Adding 2 more graphical changes from rubae

open-ideas · Jan 11, 2015 · 1f5cfeb · 1f5cfeb
1 parent c374cfe
commit 1f5cfeb
Show file tree

Hide file tree

Showing 2 changed files with 80 additions and 60 deletions.
diff --git a/FastBuildings/Input/BaseClasses/Partial_SIM.mo b/FastBuildings/Input/BaseClasses/Partial_SIM.mo
@@ -13,45 +13,73 @@ an inner \"sim\" component is not defined.
 For simulation drag a sim from FastBuildings.Input 
 into your model to specify your Simulation Input Manager.", Diagram(coordinateSystem(extent = {{-100,-100},{100,100}}, preserveAspectRatio = false, initialScale = 0.1, grid = {2,2}), graphics), Icon(coordinateSystem(extent={{-100,
             -100},{100,100}},                                                                                                    preserveAspectRatio=false,   initialScale = 0.1, grid = {2,2}), graphics={
-                                                                                              Text(origin={
-              0.3881,85.1468},                                                                                                    fillColor=
-              {0,0,255},                                                                                                    extent={{
-              -99.6119,13.1468},{99.6119,-13.1468}},
-          textString="%name",
-          lineColor={0,0,255}),
-        Ellipse(
-          extent={{-32,24},{30,-34}},
-          lineColor={0,0,255},
-          fillPattern=FillPattern.Solid,
-          fillColor={0,0,255}),
-        Line(
-          points={{14,26},{34,54}},
-          color={0,0,255},
-          thickness=0.5,
-          smooth=Smooth.None),
-        Line(
-          points={{36,-8},{38,-8},{74,-12}},
-          color={0,0,255},
-          thickness=0.5,
-          smooth=Smooth.None),
-        Line(
-          points={{16,-34},{30,-66}},
-          color={0,0,255},
-          thickness=0.5,
-          smooth=Smooth.None),
-        Line(
-          points={{-18,-34},{-34,-64}},
-          color={0,0,255},
-          thickness=0.5,
-          smooth=Smooth.None),
+        Rectangle(
+          extent={{-60,50},{60,-50}},
+          lineColor={95,95,95},
+          fillPattern=FillPattern.Solid,
+          fillColor={95,95,95}),
+        Rectangle(
+          extent={{-50,40},{50,-30}},
+          fillPattern=FillPattern.Solid,
+          fillColor={255,255,255},
+          pattern=LinePattern.None),
+        Rectangle(
+          extent={{-10,-60},{10,-50}},
+          pattern=LinePattern.None,
+          fillColor={95,95,95},
+          fillPattern=FillPattern.Solid,
+          lineColor={0,0,0}),
+        Polygon(
+          points={{-40,-60},{-40,-60}},
+          pattern=LinePattern.None,
+          smooth=Smooth.None,
+          fillColor={0,0,0},
+          fillPattern=FillPattern.Solid),
+        Polygon(
+          points={{-40,-60},{40,-60},{50,-70},{-52,-70},{-40,-60}},
+          smooth=Smooth.None,
+          fillColor={95,95,95},
+          fillPattern=FillPattern.Solid,
+          pattern=LinePattern.None),
+        Rectangle(
+          extent={{44,-26},{38,14}},
+          fillColor={0,0,127},
+          fillPattern=FillPattern.Solid,
+          pattern=LinePattern.None),
+        Rectangle(
+          extent={{34,-26},{28,-14}},
+          fillColor={0,127,255},
+          fillPattern=FillPattern.Solid,
+          pattern=LinePattern.None),
+        Rectangle(
+          extent={{24,-26},{18,30}},
+          fillColor={0,0,127},
+          fillPattern=FillPattern.Solid,
+          pattern=LinePattern.None),
+        Rectangle(
+          extent={{14,-26},{8,10}},
+          fillColor={175,175,175},
+          fillPattern=FillPattern.Solid,
+          pattern=LinePattern.None),
+        Rectangle(
+          extent={{4,-26},{-2,-14}},
+          fillColor={0,127,255},
+          fillPattern=FillPattern.Solid,
+          pattern=LinePattern.None),
         Line(
-          points={{-36,-6},{-76,-4}},
-          color={0,0,255},
-          thickness=0.5,
+          points={{-6,-26},{-46,-26}},
+          color={0,0,127},
           smooth=Smooth.None),
-        Line(
-          points={{-22,24},{-40,52}},
-          color={0,0,255},
-          thickness=0.5,
-          smooth=Smooth.None)}));
+        Text(
+          extent={{-50,40},{-20,0}},
+          lineColor={95,95,95},
+          fillColor={95,95,95},
+          fillPattern=FillPattern.Solid,
+          textStyle={TextStyle.Italic},
+          fontName="Bookman Old Style",
+          textString="i"),
+        Text(
+          extent={{-100,100},{100,60}},
+          lineColor={0,0,193},
+          textString="%name")}));
 end Partial_SIM;
diff --git a/FastBuildings/Zones/Windows/PartialWindow.mo b/FastBuildings/Zones/Windows/PartialWindow.mo
@@ -10,34 +10,26 @@ partial model PartialWindow "Partial window model"
             -0.52412},                                                                                                    extent = {{-12,-12},{12,12}}, rotation = 0)));
 
   annotation(Diagram(graphics),
-                      Icon(coordinateSystem(preserveAspectRatio=false, extent={
-            {-100,-100},{100,100}}),
+                      Icon(coordinateSystem(preserveAspectRatio=false, extent={{-100,
+            -100},{100,100}}),
                            graphics={
         Rectangle(
           extent={{-60,80},{60,-80}},
           lineColor={95,95,95},
-          lineThickness=0.5),
-        Line(
-          points={{0,56},{20,56},{20,76},{50,76}},
-          color={95,95,95},
-          smooth=Smooth.None),
-        Line(
-          points={{0,-24},{20,-24},{20,-74},{20,-74},{50,-74}},
-          color={95,95,95},
-          smooth=Smooth.None),
-        Line(
-          points={{0,56},{0,62},{0,96},{50,96}},
-          color={95,95,95},
-          smooth=Smooth.None),
-        Line(
-          points={{0,-24},{0,-94},{50,-94}},
-          color={95,95,95},
-          smooth=Smooth.None),
+          lineThickness=1),
         Text(
-          extent={{-100,102},{100,82}},
+          extent={{-100,120},{100,92}},
           lineColor={95,95,95},
           lineThickness=0.5,
           fillColor={95,95,95},
           fillPattern=FillPattern.Solid,
-          textString="%name")}));
+          textString="%name"),
+        Line(
+          points={{0,80},{0,-80}},
+          color={95,95,95},
+          smooth=Smooth.None),
+        Line(
+          points={{-60,0},{54,0},{60,0}},
+          color={95,95,95},
+          smooth=Smooth.None)}));
 end PartialWindow;