Update components when shapes are added/deleted.

OpenModelica · Oct 3, 2015 · 0869ec5 · 0869ec5
1 parent 36a2419
commit 0869ec5
Show file tree

Hide file tree

Showing 27 changed files with 538 additions and 263 deletions.
diff --git a/OMEdit/OMEditGUI/Annotations/BitmapAnnotation.cpp b/OMEdit/OMEditGUI/Annotations/BitmapAnnotation.cpp
@@ -84,7 +84,7 @@ BitmapAnnotation::BitmapAnnotation(ShapeAnnotation *pShapeAnnotation, GraphicsVi
   mpComponent = 0;
   updateShape(pShapeAnnotation);
   setShapeFlags(true);
-  mpGraphicsView->scene()->addItem(this);
+  mpGraphicsView->addItem(this);
   connect(pShapeAnnotation, SIGNAL(updateReferenceShapes()), pShapeAnnotation, SIGNAL(changed()));
   connect(pShapeAnnotation, SIGNAL(added()), this, SLOT(referenceShapeAdded()));
   connect(pShapeAnnotation, SIGNAL(changed()), this, SLOT(referenceShapeChanged()));

diff --git a/OMEdit/OMEditGUI/Annotations/EllipseAnnotation.cpp b/OMEdit/OMEditGUI/Annotations/EllipseAnnotation.cpp
@@ -82,7 +82,7 @@ EllipseAnnotation::EllipseAnnotation(ShapeAnnotation *pShapeAnnotation, Graphics
 {
   updateShape(pShapeAnnotation);
   setShapeFlags(true);
-  mpGraphicsView->scene()->addItem(this);
+  mpGraphicsView->addItem(this);
   connect(pShapeAnnotation, SIGNAL(updateReferenceShapes()), pShapeAnnotation, SIGNAL(changed()));
   connect(pShapeAnnotation, SIGNAL(added()), this, SLOT(referenceShapeAdded()));
   connect(pShapeAnnotation, SIGNAL(changed()), this, SLOT(referenceShapeChanged()));

diff --git a/OMEdit/OMEditGUI/Annotations/LineAnnotation.cpp b/OMEdit/OMEditGUI/Annotations/LineAnnotation.cpp
@@ -131,15 +131,15 @@ LineAnnotation::LineAnnotation(GraphicsView *pGraphicsView)
   addPoint(QPointF(100, 100));
   addPoint(QPointF(100, -100));
   setShapeFlags(true);
-  mpGraphicsView->scene()->addItem(this);
+  mpGraphicsView->addItem(this);
 }
 
 LineAnnotation::LineAnnotation(ShapeAnnotation *pShapeAnnotation, GraphicsView *pGraphicsView)
   : ShapeAnnotation(true, pGraphicsView, 0)
 {
   updateShape(pShapeAnnotation);
   setShapeFlags(true);
-  mpGraphicsView->scene()->addItem(this);
+  mpGraphicsView->addItem(this);
   connect(pShapeAnnotation, SIGNAL(updateReferenceShapes()), pShapeAnnotation, SIGNAL(changed()));
   connect(pShapeAnnotation, SIGNAL(added()), this, SLOT(referenceShapeAdded()));
   connect(pShapeAnnotation, SIGNAL(changed()), this, SLOT(referenceShapeChanged()));
@@ -161,7 +161,7 @@ LineAnnotation::LineAnnotation(Component *pStartComponent, GraphicsView *pGraphi
     mLineColor = pShapeAnnotation->getLineColor();
   }
   // set the graphics view
-  mpGraphicsView->scene()->addItem(this);
+  mpGraphicsView->addItem(this);
   // set the start component
   setStartComponent(pStartComponent);
   setEndComponent(0);
@@ -191,7 +191,7 @@ LineAnnotation::LineAnnotation(QString annotation, bool inheritedShape, Componen
   mPoints = points;
   mOrigin = QPointF(0, 0);
   // set the graphics view
-  mpGraphicsView->scene()->addItem(this);
+  mpGraphicsView->addItem(this);
 }
 
 void LineAnnotation::parseShapeAnnotation(QString annotation)

diff --git a/OMEdit/OMEditGUI/Annotations/PolygonAnnotation.cpp b/OMEdit/OMEditGUI/Annotations/PolygonAnnotation.cpp
@@ -82,7 +82,7 @@ PolygonAnnotation::PolygonAnnotation(ShapeAnnotation *pShapeAnnotation, Graphics
 {
   updateShape(pShapeAnnotation);
   setShapeFlags(true);
-  mpGraphicsView->scene()->addItem(this);
+  mpGraphicsView->addItem(this);
   connect(pShapeAnnotation, SIGNAL(updateReferenceShapes()), pShapeAnnotation, SIGNAL(changed()));
   connect(pShapeAnnotation, SIGNAL(added()), this, SLOT(referenceShapeAdded()));
   connect(pShapeAnnotation, SIGNAL(changed()), this, SLOT(referenceShapeChanged()));

diff --git a/OMEdit/OMEditGUI/Annotations/RectangleAnnotation.cpp b/OMEdit/OMEditGUI/Annotations/RectangleAnnotation.cpp
@@ -100,7 +100,7 @@ RectangleAnnotation::RectangleAnnotation(ShapeAnnotation *pShapeAnnotation, Grap
 {
   updateShape(pShapeAnnotation);
   setShapeFlags(true);
-  mpGraphicsView->scene()->addItem(this);
+  mpGraphicsView->addItem(this);
   connect(pShapeAnnotation, SIGNAL(updateReferenceShapes()), pShapeAnnotation, SIGNAL(changed()));
   connect(pShapeAnnotation, SIGNAL(added()), this, SLOT(referenceShapeAdded()));
   connect(pShapeAnnotation, SIGNAL(changed()), this, SLOT(referenceShapeChanged()));

diff --git a/OMEdit/OMEditGUI/Annotations/ShapeAnnotation.cpp b/OMEdit/OMEditGUI/Annotations/ShapeAnnotation.cpp
@@ -359,6 +359,7 @@ ShapeAnnotation::ShapeAnnotation(QGraphicsItem *pParent)
   : QGraphicsItem(pParent)
 {
   mpGraphicsView = 0;
+  mpParentComponent = dynamic_cast<Component*>(pParent);
   mpTransformation = 0;
   mIsCustomShape = false;
   mIsInheritedShape = false;
@@ -624,7 +625,7 @@ void ShapeAnnotation::applyFillPattern(QPainter *painter)
   */
 QString ShapeAnnotation::getShapeAnnotation()
 {
-  return QString();
+  return "";
 }
 
 /*!
@@ -1397,7 +1398,12 @@ void ShapeAnnotation::referenceShapeAdded()
 {
   ShapeAnnotation *pShapeAnnotation = qobject_cast<ShapeAnnotation*>(sender());
   if (pShapeAnnotation) {
-    mpGraphicsView->scene()->addItem(this);
+    if (mpGraphicsView) {
+      mpGraphicsView->addItem(this);
+    } else if (mpParentComponent) {
+      mpParentComponent->shapeAdded();
+      setVisible(true);
+    }
   }
 }
 
@@ -1408,8 +1414,14 @@ void ShapeAnnotation::referenceShapeChanged()
 {
   ShapeAnnotation *pShapeAnnotation = qobject_cast<ShapeAnnotation*>(sender());
   if (pShapeAnnotation) {
-    updateShape(pShapeAnnotation);
-    setTransform(pShapeAnnotation->getTransformation()->getTransformationMatrix());
+    if (mpGraphicsView) {
+      updateShape(pShapeAnnotation);
+      setTransform(pShapeAnnotation->getTransformation()->getTransformationMatrix());
+    } else if (mpParentComponent) {
+      updateShape(pShapeAnnotation);
+      setPos(mOrigin);
+      setRotation(mRotation);
+    }
   }
 }
 
@@ -1420,7 +1432,12 @@ void ShapeAnnotation::referenceShapeDeleted()
 {
   ShapeAnnotation *pShapeAnnotation = qobject_cast<ShapeAnnotation*>(sender());
   if (pShapeAnnotation) {
-    mpGraphicsView->scene()->removeItem(this);
+    if (mpGraphicsView) {
+      mpGraphicsView->removeItem(this);
+    } else if (mpParentComponent) {
+      setVisible(false);
+      mpParentComponent->shapeDeleted();
+    }
   }
 }
 

diff --git a/OMEdit/OMEditGUI/Annotations/ShapeAnnotation.h b/OMEdit/OMEditGUI/Annotations/ShapeAnnotation.h
@@ -235,6 +235,7 @@ public slots:
   void referenceShapeDeleted();
 protected:
   GraphicsView *mpGraphicsView;
+  Component *mpParentComponent;
   Transformation *mpTransformation;
   QList<QPointF> mPoints;
   QList<LineGeometryType> mGeometries;

diff --git a/OMEdit/OMEditGUI/Annotations/ShapePropertiesDialog.cpp b/OMEdit/OMEditGUI/Annotations/ShapePropertiesDialog.cpp
@@ -677,8 +677,10 @@ void ShapePropertiesDialog::removePoint()
 
 void ShapePropertiesDialog::saveShapeProperties()
 {
-  if (applyShapeProperties())
+  if (applyShapeProperties()) {
+    mpShapeAnnotation->emitChanged();
     accept();
+  }
 }
 
 bool ShapePropertiesDialog::applyShapeProperties()

diff --git a/OMEdit/OMEditGUI/Annotations/TextAnnotation.cpp b/OMEdit/OMEditGUI/Annotations/TextAnnotation.cpp
@@ -113,7 +113,7 @@ TextAnnotation::TextAnnotation(ShapeAnnotation *pShapeAnnotation, GraphicsView *
   mpComponent = 0;
   updateShape(pShapeAnnotation);
   setShapeFlags(true);
-  mpGraphicsView->scene()->addItem(this);
+  mpGraphicsView->addItem(this);
   connect(pShapeAnnotation, SIGNAL(updateReferenceShapes()), pShapeAnnotation, SIGNAL(changed()));
   connect(pShapeAnnotation, SIGNAL(added()), this, SLOT(referenceShapeAdded()));
   connect(pShapeAnnotation, SIGNAL(changed()), this, SLOT(referenceShapeChanged()));
@@ -374,7 +374,7 @@ void TextAnnotation::initUpdateTextString()
   if (mpComponent) {
     if (mOriginalTextString.contains("%")) {
       updateTextString();
-      connect(mpComponent->getRootParentComponent(), SIGNAL(componentDisplayTextChanged()), SLOT(updateTextString()), Qt::UniqueConnection);
+      connect(mpComponent->getRootParentComponent(), SIGNAL(displayTextChanged()), SLOT(updateTextString()), Qt::UniqueConnection);
     }
   }
 }