Use the containing GraphicsView for evaluation (#13993)

adeas31 · web-flow · commit 1d9c0c9f74e8 · 2025-06-11T14:35:00.000+02:00
#13992
diff --git a/OMEdit/OMEditLIB/Annotations/BitmapAnnotation.cpp b/OMEdit/OMEditLIB/Annotations/BitmapAnnotation.cpp
@@ -154,7 +154,7 @@ void BitmapAnnotation::parseShapeAnnotation(QString annotation)
 
 void BitmapAnnotation::parseShapeAnnotation()
 {
-  GraphicsView *pGraphicsView = getGraphicsView();
+  GraphicsView *pGraphicsView = getContainingGraphicsView();
   GraphicItem::parseShapeAnnotation(mpBitmap, pGraphicsView);
 
   mExtent = mpBitmap->getExtent();
diff --git a/OMEdit/OMEditLIB/Annotations/EllipseAnnotation.cpp b/OMEdit/OMEditLIB/Annotations/EllipseAnnotation.cpp
@@ -102,7 +102,8 @@ void EllipseAnnotation::parseShapeAnnotation(QString annotation)
 
 void EllipseAnnotation::parseShapeAnnotation()
 {
-  GraphicsView *pGraphicsView = getGraphicsView();
+  GraphicsView *pGraphicsView = getContainingGraphicsView();
+  GraphicItem::parseShapeAnnotation(mpEllipse, pGraphicsView);
   FilledShape::parseShapeAnnotation(mpEllipse, pGraphicsView);
 
   mExtent = mpEllipse->getExtent();
diff --git a/OMEdit/OMEditLIB/Annotations/LineAnnotation.cpp b/OMEdit/OMEditLIB/Annotations/LineAnnotation.cpp
@@ -576,7 +576,7 @@ void LineAnnotation::parseShapeAnnotation(QString annotation)
 
 void LineAnnotation::parseShapeAnnotation()
 {
-  GraphicsView *pGraphicsView = getGraphicsView();
+  GraphicsView *pGraphicsView = getContainingGraphicsView();
   GraphicItem::parseShapeAnnotation(mpLine, pGraphicsView);
 
   mPoints = mpLine->getPoints();
diff --git a/OMEdit/OMEditLIB/Annotations/PolygonAnnotation.cpp b/OMEdit/OMEditLIB/Annotations/PolygonAnnotation.cpp
@@ -130,7 +130,7 @@ void PolygonAnnotation::parseShapeAnnotation(QString annotation)
 
 void PolygonAnnotation::parseShapeAnnotation()
 {
-  GraphicsView *pGraphicsView = getGraphicsView();
+  GraphicsView *pGraphicsView = getContainingGraphicsView();
   GraphicItem::parseShapeAnnotation(mpPolygon, pGraphicsView);
   FilledShape::parseShapeAnnotation(mpPolygon, pGraphicsView);
 
diff --git a/OMEdit/OMEditLIB/Annotations/RectangleAnnotation.cpp b/OMEdit/OMEditLIB/Annotations/RectangleAnnotation.cpp
@@ -153,7 +153,7 @@ void RectangleAnnotation::parseShapeAnnotation(QString annotation)
 
 void RectangleAnnotation::parseShapeAnnotation()
 {
-  GraphicsView *pGraphicsView = getGraphicsView();
+  GraphicsView *pGraphicsView = getContainingGraphicsView();
   GraphicItem::parseShapeAnnotation(mpRectangle, pGraphicsView);
   FilledShape::parseShapeAnnotation(mpRectangle, pGraphicsView);
 
diff --git a/OMEdit/OMEditLIB/Annotations/ShapeAnnotation.cpp b/OMEdit/OMEditLIB/Annotations/ShapeAnnotation.cpp
@@ -771,11 +771,11 @@ void ShapeAnnotation::setOriginItemPos(const QPointF point)
 }
 
 /*!
- * \brief ShapeAnnotation::getGraphicsView
- * Returns the GraphicsView of shape.
+ * \brief ShapeAnnotation::getContainingGraphicsView
+ * Returns the GraphicsView of shape where is contained.
  * \return
  */
-GraphicsView *ShapeAnnotation::getGraphicsView()
+GraphicsView *ShapeAnnotation::getContainingGraphicsView()
 {
   if (mpGraphicsView) {
     return mpGraphicsView;
@@ -1078,7 +1078,7 @@ void ShapeAnnotation::updateDynamicSelect(double time)
   if ((mpGraphicsView && mpGraphicsView->isVisualizationView())
       || (mpParentComponent && mpParentComponent->getGraphicsView() && mpParentComponent->getGraphicsView()->isVisualizationView())) {
     bool updated = false;
-    GraphicsView *pGraphicsView = getGraphicsView();
+    GraphicsView *pGraphicsView = getContainingGraphicsView();
 
     updated |= mVisible.update(time, pGraphicsView->getModelWidget()->getModelInstance());
     updated |= mOrigin.update(time, pGraphicsView->getModelWidget()->getModelInstance());
diff --git a/OMEdit/OMEditLIB/Annotations/ShapeAnnotation.h b/OMEdit/OMEditLIB/Annotations/ShapeAnnotation.h
@@ -157,7 +157,8 @@ class ShapeAnnotation : public QObject, public QGraphicsItem, public GraphicItem
   virtual void replaceExtent(const int index, const QPointF point);
   void updateExtent(const int index, const QPointF point);
   void setOriginItemPos(const QPointF point);
-  GraphicsView* getGraphicsView();
+  GraphicsView* getGraphicsView() {return mpGraphicsView;}
+  GraphicsView* getContainingGraphicsView();
   Element* getParentComponent() const {return mpParentComponent;}
   OriginItem* getOriginItem() {return mpOriginItem;}
   void setPoints(QVector<QPointF> points) {mPoints = points;}
diff --git a/OMEdit/OMEditLIB/Annotations/TextAnnotation.cpp b/OMEdit/OMEditLIB/Annotations/TextAnnotation.cpp
@@ -252,7 +252,7 @@ void TextAnnotation::parseShapeAnnotation(QString annotation)
 
 void TextAnnotation::parseShapeAnnotation()
 {
-  GraphicsView *pGraphicsView = getGraphicsView();
+  GraphicsView *pGraphicsView = getContainingGraphicsView();
   GraphicItem::parseShapeAnnotation(mpText, pGraphicsView);
   FilledShape::parseShapeAnnotation(mpText, pGraphicsView);
 
diff --git a/OMEdit/OMEditLIB/Element/Transformation.cpp b/OMEdit/OMEditLIB/Element/Transformation.cpp
@@ -159,14 +159,14 @@ void Transformation::parseTransformation(const ModelInstance::PlacementAnnotatio
 
   // transformation
   mVisible = placementAnnotation.getVisible();
-  mVisible.evaluate(mpComponent ? mpComponent->getGraphicsView()->getModelWidget()->getModelInstance() : nullptr);
+  mVisible.evaluate(mpComponent ? mpComponent->getGraphicsView()->getModelWidget()->getModelInstance() : placementAnnotation.getParentModel());
   ModelInstance::Transformation transformation = placementAnnotation.getTransformation();
   mOriginDiagram = transformation.getOrigin();
-  mOriginDiagram.evaluate(mpComponent ? mpComponent->getGraphicsView()->getModelWidget()->getModelInstance() : nullptr);
+  mOriginDiagram.evaluate(mpComponent ? mpComponent->getGraphicsView()->getModelWidget()->getModelInstance() : placementAnnotation.getParentModel());
   mExtentDiagram = transformation.getExtent();
-  mExtentDiagram.evaluate(mpComponent ? mpComponent->getGraphicsView()->getModelWidget()->getModelInstance() : nullptr);
+  mExtentDiagram.evaluate(mpComponent ? mpComponent->getGraphicsView()->getModelWidget()->getModelInstance() : placementAnnotation.getParentModel());
   mRotateAngleDiagram = transformation.getRotation();
-  mRotateAngleDiagram.evaluate(mpComponent ? mpComponent->getGraphicsView()->getModelWidget()->getModelInstance() : nullptr);
+  mRotateAngleDiagram.evaluate(mpComponent ? mpComponent->getGraphicsView()->getModelWidget()->getModelInstance() : placementAnnotation.getParentModel());
   // map values from element coordinate system to DiagramMap extent
   if (pExtend && pExtend->getIconDiagramMapHasExtent(false)) {
     ExtentAnnotation extendsCoOrdinateExtents = pExtend->getIconDiagramMapExtent(false);
@@ -202,14 +202,14 @@ void Transformation::parseTransformation(const ModelInstance::PlacementAnnotatio
   }
   // icon transformation
   mVisibleIcon = placementAnnotation.getIconVisible();
-  mVisibleIcon.evaluate(mpComponent ? mpComponent->getGraphicsView()->getModelWidget()->getModelInstance() : nullptr);
+  mVisibleIcon.evaluate(mpComponent ? mpComponent->getGraphicsView()->getModelWidget()->getModelInstance() : placementAnnotation.getParentModel());
   ModelInstance::Transformation iconTransformation = placementAnnotation.getIconTransformation();
   mOriginIcon = iconTransformation.getOrigin();
-  mOriginIcon.evaluate(mpComponent ? mpComponent->getGraphicsView()->getModelWidget()->getModelInstance() : nullptr);
+  mOriginIcon.evaluate(mpComponent ? mpComponent->getGraphicsView()->getModelWidget()->getModelInstance() : placementAnnotation.getParentModel());
   mExtentIcon = iconTransformation.getExtent();
-  mExtentIcon.evaluate(mpComponent ? mpComponent->getGraphicsView()->getModelWidget()->getModelInstance() : nullptr);
+  mExtentIcon.evaluate(mpComponent ? mpComponent->getGraphicsView()->getModelWidget()->getModelInstance() : placementAnnotation.getParentModel());
   mRotateAngleIcon = iconTransformation.getRotation();
-  mRotateAngleIcon.evaluate(mpComponent ? mpComponent->getGraphicsView()->getModelWidget()->getModelInstance() : nullptr);
+  mRotateAngleIcon.evaluate(mpComponent ? mpComponent->getGraphicsView()->getModelWidget()->getModelInstance() : placementAnnotation.getParentModel());
   // map values from element coordinate system to IconMap extent.
   if (pExtend && pExtend->getIconDiagramMapHasExtent(true)) {
     ExtentAnnotation extendsCoOrdinateExtents = pExtend->getIconDiagramMapExtent(true);

Original file line number	Diff line number	Diff line change
`@@ -154,7 +154,7 @@ void BitmapAnnotation::parseShapeAnnotation(QString annotation)`
`154`	`154`
`155`	`155`	`void BitmapAnnotation::parseShapeAnnotation()`
`156`	`156`	`{`
`157`		`- GraphicsView *pGraphicsView = getGraphicsView();`
	`157`	`+ GraphicsView *pGraphicsView = getContainingGraphicsView();`
`158`	`158`	`GraphicItem::parseShapeAnnotation(mpBitmap, pGraphicsView);`
`159`	`159`
`160`	`160`	`mExtent = mpBitmap->getExtent();`
Original file line number	Diff line number	Diff line change
`@@ -102,7 +102,8 @@ void EllipseAnnotation::parseShapeAnnotation(QString annotation)`
`102`	`102`
`103`	`103`	`void EllipseAnnotation::parseShapeAnnotation()`
`104`	`104`	`{`
`105`		`- GraphicsView *pGraphicsView = getGraphicsView();`
	`105`	`+ GraphicsView *pGraphicsView = getContainingGraphicsView();`
	`106`	`+ GraphicItem::parseShapeAnnotation(mpEllipse, pGraphicsView);`
`106`	`107`	`FilledShape::parseShapeAnnotation(mpEllipse, pGraphicsView);`
`107`	`108`
`108`	`109`	`mExtent = mpEllipse->getExtent();`
Original file line number	Diff line number	Diff line change
`@@ -576,7 +576,7 @@ void LineAnnotation::parseShapeAnnotation(QString annotation)`
`576`	`576`
`577`	`577`	`void LineAnnotation::parseShapeAnnotation()`
`578`	`578`	`{`
`579`		`- GraphicsView *pGraphicsView = getGraphicsView();`
	`579`	`+ GraphicsView *pGraphicsView = getContainingGraphicsView();`
`580`	`580`	`GraphicItem::parseShapeAnnotation(mpLine, pGraphicsView);`
`581`	`581`
`582`	`582`	`mPoints = mpLine->getPoints();`
Original file line number	Diff line number	Diff line change
`@@ -130,7 +130,7 @@ void PolygonAnnotation::parseShapeAnnotation(QString annotation)`
`130`	`130`
`131`	`131`	`void PolygonAnnotation::parseShapeAnnotation()`
`132`	`132`	`{`
`133`		`- GraphicsView *pGraphicsView = getGraphicsView();`
	`133`	`+ GraphicsView *pGraphicsView = getContainingGraphicsView();`
`134`	`134`	`GraphicItem::parseShapeAnnotation(mpPolygon, pGraphicsView);`
`135`	`135`	`FilledShape::parseShapeAnnotation(mpPolygon, pGraphicsView);`
`136`	`136`
Original file line number	Diff line number	Diff line change
`@@ -153,7 +153,7 @@ void RectangleAnnotation::parseShapeAnnotation(QString annotation)`
`153`	`153`
`154`	`154`	`void RectangleAnnotation::parseShapeAnnotation()`
`155`	`155`	`{`
`156`		`- GraphicsView *pGraphicsView = getGraphicsView();`
	`156`	`+ GraphicsView *pGraphicsView = getContainingGraphicsView();`
`157`	`157`	`GraphicItem::parseShapeAnnotation(mpRectangle, pGraphicsView);`
`158`	`158`	`FilledShape::parseShapeAnnotation(mpRectangle, pGraphicsView);`
`159`	`159`
Original file line number	Diff line number	Diff line change
`@@ -252,7 +252,7 @@ void TextAnnotation::parseShapeAnnotation(QString annotation)`
`252`	`252`
`253`	`253`	`void TextAnnotation::parseShapeAnnotation()`
`254`	`254`	`{`
`255`		`- GraphicsView *pGraphicsView = getGraphicsView();`
	`255`	`+ GraphicsView *pGraphicsView = getContainingGraphicsView();`
`256`	`256`	`GraphicItem::parseShapeAnnotation(mpText, pGraphicsView);`
`257`	`257`	`FilledShape::parseShapeAnnotation(mpText, pGraphicsView);`
`258`	`258`