Changeset 1c153a9d in OpenModelica

Timestamp:

2020-11-11T16:05:46+01: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:

060e22d0, 86acb37, d58083b8, ddd9636, f10cce6

Parents:

94032733

git-author:

Adeel Asghar <adeel.asghar@…> (11/11/20 15:40:18)

git-committer:

Adeel Asghar <adeel.asghar@…> (11/11/20 16:05:46)

Message:

Call update when shapes are resized

File:

• OMEdit/OMEditLIB/Annotations/ShapeAnnotation.cpp (modified) (2 diffs)

OMEdit/OMEditLIB/Annotations/ShapeAnnotation.cpp

@@ -1544 +1544 @@
 void ShapeAnnotation::cornerItemReleased(const bool changed)
 {
-  Q_ASSERT(!mOldAnnotation.isEmpty());
+  assert(!mOldAnnotation.isEmpty());
 
   if (changed) {
@@ -1550 +1550 @@
     LineAnnotation *pLineAnnotation = dynamic_cast<LineAnnotation*>(this);
 
-    if (pLineAnnotation) {
-      if (pModelWidget->getLibraryTreeItem()->getLibraryType() == LibraryTreeItem::OMS) {
+    if (pModelWidget->getLibraryTreeItem()->getLibraryType() == LibraryTreeItem::OMS) {
+      if (pLineAnnotation) {
         pLineAnnotation->updateOMSConnection();
         pModelWidget->createOMSimulatorUndoCommand(QString("Update OMS Connection connect(%1, %2)").arg(pLineAnnotation->getStartComponentName(), pLineAnnotation->getEndComponentName()));
         pModelWidget->updateModelText();
+      }
+    } else {
+      if (pLineAnnotation && pLineAnnotation->getLineType() == LineAnnotation::ConnectionType) {
+        manhattanizeShape(false);
+        removeRedundantPointsGeometriesAndCornerItems();
+        // Call getOMCShapeAnnotation() after manhattanizeShape() and removeRedundantPointsGeometriesAndCornerItems() to get a correct new annotation
+        QString newAnnotation = getOMCShapeAnnotation();
+        pModelWidget->getUndoStack()->push(new UpdateConnectionCommand(pLineAnnotation, mOldAnnotation, newAnnotation));
+      } else if (pLineAnnotation && pLineAnnotation->getLineType() == LineAnnotation::TransitionType) {
+        manhattanizeShape(false);
+        removeRedundantPointsGeometriesAndCornerItems();
+        QString newAnnotation = getOMCShapeAnnotation();
+        pModelWidget->getUndoStack()->push(new UpdateTransitionCommand(pLineAnnotation, pLineAnnotation->getCondition(), pLineAnnotation->getImmediate(),
+                                                                       pLineAnnotation->getReset(), pLineAnnotation->getSynchronize(), pLineAnnotation->getPriority(),
+                                                                       mOldAnnotation, pLineAnnotation->getCondition(), pLineAnnotation->getImmediate(),
+                                                                       pLineAnnotation->getReset(), pLineAnnotation->getSynchronize(), pLineAnnotation->getPriority(), newAnnotation));
       } else {
-        if (pLineAnnotation->getLineType() == LineAnnotation::ConnectionType) {
-          manhattanizeShape(false);
-          removeRedundantPointsGeometriesAndCornerItems();
-          // Call getOMCShapeAnnotation() after manhattanizeShape() and removeRedundantPointsGeometriesAndCornerItems() to get a correct new annotation
-          QString newAnnotation = getOMCShapeAnnotation();
-          pModelWidget->getUndoStack()->push(new UpdateConnectionCommand(pLineAnnotation, mOldAnnotation, newAnnotation));
-        } else if (pLineAnnotation && pLineAnnotation->getLineType() == LineAnnotation::TransitionType) {
-          manhattanizeShape(false);
-          removeRedundantPointsGeometriesAndCornerItems();
-          QString newAnnotation = getOMCShapeAnnotation();
-          pModelWidget->getUndoStack()->push(new UpdateTransitionCommand(pLineAnnotation, pLineAnnotation->getCondition(), pLineAnnotation->getImmediate(),
-                                                                         pLineAnnotation->getReset(), pLineAnnotation->getSynchronize(), pLineAnnotation->getPriority(),
-                                                                         mOldAnnotation, pLineAnnotation->getCondition(), pLineAnnotation->getImmediate(),
-                                                                         pLineAnnotation->getReset(), pLineAnnotation->getSynchronize(), pLineAnnotation->getPriority(), newAnnotation));
-        } else {
-          QString newAnnotation = getOMCShapeAnnotation();
-          pModelWidget->getUndoStack()->push(new UpdateShapeCommand(this, mOldAnnotation, newAnnotation));
-          pModelWidget->updateClassAnnotationIfNeeded();
-        }
-        pModelWidget->updateModelText();
+        QString newAnnotation = getOMCShapeAnnotation();
+        pModelWidget->getUndoStack()->push(new UpdateShapeCommand(this, mOldAnnotation, newAnnotation));
+        pModelWidget->updateClassAnnotationIfNeeded();
       }
+      pModelWidget->updateModelText();
     }
   } else {