Changeset 9d33ba for src/Actions

Timestamp:

Jul 22, 2010, 7:45:26 PM (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:

454065

Parents:

ca1ba5

Message:

Added ValueStorage::getDescription(), i.e. now all occurences of MapOfActions in classes ...Action can be replaced.

• MapOfActions replaced by ValueStorage in: MolecularVolumeAction, PairCorrelationAction, PointCorrelationAction, PrincipalAxisSystemAction, SurfaceCorrelationAction, AddAction.
• AddAction converted to new createDialog().

Location:

src/Actions

Files:

• AnalysisAction/MolecularVolumeAction.cpp (modified) (2 diffs)
• AnalysisAction/PairCorrelationAction.cpp (modified) (3 diffs)
• AnalysisAction/PointCorrelationAction.cpp (modified) (3 diffs)
• AnalysisAction/PrincipalAxisSystemAction.cpp (modified) (3 diffs)
• AnalysisAction/SurfaceCorrelationAction.cpp (modified) (3 diffs)
• AtomAction/AddAction.cpp (modified) (2 diffs)
• AtomAction/AddAction.hpp (modified) (1 diff)

src/Actions/AnalysisAction/MolecularVolumeAction.cpp

@@ -24 +24 @@
 #include "UIElements/UIFactory.hpp"
 #include "UIElements/Dialog.hpp"
-#include "Actions/MapOfActions.hpp"
+#include "UIElements/ValueStorage.hpp"
 
 const char AnalysisMolecularVolumeAction::NAME[] = "molecular-volume";
@@ -43 +43 @@
   int molID = -1;
   // obtain information
-  MapOfActions::getInstance().queryCurrentValue(NAME, molID);
+  ValueStorage::getInstance().queryCurrentValue(NAME, molID);
 
   // execute action

src/Actions/AnalysisAction/PairCorrelationAction.cpp

@@ -27 +27 @@
 #include "UIElements/UIFactory.hpp"
 #include "UIElements/Dialog.hpp"
-#include "Actions/MapOfActions.hpp"
+#include "UIElements/ValueStorage.hpp"
 
 const char AnalysisPairCorrelationAction::NAME[] = "pair-correlation";
@@ -41 +41 @@
   Dialog *dialog = UIFactory::getInstance().makeDialog();
 
-  dialog->queryElement("elements", MapOfActions::getInstance().getDescription("elements"));
-  dialog->queryDouble("bin-start", MapOfActions::getInstance().getDescription("bin-start"));
-  dialog->queryDouble("bin-width", MapOfActions::getInstance().getDescription("bin-width"));
-  dialog->queryDouble("bin-end", MapOfActions::getInstance().getDescription("bin-end"));
-  dialog->queryString("output-file", MapOfActions::getInstance().getDescription("output-file"));
-  dialog->queryString("bin-output-file", MapOfActions::getInstance().getDescription("bin-output-file"));
-  dialog->queryBoolean("periodic", MapOfActions::getInstance().getDescription("periodic"));
+  dialog->queryElement("elements", ValueStorage::getInstance().getDescription("elements"));
+  dialog->queryDouble("bin-start", ValueStorage::getInstance().getDescription("bin-start"));
+  dialog->queryDouble("bin-width", ValueStorage::getInstance().getDescription("bin-width"));
+  dialog->queryDouble("bin-end", ValueStorage::getInstance().getDescription("bin-end"));
+  dialog->queryString("output-file", ValueStorage::getInstance().getDescription("output-file"));
+  dialog->queryString("bin-output-file", ValueStorage::getInstance().getDescription("bin-output-file"));
+  dialog->queryBoolean("periodic", ValueStorage::getInstance().getDescription("periodic"));
 
   return dialog;
@@ -70 +70 @@
 
   // obtain information
-  MapOfActions::getInstance().queryCurrentValue("elements", elements);
-  MapOfActions::getInstance().queryCurrentValue("bin-start", BinStart);
-  MapOfActions::getInstance().queryCurrentValue("bin-width", BinWidth);
-  MapOfActions::getInstance().queryCurrentValue("bin-end", BinEnd);
-  MapOfActions::getInstance().queryCurrentValue("output-file", outputname);
-  MapOfActions::getInstance().queryCurrentValue("bin-output-file", binoutputname);
-  MapOfActions::getInstance().queryCurrentValue("periodic", periodic);
+  ValueStorage::getInstance().queryCurrentValue("elements", elements);
+  ValueStorage::getInstance().queryCurrentValue("bin-start", BinStart);
+  ValueStorage::getInstance().queryCurrentValue("bin-width", BinWidth);
+  ValueStorage::getInstance().queryCurrentValue("bin-end", BinEnd);
+  ValueStorage::getInstance().queryCurrentValue("output-file", outputname);
+  ValueStorage::getInstance().queryCurrentValue("bin-output-file", binoutputname);
+  ValueStorage::getInstance().queryCurrentValue("periodic", periodic);
 
   // execute action

src/Actions/AnalysisAction/PointCorrelationAction.cpp

@@ -27 +27 @@
 #include "UIElements/UIFactory.hpp"
 #include "UIElements/Dialog.hpp"
-#include "Actions/MapOfActions.hpp"
+#include "UIElements/ValueStorage.hpp"
 
 const char AnalysisPointCorrelationAction::NAME[] = "point-correlation";
@@ -41 +41 @@
   Dialog *dialog = UIFactory::getInstance().makeDialog();
 
-  dialog->queryVector("position", false, MapOfActions::getInstance().getDescription("position"));
-  dialog->queryElement("elements", MapOfActions::getInstance().getDescription("elements"));
-  dialog->queryDouble("bin-start", MapOfActions::getInstance().getDescription("bin-start"));
-  dialog->queryDouble("bin-width", MapOfActions::getInstance().getDescription("bin-width"));
-  dialog->queryDouble("bin-end", MapOfActions::getInstance().getDescription("bin-end"));
-  dialog->queryString("output-file", MapOfActions::getInstance().getDescription("output-file"));
-  dialog->queryString("bin-output-file", MapOfActions::getInstance().getDescription("bin-output-file"));
-  dialog->queryBoolean("periodic", MapOfActions::getInstance().getDescription("periodic"));
+  dialog->queryVector("position", false, ValueStorage::getInstance().getDescription("position"));
+  dialog->queryElement("elements", ValueStorage::getInstance().getDescription("elements"));
+  dialog->queryDouble("bin-start", ValueStorage::getInstance().getDescription("bin-start"));
+  dialog->queryDouble("bin-width", ValueStorage::getInstance().getDescription("bin-width"));
+  dialog->queryDouble("bin-end", ValueStorage::getInstance().getDescription("bin-end"));
+  dialog->queryString("output-file", ValueStorage::getInstance().getDescription("output-file"));
+  dialog->queryString("bin-output-file", ValueStorage::getInstance().getDescription("bin-output-file"));
+  dialog->queryBoolean("periodic", ValueStorage::getInstance().getDescription("periodic"));
 
   return dialog;
@@ -71 +71 @@
 
   // obtain information
-  MapOfActions::getInstance().queryCurrentValue("position", Point);
-  MapOfActions::getInstance().queryCurrentValue("elements", elements);
-  MapOfActions::getInstance().queryCurrentValue("bin-start", BinStart);
-  MapOfActions::getInstance().queryCurrentValue("bin-width", BinWidth);
-  MapOfActions::getInstance().queryCurrentValue("bin-end", BinEnd);
-  MapOfActions::getInstance().queryCurrentValue("output-file", outputname);
-  MapOfActions::getInstance().queryCurrentValue("bin-output-file", binoutputname);
-  MapOfActions::getInstance().queryCurrentValue("periodic", periodic);
+  ValueStorage::getInstance().queryCurrentValue("position", Point);
+  ValueStorage::getInstance().queryCurrentValue("elements", elements);
+  ValueStorage::getInstance().queryCurrentValue("bin-start", BinStart);
+  ValueStorage::getInstance().queryCurrentValue("bin-width", BinWidth);
+  ValueStorage::getInstance().queryCurrentValue("bin-end", BinEnd);
+  ValueStorage::getInstance().queryCurrentValue("output-file", outputname);
+  ValueStorage::getInstance().queryCurrentValue("bin-output-file", binoutputname);
+  ValueStorage::getInstance().queryCurrentValue("periodic", periodic);
 
   // execute action

src/Actions/AnalysisAction/PrincipalAxisSystemAction.cpp

@@ -20 +20 @@
 #include "UIElements/UIFactory.hpp"
 #include "UIElements/Dialog.hpp"
-#include "Actions/MapOfActions.hpp"
+#include "UIElements/ValueStorage.hpp"
 
 const char AnalysisPrincipalAxisSystemAction::NAME[] = "principal-axis-system";
@@ -34 +34 @@
   Dialog *dialog = UIFactory::getInstance().makeDialog();
 
-  dialog->queryMolecule(NAME, MapOfActions::getInstance().getDescription(NAME));
+  dialog->queryMolecule(NAME, ValueStorage::getInstance().getDescription(NAME));
 
   return dialog;
@@ -42 +42 @@
   molecule *mol = NULL;
 
-  MapOfActions::getInstance().queryCurrentValue(NAME, mol);
+  ValueStorage::getInstance().queryCurrentValue(NAME, mol);
   DoLog(0) && (Log() << Verbose(0) << "Evaluating prinicipal axis." << endl);
   mol->PrincipalAxisSystem(false);

src/Actions/AnalysisAction/SurfaceCorrelationAction.cpp

@@ -27 +27 @@
 #include "UIElements/UIFactory.hpp"
 #include "UIElements/Dialog.hpp"
-#include "Actions/MapOfActions.hpp"
+#include "UIElements/ValueStorage.hpp"
 
 const char AnalysisSurfaceCorrelationAction::NAME[] = "surface-correlation";
@@ -41 +41 @@
   Dialog *dialog = UIFactory::getInstance().makeDialog();
 
-  dialog->queryMolecule("molecule-by-id", MapOfActions::getInstance().getDescription("molecule-by-id"));
-  dialog->queryElement("elements", MapOfActions::getInstance().getDescription("elements"));
-  dialog->queryDouble("bin-start", MapOfActions::getInstance().getDescription("bin-start"));
-  dialog->queryDouble("bin-width", MapOfActions::getInstance().getDescription("bin-width"));
-  dialog->queryDouble("bin-end", MapOfActions::getInstance().getDescription("bin-end"));
-  dialog->queryString("output-file", MapOfActions::getInstance().getDescription("output-file"));
-  dialog->queryString("bin-output-file", MapOfActions::getInstance().getDescription("bin-output-file"));
-  dialog->queryBoolean("periodic", MapOfActions::getInstance().getDescription("periodic"));
+  dialog->queryMolecule("molecule-by-id", ValueStorage::getInstance().getDescription("molecule-by-id"));
+  dialog->queryElement("elements", ValueStorage::getInstance().getDescription("elements"));
+  dialog->queryDouble("bin-start", ValueStorage::getInstance().getDescription("bin-start"));
+  dialog->queryDouble("bin-width", ValueStorage::getInstance().getDescription("bin-width"));
+  dialog->queryDouble("bin-end", ValueStorage::getInstance().getDescription("bin-end"));
+  dialog->queryString("output-file", ValueStorage::getInstance().getDescription("output-file"));
+  dialog->queryString("bin-output-file", ValueStorage::getInstance().getDescription("bin-output-file"));
+  dialog->queryBoolean("periodic", ValueStorage::getInstance().getDescription("periodic"));
 
   return dialog;
@@ -71 +71 @@
 
   // obtain information
-  MapOfActions::getInstance().queryCurrentValue("molecule-by-id", Boundary);
-  MapOfActions::getInstance().queryCurrentValue("elements", elements);
-  MapOfActions::getInstance().queryCurrentValue("bin-start", BinStart);
-  MapOfActions::getInstance().queryCurrentValue("bin-width", BinWidth);
-  MapOfActions::getInstance().queryCurrentValue("bin-end", BinEnd);
-  MapOfActions::getInstance().queryCurrentValue("output-file", outputname);
-  MapOfActions::getInstance().queryCurrentValue("bin-output-file", binoutputname);
-  MapOfActions::getInstance().queryCurrentValue("periodic", periodic);
+  ValueStorage::getInstance().queryCurrentValue("molecule-by-id", Boundary);
+  ValueStorage::getInstance().queryCurrentValue("elements", elements);
+  ValueStorage::getInstance().queryCurrentValue("bin-start", BinStart);
+  ValueStorage::getInstance().queryCurrentValue("bin-width", BinWidth);
+  ValueStorage::getInstance().queryCurrentValue("bin-end", BinEnd);
+  ValueStorage::getInstance().queryCurrentValue("output-file", outputname);
+  ValueStorage::getInstance().queryCurrentValue("bin-output-file", binoutputname);
+  ValueStorage::getInstance().queryCurrentValue("periodic", periodic);
 
   // execute action

src/Actions/AtomAction/AddAction.cpp

@@ -24 +24 @@
 #include "UIElements/UIFactory.hpp"
 #include "UIElements/Dialog.hpp"
-#include "Actions/MapOfActions.hpp"
+#include "UIElements/ValueStorage.hpp"
 
 const char AtomAddAction::NAME[] = "add-atom";
@@ -35 +35 @@
 {}
 
+Dialog * AtomAddAction::createDialog() {
+  Dialog *dialog = UIFactory::getInstance().makeDialog();
+
+  dialog->queryElement(NAME, ValueStorage::getInstance().getDescription(NAME));
+  dialog->queryVector("position", true, ValueStorage::getInstance().getDescription("position"));
+
+  return dialog;
+}
+
 Action::state_ptr AtomAddAction::performCall() {
-  Dialog *dialog = UIFactory::getInstance().makeDialog();
   std::vector<element *> elements;
   Vector position;
 
-  dialog->queryElement(NAME, &elements, MapOfActions::getInstance().getDescription(NAME));
-  dialog->queryVector("position", &position, true, MapOfActions::getInstance().getDescription("position"));
-  cout << "pre-dialog" << endl;
+  // obtain information
+  ValueStorage::getInstance().queryCurrentValue(NAME, elements);
+  ValueStorage::getInstance().queryCurrentValue("position", position);
 
-  if(dialog->display()) {
-    cout << "post-dialog" << endl;
-    delete dialog;
-    if (elements.size() == 1) {
-      atom * first = World::getInstance().createAtom();
-      first->type = *(elements.begin());
-      first->x = position;
-      DoLog(1) && (Log() << Verbose(1) << "Adding new atom with element " << first->type->name << " at " << (first->x) << "." << endl);
-      // TODO: remove when all of World's atoms are stored.
-      std::vector<molecule *> molecules = World::getInstance().getAllMolecules();
-      if (!molecules.empty()) {
-        std::vector<molecule *>::iterator iter = molecules.begin();
-        (*iter)->AddAtom(first);
-      }
-      return Action::success;
-    } else {
+  // execute action
+  if (elements.size() == 1) {
+    atom * first = World::getInstance().createAtom();
+    first->type = *(elements.begin());
+    first->x = position;
+    DoLog(1) && (Log() << Verbose(1) << "Adding new atom with element " << first->type->name << " at " << (first->x) << "." << endl);
+    // TODO: remove when all of World's atoms are stored.
+    std::vector<molecule *> molecules = World::getInstance().getAllMolecules();
+    if (!molecules.empty()) {
+      std::vector<molecule *>::iterator iter = molecules.begin();
+      (*iter)->AddAtom(first);
+    }
+    return Action::success;
+  } else {
       DoeLog(1) && (eLog()<< Verbose(1) << "Could not find the specified element." << endl);
       return Action::failure;
-    }
-  } else {
-    delete dialog;
-    return Action::failure;
   }
-
 }
 

src/Actions/AtomAction/AddAction.hpp

@@ -21 +21 @@
   virtual const std::string getName();
 private:
+  virtual Dialog * createDialog();
   virtual Action::state_ptr performCall();
   virtual Action::state_ptr performUndo(Action::state_ptr);