From 1b125314a477cab06d7818f0aa4a41984abbcdd2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=BCdiger=20Franke?= <rdgfranke@gmail.com>
Date: Thu, 27 Oct 2016 20:39:09 +0200
Subject: [PATCH] DynamicSelect for visible with false default value

---
 OMEdit/OMEditGUI/Annotations/BitmapAnnotation.cpp    | 2 +-
 OMEdit/OMEditGUI/Annotations/EllipseAnnotation.cpp   | 3 +--
 OMEdit/OMEditGUI/Annotations/LineAnnotation.cpp      | 2 +-
 OMEdit/OMEditGUI/Annotations/PolygonAnnotation.cpp   | 2 +-
 OMEdit/OMEditGUI/Annotations/RectangleAnnotation.cpp | 3 ++-
 OMEdit/OMEditGUI/Annotations/ShapeAnnotation.cpp     | 1 +
 OMEdit/OMEditGUI/Annotations/TextAnnotation.cpp      | 2 +-
 7 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/OMEdit/OMEditGUI/Annotations/BitmapAnnotation.cpp b/OMEdit/OMEditGUI/Annotations/BitmapAnnotation.cpp
index d0e63820722..de37ecbe846 100644
--- 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
index 950b1073527..992c796e389 100644
--- 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
index ae789f79fd7..2c53275c534 100644
--- 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
index b7da9cd7316..0a5d0ece1b0 100644
--- 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
index f2d503b845f..4210450527a 100644
--- 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
index 4cc678b324b..43fc212ae46 100644
--- 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
index e4c2a978d35..80bc72194e6 100644
--- 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);
   }
 }