From 2176a3c6c74159b80bc1330572523bd5dbe58f43 Mon Sep 17 00:00:00 2001
From: Adeel Asghar <adeel.asghar@liu.se>
Date: Mon, 26 Oct 2015 00:52:21 +0100
Subject: [PATCH] Update Component instances when new shapes are added to the
 class.

---
 OMEdit/OMEditGUI/Annotations/TextAnnotation.cpp    |  6 +++---
 OMEdit/OMEditGUI/Component/Component.cpp           |  8 +++++---
 OMEdit/OMEditGUI/Modeling/ModelWidgetContainer.cpp | 12 ++++++------
 3 files changed, 14 insertions(+), 12 deletions(-)

diff --git a/OMEdit/OMEditGUI/Annotations/TextAnnotation.cpp b/OMEdit/OMEditGUI/Annotations/TextAnnotation.cpp
index 4d139bfc3dd..a4d23fcdaa9 100644
--- a/OMEdit/OMEditGUI/Annotations/TextAnnotation.cpp
+++ b/OMEdit/OMEditGUI/Annotations/TextAnnotation.cpp
@@ -403,7 +403,7 @@ void TextAnnotation::initUpdateTextString()
   if (mpComponent) {
     if (mOriginalTextString.contains("%")) {
       updateTextString();
-      connect(mpComponent->getRootParentComponent(), SIGNAL(displayTextChanged()), SLOT(updateTextString()), Qt::UniqueConnection);
+      connect(mpComponent, SIGNAL(displayTextChanged()), SLOT(updateTextString()), Qt::UniqueConnection);
     }
   }
 }
@@ -458,10 +458,10 @@ void TextAnnotation::updateTextString()
     return;
   }
   if (mOriginalTextString.toLower().contains("%name")) {
-    mTextString.replace(QRegExp("%name"), mpComponent->getRootParentComponent()->getName());
+    mTextString.replace(QRegExp("%name"), mpComponent->getName());
   }
   if (mOriginalTextString.toLower().contains("%class")) {
-    mTextString.replace(QRegExp("%class"), mpComponent->getRootParentComponent()->getLibraryTreeItem()->getNameStructure());
+    mTextString.replace(QRegExp("%class"), mpComponent->getLibraryTreeItem()->getNameStructure());
   }
   if (!mTextString.contains("%")) {
     return;
diff --git a/OMEdit/OMEditGUI/Component/Component.cpp b/OMEdit/OMEditGUI/Component/Component.cpp
index 28859bd8eb4..27d32e5a2bf 100644
--- a/OMEdit/OMEditGUI/Component/Component.cpp
+++ b/OMEdit/OMEditGUI/Component/Component.cpp
@@ -1005,9 +1005,11 @@ void Component::removeShapes()
     delete pShapeAnnotation;
   }
   mShapesList.clear();
-  mpNonExistingComponentLine->setVisible(false);
-  mpDefaultComponentRectangle->setVisible(false);
-  mpDefaultComponentText->setVisible(false);
+  if (mComponentType == Component::Root) {
+    mpNonExistingComponentLine->setVisible(false);
+    mpDefaultComponentRectangle->setVisible(false);
+    mpDefaultComponentText->setVisible(false);
+  }
 }
 
 void Component::removeComponents()
diff --git a/OMEdit/OMEditGUI/Modeling/ModelWidgetContainer.cpp b/OMEdit/OMEditGUI/Modeling/ModelWidgetContainer.cpp
index 61d20240c10..19f33d2397a 100644
--- a/OMEdit/OMEditGUI/Modeling/ModelWidgetContainer.cpp
+++ b/OMEdit/OMEditGUI/Modeling/ModelWidgetContainer.cpp
@@ -752,9 +752,9 @@ void GraphicsView::createRectangleShape(QPointF point)
     // make the toolbar button of rectangle unchecked
     pMainWindow->getRectangleShapeAction()->setChecked(false);
     pMainWindow->getConnectModeAction()->setChecked(true);
