- Fixed connect equation indexing problem (thanks to Henning Kiel).

- Properly check annotations before creating a redbox. git-svn-id: https://openmodelica.org/svn/OpenModelica/trunk@11752 f25d12d1-65f4-0310-ae8a-bbce733d8d8e
OpenModelica · Apr 13, 2012 · 008244d · 008244d
1 parent 4c880a2
commit 008244d
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 7 deletions.
diff --git a/OMEdit/OMEditGUI/Component.cpp b/OMEdit/OMEditGUI/Component.cpp
@@ -756,21 +756,20 @@ bool Component::canDrawRedBox(Component *pComponent)
     draw = true;
   else
     return false;
-
-  foreach (Component *pChildComponent, mpComponentsList)
+  // check components list
+  foreach (Component *pChildComponent, pComponent->mpComponentsList)
   {
     draw = canDrawRedBox(pChildComponent);
     if (!draw)
-      break;
+      return draw;    // return whenever we get false
   }
-
-  foreach (Component *pInheritedComponent, mpInheritanceList)
+  // check inherited components list
+  foreach (Component *pInheritedComponent, pComponent->mpInheritanceList)
   {
     draw = canDrawRedBox(pInheritedComponent);
     if (!draw)
-      break;
+      return draw;    // return whenever we get false
   }
-
   return draw;
 }
 

diff --git a/OMEdit/OMEditGUI/ConnectorWidget.cpp b/OMEdit/OMEditGUI/ConnectorWidget.cpp
@@ -93,6 +93,8 @@ Connector::Connector(Component *pStartPort, Component *pEndPort, GraphicsView *p
   }
 
   mEndComponentConnected = true;
+  mStartConnectorIsArray = false;
+  mEndConnectorIsArray = false;
   emit endComponentConnected();
   setPassive();
   if (mpEndComponent->mpParentComponent)