Ignore:
Timestamp:
Apr 9, 2010, 12:40:27 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:
67c75b
Parents:
fdd840 (diff), 9cf88c (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.
git-author:
Tillmann Crueger <crueger@…> (04/09/10 12:32:59)
git-committer:
Tillmann Crueger <crueger@…> (04/09/10 12:40:27)
Message:

Merge branch 'MenuRefactoring' into QT4Refactoring

Conflicts:

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

File:
1 edited

Legend:

Unmodified
Added
Removed
  • src/UIElements/UIFactory.hpp

    rfdd840 r82b71a  
    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 {
    34     Text,
    35 #ifdef USE_GUI_QT
    36     QT4
    37 #endif
    38 };
    39   virtual ~UIFactory();
    4037
    4138  /**
     
    5249protected:
    5350  UIFactory();
     51  virtual ~UIFactory();
    5452
    5553public:
     54  struct factoryDescription {
     55    factoryDescription(std::string _name);
     56    virtual ~factoryDescription();
     57
     58    const std::string name;
     59    // yes this method really is a factory factory, to allow insertion of
     60    // arbitrary factories
     61    virtual UIFactory* makeFactory()=0;
     62  };
    5663  /**
    5764   * create a Factory of a certain type. From that moment on only those UIElements can be produced by the factory
    5865   */
    59   static void makeUserInterface(InterfaceTypes type);
    60 
     66  static void makeUserInterface(std::string type);
     67  static void registerFactory(factoryDescription *factoryDesc);
     68protected:
     69private:
     70  static std::map<std::string,boost::shared_ptr<factoryDescription> > factories;
    6171};
    6272
Note: See TracChangeset for help on using the changeset viewer.