Changeset 047878 for src/Actions/MoleculeAction

Timestamp:

Jul 29, 2010, 11:46:26 AM (15 years ago)

Author:

Tillmann Crueger <crueger@…>

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:

112f90

Parents:

f7ee68

Message:

made all actions pass on the dialogs and add the corresponding queries

Location:

src/Actions/MoleculeAction

Files:

• BondFileAction.cpp (modified) (1 diff)
• BondFileAction.hpp (modified) (1 diff)
• ChangeNameAction.cpp (modified) (1 diff)
• ChangeNameAction.hpp (modified) (1 diff)
• FillWithMoleculeAction.cpp (modified) (1 diff)
• FillWithMoleculeAction.hpp (modified) (1 diff)
• LinearInterpolationofTrajectoriesAction.cpp (modified) (1 diff)
• LinearInterpolationofTrajectoriesAction.hpp (modified) (1 diff)
• RotateToPrincipalAxisSystemAction.cpp (modified) (1 diff)
• RotateToPrincipalAxisSystemAction.hpp (modified) (1 diff)
• SaveAdjacencyAction.cpp (modified) (1 diff)
• SaveAdjacencyAction.hpp (modified) (1 diff)
• SaveBondsAction.cpp (modified) (1 diff)
• SaveBondsAction.hpp (modified) (1 diff)
• SaveTemperatureAction.cpp (modified) (1 diff)
• SaveTemperatureAction.hpp (modified) (1 diff)
• SuspendInWaterAction.cpp (modified) (1 diff)
• SuspendInWaterAction.hpp (modified) (1 diff)
• TranslateAction.cpp (modified) (1 diff)
• TranslateAction.hpp (modified) (1 diff)
• VerletIntegrationAction.cpp (modified) (1 diff)
• VerletIntegrationAction.hpp (modified) (1 diff)

src/Actions/MoleculeAction/BondFileAction.cpp

@@ -54 +54 @@
 };
 