-    mpModelWidget->getLibraryTreeItem()->emitShapeAdded(mpRectangleShapeAnnotation, this);
     mpModelWidget->updateClassAnnotationIfNeeded();
     mpModelWidget->updateModelicaText();
+    mpModelWidget->getLibraryTreeItem()->emitShapeAdded(mpRectangleShapeAnnotation, this);
   }
 }
 
@@ -785,9 +785,9 @@ void GraphicsView::createEllipseShape(QPointF point)
     // make the toolbar button of ellipse unchecked
     pMainWindow->getEllipseShapeAction()->setChecked(false);
     pMainWindow->getConnectModeAction()->setChecked(true);
-    mpModelWidget->getLibraryTreeItem()->emitShapeAdded(mpEllipseShapeAnnotation, this);
     mpModelWidget->updateClassAnnotationIfNeeded();
     mpModelWidget->updateModelicaText();
+    mpModelWidget->getLibraryTreeItem()->emitShapeAdded(mpEllipseShapeAnnotation, this);
   }
 }
 
@@ -818,11 +818,11 @@ void GraphicsView::createTextShape(QPointF point)
     // make the toolbar button of text unchecked
     pMainWindow->getTextShapeAction()->setChecked(false);
     pMainWindow->getConnectModeAction()->setChecked(true);
-    mpModelWidget->getLibraryTreeItem()->emitShapeAdded(mpTextShapeAnnotation, this);
     mpModelWidget->updateClassAnnotationIfNeeded();
     mpModelWidget->updateModelicaText();
     mpTextShapeAnnotation->showShapeProperties();
     mpTextShapeAnnotation->setSelected(true);
+    mpModelWidget->getLibraryTreeItem()->emitShapeAdded(mpTextShapeAnnotation, this);
   }
 }
 
@@ -852,11 +852,11 @@ void GraphicsView::createBitmapShape(QPointF point)
     // make the toolbar button of text unchecked
     pMainWindow->getBitmapShapeAction()->setChecked(false);
     pMainWindow->getConnectModeAction()->setChecked(true);
-    mpModelWidget->getLibraryTreeItem()->emitShapeAdded(mpBitmapShapeAnnotation, this);
     mpModelWidget->updateClassAnnotationIfNeeded();
     mpModelWidget->updateModelicaText();
     mpBitmapShapeAnnotation->showShapeProperties();
     mpBitmapShapeAnnotation->setSelected(true);
+    mpModelWidget->getLibraryTreeItem()->emitShapeAdded(mpBitmapShapeAnnotation, this);
   }
 }
 
@@ -1718,9 +1718,9 @@ void GraphicsView::mouseDoubleClickEvent(QMouseEvent *event)
     // make the toolbar button of line unchecked
     pMainWindow->getLineShapeAction()->setChecked(false);
     pMainWindow->getConnectModeAction()->setChecked(true);
-    mpModelWidget->getLibraryTreeItem()->emitShapeAdded(mpLineShapeAnnotation, this);
     mpModelWidget->updateClassAnnotationIfNeeded();
     mpModelWidget->updateModelicaText();
+    mpModelWidget->getLibraryTreeItem()->emitShapeAdded(mpLineShapeAnnotation, this);
     return;
   } else if (isCreatingPolygonShape()) {
     // finish creating the polygon
@@ -1736,9 +1736,9 @@ void GraphicsView::mouseDoubleClickEvent(QMouseEvent *event)
     // make the toolbar button of polygon unchecked
     pMainWindow->getPolygonShapeAction()->setChecked(false);
     pMainWindow->getConnectModeAction()->setChecked(true);
-    mpModelWidget->getLibraryTreeItem()->emitShapeAdded(mpPolygonShapeAnnotation, this);
     mpModelWidget->updateClassAnnotationIfNeeded();
     mpModelWidget->updateModelicaText();
+    mpModelWidget->getLibraryTreeItem()->emitShapeAdded(mpPolygonShapeAnnotation, this);
     return;
   }
   ShapeAnnotation *pShapeAnnotation = dynamic_cast<ShapeAnnotation*>(itemAt(event->pos()));