GUI: improved performance when evaluating variables.

tmayerguerr · tmayerguerr · commit 98c7cf764e3f · 2024-10-11T11:42:25.000+02:00
diff --git a/gui/tree/tree.cpp b/gui/tree/tree.cpp
@@ -505,9 +505,9 @@ bool Tree::fileOpen(QString fileName)
     clearTree();
     TreeElement *element = TreeElement::newTreeElement(this, nullptr, _schema.rootElement, "", xmlNode, false/*fillWithDefaults*/);
     rootElement = dynamic_cast<TreeElementComplex*>(element); // set rootElement after complete initialization
-    VariableList           varList;
+    VariableListPtr varList = std::make_shared<const VariableList>();
     QMap<QString, QString> labelTypes;
-    rootElement->updateParserResults(varList);
+    rootElement->updateParserResults(varList, false);
     rootElement->updateLinks(labelTypes);
     rootElement->createItem(nullptr, nullptr)->setExpanded(true);
     treeChanged();
diff --git a/gui/tree/treeElement.cpp b/gui/tree/treeElement.cpp
@@ -419,10 +419,11 @@ int TreeElement::insertNewValue(const QString &value, bool prepend)
 
 /***********************************************/
 
-void TreeElement::updateParserResults(VariableList &varList)
+VariableListPtr TreeElement::updateParserResults(VariableListPtr varList, Bool /*addVariableInReturn*/)
 {
-  if(loop)      {VariableList varListLocal = varList; loop->updateParserResults(varListLocal);}
-  if(condition) {VariableList varListLocal = varList; condition->updateParserResults(varListLocal);}
+  if(loop)      loop->updateParserResults(varList, false);
+  if(condition) condition->updateParserResults(varList, false);
+  return varList;
 }
 
 /***********************************************/
diff --git a/gui/tree/treeElement.h b/gui/tree/treeElement.h
@@ -34,6 +34,8 @@ class  TreeElementLoopCondition;
 class  TreeItem;
 class  QComboBox;
 
+typedef std::shared_ptr<const VariableList> VariableListPtr;
+
 /***** CLASS ***********************************/
 
 class TreeElement : public QObject
@@ -174,8 +176,9 @@ class TreeElement : public QObject
 
 protected:
   /** @brief inform this element about changed variables.
-  * recursively called for all children. */
-  virtual void updateParserResults(VariableList &varList);
+  * recursively called for all children.
+  * If this element is a variable and @a addVariableInReturn an updated varList is returned. */
+  virtual VariableListPtr updateParserResults(VariableListPtr varList, Bool addVariableInReturn);
 
   /** @brief inform this element about changed variables.
   * recursively called for all children. */
