Changeset 5ca6b5


Ignore:
Timestamp:
Aug 27, 2012, 11:36:58 AM (13 years ago)
Author:
Michael Ankele <ankele@…>
Branches:
Action_Thermostats, Add_AtomRandomPerturbation, Add_FitFragmentPartialChargesAction, Add_RotateAroundBondAction, Add_SelectAtomByNameAction, Added_ParseSaveFragmentResults, AddingActions_SaveParseParticleParameters, Adding_Graph_to_ChangeBondActions, Adding_MD_integration_tests, Adding_ParticleName_to_Atom, Adding_StructOpt_integration_tests, AtomFragments, Automaking_mpqc_open, AutomationFragmentation_failures, Candidate_v1.5.4, Candidate_v1.6.0, Candidate_v1.6.1, Candidate_v1.7.0, ChangeBugEmailaddress, ChangingTestPorts, ChemicalSpaceEvaluator, CombiningParticlePotentialParsing, Combining_Subpackages, Debian_Package_split, Debian_package_split_molecuildergui_only, Disabling_MemDebug, Docu_Python_wait, EmpiricalPotential_contain_HomologyGraph, EmpiricalPotential_contain_HomologyGraph_documentation, Enable_parallel_make_install, Enhance_userguide, Enhanced_StructuralOptimization, Enhanced_StructuralOptimization_continued, Example_ManyWaysToTranslateAtom, Exclude_Hydrogens_annealWithBondGraph, FitPartialCharges_GlobalError, Fix_BoundInBox_CenterInBox_MoleculeActions, Fix_ChargeSampling_PBC, Fix_ChronosMutex, Fix_FitPartialCharges, Fix_FitPotential_needs_atomicnumbers, Fix_ForceAnnealing, Fix_IndependentFragmentGrids, Fix_ParseParticles, Fix_ParseParticles_split_forward_backward_Actions, Fix_PopActions, Fix_QtFragmentList_sorted_selection, Fix_Restrictedkeyset_FragmentMolecule, Fix_StatusMsg, Fix_StepWorldTime_single_argument, Fix_Verbose_Codepatterns, Fix_fitting_potentials, Fixes, ForceAnnealing_goodresults, ForceAnnealing_oldresults, ForceAnnealing_tocheck, ForceAnnealing_with_BondGraph, ForceAnnealing_with_BondGraph_continued, ForceAnnealing_with_BondGraph_continued_betteresults, ForceAnnealing_with_BondGraph_contraction-expansion, FragmentAction_writes_AtomFragments, FragmentMolecule_checks_bonddegrees, GeometryObjects, Gui_Fixes, Gui_displays_atomic_force_velocity, ImplicitCharges, IndependentFragmentGrids, IndependentFragmentGrids_IndividualZeroInstances, IndependentFragmentGrids_IntegrationTest, IndependentFragmentGrids_Sole_NN_Calculation, JobMarket_RobustOnKillsSegFaults, JobMarket_StableWorkerPool, JobMarket_unresolvable_hostname_fix, MoreRobust_FragmentAutomation, ODR_violation_mpqc_open, PartialCharges_OrthogonalSummation, PdbParser_setsAtomName, PythonUI_with_named_parameters, QtGui_reactivate_TimeChanged_changes, Recreated_GuiChecks, Rewrite_FitPartialCharges, RotateToPrincipalAxisSystem_UndoRedo, SaturateAtoms_findBestMatching, SaturateAtoms_singleDegree, StoppableMakroAction, Subpackage_CodePatterns, Subpackage_JobMarket, Subpackage_LinearAlgebra, Subpackage_levmar, Subpackage_mpqc_open, Subpackage_vmg, Switchable_LogView, ThirdParty_MPQC_rebuilt_buildsystem, TrajectoryDependenant_MaxOrder, TremoloParser_IncreasedPrecision, TremoloParser_MultipleTimesteps, TremoloParser_setsAtomName, Ubuntu_1604_changes, stable
Children:
a55e6f
Parents:
b2a7cc
git-author:
Michael Ankele <ankele@…> (08/10/12 13:15:34)
git-committer:
Michael Ankele <ankele@…> (08/27/12 11:36:58)
Message:

