Changeset d7940e

Timestamp:

Mar 11, 2010, 10:37:32 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:

d25863

Parents:

23b547

Message:

Made the UIFactory an instance of the Singleton Pattern

Location:

src

Files:

• Actions/small_actions.cpp (modified) (1 diff)
• Legacy/oldmenu.cpp (modified) (2 diffs)
• Patterns/Singleton.hpp (modified) (1 diff)
• Patterns/Singleton_impl.hpp (modified) (1 diff)
• UIElements/UIFactory.cpp (modified) (3 diffs)
• UIElements/UIFactory.hpp (modified) (4 diffs)
• builder.cpp (modified) (1 diff)

src/Actions/small_actions.cpp

@@ -27 +27 @@
   string filename;
   molecule *mol = NULL;
-  Dialog *dialog = UIFactory::get()->makeDialog();
+  Dialog *dialog = UIFactory::getInstance().makeDialog();
 
   dialog->queryMolecule("Enter index of molecule: ",&mol,molecules);

src/Legacy/oldmenu.cpp

@@ -912 +912 @@
 void oldmenu::SimpleAddMolecules(MoleculeListClass *molecules) {
   molecule *srcmol = NULL, *destmol = NULL;
-  Dialog *dialog = UIFactory::get()->makeDialog();
+  Dialog *dialog = UIFactory::getInstance().makeDialog();
   dialog->queryMolecule("Enter index of destination molecule: ",&destmol, molecules);
   dialog->queryMolecule("Enter index of source molecule to add from: ",&srcmol, molecules);
@@ -926 +926 @@
 void oldmenu::embeddMolecules(MoleculeListClass *molecules) {
   molecule *srcmol = NULL, *destmol = NULL;
-  Dialog *dialog = UIFactory::get()->makeDialog();
+  Dialog *dialog = UIFactory::getInstance().makeDialog();
   dialog->queryMolecule("Enter index of matrix molecule (the variable one): ",&srcmol,molecules);
   dialog->queryMolecule("Enter index of molecule to merge into (the fixed one): ",&destmol,molecules);

src/Patterns/Singleton.hpp

@@ -9 +9 @@
 #define SINGLETON_HPP_
 
-#include <memory>
+#include <cassert>
+#include <boost/thread.hpp>
 
 #include "defs.hpp"

src/Patterns/Singleton_impl.hpp

@@ -9 +9 @@
 #define SINGLETON_IMPL_HPP_
 
-#include <cassert>
+#include "Patterns/Singleton.hpp"
 
 template <class T,bool _may_create>

src/UIElements/UIFactory.cpp

@@ -8 +8 @@
 
 #include <cassert>
+#include "Patterns/Singleton_impl.hpp"
 #include "UIElements/UIFactory.hpp"
 
 // all factories that can be used:
 #include "UIElements/TextUIFactory.hpp"
-
-UIFactory *UIFactory::theFactory = 0;
 
 UIFactory::UIFactory()
@@ -27 +26 @@
 
 void UIFactory::makeUserInterface(InterfaceTypes type) {
-  assert(theFactory == 0 && "makeUserInterface should only be called once");
   switch(type) {
     case Text :
-      theFactory = new TextUIFactory();
+      setInstance(new TextUIFactory());
       break;
 
@@ -39 +37 @@
 }
 
-UIFactory* UIFactory::get(){
-  assert(theFactory != 0 && "No UserInterface created prior to factory access");
-  return theFactory;
-}
-
-
-void UIFactory::purgeInstance(){
-  if(theFactory) {
-    delete theFactory;
-    theFactory = 0;
-  }
-}
+CONSTRUCT_SINGLETON(UIFactory)

src/UIElements/UIFactory.hpp

@@ -17 +17 @@
 
 struct menuPopulaters;
+
+#include "Patterns/Singleton.hpp"
+
 /**
  * Abstract Factory to create any kind of User interface object needed by the programm.
@@ -24 +27 @@
  * UIs can be handled in a concise abstract way.
  */
-class UIFactory
+class UIFactory : public Singleton<UIFactory,false>
 {
 
@@ -45 +48 @@
   UIFactory();
 
-// singleton stuff
-private:
-  static UIFactory *theFactory;
-
 public:
   /**
@@ -55 +54 @@
   static void makeUserInterface(InterfaceTypes type);
 
-  /**
-   * get the previously created factory
-   */
-  static UIFactory* get();
-
-  /**
-   * Destroy the created factory.
-   *
-   * Make sure that all UIElements that were created by the factory are destroyed before calling this method.
-   */
-  static void purgeInstance();
 };
 

src/builder.cpp

@@ -2225 +2225 @@
 
       UIFactory::makeUserInterface(UIFactory::Text);
-      MainWindow *mainWindow = UIFactory::get()->makeMainWindow(populaters,World::getInstance().getMolecules(), configuration, World::getInstance().getPeriode(), ConfigFileName);
+      MainWindow *mainWindow = UIFactory::getInstance().makeMainWindow(populaters,World::getInstance().getMolecules(), configuration, World::getInstance().getPeriode(), ConfigFileName);
       mainWindow->display();
       delete mainWindow;