Clear the annotation attributes before parsing new ones

OpenModelica · May 11, 2020 · 2d50069 · 2d50069
1 parent 57ea0be
commit 2d50069
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 0 deletions.
diff --git a/OMEdit/OMEditLIB/Annotations/PolygonAnnotation.cpp b/OMEdit/OMEditLIB/Annotations/PolygonAnnotation.cpp
@@ -269,12 +269,14 @@ QString PolygonAnnotation::getShapeAnnotation()
 
 void PolygonAnnotation::addPoint(QPointF point)
 {
+  prepareGeometryChange();
   mPoints.append(point);
   mPoints.back() = mPoints.first();
 }
 
 void PolygonAnnotation::removePoint(int index)
 {
+  prepareGeometryChange();
   if (mPoints.size() > index) {
     mPoints.removeAt(index);
   }
@@ -287,6 +289,7 @@ void PolygonAnnotation::clearPoints()
 
 void PolygonAnnotation::updateEndPoint(QPointF point)
 {
+  prepareGeometryChange();
   // we update the second last point for polygon since the last point is connected to first one
   mPoints.replace(mPoints.size() - 2, point);
 }

diff --git a/OMEdit/OMEditLIB/Annotations/ShapeAnnotation.cpp b/OMEdit/OMEditLIB/Annotations/ShapeAnnotation.cpp
@@ -371,10 +371,14 @@ void ShapeAnnotation::setDefaults()
   mLineColor = QColor(0, 0, 0);
   mLinePattern = StringHandler::LineSolid;
   mLineThickness = 0.25;
+  mPoints.clear();
+  mGeometries.clear();
+  mArrow.clear();
   mArrow.append(StringHandler::ArrowNone);
   mArrow.append(StringHandler::ArrowNone);
   mArrowSize = 3;
   mSmooth = StringHandler::SmoothNone;
+  mExtents.clear();
   mExtents.append(QPointF(0, 0));
   mExtents.append(QPointF(0, 0));
   mBorderPattern = StringHandler::BorderNone;
@@ -385,6 +389,7 @@ void ShapeAnnotation::setDefaults()
   mTextString = "";
   mFontSize = 0;
   mFontName = Helper::systemFontInfo.family();
+  mTextStyles.clear();
   mHorizontalAlignment = StringHandler::TextAlignmentCenter;
   mOriginalFileName = "";
   mFileName = "";

diff --git a/OMEdit/OMEditLIB/Modeling/Commands.cpp b/OMEdit/OMEditLIB/Modeling/Commands.cpp
@@ -133,6 +133,10 @@ UpdateShapeCommand::UpdateShapeCommand(ShapeAnnotation *pShapeAnnotation, QStrin
  */
 void UpdateShapeCommand::redoInternal()
 {
+  mpShapeAnnotation->GraphicItem::setDefaults();
+  mpShapeAnnotation->FilledShape::setDefaults();
+  mpShapeAnnotation->setDefaults();
+  mpShapeAnnotation->setUserDefaults();
   mpShapeAnnotation->parseShapeAnnotation(mNewAnnotation);
   /* If the shape is LineAnnotation then remove and draw the corner items
    * since they might have been changed in number based on the annotation.
@@ -154,6 +158,10 @@ void UpdateShapeCommand::redoInternal()
  */
 void UpdateShapeCommand::undo()
 {
+  mpShapeAnnotation->GraphicItem::setDefaults();
+  mpShapeAnnotation->FilledShape::setDefaults();
+  mpShapeAnnotation->setDefaults();
+  mpShapeAnnotation->setUserDefaults();
   mpShapeAnnotation->parseShapeAnnotation(mOldAnnotation);
   /* If the shape is LineAnnotation then remove and draw the corner items
    * since they might have been changed in number based on the annotation.