Changeset 3731b4 for src/UIElements/QT4

Timestamp:

Jul 22, 2010, 10:02:01 PM (14 years ago)

Author:

Frederik Heber <heber@…>

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:

c46d63

Parents:

7cd469

Message:

Fixed remainder of Dialog and derived classes for still present _target's.

Location:

src/UIElements/QT4

Files:

• QTDialog.cpp (modified) (9 diffs)
• QTDialog.hpp (modified) (8 diffs)

src/UIElements/QT4/QTDialog.cpp

@@ -85 +85 @@
 }
 
-void QTDialog::queryBoolean(char const*, bool*,string){
+void QTDialog::queryBoolean(char const*,string){
   // TODO
   ASSERT(false, "Not implemented yet");
 }
 
-void QTDialog::queryAtom(char const*, atom**, string){
+void QTDialog::queryAtom(char const*, string){
   // TODO
   ASSERT(false, "Not implemented yet");
 }
 
-void QTDialog::queryBox(char const*, Box*, string){
+void QTDialog::queryBox(char const*, string){
   // TODO
   ASSERT(false, "Not implemented yet");
@@ -101 +101 @@
 
 
-void QTDialog::queryInt(const char *title, int *target,string)
-{
-  registerQuery(new IntQTQuery(title,target,inputLayout,this));
-}
-
-void QTDialog::queryDouble(const char* title, double* target,string){
-  registerQuery(new DoubleQTQuery(title,target,inputLayout,this));
-}
-
-void QTDialog::queryString(const char* title, std::string *target,string)
-{
-  registerQuery(new StringQTQuery(title,target,inputLayout,this));
-}
-
-void QTDialog::queryStrings(const char* title, std::vector<std::string> *target,string)
-{
-  registerQuery(new StringsQTQuery(title,target,inputLayout,this));
-}
-
-void QTDialog::queryMolecule(const char *title,molecule **target,string)
-{
-  registerQuery(new MoleculeQTQuery(title,target,inputLayout,this));
-}
-
-void QTDialog::queryVector(const char* title, Vector *target, bool check,string) {
-  registerQuery(new VectorQTQuery(title,target,check,inputLayout,this));
-}
-
-void QTDialog::queryElement(const char* title, std::vector<element *> *target,string){
-  registerQuery(new ElementQTQuery(title,target,inputLayout,this));
+void QTDialog::queryInt(const char *title,string)
+{
+  registerQuery(new IntQTQuery(title,inputLayout,this));
+}
+
+void QTDialog::queryDouble(const char* title,string){
+  registerQuery(new DoubleQTQuery(title,inputLayout,this));
+}
+
+void QTDialog::queryString(const char* title,string)
+{
+  registerQuery(new StringQTQuery(title,inputLayout,this));
+}
+
+void QTDialog::queryStrings(const char* title,string)
+{
+  registerQuery(new StringsQTQuery(title,inputLayout,this));
+}
+
+void QTDialog::queryMolecule(const char *title,string)
+{
+  registerQuery(new MoleculeQTQuery(title,inputLayout,this));
+}
+
+void QTDialog::queryVector(const char* title, bool check,string) {
+  registerQuery(new VectorQTQuery(title,check,inputLayout,this));
+}
+
+void QTDialog::queryElement(const char* title, string){
+  registerQuery(new ElementQTQuery(title,inputLayout,this));
 }
 
 /************************** Query Objects *******************************/
 
-QTDialog::IntQTQuery::IntQTQuery(string _title,int *_target,QBoxLayout *_parent,QTDialog *_dialog) :
-    Dialog::IntQuery(_title,_target),
+QTDialog::IntQTQuery::IntQTQuery(string _title,QBoxLayout *_parent,QTDialog *_dialog) :
+    Dialog::IntQuery(_title),
     parent(_parent)
 {
@@ -163 +163 @@
 }
 
-QTDialog::DoubleQTQuery::DoubleQTQuery(string title,double *_target,QBoxLayout *_parent,QTDialog *_dialog) :
-    Dialog::DoubleQuery(title,_target),
+QTDialog::DoubleQTQuery::DoubleQTQuery(string title,QBoxLayout *_parent,QTDialog *_dialog) :
+    Dialog::DoubleQuery(title),
     parent(_parent)
 {
@@ -192 +192 @@
 
 
-QTDialog::StringQTQuery::StringQTQuery(string _title,string *_target,QBoxLayout *_parent,QTDialog *_dialog) :
-    Dialog::StringQuery(_title,_target),
+QTDialog::StringQTQuery::StringQTQuery(string _title,QBoxLayout *_parent,QTDialog *_dialog) :
+    Dialog::StringQuery(_title),
     parent(_parent)
 {
@@ -219 +219 @@
 }
 
-QTDialog::StringsQTQuery::StringsQTQuery(string _title,vector<string> *_target,QBoxLayout *_parent,QTDialog *_dialog) :
-    Dialog::StringsQuery(_title,_target),
+QTDialog::StringsQTQuery::StringsQTQuery(string _title,QBoxLayout *_parent,QTDialog *_dialog) :
+    Dialog::StringsQuery(_title),
     parent(_parent)
 {
@@ -257 +257 @@
 }
 
-QTDialog::MoleculeQTQuery::MoleculeQTQuery(string _title, molecule **_target, QBoxLayout *_parent,QTDialog *_dialog) :
-    Dialog::MoleculeQuery(_title,_target),
+QTDialog::MoleculeQTQuery::MoleculeQTQuery(string _title, QBoxLayout *_parent,QTDialog *_dialog) :
+    Dialog::MoleculeQuery(_title),
     parent(_parent)
 {
@@ -293 +293 @@
 }
 
-QTDialog::VectorQTQuery::VectorQTQuery(std::string title, Vector *_target, bool _check,QBoxLayout *_parent,QTDialog *_dialog) :
-    Dialog::VectorQuery(title,_target,_check),
+QTDialog::VectorQTQuery::VectorQTQuery(std::string title, bool _check,QBoxLayout *_parent,QTDialog *_dialog) :
+    Dialog::VectorQuery(title,_check),
     parent(_parent)
 {
@@ -329 +329 @@
 
 
-QTDialog::ElementQTQuery::ElementQTQuery(std::string _title, vector<element *> *_target, QBoxLayout *_parent, QTDialog *_dialog) :
-    Dialog::ElementQuery(_title,_target),
+QTDialog::ElementQTQuery::ElementQTQuery(std::string _title, QBoxLayout *_parent, QTDialog *_dialog) :
+    Dialog::ElementQuery(_title),
     parent(_parent)
 {
@@ -349 +349 @@
   thisLayout->addWidget(inputBox);
 
-  pipe = new ElementQTQueryPipe(&elements,_dialog,inputBox);
+  pipe = new ElementQTQueryPipe(&tmp,_dialog,inputBox);
   pipe->update(inputBox->currentIndex());
   connect(inputBox,SIGNAL(currentIndexChanged(int)),pipe,SLOT(update(int)));

src/UIElements/QT4/QTDialog.hpp

@@ -36 +36 @@
 
   virtual void queryEmpty(const char*, std::string);
-  virtual void queryBoolean(const char *, bool *, std::string = "");
-  virtual void queryInt(const char *, int *,std::string = "");
-  virtual void queryDouble(const char*,double *,std::string = "");
-  virtual void queryString(const char*, std::string *,std::string = "");
-  virtual void queryStrings(const char*, std::vector<std::string> *,std::string = "");
-  virtual void queryAtom(const char*,atom**,std::string = "");
-  virtual void queryMolecule(const char*,molecule**,std::string = "");
-  virtual void queryVector(const char*,Vector *,bool,std::string = "");
-  virtual void queryBox(const char*,Box*, std::string = "");
-  virtual void queryElement(const char*,std::vector<element *> *_target,std::string = "");
+  virtual void queryBoolean(const char *, std::string = "");
+  virtual void queryInt(const char *,std::string = "");
+  virtual void queryDouble(const char*,std::string = "");
+  virtual void queryString(const char*,std::string = "");
+  virtual void queryStrings(const char*,std::string = "");
+  virtual void queryAtom(const char*,std::string = "");
+  virtual void queryMolecule(const char*,std::string = "");
+  virtual void queryVector(const char*,bool,std::string = "");
+  virtual void queryBox(const char*, std::string = "");
+  virtual void queryElement(const char*,std::string = "");
 
   virtual bool display();
@@ -54 +54 @@
   class IntQTQuery : public Dialog::IntQuery {
     public:
-      IntQTQuery(std::string _title, int *_target,QBoxLayout *_parent,QTDialog *_dialog);
+      IntQTQuery(std::string _title,QBoxLayout *_parent,QTDialog *_dialog);
       virtual ~IntQTQuery();
       virtual bool handle();
@@ -68 +68 @@
     class DoubleQTQuery : public Dialog::DoubleQuery {
     public:
-      DoubleQTQuery(std::string title, double *_target,QBoxLayout *_parent,QTDialog *_dialog);
+      DoubleQTQuery(std::string title,QBoxLayout *_parent,QTDialog *_dialog);
       virtual ~DoubleQTQuery();
       virtual bool handle();
@@ -82 +82 @@
     class StringQTQuery : public Dialog::StringQuery {
     public:
-      StringQTQuery(std::string _title, std::string *_target, QBoxLayout *_parent,QTDialog *_dialog);
+      StringQTQuery(std::string _title, QBoxLayout *_parent,QTDialog *_dialog);
       virtual ~StringQTQuery();
       virtual bool handle();
@@ -96 +96 @@
     class StringsQTQuery : public Dialog::StringsQuery {
     public:
-      StringsQTQuery(std::string _title, std::vector<std::string> *_target, QBoxLayout *_parent,QTDialog *_dialog);
+      StringsQTQuery(std::string _title, QBoxLayout *_parent,QTDialog *_dialog);
       virtual ~StringsQTQuery();
       virtual bool handle();
@@ -110 +110 @@
     class MoleculeQTQuery : public Dialog::MoleculeQuery {
     public:
-      MoleculeQTQuery(std::string _title, molecule **_target, QBoxLayout *_parent,QTDialog *_dialog);
+      MoleculeQTQuery(std::string _title, QBoxLayout *_parent,QTDialog *_dialog);
       virtual ~MoleculeQTQuery();
       virtual bool handle();
@@ -124 +124 @@
     class VectorQTQuery : public Dialog::VectorQuery {
     public:
-      VectorQTQuery(std::string title,Vector *_target,bool _check,QBoxLayout *,QTDialog *);
+      VectorQTQuery(std::string title,bool _check,QBoxLayout *,QTDialog *);
       virtual ~VectorQTQuery();
       virtual bool handle();
@@ -141 +141 @@
     class ElementQTQuery : public Dialog::ElementQuery {
     public:
-      ElementQTQuery(std::string _title, std::vector<element *> *_target, QBoxLayout *_parent, QTDialog *_dialog);
+      ElementQTQuery(std::string _title, QBoxLayout *_parent, QTDialog *_dialog);
       virtual ~ElementQTQuery();
       virtual bool handle();