Changeset d3a5ea

Timestamp:

Jan 19, 2010, 10:51:07 AM (16 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:

f8879d

Parents:

a6f180

Message:

Added dialogs for QT.

So far QTDialogs can query the same types a TextDialog can query.

Location:

src

Files:

• Makefile.am (modified) (2 diffs)
• Menu/QT4/QTMenu.cpp (modified) (3 diffs)
• Menu/QT4/QTMenu.hpp (modified) (2 diffs)
• UIElements/Dialog.cpp (modified) (3 diffs)
• UIElements/Dialog.hpp (modified) (1 diff)
• UIElements/QT4/QTDialog.cpp (added)
• UIElements/QT4/QTDialog.hpp (added)
• UIElements/QT4/QTUIFactory.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
 
-QTUIMOC_HEADER = UIElements/QT4/QTMainWindow.hpp Menu/QT4/QTMenu.hpp
-QTUIMOC_TARGETS = QTMainWindow.moc.cpp QTMenu.moc.cpp
+QTUIMOC_HEADER = UIElements/QT4/QTMainWindow.hpp UIElements/QT4/QTDialog.hpp Menu/QT4/QTMenu.hpp 
+QTUIMOC_TARGETS = QTMainWindow.moc.cpp QTMenu.moc.cpp QTDialog.moc.cpp
 
-QTUISOURCE = ${QTUIMOC_TARGETS} UIElements/QT4/QTMainWindow.cpp UIElements/QT4/QTUIFactory.cpp Menu/QT4/QTMenu.cpp
+QTUISOURCE = ${QTUIMOC_TARGETS} UIElements/QT4/QTMainWindow.cpp UIElements/QT4/QTDialog.cpp UIElements/QT4/QTUIFactory.cpp Menu/QT4/QTMenu.cpp
 QTUIHEADER = ${QTUIMOC_HEADER} UIElements/QT4/QTUIFactory.hpp
 
@@ -58 +58 @@
 # Therfore `%'-rules do not seem to work
 #Quick fix to get it done otherwise
-${QTUIMOC_TARGETS}:
+${QTUIMOC_TARGETS}: ${QTUIMOC_HEADER}
         list='$(QTUIMOC_HEADER)'; for header in $$list; do \
         echo "Making mocfile for $$header"; \

src/Menu/QT4/QTMenu.cpp

@@ -26 +26 @@
   const string description = item->getDescription();
   QAction *action = addAction(QString(description.c_str()));
-  QTPipe *pipe = new QTPipe(item,action);
+  QTMenuPipe *pipe = new QTMenuPipe(item,action);
   QObject::connect(action, SIGNAL(triggered()),pipe,SLOT(called()));
   plumbing.push_back(pipe);
@@ -32 +32 @@
 
 void QTMenu::removeItem(MenuItem* item) {
-  list<QTPipe*>::iterator iter;
+  list<QTMenuPipe*>::iterator iter;
   for(iter=plumbing.begin(); iter!=plumbing.end(); iter++){
     delete (*iter);
@@ -42 +42 @@
 }
 
-QTPipe::QTPipe(MenuItem *_item, QAction *_action) :
+QTMenuPipe::QTMenuPipe(MenuItem *_item, QAction *_action) :
     theItem(_item), theAction(_action)
 {}
 
-QTPipe::~QTPipe() {
+QTMenuPipe::~QTMenuPipe() {
   delete theAction;
   delete theItem;
 }
 
-void QTPipe::called() {
+void QTMenuPipe::called() {
   theItem->doTrigger();
 }

src/Menu/QT4/QTMenu.hpp

@@ -16 +16 @@
 #include "Menu/Menu.hpp"
 
-class QTPipe;
+class QTMenuPipe;
 
 class QTMenu : public QMenu, public Menu
@@ -30 +30 @@
   virtual void display();
 private:
-  list<QTPipe*> plumbing;
+  list<QTMenuPipe*> plumbing;
 };
 
 // This handles the plumbing from QT to internal Items
-class QTPipe : public QObject {
+// Slots from QT are redirected to internal methods.
+// This way methods can be used where no QT is available
+class QTMenuPipe : public QObject {
   Q_OBJECT
 public:
-  QTPipe(MenuItem*,QAction*);
-  virtual ~QTPipe();
+  QTMenuPipe(MenuItem*,QAction*);
+  virtual ~QTMenuPipe();
 public slots:
   void called();

src/UIElements/Dialog.cpp

@@ -29 +29 @@
 
 bool Dialog::display(){
+  if(checkAll()){
+    setAll();
+    return true;
+  }
+  else{
+    return false;
+  }
+}
+
+bool Dialog::checkAll(){
   list<Query*>::iterator iter;
   bool retval = true;
@@ -37 +47 @@
       break;
   }
-  if (retval){
-    // if all queries succeeded we can set the targets to appropriate values
-    for(iter=queries.begin(); iter!=queries.end(); iter++) {
-      (*iter)->setResult();
-    }
+  return retval;
+}
+
+void Dialog::setAll(){
+  list<Query*>::iterator iter;
+  for(iter=queries.begin(); iter!=queries.end(); iter++) {
+    (*iter)->setResult();
   }
-  return retval;
 }
 
@@ -74 +85 @@
 
 Dialog::StringQuery::StringQuery(string title,string *_target) :
-    Query(title), target(_target)
+    Query(title),
+    target(_target),
+    tmp("")
 {}
 

src/UIElements/Dialog.hpp

@@ -26 +26 @@
 
   virtual bool display();
+
+  virtual bool checkAll();
+  virtual void setAll();
 
 protected:

src/UIElements/QT4/QTUIFactory.cpp

@@ -15 +15 @@
 #include "UIElements/QT4/QTUIFactory.hpp"
 #include "UIElements/QT4/QTMainWindow.hpp"
+#include "UIElements/QT4/QTDialog.hpp"
 #include "defs.hpp"
 
@@ -29 +30 @@
 
 Dialog* QTUIFactory::makeDialog() {
-  assert(0 && "Not implemented yet");
-  return 0;
+  return new QTDialog();
 }