Changeset 047878 for src/Actions/SelectionAction

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/SelectionAction

Files:

• AllAtomsAction.cpp (modified) (1 diff)
• AllAtomsAction.hpp (modified) (1 diff)
• AllMoleculesAction.cpp (modified) (1 diff)
• AllMoleculesAction.hpp (modified) (1 diff)
• AtomByIdAction.cpp (modified) (1 diff)
• AtomByIdAction.hpp (modified) (1 diff)
• MoleculeByIdAction.cpp (modified) (1 diff)
• MoleculeByIdAction.hpp (modified) (1 diff)
• NotAllAtomsAction.cpp (modified) (1 diff)
• NotAllAtomsAction.hpp (modified) (1 diff)
• NotAllMoleculesAction.cpp (modified) (1 diff)
• NotAllMoleculesAction.hpp (modified) (1 diff)
• NotAtomByIdAction.cpp (modified) (1 diff)
• NotAtomByIdAction.hpp (modified) (1 diff)
• NotMoleculeByIdAction.cpp (modified) (1 diff)
• NotMoleculeByIdAction.hpp (modified) (1 diff)

src/Actions/SelectionAction/AllAtomsAction.cpp

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

src/Actions/SelectionAction/AllAtomsAction.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/SelectionAction/AllMoleculesAction.cpp

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

src/Actions/SelectionAction/AllMoleculesAction.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/SelectionAction/AtomByIdAction.cpp

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

src/Actions/SelectionAction/AtomByIdAction.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/SelectionAction/MoleculeByIdAction.cpp

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

src/Actions/SelectionAction/MoleculeByIdAction.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/SelectionAction/NotAllAtomsAction.cpp

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

src/Actions/SelectionAction/NotAllAtomsAction.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/SelectionAction/NotAllMoleculesAction.cpp

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

src/Actions/SelectionAction/NotAllMoleculesAction.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/SelectionAction/NotAtomByIdAction.cpp

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

src/Actions/SelectionAction/NotAtomByIdAction.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/SelectionAction/NotMoleculeByIdAction.cpp

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

src/Actions/SelectionAction/NotMoleculeByIdAction.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);