Changed icon for #1294 [ci skip]

ibpsa · Feb 21, 2020 · 641acc6 · 641acc6
1 parent 5a48ee2
commit 641acc6
Show file tree

Hide file tree

Showing 7 changed files with 147 additions and 35 deletions.
diff --git a/IBPSA/Fluid/Actuators/BaseClasses/ActuatorSignal.mo b/IBPSA/Fluid/Actuators/BaseClasses/ActuatorSignal.mo
@@ -67,27 +67,33 @@ equation
 
   annotation (Icon(coordinateSystem(preserveAspectRatio=false, extent={{-100,
             -100},{100,100}}), graphics={
+        Rectangle(
+          extent={{-14,100},{12,20}},
+          lineColor={255,255,255},
+          fillPattern=FillPattern.Solid,
+          fillColor=DynamicSelect({255,255,255}, y_actual*{0,140,72}+(1-y_actual)*{238,46,47}),
+          radius=10),
         Line(
-          points={{0,40},{0,100}}),
+          points={{0,48},{0,108}}),
         Line(
           points={{0,70},{40,70}}),
         Rectangle(
           visible=use_inputFilter,
-          extent={{-30,40},{30,100}},
+          extent={{-32,40},{34,100}},
           lineColor={0,0,0},
-          fillColor={135,135,135},
+          fillColor=DynamicSelect({135,135,135}, y_actual*{0,140,72}+(1-y_actual)*{238,46,47}),
           fillPattern=FillPattern.Solid),
         Ellipse(
           visible=use_inputFilter,
-          extent={{-30,100},{30,40}},
+          extent={{-32,100},{34,40}},
           lineColor={0,0,0},
-          fillColor={135,135,135},
+          fillColor=DynamicSelect({135,135,135}, y_actual*{0,140,72}+(1-y_actual)*{238,46,47}),
           fillPattern=FillPattern.Solid),
         Text(
           visible=use_inputFilter,
-          extent={{-20,92},{20,48}},
+          extent={{-20,94},{22,48}},
           lineColor={0,0,0},
-          fillColor={135,135,135},
+          fillColor=DynamicSelect({135,135,135}, y_actual*{0,140,72}+(1-y_actual)*{238,46,47}),
           fillPattern=FillPattern.Solid,
           textString="M",
           textStyle={TextStyle.Bold})}),
@@ -112,6 +118,12 @@ for a description of the filter.
 </html>", revisions="<html>
 <ul>
 <li>
+February 21, 2020, by Michael Wetter:<br/>
+Changed icon to display its operating stage.<br/>
+This is for
+<a href=\"https://github.com/ibpsa/modelica-ibpsa/issues/1294\">#1294</a>.
+</li>
+<li>
 November 14, 2019, by Michael Wetter:<br/>
 Set <code>start</code> attribute for <code>filter.x</code>.<br/>
 This is for

diff --git a/IBPSA/Fluid/Actuators/BaseClasses/PartialThreeWayValve.mo b/IBPSA/Fluid/Actuators/BaseClasses/PartialThreeWayValve.mo
@@ -85,7 +85,7 @@ equation
     Polygon(
       points={{0,0},{-76,60},{-76,-60},{0,0}},
       lineColor={0,0,0},
-      fillColor={0,0,0},
+      fillColor=DynamicSelect({0,0,0}, y_actual*{255,255,255}),
       fillPattern=FillPattern.Solid),
     Polygon(
       points={{0,0},{76,60},{76,-60},{0,0}},
@@ -103,10 +103,10 @@ equation
       fillPattern=FillPattern.VerticalCylinder,
       fillColor={0,127,255}),
     Polygon(
-      points={{0,0},{60,-76},{-60,-76},{0,0}},
-      lineColor={0,0,0},
-      fillColor={0,0,0},
-      fillPattern=FillPattern.Solid),
+          points={{0,0},{60,-76},{-60,-76},{0,0}},
+          lineColor={0,0,0},
+          fillColor=DynamicSelect({0,0,0}, (1-y_actual)*{255,255,255}),
+          fillPattern=FillPattern.Solid),
     Line(
       visible=use_inputFilter,
       points={{-30,40},{30,40}}),