drop deprecated references to ValueStorage

Location:
src
Files:
22 edited

Legend:

Unmodified
Added
Removed

  • src/Actions/Action.cpp

    rb2a7cc r5ca6b5  
    3030#include "Actions/OptionRegistry.hpp"
    3131#include "Actions/OptionTrait.hpp"
    32 //#include "Actions/ValueStorage.hpp"
    3332#include "UIElements/Dialog.hpp"
    3433#include "CodePatterns/Assert.hpp"
    … …  
    183182//  try {
    184183    startTimer();
    185     //getParametersfromValueStorage();
    186184    state = performCall();
    187185    endTimer();

  • src/Actions/Action.hpp

    rb2a7cc r5ca6b5  
    226226
    227227  /**
    228    * This is called internally before the Action::performCall(). It initializes the
    229    * necessary ActionParameters by retrieving the values from ValueStorage.
    230    */
    231   //virtual void getParametersfromValueStorage()=0;
    232 
    233   /**
    234228   * This is called internally before the action is processed. This adds necessary queries
    235229   * to a given dialog to obtain parameters for the user for processing the action accordingly.

  • src/Actions/Action_impl_header.hpp

    rb2a7cc r5ca6b5  
    3232
    3333#include "Actions/ActionTraits.hpp"
    34 #include "Actions/ValueStorage.hpp"
    3534
    3635#include "Parameters/Parameter.hpp"
    … …  
    232231
    233232private:
    234   //virtual void getParametersfromValueStorage();
    235233  virtual Action::state_ptr performCall();
    236234  virtual Action::state_ptr performUndo(Action::state_ptr);

  • src/Actions/Action_impl_python.hpp

    rb2a7cc r5ca6b5  
    8888
    8989// prints set/queryCurrentValue (command) for paramreferences and paramtokens
    90 #define value_print(z,n,command, prefix) \
    91   ValueStorage::getInstance(). command (\
    92   BOOST_PP_SEQ_ELEM(n, paramtokens)\
    93   , \
    94   prefix\
    95   BOOST_PP_SEQ_ELEM(n, paramreferences)\
     90#define value_print(z, n, container, prefix) \
     91  prefix \
     92  BOOST_PP_SEQ_ELEM(n, container)\
     93  .set(\
     94  BOOST_PP_SEQ_ELEM(n, container)\
    9695  );
    9796
    … …  
    103102#include "Actions/Action.hpp"
    104103#include "Actions/ActionRegistry.hpp"
    105 #include "Actions/ValueStorage.hpp"
    106104
    107105namespace MoleCuilder {

  • src/Actions/Calculation.hpp

    rb2a7cc r5ca6b5  
    7272  virtual T* doCalc()=0;
    7373private:
    74   virtual void getParametersfromValueStorage();
    7574  virtual Action::state_ptr performCall();
    7675  virtual Action::state_ptr performUndo(Action::state_ptr);

  • src/Actions/Calculation_impl.hpp

    rb2a7cc r5ca6b5  
    3535
    3636// methods inherited from Action
    37 
    38 template<typename T>
    39 void Calculation<T>::getParametersfromValueStorage()
    40 {}
    4137
    4238template<typename T>

  • src/Actions/ErrorAction.cpp

    rb2a7cc r5ca6b5  
    4343}
    4444
    45 void ErrorAction::getParametersfromValueStorage()
    46 {}
    47 
    4845Action::state_ptr ErrorAction::performCall() {
    4946  ELOG(0, errorMsg);

  • src/Actions/ErrorAction.hpp

    rb2a7cc r5ca6b5  
    3131private:
    3232  virtual Dialog * createDialog();
    33   virtual void getParametersfromValueStorage();
    3433  virtual Action::state_ptr performCall();
    3534  virtual Action::state_ptr performUndo(Action::state_ptr);

  • src/Actions/MakroAction.cpp

    rb2a7cc r5ca6b5  
    5656}
    5757
    58 void MakroAction::getParametersfromValueStorage()
    59 {};
    60 
    6158Dialog* MakroAction::fillDialog(Dialog *dialog) {
    6259  return actions->fillAllDialogs(dialog);

  • src/Actions/MakroAction.hpp

    rb2a7cc r5ca6b5  
    3939  virtual Dialog *fillDialog(Dialog *dialog);
    4040private:
    41   virtual void getParametersfromValueStorage();
    4241  virtual Action::state_ptr performCall();
    4342  virtual Action::state_ptr performUndo(Action::state_ptr);

  • src/Actions/ManipulateAtomsProcess.cpp

    rb2a7cc r5ca6b5  
    4242{}
    4343
    44 void ManipulateAtomsProcess::getParametersfromValueStorage()
    45 {};
    46 
    4744Dialog* ManipulateAtomsProcess::fillDialog(Dialog *dialog){
    4845  ASSERT(dialog,"No Dialog given when filling action dialog");

  • src/Actions/ManipulateAtomsProcess.hpp

    rb2a7cc r5ca6b5  
    3939  virtual Dialog * fillDialog(Dialog*);
    4040private:
    41   virtual void getParametersfromValueStorage();
    4241  virtual Action::state_ptr performCall();
    4342  virtual Action::state_ptr performUndo(Action::state_ptr);

  • src/Actions/MethodAction.cpp

    rb2a7cc r5ca6b5  
    3838{}
    3939
    40 void MethodAction::getParametersfromValueStorage()
    41 {};
    42 
    4340Dialog* MethodAction::fillDialog(Dialog *dialog) {
    4441  ASSERT(dialog,"No Dialog given when filling action dialog");

  • src/Actions/MethodAction.hpp

    rb2a7cc r5ca6b5  
    3535  virtual Dialog * fillDialog(Dialog *dialog);
    3636private:
    37   virtual void getParametersfromValueStorage();
    3837  virtual Action::state_ptr performCall();
    3938  virtual Action::state_ptr performUndo(Action::state_ptr);

  • src/Actions/ParserAction/SetParserParametersAction.cpp

    rb2a7cc r5ca6b5  
    2525#include "Parser/MpqcParser.hpp"
    2626#include "Parser/MpqcParser_Parameters.hpp"
    27 #include "Actions/ValueStorage.hpp"
    2827
    2928#include <algorithm>

  • src/Actions/Reaction.hpp

    rb2a7cc r5ca6b5  
    7777  virtual T* doCalc()=0;
    7878private:
    79   virtual void getParametersfromValueStorage()=0;
    8079  virtual Action::state_ptr performCall();
    8180  virtual Action::state_ptr performUndo(Action::state_ptr);

  • src/Actions/Reaction_impl_header.hpp

    rb2a7cc r5ca6b5  
    2929
    3030#include "Actions/ActionTraits.hpp"
    31 #include "Actions/ValueStorage.hpp"
    3231
    3332// some derived names: if CATEGORY is not given, we don't prefix with it
    … …  
    219218protected:
    220219  virtual Dialog * fillDialog(Dialog*);
    221 private:
    222   virtual void getParametersfromValueStorage();
    223220};
    224221

  • src/Actions/Reaction_impl_pre.hpp

    rb2a7cc r5ca6b5  
    125125
    126126// prints set/queryCurrentValue (command) for paramreferences and paramtokens
    127 #define value_print(z,n,command, prefix) \
    128   ValueStorage::getInstance(). command (\
    129   BOOST_PP_SEQ_ELEM(n, paramtokens)\
    130   , \
    131   prefix\
    132   BOOST_PP_SEQ_ELEM(n, paramreferences)\
     127#define value_print(z, n, container, prefix) \
     128  prefix \
     129  BOOST_PP_SEQ_ELEM(n, container)\
     130  .set(\
     131  BOOST_PP_SEQ_ELEM(n, container)\
    133132  );
    134133
    135134// prints set/queryCurrentValue (command) for paramreferences and paramtokens
    136 #define valuetype_print(z,n,command, prefix) \
    137   ValueStorage::getInstance(). command< \
    138   BOOST_PP_SEQ_ELEM(n, paramtypes) \
    139   > (\
    140   BOOST_PP_SEQ_ELEM(n, paramtokens)\
    141   , \
    142   prefix\
    143   BOOST_PP_SEQ_ELEM(n, paramreferences)\
     135#define valuetype_print(z,n,container, types, prefix) \
     136  prefix \
     137  BOOST_PP_SEQ_ELEM(n, container) \
     138  .setAsString( \
     139  BOOST_PP_SEQ_ELEM(n, container) \
    144140  );
    145141
    … …  
    225221
    226222  return static_cast<Reaction< RETURNTYPE > *>(ToCall)->getResult();
    227 };
    228 
    229 // =========== obtain parameters from Storage, used by performCall() ===========
    230 void REACTION::getParametersfromValueStorage() {
    231 #if BOOST_PP_NOT_EQUAL(MAXPARAMTYPES,0)
    232 #define BOOST_PP_LOCAL_MACRO(n) value_print(~, n, queryCurrentValue, params.)
    233 #define BOOST_PP_LOCAL_LIMITS  (0, MAXPARAMTYPES-1)
    234 #include BOOST_PP_LOCAL_ITERATE()
    235 #endif
    236223};
    237224

  • src/Actions/unittests/ActionSequenceUnitTest.cpp

    rb2a7cc r5ca6b5  
    5050  virtual ~canUndoActionStub(){}
    5151
    52   virtual void getParametersfromValueStorage(){
    53   }
    54 
    5552  virtual Dialog* fillDialog(Dialog *dialog){
    5653    ASSERT(dialog,"No Dialog given when filling action dialog");
    … …  
    8178    Action(_trait,false){}
    8279  virtual ~cannotUndoActionStub(){}
    83 
    84   virtual void getParametersfromValueStorage(){
    85   }
    8680
    8781  virtual Dialog* fillDialog(Dialog *dialog){
    … …  
    115109  {}
    116110  virtual ~wasCalledActionStub(){}
    117 
    118   virtual void getParametersfromValueStorage(){
    119   }
    120111
    121112  virtual Dialog* fillDialog(Dialog *dialog){

  • src/UIElements/Menu/TextMenu/TxMenuLeaveAction.cpp

    rb2a7cc r5ca6b5  
    5555}
    5656
    57 /** Internal function to obtain parameters from a storage.
    58  * We do not use this one as we don't need any parameters.
    59  */
    60 void TxMenu::LeaveAction::getParametersfromValueStorage()
    61 {}
    62 
    6357/** Internal function to construct the dialog.
    6458 * We do not need this function as there is no dialog to construct.

  • src/UIElements/Menu/TextMenu/TxMenuLeaveAction.hpp

    rb2a7cc r5ca6b5  
    3636  virtual Dialog* fillDialog(Dialog *dialog);
    3737private:
    38   virtual void getParametersfromValueStorage();
    3938  virtual MoleCuilder::Action::state_ptr performCall();
    4039  virtual MoleCuilder::Action::state_ptr performUndo(MoleCuilder::Action::state_ptr);

  • src/builder_init.cpp

    rb2a7cc r5ca6b5  
    4848
    4949#include "World.hpp"
     50
     51#include <boost/filesystem.hpp>
    5052
    5153
Note: See TracChangeset for help on using the changeset viewer.