Changeset cb5231 for src/UIElements/Qt4/Query/QtQueryList.hpp

Timestamp:

May 8, 2017, 1:54:50 PM (8 years ago)

Author:

Frederik Heber <frederik.heber@…>

Branches:

ForceAnnealing_goodresults, ForceAnnealing_tocheck

Children:

d7bd62

Parents:

a443e1

git-author:

Frederik Heber <heber@…> (03/30/17 21:59:00)

git-committer:

Frederik Heber <frederik.heber@…> (05/08/17 13:54:50)

Message:

Vector(s) are now stored as strings in Querys intermediately.

• they get evaluated first after being stored in a Parameter/Value on request via get().
• Needed to change all Vector(s)..Query's of all UIs and also the general base classes inside Dialog.
• QtQueryList need to be specialized in order to allow a QtQueryList<Vector> to actually store a vector of strings.
• we may use setAsString() in order to set the Parameter thankfully.
• TESTS: All regression tests on Geometry Actions are now working.

File:

• src/UIElements/Qt4/Query/QtQueryList.hpp (modified) (3 diffs)

src/UIElements/Qt4/Query/QtQueryList.hpp

@@ -105 +105 @@
 class QtQueryList<Vector> : public QtQueryListUntyped {
 public:
-  QtQueryList(Parameter<std::vector<Vector> > &parentParam, QBoxLayout *parent, Dialog *_dialog, std::vector<Vector> &_temp) : QtQueryListUntyped(parent, _dialog), tempRef(_temp)
+  QtQueryList(Parameter<std::vector<Vector> > &parentParam, QBoxLayout *parent, Dialog *_dialog, std::vector<std::string> &_temp) : QtQueryListUntyped(parent, _dialog), tempRef(_temp)
   {
     // do we have an STLVectorValidator?
@@ -137 +137 @@
     // add item to both
     addElementToListWidget(subParam->getAsString());
-    tempRef.push_back(subParam->get());
+    tempRef.push_back(subParam->getAsString());
     onUpdate();
   }
@@ -151 +151 @@
   }
 protected:
-  std::vector<Vector> &tempRef;
+  std::vector<std::string> &tempRef;
   Parameter<Vector> *subParam;
 };