Changeset 0e102be in OpenModelica for testsuite/openmodelica/interactive-API/interactive_api_annotations.mos

Timestamp:

2019-05-21T20:56:19+02:00 (5 years ago)

Author:

Adrian Pop <adrian.pop@…>

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:

2c90ef26, 38bb5e0, 4199f2d, 9dd81ea, e2eee3d

Parents:

ad11e88

git-author:

Adrian Pop <adrian.pop@…> (05/20/19 15:16:11)

git-committer:

Adrian Pop <adrian.pop@…> (05/21/19 20:56:19)

Message:

• more API using the NF
• fix ticket:5482 handle getIconAnnotation and getDiagramAnnotation via the NF
• cache results of the NF instantiation
• better fix for ticket:5484
• change annotation Text record to have defaults for fontName and testStyle
• update tests due to changes to Text annotation

File:

• testsuite/openmodelica/interactive-API/interactive_api_annotations.mos (modified) (119 diffs)

testsuite/openmodelica/interactive-API/interactive_api_annotations.mos

@@ -7994 +7994 @@
 // ""
 // Evaluating: getIconAnnotation(Modelica.Electrical.Analog.Basic.SaturatingInductor)
-// {-100.0,-100.0,100.0,100.0,true,0.1,2.0,2.0,{Ellipse(true, {0.0, 0.0}, 0, {0, 0, 255}, {0, 0, 0}, LinePattern.Solid, FillPattern.None, 0.25, {{-60, -15}, {-30, 15}}, 0, 360), Ellipse(true, {0.0, 0.0}, 0, {0, 0, 255}, {0, 0, 0}, LinePattern.Solid, FillPattern.None, 0.25, {{-30, -15}, {0, 15}}, 0, 360), Ellipse(true, {0.0, 0.0}, 0, {0, 0, 255}, {0, 0, 0}, LinePattern.Solid, FillPattern.None, 0.25, {{0, -15}, {30, 15}}, 0, 360), Ellipse(true, {0.0, 0.0}, 0, {0, 0, 255}, {0, 0, 0}, LinePattern.Solid, FillPattern.None, 0.25, {{30, -15}, {60, 15}}, 0, 360), Rectangle(true, {0.0, 0.0}, 0, {255, 255, 255}, {255, 255, 255}, LinePattern.Solid, FillPattern.Solid, 0.25, BorderPattern.None, {{-60, -20}, {62, 0}}, 0), Line(true, {0.0, 0.0}, 0, {{60, 0}, {90, 0}}, {0, 0, 255}, LinePattern.Solid, 0.25, {Arrow.None, Arrow.None}, 3, Smooth.None), Line(true, {0.0, 0.0}, 0, {{-90, 0}, {-60, 0}}, {0, 0, 255}, LinePattern.Solid, 0.25, {Arrow.None, Arrow.None}, 3, Smooth.None), Rectangle(true, {0.0, 0.0}, 0, {0, 0, 0}, {0, 0, 255}, LinePattern.Solid, FillPattern.Sphere, 0.25, BorderPattern.None, {{-60, -10}, {60, -20}}, 0), Text(true, {0.0, 0.0}, 0, {0, 0, 0}, {0, 0, 0}, LinePattern.Solid, FillPattern.None, 0.25, {{-148, -50}, {152, -80}}, "Lnom=%Lnom", 0, {-1, -1, -1}, TextAlignment.Center), Text(true, {0.0, 0.0}, 0, {0, 0, 255}, {0, 0, 0}, LinePattern.Solid, FillPattern.None, 0.25, {{-148, 91}, {152, 51}}, "%name", 0, {-1, -1, -1}, TextAlignment.Center)}}
+// {-100.0,-100.0,100.0,100.0,true,0.1,2.0,2.0,{Ellipse(true, {0.0, 0.0}, 0, {0, 0, 255}, {0, 0, 0}, LinePattern.Solid, FillPattern.None, 0.25, {{-60, -15}, {-30, 15}}, 0, 360), Ellipse(true, {0.0, 0.0}, 0, {0, 0, 255}, {0, 0, 0}, LinePattern.Solid, FillPattern.None, 0.25, {{-30, -15}, {0, 15}}, 0, 360), Ellipse(true, {0.0, 0.0}, 0, {0, 0, 255}, {0, 0, 0}, LinePattern.Solid, FillPattern.None, 0.25, {{0, -15}, {30, 15}}, 0, 360), Ellipse(true, {0.0, 0.0}, 0, {0, 0, 255}, {0, 0, 0}, LinePattern.Solid, FillPattern.None, 0.25, {{30, -15}, {60, 15}}, 0, 360), Rectangle(true, {0.0, 0.0}, 0, {255, 255, 255}, {255, 255, 255}, LinePattern.Solid, FillPattern.Solid, 0.25, BorderPattern.None, {{-60, -20}, {62, 0}}, 0), Line(true, {0.0, 0.0}, 0, {{60, 0}, {90, 0}}, {0, 0, 255}, LinePattern.Solid, 0.25, {Arrow.None, Arrow.None}, 3, Smooth.None), Line(true, {0.0, 0.0}, 0, {{-90, 0}, {-60, 0}}, {0, 0, 255}, LinePattern.Solid, 0.25, {Arrow.None, Arrow.None}, 3, Smooth.None), Rectangle(true, {0.0, 0.0}, 0, {0, 0, 0}, {0, 0, 255}, LinePattern.Solid, FillPattern.Sphere, 0.25, BorderPattern.None, {{-60, -10}, {60, -20}}, 0), Text(true, {0.0, 0.0}, 0, {0, 0, 0}, {0, 0, 0}, LinePattern.Solid, FillPattern.None, 0.25, {{-148, -50}, {152, -80}}, "Lnom=%Lnom", 0, {-1, -1, -1}, "", {}, TextAlignment.Center), Text(true, {0.0, 0.0}, 0, {0, 0, 255}, {0, 0, 0}, LinePattern.Solid, FillPattern.None, 0.25, {{-148, 91}, {152, 51}}, "%name", 0, {-1, -1, -1}, "", {}, TextAlignment.Center)}}
 // Evaluating: getErrorString()
 // ""
@@ -8039 +8039 @@
 // ""
 // Evaluating: getIconAnnotation(Modelica.Electrical.Analog.Basic.Resistor)
-// {-100.0,-100.0,100.0,100.0,true,0.1,2.0,2.0,{Rectangle(true, {0.0, 0.0}, 0, {0, 0, 255}, {255, 255, 255}, LinePattern.Solid, FillPattern.Solid, 0.25, BorderPattern.None, {{-70, 30}, {70, -30}}, 0), Line(true, {0.0, 0.0}, 0, {{-90, 0}, {-70, 0}}, {0, 0, 255}, LinePattern.Solid, 0.25, {Arrow.None, Arrow.None}, 3, Smooth.None), Line(true, {0.0, 0.0}, 0, {{70, 0}, {90, 0}}, {0, 0, 255}, LinePattern.Solid, 0.25, {Arrow.None, Arrow.None}, 3, Smooth.None), Text(true, {0.0, 0.0}, 0, {0, 0, 0}, {0, 0, 0}, LinePattern.Solid, FillPattern.None, 0.25, {{-144, -40}, {142, -72}}, "R=%R", 0, {-1, -1, -1}, TextAlignment.Center), Line(false, {0.0, 0.0}, 0, {{0, -100}, {0, -30}}, {127, 0, 0}, LinePattern.Dot, 0.25, {Arrow.None, Arrow.None}, 3, Smooth.None), Text(true, {0.0, 0.0}, 0, {0, 0, 255}, {0, 0, 0}, LinePattern.Solid, FillPattern.None, 0.25, {{-152, 87}, {148, 47}}, "%name", 0, {-1, -1, -1}, TextAlignment.Center)}}
+// {-100.0,-100.0,100.0,100.0,true,0.1,2.0,2.0,{Rectangle(true, {0.0, 0.0}, 0, {0, 0, 255}, {255, 255, 255}, LinePattern.Solid, FillPattern.Solid, 0.25, BorderPattern.None, {{-70, 30}, {70, -30}}, 0), Line(true, {0.0, 0.0}, 0, {{-90, 0}, {-70, 0}}, {0, 0, 255}, LinePattern.Solid, 0.25, {Arrow.None, Arrow.None}, 3, Smooth.None), Line(true, {0.0, 0.0}, 0, {{70, 0}, {90, 0}}, {0, 0, 255}, LinePattern.Solid, 0.25, {Arrow.None, Arrow.None}, 3, Smooth.None), Text(true, {0.0, 0.0}, 0, {0, 0, 0}, {0, 0, 0}, LinePattern.Solid, FillPattern.None, 0.25, {{-144, -40}, {142, -72}}, "R=%R", 0, {-1, -1, -1}, "", {}, TextAlignment.Center), Line(false, {0.0, 0.0}, 0, {{0, -100}, {0, -30}}, {127, 0, 0}, LinePattern.Dot, 0.25, {Arrow.None, Arrow.None}, 3, Smooth.None), Text(true, {0.0, 0.0}, 0, {0, 0, 255}, {0, 0, 0}, LinePattern.Solid, FillPattern.None, 0.25, {{-152, 87}, {148, 47}}, "%name", 0, {-1, -1, -1}, "", {}, TextAlignment.Center)}}
 // Evaluating: getErrorString()
 // ""
@@ -8070 +8070 @@
 // ""
 // Evaluating: getIconAnnotation(Modelica.Electrical.Analog.Basic.HeatingResistor)
-// {-100.0,-100.0,100.0,100.0,true,0.1,2.0,2.0,{Line(true, {0.0, 0.0}, 0, {{-90, 0}, {-70, 0}}, {0, 0, 255}, LinePattern.Solid, 0.25, {Arrow.None, Arrow.None}, 3, Smooth.None), Line(true, {0.0, 0.0}, 0, {{70, 0}, {90, 0}}, {0, 0, 255}, LinePattern.Solid, 0.25, {Arrow.None, Arrow.None}, 3, Smooth.None), Rectangle(true, {0.0, 0.0}, 0, {0, 0, 255}, {255, 255, 255}, LinePattern.Solid, FillPattern.Solid, 0.25, BorderPattern.None, {{-70, 30}, {70, -30}}, 0), Line(true, {0.0, 0.0}, 0, {{-52, -50}, {48, 50}}, {0, 0, 255}, LinePattern.Solid, 0.25, {Arrow.None, Arrow.None}, 3, Smooth.None), Polygon(true, {0.0, 0.0}, 0, {0, 0, 255}, {0, 0, 255}, LinePattern.Solid, FillPattern.Solid, 0.25, {{40, 52}, {50, 42}, {54, 56}, {40, 52}}, Smooth.None), Line(true, {0.0, 0.0}, 0, {{0, -100}, {0, -30}}, {127, 0, 0}, LinePattern.Dot, 0.25, {Arrow.None, Arrow.None}, 3, Smooth.None), Text(true, {0.0, 0.0}, 0, {0, 0, 255}, {0, 0, 0}, LinePattern.Solid, FillPattern.None, 0.25, {{-156, 109}, {144, 69}}, "%name", 0, {-1, -1, -1}, TextAlignment.Center)}}
+// {-100.0,-100.0,100.0,100.0,true,0.1,2.0,2.0,{Line(true, {0.0, 0.0}, 0, {{-90, 0}, {-70, 0}}, {0, 0, 255}, LinePattern.Solid, 0.25, {Arrow.None, Arrow.None}, 3, Smooth.None), Line(true, {0.0, 0.0}, 0, {{70, 0}, {90, 0}}, {0, 0, 255}, LinePattern.Solid, 0.25, {Arrow.None, Arrow.None}, 3, Smooth.None), Rectangle(true, {0.0, 0.0}, 0, {0, 0, 255}, {255, 255, 255}, LinePattern.Solid, FillPattern.Solid, 0.25, BorderPattern.None, {{-70, 30}, {70, -30}}, 0), Line(true, {0.0, 0.0}, 0, {{-52, -50}, {48, 50}}, {0, 0, 255}, LinePattern.Solid, 0.25, {Arrow.None, Arrow.None}, 3, Smooth.None), Polygon(true, {0.0, 0.0}, 0, {0, 0, 255}, {0, 0, 255}, LinePattern.Solid, FillPattern.Solid, 0.25, {{40, 52}, {50, 42}, {54, 56}, {40, 52}}, Smooth.None), Line(true, {0.0, 0.0}, 0, {{0, -100}, {0, -30}}, {127, 0, 0}, LinePattern.Dot, 0.25, {Arrow.None, Arrow.None}, 3, Smooth.None), Text(true, {0.0, 0.0}, 0, {0, 0, 255}, {0, 0, 0}, LinePattern.Solid, FillPattern.None, 0.25, {{-156, 109}, {144, 69}}, "%name", 0, {-1, -1, -1}, "", {}, TextAlignment.Center)}}
 // Evaluating: getErrorString()
 // ""
 // Evaluating: getDiagramAnnotation(Modelica.Electrical.Analog.Basic.HeatingResistor)
-// {-100.0,-100.0,100.0,100.0,true,0.1,2.0,2.0,{Line(true, {0.0, 0.0}, 0, {{-110, 20}, {-85, 20}}, {160, 160, 164}, LinePattern.Solid, 0.25, {Arrow.None, Arrow.None}, 3, Smooth.None), Polygon(true, {0.0, 0.0}, 0, {160, 160, 164}, {160, 160, 164}, LinePattern.Solid, FillPattern.Solid, 0.25, {{-95, 23}, {-85, 20}, {-95, 17}, {-95, 23}}, Smooth.None), Line(true, {0.0, 0.0}, 0, {{90, 20}, {115, 20}}, {160, 160, 164}, LinePattern.Solid, 0.25, {Arrow.None, Arrow.None}, 3, Smooth.None), Line(true, {0.0, 0.0}, 0, {{-125, 0}, {-115, 0}}, {160, 160, 164}, LinePattern.Solid, 0.25, {Arrow.None, Arrow.None}, 3, Smooth.None), Line(true, {0.0, 0.0}, 0, {{-120, -5}, {-120, 5}}, {160, 160, 164}, LinePattern.Solid, 0.25, {Arrow.None, Arrow.None}, 3, Smooth.None), Text(true, {0.0, 0.0}, 0, {160, 160, 164}, {0, 0, 0}, LinePattern.Solid, FillPattern.None, 0.25, {{-110, 25}, {-90, 45}}, "i", 0, {-1, -1, -1}, TextAlignment.Center), Polygon(true, {0.0, 0.0}, 0, {160, 160, 164}, {160, 160, 164}, LinePattern.Solid, FillPattern.Solid, 0.25, {{105, 23}, {115, 20}, {105, 17}, {105, 23}}, Smooth.None), Line(true, {0.0, 0.0}, 0, {{115, 0}, {125, 0}}, {160, 160, 164}, LinePattern.Solid, 0.25, {Arrow.None, Arrow.None}, 3, Smooth.None), Text(true, {0.0, 0.0}, 0, {160, 160, 164}, {0, 0, 0}, LinePattern.Solid, FillPattern.None, 0.25, {{90, 45}, {110, 25}}, "i", 0, {-1, -1, -1}, TextAlignment.Center)}}
+// {-100.0,-100.0,100.0,100.0,true,0.1,2.0,2.0,{Line(true, {0.0, 0.0}, 0, {{-110, 20}, {-85, 20}}, {160, 160, 164}, LinePattern.Solid, 0.25, {Arrow.None, Arrow.None}, 3, Smooth.None), Polygon(true, {0.0, 0.0}, 0, {160, 160, 164}, {160, 160, 164}, LinePattern.Solid, FillPattern.Solid, 0.25, {{-95, 23}, {-85, 20}, {-95, 17}, {-95, 23}}, Smooth.None), Line(true, {0.0, 0.0}, 0, {{90, 20}, {115, 20}}, {160, 160, 164}, LinePattern.Solid, 0.25, {Arrow.None, Arrow.None}, 3, Smooth.None), Line(true, {0.0, 0.0}, 0, {{-125, 0}, {-115, 0}}, {160, 160, 164}, LinePattern.Solid, 0.25, {Arrow.None, Arrow.None}, 3, Smooth.None), Line(true, {0.0, 0.0}, 0, {{-120, -5}, {-120, 5}}, {160, 160, 164}, LinePattern.Solid, 0.25, {Arrow.None, Arrow.None}, 3, Smooth.None), Text(true, {0.0, 0.0}, 0, {160, 160, 164}, {0, 0, 0}, LinePattern.Solid, FillPattern.None, 0.25, {{-110, 25}, {-90, 45}}, "i", 0, {-1, -1, -1}, "", {}, TextAlignment.Center), Polygon(true, {0.0, 0.0}, 0, {160, 160, 164}, {160, 160, 164}, LinePattern.Solid, FillPattern.Solid, 0.25, {{105, 23}, {115, 20}, {105, 17}, {105, 23}}, Smooth.None), Line(true, {0.0, 0.0}, 0, {{115, 0}, {125, 0}}, {160, 160, 164}, LinePattern.Solid, 0.25, {Arrow.None, Arrow.None}, 3, Smooth.None), Text(true, {0.0, 0.0}, 0, {160, 160, 164}, {0, 0, 0}, LinePattern.Solid, FillPattern.None, 0.25, {{90, 45}, {110, 25}}, "i", 0, {-1, -1, -1}, "", {}, TextAlignment.Center)}}
 // Evaluating: getErrorString()
 // ""
@@ -8115 +8115 @@
 // ""
 // Evaluating: getIconAnnotation(Modelica.Electrical.Analog.Basic.EMF)
-// {-100.0,-100.0,100.0,100.0,true,0.1,1.0,1.0,{Rectangle(true, {0.0, 0.0}, 0, {0, 0, 0}, {192, 192, 192}, LinePattern.Solid, FillPattern.HorizontalCylinder, 0.25, BorderPattern.None, {{-85, 10}, {-36, -10}}, 0), Line(true, {0.0, 0.0}, 0, {{0, 90}, {0, 40}}, {0, 0, 255}, LinePattern.Solid, 0.25, {Arrow.None, Arrow.None}, 3, Smooth.None), Rectangle(true, {0.0, 0.0}, 0, {0, 0, 0}, {192, 192, 192}, LinePattern.Solid, FillPattern.HorizontalCylinder, 0.25, BorderPattern.None, {{35, 10}, {100, -10}}, 0), Ellipse(true, {0.0, 0.0}, 0, {0, 0, 255}, {255, 255, 255}, LinePattern.Solid, FillPattern.Solid, 0.25, {{-40, 40}, {40, -40}}, 0, 360), Line(true, {0.0, 0.0}, 0, {{0, -90}, {0, -40}}, {0, 0, 255}, LinePattern.Solid, 0.25, {Arrow.None, Arrow.None}, 3, Smooth.None), Text(true, {0.0, 0.0}, 0, {0, 0, 255}, {0, 0, 0}, LinePattern.Solid, FillPattern.None, 0.25, {{0, -50}, {199, -90}}, "%name", 0, {-1, -1, -1}, TextAlignment.Center), Text(true, {0.0, 0.0}, 0, {160, 160, 164}, {0, 0, 0}, LinePattern.Solid, FillPattern.None, 0.25, {{0, 80}, {189, 46}}, "k=%k", 0, {-1, -1, -1}, TextAlignment.Center), Line(true, {0.0, 0.0}, 0, {{-100, -30}, {-40, -30}}, {0, 0, 0}, LinePattern.Solid, 0.25, {Arrow.None, Arrow.None}, 3, Smooth.None), Line(true, {0.0, 0.0}, 0, {{-100, -50}, {-80, -30}}, {0, 0, 0}, LinePattern.Solid, 0.25, {Arrow.None, Arrow.None}, 3, Smooth.None), Line(true, {0.0, 0.0}, 0, {{-80, -50}, {-60, -30}}, {0, 0, 0}, LinePattern.Solid, 0.25, {Arrow.None, Arrow.None}, 3, Smooth.None), Line(true, {0.0, 0.0}, 0, {{-60, -50}, {-40, -30}}, {0, 0, 0}, LinePattern.Solid, 0.25, {Arrow.None, Arrow.None}, 3, Smooth.None), Line(true, {0.0, 0.0}, 0, {{-70, -30}, {-70, -10}}, {0, 0, 0}, LinePattern.Solid, 0.25, {Arrow.None, Arrow.None}, 3, Smooth.None)}}
+// {-100.0,-100.0,100.0,100.0,true,0.1,1.0,1.0,{Rectangle(true, {0.0, 0.0}, 0, {0, 0, 0}, {192, 192, 192}, LinePattern.Solid, FillPattern.HorizontalCylinder, 0.25, BorderPattern.None, {{-85, 10}, {-36, -10}}, 0), Line(true, {0.0, 0.0}, 0, {{0, 90}, {0, 40}}, {0, 0, 255}, LinePattern.Solid, 0.25, {Arrow.None, Arrow.None}, 3, Smooth.None), Rectangle(true, {0.0, 0.0}, 0, {0, 0, 0}, {192, 192, 192}, LinePattern.Solid, FillPattern.HorizontalCylinder, 0.25, BorderPattern.None, {{35, 10}, {100, -10}}, 0), Ellipse(true, {0.0, 0.0}, 0, {0, 0, 255}, {255, 255, 255}, LinePattern.Solid, FillPattern.Solid, 0.25, {{-40, 40}, {40, -40}}, 0, 360), Line(true, {0.0, 0.0}, 0, {{0, -90}, {0, -40}}, {0, 0, 255}, LinePattern.Solid, 0.25, {Arrow.None, Arrow.None}, 3, Smooth.None), Text(true, {0.0, 0.0}, 0, {0, 0, 255}, {0, 0, 0}, LinePattern.Solid, FillPattern.None, 0.25, {{0, -50}, {199, -90}}, "%name", 0, {-1, -1, -1}, "", {}, TextAlignment.Center), Text(true, {0.0, 0.0}, 0, {160, 160, 164}, {0, 0, 0}, LinePattern.Solid, FillPattern.None, 0.25, {{0, 80}, {189, 46}}, "k=%k", 0, {-1, -1, -1}, "", {}, TextAlignment.Center), Line(true, {0.0, 0.0}, 0, {{-100, -30}, {-40, -30}}, {0, 0, 0}, LinePattern.Solid, 0.25, {Arrow.None, Arrow.None}, 3, Smooth.None), Line(true, {0.0, 0.0}, 0, {{-100, -50}, {-80, -30}}, {0, 0, 0}, LinePattern.Solid, 0.25, {Arrow.None, Arrow.None}, 3, Smooth.None), Line(true, {0.0, 0.0}, 0, {{-80, -50}, {-60, -30}}, {0, 0, 0}, LinePattern.Solid, 0.25, {Arrow.None, Arrow.None}, 3, Smooth.None), Line(true, {0.0, 0.0}, 0, {{-60, -50}, {-40, -30}}, {0, 0, 0}, LinePattern.Solid, 0.25, {Arrow.None, Arrow.None}, 3, Smooth.None), Line(true, {0.0, 0.0}, 0, {{-70, -30}, {-70, -10}}, {0, 0, 0}, LinePattern.Solid, 0.25, {Arrow.None, Arrow.None}, 3, Smooth.None)}}
 // Evaluating: getErrorString()
 // ""
 // Evaluating: getDiagramAnnotation(Modelica.Electrical.Analog.Basic.EMF)
-// {-100.0,-100.0,100.0,100.0,true,0.1,1.0,1.0,{Polygon(true, {0.0, 0.0}, 0, {160, 160, 164}, {160, 160, 164}, LinePattern.Solid, FillPattern.Solid, 0.25, {{-17, 95}, {-20, 85}, {-23, 95}, {-17, 95}}, Smooth.None), Line(true, {0.0, 0.0}, 0, {{-20, 110}, {-20, 85}}, {160, 160, 164}, LinePattern.Solid, 0.25, {Arrow.None, Arrow.None}, 3, Smooth.None), Text(true, {0.0, 0.0}, 0, {160, 160, 164}, {0, 0, 0}, LinePattern.Solid, FillPattern.None, 0.25, {{-40, 110}, {-30, 90}}, "i", 0, {-1, -1, -1}, TextAlignment.Center), Line(true, {0.0, 0.0}, 0, {{9, 75}, {19, 75}}, {192, 192, 192}, LinePattern.Solid, 0.25, {Arrow.None, Arrow.None}, 3, Smooth.None), Line(true, {0.0, 0.0}, 0, {{-20, -110}, {-20, -85}}, {160, 160, 164}, LinePattern.Solid, 0.25, {Arrow.None, Arrow.None}, 3, Smooth.None), Polygon(true, {0.0, 0.0}, 0, {160, 160, 164}, {160, 160, 164}, LinePattern.Solid, FillPattern.Solid, 0.25, {{-17, -100}, {-20, -110}, {-23, -100}, {-17, -100}}, Smooth.None), Text(true, {0.0, 0.0}, 0, {160, 160, 164}, {0, 0, 0}, LinePattern.Solid, FillPattern.None, 0.25, {{-40, -110}, {-30, -90}}, "i", 0, {-1, -1, -1}, TextAlignment.Center), Line(true, {0.0, 0.0}, 0, {{8, -79}, {18, -79}}, {192, 192, 192}, LinePattern.Solid, 0.25, {Arrow.None, Arrow.None}, 3, Smooth.None), Line(true, {0.0, 0.0}, 0, {{14, 80}, {14, 70}}, {192, 192, 192}, LinePattern.Solid, 0.25, {Arrow.None, Arrow.None}, 3, Smooth.None)}}
+// {-100.0,-100.0,100.0,100.0,true,0.1,1.0,1.0,{Polygon(true, {0.0, 0.0}, 0, {160, 160, 164}, {160, 160, 164}, LinePattern.Solid, FillPattern.Solid, 0.25, {{-17, 95}, {-20, 85}, {-23, 95}, {-17, 95}}, Smooth.None), Line(true, {0.0, 0.0}, 0, {{-20, 110}, {-20, 85}}, {160, 160, 164}, LinePattern.Solid, 0.25, {Arrow.None, Arrow.None}, 3, Smooth.None), Text(true, {0.0, 0.0}, 0, {160, 160, 164}, {0, 0, 0}, LinePattern.Solid, FillPattern.None, 0.25, {{-40, 110}, {-30, 90}}, "i", 0, {-1, -1, -1}, "", {}, TextAlignment.Center), Line(true, {0.0, 0.0}, 0, {{9, 75}, {19, 75}}, {192, 192, 192}, LinePattern.Solid, 0.25, {Arrow.None, Arrow.None}, 3, Smooth.None), Line(true, {0.0, 0.0}, 0, {{-20, -110}, {-20, -85}}, {160, 160, 164}, LinePattern.Solid, 0.25, {Arrow.None, Arrow.None}, 3, Smooth.None), Polygon(true, {0.0, 0.0}, 0, {160, 160, 164}, {160, 160, 164}, LinePattern.Solid, FillPattern.Solid, 0.25, {{-17, -100}, {-20, -110}, {-23, -100}, {-17, -100}}, Smooth.None), Text(true, {0.0, 0.0}, 0, {160, 160, 164}, {0, 0, 0}, LinePattern.Solid, FillPattern.None, 0.25, {{-40, -110}, {-30, -90}}, "i", 0, {-1, -1, -1}, "", {}, TextAlignment.Center), Line(true, {0.0, 0.0}, 0, {{8, -79}, {18, -79}}, {192, 192, 192}, LinePattern.Solid, 0.25, {Arrow.None, Arrow.None}, 3, Smooth.None), Line(true, {0.0, 0.0}, 0, {{14, 80}, {14, 70}}, {192, 192, 192}, LinePattern.Solid, 0.25, {Arrow.None, Arrow.None}, 3, Smooth.None)}}
 // Evaluating: getErrorString()
 // ""
@@ -8135 +8135 @@
 // ""
 // Evaluating: getIconAnnotation(Modelica.Electrical.Analog.Basic.Conductor)
-// {-100.0,-100.0,100.0,100.0,true,0.1,2.0,2.0,{Rectangle(true, {0.0, 0.0}, 0, {0, 0, 255}, {255, 255, 255}, LinePattern.Solid, FillPattern.Solid, 0.25, BorderPattern.None, {{-70, 30}, {70, -30}}, 0), Rectangle(true, {0.0, 0.0}, 0, {0, 0, 255}, {0, 0, 0}, LinePattern.Solid, FillPattern.None, 0.25, BorderPattern.None, {{-70, 30}, {70, -30}}, 0), Line(true, {0.0, 0.0}, 0, {{-90, 0}, {-70, 0}}, {0, 0, 255}, LinePattern.Solid, 0.25, {Arrow.None, Arrow.None}, 3, Smooth.None), Line(true, {0.0, 0.0}, 0, {{70, 0}, {90, 0}}, {0, 0, 255}, LinePattern.Solid, 0.25, {Arrow.None, Arrow.None}, 3, Smooth.None), Text(true, {0.0, 0.0}, 0, {0, 0, 0}, {0, 0, 0}, LinePattern.None, FillPattern.None, 0.25, {{-136, -42}, {142, -74}}, "G=%G", 0, {-1, -1, -1}, TextAlignment.Center), Line(false, {0.0, 0.0}, 0, {{0, -100}, {0, -30}}, {127, 0, 0}, LinePattern.Dot, 0.25, {Arrow.None, Arrow.None}, 3, Smooth.None), Text(true, {0.0, 0.0}, 0, {0, 0, 255}, {0, 0, 0}, LinePattern.Solid, FillPattern.None, 0.25, {{-152, 87}, {148, 47}}, "%name", 0, {-1, -1, -1}, TextAlignment.Center), Text(true, {0.0, 0.0}, 0, {0, 0, 0}, {0, 0, 0}, LinePattern.Solid, FillPattern.None, 0.25, {{-144, -40}, {142, -72}}, "G=%G", 0, {-1, -1, -1}, TextAlignment.Center)}}
+// {-100.0,-100.0,100.0,100.0,true,0.1,2.0,2.0,{Rectangle(true, {0.0, 0.0}, 0, {0, 0, 255}, {255, 255, 255}, LinePattern.Solid, FillPattern.Solid, 0.25, BorderPattern.None, {{-70, 30}, {70, -30}}, 0), Rectangle(true, {0.0, 0.0}, 0, {0, 0, 255}, {0, 0, 0}, LinePattern.Solid, FillPattern.None, 0.25, BorderPattern.None, {{-70, 30}, {70, -30}}, 0), Line(true, {0.0, 0.0}, 0, {{-90, 0}, {-70, 0}}, {0, 0, 255}, LinePattern.Solid, 0.25, {Arrow.None, Arrow.None}, 3, Smooth.None), Line(true, {0.0, 0.0}, 0, {{70, 0}, {90, 0}}, {0, 0, 255}, LinePattern.Solid, 0.25, {Arrow.None, Arrow.None}, 3, Smooth.None), Text(true, {0.0, 0.0}, 0, {0, 0, 0}, {0, 0, 0}, LinePattern.None, FillPattern.None, 0.25, {{-136, -42}, {142, -74}}, "G=%G", 0, {-1, -1, -1}, "", {}, TextAlignment.Center), Line(false, {0.0, 0.0}, 0, {{0, -100}, {0, -30}}, {127, 0, 0}, LinePattern.Dot, 0.25, {Arrow.None, Arrow.None}, 3, Smooth.None), Text(true, {0.0, 0.0}, 0, {0, 0, 255}, {0, 0, 0}, LinePattern.Solid, FillPattern.None, 0.25, {{-152, 87}, {148, 47}}, "%name", 0, {-1, -1, -1}, "", {}, TextAlignment.Center), Text(true, {0.0, 0.0}, 0, {0, 0, 0}, {0, 0, 0}, LinePattern.Solid, FillPattern.None, 0.25, {{-144, -40}, {142, -72}}, "G=%G", 0, {-1, -1, -1}, "", {}, TextAlignment.Center)}}
 // Evaluating: getErrorString()
 // ""
@@ -8168 +8168 @@
 // "I am using MSL31"
 // Evaluating: getIconAnnotation(Modelica.Electrical.Analog.Basic.Ground)
-// {-100.0,-100.0,100.0,100.0,true,0.1,2.0,2.0,{Line(true, {0.0, 0.0}, 0, {{-60, 50}, {60, 50}}, {0, 0, 255}, LinePattern.Solid, 0.25, {Arrow.None, Arrow.None}, 3, Smooth.None), Line(true, {0.0, 0.0}, 0, {{-40, 30}, {40, 30}}, {0, 0, 255}, LinePattern.Solid, 0.25, {Arrow.None, Arrow.None}, 3, Smooth.None), Line(true, {0.0, 0.0}, 0, {{-20, 10}, {20, 10}}, {0, 0, 255}, LinePattern.Solid, 0.25, {Arrow.None, Arrow.None}, 3, Smooth.None), Line(true, {0.0, 0.0}, 0, {{0, 90}, {0, 50}}, {0, 0, 255}, LinePattern.Solid, 0.25, {Arrow.None, Arrow.None}, 3, Smooth.None), Text(true, {0.0, 0.0}, 0, {0, 0, 255}, {0, 0, 0}, LinePattern.Solid, FillPattern.None, 0.25, {{-144, -19}, {156, -59}}, "%name", 0, {-1, -1, -1}, TextAlignment.Center)}}
+// {-100.0,-100.0,100.0,100.0,true,0.1,2.0,2.0,{Line(true, {0.0, 0.0}, 0, {{-60, 50}, {60, 50}}, {0, 0, 255}, LinePattern.Solid, 0.25, {Arrow.None, Arrow.None}, 3, Smooth.None), Line(true, {0.0, 0.0}, 0, {{-40, 30}, {40, 30}}, {0, 0, 255}, LinePattern.Solid, 0.25, {Arrow.None, Arrow.None}, 3, Smooth.None), Line(true, {0.0, 0.0}, 0, {{-20, 10}, {20, 10}}, {0, 0, 255}, LinePattern.Solid, 0.25, {Arrow.None, Arrow.None}, 3, Smooth.None), Line(true, {0.0, 0.0}, 0, {{0, 90}, {0, 50}}, {0, 0, 255}, LinePattern.Solid, 0.25, {Arrow.None, Arrow.None}, 3, Smooth.None), Text(true, {0.0, 0.0}, 0, {0, 0, 255}, {0, 0, 0}, LinePattern.Solid, FillPattern.None, 0.25, {{-144, -19}, {156, -59}}, "%name", 0, {-1, -1, -1}, "", {}, TextAlignment.Center)}}
 // Evaluating: getErrorString()
 // ""
@@ -9040 +9040 @@
 // ""
 // Evaluating: getIconAnnotation(Modelica.StateGraph.Examples.Utilities.TankController)
-// {-100.0,-100.0,100.0,100.0,true,0.1,1.0,1.0,{Text(true, {0.0, 0.0}, 0, {0, 0, 0}, {0, 0, 0}, LinePattern.Solid, FillPattern.None, 0.25, {{-100, 68}, {-32, 54}}, "start", 0, {-1, -1, -1}, TextAlignment.Center), Text(true, {0.0, 0.0}, 0, {0, 0, 0}, {0, 0, 0}, LinePattern.Solid, FillPattern.None, 0.25, {{-100, 6}, {-32, -8}}, "stop", 0, {-1, -1, -1}, TextAlignment.Center), Text(true, {0.0, 0.0}, 0, {0, 0, 0}, {0, 0, 0}, LinePattern.Solid, FillPattern.None, 0.25, {{-100, -54}, {-32, -68}}, "shut", 0, {-1, -1, -1}, TextAlignment.Center), Text(true, {0.0, 0.0}, 0, {0, 0, 0}, {0, 0, 0}, LinePattern.Solid, FillPattern.None, 0.25, {{-94, -82}, {-18, -96}}, "level1", 0, {-1, -1, -1}, TextAlignment.Center), Text(true, {0.0, 0.0}, 0, {0, 0, 0}, {0, 0, 0}, LinePattern.Solid, FillPattern.None, 0.25, {{24, -84}, {96, -98}}, "level2", 0, {-1, -1, -1}, TextAlignment.Center), Text(true, {0.0, 0.0}, 0, {0, 0, 0}, {0, 0, 0}, LinePattern.Solid, FillPattern.None, 0.25, {{31, 68}, {99, 54}}, "valve1", 0, {-1, -1, -1}, TextAlignment.Center), Text(true, {0.0, 0.0}, 0, {0, 0, 0}, {0, 0, 0}, LinePattern.Solid, FillPattern.None, 0.25, {{33, 9}, {101, -5}}, "valve2", 0, {-1, -1, -1}, TextAlignment.Center), Text(true, {0.0, 0.0}, 0, {0, 0, 0}, {0, 0, 0}, LinePattern.Solid, FillPattern.None, 0.25, {{34, -53}, {102, -67}}, "valve3", 0, {-1, -1, -1}, TextAlignment.Center)}}
+// {-100.0,-100.0,100.0,100.0,true,0.1,1.0,1.0,{Text(true, {0.0, 0.0}, 0, {0, 0, 0}, {0, 0, 0}, LinePattern.Solid, FillPattern.None, 0.25, {{-100, 68}, {-32, 54}}, "start", 0, {-1, -1, -1}, "", {}, TextAlignment.Center), Text(true, {0.0, 0.0}, 0, {0, 0, 0}, {0, 0, 0}, LinePattern.Solid, FillPattern.None, 0.25, {{-100, 6}, {-32, -8}}, "stop", 0, {-1, -1, -1}, "", {}, TextAlignment.Center), Text(true, {0.0, 0.0}, 0, {0, 0, 0}, {0, 0, 0}, LinePattern.Solid, FillPattern.None, 0.25, {{-100, -54}, {-32, -68}}, "shut", 0, {-1, -1, -1}, "", {}, TextAlignment.Center), Text(true, {0.0, 0.0}, 0, {0, 0, 0}, {0, 0, 0}, LinePattern.Solid, FillPattern.None, 0.25, {{-94, -82}, {-18, -96}}, "level1", 0, {-1, -1, -1}, "", {}, TextAlignment.Center), Text(true, {0.0, 0.0}, 0, {0, 0, 0}, {0, 0, 0}, LinePattern.Solid, FillPattern.None, 0.25, {{24, -84}, {96, -98}}, "level2", 0, {-1, -1, -1}, "", {}, TextAlignment.Center), Text(true, {0.0, 0.0}, 0, {0, 0, 0}, {0, 0, 0}, LinePattern.Solid, FillPattern.None, 0.25, {{31, 68}, {99, 54}}, "valve1", 0, {-1, -1, -1}, "", {}, TextAlignment.Center), Text(true, {0.0, 0.0}, 0, {0, 0, 0}, {0, 0, 0}, LinePattern.Solid, FillPattern.None, 0.25, {{33, 9}, {101, -5}}, "valve2", 0, {-1, -1, -1}, "", {}, TextAlignment.Center), Text(true, {0.0, 0.0}, 0, {0, 0, 0}, {0, 0, 0}, LinePattern.Solid, FillPattern.None, 0.25, {{34, -53}, {102, -67}}, "valve3", 0, {-1, -1, -1}, "", {}, TextAlignment.Center)}}
 // Evaluating: getErrorString()
 // ""
@@ -9112 +9112 @@
 // ""
 // Evaluating: getIconAnnotation(Modelica.StateGraph.Examples.Utilities.valve)
-// {-100.0,-100.0,100.0,100.0,true,0.1,1.0,1.0,{Line(true, {0.0, 0.0}, 0, {{20, 20}, {20, 20}}, {0, 0, 0}, LinePattern.Solid, 0.5, {Arrow.None, Arrow.None}, 3, Smooth.None), Text(true, {0.0, 0.0}, 0, {0, 0, 255}, {0, 0, 0}, LinePattern.Solid, FillPattern.None, 0.25, {{-131, 125}, {136, 67}}, "%name", 0, {-1, -1, -1}, TextAlignment.Center), Line(true, {0.0, 0.0}, 0, {{0, 0}, {0, -60}}, {255, 0, 255}, LinePattern.Solid, 0.25, {Arrow.None, Arrow.None}, 3, Smooth.None)}}
+// {-100.0,-100.0,100.0,100.0,true,0.1,1.0,1.0,{Line(true, {0.0, 0.0}, 0, {{20, 20}, {20, 20}}, {0, 0, 0}, LinePattern.Solid, 0.5, {Arrow.None, Arrow.None}, 3, Smooth.None), Text(true, {0.0, 0.0}, 0, {0, 0, 255}, {0, 0, 0}, LinePattern.Solid, FillPattern.None, 0.25, {{-131, 125}, {136, 67}}, "%name", 0, {-1, -1, -1}, "", {}, TextAlignment.Center), Line(true, {0.0, 0.0}, 0, {{0, 0}, {0, -60}}, {255, 0, 255}, LinePattern.Solid, 0.25, {Arrow.None, Arrow.None}, 3, Smooth.None)}}
 // Evaluating: getErrorString()
 // ""
@@ -9124 +9124 @@
 // ""
 // Evaluating: getIconAnnotation(Modelica.StateGraph.Examples.Utilities.Tank)
-// {-100.0,-100.0,100.0,100.0,true,0.1,1.0,1.0,{Text(true, {0.0, 0.0}, 0, {0, 0, 255}, {0, 0, 0}, LinePattern.Solid, FillPattern.None, 0.25, {{-122, -82}, {88, -42}}, "%name", 0, {-1, -1, -1}, TextAlignment.Center), Rectangle(true, {0.0, 0.0}, 0, {0, 0, 0}, {255, 255, 255}, LinePattern.Solid, FillPattern.Solid, 0.5, BorderPattern.None, {{-60, 60}, {80, -40}}, 0), Rectangle(true, {0.0, 0.0}, 0, {0, 0, 0}, {191, 0, 95}, LinePattern.Solid, FillPattern.HorizontalCylinder, 0.5, BorderPattern.None, {{-60, -40}, {-60, -40}}, 0)}}
+// {-100.0,-100.0,100.0,100.0,true,0.1,1.0,1.0,{Text(true, {0.0, 0.0}, 0, {0, 0, 255}, {0, 0, 0}, LinePattern.Solid, FillPattern.None, 0.25, {{-122, -82}, {88, -42}}, "%name", 0, {-1, -1, -1}, "", {}, TextAlignment.Center), Rectangle(true, {0.0, 0.0}, 0, {0, 0, 0}, {255, 255, 255}, LinePattern.Solid, FillPattern.Solid, 0.5, BorderPattern.None, {{-60, 60}, {80, -40}}, 0), Rectangle(true, {0.0, 0.0}, 0, {0, 0, 0}, {191, 0, 95}, LinePattern.Solid, FillPattern.HorizontalCylinder, 0.5, BorderPattern.None, {{-60, -40}, {-60, -40}}, 0)}}
 // Evaluating: getErrorString()
 // ""
@@ -9136 +9136 @@
 // ""
 // Evaluating: getIconAnnotation(Modelica.StateGraph.Examples.Utilities.Source)
-// {-100.0,-100.0,100.0,100.0,true,0.1,2.0,2.0,{Rectangle(true, {0.0, 0.0}, 0, {0, 0, 0}, {255, 255, 255}, LinePattern.Solid, FillPattern.Solid, 0.5, BorderPattern.None, {{-80, 40}, {80, -40}}, 0), Text(true, {0.0, 0.0}, 0, {0, 0, 255}, {0, 0, 0}, LinePattern.Solid, FillPattern.None, 0.25, {{-144, 54}, {152, 114}}, "%name", 0, {-1, -1, -1}, TextAlignment.Center)}}
+// {-100.0,-100.0,100.0,100.0,true,0.1,2.0,2.0,{Rectangle(true, {0.0, 0.0}, 0, {0, 0, 0}, {255, 255, 255}, LinePattern.Solid, FillPattern.Solid, 0.5, BorderPattern.None, {{-80, 40}, {80, -40}}, 0), Text(true, {0.0, 0.0}, 0, {0, 0, 255}, {0, 0, 0}, LinePattern.Solid, FillPattern.None, 0.25, {{-144, 54}, {152, 114}}, "%name", 0, {-1, -1, -1}, "", {}, TextAlignment.Center)}}
 // Evaluating: getErrorString()
 // ""
@@ -9240 +9240 @@
 // ""
 // Evaluating: getIconAnnotation(Modelica.StateGraph.Interfaces.PartialStateGraphIcon)
-// {-100.0,-100.0,100.0,100.0,true,0.1,2.0,2.0,{Rectangle(true, {0.0, 0.0}, 0, {0, 0, 0}, {255, 255, 255}, LinePattern.Solid, FillPattern.Solid, 0.25, BorderPattern.None, {{-100, 100}, {100, -100}}, 0), Text(true, {0.0, 0.0}, 0, {0, 0, 255}, {0, 0, 0}, LinePattern.Solid, FillPattern.None, 0.25, {{160, 110}, {-160, 150}}, "%name", 0, {-1, -1, -1}, TextAlignment.Center)}}
+// {-100.0,-100.0,100.0,100.0,true,0.1,2.0,2.0,{Rectangle(true, {0.0, 0.0}, 0, {0, 0, 0}, {255, 255, 255}, LinePattern.Solid, FillPattern.Solid, 0.25, BorderPattern.None, {{-100, 100}, {100, -100}}, 0), Text(true, {0.0, 0.0}, 0, {0, 0, 255}, {0, 0, 0}, LinePattern.Solid, FillPattern.None, 0.25, {{160, 110}, {-160, 150}}, "%name", 0, {-1, -1, -1}, "", {}, TextAlignment.Center)}}
 // Evaluating: getErrorString()
 // ""
@@ -9268 +9268 @@
 // ""
 // Evaluating: getIconAnnotation(Modelica.StateGraph.StateGraphRoot)
-// {-100.0,-100.0,100.0,100.0,true,0.1,2.0,2.0,{Text(true, {0.0, 0.0}, 0, {0, 0, 255}, {0, 0, 0}, LinePattern.Solid, FillPattern.None, 0.25, {{-200, 110}, {200, 150}}, "%name", 0, {-1, -1, -1}, TextAlignment.Center), Rectangle(true, {0.0, 0.0}, 0, {0, 0, 0}, {255, 255, 255}, LinePattern.Solid, FillPattern.Solid, 0.25, BorderPattern.None, {{-100, 100}, {100, -100}}, 0), Text(true, {0.0, 0.0}, 0, {0, 0, 0}, {0, 0, 0}, LinePattern.Solid, FillPattern.None, 0.25, {{-92, 78}, {96, 34}}, "root", 0, {-1, -1, -1}, TextAlignment.Center), Rectangle(true, {0.0, 0.0}, 0, {0, 0, 0}, {0, 0, 0}, LinePattern.Solid, FillPattern.None, 0.25, BorderPattern.None, {{-82, -6}, {-44, -40}}, 0), Line(true, {0.0, 0.0}, 0, {{0, 10}, {0, -60}}, {0, 0, 0}, LinePattern.Solid, 0.25, {Arrow.None, Arrow.None}, 3, Smooth.None), Rectangle(true, {0.0, 0.0}, 0, {0, 0, 0}, {0, 0, 0}, LinePattern.Solid, FillPattern.None, 0.25, BorderPattern.None, {{48, -6}, {86, -40}}, 0), Polygon(true, {0.0, 0.0}, 0, {0, 0, 0}, {0, 0, 0}, LinePattern.Solid, FillPattern.Solid, 0.25, {{-12, -16}, {0, -22}, {-12, -28}, {-12, -16}}, Smooth.None), Line(true, {0.0, 0.0}, 0, {{-44, -22}, {-12, -22}}, {0, 0, 0}, LinePattern.Solid, 0.25, {Arrow.None, Arrow.None}, 3, Smooth.None), Polygon(true, {0.0, 0.0}, 0, {0, 0, 0}, {0, 0, 0}, LinePattern.Solid, FillPattern.Solid, 0.25, {{36, -16}, {48, -22}, {36, -28}, {36, -16}}, Smooth.None), Line(true, {0.0, 0.0}, 0, {{0, -22}, {36, -22}}, {0, 0, 0}, LinePattern.Solid, 0.25, {Arrow.None, Arrow.None}, 3, Smooth.None)}}
+// {-100.0,-100.0,100.0,100.0,true,0.1,2.0,2.0,{Text(true, {0.0, 0.0}, 0, {0, 0, 255}, {0, 0, 0}, LinePattern.Solid, FillPattern.None, 0.25, {{-200, 110}, {200, 150}}, "%name", 0, {-1, -1, -1}, "", {}, TextAlignment.Center), Rectangle(true, {0.0, 0.0}, 0, {0, 0, 0}, {255, 255, 255}, LinePattern.Solid, FillPattern.Solid, 0.25, BorderPattern.None, {{-100, 100}, {100, -100}}, 0), Text(true, {0.0, 0.0}, 0, {0, 0, 0}, {0, 0, 0}, LinePattern.Solid, FillPattern.None, 0.25, {{-92, 78}, {96, 34}}, "root", 0, {-1, -1, -1}, "", {}, TextAlignment.Center), Rectangle(true, {0.0, 0.0}, 0, {0, 0, 0}, {0, 0, 0}, LinePattern.Solid, FillPattern.None, 0.25, BorderPattern.None, {{-82, -6}, {-44, -40}}, 0), Line(true, {0.0, 0.0}, 0, {{0, 10}, {0, -60}}, {0, 0, 0}, LinePattern.Solid, 0.25, {Arrow.None, Arrow.None}, 3, Smooth.None), Rectangle(true, {0.0, 0.0}, 0, {0, 0, 0}, {0, 0, 0}, LinePattern.Solid, FillPattern.None, 0.25, BorderPattern.None, {{48, -6}, {86, -40}}, 0), Polygon(true, {0.0, 0.0}, 0, {0, 0, 0}, {0, 0, 0}, LinePattern.Solid, FillPattern.Solid, 0.25, {{-12, -16}, {0, -22}, {-12, -28}, {-12, -16}}, Smooth.None), Line(true, {0.0, 0.0}, 0, {{-44, -22}, {-12, -22}}, {0, 0, 0}, LinePattern.Solid, 0.25, {Arrow.None, Arrow.None}, 3, Smooth.None), Polygon(true, {0.0, 0.0}, 0, {0, 0, 0}, {0, 0, 0}, LinePattern.Solid, FillPattern.Solid, 0.25, {{36, -16}, {48, -22}, {36, -28}, {36, -16}}, Smooth.None), Line(true, {0.0, 0.0}, 0, {{0, -22}, {36, -22}}, {0, 0, 0}, LinePattern.Solid, 0.25, {Arrow.None, Arrow.None}, 3, Smooth.None)}}
 // Evaluating: getErrorString()
 // ""
@@ -9296 +9296 @@
 // ""
 // Evaluating: getIconAnnotation(Modelica.StateGraph.Temporary.SetRealParameter)
-// {-100.0,-100.0,100.0,100.0,true,0.1,2.0,2.0,{Rectangle(true, {0.0, 0.0}, 0, {0, 0, 0}, {245, 245, 245}, LinePattern.Solid, FillPattern.Solid, 0.25, BorderPattern.Raised, {{-100, 40}, {100, -40}}, 0), Text(true, {0.0, 0.0}, 0, {0, 0, 0}, {0, 0, 0}, LinePattern.Solid, FillPattern.None, 0.25, {{-150, 90}, {150, 50}}, "%name =", 0, {-1, -1, -1}, TextAlignment.Center), Text(true, {0.0, 0.0}, 0, {0, 0, 0}, {0, 0, 0}, LinePattern.Solid, FillPattern.None, 0.25, {{-96, 15}, {96, -15}}, "%value", 0, {-1, -1, -1}, TextAlignment.Center)}}
+// {-100.0,-100.0,100.0,100.0,true,0.1,2.0,2.0,{Rectangle(true, {0.0, 0.0}, 0, {0, 0, 0}, {245, 245, 245}, LinePattern.Solid, FillPattern.Solid, 0.25, BorderPattern.Raised, {{-100, 40}, {100, -40}}, 0), Text(true, {0.0, 0.0}, 0, {0, 0, 0}, {0, 0, 0}, LinePattern.Solid, FillPattern.None, 0.25, {{-150, 90}, {150, 50}}, "%name =", 0, {-1, -1, -1}, "", {}, TextAlignment.Center), Text(true, {0.0, 0.0}, 0, {0, 0, 0}, {0, 0, 0}, LinePattern.Solid, FillPattern.None, 0.25, {{-96, 15}, {96, -15}}, "%value", 0, {-1, -1, -1}, "", {}, TextAlignment.Center)}}
 // Evaluating: getErrorString()
 // ""
@@ -9366 +9366 @@
 // ""
 // Evaluating: getIconAnnotation(Modelica.StateGraph.Temporary.RadioButton)
-// {-100.0,-100.0,100.0,100.0,true,0.1,2.0,2.0,{Rectangle(true, {0.0, 0.0}, 0, {128, 128, 128}, {192, 192, 192}, LinePattern.Solid, FillPattern.Solid, 0.5, BorderPattern.None, {{-100, -100}, {100, 100}}, 0), Text(true, {0.0, 0.0}, 0, {0, 0, 0}, {0, 0, 0}, LinePattern.Solid, FillPattern.None, 0.25, {{-80, -40}, {80, 40}}, "%name", 0, {-1, -1, -1}, TextAlignment.Center)}}
+// {-100.0,-100.0,100.0,100.0,true,0.1,2.0,2.0,{Rectangle(true, {0.0, 0.0}, 0, {128, 128, 128}, {192, 192, 192}, LinePattern.Solid, FillPattern.Solid, 0.5, BorderPattern.None, {{-100, -100}, {100, 100}}, 0), Text(true, {0.0, 0.0}, 0, {0, 0, 0}, {0, 0, 0}, LinePattern.Solid, FillPattern.None, 0.25, {{-80, -40}, {80, 40}}, "%name", 0, {-1, -1, -1}, "", {}, TextAlignment.Center)}}
 // Evaluating: getErrorString()
 // ""
@@ -9380 +9380 @@
 // ""
 // Evaluating: getIconAnnotation(Modelica.StateGraph.Temporary.NumericValue)
-// {-100.0,-100.0,100.0,100.0,true,0.1,2.0,2.0,{Rectangle(true, {0.0, 0.0}, 0, {0, 0, 255}, {236, 233, 216}, LinePattern.Solid, FillPattern.Solid, 0.25, BorderPattern.Raised, {{100, 50}, {-100, -50}}, 0), Text(true, {0.0, 0.0}, 0, {0, 0, 255}, {0, 0, 0}, LinePattern.Solid, FillPattern.None, 0.25, {{-90, -46}, {90, 34}}, " ", 0, {-1, -1, -1}, TextAlignment.Center)}}
+// {-100.0,-100.0,100.0,100.0,true,0.1,2.0,2.0,{Rectangle(true, {0.0, 0.0}, 0, {0, 0, 255}, {236, 233, 216}, LinePattern.Solid, FillPattern.Solid, 0.25, BorderPattern.Raised, {{100, 50}, {-100, -50}}, 0), Text(true, {0.0, 0.0}, 0, {0, 0, 255}, {0, 0, 0}, LinePattern.Solid, FillPattern.None, 0.25, {{-90, -46}, {90, 34}}, " ", 0, {-1, -1, -1}, "", {}, TextAlignment.Center)}}
 // Evaluating: getErrorString()
 // ""
@@ -9394 +9394 @@
 // ""
 // Evaluating: getIconAnnotation(Modelica.StateGraph.Temporary.IndicatorLamp)
-// {-100.0,-100.0,100.0,100.0,true,0.1,2.0,2.0,{Ellipse(true, {0.0, 0.0}, 0, {0, 0, 0}, {235, 235, 235}, LinePattern.None, FillPattern.Sphere, 0.25, {{-100, -100}, {100, 100}}, 0, 360), Text(true, {0.0, 0.0}, 0, {0, 0, 255}, {0, 0, 0}, LinePattern.Solid, FillPattern.None, 0.25, {{-150, 150}, {150, 110}}, "%name", 0, {-1, -1, -1}, TextAlignment.Center)}}
+// {-100.0,-100.0,100.0,100.0,true,0.1,2.0,2.0,{Ellipse(true, {0.0, 0.0}, 0, {0, 0, 0}, {235, 235, 235}, LinePattern.None, FillPattern.Sphere, 0.25, {{-100, -100}, {100, 100}}, 0, 360), Text(true, {0.0, 0.0}, 0, {0, 0, 255}, {0, 0, 0}, LinePattern.Solid, FillPattern.None, 0.25, {{-150, 150}, {150, 110}}, "%name", 0, {-1, -1, -1}, "", {}, TextAlignment.Center)}}
 // Evaluating: getErrorString()
 // ""
@@ -9800 +9800 @@
 // ""
 // Evaluating: getIconAnnotation(Modelica.SIunits.Conversions.to_degC)
-// {-100.0,-100.0,100.0,100.0,true,0.1,2.0,2.0,{Text(true, {0.0, 0.0}, 0, {0, 0, 0}, {0, 0, 0}, LinePattern.Solid, FillPattern.None, 0.25, {{-20, 100}, {-100, 20}}, "K", 0, {-1, -1, -1}, TextAlignment.Center), Text(true, {0.0, 0.0}, 0, {0, 0, 0}, {0, 0, 0}, LinePattern.Solid, FillPattern.None, 0.25, {{100, -20}, {20, -100}}, "°C", 0, {-1, -1, -1}, TextAlignment.Center)}}
+// {-100.0,-100.0,100.0,100.0,true,0.1,2.0,2.0,{Text(true, {0.0, 0.0}, 0, {0, 0, 0}, {0, 0, 0}, LinePattern.Solid, FillPattern.None, 0.25, {{-20, 100}, {-100, 20}}, "K", 0, {-1, -1, -1}, "", {}, TextAlignment.Center), Text(true, {0.0, 0.0}, 0, {0, 0, 0}, {0, 0, 0}, LinePattern.Solid, FillPattern.None, 0.25, {{100, -20}, {20, -100}}, "°C", 0, {-1, -1, -1}, "", {}, TextAlignment.Center)}}
 // Evaluating: getErrorString()
 // ""
@@ -9812 +9812 @@
 // ""
 // Evaluating: getIconAnnotation(Modelica.SIunits.Conversions.from_degC)
-// {-100.0,-100.0,100.0,100.0,true,0.1,2.0,2.0,{Text(true, {0.0, 0.0}, 0, {0, 0, 0}, {0, 0, 0}, LinePattern.Solid, FillPattern.None, 0.25, {{-20, 100}, {-100, 20}}, "°C", 0, {-1, -1, -1}, TextAlignment.Center), Text(true, {0.0, 0.0}, 0, {0, 0, 0}, {0, 0, 0}, LinePattern.Solid, FillPattern.None, 0.25, {{100, -20}, {20, -100}}, "K", 0, {-1, -1, -1}, TextAlignment.Center)}}
+// {-100.0,-100.0,100.0,100.0,true,0.1,2.0,2.0,{Text(true, {0.0, 0.0}, 0, {0, 0, 0}, {0, 0, 0}, LinePattern.Solid, FillPattern.None, 0.25, {{-20, 100}, {-100, 20}}, "°C", 0, {-1, -1, -1}, "", {}, TextAlignment.Center), Text(true, {0.0, 0.0}, 0, {0, 0, 0}, {0, 0, 0}, LinePattern.Solid, FillPattern.None, 0.25, {{100, -20}, {20, -100}}, "K", 0, {-1, -1, -1}, "", {}, TextAlignment.Center)}}
 // Evaluating: getErrorString()
 // ""
@@ -9824 +9824 @@
 // ""
 // Evaluating: getIconAnnotation(Modelica.SIunits.Conversions.to_degF)
-// {-100.0,-100.0,100.0,100.0,true,0.1,2.0,2.0,{Text(true, {0.0, 0.0}, 0, {0, 0, 0}, {0, 0, 0}, LinePattern.Solid, FillPattern.None, 0.25, {{-20, 100}, {-100, 20}}, "K", 0, {-1, -1, -1}, TextAlignment.Center), Text(true, {0.0, 0.0}, 0, {0, 0, 0}, {0, 0, 0}, LinePattern.Solid, FillPattern.None, 0.25, {{100, -20}, {20, -100}}, "°F", 0, {-1, -1, -1}, TextAlignment.Center)}}
+// {-100.0,-100.0,100.0,100.0,true,0.1,2.0,2.0,{Text(true, {0.0, 0.0}, 0, {0, 0, 0}, {0, 0, 0}, LinePattern.Solid, FillPattern.None, 0.25, {{-20, 100}, {-100, 20}}, "K", 0, {-1, -1, -1}, "", {}, TextAlignment.Center), Text(true, {0.0, 0.0}, 0, {0, 0, 0}, {0, 0, 0}, LinePattern.Solid, FillPattern.None, 0.25, {{100, -20}, {20, -100}}, "°F", 0, {-1, -1, -1}, "", {}, TextAlignment.Center)}}
 // Evaluating: getErrorString()
 // ""
@@ -9836 +9836 @@
 // ""
 // Evaluating: getIconAnnotation(Modelica.SIunits.Conversions.from_degF)
-// {-100.0,-100.0,100.0,100.0,true,0.1,2.0,2.0,{Text(true, {0.0, 0.0}, 0, {0, 0, 0}, {0, 0, 0}, LinePattern.Solid, FillPattern.None, 0.25, {{-20, 100}, {-100, 20}}, "°F", 0, {-1, -1, -1}, TextAlignment.Center), Text(true, {0.0, 0.0}, 0, {0, 0, 0}, {0, 0, 0}, LinePattern.Solid, FillPattern.None, 0.25, {{100, -20}, {20, -100}}, "K", 0, {-1, -1, -1}, TextAlignment.Center)}}
+// {-100.0,-100.0,100.0,100.0,true,0.1,2.0,2.0,{Text(true, {0.0, 0.0}, 0, {0, 0, 0}, {0, 0, 0}, LinePattern.Solid, FillPattern.None, 0.25, {{-20, 100}, {-100, 20}}, "°F", 0, {-1, -1, -1}, "", {}, TextAlignment.Center), Text(true, {0.0, 0.0}, 0, {0, 0, 0}, {0, 0, 0}, LinePattern.Solid, FillPattern.None, 0.25, {{100, -20}, {20, -100}}, "K", 0, {-1, -1, -1}, "", {}, TextAlignment.Center)}}
 // Evaluating: getErrorString()
 // ""
@@ -9848 +9848 @@
 // ""
 // Evaluating: getIconAnnotation(Modelica.SIunits.Conversions.to_degRk)
-// {-100.0,-100.0,100.0,100.0,true,0.1,2.0,2.0,{Text(true, {0.0, 0.0}, 0, {0, 0, 0}, {0, 0, 0}, LinePattern.Solid, FillPattern.None, 0.25, {{-20, 100}, {-100, 20}}, "K", 0, {-1, -1, -1}, TextAlignment.Center), Text(true, {0.0, 0.0}, 0, {0, 0, 0}, {0, 0, 0}, LinePattern.Solid, FillPattern.None, 0.25, {{100, -20}, {20, -100}}, "°Rk", 0, {-1, -1, -1}, TextAlignment.Center)}}
+// {-100.0,-100.0,100.0,100.0,true,0.1,2.0,2.0,{Text(true, {0.0, 0.0}, 0, {0, 0, 0}, {0, 0, 0}, LinePattern.Solid, FillPattern.None, 0.25, {{-20, 100}, {-100, 20}}, "K", 0, {-1, -1, -1}, "", {}, TextAlignment.Center), Text(true, {0.0, 0.0}, 0, {0, 0, 0}, {0, 0, 0}, LinePattern.Solid, FillPattern.None, 0.25, {{100, -20}, {20, -100}}, "°Rk", 0, {-1, -1, -1}, "", {}, TextAlignment.Center)}}
 // Evaluating: getErrorString()
 // ""
@@ -9860 +9860 @@
 // ""
 // Evaluating: getIconAnnotation(Modelica.SIunits.Conversions.from_degRk)
-// {-100.0,-100.0,100.0,100.0,true,0.1,2.0,2.0,{Text(true, {0.0, 0.0}, 0, {0, 0, 0}, {0, 0, 0}, LinePattern.Solid, FillPattern.None, 0.25, {{-20, 100}, {-100, 20}}, "°Rk", 0, {-1, -1, -1}, TextAlignment.Center), Text(true, {0.0, 0.0}, 0, {0, 0, 0}, {0, 0, 0}, LinePattern.Solid, FillPattern.None, 0.25, {{100, -20}, {20, -100}}, "K", 0, {-1, -1, -1}, TextAlignment.Center)}}
+// {-100.0,-100.0,100.0,100.0,true,0.1,2.0,2.0,{Text(true, {0.0, 0.0}, 0, {0, 0, 0}, {0, 0, 0}, LinePattern.Solid, FillPattern.None, 0.25, {{-20, 100}, {-100, 20}}, "°Rk", 0, {-1, -1, -1}, "", {}, TextAlignment.Center), Text(true, {0.0, 0.0}, 0, {0, 0, 0}, {0, 0, 0}, LinePattern.Solid, FillPattern.None, 0.25, {{100, -20}, {20, -100}}, "K", 0, {-1, -1, -1}, "", {}, TextAlignment.Center)}}
 // Evaluating: getErrorString()
 // ""
@@ -9872 +9872 @@
 // ""
 // Evaluating: getIconAnnotation(Modelica.SIunits.Conversions.to_deg)
-// {-100.0,-100.0,100.0,100.0,true,0.1,2.0,2.0,{Text(true, {0.0, 0.0}, 0, {0, 0, 0}, {0, 0, 0}, LinePattern.Solid, FillPattern.None, 0.25, {{-20, 100}, {-100, 20}}, "rad", 0, {-1, -1, -1}, TextAlignment.Center), Text(true, {0.0, 0.0}, 0, {0, 0, 0}, {0, 0, 0}, LinePattern.Solid, FillPattern.None, 0.25, {{100, -20}, {20, -100}}, "deg", 0, {-1, -1, -1}, TextAlignment.Center)}}
+// {-100.0,-100.0,100.0,100.0,true,0.1,2.0,2.0,{Text(true, {0.0, 0.0}, 0, {0, 0, 0}, {0, 0, 0}, LinePattern.Solid, FillPattern.None, 0.25, {{-20, 100}, {-100, 20}}, "rad", 0, {-1, -1, -1}, "", {}, TextAlignment.Center), Text(true, {0.0, 0.0}, 0, {0, 0, 0}, {0, 0, 0}, LinePattern.Solid, FillPattern.None, 0.25, {{100, -20}, {20, -100}}, "deg", 0, {-1, -1, -1}, "", {}, TextAlignment.Center)}}
 // Evaluating: getErrorString()
 // ""
@@ -9884 +9884 @@
 // ""
 // Evaluating: getIconAnnotation(Modelica.SIunits.Conversions.from_deg)
-// {-100.0,-100.0,100.0,100.0,true,0.1,2.0,2.0,{Text(true, {0.0, 0.0}, 0, {0, 0, 0}, {0, 0, 0}, LinePattern.Solid, FillPattern.None, 0.25, {{-20, 100}, {-100, 20}}, "deg", 0, {-1, -1, -1}, TextAlignment.Center), Text(true, {0.0, 0.0}, 0, {0, 0, 0}, {0, 0, 0}, LinePattern.Solid, FillPattern.None, 0.25, {{100, -20}, {20, -100}}, "rad", 0, {-1, -1, -1}, TextAlignment.Center)}}
+// {-100.0,-100.0,100.0,100.0,true,0.1,2.0,2.0,{Text(true, {0.0, 0.0}, 0, {0, 0, 0}, {0, 0, 0}, LinePattern.Solid, FillPattern.None, 0.25, {{-20, 100}, {-100, 20}}, "deg", 0, {-1, -1, -1}, "", {}, TextAlignment.Center), Text(true, {0.0, 0.0}, 0, {0, 0, 0}, {0, 0, 0}, LinePattern.Solid, FillPattern.None, 0.25, {{100, -20}, {20, -100}}, "rad", 0, {-1, -1, -1}, "", {}, TextAlignment.Center)}}
 // Evaluating: getErrorString()
 // ""
@@ -9896 +9896 @@
 // ""
 // Evaluating: getIconAnnotation(Modelica.SIunits.Conversions.to_rpm)
-// {-100.0,-100.0,100.0,100.0,true,0.1,2.0,2.0,{Text(true, {0.0, 0.0}, 0, {0, 0, 0}, {0, 0, 0}, LinePattern.Solid, FillPattern.None, 0.25, {{-20, 100}, {-100, 20}}, "rad/s", 0, {-1, -1, -1}, TextAlignment.Center), Text(true, {0.0, 0.0}, 0, {0, 0, 0}, {0, 0, 0}, LinePattern.Solid, FillPattern.None, 0.25, {{100, -20}, {20, -100}}, "1/min", 0, {-1, -1, -1}, TextAlignment.Center)}}
+// {-100.0,-100.0,100.0,100.0,true,0.1,2.0,2.0,{Text(true, {0.0, 0.0}, 0, {0, 0, 0}, {0, 0, 0}, LinePattern.Solid, FillPattern.None, 0.25, {{-20, 100}, {-100, 20}}, "rad/s", 0, {-1, -1, -1}, "", {}, TextAlignment.Center), Text(true, {0.0, 0.0}, 0, {0, 0, 0}, {0, 0, 0}, LinePattern.Solid, FillPattern.None, 0.25, {{100, -20}, {20, -100}}, "1/min", 0, {-1, -1, -1}, "", {}, TextAlignment.Center)}}
 // Evaluating: getErrorString()
 // ""
@@ -9908 +9908 @@
 // ""
 // Evaluating: getIconAnnotation(Modelica.SIunits.Conversions.from_rpm)
-// {-100.0,-100.0,100.0,100.0,true,0.1,2.0,2.0,{Text(true, {0.0, 0.0}, 0, {0, 0, 0}, {0, 0, 0}, LinePattern.Solid, FillPattern.None, 0.25, {{-20, 100}, {-100, 20}}, "1/min", 0, {-1, -1, -1}, TextAlignment.Center), Text(true, {0.0, 0.0}, 0, {0, 0, 0}, {0, 0, 0}, LinePattern.Solid, FillPattern.None, 0.25, {{100, -20}, {20, -100}}, "rad/s", 0, {-1, -1, -1}, TextAlignment.Center)}}
+// {-100.0,-100.0,100.0,100.0,true,0.1,2.0,2.0,{Text(true, {0.0, 0.0}, 0, {0, 0, 0}, {0, 0, 0}, LinePattern.Solid, FillPattern.None, 0.25, {{-20, 100}, {-100, 20}}, "1/min", 0, {-1, -1, -1}, "", {}, TextAlignment.Center), Text(true, {0.0, 0.0}, 0, {0, 0, 0}, {0, 0, 0}, LinePattern.Solid, FillPattern.None, 0.25, {{100, -20}, {20, -100}}, "rad/s", 0, {-1, -1, -1}, "", {}, TextAlignment.Center)}}
 // Evaluating: getErrorString()
 // ""
@@ -9920 +9920 @@
 // ""
 // Evaluating: getIconAnnotation(Modelica.SIunits.Conversions.to_kmh)
-// {-100.0,-100.0,100.0,100.0,true,0.1,2.0,2.0,{Text(true, {0.0, 0.0}, 0, {0, 0, 0}, {0, 0, 0}, LinePattern.Solid, FillPattern.None, 0.25, {{-20, 100}, {-100, 20}}, "m/s", 0, {-1, -1, -1}, TextAlignment.Center), Text(true, {0.0, 0.0}, 0, {0, 0, 0}, {0, 0, 0}, LinePattern.Solid, FillPattern.None, 0.25, {{100, -20}, {20, -100}}, "km/h", 0, {-1, -1, -1}, TextAlignment.Center)}}
+// {-100.0,-100.0,100.0,100.0,true,0.1,2.0,2.0,{Text(true, {0.0, 0.0}, 0, {0, 0, 0}, {0, 0, 0}, LinePattern.Solid, FillPattern.None, 0.25, {{-20, 100}, {-100, 20}}, "m/s", 0, {-1, -1, -1}, "", {}, TextAlignment.Center), Text(true, {0.0, 0.0}, 0, {0, 0, 0}, {0, 0, 0}, LinePattern.Solid, FillPattern.None, 0.25, {{100, -20}, {20, -100}}, "km/h", 0, {-1, -1, -1}, "", {}, TextAlignment.Center)}}
 // Evaluating: getErrorString()
 // ""
@@ -9932 +9932 @@
 // ""
 // Evaluating: getIconAnnotation(Modelica.SIunits.Conversions.from_kmh)
-// {-100.0,-100.0,100.0,100.0,true,0.1,2.0,2.0,{Text(true, {0.0, 0.0}, 0, {0, 0, 0}, {0, 0, 0}, LinePattern.Solid, FillPattern.None, 0.25, {{-20, 100}, {-100, 20}}, "km/h", 0, {-1, -1, -1}, TextAlignment.Center), Text(true, {0.0, 0.0}, 0, {0, 0, 0}, {0, 0, 0}, LinePattern.Solid, FillPattern.None, 0.25, {{100, -20}, {20, -100}}, "m/s", 0, {-1, -1, -1}, TextAlignment.Center)}}
+// {-100.0,-100.0,100.0,100.0,true,0.1,2.0,2.0,{Text(true, {0.0, 0.0}, 0, {0, 0, 0}, {0, 0, 0}, LinePattern.Solid, FillPattern.None, 0.25, {{-20, 100}, {-100, 20}}, "km/h", 0, {-1, -1, -1}, "", {}, TextAlignment.Center), Text(true, {0.0, 0.0}, 0, {0, 0, 0}, {0, 0, 0}, LinePattern.Solid, FillPattern.None, 0.25, {{100, -20}, {20, -100}}, "m/s", 0, {-1, -1, -1}, "", {}, TextAlignment.Center)}}
 // Evaluating: getErrorString()
 // ""
@@ -9944 +9944 @@
 // ""
 // Evaluating: getIconAnnotation(Modelica.SIunits.Conversions.to_day)
-// {-100.0,-100.0,100.0,100.0,true,0.1,2.0,2.0,{Text(true, {0.0, 0.0}, 0, {0, 0, 0}, {0, 0, 0}, LinePattern.Solid, FillPattern.None, 0.25, {{-20, 100}, {-100, 20}}, "s", 0, {-1, -1, -1}, TextAlignment.Center), Text(true, {0.0, 0.0}, 0, {0, 0, 0}, {0, 0, 0}, LinePattern.Solid, FillPattern.None, 0.25, {{100, -20}, {20, -100}}, "day", 0, {-1, -1, -1}, TextAlignment.Center)}}
+// {-100.0,-100.0,100.0,100.0,true,0.1,2.0,2.0,{Text(true, {0.0, 0.0}, 0, {0, 0, 0}, {0, 0, 0}, LinePattern.Solid, FillPattern.None, 0.25, {{-20, 100}, {-100, 20}}, "s", 0, {-1, -1, -1}, "", {}, TextAlignment.Center), Text(true, {0.0, 0.0}, 0, {0, 0, 0}, {0, 0, 0}, LinePattern.Solid, FillPattern.None, 0.25, {{100, -20}, {20, -100}}, "day", 0, {-1, -1, -1}, "", {}, TextAlignment.Center)}}
 // Evaluating: getErrorString()
 // ""
@@ -9956 +9956 @@
 // ""
 // Evaluating: getIconAnnotation(Modelica.SIunits.Conversions.from_day)
-// {-100.0,-100.0,100.0,100.0,true,0.1,2.0,2.0,{Text(true, {0.0, 0.0}, 0, {0, 0, 0}, {0, 0, 0}, LinePattern.Solid, FillPattern.None, 0.25, {{-20, 100}, {-100, 20}}, "day", 0, {-1, -1, -1}, TextAlignment.Center), Text(true, {0.0, 0.0}, 0, {0, 0, 0}, {0, 0, 0}, LinePattern.Solid, FillPattern.None, 0.25, {{100, -20}, {20, -100}}, "s", 0, {-1, -1, -1}, TextAlignment.Center)}}
+// {-100.0,-100.0,100.0,100.0,true,0.1,2.0,2.0,{Text(true, {0.0, 0.0}, 0, {0, 0, 0}, {0, 0, 0}, LinePattern.Solid, FillPattern.None, 0.25, {{-20, 100}, {-100, 20}}, "day", 0, {-1, -1, -1}, "", {}, TextAlignment.Center), Text(true, {0.0, 0.0}, 0, {0, 0, 0}, {0, 0, 0}, LinePattern.Solid, FillPattern.None, 0.25, {{100, -20}, {20, -100}}, "s", 0, {-1, -1, -1}, "", {}, TextAlignment.Center)}}
 // Evaluating: getErrorString()
 // ""
@@ -9968 +9968 @@
 // ""
 // Evaluating: getIconAnnotation(Modelica.SIunits.Conversions.to_hour)
-// {-100.0,-100.0,100.0,100.0,true,0.1,2.0,2.0,{Text(true, {0.0, 0.0}, 0, {0, 0, 0}, {0, 0, 0}, LinePattern.Solid, FillPattern.None, 0.25, {{-20, 100}, {-100, 20}}, "s", 0, {-1, -1, -1}, TextAlignment.Center), Text(true, {0.0, 0.0}, 0, {0, 0, 0}, {0, 0, 0}, LinePattern.Solid, FillPattern.None, 0.25, {{100, -20}, {20, -100}}, "hour", 0, {-1, -1, -1}, TextAlignment.Center)}}
+// {-100.0,-100.0,100.0,100.0,true,0.1,2.0,2.0,{Text(true, {0.0, 0.0}, 0, {0, 0, 0}, {0, 0, 0}, LinePattern.Solid, FillPattern.None, 0.25, {{-20, 100}, {-100, 20}}, "s", 0, {-1, -1, -1}, "", {}, TextAlignment.Center), Text(true, {0.0, 0.0}, 0, {0, 0, 0}, {0, 0, 0}, LinePattern.Solid, FillPattern.None, 0.25, {{100, -20}, {20, -100}}, "hour", 0, {-1, -1, -1}, "", {}, TextAlignment.Center)}}
 // Evaluating: getErrorString()
 // ""
@@ -9980 +9980 @@
 // ""
 // Evaluating: getIconAnnotation(Modelica.SIunits.Conversions.from_hour)
-// {-100.0,-100.0,100.0,100.0,true,0.1,2.0,2.0,{Text(true, {0.0, 0.0}, 0, {0, 0, 0}, {0, 0, 0}, LinePattern.Solid, FillPattern.None, 0.25, {{-20, 100}, {-100, 20}}, "hour", 0, {-1, -1, -1}, TextAlignment.Center), Text(true, {0.0, 0.0}, 0, {0, 0, 0}, {0, 0, 0}, LinePattern.Solid, FillPattern.None, 0.25, {{100, -20}, {20, -100}}, "s", 0, {-1, -1, -1}, TextAlignment.Center)}}
+// {-100.0,-100.0,100.0,100.0,true,0.1,2.0,2.0,{Text(true, {0.0, 0.0}, 0, {0, 0, 0}, {0, 0, 0}, LinePattern.Solid, FillPattern.None, 0.25, {{-20, 100}, {-100, 20}}, "hour", 0, {-1, -1, -1}, "", {}, TextAlignment.Center), Text(true, {0.0, 0.0}, 0, {0, 0, 0}, {0, 0, 0}, LinePattern.Solid, FillPattern.None, 0.25, {{100, -20}, {20, -100}}, "s", 0, {-1, -1, -1}, "", {}, TextAlignment.Center)}}
 // Evaluating: getErrorString()
 // ""
@@ -9992 +9992 @@
 // ""
 // Evaluating: getIconAnnotation(Modelica.SIunits.Conversions.to_minute)
-// {-100.0,-100.0,100.0,100.0,true,0.1,2.0,2.0,{Text(true, {0.0, 0.0}, 0, {0, 0, 0}, {0, 0, 0}, LinePattern.Solid, FillPattern.None, 0.25, {{-20, 100}, {-100, 20}}, "s", 0, {-1, -1, -1}, TextAlignment.Center), Text(true, {0.0, 0.0}, 0, {0, 0, 0}, {0, 0, 0}, LinePattern.Solid, FillPattern.None, 0.25, {{100, -20}, {20, -100}}, "minute", 0, {-1, -1, -1}, TextAlignment.Center)}}
+// {-100.0,-100.0,100.0,100.0,true,0.1,2.0,2.0,{Text(true, {0.0, 0.0}, 0, {0, 0, 0}, {0, 0, 0}, LinePattern.Solid, FillPattern.None, 0.25, {{-20, 100}, {-100, 20}}, "s", 0, {-1, -1, -1}, "", {}, TextAlignment.Center), Text(true, {0.0, 0.0}, 0, {0, 0, 0}, {0, 0, 0}, LinePattern.Solid, FillPattern.None, 0.25, {{100, -20}, {20, -100}}, "minute", 0, {-1, -1, -1}, "", {}, TextAlignment.Center)}}
 // Evaluating: getErrorString()
 // ""
@@ -10004 +10004 @@
 // ""
 // Evaluating: getIconAnnotation(Modelica.SIunits.Conversions.from_minute)
-// {-100.0,-100.0,100.0,100.0,true,0.1,2.0,2.0,{Text(true, {0.0, 0.0}, 0, {0, 0, 0}, {0, 0, 0}, LinePattern.Solid, FillPattern.None, 0.25, {{-20, 100}, {-100, 20}}, "minute", 0, {-1, -1, -1}, TextAlignment.Center), Text(true, {0.0, 0.0}, 0, {0, 0, 0}, {0, 0, 0}, LinePattern.Solid, FillPattern.None, 0.25, {{100, -20}, {20, -100}}, "s", 0, {-1, -1, -1}, TextAlignment.Center)}}
+// {-100.0,-100.0,100.0,100.0,true,0.1,2.0,2.0,{Text(true, {0.0, 0.0}, 0, {0, 0, 0}, {0, 0, 0}, LinePattern.Solid, FillPattern.None, 0.25, {{-20, 100}, {-100, 20}}, "minute", 0, {-1, -1, -1}, "", {}, TextAlignment.Center), Text(true, {0.0, 0.0}, 0, {0, 0, 0}, {0, 0, 0}, LinePattern.Solid, FillPattern.None, 0.25, {{100, -20}, {20, -100}}, "s", 0, {-1, -1, -1}, "", {}, TextAlignment.Center)}}
 // Evaluating: getErrorString()
 // ""
@@ -10016 +10016 @@
 // ""
 // Evaluating: getIconAnnotation(Modelica.SIunits.Conversions.to_litre)
-// {-100.0,-100.0,100.0,100.0,true,0.1,2.0,2.0,{Text(true, {0.0, 0.0}, 0, {0, 0, 0}, {0, 0, 0}, LinePattern.Solid, FillPattern.None, 0.25, {{-20, 100}, {-100, 20}}, "m3", 0, {-1, -1, -1}, TextAlignment.Center), Text(true, {0.0, 0.0}, 0, {0, 0, 0}, {0, 0, 0}, LinePattern.Solid, FillPattern.None, 0.25, {{100, -20}, {20, -100}}, "litre", 0, {-1, -1, -1}, TextAlignment.Center)}}
+// {-100.0,-100.0,100.0,100.0,true,0.1,2.0,2.0,{Text(true, {0.0, 0.0}, 0, {0, 0, 0}, {0, 0, 0}, LinePattern.Solid, FillPattern.None, 0.25, {{-20, 100}, {-100, 20}}, "m3", 0, {-1, -1, -1}, "", {}, TextAlignment.Center), Text(true, {0.0, 0.0}, 0, {0, 0, 0}, {0, 0, 0}, LinePattern.Solid, FillPattern.None, 0.25, {{100, -20}, {20, -100}}, "litre", 0, {-1, -1, -1}, "", {}, TextAlignment.Center)}}
 // Evaluating: getErrorString()
 // ""
@@ -10028 +10028 @@
 // ""
 // Evaluating: getIconAnnotation(Modelica.SIunits.Conversions.from_litre)
-// {-100.0,-100.0,100.0,100.0,true,0.1,2.0,2.0,{Text(true, {0.0, 0.0}, 0, {0, 0, 0}, {0, 0, 0}, LinePattern.Solid, FillPattern.None, 0.25, {{-20, 100}, {-100, 20}}, "litre", 0, {-1, -1, -1}, TextAlignment.Center), Text(true, {0.0, 0.0}, 0, {0, 0, 0}, {0, 0, 0}, LinePattern.Solid, FillPattern.None, 0.25, {{100, -20}, {20, -100}}, "m3", 0, {-1, -1, -1}, TextAlignment.Center)}}
+// {-100.0,-100.0,100.0,100.0,true,0.1,2.0,2.0,{Text(true, {0.0, 0.0}, 0, {0, 0, 0}, {0, 0, 0}, LinePattern.Solid, FillPattern.None, 0.25, {{-20, 100}, {-100, 20}}, "litre", 0, {-1, -1, -1}, "", {}, TextAlignment.Center), Text(true, {0.0, 0.0}, 0, {0, 0, 0}, {0, 0, 0}, LinePattern.Solid, FillPattern.None, 0.25, {{100, -20}, {20, -100}}, "m3", 0, {-1, -1, -1}, "", {}, TextAlignment.Center)}}
 // Evaluating: getErrorString()
 // ""
@@ -10040 +10040 @@
 // ""
 // Evaluating: getIconAnnotation(Modelica.SIunits.Conversions.to_kWh)
-// {-100.0,-100.0,100.0,100.0,true,0.1,2.0,2.0,{Text(true, {0.0, 0.0}, 0, {0, 0, 0}, {0, 0, 0}, LinePattern.Solid, FillPattern.None, 0.25, {{-20, 100}, {-100, 20}}, "J", 0, {-1, -1, -1}, TextAlignment.Center), Text(true, {0.0, 0.0}, 0, {0, 0, 0}, {0, 0, 0}, LinePattern.Solid, FillPattern.None, 0.25, {{100, -20}, {20, -100}}, "kWh", 0, {-1, -1, -1}, TextAlignment.Center)}}
+// {-100.0,-100.0,100.0,100.0,true,0.1,2.0,2.0,{Text(true, {0.0, 0.0}, 0, {0, 0, 0}, {0, 0, 0}, LinePattern.Solid, FillPattern.None, 0.25, {{-20, 100}, {-100, 20}}, "J", 0, {-1, -1, -1}, "", {}, TextAlignment.Center), Text(true, {0.0, 0.0}, 0, {0, 0, 0}, {0, 0, 0}, LinePattern.Solid, FillPattern.None, 0.25, {{100, -20}, {20, -100}}, "kWh", 0, {-1, -1, -1}, "", {}, TextAlignment.Center)}}
 // Evaluating: getErrorString()
 // ""
@@ -10052 +10052 @@
 // ""
 // Evaluating: getIconAnnotation(Modelica.SIunits.Conversions.from_kWh)
-// {-100.0,-100.0,100.0,100.0,true,0.1,2.0,2.0,{Text(true, {0.0, 0.0}, 0, {0, 0, 0}, {0, 0, 0}, LinePattern.Solid, FillPattern.None, 0.25, {{-20, 100}, {-100, 20}}, "kWh", 0, {-1, -1, -1}, TextAlignment.Center), Text(true, {0.0, 0.0}, 0, {0, 0, 0}, {0, 0, 0}, LinePattern.Solid, FillPattern.None, 0.25, {{100, -20}, {20, -100}}, "J", 0, {-1, -1, -1}, TextAlignment.Center)}}
+// {-100.0,-100.0,100.0,100.0,true,0.1,2.0,2.0,{Text(true, {0.0, 0.0}, 0, {0, 0, 0}, {0, 0, 0}, LinePattern.Solid, FillPattern.None, 0.25, {{-20, 100}, {-100, 20}}, "kWh", 0, {-1, -1, -1}, "", {}, TextAlignment.Center), Text(true, {0.0, 0.0}, 0, {0, 0, 0}, {0, 0, 0}, LinePattern.Solid, FillPattern.None, 0.25, {{100, -20}, {20, -100}}, "J", 0, {-1, -1, -1}, "", {}, TextAlignment.Center)}}
 // Evaluating: getErrorString()
 // ""
@@ -10064 +10064 @@
 // ""
 // Evaluating: getIconAnnotation(Modelica.SIunits.Conversions.to_bar)
-// {-100.0,-100.0,100.0,100.0,true,0.1,2.0,2.0,{Text(true, {0.0, 0.0}, 0, {0, 0, 0}, {0, 0, 0}, LinePattern.Solid, FillPattern.None, 0.25, {{-20, 100}, {-100, 20}}, "Pa", 0, {-1, -1, -1}, TextAlignment.Center), Text(true, {0.0, 0.0}, 0, {0, 0, 0}, {0, 0, 0}, LinePattern.Solid, FillPattern.None, 0.25, {{100, -20}, {20, -100}}, "bar", 0, {-1, -1, -1}, TextAlignment.Center)}}
+// {-100.0,-100.0,100.0,100.0,true,0.1,2.0,2.0,{Text(true, {0.0, 0.0}, 0, {0, 0, 0}, {0, 0, 0}, LinePattern.Solid, FillPattern.None, 0.25, {{-20, 100}, {-100, 20}}, "Pa", 0, {-1, -1, -1}, "", {}, TextAlignment.Center), Text(true, {0.0, 0.0}, 0, {0, 0, 0}, {0, 0, 0}, LinePattern.Solid, FillPattern.None, 0.25, {{100, -20}, {20, -100}}, "bar", 0, {-1, -1, -1}, "", {}, TextAlignment.Center)}}
 // Evaluating: getErrorString()
 // ""
@@ -10076 +10076 @@
 // ""
 // Evaluating: getIconAnnotation(Modelica.SIunits.Conversions.from_bar)
-// {-100.0,-100.0,100.0,100.0,true,0.1,2.0,2.0,{Text(true, {0.0, 0.0}, 0, {0, 0, 0}, {0, 0, 0}, LinePattern.Solid, FillPattern.None, 0.25, {{-20, 100}, {-100, 20}}, "bar", 0, {-1, -1, -1}, TextAlignment.Center), Text(true, {0.0, 0.0}, 0, {0, 0, 0}, {0, 0, 0}, LinePattern.Solid, FillPattern.None, 0.25, {{100, -20}, {20, -100}}, "Pa", 0, {-1, -1, -1}, TextAlignment.Center)}}
+// {-100.0,-100.0,100.0,100.0,true,0.1,2.0,2.0,{Text(true, {0.0, 0.0}, 0, {0, 0, 0}, {0, 0, 0}, LinePattern.Solid, FillPattern.None, 0.25, {{-20, 100}, {-100, 20}}, "bar", 0, {-1, -1, -1}, "", {}, TextAlignment.Center), Text(true, {0.0, 0.0}, 0, {0, 0, 0}, {0, 0, 0}, LinePattern.Solid, FillPattern.None, 0.25, {{100, -20}, {20, -100}}, "Pa", 0, {-1, -1, -1}, "", {}, TextAlignment.Center)}}
 // Evaluating: getErrorString()
 // ""
@@ -10088 +10088 @@
 // ""
 // Evaluating: getIconAnnotation(Modelica.SIunits.Conversions.to_gps)
-// {-100.0,-100.0,100.0,100.0,true,0.1,2.0,2.0,{Text(true, {0.0, 0.0}, 0, {0, 0, 0}, {0, 0, 0}, LinePattern.Solid, FillPattern.None, 0.25, {{-20, 100}, {-100, 20}}, "kg/s", 0, {-1, -1, -1}, TextAlignment.Center), Text(true, {0.0, 0.0}, 0, {0, 0, 0}, {0, 0, 0}, LinePattern.Solid, FillPattern.None, 0.25, {{100, -20}, {20, -100}}, "g/s", 0, {-1, -1, -1}, TextAlignment.Center)}}
+// {-100.0,-100.0,100.0,100.0,true,0.1,2.0,2.0,{Text(true, {0.0, 0.0}, 0, {0, 0, 0}, {0, 0, 0}, LinePattern.Solid, FillPattern.None, 0.25, {{-20, 100}, {-100, 20}}, "kg/s", 0, {-1, -1, -1}, "", {}, TextAlignment.Center), Text(true, {0.0, 0.0}, 0, {0, 0, 0}, {0, 0, 0}, LinePattern.Solid, FillPattern.None, 0.25, {{100, -20}, {20, -100}}, "g/s", 0, {-1, -1, -1}, "", {}, TextAlignment.Center)}}
 // Evaluating: getErrorString()
 // ""
@@ -10100 +10100 @@
 // ""
 // Evaluating: getIconAnnotation(Modelica.SIunits.Conversions.from_gps)
-// {-100.0,-100.0,100.0,100.0,true,0.1,2.0,2.0,{Text(true, {0.0, 0.0}, 0, {0, 0, 0}, {0, 0, 0}, LinePattern.Solid, FillPattern.None, 0.25, {{-20, 100}, {-100, 20}}, "g/s", 0, {-1, -1, -1}, TextAlignment.Center), Text(true, {0.0, 0.0}, 0, {0, 0, 0}, {0, 0, 0}, LinePattern.Solid, FillPattern.None, 0.25, {{100, -20}, {20, -100}}, "kg/s", 0, {-1, -1, -1}, TextAlignment.Center)}}
+// {-100.0,-100.0,100.0,100.0,true,0.1,2.0,2.0,{Text(true, {0.0, 0.0}, 0, {0, 0, 0}, {0, 0, 0}, LinePattern.Solid, FillPattern.None, 0.25, {{-20, 100}, {-100, 20}}, "g/s", 0, {-1, -1, -1}, "", {}, TextAlignment.Center), Text(true, {0.0, 0.0}, 0, {0, 0, 0}, {0, 0, 0}, LinePattern.Solid, FillPattern.None, 0.25, {{100, -20}, {20, -100}}, "kg/s", 0, {-1, -1, -1}, "", {}, TextAlignment.Center)}}
 // Evaluating: getErrorString()
 // ""
@@ -10112 +10112 @@
 // ""
 // Evaluating: getIconAnnotation(Modelica.SIunits.Conversions.ConversionIcon)
-// {-100.0,-100.0,100.0,100.0,true,0.1,2.0,2.0,{Rectangle(true, {0.0, 0.0}, 0, {191, 0, 0}, {255, 255, 255}, LinePattern.Solid, FillPattern.Solid, 0.25, BorderPattern.None, {{-100, 100}, {100, -100}}, 0), Line(true, {0.0, 0.0}, 0, {{-90, 0}, {30, 0}}, {191, 0, 0}, LinePattern.Solid, 0.25, {Arrow.None, Arrow.None}, 3, Smooth.None), Polygon(true, {0.0, 0.0}, 0, {191, 0, 0}, {191, 0, 0}, LinePattern.Solid, FillPattern.Solid, 0.25, {{90, 0}, {30, 20}, {30, -20}, {90, 0}}, Smooth.None), Text(true, {0.0, 0.0}, 0, {0, 0, 255}, {0, 0, 0}, LinePattern.Solid, FillPattern.None, 0.25, {{-115, 155}, {115, 105}}, "%name", 0, {-1, -1, -1}, TextAlignment.Center)}}
+// {-100.0,-100.0,100.0,100.0,true,0.1,2.0,2.0,{Rectangle(true, {0.0, 0.0}, 0, {191, 0, 0}, {255, 255, 255}, LinePattern.Solid, FillPattern.Solid, 0.25, BorderPattern.None, {{-100, 100}, {100, -100}}, 0), Line(true, {0.0, 0.0}, 0, {{-90, 0}, {30, 0}}, {191, 0, 0}, LinePattern.Solid, 0.25, {Arrow.None, Arrow.None}, 3, Smooth.None), Polygon(true, {0.0, 0.0}, 0, {191, 0, 0}, {191, 0, 0}, LinePattern.Solid, FillPattern.Solid, 0.25, {{90, 0}, {30, 20}, {30, -20}, {90, 0}}, Smooth.None), Text(true, {0.0, 0.0}, 0, {0, 0, 255}, {0, 0, 0}, LinePattern.Solid, FillPattern.None, 0.25, {{-115, 155}, {115, 105}}, "%name", 0, {-1, -1, -1}, "", {}, TextAlignment.Center)}}
 // Evaluating: getErrorString()
 // ""
@@ -10124 +10124 @@
 // ""
 // Evaluating: getIconAnnotation(Modelica.SIunits.Conversions.from_Hz)
-// {-100.0,-100.0,100.0,100.0,true,0.1,2.0,2.0,{Text(true, {0.0, 0.0}, 0, {0, 0, 0}, {0, 0, 0}, LinePattern.Solid, FillPattern.None, 0.25, {{-20, 100}, {-100, 20}}, "Hz", 0, {-1, -1, -1}, TextAlignment.Center), Text(true, {0.0, 0.0}, 0, {0, 0, 0}, {0, 0, 0}, LinePattern.Solid, FillPattern.None, 0.25, {{100, -20}, {20, -100}}, "1/s", 0, {-1, -1, -1}, TextAlignment.Center)}}
+// {-100.0,-100.0,100.0,100.0,true,0.1,2.0,2.0,{Text(true, {0.0, 0.0}, 0, {0, 0, 0}, {0, 0, 0}, LinePattern.Solid, FillPattern.None, 0.25, {{-20, 100}, {-100, 20}}, "Hz", 0, {-1, -1, -1}, "", {}, TextAlignment.Center), Text(true, {0.0, 0.0}, 0, {0, 0, 0}, {0, 0, 0}, LinePattern.Solid, FillPattern.None, 0.25, {{100, -20}, {20, -100}}, "1/s", 0, {-1, -1, -1}, "", {}, TextAlignment.Center)}}
 // Evaluating: getErrorString()
 // ""
@@ -10136 +10136 @@
 // ""
 // Evaluating: getIconAnnotation(Modelica.SIunits.Conversions.to_Hz)
-// {-100.0,-100.0,100.0,100.0,true,0.1,2.0,2.0,{Text(true, {0.0, 0.0}, 0, {0, 0, 0}, {0, 0, 0}, LinePattern.Solid, FillPattern.None, 0.25, {{-20, 100}, {-100, 20}}, "1/s", 0, {-1, -1, -1}, TextAlignment.Center), Text(true, {0.0, 0.0}, 0, {0, 0, 0}, {0, 0, 0}, LinePattern.Solid, FillPattern.None, 0.25, {{100, -20}, {20, -100}}, "Hz", 0, {-1, -1, -1}, TextAlignment.Center)}}
+// {-100.0,-100.0,100.0,100.0,true,0.1,2.0,2.0,{Text(true, {0.0, 0.0}, 0, {0, 0, 0}, {0, 0, 0}, LinePattern.Solid, FillPattern.None, 0.25, {{-20, 100}, {-100, 20}}, "1/s", 0, {-1, -1, -1}, "", {}, TextAlignment.Center), Text(true, {0.0, 0.0}, 0, {0, 0, 0}, {0, 0, 0}, LinePattern.Solid, FillPattern.None, 0.25, {{100, -20}, {20, -100}}, "Hz", 0, {-1, -1, -1}, "", {}, TextAlignment.Center)}}
 // Evaluating: getErrorString()
 // ""
@@ -15980 +15980 @@
 // ""
 // Evaluating: getIconAnnotation(Modelica.Icons.Example)
-// {-100.0,-100.0,100.0,100.0,true,0.1,1.0,1.0,{Rectangle(true, {0.0, 0.0}, 0, {0, 0, 255}, {255, 255, 255}, LinePattern.Solid, FillPattern.Solid, 0.25, BorderPattern.None, {{-100, -100}, {80, 50}}, 0), Polygon(true, {0.0, 0.0}, 0, {0, 0, 255}, {255, 255, 255}, LinePattern.Solid, FillPattern.Solid, 0.25, {{-100, 50}, {-80, 70}, {100, 70}, {80, 50}, {-100, 50}}, Smooth.None), Polygon(true, {0.0, 0.0}, 0, {0, 0, 255}, {255, 255, 255}, LinePattern.Solid, FillPattern.Solid, 0.25, {{100, 70}, {100, -80}, {80, -100}, {80, 50}, {100, 70}}, Smooth.None), Text(true, {0.0, 0.0}, 0, {0, 0, 255}, {0, 0, 0}, LinePattern.Solid, FillPattern.None, 0.25, {{-96, 3}, {77, -49}}, "Example", 0, {-1, -1, -1}, TextAlignment.Center), Text(true, {0.0, 0.0}, 0, {255, 0, 0}, {0, 0, 0}, LinePattern.Solid, FillPattern.None, 0.25, {{-120, 132}, {120, 73}}, "%name", 0, {-1, -1, -1}, TextAlignment.Center)}}
+// {-100.0,-100.0,100.0,100.0,true,0.1,1.0,1.0,{Rectangle(true, {0.0, 0.0}, 0, {0, 0, 255}, {255, 255, 255}, LinePattern.Solid, FillPattern.Solid, 0.25, BorderPattern.None, {{-100, -100}, {80, 50}}, 0), Polygon(true, {0.0, 0.0}, 0, {0, 0, 255}, {255, 255, 255}, LinePattern.Solid, FillPattern.Solid, 0.25, {{-100, 50}, {-80, 70}, {100, 70}, {80, 50}, {-100, 50}}, Smooth.None), Polygon(true, {0.0, 0.0}, 0, {0, 0, 255}, {255, 255, 255}, LinePattern.Solid, FillPattern.Solid, 0.25, {{100, 70}, {100, -80}, {80, -100}, {80, 50}, {100, 70}}, Smooth.None), Text(true, {0.0, 0.0}, 0, {0, 0, 255}, {0, 0, 0}, LinePattern.Solid, FillPattern.None, 0.25, {{-96, 3}, {77, -49}}, "Example", 0, {-1, -1, -1}, "", {}, TextAlignment.Center), Text(true, {0.0, 0.0}, 0, {255, 0, 0}, {0, 0, 0}, LinePattern.Solid, FillPattern.None, 0.25, {{-120, 132}, {120, 73}}, "%name", 0, {-1, -1, -1}, "", {}, TextAlignment.Center)}}
 // Evaluating: getErrorString()
 // ""
@@ -15997 +15997 @@
 // ""
 // Evaluating: getIconAnnotation(Modelica.Icons.Function)
-// {-100.0,-100.0,100.0,100.0,true,0.1,2.0,2.0,{Text(true, {0.0, 0.0}, 0, {0, 0, 255}, {0, 0, 0}, LinePattern.Solid, FillPattern.None, 0.25, {{-140, 162}, {136, 102}}, "%name", 0, {-1, -1, -1}, TextAlignment.Center), Ellipse(true, {0.0, 0.0}, 0, {255, 127, 0}, {255, 255, 255}, LinePattern.Solid, FillPattern.Solid, 0.25, {{-100, 100}, {100, -100}}, 0, 360), Text(true, {0.0, 0.0}, 0, {255, 127, 0}, {0, 0, 0}, LinePattern.Solid, FillPattern.None, 0.25, {{-100, 100}, {100, -100}}, "f", 0, {-1, -1, -1}, TextAlignment.Center)}}
+// {-100.0,-100.0,100.0,100.0,true,0.1,2.0,2.0,{Text(true, {0.0, 0.0}, 0, {0, 0, 255}, {0, 0, 0}, LinePattern.Solid, FillPattern.None, 0.25, {{-140, 162}, {136, 102}}, "%name", 0, {-1, -1, -1}, "", {}, TextAlignment.Center), Ellipse(true, {0.0, 0.0}, 0, {255, 127, 0}, {255, 255, 255}, LinePattern.Solid, FillPattern.Solid, 0.25, {{-100, 100}, {100, -100}}, 0, 360), Text(true, {0.0, 0.0}, 0, {255, 127, 0}, {0, 0, 0}, LinePattern.Solid, FillPattern.None, 0.25, {{-100, 100}, {100, -100}}, "f", 0, {-1, -1, -1}, "", {}, TextAlignment.Center)}}
 // Evaluating: getErrorString()
 // ""
@@ -16013 +16013 @@
 // ""
 // Evaluating: getIconAnnotation(Modelica.Icons.Record)
-// {-100.0,-100.0,100.0,100.0,true,0.1,2.0,2.0,{Rectangle(true, {0.0, 0.0}, 0, {0, 0, 255}, {255, 255, 127}, LinePattern.Solid, FillPattern.Solid, 0.25, BorderPattern.None, {{-100, 50}, {100, -100}}, 0), Text(true, {0.0, 0.0}, 0, {0, 0, 255}, {0, 0, 0}, LinePattern.Solid, FillPattern.None, 0.25, {{-127, 115}, {127, 55}}, "%name", 0, {-1, -1, -1}, TextAlignment.Center), Line(true, {0.0, 0.0}, 0, {{-100, -50}, {100, -50}}, {0, 0, 0}, LinePattern.Solid, 0.25, {Arrow.None, Arrow.None}, 3, Smooth.None), Line(true, {0.0, 0.0}, 0, {{-100, 0}, {100, 0}}, {0, 0, 0}, LinePattern.Solid, 0.25, {Arrow.None, Arrow.None}, 3, Smooth.None), Line(true, {0.0, 0.0}, 0, {{0, 50}, {0, -100}}, {0, 0, 0}, LinePattern.Solid, 0.25, {Arrow.None, Arrow.None}, 3, Smooth.None)}}
+// {-100.0,-100.0,100.0,100.0,true,0.1,2.0,2.0,{Rectangle(true, {0.0, 0.0}, 0, {0, 0, 255}, {255, 255, 127}, LinePattern.Solid, FillPattern.Solid, 0.25, BorderPattern.None, {{-100, 50}, {100, -100}}, 0), Text(true, {0.0, 0.0}, 0, {0, 0, 255}, {0, 0, 0}, LinePattern.Solid, FillPattern.None, 0.25, {{-127, 115}, {127, 55}}, "%name", 0, {-1, -1, -1}, "", {}, TextAlignment.Center), Line(true, {0.0, 0.0}, 0, {{-100, -50}, {100, -50}}, {0, 0, 0}, LinePattern.Solid, 0.25, {Arrow.None, Arrow.None}, 3, Smooth.None), Line(true, {0.0, 0.0}, 0, {{-100, 0}, {100, 0}}, {0, 0, 0}, LinePattern.Solid, 0.25, {Arrow.None, Arrow.None}, 3, Smooth.None), Line(true, {0.0, 0.0}, 0, {{0, 50}, {0, -100}}, {0, 0, 0}, LinePattern.Solid, 0.25, {Arrow.None, Arrow.None}, 3, Smooth.None)}}
 // Evaluating: getErrorString()
 // ""
@@ -16029 +16029 @@
 // ""
 // Evaluating: getIconAnnotation(Modelica.Icons.TypeReal)
-// {-100.0,-100.0,100.0,100.0,true,0.1,2.0,2.0,{Rectangle(true, {0.0, 0.0}, 0, {0, 0, 0}, {181, 181, 181}, LinePattern.Solid, FillPattern.Solid, 0.25, BorderPattern.None, {{-100, 100}, {100, -100}}, 0), Text(true, {0.0, 0.0}, 0, {0, 0, 0}, {0, 0, 0}, LinePattern.Solid, FillPattern.None, 0.25, {{-94, 94}, {94, -94}}, "R", 0, {-1, -1, -1}, TextAlignment.Center)}}
+// {-100.0,-100.0,100.0,100.0,true,0.1,2.0,2.0,{Rectangle(true, {0.0, 0.0}, 0, {0, 0, 0}, {181, 181, 181}, LinePattern.Solid, FillPattern.Solid, 0.25, BorderPattern.None, {{-100, 100}, {100, -100}}, 0), Text(true, {0.0, 0.0}, 0, {0, 0, 0}, {0, 0, 0}, LinePattern.Solid, FillPattern.None, 0.25, {{-94, 94}, {94, -94}}, "R", 0, {-1, -1, -1}, "", {}, TextAlignment.Center)}}
 // Evaluating: getErrorString()
 // ""
@@ -16045 +16045 @@
 // ""
 // Evaluating: getIconAnnotation(Modelica.Icons.TypeInteger)
-// {-100.0,-100.0,100.0,100.0,true,0.1,2.0,2.0,{Rectangle(true, {0.0, 0.0}, 0, {0, 0, 0}, {181, 181, 181}, LinePattern.Solid, FillPattern.Solid, 0.25, BorderPattern.None, {{-100, 100}, {100, -100}}, 0), Text(true, {0.0, 0.0}, 0, {0, 0, 0}, {0, 0, 0}, LinePattern.Solid, FillPattern.None, 0.25, {{-94, 94}, {94, -94}}, "I", 0, {-1, -1, -1}, TextAlignment.Center)}}
+// {-100.0,-100.0,100.0,100.0,true,0.1,2.0,2.0,{Rectangle(true, {0.0, 0.0}, 0, {0, 0, 0}, {181, 181, 181}, LinePattern.Solid, FillPattern.Solid, 0.25, BorderPattern.None, {{-100, 100}, {100, -100}}, 0), Text(true, {0.0, 0.0}, 0, {0, 0, 0}, {0, 0, 0}, LinePattern.Solid, FillPattern.None, 0.25, {{-94, 94}, {94, -94}}, "I", 0, {-1, -1, -1}, "", {}, TextAlignment.Center)}}
 // Evaluating: getErrorString()
 // ""
@@ -16061 +16061 @@
 // ""
 // Evaluating: getIconAnnotation(Modelica.Icons.TypeBoolean)
-// {-100.0,-100.0,100.0,100.0,true,0.1,2.0,2.0,{Rectangle(true, {0.0, 0.0}, 0, {0, 0, 0}, {181, 181, 181}, LinePattern.Solid, FillPattern.Solid, 0.25, BorderPattern.None, {{-100, 100}, {100, -100}}, 0), Text(true, {0.0, 0.0}, 0, {0, 0, 0}, {0, 0, 0}, LinePattern.Solid, FillPattern.None, 0.25, {{-94, 94}, {94, -94}}, "B", 0, {-1, -1, -1}, TextAlignment.Center)}}
+// {-100.0,-100.0,100.0,100.0,true,0.1,2.0,2.0,{Rectangle(true, {0.0, 0.0}, 0, {0, 0, 0}, {181, 181, 181}, LinePattern.Solid, FillPattern.Solid, 0.25, BorderPattern.None, {{-100, 100}, {100, -100}}, 0), Text(true, {0.0, 0.0}, 0, {0, 0, 0}, {0, 0, 0}, LinePattern.Solid, FillPattern.None, 0.25, {{-94, 94}, {94, -94}}, "B", 0, {-1, -1, -1}, "", {}, TextAlignment.Center)}}
 // Evaluating: getErrorString()
 // ""
@@ -16077 +16077 @@
 // ""
 // Evaluating: getIconAnnotation(Modelica.Icons.TypeString)
-// {-100.0,-100.0,100.0,100.0,true,0.1,2.0,2.0,{Rectangle(true, {0.0, 0.0}, 0, {0, 0, 0}, {181, 181, 181}, LinePattern.Solid, FillPattern.Solid, 0.25, BorderPattern.None, {{-100, 100}, {100, -100}}, 0), Text(true, {0.0, 0.0}, 0, {0, 0, 0}, {0, 0, 0}, LinePattern.Solid, FillPattern.None, 0.25, {{-94, 94}, {94, -94}}, "S", 0, {-1, -1, -1}, TextAlignment.Center)}}
+// {-100.0,-100.0,100.0,100.0,true,0.1,2.0,2.0,{Rectangle(true, {0.0, 0.0}, 0, {0, 0, 0}, {181, 181, 181}, LinePattern.Solid, FillPattern.Solid, 0.25, BorderPattern.None, {{-100, 100}, {100, -100}}, 0), Text(true, {0.0, 0.0}, 0, {0, 0, 0}, {0, 0, 0}, LinePattern.Solid, FillPattern.None, 0.25, {{-94, 94}, {94, -94}}, "S", 0, {-1, -1, -1}, "", {}, TextAlignment.Center)}}
 // Evaluating: getErrorString()
 // ""
@@ -16853 +16853 @@
 // ""
 // Evaluating: getIconAnnotation(Modelica.Utilities.Internal.PartialModelicaServices.Animation.PartialShape)
-// {-100.0,-100.0,100.0,100.0,true,0.1,2.0,2.0,{Rectangle(true, {0.0, 0.0}, 0, {0, 0, 255}, {255, 255, 255}, LinePattern.Solid, FillPattern.Solid, 0.25, BorderPattern.None, {{-100, -100}, {80, 60}}, 0), Polygon(true, {0.0, 0.0}, 0, {0, 0, 255}, {192, 192, 192}, LinePattern.Solid, FillPattern.Solid, 0.25, {{-100, 60}, {-80, 100}, {100, 100}, {80, 60}, {-100, 60}}, Smooth.None), Polygon(true, {0.0, 0.0}, 0, {0, 0, 255}, {160, 160, 164}, LinePattern.Solid, FillPattern.Solid, 0.25, {{100, 100}, {100, -60}, {80, -100}, {80, 60}, {100, 100}}, Smooth.None), Text(true, {0.0, 0.0}, 0, {0, 0, 0}, {0, 0, 0}, LinePattern.Solid, FillPattern.None, 0.25, {{-100, -100}, {80, 60}}, "%shapeType", 0, {-1, -1, -1}, TextAlignment.Center), Text(true, {0.0, 0.0}, 0, {0, 0, 255}, {0, 0, 0}, LinePattern.Solid, FillPattern.None, 0.25, {{-132, 160}, {128, 100}}, "%name", 0, {-1, -1, -1}, TextAlignment.Center)}}
+// {-100.0,-100.0,100.0,100.0,true,0.1,2.0,2.0,{Rectangle(true, {0.0, 0.0}, 0, {0, 0, 255}, {255, 255, 255}, LinePattern.Solid, FillPattern.Solid, 0.25, BorderPattern.None, {{-100, -100}, {80, 60}}, 0), Polygon(true, {0.0, 0.0}, 0, {0, 0, 255}, {192, 192, 192}, LinePattern.Solid, FillPattern.Solid, 0.25, {{-100, 60}, {-80, 100}, {100, 100}, {80, 60}, {-100, 60}}, Smooth.None), Polygon(true, {0.0, 0.0}, 0, {0, 0, 255}, {160, 160, 164}, LinePattern.Solid, FillPattern.Solid, 0.25, {{100, 100}, {100, -60}, {80, -100}, {80, 60}, {100, 100}}, Smooth.None), Text(true, {0.0, 0.0}, 0, {0, 0, 0}, {0, 0, 0}, LinePattern.Solid, FillPattern.None, 0.25, {{-100, -100}, {80, 60}}, "%shapeType", 0, {-1, -1, -1}, "", {}, TextAlignment.Center), Text(true, {0.0, 0.0}, 0, {0, 0, 255}, {0, 0, 0}, LinePattern.Solid, FillPattern.None, 0.25, {{-132, 160}, {128, 100}}, "%name", 0, {-1, -1, -1}, "", {}, TextAlignment.Center)}}
 // Evaluating: getErrorString()
 // ""
@@ -18305 +18305 @@
 // ""
 // Evaluating: getIconAnnotation(Modelica.Thermal.FluidHeatFlow.Components.IsolatedPipe)
-// {-100.0,-100.0,100.0,100.0,true,0.1,2.0,2.0,{Rectangle(true, {0.0, 0.0}, 0, {255, 0, 0}, {0, 0, 255}, LinePattern.Solid, FillPattern.Solid, 0.25, BorderPattern.None, {{-90, 20}, {90, -20}}, 0), Text(true, {0.0, 0.0}, 0, {0, 0, 0}, {0, 0, 0}, LinePattern.Solid, FillPattern.None, 0.25, {{-150, 100}, {150, 40}}, "%name", 0, {-1, -1, -1}, TextAlignment.Center)}}
+// {-100.0,-100.0,100.0,100.0,true,0.1,2.0,2.0,{Rectangle(true, {0.0, 0.0}, 0, {255, 0, 0}, {0, 0, 255}, LinePattern.Solid, FillPattern.Solid, 0.25, BorderPattern.None, {{-90, 20}, {90, -20}}, 0), Text(true, {0.0, 0.0}, 0, {0, 0, 0}, {0, 0, 0}, LinePattern.Solid, FillPattern.None, 0.25, {{-150, 100}, {150, 40}}, "%name", 0, {-1, -1, -1}, "", {}, TextAlignment.Center)}}
 // Evaluating: getErrorString()
 // ""
@@ -18322 +18322 @@
 // ""
 // Evaluating: getIconAnnotation(Modelica.Thermal.FluidHeatFlow.Components.HeatedPipe)
-// {-100.0,-100.0,100.0,100.0,true,0.1,2.0,2.0,{Rectangle(true, {0.0, 0.0}, 0, {255, 0, 0}, {0, 0, 255}, LinePattern.Solid, FillPattern.Solid, 0.25, BorderPattern.None, {{-90, 20}, {90, -20}}, 0), Text(true, {0.0, 0.0}, 0, {0, 0, 0}, {0, 0, 0}, LinePattern.Solid, FillPattern.None, 0.25, {{-150, 100}, {150, 40}}, "%name", 0, {-1, -1, -1}, TextAlignment.Center), Polygon(true, {0.0, 0.0}, 0, {255, 0, 0}, {0, 0, 0}, LinePattern.Solid, FillPattern.None, 0.25, {{-10, -90}, {-10, -40}, {0, -20}, {10, -40}, {10, -90}, {-10, -90}}, Smooth.None)}}
+// {-100.0,-100.0,100.0,100.0,true,0.1,2.0,2.0,{Rectangle(true, {0.0, 0.0}, 0, {255, 0, 0}, {0, 0, 255}, LinePattern.Solid, FillPattern.Solid, 0.25, BorderPattern.None, {{-90, 20}, {90, -20}}, 0), Text(true, {0.0, 0.0}, 0, {0, 0, 0}, {0, 0, 0}, LinePattern.Solid, FillPattern.None, 0.25, {{-150, 100}, {150, 40}}, "%name", 0, {-1, -1, -1}, "", {}, TextAlignment.Center), Polygon(true, {0.0, 0.0}, 0, {255, 0, 0}, {0, 0, 0}, LinePattern.Solid, FillPattern.None, 0.25, {{-10, -90}, {-10, -40}, {0, -20}, {10, -40}, {10, -90}, {-10, -90}}, Smooth.None)}}
 // Evaluating: getErrorString()
 // ""
@@ -18342 +18342 @@
 // ""
 // Evaluating: getIconAnnotation(Modelica.Thermal.FluidHeatFlow.Components.Valve)
-// {-100.0,-100.0,100.0,100.0,true,0.1,2.0,2.0,{Text(true, {0.0, 0.0}, 0, {0, 0, 0}, {0, 0, 0}, LinePattern.Solid, FillPattern.None, 0.25, {{-150, -60}, {150, -120}}, "%name", 0, {-1, -1, -1}, TextAlignment.Center), Polygon(true, {0.0, 0.0}, 0, {255, 0, 0}, {0, 0, 255}, LinePattern.Solid, FillPattern.Solid, 0.25, {{-90, 10}, {-60, 10}, {-60, 60}, {0, 0}, {60, 60}, {60, 10}, {90, 10}, {90, -10}, {60, -10}, {60, -60}, {0, 0}, {-60, -60}, {-60, -10}, {-90, -10}, {-90, 10}}, Smooth.None), Line(true, {0.0, 0.0}, 0, {{0, 80}, {0, 0}}, {0, 0, 127}, LinePattern.Solid, 0.25, {Arrow.None, Arrow.None}, 3, Smooth.None)}}
+// {-100.0,-100.0,100.0,100.0,true,0.1,2.0,2.0,{Text(true, {0.0, 0.0}, 0, {0, 0, 0}, {0, 0, 0}, LinePattern.Solid, FillPattern.None, 0.25, {{-150, -60}, {150, -120}}, "%name", 0, {-1, -1, -1}, "", {}, TextAlignment.Center), Polygon(true, {0.0, 0.0}, 0, {255, 0, 0}, {0, 0, 255}, LinePattern.Solid, FillPattern.Solid, 0.25, {{-90, 10}, {-60, 10}, {-60, 60}, {0, 0}, {60, 60}, {60, 10}, {90, 10}, {90, -10}, {60, -10}, {60, -60}, {0, 0}, {-60, -60}, {-60, -10}, {-90, -10}, {-90, 10}}, Smooth.None), Line(true, {0.0, 0.0}, 0, {{0, 80}, {0, 0}}, {0, 0, 127}, LinePattern.Solid, 0.25, {Arrow.None, Arrow.None}, 3, Smooth.None)}}
 // Evaluating: getErrorString()
 // ""
@@ -18427 +18427 @@
 // ""
 // Evaluating: getIconAnnotation(Modelica.Thermal.FluidHeatFlow.Sources.Ambient)
-// {-100.0,-100.0,100.0,100.0,true,0.1,2.0,2.0,{Text(true, {0.0, 0.0}, 0, {0, 0, 0}, {0, 0, 0}, LinePattern.Solid, FillPattern.None, 0.25, {{20, 80}, {80, 20}}, "p", 0, {-1, -1, -1}, TextAlignment.Center), Text(true, {0.0, 0.0}, 0, {0, 0, 0}, {0, 0, 0}, LinePattern.Solid, FillPattern.None, 0.25, {{20, -20}, {80, -80}}, "T", 0, {-1, -1, -1}, TextAlignment.Center)}}
+// {-100.0,-100.0,100.0,100.0,true,0.1,2.0,2.0,{Text(true, {0.0, 0.0}, 0, {0, 0, 0}, {0, 0, 0}, LinePattern.Solid, FillPattern.None, 0.25, {{20, 80}, {80, 20}}, "p", 0, {-1, -1, -1}, "", {}, TextAlignment.Center), Text(true, {0.0, 0.0}, 0, {0, 0, 0}, {0, 0, 0}, LinePattern.Solid, FillPattern.None, 0.25, {{20, -20}, {80, -80}}, "T", 0, {-1, -1, -1}, "", {}, TextAlignment.Center)}}
 // Evaluating: getErrorString()
 // ""
@@ -18442 +18442 @@
 // ""
 // Evaluating: getIconAnnotation(Modelica.Thermal.FluidHeatFlow.Sources.AbsolutePressure)
-// {-100.0,-100.0,100.0,100.0,true,0.1,2.0,2.0,{Text(true, {0.0, 0.0}, 0, {0, 0, 255}, {0, 0, 0}, LinePattern.Solid, FillPattern.None, 0.25, {{-150, 150}, {150, 90}}, "%name", 0, {-1, -1, -1}, TextAlignment.Center), Ellipse(true, {0.0, 0.0}, 0, {255, 0, 0}, {255, 255, 255}, LinePattern.Solid, FillPattern.Solid, 0.25, {{-90, 90}, {90, -90}}, 0, 360)}}
+// {-100.0,-100.0,100.0,100.0,true,0.1,2.0,2.0,{Text(true, {0.0, 0.0}, 0, {0, 0, 255}, {0, 0, 0}, LinePattern.Solid, FillPattern.None, 0.25, {{-150, 150}, {150, 90}}, "%name", 0, {-1, -1, -1}, "", {}, TextAlignment.Center), Ellipse(true, {0.0, 0.0}, 0, {255, 0, 0}, {255, 255, 255}, LinePattern.Solid, FillPattern.Solid, 0.25, {{-90, 90}, {90, -90}}, 0, 360)}}
 // Evaluating: getErrorString()
 // ""
@@ -18457 +18457 @@
 // ""
 // Evaluating: getIconAnnotation(Modelica.Thermal.FluidHeatFlow.Sources.VolumeFlow)
-// {-100.0,-100.0,100.0,100.0,true,0.1,2.0,2.0,{Ellipse(true, {0.0, 0.0}, 0, {255, 0, 0}, {255, 255, 255}, LinePattern.Solid, FillPattern.Solid, 0.25, {{-90, 90}, {90, -90}}, 0, 360), Text(true, {0.0, 0.0}, 0, {0, 0, 255}, {0, 0, 0}, LinePattern.Solid, FillPattern.None, 0.25, {{-150, -90}, {150, -150}}, "%name", 0, {-1, -1, -1}, TextAlignment.Center), Polygon(true, {0.0, 0.0}, 0, {255, 0, 0}, {0, 0, 255}, LinePattern.Solid, FillPattern.Solid, 0.25, {{-60, 68}, {90, 10}, {90, -10}, {-60, -68}, {-60, 68}}, Smooth.None), Text(true, {0.0, 0.0}, 0, {0, 0, 0}, {0, 0, 0}, LinePattern.Solid, FillPattern.None, 0.25, {{-40, 20}, {0, -20}}, "V", 0, {-1, -1, -1}, TextAlignment.Center)}}
+// {-100.0,-100.0,100.0,100.0,true,0.1,2.0,2.0,{Ellipse(true, {0.0, 0.0}, 0, {255, 0, 0}, {255, 255, 255}, LinePattern.Solid, FillPattern.Solid, 0.25, {{-90, 90}, {90, -90}}, 0, 360), Text(true, {0.0, 0.0}, 0, {0, 0, 255}, {0, 0, 0}, LinePattern.Solid, FillPattern.None, 0.25, {{-150, -90}, {150, -150}}, "%name", 0, {-1, -1, -1}, "", {}, TextAlignment.Center), Polygon(true, {0.0, 0.0}, 0, {255, 0, 0}, {0, 0, 255}, LinePattern.Solid, FillPattern.Solid, 0.25, {{-60, 68}, {90, 10}, {90, -10}, {-60, -68}, {-60, 68}}, Smooth.None), Text(true, {0.0, 0.0}, 0, {0, 0, 0}, {0, 0, 0}, LinePattern.Solid, FillPattern.None, 0.25, {{-40, 20}, {0, -20}}, "V", 0, {-1, -1, -1}, "", {}, TextAlignment.Center)}}
 // Evaluating: getErrorString()
 // ""
@@ -18475 +18475 @@
 // ""
 // Evaluating: getIconAnnotation(Modelica.Thermal.FluidHeatFlow.Sources.PressureIncrease)
-// {-100.0,-100.0,100.0,100.0,true,0.1,2.0,2.0,{Ellipse(true, {0.0, 0.0}, 0, {255, 0, 0}, {255, 255, 255}, LinePattern.Solid, FillPattern.Solid, 0.25, {{-90, 90}, {90, -90}}, 0, 360), Text(true, {0.0, 0.0}, 0, {0, 0, 255}, {0, 0, 0}, LinePattern.Solid, FillPattern.None, 0.25, {{-150, -90}, {150, -150}}, "%name", 0, {-1, -1, -1}, TextAlignment.Center), Polygon(true, {0.0, 0.0}, 0, {0, 0, 255}, {255, 0, 0}, LinePattern.Solid, FillPattern.Solid, 0.25, {{-60, 68}, {90, 10}, {90, -10}, {-60, -68}, {-60, 68}}, Smooth.None), Text(true, {0.0, 0.0}, 0, {0, 0, 0}, {0, 0, 0}, LinePattern.Solid, FillPattern.None, 0.25, {{-40, 20}, {0, -20}}, "dp", 0, {-1, -1, -1}, TextAlignment.Center)}}
+// {-100.0,-100.0,100.0,100.0,true,0.1,2.0,2.0,{Ellipse(true, {0.0, 0.0}, 0, {255, 0, 0}, {255, 255, 255}, LinePattern.Solid, FillPattern.Solid, 0.25, {{-90, 90}, {90, -90}}, 0, 360), Text(true, {0.0, 0.0}, 0, {0, 0, 255}, {0, 0, 0}, LinePattern.Solid, FillPattern.None, 0.25, {{-150, -90}, {150, -150}}, "%name", 0, {-1, -1, -1}, "", {}, TextAlignment.Center), Polygon(true, {0.0, 0.0}, 0, {0, 0, 255}, {255, 0, 0}, LinePattern.Solid, FillPattern.Solid, 0.25, {{-60, 68}, {90, 10}, {90, -10}, {-60, -68}, {-60, 68}}, Smooth.None), Text(true, {0.0, 0.0}, 0, {0, 0, 0}, {0, 0, 0}, LinePattern.Solid, FillPattern.None, 0.25, {{-40, 20}, {0, -20}}, "dp", 0, {-1, -1, -1}, "", {}, TextAlignment.Center)}}
 // Evaluating: getErrorString()
 // ""
@@ -18493 +18493 @@
 // ""
 // Evaluating: getIconAnnotation(Modelica.Thermal.FluidHeatFlow.Sources.IdealPump)
-// {-100.0,-100.0,100.0,100.0,true,0.1,2.0,2.0,{Ellipse(true, {0.0, 0.0}, 0, {255, 0, 0}, {255, 255, 255}, LinePattern.Solid, FillPattern.Solid, 0.25, {{-90, 90}, {90, -90}}, 0, 360), Text(true, {0.0, 0.0}, 0, {0, 0, 255}, {0, 0, 0}, LinePattern.Solid, FillPattern.None, 0.25, {{-150, 150}, {150, 90}}, "%name", 0, {-1, -1, -1}, TextAlignment.Center), Rectangle(true, {0.0, 0.0}, 0, {0, 0, 0}, {175, 175, 175}, LinePattern.Solid, FillPattern.VerticalCylinder, 0.25, BorderPattern.None, {{-10, -40}, {10, -100}}, 0), Polygon(true, {0.0, 0.0}, 0, {0, 0, 0}, {0, 0, 255}, LinePattern.Solid, FillPattern.HorizontalCylinder, 0.25, {{-60, 68}, {90, 10}, {90, -10}, {-60, -68}, {-60, 68}}, Smooth.None)}}
+// {-100.0,-100.0,100.0,100.0,true,0.1,2.0,2.0,{Ellipse(true, {0.0, 0.0}, 0, {255, 0, 0}, {255, 255, 255}, LinePattern.Solid, FillPattern.Solid, 0.25, {{-90, 90}, {90, -90}}, 0, 360), Text(true, {0.0, 0.0}, 0, {0, 0, 255}, {0, 0, 0}, LinePattern.Solid, FillPattern.None, 0.25, {{-150, 150}, {150, 90}}, "%name", 0, {-1, -1, -1}, "", {}, TextAlignment.Center), Rectangle(true, {0.0, 0.0}, 0, {0, 0, 0}, {175, 175, 175}, LinePattern.Solid, FillPattern.VerticalCylinder, 0.25, BorderPattern.None, {{-10, -40}, {10, -100}}, 0), Polygon(true, {0.0, 0.0}, 0, {0, 0, 0}, {0, 0, 255}, LinePattern.Solid, FillPattern.HorizontalCylinder, 0.25, {{-60, 68}, {90, 10}, {90, -10}, {-60, -68}, {-60, 68}}, Smooth.None)}}
 // Evaluating: getErrorString()
 // ""
@@ -18519 +18519 @@
 // ""
 // Evaluating: getIconAnnotation(Modelica.Thermal.FluidHeatFlow.Sensors.PressureSensor)
-// {-100.0,-100.0,100.0,100.0,true,0.1,2.0,2.0,{Text(true, {0.0, 0.0}, 0, {0, 0, 255}, {0, 0, 0}, LinePattern.Solid, FillPattern.None, 0.25, {{-22, -20}, {20, -60}}, "p", 0, {-1, -1, -1}, TextAlignment.Center)}}
+// {-100.0,-100.0,100.0,100.0,true,0.1,2.0,2.0,{Text(true, {0.0, 0.0}, 0, {0, 0, 255}, {0, 0, 0}, LinePattern.Solid, FillPattern.None, 0.25, {{-22, -20}, {20, -60}}, "p", 0, {-1, -1, -1}, "", {}, TextAlignment.Center)}}
 // Evaluating: getErrorString()
 // ""
@@ -18534 +18534 @@
 // ""
 // Evaluating: getIconAnnotation(Modelica.Thermal.FluidHeatFlow.Sensors.TemperatureSensor)
-// {-100.0,-100.0,100.0,100.0,true,0.1,2.0,2.0,{Text(true, {0.0, 0.0}, 0, {0, 0, 255}, {0, 0, 0}, LinePattern.Solid, FillPattern.None, 0.25, {{-22, -20}, {20, -60}}, "T", 0, {-1, -1, -1}, TextAlignment.Center)}}
+// {-100.0,-100.0,100.0,100.0,true,0.1,2.0,2.0,{Text(true, {0.0, 0.0}, 0, {0, 0, 255}, {0, 0, 0}, LinePattern.Solid, FillPattern.None, 0.25, {{-22, -20}, {20, -60}}, "T", 0, {-1, -1, -1}, "", {}, TextAlignment.Center)}}
 // Evaluating: getErrorString()
 // ""
@@ -18549 +18549 @@
 // ""
 // Evaluating: getIconAnnotation(Modelica.Thermal.FluidHeatFlow.Sensors.RelPressureSensor)
-// {-100.0,-100.0,100.0,100.0,true,0.1,2.0,2.0,{Text(true, {0.0, 0.0}, 0, {0, 0, 255}, {0, 0, 0}, LinePattern.Solid, FillPattern.None, 0.25, {{-22, -20}, {20, -60}}, "dp", 0, {-1, -1, -1}, TextAlignment.Center)}}
+// {-100.0,-100.0,100.0,100.0,true,0.1,2.0,2.0,{Text(true, {0.0, 0.0}, 0, {0, 0, 255}, {0, 0, 0}, LinePattern.Solid, FillPattern.None, 0.25, {{-22, -20}, {20, -60}}, "dp", 0, {-1, -1, -1}, "", {}, TextAlignment.Center)}}
 // Evaluating: getErrorString()
 // ""
@@ -18564 +18564 @@
 // ""
 // Evaluating: getIconAnnotation(Modelica.Thermal.FluidHeatFlow.Sensors.RelTemperatureSensor)
-// {-100.0,-100.0,100.0,100.0,true,0.1,2.0,2.0,{Text(true, {0.0, 0.0}, 0, {0, 0, 255}, {0, 0, 0}, LinePattern.Solid, FillPattern.None, 0.25, {{-22, -20}, {20, -60}}, "dT", 0, {-1, -1, -1}, TextAlignment.Center)}}
+// {-100.0,-100.0,100.0,100.0,true,0.1,2.0,2.0,{Text(true, {0.0, 0.0}, 0, {0, 0, 255}, {0, 0, 0}, LinePattern.Solid, FillPattern.None, 0.25, {{-22, -20}, {20, -60}}, "dT", 0, {-1, -1, -1}, "", {}, TextAlignment.Center)}}
 // Evaluating: getErrorString()
 // ""
@@ -18582 +18582 @@
 // ""
 // Evaluating: getIconAnnotation(Modelica.Thermal.FluidHeatFlow.Sensors.MassFlowSensor)
-// {-100.0,-100.0,100.0,100.0,true,0.1,2.0,2.0,{Text(true, {0.0, 0.0}, 0, {0, 0, 255}, {0, 0, 0}, LinePattern.Solid, FillPattern.None, 0.25, {{-22, -20}, {20, -60}}, "m", 0, {-1, -1, -1}, TextAlignment.Center)}}
+// {-100.0,-100.0,100.0,100.0,true,0.1,2.0,2.0,{Text(true, {0.0, 0.0}, 0, {0, 0, 255}, {0, 0, 0}, LinePattern.Solid, FillPattern.None, 0.25, {{-22, -20}, {20, -60}}, "m", 0, {-1, -1, -1}, "", {}, TextAlignment.Center)}}
 // Evaluating: getErrorString()
 // ""
@@ -18597 +18597 @@
 // ""
 // Evaluating: getIconAnnotation(Modelica.Thermal.FluidHeatFlow.Sensors.VolumeFlowSensor)
-// {-100.0,-100.0,100.0,100.0,true,0.1,2.0,2.0,{Text(true, {0.0, 0.0}, 0, {0, 0, 255}, {0, 0, 0}, LinePattern.Solid, FillPattern.None, 0.25, {{-22, -20}, {20, -60}}, "V", 0, {-1, -1, -1}, TextAlignment.Center)}}
+// {-100.0,-100.0,100.0,100.0,true,0.1,2.0,2.0,{Text(true, {0.0, 0.0}, 0, {0, 0, 255}, {0, 0, 0}, LinePattern.Solid, FillPattern.None, 0.25, {{-22, -20}, {20, -60}}, "V", 0, {-1, -1, -1}, "", {}, TextAlignment.Center)}}
 // Evaluating: getErrorString()
 // ""
@@ -18612 +18612 @@
 // ""
 // Evaluating: getIconAnnotation(Modelica.Thermal.FluidHeatFlow.Sensors.EnthalpyFlowSensor)
-// {-100.0,-100.0,100.0,100.0,true,0.1,2.0,2.0,{Text(true, {0.0, 0.0}, 0, {0, 0, 255}, {0, 0, 0}, LinePattern.Solid, FillPattern.None, 0.25, {{-22, -20}, {20, -60}}, "H", 0, {-1, -1, -1}, TextAlignment.Center)}}
+// {-100.0,-100.0,100.0,100.0,true,0.1,2.0,2.0,{Text(true, {0.0, 0.0}, 0, {0, 0, 255}, {0, 0, 0}, LinePattern.Solid, FillPattern.None, 0.25, {{-22, -20}, {20, -60}}, "H", 0, {-1, -1, -1}, "", {}, TextAlignment.Center)}}
 // Evaluating: getErrorString()
 // ""
@@ -18653 +18653 @@
 // ""
 // Evaluating: getDiagramAnnotation(Modelica.Thermal.FluidHeatFlow.Interfaces.Partials.SimpleFriction)
-// {-100.0,-100.0,100.0,100.0,true,0.1,2.0,2.0,{Line(true, {0.0, 0.0}, 0, {{-80, 0}, {80, 0}}, {0, 0, 255}, LinePattern.Solid, 0.25, {Arrow.None, Arrow.None}, 3, Smooth.None), Line(true, {0.0, 0.0}, 0, {{0, 80}, {0, -80}}, {0, 0, 255}, LinePattern.Solid, 0.25, {Arrow.None, Arrow.None}, 3, Smooth.None), Line(true, {0.0, 0.0}, 0, {{-40, -20}, {40, 20}}, {0, 0, 255}, LinePattern.Solid, 0.25, {Arrow.None, Arrow.None}, 3, Smooth.None), Line(true, {0.0, 0.0}, 0, {{40, 20}, {60, 40}, {70, 60}, {74, 80}}, {0, 0, 255}, LinePattern.Solid, 0.25, {Arrow.None, Arrow.None}, 3, Smooth.None), Line(true, {0.0, 0.0}, 0, {{-40, -20}, {-60, -40}, {-70, -60}, {-74, -80}}, {0, 0, 255}, LinePattern.Solid, 0.25, {Arrow.None, Arrow.None}, 3, Smooth.None), Line(true, {0.0, 0.0}, 0, {{40, 20}, {40, 0}}, {0, 0, 255}, LinePattern.Solid, 0.25, {Arrow.None, Arrow.None}, 3, Smooth.None), Line(true, {0.0, 0.0}, 0, {{60, 40}, {60, 0}}, {0, 0, 255}, LinePattern.Solid, 0.25, {Arrow.None, Arrow.None}, 3, Smooth.None), Line(true, {0.0, 0.0}, 0, {{40, 20}, {0, 20}}, {0, 0, 255}, LinePattern.Solid, 0.25, {Arrow.None, Arrow.None}, 3, Smooth.None), Line(true, {0.0, 0.0}, 0, {{60, 40}, {0, 40}}, {0, 0, 255}, LinePattern.Solid, 0.25, {Arrow.None, Arrow.None}, 3, Smooth.None), Text(true, {0.0, 0.0}, 0, {0, 0, 255}, {0, 0, 0}, LinePattern.Solid, FillPattern.None, 0.25, {{18, 0}, {48, -20}}, "V_flowLaminar", 0, {-1, -1, -1}, TextAlignment.Center), Text(true, {0.0, 0.0}, 0, {0, 0, 255}, {0, 0, 0}, LinePattern.Solid, FillPattern.None, 0.25, {{50, 0}, {80, -20}}, "V_flowNominal", 0, {-1, -1, -1}, TextAlignment.Center), Text(true, {0.0, 0.0}, 0, {0, 0, 255}, {0, 0, 0}, LinePattern.Solid, FillPattern.None, 0.25, {{-30, 30}, {-4, 10}}, "dpLaminar", 0, {-1, -1, -1}, TextAlignment.Center), Text(true, {0.0, 0.0}, 0, {0, 0, 255}, {0, 0, 0}, LinePattern.Solid, FillPattern.None, 0.25, {{-30, 50}, {-4, 30}}, "dpNominal", 0, {-1, -1, -1}, TextAlignment.Center), Text(true, {0.0, 0.0}, 0, {0, 0, 255}, {0, 0, 0}, LinePattern.Solid, FillPattern.None, 0.25, {{0, 20}, {30, 0}}, "dp ~ V_flow", 0, {-1, -1, -1}, TextAlignment.Center), Text(true, {0.0, 0.0}, 0, {0, 0, 255}, {0, 0, 0}, LinePattern.Solid, FillPattern.None, 0.25, {{30, 60}, {60, 40}}, "dp ~ V_flow²", 0, {-1, -1, -1}, TextAlignment.Center)}}
+// {-100.0,-100.0,100.0,100.0,true,0.1,2.0,2.0,{Line(true, {0.0, 0.0}, 0, {{-80, 0}, {80, 0}}, {0, 0, 255}, LinePattern.Solid, 0.25, {Arrow.None, Arrow.None}, 3, Smooth.None), Line(true, {0.0, 0.0}, 0, {{0, 80}, {0, -80}}, {0, 0, 255}, LinePattern.Solid, 0.25, {Arrow.None, Arrow.None}, 3, Smooth.None), Line(true, {0.0, 0.0}, 0, {{-40, -20}, {40, 20}}, {0, 0, 255}, LinePattern.Solid, 0.25, {Arrow.None, Arrow.None}, 3, Smooth.None), Line(true, {0.0, 0.0}, 0, {{40, 20}, {60, 40}, {70, 60}, {74, 80}}, {0, 0, 255}, LinePattern.Solid, 0.25, {Arrow.None, Arrow.None}, 3, Smooth.None), Line(true, {0.0, 0.0}, 0, {{-40, -20}, {-60, -40}, {-70, -60}, {-74, -80}}, {0, 0, 255}, LinePattern.Solid, 0.25, {Arrow.None, Arrow.None}, 3, Smooth.None), Line(true, {0.0, 0.0}, 0, {{40, 20}, {40, 0}}, {0, 0, 255}, LinePattern.Solid, 0.25, {Arrow.None, Arrow.None}, 3, Smooth.None), Line(true, {0.0, 0.0}, 0, {{60, 40}, {60, 0}}, {0, 0, 255}, LinePattern.Solid, 0.25, {Arrow.None, Arrow.None}, 3, Smooth.None), Line(true, {0.0, 0.0}, 0, {{40, 20}, {0, 20}}, {0, 0, 255}, LinePattern.Solid, 0.25, {Arrow.None, Arrow.None}, 3, Smooth.None), Line(true, {0.0, 0.0}, 0, {{60, 40}, {0, 40}}, {0, 0, 255}, LinePattern.Solid, 0.25, {Arrow.None, Arrow.None}, 3, Smooth.None), Text(true, {0.0, 0.0}, 0, {0, 0, 255}, {0, 0, 0}, LinePattern.Solid, FillPattern.None, 0.25, {{18, 0}, {48, -20}}, "V_flowLaminar", 0, {-1, -1, -1}, "", {}, TextAlignment.Center), Text(true, {0.0, 0.0}, 0, {0, 0, 255}, {0, 0, 0}, LinePattern.Solid, FillPattern.None, 0.25, {{50, 0}, {80, -20}}, "V_flowNominal", 0, {-1, -1, -1}, "", {}, TextAlignment.Center), Text(true, {0.0, 0.0}, 0, {0, 0, 255}, {0, 0, 0}, LinePattern.Solid, FillPattern.None, 0.25, {{-30, 30}, {-4, 10}}, "dpLaminar", 0, {-1, -1, -1}, "", {}, TextAlignment.Center), Text(true, {0.0, 0.0}, 0, {0, 0, 255}, {0, 0, 0}, LinePattern.Solid, FillPattern.None, 0.25, {{-30, 50}, {-4, 30}}, "dpNominal", 0, {-1, -1, -1}, "", {}, TextAlignment.Center), Text(true, {0.0, 0.0}, 0, {0, 0, 255}, {0, 0, 0}, LinePattern.Solid, FillPattern.None, 0.25, {{0, 20}, {30, 0}}, "dp ~ V_flow", 0, {-1, -1, -1}, "", {}, TextAlignment.Center), Text(true, {0.0, 0.0}, 0, {0, 0, 255}, {0, 0, 0}, LinePattern.Solid, FillPattern.None, 0.25, {{30, 60}, {60, 40}}, "dp ~ V_flow²", 0, {-1, -1, -1}, "", {}, TextAlignment.Center)}}
 // Evaluating: getErrorString()
 // ""
@@ -18687 +18687 @@
 // ""
 // Evaluating: getIconAnnotation(Modelica.Thermal.FluidHeatFlow.Interfaces.Partials.Ambient)
-// {-100.0,-100.0,100.0,100.0,true,0.1,2.0,2.0,{Ellipse(true, {0.0, 0.0}, 0, {255, 0, 0}, {0, 0, 255}, LinePattern.Solid, FillPattern.Solid, 0.25, {{-90, 90}, {90, -90}}, 0, 360), Text(true, {0.0, 0.0}, 0, {0, 0, 255}, {0, 0, 0}, LinePattern.Solid, FillPattern.None, 0.25, {{-150, 150}, {150, 90}}, "%name", 0, {-1, -1, -1}, TextAlignment.Center)}}
+// {-100.0,-100.0,100.0,100.0,true,0.1,2.0,2.0,{Ellipse(true, {0.0, 0.0}, 0, {255, 0, 0}, {0, 0, 255}, LinePattern.Solid, FillPattern.Solid, 0.25, {{-90, 90}, {90, -90}}, 0, 360), Text(true, {0.0, 0.0}, 0, {0, 0, 255}, {0, 0, 0}, LinePattern.Solid, FillPattern.None, 0.25, {{-150, 150}, {150, 90}}, "%name", 0, {-1, -1, -1}, "", {}, TextAlignment.Center)}}
 // Evaluating: getErrorString()
 // ""
@@ -18703 +18703 @@
 // ""
 // Evaluating: getIconAnnotation(Modelica.Thermal.FluidHeatFlow.Interfaces.Partials.AbsoluteSensor)
-// {-100.0,-100.0,100.0,100.0,true,0.1,2.0,2.0,{Ellipse(true, {0.0, 0.0}, 0, {0, 0, 0}, {255, 255, 255}, LinePattern.Solid, FillPattern.Solid, 0.25, {{-70, 70}, {70, -70}}, 0, 360), Line(true, {0.0, 0.0}, 0, {{0, 70}, {0, 40}}, {0, 0, 0}, LinePattern.Solid, 0.25, {Arrow.None, Arrow.None}, 3, Smooth.None), Line(true, {0.0, 0.0}, 0, {{22.9, 32.8}, {40.2, 57.3}}, {0, 0, 0}, LinePattern.Solid, 0.25, {Arrow.None, Arrow.None}, 3, Smooth.None), Line(true, {0.0, 0.0}, 0, {{-22.9, 32.8}, {-40.2, 57.3}}, {0, 0, 0}, LinePattern.Solid, 0.25, {Arrow.None, Arrow.None}, 3, Smooth.None), Line(true, {0.0, 0.0}, 0, {{37.6, 13.7}, {65.8, 23.9}}, {0, 0, 0}, LinePattern.Solid, 0.25, {Arrow.None, Arrow.None}, 3, Smooth.None), Line(true, {0.0, 0.0}, 0, {{-37.6, 13.7}, {-65.8, 23.9}}, {0, 0, 0}, LinePattern.Solid, 0.25, {Arrow.None, Arrow.None}, 3, Smooth.None), Line(true, {0.0, 0.0}, 0, {{0.0, 0.0}, {9.02, 28.6}}, {0, 0, 0}, LinePattern.Solid, 0.25, {Arrow.None, Arrow.None}, 3, Smooth.None), Polygon(true, {0.0, 0.0}, 0, {0, 0, 0}, {0, 0, 0}, LinePattern.Solid, FillPattern.Solid, 0.25, {{-0.48, 31.6}, {18.0, 26.0}, {18.0, 57.2}, {-0.48, 31.6}}, Smooth.None), Ellipse(true, {0.0, 0.0}, 0, {0, 0, 0}, {0, 0, 0}, LinePattern.Solid, FillPattern.Solid, 0.25, {{-5, 5}, {5, -5}}, 0, 360), Line(true, {0.0, 0.0}, 0, {{-70, 0}, {-90, 0}}, {0, 0, 0}, LinePattern.Solid, 0.25, {Arrow.None, Arrow.None}, 3, Smooth.None), Line(true, {0.0, 0.0}, 0, {{70, 0}, {100, 0}}, {0, 0, 0}, LinePattern.Solid, 0.25, {Arrow.None, Arrow.None}, 3, Smooth.None), Text(true, {0.0, 0.0}, 0, {0, 0, 255}, {0, 0, 0}, LinePattern.Solid, FillPattern.None, 0.25, {{-150, 130}, {150, 70}}, "%name", 0, {-1, -1, -1}, TextAlignment.Center)}}
+// {-100.0,-100.0,100.0,100.0,true,0.1,2.0,2.0,{Ellipse(true, {0.0, 0.0}, 0, {0, 0, 0}, {255, 255, 255}, LinePattern.Solid, FillPattern.Solid, 0.25, {{-70, 70}, {70, -70}}, 0, 360), Line(true, {0.0, 0.0}, 0, {{0, 70}, {0, 40}}, {0, 0, 0}, LinePattern.Solid, 0.25, {Arrow.None, Arrow.None}, 3, Smooth.None), Line(true, {0.0, 0.0}, 0, {{22.9, 32.8}, {40.2, 57.3}}, {0, 0, 0}, LinePattern.Solid, 0.25, {Arrow.None, Arrow.None}, 3, Smooth.None), Line(true, {0.0, 0.0}, 0, {{-22.9, 32.8}, {-40.2, 57.3}}, {0, 0, 0}, LinePattern.Solid, 0.25, {Arrow.None, Arrow.None}, 3, Smooth.None), Line(true, {0.0, 0.0}, 0, {{37.6, 13.7}, {65.8, 23.9}}, {0, 0, 0}, LinePattern.Solid, 0.25, {Arrow.None, Arrow.None}, 3, Smooth.None), Line(true, {0.0, 0.0}, 0, {{-37.6, 13.7}, {-65.8, 23.9}}, {0, 0, 0}, LinePattern.Solid, 0.25, {Arrow.None, Arrow.None}, 3, Smooth.None), Line(true, {0.0, 0.0}, 0, {{0.0, 0.0}, {9.02, 28.6}}, {0, 0, 0}, LinePattern.Solid, 0.25, {Arrow.None, Arrow.None}, 3, Smooth.None), Polygon(true, {0.0, 0.0}, 0, {0, 0, 0}, {0, 0, 0}, LinePattern.Solid, FillPattern.Solid, 0.25, {{-0.48, 31.6}, {18.0, 26.0}, {18.0, 57.2}, {-0.48, 31.6}}, Smooth.None), Ellipse(true, {0.0, 0.0}, 0, {0, 0, 0}, {0, 0, 0}, LinePattern.Solid, FillPattern.Solid, 0.25, {{-5, 5}, {5, -5}}, 0, 360), Line(true, {0.0, 0.0}, 0, {{-70, 0}, {-90, 0}}, {0, 0, 0}, LinePattern.Solid, 0.25, {Arrow.None, Arrow.None}, 3, Smooth.None), Line(true, {0.0, 0.0}, 0, {{70, 0}, {100, 0}}, {0, 0, 0}, LinePattern.Solid, 0.25, {Arrow.None, Arrow.None}, 3, Smooth.None), Text(true, {0.0, 0.0}, 0, {0, 0, 255}, {0, 0, 0}, LinePattern.Solid, FillPattern.None, 0.25, {{-150, 130}, {150, 70}}, "%name", 0, {-1, -1, -1}, "", {}, TextAlignment.Center)}}
 // Evaluating: getErrorString()
 // ""
@@ -18718 +18718 @@
 // ""
 // Evaluating: getIconAnnotation(Modelica.Thermal.FluidHeatFlow.Interfaces.Partials.RelativeSensor)
-// {-100.0,-100.0,100.0,100.0,true,0.1,2.0,2.0,{Ellipse(true, {0.0, 0.0}, 0, {0, 0, 0}, {255, 255, 255}, LinePattern.Solid, FillPattern.Solid, 0.25, {{-70, 70}, {70, -70}}, 0, 360), Line(true, {0.0, 0.0}, 0, {{0, 70}, {0, 40}}, {0, 0, 0}, LinePattern.Solid, 0.25, {Arrow.None, Arrow.None}, 3, Smooth.None), Line(true, {0.0, 0.0}, 0, {{22.9, 32.8}, {40.2, 57.3}}, {0, 0, 0}, LinePattern.Solid, 0.25, {Arrow.None, Arrow.None}, 3, Smooth.None), Line(true, {0.0, 0.0}, 0, {{-22.9, 32.8}, {-40.2, 57.3}}, {0, 0, 0}, LinePattern.Solid, 0.25, {Arrow.None, Arrow.None}, 3, Smooth.None), Line(true, {0.0, 0.0}, 0, {{37.6, 13.7}, {65.8, 23.9}}, {0, 0, 0}, LinePattern.Solid, 0.25, {Arrow.None, Arrow.None}, 3, Smooth.None), Line(true, {0.0, 0.0}, 0, {{-37.6, 13.7}, {-65.8, 23.9}}, {0, 0, 0}, LinePattern.Solid, 0.25, {Arrow.None, Arrow.None}, 3, Smooth.None), Line(true, {0.0, 0.0}, 0, {{0.0, 0.0}, {9.02, 28.6}}, {0, 0, 0}, LinePattern.Solid, 0.25, {Arrow.None, Arrow.None}, 3, Smooth.None), Polygon(true, {0.0, 0.0}, 0, {0, 0, 0}, {0, 0, 0}, LinePattern.Solid, FillPattern.Solid, 0.25, {{-0.48, 31.6}, {18.0, 26.0}, {18.0, 57.2}, {-0.48, 31.6}}, Smooth.None), Ellipse(true, {0.0, 0.0}, 0, {0, 0, 0}, {0, 0, 0}, LinePattern.Solid, FillPattern.Solid, 0.25, {{-5, 5}, {5, -5}}, 0, 360), Line(true, {0.0, 0.0}, 0, {{-70, 0}, {-90, 0}}, {0, 0, 0}, LinePattern.Solid, 0.25, {Arrow.None, Arrow.None}, 3, Smooth.None), Line(true, {0.0, 0.0}, 0, {{70, 0}, {90, 0}}, {0, 0, 0}, LinePattern.Solid, 0.25, {Arrow.None, Arrow.None}, 3, Smooth.None), Line(true, {0.0, 0.0}, 0, {{0, -100}, {0, -70}}, {0, 0, 0}, LinePattern.Solid, 0.25, {Arrow.None, Arrow.None}, 3, Smooth.None), Text(true, {0.0, 0.0}, 0, {0, 0, 255}, {0, 0, 0}, LinePattern.Solid, FillPattern.None, 0.25, {{-150, 130}, {150, 70}}, "%name", 0, {-1, -1, -1}, TextAlignment.Center)}}
+// {-100.0,-100.0,100.0,100.0,true,0.1,2.0,2.0,{Ellipse(true, {0.0, 0.0}, 0, {0, 0, 0}, {255, 255, 255}, LinePattern.Solid, FillPattern.Solid, 0.25, {{-70, 70}, {70, -70}}, 0, 360), Line(true, {0.0, 0.0}, 0, {{0, 70}, {0, 40}}, {0, 0, 0}, LinePattern.Solid, 0.25, {Arrow.None, Arrow.None}, 3, Smooth.None), Line(true, {0.0, 0.0}, 0, {{22.9, 32.8}, {40.2, 57.3}}, {0, 0, 0}, LinePattern.Solid, 0.25, {Arrow.None, Arrow.None}, 3, Smooth.None), Line(true, {0.0, 0.0}, 0, {{-22.9, 32.8}, {-40.2, 57.3}}, {0, 0, 0}, LinePattern.Solid, 0.25, {Arrow.None, Arrow.None}, 3, Smooth.None), Line(true, {0.0, 0.0}, 0, {{37.6, 13.7}, {65.8, 23.9}}, {0, 0, 0}, LinePattern.Solid, 0.25, {Arrow.None, Arrow.None}, 3, Smooth.None), Line(true, {0.0, 0.0}, 0, {{-37.6, 13.7}, {-65.8, 23.9}}, {0, 0, 0}, LinePattern.Solid, 0.25, {Arrow.None, Arrow.None}, 3, Smooth.None), Line(true, {0.0, 0.0}, 0, {{0.0, 0.0}, {9.02, 28.6}}, {0, 0, 0}, LinePattern.Solid, 0.25, {Arrow.None, Arrow.None}, 3, Smooth.None), Polygon(true, {0.0, 0.0}, 0, {0, 0, 0}, {0, 0, 0}, LinePattern.Solid, FillPattern.Solid, 0.25, {{-0.48, 31.6}, {18.0, 26.0}, {18.0, 57.2}, {-0.48, 31.6}}, Smooth.None), Ellipse(true, {0.0, 0.0}, 0, {0, 0, 0}, {0, 0, 0}, LinePattern.Solid, FillPattern.Solid, 0.25, {{-5, 5}, {5, -5}}, 0, 360), Line(true, {0.0, 0.0}, 0, {{-70, 0}, {-90, 0}}, {0, 0, 0}, LinePattern.Solid, 0.25, {Arrow.None, Arrow.None}, 3, Smooth.None), Line(true, {0.0, 0.0}, 0, {{70, 0}, {90, 0}}, {0, 0, 0}, LinePattern.Solid, 0.25, {Arrow.None, Arrow.None}, 3, Smooth.None), Line(true, {0.0, 0.0}, 0, {{0, -100}, {0, -70}}, {0, 0, 0}, LinePattern.Solid, 0.25, {Arrow.None, Arrow.None}, 3, Smooth.None), Text(true, {0.0, 0.0}, 0, {0, 0, 255}, {0, 0, 0}, LinePattern.Solid, FillPattern.None, 0.25, {{-150, 130}, {150, 70}}, "%name", 0, {-1, -1, -1}, "", {}, TextAlignment.Center)}}
 // Evaluating: getErrorString()
 // ""
@@ -18733 +18733 @@
 // ""
 // Evaluating: getIconAnnotation(Modelica.Thermal.FluidHeatFlow.Interfaces.Partials.FlowSensor)
-// {-100.0,-100.0,100.0,100.0,true,0.1,2.0,2.0,{Ellipse(true, {0.0, 0.0}, 0, {0, 0, 0}, {255, 255, 255}, LinePattern.Solid, FillPattern.Solid, 0.25, {{-70, 70}, {70, -70}}, 0, 360), Line(true, {0.0, 0.0}, 0, {{0, 70}, {0, 40}}, {0, 0, 0}, LinePattern.Solid, 0.25, {Arrow.None, Arrow.None}, 3, Smooth.None), Line(true, {0.0, 0.0}, 0, {{22.9, 32.8}, {40.2, 57.3}}, {0, 0, 0}, LinePattern.Solid, 0.25, {Arrow.None, Arrow.None}, 3, Smooth.None), Line(true, {0.0, 0.0}, 0, {{-22.9, 32.8}, {-40.2, 57.3}}, {0, 0, 0}, LinePattern.Solid, 0.25, {Arrow.None, Arrow.None}, 3, Smooth.None), Line(true, {0.0, 0.0}, 0, {{37.6, 13.7}, {65.8, 23.9}}, {0, 0, 0}, LinePattern.Solid, 0.25, {Arrow.None, Arrow.None}, 3, Smooth.None), Line(true, {0.0, 0.0}, 0, {{-37.6, 13.7}, {-65.8, 23.9}}, {0, 0, 0}, LinePattern.Solid, 0.25, {Arrow.None, Arrow.None}, 3, Smooth.None), Line(true, {0.0, 0.0}, 0, {{0.0, 0.0}, {9.02, 28.6}}, {0, 0, 0}, LinePattern.Solid, 0.25, {Arrow.None, Arrow.None}, 3, Smooth.None), Polygon(true, {0.0, 0.0}, 0, {0, 0, 0}, {0, 0, 0}, LinePattern.Solid, FillPattern.Solid, 0.25, {{-0.48, 31.6}, {18.0, 26.0}, {18.0, 57.2}, {-0.48, 31.6}}, Smooth.None), Ellipse(true, {0.0, 0.0}, 0, {0, 0, 0}, {0, 0, 0}, LinePattern.Solid, FillPattern.Solid, 0.25, {{-5, 5}, {5, -5}}, 0, 360), Line(true, {0.0, 0.0}, 0, {{-70, 0}, {-90, 0}}, {0, 0, 0}, LinePattern.Solid, 0.25, {Arrow.None, Arrow.None}, 3, Smooth.None), Line(true, {0.0, 0.0}, 0, {{70, 0}, {90, 0}}, {0, 0, 0}, LinePattern.Solid, 0.25, {Arrow.None, Arrow.None}, 3, Smooth.None), Line(true, {0.0, 0.0}, 0, {{0, -100}, {0, -70}}, {0, 0, 0}, LinePattern.Solid, 0.25, {Arrow.None, Arrow.None}, 3, Smooth.None), Text(true, {0.0, 0.0}, 0, {0, 0, 255}, {0, 0, 0}, LinePattern.Solid, FillPattern.None, 0.25, {{-150, 130}, {150, 70}}, "%name", 0, {-1, -1, -1}, TextAlignment.Center)}}
+// {-100.0,-100.0,100.0,100.0,true,0.1,2.0,2.0,{Ellipse(true, {0.0, 0.0}, 0, {0, 0, 0}, {255, 255, 255}, LinePattern.Solid, FillPattern.Solid, 0.25, {{-70, 70}, {70, -70}}, 0, 360), Line(true, {0.0, 0.0}, 0, {{0, 70}, {0, 40}}, {0, 0, 0}, LinePattern.Solid, 0.25, {Arrow.None, Arrow.None}, 3, Smooth.None), Line(true, {0.0, 0.0}, 0, {{22.9, 32.8}, {40.2, 57.3}}, {0, 0, 0}, LinePattern.Solid, 0.25, {Arrow.None, Arrow.None}, 3, Smooth.None), Line(true, {0.0, 0.0}, 0, {{-22.9, 32.8}, {-40.2, 57.3}}, {0, 0, 0}, LinePattern.Solid, 0.25, {Arrow.None, Arrow.None}, 3, Smooth.None), Line(true, {0.0, 0.0}, 0, {{37.6, 13.7}, {65.8, 23.9}}, {0, 0, 0}, LinePattern.Solid, 0.25, {Arrow.None, Arrow.None}, 3, Smooth.None), Line(true, {0.0, 0.0}, 0, {{-37.6, 13.7}, {-65.8, 23.9}}, {0, 0, 0}, LinePattern.Solid, 0.25, {Arrow.None, Arrow.None}, 3, Smooth.None), Line(true, {0.0, 0.0}, 0, {{0.0, 0.0}, {9.02, 28.6}}, {0, 0, 0}, LinePattern.Solid, 0.25, {Arrow.None, Arrow.None}, 3, Smooth.None), Polygon(true, {0.0, 0.0}, 0, {0, 0, 0}, {0, 0, 0}, LinePattern.Solid, FillPattern.Solid, 0.25, {{-0.48, 31.6}, {18.0, 26.0}, {18.0, 57.2}, {-0.48, 31.6}}, Smooth.None), Ellipse(true, {0.0, 0.0}, 0, {0, 0, 0}, {0, 0, 0}, LinePattern.Solid, FillPattern.Solid, 0.25, {{-5, 5}, {5, -5}}, 0, 360), Line(true, {0.0, 0.0}, 0, {{-70, 0}, {-90, 0}}, {0, 0, 0}, LinePattern.Solid, 0.25, {Arrow.None, Arrow.None}, 3, Smooth.None), Line(true, {0.0, 0.0}, 0, {{70, 0}, {90, 0}}, {0, 0, 0}, LinePattern.Solid, 0.25, {Arrow.None, Arrow.None}, 3, Smooth.None), Line(true, {0.0, 0.0}, 0, {{0, -100}, {0, -70}}, {0, 0, 0}, LinePattern.Solid, 0.25, {Arrow.None, Arrow.None}, 3, Smooth.None), Text(true, {0.0, 0.0}, 0, {0, 0, 255}, {0, 0, 0}, LinePattern.Solid, FillPattern.None, 0.25, {{-150, 130}, {150, 70}}, "%name", 0, {-1, -1, -1}, "", {}, TextAlignment.Center)}}
 // Evaluating: getErrorString()
 // ""
@@ -18845 +18845 @@
 // ""
 // Evaluating: getIconAnnotation(Modelica.Thermal.HeatTransfer.Components.ThermalCollector)
-// {-100.0,-100.0,100.0,100.0,true,0.1,2.0,2.0,{Polygon(true, {0.0, 0.0}, 0, {95, 95, 95}, {175, 175, 175}, LinePattern.Solid, FillPattern.Solid, 0.25, {{-10, -90}, {-10, 0}, {-100, 90}, {-80, 90}, {0, 20}, {80, 90}, {100, 90}, {10, 0}, {10, -90}, {-10, -90}}, Smooth.None), Text(true, {0.0, 0.0}, 0, {0, 0, 255}, {0, 0, 0}, LinePattern.Solid, FillPattern.None, 0.25, {{-100, -20}, {100, -80}}, "%name", 0, {-1, -1, -1}, TextAlignment.Center), Text(true, {0.0, 0.0}, 0, {0, 0, 255}, {0, 0, 0}, LinePattern.Solid, FillPattern.None, 0.25, {{-100, 80}, {100, 40}}, "m=%m", 0, {-1, -1, -1}, TextAlignment.Center)}}
+// {-100.0,-100.0,100.0,100.0,true,0.1,2.0,2.0,{Polygon(true, {0.0, 0.0}, 0, {95, 95, 95}, {175, 175, 175}, LinePattern.Solid, FillPattern.Solid, 0.25, {{-10, -90}, {-10, 0}, {-100, 90}, {-80, 90}, {0, 20}, {80, 90}, {100, 90}, {10, 0}, {10, -90}, {-10, -90}}, Smooth.None), Text(true, {0.0, 0.0}, 0, {0, 0, 255}, {0, 0, 0}, LinePattern.Solid, FillPattern.None, 0.25, {{-100, -20}, {100, -80}}, "%name", 0, {-1, -1, -1}, "", {}, TextAlignment.Center), Text(true, {0.0, 0.0}, 0, {0, 0, 255}, {0, 0, 0}, LinePattern.Solid, FillPattern.None, 0.25, {{-100, 80}, {100, 40}}, "m=%m", 0, {-1, -1, -1}, "", {}, TextAlignment.Center)}}
 // Evaluating: getErrorString()
 // ""
@@ -19793 +19793 @@
 // ""
 // Evaluating: getIconAnnotation(Modelica.Mechanics.MultiBody.World)
-// {-100.0,-100.0,100.0,100.0,true,0.1,2.0,2.0,{Rectangle(true, {0.0, 0.0}, 0, {0, 0, 0}, {255, 255, 255}, LinePattern.Solid, FillPattern.Solid, 0.25, BorderPattern.None, {{-100, 100}, {100, -100}}, 0), Line(true, {0.0, 0.0}, 0, {{-100, -118}, {-100, 61}}, {0, 0, 0}, LinePattern.Solid, 0.5, {Arrow.None, Arrow.None}, 3, Smooth.None), Polygon(true, {0.0, 0.0}, 0, {0, 0, 0}, {0, 0, 0}, LinePattern.Solid, FillPattern.Solid, 0.25, {{-100, 100}, {-120, 60}, {-80, 60}, {-100, 100}, {-100, 100}}, Smooth.None), Line(true, {0.0, 0.0}, 0, {{-119, -100}, {59, -100}}, {0, 0, 0}, LinePattern.Solid, 0.5, {Arrow.None, Arrow.None}, 3, Smooth.None), Polygon(true, {0.0, 0.0}, 0, {0, 0, 0}, {0, 0, 0}, LinePattern.Solid, FillPattern.Solid, 0.25, {{99, -100}, {59, -80}, {59, -120}, {99, -100}}, Smooth.None), Text(true, {0.0, 0.0}, 0, {0, 0, 255}, {0, 0, 0}, LinePattern.Solid, FillPattern.None, 0.25, {{-140, 165}, {140, 103}}, "%name", 0, {-1, -1, -1}, TextAlignment.Center), Text(true, {0.0, 0.0}, 0, {0, 0, 0}, {0, 0, 0}, LinePattern.Solid, FillPattern.None, 0.25, {{95, -113}, {144, -162}}, "%label1", 0, {-1, -1, -1}, TextAlignment.Center), Text(true, {0.0, 0.0}, 0, {0, 0, 0}, {0, 0, 0}, LinePattern.Solid, FillPattern.None, 0.25, {{-170, 127}, {-119, 77}}, "%label2", 0, {-1, -1, -1}, TextAlignment.Center), Line(true, {0.0, 0.0}, 0, {{-56, 78}, {-56, -26}}, {0, 0, 255}, LinePattern.Solid, 0.25, {Arrow.None, Arrow.None}, 3, Smooth.None), Polygon(true, {0.0, 0.0}, 0, {0, 0, 255}, {0, 0, 255}, LinePattern.Solid, FillPattern.Solid, 0.25, {{-68, -26}, {-56, -66}, {-44, -26}, {-68, -26}}, Smooth.None), Line(true, {0.0, 0.0}, 0, {{2, 78}, {2, -26}}, {0, 0, 255}, LinePattern.Solid, 0.25, {Arrow.None, Arrow.None}, 3, Smooth.None), Polygon(true, {0.0, 0.0}, 0, {0, 0, 255}, {0, 0, 255}, LinePattern.Solid, FillPattern.Solid, 0.25, {{-10, -26}, {2, -66}, {14, -26}, {-10, -26}}, Smooth.None), Line(true, {0.0, 0.0}, 0, {{66, 80}, {66, -26}}, {0, 0, 255}, LinePattern.Solid, 0.25, {Arrow.None, Arrow.None}, 3, Smooth.None), Polygon(true, {0.0, 0.0}, 0, {0, 0, 255}, {0, 0, 255}, LinePattern.Solid, FillPattern.Solid, 0.25, {{54, -26}, {66, -66}, {78, -26}, {54, -26}}, Smooth.None)}}
+// {-100.0,-100.0,100.0,100.0,true,0.1,2.0,2.0,{Rectangle(true, {0.0, 0.0}, 0, {0, 0, 0}, {255, 255, 255}, LinePattern.Solid, FillPattern.Solid, 0.25, BorderPattern.None, {{-100, 100}, {100, -100}}, 0), Line(true, {0.0, 0.0}, 0, {{-100, -118}, {-100, 61}}, {0, 0, 0}, LinePattern.Solid, 0.5, {Arrow.None, Arrow.None}, 3, Smooth.None), Polygon(true, {0.0, 0.0}, 0, {0, 0, 0}, {0, 0, 0}, LinePattern.Solid, FillPattern.Solid, 0.25, {{-100, 100}, {-120, 60}, {-80, 60}, {-100, 100}, {-100, 100}}, Smooth.None), Line(true, {0.0, 0.0}, 0, {{-119, -100}, {59, -100}}, {0, 0, 0}, LinePattern.Solid, 0.5, {Arrow.None, Arrow.None}, 3, Smooth.None), Polygon(true, {0.0, 0.0}, 0, {0, 0, 0}, {0, 0, 0}, LinePattern.Solid, FillPattern.Solid, 0.25, {{99, -100}, {59, -80}, {59, -120}, {99, -100}}, Smooth.None), Text(true, {0.0, 0.0}, 0, {0, 0, 255}, {0, 0, 0}, LinePattern.Solid, FillPattern.None, 0.25, {{-140, 165}, {140, 103}}, "%name", 0, {-1, -1, -1}, "", {}, TextAlignment.Center), Text(true, {0.0, 0.0}, 0, {0, 0, 0}, {0, 0, 0}, LinePattern.Solid, FillPattern.None, 0.25, {{95, -113}, {144, -162}}, "%label1", 0, {-1, -1, -1}, "", {}, TextAlignment.Center), Text(true, {0.0, 0.0}, 0, {0, 0, 0}, {0, 0, 0}, LinePattern.Solid, FillPattern.None, 0.25, {{-170, 127}, {-119, 77}}, "%label2", 0, {-1, -1, -1}, "", {}, TextAlignment.Center), Line(true, {0.0, 0.0}, 0, {{-56, 78}, {-56, -26}}, {0, 0, 255}, LinePattern.Solid, 0.25, {Arrow.None, Arrow.None}, 3, Smooth.None), Polygon(true, {0.0, 0.0}, 0, {0, 0, 255}, {0, 0, 255}, LinePattern.Solid, FillPattern.Solid, 0.25, {{-68, -26}, {-56, -66}, {-44, -26}, {-68, -26}}, Smooth.None), Line(true, {0.0, 0.0}, 0, {{2, 78}, {2, -26}}, {0, 0, 255}, LinePattern.Solid, 0.25, {Arrow.None, Arrow.None}, 3, Smooth.None), Polygon(true, {0.0, 0.0}, 0, {0, 0, 255}, {0, 0, 255}, LinePattern.Solid, FillPattern.Solid, 0.25, {{-10, -26}, {2, -66}, {14, -26}, {-10, -26}}, Smooth.None), Line(true, {0.0, 0.0}, 0, {{66, 80}, {66, -26}}, {0, 0, 255}, LinePattern.Solid, 0.25, {Arrow.None, Arrow.None}, 3, Smooth.None), Polygon(true, {0.0, 0.0}, 0, {0, 0, 255}, {0, 0, 255}, LinePattern.Solid, FillPattern.Solid, 0.25, {{54, -26}, {66, -66}, {78, -26}, {54, -26}}, Smooth.None)}}
 // Evaluating: getErrorString()
 // ""
@@ -20394 +20394 @@
 // ""
 // Evaluating: getDiagramAnnotation(Modelica.Mechanics.MultiBody.Examples.Loops.Engine1b)
-// {-100.0,-120.0,150.0,120.0,true,0.1,1.0,1.0,{Rectangle(true, {0.0, 0.0}, 0, {255, 0, 0}, {0, 0, 0}, LinePattern.Solid, FillPattern.None, 0.5, BorderPattern.None, {{3, 117}, {88, -23}}, 0), Text(true, {0.0, 0.0}, 0, {255, 0, 0}, {0, 0, 0}, LinePattern.Solid, FillPattern.None, 0.5, {{65, -30}, {145, -39}}, "jointRRP in model", 0, {-1, -1, -1}, TextAlignment.Center), Text(true, {0.0, 0.0}, 0, {255, 0, 0}, {0, 0, 0}, LinePattern.Solid, FillPattern.None, 0.5, {{66, -34}, {141, -52}}, "Loops.Engine1b_analytic", 0, {-1, -1, -1}, TextAlignment.Center)}}
+// {-100.0,-120.0,150.0,120.0,true,0.1,1.0,1.0,{Rectangle(true, {0.0, 0.0}, 0, {255, 0, 0}, {0, 0, 0}, LinePattern.Solid, FillPattern.None, 0.5, BorderPattern.None, {{3, 117}, {88, -23}}, 0), Text(true, {0.0, 0.0}, 0, {255, 0, 0}, {0, 0, 0}, LinePattern.Solid, FillPattern.None, 0.5, {{65, -30}, {145, -39}}, "jointRRP in model", 0, {-1, -1, -1}, "", {}, TextAlignment.Center), Text(true, {0.0, 0.0}, 0, {255, 0, 0}, {0, 0, 0}, LinePattern.Solid, FillPattern.None, 0.5, {{66, -34}, {141, -52}}, "Loops.Engine1b_analytic", 0, {-1, -1, -1}, "", {}, TextAlignment.Center)}}
 // Evaluating: getErrorString()
 // ""
@@ -20663 +20663 @@
 // ""
 // Evaluating: getIconAnnotation(Modelica.Mechanics.MultiBody.Examples.Loops.Utilities.Cylinder)
-// {-100.0,-150.0,100.0,150.0,true,0.1,1.0,1.0,{Polygon(true, {0.0, 0.0}, 0, {0, 0, 0}, {192, 192, 192}, LinePattern.Solid, FillPattern.Solid, 0.25, {{-60, -50}, {-60, 100}, {60, 100}, {60, -52}, {100, -52}, {100, 150}, {-100, 150}, {-100, -50}, {-60, -50}}, Smooth.None), Rectangle(true, {0.0, 0.0}, 0, {0, 0, 0}, {192, 192, 192}, LinePattern.Solid, FillPattern.VerticalCylinder, 0.25, BorderPattern.None, {{-58, 89}, {58, 13}}, 0), Rectangle(true, {0.0, 0.0}, 0, {0, 0, 0}, {0, 0, 0}, LinePattern.Solid, FillPattern.Solid, 0.25, BorderPattern.None, {{-60, 81}, {60, 75}}, 0), Rectangle(true, {0.0, 0.0}, 0, {0, 0, 0}, {0, 0, 0}, LinePattern.Solid, FillPattern.Solid, 0.25, BorderPattern.None, {{-60, 67}, {60, 61}}, 0), Rectangle(true, {0.0, 0.0}, 0, {0, 0, 0}, {0, 0, 0}, LinePattern.Solid, FillPattern.Solid, 0.25, BorderPattern.None, {{-60, 55}, {60, 49}}, 0), Polygon(true, {0.0, 0.0}, 0, {0, 0, 255}, {255, 255, 255}, LinePattern.None, FillPattern.Solid, 0.25, {{-60, 11}, {-42, 23}, {38, 23}, {56, 11}, {-60, 11}}, Smooth.None), Ellipse(true, {0.0, 0.0}, 0, {0, 0, 0}, {0, 0, 0}, LinePattern.Solid, FillPattern.Solid, 0.25, {{-6, 41}, {2, 33}}, 0, 360), Ellipse(true, {0.0, 0.0}, 0, {192, 192, 192}, {0, 0, 0}, LinePattern.Solid, FillPattern.None, 0.25, {{-40, -129}, {40, -49}}, 0, 360), Line(true, {0.0, 0.0}, 0, {{0, -90}, {26, -58}, {-2, 37}}, {0, 0, 0}, LinePattern.Solid, 1, {Arrow.None, Arrow.None}, 3, Smooth.None), Text(true, {0.0, 0.0}, 0, {0, 0, 255}, {0, 0, 0}, LinePattern.Solid, FillPattern.None, 0.25, {{-150, -124}, {164, -186}}, "%name", 0, {-1, -1, -1}, TextAlignment.Center), Line(true, {0.0, 0.0}, 0, {{-100, -90}, {100, -91}}, {0, 0, 0}, LinePattern.Solid, 0.5, {Arrow.None, Arrow.None}, 3, Smooth.None)}}
+// {-100.0,-150.0,100.0,150.0,true,0.1,1.0,1.0,{Polygon(true, {0.0, 0.0}, 0, {0, 0, 0}, {192, 192, 192}, LinePattern.Solid, FillPattern.Solid, 0.25, {{-60, -50}, {-60, 100}, {60, 100}, {60, -52}, {100, -52}, {100, 150}, {-100, 150}, {-100, -50}, {-60, -50}}, Smooth.None), Rectangle(true, {0.0, 0.0}, 0, {0, 0, 0}, {192, 192, 192}, LinePattern.Solid, FillPattern.VerticalCylinder, 0.25, BorderPattern.None, {{-58, 89}, {58, 13}}, 0), Rectangle(true, {0.0, 0.0}, 0, {0, 0, 0}, {0, 0, 0}, LinePattern.Solid, FillPattern.Solid, 0.25, BorderPattern.None, {{-60, 81}, {60, 75}}, 0), Rectangle(true, {0.0, 0.0}, 0, {0, 0, 0}, {0, 0, 0}, LinePattern.Solid, FillPattern.Solid, 0.25, BorderPattern.None, {{-60, 67}, {60, 61}}, 0), Rectangle(true, {0.0, 0.0}, 0, {0, 0, 0}, {0, 0, 0}, LinePattern.Solid, FillPattern.Solid, 0.25, BorderPattern.None, {{-60, 55}, {60, 49}}, 0), Polygon(true, {0.0, 0.0}, 0, {0, 0, 255}, {255, 255, 255}, LinePattern.None, FillPattern.Solid, 0.25, {{-60, 11}, {-42, 23}, {38, 23}, {56, 11}, {-60, 11}}, Smooth.None), Ellipse(true, {0.0, 0.0}, 0, {0, 0, 0}, {0, 0, 0}, LinePattern.Solid, FillPattern.Solid, 0.25, {{-6, 41}, {2, 33}}, 0, 360), Ellipse(true, {0.0, 0.0}, 0, {192, 192, 192}, {0, 0, 0}, LinePattern.Solid, FillPattern.None, 0.25, {{-40, -129}, {40, -49}}, 0, 360), Line(true, {0.0, 0.0}, 0, {{0, -90}, {26, -58}, {-2, 37}}, {0, 0, 0}, LinePattern.Solid, 1, {Arrow.None, Arrow.None}, 3, Smooth.None), Text(true, {0.0, 0.0}, 0, {0, 0, 255}, {0, 0, 0}, LinePattern.Solid, FillPattern.None, 0.25, {{-150, -124}, {164, -186}}, "%name", 0, {-1, -1, -1}, "", {}, TextAlignment.Center), Line(true, {0.0, 0.0}, 0, {{-100, -90}, {100, -91}}, {0, 0, 0}, LinePattern.Solid, 0.5, {Arrow.None, Arrow.None}, 3, Smooth.None)}}
 // Evaluating: getErrorString()
 // ""
@@ -20675 +20675 @@
 // ""
 // Evaluating: getIconAnnotation(Modelica.Mechanics.MultiBody.Examples.Loops.Utilities.GasForce)
-// {-100.0,-100.0,100.0,100.0,true,0.1,2.0,2.0,{Rectangle(true, {0.0, 0.0}, 0, {0, 0, 0}, {192, 192, 192}, LinePattern.Solid, FillPattern.Solid, 0.25, BorderPattern.None, {{-90, 50}, {90, -50}}, 0), Rectangle(true, {0.0, 0.0}, 0, {0, 0, 255}, {0, 0, 255}, LinePattern.Solid, FillPattern.Solid, 0.25, BorderPattern.None, {{-40, 50}, {-20, -50}}, 0), Rectangle(true, {0.0, 0.0}, 0, {0, 0, 255}, {0, 0, 255}, LinePattern.Solid, FillPattern.Solid, 0.25, BorderPattern.None, {{-90, 10}, {-40, -10}}, 0), Polygon(true, {0.0, 0.0}, 0, {255, 0, 0}, {255, 0, 0}, LinePattern.Solid, FillPattern.Solid, 0.25, {{60, 2}, {54, 2}, {0, 2}, {0, 10}, {-20, 0}, {0, -10}, {0, -4}, {60, -4}, {60, 2}}, Smooth.None), Text(true, {0.0, 0.0}, 0, {0, 0, 255}, {0, 0, 0}, LinePattern.Solid, FillPattern.None, 0.25, {{-100, 120}, {100, 60}}, "%name", 0, {-1, -1, -1}, TextAlignment.Center)}}
+// {-100.0,-100.0,100.0,100.0,true,0.1,2.0,2.0,{Rectangle(true, {0.0, 0.0}, 0, {0, 0, 0}, {192, 192, 192}, LinePattern.Solid, FillPattern.Solid, 0.25, BorderPattern.None, {{-90, 50}, {90, -50}}, 0), Rectangle(true, {0.0, 0.0}, 0, {0, 0, 255}, {0, 0, 255}, LinePattern.Solid, FillPattern.Solid, 0.25, BorderPattern.None, {{-40, 50}, {-20, -50}}, 0), Rectangle(true, {0.0, 0.0}, 0, {0, 0, 255}, {0, 0, 255}, LinePattern.Solid, FillPattern.Solid, 0.25, BorderPattern.None, {{-90, 10}, {-40, -10}}, 0), Polygon(true, {0.0, 0.0}, 0, {255, 0, 0}, {255, 0, 0}, LinePattern.Solid, FillPattern.Solid, 0.25, {{60, 2}, {54, 2}, {0, 2}, {0, 10}, {-20, 0}, {0, -10}, {0, -4}, {60, -4}, {60, 2}}, Smooth.None), Text(true, {0.0, 0.0}, 0, {0, 0, 255}, {0, 0, 0}, LinePattern.Solid, FillPattern.None, 0.25, {{-100, 120}, {100, 60}}, "%name", 0, {-1, -1, -1}, "", {}, TextAlignment.Center)}}
 // Evaluating: getErrorString()
 // ""
 // Evaluating: getDiagramAnnotation(Modelica.Mechanics.MultiBody.Examples.Loops.Utilities.GasForce)
-// {-100.0,-100.0,100.0,100.0,true,0.1,2.0,2.0,{Rectangle(true, {0.0, 0.0}, 0, {0, 0, 0}, {192, 192, 192}, LinePattern.Solid, FillPattern.Solid, 0.25, BorderPattern.None, {{-90, 50}, {90, -50}}, 0), Rectangle(true, {0.0, 0.0}, 0, {0, 0, 255}, {0, 0, 255}, LinePattern.Solid, FillPattern.Solid, 0.25, BorderPattern.None, {{-40, 50}, {-20, -50}}, 0), Rectangle(true, {0.0, 0.0}, 0, {0, 0, 255}, {0, 0, 255}, LinePattern.Solid, FillPattern.Solid, 0.25, BorderPattern.None, {{-90, 10}, {-40, -10}}, 0), Polygon(true, {0.0, 0.0}, 0, {255, 0, 0}, {255, 0, 0}, LinePattern.Solid, FillPattern.Solid, 0.25, {{60, 2}, {54, 2}, {0, 2}, {0, 10}, {-20, 0}, {0, -10}, {0, -4}, {60, -4}, {60, 2}}, Smooth.None), Text(true, {0.0, 0.0}, 0, {0, 0, 255}, {0, 0, 0}, LinePattern.Solid, FillPattern.None, 0.25, {{-100, 120}, {100, 60}}, "%name", 0, {-1, -1, -1}, TextAlignment.Center)}}
+// {-100.0,-100.0,100.0,100.0,true,0.1,2.0,2.0,{Rectangle(true, {0.0, 0.0}, 0, {0, 0, 0}, {192, 192, 192}, LinePattern.Solid, FillPattern.Solid, 0.25, BorderPattern.None, {{-90, 50}, {90, -50}}, 0), Rectangle(true, {0.0, 0.0}, 0, {0, 0, 255}, {0, 0, 255}, LinePattern.Solid, FillPattern.Solid, 0.25, BorderPattern.None, {{-40, 50}, {-20, -50}}, 0), Rectangle(true, {0.0, 0.0}, 0, {0, 0, 255}, {0, 0, 255}, LinePattern.Solid, FillPattern.Solid, 0.25, BorderPattern.None, {{-90, 10}, {-40, -10}}, 0), Polygon(true, {0.0, 0.0}, 0, {255, 0, 0}, {255, 0, 0}, LinePattern.Solid, FillPattern.Solid, 0.25, {{60, 2}, {54, 2}, {0, 2}, {0, 10}, {-20, 0}, {0, -10}, {0, -4}, {60, -4}, {60, 2}}, Smooth.None), Text(true, {0.0, 0.0}, 0, {0, 0, 255}, {0, 0, 0}, LinePattern.Solid, FillPattern.None, 0.25, {{-100, 120}, {100, 60}}, "%name", 0, {-1, -1, -1}, "", {}, TextAlignment.Center)}}
 // Evaluating: getErrorString()
 // ""
@@ -20687 +20687 @@
 // ""
 // Evaluating: getIconAnnotation(Modelica.Mechanics.MultiBody.Examples.Loops.Utilities.CylinderBase)
-// {-100.0,-100.0,100.0,100.0,true,0.1,1.0,1.0,{Polygon(true, {0.0, 0.0}, 0, {0, 0, 0}, {192, 192, 192}, LinePattern.Solid, FillPattern.Solid, 0.25, {{-60, -61}, {-60, 64}, {60, 64}, {60, -61}, {100, -61}, {100, 114}, {-100, 114}, {-100, -61}, {-60, -61}}, Smooth.None), Rectangle(true, {0.0, 0.0}, 0, {0, 0, 0}, {192, 192, 192}, LinePattern.Solid, FillPattern.VerticalCylinder, 0.25, BorderPattern.None, {{-58, 63}, {58, -13}}, 0), Rectangle(true, {0.0, 0.0}, 0, {0, 0, 0}, {0, 0, 0}, LinePattern.Solid, FillPattern.Solid, 0.25, BorderPattern.None, {{-60, 55}, {60, 49}}, 0), Rectangle(true, {0.0, 0.0}, 0, {0, 0, 0}, {0, 0, 0}, LinePattern.Solid, FillPattern.Solid, 0.25, BorderPattern.None, {{-60, 41}, {60, 35}}, 0), Rectangle(true, {0.0, 0.0}, 0, {0, 0, 0}, {0, 0, 0}, LinePattern.Solid, FillPattern.Solid, 0.25, BorderPattern.None, {{-60, 29}, {60, 23}}, 0), Polygon(true, {0.0, 0.0}, 0, {0, 0, 255}, {255, 255, 255}, LinePattern.None, FillPattern.Solid, 0.25, {{-57, -13}, {-39, -1}, {41, -1}, {59, -13}, {-57, -13}}, Smooth.None), Ellipse(true, {0.0, 0.0}, 0, {0, 0, 0}, {0, 0, 0}, LinePattern.Solid, FillPattern.Solid, 0.25, {{-6, 15}, {2, 7}}, 0, 360), Ellipse(true, {0.0, 0.0}, 0, {192, 192, 192}, {0, 0, 0}, LinePattern.Solid, FillPattern.None, 0.25, {{-41, -139}, {39, -59}}, 0, 360), Line(true, {0.0, 0.0}, 0, {{-1, -99}, {25, -67}, {-2, 10}}, {0, 0, 0}, LinePattern.Solid, 1, {Arrow.None, Arrow.None}, 3, Smooth.None), Text(true, {0.0, 0.0}, 0, {0, 0, 255}, {0, 0, 0}, LinePattern.Solid, FillPattern.None, 0.25, {{-156, 178}, {158, 116}}, "%name", 0, {-1, -1, -1}, TextAlignment.Center), Line(true, {0.0, 0.0}, 0, {{-100, -99}, {100, -100}}, {0, 0, 0}, LinePattern.Solid, 0.5, {Arrow.None, Arrow.None}, 3, Smooth.None)}}
+// {-100.0,-100.0,100.0,100.0,true,0.1,1.0,1.0,{Polygon(true, {0.0, 0.0}, 0, {0, 0, 0}, {192, 192, 192}, LinePattern.Solid, FillPattern.Solid, 0.25, {{-60, -61}, {-60, 64}, {60, 64}, {60, -61}, {100, -61}, {100, 114}, {-100, 114}, {-100, -61}, {-60, -61}}, Smooth.None), Rectangle(true, {0.0, 0.0}, 0, {0, 0, 0}, {192, 192, 192}, LinePattern.Solid, FillPattern.VerticalCylinder, 0.25, BorderPattern.None, {{-58, 63}, {58, -13}}, 0), Rectangle(true, {0.0, 0.0}, 0, {0, 0, 0}, {0, 0, 0}, LinePattern.Solid, FillPattern.Solid, 0.25, BorderPattern.None, {{-60, 55}, {60, 49}}, 0), Rectangle(true, {0.0, 0.0}, 0, {0, 0, 0}, {0, 0, 0}, LinePattern.Solid, FillPattern.Solid, 0.25, BorderPattern.None, {{-60, 41}, {60, 35}}, 0), Rectangle(true, {0.0, 0.0}, 0, {0, 0, 0}, {0, 0, 0}, LinePattern.Solid, FillPattern.Solid, 0.25, BorderPattern.None, {{-60, 29}, {60, 23}}, 0), Polygon(true, {0.0, 0.0}, 0, {0, 0, 255}, {255, 255, 255}, LinePattern.None, FillPattern.Solid, 0.25, {{-57, -13}, {-39, -1}, {41, -1}, {59, -13}, {-57, -13}}, Smooth.None), Ellipse(true, {0.0, 0.0}, 0, {0, 0, 0}, {0, 0, 0}, LinePattern.Solid, FillPattern.Solid, 0.25, {{-6, 15}, {2, 7}}, 0, 360), Ellipse(true, {0.0, 0.0}, 0, {192, 192, 192}, {0, 0, 0}, LinePattern.Solid, FillPattern.None, 0.25, {{-41, -139}, {39, -59}}, 0, 360), Line(true, {0.0, 0.0}, 0, {{-1, -99}, {25, -67}, {-2, 10}}, {0, 0, 0}, LinePattern.Solid, 1, {Arrow.None, Arrow.None}, 3, Smooth.None), Text(true, {0.0, 0.0}, 0, {0, 0, 255}, {0, 0, 0}, LinePattern.Solid, FillPattern.None, 0.25, {{-156, 178}, {158, 116}}, "%name", 0, {-1, -1, -1}, "", {}, TextAlignment.Center), Line(true, {0.0, 0.0}, 0, {{-100, -99}, {100, -100}}, {0, 0, 0}, LinePattern.Solid, 0.5, {Arrow.None, Arrow.None}, 3, Smooth.None)}}
 // Evaluating: getErrorString()
 // ""
@@ -20711 +20711 @@
 // ""
 // Evaluating: getIconAnnotation(Modelica.Mechanics.MultiBody.Examples.Loops.Utilities.EngineV6_analytic)
-// {-100.0,-100.0,100.0,100.0,true,0.1,1.0,1.0,{Rectangle(true, {0.0, 0.0}, 0, {0, 0, 0}, {255, 255, 255}, LinePattern.Solid, FillPattern.Solid, 0.25, BorderPattern.None, {{-100, 100}, {100, -100}}, 0), Text(true, {0.0, 0.0}, 0, {0, 0, 255}, {0, 0, 0}, LinePattern.Solid, FillPattern.None, 0.25, {{-137, 160}, {137, 104}}, "%name", 0, {-1, -1, -1}, TextAlignment.Center), Bitmap(true, {0.0, 0.0}, 0, {{-97, 75}, {99, -39}}, "../../../../Images/MultiBody/Examples/Loops/EngineV6_CAD.png")}}
+// {-100.0,-100.0,100.0,100.0,true,0.1,1.0,1.0,{Rectangle(true, {0.0, 0.0}, 0, {0, 0, 0}, {255, 255, 255}, LinePattern.Solid, FillPattern.Solid, 0.25, BorderPattern.None, {{-100, 100}, {100, -100}}, 0), Text(true, {0.0, 0.0}, 0, {0, 0, 255}, {0, 0, 0}, LinePattern.Solid, FillPattern.None, 0.25, {{-137, 160}, {137, 104}}, "%name", 0, {-1, -1, -1}, "", {}, TextAlignment.Center), Bitmap(true, {0.0, 0.0}, 0, {{-97, 75}, {99, -39}}, "../../../../Images/MultiBody/Examples/Loops/EngineV6_CAD.png")}}
 // Evaluating: getErrorString()
 // ""
@@ -20780 +20780 @@
 // ""
 // Evaluating: getIconAnnotation(Modelica.Mechanics.MultiBody.Examples.Systems.RobotR3.fullRobot)
-// {-100.0,-100.0,100.0,100.0,true,0.1,0.5,0.5,{Rectangle(true, {0.0, 0.0}, 0, {0, 0, 0}, {192, 192, 192}, LinePattern.Solid, FillPattern.Solid, 0.25, BorderPattern.None, {{-99.5, 100.0}, {100.0, -100.0}}, 0), Bitmap(true, {0.0, 0.0}, 0, {{-75.5, 98.25}, {87.0, -96.75}}, "../../../../Images/MultiBody/Examples/Systems/robot_kr15.bmp"), Text(true, {0.0, 0.0}, 0, {0, 0, 255}, {0, 0, 0}, LinePattern.Solid, FillPattern.None, 0.25, {{-111.5, 130.0}, {108.5, 100.0}}, "%name", 0, {-1, -1, -1}, TextAlignment.Center), Text(true, {0.0, 0.0}, 0, {0, 0, 0}, {0, 0, 0}, LinePattern.Solid, FillPattern.None, 0.25, {{-104.5, -104.0}, {115.0, -128.0}}, "mLoad=%mLoad", 0, {-1, -1, -1}, TextAlignment.Center)}}
+// {-100.0,-100.0,100.0,100.0,true,0.1,0.5,0.5,{Rectangle(true, {0.0, 0.0}, 0, {0, 0, 0}, {192, 192, 192}, LinePattern.Solid, FillPattern.Solid, 0.25, BorderPattern.None, {{-99.5, 100.0}, {100.0, -100.0}}, 0), Bitmap(true, {0.0, 0.0}, 0, {{-75.5, 98.25}, {87.0, -96.75}}, "../../../../Images/MultiBody/Examples/Systems/robot_kr15.bmp"), Text(true, {0.0, 0.0}, 0, {0, 0, 255}, {0, 0, 0}, LinePattern.Solid, FillPattern.None, 0.25, {{-111.5, 130.0}, {108.5, 100.0}}, "%name", 0, {-1, -1, -1}, "", {}, TextAlignment.Center), Text(true, {0.0, 0.0}, 0, {0, 0, 0}, {0, 0, 0}, LinePattern.Solid, FillPattern.None, 0.25, {{-104.5, -104.0}, {115.0, -128.0}}, "mLoad=%mLoad", 0, {-1, -1, -1}, "", {}, TextAlignment.Center)}}
 // Evaluating: getErrorString()
 // ""
@@ -20847 +20847 @@
 // ""
 // Evaluating: getIconAnnotation(Modelica.Mechanics.MultiBody.Examples.Systems.RobotR3.Components.PathPlanning1)
-// {-100.0,-100.0,100.0,100.0,true,0.1,1.0,1.0,{Rectangle(true, {0.0, 0.0}, 0, {0, 0, 0}, {255, 255, 255}, LinePattern.Solid, FillPattern.Solid, 0.25, BorderPattern.None, {{-100, 100}, {100, -100}}, 0), Text(true, {0.0, 0.0}, 0, {0, 0, 255}, {0, 0, 0}, LinePattern.Solid, FillPattern.None, 0.25, {{-150, 150}, {150, 110}}, "%name", 0, {-1, -1, -1}, TextAlignment.Center), Polygon(true, {0.0, 0.0}, 0, {192, 192, 192}, {192, 192, 192}, LinePattern.Solid, FillPattern.Solid, 0.25, {{-80, 90}, {-88, 68}, {-72, 68}, {-80, 88}, {-80, 90}}, Smooth.None), Line(true, {0.0, 0.0}, 0, {{-80, 78}, {-80, -82}}, {192, 192, 192}, LinePattern.Solid, 0.25, {Arrow.None, Arrow.None}, 3, Smooth.None), Line(true, {0.0, 0.0}, 0, {{-90, 0}, {82, 0}}, {192, 192, 192}, LinePattern.Solid, 0.25, {Arrow.None, Arrow.None}, 3, Smooth.None), Polygon(true, {0.0, 0.0}, 0, {192, 192, 192}, {192, 192, 192}, LinePattern.Solid, FillPattern.Solid, 0.25, {{90, 0}, {68, 8}, {68, -8}, {90, 0}}, Smooth.None), Text(true, {0.0, 0.0}, 0, {192, 192, 192}, {0, 0, 0}, LinePattern.Solid, FillPattern.None, 0.25, {{-42, 55}, {29, 12}}, "w", 0, {-1, -1, -1}, TextAlignment.Center), Line(true, {0.0, 0.0}, 0, {{-80, 0}, {-41, 69}, {26, 69}, {58, 0}}, {0, 0, 0}, LinePattern.Solid, 0.25, {Arrow.None, Arrow.None}, 3, Smooth.None), Text(true, {0.0, 0.0}, 0, {0, 0, 0}, {0, 0, 0}, LinePattern.Solid, FillPattern.None, 0.25, {{-73, -44}, {82, -69}}, "1 axis", 0, {-1, -1, -1}, TextAlignment.Center)}}
+// {-100.0,-100.0,100.0,100.0,true,0.1,1.0,1.0,{Rectangle(true, {0.0, 0.0}, 0, {0, 0, 0}, {255, 255, 255}, LinePattern.Solid, FillPattern.Solid, 0.25, BorderPattern.None, {{-100, 100}, {100, -100}}, 0), Text(true, {0.0, 0.0}, 0, {0, 0, 255}, {0, 0, 0}, LinePattern.Solid, FillPattern.None, 0.25, {{-150, 150}, {150, 110}}, "%name", 0, {-1, -1, -1}, "", {}, TextAlignment.Center), Polygon(true, {0.0, 0.0}, 0, {192, 192, 192}, {192, 192, 192}, LinePattern.Solid, FillPattern.Solid, 0.25, {{-80, 90}, {-88, 68}, {-72, 68}, {-80, 88}, {-80, 90}}, Smooth.None), Line(true, {0.0, 0.0}, 0, {{-80, 78}, {-80, -82}}, {192, 192, 192}, LinePattern.Solid, 0.25, {Arrow.None, Arrow.None}, 3, Smooth.None), Line(true, {0.0, 0.0}, 0, {{-90, 0}, {82, 0}}, {192, 192, 192}, LinePattern.Solid, 0.25, {Arrow.None, Arrow.None}, 3, Smooth.None), Polygon(true, {0.0, 0.0}, 0, {192, 192, 192}, {192, 192, 192}, LinePattern.Solid, FillPattern.Solid, 0.25, {{90, 0}, {68, 8}, {68, -8}, {90, 0}}, Smooth.None), Text(true, {0.0, 0.0}, 0, {192, 192, 192}, {0, 0, 0}, LinePattern.Solid, FillPattern.None, 0.25, {{-42, 55}, {29, 12}}, "w", 0, {-1, -1, -1}, "", {}, TextAlignment.Center), Line(true, {0.0, 0.0}, 0, {{-80, 0}, {-41, 69}, {26, 69}, {58, 0}}, {0, 0, 0}, LinePattern.Solid, 0.25, {Arrow.None, Arrow.None}, 3, Smooth.None), Text(true, {0.0, 0.0}, 0, {0, 0, 0}, {0, 0, 0}, LinePattern.Solid, FillPattern.None, 0.25, {{-73, -44}, {82, -69}}, "1 axis", 0, {-1, -1, -1}, "", {}, TextAlignment.Center)}}
 // Evaluating: getErrorString()
 // ""
@@ -20892 +20892 @@
 // ""
 // Evaluating: getIconAnnotation(Modelica.Mechanics.MultiBody.Examples.Systems.RobotR3.Components.PathPlanning6)
-// {-100.0,-100.0,100.0,100.0,true,0.1,1.0,1.0,{Rectangle(true, {0.0, 0.0}, 0, {0, 0, 0}, {255, 255, 255}, LinePattern.Solid, FillPattern.Solid, 0.25, BorderPattern.None, {{-100, 100}, {100, -100}}, 0), Text(true, {0.0, 0.0}, 0, {0, 0, 255}, {0, 0, 0}, LinePattern.Solid, FillPattern.None, 0.25, {{-150, 150}, {150, 110}}, "%name", 0, {-1, -1, -1}, TextAlignment.Center), Polygon(true, {0.0, 0.0}, 0, {192, 192, 192}, {192, 192, 192}, LinePattern.Solid, FillPattern.Solid, 0.25, {{-80, 90}, {-88, 68}, {-72, 68}, {-80, 88}, {-80, 90}}, Smooth.None), Line(true, {0.0, 0.0}, 0, {{-80, 78}, {-80, -82}}, {192, 192, 192}, LinePattern.Solid, 0.25, {Arrow.None, Arrow.None}, 3, Smooth.None), Line(true, {0.0, 0.0}, 0, {{-90, 0}, {82, 0}}, {192, 192, 192}, LinePattern.Solid, 0.25, {Arrow.None, Arrow.None}, 3, Smooth.None), Polygon(true, {0.0, 0.0}, 0, {192, 192, 192}, {192, 192, 192}, LinePattern.Solid, FillPattern.Solid, 0.25, {{90, 0}, {68, 8}, {68, -8}, {90, 0}}, Smooth.None), Text(true, {0.0, 0.0}, 0, {192, 192, 192}, {0, 0, 0}, LinePattern.Solid, FillPattern.None, 0.25, {{-42, 55}, {29, 12}}, "w", 0, {-1, -1, -1}, TextAlignment.Center), Line(true, {0.0, 0.0}, 0, {{-80, 0}, {-41, 69}, {26, 69}, {58, 0}}, {0, 0, 0}, LinePattern.Solid, 0.25, {Arrow.None, Arrow.None}, 3, Smooth.None), Text(true, {0.0, 0.0}, 0, {0, 0, 0}, {0, 0, 0}, LinePattern.Solid, FillPattern.None, 0.25, {{-70, -43}, {85, -68}}, "6 axes", 0, {-1, -1, -1}, TextAlignment.Center)}}
+// {-100.0,-100.0,100.0,100.0,true,0.1,1.0,1.0,{Rectangle(true, {0.0, 0.0}, 0, {0, 0, 0}, {255, 255, 255}, LinePattern.Solid, FillPattern.Solid, 0.25, BorderPattern.None, {{-100, 100}, {100, -100}}, 0), Text(true, {0.0, 0.0}, 0, {0, 0, 255}, {0, 0, 0}, LinePattern.Solid, FillPattern.None, 0.25, {{-150, 150}, {150, 110}}, "%name", 0, {-1, -1, -1}, "", {}, TextAlignment.Center), Polygon(true, {0.0, 0.0}, 0, {192, 192, 192}, {192, 192, 192}, LinePattern.Solid, FillPattern.Solid, 0.25, {{-80, 90}, {-88, 68}, {-72, 68}, {-80, 88}, {-80, 90}}, Smooth.None), Line(true, {0.0, 0.0}, 0, {{-80, 78}, {-80, -82}}, {192, 192, 192}, LinePattern.Solid, 0.25, {Arrow.None, Arrow.None}, 3, Smooth.None), Line(true, {0.0, 0.0}, 0, {{-90, 0}, {82, 0}}, {192, 192, 192}, LinePattern.Solid, 0.25, {Arrow.None, Arrow.None}, 3, Smooth.None), Polygon(true, {0.0, 0.0}, 0, {192, 192, 192}, {192, 192, 192}, LinePattern.Solid, FillPattern.Solid, 0.25, {{90, 0}, {68, 8}, {68, -8}, {90, 0}}, Smooth.None), Text(true, {0.0, 0.0}, 0, {192, 192, 192}, {0, 0, 0}, LinePattern.Solid, FillPattern.None, 0.25, {{-42, 55}, {29, 12}}, "w", 0, {-1, -1, -1}, "", {}, TextAlignment.Center), Line(true, {0.0, 0.0}, 0, {{-80, 0}, {-41, 69}, {26, 69}, {58, 0}}, {0, 0, 0}, LinePattern.Solid, 0.25, {Arrow.None, Arrow.None}, 3, Smooth.None), Text(true, {0.0, 0.0}, 0, {0, 0, 0}, {0, 0, 0}, LinePattern.Solid, FillPattern.None, 0.25, {{-70, -43}, {85, -68}}, "6 axes", 0, {-1, -1, -1}, "", {}, TextAlignment.Center)}}
 // Evaluating: getErrorString()
 // ""
@@ -20936 +20936 @@
 // ""
 // Evaluating: getIconAnnotation(Modelica.Mechanics.MultiBody.Examples.Systems.RobotR3.Components.PathToAxisControlBus)
-// {-100.0,-100.0,100.0,100.0,true,0.1,2.0,2.0,{Text(true, {0.0, 0.0}, 0, {0, 0, 0}, {0, 0, 0}, LinePattern.Solid, FillPattern.None, 0.25, {{-100, 98}, {-24, 68}}, "q", 0, {-1, -1, -1}, TextAlignment.Center), Text(true, {0.0, 0.0}, 0, {0, 0, 0}, {0, 0, 0}, LinePattern.Solid, FillPattern.None, 0.25, {{-94, 46}, {-18, 16}}, "qd", 0, {-1, -1, -1}, TextAlignment.Center), Text(true, {0.0, 0.0}, 0, {0, 0, 0}, {0, 0, 0}, LinePattern.Solid, FillPattern.None, 0.25, {{-96, -16}, {-20, -46}}, "qdd", 0, {-1, -1, -1}, TextAlignment.Center), Text(true, {0.0, 0.0}, 0, {0, 0, 0}, {0, 0, 0}, LinePattern.Solid, FillPattern.None, 0.25, {{-2, 20}, {80, -18}}, "%axisUsed", 0, {-1, -1, -1}, TextAlignment.Center), Text(true, {0.0, 0.0}, 0, {0, 0, 0}, {0, 0, 0}, LinePattern.Solid, FillPattern.None, 0.25, {{2, 52}, {76, 28}}, "axis", 0, {-1, -1, -1}, TextAlignment.Center), Text(true, {0.0, 0.0}, 0, {0, 0, 0}, {0, 0, 0}, LinePattern.Solid, FillPattern.None, 0.25, {{-94, -70}, {32, -96}}, "moving", 0, {-1, -1, -1}, TextAlignment.Center)}}
+// {-100.0,-100.0,100.0,100.0,true,0.1,2.0,2.0,{Text(true, {0.0, 0.0}, 0, {0, 0, 0}, {0, 0, 0}, LinePattern.Solid, FillPattern.None, 0.25, {{-100, 98}, {-24, 68}}, "q", 0, {-1, -1, -1}, "", {}, TextAlignment.Center), Text(true, {0.0, 0.0}, 0, {0, 0, 0}, {0, 0, 0}, LinePattern.Solid, FillPattern.None, 0.25, {{-94, 46}, {-18, 16}}, "qd", 0, {-1, -1, -1}, "", {}, TextAlignment.Center), Text(true, {0.0, 0.0}, 0, {0, 0, 0}, {0, 0, 0}, LinePattern.Solid, FillPattern.None, 0.25, {{-96, -16}, {-20, -46}}, "qdd", 0, {-1, -1, -1}, "", {}, TextAlignment.Center), Text(true, {0.0, 0.0}, 0, {0, 0, 0}, {0, 0, 0}, LinePattern.Solid, FillPattern.None, 0.25, {{-2, 20}, {80, -18}}, "%axisUsed", 0, {-1, -1, -1}, "", {}, TextAlignment.Center), Text(true, {0.0, 0.0}, 0, {0, 0, 0}, {0, 0, 0}, LinePattern.Solid, FillPattern.None, 0.25, {{2, 52}, {76, 28}}, "axis", 0, {-1, -1, -1}, "", {}, TextAlignment.Center), Text(true, {0.0, 0.0}, 0, {0, 0, 0}, {0, 0, 0}, LinePattern.Solid, FillPattern.None, 0.25, {{-94, -70}, {32, -96}}, "moving", 0, {-1, -1, -1}, "", {}, TextAlignment.Center)}}
 // Evaluating: getErrorString()
 // ""
@@ -20948 +20948 @@
 // ""
 // Evaluating: getIconAnnotation(Modelica.Mechanics.MultiBody.Examples.Systems.RobotR3.Components.GearType2)
-// {-100.0,-100.0,100.0,100.0,true,0.1,2.0,2.0,{Rectangle(true, {0.0, 0.0}, 0, {0, 0, 0}, {192, 192, 192}, LinePattern.Solid, FillPattern.HorizontalCylinder, 0.25, BorderPattern.None, {{-100, 10}, {-60, -10}}, 0), Polygon(true, {0.0, 0.0}, 0, {0, 0, 0}, {128, 128, 128}, LinePattern.Solid, FillPattern.HorizontalCylinder, 0.25, {{-60, 10}, {-60, 20}, {-40, 40}, {-40, -40}, {-60, -20}, {-60, 10}}, Smooth.None), Rectangle(true, {0.0, 0.0}, 0, {0, 0, 0}, {192, 192, 192}, LinePattern.Solid, FillPattern.HorizontalCylinder, 0.25, BorderPattern.None, {{-40, 60}, {40, -60}}, 0), Polygon(true, {0.0, 0.0}, 0, {128, 128, 128}, {128, 128, 128}, LinePattern.Solid, FillPattern.Solid, 0.25, {{60, 20}, {40, 40}, {40, -40}, {60, -20}, {60, 20}}, Smooth.None), Rectangle(true, {0.0, 0.0}, 0, {0, 0, 0}, {192, 192, 192}, LinePattern.Solid, FillPattern.HorizontalCylinder, 0.25, BorderPattern.None, {{60, 10}, {100, -10}}, 0), Polygon(true, {0.0, 0.0}, 0, {0, 0, 0}, {0, 0, 0}, LinePattern.Solid, FillPattern.Solid, 0.25, {{-60, -90}, {-50, -90}, {-20, -30}, {20, -30}, {48, -90}, {60, -90}, {60, -100}, {-60, -100}, {-60, -90}}, Smooth.None), Text(true, {0.0, 0.0}, 0, {0, 0, 255}, {0, 0, 0}, LinePattern.Solid, FillPattern.None, 0.25, {{0, 128}, {0, 68}}, "%name", 0, {-1, -1, -1}, TextAlignment.Center), Text(true, {0.0, 0.0}, 0, {0, 0, 255}, {0, 0, 0}, LinePattern.Solid, FillPattern.None, 0.25, {{-36, 40}, {38, -30}}, "2", 0, {-1, -1, -1}, TextAlignment.Center)}}
+// {-100.0,-100.0,100.0,100.0,true,0.1,2.0,2.0,{Rectangle(true, {0.0, 0.0}, 0, {0, 0, 0}, {192, 192, 192}, LinePattern.Solid, FillPattern.HorizontalCylinder, 0.25, BorderPattern.None, {{-100, 10}, {-60, -10}}, 0), Polygon(true, {0.0, 0.0}, 0, {0, 0, 0}, {128, 128, 128}, LinePattern.Solid, FillPattern.HorizontalCylinder, 0.25, {{-60, 10}, {-60, 20}, {-40, 40}, {-40, -40}, {-60, -20}, {-60, 10}}, Smooth.None), Rectangle(true, {0.0, 0.0}, 0, {0, 0, 0}, {192, 192, 192}, LinePattern.Solid, FillPattern.HorizontalCylinder, 0.25, BorderPattern.None, {{-40, 60}, {40, -60}}, 0), Polygon(true, {0.0, 0.0}, 0, {128, 128, 128}, {128, 128, 128}, LinePattern.Solid, FillPattern.Solid, 0.25, {{60, 20}, {40, 40}, {40, -40}, {60, -20}, {60, 20}}, Smooth.None), Rectangle(true, {0.0, 0.0}, 0, {0, 0, 0}, {192, 192, 192}, LinePattern.Solid, FillPattern.HorizontalCylinder, 0.25, BorderPattern.None, {{60, 10}, {100, -10}}, 0), Polygon(true, {0.0, 0.0}, 0, {0, 0, 0}, {0, 0, 0}, LinePattern.Solid, FillPattern.Solid, 0.25, {{-60, -90}, {-50, -90}, {-20, -30}, {20, -30}, {48, -90}, {60, -90}, {60, -100}, {-60, -100}, {-60, -90}}, Smooth.None), Text(true, {0.0, 0.0}, 0, {0, 0, 255}, {0, 0, 0}, LinePattern.Solid, FillPattern.None, 0.25, {{0, 128}, {0, 68}}, "%name", 0, {-1, -1, -1}, "", {}, TextAlignment.Center), Text(true, {0.0, 0.0}, 0, {0, 0, 255}, {0, 0, 0}, LinePattern.Solid, FillPattern.None, 0.25, {{-36, 40}, {38, -30}}, "2", 0, {-1, -1, -1}, "", {}, TextAlignment.Center)}}
 // Evaluating: getErrorString()
 // ""
@@ -20967 +20967 @@
 // ""
 // Evaluating: getIconAnnotation(Modelica.Mechanics.MultiBody.Examples.Systems.RobotR3.Components.Motor)
-// {-100.0,-100.0,100.0,100.0,true,0.1,1.0,1.0,{Text(true, {0.0, 0.0}, 0, {0, 0, 255}, {0, 0, 0}, LinePattern.Solid, FillPattern.None, 0.25, {{0, 120}, {0, 60}}, "%name", 0, {-1, -1, -1}, TextAlignment.Center), Line(true, {0.0, 0.0}, 0, {{80, -102}, {80, -10}}, {255, 204, 51}, LinePattern.Solid, 0.5, {Arrow.None, Arrow.None}, 3, Smooth.None)}}
+// {-100.0,-100.0,100.0,100.0,true,0.1,1.0,1.0,{Text(true, {0.0, 0.0}, 0, {0, 0, 255}, {0, 0, 0}, LinePattern.Solid, FillPattern.None, 0.25, {{0, 120}, {0, 60}}, "%name", 0, {-1, -1, -1}, "", {}, TextAlignment.Center), Line(true, {0.0, 0.0}, 0, {{80, -102}, {80, -10}}, {255, 204, 51}, LinePattern.Solid, 0.5, {Arrow.None, Arrow.None}, 3, Smooth.None)}}
 // Evaluating: getErrorString()
 // ""
@@ -20987 +20987 @@
 // ""
 // Evaluating: getIconAnnotation(Modelica.Mechanics.MultiBody.Examples.Systems.RobotR3.Components.Controller)
-// {-100.0,-100.0,100.0,100.0,true,0.1,1.0,1.0,{Rectangle(true, {0.0, 0.0}, 0, {0, 0, 0}, {235, 235, 235}, LinePattern.Solid, FillPattern.Solid, 0.25, BorderPattern.None, {{-100, -100}, {100, 100}}, 0), Rectangle(true, {0.0, 0.0}, 0, {0, 0, 255}, {255, 255, 255}, LinePattern.Solid, FillPattern.Solid, 0.25, BorderPattern.None, {{-30, 54}, {30, 24}}, 0), Polygon(true, {0.0, 0.0}, 0, {0, 0, 255}, {0, 0, 255}, LinePattern.Solid, FillPattern.Solid, 0.25, {{-30, 40}, {-60, 50}, {-60, 30}, {-30, 40}}, Smooth.None), Line(true, {0.0, 0.0}, 0, {{-31, -41}, {-78, -41}, {-78, 39}, {-30, 39}}, {0, 0, 255}, LinePattern.Solid, 0.25, {Arrow.None, Arrow.None}, 3, Smooth.None), Rectangle(true, {0.0, 0.0}, 0, {0, 0, 255}, {255, 255, 255}, LinePattern.Solid, FillPattern.Solid, 0.25, BorderPattern.None, {{-30, -26}, {30, -56}}, 0), Polygon(true, {0.0, 0.0}, 0, {0, 0, 255}, {0, 0, 255}, LinePattern.Solid, FillPattern.Solid, 0.25, {{60, -32}, {30, -42}, {60, -52}, {60, -32}}, Smooth.None), Line(true, {0.0, 0.0}, 0, {{30, 39}, {76, 39}, {76, -41}, {30, -41}}, {0, 0, 255}, LinePattern.Solid, 0.25, {Arrow.None, Arrow.None}, 3, Smooth.None), Text(true, {0.0, 0.0}, 0, {0, 0, 255}, {0, 0, 0}, LinePattern.Solid, FillPattern.None, 0.25, {{-100, 150}, {100, 110}}, "%name", 0, {-1, -1, -1}, TextAlignment.Center)}}
+// {-100.0,-100.0,100.0,100.0,true,0.1,1.0,1.0,{Rectangle(true, {0.0, 0.0}, 0, {0, 0, 0}, {235, 235, 235}, LinePattern.Solid, FillPattern.Solid, 0.25, BorderPattern.None, {{-100, -100}, {100, 100}}, 0), Rectangle(true, {0.0, 0.0}, 0, {0, 0, 255}, {255, 255, 255}, LinePattern.Solid, FillPattern.Solid, 0.25, BorderPattern.None, {{-30, 54}, {30, 24}}, 0), Polygon(true, {0.0, 0.0}, 0, {0, 0, 255}, {0, 0, 255}, LinePattern.Solid, FillPattern.Solid, 0.25, {{-30, 40}, {-60, 50}, {-60, 30}, {-30, 40}}, Smooth.None), Line(true, {0.0, 0.0}, 0, {{-31, -41}, {-78, -41}, {-78, 39}, {-30, 39}}, {0, 0, 255}, LinePattern.Solid, 0.25, {Arrow.None, Arrow.None}, 3, Smooth.None), Rectangle(true, {0.0, 0.0}, 0, {0, 0, 255}, {255, 255, 255}, LinePattern.Solid, FillPattern.Solid, 0.25, BorderPattern.None, {{-30, -26}, {30, -56}}, 0), Polygon(true, {0.0, 0.0}, 0, {0, 0, 255}, {0, 0, 255}, LinePattern.Solid, FillPattern.Solid, 0.25, {{60, -32}, {30, -42}, {60, -52}, {60, -32}}, Smooth.None), Line(true, {0.0, 0.0}, 0, {{30, 39}, {76, 39}, {76, -41}, {30, -41}}, {0, 0, 255}, LinePattern.Solid, 0.25, {Arrow.None, Arrow.None}, 3, Smooth.None), Text(true, {0.0, 0.0}, 0, {0, 0, 255}, {0, 0, 0}, LinePattern.Solid, FillPattern.None, 0.25, {{-100, 150}, {100, 110}}, "%name", 0, {-1, -1, -1}, "", {}, TextAlignment.Center)}}
 // Evaluating: getErrorString()
 // ""
@@ -21020 +21020 @@
 // ""
 // Evaluating: getIconAnnotation(Modelica.Mechanics.MultiBody.Examples.Systems.RobotR3.Components.AxisType2)
-// {-100.0,-100.0,100.0,100.0,true,0.1,1.0,1.0,{Rectangle(true, {0.0, 0.0}, 0, {0, 0, 0}, {160, 160, 164}, LinePattern.Solid, FillPattern.HorizontalCylinder, 0.25, BorderPattern.None, {{-100, 50}, {100, -50}}, 0), Text(true, {0.0, 0.0}, 0, {0, 0, 255}, {0, 0, 0}, LinePattern.Solid, FillPattern.None, 0.25, {{-150, 57}, {150, 97}}, "%name", 0, {-1, -1, -1}, TextAlignment.Center)}}
+// {-100.0,-100.0,100.0,100.0,true,0.1,1.0,1.0,{Rectangle(true, {0.0, 0.0}, 0, {0, 0, 0}, {160, 160, 164}, LinePattern.Solid, FillPattern.HorizontalCylinder, 0.25, BorderPattern.None, {{-100, 50}, {100, -50}}, 0), Text(true, {0.0, 0.0}, 0, {0, 0, 255}, {0, 0, 0}, LinePattern.Solid, FillPattern.None, 0.25, {{-150, 57}, {150, 97}}, "%name", 0, {-1, -1, -1}, "", {}, TextAlignment.Center)}}
 // Evaluating: getErrorString()
 // ""
@@ -21049 +21049 @@
 // ""
 // Evaluating: getIconAnnotation(Modelica.Mechanics.MultiBody.Examples.Systems.RobotR3.Components.MechanicalStructure)
-// {-200.0,-200.0,200.0,200.0,true,0.1,2.0,2.0,{Rectangle(true, {0.0, 0.0}, 0, {0, 0, 0}, {192, 192, 192}, LinePattern.Solid, FillPattern.Solid, 0.25, BorderPattern.None, {{-200, 200}, {200, -200}}, 0), Text(true, {0.0, 0.0}, 0, {0, 0, 255}, {0, 0, 0}, LinePattern.Solid, FillPattern.None, 0.25, {{-200, 280}, {200, 200}}, "%name", 0, {-1, -1, -1}, TextAlignment.Center), Text(true, {0.0, 0.0}, 0, {0, 0, 255}, {0, 0, 0}, LinePattern.Solid, FillPattern.None, 0.25, {{-200, -150}, {-140, -190}}, "1", 0, {-1, -1, -1}, TextAlignment.Center), Text(true, {0.0, 0.0}, 0, {0, 0, 255}, {0, 0, 0}, LinePattern.Solid, FillPattern.None, 0.25, {{-200, -30}, {-140, -70}}, "3", 0, {-1, -1, -1}, TextAlignment.Center), Text(true, {0.0, 0.0}, 0, {0, 0, 255}, {0, 0, 0}, LinePattern.Solid, FillPattern.None, 0.25, {{-200, -90}, {-140, -130}}, "2", 0, {-1, -1, -1}, TextAlignment.Center), Text(true, {0.0, 0.0}, 0, {0, 0, 255}, {0, 0, 0}, LinePattern.Solid, FillPattern.None, 0.25, {{-200, 90}, {-140, 50}}, "5", 0, {-1, -1, -1}, TextAlignment.Center), Text(true, {0.0, 0.0}, 0, {0, 0, 255}, {0, 0, 0}, LinePattern.Solid, FillPattern.None, 0.25, {{-200, 28}, {-140, -12}}, "4", 0, {-1, -1, -1}, TextAlignment.Center), Text(true, {0.0, 0.0}, 0, {0, 0, 255}, {0, 0, 0}, LinePattern.Solid, FillPattern.None, 0.25, {{-198, 150}, {-138, 110}}, "6", 0, {-1, -1, -1}, TextAlignment.Center), Bitmap(true, {0.0, 0.0}, 0, {{-130, 195}, {195, -195}}, "../../../../Images/MultiBody/Examples/Systems/robot_kr15.bmp")}}
+// {-200.0,-200.0,200.0,200.0,true,0.1,2.0,2.0,{Rectangle(true, {0.0, 0.0}, 0, {0, 0, 0}, {192, 192, 192}, LinePattern.Solid, FillPattern.Solid, 0.25, BorderPattern.None, {{-200, 200}, {200, -200}}, 0), Text(true, {0.0, 0.0}, 0, {0, 0, 255}, {0, 0, 0}, LinePattern.Solid, FillPattern.None, 0.25, {{-200, 280}, {200, 200}}, "%name", 0, {-1, -1, -1}, "", {}, TextAlignment.Center), Text(true, {0.0, 0.0}, 0, {0, 0, 255}, {0, 0, 0}, LinePattern.Solid, FillPattern.None, 0.25, {{-200, -150}, {-140, -190}}, "1", 0, {-1, -1, -1}, "", {}, TextAlignment.Center), Text(true, {0.0, 0.0}, 0, {0, 0, 255}, {0, 0, 0}, LinePattern.Solid, FillPattern.None, 0.25, {{-200, -30}, {-140, -70}}, "3", 0, {-1, -1, -1}, "", {}, TextAlignment.Center), Text(true, {0.0, 0.0}, 0, {0, 0, 255}, {0, 0, 0}, LinePattern.Solid, FillPattern.None, 0.25, {{-200, -90}, {-140, -130}}, "2", 0, {-1, -1, -1}, "", {}, TextAlignment.Center), Text(true, {0.0, 0.0}, 0, {0, 0, 255}, {0, 0, 0}, LinePattern.Solid, FillPattern.None, 0.25, {{-200, 90}, {-140, 50}}, "5", 0, {-1, -1, -1}, "", {}, TextAlignment.Center), Text(true, {0.0, 0.0}, 0, {0, 0, 255}, {0, 0, 0}, LinePattern.Solid, FillPattern.None, 0.25, {{-200, 28}, {-140, -12}}, "4", 0, {-1, -1, -1}, "", {}, TextAlignment.Center), Text(true, {0.0, 0.0}, 0, {0, 0, 255}, {0, 0, 0}, LinePattern.Solid, FillPattern.None, 0.25, {{-198, 150}, {-138, 110}}, "6", 0, {-1, -1, -1}, "", {}, TextAlignment.Center), Bitmap(true, {0.0, 0.0}, 0, {{-130, 195}, {195, -195}}, "../../../../Images/MultiBody/Examples/Systems/robot_kr15.bmp")}}
 // Evaluating: getErrorString()
 // ""
@@ -21177 +21177 @@
 // ""
 // Evaluating: getIconAnnotation(Modelica.Mechanics.MultiBody.Forces.WorldForce)
-// {-100.0,-100.0,100.0,100.0,true,0.1,2.0,2.0,{Text(true, {0.0, 0.0}, 0, {192, 192, 192}, {0, 0, 0}, LinePattern.Solid, FillPattern.None, 0.25, {{-89, -46}, {91, -76}}, "resolve", 0, {-1, -1, -1}, TextAlignment.Center), Polygon(true, {0.0, 0.0}, 0, {0, 0, 0}, {0, 0, 0}, LinePattern.Solid, FillPattern.Solid, 0.25, {{-100, 10}, {50, 10}, {50, 31}, {94, 0}, {50, -31}, {50, -10}, {-100, -10}, {-100, 10}}, Smooth.None), Text(true, {0.0, 0.0}, 0, {0, 0, 255}, {0, 0, 0}, LinePattern.Solid, FillPattern.None, 0.25, {{-149, 103}, {136, 42}}, "%name", 0, {-1, -1, -1}, TextAlignment.Center), Line(true, {0.0, 0.0}, 0, {{0, -10}, {0, -95}}, {95, 95, 95}, LinePattern.Dot, 0.25, {Arrow.None, Arrow.None}, 3, Smooth.None)}}
+// {-100.0,-100.0,100.0,100.0,true,0.1,2.0,2.0,{Text(true, {0.0, 0.0}, 0, {192, 192, 192}, {0, 0, 0}, LinePattern.Solid, FillPattern.None, 0.25, {{-89, -46}, {91, -76}}, "resolve", 0, {-1, -1, -1}, "", {}, TextAlignment.Center), Polygon(true, {0.0, 0.0}, 0, {0, 0, 0}, {0, 0, 0}, LinePattern.Solid, FillPattern.Solid, 0.25, {{-100, 10}, {50, 10}, {50, 31}, {94, 0}, {50, -31}, {50, -10}, {-100, -10}, {-100, 10}}, Smooth.None), Text(true, {0.0, 0.0}, 0, {0, 0, 255}, {0, 0, 0}, LinePattern.Solid, FillPattern.None, 0.25, {{-149, 103}, {136, 42}}, "%name", 0, {-1, -1, -1}, "", {}, TextAlignment.Center), Line(true, {0.0, 0.0}, 0, {{0, -10}, {0, -95}}, {95, 95, 95}, LinePattern.Dot, 0.25, {Arrow.None, Arrow.None}, 3, Smooth.None)}}
 // Evaluating: getErrorString()
 // ""
@@ -21255 +21255 @@
 // ""
 // Evaluating: getIconAnnotation(Modelica.Mechanics.MultiBody.Forces.WorldTorque)
-// {-100.0,-100.0,100.0,100.0,true,0.1,1.0,1.0,{Text(true, {0.0, 0.0}, 0, {192, 192, 192}, {0, 0, 0}, LinePattern.Solid, FillPattern.None, 0.25, {{-61, 64}, {46, 27}}, "resolve", 0, {-1, -1, -1}, TextAlignment.Center), Text(true, {0.0, 0.0}, 0, {0, 0, 255}, {0, 0, 0}, LinePattern.Solid, FillPattern.None, 0.25, {{-145, -28}, {140, -89}}, "%name", 0, {-1, -1, -1}, TextAlignment.Center), Line(true, {0.0, 0.0}, 0, {{0, 95}, {0, 82}}, {95, 95, 95}, LinePattern.Dot, 0.25, {Arrow.None, Arrow.None}, 3, Smooth.None), Line(true, {0.0, 0.0}, 0, {{-100, 0}, {-94, 13}, {-86, 28}, {-74, 48}, {-65, 60}, {-52, 72}, {-35, 81}, {-22, 84}, {-8, 84}, {7, 80}, {19, 73}, {32, 65}, {44, 55}, {52, 47}, {58, 40}}, {0, 0, 0}, LinePattern.Solid, 0.5, {Arrow.None, Arrow.None}, 3, Smooth.None), Polygon(true, {0.0, 0.0}, 0, {0, 0, 0}, {0, 0, 0}, LinePattern.Solid, FillPattern.Solid, 0.25, {{94, 10}, {75, 59}, {41, 24}, {94, 10}}, Smooth.None)}}
+// {-100.0,-100.0,100.0,100.0,true,0.1,1.0,1.0,{Text(true, {0.0, 0.0}, 0, {192, 192, 192}, {0, 0, 0}, LinePattern.Solid, FillPattern.None, 0.25, {{-61, 64}, {46, 27}}, "resolve", 0, {-1, -1, -1}, "", {}, TextAlignment.Center), Text(true, {0.0, 0.0}, 0, {0, 0, 255}, {0, 0, 0}, LinePattern.Solid, FillPattern.None, 0.25, {{-145, -28}, {140, -89}}, "%name", 0, {-1, -1, -1}, "", {}, TextAlignment.Center), Line(true, {0.0, 0.0}, 0, {{0, 95}, {0, 82}}, {95, 95, 95}, LinePattern.Dot, 0.25, {Arrow.None, Arrow.None}, 3, Smooth.None), Line(true, {0.0, 0.0}, 0, {{-100, 0}, {-94, 13}, {-86, 28}, {-74, 48}, {-65, 60}, {-52, 72}, {-35, 81}, {-22, 84}, {-8, 84}, {7, 80}, {19, 73}, {32, 65}, {44, 55}, {52, 47}, {58, 40}}, {0, 0, 0}, LinePattern.Solid, 0.5, {Arrow.None, Arrow.None}, 3, Smooth.None), Polygon(true, {0.0, 0.0}, 0, {0, 0, 0}, {0, 0, 0}, LinePattern.Solid, FillPattern.Solid, 0.25, {{94, 10}, {75, 59}, {41, 24}, {94, 10}}, Smooth.None)}}
 // Evaluating: getErrorString()
 // ""
@@ -21332 +21332 @@
 // ""
 // Evaluating: getIconAnnotation(Modelica.Mechanics.MultiBody.Forces.WorldForceAndTorque)
-// {-100.0,-100.0,100.0,100.0,true,0.1,2.0,2.0,{Text(true, {0.0, 0.0}, 0, {192, 192, 192}, {0, 0, 0}, LinePattern.Solid, FillPattern.None, 0.25, {{-63, 56}, {44, 19}}, "resolve", 0, {-1, -1, -1}, TextAlignment.Center), Text(true, {0.0, 0.0}, 0, {0, 0, 255}, {0, 0, 0}, LinePattern.Solid, FillPattern.None, 0.25, {{-151, -73}, {134, -134}}, "%name", 0, {-1, -1, -1}, TextAlignment.Center), Line(true, {0.0, 0.0}, 0, {{-100, 60}, {-86, 68}, {-80, 72}, {-70, 78}, {-64, 82}, {-46, 86}, {-34, 88}, {-16, 88}, {-2, 86}, {12, 80}, {24, 74}, {34, 68}, {46, 58}, {52, 54}, {58, 48}}, {0, 0, 0}, LinePattern.Solid, 0.5, {Arrow.None, Arrow.None}, 3, Smooth.None), Polygon(true, {0.0, 0.0}, 0, {0, 0, 0}, {0, 0, 0}, LinePattern.Solid, FillPattern.Solid, 0.25, {{89, 17}, {64, 76}, {30, 41}, {89, 17}}, Smooth.None), Line(true, {0.0, 0.0}, 0, {{0, 95}, {0, -26}}, {95, 95, 95}, LinePattern.Dot, 0.25, {Arrow.None, Arrow.None}, 3, Smooth.None), Line(true, {0.0, 0.0}, 0, {{0, 0}, {96, 0}}, {95, 95, 95}, LinePattern.Dot, 0.25, {Arrow.None, Arrow.None}, 3, Smooth.None), Polygon(true, {0.0, 0.0}, 0, {0, 0, 0}, {0, 0, 0}, LinePattern.Solid, FillPattern.Solid, 0.25, {{-104, -48}, {54, 0}, {46, 20}, {96, 0}, {66, -42}, {60, -22}, {-96, -72}, {-104, -48}}, Smooth.None)}}
+// {-100.0,-100.0,100.0,100.0,true,0.1,2.0,2.0,{Text(true, {0.0, 0.0}, 0, {192, 192, 192}, {0, 0, 0}, LinePattern.Solid, FillPattern.None, 0.25, {{-63, 56}, {44, 19}}, "resolve", 0, {-1, -1, -1}, "", {}, TextAlignment.Center), Text(true, {0.0, 0.0}, 0, {0, 0, 255}, {0, 0, 0}, LinePattern.Solid, FillPattern.None, 0.25, {{-151, -73}, {134, -134}}, "%name", 0, {-1, -1, -1}, "", {}, TextAlignment.Center), Line(true, {0.0, 0.0}, 0, {{-100, 60}, {-86, 68}, {-80, 72}, {-70, 78}, {-64, 82}, {-46, 86}, {-34, 88}, {-16, 88}, {-2, 86}, {12, 80}, {24, 74}, {34, 68}, {46, 58}, {52, 54}, {58, 48}}, {0, 0, 0}, LinePattern.Solid, 0.5, {Arrow.None, Arrow.None}, 3, Smooth.None), Polygon(true, {0.0, 0.0}, 0, {0, 0, 0}, {0, 0, 0}, LinePattern.Solid, FillPattern.Solid, 0.25, {{89, 17}, {64, 76}, {30, 41}, {89, 17}}, Smooth.None), Line(true, {0.0, 0.0}, 0, {{0, 95}, {0, -26}}, {95, 95, 95}, LinePattern.Dot, 0.25, {Arrow.None, Arrow.None}, 3, Smooth.None), Line(true, {0.0, 0.0}, 0, {{0, 0}, {96, 0}}, {95, 95, 95}, LinePattern.Dot, 0.25, {Arrow.None, Arrow.None}, 3, Smooth.None), Polygon(true, {0.0, 0.0}, 0, {0, 0, 0}, {0, 0, 0}, LinePattern.Solid, FillPattern.Solid, 0.25, {{-104, -48}, {54, 0}, {46, 20}, {96, 0}, {66, -42}, {60, -22}, {-96, -72}, {-104, -48}}, Smooth.None)}}
 // Evaluating: getErrorString()
 // ""
@@ -21413 +21413 @@
 // ""
 // Evaluating: getIconAnnotation(Modelica.Mechanics.MultiBody.Forces.Force)
-// {-100.0,-100.0,100.0,100.0,true,0.1,2.0,2.0,{Rectangle(true, {0.0, 0.0}, 0, {255, 255, 255}, {255, 255, 255}, LinePattern.Solid, FillPattern.Solid, 0.25, BorderPattern.None, {{-98, 99}, {99, -98}}, 0), Text(true, {0.0, 0.0}, 0, {192, 192, 192}, {0, 0, 0}, LinePattern.Solid, FillPattern.None, 0.25, {{-92, 61}, {87, 35}}, "resolve", 0, {-1, -1, -1}, TextAlignment.Center), Text(true, {0.0, 0.0}, 0, {0, 0, 255}, {0, 0, 0}, LinePattern.Solid, FillPattern.None, 0.25, {{-136, -52}, {149, -113}}, "%name", 0, {-1, -1, -1}, TextAlignment.Center), Line(true, {0.0, 0.0}, 0, {{40, 100}, {40, 0}}, {95, 95, 95}, LinePattern.Dot, 0.25, {Arrow.None, Arrow.None}, 3, Smooth.None), Polygon(true, {0.0, 0.0}, 0, {0, 0, 0}, {0, 0, 0}, LinePattern.Solid, FillPattern.Solid, 0.25, {{-94, 0}, {-64, 11}, {-64, -10}, {-94, 0}}, Smooth.None), Line(true, {0.0, 0.0}, 0, {{-60, 100}, {40, 100}}, {95, 95, 95}, LinePattern.Dot, 0.25, {Arrow.None, Arrow.None}, 3, Smooth.None), Polygon(true, {0.0, 0.0}, 0, {0, 0, 0}, {0, 0, 0}, LinePattern.Solid, FillPattern.Solid, 0.25, {{94, 0}, {65, 12}, {65, -11}, {94, 0}}, Smooth.None), Line(true, {0.0, 0.0}, 0, {{-64, 0}, {-20, 0}}, {0, 0, 0}, LinePattern.Solid, 0.25, {Arrow.None, Arrow.None}, 3, Smooth.None), Line(true, {0.0, 0.0}, 0, {{20, 0}, {65, 0}}, {0, 0, 0}, LinePattern.Solid, 0.25, {Arrow.None, Arrow.None}, 3, Smooth.None)}}
+// {-100.0,-100.0,100.0,100.0,true,0.1,2.0,2.0,{Rectangle(true, {0.0, 0.0}, 0, {255, 255, 255}, {255, 255, 255}, LinePattern.Solid, FillPattern.Solid, 0.25, BorderPattern.None, {{-98, 99}, {99, -98}}, 0), Text(true, {0.0, 0.0}, 0, {192, 192, 192}, {0, 0, 0}, LinePattern.Solid, FillPattern.None, 0.25, {{-92, 61}, {87, 35}}, "resolve", 0, {-1, -1, -1}, "", {}, TextAlignment.Center), Text(true, {0.0, 0.0}, 0, {0, 0, 255}, {0, 0, 0}, LinePattern.Solid, FillPattern.None, 0.25, {{-136, -52}, {149, -113}}, "%name", 0, {-1, -1, -1}, "", {}, TextAlignment.Center), Line(true, {0.0, 0.0}, 0, {{40, 100}, {40, 0}}, {95, 95, 95}, LinePattern.Dot, 0.25, {Arrow.None, Arrow.None}, 3, Smooth.None), Polygon(true, {0.0, 0.0}, 0, {0, 0, 0}, {0, 0, 0}, LinePattern.Solid, FillPattern.Solid, 0.25, {{-94, 0}, {-64, 11}, {-64, -10}, {-94, 0}}, Smooth.None), Line(true, {0.0, 0.0}, 0, {{-60, 100}, {40, 100}}, {95, 95, 95}, LinePattern.Dot, 0.25, {Arrow.None, Arrow.None}, 3, Smooth.None), Polygon(true, {0.0, 0.0}, 0, {0, 0, 0}, {0, 0, 0}, LinePattern.Solid, FillPattern.Solid, 0.25, {{94, 0}, {65, 12}, {65, -11}, {94, 0}}, Smooth.None), Line(true, {0.0, 0.0}, 0, {{-64, 0}, {-20, 0}}, {0, 0, 0}, LinePattern.Solid, 0.25, {Arrow.None, Arrow.None}, 3, Smooth.None), Line(true, {0.0, 0.0}, 0, {{20, 0}, {65, 0}}, {0, 0, 0}, LinePattern.Solid, 0.25, {Arrow.None, Arrow.None}, 3, Smooth.None)}}
 // Evaluating: getErrorString()
 // ""
@@ -21484 +21484 @@
 // ""
 // Evaluating: getIconAnnotation(Modelica.Mechanics.MultiBody.Forces.Torque)
-// {-100.0,-100.0,100.0,100.0,true,0.1,2.0,2.0,{Rectangle(true, {0.0, 0.0}, 0, {255, 255, 255}, {255, 255, 255}, LinePattern.Solid, FillPattern.Solid, 0.25, BorderPattern.None, {{-98, 99}, {99, -98}}, 0), Text(true, {0.0, 0.0}, 0, {192, 192, 192}, {0, 0, 0}, LinePattern.Solid, FillPattern.None, 0.25, {{-59, 55}, {72, 30}}, "resolve", 0, {-1, -1, -1}, TextAlignment.Center), Text(true, {0.0, 0.0}, 0, {0, 0, 255}, {0, 0, 0}, LinePattern.Solid, FillPattern.None, 0.25, {{-139, -27}, {146, -88}}, "%name", 0, {-1, -1, -1}, TextAlignment.Center), Polygon(true, {0.0, 0.0}, 0, {0, 0, 0}, {0, 0, 0}, LinePattern.Solid, FillPattern.Solid, 0.25, {{100, 20}, {84, 52}, {69, 39}, {100, 20}}, Smooth.None), Line(true, {0.0, 0.0}, 0, {{40, 100}, {76, 46}}, {95, 95, 95}, LinePattern.Dot, 0.25, {Arrow.None, Arrow.None}, 3, Smooth.None), Polygon(true, {0.0, 0.0}, 0, {0, 0, 0}, {0, 0, 0}, LinePattern.Solid, FillPattern.Solid, 0.25, {{-99, 20}, {-86, 53}, {-70, 42}, {-99, 20}}, Smooth.None), Line(true, {0.0, 0.0}, 0, {{-60, 100}, {40, 100}}, {95, 95, 95}, LinePattern.Dot, 0.25, {Arrow.None, Arrow.None}, 3, Smooth.None), Line(true, {0.0, 0.0}, 0, {{-79, 47}, {-70, 61}, {-59, 72}, {-45, 81}, {-32, 84}, {-20, 85}}, {0, 0, 0}, LinePattern.Solid, 0.25, {Arrow.None, Arrow.None}, 3, Smooth.None), Line(true, {0.0, 0.0}, 0, {{77, 45}, {66, 60}, {55, 69}, {49, 74}, {41, 80}, {31, 84}, {20, 85}}, {0, 0, 0}, LinePattern.Solid, 0.25, {Arrow.None, Arrow.None}, 3, Smooth.None)}}
+// {-100.0,-100.0,100.0,100.0,true,0.1,2.0,2.0,{Rectangle(true, {0.0, 0.0}, 0, {255, 255, 255}, {255, 255, 255}, LinePattern.Solid, FillPattern.Solid, 0.25, BorderPattern.None, {{-98, 99}, {99, -98}}, 0), Text(true, {0.0, 0.0}, 0, {192, 192, 192}, {0, 0, 0}, LinePattern.Solid, FillPattern.None, 0.25, {{-59, 55}, {72, 30}}, "resolve", 0, {-1, -1, -1}, "", {}, TextAlignment.Center), Text(true, {0.0, 0.0}, 0, {0, 0, 255}, {0, 0, 0}, LinePattern.Solid, FillPattern.None, 0.25, {{-139, -27}, {146, -88}}, "%name", 0, {-1, -1, -1}, "", {}, TextAlignment.Center), Polygon(true, {0.0, 0.0}, 0, {0, 0, 0}, {0, 0, 0}, LinePattern.Solid, FillPattern.Solid, 0.25, {{100, 20}, {84, 52}, {69, 39}, {100, 20}}, Smooth.None), Line(true, {0.0, 0.0}, 0, {{40, 100}, {76, 46}}, {95, 95, 95}, LinePattern.Dot, 0.25, {Arrow.None, Arrow.None}, 3, Smooth.None), Polygon(true, {0.0, 0.0}, 0, {0, 0, 0}, {0, 0, 0}, LinePattern.Solid, FillPattern.Solid, 0.25, {{-99, 20}, {-86, 53}, {-70, 42}, {-99, 20}}, Smooth.None), Line(true, {0.0, 0.0}, 0, {{-60, 100}, {40, 100}}, {95, 95, 95}, LinePattern.Dot, 0.25, {Arrow.None, Arrow.None}, 3, Smooth.None), Line(true, {0.0, 0.0}, 0, {{-79, 47}, {-70, 61}, {-59, 72}, {-45, 81}, {-32, 84}, {-20, 85}}, {0, 0, 0}, LinePattern.Solid, 0.25, {Arrow.None, Arrow.None}, 3, Smooth.None), Line(true, {0.0, 0.0}, 0, {{77, 45}, {66, 60}, {55, 69}, {49, 74}, {41, 80}, {31, 84}, {20, 85}}, {0, 0, 0}, LinePattern.Solid, 0.25, {Arrow.None, Arrow.None}, 3, Smooth.None)}}
 // Evaluating: getErrorString()
 // ""
@@ -25454 +25454 @@
 // ""
 // Evaluating: getIconAnnotation(Modelica.Math.sin)
-// {-100.0,-100.0,100.0,100.0,true,0.1,2.0,2.0,{Line(true, {0.0, 0.0}, 0, {{-90, 0}, {68, 0}}, {192, 192, 192}, LinePattern.Solid, 0.25, {Arrow.None, Arrow.None}, 3, Smooth.None), Polygon(true, {0.0, 0.0}, 0, {192, 192, 192}, {192, 192, 192}, LinePattern.Solid, FillPattern.Solid, 0.25, {{90, 0}, {68, 8}, {68, -8}, {90, 0}}, Smooth.None), Line(true, {0.0, 0.0}, 0, {{-80.0, 0.0}, {-68.7, 34.2}, {-61.5, 53.1}, {-55.1, 66.40000000000001}, {-49.4, 74.59999999999999}, {-43.8, 79.09999999999999}, {-38.2, 79.8}, {-32.6, 76.59999999999999}, {-26.9, 69.7}, {-21.3, 59.4}, {-14.9, 44.1}, {-6.83, 21.2}, {10.1, -30.8}, {17.3, -50.2}, {23.7, -64.2}, {29.3, -73.09999999999999}, {35.0, -78.40000000000001}, {40.6, -80.0}, {46.2, -77.59999999999999}, {51.9, -71.5}, {57.5, -61.9}, {63.9, -47.2}, {72.0, -24.8}, {80.0, 0.0}}, {0, 0, 0}, LinePattern.Solid, 0.25, {Arrow.None, Arrow.None}, 3, Smooth.None), Text(true, {0.0, 0.0}, 0, {192, 192, 192}, {0, 0, 0}, LinePattern.Solid, FillPattern.None, 0.25, {{12, 84}, {84, 36}}, "sin", 0, {-1, -1, -1}, TextAlignment.Center)}}
+// {-100.0,-100.0,100.0,100.0,true,0.1,2.0,2.0,{Line(true, {0.0, 0.0}, 0, {{-90, 0}, {68, 0}}, {192, 192, 192}, LinePattern.Solid, 0.25, {Arrow.None, Arrow.None}, 3, Smooth.None), Polygon(true, {0.0, 0.0}, 0, {192, 192, 192}, {192, 192, 192}, LinePattern.Solid, FillPattern.Solid, 0.25, {{90, 0}, {68, 8}, {68, -8}, {90, 0}}, Smooth.None), Line(true, {0.0, 0.0}, 0, {{-80.0, 0.0}, {-68.7, 34.2}, {-61.5, 53.1}, {-55.1, 66.40000000000001}, {-49.4, 74.59999999999999}, {-43.8, 79.09999999999999}, {-38.2, 79.8}, {-32.6, 76.59999999999999}, {-26.9, 69.7}, {-21.3, 59.4}, {-14.9, 44.1}, {-6.83, 21.2}, {10.1, -30.8}, {17.3, -50.2}, {23.7, -64.2}, {29.3, -73.09999999999999}, {35.0, -78.40000000000001}, {40.6, -80.0}, {46.2, -77.59999999999999}, {51.9, -71.5}, {57.5, -61.9}, {63.9, -47.2}, {72.0, -24.8}, {80.0, 0.0}}, {0, 0, 0}, LinePattern.Solid, 0.25, {Arrow.None, Arrow.None}, 3, Smooth.None), Text(true, {0.0, 0.0}, 0, {192, 192, 192}, {0, 0, 0}, LinePattern.Solid, FillPattern.None, 0.25, {{12, 84}, {84, 36}}, "sin", 0, {-1, -1, -1}, "", {}, TextAlignment.Center)}}
 // Evaluating: getErrorString()
 // ""
 // Evaluating: getDiagramAnnotation(Modelica.Math.sin)
-// {-100.0,-100.0,100.0,100.0,true,0.1,2.0,2.0,{Line(true, {0.0, 0.0}, 0, {{-100, 0}, {84, 0}}, {95, 95, 95}, LinePattern.Solid, 0.25, {Arrow.None, Arrow.None}, 3, Smooth.None), Polygon(true, {0.0, 0.0}, 0, {95, 95, 95}, {95, 95, 95}, LinePattern.Solid, FillPattern.Solid, 0.25, {{100, 0}, {84, 6}, {84, -6}, {100, 0}}, Smooth.None), Line(true, {0.0, 0.0}, 0, {{-80.0, 0.0}, {-68.7, 34.2}, {-61.5, 53.1}, {-55.1, 66.40000000000001}, {-49.4, 74.59999999999999}, {-43.8, 79.09999999999999}, {-38.2, 79.8}, {-32.6, 76.59999999999999}, {-26.9, 69.7}, {-21.3, 59.4}, {-14.9, 44.1}, {-6.83, 21.2}, {10.1, -30.8}, {17.3, -50.2}, {23.7, -64.2}, {29.3, -73.09999999999999}, {35.0, -78.40000000000001}, {40.6, -80.0}, {46.2, -77.59999999999999}, {51.9, -71.5}, {57.5, -61.9}, {63.9, -47.2}, {72.0, -24.8}, {80.0, 0.0}}, {0, 0, 255}, LinePattern.Solid, 0.5, {Arrow.None, Arrow.None}, 3, Smooth.None), Text(true, {0.0, 0.0}, 0, {0, 0, 255}, {0, 0, 0}, LinePattern.Solid, FillPattern.None, 0.25, {{-105, 72}, {-85, 88}}, "1", 0, {-1, -1, -1}, TextAlignment.Center), Text(true, {0.0, 0.0}, 0, {0, 0, 255}, {0, 0, 0}, LinePattern.Solid, FillPattern.None, 0.25, {{70, 25}, {90, 5}}, "2*pi", 0, {-1, -1, -1}, TextAlignment.Center), Text(true, {0.0, 0.0}, 0, {0, 0, 255}, {0, 0, 0}, LinePattern.Solid, FillPattern.None, 0.25, {{-103, -72}, {-83, -88}}, "-1", 0, {-1, -1, -1}, TextAlignment.Center), Text(true, {0.0, 0.0}, 0, {95, 95, 95}, {0, 0, 0}, LinePattern.Solid, FillPattern.None, 0.25, {{82, -6}, {102, -26}}, "u", 0, {-1, -1, -1}, TextAlignment.Center), Line(true, {0.0, 0.0}, 0, {{-80, 80}, {-28, 80}}, {175, 175, 175}, LinePattern.Solid, 0.25, {Arrow.None, Arrow.None}, 3, Smooth.None), Line(true, {0.0, 0.0}, 0, {{-80, -80}, {50, -80}}, {175, 175, 175}, LinePattern.Solid, 0.25, {Arrow.None, Arrow.None}, 3, Smooth.None)}}
+// {-100.0,-100.0,100.0,100.0,true,0.1,2.0,2.0,{Line(true, {0.0, 0.0}, 0, {{-100, 0}, {84, 0}}, {95, 95, 95}, LinePattern.Solid, 0.25, {Arrow.None, Arrow.None}, 3, Smooth.None), Polygon(true, {0.0, 0.0}, 0, {95, 95, 95}, {95, 95, 95}, LinePattern.Solid, FillPattern.Solid, 0.25, {{100, 0}, {84, 6}, {84, -6}, {100, 0}}, Smooth.None), Line(true, {0.0, 0.0}, 0, {{-80.0, 0.0}, {-68.7, 34.2}, {-61.5, 53.1}, {-55.1, 66.40000000000001}, {-49.4, 74.59999999999999}, {-43.8, 79.09999999999999}, {-38.2, 79.8}, {-32.6, 76.59999999999999}, {-26.9, 69.7}, {-21.3, 59.4}, {-14.9, 44.1}, {-6.83, 21.2}, {10.1, -30.8}, {17.3, -50.2}, {23.7, -64.2}, {29.3, -73.09999999999999}, {35.0, -78.40000000000001}, {40.6, -80.0}, {46.2, -77.59999999999999}, {51.9, -71.5}, {57.5, -61.9}, {63.9, -47.2}, {72.0, -24.8}, {80.0, 0.0}}, {0, 0, 255}, LinePattern.Solid, 0.5, {Arrow.None, Arrow.None}, 3, Smooth.None), Text(true, {0.0, 0.0}, 0, {0, 0, 255}, {0, 0, 0}, LinePattern.Solid, FillPattern.None, 0.25, {{-105, 72}, {-85, 88}}, "1", 0, {-1, -1, -1}, "", {}, TextAlignment.Center), Text(true, {0.0, 0.0}, 0, {0, 0, 255}, {0, 0, 0}, LinePattern.Solid, FillPattern.None, 0.25, {{70, 25}, {90, 5}}, "2*pi", 0, {-1, -1, -1}, "", {}, TextAlignment.Center), Text(true, {0.0, 0.0}, 0, {0, 0, 255}, {0, 0, 0}, LinePattern.Solid, FillPattern.None, 0.25, {{-103, -72}, {-83, -88}}, "-1", 0, {-1, -1, -1}, "", {}, TextAlignment.Center), Text(true, {0.0, 0.0}, 0, {95, 95, 95}, {0, 0, 0}, LinePattern.Solid, FillPattern.None, 0.25, {{82, -6}, {102, -26}}, "u", 0, {-1, -1, -1}, "", {}, TextAlignment.Center), Line(true, {0.0, 0.0}, 0, {{-80, 80}, {-28, 80}}, {175, 175, 175}, LinePattern.Solid, 0.25, {Arrow.None, Arrow.None}, 3, Smooth.None), Line(true, {0.0, 0.0}, 0, {{-80, -80}, {50, -80}}, {175, 175, 175}, LinePattern.Solid, 0.25, {Arrow.None, Arrow.None}, 3, Smooth.None)}}
 // Evaluating: getErrorString()
 // ""
@@ -25474 +25474 @@
 // ""
 // Evaluating: getIconAnnotation(Modelica.Math.cos)
-// {-100.0,-100.0,100.0,100.0,true,0.1,2.0,2.0,{Line(true, {0.0, 0.0}, 0, {{-90, 0}, {68, 0}}, {192, 192, 192}, LinePattern.Solid, 0.25, {Arrow.None, Arrow.None}, 3, Smooth.None), Polygon(true, {0.0, 0.0}, 0, {192, 192, 192}, {192, 192, 192}, LinePattern.Solid, FillPattern.Solid, 0.25, {{90, 0}, {68, 8}, {68, -8}, {90, 0}}, Smooth.None), Line(true, {0.0, 0.0}, 0, {{-80.0, 80.0}, {-74.40000000000001, 78.09999999999999}, {-68.7, 72.3}, {-63.1, 63.0}, {-56.7, 48.7}, {-48.6, 26.6}, {-29.3, -32.5}, {-22.1, -51.7}, {-15.7, -65.3}, {-10.1, -73.8}, {-4.42, -78.8}, {1.21, -79.90000000000001}, {6.83, -77.09999999999999}, {12.5, -70.59999999999999}, {18.1, -60.6}, {24.5, -45.7}, {32.6, -23.0}, {50.3, 31.3}, {57.5, 50.7}, {63.9, 64.59999999999999}, {69.5, 73.40000000000001}, {75.2, 78.59999999999999}, {80.0, 80.0}}, {0, 0, 0}, LinePattern.Solid, 0.25, {Arrow.None, Arrow.None}, 3, Smooth.None), Text(true, {0.0, 0.0}, 0, {192, 192, 192}, {0, 0, 0}, LinePattern.Solid, FillPattern.None, 0.25, {{-36, 82}, {36, 34}}, "cos", 0, {-1, -1, -1}, TextAlignment.Center)}}
+// {-100.0,-100.0,100.0,100.0,true,0.1,2.0,2.0,{Line(true, {0.0, 0.0}, 0, {{-90, 0}, {68, 0}}, {192, 192, 192}, LinePattern.Solid, 0.25, {Arrow.None, Arrow.None}, 3, Smooth.None), Polygon(true, {0.0, 0.0}, 0, {192, 192, 192}, {192, 192, 192}, LinePattern.Solid, FillPattern.Solid, 0.25, {{90, 0}, {68, 8}, {68, -8}, {90, 0}}, Smooth.None), Line(true, {0.0, 0.0}, 0, {{-80.0, 80.0}, {-74.40000000000001, 78.09999999999999}, {-68.7, 72.3}, {-63.1, 63.0}, {-56.7, 48.7}, {-48.6, 26.6}, {-29.3, -32.5}, {-22.1, -51.7}, {-15.7, -65.3}, {-10.1, -73.8}, {-4.42, -78.8}, {1.21, -79.90000000000001}, {6.83, -77.09999999999999}, {12.5, -70.59999999999999}, {18.1, -60.6}, {24.5, -45.7}, {32.6, -23.0}, {50.3, 31.3}, {57.5, 50.7}, {63.9, 64.59999999999999}, {69.5, 73.40000000000001}, {75.2, 78.59999999999999}, {80.0, 80.0}}, {0, 0, 0}, LinePattern.Solid, 0.25, {Arrow.None, Arrow.None}, 3, Smooth.None), Text(true, {0.0, 0.0}, 0, {192, 192, 192}, {0, 0, 0}, LinePattern.Solid, FillPattern.None, 0.25, {{-36, 82}, {36, 34}}, "cos", 0, {-1, -1, -1}, "", {}, TextAlignment.Center)}}
 // Evaluating: getErrorString()
 // ""
 // Evaluating: getDiagramAnnotation(Modelica.Math.cos)
-// {-100.0,-100.0,100.0,100.0,true,0.1,2.0,2.0,{Text(true, {0.0, 0.0}, 0, {0, 0, 255}, {0, 0, 0}, LinePattern.Solid, FillPattern.None, 0.25, {{-103, 72}, {-83, 88}}, "1", 0, {-1, -1, -1}, TextAlignment.Center), Text(true, {0.0, 0.0}, 0, {0, 0, 255}, {0, 0, 0}, LinePattern.Solid, FillPattern.None, 0.25, {{-103, -72}, {-83, -88}}, "-1", 0, {-1, -1, -1}, TextAlignment.Center), Text(true, {0.0, 0.0}, 0, {0, 0, 255}, {0, 0, 0}, LinePattern.Solid, FillPattern.None, 0.25, {{70, 25}, {90, 5}}, "2*pi", 0, {-1, -1, -1}, TextAlignment.Center), Line(true, {0.0, 0.0}, 0, {{-100, 0}, {84, 0}}, {95, 95, 95}, LinePattern.Solid, 0.25, {Arrow.None, Arrow.None}, 3, Smooth.None), Polygon(true, {0.0, 0.0}, 0, {95, 95, 95}, {95, 95, 95}, LinePattern.Solid, FillPattern.Solid, 0.25, {{98, 0}, {82, 6}, {82, -6}, {98, 0}}, Smooth.None), Line(true, {0.0, 0.0}, 0, {{-80.0, 80.0}, {-74.40000000000001, 78.09999999999999}, {-68.7, 72.3}, {-63.1, 63.0}, {-56.7, 48.7}, {-48.6, 26.6}, {-29.3, -32.5}, {-22.1, -51.7}, {-15.7, -65.3}, {-10.1, -73.8}, {-4.42, -78.8}, {1.21, -79.90000000000001}, {6.83, -77.09999999999999}, {12.5, -70.59999999999999}, {18.1, -60.6}, {24.5, -45.7}, {32.6, -23.0}, {50.3, 31.3}, {57.5, 50.7}, {63.9, 64.59999999999999}, {69.5, 73.40000000000001}, {75.2, 78.59999999999999}, {80.0, 80.0}}, {0, 0, 255}, LinePattern.Solid, 0.5, {Arrow.None, Arrow.None}, 3, Smooth.None), Text(true, {0.0, 0.0}, 0, {95, 95, 95}, {0, 0, 0}, LinePattern.Solid, FillPattern.None, 0.25, {{78, -6}, {98, -26}}, "u", 0, {-1, -1, -1}, TextAlignment.Center), Line(true, {0.0, 0.0}, 0, {{-80, -80}, {18, -80}}, {175, 175, 175}, LinePattern.Solid, 0.25, {Arrow.None, Arrow.None}, 3, Smooth.None)}}
+// {-100.0,-100.0,100.0,100.0,true,0.1,2.0,2.0,{Text(true, {0.0, 0.0}, 0, {0, 0, 255}, {0, 0, 0}, LinePattern.Solid, FillPattern.None, 0.25, {{-103, 72}, {-83, 88}}, "1", 0, {-1, -1, -1}, "", {}, TextAlignment.Center), Text(true, {0.0, 0.0}, 0, {0, 0, 255}, {0, 0, 0}, LinePattern.Solid, FillPattern.None, 0.25, {{-103, -72}, {-83, -88}}, "-1", 0, {-1, -1, -1}, "", {}, TextAlignment.Center), Text(true, {0.0, 0.0}, 0, {0, 0, 255}, {0, 0, 0}, LinePattern.Solid, FillPattern.None, 0.25, {{70, 25}, {90, 5}}, "2*pi", 0, {-1, -1, -1}, "", {}, TextAlignment.Center), Line(true, {0.0, 0.0}, 0, {{-100, 0}, {84, 0}}, {95, 95, 95}, LinePattern.Solid, 0.25, {Arrow.None, Arrow.None}, 3, Smooth.None), Polygon(true, {0.0, 0.0}, 0, {95, 95, 95}, {95, 95, 95}, LinePattern.Solid, FillPattern.Solid, 0.25, {{98, 0}, {82, 6}, {82, -6}, {98, 0}}, Smooth.None), Line(true, {0.0, 0.0}, 0, {{-80.0, 80.0}, {-74.40000000000001, 78.09999999999999}, {-68.7, 72.3}, {-63.1, 63.0}, {-56.7, 48.7}, {-48.6, 26.6}, {-29.3, -32.5}, {-22.1, -51.7}, {-15.7, -65.3}, {-10.1, -73.8}, {-4.42, -78.8}, {1.21, -79.90000000000001}, {6.83, -77.09999999999999}, {12.5, -70.59999999999999}, {18.1, -60.6}, {24.5, -45.7}, {32.6, -23.0}, {50.3, 31.3}, {57.5, 50.7}, {63.9, 64.59999999999999}, {69.5, 73.40000000000001}, {75.2, 78.59999999999999}, {80.0, 80.0}}, {0, 0, 255}, LinePattern.Solid, 0.5, {Arrow.None, Arrow.None}, 3, Smooth.None), Text(true, {0.0, 0.0}, 0, {95, 95, 95}, {0, 0, 0}, LinePattern.Solid, FillPattern.None, 0.25, {{78, -6}, {98, -26}}, "u", 0, {-1, -1, -1}, "", {}, TextAlignment.Center), Line(true, {0.0, 0.0}, 0, {{-80, -80}, {18, -80}}, {175, 175, 175}, LinePattern.Solid, 0.25, {Arrow.None, Arrow.None}, 3, Smooth.None)}}
 // Evaluating: getErrorString()
 // ""
@@ -25494 +25494 @@
 // ""
 // Evaluating: getIconAnnotation(Modelica.Math.tan)
-// {-100.0,-100.0,100.0,100.0,true,0.1,2.0,2.0,{Line(true, {0.0, 0.0}, 0, {{-90, 0}, {68, 0}}, {192, 192, 192}, LinePattern.Solid, 0.25, {Arrow.None, Arrow.None}, 3, Smooth.None), Polygon(true, {0.0, 0.0}, 0, {192, 192, 192}, {192, 192, 192}, LinePattern.Solid, FillPattern.Solid, 0.25, {{90, 0}, {68, 8}, {68, -8}, {90, 0}}, Smooth.None), Line(true, {0.0, 0.0}, 0, {{-80.0, -80.0}, {-78.40000000000001, -68.40000000000001}, {-76.8, -59.7}, {-74.40000000000001, -50.0}, {-71.2, -40.9}, {-67.09999999999999, -33.0}, {-60.7, -24.8}, {-51.1, -17.2}, {-35.8, -9.98}, {-4.42, -1.07}, {33.4, 9.119999999999999}, {49.4, 16.2}, {59.1, 23.2}, {65.5, 30.6}, {70.40000000000001, 39.1}, {73.59999999999999, 47.4}, {76.0, 56.1}, {77.59999999999999, 63.8}, {80.0, 80.0}}, {0, 0, 0}, LinePattern.Solid, 0.25, {Arrow.None, Arrow.None}, 3, Smooth.None), Text(true, {0.0, 0.0}, 0, {192, 192, 192}, {0, 0, 0}, LinePattern.Solid, FillPattern.None, 0.25, {{-90, 72}, {-18, 24}}, "tan", 0, {-1, -1, -1}, TextAlignment.Center)}}
+// {-100.0,-100.0,100.0,100.0,true,0.1,2.0,2.0,{Line(true, {0.0, 0.0}, 0, {{-90, 0}, {68, 0}}, {192, 192, 192}, LinePattern.Solid, 0.25, {Arrow.None, Arrow.None}, 3, Smooth.None), Polygon(true, {0.0, 0.0}, 0, {192, 192, 192}, {192, 192, 192}, LinePattern.Solid, FillPattern.Solid, 0.25, {{90, 0}, {68, 8}, {68, -8}, {90, 0}}, Smooth.None), Line(true, {0.0, 0.0}, 0, {{-80.0, -80.0}, {-78.40000000000001, -68.40000000000001}, {-76.8, -59.7}, {-74.40000000000001, -50.0}, {-71.2, -40.9}, {-67.09999999999999, -33.0}, {-60.7, -24.8}, {-51.1, -17.2}, {-35.8, -9.98}, {-4.42, -1.07}, {33.4, 9.119999999999999}, {49.4, 16.2}, {59.1, 23.2}, {65.5, 30.6}, {70.40000000000001, 39.1}, {73.59999999999999, 47.4}, {76.0, 56.1}, {77.59999999999999, 63.8}, {80.0, 80.0}}, {0, 0, 0}, LinePattern.Solid, 0.25, {Arrow.None, Arrow.None}, 3, Smooth.None), Text(true, {0.0, 0.0}, 0, {192, 192, 192}, {0, 0, 0}, LinePattern.Solid, FillPattern.None, 0.25, {{-90, 72}, {-18, 24}}, "tan", 0, {-1, -1, -1}, "", {}, TextAlignment.Center)}}
 // Evaluating: getErrorString()
 // ""
 // Evaluating: getDiagramAnnotation(Modelica.Math.tan)
-// {-100.0,-100.0,100.0,100.0,true,0.1,2.0,2.0,{Text(true, {0.0, 0.0}, 0, {0, 0, 255}, {0, 0, 0}, LinePattern.Solid, FillPattern.None, 0.25, {{-37, -72}, {-17, -88}}, "-5.8", 0, {-1, -1, -1}, TextAlignment.Center), Text(true, {0.0, 0.0}, 0, {0, 0, 255}, {0, 0, 0}, LinePattern.Solid, FillPattern.None, 0.25, {{-33, 86}, {-13, 70}}, " 5.8", 0, {-1, -1, -1}, TextAlignment.Center), Text(true, {0.0, 0.0}, 0, {0, 0, 255}, {0, 0, 0}, LinePattern.Solid, FillPattern.None, 0.25, {{68, -13}, {88, -33}}, "1.4", 0, {-1, -1, -1}, TextAlignment.Center), Line(true, {0.0, 0.0}, 0, {{-100, 0}, {84, 0}}, {95, 95, 95}, LinePattern.Solid, 0.25, {Arrow.None, Arrow.None}, 3, Smooth.None), Polygon(true, {0.0, 0.0}, 0, {95, 95, 95}, {95, 95, 95}, LinePattern.Solid, FillPattern.Solid, 0.25, {{98, 0}, {82, 6}, {82, -6}, {98, 0}}, Smooth.None), Line(true, {0.0, 0.0}, 0, {{-80.0, -80.0}, {-78.40000000000001, -68.40000000000001}, {-76.8, -59.7}, {-74.40000000000001, -50.0}, {-71.2, -40.9}, {-67.09999999999999, -33.0}, {-60.7, -24.8}, {-51.1, -17.2}, {-35.8, -9.98}, {-4.42, -1.07}, {33.4, 9.119999999999999}, {49.4, 16.2}, {59.1, 23.2}, {65.5, 30.6}, {70.40000000000001, 39.1}, {73.59999999999999, 47.4}, {76.0, 56.1}, {77.59999999999999, 63.8}, {80.0, 80.0}}, {0, 0, 255}, LinePattern.Solid, 0.5, {Arrow.None, Arrow.None}, 3, Smooth.None), Text(true, {0.0, 0.0}, 0, {95, 95, 95}, {0, 0, 0}, LinePattern.Solid, FillPattern.None, 0.25, {{82, 22}, {102, 2}}, "u", 0, {-1, -1, -1}, TextAlignment.Center), Line(true, {0.0, 0.0}, 0, {{0, 80}, {86, 80}}, {175, 175, 175}, LinePattern.Solid, 0.25, {Arrow.None, Arrow.None}, 3, Smooth.None), Line(true, {0.0, 0.0}, 0, {{80, 88}, {80, -16}}, {175, 175, 175}, LinePattern.Solid, 0.25, {Arrow.None, Arrow.None}, 3, Smooth.None)}}
+// {-100.0,-100.0,100.0,100.0,true,0.1,2.0,2.0,{Text(true, {0.0, 0.0}, 0, {0, 0, 255}, {0, 0, 0}, LinePattern.Solid, FillPattern.None, 0.25, {{-37, -72}, {-17, -88}}, "-5.8", 0, {-1, -1, -1}, "", {}, TextAlignment.Center), Text(true, {0.0, 0.0}, 0, {0, 0, 255}, {0, 0, 0}, LinePattern.Solid, FillPattern.None, 0.25, {{-33, 86}, {-13, 70}}, " 5.8", 0, {-1, -1, -1}, "", {}, TextAlignment.Center), Text(true, {0.0, 0.0}, 0, {0, 0, 255}, {0, 0, 0}, LinePattern.Solid, FillPattern.None, 0.25, {{68, -13}, {88, -33}}, "1.4", 0, {-1, -1, -1}, "", {}, TextAlignment.Center), Line(true, {0.0, 0.0}, 0, {{-100, 0}, {84, 0}}, {95, 95, 95}, LinePattern.Solid, 0.25, {Arrow.None, Arrow.None}, 3, Smooth.None), Polygon(true, {0.0, 0.0}, 0, {95, 95, 95}, {95, 95, 95}, LinePattern.Solid, FillPattern.Solid, 0.25, {{98, 0}, {82, 6}, {82, -6}, {98, 0}}, Smooth.None), Line(true, {0.0, 0.0}, 0, {{-80.0, -80.0}, {-78.40000000000001, -68.40000000000001}, {-76.8, -59.7}, {-74.40000000000001, -50.0}, {-71.2, -40.9}, {-67.09999999999999, -33.0}, {-60.7, -24.8}, {-51.1, -17.2}, {-35.8, -9.98}, {-4.42, -1.07}, {33.4, 9.119999999999999}, {49.4, 16.2}, {59.1, 23.2}, {65.5, 30.6}, {70.40000000000001, 39.1}, {73.59999999999999, 47.4}, {76.0, 56.1}, {77.59999999999999, 63.8}, {80.0, 80.0}}, {0, 0, 255}, LinePattern.Solid, 0.5, {Arrow.None, Arrow.None}, 3, Smooth.None), Text(true, {0.0, 0.0}, 0, {95, 95, 95}, {0, 0, 0}, LinePattern.Solid, FillPattern.None, 0.25, {{82, 22}, {102, 2}}, "u", 0, {-1, -1, -1}, "", {}, TextAlignment.Center), Line(true, {0.0, 0.0}, 0, {{0, 80}, {86, 80}}, {175, 175, 175}, LinePattern.Solid, 0.25, {Arrow.None, Arrow.None}, 3, Smooth.None), Line(true, {0.0, 0.0}, 0, {{80, 88}, {80, -16}}, {175, 175, 175}, LinePattern.Solid, 0.25, {Arrow.None, Arrow.None}, 3, Smooth.None)}}
 // Evaluating: getErrorString()
 // ""
@@ -25515 +25515 @@
 // ""
 // Evaluating: getIconAnnotation(Modelica.Math.asin)
-// {-100.0,-100.0,100.0,100.0,true,0.1,2.0,2.0,{Line(true, {0.0, 0.0}, 0, {{-90, 0}, {68, 0}}, {192, 192, 192}, LinePattern.Solid, 0.25, {Arrow.None, Arrow.None}, 3, Smooth.None), Polygon(true, {0.0, 0.0}, 0, {192, 192, 192}, {192, 192, 192}, LinePattern.Solid, FillPattern.Solid, 0.25, {{90, 0}, {68, 8}, {68, -8}, {90, 0}}, Smooth.None), Line(true, {0.0, 0.0}, 0, {{-80.0, -80.0}, {-79.2, -72.8}, {-77.59999999999999, -67.5}, {-73.59999999999999, -59.4}, {-66.3, -49.8}, {-53.5, -37.3}, {-30.2, -19.7}, {37.4, 24.8}, {57.5, 40.8}, {68.7, 52.7}, {75.2, 62.2}, {77.59999999999999, 67.5}, {80.0, 80.0}}, {0, 0, 0}, LinePattern.Solid, 0.25, {Arrow.None, Arrow.None}, 3, Smooth.None), Text(true, {0.0, 0.0}, 0, {192, 192, 192}, {0, 0, 0}, LinePattern.Solid, FillPattern.None, 0.25, {{-88, 78}, {-16, 30}}, "asin", 0, {-1, -1, -1}, TextAlignment.Center)}}
+// {-100.0,-100.0,100.0,100.0,true,0.1,2.0,2.0,{Line(true, {0.0, 0.0}, 0, {{-90, 0}, {68, 0}}, {192, 192, 192}, LinePattern.Solid, 0.25, {Arrow.None, Arrow.None}, 3, Smooth.None), Polygon(true, {0.0, 0.0}, 0, {192, 192, 192}, {192, 192, 192}, LinePattern.Solid, FillPattern.Solid, 0.25, {{90, 0}, {68, 8}, {68, -8}, {90, 0}}, Smooth.None), Line(true, {0.0, 0.0}, 0, {{-80.0, -80.0}, {-79.2, -72.8}, {-77.59999999999999, -67.5}, {-73.59999999999999, -59.4}, {-66.3, -49.8}, {-53.5, -37.3}, {-30.2, -19.7}, {37.4, 24.8}, {57.5, 40.8}, {68.7, 52.7}, {75.2, 62.2}, {77.59999999999999, 67.5}, {80.0, 80.0}}, {0, 0, 0}, LinePattern.Solid, 0.25, {Arrow.None, Arrow.None}, 3, Smooth.None), Text(true, {0.0, 0.0}, 0, {192, 192, 192}, {0, 0, 0}, LinePattern.Solid, FillPattern.None, 0.25, {{-88, 78}, {-16, 30}}, "asin", 0, {-1, -1, -1}, "", {}, TextAlignment.Center)}}
 // Evaluating: getErrorString()
 // ""
 // Evaluating: getDiagramAnnotation(Modelica.Math.asin)
-// {-100.0,-100.0,100.0,100.0,true,0.1,2.0,2.0,{Text(true, {0.0, 0.0}, 0, {0, 0, 255}, {0, 0, 0}, LinePattern.Solid, FillPattern.None, 0.25, {{-40, -72}, {-15, -88}}, "-pi/2", 0, {-1, -1, -1}, TextAlignment.Center), Text(true, {0.0, 0.0}, 0, {0, 0, 255}, {0, 0, 0}, LinePattern.Solid, FillPattern.None, 0.25, {{-38, 88}, {-13, 72}}, " pi/2", 0, {-1, -1, -1}, TextAlignment.Center), Text(true, {0.0, 0.0}, 0, {0, 0, 255}, {0, 0, 0}, LinePattern.Solid, FillPattern.None, 0.25, {{68, -9}, {88, -29}}, "+1", 0, {-1, -1, -1}, TextAlignment.Center), Text(true, {0.0, 0.0}, 0, {0, 0, 255}, {0, 0, 0}, LinePattern.Solid, FillPattern.None, 0.25, {{-90, 21}, {-70, 1}}, "-1", 0, {-1, -1, -1}, TextAlignment.Center), Line(true, {0.0, 0.0}, 0, {{-100, 0}, {84, 0}}, {95, 95, 95}, LinePattern.Solid, 0.25, {Arrow.None, Arrow.None}, 3, Smooth.None), Polygon(true, {0.0, 0.0}, 0, {95, 95, 95}, {95, 95, 95}, LinePattern.Solid, FillPattern.Solid, 0.25, {{98, 0}, {82, 6}, {82, -6}, {98, 0}}, Smooth.None), Line(true, {0.0, 0.0}, 0, {{-80.0, -80.0}, {-79.2, -72.8}, {-77.59999999999999, -67.5}, {-73.59999999999999, -59.4}, {-66.3, -49.8}, {-53.5, -37.3}, {-30.2, -19.7}, {37.4, 24.8}, {57.5, 40.8}, {68.7, 52.7}, {75.2, 62.2}, {77.59999999999999, 67.5}, {80.0, 80.0}}, {0, 0, 255}, LinePattern.Solid, 0.5, {Arrow.None, Arrow.None}, 3, Smooth.None), Text(true, {0.0, 0.0}, 0, {95, 95, 95}, {0, 0, 0}, LinePattern.Solid, FillPattern.None, 0.25, {{82, 24}, {102, 4}}, "u", 0, {-1, -1, -1}, TextAlignment.Center), Line(true, {0.0, 0.0}, 0, {{0, 80}, {86, 80}}, {175, 175, 175}, LinePattern.Solid, 0.25, {Arrow.None, Arrow.None}, 3, Smooth.None), Line(true, {0.0, 0.0}, 0, {{80, 86}, {80, -10}}, {175, 175, 175}, LinePattern.Solid, 0.25, {Arrow.None, Arrow.None}, 3, Smooth.None)}}
+// {-100.0,-100.0,100.0,100.0,true,0.1,2.0,2.0,{Text(true, {0.0, 0.0}, 0, {0, 0, 255}, {0, 0, 0}, LinePattern.Solid, FillPattern.None, 0.25, {{-40, -72}, {-15, -88}}, "-pi/2", 0, {-1, -1, -1}, "", {}, TextAlignment.Center), Text(true, {0.0, 0.0}, 0, {0, 0, 255}, {0, 0, 0}, LinePattern.Solid, FillPattern.None, 0.25, {{-38, 88}, {-13, 72}}, " pi/2", 0, {-1, -1, -1}, "", {}, TextAlignment.Center), Text(true, {0.0, 0.0}, 0, {0, 0, 255}, {0, 0, 0}, LinePattern.Solid, FillPattern.None, 0.25, {{68, -9}, {88, -29}}, "+1", 0, {-1, -1, -1}, "", {}, TextAlignment.Center), Text(true, {0.0, 0.0}, 0, {0, 0, 255}, {0, 0, 0}, LinePattern.Solid, FillPattern.None, 0.25, {{-90, 21}, {-70, 1}}, "-1", 0, {-1, -1, -1}, "", {}, TextAlignment.Center), Line(true, {0.0, 0.0}, 0, {{-100, 0}, {84, 0}}, {95, 95, 95}, LinePattern.Solid, 0.25, {Arrow.None, Arrow.None}, 3, Smooth.None), Polygon(true, {0.0, 0.0}, 0, {95, 95, 95}, {95, 95, 95}, LinePattern.Solid, FillPattern.Solid, 0.25, {{98, 0}, {82, 6}, {82, -6}, {98, 0}}, Smooth.None), Line(true, {0.0, 0.0}, 0, {{-80.0, -80.0}, {-79.2, -72.8}, {-77.59999999999999, -67.5}, {-73.59999999999999, -59.4}, {-66.3, -49.8}, {-53.5, -37.3}, {-30.2, -19.7}, {37.4, 24.8}, {57.5, 40.8}, {68.7, 52.7}, {75.2, 62.2}, {77.59999999999999, 67.5}, {80.0, 80.0}}, {0, 0, 255}, LinePattern.Solid, 0.5, {Arrow.None, Arrow.None}, 3, Smooth.None), Text(true, {0.0, 0.0}, 0, {95, 95, 95}, {0, 0, 0}, LinePattern.Solid, FillPattern.None, 0.25, {{82, 24}, {102, 4}}, "u", 0, {-1, -1, -1}, "", {}, TextAlignment.Center), Line(true, {0.0, 0.0}, 0, {{0, 80}, {86, 80}}, {175, 175, 175}, LinePattern.Solid, 0.25, {Arrow.None, Arrow.None}, 3, Smooth.None), Line(true, {0.0, 0.0}, 0, {{80, 86}, {80, -10}}, {175, 175, 175}, LinePattern.Solid, 0.25, {Arrow.None, Arrow.None}, 3, Smooth.None)}}
 // Evaluating: getErrorString()
 // ""
@@ -25535 +25535 @@
 // ""
 // Evaluating: getIconAnnotation(Modelica.Math.acos)
-// {-100.0,-100.0,100.0,100.0,true,0.1,2.0,2.0,{Line(true, {0.0, 0.0}, 0, {{-90, -80}, {68, -80}}, {192, 192, 192}, LinePattern.Solid, 0.25, {Arrow.None, Arrow.None}, 3, Smooth.None), Polygon(true, {0.0, 0.0}, 0, {192, 192, 192}, {192, 192, 192}, LinePattern.Solid, FillPattern.Solid, 0.25, {{90, -80}, {68, -72}, {68, -88}, {90, -80}}, Smooth.None), Line(true, {0.0, 0.0}, 0, {{-80.0, 80.0}, {-79.2, 72.8}, {-77.59999999999999, 67.5}, {-73.59999999999999, 59.4}, {-66.3, 49.8}, {-53.5, 37.3}, {-30.2, 19.7}, {37.4, -24.8}, {57.5, -40.8}, {68.7, -52.7}, {75.2, -62.2}, {77.59999999999999, -67.5}, {80.0, -80.0}}, {0, 0, 0}, LinePattern.Solid, 0.25, {Arrow.None, Arrow.None}, 3, Smooth.None), Text(true, {0.0, 0.0}, 0, {192, 192, 192}, {0, 0, 0}, LinePattern.Solid, FillPattern.None, 0.25, {{-86, -14}, {-14, -62}}, "acos", 0, {-1, -1, -1}, TextAlignment.Center)}}
+// {-100.0,-100.0,100.0,100.0,true,0.1,2.0,2.0,{Line(true, {0.0, 0.0}, 0, {{-90, -80}, {68, -80}}, {192, 192, 192}, LinePattern.Solid, 0.25, {Arrow.None, Arrow.None}, 3, Smooth.None), Polygon(true, {0.0, 0.0}, 0, {192, 192, 192}, {192, 192, 192}, LinePattern.Solid, FillPattern.Solid, 0.25, {{90, -80}, {68, -72}, {68, -88}, {90, -80}}, Smooth.None), Line(true, {0.0, 0.0}, 0, {{-80.0, 80.0}, {-79.2, 72.8}, {-77.59999999999999, 67.5}, {-73.59999999999999, 59.4}, {-66.3, 49.8}, {-53.5, 37.3}, {-30.2, 19.7}, {37.4, -24.8}, {57.5, -40.8}, {68.7, -52.7}, {75.2, -62.2}, {77.59999999999999, -67.5}, {80.0, -80.0}}, {0, 0, 0}, LinePattern.Solid, 0.25, {Arrow.None, Arrow.None}, 3, Smooth.None), Text(true, {0.0, 0.0}, 0, {192, 192, 192}, {0, 0, 0}, LinePattern.Solid, FillPattern.None, 0.25, {{-86, -14}, {-14, -62}}, "acos", 0, {-1, -1, -1}, "", {}, TextAlignment.Center)}}
 // Evaluating: getErrorString()
 // ""
 // Evaluating: getDiagramAnnotation(Modelica.Math.acos)
-// {-100.0,-100.0,100.0,100.0,true,0.1,2.0,2.0,{Line(true, {0.0, 0.0}, 0, {{-100, -80}, {84, -80}}, {95, 95, 95}, LinePattern.Solid, 0.25, {Arrow.None, Arrow.None}, 3, Smooth.None), Polygon(true, {0.0, 0.0}, 0, {95, 95, 95}, {95, 95, 95}, LinePattern.Solid, FillPattern.Solid, 0.25, {{98, -80}, {82, -74}, {82, -86}, {98, -80}}, Smooth.None), Line(true, {0.0, 0.0}, 0, {{-80.0, 80.0}, {-79.2, 72.8}, {-77.59999999999999, 67.5}, {-73.59999999999999, 59.4}, {-66.3, 49.8}, {-53.5, 37.3}, {-30.2, 19.7}, {37.4, -24.8}, {57.5, -40.8}, {68.7, -52.7}, {75.2, -62.2}, {77.59999999999999, -67.5}, {80.0, -80.0}}, {0, 0, 255}, LinePattern.Solid, 0.5, {Arrow.None, Arrow.None}, 3, Smooth.None), Text(true, {0.0, 0.0}, 0, {0, 0, 255}, {0, 0, 0}, LinePattern.Solid, FillPattern.None, 0.25, {{-30, 88}, {-5, 72}}, " pi", 0, {-1, -1, -1}, TextAlignment.Center), Text(true, {0.0, 0.0}, 0, {0, 0, 255}, {0, 0, 0}, LinePattern.Solid, FillPattern.None, 0.25, {{-94, -57}, {-74, -77}}, "-1", 0, {-1, -1, -1}, TextAlignment.Center), Text(true, {0.0, 0.0}, 0, {0, 0, 255}, {0, 0, 0}, LinePattern.Solid, FillPattern.None, 0.25, {{60, -81}, {80, -101}}, "+1", 0, {-1, -1, -1}, TextAlignment.Center), Text(true, {0.0, 0.0}, 0, {95, 95, 95}, {0, 0, 0}, LinePattern.Solid, FillPattern.None, 0.25, {{82, -56}, {102, -76}}, "u", 0, {-1, -1, -1}, TextAlignment.Center), Line(true, {0.0, 0.0}, 0, {{-2, 80}, {84, 80}}, {175, 175, 175}, LinePattern.Solid, 0.25, {Arrow.None, Arrow.None}, 3, Smooth.None), Line(true, {0.0, 0.0}, 0, {{80, 82}, {80, -86}}, {175, 175, 175}, LinePattern.Solid, 0.25, {Arrow.None, Arrow.None}, 3, Smooth.None)}}
+// {-100.0,-100.0,100.0,100.0,true,0.1,2.0,2.0,{Line(true, {0.0, 0.0}, 0, {{-100, -80}, {84, -80}}, {95, 95, 95}, LinePattern.Solid, 0.25, {Arrow.None, Arrow.None}, 3, Smooth.None), Polygon(true, {0.0, 0.0}, 0, {95, 95, 95}, {95, 95, 95}, LinePattern.Solid, FillPattern.Solid, 0.25, {{98, -80}, {82, -74}, {82, -86}, {98, -80}}, Smooth.None), Line(true, {0.0, 0.0}, 0, {{-80.0, 80.0}, {-79.2, 72.8}, {-77.59999999999999, 67.5}, {-73.59999999999999, 59.4}, {-66.3, 49.8}, {-53.5, 37.3}, {-30.2, 19.7}, {37.4, -24.8}, {57.5, -40.8}, {68.7, -52.7}, {75.2, -62.2}, {77.59999999999999, -67.5}, {80.0, -80.0}}, {0, 0, 255}, LinePattern.Solid, 0.5, {Arrow.None, Arrow.None}, 3, Smooth.None), Text(true, {0.0, 0.0}, 0, {0, 0, 255}, {0, 0, 0}, LinePattern.Solid, FillPattern.None, 0.25, {{-30, 88}, {-5, 72}}, " pi", 0, {-1, -1, -1}, "", {}, TextAlignment.Center), Text(true, {0.0, 0.0}, 0, {0, 0, 255}, {0, 0, 0}, LinePattern.Solid, FillPattern.None, 0.25, {{-94, -57}, {-74, -77}}, "-1", 0, {-1, -1, -1}, "", {}, TextAlignment.Center), Text(true, {0.0, 0.0}, 0, {0, 0, 255}, {0, 0, 0}, LinePattern.Solid, FillPattern.None, 0.25, {{60, -81}, {80, -101}}, "+1", 0, {-1, -1, -1}, "", {}, TextAlignment.Center), Text(true, {0.0, 0.0}, 0, {95, 95, 95}, {0, 0, 0}, LinePattern.Solid, FillPattern.None, 0.25, {{82, -56}, {102, -76}}, "u", 0, {-1, -1, -1}, "", {}, TextAlignment.Center), Line(true, {0.0, 0.0}, 0, {{-2, 80}, {84, 80}}, {175, 175, 175}, LinePattern.Solid, 0.25, {Arrow.None, Arrow.None}, 3, Smooth.None), Line(true, {0.0, 0.0}, 0, {{80, 82}, {80, -86}}, {175, 175, 175}, LinePattern.Solid, 0.25, {Arrow.None, Arrow.None}, 3, Smooth.None)}}
 // Evaluating: getErrorString()
 // ""
@@ -25555 +25555 @@
 // ""
 // Evaluating: getIconAnnotation(Modelica.Math.atan)
-// {-100.0,-100.0,100.0,100.0,true,0.1,1.0,1.0,{Line(true, {0.0, 0.0}, 0, {{-90, 0}, {68, 0}}, {192, 192, 192}, LinePattern.Solid, 0.25, {Arrow.None, Arrow.None}, 3, Smooth.None), Polygon(true, {0.0, 0.0}, 0, {192, 192, 192}, {192, 192, 192}, LinePattern.Solid, FillPattern.Solid, 0.25, {{90, 0}, {68, 8}, {68, -8}, {90, 0}}, Smooth.None), Line(true, {0.0, 0.0}, 0, {{-80.0, -80.0}, {-52.7, -75.2}, {-37.4, -69.7}, {-26.9, -63.0}, {-19.7, -55.2}, {-14.1, -45.8}, {-10.1, -36.4}, {-6.03, -23.9}, {-1.21, -5.06}, {5.23, 21.0}, {9.25, 34.1}, {13.3, 44.2}, {18.1, 52.9}, {24.5, 60.8}, {33.4, 67.59999999999999}, {47.0, 73.59999999999999}, {69.5, 78.59999999999999}, {80.0, 80.0}}, {0, 0, 0}, LinePattern.Solid, 0.25, {Arrow.None, Arrow.None}, 3, Smooth.None), Text(true, {0.0, 0.0}, 0, {192, 192, 192}, {0, 0, 0}, LinePattern.Solid, FillPattern.None, 0.25, {{-86, 68}, {-14, 20}}, "atan", 0, {-1, -1, -1}, TextAlignment.Center)}}
+// {-100.0,-100.0,100.0,100.0,true,0.1,1.0,1.0,{Line(true, {0.0, 0.0}, 0, {{-90, 0}, {68, 0}}, {192, 192, 192}, LinePattern.Solid, 0.25, {Arrow.None, Arrow.None}, 3, Smooth.None), Polygon(true, {0.0, 0.0}, 0, {192, 192, 192}, {192, 192, 192}, LinePattern.Solid, FillPattern.Solid, 0.25, {{90, 0}, {68, 8}, {68, -8}, {90, 0}}, Smooth.None), Line(true, {0.0, 0.0}, 0, {{-80.0, -80.0}, {-52.7, -75.2}, {-37.4, -69.7}, {-26.9, -63.0}, {-19.7, -55.2}, {-14.1, -45.8}, {-10.1, -36.4}, {-6.03, -23.9}, {-1.21, -5.06}, {5.23, 21.0}, {9.25, 34.1}, {13.3, 44.2}, {18.1, 52.9}, {24.5, 60.8}, {33.4, 67.59999999999999}, {47.0, 73.59999999999999}, {69.5, 78.59999999999999}, {80.0, 80.0}}, {0, 0, 0}, LinePattern.Solid, 0.25, {Arrow.None, Arrow.None}, 3, Smooth.None), Text(true, {0.0, 0.0}, 0, {192, 192, 192}, {0, 0, 0}, LinePattern.Solid, FillPattern.None, 0.25, {{-86, 68}, {-14, 20}}, "atan", 0, {-1, -1, -1}, "", {}, TextAlignment.Center)}}
 // Evaluating: getErrorString()
 // ""
 // Evaluating: getDiagramAnnotation(Modelica.Math.atan)
-// {-100.0,-100.0,100.0,100.0,true,0.1,1.0,1.0,{Line(true, {0.0, 0.0}, 0, {{-100, 0}, {84, 0}}, {95, 95, 95}, LinePattern.Solid, 0.25, {Arrow.None, Arrow.None}, 3, Smooth.None), Polygon(true, {0.0, 0.0}, 0, {95, 95, 95}, {95, 95, 95}, LinePattern.Solid, FillPattern.Solid, 0.25, {{96, 0}, {80, 6}, {80, -6}, {96, 0}}, Smooth.None), Line(true, {0.0, 0.0}, 0, {{-80.0, -80.0}, {-52.7, -75.2}, {-37.4, -69.7}, {-26.9, -63.0}, {-19.7, -55.2}, {-14.1, -45.8}, {-10.1, -36.4}, {-6.03, -23.9}, {-1.21, -5.06}, {5.23, 21.0}, {9.25, 34.1}, {13.3, 44.2}, {18.1, 52.9}, {24.5, 60.8}, {33.4, 67.59999999999999}, {47.0, 73.59999999999999}, {65.0, 77.0}, {80.0, 78.0}}, {0, 0, 255}, LinePattern.Solid, 0.5, {Arrow.None, Arrow.None}, 3, Smooth.None), Text(true, {0.0, 0.0}, 0, {0, 0, 255}, {0, 0, 0}, LinePattern.Solid, FillPattern.None, 0.25, {{-34, 87}, {-14, 74}}, "pi/2", 0, {-1, -1, -1}, TextAlignment.Center), Text(true, {0.0, 0.0}, 0, {0, 0, 255}, {0, 0, 0}, LinePattern.Solid, FillPattern.None, 0.25, {{-32, -71}, {-12, -91}}, "-pi/2", 0, {-1, -1, -1}, TextAlignment.Center), Text(true, {0.0, 0.0}, 0, {95, 95, 95}, {0, 0, 0}, LinePattern.Solid, FillPattern.None, 0.25, {{84, -4}, {104, -24}}, "u", 0, {-1, -1, -1}, TextAlignment.Center), Line(true, {0.0, 0.0}, 0, {{-2, 80}, {84, 80}}, {175, 175, 175}, LinePattern.Solid, 0.25, {Arrow.None, Arrow.None}, 3, Smooth.None)}}
+// {-100.0,-100.0,100.0,100.0,true,0.1,1.0,1.0,{Line(true, {0.0, 0.0}, 0, {{-100, 0}, {84, 0}}, {95, 95, 95}, LinePattern.Solid, 0.25, {Arrow.None, Arrow.None}, 3, Smooth.None), Polygon(true, {0.0, 0.0}, 0, {95, 95, 95}, {95, 95, 95}, LinePattern.Solid, FillPattern.Solid, 0.25, {{96, 0}, {80, 6}, {80, -6}, {96, 0}}, Smooth.None), Line(true, {0.0, 0.0}, 0, {{-80.0, -80.0}, {-52.7, -75.2}, {-37.4, -69.7}, {-26.9, -63.0}, {-19.7, -55.2}, {-14.1, -45.8}, {-10.1, -36.4}, {-6.03, -23.9}, {-1.21, -5.06}, {5.23, 21.0}, {9.25, 34.1}, {13.3, 44.2}, {18.1, 52.9}, {24.5, 60.8}, {33.4, 67.59999999999999}, {47.0, 73.59999999999999}, {65.0, 77.0}, {80.0, 78.0}}, {0, 0, 255}, LinePattern.Solid, 0.5, {Arrow.None, Arrow.None}, 3, Smooth.None), Text(true, {0.0, 0.0}, 0, {0, 0, 255}, {0, 0, 0}, LinePattern.Solid, FillPattern.None, 0.25, {{-34, 87}, {-14, 74}}, "pi/2", 0, {-1, -1, -1}, "", {}, TextAlignment.Center), Text(true, {0.0, 0.0}, 0, {0, 0, 255}, {0, 0, 0}, LinePattern.Solid, FillPattern.None, 0.25, {{-32, -71}, {-12, -91}}, "-pi/2", 0, {-1, -1, -1}, "", {}, TextAlignment.Center), Text(true, {0.0, 0.0}, 0, {95, 95, 95}, {0, 0, 0}, LinePattern.Solid, FillPattern.None, 0.25, {{84, -4}, {104, -24}}, "u", 0, {-1, -1, -1}, "", {}, TextAlignment.Center), Line(true, {0.0, 0.0}, 0, {{-2, 80}, {84, 80}}, {175, 175, 175}, LinePattern.Solid, 0.25, {Arrow.None, Arrow.None}, 3, Smooth.None)}}
 // Evaluating: getErrorString()
 // ""
@@ -25575 +25575 @@
 // ""
 // Evaluating: getIconAnnotation(Modelica.Math.atan2)
-// {-100.0,-100.0,100.0,100.0,true,0.1,2.0,2.0,{Line(true, {0.0, 0.0}, 0, {{-90, 0}, {68, 0}}, {192, 192, 192}, LinePattern.Solid, 0.25, {Arrow.None, Arrow.None}, 3, Smooth.None), Polygon(true, {0.0, 0.0}, 0, {192, 192, 192}, {192, 192, 192}, LinePattern.Solid, FillPattern.Solid, 0.25, {{90, 0}, {68, 8}, {68, -8}, {90, 0}}, Smooth.None), Line(true, {0.0, 0.0}, 0, {{0.0, -80.0}, {8.93, -67.2}, {17.1, -59.3}, {27.3, -53.6}, {42.1, -49.4}, {69.90000000000001, -45.8}, {80.0, -45.1}}, {0, 0, 0}, LinePattern.Solid, 0.25, {Arrow.None, Arrow.None}, 3, Smooth.None), Line(true, {0.0, 0.0}, 0, {{-80.0, -34.9}, {-46.1, -31.4}, {-29.4, -27.1}, {-18.3, -21.5}, {-10.3, -14.5}, {-2.03, -3.17}, {7.97, 11.6}, {15.5, 19.4}, {24.3, 25.0}, {39.0, 30.0}, {62.1, 33.5}, {80.0, 34.9}}, {0, 0, 0}, LinePattern.Solid, 0.25, {Arrow.None, Arrow.None}, 3, Smooth.None), Line(true, {0.0, 0.0}, 0, {{-80.0, 45.1}, {-45.9, 48.7}, {-29.1, 52.9}, {-18.1, 58.6}, {-10.2, 65.8}, {-1.82, 77.2}, {0.0, 80.0}}, {0, 0, 0}, LinePattern.Solid, 0.25, {Arrow.None, Arrow.None}, 3, Smooth.None), Text(true, {0.0, 0.0}, 0, {192, 192, 192}, {0, 0, 0}, LinePattern.Solid, FillPattern.None, 0.25, {{-90, -46}, {-18, -94}}, "atan2", 0, {-1, -1, -1}, TextAlignment.Center)}}
+// {-100.0,-100.0,100.0,100.0,true,0.1,2.0,2.0,{Line(true, {0.0, 0.0}, 0, {{-90, 0}, {68, 0}}, {192, 192, 192}, LinePattern.Solid, 0.25, {Arrow.None, Arrow.None}, 3, Smooth.None), Polygon(true, {0.0, 0.0}, 0, {192, 192, 192}, {192, 192, 192}, LinePattern.Solid, FillPattern.Solid, 0.25, {{90, 0}, {68, 8}, {68, -8}, {90, 0}}, Smooth.None), Line(true, {0.0, 0.0}, 0, {{0.0, -80.0}, {8.93, -67.2}, {17.1, -59.3}, {27.3, -53.6}, {42.1, -49.4}, {69.90000000000001, -45.8}, {80.0, -45.1}}, {0, 0, 0}, LinePattern.Solid, 0.25, {Arrow.None, Arrow.None}, 3, Smooth.None), Line(true, {0.0, 0.0}, 0, {{-80.0, -34.9}, {-46.1, -31.4}, {-29.4, -27.1}, {-18.3, -21.5}, {-10.3, -14.5}, {-2.03, -3.17}, {7.97, 11.6}, {15.5, 19.4}, {24.3, 25.0}, {39.0, 30.0}, {62.1, 33.5}, {80.0, 34.9}}, {0, 0, 0}, LinePattern.Solid, 0.25, {Arrow.None, Arrow.None}, 3, Smooth.None), Line(true, {0.0, 0.0}, 0, {{-80.0, 45.1}, {-45.9, 48.7}, {-29.1, 52.9}, {-18.1, 58.6}, {-10.2, 65.8}, {-1.82, 77.2}, {0.0, 80.0}}, {0, 0, 0}, LinePattern.Solid, 0.25, {Arrow.None, Arrow.None}, 3, Smooth.None), Text(true, {0.0, 0.0}, 0, {192, 192, 192}, {0, 0, 0}, LinePattern.Solid, FillPattern.None, 0.25, {{-90, -46}, {-18, -94}}, "atan2", 0, {-1, -1, -1}, "", {}, TextAlignment.Center)}}
 // Evaluating: getErrorString()
 // ""
 // Evaluating: getDiagramAnnotation(Modelica.Math.atan2)
-// {-100.0,-100.0,100.0,100.0,true,0.1,2.0,2.0,{Line(true, {0.0, 0.0}, 0, {{-100, 0}, {84, 0}}, {95, 95, 95}, LinePattern.Solid, 0.25, {Arrow.None, Arrow.None}, 3, Smooth.None), Polygon(true, {0.0, 0.0}, 0, {95, 95, 95}, {95, 95, 95}, LinePattern.Solid, FillPattern.Solid, 0.25, {{96, 0}, {80, 6}, {80, -6}, {96, 0}}, Smooth.None), Line(true, {0.0, 0.0}, 0, {{0.0, -80.0}, {8.93, -67.2}, {17.1, -59.3}, {27.3, -53.6}, {42.1, -49.4}, {69.90000000000001, -45.8}, {80.0, -45.1}}, {0, 0, 255}, LinePattern.Solid, 0.5, {Arrow.None, Arrow.None}, 3, Smooth.None), Line(true, {0.0, 0.0}, 0, {{-80.0, -34.9}, {-46.1, -31.4}, {-29.4, -27.1}, {-18.3, -21.5}, {-10.3, -14.5}, {-2.03, -3.17}, {7.97, 11.6}, {15.5, 19.4}, {24.3, 25.0}, {39.0, 30.0}, {62.1, 33.5}, {80.0, 34.9}}, {0, 0, 255}, LinePattern.Solid, 0.5, {Arrow.None, Arrow.None}, 3, Smooth.None), Line(true, {0.0, 0.0}, 0, {{-80.0, 45.1}, {-45.9, 48.7}, {-29.1, 52.9}, {-18.1, 58.6}, {-10.2, 65.8}, {-1.82, 77.2}, {0.0, 80.0}}, {0, 0, 255}, LinePattern.Solid, 0.5, {Arrow.None, Arrow.None}, 3, Smooth.None), Text(true, {0.0, 0.0}, 0, {0, 0, 255}, {0, 0, 0}, LinePattern.Solid, FillPattern.None, 0.25, {{-32, 89}, {-10, 74}}, "pi", 0, {-1, -1, -1}, TextAlignment.Center), Text(true, {0.0, 0.0}, 0, {0, 0, 255}, {0, 0, 0}, LinePattern.Solid, FillPattern.None, 0.25, {{-32, -72}, {-4, -88}}, "-pi", 0, {-1, -1, -1}, TextAlignment.Center), Text(true, {0.0, 0.0}, 0, {0, 0, 255}, {0, 0, 0}, LinePattern.Solid, FillPattern.None, 0.25, {{0, 55}, {20, 42}}, "pi/2", 0, {-1, -1, -1}, TextAlignment.Center), Line(true, {0.0, 0.0}, 0, {{0, 40}, {-8, 40}}, {192, 192, 192}, LinePattern.Solid, 0.25, {Arrow.None, Arrow.None}, 3, Smooth.None), Line(true, {0.0, 0.0}, 0, {{0, -40}, {-8, -40}}, {192, 192, 192}, LinePattern.Solid, 0.25, {Arrow.None, Arrow.None}, 3, Smooth.None), Text(true, {0.0, 0.0}, 0, {0, 0, 255}, {0, 0, 0}, LinePattern.Solid, FillPattern.None, 0.25, {{0, -23}, {20, -42}}, "-pi/2", 0, {-1, -1, -1}, TextAlignment.Center), Text(true, {0.0, 0.0}, 0, {95, 95, 95}, {0, 0, 0}, LinePattern.Solid, FillPattern.None, 0.25, {{62, -4}, {94, -26}}, "u1, u2", 0, {-1, -1, -1}, TextAlignment.Center), Line(true, {0.0, 0.0}, 0, {{-88, 40}, {86, 40}}, {175, 175, 175}, LinePattern.Solid, 0.25, {Arrow.None, Arrow.None}, 3, Smooth.None), Line(true, {0.0, 0.0}, 0, {{-86, -40}, {86, -40}}, {175, 175, 175}, LinePattern.Solid, 0.25, {Arrow.None, Arrow.None}, 3, Smooth.None)}}
+// {-100.0,-100.0,100.0,100.0,true,0.1,2.0,2.0,{Line(true, {0.0, 0.0}, 0, {{-100, 0}, {84, 0}}, {95, 95, 95}, LinePattern.Solid, 0.25, {Arrow.None, Arrow.None}, 3, Smooth.None), Polygon(true, {0.0, 0.0}, 0, {95, 95, 95}, {95, 95, 95}, LinePattern.Solid, FillPattern.Solid, 0.25, {{96, 0}, {80, 6}, {80, -6}, {96, 0}}, Smooth.None), Line(true, {0.0, 0.0}, 0, {{0.0, -80.0}, {8.93, -67.2}, {17.1, -59.3}, {27.3, -53.6}, {42.1, -49.4}, {69.90000000000001, -45.8}, {80.0, -45.1}}, {0, 0, 255}, LinePattern.Solid, 0.5, {Arrow.None, Arrow.None}, 3, Smooth.None), Line(true, {0.0, 0.0}, 0, {{-80.0, -34.9}, {-46.1, -31.4}, {-29.4, -27.1}, {-18.3, -21.5}, {-10.3, -14.5}, {-2.03, -3.17}, {7.97, 11.6}, {15.5, 19.4}, {24.3, 25.0}, {39.0, 30.0}, {62.1, 33.5}, {80.0, 34.9}}, {0, 0, 255}, LinePattern.Solid, 0.5, {Arrow.None, Arrow.None}, 3, Smooth.None), Line(true, {0.0, 0.0}, 0, {{-80.0, 45.1}, {-45.9, 48.7}, {-29.1, 52.9}, {-18.1, 58.6}, {-10.2, 65.8}, {-1.82, 77.2}, {0.0, 80.0}}, {0, 0, 255}, LinePattern.Solid, 0.5, {Arrow.None, Arrow.None}, 3, Smooth.None), Text(true, {0.0, 0.0}, 0, {0, 0, 255}, {0, 0, 0}, LinePattern.Solid, FillPattern.None, 0.25, {{-32, 89}, {-10, 74}}, "pi", 0, {-1, -1, -1}, "", {}, TextAlignment.Center), Text(true, {0.0, 0.0}, 0, {0, 0, 255}, {0, 0, 0}, LinePattern.Solid, FillPattern.None, 0.25, {{-32, -72}, {-4, -88}}, "-pi", 0, {-1, -1, -1}, "", {}, TextAlignment.Center), Text(true, {0.0, 0.0}, 0, {0, 0, 255}, {0, 0, 0}, LinePattern.Solid, FillPattern.None, 0.25, {{0, 55}, {20, 42}}, "pi/2", 0, {-1, -1, -1}, "", {}, TextAlignment.Center), Line(true, {0.0, 0.0}, 0, {{0, 40}, {-8, 40}}, {192, 192, 192}, LinePattern.Solid, 0.25, {Arrow.None, Arrow.None}, 3, Smooth.None), Line(true, {0.0, 0.0}, 0, {{0, -40}, {-8, -40}}, {192, 192, 192}, LinePattern.Solid, 0.25, {Arrow.None, Arrow.None}, 3, Smooth.None), Text(true, {0.0, 0.0}, 0, {0, 0, 255}, {0, 0, 0}, LinePattern.Solid, FillPattern.None, 0.25, {{0, -23}, {20, -42}}, "-pi/2", 0, {-1, -1, -1}, "", {}, TextAlignment.Center), Text(true, {0.0, 0.0}, 0, {95, 95, 95}, {0, 0, 0}, LinePattern.Solid, FillPattern.None, 0.25, {{62, -4}, {94, -26}}, "u1, u2", 0, {-1, -1, -1}, "", {}, TextAlignment.Center), Line(true, {0.0, 0.0}, 0, {{-88, 40}, {86, 40}}, {175, 175, 175}, LinePattern.Solid, 0.25, {Arrow.None, Arrow.None}, 3, Smooth.None), Line(true, {0.0, 0.0}, 0, {{-86, -40}, {86, -40}}, {175, 175, 175}, LinePattern.Solid, 0.25, {Arrow.None, Arrow.None}, 3, Smooth.None)}}
 // Evaluating: getErrorString()
 // ""
@@ -25599 +25599 @@
 // ""
 // Evaluating: getIconAnnotation(Modelica.Math.sinh)
-// {-100.0,-100.0,100.0,100.0,true,0.1,2.0,2.0,{Line(true, {0.0, 0.0}, 0, {{-90, 0}, {68, 0}}, {192, 192, 192}, LinePattern.Solid, 0.25, {Arrow.None, Arrow.None}, 3, Smooth.None), Polygon(true, {0.0, 0.0}, 0, {192, 192, 192}, {192, 192, 192}, LinePattern.Solid, FillPattern.Solid, 0.25, {{90, 0}, {68, 8}, {68, -8}, {90, 0}}, Smooth.None), Line(true, {0.0, 0.0}, 0, {{-80.0, -80.0}, {-76.0, -65.40000000000001}, {-71.2, -51.4}, {-65.5, -38.8}, {-59.1, -28.1}, {-51.1, -18.7}, {-41.4, -11.4}, {-27.7, -5.5}, {-4.42, -0.653}, {24.5, 4.57}, {39.0, 10.1}, {49.4, 17.2}, {57.5, 25.9}, {63.9, 35.8}, {69.5, 47.4}, {74.40000000000001, 60.4}, {78.40000000000001, 73.8}, {80.0, 80.0}}, {0, 0, 0}, LinePattern.Solid, 0.25, {Arrow.None, Arrow.None}, 3, Smooth.None), Text(true, {0.0, 0.0}, 0, {192, 192, 192}, {0, 0, 0}, LinePattern.Solid, FillPattern.None, 0.25, {{-88, 80}, {-16, 32}}, "sinh", 0, {-1, -1, -1}, TextAlignment.Center)}}
+// {-100.0,-100.0,100.0,100.0,true,0.1,2.0,2.0,{Line(true, {0.0, 0.0}, 0, {{-90, 0}, {68, 0}}, {192, 192, 192}, LinePattern.Solid, 0.25, {Arrow.None, Arrow.None}, 3, Smooth.None), Polygon(true, {0.0, 0.0}, 0, {192, 192, 192}, {192, 192, 192}, LinePattern.Solid, FillPattern.Solid, 0.25, {{90, 0}, {68, 8}, {68, -8}, {90, 0}}, Smooth.None), Line(true, {0.0, 0.0}, 0, {{-80.0, -80.0}, {-76.0, -65.40000000000001}, {-71.2, -51.4}, {-65.5, -38.8}, {-59.1, -28.1}, {-51.1, -18.7}, {-41.4, -11.4}, {-27.7, -5.5}, {-4.42, -0.653}, {24.5, 4.57}, {39.0, 10.1}, {49.4, 17.2}, {57.5, 25.9}, {63.9, 35.8}, {69.5, 47.4}, {74.40000000000001, 60.4}, {78.40000000000001, 73.8}, {80.0, 80.0}}, {0, 0, 0}, LinePattern.Solid, 0.25, {Arrow.None, Arrow.None}, 3, Smooth.None), Text(true, {0.0, 0.0}, 0, {192, 192, 192}, {0, 0, 0}, LinePattern.Solid, FillPattern.None, 0.25, {{-88, 80}, {-16, 32}}, "sinh", 0, {-1, -1, -1}, "", {}, TextAlignment.Center)}}
 // Evaluating: getErrorString()
 // ""
 // Evaluating: getDiagramAnnotation(Modelica.Math.sinh)
-// {-100.0,-100.0,100.0,100.0,true,0.1,2.0,2.0,{Line(true, {0.0, 0.0}, 0, {{-100, 0}, {84, 0}}, {95, 95, 95}, LinePattern.Solid, 0.25, {Arrow.None, Arrow.None}, 3, Smooth.None), Polygon(true, {0.0, 0.0}, 0, {95, 95, 95}, {95, 95, 95}, LinePattern.Solid, FillPattern.Solid, 0.25, {{98, 0}, {82, 6}, {82, -6}, {98, 0}}, Smooth.None), Line(true, {0.0, 0.0}, 0, {{-80.0, -80.0}, {-76.0, -65.40000000000001}, {-71.2, -51.4}, {-65.5, -38.8}, {-59.1, -28.1}, {-51.1, -18.7}, {-41.4, -11.4}, {-27.7, -5.5}, {-4.42, -0.653}, {24.5, 4.57}, {39.0, 10.1}, {49.4, 17.2}, {57.5, 25.9}, {63.9, 35.8}, {69.5, 47.4}, {74.40000000000001, 60.4}, {78.40000000000001, 73.8}, {80.0, 80.0}}, {0, 0, 255}, LinePattern.Solid, 0.5, {Arrow.None, Arrow.None}, 3, Smooth.None), Text(true, {0.0, 0.0}, 0, {0, 0, 255}, {0, 0, 0}, LinePattern.Solid, FillPattern.None, 0.25, {{-31, 72}, {-11, 88}}, "27", 0, {-1, -1, -1}, TextAlignment.Center), Text(true, {0.0, 0.0}, 0, {0, 0, 255}, {0, 0, 0}, LinePattern.Solid, FillPattern.None, 0.25, {{-35, -88}, {-15, -72}}, "-27", 0, {-1, -1, -1}, TextAlignment.Center), Text(true, {0.0, 0.0}, 0, {0, 0, 255}, {0, 0, 0}, LinePattern.Solid, FillPattern.None, 0.25, {{68, -7}, {88, -27}}, "4", 0, {-1, -1, -1}, TextAlignment.Center), Text(true, {0.0, 0.0}, 0, {0, 0, 255}, {0, 0, 0}, LinePattern.Solid, FillPattern.None, 0.25, {{-98, 21}, {-78, 1}}, "-4", 0, {-1, -1, -1}, TextAlignment.Center), Text(true, {0.0, 0.0}, 0, {95, 95, 95}, {0, 0, 0}, LinePattern.Solid, FillPattern.None, 0.25, {{80, 26}, {100, 6}}, "u", 0, {-1, -1, -1}, TextAlignment.Center), Line(true, {0.0, 0.0}, 0, {{0, 80}, {86, 80}}, {175, 175, 175}, LinePattern.Solid, 0.25, {Arrow.None, Arrow.None}, 3, Smooth.None), Line(true, {0.0, 0.0}, 0, {{80, 84}, {80, -6}}, {175, 175, 175}, LinePattern.Solid, 0.25, {Arrow.None, Arrow.None}, 3, Smooth.None)}}
+// {-100.0,-100.0,100.0,100.0,true,0.1,2.0,2.0,{Line(true, {0.0, 0.0}, 0, {{-100, 0}, {84, 0}}, {95, 95, 95}, LinePattern.Solid, 0.25, {Arrow.None, Arrow.None}, 3, Smooth.None), Polygon(true, {0.0, 0.0}, 0, {95, 95, 95}, {95, 95, 95}, LinePattern.Solid, FillPattern.Solid, 0.25, {{98, 0}, {82, 6}, {82, -6}, {98, 0}}, Smooth.None), Line(true, {0.0, 0.0}, 0, {{-80.0, -80.0}, {-76.0, -65.40000000000001}, {-71.2, -51.4}, {-65.5, -38.8}, {-59.1, -28.1}, {-51.1, -18.7}, {-41.4, -11.4}, {-27.7, -5.5}, {-4.42, -0.653}, {24.5, 4.57}, {39.0, 10.1}, {49.4, 17.2}, {57.5, 25.9}, {63.9, 35.8}, {69.5, 47.4}, {74.40000000000001, 60.4}, {78.40000000000001, 73.8}, {80.0, 80.0}}, {0, 0, 255}, LinePattern.Solid, 0.5, {Arrow.None, Arrow.None}, 3, Smooth.None), Text(true, {0.0, 0.0}, 0, {0, 0, 255}, {0, 0, 0}, LinePattern.Solid, FillPattern.None, 0.25, {{-31, 72}, {-11, 88}}, "27", 0, {-1, -1, -1}, "", {}, TextAlignment.Center), Text(true, {0.0, 0.0}, 0, {0, 0, 255}, {0, 0, 0}, LinePattern.Solid, FillPattern.None, 0.25, {{-35, -88}, {-15, -72}}, "-27", 0, {-1, -1, -1}, "", {}, TextAlignment.Center), Text(true, {0.0, 0.0}, 0, {0, 0, 255}, {0, 0, 0}, LinePattern.Solid, FillPattern.None, 0.25, {{68, -7}, {88, -27}}, "4", 0, {-1, -1, -1}, "", {}, TextAlignment.Center), Text(true, {0.0, 0.0}, 0, {0, 0, 255}, {0, 0, 0}, LinePattern.Solid, FillPattern.None, 0.25, {{-98, 21}, {-78, 1}}, "-4", 0, {-1, -1, -1}, "", {}, TextAlignment.Center), Text(true, {0.0, 0.0}, 0, {95, 95, 95}, {0, 0, 0}, LinePattern.Solid, FillPattern.None, 0.25, {{80, 26}, {100, 6}}, "u", 0, {-1, -1, -1}, "", {}, TextAlignment.Center), Line(true, {0.0, 0.0}, 0, {{0, 80}, {86, 80}}, {175, 175, 175}, LinePattern.Solid, 0.25, {Arrow.None, Arrow.None}, 3, Smooth.None), Line(true, {0.0, 0.0}, 0, {{80, 84}, {80, -6}}, {175, 175, 175}, LinePattern.Solid, 0.25, {Arrow.None, Arrow.None}, 3, Smooth.None)}}
 // Evaluating: getErrorString()
 // ""
@@ -25619 +25619 @@
 // ""
 // Evaluating: getIconAnnotation(Modelica.Math.cosh)
-// {-100.0,-100.0,100.0,100.0,true,0.1,2.0,2.0,{Line(true, {0.0, 0.0}, 0, {{-90.0, -86.083}, {68.0, -86.083}}, {192, 192, 192}, LinePattern.Solid, 0.25, {Arrow.None, Arrow.None}, 3, Smooth.None), Polygon(true, {0.0, 0.0}, 0, {192, 192, 192}, {192, 192, 192}, LinePattern.Solid, FillPattern.Solid, 0.25, {{90.0, -86.083}, {68.0, -78.083}, {68.0, -94.083}, {90.0, -86.083}}, Smooth.None), Line(true, {0.0, 0.0}, 0, {{-80.0, 80.0}, {-77.59999999999999, 61.1}, {-74.40000000000001, 39.3}, {-71.2, 20.7}, {-67.09999999999999, 1.29}, {-63.1, -14.6}, {-58.3, -29.8}, {-52.7, -43.5}, {-46.2, -55.1}, {-39.0, -64.3}, {-30.2, -71.7}, {-18.9, -77.09999999999999}, {-4.42, -79.90000000000001}, {10.9, -79.09999999999999}, {23.7, -75.2}, {34.2, -68.7}, {42.2, -60.6}, {48.6, -51.2}, {54.3, -40.0}, {59.1, -27.5}, {63.1, -14.6}, {67.09999999999999, 1.29}, {71.2, 20.7}, {74.40000000000001, 39.3}, {77.59999999999999, 61.1}, {80.0, 80.0}}, {0, 0, 0}, LinePattern.Solid, 0.25, {Arrow.None, Arrow.None}, 3, Smooth.None), Text(true, {0.0, 0.0}, 0, {192, 192, 192}, {0, 0, 0}, LinePattern.Solid, FillPattern.None, 0.25, {{4, 66}, {66, 20}}, "cosh", 0, {-1, -1, -1}, TextAlignment.Center)}}
+// {-100.0,-100.0,100.0,100.0,true,0.1,2.0,2.0,{Line(true, {0.0, 0.0}, 0, {{-90.0, -86.083}, {68.0, -86.083}}, {192, 192, 192}, LinePattern.Solid, 0.25, {Arrow.None, Arrow.None}, 3, Smooth.None), Polygon(true, {0.0, 0.0}, 0, {192, 192, 192}, {192, 192, 192}, LinePattern.Solid, FillPattern.Solid, 0.25, {{90.0, -86.083}, {68.0, -78.083}, {68.0, -94.083}, {90.0, -86.083}}, Smooth.None), Line(true, {0.0, 0.0}, 0, {{-80.0, 80.0}, {-77.59999999999999, 61.1}, {-74.40000000000001, 39.3}, {-71.2, 20.7}, {-67.09999999999999, 1.29}, {-63.1, -14.6}, {-58.3, -29.8}, {-52.7, -43.5}, {-46.2, -55.1}, {-39.0, -64.3}, {-30.2, -71.7}, {-18.9, -77.09999999999999}, {-4.42, -79.90000000000001}, {10.9, -79.09999999999999}, {23.7, -75.2}, {34.2, -68.7}, {42.2, -60.6}, {48.6, -51.2}, {54.3, -40.0}, {59.1, -27.5}, {63.1, -14.6}, {67.09999999999999, 1.29}, {71.2, 20.7}, {74.40000000000001, 39.3}, {77.59999999999999, 61.1}, {80.0, 80.0}}, {0, 0, 0}, LinePattern.Solid, 0.25, {Arrow.None, Arrow.None}, 3, Smooth.None), Text(true, {0.0, 0.0}, 0, {192, 192, 192}, {0, 0, 0}, LinePattern.Solid, FillPattern.None, 0.25, {{4, 66}, {66, 20}}, "cosh", 0, {-1, -1, -1}, "", {}, TextAlignment.Center)}}
 // Evaluating: getErrorString()
 // ""
 // Evaluating: getDiagramAnnotation(Modelica.Math.cosh)
-// {-100.0,-100.0,100.0,100.0,true,0.1,2.0,2.0,{Line(true, {0.0, 0.0}, 0, {{-100.0, -84.083}, {84.0, -84.083}}, {95, 95, 95}, LinePattern.Solid, 0.25, {Arrow.None, Arrow.None}, 3, Smooth.None), Polygon(true, {0.0, 0.0}, 0, {95, 95, 95}, {95, 95, 95}, LinePattern.Solid, FillPattern.Solid, 0.25, {{98.0, -84.083}, {82.0, -78.083}, {82.0, -90.083}, {98.0, -84.083}}, Smooth.None), Line(true, {0.0, 0.0}, 0, {{-80.0, 80.0}, {-77.59999999999999, 61.1}, {-74.40000000000001, 39.3}, {-71.2, 20.7}, {-67.09999999999999, 1.29}, {-63.1, -14.6}, {-58.3, -29.8}, {-52.7, -43.5}, {-46.2, -55.1}, {-39.0, -64.3}, {-30.2, -71.7}, {-18.9, -77.09999999999999}, {-4.42, -79.90000000000001}, {10.9, -79.09999999999999}, {23.7, -75.2}, {34.2, -68.7}, {42.2, -60.6}, {48.6, -51.2}, {54.3, -40.0}, {59.1, -27.5}, {63.1, -14.6}, {67.09999999999999, 1.29}, {71.2, 20.7}, {74.40000000000001, 39.3}, {77.59999999999999, 61.1}, {80.0, 80.0}}, {0, 0, 255}, LinePattern.Solid, 0.5, {Arrow.None, Arrow.None}, 3, Smooth.None), Text(true, {0.0, 0.0}, 0, {0, 0, 255}, {0, 0, 0}, LinePattern.Solid, FillPattern.None, 0.25, {{-31, 72}, {-11, 88}}, "27", 0, {-1, -1, -1}, TextAlignment.Center), Text(true, {0.0, 0.0}, 0, {0, 0, 255}, {0, 0, 0}, LinePattern.Solid, FillPattern.None, 0.25, {{64, -83}, {84, -103}}, "4", 0, {-1, -1, -1}, TextAlignment.Center), Text(true, {0.0, 0.0}, 0, {0, 0, 255}, {0, 0, 0}, LinePattern.Solid, FillPattern.None, 0.25, {{-94, -63}, {-74, -83}}, "-4", 0, {-1, -1, -1}, TextAlignment.Center), Text(true, {0.0, 0.0}, 0, {95, 95, 95}, {0, 0, 0}, LinePattern.Solid, FillPattern.None, 0.25, {{80, -60}, {100, -80}}, "u", 0, {-1, -1, -1}, TextAlignment.Center), Line(true, {0.0, 0.0}, 0, {{0, 80}, {88, 80}}, {175, 175, 175}, LinePattern.Solid, 0.25, {Arrow.None, Arrow.None}, 3, Smooth.None), Line(true, {0.0, 0.0}, 0, {{80, 84}, {80, -90}}, {175, 175, 175}, LinePattern.Solid, 0.25, {Arrow.None, Arrow.None}, 3, Smooth.None)}}
+// {-100.0,-100.0,100.0,100.0,true,0.1,2.0,2.0,{Line(true, {0.0, 0.0}, 0, {{-100.0, -84.083}, {84.0, -84.083}}, {95, 95, 95}, LinePattern.Solid, 0.25, {Arrow.None, Arrow.None}, 3, Smooth.None), Polygon(true, {0.0, 0.0}, 0, {95, 95, 95}, {95, 95, 95}, LinePattern.Solid, FillPattern.Solid, 0.25, {{98.0, -84.083}, {82.0, -78.083}, {82.0, -90.083}, {98.0, -84.083}}, Smooth.None), Line(true, {0.0, 0.0}, 0, {{-80.0, 80.0}, {-77.59999999999999, 61.1}, {-74.40000000000001, 39.3}, {-71.2, 20.7}, {-67.09999999999999, 1.29}, {-63.1, -14.6}, {-58.3, -29.8}, {-52.7, -43.5}, {-46.2, -55.1}, {-39.0, -64.3}, {-30.2, -71.7}, {-18.9, -77.09999999999999}, {-4.42, -79.90000000000001}, {10.9, -79.09999999999999}, {23.7, -75.2}, {34.2, -68.7}, {42.2, -60.6}, {48.6, -51.2}, {54.3, -40.0}, {59.1, -27.5}, {63.1, -14.6}, {67.09999999999999, 1.29}, {71.2, 20.7}, {74.40000000000001, 39.3}, {77.59999999999999, 61.1}, {80.0, 80.0}}, {0, 0, 255}, LinePattern.Solid, 0.5, {Arrow.None, Arrow.None}, 3, Smooth.None), Text(true, {0.0, 0.0}, 0, {0, 0, 255}, {0, 0, 0}, LinePattern.Solid, FillPattern.None, 0.25, {{-31, 72}, {-11, 88}}, "27", 0, {-1, -1, -1}, "", {}, TextAlignment.Center), Text(true, {0.0, 0.0}, 0, {0, 0, 255}, {0, 0, 0}, LinePattern.Solid, FillPattern.None, 0.25, {{64, -83}, {84, -103}}, "4", 0, {-1, -1, -1}, "", {}, TextAlignment.Center), Text(true, {0.0, 0.0}, 0, {0, 0, 255}, {0, 0, 0}, LinePattern.Solid, FillPattern.None, 0.25, {{-94, -63}, {-74, -83}}, "-4", 0, {-1, -1, -1}, "", {}, TextAlignment.Center), Text(true, {0.0, 0.0}, 0, {95, 95, 95}, {0, 0, 0}, LinePattern.Solid, FillPattern.None, 0.25, {{80, -60}, {100, -80}}, "u", 0, {-1, -1, -1}, "", {}, TextAlignment.Center), Line(true, {0.0, 0.0}, 0, {{0, 80}, {88, 80}}, {175, 175, 175}, LinePattern.Solid, 0.25, {Arrow.None, Arrow.None}, 3, Smooth.None), Line(true, {0.0, 0.0}, 0, {{80, 84}, {80, -90}}, {175, 175, 175}, LinePattern.Solid, 0.25, {Arrow.None, Arrow.None}, 3, Smooth.None)}}
 // Evaluating: getErrorString()
 // ""
@@ -25639 +25639 @@
 // ""
 // Evaluating: getIconAnnotation(Modelica.Math.tanh)
-// {-100.0,-100.0,100.0,100.0,true,0.1,0.5,0.5,{Line(true, {0.0, 0.0}, 0, {{-90, 0}, {68, 0}}, {192, 192, 192}, LinePattern.Solid, 0.25, {Arrow.None, Arrow.None}, 3, Smooth.None), Polygon(true, {0.0, 0.0}, 0, {192, 192, 192}, {192, 192, 192}, LinePattern.Solid, FillPattern.Solid, 0.25, {{90, 0}, {68, 8}, {68, -8}, {90, 0}}, Smooth.None), Line(true, {0.0, 0.0}, 0, {{-80.0, -80.0}, {-47.8, -78.7}, {-35.8, -75.7}, {-27.7, -70.59999999999999}, {-22.1, -64.2}, {-17.3, -55.9}, {-12.5, -44.3}, {-7.64, -29.2}, {-1.21, -4.82}, {6.83, 26.3}, {11.7, 42.0}, {16.5, 54.2}, {21.3, 63.1}, {26.9, 69.90000000000001}, {34.2, 75.0}, {45.4, 78.40000000000001}, {72.0, 79.90000000000001}, {80.0, 80.0}}, {0, 0, 0}, LinePattern.Solid, 0.25, {Arrow.None, Arrow.None}, 3, Smooth.None), Text(true, {0.0, 0.0}, 0, {192, 192, 192}, {0, 0, 0}, LinePattern.Solid, FillPattern.None, 0.25, {{-88, 72}, {-16, 24}}, "tanh", 0, {-1, -1, -1}, TextAlignment.Center)}}
+// {-100.0,-100.0,100.0,100.0,true,0.1,0.5,0.5,{Line(true, {0.0, 0.0}, 0, {{-90, 0}, {68, 0}}, {192, 192, 192}, LinePattern.Solid, 0.25, {Arrow.None, Arrow.None}, 3, Smooth.None), Polygon(true, {0.0, 0.0}, 0, {192, 192, 192}, {192, 192, 192}, LinePattern.Solid, FillPattern.Solid, 0.25, {{90, 0}, {68, 8}, {68, -8}, {90, 0}}, Smooth.None), Line(true, {0.0, 0.0}, 0, {{-80.0, -80.0}, {-47.8, -78.7}, {-35.8, -75.7}, {-27.7, -70.59999999999999}, {-22.1, -64.2}, {-17.3, -55.9}, {-12.5, -44.3}, {-7.64, -29.2}, {-1.21, -4.82}, {6.83, 26.3}, {11.7, 42.0}, {16.5, 54.2}, {21.3, 63.1}, {26.9, 69.90000000000001}, {34.2, 75.0}, {45.4, 78.40000000000001}, {72.0, 79.90000000000001}, {80.0, 80.0}}, {0, 0, 0}, LinePattern.Solid, 0.25, {Arrow.None, Arrow.None}, 3, Smooth.None), Text(true, {0.0, 0.0}, 0, {192, 192, 192}, {0, 0, 0}, LinePattern.Solid, FillPattern.None, 0.25, {{-88, 72}, {-16, 24}}, "tanh", 0, {-1, -1, -1}, "", {}, TextAlignment.Center)}}
 // Evaluating: getErrorString()
 // ""
 // Evaluating: getDiagramAnnotation(Modelica.Math.tanh)
-// {-100.0,-100.0,100.0,100.0,true,0.1,0.5,0.5,{Line(true, {0.0, 0.0}, 0, {{-100, 0}, {84, 0}}, {95, 95, 95}, LinePattern.Solid, 0.25, {Arrow.None, Arrow.None}, 3, Smooth.None), Polygon(true, {0.0, 0.0}, 0, {95, 95, 95}, {95, 95, 95}, LinePattern.Solid, FillPattern.Solid, 0.25, {{96, 0}, {80, 6}, {80, -6}, {96, 0}}, Smooth.None), Line(true, {0.0, 0.0}, 0, {{-80.0, -80.5}, {-47.8, -79.2}, {-35.8, -76.2}, {-27.7, -71.09999999999999}, {-22.1, -64.7}, {-17.3, -56.4}, {-12.5, -44.8}, {-7.64, -29.7}, {-1.21, -5.32}, {6.83, 25.8}, {11.7, 41.5}, {16.5, 53.7}, {21.3, 62.6}, {26.9, 69.40000000000001}, {34.2, 74.5}, {45.4, 77.90000000000001}, {72.0, 79.40000000000001}, {80.0, 79.5}}, {0, 0, 255}, LinePattern.Solid, 0.5, {Arrow.None, Arrow.None}, 3, Smooth.None), Text(true, {0.0, 0.0}, 0, {0, 0, 255}, {0, 0, 0}, LinePattern.Solid, FillPattern.None, 0.25, {{-29, 72}, {-9, 88}}, "1", 0, {-1, -1, -1}, TextAlignment.Center), Text(true, {0.0, 0.0}, 0, {0, 0, 255}, {0, 0, 0}, LinePattern.Solid, FillPattern.None, 0.25, {{3, -72}, {23, -88}}, "-1", 0, {-1, -1, -1}, TextAlignment.Center), Text(true, {0.0, 0.0}, 0, {95, 95, 95}, {0, 0, 0}, LinePattern.Solid, FillPattern.None, 0.25, {{82, -2}, {102, -22}}, "u", 0, {-1, -1, -1}, TextAlignment.Center), Line(true, {0.0, 0.0}, 0, {{0, 80}, {88, 80}}, {175, 175, 175}, LinePattern.Solid, 0.25, {Arrow.None, Arrow.None}, 3, Smooth.None)}}
+// {-100.0,-100.0,100.0,100.0,true,0.1,0.5,0.5,{Line(true, {0.0, 0.0}, 0, {{-100, 0}, {84, 0}}, {95, 95, 95}, LinePattern.Solid, 0.25, {Arrow.None, Arrow.None}, 3, Smooth.None), Polygon(true, {0.0, 0.0}, 0, {95, 95, 95}, {95, 95, 95}, LinePattern.Solid, FillPattern.Solid, 0.25, {{96, 0}, {80, 6}, {80, -6}, {96, 0}}, Smooth.None), Line(true, {0.0, 0.0}, 0, {{-80.0, -80.5}, {-47.8, -79.2}, {-35.8, -76.2}, {-27.7, -71.09999999999999}, {-22.1, -64.7}, {-17.3, -56.4}, {-12.5, -44.8}, {-7.64, -29.7}, {-1.21, -5.32}, {6.83, 25.8}, {11.7, 41.5}, {16.5, 53.7}, {21.3, 62.6}, {26.9, 69.40000000000001}, {34.2, 74.5}, {45.4, 77.90000000000001}, {72.0, 79.40000000000001}, {80.0, 79.5}}, {0, 0, 255}, LinePattern.Solid, 0.5, {Arrow.None, Arrow.None}, 3, Smooth.None), Text(true, {0.0, 0.0}, 0, {0, 0, 255}, {0, 0, 0}, LinePattern.Solid, FillPattern.None, 0.25, {{-29, 72}, {-9, 88}}, "1", 0, {-1, -1, -1}, "", {}, TextAlignment.Center), Text(true, {0.0, 0.0}, 0, {0, 0, 255}, {0, 0, 0}, LinePattern.Solid, FillPattern.None, 0.25, {{3, -72}, {23, -88}}, "-1", 0, {-1, -1, -1}, "", {}, TextAlignment.Center), Text(true, {0.0, 0.0}, 0, {95, 95, 95}, {0, 0, 0}, LinePattern.Solid, FillPattern.None, 0.25, {{82, -2}, {102, -22}}, "u", 0, {-1, -1, -1}, "", {}, TextAlignment.Center), Line(true, {0.0, 0.0}, 0, {{0, 80}, {88, 80}}, {175, 175, 175}, LinePattern.Solid, 0.25, {Arrow.None, Arrow.None}, 3, Smooth.None)}}
 // Evaluating: getErrorString()
 // ""
@@ -25659 +25659 @@
 // ""
 // Evaluating: getIconAnnotation(Modelica.Math.exp)
-// {-100.0,-100.0,100.0,100.0,true,0.1,2.0,2.0,{Line(true, {0.0, 0.0}, 0, {{-90.0, -80.3976}, {68.0, -80.3976}}, {192, 192, 192}, LinePattern.Solid, 0.25, {Arrow.None, Arrow.None}, 3, Smooth.None), Polygon(true, {0.0, 0.0}, 0, {192, 192, 192}, {192, 192, 192}, LinePattern.Solid, FillPattern.Solid, 0.25, {{90.0, -80.3976}, {68.0, -72.3976}, {68.0, -88.3976}, {90.0, -80.3976}}, Smooth.None), Line(true, {0.0, 0.0}, 0, {{-80.0, -80.0}, {-31.0, -77.90000000000001}, {-6.03, -74.0}, {10.9, -68.40000000000001}, {23.7, -61.0}, {34.2, -51.6}, {43.0, -40.3}, {50.3, -27.8}, {56.7, -13.5}, {62.3, 2.23}, {67.09999999999999, 18.6}, {72.0, 38.2}, {76.0, 57.6}, {80.0, 80.0}}, {0, 0, 0}, LinePattern.Solid, 0.25, {Arrow.None, Arrow.None}, 3, Smooth.None), Text(true, {0.0, 0.0}, 0, {192, 192, 192}, {0, 0, 0}, LinePattern.Solid, FillPattern.None, 0.25, {{-86, 50}, {-14, 2}}, "exp", 0, {-1, -1, -1}, TextAlignment.Center)}}
+// {-100.0,-100.0,100.0,100.0,true,0.1,2.0,2.0,{Line(true, {0.0, 0.0}, 0, {{-90.0, -80.3976}, {68.0, -80.3976}}, {192, 192, 192}, LinePattern.Solid, 0.25, {Arrow.None, Arrow.None}, 3, Smooth.None), Polygon(true, {0.0, 0.0}, 0, {192, 192, 192}, {192, 192, 192}, LinePattern.Solid, FillPattern.Solid, 0.25, {{90.0, -80.3976}, {68.0, -72.3976}, {68.0, -88.3976}, {90.0, -80.3976}}, Smooth.None), Line(true, {0.0, 0.0}, 0, {{-80.0, -80.0}, {-31.0, -77.90000000000001}, {-6.03, -74.0}, {10.9, -68.40000000000001}, {23.7, -61.0}, {34.2, -51.6}, {43.0, -40.3}, {50.3, -27.8}, {56.7, -13.5}, {62.3, 2.23}, {67.09999999999999, 18.6}, {72.0, 38.2}, {76.0, 57.6}, {80.0, 80.0}}, {0, 0, 0}, LinePattern.Solid, 0.25, {Arrow.None, Arrow.None}, 3, Smooth.None), Text(true, {0.0, 0.0}, 0, {192, 192, 192}, {0, 0, 0}, LinePattern.Solid, FillPattern.None, 0.25, {{-86, 50}, {-14, 2}}, "exp", 0, {-1, -1, -1}, "", {}, TextAlignment.Center)}}
 // Evaluating: getErrorString()
 // ""
 // Evaluating: getDiagramAnnotation(Modelica.Math.exp)
-// {-100.0,-100.0,100.0,100.0,true,0.1,2.0,2.0,{Line(true, {0.0, 0.0}, 0, {{-100.0, -80.3976}, {84.0, -80.3976}}, {95, 95, 95}, LinePattern.Solid, 0.25, {Arrow.None, Arrow.None}, 3, Smooth.None), Polygon(true, {0.0, 0.0}, 0, {95, 95, 95}, {95, 95, 95}, LinePattern.Solid, FillPattern.Solid, 0.25, {{98.0, -80.3976}, {82.0, -74.3976}, {82.0, -86.3976}, {98.0, -80.3976}}, Smooth.None), Line(true, {0.0, 0.0}, 0, {{-80.0, -80.0}, {-31.0, -77.90000000000001}, {-6.03, -74.0}, {10.9, -68.40000000000001}, {23.7, -61.0}, {34.2, -51.6}, {43.0, -40.3}, {50.3, -27.8}, {56.7, -13.5}, {62.3, 2.23}, {67.09999999999999, 18.6}, {72.0, 38.2}, {76.0, 57.6}, {80.0, 80.0}}, {0, 0, 255}, LinePattern.Solid, 0.5, {Arrow.None, Arrow.None}, 3, Smooth.None), Text(true, {0.0, 0.0}, 0, {0, 0, 255}, {0, 0, 0}, LinePattern.Solid, FillPattern.None, 0.25, {{-31, 72}, {-11, 88}}, "20", 0, {-1, -1, -1}, TextAlignment.Center), Text(true, {0.0, 0.0}, 0, {0, 0, 255}, {0, 0, 0}, LinePattern.Solid, FillPattern.None, 0.25, {{-92, -81}, {-72, -101}}, "-3", 0, {-1, -1, -1}, TextAlignment.Center), Text(true, {0.0, 0.0}, 0, {0, 0, 255}, {0, 0, 0}, LinePattern.Solid, FillPattern.None, 0.25, {{66, -81}, {86, -101}}, "3", 0, {-1, -1, -1}, TextAlignment.Center), Text(true, {0.0, 0.0}, 0, {0, 0, 255}, {0, 0, 0}, LinePattern.Solid, FillPattern.None, 0.25, {{2, -69}, {22, -89}}, "1", 0, {-1, -1, -1}, TextAlignment.Center), Text(true, {0.0, 0.0}, 0, {95, 95, 95}, {0, 0, 0}, LinePattern.Solid, FillPattern.None, 0.25, {{78, -54}, {98, -74}}, "u", 0, {-1, -1, -1}, TextAlignment.Center), Line(true, {0.0, 0.0}, 0, {{0, 80}, {88, 80}}, {175, 175, 175}, LinePattern.Solid, 0.25, {Arrow.None, Arrow.None}, 3, Smooth.None), Line(true, {0.0, 0.0}, 0, {{80, 84}, {80, -84}}, {175, 175, 175}, LinePattern.Solid, 0.25, {Arrow.None, Arrow.None}, 3, Smooth.None)}}
+// {-100.0,-100.0,100.0,100.0,true,0.1,2.0,2.0,{Line(true, {0.0, 0.0}, 0, {{-100.0, -80.3976}, {84.0, -80.3976}}, {95, 95, 95}, LinePattern.Solid, 0.25, {Arrow.None, Arrow.None}, 3, Smooth.None), Polygon(true, {0.0, 0.0}, 0, {95, 95, 95}, {95, 95, 95}, LinePattern.Solid, FillPattern.Solid, 0.25, {{98.0, -80.3976}, {82.0, -74.3976}, {82.0, -86.3976}, {98.0, -80.3976}}, Smooth.None), Line(true, {0.0, 0.0}, 0, {{-80.0, -80.0}, {-31.0, -77.90000000000001}, {-6.03, -74.0}, {10.9, -68.40000000000001}, {23.7, -61.0}, {34.2, -51.6}, {43.0, -40.3}, {50.3, -27.8}, {56.7, -13.5}, {62.3, 2.23}, {67.09999999999999, 18.6}, {72.0, 38.2}, {76.0, 57.6}, {80.0, 80.0}}, {0, 0, 255}, LinePattern.Solid, 0.5, {Arrow.None, Arrow.None}, 3, Smooth.None), Text(true, {0.0, 0.0}, 0, {0, 0, 255}, {0, 0, 0}, LinePattern.Solid, FillPattern.None, 0.25, {{-31, 72}, {-11, 88}}, "20", 0, {-1, -1, -1}, "", {}, TextAlignment.Center), Text(true, {0.0, 0.0}, 0, {0, 0, 255}, {0, 0, 0}, LinePattern.Solid, FillPattern.None, 0.25, {{-92, -81}, {-72, -101}}, "-3", 0, {-1, -1, -1}, "", {}, TextAlignment.Center), Text(true, {0.0, 0.0}, 0, {0, 0, 255}, {0, 0, 0}, LinePattern.Solid, FillPattern.None, 0.25, {{66, -81}, {86, -101}}, "3", 0, {-1, -1, -1}, "", {}, TextAlignment.Center), Text(true, {0.0, 0.0}, 0, {0, 0, 255}, {0, 0, 0}, LinePattern.Solid, FillPattern.None, 0.25, {{2, -69}, {22, -89}}, "1", 0, {-1, -1, -1}, "", {}, TextAlignment.Center), Text(true, {0.0, 0.0}, 0, {95, 95, 95}, {0, 0, 0}, LinePattern.Solid, FillPattern.None, 0.25, {{78, -54}, {98, -74}}, "u", 0, {-1, -1, -1}, "", {}, TextAlignment.Center), Line(true, {0.0, 0.0}, 0, {{0, 80}, {88, 80}}, {175, 175, 175}, LinePattern.Solid, 0.25, {Arrow.None, Arrow.None}, 3, Smooth.None), Line(true, {0.0, 0.0}, 0, {{80, 84}, {80, -84}}, {175, 175, 175}, LinePattern.Solid, 0.25, {Arrow.None, Arrow.None}, 3, Smooth.None)}}
 // Evaluating: getErrorString()
 // ""
@@ -25679 +25679 @@
 // ""
 // Evaluating: getIconAnnotation(Modelica.Math.log)
-// {-100.0,-100.0,100.0,100.0,true,0.1,2.0,2.0,{Line(true, {0.0, 0.0}, 0, {{-90, 0}, {68, 0}}, {192, 192, 192}, LinePattern.Solid, 0.25, {Arrow.None, Arrow.None}, 3, Smooth.None), Polygon(true, {0.0, 0.0}, 0, {192, 192, 192}, {192, 192, 192}, LinePattern.Solid, FillPattern.Solid, 0.25, {{90, 0}, {68, 8}, {68, -8}, {90, 0}}, Smooth.None), Line(true, {0.0, 0.0}, 0, {{-80.0, -80.0}, {-79.2, -50.6}, {-78.40000000000001, -37.0}, {-77.59999999999999, -28.0}, {-76.8, -21.3}, {-75.2, -11.4}, {-72.8, -1.31}, {-69.5, 8.08}, {-64.7, 17.9}, {-57.5, 28.0}, {-47.0, 38.1}, {-31.8, 48.1}, {-10.1, 58.0}, {22.1, 68.0}, {68.7, 78.09999999999999}, {80.0, 80.0}}, {0, 0, 0}, LinePattern.Solid, 0.25, {Arrow.None, Arrow.None}, 3, Smooth.None), Text(true, {0.0, 0.0}, 0, {192, 192, 192}, {0, 0, 0}, LinePattern.Solid, FillPattern.None, 0.25, {{-6, -24}, {66, -72}}, "log", 0, {-1, -1, -1}, TextAlignment.Center)}}
+// {-100.0,-100.0,100.0,100.0,true,0.1,2.0,2.0,{Line(true, {0.0, 0.0}, 0, {{-90, 0}, {68, 0}}, {192, 192, 192}, LinePattern.Solid, 0.25, {Arrow.None, Arrow.None}, 3, Smooth.None), Polygon(true, {0.0, 0.0}, 0, {192, 192, 192}, {192, 192, 192}, LinePattern.Solid, FillPattern.Solid, 0.25, {{90, 0}, {68, 8}, {68, -8}, {90, 0}}, Smooth.None), Line(true, {0.0, 0.0}, 0, {{-80.0, -80.0}, {-79.2, -50.6}, {-78.40000000000001, -37.0}, {-77.59999999999999, -28.0}, {-76.8, -21.3}, {-75.2, -11.4}, {-72.8, -1.31}, {-69.5, 8.08}, {-64.7, 17.9}, {-57.5, 28.0}, {-47.0, 38.1}, {-31.8, 48.1}, {-10.1, 58.0}, {22.1, 68.0}, {68.7, 78.09999999999999}, {80.0, 80.0}}, {0, 0, 0}, LinePattern.Solid, 0.25, {Arrow.None, Arrow.None}, 3, Smooth.None), Text(true, {0.0, 0.0}, 0, {192, 192, 192}, {0, 0, 0}, LinePattern.Solid, FillPattern.None, 0.25, {{-6, -24}, {66, -72}}, "log", 0, {-1, -1, -1}, "", {}, TextAlignment.Center)}}
 // Evaluating: getErrorString()
 // ""
 // Evaluating: getDiagramAnnotation(Modelica.Math.log)
-// {-100.0,-100.0,100.0,100.0,true,0.1,2.0,2.0,{Line(true, {0.0, 0.0}, 0, {{-100, 0}, {84, 0}}, {95, 95, 95}, LinePattern.Solid, 0.25, {Arrow.None, Arrow.None}, 3, Smooth.None), Polygon(true, {0.0, 0.0}, 0, {95, 95, 95}, {95, 95, 95}, LinePattern.Solid, FillPattern.Solid, 0.25, {{100, 0}, {84, 6}, {84, -6}, {100, 0}}, Smooth.None), Line(true, {0.0, 0.0}, 0, {{-78.0, -80.0}, {-77.2, -50.6}, {-76.40000000000001, -37.0}, {-75.59999999999999, -28.0}, {-74.8, -21.3}, {-73.2, -11.4}, {-70.8, -1.31}, {-67.5, 8.08}, {-62.7, 17.9}, {-55.5, 28.0}, {-45.0, 38.1}, {-29.8, 48.1}, {-8.1, 58.0}, {24.1, 68.0}, {70.7, 78.09999999999999}, {82.0, 80.0}}, {0, 0, 255}, LinePattern.Solid, 0.5, {Arrow.None, Arrow.None}, 3, Smooth.None), Text(true, {0.0, 0.0}, 0, {0, 0, 255}, {0, 0, 0}, LinePattern.Solid, FillPattern.None, 0.25, {{-105, 72}, {-85, 88}}, "3", 0, {-1, -1, -1}, TextAlignment.Center), Text(true, {0.0, 0.0}, 0, {0, 0, 255}, {0, 0, 0}, LinePattern.Solid, FillPattern.None, 0.25, {{60, -3}, {80, -23}}, "20", 0, {-1, -1, -1}, TextAlignment.Center), Text(true, {0.0, 0.0}, 0, {0, 0, 255}, {0, 0, 0}, LinePattern.Solid, FillPattern.None, 0.25, {{-78, -7}, {-58, -27}}, "1", 0, {-1, -1, -1}, TextAlignment.Center), Text(true, {0.0, 0.0}, 0, {95, 95, 95}, {0, 0, 0}, LinePattern.Solid, FillPattern.None, 0.25, {{84, 26}, {104, 6}}, "u", 0, {-1, -1, -1}, TextAlignment.Center), Text(true, {0.0, 0.0}, 0, {0, 0, 255}, {0, 0, 0}, LinePattern.Solid, FillPattern.None, 0.25, {{-100, 9}, {-80, -11}}, "0", 0, {-1, -1, -1}, TextAlignment.Center), Line(true, {0.0, 0.0}, 0, {{-80, 80}, {84, 80}}, {175, 175, 175}, LinePattern.Solid, 0.25, {Arrow.None, Arrow.None}, 3, Smooth.None), Line(true, {0.0, 0.0}, 0, {{82, 82}, {82, -6}}, {175, 175, 175}, LinePattern.Solid, 0.25, {Arrow.None, Arrow.None}, 3, Smooth.None)}}
+// {-100.0,-100.0,100.0,100.0,true,0.1,2.0,2.0,{Line(true, {0.0, 0.0}, 0, {{-100, 0}, {84, 0}}, {95, 95, 95}, LinePattern.Solid, 0.25, {Arrow.None, Arrow.None}, 3, Smooth.None), Polygon(true, {0.0, 0.0}, 0, {95, 95, 95}, {95, 95, 95}, LinePattern.Solid, FillPattern.Solid, 0.25, {{100, 0}, {84, 6}, {84, -6}, {100, 0}}, Smooth.None), Line(true, {0.0, 0.0}, 0, {{-78.0, -80.0}, {-77.2, -50.6}, {-76.40000000000001, -37.0}, {-75.59999999999999, -28.0}, {-74.8, -21.3}, {-73.2, -11.4}, {-70.8, -1.31}, {-67.5, 8.08}, {-62.7, 17.9}, {-55.5, 28.0}, {-45.0, 38.1}, {-29.8, 48.1}, {-8.1, 58.0}, {24.1, 68.0}, {70.7, 78.09999999999999}, {82.0, 80.0}}, {0, 0, 255}, LinePattern.Solid, 0.5, {Arrow.None, Arrow.None}, 3, Smooth.None), Text(true, {0.0, 0.0}, 0, {0, 0, 255}, {0, 0, 0}, LinePattern.Solid, FillPattern.None, 0.25, {{-105, 72}, {-85, 88}}, "3", 0, {-1, -1, -1}, "", {}, TextAlignment.Center), Text(true, {0.0, 0.0}, 0, {0, 0, 255}, {0, 0, 0}, LinePattern.Solid, FillPattern.None, 0.25, {{60, -3}, {80, -23}}, "20", 0, {-1, -1, -1}, "", {}, TextAlignment.Center), Text(true, {0.0, 0.0}, 0, {0, 0, 255}, {0, 0, 0}, LinePattern.Solid, FillPattern.None, 0.25, {{-78, -7}, {-58, -27}}, "1", 0, {-1, -1, -1}, "", {}, TextAlignment.Center), Text(true, {0.0, 0.0}, 0, {95, 95, 95}, {0, 0, 0}, LinePattern.Solid, FillPattern.None, 0.25, {{84, 26}, {104, 6}}, "u", 0, {-1, -1, -1}, "", {}, TextAlignment.Center), Text(true, {0.0, 0.0}, 0, {0, 0, 255}, {0, 0, 0}, LinePattern.Solid, FillPattern.None, 0.25, {{-100, 9}, {-80, -11}}, "0", 0, {-1, -1, -1}, "", {}, TextAlignment.Center), Line(true, {0.0, 0.0}, 0, {{-80, 80}, {84, 80}}, {175, 175, 175}, LinePattern.Solid, 0.25, {Arrow.None, Arrow.None}, 3, Smooth.None), Line(true, {0.0, 0.0}, 0, {{82, 82}, {82, -6}}, {175, 175, 175}, LinePattern.Solid, 0.25, {Arrow.None, Arrow.None}, 3, Smooth.None)}}
 // Evaluating: getErrorString()
 // ""
@@ -25700 +25700 @@
 // ""
 // Evaluating: getIconAnnotation(Modelica.Math.log10)
-// {-100.0,-100.0,100.0,100.0,true,0.1,2.0,2.0,{Line(true, {0.0, 0.0}, 0, {{-90, 0}, {68, 0}}, {192, 192, 192}, LinePattern.Solid, 0.25, {Arrow.None, Arrow.None}, 3, Smooth.None), Polygon(true, {0.0, 0.0}, 0, {192, 192, 192}, {192, 192, 192}, LinePattern.Solid, FillPattern.Solid, 0.25, {{90, 0}, {68, 8}, {68, -8}, {90, 0}}, Smooth.None), Line(true, {0.0, 0.0}, 0, {{-79.8, -80.0}, {-79.2, -50.6}, {-78.40000000000001, -37.0}, {-77.59999999999999, -28.0}, {-76.8, -21.3}, {-75.2, -11.4}, {-72.8, -1.31}, {-69.5, 8.08}, {-64.7, 17.9}, {-57.5, 28.0}, {-47.0, 38.1}, {-31.8, 48.1}, {-10.1, 58.0}, {22.1, 68.0}, {68.7, 78.09999999999999}, {80.0, 80.0}}, {0, 0, 0}, LinePattern.Solid, 0.25, {Arrow.None, Arrow.None}, 3, Smooth.None), Text(true, {0.0, 0.0}, 0, {192, 192, 192}, {0, 0, 0}, LinePattern.Solid, FillPattern.None, 0.25, {{-30, -22}, {60, -70}}, "log10", 0, {-1, -1, -1}, TextAlignment.Center)}}
+// {-100.0,-100.0,100.0,100.0,true,0.1,2.0,2.0,{Line(true, {0.0, 0.0}, 0, {{-90, 0}, {68, 0}}, {192, 192, 192}, LinePattern.Solid, 0.25, {Arrow.None, Arrow.None}, 3, Smooth.None), Polygon(true, {0.0, 0.0}, 0, {192, 192, 192}, {192, 192, 192}, LinePattern.Solid, FillPattern.Solid, 0.25, {{90, 0}, {68, 8}, {68, -8}, {90, 0}}, Smooth.None), Line(true, {0.0, 0.0}, 0, {{-79.8, -80.0}, {-79.2, -50.6}, {-78.40000000000001, -37.0}, {-77.59999999999999, -28.0}, {-76.8, -21.3}, {-75.2, -11.4}, {-72.8, -1.31}, {-69.5, 8.08}, {-64.7, 17.9}, {-57.5, 28.0}, {-47.0, 38.1}, {-31.8, 48.1}, {-10.1, 58.0}, {22.1, 68.0}, {68.7, 78.09999999999999}, {80.0, 80.0}}, {0, 0, 0}, LinePattern.Solid, 0.25, {Arrow.None, Arrow.None}, 3, Smooth.None), Text(true, {0.0, 0.0}, 0, {192, 192, 192}, {0, 0, 0}, LinePattern.Solid, FillPattern.None, 0.25, {{-30, -22}, {60, -70}}, "log10", 0, {-1, -1, -1}, "", {}, TextAlignment.Center)}}
 // Evaluating: getErrorString()
 // ""
 // Evaluating: getDiagramAnnotation(Modelica.Math.log10)
-// {-100.0,-100.0,100.0,100.0,true,0.1,2.0,2.0,{Line(true, {0.0, 0.0}, 0, {{-100, 0}, {84, 0}}, {95, 95, 95}, LinePattern.Solid, 0.25, {Arrow.None, Arrow.None}, 3, Smooth.None), Polygon(true, {0.0, 0.0}, 0, {95, 95, 95}, {95, 95, 95}, LinePattern.Solid, FillPattern.Solid, 0.25, {{98, 0}, {82, 6}, {82, -6}, {98, 0}}, Smooth.None), Line(true, {0.0, 0.0}, 0, {{-77.8, -80.0}, {-77.2, -50.6}, {-76.40000000000001, -37.0}, {-75.59999999999999, -28.0}, {-74.8, -21.3}, {-73.2, -11.4}, {-70.8, -1.31}, {-67.5, 8.08}, {-62.7, 17.9}, {-55.5, 28.0}, {-45.0, 38.1}, {-29.8, 48.1}, {-8.1, 58.0}, {24.1, 68.0}, {70.7, 78.09999999999999}, {82.0, 80.0}}, {0, 0, 255}, LinePattern.Solid, 0.5, {Arrow.None, Arrow.None}, 3, Smooth.None), Text(true, {0.0, 0.0}, 0, {0, 0, 255}, {0, 0, 0}, LinePattern.Solid, FillPattern.None, 0.25, {{66, -13}, {86, -33}}, "20", 0, {-1, -1, -1}, TextAlignment.Center), Text(true, {0.0, 0.0}, 0, {0, 0, 255}, {0, 0, 0}, LinePattern.Solid, FillPattern.None, 0.25, {{-78, -1}, {-58, -21}}, "1", 0, {-1, -1, -1}, TextAlignment.Center), Text(true, {0.0, 0.0}, 0, {0, 0, 255}, {0, 0, 0}, LinePattern.Solid, FillPattern.None, 0.25, {{-83, 62}, {-63, 78}}, " 1.3", 0, {-1, -1, -1}, TextAlignment.Center), Text(true, {0.0, 0.0}, 0, {95, 95, 95}, {0, 0, 0}, LinePattern.Solid, FillPattern.None, 0.25, {{80, 24}, {100, 4}}, "u", 0, {-1, -1, -1}, TextAlignment.Center), Text(true, {0.0, 0.0}, 0, {0, 0, 255}, {0, 0, 0}, LinePattern.Solid, FillPattern.None, 0.25, {{-100, 9}, {-80, -11}}, "0", 0, {-1, -1, -1}, TextAlignment.Center), Line(true, {0.0, 0.0}, 0, {{-80, 80}, {86, 80}}, {175, 175, 175}, LinePattern.Solid, 0.25, {Arrow.None, Arrow.None}, 3, Smooth.None), Line(true, {0.0, 0.0}, 0, {{80, 92}, {80, -12}}, {175, 175, 175}, LinePattern.Solid, 0.25, {Arrow.None, Arrow.None}, 3, Smooth.None)}}
+// {-100.0,-100.0,100.0,100.0,true,0.1,2.0,2.0,{Line(true, {0.0, 0.0}, 0, {{-100, 0}, {84, 0}}, {95, 95, 95}, LinePattern.Solid, 0.25, {Arrow.None, Arrow.None}, 3, Smooth.None), Polygon(true, {0.0, 0.0}, 0, {95, 95, 95}, {95, 95, 95}, LinePattern.Solid, FillPattern.Solid, 0.25, {{98, 0}, {82, 6}, {82, -6}, {98, 0}}, Smooth.None), Line(true, {0.0, 0.0}, 0, {{-77.8, -80.0}, {-77.2, -50.6}, {-76.40000000000001, -37.0}, {-75.59999999999999, -28.0}, {-74.8, -21.3}, {-73.2, -11.4}, {-70.8, -1.31}, {-67.5, 8.08}, {-62.7, 17.9}, {-55.5, 28.0}, {-45.0, 38.1}, {-29.8, 48.1}, {-8.1, 58.0}, {24.1, 68.0}, {70.7, 78.09999999999999}, {82.0, 80.0}}, {0, 0, 255}, LinePattern.Solid, 0.5, {Arrow.None, Arrow.None}, 3, Smooth.None), Text(true, {0.0, 0.0}, 0, {0, 0, 255}, {0, 0, 0}, LinePattern.Solid, FillPattern.None, 0.25, {{66, -13}, {86, -33}}, "20", 0, {-1, -1, -1}, "", {}, TextAlignment.Center), Text(true, {0.0, 0.0}, 0, {0, 0, 255}, {0, 0, 0}, LinePattern.Solid, FillPattern.None, 0.25, {{-78, -1}, {-58, -21}}, "1", 0, {-1, -1, -1}, "", {}, TextAlignment.Center), Text(true, {0.0, 0.0}, 0, {0, 0, 255}, {0, 0, 0}, LinePattern.Solid, FillPattern.None, 0.25, {{-83, 62}, {-63, 78}}, " 1.3", 0, {-1, -1, -1}, "", {}, TextAlignment.Center), Text(true, {0.0, 0.0}, 0, {95, 95, 95}, {0, 0, 0}, LinePattern.Solid, FillPattern.None, 0.25, {{80, 24}, {100, 4}}, "u", 0, {-1, -1, -1}, "", {}, TextAlignment.Center), Text(true, {0.0, 0.0}, 0, {0, 0, 255}, {0, 0, 0}, LinePattern.Solid, FillPattern.None, 0.25, {{-100, 9}, {-80, -11}}, "0", 0, {-1, -1, -1}, "", {}, TextAlignment.Center), Line(true, {0.0, 0.0}, 0, {{-80, 80}, {86, 80}}, {175, 175, 175}, LinePattern.Solid, 0.25, {Arrow.None, Arrow.None}, 3, Smooth.None), Line(true, {0.0, 0.0}, 0, {{80, 92}, {80, -12}}, {175, 175, 175}, LinePattern.Solid, 0.25, {Arrow.None, Arrow.None}, 3, Smooth.None)}}
 // Evaluating: getErrorString()
 // ""
@@ -26334 +26334 @@
 // ""
 // Evaluating: getDiagramAnnotation(Modelica.Electrical.Analog.Examples.CharacteristicIdealDiodes)
-// {-100.0,-100.0,100.0,100.0,false,0.1,2.0,2.0,{Text(true, {0.0, 0.0}, 0, {0, 0, 255}, {0, 0, 0}, LinePattern.Solid, FillPattern.None, 0.25, {{-88, 102}, {92, 48}}, "Characteristic Ideal Diodes", 0, {-1, -1, -1}, TextAlignment.Center)}}
+// {-100.0,-100.0,100.0,100.0,false,0.1,2.0,2.0,{Text(true, {0.0, 0.0}, 0, {0, 0, 255}, {0, 0, 0}, LinePattern.Solid, FillPattern.None, 0.25, {{-88, 102}, {92, 48}}, "Characteristic Ideal Diodes", 0, {-1, -1, -1}, "", {}, TextAlignment.Center)}}
 // Evaluating: getErrorString()
 // ""
@@ -26374 +26374 @@
 // ""
 // Evaluating: getDiagramAnnotation(Modelica.Electrical.Analog.Examples.CharacteristicThyristors)
-// {-100.0,-100.0,100.0,100.0,false,0.1,2.0,2.0,{Text(true, {0.0, 0.0}, 0, {0, 0, 255}, {0, 0, 0}, LinePattern.Solid, FillPattern.None, 0.25, {{-96, 100}, {98, 60}}, "Characteristic Thyristors", 0, {-1, -1, -1}, TextAlignment.Center)}}
+// {-100.0,-100.0,100.0,100.0,false,0.1,2.0,2.0,{Text(true, {0.0, 0.0}, 0, {0, 0, 255}, {0, 0, 0}, LinePattern.Solid, FillPattern.None, 0.25, {{-96, 100}, {98, 60}}, "Characteristic Thyristors", 0, {-1, -1, -1}, "", {}, TextAlignment.Center)}}
 // Evaluating: getErrorString()
 // ""
@@ -26409 +26409 @@
 // ""
 // Evaluating: getDiagramAnnotation(Modelica.Electrical.Analog.Examples.CompareTransformers)
-// {-100.0,-100.0,100.0,100.0,false,0.1,2.0,2.0,{Text(true, {0.0, 0.0}, 0, {0, 0, 255}, {0, 0, 0}, LinePattern.Solid, FillPattern.None, 0.25, {{-60, -80}, {60, -100}}, "try considerMagnetization=false/true", 0, {-1, -1, -1}, TextAlignment.Center), Text(true, {0.0, 0.0}, 0, {0, 0, 255}, {0, 0, 0}, LinePattern.Solid, FillPattern.None, 0.25, {{-60, 20}, {60, 0}}, "Basic.Transformer (mutual inductance)", 0, {-1, -1, -1}, TextAlignment.Center)}}
+// {-100.0,-100.0,100.0,100.0,false,0.1,2.0,2.0,{Text(true, {0.0, 0.0}, 0, {0, 0, 255}, {0, 0, 0}, LinePattern.Solid, FillPattern.None, 0.25, {{-60, -80}, {60, -100}}, "try considerMagnetization=false/true", 0, {-1, -1, -1}, "", {}, TextAlignment.Center), Text(true, {0.0, 0.0}, 0, {0, 0, 255}, {0, 0, 0}, LinePattern.Solid, FillPattern.None, 0.25, {{-60, 20}, {60, 0}}, "Basic.Transformer (mutual inductance)", 0, {-1, -1, -1}, "", {}, TextAlignment.Center)}}
 // Evaluating: getErrorString()
 // ""
@@ -26450 +26450 @@
 // ""
 // Evaluating: getDiagramAnnotation(Modelica.Electrical.Analog.Examples.ControlledSwitchWithArc)
-// {-100.0,-100.0,100.0,100.0,true,0.1,2.0,2.0,{Text(true, {0.0, 0.0}, 0, {0, 0, 255}, {0, 0, 0}, LinePattern.Solid, FillPattern.None, 0.25, {{-100, 80}, {100, 60}}, "Compare voltage and current of inductor1 and inductor2", 0, {-1, -1, -1}, TextAlignment.Center)}}
+// {-100.0,-100.0,100.0,100.0,true,0.1,2.0,2.0,{Text(true, {0.0, 0.0}, 0, {0, 0, 255}, {0, 0, 0}, LinePattern.Solid, FillPattern.None, 0.25, {{-100, 80}, {100, 60}}, "Compare voltage and current of inductor1 and inductor2", 0, {-1, -1, -1}, "", {}, TextAlignment.Center)}}
 // Evaluating: getErrorString()
 // ""
@@ -27668 +27668 @@
 // ""
 // Evaluating: getDiagramAnnotation(Modelica.Blocks.Examples.PID_Controller)
-// {-100.0,-100.0,100.0,100.0,true,0.1,1.0,1.0,{Rectangle(true, {0.0, 0.0}, 0, {255, 0, 0}, {0, 0, 0}, LinePattern.Solid, FillPattern.None, 0.25, BorderPattern.None, {{-99, 48}, {-32, 8}}, 0), Text(true, {0.0, 0.0}, 0, {255, 0, 0}, {0, 0, 0}, LinePattern.Solid, FillPattern.None, 0.25, {{-98, 59}, {-31, 51}}, "reference speed generation", 0, {-1, -1, -1}, TextAlignment.Center), Text(true, {0.0, 0.0}, 0, {255, 0, 0}, {0, 0, 0}, LinePattern.Solid, FillPattern.None, 0.25, {{-98, -46}, {-60, -52}}, "PI controller", 0, {-1, -1, -1}, TextAlignment.Center), Line(true, {0.0, 0.0}, 0, {{-76, -44}, {-57, -23}}, {255, 0, 0}, LinePattern.Solid, 0.25, {Arrow.None, Arrow.Filled}, 3, Smooth.None), Rectangle(true, {0.0, 0.0}, 0, {255, 0, 0}, {0, 0, 0}, LinePattern.Solid, FillPattern.None, 0.25, BorderPattern.None, {{-25, 6}, {99, -50}}, 0), Text(true, {0.0, 0.0}, 0, {255, 0, 0}, {0, 0, 0}, LinePattern.Solid, FillPattern.None, 0.25, {{4, 14}, {71, 7}}, "plant (simple drive train)", 0, {-1, -1, -1}, TextAlignment.Center)}}
+// {-100.0,-100.0,100.0,100.0,true,0.1,1.0,1.0,{Rectangle(true, {0.0, 0.0}, 0, {255, 0, 0}, {0, 0, 0}, LinePattern.Solid, FillPattern.None, 0.25, BorderPattern.None, {{-99, 48}, {-32, 8}}, 0), Text(true, {0.0, 0.0}, 0, {255, 0, 0}, {0, 0, 0}, LinePattern.Solid, FillPattern.None, 0.25, {{-98, 59}, {-31, 51}}, "reference speed generation", 0, {-1, -1, -1}, "", {}, TextAlignment.Center), Text(true, {0.0, 0.0}, 0, {255, 0, 0}, {0, 0, 0}, LinePattern.Solid, FillPattern.None, 0.25, {{-98, -46}, {-60, -52}}, "PI controller", 0, {-1, -1, -1}, "", {}, TextAlignment.Center), Line(true, {0.0, 0.0}, 0, {{-76, -44}, {-57, -23}}, {255, 0, 0}, LinePattern.Solid, 0.25, {Arrow.None, Arrow.Filled}, 3, Smooth.None), Rectangle(true, {0.0, 0.0}, 0, {255, 0, 0}, {0, 0, 0}, LinePattern.Solid, FillPattern.None, 0.25, BorderPattern.None, {{-25, 6}, {99, -50}}, 0), Text(true, {0.0, 0.0}, 0, {255, 0, 0}, {0, 0, 0}, LinePattern.Solid, FillPattern.None, 0.25, {{4, 14}, {71, 7}}, "plant (simple drive train)", 0, {-1, -1, -1}, "", {}, TextAlignment.Center)}}
 // Evaluating: getErrorString()
 // ""
@@ -28064 +28064 @@
 // ""
 // Evaluating: getIconAnnotation(Modelica.Blocks.Examples.BusUsage_Utilities.Part)
-// {-100.0,-100.0,100.0,100.0,true,0.1,2.0,2.0,{Rectangle(true, {0.0, 0.0}, 0, {0, 0, 255}, {159, 159, 223}, LinePattern.Solid, FillPattern.Solid, 0.25, BorderPattern.None, {{-100, 60}, {100, -60}}, 0), Text(true, {0.0, 0.0}, 0, {0, 0, 255}, {0, 0, 0}, LinePattern.Solid, FillPattern.None, 0.25, {{-106, 124}, {114, 68}}, "%name", 0, {-1, -1, -1}, TextAlignment.Center)}}
+// {-100.0,-100.0,100.0,100.0,true,0.1,2.0,2.0,{Rectangle(true, {0.0, 0.0}, 0, {0, 0, 255}, {159, 159, 223}, LinePattern.Solid, FillPattern.Solid, 0.25, BorderPattern.None, {{-100, 60}, {100, -60}}, 0), Text(true, {0.0, 0.0}, 0, {0, 0, 255}, {0, 0, 0}, LinePattern.Solid, FillPattern.None, 0.25, {{-106, 124}, {114, 68}}, "%name", 0, {-1, -1, -1}, "", {}, TextAlignment.Center)}}
 // Evaluating: getErrorString()
 // ""
@@ -28083 +28083 @@
 // ""
 // Evaluating: getIconAnnotation(Modelica.Blocks.Continuous.PID)
-// {-100.0,-100.0,100.0,100.0,true,0.1,2.0,2.0,{Line(true, {0.0, 0.0}, 0, {{-80, 78}, {-80, -90}}, {192, 192, 192}, LinePattern.Solid, 0.25, {Arrow.None, Arrow.None}, 3, Smooth.None), Polygon(true, {0.0, 0.0}, 0, {192, 192, 192}, {192, 192, 192}, LinePattern.Solid, FillPattern.Solid, 0.25, {{-80, 90}, {-88, 68}, {-72, 68}, {-80, 90}}, Smooth.None), Line(true, {0.0, 0.0}, 0, {{-90, -80}, {82, -80}}, {192, 192, 192}, LinePattern.Solid, 0.25, {Arrow.None, Arrow.None}, 3, Smooth.None), Polygon(true, {0.0, 0.0}, 0, {192, 192, 192}, {192, 192, 192}, LinePattern.Solid, FillPattern.Solid, 0.25, {{90, -80}, {68, -72}, {68, -88}, {90, -80}}, Smooth.None), Line(true, {0.0, 0.0}, 0, {{-80, -80}, {-80, 50}, {-80, -20}, {60, 80}}, {0, 0, 127}, LinePattern.Solid, 0.25, {Arrow.None, Arrow.None}, 3, Smooth.None), Text(true, {0.0, 0.0}, 0, {192, 192, 192}, {0, 0, 0}, LinePattern.Solid, FillPattern.None, 0.25, {{-20, -20}, {80, -60}}, "PID", 0, {-1, -1, -1}, TextAlignment.Center), Text(true, {0.0, 0.0}, 0, {0, 0, 0}, {0, 0, 0}, LinePattern.Solid, FillPattern.None, 0.25, {{-150, -150}, {150, -110}}, "Ti=%Ti", 0, {-1, -1, -1}, TextAlignment.Center)}}
+// {-100.0,-100.0,100.0,100.0,true,0.1,2.0,2.0,{Line(true, {0.0, 0.0}, 0, {{-80, 78}, {-80, -90}}, {192, 192, 192}, LinePattern.Solid, 0.25, {Arrow.None, Arrow.None}, 3, Smooth.None), Polygon(true, {0.0, 0.0}, 0, {192, 192, 192}, {192, 192, 192}, LinePattern.Solid, FillPattern.Solid, 0.25, {{-80, 90}, {-88, 68}, {-72, 68}, {-80, 90}}, Smooth.None), Line(true, {0.0, 0.0}, 0, {{-90, -80}, {82, -80}}, {192, 192, 192}, LinePattern.Solid, 0.25, {Arrow.None, Arrow.None}, 3, Smooth.None), Polygon(true, {0.0, 0.0}, 0, {192, 192, 192}, {192, 192, 192}, LinePattern.Solid, FillPattern.Solid, 0.25, {{90, -80}, {68, -72}, {68, -88}, {90, -80}}, Smooth.None), Line(true, {0.0, 0.0}, 0, {{-80, -80}, {-80, 50}, {-80, -20}, {60, 80}}, {0, 0, 127}, LinePattern.Solid, 0.25, {Arrow.None, Arrow.None}, 3, Smooth.None), Text(true, {0.0, 0.0}, 0, {192, 192, 192}, {0, 0, 0}, LinePattern.Solid, FillPattern.None, 0.25, {{-20, -20}, {80, -60}}, "PID", 0, {-1, -1, -1}, "", {}, TextAlignment.Center), Text(true, {0.0, 0.0}, 0, {0, 0, 0}, {0, 0, 0}, LinePattern.Solid, FillPattern.None, 0.25, {{-150, -150}, {150, -110}}, "Ti=%Ti", 0, {-1, -1, -1}, "", {}, TextAlignment.Center)}}
 // Evaluating: getErrorString()
 // ""
@@ -28175 +28175 @@
 // ""
 // Evaluating: getIconAnnotation(Modelica.Blocks.Continuous.LimPID)
-// {-100.0,-100.0,100.0,100.0,true,0.1,1.0,1.0,{Line(true, {0.0, 0.0}, 0, {{-80, 78}, {-80, -90}}, {192, 192, 192}, LinePattern.Solid, 0.25, {Arrow.None, Arrow.None}, 3, Smooth.None), Polygon(true, {0.0, 0.0}, 0, {192, 192, 192}, {192, 192, 192}, LinePattern.Solid, FillPattern.Solid, 0.25, {{-80, 90}, {-88, 68}, {-72, 68}, {-80, 90}}, Smooth.None), Line(true, {0.0, 0.0}, 0, {{-90, -80}, {82, -80}}, {192, 192, 192}, LinePattern.Solid, 0.25, {Arrow.None, Arrow.None}, 3, Smooth.None), Polygon(true, {0.0, 0.0}, 0, {192, 192, 192}, {192, 192, 192}, LinePattern.Solid, FillPattern.Solid, 0.25, {{90, -80}, {68, -72}, {68, -88}, {90, -80}}, Smooth.None), Line(true, {0.0, 0.0}, 0, {{-80, -80}, {-80, 50}, {-80, -20}, {30, 60}, {80, 60}}, {0, 0, 127}, LinePattern.Solid, 0.25, {Arrow.None, Arrow.None}, 3, Smooth.None), Text(true, {0.0, 0.0}, 0, {192, 192, 192}, {0, 0, 0}, LinePattern.Solid, FillPattern.None, 0.25, {{-20, -20}, {80, -60}}, "PID", 0, {-1, -1, -1}, TextAlignment.Center)}}
+// {-100.0,-100.0,100.0,100.0,true,0.1,1.0,1.0,{Line(true, {0.0, 0.0}, 0, {{-80, 78}, {-80, -90}}, {192, 192, 192}, LinePattern.Solid, 0.25, {Arrow.None, Arrow.None}, 3, Smooth.None), Polygon(true, {0.0, 0.0}, 0, {192, 192, 192}, {192, 192, 192}, LinePattern.Solid, FillPattern.Solid, 0.25, {{-80, 90}, {-88, 68}, {-72, 68}, {-80, 90}}, Smooth.None), Line(true, {0.0, 0.0}, 0, {{-90, -80}, {82, -80}}, {192, 192, 192}, LinePattern.Solid, 0.25, {Arrow.None, Arrow.None}, 3, Smooth.None), Polygon(true, {0.0, 0.0}, 0, {192, 192, 192}, {192, 192, 192}, LinePattern.Solid, FillPattern.Solid, 0.25, {{90, -80}, {68, -72}, {68, -88}, {90, -80}}, Smooth.None), Line(true, {0.0, 0.0}, 0, {{-80, -80}, {-80, 50}, {-80, -20}, {30, 60}, {80, 60}}, {0, 0, 127}, LinePattern.Solid, 0.25, {Arrow.None, Arrow.None}, 3, Smooth.None), Text(true, {0.0, 0.0}, 0, {192, 192, 192}, {0, 0, 0}, LinePattern.Solid, FillPattern.None, 0.25, {{-20, -20}, {80, -60}}, "PID", 0, {-1, -1, -1}, "", {}, TextAlignment.Center)}}
 // Evaluating: getErrorString()
 // ""
@@ -28341 +28341 @@
 // ""
 // Evaluating: getIconAnnotation(Modelica.Blocks.Continuous.Der)
-// {-100.0,-100.0,100.0,100.0,true,0.1,2.0,2.0,{Text(true, {0.0, 0.0}, 0, {0, 0, 127}, {0, 0, 0}, LinePattern.Solid, FillPattern.None, 0.25, {{-80, 76}, {80, -82}}, "der()", 0, {-1, -1, -1}, TextAlignment.Center)}}
+// {-100.0,-100.0,100.0,100.0,true,0.1,2.0,2.0,{Text(true, {0.0, 0.0}, 0, {0, 0, 127}, {0, 0, 0}, LinePattern.Solid, FillPattern.None, 0.25, {{-80, 76}, {80, -82}}, "der()", 0, {-1, -1, -1}, "", {}, TextAlignment.Center)}}
 // Evaluating: getErrorString()
 // ""
@@ -28399 +28399 @@
 // ""
 // Evaluating: getIconAnnotation(Modelica.Blocks.Interfaces.BlockIcon)
-// {-100.0,-100.0,100.0,100.0,true,0.1,2.0,2.0,{Rectangle(true, {0.0, 0.0}, 0, {0, 0, 127}, {255, 255, 255}, LinePattern.Solid, FillPattern.Solid, 0.25, BorderPattern.None, {{-100, -100}, {100, 100}}, 0), Text(true, {0.0, 0.0}, 0, {0, 0, 255}, {0, 0, 0}, LinePattern.Solid, FillPattern.None, 0.25, {{-150, 150}, {150, 110}}, "%name", 0, {-1, -1, -1}, TextAlignment.Center)}}
+// {-100.0,-100.0,100.0,100.0,true,0.1,2.0,2.0,{Rectangle(true, {0.0, 0.0}, 0, {0, 0, 127}, {255, 255, 255}, LinePattern.Solid, FillPattern.Solid, 0.25, BorderPattern.None, {{-100, -100}, {100, 100}}, 0), Text(true, {0.0, 0.0}, 0, {0, 0, 255}, {0, 0, 0}, LinePattern.Solid, FillPattern.None, 0.25, {{-150, 150}, {150, 110}}, "%name", 0, {-1, -1, -1}, "", {}, TextAlignment.Center)}}
 // Evaluating: getErrorString()
 // ""
@@ -29059 +29059 @@
 // ""
 // Evaluating: getIconAnnotation(Modelica.Blocks.Sources.IntegerExpression)
-// {-100.0,-100.0,100.0,100.0,false,0.1,2.0,2.0,{Rectangle(true, {0.0, 0.0}, 0, {0, 0, 0}, {235, 235, 235}, LinePattern.Solid, FillPattern.Solid, 0.25, BorderPattern.Raised, {{-100, 40}, {100, -40}}, 0), Text(true, {0.0, 0.0}, 0, {0, 0, 0}, {0, 0, 0}, LinePattern.Solid, FillPattern.None, 0.25, {{-96, 15}, {96, -15}}, "%y", 0, {-1, -1, -1}, TextAlignment.Center), Text(true, {0.0, 0.0}, 0, {0, 0, 255}, {0, 0, 0}, LinePattern.Solid, FillPattern.None, 0.25, {{-150, 90}, {140, 50}}, "%name", 0, {-1, -1, -1}, TextAlignment.Center)}}
+// {-100.0,-100.0,100.0,100.0,false,0.1,2.0,2.0,{Rectangle(true, {0.0, 0.0}, 0, {0, 0, 0}, {235, 235, 235}, LinePattern.Solid, FillPattern.Solid, 0.25, BorderPattern.Raised, {{-100, 40}, {100, -40}}, 0), Text(true, {0.0, 0.0}, 0, {0, 0, 0}, {0, 0, 0}, LinePattern.Solid, FillPattern.None, 0.25, {{-96, 15}, {96, -15}}, "%y", 0, {-1, -1, -1}, "", {}, TextAlignment.Center), Text(true, {0.0, 0.0}, 0, {0, 0, 255}, {0, 0, 0}, LinePattern.Solid, FillPattern.None, 0.25, {{-150, 90}, {140, 50}}, "%name", 0, {-1, -1, -1}, "", {}, TextAlignment.Center)}}
 // Evaluating: getErrorString()
 // ""
@@ -29082 +29082 @@
 // ""
 // Evaluating: getIconAnnotation(Modelica.Blocks.Sources.BooleanExpression)
-// {-100.0,-100.0,100.0,100.0,false,0.1,2.0,2.0,{Rectangle(true, {0.0, 0.0}, 0, {0, 0, 0}, {235, 235, 235}, LinePattern.Solid, FillPattern.Solid, 0.25, BorderPattern.Raised, {{-100, 40}, {100, -40}}, 0), Text(true, {0.0, 0.0}, 0, {0, 0, 0}, {0, 0, 0}, LinePattern.Solid, FillPattern.None, 0.25, {{-96, 15}, {96, -15}}, "%y", 0, {-1, -1, -1}, TextAlignment.Center), Text(true, {0.0, 0.0}, 0, {0, 0, 255}, {0, 0, 0}, LinePattern.Solid, FillPattern.None, 0.25, {{-150, 90}, {140, 50}}, "%name", 0, {-1, -1, -1}, TextAlignment.Center), Polygon(true, {0.0, 0.0}, 0, {255, 0, 255}, {255, 255, 255}, LinePattern.Solid, FillPattern.Solid, 0.25, {{100, 10}, {120, 0}, {100, -10}, {100, 10}}, Smooth.None)}}
+// {-100.0,-100.0,100.0,100.0,false,0.1,2.0,2.0,{Rectangle(true, {0.0, 0.0}, 0, {0, 0, 0}, {235, 235, 235}, LinePattern.Solid, FillPattern.Solid, 0.25, BorderPattern.Raised, {{-100, 40}, {100, -40}}, 0), Text(true, {0.0, 0.0}, 0, {0, 0, 0}, {0, 0, 0}, LinePattern.Solid, FillPattern.None, 0.25, {{-96, 15}, {96, -15}}, "%y", 0, {-1, -1, -1}, "", {}, TextAlignment.Center), Text(true, {0.0, 0.0}, 0, {0, 0, 255}, {0, 0, 0}, LinePattern.Solid, FillPattern.None, 0.25, {{-150, 90}, {140, 50}}, "%name", 0, {-1, -1, -1}, "", {}, TextAlignment.Center), Polygon(true, {0.0, 0.0}, 0, {255, 0, 255}, {255, 255, 255}, LinePattern.Solid, FillPattern.Solid, 0.25, {{100, 10}, {120, 0}, {100, -10}, {100, 10}}, Smooth.None)}}
 // Evaluating: getErrorString()
 // ""