- fixed getIconAnnotation and getDiagramAnnotation to get rid of the empty component:

  before: {x1,y1,x2,y2,,{graphics_elements}}
  after:  {x1,y1,x2,y2,{graphics_elements}}

  

git-svn-id: https://openmodelica.org/svn/OpenModelica/trunk@3828 f25d12d1-65f4-0310-ae8a-bbce733d8d8e

Author: adrpo

Compiler/DAE.mo

@@ -3471,6 +3471,12 @@ algorithm
       Option<Absyn.Comment> comment;
       Absyn.InnerOuter io;
       Types.Type tp;
+    /* adrpo: filter out records! */
+    case ((x as VAR(ty = RECORD(_))) :: lst)
+      equation
+        res = getVariableList(lst);
+      then
+        (res);      
     case ((x as VAR(_,_,_,_,_,_,_,_,_,_,_,_,_,_)) :: lst)
       equation
         res = getVariableList(lst);

Compiler/Interactive.mo

@@ -13125,7 +13125,11 @@ algorithm
         (_,mod_2) = Mod.elabMod(Env.emptyCache,env, Prefix.NOPRE(), mod_1, true);
         (_,dae,_,cs,t,state) = Inst.instClass(Env.emptyCache,env, mod_2, Prefix.NOPRE(), Connect.emptySet,
           placementclass, {}, false, Inst.TOP_CALL());
+        //debug_print("dae", dae);        
+        //print("before:\n"); print(intString(listLength(dae))); print(" "); DAE.dump(DAE.DAE(dae)); print(Print.getString()); print ("\n");
         dae_1 = Inst.initVarsModelicaOutput(dae) "Put bindings of variables as expressions inside variable elements of the dae instead of equations" ;
+        //debug_print("dae_1", dae_1);
+        //print("after:\n"); print(intString(listLength(dae_1))); print(" "); DAE.dump(DAE.DAE(dae_1)); print(Print.getString()); print ("\n");
         str = DAE.getVariableBindingsStr(dae_1);
       then
         str;