DynamicSelect for visible with false default value

OpenModelica · Oct 27, 2016 · 1b12531 · 1b12531
1 parent 14b6e85
commit 1b12531
Show file tree

Hide file tree

Showing 7 changed files with 8 additions and 7 deletions.
diff --git a/OMEdit/OMEditGUI/Annotations/BitmapAnnotation.cpp b/OMEdit/OMEditGUI/Annotations/BitmapAnnotation.cpp
@@ -121,7 +121,7 @@ void BitmapAnnotation::paint(QPainter *painter, const QStyleOptionGraphicsItem *
 {
   Q_UNUSED(option);
   Q_UNUSED(widget);
-  if (mVisible)
+  if (mVisible || !mDynamicVisible.isEmpty())
     drawBitmapAnnotaion(painter);
 }
 

diff --git a/OMEdit/OMEditGUI/Annotations/EllipseAnnotation.cpp b/OMEdit/OMEditGUI/Annotations/EllipseAnnotation.cpp
@@ -126,8 +126,7 @@ void EllipseAnnotation::paint(QPainter *painter, const QStyleOptionGraphicsItem
 {
   Q_UNUSED(option);
   Q_UNUSED(widget);
-  if (mVisible)
-  {
+  if (mVisible || !mDynamicVisible.isEmpty()) {
     drawEllipseAnnotaion(painter);
   }
 }

diff --git a/OMEdit/OMEditGUI/Annotations/LineAnnotation.cpp b/OMEdit/OMEditGUI/Annotations/LineAnnotation.cpp
@@ -291,7 +291,7 @@ void LineAnnotation::paint(QPainter *painter, const QStyleOptionGraphicsItem *op
 {
   Q_UNUSED(option);
   Q_UNUSED(widget);
-  if (mVisible) {
+  if (mVisible || !mDynamicVisible.isEmpty()) {
     drawLineAnnotaion(painter);
   }
 }

diff --git a/OMEdit/OMEditGUI/Annotations/PolygonAnnotation.cpp b/OMEdit/OMEditGUI/Annotations/PolygonAnnotation.cpp
@@ -158,7 +158,7 @@ void PolygonAnnotation::paint(QPainter *painter, const QStyleOptionGraphicsItem
 {
   Q_UNUSED(option);
   Q_UNUSED(widget);
-  if (mVisible) {
+  if (mVisible || !mDynamicVisible.isEmpty()) {
     drawPolygonAnnotaion(painter);
   }
 }

diff --git a/OMEdit/OMEditGUI/Annotations/RectangleAnnotation.cpp b/OMEdit/OMEditGUI/Annotations/RectangleAnnotation.cpp
@@ -133,8 +133,9 @@ void RectangleAnnotation::paint(QPainter *painter, const QStyleOptionGraphicsIte
 {
   Q_UNUSED(option);
   Q_UNUSED(widget);
-  if (mVisible)
+  if (mVisible || !mDynamicVisible.isEmpty()) {
     drawRectangleAnnotaion(painter);
+  }
 }
 
 void RectangleAnnotation::drawRectangleAnnotaion(QPainter *painter)

diff --git a/OMEdit/OMEditGUI/Annotations/ShapeAnnotation.cpp b/OMEdit/OMEditGUI/Annotations/ShapeAnnotation.cpp
@@ -987,6 +987,7 @@ void ShapeAnnotation::initUpdateVisible()
 {
   if (mpParentComponent) {
     if (!mDynamicVisible.isEmpty()) {
+      updateVisible();
       connect(mpParentComponent, SIGNAL(displayTextChanged()), SLOT(updateVisible()), Qt::UniqueConnection);
     }
   }

diff --git a/OMEdit/OMEditGUI/Annotations/TextAnnotation.cpp b/OMEdit/OMEditGUI/Annotations/TextAnnotation.cpp
@@ -221,7 +221,7 @@ void TextAnnotation::paint(QPainter *painter, const QStyleOptionGraphicsItem *op
   } else if (mpComponent && mpComponent->getGraphicsView()->isRenderingLibraryPixmap()) {
     return;
   }
-  if (mVisible) {
+  if (mVisible || !mDynamicVisible.isEmpty()) {
     drawTextAnnotaion(painter);
   }
 }