Changeset b8d1aeb for src/UIElements

Timestamp:

Feb 2, 2010, 11:38:06 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, Candidate_v1.7.0, 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:

7ba324

Parents:

9fe36b (diff), 2ededc2 (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/Makefile.am
molecuilder/src/builder.cpp
molecuilder/src/unittests/Makefile.am

Location:

src/UIElements

Files:

• Dialog.cpp (modified) (3 diffs)
• Dialog.hpp (modified) (5 diffs)
• QT4/QTDialog.cpp (modified) (6 diffs)
• QT4/QTDialog.hpp (modified) (6 diffs)
• TextDialog.cpp (modified) (4 diffs)
• TextDialog.hpp (modified) (3 diffs)

src/UIElements/Dialog.cpp

@@ -9 +9 @@
 
 #include "UIElements/Dialog.hpp"
+
+#include "vector.hpp"
 
 using namespace std;
@@ -96 +98 @@
 }
 
+// Double Queries
+
+Dialog::DoubleQuery::DoubleQuery(string title,double *_target) :
+    Query(title), target(_target)
+{}
+
+Dialog::DoubleQuery::~DoubleQuery() {};
+
+void Dialog::DoubleQuery::setResult() {
+  *target = tmp;
+}
+
+
 // Molecule Queries
 
@@ -110 +125 @@
   *target = tmp;
 }
+
+// Vector Queries
+
+Dialog::VectorQuery::VectorQuery(std::string title,Vector *_target,const double *const _cellSize,bool _check) :
+  Query(title), target(_target), cellSize(_cellSize), check(_check)
+{
+tmp = new Vector();
+}
+
+Dialog::VectorQuery::~VectorQuery()
+{
+  delete tmp;
+}
+
+void Dialog::VectorQuery::setResult() {
+  *target = *tmp;
+}

src/UIElements/Dialog.hpp

@@ -14 +14 @@
 class MoleculeListClass;
 class molecule;
+class Vector;
 
 class Dialog
@@ -22 +23 @@
 
   virtual void queryInt(const char *, int *)=0;
+  virtual void queryDouble(const char*,double *)=0;
   virtual void queryString(const char*, std::string *)=0;
   virtual void queryMolecule(const char*,molecule**,MoleculeListClass*)=0;
+  virtual void queryVector(const char*,Vector *,const double *const,bool)=0;
 
   virtual bool display();
@@ -67 +70 @@
   };
 
+  class DoubleQuery : public Query {
+  public:
+    DoubleQuery(std::string title,double *_target);
+    ~DoubleQuery();
+    virtual bool handle()=0;
+    virtual void setResult();
+  protected:
+    double tmp;
+  private:
+    double *target;
+  };
+
   class StringQuery : public Query {
   public:
@@ -78 +93 @@
     std::string *target;
   };
+
 
   class MoleculeQuery : public Query {
@@ -92 +108 @@
   };
 
+  class VectorQuery : public Query {
+  public:
+      VectorQuery(std::string title,Vector *_target,const double *const _cellSize,bool _check);
+      ~VectorQuery();
+      virtual bool handle()=0;
+      virtual void setResult();
+    protected:
+      Vector *tmp;
+      const double *const cellSize;
+      bool check;
+    private:
+      Vector *target;
+  };
+
 void registerQuery(Query* query);
 

src/UIElements/QT4/QTDialog.cpp

@@ -10 +10 @@
 #include <string>
 #include <sstream>
+#include <limits>
 
 #include <Qt/qboxlayout.h>
 #include <Qt/qlabel.h>
 #include <Qt/qspinbox.h>
+#include <QtGui/QDoubleSpinBox>
 #include <Qt/qlineedit.h>
 #include <Qt/qdialogbuttonbox.h>
@@ -75 +77 @@
 }
 
+void QTDialog::queryDouble(const char* title, double* target){
+  registerQuery(new DoubleQTQuery(title,target,inputLayout,this));
+}
+
 void QTDialog::queryString(const char* title, std::string *target)
 {
@@ -84 +90 @@
   registerQuery(new MoleculeQTQuery(title,target,molecules,inputLayout,this));
 }
+
+void QTDialog::queryVector(const char* title, Vector *target,const double *const cellSize, bool check) {
+  registerQuery(new VectorQTQuery(title,target,cellSize,check,inputLayout,this));
+}
+
+/************************** Query Objects *******************************/
 
 QTDialog::IntQTQuery::IntQTQuery(string _title,int *_target,QBoxLayout *_parent,QTDialog *_dialog) :
