Changeset 4a75d9 for src/UIElements

Timestamp:

May 8, 2010, 8:14:04 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:

8e1f7af

Parents:

ecb799

Message:

...UIFactory::makeMainWindow() now has only a single parameter, namely menuPopulaters.

• as molecules and periodentafel can be accessed globally from singleton World, there is no need to pass these around anymore.
• typedef MenuMaker and populateEditMoleculesMenu() equally stripped.

Location:

src/UIElements

Files:

• CommandLineUIFactory.cpp (modified) (1 diff)
• CommandLineUIFactory.hpp (modified) (1 diff)
• CommandLineWindow.cpp (modified) (1 diff)
• CommandLineWindow.hpp (modified) (1 diff)
• MainWindow.hpp (modified) (1 diff)
• TextUIFactory.cpp (modified) (1 diff)
• TextUIFactory.hpp (modified) (1 diff)
• TextWindow.cpp (modified) (3 diffs)
• TextWindow.hpp (modified) (1 diff)
• UIFactory.hpp (modified) (1 diff)

src/UIElements/CommandLineUIFactory.cpp

@@ -28 +28 @@
 }
 
-MainWindow* CommandLineUIFactory::makeMainWindow(menuPopulaters populaters,MoleculeListClass *molecules, config *configuration, periodentafel *periode, char *ConfigFileName) {
-  return new CommandLineWindow(populaters,molecules,configuration,periode,ConfigFileName);
+MainWindow* CommandLineUIFactory::makeMainWindow(menuPopulaters populaters) {
+  return new CommandLineWindow(populaters);
 }

src/UIElements/CommandLineUIFactory.hpp

@@ -19 +19 @@
 
   virtual Dialog* makeDialog();
-  virtual MainWindow* makeMainWindow(menuPopulaters,MoleculeListClass *, config *, periodentafel *, char *);
+  virtual MainWindow* makeMainWindow(menuPopulaters);
 
 protected:

src/UIElements/CommandLineWindow.cpp

@@ -16 +16 @@
 
 // TODO: see what code can be moved to a base class for Graphic and CommandLine Windows
-CommandLineWindow::CommandLineWindow(menuPopulaters populaters,MoleculeListClass *molecules, config *configuration, periodentafel *periode, char *ConfigFileName)
+CommandLineWindow::CommandLineWindow(menuPopulaters populaters)
 {
 

src/UIElements/CommandLineWindow.hpp

@@ -16 +16 @@
 {
 public:
-  CommandLineWindow(menuPopulaters,MoleculeListClass *, config *, periodentafel *, char *);
+  CommandLineWindow(menuPopulaters);
   virtual ~CommandLineWindow();
 

src/UIElements/MainWindow.hpp

@@ -28 +28 @@
  * The type of menuPopulators
  */
-typedef void (*MenuMaker)(Menu*,MoleculeListClass*, config*, periodentafel*);
+typedef void (*MenuMaker)(Menu*);
 
 /**

src/UIElements/TextUIFactory.cpp

@@ -27 +27 @@
 }
 
-MainWindow* TextUIFactory::makeMainWindow(menuPopulaters populaters,MoleculeListClass *molecules, config *configuration, periodentafel *periode, char *ConfigFileName) {
-  return new TextWindow(populaters,molecules,configuration,periode,ConfigFileName);
+MainWindow* TextUIFactory::makeMainWindow(menuPopulaters populaters) {
+  return new TextWindow(populaters);
 }
 

src/UIElements/TextUIFactory.hpp

@@ -19 +19 @@
 
   virtual Dialog* makeDialog();
-  virtual MainWindow* makeMainWindow(menuPopulaters,MoleculeListClass *, config *, periodentafel *, char *);
+  virtual MainWindow* makeMainWindow(menuPopulaters);
 
 protected:

src/UIElements/TextWindow.cpp

@@ -27 +27 @@
 #include "molecule.hpp"
 #include "periodentafel.hpp"
+#include "World.hpp"
 
 #include "Legacy/oldmenu.hpp"
@@ -48 +49 @@
 
 // TODO: see what code can be moved to a base class for Graphic and Text Windows
-TextWindow::TextWindow(menuPopulaters populaters,MoleculeListClass *molecules, config *configuration, periodentafel *periode, char *ConfigFileName)
+TextWindow::TextWindow(menuPopulaters populaters)
 {
+  MoleculeListClass *molecules = World::getInstance().getMolecules();
+  config *configuration = NULL;
+  periodentafel *periode = World::getInstance().getPeriode();
+  char *ConfigFileName = NULL;
   old_menu = new oldmenu;
 
@@ -101 +106 @@
   // call all functions used to build the submenus
 
-  populaters.MakeEditMoleculesMenu(editMoleculesMenu,molecules,configuration,periode);
+  populaters.MakeEditMoleculesMenu(editMoleculesMenu);
 
   Action *returnFromEditMoleculeAction = new TextMenu::LeaveAction(editMoleculesMenu);

src/UIElements/TextWindow.hpp

@@ -20 +20 @@
 {
 public:
-  TextWindow(menuPopulaters,MoleculeListClass *, config *, periodentafel *, char *);
+  TextWindow(menuPopulaters);
   virtual ~TextWindow();
 

src/UIElements/UIFactory.hpp

@@ -38 +38 @@
    * Produce some kind of main window, of whichever type was chosen when the factory was created
    */
-  virtual MainWindow* makeMainWindow(menuPopulaters,MoleculeListClass *, config *, periodentafel *, char *)=0;
+  virtual MainWindow* makeMainWindow(menuPopulaters)=0;
 
   /**