ticket:4468 Fixed export to image for Text shapes.

OpenModelica · Jul 13, 2017 · ae81be2 · ae81be2
1 parent 4d60cd3
commit ae81be2
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 5 deletions.
diff --git a/OMEdit/OMEditGUI/Annotations/TextAnnotation.cpp b/OMEdit/OMEditGUI/Annotations/TextAnnotation.cpp
@@ -323,10 +323,12 @@ void TextAnnotation::drawTextAnnotaion(QPainter *painter)
     }
   }
   // draw the font
-  if (mpComponent) {
-    painter->drawText(boundingRect(), StringHandler::getTextAlignment(mHorizontalAlignment) | Qt::AlignVCenter | Qt::TextDontClip, mTextString);
-  } else if (boundingRect().width() > 0 && boundingRect().height() > 0) {
+  if (mpComponent || boundingRect().width() > 0 || boundingRect().height() > 0) {
     painter->drawText(boundingRect(), StringHandler::getTextAlignment(mHorizontalAlignment) | Qt::AlignVCenter | Qt::TextDontClip, mTextString);
+    mExportBoundingRect = painter->boundingRect(boundingRect(), StringHandler::getTextAlignment(mHorizontalAlignment) | Qt::AlignVCenter | Qt::TextDontClip, mTextString);
+    if (mpComponent) {
+      mExportBoundingRect = sceneTransform().mapRect(mExportBoundingRect);
+    }
   }
 }
 

diff --git a/OMEdit/OMEditGUI/Annotations/TextAnnotation.h b/OMEdit/OMEditGUI/Annotations/TextAnnotation.h
@@ -58,6 +58,8 @@ class TextAnnotation : public ShapeAnnotation
   QString getOMCShapeAnnotation();
   QString getShapeAnnotation();
   void updateShape(ShapeAnnotation *pShapeAnnotation);
+
+  QRectF mExportBoundingRect;
 private:
   Component *mpComponent;
 

diff --git a/OMEdit/OMEditGUI/Component/Component.cpp b/OMEdit/OMEditGUI/Component/Component.cpp
@@ -779,7 +779,11 @@ QRectF Component::itemsBoundingRect()
     rect |= pComponent->sceneBoundingRect();
   }
   foreach (QGraphicsItem *item, mShapesList) {
-    rect |= item->sceneBoundingRect();
+    if (TextAnnotation *pTextAnnotation = dynamic_cast<TextAnnotation*>(item)) {
+      rect |= pTextAnnotation->mExportBoundingRect;
+    } else {
+      rect |= item->sceneBoundingRect();
+    }
   }
   if (mpNonExistingComponentLine->isVisible()) {
     rect |= mpNonExistingComponentLine->sceneBoundingRect();

diff --git a/OMEdit/OMEditGUI/Modeling/ModelWidgetContainer.cpp b/OMEdit/OMEditGUI/Modeling/ModelWidgetContainer.cpp
@@ -928,7 +928,11 @@ QRectF GraphicsView::itemsBoundingRect()
     rect |= pComponent->itemsBoundingRect();
   }
   foreach (QGraphicsItem *item, mShapesList) {
-    rect |= item->sceneBoundingRect();
+    if (TextAnnotation *pTextAnnotation = dynamic_cast<TextAnnotation*>(item)) {
+      rect |= pTextAnnotation->mExportBoundingRect;
+    } else {
+      rect |= item->sceneBoundingRect();
+    }
   }
   foreach (QGraphicsItem *item, mConnectionsList) {
     rect |= item->sceneBoundingRect();