Changeset 8bb05e for src/Actions/AtomAction/AddAction.cpp

Timestamp:

Aug 28, 2010, 12:57:56 AM (14 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:

53d01c

Parents:

72f611

git-author:

Frederik Heber <heber@…> (08/26/10 13:27:09)

git-committer:

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

Message:

AtomAddAction converted to use macro framework.

• State generation is working.

File:

• src/Actions/AtomAction/AddAction.cpp (modified) (5 diffs)

src/Actions/AtomAction/AddAction.cpp

@@ -20 +20 @@
 #include "Helpers/MemDebug.hpp"
 
-#include "Actions/AtomAction/AddAction.hpp"
-#include "Actions/ActionRegistry.hpp"
 #include "Descriptors/AtomIdDescriptor.hpp"
 #include "atom.hpp"
@@ -36 +34 @@
 using namespace std;
 
-#include "UIElements/UIFactory.hpp"
-#include "UIElements/Dialog.hpp"
-#include "Actions/ValueStorage.hpp"
+#include "Actions/AtomAction/AddAction.hpp"
 
-// memento to remember the state when undoing
+// and construct the stuff
+#include "AddAction.def"
+#include "Action_impl_pre.hpp"
 
-class AtomAddState : public ActionState {
-public:
-  AtomAddState(const Vector &_position, const element *_elemental, const atomId_t _id) :
-    position(_position),
-    elemental(_elemental),
-    id(_id)
-  {}
-  Vector position;
-  const element *elemental;
-  atomId_t id;
-};
-
-const char AtomAddAction::NAME[] = "add-atom";
-
-AtomAddAction::AtomAddAction() :
-  Action(NAME)
-{}
-
-AtomAddAction::~AtomAddAction()
-{}
-
-void AtomAdd(element *elemental, Vector &position) {
-  ValueStorage::getInstance().setCurrentValue(AtomAddAction::NAME, elemental);
-  ValueStorage::getInstance().setCurrentValue("position", elemental);
-  ActionRegistry::getInstance().getActionByName(AtomAddAction::NAME)->call(Action::NonInteractive);
-};
-
-void AtomAddAction::getParametersfromValueStorage()
-{};
-
-Dialog* AtomAddAction::fillDialog(Dialog *dialog) {
-  ASSERT(dialog,"No Dialog given when filling action dialog");
-
-  dialog->queryElement(NAME, ValueStorage::getInstance().getDescription(NAME));
-  dialog->queryVector("position", true, ValueStorage::getInstance().getDescription("position"));
-
-  return dialog;
-}
-
+/** =========== define the function ====================== */
 Action::state_ptr AtomAddAction::performCall() {
-  const element * elemental = NULL;
-  Vector position;
-
   // obtain information
-  ValueStorage::getInstance().queryCurrentValue(NAME, elemental);
-  ValueStorage::getInstance().queryCurrentValue("position", position);
+  getParametersfromValueStorage();
 
   // execute action
   atom * first = World::getInstance().createAtom();
-  first->setType(elemental);
-  first->setPosition(position);
+  first->setType(params.elemental);
+  first->setPosition(params.position);
   DoLog(1) && (Log() << Verbose(1) << "Adding new atom with element " << first->getType()->getName() << " at " << (first->getPosition()) << "." << endl);
   // TODO: remove when all of World's atoms are stored.
@@ -100 +56 @@
     (*iter)->AddAtom(first);
   }
-  return Action::state_ptr(new AtomAddState(position, elemental, first->getId()));
+  return Action::state_ptr(new AtomAddState(first->getId(), params));
 }
 
@@ -116 +72 @@
 
   atom * first = World::getInstance().createAtom();
-  first->setType(state->elemental);
-  first->setPosition(state->position);
-  DoLog(1) && (Log() << Verbose(1) << "Re-adding new atom with element " << state->elemental->getName() << " at " << state->position << "." << endl);
+  first->setType(state->params.elemental);
+  first->setPosition(state->params.position);
+  DoLog(1) && (Log() << Verbose(1) << "Re-adding new atom with element " << state->params.elemental->getName() << " at " << state->params.position << "." << endl);
   // TODO: remove when all of World's atoms are stored.
   std::vector<molecule *> molecules = World::getInstance().getAllMolecules();
@@ -142 +98 @@
   return NAME;
 }
+/** =========== end of function ====================== */