Changeset 1fd675 for src/Actions/WorldAction/SetGaussianBasisAction.cpp

Timestamp:

Aug 28, 2010, 12:57:56 AM (15 years ago)

Author:

Frederik Heber <heber@…>

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, 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:

966e12

Parents:

53d01c

git-author:

Frederik Heber <heber@…> (08/26/10 21:05:34)

git-committer:

Frederik Heber <heber@…> (08/28/10 00:57:56)

Message:

All Actions are converted to the new macro framework.

• included all three values that have been used to create or convert the files
  • createdef.sh
  • createCpp.sh
  • createHeader.sh

File:

• src/Actions/WorldAction/SetGaussianBasisAction.cpp (modified) (4 diffs)

src/Actions/WorldAction/SetGaussianBasisAction.cpp ¶

@@ -20 +20 @@
 #include "Helpers/MemDebug.hpp"
 
-#include "Actions/WorldAction/SetGaussianBasisAction.hpp"
-#include "Actions/ActionRegistry.hpp"
 #include "config.hpp"
 #include "Helpers/Log.hpp"
@@ -32 +30 @@
 using namespace std;
 
-#include "UIElements/UIFactory.hpp"
-#include "UIElements/Dialog.hpp"
-#include "Actions/ValueStorage.hpp"
+#include "Actions/WorldAction/SetGaussianBasisAction.hpp"
 
-
-// memento to remember the state when undoing
-
-class WorldSetGaussianBasisState : public ActionState {
-public:
-  WorldSetGaussianBasisState(std::string _lastName) :
-    lastName(_lastName)
-  {}
-  std::string lastName;
-};
-
-
-const char WorldSetGaussianBasisAction::NAME[] = "set-basis";
-
-WorldSetGaussianBasisAction::WorldSetGaussianBasisAction() :
-  Action(NAME)
-{}
-
-WorldSetGaussianBasisAction::~WorldSetGaussianBasisAction()
-{}
-
-void WorldSetGaussianBasis(std::string &basisname) {
-  ValueStorage::getInstance().setCurrentValue(WorldSetGaussianBasisAction::NAME, basisname);
-  ActionRegistry::getInstance().getActionByName(WorldSetGaussianBasisAction::NAME)->call(Action::NonInteractive);
-};
-
-void WorldSetGaussianBasisAction::getParametersfromValueStorage()
-{};
-
-Dialog* WorldSetGaussianBasisAction::fillDialog(Dialog *dialog) {
-  ASSERT(dialog,"No Dialog given when filling action dialog");
-
-  dialog->queryString(NAME, ValueStorage::getInstance().getDescription(NAME));
-
-  return dialog;
-}
-
+// and construct the stuff
+#include "SetGaussianBasisAction.def"
+#include "Action_impl_pre.hpp"
+/** =========== define the function ====================== */
 Action::state_ptr WorldSetGaussianBasisAction::performCall() {
   config *configuration = World::getInstance().getConfig();
 
   string lastname = configuration->basis;
-  ValueStorage::getInstance().queryCurrentValue(NAME, configuration->basis);
+  // obtain information
+  getParametersfromValueStorage();
+  configuration->basis = params.newname;
 
   DoLog(1) && (Log() << Verbose(1) << "Setting MPQC basis to " << configuration->basis << "." << endl);
-  return Action::success;
+  return Action::state_ptr(new WorldSetGaussianBasisState(lastname, params));
 }
 
@@ -87 +52 @@
 
   config *configuration = World::getInstance().getConfig();
-  string newName = configuration->basis;
-  configuration->basis = state->lastName;
+  configuration->basis = state->lastname;
 
-  return Action::state_ptr(new WorldSetGaussianBasisState(newName));
+  return Action::state_ptr(_state);
 }
 
 Action::state_ptr WorldSetGaussianBasisAction::performRedo(Action::state_ptr _state){
-  return performUndo(_state);
+  WorldSetGaussianBasisState *state = assert_cast<WorldSetGaussianBasisState*>(_state.get());
+
+  config *configuration = World::getInstance().getConfig();
+  configuration->basis = state->params.newname;
+
+  return Action::state_ptr(_state);
 }
 
@@ -108 +77 @@
   return NAME;
 }
+/** =========== end of function ====================== */