Changeset 9770cc8 in OpenModelica

Timestamp:

2021-06-08T14:07:16+02:00 (3 years ago)

Author:

GitHub <noreply@…>

Branches:

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

Children:

5dd217b, c162e1ab

Parents:

41f9a35e

git-author:

Adeel Asghar <adeel.asghar@…> (06/08/21 14:07:16)

git-committer:

GitHub <noreply@…> (06/08/21 14:07:16)

Message:

Replaced assert with size checks (#7530)

Location:

OMEdit/OMEditLIB/Annotations

Files:

• LineAnnotation.cpp (modified) (3 diffs)
• ShapeAnnotation.cpp (modified) (4 diffs)

OMEdit/OMEditLIB/Annotations/LineAnnotation.cpp

@@ -962 +962 @@
     if (mPoints.size() == 2 && mpEndComponent) {
       // just check if additional points are really needed or not.
-      if ((mGeometries[secondLastIndex] == ShapeAnnotation::HorizontalLine && mPoints[lastIndex].y() != point.y()) ||
-          (mGeometries[secondLastIndex] == ShapeAnnotation::VerticalLine && mPoints[lastIndex].x() != point.x())) {
+      if (secondLastIndex < mGeometries.size() && ((mGeometries.at(secondLastIndex) == ShapeAnnotation::HorizontalLine && mPoints.at(lastIndex).y() != point.y()) ||
+                                                   (mGeometries.at(secondLastIndex) == ShapeAnnotation::VerticalLine && mPoints.at(lastIndex).x() != point.x()))) {
         insertPointsGeometriesAndCornerItems(lastIndex);
         setCornerItemsActiveOrPassive();
@@ -975 +975 @@
       updateCornerItem(lastIndex);
       /* update the 2nd point */
-      assert(secondLastIndex < mGeometries.size());
-      if (mGeometries[secondLastIndex] == ShapeAnnotation::HorizontalLine) {
-        mPoints[secondLastIndex] = QPointF(mPoints[secondLastIndex].x(), mPoints[secondLastIndex].y() + dy);
-      } else if (mGeometries[secondLastIndex] == ShapeAnnotation::VerticalLine) {
-        mPoints[secondLastIndex] = QPointF(mPoints[secondLastIndex].x() + dx, mPoints[secondLastIndex].y());
-      }
-      updateCornerItem(secondLastIndex);
+      if (secondLastIndex < mGeometries.size()) {
+        if (mGeometries.at(secondLastIndex) == ShapeAnnotation::HorizontalLine) {
+          mPoints[secondLastIndex] = QPointF(mPoints.at(secondLastIndex).x(), mPoints.at(secondLastIndex).y() + dy);
+        } else if (mGeometries.at(secondLastIndex) == ShapeAnnotation::VerticalLine) {
+          mPoints[secondLastIndex] = QPointF(mPoints.at(secondLastIndex).x() + dx, mPoints.at(secondLastIndex).y());
+        }
+        updateCornerItem(secondLastIndex);
+      }
     }
     if (!mpGraphicsView->isCreatingConnection() && !mpGraphicsView->isCreatingTransition()) {
@@ -1282 +1283 @@
     updateOMSConnection();
   } else {
-    assert(!mOldAnnotation.isEmpty());
-    if (mLineType == LineAnnotation::ConnectionType) {
-      mpGraphicsView->getModelWidget()->getUndoStack()->push(new UpdateConnectionCommand(this, mOldAnnotation, getOMCShapeAnnotation()));
-    } else if (mLineType == LineAnnotation::TransitionType) {
-      mpGraphicsView->getModelWidget()->getUndoStack()->push(new UpdateTransitionCommand(this, mCondition, mImmediate, mReset,
-                                                                                         mSynchronize, mPriority, mOldAnnotation,
-                                                                                         mCondition, mImmediate, mReset, mSynchronize,
-                                                                                         mPriority, getOMCShapeAnnotation()));
-    } else if (mLineType == LineAnnotation::InitialStateType) {
-      mpGraphicsView->getModelWidget()->getUndoStack()->push(new UpdateInitialStateCommand(this, mOldAnnotation, getOMCShapeAnnotation()));
+    if (!mOldAnnotation.isEmpty()) {
+      if (mLineType == LineAnnotation::ConnectionType) {
+        mpGraphicsView->getModelWidget()->getUndoStack()->push(new UpdateConnectionCommand(this, mOldAnnotation, getOMCShapeAnnotation()));
+      } else if (mLineType == LineAnnotation::TransitionType) {
+        mpGraphicsView->getModelWidget()->getUndoStack()->push(new UpdateTransitionCommand(this, mCondition, mImmediate, mReset,
+                                                                                           mSynchronize, mPriority, mOldAnnotation,
+                                                                                           mCondition, mImmediate, mReset, mSynchronize,
+                                                                                           mPriority, getOMCShapeAnnotation()));
+      } else if (mLineType == LineAnnotation::InitialStateType) {
+        mpGraphicsView->getModelWidget()->getUndoStack()->push(new UpdateInitialStateCommand(this, mOldAnnotation, getOMCShapeAnnotation()));
+      }
     }
   }

OMEdit/OMEditLIB/Annotations/ShapeAnnotation.cpp

@@ -770 +770 @@
   if (dynamic_cast<LineAnnotation*>(this) || dynamic_cast<PolygonAnnotation*>(this)) {
     for (int i = 0 ; i < mCornerItemsList.size() ; i++) {
-      assert(mPoints.size() > i);
-      mCornerItemsList.at(i)->setPos(QPointF(mPoints.at(i).x(), mPoints.at(i).y()));
+      if (mPoints.size() > i) {
+        mCornerItemsList.at(i)->setPos(QPointF(mPoints.at(i).x(), mPoints.at(i).y()));
+      }
     }
   } else {
-    assert(mExtents.size() > 1);
-    QPointF extent1 = QPointF(qMin(mExtents.at(0).x(), mExtents.at(1).x()), qMin(mExtents.at(0).y(), mExtents.at(1).y()));
-    QPointF extent2 = QPointF(qMax(mExtents.at(0).x(), mExtents.at(1).x()), qMax(mExtents.at(0).y(), mExtents.at(1).y()));
-    if (mCornerItemsList.size() > 1) {
-      mCornerItemsList.at(0)->setPos(QPointF(extent1.x(), extent1.y()));
-      mCornerItemsList.at(1)->setPos(QPointF(extent2.x(), extent2.y()));
+    if (mExtents.size() > 1) {
+      QPointF extent1 = QPointF(qMin(mExtents.at(0).x(), mExtents.at(1).x()), qMin(mExtents.at(0).y(), mExtents.at(1).y()));
+      QPointF extent2 = QPointF(qMax(mExtents.at(0).x(), mExtents.at(1).x()), qMax(mExtents.at(0).y(), mExtents.at(1).y()));
+      if (mCornerItemsList.size() > 1) {
+        mCornerItemsList.at(0)->setPos(QPointF(extent1.x(), extent1.y()));
+        mCornerItemsList.at(1)->setPos(QPointF(extent2.x(), extent2.y()));
+      }
     }
   }
@@ -804 +806 @@
 void ShapeAnnotation::replaceExtent(const int index, const QPointF point)
 {
-  assert(mExtents.size() > 1);
-  assert(index >= 0 && index <= 1);
-
-  prepareGeometryChange();
-  mExtents.replace(index, point);
+  if (mExtents.size() > 1 && index >= 0 && index <= 1) {
+    prepareGeometryChange();
+    mExtents.replace(index, point);
+  }
 }
 
@@ -819 +820 @@
 void ShapeAnnotation::updateExtent(const int index, const QPointF point)
 {
-  assert(mExtents.size() > 1);
-  assert(index >= 0 && index <= 1);
-
-  prepareGeometryChange();
-  mExtents.replace(index, point);
-
+  if (mExtents.size() > 1 && index >= 0 && index <= 1) {
+    prepareGeometryChange();
+    mExtents.replace(index, point);
+  }
   applyTransformation();
 }
@@ -1550 +1549 @@
 void ShapeAnnotation::cornerItemReleased(const bool changed)
 {
-  assert(!mOldAnnotation.isEmpty());
-
-  if (changed) {
-    ModelWidget *pModelWidget = mpGraphicsView->getModelWidget();
-    LineAnnotation *pLineAnnotation = dynamic_cast<LineAnnotation*>(this);
-
-    if (pModelWidget->getLibraryTreeItem()->getLibraryType() == LibraryTreeItem::OMS) {
-      if (pLineAnnotation) {
-        pLineAnnotation->updateOMSConnection();
-        pModelWidget->createOMSimulatorUndoCommand(QString("Update OMS Connection connect(%1, %2)").arg(pLineAnnotation->getStartComponentName(), pLineAnnotation->getEndComponentName()));
+  if (!mOldAnnotation.isEmpty()) {
+    if (changed) {
+      ModelWidget *pModelWidget = mpGraphicsView->getModelWidget();
+      LineAnnotation *pLineAnnotation = dynamic_cast<LineAnnotation*>(this);
+
+      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();
+          return;
+        }
+      } 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 {
+          QString newAnnotation = getOMCShapeAnnotation();
+          pModelWidget->getUndoStack()->push(new UpdateShapeCommand(this, mOldAnnotation, newAnnotation));
+          pModelWidget->updateClassAnnotationIfNeeded();
+        }
         pModelWidget->updateModelText();
-        return;
       }
     } 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 {
-        QString newAnnotation = getOMCShapeAnnotation();
-        pModelWidget->getUndoStack()->push(new UpdateShapeCommand(this, mOldAnnotation, newAnnotation));
-        pModelWidget->updateClassAnnotationIfNeeded();
-      }
-      pModelWidget->updateModelText();
-    }
-  } else {
-    parseShapeAnnotation(mOldAnnotation);
-    applyTransformation();
+      parseShapeAnnotation(mOldAnnotation);
+      applyTransformation();
+    }
   }