Changeset e1105bf in OpenModelica

Timestamp:

2020-09-08T13:14:16+02:00 (4 years ago)

Author:

Adeel Asghar <adeel.asghar@…>

Branches:

Added-citation-metadata, maintenance/v1.17, maintenance/v1.18, maintenance/v1.19, maintenance/v1.20, maintenance/v1.21, maintenance/v1.22, maintenance/v1.23, master, omlib-staging

Children:

2bb77f3, 976110cd

Parents:

818a8f24

git-author:

Adeel Asghar <adeel.asghar@…> (09/08/20 12:35:41)

git-committer:

Adeel Asghar <adeel.asghar@…> (09/08/20 13:14:16)

Message:

Apply the transformation on the graphical items inside the elements

Fixes wrong display of bitmaps. Ticket:6066

Location:

OMEdit/OMEditLIB/Annotations

Files:

• BitmapAnnotation.cpp (modified) (1 diff)
• EllipseAnnotation.cpp (modified) (1 diff)
• LineAnnotation.cpp (modified) (1 diff)
• PolygonAnnotation.cpp (modified) (1 diff)
• RectangleAnnotation.cpp (modified) (1 diff)
• ShapeAnnotation.cpp (modified) (1 diff)
• TextAnnotation.cpp (modified) (1 diff)

OMEdit/OMEditLIB/Annotations/BitmapAnnotation.cpp

@@ -59 +59 @@
   mpOriginItem = 0;
   updateShape(pShapeAnnotation);
-  setPos(mOrigin);
-  setRotation(mRotation);
+  applyTransformation();
 }
 

OMEdit/OMEditLIB/Annotations/EllipseAnnotation.cpp

@@ -56 +56 @@
   mpOriginItem = 0;
   updateShape(pShapeAnnotation);
-  setPos(mOrigin);
-  setRotation(mRotation);
+  applyTransformation();
 }
 

OMEdit/OMEditLIB/Annotations/LineAnnotation.cpp

@@ -99 +99 @@
   setOMSConnectionType(oms_connection_single);
   setActiveState(false);
-  setPos(mOrigin);
-  setRotation(mRotation);
+  applyTransformation();
 }
 

OMEdit/OMEditLIB/Annotations/PolygonAnnotation.cpp

@@ -56 +56 @@
   mpOriginItem = 0;
   updateShape(pShapeAnnotation);
-  setPos(mOrigin);
-  setRotation(mRotation);
+  applyTransformation();
 }
 

OMEdit/OMEditLIB/Annotations/RectangleAnnotation.cpp

@@ -56 +56 @@
   mpOriginItem = 0;
   updateShape(pShapeAnnotation);
-  setPos(mOrigin);
-  setRotation(mRotation);
+  applyTransformation();
 }
 

OMEdit/OMEditLIB/Annotations/ShapeAnnotation.cpp

@@ -676 +676 @@
   // if the extends have some new coordinate extents then use it to scale the shape
   LineAnnotation *pLineAnnotation = dynamic_cast<LineAnnotation*>(this);
-  if (!(pLineAnnotation && pLineAnnotation->getLineType() != LineAnnotation::ShapeType) && mpReferenceShapeAnnotation && mpReferenceShapeAnnotation->getGraphicsView()) {
-    QList<QPointF> extendsCoOrdinateExtents = getExtentsForInheritedShapeFromIconDiagramMap(mpGraphicsView, mpReferenceShapeAnnotation);
-
-    qreal left = mpGraphicsView->mMergedCoOrdinateSystem.getLeft();
-    qreal bottom = mpGraphicsView->mMergedCoOrdinateSystem.getBottom();
-    qreal right = mpGraphicsView->mMergedCoOrdinateSystem.getRight();
-    qreal top = mpGraphicsView->mMergedCoOrdinateSystem.getTop();
+  GraphicsView *pGraphicsView = mpGraphicsView ? mpGraphicsView : mpReferenceShapeAnnotation->getGraphicsView();
+  if (pGraphicsView && !(pLineAnnotation && pLineAnnotation->getLineType() != LineAnnotation::ShapeType) && mpReferenceShapeAnnotation && mpReferenceShapeAnnotation->getGraphicsView()) {
+    QList<QPointF> extendsCoOrdinateExtents = getExtentsForInheritedShapeFromIconDiagramMap(pGraphicsView, mpReferenceShapeAnnotation);
+
+    qreal left = pGraphicsView->mMergedCoOrdinateSystem.getLeft();
+    qreal bottom = pGraphicsView->mMergedCoOrdinateSystem.getBottom();
+    qreal right = pGraphicsView->mMergedCoOrdinateSystem.getRight();
+    qreal top = pGraphicsView->mMergedCoOrdinateSystem.getTop();
     // map the origin to extends CoOrdinateSystem
     origin.setX(Utilities::mapToCoOrdinateSystem(mOrigin.x(), left, right, extendsCoOrdinateExtents.at(0).x(), extendsCoOrdinateExtents.at(1).x()));

OMEdit/OMEditLIB/Annotations/TextAnnotation.cpp

@@ -68 +68 @@
   updateShape(pShapeAnnotation);
   initUpdateTextString();
-  setPos(mOrigin);
-  setRotation(mRotation);
+  applyTransformation();
 }