diff --git a/IBPSA/Fluid/Actuators/BaseClasses/PartialTwoWayValve.mo b/IBPSA/Fluid/Actuators/BaseClasses/PartialTwoWayValve.mo
@@ -37,7 +37,7 @@ initial equation
     Polygon(
       points={{0,0},{-76,60},{-76,-60},{0,0}},
       lineColor={0,0,0},
-      fillColor={0,0,0},
+      fillColor=DynamicSelect({0,0,0}, y_actual*{255,255,255}),
       fillPattern=FillPattern.Solid),
     Polygon(
       points={{0,-0},{76,60},{76,-60},{0,0}},
@@ -95,6 +95,12 @@ each valve opening characteristics has different parameters.
 revisions="<html>
 <ul>
 <li>
+February 21, 2020, by Michael Wetter:<br/>
+Changed icon to display its operating stage.<br/>
+This is for
+<a href=\"https://github.com/ibpsa/modelica-ibpsa/issues/1294\">#1294</a>.
+</li>
+<li>
 November 9, 2019, by Filip Jorissen:<br/>
 Removed assert for <code>phi>-0.2</code>
 since the valve control input is now lower limited

diff --git a/IBPSA/Fluid/Movers/FlowControlled_dp.mo b/IBPSA/Fluid/Movers/FlowControlled_dp.mo
@@ -157,6 +157,12 @@ IBPSA.Fluid.Movers.Validation.FlowControlled_dpSystem</a>.
       revisions="<html>
 <ul>
 <li>
+February 21, 2020, by Michael Wetter:<br/>
+Changed icon to display its operating stage.<br/>
+This is for
+<a href=\"https://github.com/ibpsa/modelica-ibpsa/issues/1294\">#1294</a>.
+</li>
+<li>
 May 5, 2017, by Filip Jorissen:<br/>
 Added parameters, documentation and functionality for
 <code>prescribeSystemPressure</code>.<br/>
@@ -255,6 +261,12 @@ Revised implementation to allow zero flow rate.
 </ul>
 </html>"),
     Icon(graphics={
+        Rectangle(
+          extent={{-14,100},{14,60}},
+          lineColor={255,255,255},
+          fillPattern=FillPattern.Solid,
+          fillColor=DynamicSelect({255,255,255}, dp_actual/dp_nominal*{0,140,72}+(1-dp_actual/dp_nominal)*{238,46,47}),
+          radius=10),
         Line(
           points={{2,50},{100,50}},
           color={0,0,0},
@@ -266,24 +278,36 @@ Revised implementation to allow zero flow rate.
         Text(extent={{60,66},{110,52}},
           lineColor={0,0,127},
           textString="dp"),
+        Line(
+          points={{0,70},{100,70}},
+          color={0,0,0},
+          smooth=Smooth.None),
+        Line(
+          points={{0,90},{100,90}},
+          color={0,0,0},
+          smooth=Smooth.None),
+        Line(
+          points={{0,100},{0,50}},
+          color={0,0,0},
+          smooth=Smooth.None),
+        Text(
+          visible=use_inputFilter,
+          extent={{-22,92},{20,46}},
+          lineColor={0,0,0},
+          fillColor={135,135,135},
+          fillPattern=FillPattern.Solid,
+          textString="M",
+          textStyle={TextStyle.Bold}),
         Rectangle(
           visible=use_inputFilter,
           extent={{-34,40},{32,100}},
           lineColor={0,0,0},
-          fillColor={135,135,135},
+          fillColor=DynamicSelect({135,135,135}, dp_actual/dp_nominal*{0,140,72}+(1-dp_actual/dp_nominal)*{238,46,47}),
           fillPattern=FillPattern.Solid),
         Ellipse(
           visible=use_inputFilter,
           extent={{-34,100},{32,40}},
           lineColor={0,0,0},
-          fillColor={135,135,135},
-          fillPattern=FillPattern.Solid),
-        Text(
-          visible=use_inputFilter,
-          extent={{-22,92},{20,46}},
-          lineColor={0,0,0},
-          fillColor={135,135,135},
-          fillPattern=FillPattern.Solid,
-          textString="M",
-          textStyle={TextStyle.Bold})}));
+          fillColor=DynamicSelect({135,135,135}, dp_actual/dp_nominal*{0,140,72}+(1-dp_actual/dp_nominal)*{238,46,47}),
+          fillPattern=FillPattern.Solid)}));
 end FlowControlled_dp;
