Make External model useful for meta modeling.

Delete the OriginItem when the component is deleted.
OpenModelica · Jun 4, 2015 · 0fa0c95 · 0fa0c95
1 parent fb6b73c
commit 0fa0c95
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 13 deletions.
diff --git a/OMEdit/OMEditGUI/Component/Component.cpp b/OMEdit/OMEditGUI/Component/Component.cpp
@@ -52,15 +52,20 @@ Component::Component(QString annotation, QString name, QString className, Compon
   mComponentType = Component::Root;
   initialize();
   setComponentFlags(true);
-  getClassInheritedComponents(true);
-  parseAnnotationString(annotation);
-  /* if component doesn't exists show it as red cross box. */
-  if (!mpOMCProxy->existClass(className)) {
-    parseAnnotationString(Helper::errorComponentAnnotationString);
-  } else if (canUseDefaultAnnotation(this)) { /* if component doesn't have any annotation then assign it a default one. */
+  if (mpGraphicsView->getModelWidget()->getLibraryTreeNode()->getLibraryType() == LibraryTreeNode::TLM) {
+    mType = StringHandler::Connector;
     parseAnnotationString(Helper::defaultComponentAnnotationString);
+  } else {
+    getClassInheritedComponents(true);
+    parseAnnotationString(annotation);
+    /* if component doesn't exists show it as red cross box. */
+    if (!mpOMCProxy->existClass(className)) {
+      parseAnnotationString(Helper::errorComponentAnnotationString);
+    } else if (canUseDefaultAnnotation(this)) { /* if component doesn't have any annotation then assign it a default one. */
+      parseAnnotationString(Helper::defaultComponentAnnotationString);
+    }
+    getClassComponents();
   }
-  getClassComponents();
   // transformation
   mpTransformation = new Transformation(mpGraphicsView->getViewType());
   mpTransformation->parseTransformationString(transformation, boundingRect().width(), boundingRect().height());
@@ -1043,6 +1048,7 @@ void Component::deleteMe()
   // delete the component from model
   mpGraphicsView->deleteComponentObject(this);
   deleteLater();
+  delete mpOriginItem;
   // make the model modified
   mpGraphicsView->getModelWidget()->setModelModified();
   /* When something is deleted from the icon layer then update the LibraryTreeNode in the Library Browser */

diff --git a/OMEdit/OMEditGUI/Modeling/ModelWidgetContainer.cpp b/OMEdit/OMEditGUI/Modeling/ModelWidgetContainer.cpp
@@ -449,12 +449,6 @@ bool GraphicsView::addComponent(QString className, QPointF position)
           mpModelWidget->getIconGraphicsView()->addComponentToView(name, className, "", position, new ComponentInfo(""), type);
           /* When something is added in the icon layer then update the LibraryTreeNode in the Library Browser */
           pMainWindow->getLibraryTreeWidget()->loadLibraryComponent(mpModelWidget->getLibraryTreeNode());
-        } else if(mpModelWidget->getLibraryTreeNode()->getLibraryType()== LibraryTreeNode::TLM) {
-          type = StringHandler::Connector;
-          addComponentToView(name, className, "", position, 0, type, false);
-          mpModelWidget->getIconGraphicsView()->addComponentToView(name, className, "", position, new ComponentInfo(""), type);
-          /* When something is added in the icon layer then update the LibraryTreeNode in the Library Browser */
-          pMainWindow->getLibraryTreeWidget()->loadLibraryComponent(mpModelWidget->getLibraryTreeNode());
         } else {
           addComponentToView(name, className, "", position, new ComponentInfo(""), type);
         }