Changeset 047878 for src/Actions/WorldAction

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, 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/WorldAction

Files:

• AddEmptyBoundaryAction.cpp (modified) (1 diff)
• AddEmptyBoundaryAction.hpp (modified) (1 diff)
• BoundInBoxAction.cpp (modified) (1 diff)
• BoundInBoxAction.hpp (modified) (1 diff)
• CenterInBoxAction.cpp (modified) (1 diff)
• CenterInBoxAction.hpp (modified) (1 diff)
• CenterOnEdgeAction.cpp (modified) (1 diff)
• CenterOnEdgeAction.hpp (modified) (1 diff)
• ChangeBoxAction.cpp (modified) (1 diff)
• ChangeBoxAction.hpp (modified) (1 diff)
• InputAction.cpp (modified) (1 diff)
• InputAction.hpp (modified) (1 diff)
• OutputAction.cpp (modified) (1 diff)
• OutputAction.hpp (modified) (1 diff)
• RemoveSphereOfAtomsAction.cpp (modified) (1 diff)
• RemoveSphereOfAtomsAction.hpp (modified) (1 diff)
• RepeatBoxAction.cpp (modified) (1 diff)
• RepeatBoxAction.hpp (modified) (1 diff)
• ScaleBoxAction.cpp (modified) (1 diff)
• ScaleBoxAction.hpp (modified) (1 diff)
• SetDefaultNameAction.cpp (modified) (1 diff)
• SetDefaultNameAction.hpp (modified) (1 diff)
• SetGaussianBasisAction.cpp (modified) (1 diff)
• SetGaussianBasisAction.hpp (modified) (1 diff)
• SetOutputFormatsAction.cpp (modified) (1 diff)
• SetOutputFormatsAction.hpp (modified) (1 diff)

src/Actions/WorldAction/AddEmptyBoundaryAction.cpp

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

src/Actions/WorldAction/AddEmptyBoundaryAction.hpp

@@ -25 +25 @@
 
   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/WorldAction/BoundInBoxAction.cpp

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

src/Actions/WorldAction/BoundInBoxAction.hpp

@@ -24 +24 @@
 
   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/WorldAction/CenterInBoxAction.cpp

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

src/Actions/WorldAction/CenterInBoxAction.hpp

@@ -25 +25 @@
 
   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/WorldAction/CenterOnEdgeAction.cpp

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

src/Actions/WorldAction/CenterOnEdgeAction.hpp

@@ -24 +24 @@
 
   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/WorldAction/ChangeBoxAction.cpp

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

src/Actions/WorldAction/ChangeBoxAction.hpp

@@ -25 +25 @@
 
   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/WorldAction/InputAction.cpp

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

src/Actions/WorldAction/InputAction.hpp

@@ -24 +24 @@
 
   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/WorldAction/OutputAction.cpp

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

src/Actions/WorldAction/OutputAction.hpp

@@ -24 +24 @@
 
   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/WorldAction/RemoveSphereOfAtomsAction.cpp

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

src/Actions/WorldAction/RemoveSphereOfAtomsAction.hpp

@@ -26 +26 @@
 
   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/WorldAction/RepeatBoxAction.cpp

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

src/Actions/WorldAction/RepeatBoxAction.hpp

@@ -25 +25 @@
 
   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/WorldAction/ScaleBoxAction.cpp

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

src/Actions/WorldAction/ScaleBoxAction.hpp

@@ -25 +25 @@
 
   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/WorldAction/SetDefaultNameAction.cpp

@@ -48 +48 @@
 };
 
-Dialog* WorldSetDefaultNameAction::createDialog() {
-  Dialog *dialog = UIFactory::getInstance().makeDialog();
+Dialog* WorldSetDefaultNameAction::fillDialog(Dialog *dialog) {
+  ASSERT(dialog,"No Dialog given when filling action dialog");
 
   string defaultname = World::getInstance().getDefaultName();

src/Actions/WorldAction/SetDefaultNameAction.hpp

@@ -24 +24 @@
 
   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/WorldAction/SetGaussianBasisAction.cpp

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

src/Actions/WorldAction/SetGaussianBasisAction.hpp

@@ -24 +24 @@
 
   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/WorldAction/SetOutputFormatsAction.cpp

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

src/Actions/WorldAction/SetOutputFormatsAction.hpp

@@ -26 +26 @@
 
   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);