@@ -110 +122 @@
 bool QTDialog::IntQTQuery::handle()
 {
+  return true;
+}
+
+QTDialog::DoubleQTQuery::DoubleQTQuery(string title,double *_target,QBoxLayout *_parent,QTDialog *_dialog) :
+    Dialog::DoubleQuery(title,_target),
+    parent(_parent)
+{
+  thisLayout = new QHBoxLayout();
+  titleLabel = new QLabel(QString(getTitle().c_str()));
+  inputBox = new QDoubleSpinBox();
+  inputBox->setValue(0);
+  inputBox->setRange(-numeric_limits<double>::max(),numeric_limits<double>::max());
+  inputBox->setDecimals(3);
+  parent->addLayout(thisLayout);
+  thisLayout->addWidget(titleLabel);
+  thisLayout->addWidget(inputBox);
+
+  pipe = new DoubleQTQueryPipe(&tmp,_dialog);
+  pipe->update(inputBox->value());
+  connect(inputBox,SIGNAL(valueChanged(double)),pipe,SLOT(update(double)));
+}
+
+QTDialog::DoubleQTQuery::~DoubleQTQuery()
+{
+  delete pipe;
+}
+
+bool QTDialog::DoubleQTQuery::handle() {
   return true;
 }
@@ -177 +217 @@
 }
 
+QTDialog::VectorQTQuery::VectorQTQuery(std::string title, Vector *_target, const double *const _cellSize, bool _check,QBoxLayout *_parent,QTDialog *_dialog) :
+    Dialog::VectorQuery(title,_target,_cellSize,_check),
+    parent(_parent)
+{
+  // About the j: I don't know why it was done this way, but it was used this way in Vector::AskPosition, so I reused it
+  int j = -1;
+  const char *coords[3] = {"x:","y:","z:"};
+  mainLayout= new QHBoxLayout();
+  titleLabel = new QLabel(QString(getTitle().c_str()));
+  mainLayout->addWidget(titleLabel);
+  subLayout = new QVBoxLayout();
+  mainLayout->addLayout(subLayout);
+  for(int i=0; i<3; i++) {
+    j+=i+1;
+    coordLayout[i] = new QHBoxLayout();
+    subLayout->addLayout(coordLayout[i]);
+    coordLabel[i] = new QLabel(QString(coords[i]));
+    coordLayout[i]->addWidget(coordLabel[i]);
+    coordInput[i] = new QDoubleSpinBox();
+    coordInput[i]->setRange(0,cellSize[j]);
+    coordInput[i]->setDecimals(3);
+    coordLayout[i]->addWidget(coordInput[i]);
+    pipe[i] = new DoubleQTQueryPipe(&((*tmp)[i]),_dialog);
+    pipe[i]->update(coordInput[i]->value());
+    connect(coordInput[i],SIGNAL(valueChanged(double)),pipe[i],SLOT(update(double)));
+
+  }
+  parent->addLayout(mainLayout);
+}
+
+QTDialog::VectorQTQuery::~VectorQTQuery()
+{}
+
+bool QTDialog::VectorQTQuery::handle() {
+  return true;
+}
+
 
 /*************************** Plumbing *******************************/
@@ -203 +280 @@
 void IntQTQueryPipe::update(int newInt) {
   (*content) = newInt;
+  dialog->update();
+}
+
+DoubleQTQueryPipe::DoubleQTQueryPipe(double *_content, QTDialog *_dialog) :
+  content(_content),
+  dialog(_dialog)
+{}
+
+DoubleQTQueryPipe::~DoubleQTQueryPipe()
+{}
+
+void DoubleQTQueryPipe::update(double newDbl) {
+  (*content) = newDbl;
   dialog->update();
 }

src/UIElements/QT4/QTDialog.hpp

@@ -15 +15 @@
 class QLabel;
 class QSpinBox;
+class QDoubleSpinBox;
 class QLineEdit;
 class QComboBox;
@@ -23 +24 @@
 class StringQTQueryPipe;
 class IntQTQueryPipe;
+class DoubleQTQueryPipe;
 class MoleculeQTQueryPipe;
 
@@ -34 +36 @@
   virtual void queryInt(const char *, int *);
   virtual void queryString(const char*, std::string *);
+  virtual void queryDouble(const char*,double *);
   virtual void queryMolecule(const char*,molecule**,MoleculeListClass*);
+  virtual void queryVector(const char*,Vector *,const double *const,bool);
 
   virtual bool display();
@@ -53 +57 @@
 
       IntQTQueryPipe *pipe;
