Use the sceneBoundingRect for text shape while exporting as image

Fixes ticket:6139
OpenModelica · Oct 9, 2020 · d4f127b · d4f127b
1 parent cec2d52
commit d4f127b
Show file tree

Hide file tree

Showing 4 changed files with 2 additions and 16 deletions.
diff --git a/OMEdit/OMEditLIB/Annotations/TextAnnotation.cpp b/OMEdit/OMEditLIB/Annotations/TextAnnotation.cpp
@@ -391,10 +391,6 @@ void TextAnnotation::drawTextAnnotaion(QPainter *painter)
   // draw the font
   if (mpComponent || mappedBoundingRect.width() != 0 || mappedBoundingRect.height() != 0) {
     painter->drawText(mappedBoundingRect, StringHandler::getTextAlignment(mHorizontalAlignment) | Qt::AlignVCenter | Qt::TextDontClip, textToDraw);
-    mExportBoundingRect = painter->boundingRect(mappedBoundingRect, StringHandler::getTextAlignment(mHorizontalAlignment) | Qt::AlignVCenter | Qt::TextDontClip, textToDraw);
-    if (mpComponent) {
-      mExportBoundingRect = sceneTransform().mapRect(mExportBoundingRect);
-    }
   }
 }
 

diff --git a/OMEdit/OMEditLIB/Annotations/TextAnnotation.h b/OMEdit/OMEditLIB/Annotations/TextAnnotation.h
@@ -64,8 +64,6 @@ class TextAnnotation : public ShapeAnnotation
   QString getOMCShapeAnnotationWithShapeName() override;
   QString getShapeAnnotation() override;
   void updateShape(ShapeAnnotation *pShapeAnnotation) override;
-
-  QRectF mExportBoundingRect;
 private:
   Element *mpComponent;
 

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

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