diff --git a/gui/tree/treeElementComplex.cpp b/gui/tree/treeElementComplex.cpp
@@ -294,9 +294,9 @@ void TreeElementComplex::updateParserResultsInScope()
   {
     if(!initializedVariables)
       return;
-    VariableList varList = this->varList; // without added local variables
+    auto varList = this->varList; // without added local variables
     for(auto &child : children_[selectedIndex()])
-      child->updateParserResults(varList);
+      varList = child->updateParserResults(varList, true);
   }
   catch(std::exception &e)
   {
@@ -306,19 +306,20 @@ void TreeElementComplex::updateParserResultsInScope()
 
 /***********************************************/
 
-void TreeElementComplex::updateParserResults(VariableList &varList)
+VariableListPtr TreeElementComplex::updateParserResults(VariableListPtr varList, Bool /*addVariableInReturn*/)
 {
   try
   {
     this->varList = varList;
     initializedVariables = true;
-    TreeElement::updateParserResults(varList);
+    TreeElement::updateParserResults(varList, false);
     for(auto &childdrenAtIndex : children_)
     {
-      VariableList varListLocal = this->varList; // without added local variables
+      auto varListLocal = this->varList; // without added local variables
       for(auto &child : childdrenAtIndex)
-        child->updateParserResults(varListLocal);
+        varListLocal = child->updateParserResults(varListLocal, true);
     }
+    return varList;
   }
   catch(std::exception &e)
   {
diff --git a/gui/tree/treeElementComplex.h b/gui/tree/treeElementComplex.h
@@ -69,8 +69,8 @@ class TreeElementComplex : public TreeElement
   // Inform about changes in variables
   // ---------------------------------
 private:
-  bool         initializedVariables;
-  VariableList varList;
+  bool                   initializedVariables;
+  VariableListPtr        varList;
   QMap<QString, QString> labelTypes;
 
 public:
@@ -82,8 +82,8 @@ class TreeElementComplex : public TreeElement
   virtual void updateLinksInScope();
 
   /** @brief inform this element about changed variables.
-  * recursively called for all children. */
-  void updateParserResults(VariableList &varList) override;
+  * recursively called for all children. Returns the input @a varList. */
+  VariableListPtr updateParserResults(VariableListPtr varList, Bool /*addVariableInReturn*/) override;
 
   /** @brief inform this element about changed variables.
   * recursively called for all children. */
diff --git a/gui/tree/treeElementFileName.cpp b/gui/tree/treeElementFileName.cpp
@@ -87,7 +87,7 @@ void TreeElementFileName::openFileClicked()
     {
       for(int i=_valueCount; i<_valueList.size(); i++) // all possible links
       {
-        QString parsed = parseExpression("{"+_valueList.at(i)+"}", varList);
+        QString parsed = parseExpression("{"+_valueList.at(i)+"}", *varList);
         if(path.startsWith(parsed) && (parsed.size() > parsedVariable.size()))
         {
           variable = "{"+_valueList.at(i)+"}";
diff --git a/gui/tree/treeElementFileName.h b/gui/tree/treeElementFileName.h
@@ -26,15 +26,16 @@ class TreeElementFileName : public TreeElementSimple
 {
   Q_OBJECT
 
-  VariableList varList;
+  VariableListPtr varList;
 
 public:
   TreeElementFileName(Tree *tree, TreeElementComplex *parentElement, XsdElementPtr xsdElement,
                       const QString &defaultOverride, XmlNodePtr xmlNode, bool fillWithDefaults);
 
   /** @brief inform this element about changed variables.
-  * recursively called for all children. */
-  void updateParserResults(VariableList &varList) override {this->varList = varList; TreeElementSimple::updateParserResults(varList);}
+  * recursively called for all children.
+  * If this element is a variable and @a addVariableInReturn an updated varList is returned. */
+  VariableListPtr updateParserResults(VariableListPtr varList, Bool addVariableInReturn) override {this->varList = varList; return TreeElementSimple::updateParserResults(varList, addVariableInReturn);}
 
   /** @brief creates an editable combo box with additional file selector. */
   QWidget *createEditor() override;
diff --git a/gui/tree/treeElementGlobal.cpp b/gui/tree/treeElementGlobal.cpp
@@ -92,17 +92,18 @@ void TreeElementGlobal::updateParserResultsInScope()
 
 /***********************************************/
 
-void TreeElementGlobal::updateParserResults(VariableList &varList)
+VariableListPtr TreeElementGlobal::updateParserResults(VariableListPtr varListOld, Bool /*addVariableInReturn*/)
 {
   try
   {
+    varList = std::make_shared<const VariableList>(*varListOld); // make copy
     // as the order is irrelevant -> add all variables before
     for(auto child : children())
       if(!child->label().isEmpty() && !child->disabled())
-        varList.setVariable(child->label().toStdString(), (child->isLinked() ? "{"+child->selectedValue()+"}" : child->selectedValue()).toStdString());
-    this->varList = varList;
+        std::const_pointer_cast<VariableList>(varList)->setVariable(child->label().toStdString(), (child->isLinked() ? "{"+child->selectedValue()+"}" : child->selectedValue()).toStdString());
     for(auto child : children_[selectedIndex()])
-      child->updateParserResults(varList);
+      child->updateParserResults(varList, false);
+    return varList;
   }
   catch(std::exception &e)
   {
diff --git a/gui/tree/treeElementGlobal.h b/gui/tree/treeElementGlobal.h
@@ -42,8 +42,9 @@ class TreeElementGlobal : public TreeElementComplex
   void updateLinksInScope() override;
 
   /** @brief inform this element about changed variables.
-   * recursively called for all children. */
-  void updateParserResults(VariableList &varList) override;
+  * recursively called for all children.
+  * Returns a new varList containing the global variables. */
+  VariableListPtr updateParserResults(VariableListPtr varList, Bool /*addVariableInReturn*/) override;
 
   /** @brief inform this element about changed variables.
    * recursively called for all children. */
diff --git a/gui/tree/treeElementSimple.cpp b/gui/tree/treeElementSimple.cpp
@@ -92,20 +92,25 @@ void TreeElementSimple::setSelectedIndex(int index)
 
 /***********************************************/
 
-void TreeElementSimple::updateParserResults(VariableList &varList)
+VariableListPtr TreeElementSimple::updateParserResults(VariableListPtr varList, Bool addVariableInReturn)
 {
-  TreeElement::updateParserResults(varList);
-
-  // is variable? -> add to list
-  if(!label().isEmpty() && !disabled())
-    varList.setVariable(label().toStdString(), (isLinked() ? "{"+selectedValue()+"}" : selectedValue()).toStdString());
-
-  QString resultNew = parseExpression((isLinked()) ? "{"+selectedValue()+"}" : selectedValue(), varList);
-  if(resultNew == result)
-    return;
-  result = resultNew;
-  if(item())
-    item()->updateValue();
+  TreeElement::updateParserResults(varList, false);
+
+  QString resultNew = parseExpression((isLinked()) ? "{"+selectedValue()+"}" : selectedValue(), *varList);
+  if(resultNew != result)
+  {
+    result = resultNew;
+    if(item())
+      item()->updateValue();
+  }
+
+  if(!addVariableInReturn || label().isEmpty() || disabled()) // is not variable?
+    return varList;
+
+  // variable -> add to list
+  auto varListNew = std::make_shared<VariableList>(*varList); // make copy
+  varListNew->setVariable(label().toStdString(), (isLinked() ? "{"+selectedValue()+"}" : selectedValue()).toStdString());
+  return std::const_pointer_cast<const VariableList>(varListNew);
 }
 
 /***********************************************/
diff --git a/gui/tree/treeElementSimple.h b/gui/tree/treeElementSimple.h
@@ -43,8 +43,9 @@ class TreeElementSimple : public TreeElement
   void setSelectedIndex(int index) override;
 
   /** @brief inform this element about changed variables.
-  * recursively called for all children. */
-  void updateParserResults(VariableList &varList) override;
+  * recursively called for all children.
+  * If this element is a variable and @a addVariableInReturn an updated varList is returned. */
+  VariableListPtr updateParserResults(VariableListPtr varList, Bool addVariableInReturn) override;
 
 protected:
   virtual QString parseExpression(const QString &text, const VariableList &varList) const;
diff --git a/gui/tree/treeElementTime.cpp b/gui/tree/treeElementTime.cpp
@@ -101,9 +101,9 @@ void TreeElementTime::comboBoxEditTextChanged(const QString &text)
         try
         {
           bool resolved = true;
-          auto result = StringParser::parse(name().toStdString(), text.toStdString(), varList, resolved);
+          auto result = StringParser::parse(name().toStdString(), text.toStdString(), *varList, resolved);
           if(resolved)
-            mjd = ExpressionVariable::parse(result, varList);
+            mjd = ExpressionVariable::parse(result, *varList);
         }
         catch(std::exception &/*e*/)
         {} // if not a number use mjd = 0
diff --git a/gui/tree/treeElementTime.h b/gui/tree/treeElementTime.h
@@ -29,7 +29,7 @@ class TreeElementTime : public TreeElementSimple
 {
   Q_OBJECT
 
-  VariableList varList;
+  VariableListPtr varList;
 
 public:
   TreeElementTime(Tree *tree, TreeElementComplex *parentElement, XsdElementPtr xsdElement,
@@ -42,8 +42,9 @@ class TreeElementTime : public TreeElementSimple
   void setSelectedIndex(int index) override;
 
   /** @brief inform this element about changed variables.
-  * recursively called for all children. */
-  void updateParserResults(VariableList &varList) override {this->varList = varList; TreeElementSimple::updateParserResults(varList);}
+  * recursively called for all children.
+  * If this element is a variable and @a addVariableInReturn an updated varList is returned. */
+  VariableListPtr updateParserResults(VariableListPtr varList, Bool addVariableInReturn) override {this->varList = varList; return TreeElementSimple::updateParserResults(varList, addVariableInReturn);}
 
   /** @brief creates an editable combo box + dateTimeEdit. */
   QWidget *createEditor() override;

Original file line number	Diff line number	Diff line change
`@@ -419,10 +419,11 @@ int TreeElement::insertNewValue(const QString &value, bool prepend)`
`419`	`419`
`420`	`420`	`/***********************************************/`
`421`	`421`
`422`		`-void TreeElement::updateParserResults(VariableList &varList)`
	`422`	`+VariableListPtr TreeElement::updateParserResults(VariableListPtr varList, Bool /addVariableInReturn/)`
`423`	`423`	`{`
`424`		`- if(loop) {VariableList varListLocal = varList; loop->updateParserResults(varListLocal);}`
`425`		`- if(condition) {VariableList varListLocal = varList; condition->updateParserResults(varListLocal);}`
	`424`	`+ if(loop) loop->updateParserResults(varList, false);`
	`425`	`+ if(condition) condition->updateParserResults(varList, false);`
	`426`	`+ return varList;`
`426`	`427`	`}`
`427`	`428`
`428`	`429`	`/***********************************************/`
Original file line number	Diff line number	Diff line change
`@@ -294,9 +294,9 @@ void TreeElementComplex::updateParserResultsInScope()`
`294`	`294`	`{`
`295`	`295`	`if(!initializedVariables)`
`296`	`296`	`return;`
`297`		`- VariableList varList = this->varList; // without added local variables`
	`297`	`+ auto varList = this->varList; // without added local variables`
`298`	`298`	`for(auto &child : children_[selectedIndex()])`
`299`		`- child->updateParserResults(varList);`
	`299`	`+ varList = child->updateParserResults(varList, true);`
`300`	`300`	`}`
`301`	`301`	`catch(std::exception &e)`
`302`	`302`	`{`
`@@ -306,19 +306,20 @@ void TreeElementComplex::updateParserResultsInScope()`
`306`	`306`
`307`	`307`	`/***********************************************/`
`308`	`308`
`309`		`-void TreeElementComplex::updateParserResults(VariableList &varList)`
	`309`	`+VariableListPtr TreeElementComplex::updateParserResults(VariableListPtr varList, Bool /addVariableInReturn/)`
`310`	`310`	`{`
`311`	`311`	`try`
`312`	`312`	`{`
`313`	`313`	`this->varList = varList;`
`314`	`314`	`initializedVariables = true;`
`315`		`- TreeElement::updateParserResults(varList);`
	`315`	`+ TreeElement::updateParserResults(varList, false);`
`316`	`316`	`for(auto &childdrenAtIndex : children_)`
`317`	`317`	`{`
`318`		`- VariableList varListLocal = this->varList; // without added local variables`
	`318`	`+ auto varListLocal = this->varList; // without added local variables`
`319`	`319`	`for(auto &child : childdrenAtIndex)`
`320`		`- child->updateParserResults(varListLocal);`
	`320`	`+ varListLocal = child->updateParserResults(varListLocal, true);`
`321`	`321`	`}`
	`322`	`+ return varList;`
`322`	`323`	`}`
`323`	`324`	`catch(std::exception &e)`
`324`	`325`	`{`
Original file line number	Diff line number	Diff line change
`@@ -87,7 +87,7 @@ void TreeElementFileName::openFileClicked()`
`87`	`87`	`{`
`88`	`88`	`for(int i=_valueCount; i<_valueList.size(); i++) // all possible links`
`89`	`89`	`{`
`90`		`- QString parsed = parseExpression("{"+_valueList.at(i)+"}", varList);`
	`90`	`+ QString parsed = parseExpression("{"+_valueList.at(i)+"}", *varList);`
`91`	`91`	`if(path.startsWith(parsed) && (parsed.size() > parsedVariable.size()))`
`92`	`92`	`{`
`93`	`93`	`variable = "{"+_valueList.at(i)+"}";`
Original file line number	Diff line number	Diff line change
`@@ -92,17 +92,18 @@ void TreeElementGlobal::updateParserResultsInScope()`
`92`	`92`
`93`	`93`	`/***********************************************/`
`94`	`94`
`95`		`-void TreeElementGlobal::updateParserResults(VariableList &varList)`
	`95`	`+VariableListPtr TreeElementGlobal::updateParserResults(VariableListPtr varListOld, Bool /addVariableInReturn/)`
`96`	`96`	`{`
`97`	`97`	`try`
`98`	`98`	`{`
	`99`	`+ varList = std::make_shared<const VariableList>(*varListOld); // make copy`
`99`	`100`	`// as the order is irrelevant -> add all variables before`
`100`	`101`	`for(auto child : children())`
`101`	`102`	`if(!child->label().isEmpty() && !child->disabled())`
`102`		`- varList.setVariable(child->label().toStdString(), (child->isLinked() ? "{"+child->selectedValue()+"}" : child->selectedValue()).toStdString());`
`103`		`- this->varList = varList;`
	`103`	`+ std::const_pointer_cast<VariableList>(varList)->setVariable(child->label().toStdString(), (child->isLinked() ? "{"+child->selectedValue()+"}" : child->selectedValue()).toStdString());`
`104`	`104`	`for(auto child : children_[selectedIndex()])`
`105`		`- child->updateParserResults(varList);`
	`105`	`+ child->updateParserResults(varList, false);`
	`106`	`+ return varList;`
`106`	`107`	`}`
`107`	`108`	`catch(std::exception &e)`
`108`	`109`	`{`