Changeset 3027f8

Timestamp:

Jan 14, 2010, 2:23:13 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:

ea94a8

Parents:

abc967

git-author:

Tillmann Crueger <crueger@…> (01/14/10 13:40:44)

git-committer:

Tillmann Crueger <crueger@…> (01/14/10 14:23:13)

Message:

Build basis for a QT4 User interface

• Added compilation rules for QT4 UI

Files:

• configure.ac (modified) (1 diff)
• m4/gwqt4.m4 (added)
• src/Makefile.am (modified) (4 diffs)
• src/UIElements/QT4/QTMainWindow.cpp (added)
• src/UIElements/QT4/QTMainWindow.hpp (added)
• src/UIElements/UIFactory.hpp (modified) (1 diff)
• src/builder.cpp (modified) (1 diff)
• src/menu.cpp (modified) (1 diff)

configure.ac

@@ -34 +34 @@
 #AX_BOOST_PROGRAM_OPTIONS
 #AX_BOOST_SERIALIZATION
+
+#QT4 libraries
+gw_CHECK_QT4
 
 # Checks for header files.

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
+
+QTUIMOCS = QTMainWindow.moc.cpp
+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
@@ -24 +31 @@
 
 noinst_LIBRARIES = libmolecuilder.a
-bin_PROGRAMS = molecuilder joiner analyzer
+bin_PROGRAMS = molecuilder molecuildergui joiner analyzer 
 molecuilderdir = ${bindir}
 libmolecuilder_a_SOURCES = ${SOURCE} ${HEADER}
@@ -31 +38 @@
 molecuilder_SOURCES = builder.cpp
 molecuilder_LDADD = libmolecuilder.a
+#Stuff for building the GUI using QT
+molecuildergui_SOURCES = builder.cpp ${QTUISOURCE} ${QTUIMOCS} ${QTUIHEADER}
+molecuildergui_CXXFLAGS = ${QT_CXXFLAGS} -DUSE_GUI_QT
+molecuildergui_LDFLAGS = ${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
 joiner_LDADD = libmolecuilder.a 
@@ -36 +48 @@
 analyzer_LDADD = libmolecuilder.a 
 
+
+#Rules needed for QT4
+# UI-Files are scattered throughout several subdirectories
+# Therfore `%'-rules do not seem to work
+#Quick fix to get it done otherwise
+${QTUIMOCS}:
+        list='$(QTUIHEADER)'; for header in $$list; do \
+        echo "Making mocfile for $$header"; \
+        target=`basename $$header | sed "s/\(.*\)\..*/\1.moc.cpp/"`;\
+        $(MOC) $(srcdir)/$$header -o $$target \
+        || eval $$failcom; \
+        done;
+        
 #EXTRA_DIST = ${molecuilder_DATA}
 

src/UIElements/UIFactory.hpp

@@ -22 +22 @@
 
 public:
-  enum InterfaceTypes {Text};
+  enum InterfaceTypes {Text,QT4};
   virtual ~UIFactory();
 

src/builder.cpp

@@ -973 +973 @@
       populaters.MakeEditMoleculesMenu = populateEditMoleculesMenu;
 
+#ifdef USE_GUI_QT
+      UIFactory::makeUserInterface(UIFactory::QT4);
+#else
       UIFactory::makeUserInterface(UIFactory::Text);
+#endif
       MainWindow *mainWindow = UIFactory::get()->makeMainWindow(populaters,molecules, configuration, periode, ConfigFileName);
       mainWindow->display();

src/menu.cpp

@@ -930 +930 @@
   molecule *srcmol = NULL, *destmol = NULL;
   Dialog *dialog = UIFactory::get()->makeDialog();
-  dialog->queryMolecule("Enter index of matrix molecule (the variable one): ",srcmol,molecules);
-  dialog->queryMolecule("Enter index of molecule to merge into (the fixed one): ",destmol,molecules);
+  dialog->queryMolecule("Enter index of matrix molecule (the variable one): ",&srcmol,molecules);
+  dialog->queryMolecule("Enter index of molecule to merge into (the fixed one): ",&destmol,molecules);
   if(dialog->display()) {
     molecules->EmbedMerge(destmol, srcmol);