Changeset 82b71a
- Timestamp:
- Apr 9, 2010, 12:40:27 PM (15 years ago)
- 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)
- Location:
- src
- Files:
-
- 8 edited
Legend:
- Unmodified
- Added
- Removed
-
src/Makefile.am
rfdd840 r82b71a 44 44 MENUHEADER = Menu/Menu.hpp Menu/TextMenu.hpp Menu/MenuItem.hpp Menu/SubMenuItem.hpp Menu/ActionMenuItem.hpp Menu/SeperatorItem.hpp Menu/DisplayMenuItem.hpp 45 45 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 46 UISOURCE = ${MENUACTIONSSOURCE} ${VIEWSOURCE} ${MENUSOURCE} UIElements/UIFactory.cpp UIElements/TextUIFactory.cpp UIElements/MainWindow.cpp UIElements/TextWindow.cpp UIElements/Dialog.cpp UIElements/TextDialog.cpp UIElements/TextStatusIndicator.cpp 47 UIHEADER = ${MENUACTIONSHEADER} ${VIEWHEADER} ${MENUHEADER} UIElements/UIFactory.hpp UIElements/TextUIFactory.hpp UIElements/MainWindow.hpp UIElements/TextWindow.hpp UIElements/Dialog.hpp UIElements/TextDialog.hpp UIElements/TextStatusIndicator.hpp 51 48 52 49 # all these files are only used for legacy reasons while the transition is in progress … … 100 97 101 98 QTUI_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.cpp104 #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.hpp105 99 106 100 SOURCE = ${ANALYSISSOURCE} \ … … 195 189 #molecuilder_CXXFLAGS += -DNO_CACHING 196 190 molecuilder_LDFLAGS = $(BOOST_LIB) 197 molecuilder_SOURCES = ${ FACTORYSOURCE} ${LEGACYSOURCE} builder.cpp191 molecuilder_SOURCES = ${LEGACYSOURCE} builder.cpp 198 192 molecuilder_SOURCES += $(srcdir)/version.c 199 193 molecuilder_LDADD = libmolecuilder.a libgslwrapper.a libmenu.a ${BOOST_THREAD_LIB} 200 194 201 195 #Stuff for building the GUI using QT 202 molecuildergui_SOURCES = ${QTUISOURCE} ${ FACTORYSOURCE} ${LEGACYSOURCE} builder.cpp196 molecuildergui_SOURCES = ${QTUISOURCE} ${LEGACYSOURCE} builder.cpp 203 197 molecuildergui_SOURCES += $(srcdir)/version.c 204 198 molecuildergui_CXXFLAGS = ${QT_CXXFLAGS} ${GLU_CXXFLAGS} -DUSE_GUI_QT -
src/UIElements/QT4/QTUIFactory.cpp
rfdd840 r82b71a 43 43 return new QTMainWindow(populaters,molecules,configuration,periode,ConfigFileName,app); 44 44 } 45 46 QTUIFactory::description::description() : 47 UIFactory::factoryDescription("QT4") 48 {} 49 50 QTUIFactory::description::~description() 51 {} 52 53 UIFactory* QTUIFactory::description::makeFactory(){ 54 return new QTUIFactory(); 55 } -
src/UIElements/QT4/QTUIFactory.hpp
rfdd840 r82b71a 23 23 virtual MainWindow* makeMainWindow(menuPopulaters,MoleculeListClass *, config *, periodentafel *, char *); 24 24 25 struct description : public UIFactory::factoryDescription { 26 description(); 27 virtual ~description(); 28 29 virtual UIFactory* makeFactory(); 30 }; 31 25 32 protected: 26 33 QTUIFactory(); -
src/UIElements/TextUIFactory.cpp
rfdd840 r82b71a 12 12 13 13 TextUIFactory::TextUIFactory() 14 { 15 // TODO Auto-generated constructor stub 16 17 } 14 {} 18 15 19 16 TextUIFactory::~TextUIFactory() 20 { 21 // TODO Auto-generated destructor stub 22 } 17 {} 23 18 24 19 … … 31 26 } 32 27 28 TextUIFactory::description::description() : 29 UIFactory::factoryDescription("Text") 30 {} 31 32 TextUIFactory::description::~description() 33 {} 34 35 UIFactory* TextUIFactory::description::makeFactory(){ 36 return new TextUIFactory(); 37 } 38 -
src/UIElements/TextUIFactory.hpp
rfdd840 r82b71a 21 21 virtual MainWindow* makeMainWindow(menuPopulaters,MoleculeListClass *, config *, periodentafel *, char *); 22 22 23 struct description : public UIFactory::factoryDescription { 24 description(); 25 virtual ~description(); 26 27 virtual UIFactory* makeFactory(); 28 }; 29 23 30 protected: 24 31 TextUIFactory(); -
src/UIElements/UIFactory.cpp
rfdd840 r82b71a 7 7 8 8 9 #include < cassert>9 #include <utility> 10 10 #include "Patterns/Singleton_impl.hpp" 11 11 #include "UIElements/UIFactory.hpp" 12 #include "Helpers/Assert.hpp" 12 13 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 14 using namespace std; 15 16 std::map<std::string,boost::shared_ptr<UIFactory::factoryDescription> > UIFactory::factories; 18 17 19 18 UIFactory::UIFactory() 20 { 21 // TODO Auto-generated constructor stub 19 {} 22 20 21 UIFactory::~UIFactory() 22 {} 23 24 void 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()); 23 28 } 24 29 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 } 30 void 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))); 44 34 } 45 35 46 36 CONSTRUCT_SINGLETON(UIFactory) 37 38 UIFactory::factoryDescription::factoryDescription(string _name) : 39 name(_name) 40 {} 41 42 UIFactory::factoryDescription::~factoryDescription() 43 {} -
src/UIElements/UIFactory.hpp
rfdd840 r82b71a 20 20 #include "Patterns/Singleton.hpp" 21 21 22 #include <string> 23 #include <map> 24 #include <boost/smart_ptr.hpp> 25 22 26 /** 23 27 * Abstract Factory to create any kind of User interface object needed by the programm. … … 29 33 class UIFactory : public Singleton<UIFactory,false> 30 34 { 31 35 friend class Singleton<UIFactory,false>; 32 36 public: 33 enum InterfaceTypes {34 Text,35 #ifdef USE_GUI_QT36 QT437 #endif38 };39 virtual ~UIFactory();40 37 41 38 /** … … 52 49 protected: 53 50 UIFactory(); 51 virtual ~UIFactory(); 54 52 55 53 public: 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 }; 56 63 /** 57 64 * create a Factory of a certain type. From that moment on only those UIElements can be produced by the factory 58 65 */ 59 static void makeUserInterface(InterfaceTypes type); 60 66 static void makeUserInterface(std::string type); 67 static void registerFactory(factoryDescription *factoryDesc); 68 protected: 69 private: 70 static std::map<std::string,boost::shared_ptr<factoryDescription> > factories; 61 71 }; 62 72 -
src/builder.cpp
rfdd840 r82b71a 70 70 #include "periodentafel.hpp" 71 71 #include "UIElements/UIFactory.hpp" 72 #include "UIElements/TextUIFactory.hpp" 73 #ifdef USE_GUI_QT 74 #include "UIElements/QT4/QTUIFactory.hpp" 75 #endif 72 76 #include "UIElements/MainWindow.hpp" 73 77 #include "UIElements/Dialog.hpp" … … 2226 2230 populaters.MakeEditMoleculesMenu = populateEditMoleculesMenu; 2227 2231 2232 UIFactory::registerFactory(new TextUIFactory::description()); 2228 2233 #ifdef USE_GUI_QT 2229 UIFactory::makeUserInterface(UIFactory::QT4); 2234 UIFactory::registerFactory(new QTUIFactory::description()); 2235 UIFactory::makeUserInterface("QT4"); 2230 2236 #else 2231 2237 cout << ESPACKVersion << endl; 2232 UIFactory::makeUserInterface( UIFactory::Text);2238 UIFactory::makeUserInterface("Text"); 2233 2239 #endif 2240 2241 2234 2242 MainWindow *mainWindow = UIFactory::getInstance().makeMainWindow(populaters,World::getInstance().getMolecules(), configuration, World::getInstance().getPeriode(), ConfigFileName); 2235 2243 mainWindow->display();
Note:
See TracChangeset
for help on using the changeset viewer.