+    };
+
+    class DoubleQTQuery : public Dialog::DoubleQuery {
+    public:
+      DoubleQTQuery(std::string title, double *_target,QBoxLayout *_parent,QTDialog *_dialog);
+      ~DoubleQTQuery();
+      virtual bool handle();
+    private:
+      QBoxLayout *parent;
+      QBoxLayout *thisLayout;
+      QLabel *titleLabel;
+      QDoubleSpinBox *inputBox;
+
+      DoubleQTQueryPipe *pipe;
     };
 
@@ -81 +99 @@
 
       MoleculeQTQueryPipe *pipe;
+    };
+
+    class VectorQTQuery : public Dialog::VectorQuery {
+    public:
+      VectorQTQuery(std::string title,Vector *_target,const double *const _cellSize,bool _check,QBoxLayout *,QTDialog *);
+      ~VectorQTQuery();
+      virtual bool handle();
+    private:
+      QBoxLayout *parent;
+      QBoxLayout *mainLayout;
+      QLabel *titleLabel;
+      QBoxLayout *subLayout;
+      QBoxLayout *coordLayout[3];
+      QLabel *coordLabel[3];
+      QDoubleSpinBox *coordInput[3];
+
+      DoubleQTQueryPipe *pipe[3];
     };
 
@@ -124 +159 @@
 };
 
+class DoubleQTQueryPipe : public QWidget {
+  Q_OBJECT
+public:
+  DoubleQTQueryPipe(double *_content, QTDialog *_dialog);
+  ~DoubleQTQueryPipe();
+
+public slots:
+  void update(double);
+
+private:
+  double *content;
+  QTDialog *dialog;
+
+};
 
 class MoleculeQTQueryPipe : public QWidget {

src/UIElements/TextDialog.cpp

@@ -31 +31 @@
 }
 
+void TextDialog::queryDouble(const char* title, double* target){
+  registerQuery(new DoubleTextQuery(title,target));
+}
+
 void TextDialog::queryString(const char* title, string* target){
   registerQuery(new StringTextQuery(title,target));
@@ -37 +41 @@
 void TextDialog::queryMolecule(const char* title, molecule **target, MoleculeListClass *molecules) {
   registerQuery(new MoleculeTextQuery(title,target,molecules));
+}
+
+void TextDialog::queryVector(const char* title, Vector *target,const double *const cellSize, bool check) {
+  registerQuery(new VectorTextQuery(title,target,cellSize,check));
 }
 
@@ -65 +73 @@
 }
 
+TextDialog::DoubleTextQuery::DoubleTextQuery(string title,double *_target) :
+    Dialog::DoubleQuery(title,_target)
+{}
+
+TextDialog::DoubleTextQuery::~DoubleTextQuery() {}
+
+bool TextDialog::DoubleTextQuery::handle() {
+  Log() << Verbose(0) << getTitle();
+  cin >> tmp;
+  return true;
+}
+
 TextDialog::MoleculeTextQuery::MoleculeTextQuery(string title, molecule **_target, MoleculeListClass *_molecules) :
     Dialog::MoleculeQuery(title,_target,_molecules)
@@ -84 +104 @@
   return (idxOfMol!=-1);
 }
+
+TextDialog::VectorTextQuery::VectorTextQuery(std::string title, Vector *_target, const double *const _cellSize, bool _check) :
+    Dialog::VectorQuery(title,_target,_cellSize,_check)
+{}
+
+TextDialog::VectorTextQuery::~VectorTextQuery()
+{}
+
+bool TextDialog::VectorTextQuery::handle() {
+ tmp->AskPosition(cellSize,check);
+ return true;
+}

src/UIElements/TextDialog.hpp

@@ -21 +21 @@
   virtual void queryInt(const char *, int *);
   virtual void queryString(const char*, std::string *);
+  virtual void queryDouble(const char*, double*);
   virtual void queryMolecule(const char*,molecule**,MoleculeListClass*);
+  virtual void queryVector(const char*,Vector *,const double * const,bool);
 
 protected:
@@ -29 +31 @@
     IntTextQuery(std::string title, int *_target);
     ~IntTextQuery();
+    virtual bool handle();
+  };
+
+  class DoubleTextQuery : public Dialog::DoubleQuery {
+  public:
+    DoubleTextQuery(std::string title, double *_target);
+    ~DoubleTextQuery();
     virtual bool handle();
   };
@@ -45 +54 @@
     virtual bool handle();
   };
+
+  class VectorTextQuery : public Dialog::VectorQuery {
+  public:
+    VectorTextQuery(std::string title,Vector *_target,const double *const _cellSize,bool _check);
+    ~VectorTextQuery();
+    virtual bool handle();
+  };
 };