-Dialog* MoleculeBondFileAction::createDialog() {
-  Dialog *dialog = UIFactory::getInstance().makeDialog();
+Dialog* MoleculeBondFileAction::fillDialog(Dialog *dialog) {
+  ASSERT(dialog,"No Dialog given when filling action dialog");
 
   dialog->queryString(NAME, MapOfActions::getInstance().getDescription(NAME));

src/Actions/MoleculeAction/BondFileAction.hpp

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

src/Actions/MoleculeAction/ChangeNameAction.cpp

@@ -50 +50 @@
 };
 
-Dialog* MoleculeChangeNameAction::createDialog() {
-  Dialog *dialog = UIFactory::getInstance().makeDialog();
+Dialog* MoleculeChangeNameAction::fillDialog(Dialog *dialog) {
+  ASSERT(dialog,"No Dialog given when filling action dialog");
 
   dialog->queryString(NAME, ValueStorage::getInstance().getDescription(NAME));

src/Actions/MoleculeAction/ChangeNameAction.hpp

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

src/Actions/MoleculeAction/FillWithMoleculeAction.cpp

@@ -60 +60 @@
 };
 
-Dialog* MoleculeFillWithMoleculeAction::createDialog() {
-  Dialog *dialog = UIFactory::getInstance().makeDialog();
+Dialog* MoleculeFillWithMoleculeAction::fillDialog(Dialog *dialog) {
+  ASSERT(dialog,"No Dialog given when filling action dialog");
 
   dialog->queryString(NAME, ValueStorage::getInstance().getDescription(NAME));

src/Actions/MoleculeAction/FillWithMoleculeAction.hpp

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

src/Actions/MoleculeAction/LinearInterpolationofTrajectoriesAction.cpp

@@ -59 +59 @@
 };
 
-Dialog* MoleculeLinearInterpolationofTrajectoriesAction::createDialog() {
-  Dialog *dialog = UIFactory::getInstance().makeDialog();
+Dialog* MoleculeLinearInterpolationofTrajectoriesAction::fillDialog(Dialog *dialog) {
+  ASSERT(dialog,"No Dialog given when filling action dialog");
 
   dialog->queryString(NAME, MapOfActions::getInstance().getDescription(NAME));

src/Actions/MoleculeAction/LinearInterpolationofTrajectoriesAction.hpp

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

src/Actions/MoleculeAction/RotateToPrincipalAxisSystemAction.cpp

@@ -52 +52 @@
 };
 
-Dialog* MoleculeRotateToPrincipalAxisSystemAction::createDialog() {
-  Dialog *dialog = UIFactory::getInstance().makeDialog();
+Dialog* MoleculeRotateToPrincipalAxisSystemAction::fillDialog(Dialog *dialog) {
+  ASSERT(dialog,"No Dialog given when filling action dialog");
 
   dialog->queryEmpty(NAME, MapOfActions::getInstance().getDescription(NAME));

src/Actions/MoleculeAction/RotateToPrincipalAxisSystemAction.hpp

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

src/Actions/MoleculeAction/SaveAdjacencyAction.cpp

@@ -56 +56 @@
 };
 
-Dialog* MoleculeSaveAdjacencyAction::createDialog() {
-  Dialog *dialog = UIFactory::getInstance().makeDialog();
+Dialog* MoleculeSaveAdjacencyAction::fillDialog(Dialog *dialog) {
+  ASSERT(dialog,"No Dialog given when filling action dialog");
 
   dialog->queryString(NAME, ValueStorage::getInstance().getDescription(NAME));

src/Actions/MoleculeAction/SaveAdjacencyAction.hpp

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

src/Actions/MoleculeAction/SaveBondsAction.cpp

@@ -56 +56 @@
 };
 
-Dialog* MoleculeSaveBondsAction::createDialog() {
-  Dialog *dialog = UIFactory::getInstance().makeDialog();
+Dialog* MoleculeSaveBondsAction::fillDialog(Dialog *dialog) {
+  ASSERT(dialog,"No Dialog given when filling action dialog");
 
   dialog->queryString(NAME, ValueStorage::getInstance().getDescription(NAME));

src/Actions/MoleculeAction/SaveBondsAction.hpp

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

src/Actions/MoleculeAction/SaveTemperatureAction.cpp

@@ -53 +53 @@
 };
 
-Dialog* MoleculeSaveTemperatureAction::createDialog() {
-  Dialog *dialog = UIFactory::getInstance().makeDialog();
+Dialog* MoleculeSaveTemperatureAction::fillDialog(Dialog *dialog) {
+  ASSERT(dialog,"No Dialog given when filling action dialog");
 
   dialog->queryString(NAME, ValueStorage::getInstance().getDescription(NAME));

src/Actions/MoleculeAction/SaveTemperatureAction.hpp

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

src/Actions/MoleculeAction/SuspendInWaterAction.cpp

@@ -53 +53 @@
 };
 
-Dialog* MoleculeSuspendInWaterAction::createDialog() {
-  Dialog *dialog = UIFactory::getInstance().makeDialog();
+Dialog* MoleculeSuspendInWaterAction::fillDialog(Dialog *dialog) {
+  ASSERT(dialog,"No Dialog given when filling action dialog");
 
   dialog->queryDouble(NAME, ValueStorage::getInstance().getDescription(NAME));

src/Actions/MoleculeAction/SuspendInWaterAction.hpp

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

src/Actions/MoleculeAction/TranslateAction.cpp

@@ -55 +55 @@
 };
 
-Dialog* MoleculeTranslateAction::createDialog() {
-  Dialog *dialog = UIFactory::getInstance().makeDialog();
+Dialog* MoleculeTranslateAction::fillDialog(Dialog *dialog) {
+  ASSERT(dialog,"No Dialog given when filling action dialog");
 
   dialog->queryVector(NAME, false, ValueStorage::getInstance().getDescription(NAME));

src/Actions/MoleculeAction/TranslateAction.hpp

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

src/Actions/MoleculeAction/VerletIntegrationAction.cpp

@@ -53 +53 @@
 };
 
-Dialog* MoleculeVerletIntegrationAction::createDialog() {
-  Dialog *dialog = UIFactory::getInstance().makeDialog();
+Dialog* MoleculeVerletIntegrationAction::fillDialog(Dialog *dialog) {
+  ASSERT(dialog,"No Dialog given when filling action dialog");
 
   dialog->queryString(NAME, ValueStorage::getInstance().getDescription(NAME));

src/Actions/MoleculeAction/VerletIntegrationAction.hpp

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