Changeset ea94a8

Timestamp:

Jan 14, 2010, 2:50:36 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:

8f67e2

Parents:

3027f8

Message:

Added a UIFactory for construction of QT4 UIElements

Location:

src

Files:

• Makefile.am (modified) (3 diffs)
• UIElements/QT4/QTMainWindow.cpp (modified) (1 diff)
• UIElements/QT4/QTMainWindow.hpp (modified) (1 diff)
• UIElements/QT4/QTUIFactory.cpp (added)
• UIElements/QT4/QTUIFactory.hpp (added)
• UIElements/TextUIFactory.hpp (modified) (1 diff)
• UIElements/UIFactory.cpp (modified) (2 diffs)

src/Makefile.am

@@ -17 +17 @@
 UIHEADER = ${ACTIONSHEADER} ${VIEWHEADER} ${MENUHEADER} UIElements/UIFactory.hpp UIElements/TextUIFactory.hpp UIElements/MainWindow.hpp UIElements/TextWindow.hpp UIElements/Dialog.hpp UIElements/TextDialog.hpp
 
-QTUISOURCE = UIElements/QT4/QTMainWindow.cpp
-QTUIHEADER = UIElements/QT4/QTMainWindow.hpp
+QTUIMOC_HEADER = UIElements/QT4/QTMainWindow.hpp 
+QTUIMOC_TARGETS = QTMainWindow.moc.cpp
 
-QTUIMOCS = QTMainWindow.moc.cpp
+QTUISOURCE = ${QTUIMOC_TARGETS} UIElements/QT4/QTMainWindow.cpp UIElements/QT4/QTUIFactory.cpp
+QTUIHEADER = ${QTUIMOC_HEADER} UIElements/QT4/QTUIFactory.hpp
+
 QTUI_DEFS = 
 
-
-SOURCE = ${ANALYSISSOURCE} ${ATOMSOURCE} ${UISOURCE} bond.cpp bondgraph.cpp boundary.cpp config.cpp element.cpp ellipsoid.cpp errorlogger.cpp graph.cpp helpers.cpp leastsquaremin.cpp linkedcell.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 menu.cpp
-HEADER = ${ANALYSISHEADER} ${ATOMHEADER} ${UIHEADER} bond.hpp bondgraph.hpp boundary.hpp config.hpp defs.hpp element.hpp ellipsoid.hpp errorlogger.hpp graph.hpp helpers.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 menu.hpp
+#Right now QT is included in all Builds for simplicity of the build process
+# TODO: Find a way to extract Files using QT and seperate the build process into two parts
+SOURCE = ${ANALYSISSOURCE} ${ATOMSOURCE} ${UISOURCE} ${QTUISOURCE} bond.cpp bondgraph.cpp boundary.cpp config.cpp element.cpp ellipsoid.cpp errorlogger.cpp graph.cpp helpers.cpp leastsquaremin.cpp linkedcell.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 menu.cpp
+HEADER = ${ANALYSISHEADER} ${ATOMHEADER} ${UIHEADER} ${QTUIHEADER} bond.hpp bondgraph.hpp boundary.hpp config.hpp defs.hpp element.hpp ellipsoid.hpp errorlogger.hpp graph.hpp helpers.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 menu.hpp
 
 BOOST_LIB = $(BOOST_LDFLAGS) $(BOOST_MPL_LIB)
@@ -33 +36 @@
 bin_PROGRAMS = molecuilder molecuildergui joiner analyzer 
 molecuilderdir = ${bindir}
+libmolecuilder_a_CXXFLAGS = ${QT_CXXFLAGS}
 libmolecuilder_a_SOURCES = ${SOURCE} ${HEADER}
 molecuilder_DATA = elements.db valence.db orbitals.db Hbonddistance.db Hbondangle.db
-molecuilder_LDFLAGS = $(BOOST_LIB)
-molecuilder_SOURCES = builder.cpp
-molecuilder_LDADD = libmolecuilder.a
+molecuilder_CXXFLAGS = ${QT_CXXFLAGS}
+molecuilder_LDFLAGS = $(BOOST_LIB) ${QT_LDFLAGS}
+molecuilder_SOURCES = builder.cpp 
+molecuilder_LDADD = libmolecuilder.a ${QT_LDADD} ${QT_LIB_GUI}
 #Stuff for building the GUI using QT
-molecuildergui_SOURCES = builder.cpp ${QTUISOURCE} ${QTUIMOCS} ${QTUIHEADER}
+molecuildergui_SOURCES = builder.cpp
 molecuildergui_CXXFLAGS = ${QT_CXXFLAGS} -DUSE_GUI_QT
-molecuildergui_LDFLAGS = ${QT_LDFLAGS}
+molecuildergui_LDFLAGS = $(BOOST_LIB) ${QT_LDFLAGS}
 molecuildergui_LDADD = libmolecuilder.a ${QT_LDADD} ${QT_LIB_GUI}
 joiner_SOURCES = joiner.cpp datacreator.cpp parser.cpp datacreator.hpp helpers.hpp parser.hpp periodentafel.hpp
@@ -53 +58 @@
 # Therfore `%'-rules do not seem to work
 #Quick fix to get it done otherwise
-${QTUIMOCS}:
+${QTUIMOC_TARGETS}:
         list='$(QTUIHEADER)'; for header in $$list; do \
         echo "Making mocfile for $$header"; \

src/UIElements/QT4/QTMainWindow.cpp

@@ -12 +12 @@
 using namespace std;
 
-QTMainWindow::QTMainWindow()
+QTMainWindow::QTMainWindow(menuPopulaters populaters,MoleculeListClass *molecules, config *configuration, periodentafel *periode, char *ConfigFileName)
 {
   // TODO Auto-generated constructor stub

src/UIElements/QT4/QTMainWindow.hpp

@@ -17 +17 @@
 
 public:
-  QTMainWindow();
+  QTMainWindow(menuPopulaters populaters,MoleculeListClass *molecules, config *configuration, periodentafel *periode, char *ConfigFileName);
   virtual ~QTMainWindow();
 

src/UIElements/TextUIFactory.hpp

@@ -13 +13 @@
 class TextUIFactory : public UIFactory
 {
-friend class UIFactory;
+  friend class UIFactory;
 
 public:

src/UIElements/UIFactory.cpp

@@ -12 +12 @@
 // all factories that can be used:
 #include "UIElements/TextUIFactory.hpp"
+#include "UIElements/QT4/QTUIFactory.hpp"
 
 UIFactory *UIFactory::theFactory = 0;
@@ -32 +33 @@
       theFactory = new TextUIFactory();
       break;
+    case QT4 :
+      theFactory = new QTUIFactory();
+      break;
 
     default: