Changeset b3a54d for src/UIElements

Timestamp:

Jul 18, 2012, 2:02:25 PM (13 years ago)

Author:

Michael Ankele <ankele@…>

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:

7a1e7d

Parents:

9d5531

git-author:

Michael Ankele <ankele@…> (07/09/12 15:04:57)

git-committer:

Michael Ankele <ankele@…> (07/18/12 14:02:25)

Message:

QtQuery: use Query::temp instead of param.get()

Location:

src/UIElements/Qt4/Query

Files:

• BooleanQtQuery.cpp (modified) (1 diff)
• DoubleQtQuery.cpp (modified) (1 diff)
• DoublesQtQuery.cpp (modified) (1 diff)
• ElementQtQuery.cpp (modified) (1 diff)
• ElementsQtQuery.cpp (modified) (1 diff)
• FileQtQuery.cpp (modified) (1 diff)
• IntQtQuery.cpp (modified) (1 diff)
• IntsQtQuery.cpp (modified) (1 diff)
• MoleculeQtQuery.cpp (modified) (1 diff)
• MoleculesQtQuery.cpp (modified) (1 diff)
• RandomNumberDistribution_ParametersQtQuery.cpp (modified) (1 diff)
• RealSpaceMatrixQtQuery.cpp (modified) (1 diff)
• StringQtQuery.cpp (modified) (2 diffs)
• StringsQtQuery.cpp (modified) (1 diff)
• UnsignedIntQtQuery.cpp (modified) (1 diff)
• UnsignedIntsQtQuery.cpp (modified) (1 diff)
• VectorQtQuery.cpp (modified) (4 diffs)
• VectorsQtQuery.cpp (modified) (1 diff)

src/UIElements/Qt4/Query/BooleanQtQuery.cpp

@@ -32 +32 @@
     parent(_parent)
 {
-  if (!param.isSet())
-    param.set(false);
+  temp = false;
+  if (param.isSet())
+    temp = param.get();
   thisLayout = new QHBoxLayout();
   titleLabel = new QLabel(QString(getTitle().c_str()),_dialog);
   booleanCheckBox = new QCheckBox(QString(getTitle().c_str()), _dialog);
-  booleanCheckBox->setCheckState(param.get() ? Qt::Checked : Qt::Unchecked);
+  booleanCheckBox->setCheckState(temp ? Qt::Checked : Qt::Unchecked);
 
   parent->addLayout(thisLayout);

src/UIElements/Qt4/Query/DoubleQtQuery.cpp

@@ -32 +32 @@
     parent(_parent)
 {
-  if (!param.isSet())
-    param.set(0.0);
+  temp = 0.0;
+  if (param.isSet())
+    temp = param.get();
   thisLayout = new QHBoxLayout();
   titleLabel = new QLabel(QString(getTitle().c_str()));
   inputBox = new QDoubleSpinBox();
-  inputBox->setValue(param.get());
+  inputBox->setValue(temp);
   inputBox->setRange(-std::numeric_limits<double>::max(),std::numeric_limits<double>::max());
   inputBox->setDecimals(3);

src/UIElements/Qt4/Query/DoublesQtQuery.cpp

@@ -30 +30 @@
 
 
-QtDialog::DoublesQtQuery::DoublesQtQuery(Parameter<std::vector<double> > &param, std::string title,QBoxLayout *_parent,QtDialog *_dialog) :
-    Dialog::DoublesQuery(param, title),
+QtDialog::DoublesQtQuery::DoublesQtQuery(Parameter<std::vector<double> > &_param, std::string title,QBoxLayout *_parent,QtDialog *_dialog) :
+    Dialog::DoublesQuery(_param, title),
     parent(_parent)
 {

src/UIElements/Qt4/Query/ElementQtQuery.cpp

@@ -31 +31 @@
 #include "World.hpp"
 
-QtDialog::ElementQtQuery::ElementQtQuery(Parameter<const element *> &param, std::string _title, QBoxLayout *_parent, QtDialog *_dialog) :
-    Dialog::ElementQuery(param, _title),
+QtDialog::ElementQtQuery::ElementQtQuery(Parameter<const element *> &_param, std::string _title, QBoxLayout *_parent, QtDialog *_dialog) :
+    Dialog::ElementQuery(_param, _title),
     parent(_parent)
 {

src/UIElements/Qt4/Query/ElementsQtQuery.cpp

@@ -32 +32 @@
 
 
-QtDialog::ElementsQtQuery::ElementsQtQuery(Parameter<std::vector<const element *> > &param, std::string _title, QBoxLayout *_parent, QtDialog *_dialog) :
-    Dialog::ElementsQuery(param, _title),
+QtDialog::ElementsQtQuery::ElementsQtQuery(Parameter<std::vector<const element *> > &_param, std::string _title, QBoxLayout *_parent, QtDialog *_dialog) :
+    Dialog::ElementsQuery(_param, _title),
     parent(_parent)
 {

src/UIElements/Qt4/Query/FileQtQuery.cpp

@@ -29 +29 @@
 
 
-QtDialog::FileQtQuery::FileQtQuery(Parameter<boost::filesystem::path> &param, std::string _title, QBoxLayout *_parent, QtDialog *_dialog) :
-    Dialog::FileQuery(param, _title),
+QtDialog::FileQtQuery::FileQtQuery(Parameter<boost::filesystem::path> &_param, std::string _title, QBoxLayout *_parent, QtDialog *_dialog) :
+    Dialog::FileQuery(_param, _title),
     parent(_parent)
 {

src/UIElements/Qt4/Query/IntQtQuery.cpp

@@ -28 +28 @@
 
 
-QtDialog::IntQtQuery::IntQtQuery(Parameter<int> &param, std::string _title,QBoxLayout *_parent,QtDialog *_dialog) :
-    Dialog::IntQuery(param, _title),
+QtDialog::IntQtQuery::IntQtQuery(Parameter<int> &_param, std::string _title,QBoxLayout *_parent,QtDialog *_dialog) :
+    Dialog::IntQuery(_param, _title),
     parent(_parent)
 {
-  if (!param.isSet())
-    param.set(0);
+  temp = 0;
+  if (param.isSet())
+    temp = param.get();
   thisLayout = new QHBoxLayout();
   titleLabel = new QLabel(QString(getTitle().c_str()));
   inputBox = new QSpinBox();
-  inputBox->setValue(param.get());
+  inputBox->setValue(temp);
   parent->addLayout(thisLayout);
   thisLayout->addWidget(titleLabel);

src/UIElements/Qt4/Query/IntsQtQuery.cpp

@@ -30 +30 @@
 
 
-QtDialog::IntsQtQuery::IntsQtQuery(Parameter<std::vector<int> > &param, std::string _title,QBoxLayout *_parent,QtDialog *_dialog) :
-    Dialog::IntsQuery(param, _title),
+QtDialog::IntsQtQuery::IntsQtQuery(Parameter<std::vector<int> > &_param, std::string _title,QBoxLayout *_parent,QtDialog *_dialog) :
+    Dialog::IntsQuery(_param, _title),
     parent(_parent)
 {

src/UIElements/Qt4/Query/MoleculeQtQuery.cpp

@@ -31 +31 @@
 
 
-QtDialog::MoleculeQtQuery::MoleculeQtQuery(Parameter<const molecule *> &param, std::string _title, QBoxLayout *_parent,QtDialog *_dialog) :
-    Dialog::MoleculeQuery(param, _title),
+QtDialog::MoleculeQtQuery::MoleculeQtQuery(Parameter<const molecule *> &_param, std::string _title, QBoxLayout *_parent,QtDialog *_dialog) :
+    Dialog::MoleculeQuery(_param, _title),
     parent(_parent)
 {

src/UIElements/Qt4/Query/MoleculesQtQuery.cpp

@@ -31 +31 @@
 
 
-QtDialog::MoleculesQtQuery::MoleculesQtQuery(Parameter<std::vector<const molecule *> > &param, std::string _title, QBoxLayout *_parent,QtDialog *_dialog) :
-    Dialog::MoleculesQuery(param, _title),
+QtDialog::MoleculesQtQuery::MoleculesQtQuery(Parameter<std::vector<const molecule *> > &_param, std::string _title, QBoxLayout *_parent,QtDialog *_dialog) :
+    Dialog::MoleculesQuery(_param, _title),
     parent(_parent)
 {

src/UIElements/Qt4/Query/RandomNumberDistribution_ParametersQtQuery.cpp

@@ -31 +31 @@
 #include "World.hpp"
 
-QtDialog::RandomNumberDistribution_ParametersQtQuery::RandomNumberDistribution_ParametersQtQuery(Parameter<RandomNumberDistribution_Parameters> &param, std::string _title,QBoxLayout *_parent,QtDialog *_dialog) :
-    Dialog::RandomNumberDistribution_ParametersQuery(param, _title),
+QtDialog::RandomNumberDistribution_ParametersQtQuery::RandomNumberDistribution_ParametersQtQuery(Parameter<RandomNumberDistribution_Parameters> &_param, std::string _title,QBoxLayout *_parent,QtDialog *_dialog) :
+    Dialog::RandomNumberDistribution_ParametersQuery(_param, _title),
     parent(_parent)
 {

src/UIElements/Qt4/Query/RealSpaceMatrixQtQuery.cpp

@@ -30 +30 @@
 #include "World.hpp"
 
-QtDialog::RealSpaceMatrixQtQuery::RealSpaceMatrixQtQuery(Parameter<RealSpaceMatrix> &param, std::string _title,QBoxLayout *_parent,QtDialog *_dialog) :
-    Dialog::RealSpaceMatrixQuery(param, _title),
+QtDialog::RealSpaceMatrixQtQuery::RealSpaceMatrixQtQuery(Parameter<RealSpaceMatrix> &_param, std::string _title,QBoxLayout *_parent,QtDialog *_dialog) :
+    Dialog::RealSpaceMatrixQuery(_param, _title),
     parent(_parent)
 {

src/UIElements/Qt4/Query/StringQtQuery.cpp

@@ -28 +28 @@
 
 
-QtDialog::StringQtQuery::StringQtQuery(Parameter<std::string> &param, std::string _title,QBoxLayout *_parent,QtDialog *_dialog) :
-    Dialog::StringQuery(param, _title),
+QtDialog::StringQtQuery::StringQtQuery(Parameter<std::string> &_param, std::string _title,QBoxLayout *_parent,QtDialog *_dialog) :
+    Dialog::StringQuery(_param, _title),
     parent(_parent)
 {
-  if (!param.isSet())
-    param.set("");
+  temp = "";
+  if (param.isSet())
+    temp = param.get();
   thisLayout = new QHBoxLayout();
   titleLabel = new QLabel(QString(getTitle().c_str()));
@@ -54 +55 @@
 bool QtDialog::StringQtQuery::handle()
 {
-  //return tmp.get() != "";
-  if (param.isValid(temp)){
-    param.set(temp);
-    return true;
-  }
+  if (temp != "")
+    if (param.isValid(temp)){
+      param.set(temp);
+      return true;
+    }
   return false;
 }

src/UIElements/Qt4/Query/StringsQtQuery.cpp

@@ -30 +30 @@
 
 
-QtDialog::StringsQtQuery::StringsQtQuery(Parameter<std::vector<std::string> > &param, std::string _title,QBoxLayout *_parent,QtDialog *_dialog) :
-    Dialog::StringsQuery(param, _title),
+QtDialog::StringsQtQuery::StringsQtQuery(Parameter<std::vector<std::string> > &_param, std::string _title,QBoxLayout *_parent,QtDialog *_dialog) :
+    Dialog::StringsQuery(_param, _title),
     parent(_parent)
 {

src/UIElements/Qt4/Query/UnsignedIntQtQuery.cpp

@@ -28 +28 @@
 
 
-QtDialog::UnsignedIntQtQuery::UnsignedIntQtQuery(Parameter<unsigned int> &param, std::string _title,QBoxLayout *_parent,QtDialog *_dialog) :
-    Dialog::UnsignedIntQuery(param, _title),
+QtDialog::UnsignedIntQtQuery::UnsignedIntQtQuery(Parameter<unsigned int> &_param, std::string _title,QBoxLayout *_parent,QtDialog *_dialog) :
+    Dialog::UnsignedIntQuery(_param, _title),
     parent(_parent)
 {
-  if (!param.isSet())
-    param.set(0);
+  temp = 0;
+  if (param.isSet())
+    temp = param.get();
   thisLayout = new QHBoxLayout();
   titleLabel = new QLabel(QString(getTitle().c_str()));
   inputBox = new QSpinBox();
-  inputBox->setValue(param.get());
+  inputBox->setValue(temp);
   parent->addLayout(thisLayout);
   thisLayout->addWidget(titleLabel);

src/UIElements/Qt4/Query/UnsignedIntsQtQuery.cpp

@@ -30 +30 @@
 
 
-QtDialog::UnsignedIntsQtQuery::UnsignedIntsQtQuery(Parameter<std::vector<unsigned int> > &param, std::string _title,QBoxLayout *_parent,QtDialog *_dialog) :
-    Dialog::UnsignedIntsQuery(param, _title),
+QtDialog::UnsignedIntsQtQuery::UnsignedIntsQtQuery(Parameter<std::vector<unsigned int> > &_param, std::string _title,QBoxLayout *_parent,QtDialog *_dialog) :
+    Dialog::UnsignedIntsQuery(_param, _title),
     parent(_parent)
 {

src/UIElements/Qt4/Query/VectorQtQuery.cpp

@@ -29 +29 @@
 
 
-QtDialog::VectorQtQuery::VectorQtQuery(Parameter<Vector> &param, std::string title, QBoxLayout *_parent,QtDialog *_dialog) :
-    Dialog::VectorQuery(param, title),
+QtDialog::VectorQtQuery::VectorQtQuery(Parameter<Vector> &_param, std::string title, QBoxLayout *_parent,QtDialog *_dialog) :
+    Dialog::VectorQuery(_param, title),
     parent(_parent)
 {
-  if (!param.isSet())
-    param.set(Vector(0,0,0));
+  temp = Vector(0, 0, 0);
+  if (param.isSet())
+    temp = param.get();
   mainLayout= new QHBoxLayout();
   titleLabel = new QLabel(QString(getTitle().c_str()));
@@ -47 +48 @@
   coordInputX = new QDoubleSpinBox();
   coordInputX->setRange(-std::numeric_limits<double>::max(),std::numeric_limits<double>::max());
-  coordInputX->setValue(param.get()[0]);
+  coordInputX->setValue(temp[0]);
 //  coordInputX->setRange(0,M.at(i,i));
   coordInputX->setDecimals(3);
@@ -53 +54 @@
   coordInputY = new QDoubleSpinBox();
   coordInputY->setRange(-std::numeric_limits<double>::max(),std::numeric_limits<double>::max());
-  coordInputY->setValue(param.get()[1]);
+  coordInputY->setValue(temp[1]);
 //  coordInputY->setRange(0,M.at(i,i));
   coordInputY->setDecimals(3);
@@ -59 +60 @@
   coordInputZ = new QDoubleSpinBox();
   coordInputZ->setRange(-std::numeric_limits<double>::max(),std::numeric_limits<double>::max());
-  coordInputZ->setValue(param.get()[2]);
+  coordInputZ->setValue(temp[2]);
 //  coordInputZ->setRange(0,M.at(i,i));
   coordInputZ->setDecimals(3);

src/UIElements/Qt4/Query/VectorsQtQuery.cpp

@@ -29 +29 @@
 
 
-QtDialog::VectorsQtQuery::VectorsQtQuery(Parameter<std::vector<Vector> > &param, std::string title, QBoxLayout *_parent,QtDialog *_dialog) :
-    Dialog::VectorsQuery(param, title),
+QtDialog::VectorsQtQuery::VectorsQtQuery(Parameter<std::vector<Vector> > &_param, std::string title, QBoxLayout *_parent,QtDialog *_dialog) :
+    Dialog::VectorsQuery(_param, title),
     parent(_parent)
 {