ticket:5481 Updated the parameter when the value is changed

OpenModelica · May 16, 2019 · 89b4204 · 89b4204
1 parent 41b846d
commit 89b4204
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 4 deletions.
diff --git a/OMEdit/OMEdit/OMEditGUI/Annotations/TextAnnotation.cpp b/OMEdit/OMEdit/OMEditGUI/Annotations/TextAnnotation.cpp
@@ -63,7 +63,7 @@ TextAnnotation::TextAnnotation(ShapeAnnotation *pShapeAnnotation, Component *pPa
   : ShapeAnnotation(pParent), mpComponent(pParent)
 {
   updateShape(pShapeAnnotation);
-  updateTextString();
+  initUpdateTextString();
   setPos(mOrigin);
   setRotation(mRotation);
   connect(pShapeAnnotation, SIGNAL(updateReferenceShapes()), pShapeAnnotation, SIGNAL(changed()));
@@ -96,7 +96,7 @@ TextAnnotation::TextAnnotation(Component *pParent)
   mExtents.replace(0, QPointF(-50, -50));
   mExtents.replace(1, QPointF(50, 50));
   setTextString("%name");
-  updateTextString();
+  initUpdateTextString();
   setPos(mOrigin);
   setRotation(mRotation);
 }
@@ -142,7 +142,7 @@ TextAnnotation::TextAnnotation(GraphicsView *pGraphicsView)
   mExtents.replace(0, QPointF(-100, 20));
   mExtents.replace(1, QPointF(100, -20));
   setTextString("%name");
-  updateTextString();
+  initUpdateTextString();
   setPos(mOrigin);
   setRotation(mRotation);
   setShapeFlags(true);
@@ -186,7 +186,7 @@ void TextAnnotation::parseShapeAnnotation(QString annotation)
     mOriginalTextString = StringHandler::removeFirstLastQuotes(list.at(9));
   }
   mTextString = mOriginalTextString;
-  updateTextString();
+  initUpdateTextString();
   // 11th item of the list contains the fontSize.
   mFontSize = list.at(10).toFloat();
   // 12th item of the list contains the optional textColor, {-1, -1, -1} if not set
@@ -520,6 +520,16 @@ void TextAnnotation::updateShape(ShapeAnnotation *pShapeAnnotation)
   ShapeAnnotation::setDefaults(pShapeAnnotation);
 }
 
+void TextAnnotation::initUpdateTextString()
+{
+  if (mpComponent) {
+    if (mOriginalTextString.contains("%")) {
+      updateTextString();
+      connect(mpComponent, SIGNAL(displayTextChanged()), SLOT(updateTextString()), Qt::UniqueConnection);
+    }
+  }
+}
+
 /*!
  * \brief TextAnnotation::updateTextStringHelper
  * Helper function for TextAnnotation::updateTextString()

diff --git a/OMEdit/OMEdit/OMEditGUI/Annotations/TextAnnotation.h b/OMEdit/OMEdit/OMEditGUI/Annotations/TextAnnotation.h
@@ -68,6 +68,7 @@ class TextAnnotation : public ShapeAnnotation
 private:
   Component *mpComponent;
 
+  void initUpdateTextString();
   void updateTextStringHelper(QRegExp regExp);
 public slots:
   void updateTextString();