Changeset cc04b7 for src/UIElements

Timestamp:

Jan 7, 2010, 2:46:34 PM (16 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:

12b845

Parents:

a56275

Message:

Added a central registry that allows access to actions by name.

Location:

src/UIElements

Files:

• TextUIFactory.cpp (modified) (2 diffs)
• TextUIFactory.hpp (modified) (1 diff)
• TextWindow.cpp (modified) (2 diffs)
• UIFactory.cpp (modified) (2 diffs)
• UIFactory.hpp (modified) (3 diffs)

src/UIElements/TextUIFactory.cpp

@@ -7 +7 @@
 
 #include "UIElements/TextUIFactory.hpp"
+#include "UIElements/TextWindow.hpp"
 #include "UIElements/TextDialog.hpp"
+
 
 TextUIFactory::TextUIFactory()
@@ -25 +27 @@
 }
 
+MainWindow* TextUIFactory::makeMainWindow() {
+  return new TextWindow();
+}
 

src/UIElements/TextUIFactory.hpp

@@ -19 +19 @@
 
   virtual Dialog* makeDialog();
+  virtual MainWindow* makeMainWindow();
 
 protected:

src/UIElements/TextWindow.cpp

@@ -8 +8 @@
 #include "UIElements/TextWindow.hpp"
 #include "../menu.hpp"
+
+#include <iostream>
+
+using namespace std;
 
 TextWindow::TextWindow()
@@ -21 +25 @@
 
 void TextWindow::display(MoleculeListClass *molecules, config *configuration, periodentafel *periode, char *ConfigFileName) {
+  cout << "creating main window" <<endl;
   oldmenu *main_menu;
   main_menu = new oldmenu;

src/UIElements/UIFactory.cpp

@@ -12 +12 @@
 // all factories that can be used:
 #include "UIElements/TextUIFactory.hpp"
+
+UIFactory *UIFactory::theFactory = 0;
 
 UIFactory::UIFactory()
@@ -41 +43 @@
   return theFactory;
 }
+
+
+void UIFactory::purgeInstance(){
+  if(theFactory) {
+    delete theFactory;
+    theFactory = 0;
+  }
+}

src/UIElements/UIFactory.hpp

@@ -9 +9 @@
 #define UIFACTORY_HPP_
 
+class MainWindow;
 class Dialog;
 
@@ -14 +15 @@
 {
 
+public:
   enum InterfaceTypes {Text};
-public:
   virtual ~UIFactory();
 
   // methods for creating UIElements
+  virtual MainWindow* makeMainWindow()=0;
   virtual Dialog* makeDialog()=0;
 
@@ -25 +27 @@
 
 // singleton stuff
+private:
+  static UIFactory *theFactory;
+
 public:
   static void makeUserInterface(InterfaceTypes type);
   static UIFactory* get();
-
-private:
-  static UIFactory *theFactory;
+  static void purgeInstance();
 };