Changeset cbf01e for src/UIElements/QT4

Timestamp:

Feb 25, 2010, 2:23:33 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:

2561df

Parents:

326a43b (diff), 5a7243 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'MenuRefactoring' into QT4Refactoring

Conflicts:

molecuilder/src/Actions/Process.cpp
molecuilder/src/Actions/Process.hpp
molecuilder/src/Actions/small_actions.hpp
molecuilder/src/Makefile.am
molecuilder/src/UIElements/TextDialog.cpp
molecuilder/src/World.cpp
molecuilder/src/unittests/Makefile.am

Location:

src/UIElements/QT4

Files:

• QTDialog.cpp (modified) (5 diffs)
• QTDialog.hpp (modified) (13 diffs)

src/UIElements/QT4/QTDialog.cpp

@@ -21 +21 @@
 #include <Qt/qcombobox.h>
 
+#include "World.hpp"
+#include "periodentafel.hpp"
 #include "atom.hpp"
+#include "element.hpp"
 #include "molecule.hpp"
 
@@ -95 +98 @@
 }
 
+void QTDialog::queryElement(const char* title, element **target){
+  registerQuery(new ElementQTQuery(title,target,inputLayout,this));
+}
+
 /************************** Query Objects *******************************/
 
@@ -192 +199 @@
   for(iter  = molecules->ListOfMolecules.begin();
       iter != molecules->ListOfMolecules.end();
-      iter++) {
+      ++iter) {
     stringstream sstr;
     sstr << (*iter)->IndexNr << "\t" << (*iter)->getName();
@@ -255 +262 @@
 
 
+QTDialog::ElementQTQuery::ElementQTQuery(std::string _title, element **_target, QBoxLayout *_parent, QTDialog *_dialog) :
+    Dialog::ElementQuery(_title,_target),
+    parent(_parent)
+{
+  periodentafel *periode = World::get()->getPeriode();
+  thisLayout = new QHBoxLayout();
+  titleLabel = new QLabel(QString(getTitle().c_str()));
+  inputBox = new QComboBox();
+  element* Elemental = 0;
+  for(Elemental = periode->start->next;
+      Elemental!=periode->end;
+      Elemental = Elemental->next)
+  {
+    stringstream sstr;
+    sstr << Elemental->Z << "\t" << Elemental->name;
+    inputBox->addItem(QString(sstr.str().c_str()),QVariant(Elemental->Z));
+  }
+  parent->addLayout(thisLayout);
+  thisLayout->addWidget(titleLabel);
+  thisLayout->addWidget(inputBox);
+
+  pipe = new ElementQTQueryPipe(&tmp,_dialog,inputBox);
+  pipe->update(inputBox->currentIndex());
+  connect(inputBox,SIGNAL(currentIndexChanged(int)),pipe,SLOT(update(int)));
+}
+
+QTDialog::ElementQTQuery::~ElementQTQuery()
+{
+  delete pipe;
+}
+
+bool QTDialog::ElementQTQuery::handle(){
+  return true;
+}
+
 /*************************** Plumbing *******************************/
 
@@ -313 +355 @@
 }
 
+ElementQTQueryPipe::ElementQTQueryPipe(element **_content, QTDialog *_dialog, QComboBox *_theBox) :
+  content(_content),
+  dialog(_dialog),
+  theBox(_theBox)
+{}
+
+ElementQTQueryPipe::~ElementQTQueryPipe()
+{}
+
+void ElementQTQueryPipe::update(int newIndex) {
+  QVariant data = theBox->itemData(newIndex);
+  int idx = data.toInt();
+  (*content) = World::get()->getPeriode()->FindElement(idx);
+  dialog->update();
+}
+

src/UIElements/QT4/QTDialog.hpp

@@ -26 +26 @@
 class DoubleQTQueryPipe;
 class MoleculeQTQueryPipe;
+class ElementQTQueryPipe;
 
 class QTDialog : public QDialog, public Dialog
@@ -39 +40 @@
   virtual void queryMolecule(const char*,molecule**,MoleculeListClass*);
   virtual void queryVector(const char*,Vector *,const double *const,bool);
+  virtual void queryElement(const char*,element **);
 
   virtual bool display();
@@ -48 +50 @@
     public:
       IntQTQuery(std::string _title, int *_target,QBoxLayout *_parent,QTDialog *_dialog);
-      ~IntQTQuery();
+      virtual ~IntQTQuery();
       virtual bool handle();
     private:
@@ -62 +64 @@
     public:
       DoubleQTQuery(std::string title, double *_target,QBoxLayout *_parent,QTDialog *_dialog);
-      ~DoubleQTQuery();
+      virtual ~DoubleQTQuery();
       virtual bool handle();
     private:
@@ -76 +78 @@
     public:
       StringQTQuery(std::string _title, std::string *_target, QBoxLayout *_parent,QTDialog *_dialog);
-      ~StringQTQuery();
+      virtual ~StringQTQuery();
       virtual bool handle();
     private:
@@ -90 +92 @@
     public:
       MoleculeQTQuery(std::string _title, molecule **_target, MoleculeListClass *_molecules, QBoxLayout *_parent,QTDialog *_dialog);
-      ~MoleculeQTQuery();
+      virtual ~MoleculeQTQuery();
       virtual bool handle();
     private:
@@ -104 +106 @@
     public:
       VectorQTQuery(std::string title,Vector *_target,const double *const _cellSize,bool _check,QBoxLayout *,QTDialog *);
-      ~VectorQTQuery();
+      virtual ~VectorQTQuery();
       virtual bool handle();
     private:
@@ -118 +120 @@
     };
 
+    class ElementQTQuery : public Dialog::ElementQuery {
+    public:
+      ElementQTQuery(std::string _title, element **_target, QBoxLayout *_parent, QTDialog *_dialog);
+      virtual ~ElementQTQuery();
+      virtual bool handle();
+    private:
+      QBoxLayout *parent;
+      QBoxLayout *thisLayout;
+      QLabel *titleLabel;
+      QComboBox *inputBox;
+
+      ElementQTQueryPipe *pipe;
+    };
+
 private:
   QBoxLayout *mainLayout;
@@ -133 +149 @@
 public:
   StringQTQueryPipe(std::string *_content, QTDialog *_dialog);
-  ~StringQTQueryPipe();
+  virtual ~StringQTQueryPipe();
 
 public slots:
@@ -148 +164 @@
 public:
   IntQTQueryPipe(int *_content, QTDialog *_dialog);
-  ~IntQTQueryPipe();
+  virtual ~IntQTQueryPipe();
 
 public slots:
@@ -163 +179 @@
 public:
   DoubleQTQueryPipe(double *_content, QTDialog *_dialog);
-  ~DoubleQTQueryPipe();
+  virtual ~DoubleQTQueryPipe();
 
 public slots:
@@ -178 +194 @@
 public:
   MoleculeQTQueryPipe(molecule **_content, QTDialog *_dialog, QComboBox *_theBox, MoleculeListClass *_molecules);
-  ~MoleculeQTQueryPipe();
+  virtual ~MoleculeQTQueryPipe();
 
 public slots:
@@ -190 +206 @@
 
 };
+
+class ElementQTQueryPipe : public QWidget {
+  Q_OBJECT
+public:
+  ElementQTQueryPipe(element **_content, QTDialog *_dialog, QComboBox *_theBox);
+  virtual ~ElementQTQueryPipe();
+
+public slots:
+  void update(int);
+
+private:
+  element **content;
+  QTDialog *dialog;
+  QComboBox *theBox;
+};
 #endif /* QTDIALOG_HPP_ */