Changeset cb5231 for src/UIElements/Dialog.cpp

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/Dialog.cpp (modified) (1 diff)

src/UIElements/Dialog.cpp

@@ -145 +145 @@
 }
 
+static const std::string concatenateStrings(const std::vector<std::string> &_strings)
+{
+  std::stringstream output;
+  for (std::vector<std::string>::const_iterator iter = _strings.begin();
+      iter != _strings.end(); ++iter)
+    output << *iter << " ";
+  return output.str();
+}
+
+bool Dialog::TQuery< std::vector<Vector> >::isValid()
+{
+  return param.isValidAsString(concatenateStrings(temp));
+}
+void Dialog::TQuery< std::vector<Vector> >::setResult()
+{
+  param.setAsString(concatenateStrings(temp));
+}
+
 /** With the following boost::preprocessor code we generate template
  * specializations for each desired query types in the abstract class Dialog.