diff --git a/IBPSA/Fluid/Movers/FlowControlled_m_flow.mo b/IBPSA/Fluid/Movers/FlowControlled_m_flow.mo
@@ -101,6 +101,12 @@ User's Guide</a> for more information.
       revisions="<html>
 <ul>
 <li>
+February 21, 2020, by Michael Wetter:<br/>
+Changed icon to display its operating stage.<br/>
+This is for
+<a href=\"https://github.com/ibpsa/modelica-ibpsa/issues/1294\">#1294</a>.
+</li>
+<li>
 March 24, 2017, by Michael Wetter:<br/>
 Renamed <code>filteredSpeed</code> to <code>use_inputFilter</code>.<br/>
 This is for
@@ -147,6 +153,12 @@ Revised implementation to allow zero flow rate.
 </ul>
 </html>"),
     Icon(graphics={
+        Rectangle(
+          extent={{-14,100},{14,60}},
+          lineColor={255,255,255},
+          fillPattern=FillPattern.Solid,
+          fillColor=DynamicSelect({255,255,255}, m_flow_actual/m_flow_nominal*{0,140,72}+(1-m_flow_actual/m_flow_nominal)*{238,46,47}),
+          radius=10),
         Text(
           visible = inputType == IBPSA.Fluid.Types.InputType.Continuous,
           extent={{22,146},{114,102}},
@@ -158,17 +170,29 @@ Revised implementation to allow zero flow rate.
         Text(extent={{50,66},{100,52}},
           lineColor={0,0,127},
           textString="m_flow"),
+        Line(
+          points={{0,70},{100,70}},
+          color={0,0,0},
+          smooth=Smooth.None),
+        Line(
+          points={{0,90},{100,90}},
+          color={0,0,0},
+          smooth=Smooth.None),
+        Line(
+          points={{0,100},{0,50}},
+          color={0,0,0},
+          smooth=Smooth.None),
         Rectangle(
           visible=use_inputFilter,
           extent={{-34,40},{32,100}},
           lineColor={0,0,0},
-          fillColor={135,135,135},
+          fillColor=DynamicSelect({135,135,135}, m_flow_actual/m_flow_nominal*{0,140,72}+(1-m_flow_actual/m_flow_nominal)*{238,46,47}),
           fillPattern=FillPattern.Solid),
         Ellipse(
           visible=use_inputFilter,
           extent={{-34,100},{32,40}},
           lineColor={0,0,0},
-          fillColor={135,135,135},
+          fillColor=DynamicSelect({135,135,135}, m_flow_actual/m_flow_nominal*{0,140,72}+(1-m_flow_actual/m_flow_nominal)*{238,46,47}),
           fillPattern=FillPattern.Solid),
         Text(
           visible=use_inputFilter,

diff --git a/IBPSA/Fluid/Movers/SpeedControlled_Nrpm.mo b/IBPSA/Fluid/Movers/SpeedControlled_Nrpm.mo
@@ -60,21 +60,38 @@ equation
   annotation (defaultComponentName="pump",
     Icon(coordinateSystem(preserveAspectRatio=true,  extent={{-100,-100},{100,
             100}}), graphics={
-            Text(
-              extent={{26,136},{124,114}},
+        Rectangle(
+          extent={{-14,100},{14,58}},
+          lineColor={255,255,255},
+          fillPattern=FillPattern.Solid,
+          fillColor=DynamicSelect({255,255,255}, y_actual*{0,140,72}+(1-y_actual)*{238,46,47}),
+          radius=10),
+        Text( extent={{26,136},{124,114}},
           textString="Nrpm [rpm]",
           lineColor={0,0,127}),
+        Line(
+          points={{0,70},{100,70}},
+          color={0,0,0},
+          smooth=Smooth.None),
+        Line(
+          points={{0,90},{100,90}},
+          color={0,0,0},
+          smooth=Smooth.None),
+        Line(
+          points={{0,100},{0,50}},
+          color={0,0,0},
+          smooth=Smooth.None),
         Rectangle(
           visible=use_inputFilter,
           extent={{-34,40},{32,100}},
           lineColor={0,0,0},
-          fillColor={135,135,135},
+          fillColor=DynamicSelect({135,135,135}, y_actual*{0,140,72}+(1-y_actual)*{238,46,47}),
           fillPattern=FillPattern.Solid),
         Ellipse(
           visible=use_inputFilter,
           extent={{-34,100},{32,40}},
           lineColor={0,0,0},
-          fillColor={135,135,135},
+          fillColor=DynamicSelect({135,135,135}, y_actual*{0,140,72}+(1-y_actual)*{238,46,47}),
           fillPattern=FillPattern.Solid),
         Text(
           visible=use_inputFilter,
@@ -103,6 +120,12 @@ User's Guide</a> for more information.
       revisions="<html>
 <ul>
 <li>
+February 21, 2020, by Michael Wetter:<br/>
+Changed icon to display its operating stage.<br/>
+This is for
+<a href=\"https://github.com/ibpsa/modelica-ibpsa/issues/1294\">#1294</a>.
+</li>
+<li>
 March 24, 2017, by Michael Wetter:<br/>
 Renamed <code>filteredSpeed</code> to <code>use_inputFilter</code>.<br/>
 This is for

diff --git a/IBPSA/Fluid/Movers/SpeedControlled_y.mo b/IBPSA/Fluid/Movers/SpeedControlled_y.mo
@@ -64,22 +64,39 @@ equation
     annotation (defaultComponentName="fan",
     Icon(coordinateSystem(preserveAspectRatio=true,  extent={{-100,-100},{100,
             100}}),
-            graphics={
-            Text(
-              extent={{6,136},{104,114}},
+         graphics={
+        Rectangle(
+          extent={{-14,100},{14,60}},
+          lineColor={255,255,255},
+          fillPattern=FillPattern.Solid,
+          fillColor=DynamicSelect({255,255,255}, y_actual*{0,140,72}+(1-y_actual)*{238,46,47}),
+          radius=10),
+        Text( extent={{6,136},{104,114}},
           lineColor={0,0,127},
           textString="y [0..1]"),
+        Line(
+          points={{0,70},{100,70}},
+          color={0,0,0},
+          smooth=Smooth.None),
+        Line(
+          points={{0,90},{100,90}},
+          color={0,0,0},
+          smooth=Smooth.None),
+        Line(
+          points={{0,100},{0,50}},
+          color={0,0,0},
+          smooth=Smooth.None),
         Rectangle(
           visible=use_inputFilter,
           extent={{-34,40},{32,100}},
           lineColor={0,0,0},
-          fillColor={135,135,135},
+          fillColor=DynamicSelect({135,135,135}, y_actual*{0,140,72}+(1-y_actual)*{238,46,47}),
           fillPattern=FillPattern.Solid),
         Ellipse(
           visible=use_inputFilter,
           extent={{-34,100},{32,40}},
           lineColor={0,0,0},
-          fillColor={135,135,135},
+          fillColor=DynamicSelect({135,135,135}, y_actual*{0,140,72}+(1-y_actual)*{238,46,47}),
           fillPattern=FillPattern.Solid),
         Text(
           visible=use_inputFilter,
@@ -110,6 +127,12 @@ User's Guide</a> for more information.
       revisions="<html>
 <ul>
 <li>
+February 21, 2020, by Michael Wetter:<br/>
+Changed icon to display its operating stage.<br/>
+This is for
+<a href=\"https://github.com/ibpsa/modelica-ibpsa/issues/1294\">#1294</a>.
+</li>
+<li>
 March 24, 2017, by Michael Wetter:<br/>
 Renamed <code>filteredSpeed</code> to <code>use_inputFilter</code>.<br/>
 This is for