Changeset 8f67e2

Timestamp:

Jan 14, 2010, 4:21:02 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:

fa27ed

Parents:

ea94a8

Message:

Started actual presentation of the GUI Window

Location:

src/UIElements/QT4

Files:

• QTMainWindow.cpp (modified) (2 diffs)
• QTMainWindow.hpp (modified) (1 diff)
• QTUIFactory.cpp (modified) (2 diffs)
• QTUIFactory.hpp (modified) (2 diffs)

src/UIElements/QT4/QTMainWindow.cpp

@@ -8 +8 @@
 #include "QTMainWindow.hpp"
 
+#include<Qt/qapplication.h>
+
 #include<iostream>
 
 using namespace std;
 
-QTMainWindow::QTMainWindow(menuPopulaters populaters,MoleculeListClass *molecules, config *configuration, periodentafel *periode, char *ConfigFileName)
-{
-  // TODO Auto-generated constructor stub
-
-}
+QTMainWindow::QTMainWindow(menuPopulaters populaters,MoleculeListClass *molecules, config *configuration, periodentafel *periode, char *ConfigFileName,QApplication *_theApp) :
+    theApp(_theApp)
+{}
 
 QTMainWindow::~QTMainWindow()
@@ -25 +25 @@
 void QTMainWindow::display() {
   cout << "Displaying the QTMainWindow" << endl;
+  this->show();
+  theApp->exec();
 }

src/UIElements/QT4/QTMainWindow.hpp

@@ -17 +17 @@
 
 public:
-  QTMainWindow(menuPopulaters populaters,MoleculeListClass *molecules, config *configuration, periodentafel *periode, char *ConfigFileName);
+  QTMainWindow(menuPopulaters populaters,MoleculeListClass *molecules, config *configuration,
+               periodentafel *periode, char *ConfigFileName, QApplication *_theApp);
   virtual ~QTMainWindow();
 
   virtual void display();
 
+private:
+  QApplication *theApp;
 
 };

src/UIElements/QT4/QTUIFactory.cpp

@@ -10 +10 @@
 
 using namespace std;
+
+#include <qapplication.h>
 
 #include "UIElements/QT4/QTUIFactory.hpp"
@@ -32 +34 @@
 MainWindow* QTUIFactory::makeMainWindow(menuPopulaters populaters,MoleculeListClass *molecules, config *configuration, periodentafel *periode, char *ConfigFileName) {
   cout << "making QT4 Window" << endl;
-  return new QTMainWindow(populaters,molecules,configuration,periode,ConfigFileName);
+
+  // For now we just fake the command line parameters to make QT happy
+  int argc=1;
+  char **argv;
+  argv = new char*[1];
+  argv[0] = new char[10];
+  strcpy(argv[0],"foo");
+  app = new QApplication(argc,argv);
+  return new QTMainWindow(populaters,molecules,configuration,periode,ConfigFileName,app);
 }

src/UIElements/QT4/QTUIFactory.hpp

@@ -10 +10 @@
 
 #include "UIElements/UIFactory.hpp"
+
+class QApplication;
 
 class QTUIFactory : public UIFactory
@@ -23 +25 @@
 protected:
   QTUIFactory();
+
+private:
+  QApplication *app;
 };