Changeset 9cf88c


Ignore:
Timestamp:
Apr 9, 2010, 12:15:58 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:
190326, 82b71a
Parents:
f9352d
Message:

Changed UIFactory to use injector pattern to let it know about existing factories.

Location:
src
Files:
5 edited

Legend:

Unmodified
Added
Removed
  • src/UIElements/TextUIFactory.cpp

    rf9352d r9cf88c  
    1212
    1313TextUIFactory::TextUIFactory()
    14 {
    15   // TODO Auto-generated constructor stub
    16 
    17 }
     14{}
    1815
    1916TextUIFactory::~TextUIFactory()
    20 {
    21   // TODO Auto-generated destructor stub
    22 }
     17{}
    2318
    2419
     
    3126}
    3227
     28TextUIFactory::description::description() :
     29    UIFactory::factoryDescription("Text")
     30{}
     31
     32TextUIFactory::description::~description()
     33{}
     34
     35UIFactory* TextUIFactory::description::makeFactory(){
     36  return new TextUIFactory();
     37}
     38
  • src/UIElements/TextUIFactory.hpp

    rf9352d r9cf88c  
    2121  virtual MainWindow* makeMainWindow(menuPopulaters,MoleculeListClass *, config *, periodentafel *, char *);
    2222
     23  struct description : public UIFactory::factoryDescription {
     24    description();
     25    virtual ~description();
     26
     27    virtual UIFactory* makeFactory();
     28  };
     29
    2330protected:
    2431  TextUIFactory();
  • src/UIElements/UIFactory.cpp

    rf9352d r9cf88c  
    77
    88
    9 #include <cassert>
     9#include <utility>
    1010#include "Patterns/Singleton_impl.hpp"
    1111#include "UIElements/UIFactory.hpp"
     12#include "Helpers/Assert.hpp"
    1213
    13 // all factories that can be used:
    14 #include "UIElements/TextUIFactory.hpp"
     14using namespace std;
     15
     16std::map<std::string,boost::shared_ptr<UIFactory::factoryDescription> > UIFactory::factories;
    1517
    1618UIFactory::UIFactory()
    17 {
    18   // TODO Auto-generated constructor stub
     19{}
    1920
     21UIFactory::~UIFactory()
     22{}
     23
     24void UIFactory::makeUserInterface(std::string type) {
     25  ASSERT(factories.count(type),"Selected factory was not registered before creation.");
     26  // call the factory factory
     27  setInstance(factories[type]->makeFactory());
    2028}
    2129
    22 UIFactory::~UIFactory()
    23 {
    24   // TODO Auto-generated destructor stub
    25 }
    26 
    27 void UIFactory::makeUserInterface(InterfaceTypes type) {
    28   switch(type) {
    29     case Text :
    30       setInstance(new TextUIFactory());
    31       break;
    32 
    33     default:
    34       assert(0 && "No such Factory in stock");
    35       break;
    36   }
     30void UIFactory::registerFactory(factoryDescription *factoryDesc) {
     31  ASSERT(!factories.count(factoryDesc->name),"Trying to re-register an already registered factory.");
     32  factories.insert(make_pair(factoryDesc->name,
     33                             boost::shared_ptr<factoryDescription>(factoryDesc)));
    3734}
    3835
    3936CONSTRUCT_SINGLETON(UIFactory)
     37
     38UIFactory::factoryDescription::factoryDescription(string _name) :
     39  name(_name)
     40{}
     41
     42UIFactory::factoryDescription::~factoryDescription()
     43{}
  • src/UIElements/UIFactory.hpp

    rf9352d r9cf88c  
    2020#include "Patterns/Singleton.hpp"
    2121
     22#include <string>
     23#include <map>
     24#include <boost/smart_ptr.hpp>
     25
    2226/**
    2327 * Abstract Factory to create any kind of User interface object needed by the programm.
     
    2933class UIFactory : public Singleton<UIFactory,false>
    3034{
    31 
     35  friend class Singleton<UIFactory,false>;
    3236public:
    33   enum InterfaceTypes {Text};
    34   virtual ~UIFactory();
    35 
    3637  /**
    3738   * Produce some kind of main window, of whichever type was chosen when the factory was created
     
    4748protected:
    4849  UIFactory();
     50  virtual ~UIFactory();
    4951
    5052public:
     53  struct factoryDescription {
     54    factoryDescription(std::string _name);
     55    virtual ~factoryDescription();
     56
     57    const std::string name;
     58    // yes this method really is a factory factory, to allow insertion of
     59    // arbitrary factories
     60    virtual UIFactory* makeFactory()=0;
     61  };
    5162  /**
    5263   * create a Factory of a certain type. From that moment on only those UIElements can be produced by the factory
    5364   */
    54   static void makeUserInterface(InterfaceTypes type);
    55 
     65  static void makeUserInterface(std::string type);
     66  static void registerFactory(factoryDescription *factoryDesc);
     67protected:
     68private:
     69  static std::map<std::string,boost::shared_ptr<factoryDescription> > factories;
    5670};
    5771
  • src/builder.cpp

    rf9352d r9cf88c  
    7070#include "periodentafel.hpp"
    7171#include "UIElements/UIFactory.hpp"
     72#include "UIElements/TextUIFactory.hpp"
    7273#include "UIElements/MainWindow.hpp"
    7374#include "UIElements/Dialog.hpp"
     
    22282229      populaters.MakeEditMoleculesMenu = populateEditMoleculesMenu;
    22292230
    2230       UIFactory::makeUserInterface(UIFactory::Text);
     2231      UIFactory::registerFactory(new TextUIFactory::description());
     2232      UIFactory::makeUserInterface("Text");
    22312233      MainWindow *mainWindow = UIFactory::getInstance().makeMainWindow(populaters,World::getInstance().getMolecules(), configuration, World::getInstance().getPeriode(), ConfigFileName);
    22322234      mainWindow->display();
Note: See TracChangeset for help on using the changeset viewer.