Changeset 82b71a


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

Location:
src
Files:
8 edited

Legend:

Unmodified
Added
Removed
  • src/Makefile.am

    rfdd840 r82b71a  
    4444MENUHEADER = Menu/Menu.hpp Menu/TextMenu.hpp Menu/MenuItem.hpp Menu/SubMenuItem.hpp Menu/ActionMenuItem.hpp Menu/SeperatorItem.hpp Menu/DisplayMenuItem.hpp
    4545
    46 UISOURCE = ${MENUACTIONSSOURCE} ${VIEWSOURCE} ${MENUSOURCE} UIElements/TextUIFactory.cpp UIElements/MainWindow.cpp UIElements/TextWindow.cpp UIElements/Dialog.cpp UIElements/TextDialog.cpp UIElements/TextStatusIndicator.cpp
    47 UIHEADER = ${MENUACTIONSHEADER} ${VIEWHEADER} ${MENUHEADER} UIElements/TextUIFactory.hpp UIElements/MainWindow.hpp UIElements/TextWindow.hpp UIElements/Dialog.hpp UIElements/TextDialog.hpp UIElements/TextStatusIndicator.hpp
    48 
    49 FACTORYSOURCE = UIElements/UIFactory.cpp
    50 FACTORYHEADER = UIElements/UIFactory.hpp
     46UISOURCE = ${MENUACTIONSSOURCE} ${VIEWSOURCE} ${MENUSOURCE} UIElements/UIFactory.cpp UIElements/TextUIFactory.cpp UIElements/MainWindow.cpp UIElements/TextWindow.cpp UIElements/Dialog.cpp UIElements/TextDialog.cpp UIElements/TextStatusIndicator.cpp
     47UIHEADER = ${MENUACTIONSHEADER} ${VIEWHEADER} ${MENUHEADER} UIElements/UIFactory.hpp UIElements/TextUIFactory.hpp UIElements/MainWindow.hpp UIElements/TextWindow.hpp UIElements/Dialog.hpp UIElements/TextDialog.hpp UIElements/TextStatusIndicator.hpp
    5148
    5249# all these files are only used for legacy reasons while the transition is in progress
     
    10097
    10198QTUI_DEFS =
    102 
    103 #SOURCE = ${ANALYSISSOURCE} ${ATOMSOURCE} ${PATTERNSOURCE}  ${DESCRIPTORSOURCE}  bond.cpp bondgraph.cpp boundary.cpp config.cpp element.cpp ellipsoid.cpp errorlogger.cpp graph.cpp helpers.cpp info.cpp leastsquaremin.cpp linkedcell.cpp lists.cpp log.cpp logger.cpp memoryusageobserver.cpp moleculelist.cpp molecule.cpp molecule_dynamics.cpp molecule_fragmentation.cpp molecule_geometry.cpp molecule_graph.cpp molecule_pointcloud.cpp parser.cpp periodentafel.cpp tesselation.cpp tesselationhelpers.cpp vector.cpp verbose.cpp World.cpp WorldIterators.cpp
    104 #HEADER = ${ANALYSISHEADER} ${ATOMHEADER} ${PATTERNHEADER} ${ACTIONSHEADER} ${DESCRIPTORHEADER} ${LEGACYHEADER} bond.hpp bondgraph.hpp boundary.hpp config.hpp defs.hpp element.hpp ellipsoid.hpp errorlogger.hpp graph.hpp helpers.hpp info.hpp leastsquaremin.hpp linkedcell.hpp lists.hpp log.hpp logger.hpp memoryallocator.hpp memoryusageobserver.hpp molecule.hpp molecule_template.hpp parser.hpp periodentafel.hpp stackclass.hpp tesselation.hpp tesselationhelpers.hpp vector.hpp verbose.hpp World.hpp
    10599
    106100SOURCE = ${ANALYSISSOURCE} \
     
    195189#molecuilder_CXXFLAGS += -DNO_CACHING
    196190molecuilder_LDFLAGS = $(BOOST_LIB)
    197 molecuilder_SOURCES = ${FACTORYSOURCE} ${LEGACYSOURCE} builder.cpp
     191molecuilder_SOURCES = ${LEGACYSOURCE} builder.cpp
    198192molecuilder_SOURCES += $(srcdir)/version.c
    199193molecuilder_LDADD = libmolecuilder.a libgslwrapper.a libmenu.a ${BOOST_THREAD_LIB}
    200194
    201195#Stuff for building the GUI using QT
    202 molecuildergui_SOURCES = ${QTUISOURCE} ${FACTORYSOURCE} ${LEGACYSOURCE} builder.cpp
     196molecuildergui_SOURCES = ${QTUISOURCE} ${LEGACYSOURCE} builder.cpp
    203197molecuildergui_SOURCES += $(srcdir)/version.c
    204198molecuildergui_CXXFLAGS = ${QT_CXXFLAGS} ${GLU_CXXFLAGS} -DUSE_GUI_QT
  • src/UIElements/QT4/QTUIFactory.cpp

    rfdd840 r82b71a  
    4343  return new QTMainWindow(populaters,molecules,configuration,periode,ConfigFileName,app);
    4444}
     45
     46QTUIFactory::description::description() :
     47    UIFactory::factoryDescription("QT4")
     48{}
     49
     50QTUIFactory::description::~description()
     51{}
     52
     53UIFactory* QTUIFactory::description::makeFactory(){
     54  return new QTUIFactory();
     55}
  • src/UIElements/QT4/QTUIFactory.hpp

    rfdd840 r82b71a  
    2323  virtual MainWindow* makeMainWindow(menuPopulaters,MoleculeListClass *, config *, periodentafel *, char *);
    2424
     25  struct description : public UIFactory::factoryDescription {
     26    description();
     27    virtual ~description();
     28
     29    virtual UIFactory* makeFactory();
     30  };
     31
    2532protected:
    2633  QTUIFactory();
  • src/UIElements/TextUIFactory.cpp

    rfdd840 r82b71a  
    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

    rfdd840 r82b71a  
    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

    rfdd840 r82b71a  
    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"
    15 #ifdef USE_GUI_QT
    16 #include "UIElements/QT4/QTUIFactory.hpp"
    17 #endif
     14using namespace std;
     15
     16std::map<std::string,boost::shared_ptr<UIFactory::factoryDescription> > UIFactory::factories;
    1817
    1918UIFactory::UIFactory()
    20 {
    21   // TODO Auto-generated constructor stub
     19{}
    2220
     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());
    2328}
    2429
    25 UIFactory::~UIFactory()
    26 {
    27   // TODO Auto-generated destructor stub
    28 }
    29 
    30 void UIFactory::makeUserInterface(InterfaceTypes type) {
    31   switch(type) {
    32     case Text :
    33       setInstance(new TextUIFactory());
    34       break;
    35 #ifdef USE_GUI_QT
    36     case QT4 :
    37       setInstance(new QTUIFactory());
    38       break;
    39 #endif
    40     default:
    41       assert(0 && "No such Factory in stock");
    42       break;
    43   }
     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)));
    4434}
    4535
    4636CONSTRUCT_SINGLETON(UIFactory)
     37
     38UIFactory::factoryDescription::factoryDescription(string _name) :
     39  name(_name)
     40{}
     41
     42UIFactory::factoryDescription::~factoryDescription()
     43{}
  • 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
  • src/builder.cpp

    rfdd840 r82b71a  
    7070#include "periodentafel.hpp"
    7171#include "UIElements/UIFactory.hpp"
     72#include "UIElements/TextUIFactory.hpp"
     73#ifdef USE_GUI_QT
     74#include "UIElements/QT4/QTUIFactory.hpp"
     75#endif
    7276#include "UIElements/MainWindow.hpp"
    7377#include "UIElements/Dialog.hpp"
     
    22262230      populaters.MakeEditMoleculesMenu = populateEditMoleculesMenu;
    22272231
     2232      UIFactory::registerFactory(new TextUIFactory::description());
    22282233#ifdef USE_GUI_QT
    2229       UIFactory::makeUserInterface(UIFactory::QT4);
     2234      UIFactory::registerFactory(new QTUIFactory::description());
     2235      UIFactory::makeUserInterface("QT4");
    22302236#else
    22312237      cout << ESPACKVersion << endl;
    2232       UIFactory::makeUserInterface(UIFactory::Text);
     2238      UIFactory::makeUserInterface("Text");
    22332239#endif
     2240
     2241
    22342242      MainWindow *mainWindow = UIFactory::getInstance().makeMainWindow(populaters,World::getInstance().getMolecules(), configuration, World::getInstance().getPeriode(), ConfigFileName);
    22352243      mainWindow->display();
Note: See TracChangeset for help on using the changeset viewer.