Changeset a881f5 for src/Actions/AnalysisAction

Timestamp:

Aug 5, 2010, 8:06:42 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:

6d587e

Parents:

5fbaeb (diff), f761c4 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'StructureRefactoring' into stable

Conflicts:

src/Actions/AnalysisAction/PairCorrelationAction.hpp
src/Actions/AnalysisAction/SurfaceCorrelationAction.hpp

• due to different ordering of vector, string includes

Location:

src/Actions/AnalysisAction

Files:

• MolecularVolumeAction.cpp (modified) (1 diff)
• MolecularVolumeAction.hpp (modified) (1 diff)
• PairCorrelationAction.cpp (modified) (1 diff)
• PairCorrelationAction.hpp (modified) (2 diffs)
• PointCorrelationAction.cpp (modified) (1 diff)
• PointCorrelationAction.hpp (modified) (1 diff)
• PrincipalAxisSystemAction.cpp (modified) (1 diff)
• PrincipalAxisSystemAction.hpp (modified) (1 diff)
• SurfaceCorrelationAction.cpp (modified) (1 diff)
• SurfaceCorrelationAction.hpp (modified) (2 diffs)

src/Actions/AnalysisAction/MolecularVolumeAction.cpp

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

src/Actions/AnalysisAction/MolecularVolumeAction.hpp

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

src/Actions/AnalysisAction/PairCorrelationAction.cpp

@@ -51 +51 @@
 
 
-Dialog* AnalysisPairCorrelationAction::createDialog() {
-  Dialog *dialog = UIFactory::getInstance().makeDialog();
+Dialog* AnalysisPairCorrelationAction::fillDialog(Dialog* dialog) {
+  ASSERT(dialog,"No Dialog given when filling action dialog");
 
   dialog->queryElements("elements", ValueStorage::getInstance().getDescription("elements"));

src/Actions/AnalysisAction/PairCorrelationAction.hpp

@@ -10 +10 @@
 
 #include "Actions/Action.hpp"
+#include <string>
 #include <vector>
-#include <string>
 
 class element;
@@ -27 +27 @@
 
   virtual const std::string getName();
-
+protected:
+  virtual Dialog * fillDialog(Dialog*);
 private:
-  virtual Dialog * createDialog();
-  virtual Action::state_ptr performCall();
+   virtual Action::state_ptr performCall();
   virtual Action::state_ptr performUndo(Action::state_ptr);
   virtual Action::state_ptr performRedo(Action::state_ptr);

src/Actions/AnalysisAction/PointCorrelationAction.cpp

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

src/Actions/AnalysisAction/PointCorrelationAction.hpp

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

src/Actions/AnalysisAction/PrincipalAxisSystemAction.cpp

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

src/Actions/AnalysisAction/PrincipalAxisSystemAction.hpp

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

src/Actions/AnalysisAction/SurfaceCorrelationAction.cpp

@@ -52 +52 @@
 
 
-Dialog* AnalysisSurfaceCorrelationAction::createDialog() {
-  Dialog *dialog = UIFactory::getInstance().makeDialog();
+Dialog* AnalysisSurfaceCorrelationAction::fillDialog(Dialog *dialog) {
+  ASSERT(dialog,"No Dialog given when filling action dialog");
 
   dialog->queryMolecule("molecule-by-id", ValueStorage::getInstance().getDescription("molecule-by-id"));

src/Actions/AnalysisAction/SurfaceCorrelationAction.hpp

@@ -10 +10 @@
 
 #include "Actions/Action.hpp"
+#include <string>
 #include <vector>
-#include <string>
 
 class element;
@@ -28 +28 @@
 
   virtual const std::string getName();
+protected:
+  virtual Dialog * fillDialog(Dialog*);
 private:
-  virtual Dialog * createDialog();
   virtual Action::state_ptr performCall();
   virtual Action::state_ptr performUndo(Action::state_ptr);