Changeset f0d262f in OpenModelica

Timestamp:

2015-10-13T14:45:28+02:00 (9 years ago)

Author:

Adeel Asghar <adeel.asghar@…>

Branches:

Added-citation-metadata, maintenance/v1.14, maintenance/v1.15, maintenance/v1.16, 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:

4a71f04

Parents:

a777e79

Message:

Mark the model modified when component is removed. Properly check if Icon view has annotation or not.

File:

• OMEdit/OMEditGUI/Modeling/ModelWidgetContainer.cpp (modified) (2 diffs)

OMEdit/OMEditGUI/Modeling/ModelWidgetContainer.cpp

@@ -576 +576 @@
     pTLMEditor->deleteSubModel(pComponent->getName());
   }
+  // make the model modified
+  mpModelWidget->setModelModified();
 }
 
@@ -1075 +1077 @@
 {
   foreach (ModelWidget::InheritedClass *pInheritedClass, mpModelWidget->getInheritedClassesList()) {
-    if (mViewType == StringHandler::Icon && pInheritedClass->mIconShapesList.size() > 0) {
+    if (mViewType == StringHandler::Icon) {
+      if (pInheritedClass->mIconShapesList.size() > 0) {
+        return true;
+      } else {
+        foreach (Component *pInheritedComponent, pInheritedClass->mIconComponentsList) {
+          if (pInheritedComponent->hasShapeAnnotation(pInheritedComponent)) {
+            return true;
+          }
+        }
+      }
+    } else if (mViewType == StringHandler::Diagram && pInheritedClass->mDiagramShapesList.size() > 0) {
       return true;
-    } else if (mViewType == StringHandler::Diagram && pInheritedClass->mDiagramShapesList.size() > 0) {
-
     }
   }