Changeset 5f5a7b for src/UIElements

Timestamp:

Jun 17, 2010, 12:56:48 PM (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:

1dc9ec, 257c77

Parents:

fc6053 (diff), 190326 (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 'MenuRefactoring' into stable

Conflicts:

molecuilder/src/UIElements/TextUIFactory.cpp
molecuilder/src/UIElements/UIFactory.cpp
molecuilder/src/UIElements/UIFactory.hpp
molecuilder/src/builder.cpp

Location:

src/UIElements

Files:

• CommandLineUI/CommandLineUIFactory.cpp (modified) (1 diff)
• CommandLineUI/CommandLineUIFactory.hpp (modified) (1 diff)
• TextUI/TextUIFactory.cpp (modified) (2 diffs)
• TextUI/TextUIFactory.hpp (modified) (1 diff)
• UIFactory.cpp (modified) (1 diff)
• UIFactory.hpp (modified) (3 diffs)

src/UIElements/CommandLineUI/CommandLineUIFactory.cpp

@@ -32 +32 @@
   return new CommandLineWindow();
 }
+
+CommandLineUIFactory::description::description() :
+    UIFactory::factoryDescription("CommandLine")
+{}
+
+CommandLineUIFactory::description::~description()
+{}
+
+UIFactory* CommandLineUIFactory::description::makeFactory(){
+  return new CommandLineUIFactory();
+}

src/UIElements/CommandLineUI/CommandLineUIFactory.hpp

@@ -21 +21 @@
   virtual MainWindow* makeMainWindow();
 
+  struct description : public UIFactory::factoryDescription {
+    description();
+    virtual ~description();
+
+    virtual UIFactory* makeFactory();
+  };
+
 protected:
   CommandLineUIFactory();

src/UIElements/TextUI/TextUIFactory.cpp

@@ -6 +6 @@
  */
 
-#include "Helpers/MemDebug.hpp"
-
-#include "TextUI/TextUIFactory.hpp"
-#include "TextUI/TextWindow.hpp"
-#include "TextUI/TextDialog.hpp"
+#include "UIElements/TextUI/TextUIFactory.hpp"
+#include "UIElements/TextUI/TextWindow.hpp"
+#include "UIElements/TextUI/TextDialog.hpp"
 
 
 TextUIFactory::TextUIFactory()
-{
-  // TODO Auto-generated constructor stub
-
-}
+{}
 
 TextUIFactory::~TextUIFactory()
-{
-  // TODO Auto-generated destructor stub
-}
+{}
 
 
@@ -33 +26 @@
 }
 
+TextUIFactory::description::description() :
+    UIFactory::factoryDescription("Text")
+{}
+
+TextUIFactory::description::~description()
+{}
+
+UIFactory* TextUIFactory::description::makeFactory(){
+  return new TextUIFactory();
+}
+

src/UIElements/TextUI/TextUIFactory.hpp

@@ -21 +21 @@
   virtual MainWindow* makeMainWindow();
 
+  struct description : public UIFactory::factoryDescription {
+    description();
+    virtual ~description();
+
+    virtual UIFactory* makeFactory();
+  };
+
 protected:
   TextUIFactory();

src/UIElements/UIFactory.cpp

@@ -8 +8 @@
 #include "Helpers/MemDebug.hpp"
 
-#include <cassert>
+#include <utility>
 #include "Patterns/Singleton_impl.hpp"
-#include "UIFactory.hpp"
+#include "UIElements/UIFactory.hpp"
+#include "Helpers/Assert.hpp"
 
-// all factories that can be used:
-#include "TextUI/TextUIFactory.hpp"
-#include "CommandLineUI/CommandLineUIFactory.hpp"
+using namespace std;
+
+std::map<std::string,boost::shared_ptr<UIFactory::factoryDescription> > UIFactory::factories;
 
 UIFactory::UIFactory()
-{
-  // TODO Auto-generated constructor stub
+{}
 
+UIFactory::~UIFactory()
+{}
+
+void UIFactory::makeUserInterface(std::string type) {
+  ASSERT(factories.count(type),"Selected factory was not registered before creation.");
+  // call the factory factory
+  setInstance(factories[type]->makeFactory());
 }
 
-UIFactory::~UIFactory()
-{
-  // TODO Auto-generated destructor stub
-}
-
-void UIFactory::makeUserInterface(InterfaceTypes type) {
-  switch(type) {
-    case Text :
-      setInstance(new TextUIFactory());
-      break;
-    case CommandLine:
-      setInstance(new CommandLineUIFactory());
-      break;
-
-    default:
-      assert(0 && "No such Factory in stock");
-      break;
-  }
+void UIFactory::registerFactory(factoryDescription *factoryDesc) {
+  ASSERT(!factories.count(factoryDesc->name),"Trying to re-register an already registered factory.");
+  factories.insert(make_pair(factoryDesc->name,
+                             boost::shared_ptr<factoryDescription>(factoryDesc)));
 }
 
 CONSTRUCT_SINGLETON(UIFactory)
+
+UIFactory::factoryDescription::factoryDescription(string _name) :
+  name(_name)
+{}
+
+UIFactory::factoryDescription::~factoryDescription()
+{}

src/UIElements/UIFactory.hpp

@@ -15 +15 @@
 #include "Patterns/Singleton.hpp"
 
+#include <string>
+#include <map>
+#include <boost/smart_ptr.hpp>
+
 /**
  * Abstract Factory to create any kind of User interface object needed by the programm.
@@ -24 +28 @@
 class UIFactory : public Singleton<UIFactory,false>
 {
-
+  friend class Singleton<UIFactory,false>;
 public:
-  enum InterfaceTypes {Text, CommandLine};
-  virtual ~UIFactory();
-
   /**
    * Produce some kind of main window, of whichever type was chosen when the factory was created
@@ -42 +43 @@
 protected:
   UIFactory();
+  virtual ~UIFactory();
 
 public:
+  struct factoryDescription {
+    factoryDescription(std::string _name);
+    virtual ~factoryDescription();
+
+    const std::string name;
+    // yes this method really is a factory factory, to allow insertion of
+    // arbitrary factories
+    virtual UIFactory* makeFactory()=0;
+  };
   /**
    * create a Factory of a certain type. From that moment on only those UIElements can be produced by the factory
    */
-  static void makeUserInterface(InterfaceTypes type);
-
+  static void makeUserInterface(std::string type);
+  static void registerFactory(factoryDescription *factoryDesc);
+protected:
+private:
+  static std::map<std::string,boost::shared_ptr<factoryDescription> > factories;
 };