Changeset cb5231 for src/UIElements/Dialog.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/Dialog.hpp (modified) (2 diffs)

src/UIElements/Dialog.hpp

@@ -304 +304 @@
   virtual ~TQuery(){}
   virtual bool handle()=0;
-  virtual bool isValid(){ return param.isValid(temp);  }
-  virtual void setResult(){ param.set(temp);  }
+  virtual bool isValid(){ return param.isValidAsString(temp);  }
+  virtual void setResult(){ param.setAsString(temp);  }
 protected:
-  Vector temp;
+  std::string temp;
   Parameter<Vector> &param;
 };
@@ -318 +318 @@
   virtual ~TQuery(){}
   virtual bool handle()=0;
-  virtual bool isValid(){ return param.isValid(temp);  }
-  virtual void setResult(){ param.set(temp);  }
+  virtual bool isValid();
+  virtual void setResult();
 protected:
-  std::vector<Vector> temp;
+  std::vector<std::string> temp;
   Parameter< std::vector<Vector> > &param;
 };