Changeset fa27ed for src/UIElements/QT4

Timestamp:

Jan 15, 2010, 2:59:35 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:

a6f180

Parents:

8f67e2

Message:

Added support to call MenuItems using QT4

Location:

src/UIElements/QT4

Files:

• QTMainWindow.cpp (modified) (3 diffs)
• QTMainWindow.hpp (modified) (2 diffs)
• QTUIFactory.cpp (modified) (2 diffs)

src/UIElements/QT4/QTMainWindow.cpp

@@ -9 +9 @@
 
 #include<Qt/qapplication.h>
+#include<Qt/qlabel.h>
+#include<Qt/qstring.h>
+#include<Qt/qmenubar.h>
 
 #include<iostream>
+#include<boost/bind.hpp>
+
+#include "atom.hpp"
+#include "molecule.hpp"
+#include "Menu/QT4/QTMenu.hpp"
+#include "Views/StreamStringView.hpp"
+
 
 using namespace std;
@@ -16 +26 @@
 QTMainWindow::QTMainWindow(menuPopulaters populaters,MoleculeListClass *molecules, config *configuration, periodentafel *periode, char *ConfigFileName,QApplication *_theApp) :
     theApp(_theApp)
-{}
+{
+  moleculeView = new StreamStringView(boost::bind(&MoleculeListClass::Enumerate,molecules,_1));
+  moleculeDisplay = new QLabel(QString(moleculeView->toString().c_str()));
+  setCentralWidget(moleculeDisplay);
+
+  editMoleculesMenu = new QTMenu("Edit Molecules");
+  populaters.MakeEditMoleculesMenu(editMoleculesMenu,molecules,configuration,periode);
+  menuBar()->addMenu(editMoleculesMenu);
+}
 
 QTMainWindow::~QTMainWindow()
@@ -24 +42 @@
 
 void QTMainWindow::display() {
-  cout << "Displaying the QTMainWindow" << endl;
   this->show();
   theApp->exec();

src/UIElements/QT4/QTMainWindow.hpp

@@ -12 +12 @@
 #include <Qt/qmainwindow.h>
 
+class QLabel;
+class StringView;
+class QTMenu;
+
 class QTMainWindow : public QMainWindow, public MainWindow
 {
@@ -24 +28 @@
 
 private:
+  // All kinds of QTStuff used in this window
   QApplication *theApp;
+  QLabel *moleculeDisplay;
+  QTMenu *editMoleculesMenu;
+
+  // All kinds of internal stuff that is bridged to QT
+  StringView *moleculeView;
 
 };

src/UIElements/QT4/QTUIFactory.cpp

@@ -15 +15 @@
 #include "UIElements/QT4/QTUIFactory.hpp"
 #include "UIElements/QT4/QTMainWindow.hpp"
+#include "defs.hpp"
 
 QTUIFactory::QTUIFactory()
@@ -33 +34 @@
 
 MainWindow* QTUIFactory::makeMainWindow(menuPopulaters populaters,MoleculeListClass *molecules, config *configuration, periodentafel *periode, char *ConfigFileName) {
-  cout << "making QT4 Window" << endl;
-
   // 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");
+  argv[0] = new char[64];
+  strcpy(argv[0],MOLECUILDER_NAME);
   app = new QApplication(argc,argv);
   return new QTMainWindow(populaters,molecules,configuration,periode,ConfigFileName,app);