Chilled water plant with a non-integrated waterside economizer (WSE) have two cooling modes: diff --git a/Buildings/Applications/DataCenters/ChillerCooled/Controls/Reheat.mo b/Buildings/Applications/DataCenters/ChillerCooled/Controls/Reheat.mo index 0543a2ccc2e..aac57652469 100644 --- a/Buildings/Applications/DataCenters/ChillerCooled/Controls/Reheat.mo +++ b/Buildings/Applications/DataCenters/ChillerCooled/Controls/Reheat.mo @@ -80,7 +80,7 @@ equation borderPattern=BorderPattern.Raised), Text( extent={{-150,150},{150,110}}, textString="%name", - lineColor={0,0,255}), + textColor={0,0,255}), Line( points={{-12,-64},{-12,60}}, color={0,0,127}, diff --git a/Buildings/Applications/DataCenters/ChillerCooled/Equipment/BaseClasses/PartialChillerWSE.mo b/Buildings/Applications/DataCenters/ChillerCooled/Equipment/BaseClasses/PartialChillerWSE.mo index 64f56f8df6a..d5b1e6edfb2 100644 --- a/Buildings/Applications/DataCenters/ChillerCooled/Equipment/BaseClasses/PartialChillerWSE.mo +++ b/Buildings/Applications/DataCenters/ChillerCooled/Equipment/BaseClasses/PartialChillerWSE.mo @@ -454,7 +454,7 @@ equation fillPattern=FillPattern.Solid), Text( extent={{6,16},{16,8}}, - lineColor={0,0,0}, + textColor={0,0,0}, fillColor={255,255,255}, fillPattern=FillPattern.Solid, textStyle={TextStyle.Bold}, diff --git a/Buildings/Applications/DataCenters/ChillerCooled/Equipment/BaseClasses/PartialCoolingCoilHumidifyingHeating.mo b/Buildings/Applications/DataCenters/ChillerCooled/Equipment/BaseClasses/PartialCoolingCoilHumidifyingHeating.mo index d726c643bca..d0162881cd5 100644 --- a/Buildings/Applications/DataCenters/ChillerCooled/Equipment/BaseClasses/PartialCoolingCoilHumidifyingHeating.mo +++ b/Buildings/Applications/DataCenters/ChillerCooled/Equipment/BaseClasses/PartialCoolingCoilHumidifyingHeating.mo @@ -227,9 +227,9 @@ equation connect(yVal, watVal.y_actual) annotation (Line(points={{110,40},{92,40},{73, 40},{73,-5}}, color={0,0,127})); annotation ( Diagram(coordinateSystem(preserveAspectRatio=false), - graphics={Text(extent={{50,74},{76,68}},lineColor={0,0,255}, + graphics={Text(extent={{50,74},{76,68}},textColor={0,0,255}, textString="Waterside",textStyle={TextStyle.Bold}), - Text(extent={{58,-70},{84,-76}},lineColor={0,0,255}, + Text(extent={{58,-70},{84,-76}},textColor={0,0,255}, textString="Airside",textStyle={TextStyle.Bold})}), Documentation(info="
diff --git a/Buildings/Applications/DataCenters/ChillerCooled/Equipment/CoolingCoilHumidifyingHeating.mo b/Buildings/Applications/DataCenters/ChillerCooled/Equipment/CoolingCoilHumidifyingHeating.mo index 26049ae9c38..8104b4c2fd9 100644 --- a/Buildings/Applications/DataCenters/ChillerCooled/Equipment/CoolingCoilHumidifyingHeating.mo +++ b/Buildings/Applications/DataCenters/ChillerCooled/Equipment/CoolingCoilHumidifyingHeating.mo @@ -212,11 +212,11 @@ equation pattern=LinePattern.None), Text( extent={{-42,-20},{2,-66}}, - lineColor={255,255,255}, + textColor={255,255,255}, textString="+"), Text( extent={{-66,-20},{-22,-66}}, - lineColor={255,255,255}, + textColor={255,255,255}, textString="+"), Ellipse( extent={{-60,-52},{-80,-72}}, diff --git a/Buildings/Applications/DataCenters/ChillerCooled/Equipment/ElectricHeater.mo b/Buildings/Applications/DataCenters/ChillerCooled/Equipment/ElectricHeater.mo index b0c056db3ac..4da517a5733 100644 --- a/Buildings/Applications/DataCenters/ChillerCooled/Equipment/ElectricHeater.mo +++ b/Buildings/Applications/DataCenters/ChillerCooled/Equipment/ElectricHeater.mo @@ -110,7 +110,7 @@ equation fillPattern=FillPattern.Solid), Text( extent={{18,-6},{62,-52}}, - lineColor={255,255,255}, + textColor={255,255,255}, textString="+"), Rectangle( extent={{-100,82},{-70,78}}, @@ -126,11 +126,11 @@ equation fillPattern=FillPattern.Solid), Text( extent={{26,108},{94,84}}, - lineColor={0,0,127}, + textColor={0,0,127}, textString="Q_flow"), Text( extent={{-110,102},{-74,84}}, - lineColor={0,0,127}, + textColor={0,0,127}, textString="T"), Rectangle( extent={{-70,60},{-66,82}}, diff --git a/Buildings/Applications/DataCenters/ChillerCooled/Examples/BaseClasses/PostProcess.mo b/Buildings/Applications/DataCenters/ChillerCooled/Examples/BaseClasses/PostProcess.mo index f92a32084c3..9e545710889 100644 --- a/Buildings/Applications/DataCenters/ChillerCooled/Examples/BaseClasses/PostProcess.mo +++ b/Buildings/Applications/DataCenters/ChillerCooled/Examples/BaseClasses/PostProcess.mo @@ -74,27 +74,27 @@ equation pattern=LinePattern.Dot), Text( extent={{174,-164},{282,-192}}, - lineColor={0,0,0}, + textColor={0,0,0}, pattern=LinePattern.Dash, lineThickness=0.5, textString="Post-processing"), Text( extent={{310,120},{254,108}}, - lineColor={0,0,0}, + textColor={0,0,0}, pattern=LinePattern.Dot, fillColor={229,229,229}, fillPattern=FillPattern.Solid, textString="Economizing Hours"), Text( extent={{258,-6},{318,-52}}, - lineColor={0,0,0}, + textColor={0,0,0}, pattern=LinePattern.Dot, fillColor={229,229,229}, fillPattern=FillPattern.Solid, textString="Energy Consumption"), Text( extent={{262,224},{308,200}}, - lineColor={0,0,0}, + textColor={0,0,0}, pattern=LinePattern.Dot, fillColor={229,229,229}, fillPattern=FillPattern.Solid, diff --git a/Buildings/Applications/DataCenters/DXCooled/Controls/AirsideEconomizer.mo b/Buildings/Applications/DataCenters/DXCooled/Controls/AirsideEconomizer.mo index 29fbb1e0f06..4327510fe65 100644 --- a/Buildings/Applications/DataCenters/DXCooled/Controls/AirsideEconomizer.mo +++ b/Buildings/Applications/DataCenters/DXCooled/Controls/AirsideEconomizer.mo @@ -81,7 +81,7 @@ equation fillPattern=FillPattern.Solid), Text( extent={{128,114},{-128,166}}, - lineColor={0,0,255}, + textColor={0,0,255}, textString="%name")}), Documentation(info="
diff --git a/Buildings/Applications/DataCenters/DXCooled/Controls/Compressor.mo b/Buildings/Applications/DataCenters/DXCooled/Controls/Compressor.mo index 73173990f62..b160f1995cf 100644 --- a/Buildings/Applications/DataCenters/DXCooled/Controls/Compressor.mo +++ b/Buildings/Applications/DataCenters/DXCooled/Controls/Compressor.mo @@ -85,7 +85,7 @@ equation fillColor={255,255,255}, fillPattern=FillPattern.Solid), Text( extent={{128,114},{-128,166}}, - lineColor={0,0,255}, + textColor={0,0,255}, textString="%name")}), Diagram(coordinateSystem(preserveAspectRatio=false)), Documentation(info=" diff --git a/Buildings/Applications/DataCenters/DXCooled/Controls/CoolingMode.mo b/Buildings/Applications/DataCenters/DXCooled/Controls/CoolingMode.mo index c8a4d3cd6fa..dd8ec384ad3 100644 --- a/Buildings/Applications/DataCenters/DXCooled/Controls/CoolingMode.mo +++ b/Buildings/Applications/DataCenters/DXCooled/Controls/CoolingMode.mo @@ -142,7 +142,7 @@ equation fillPattern=FillPattern.Solid), Text( extent={{128,114},{-128,166}}, - lineColor={0,0,255}, + textColor={0,0,255}, textString="%name")}), Documentation(info="
diff --git a/Buildings/BaseClasses/BaseIcon.mo b/Buildings/BaseClasses/BaseIcon.mo index 0e3c02a8277..8d6355f6ace 100644 --- a/Buildings/BaseClasses/BaseIcon.mo +++ b/Buildings/BaseClasses/BaseIcon.mo @@ -4,7 +4,7 @@ block BaseIcon "Base icon" annotation (Icon(coordinateSystem(preserveAspectRatio=false, extent={{-100, -100},{100,100}}), graphics={Text( extent={{-46,158},{52,110}}, - lineColor={0,0,255}, + textColor={0,0,255}, textString="%name")}), Documentation( info=" diff --git a/Buildings/BaseClasses/BaseIconLow.mo b/Buildings/BaseClasses/BaseIconLow.mo index 6e5c14c47a5..e2304a37df8 100644 --- a/Buildings/BaseClasses/BaseIconLow.mo +++ b/Buildings/BaseClasses/BaseIconLow.mo @@ -3,7 +3,7 @@ block BaseIconLow "Base icon with model name below the icon" annotation (Icon(graphics={Text( extent={{-46,-94},{52,-142}}, - lineColor={0,0,255}, + textColor={0,0,255}, textString= "%name")}), Documentation( diff --git a/Buildings/BoundaryConditions/SkyTemperature/BlackBody.mo b/Buildings/BoundaryConditions/SkyTemperature/BlackBody.mo index 50a6374411b..87f5bb3b163 100644 --- a/Buildings/BoundaryConditions/SkyTemperature/BlackBody.mo +++ b/Buildings/BoundaryConditions/SkyTemperature/BlackBody.mo @@ -105,29 +105,29 @@ First implementation. Text( extent={{-150,110},{150,150}}, textString="%name", - lineColor={0,0,255}), + textColor={0,0,255}), Text( extent={{-50,44},{56,-40}}, - lineColor={0,0,255}, + textColor={0,0,255}, textString="T"), Text( extent={{-96,84},{-66,74}}, - lineColor={0,0,127}, + textColor={0,0,127}, textString="TDry"), Text( extent={{-90,36},{-66,24}}, - lineColor={0,0,127}, + textColor={0,0,127}, textString="TDewPoi"), Text( extent={{-92,-74},{-62,-88}}, - lineColor={0,0,127}, + textColor={0,0,127}, textString="radHorIR"), Text( extent={{16,-6},{54,-28}}, - lineColor={0,0,255}, + textColor={0,0,255}, textString="bs"), Text( extent={{-88,-24},{-64,-36}}, - lineColor={0,0,127}, + textColor={0,0,127}, textString="nOpa")})); end BlackBody; diff --git a/Buildings/BoundaryConditions/SolarGeometry/BaseClasses/Declination.mo b/Buildings/BoundaryConditions/SolarGeometry/BaseClasses/Declination.mo index 291bd7ce22e..9c8ea2769a3 100644 --- a/Buildings/BoundaryConditions/SolarGeometry/BaseClasses/Declination.mo +++ b/Buildings/BoundaryConditions/SolarGeometry/BaseClasses/Declination.mo @@ -67,5 +67,5 @@ First implementation. Text( extent={{-150,110},{150,150}}, textString="%name", - lineColor={0,0,255})})); + textColor={0,0,255})})); end Declination; diff --git a/Buildings/BoundaryConditions/SolarGeometry/BaseClasses/IncidenceAngle.mo b/Buildings/BoundaryConditions/SolarGeometry/BaseClasses/IncidenceAngle.mo index b7b1cf4abd2..ecfe41cb2fd 100644 --- a/Buildings/BoundaryConditions/SolarGeometry/BaseClasses/IncidenceAngle.mo +++ b/Buildings/BoundaryConditions/SolarGeometry/BaseClasses/IncidenceAngle.mo @@ -59,13 +59,13 @@ First implementation. Text( extent={{-150,110},{150,150}}, textString="%name", - lineColor={0,0,255}), + textColor={0,0,255}), Text( extent={{-98,60},{-56,50}}, - lineColor={0,0,127}, + textColor={0,0,127}, textString="decAng"), Text( extent={{-98,-42},{-42,-54}}, - lineColor={0,0,127}, + textColor={0,0,127}, textString="solHouAng")})); end IncidenceAngle; diff --git a/Buildings/BoundaryConditions/SolarGeometry/BaseClasses/SolarAzimuth.mo b/Buildings/BoundaryConditions/SolarGeometry/BaseClasses/SolarAzimuth.mo index f71da6f9765..d95d971ae2b 100644 --- a/Buildings/BoundaryConditions/SolarGeometry/BaseClasses/SolarAzimuth.mo +++ b/Buildings/BoundaryConditions/SolarGeometry/BaseClasses/SolarAzimuth.mo @@ -88,17 +88,17 @@ First implementation. Text( extent={{-150,110},{150,150}}, textString="%name", - lineColor={0,0,255}), + textColor={0,0,255}), Text( extent={{-100,68},{-58,58}}, - lineColor={0,0,127}, + textColor={0,0,127}, textString="zen"), Text( extent={{-102,-54},{-60,-64}}, - lineColor={0,0,127}, + textColor={0,0,127}, textString="solTim"), Text( extent={{-102,6},{-60,-4}}, - lineColor={0,0,127}, + textColor={0,0,127}, textString="decAng")})); end SolarAzimuth; diff --git a/Buildings/BoundaryConditions/SolarGeometry/BaseClasses/SolarHourAngle.mo b/Buildings/BoundaryConditions/SolarGeometry/BaseClasses/SolarHourAngle.mo index 65bc3f89588..9ad7a010c97 100644 --- a/Buildings/BoundaryConditions/SolarGeometry/BaseClasses/SolarHourAngle.mo +++ b/Buildings/BoundaryConditions/SolarGeometry/BaseClasses/SolarHourAngle.mo @@ -35,5 +35,5 @@ First implementation. Text( extent={{-150,110},{150,150}}, textString="%name", - lineColor={0,0,255})})); + textColor={0,0,255})})); end SolarHourAngle; diff --git a/Buildings/BoundaryConditions/SolarGeometry/BaseClasses/ZenithAngle.mo b/Buildings/BoundaryConditions/SolarGeometry/BaseClasses/ZenithAngle.mo index 8ba1d9a37f6..c0bf8a7cee1 100644 --- a/Buildings/BoundaryConditions/SolarGeometry/BaseClasses/ZenithAngle.mo +++ b/Buildings/BoundaryConditions/SolarGeometry/BaseClasses/ZenithAngle.mo @@ -50,13 +50,13 @@ First implementation. Text( extent={{-150,110},{150,150}}, textString="%name", - lineColor={0,0,255}), + textColor={0,0,255}), Text( extent={{-98,62},{-46,46}}, - lineColor={0,0,127}, + textColor={0,0,127}, textString="decAng"), Text( extent={{-98,-40},{-22,-58}}, - lineColor={0,0,127}, + textColor={0,0,127}, textString="solHouAng")})); end ZenithAngle; diff --git a/Buildings/BoundaryConditions/SolarGeometry/IncidenceAngle.mo b/Buildings/BoundaryConditions/SolarGeometry/IncidenceAngle.mo index 9c57aec7bd8..6f3bbeb7257 100644 --- a/Buildings/BoundaryConditions/SolarGeometry/IncidenceAngle.mo +++ b/Buildings/BoundaryConditions/SolarGeometry/IncidenceAngle.mo @@ -78,6 +78,6 @@ First implementation. 100}}), graphics={Text( extent={{-150,110},{150,150}}, textString="%name", - lineColor={0,0,255}), Bitmap(extent={{-90,-90},{90,90}}, fileName= + textColor={0,0,255}), Bitmap(extent={{-90,-90},{90,90}}, fileName= "modelica://Buildings/Resources/Images/BoundaryConditions/SolarGeometry/BaseClasses/IncidenceAngle.png")})); end IncidenceAngle; diff --git a/Buildings/BoundaryConditions/SolarGeometry/ProjectedShadowLength.mo b/Buildings/BoundaryConditions/SolarGeometry/ProjectedShadowLength.mo index 8815127ab7f..bd206ba8915 100644 --- a/Buildings/BoundaryConditions/SolarGeometry/ProjectedShadowLength.mo +++ b/Buildings/BoundaryConditions/SolarGeometry/ProjectedShadowLength.mo @@ -199,7 +199,7 @@ First implementation. Text( extent={{-150,110},{150,150}}, textString="%name", - lineColor={0,0,255}), + textColor={0,0,255}), Polygon( points={{-50,-34},{38,6},{36,66},{-52,36},{-50,-34}}, lineColor={0,0,0}, diff --git a/Buildings/BoundaryConditions/SolarGeometry/ZenithAngle.mo b/Buildings/BoundaryConditions/SolarGeometry/ZenithAngle.mo index 856737804f1..8b14b952598 100644 --- a/Buildings/BoundaryConditions/SolarGeometry/ZenithAngle.mo +++ b/Buildings/BoundaryConditions/SolarGeometry/ZenithAngle.mo @@ -52,6 +52,6 @@ First implementation. 100}}), graphics={Text( extent={{-150,110},{150,150}}, textString="%name", - lineColor={0,0,255}), Bitmap(extent={{-90,-90},{90,90}}, fileName= + textColor={0,0,255}), Bitmap(extent={{-90,-90},{90,90}}, fileName= "modelica://Buildings/Resources/Images/BoundaryConditions/SolarGeometry/BaseClasses/ZenithAngle.png")})); end ZenithAngle; diff --git a/Buildings/BoundaryConditions/SolarIrradiation/BaseClasses/BrighteningCoefficient.mo b/Buildings/BoundaryConditions/SolarIrradiation/BaseClasses/BrighteningCoefficient.mo index aac3daa13d3..24448568510 100644 --- a/Buildings/BoundaryConditions/SolarIrradiation/BaseClasses/BrighteningCoefficient.mo +++ b/Buildings/BoundaryConditions/SolarIrradiation/BaseClasses/BrighteningCoefficient.mo @@ -141,25 +141,25 @@ First implementation. Text( extent={{-150,110},{150,150}}, textString="%name", - lineColor={0,0,255}), + textColor={0,0,255}), Text( extent={{-96,72},{-52,50}}, - lineColor={0,0,127}, + textColor={0,0,127}, textString="skyCle"), Text( extent={{-96,14},{-52,-8}}, - lineColor={0,0,127}, + textColor={0,0,127}, textString="skyBri"), Text( extent={{-96,-46},{-52,-68}}, - lineColor={0,0,127}, + textColor={0,0,127}, textString="zen"), Text( extent={{62,50},{106,28}}, - lineColor={0,0,127}, + textColor={0,0,127}, textString="F1"), Text( extent={{60,-30},{104,-52}}, - lineColor={0,0,127}, + textColor={0,0,127}, textString="F2")})); end BrighteningCoefficient; diff --git a/Buildings/BoundaryConditions/SolarIrradiation/BaseClasses/DiffuseIsotropic.mo b/Buildings/BoundaryConditions/SolarIrradiation/BaseClasses/DiffuseIsotropic.mo index 377e0bc3bf3..b25ccae4ce7 100644 --- a/Buildings/BoundaryConditions/SolarIrradiation/BaseClasses/DiffuseIsotropic.mo +++ b/Buildings/BoundaryConditions/SolarIrradiation/BaseClasses/DiffuseIsotropic.mo @@ -56,5 +56,5 @@ First implementation. 100}}), graphics={Text( extent={{-150,110},{150,150}}, textString="%name", - lineColor={0,0,255})})); + textColor={0,0,255})})); end DiffuseIsotropic; diff --git a/Buildings/BoundaryConditions/SolarIrradiation/BaseClasses/DiffusePerez.mo b/Buildings/BoundaryConditions/SolarIrradiation/BaseClasses/DiffusePerez.mo index e0aaf0808a7..2c864e24b61 100644 --- a/Buildings/BoundaryConditions/SolarIrradiation/BaseClasses/DiffusePerez.mo +++ b/Buildings/BoundaryConditions/SolarIrradiation/BaseClasses/DiffusePerez.mo @@ -102,29 +102,29 @@ First implementation. Text( extent={{-150,110},{150,150}}, textString="%name", - lineColor={0,0,255}), + textColor={0,0,255}), Text( extent={{-48,74},{-100,86}}, - lineColor={0,0,127}, + textColor={0,0,127}, textString="HGloHor"), Text( extent={{-50,44},{-102,56}}, - lineColor={0,0,127}, + textColor={0,0,127}, textString="HDifHor"), Text( extent={{-50,14},{-102,26}}, - lineColor={0,0,127}, + textColor={0,0,127}, textString="briCof1"), Text( extent={{-50,-16},{-102,-4}}, - lineColor={0,0,127}, + textColor={0,0,127}, textString="briCof2"), Text( extent={{-50,-46},{-102,-34}}, - lineColor={0,0,127}, + textColor={0,0,127}, textString="zen"), Text( extent={{-52,-76},{-104,-64}}, - lineColor={0,0,127}, + textColor={0,0,127}, textString="incAng")})); end DiffusePerez; diff --git a/Buildings/BoundaryConditions/SolarIrradiation/BaseClasses/DirectTiltedSurface.mo b/Buildings/BoundaryConditions/SolarIrradiation/BaseClasses/DirectTiltedSurface.mo index a80e6a49cab..a890df04fd0 100644 --- a/Buildings/BoundaryConditions/SolarIrradiation/BaseClasses/DirectTiltedSurface.mo +++ b/Buildings/BoundaryConditions/SolarIrradiation/BaseClasses/DirectTiltedSurface.mo @@ -46,13 +46,13 @@ First implementation. Text( extent={{-150,110},{150,150}}, textString="%name", - lineColor={0,0,255}), + textColor={0,0,255}), Text( extent={{-50,56},{-102,68}}, - lineColor={0,0,127}, + textColor={0,0,127}, textString="HDirNor"), Text( extent={{-54,-66},{-106,-54}}, - lineColor={0,0,127}, + textColor={0,0,127}, textString="incAng")})); end DirectTiltedSurface; diff --git a/Buildings/BoundaryConditions/SolarIrradiation/BaseClasses/PartialSolarIrradiation.mo b/Buildings/BoundaryConditions/SolarIrradiation/BaseClasses/PartialSolarIrradiation.mo index 3ddd54e18ea..32a95ab6c21 100644 --- a/Buildings/BoundaryConditions/SolarIrradiation/BaseClasses/PartialSolarIrradiation.mo +++ b/Buildings/BoundaryConditions/SolarIrradiation/BaseClasses/PartialSolarIrradiation.mo @@ -33,5 +33,5 @@ First implementation. 100}}), graphics={Text( extent={{-150,110},{150,150}}, textString="%name", - lineColor={0,0,255})})); + textColor={0,0,255})})); end PartialSolarIrradiation; diff --git a/Buildings/BoundaryConditions/SolarIrradiation/BaseClasses/RelativeAirMass.mo b/Buildings/BoundaryConditions/SolarIrradiation/BaseClasses/RelativeAirMass.mo index 78506bb7d82..f145042fb1f 100644 --- a/Buildings/BoundaryConditions/SolarIrradiation/BaseClasses/RelativeAirMass.mo +++ b/Buildings/BoundaryConditions/SolarIrradiation/BaseClasses/RelativeAirMass.mo @@ -46,5 +46,5 @@ First implementation. 100}}), graphics={Text( extent={{-150,110},{150,150}}, textString="%name", - lineColor={0,0,255})})); + textColor={0,0,255})})); end RelativeAirMass; diff --git a/Buildings/BoundaryConditions/SolarIrradiation/BaseClasses/SkyBrightness.mo b/Buildings/BoundaryConditions/SolarIrradiation/BaseClasses/SkyBrightness.mo index f6f123a6cf5..60c11082e21 100644 --- a/Buildings/BoundaryConditions/SolarIrradiation/BaseClasses/SkyBrightness.mo +++ b/Buildings/BoundaryConditions/SolarIrradiation/BaseClasses/SkyBrightness.mo @@ -37,13 +37,13 @@ First implementation. Text( extent={{-150,110},{150,150}}, textString="%name", - lineColor={0,0,255}), + textColor={0,0,255}), Text( extent={{-44,36},{-96,48}}, - lineColor={0,0,127}, + textColor={0,0,127}, textString="relAirMas"), Text( extent={{-44,-46},{-96,-34}}, - lineColor={0,0,127}, + textColor={0,0,127}, textString="HDifHor")})); end SkyBrightness; diff --git a/Buildings/BoundaryConditions/SolarIrradiation/BaseClasses/SkyClearness.mo b/Buildings/BoundaryConditions/SolarIrradiation/BaseClasses/SkyClearness.mo index a178ae4fb3a..65f22aeacc1 100644 --- a/Buildings/BoundaryConditions/SolarIrradiation/BaseClasses/SkyClearness.mo +++ b/Buildings/BoundaryConditions/SolarIrradiation/BaseClasses/SkyClearness.mo @@ -92,17 +92,17 @@ First implementation. Text( extent={{-150,110},{150,150}}, textString="%name", - lineColor={0,0,255}), + textColor={0,0,255}), Text( extent={{-48,-6},{-100,6}}, - lineColor={0,0,127}, + textColor={0,0,127}, textString="HDifHor"), Text( extent={{-48,54},{-100,66}}, - lineColor={0,0,127}, + textColor={0,0,127}, textString="HGloHor"), Text( extent={{-48,-66},{-100,-54}}, - lineColor={0,0,127}, + textColor={0,0,127}, textString="zen")})); end SkyClearness; diff --git a/Buildings/BoundaryConditions/SolarIrradiation/DiffuseIsotropic.mo b/Buildings/BoundaryConditions/SolarIrradiation/DiffuseIsotropic.mo index 9dac3e40744..d7e52cf2c4d 100644 --- a/Buildings/BoundaryConditions/SolarIrradiation/DiffuseIsotropic.mo +++ b/Buildings/BoundaryConditions/SolarIrradiation/DiffuseIsotropic.mo @@ -93,5 +93,5 @@ First implementation. 100}}), graphics={Text( extent={{-150,110},{150,150}}, textString="%name", - lineColor={0,0,255})})); + textColor={0,0,255})})); end DiffuseIsotropic; diff --git a/Buildings/BoundaryConditions/SolarIrradiation/DiffusePerez.mo b/Buildings/BoundaryConditions/SolarIrradiation/DiffusePerez.mo index 2e053ec8f94..7ee92b3cbb6 100644 --- a/Buildings/BoundaryConditions/SolarIrradiation/DiffusePerez.mo +++ b/Buildings/BoundaryConditions/SolarIrradiation/DiffusePerez.mo @@ -190,5 +190,5 @@ First implementation. 100}}), graphics={Text( extent={{-150,110},{150,150}}, textString="%name", - lineColor={0,0,255})})); + textColor={0,0,255})})); end DiffusePerez; diff --git a/Buildings/BoundaryConditions/SolarIrradiation/DirectTiltedSurface.mo b/Buildings/BoundaryConditions/SolarIrradiation/DirectTiltedSurface.mo index d6c3cf6dc3f..577cfc1846d 100644 --- a/Buildings/BoundaryConditions/SolarIrradiation/DirectTiltedSurface.mo +++ b/Buildings/BoundaryConditions/SolarIrradiation/DirectTiltedSurface.mo @@ -80,5 +80,5 @@ First implementation. 100}}), graphics={Text( extent={{-150,110},{150,150}}, textString="%name", - lineColor={0,0,255})})); + textColor={0,0,255})})); end DirectTiltedSurface; diff --git a/Buildings/BoundaryConditions/WeatherData/BaseClasses/CheckPressure.mo b/Buildings/BoundaryConditions/WeatherData/BaseClasses/CheckPressure.mo index 22f0ad39a2a..a3472df6dec 100644 --- a/Buildings/BoundaryConditions/WeatherData/BaseClasses/CheckPressure.mo +++ b/Buildings/BoundaryConditions/WeatherData/BaseClasses/CheckPressure.mo @@ -43,6 +43,6 @@ First implementation. Icon(coordinateSystem(preserveAspectRatio=true, extent={{-100,-100},{100, 100}}), graphics={Text( extent={{-28,42},{26,-34}}, - lineColor={0,0,255}, + textColor={0,0,255}, textString="P")})); end CheckPressure; diff --git a/Buildings/BoundaryConditions/WeatherData/BaseClasses/ConvertTime.mo b/Buildings/BoundaryConditions/WeatherData/BaseClasses/ConvertTime.mo index 4119c22da2b..48a1ca77818 100644 --- a/Buildings/BoundaryConditions/WeatherData/BaseClasses/ConvertTime.mo +++ b/Buildings/BoundaryConditions/WeatherData/BaseClasses/ConvertTime.mo @@ -106,11 +106,11 @@ First implementation. 100}}), graphics={ Text( extent={{-98,6},{-74,-4}}, - lineColor={0,0,127}, + textColor={0,0,127}, textString="modTim"), Text( extent={{74,6},{98,-4}}, - lineColor={0,0,127}, + textColor={0,0,127}, textString="calTim"), Rectangle( extent={{-66,76},{60,58}}, diff --git a/Buildings/BoundaryConditions/WeatherData/BaseClasses/EquationOfTime.mo b/Buildings/BoundaryConditions/WeatherData/BaseClasses/EquationOfTime.mo index 9414ffa31a8..ac9a318edbf 100644 --- a/Buildings/BoundaryConditions/WeatherData/BaseClasses/EquationOfTime.mo +++ b/Buildings/BoundaryConditions/WeatherData/BaseClasses/EquationOfTime.mo @@ -36,13 +36,13 @@ First implementation. 100}}), graphics={Text( extent={{-150,110},{150,150}}, textString="%name", - lineColor={0,0,255}), + textColor={0,0,255}), Text( extent={{-58,38},{38,-24}}, - lineColor={0,0,255}, + textColor={0,0,255}, textString="t"), Text( extent={{-6,4},{52,-24}}, - lineColor={0,0,255}, + textColor={0,0,255}, textString="equ")})); end EquationOfTime; diff --git a/Buildings/BoundaryConditions/WeatherData/BaseClasses/LocalCivilTime.mo b/Buildings/BoundaryConditions/WeatherData/BaseClasses/LocalCivilTime.mo index 861a7f8ead3..5f0c515572d 100644 --- a/Buildings/BoundaryConditions/WeatherData/BaseClasses/LocalCivilTime.mo +++ b/Buildings/BoundaryConditions/WeatherData/BaseClasses/LocalCivilTime.mo @@ -46,9 +46,9 @@ First implementation. Icon(coordinateSystem(preserveAspectRatio=true, extent={{-100,-100},{100, 100}}), graphics={Text( extent={{-98,6},{-60,-6}}, - lineColor={0,0,127}, + textColor={0,0,127}, textString="cloTim"), Text( extent={{74,6},{98,-4}}, - lineColor={0,0,127}, + textColor={0,0,127}, textString="calTim")})); end LocalCivilTime; diff --git a/Buildings/BoundaryConditions/WeatherData/BaseClasses/PartialLimiter.mo b/Buildings/BoundaryConditions/WeatherData/BaseClasses/PartialLimiter.mo index bb36e78a528..a75bf58710a 100644 --- a/Buildings/BoundaryConditions/WeatherData/BaseClasses/PartialLimiter.mo +++ b/Buildings/BoundaryConditions/WeatherData/BaseClasses/PartialLimiter.mo @@ -55,7 +55,7 @@ First implementation. Text( extent={{-150,-150},{150,-110}}, textString="%uMin <= u <= %uMax", - lineColor={0,0,0})}), + textColor={0,0,0})}), Diagram(coordinateSystem( preserveAspectRatio=true, extent={{-100,-100},{100,100}}))); diff --git a/Buildings/BoundaryConditions/WeatherData/BaseClasses/PartialLimiterMin.mo b/Buildings/BoundaryConditions/WeatherData/BaseClasses/PartialLimiterMin.mo index eb63ff7bbbf..5422adc37d8 100644 --- a/Buildings/BoundaryConditions/WeatherData/BaseClasses/PartialLimiterMin.mo +++ b/Buildings/BoundaryConditions/WeatherData/BaseClasses/PartialLimiterMin.mo @@ -37,6 +37,6 @@ First implementation. graphics={ Text( extent={{-100,30},{98,-16}}, - lineColor={0,0,0}, + textColor={0,0,0}, textString="0 <= u")})); end PartialLimiterMin; diff --git a/Buildings/BoundaryConditions/WeatherData/BaseClasses/SolarTime.mo b/Buildings/BoundaryConditions/WeatherData/BaseClasses/SolarTime.mo index 4db5c871b52..2d3fcbd0b69 100644 --- a/Buildings/BoundaryConditions/WeatherData/BaseClasses/SolarTime.mo +++ b/Buildings/BoundaryConditions/WeatherData/BaseClasses/SolarTime.mo @@ -43,21 +43,21 @@ First implementation. 100}}), graphics={Text( extent={{-150,110},{150,150}}, textString="%name", - lineColor={0,0,255}), + textColor={0,0,255}), Text( extent={{-54,38},{42,-24}}, - lineColor={0,0,255}, + textColor={0,0,255}, textString="t"), Text( extent={{-4,4},{52,-24}}, - lineColor={0,0,255}, + textColor={0,0,255}, textString="sol"), Text( extent={{-94,66},{-42,50}}, - lineColor={0,0,127}, + textColor={0,0,127}, textString="equTim"), Text( extent={{-96,-44},{-44,-60}}, - lineColor={0,0,127}, + textColor={0,0,127}, textString="locTim")})); end SolarTime; diff --git a/Buildings/BoundaryConditions/WeatherData/ReaderTMY3.mo b/Buildings/BoundaryConditions/WeatherData/ReaderTMY3.mo index cd239165dec..25a6ee89e56 100644 --- a/Buildings/BoundaryConditions/WeatherData/ReaderTMY3.mo +++ b/Buildings/BoundaryConditions/WeatherData/ReaderTMY3.mo @@ -443,7 +443,7 @@ protected extent={{-100,-100},{100,100}}), graphics={ Text( extent={{-81,32},{84,-24}}, - lineColor={0,0,0}, + textColor={0,0,0}, textString="Latitude")}), Documentation(info="
@@ -487,7 +487,7 @@ First implementation. extent={{-100,-100},{100,100}}), graphics={ Text( extent={{-81,32},{84,-24}}, - lineColor={0,0,0}, + textColor={0,0,0}, textString="Longitude")}), Documentation(info="
@@ -831,7 +831,7 @@ equation Text( extent={{-162,270},{138,230}}, textString="%name", - lineColor={0,0,255}), + textColor={0,0,255}), Text( visible=(pAtmSou == Buildings.BoundaryConditions.Types.DataSource.Input), extent={{-190,216},{-164,184}}, @@ -888,7 +888,7 @@ equation fillColor={230,230,230}), Text( extent={{140,-106},{-126,-192}}, - lineColor={255,255,255}, + textColor={255,255,255}, textString=DynamicSelect("", String(weaBus.TDryBul-273.15, format=".1f")))}), Documentation(info="
diff --git a/Buildings/Controls/Continuous/LimPID.mo b/Buildings/Controls/Continuous/LimPID.mo index a55fb045020..a0a8fe490f4 100644 --- a/Buildings/Controls/Continuous/LimPID.mo +++ b/Buildings/Controls/Continuous/LimPID.mo @@ -260,19 +260,19 @@ equation Line(points={{-50,-40},{-30,-40},{30,40},{50,40}}), Text( extent={{46,-6},{68,-18}}, - lineColor={128,128,128}, + textColor={128,128,128}, textString="u"), Text( extent={{-30,70},{-5,50}}, - lineColor={128,128,128}, + textColor={128,128,128}, textString="y"), Text( extent={{-58,-54},{-28,-42}}, - lineColor={128,128,128}, + textColor={128,128,128}, textString="uMin"), Text( extent={{26,40},{66,56}}, - lineColor={128,128,128}, + textColor={128,128,128}, textString="uMax")})); end Limiter; diff --git a/Buildings/Controls/Continuous/NumberOfRequests.mo b/Buildings/Controls/Continuous/NumberOfRequests.mo index 06a48818f50..fc9a0806e02 100644 --- a/Buildings/Controls/Continuous/NumberOfRequests.mo +++ b/Buildings/Controls/Continuous/NumberOfRequests.mo @@ -85,7 +85,7 @@ First implementation. "), Icon(graphics={ Text( extent={{-128,88},{-6,28}}, - lineColor={0,0,255}, + textColor={0,0,255}, textString="%threShold"), Line(points={{-62,-6},{-4,24}}, color={0,0,255}), Line(points={{-4,24},{64,60}}, color={255,0,0}), diff --git a/Buildings/Controls/Continuous/PIDHysteresis.mo b/Buildings/Controls/Continuous/PIDHysteresis.mo index fc69ef7bd36..4adc45e3ccf 100644 --- a/Buildings/Controls/Continuous/PIDHysteresis.mo +++ b/Buildings/Controls/Continuous/PIDHysteresis.mo @@ -139,7 +139,7 @@ equation Line(points={{-90,-76},{82,-76}}, color={192,192,192}), Text( extent={{-20,-16},{80,-56}}, - lineColor={192,192,192}, + textColor={192,192,192}, textString="PID"), Line(points={{-80,84},{-80,-84}}, color={192,192,192}), Line(points={{-80,-76},{-36,-76},{-36,-30},{36,12},{64,12}}, color={0,0, diff --git a/Buildings/Controls/Continuous/SignalRanker.mo b/Buildings/Controls/Continuous/SignalRanker.mo index db3f03a9406..1c9190641b0 100644 --- a/Buildings/Controls/Continuous/SignalRanker.mo +++ b/Buildings/Controls/Continuous/SignalRanker.mo @@ -35,6 +35,6 @@ First implementation. "), Icon(graphics={Text( extent={{-94,34},{96,-164}}, - lineColor={0,0,255}, + textColor={0,0,255}, textString="y[i] >= y[i+1]")})); end SignalRanker; diff --git a/Buildings/Controls/DemandResponse/BaseClasses/BaselinePrediction.mo b/Buildings/Controls/DemandResponse/BaseClasses/BaselinePrediction.mo index 186ec115be7..de104461fd2 100644 --- a/Buildings/Controls/DemandResponse/BaseClasses/BaselinePrediction.mo +++ b/Buildings/Controls/DemandResponse/BaseClasses/BaselinePrediction.mo @@ -63,7 +63,7 @@ equation {100,100}}), graphics={Text( extent={{-70,64},{74,-54}}, - lineColor={0,0,255}, + textColor={0,0,255}, textString="BL")}), Documentation(info="
diff --git a/Buildings/Controls/DemandResponse/BaseClasses/NormalOperation.mo b/Buildings/Controls/DemandResponse/BaseClasses/NormalOperation.mo index 528f3190b1f..40a28f9c8b9 100644 --- a/Buildings/Controls/DemandResponse/BaseClasses/NormalOperation.mo +++ b/Buildings/Controls/DemandResponse/BaseClasses/NormalOperation.mo @@ -14,7 +14,7 @@ equation annotation (Icon(coordinateSystem(preserveAspectRatio=false, extent={{-100, -100},{100,100}}), graphics={Text( extent={{-70,64},{74,-54}}, - lineColor={0,0,255}, + textColor={0,0,255}, textString="N")}), Documentation(info="
Block that outputs the currently consumed electrical power, diff --git a/Buildings/Controls/DemandResponse/BaseClasses/ShedOperation.mo b/Buildings/Controls/DemandResponse/BaseClasses/ShedOperation.mo index 5f10f93fd75..c8801115f87 100644 --- a/Buildings/Controls/DemandResponse/BaseClasses/ShedOperation.mo +++ b/Buildings/Controls/DemandResponse/BaseClasses/ShedOperation.mo @@ -20,7 +20,7 @@ equation annotation (Icon(coordinateSystem(preserveAspectRatio=false, extent={{-100, -100},{100,100}}), graphics={Text( extent={{-70,64},{74,-54}}, - lineColor={0,0,255}, + textColor={0,0,255}, textString="SH")}), Documentation(info="
This model computes the predicted load as the product of the shed diff --git a/Buildings/Controls/DemandResponse/Client.mo b/Buildings/Controls/DemandResponse/Client.mo index b90f8284481..2bf01e26220 100644 --- a/Buildings/Controls/DemandResponse/Client.mo +++ b/Buildings/Controls/DemandResponse/Client.mo @@ -218,7 +218,7 @@ equation annotation ( Icon(graphics={ Text( extent={{-70,54},{74,-64}}, - lineColor={0,0,255}, + textColor={0,0,255}, textString="DR")}), Documentation(info="
diff --git a/Buildings/Controls/Interfaces/DayTypeInput.mo b/Buildings/Controls/Interfaces/DayTypeInput.mo index f2ff39935e4..0d89eaf216b 100644 --- a/Buildings/Controls/Interfaces/DayTypeInput.mo +++ b/Buildings/Controls/Interfaces/DayTypeInput.mo @@ -23,7 +23,7 @@ annotation ( fillPattern=FillPattern.Solid, points={{0.0,50.0},{100.0,0.0},{0.0,-50.0},{0.0,50.0}}), Text( - lineColor={0,0,127}, + textColor={0,0,127}, extent={{-10.0,60.0},{-10.0,85.0}}, textString="%name")}), Documentation(info=" diff --git a/Buildings/Controls/Interfaces/DayTypeOutput.mo b/Buildings/Controls/Interfaces/DayTypeOutput.mo index 68119acb0b3..75afeab1822 100644 --- a/Buildings/Controls/Interfaces/DayTypeOutput.mo +++ b/Buildings/Controls/Interfaces/DayTypeOutput.mo @@ -22,7 +22,7 @@ annotation ( fillPattern=FillPattern.Solid, points={{-100.0,50.0},{0.0,0.0},{-100.0,-50.0}}), Text( - lineColor={0,0,127}, + textColor={0,0,127}, extent={{30.0,60.0},{30.0,110.0}}, textString="%name")}), Documentation(info=" diff --git a/Buildings/Controls/OBC/ASHRAE/G36_PR1/AHUs/MultiZone/VAV/Controller.mo b/Buildings/Controls/OBC/ASHRAE/G36_PR1/AHUs/MultiZone/VAV/Controller.mo index ee2bcb68b86..1e803860df2 100644 --- a/Buildings/Controls/OBC/ASHRAE/G36_PR1/AHUs/MultiZone/VAV/Controller.mo +++ b/Buildings/Controls/OBC/ASHRAE/G36_PR1/AHUs/MultiZone/VAV/Controller.mo @@ -832,111 +832,111 @@ annotation (defaultComponentName="conAHU", fillPattern=FillPattern.Solid), Text( extent={{-200,450},{200,372}}, textString="%name", - lineColor={0,0,255}), Text( + textColor={0,0,255}), Text( extent={{-200,348},{-116,332}}, - lineColor={0,0,0}, + textColor={0,0,0}, textString="TZonHeaSet"), Text( extent={{102,-48},{202,-68}}, - lineColor={255,0,255}, + textColor={255,0,255}, textString="yReqOutAir"), Text( extent={{-196,-238},{-122,-258}}, - lineColor={255,127,0}, + textColor={255,127,0}, textString="uOpeMod"), Text( extent={{-200,318},{-114,302}}, - lineColor={0,0,0}, + textColor={0,0,0}, textString="TZonCooSet"), Text( extent={{-198,260},{-120,242}}, - lineColor={0,0,0}, + textColor={0,0,0}, textString="ducStaPre"), Text( extent={{-198,288},{-162,272}}, - lineColor={0,0,0}, + textColor={0,0,0}, textString="TOut"), Text( extent={{-196,110},{-90,88}}, - lineColor={0,0,0}, + textColor={0,0,0}, textString="uDesSysVenEff"), Text( extent={{-196,140},{-22,118}}, - lineColor={0,0,0}, + textColor={0,0,0}, textString="VSumDesAreBreZon_flow"), Text( extent={{-196,170},{-20,148}}, - lineColor={0,0,0}, + textColor={0,0,0}, textString="VSumDesPopBreZon_flow"), Text( extent={{-196,200},{-88,182}}, - lineColor={0,0,0}, + textColor={0,0,0}, textString="sumDesZonPop"), Text( extent={{-200,-42},{-154,-62}}, - lineColor={0,0,0}, + textColor={0,0,0}, textString="TSup"), Text( extent={{-200,18},{-84,0}}, - lineColor={0,0,0}, + textColor={0,0,0}, textString="uOutAirFra_max"), Text( extent={{-196,48},{-62,30}}, - lineColor={0,0,0}, + textColor={0,0,0}, textString="VSumSysPriAir_flow"), Text( extent={{-196,80},{-42,58}}, - lineColor={0,0,0}, + textColor={0,0,0}, textString="VSumUncOutAir_flow"), Text( extent={{-200,-162},{-126,-180}}, - lineColor={0,0,0}, + textColor={0,0,0}, textString="VOut_flow"), Text( visible=use_enthalpy, extent={{-200,-130},{-134,-148}}, - lineColor={0,0,0}, + textColor={0,0,0}, textString="hOutCut"), Text( visible=use_enthalpy, extent={{-200,-100},{-160,-118}}, - lineColor={0,0,0}, + textColor={0,0,0}, textString="hOut"), Text( extent={{-198,-70},{-146,-86}}, - lineColor={0,0,0}, + textColor={0,0,0}, textString="TOutCut"), Text( visible=use_TMix, extent={{-200,-200},{-154,-218}}, - lineColor={0,0,0}, + textColor={0,0,0}, textString="TMix"), Text( extent={{-194,-270},{-68,-290}}, - lineColor={255,127,0}, + textColor={255,127,0}, textString="uZonTemResReq"), Text( extent={{-192,-300},{-74,-320}}, - lineColor={255,127,0}, + textColor={255,127,0}, textString="uZonPreResReq"), Text( visible=use_G36FrePro, extent={{-200,-330},{-110,-348}}, - lineColor={255,127,0}, + textColor={255,127,0}, textString="uFreProSta"), Text( extent={{106,252},{198,230}}, - lineColor={0,0,0}, + textColor={0,0,0}, textString="ySupFanSpe"), Text( extent={{122,192},{202,172}}, - lineColor={0,0,0}, + textColor={0,0,0}, textString="TSupSet"), Text( extent={{68,72},{196,52}}, - lineColor={0,0,0}, + textColor={0,0,0}, textString="yAveOutAirFraPlu"), Text( extent={{48,132},{196,110}}, - lineColor={0,0,0}, + textColor={0,0,0}, textString="VDesUncOutAir_flow"), Text( extent={{150,-104},{200,-126}}, - lineColor={0,0,0}, + textColor={0,0,0}, textString="yHea"), Text( extent={{94,-288},{200,-308}}, - lineColor={0,0,0}, + textColor={0,0,0}, textString="yOutDamPos"), Text( extent={{98,-228},{198,-248}}, - lineColor={0,0,0}, + textColor={0,0,0}, textString="yRetDamPos"), Text( extent={{78,14},{196,-6}}, - lineColor={0,0,0}, + textColor={0,0,0}, textString="VEffOutAir_flow"), Text( extent={{120,312},{202,292}}, - lineColor={255,0,255}, + textColor={255,0,255}, textString="ySupFan"), Text( extent={{150,-166},{200,-188}}, - lineColor={0,0,0}, + textColor={0,0,0}, textString="yCoo")}), Documentation(info="
diff --git a/Buildings/Controls/OBC/ASHRAE/G36_PR1/AHUs/MultiZone/VAV/Economizers/Controller.mo b/Buildings/Controls/OBC/ASHRAE/G36_PR1/AHUs/MultiZone/VAV/Economizers/Controller.mo index 59db6251e29..a690bcf3841 100644 --- a/Buildings/Controls/OBC/ASHRAE/G36_PR1/AHUs/MultiZone/VAV/Economizers/Controller.mo +++ b/Buildings/Controls/OBC/ASHRAE/G36_PR1/AHUs/MultiZone/VAV/Economizers/Controller.mo @@ -344,12 +344,12 @@ annotation ( thickness=0.5), Text( extent={{-176,216},{152,178}}, - lineColor={0,0,127}, + textColor={0,0,127}, textString="%name")}), Diagram(coordinateSystem(preserveAspectRatio=false, extent={{-160,-160},{ 160,160}}), graphics={Text( extent={{-140,22},{-110,6}}, - lineColor={95,95,95}, + textColor={95,95,95}, textString="Not included in G36", horizontalAlignment=TextAlignment.Left), Rectangle( @@ -359,7 +359,7 @@ in G36", horizontalAlignment=TextAlignment.Left), fillPattern=FillPattern.Solid), Text( extent={{76,-86},{154,-96}}, - lineColor={95,95,95}, + textColor={95,95,95}, textString="Freeze protection based on TMix, not a part of G36", horizontalAlignment=TextAlignment.Left)}), diff --git a/Buildings/Controls/OBC/ASHRAE/G36_PR1/AHUs/MultiZone/VAV/Economizers/Subsequences/Enable.mo b/Buildings/Controls/OBC/ASHRAE/G36_PR1/AHUs/MultiZone/VAV/Economizers/Subsequences/Enable.mo index c68b17b87f2..2bbcb0c678a 100644 --- a/Buildings/Controls/OBC/ASHRAE/G36_PR1/AHUs/MultiZone/VAV/Economizers/Subsequences/Enable.mo +++ b/Buildings/Controls/OBC/ASHRAE/G36_PR1/AHUs/MultiZone/VAV/Economizers/Subsequences/Enable.mo @@ -298,7 +298,7 @@ annotation ( fillPattern=FillPattern.Solid), Text( extent={{-174,142},{154,104}}, - lineColor={0,0,127}, + textColor={0,0,127}, textString="%name"), Line( points={{0,60},{80,60}}, @@ -334,24 +334,24 @@ annotation ( fillPattern=FillPattern.Solid), Text( extent={{102,168},{184,156}}, - lineColor={0,0,0}, + textColor={0,0,0}, horizontalAlignment=TextAlignment.Left, textString="Outdoor air conditions"), Text( extent={{100,70},{278,36}}, - lineColor={0,0,0}, + textColor={0,0,0}, horizontalAlignment=TextAlignment.Left, textString="Freeze protection - disable if stage1 and above"), Text( extent={{100,-180},{268,-228}}, - lineColor={0,0,0}, + textColor={0,0,0}, horizontalAlignment=TextAlignment.Left, textString="Damper position limit assignments with delays"), Text( extent={{100,102},{194,92}}, - lineColor={0,0,0}, + textColor={0,0,0}, horizontalAlignment=TextAlignment.Left, textString="Supply fan status")}), Documentation(info=" diff --git a/Buildings/Controls/OBC/ASHRAE/G36_PR1/AHUs/MultiZone/VAV/Economizers/Subsequences/Limits.mo b/Buildings/Controls/OBC/ASHRAE/G36_PR1/AHUs/MultiZone/VAV/Economizers/Subsequences/Limits.mo index 066a244e889..d44a2f14f21 100644 --- a/Buildings/Controls/OBC/ASHRAE/G36_PR1/AHUs/MultiZone/VAV/Economizers/Subsequences/Limits.mo +++ b/Buildings/Controls/OBC/ASHRAE/G36_PR1/AHUs/MultiZone/VAV/Economizers/Subsequences/Limits.mo @@ -274,7 +274,7 @@ annotation ( fillPattern=FillPattern.Solid), Text( extent={{-88,138},{88,108}}, - lineColor={0,0,127}, + textColor={0,0,127}, textString="%name"), Line( points={{-60,-60},{2,62},{2,62},{64,-60},{-60,-60}}, @@ -303,33 +303,33 @@ annotation ( fillPattern=FillPattern.Solid), Text( extent={{26,230},{172,184}}, - lineColor={0,0,0}, + textColor={0,0,0}, horizontalAlignment=TextAlignment.Left, textString="Damper position limit calculation and assignments"), Text( extent={{-170,160},{-4,130}}, - lineColor={0,0,0}, + textColor={0,0,0}, horizontalAlignment=TextAlignment.Left, textString="Physical damper position limits set at commissioning"), Text( extent={{28,78},{150,30}}, - lineColor={0,0,0}, + textColor={0,0,0}, horizontalAlignment=TextAlignment.Left, textString="Switches to deactivate limit modulation"), Text( extent={{-80,-196},{124,-226}}, - lineColor={0,0,0}, + textColor={0,0,0}, horizontalAlignment=TextAlignment.Left, textString="Enable/disable conditions for damper position limits control loop"), Text( extent={{-170,126},{14,94}}, - lineColor={0,0,0}, + textColor={0,0,0}, horizontalAlignment=TextAlignment.Left, textString="Damper position limits outdoor air volume flow diff --git a/Buildings/Controls/OBC/ASHRAE/G36_PR1/AHUs/MultiZone/VAV/Economizers/Subsequences/Modulation.mo b/Buildings/Controls/OBC/ASHRAE/G36_PR1/AHUs/MultiZone/VAV/Economizers/Subsequences/Modulation.mo index 82e7c507e02..839926e89ed 100644 --- a/Buildings/Controls/OBC/ASHRAE/G36_PR1/AHUs/MultiZone/VAV/Economizers/Subsequences/Modulation.mo +++ b/Buildings/Controls/OBC/ASHRAE/G36_PR1/AHUs/MultiZone/VAV/Economizers/Subsequences/Modulation.mo @@ -170,7 +170,7 @@ annotation ( thickness=0.5), Text( extent={{-108,138},{102,110}}, - lineColor={0,0,127}, + textColor={0,0,127}, textString="%name")}), Diagram(coordinateSystem(preserveAspectRatio=false, extent={{-120,-120},{ 120,120}}), graphics={ @@ -186,13 +186,13 @@ annotation ( fillPattern=FillPattern.Solid), Text( extent={{-116,118},{-34,102}}, - lineColor={0,0,0}, + textColor={0,0,0}, horizontalAlignment=TextAlignment.Left, textString="Damper position supply air temperature control loop"), Text( extent={{-24,118},{24,106}}, - lineColor={0,0,0}, + textColor={0,0,0}, horizontalAlignment=TextAlignment.Left, textString="Damper position assignments"), @@ -203,7 +203,7 @@ assignments"), fillPattern=FillPattern.Solid), Text( extent={{54,118},{120,96}}, - lineColor={0,0,0}, + textColor={0,0,0}, horizontalAlignment=TextAlignment.Left, textString="Overwrite if the freeze protection that tracks TFre at the measured diff --git a/Buildings/Controls/OBC/ASHRAE/G36_PR1/AHUs/MultiZone/VAV/Economizers/Subsequences/Validation/Enable_FreProSta.mo b/Buildings/Controls/OBC/ASHRAE/G36_PR1/AHUs/MultiZone/VAV/Economizers/Subsequences/Validation/Enable_FreProSta.mo index f3f6207a8d4..c0da0770745 100644 --- a/Buildings/Controls/OBC/ASHRAE/G36_PR1/AHUs/MultiZone/VAV/Economizers/Subsequences/Validation/Enable_FreProSta.mo +++ b/Buildings/Controls/OBC/ASHRAE/G36_PR1/AHUs/MultiZone/VAV/Economizers/Subsequences/Validation/Enable_FreProSta.mo @@ -108,7 +108,7 @@ equation coordinateSystem(preserveAspectRatio=false, extent={{-180,-180},{180,180}}), graphics={ Text( extent={{58,-38},{176,-64}}, - lineColor={0,0,0}, + textColor={0,0,0}, horizontalAlignment=TextAlignment.Left, textString="Tests freeze protection disable condition")}), Documentation(info=" diff --git a/Buildings/Controls/OBC/ASHRAE/G36_PR1/AHUs/MultiZone/VAV/Economizers/Subsequences/Validation/Enable_TOut_hOut.mo b/Buildings/Controls/OBC/ASHRAE/G36_PR1/AHUs/MultiZone/VAV/Economizers/Subsequences/Validation/Enable_TOut_hOut.mo index ff0fa5bc5ec..39ae764ece3 100644 --- a/Buildings/Controls/OBC/ASHRAE/G36_PR1/AHUs/MultiZone/VAV/Economizers/Subsequences/Validation/Enable_TOut_hOut.mo +++ b/Buildings/Controls/OBC/ASHRAE/G36_PR1/AHUs/MultiZone/VAV/Economizers/Subsequences/Validation/Enable_TOut_hOut.mo @@ -190,7 +190,7 @@ annotation ( coordinateSystem(preserveAspectRatio=false, extent={{-260,-220},{260,220}}), graphics={Text( extent={{-50,214},{530,162}}, - lineColor={0,0,0}, + textColor={0,0,0}, horizontalAlignment=TextAlignment.Left, textString="Example high limit cutoff conditions: ASHRAE 90.1-2013: @@ -199,17 +199,17 @@ annotation ( hOut > 28 Btu/lb [65.1 kJ/kg]"), Text( extent={{-82,-40},{14,-66}}, - lineColor={0,0,0}, + textColor={0,0,0}, horizontalAlignment=TextAlignment.Left, textString="Tests temperature hysteresis"), Text( extent={{80,-40},{166,-66}}, - lineColor={0,0,0}, + textColor={0,0,0}, horizontalAlignment=TextAlignment.Left, textString="Tests enthalpy hysteresis"), Text( extent={{204,-46},{272,-68}}, - lineColor={0,0,0}, + textColor={0,0,0}, horizontalAlignment=TextAlignment.Left, textString="No enthalpy sensor")}), diff --git a/Buildings/Controls/OBC/ASHRAE/G36_PR1/AHUs/MultiZone/VAV/Economizers/Subsequences/Validation/Limits_LoopDisable.mo b/Buildings/Controls/OBC/ASHRAE/G36_PR1/AHUs/MultiZone/VAV/Economizers/Subsequences/Validation/Limits_LoopDisable.mo index 3fa43e8a629..26c262154bc 100644 --- a/Buildings/Controls/OBC/ASHRAE/G36_PR1/AHUs/MultiZone/VAV/Economizers/Subsequences/Validation/Limits_LoopDisable.mo +++ b/Buildings/Controls/OBC/ASHRAE/G36_PR1/AHUs/MultiZone/VAV/Economizers/Subsequences/Validation/Limits_LoopDisable.mo @@ -150,7 +150,7 @@ annotation ( 220,120}}), graphics={ Text( extent={{-200,110},{-174,100}}, - lineColor={0,0,0}, + textColor={0,0,0}, lineThickness=0.5, fillColor={255,255,255}, fillPattern=FillPattern.Solid, @@ -158,7 +158,7 @@ annotation ( textString="Fan is off"), Text( extent={{-60,114},{34,100}}, - lineColor={0,0,0}, + textColor={0,0,0}, lineThickness=0.5, fillColor={255,255,255}, fillPattern=FillPattern.Solid, @@ -166,7 +166,7 @@ annotation ( textString="Operation mode is other than occupied"), Text( extent={{80,114},{172,100}}, - lineColor={0,0,0}, + textColor={0,0,0}, lineThickness=0.5, fillColor={255,255,255}, fillPattern=FillPattern.Solid, diff --git a/Buildings/Controls/OBC/ASHRAE/G36_PR1/AHUs/MultiZone/VAV/Economizers/Validation/Controller_Disable.mo b/Buildings/Controls/OBC/ASHRAE/G36_PR1/AHUs/MultiZone/VAV/Economizers/Validation/Controller_Disable.mo index 3118f4fe5c6..fe127a2f6d9 100644 --- a/Buildings/Controls/OBC/ASHRAE/G36_PR1/AHUs/MultiZone/VAV/Economizers/Validation/Controller_Disable.mo +++ b/Buildings/Controls/OBC/ASHRAE/G36_PR1/AHUs/MultiZone/VAV/Economizers/Validation/Controller_Disable.mo @@ -193,21 +193,21 @@ equation 220,160}}), graphics={ Text( extent={{20,140},{104,112}}, - lineColor={0,0,0}, + textColor={0,0,0}, horizontalAlignment=TextAlignment.Left, textString="Disable modulation enable minimal outdoor air control"), Text( extent={{100,140},{184,112}}, - lineColor={0,0,0}, + textColor={0,0,0}, horizontalAlignment=TextAlignment.Left, textString="Disable modulation and minimal outdoor air control (freeze protection is at stage2)"), Text( extent={{160,-12},{218,-40}}, - lineColor={0,0,0}, + textColor={0,0,0}, horizontalAlignment=TextAlignment.Left, textString="Overide damper positions based on the TMix tracking diff --git a/Buildings/Controls/OBC/ASHRAE/G36_PR1/AHUs/MultiZone/VAV/Economizers/Validation/Controller_Mod_DamLim.mo b/Buildings/Controls/OBC/ASHRAE/G36_PR1/AHUs/MultiZone/VAV/Economizers/Validation/Controller_Mod_DamLim.mo index 2cff4b74a66..5a88d2a485e 100644 --- a/Buildings/Controls/OBC/ASHRAE/G36_PR1/AHUs/MultiZone/VAV/Economizers/Validation/Controller_Mod_DamLim.mo +++ b/Buildings/Controls/OBC/ASHRAE/G36_PR1/AHUs/MultiZone/VAV/Economizers/Validation/Controller_Mod_DamLim.mo @@ -150,13 +150,13 @@ equation fillPattern=FillPattern.Solid), Text( extent={{-128,-132},{-36,-152}}, - lineColor={0,0,0}, + textColor={0,0,0}, horizontalAlignment=TextAlignment.Left, textString="Enable both damper limit and modulation control loops"), Text( extent={{92,14},{140,-10}}, - lineColor={0,0,0}, + textColor={0,0,0}, horizontalAlignment=TextAlignment.Left, textString="Economizer fully enabled - validate damper position @@ -165,7 +165,7 @@ and damper position limits enthalpy measurement)"), Text( extent={{20,46},{70,24}}, - lineColor={0,0,0}, + textColor={0,0,0}, horizontalAlignment=TextAlignment.Left, textString="Economizer fully enabled - validate damper position diff --git a/Buildings/Controls/OBC/ASHRAE/G36_PR1/AHUs/MultiZone/VAV/SetPoints/ExhaustDamper.mo b/Buildings/Controls/OBC/ASHRAE/G36_PR1/AHUs/MultiZone/VAV/SetPoints/ExhaustDamper.mo index 3dbe2baab27..f6df617d774 100644 --- a/Buildings/Controls/OBC/ASHRAE/G36_PR1/AHUs/MultiZone/VAV/SetPoints/ExhaustDamper.mo +++ b/Buildings/Controls/OBC/ASHRAE/G36_PR1/AHUs/MultiZone/VAV/SetPoints/ExhaustDamper.mo @@ -99,19 +99,19 @@ annotation ( fillPattern=FillPattern.Solid), Text( extent={{-94,74},{-64,46}}, - lineColor={0,0,127}, + textColor={0,0,127}, fillColor={0,0,0}, fillPattern=FillPattern.Solid, textString="dpBui"), Text( extent={{-94,-48},{-70,-70}}, - lineColor={0,0,127}, + textColor={0,0,127}, fillColor={0,0,0}, fillPattern=FillPattern.Solid, textString="uSupFan"), Text( extent={{52,16},{96,-18}}, - lineColor={0,0,127}, + textColor={0,0,127}, fillColor={0,0,0}, fillPattern=FillPattern.Solid, textString="yExhDamPos"), @@ -130,7 +130,7 @@ annotation ( Line(points={{-80,-78},{-80,-78},{14,62},{80,62}}, color={0,0,127}), Text( extent={{-100,140},{100,100}}, - lineColor={0,0,255}, + textColor={0,0,255}, textString="%name")}), Diagram(coordinateSystem(preserveAspectRatio=false, extent={{-80,-80},{80,80}})), Documentation(info=" diff --git a/Buildings/Controls/OBC/ASHRAE/G36_PR1/AHUs/MultiZone/VAV/SetPoints/OutdoorAirFlow/AHU.mo b/Buildings/Controls/OBC/ASHRAE/G36_PR1/AHUs/MultiZone/VAV/SetPoints/OutdoorAirFlow/AHU.mo index 3d837f11a28..9968a7c9fff 100644 --- a/Buildings/Controls/OBC/ASHRAE/G36_PR1/AHUs/MultiZone/VAV/SetPoints/OutdoorAirFlow/AHU.mo +++ b/Buildings/Controls/OBC/ASHRAE/G36_PR1/AHUs/MultiZone/VAV/SetPoints/OutdoorAirFlow/AHU.mo @@ -306,67 +306,67 @@ annotation ( fillPattern=FillPattern.Solid), Text( extent={{-100,158},{100,118}}, - lineColor={0,0,255}, + textColor={0,0,255}, textString="%name"), Text( extent={{-98,98},{-34,86}}, - lineColor={0,0,0}, + textColor={0,0,0}, textString="sumDesZonPop"), Text( extent={{-96,-62},{-52,-76}}, - lineColor={255,0,255}, + textColor={255,0,255}, textString="uSupFan"), Text( extent={{-96,-82},{-50,-96}}, - lineColor={255,127,0}, + textColor={255,127,0}, textString="uOpeMod"), Text( extent={{-98,78},{-12,62}}, - lineColor={0,0,0}, + textColor={0,0,0}, textString="VDesPopBreZon_flow"), Text( extent={{-98,58},{-12,42}}, - lineColor={0,0,0}, + textColor={0,0,0}, textString="VDesAreBreZon_flow"), Text( extent={{-98,38},{-34,26}}, - lineColor={0,0,0}, + textColor={0,0,0}, textString="desSysVenEff"), Text( extent={{-98,18},{-30,4}}, - lineColor={0,0,0}, + textColor={0,0,0}, textString="VUncOutAir_flow"), Text( extent={{-98,-2},{-34,-18}}, - lineColor={0,0,0}, + textColor={0,0,0}, textString="VSysPriAir_flow"), Text( extent={{-98,-22},{-28,-38}}, - lineColor={0,0,0}, + textColor={0,0,0}, textString="uOutAirFra_max"), Text( extent={{42,-74},{102,-86}}, - lineColor={255,0,255}, + textColor={255,0,255}, textString="yReqOutAir"), Text( extent={{20,88},{96,72}}, - lineColor={0,0,0}, + textColor={0,0,0}, textString="VDesUncOutAir_flow"), Text( extent={{30,60},{98,44}}, - lineColor={0,0,0}, + textColor={0,0,0}, textString="yAveOutAirFraPlu"), Text( extent={{34,30},{98,12}}, - lineColor={0,0,0}, + textColor={0,0,0}, textString="VDesOutAir_flow"), Text( extent={{38,-10},{98,-26}}, - lineColor={0,0,0}, + textColor={0,0,0}, textString="VEffOutAir_flow"), Text( extent={{18,-40},{98,-56}}, - lineColor={0,0,0}, + textColor={0,0,0}, textString="effOutAir_normalized")}), Diagram(coordinateSystem(preserveAspectRatio=false, extent={{-220,-240},{240,240}})), Documentation(info=" diff --git a/Buildings/Controls/OBC/ASHRAE/G36_PR1/AHUs/MultiZone/VAV/SetPoints/OutdoorAirFlow/SumZone.mo b/Buildings/Controls/OBC/ASHRAE/G36_PR1/AHUs/MultiZone/VAV/SetPoints/OutdoorAirFlow/SumZone.mo index 198be99173c..254a05ea0b8 100644 --- a/Buildings/Controls/OBC/ASHRAE/G36_PR1/AHUs/MultiZone/VAV/SetPoints/OutdoorAirFlow/SumZone.mo +++ b/Buildings/Controls/OBC/ASHRAE/G36_PR1/AHUs/MultiZone/VAV/SetPoints/OutdoorAirFlow/SumZone.mo @@ -215,67 +215,67 @@ annotation ( fillPattern=FillPattern.Solid), Text( extent={{-100,158},{100,118}}, - lineColor={0,0,255}, + textColor={0,0,255}, textString="%name"), Text( extent={{-98,88},{-34,74}}, - lineColor={0,0,0}, + textColor={0,0,0}, textString="uDesZonPeaOcc"), Text( extent={{-98,68},{-22,54}}, - lineColor={0,0,0}, + textColor={0,0,0}, textString="VDesPopBreZon_flow"), Text( extent={{-98,26},{-30,14}}, - lineColor={0,0,0}, + textColor={0,0,0}, textString="yAveOutAirFraPlu"), Text( extent={{-98,48},{-24,32}}, - lineColor={0,0,0}, + textColor={0,0,0}, textString="VDesAreBreZon_flow"), Text( extent={{-98,-52},{-44,-66}}, - lineColor={0,0,0}, + textColor={0,0,0}, textString="uPriOutAirFra"), Text( extent={{-98,-74},{-50,-86}}, - lineColor={0,0,0}, + textColor={0,0,0}, textString="VPriAir_flow"), Text( extent={{-98,-32},{-30,-46}}, - lineColor={0,0,0}, + textColor={0,0,0}, textString="VUncOutAir_flow"), Text( extent={{-98,-12},{-28,-26}}, - lineColor={0,0,0}, + textColor={0,0,0}, textString="uDesPriOutAirFra"), Text( extent={{42,8},{96,-6}}, - lineColor={0,0,0}, + textColor={0,0,0}, textString="yDesSysVenEff"), Text( extent={{12,40},{96,24}}, - lineColor={0,0,0}, + textColor={0,0,0}, textString="VSumDesAreBreZon_flow"), Text( extent={{12,70},{96,54}}, - lineColor={0,0,0}, + textColor={0,0,0}, textString="VSumDesPopBreZon_flow"), Text( extent={{36,98},{96,82}}, - lineColor={0,0,0}, + textColor={0,0,0}, textString="ySumDesZonPop"), Text( extent={{36,-50},{96,-66}}, - lineColor={0,0,0}, + textColor={0,0,0}, textString="uOutAirFra_max"), Text( extent={{26,-20},{96,-36}}, - lineColor={0,0,0}, + textColor={0,0,0}, textString="VSumUncOutAir_flow"), Text( extent={{24,-80},{96,-96}}, - lineColor={0,0,0}, + textColor={0,0,0}, textString="VSumSysPriAir_flow")}), Diagram(coordinateSystem(preserveAspectRatio=false, extent={{-100,-140},{100,140}})), defaultComponentName="zonToSys", diff --git a/Buildings/Controls/OBC/ASHRAE/G36_PR1/AHUs/MultiZone/VAV/SetPoints/OutdoorAirFlow/Zone.mo b/Buildings/Controls/OBC/ASHRAE/G36_PR1/AHUs/MultiZone/VAV/SetPoints/OutdoorAirFlow/Zone.mo index d0539544fd4..7d3c1f59bba 100644 --- a/Buildings/Controls/OBC/ASHRAE/G36_PR1/AHUs/MultiZone/VAV/SetPoints/OutdoorAirFlow/Zone.mo +++ b/Buildings/Controls/OBC/ASHRAE/G36_PR1/AHUs/MultiZone/VAV/SetPoints/OutdoorAirFlow/Zone.mo @@ -425,65 +425,65 @@ annotation ( fillPattern=FillPattern.Solid), Text( extent={{-98,-82},{-14,-98}}, - lineColor={0,0,0}, + textColor={0,0,0}, textString="VUncOut_flow_nominal"), Text( extent={{-100,158},{100,118}}, - lineColor={0,0,255}, + textColor={0,0,255}, textString="%name"), Text( extent={{-100,-54},{-58,-64}}, - lineColor={0,0,0}, + textColor={0,0,0}, textString="VDis_flow"), Text( extent={{-100,-24},{-72,-36}}, - lineColor={0,0,0}, + textColor={0,0,0}, textString="TDis"), Text( extent={{-100,8},{-70,-4}}, - lineColor={0,0,0}, + textColor={0,0,0}, textString="TZon"), Text( extent={{-100,36},{-40,24}}, - lineColor={255,0,255}, + textColor={255,0,255}, textString="uReqOutAir"), Text( visible=have_winSen, extent={{-100,68},{-72,56}}, - lineColor={255,0,255}, + textColor={255,0,255}, textString="uWin"), Text( visible=have_occSen, extent={{-100,98},{-70,86}}, - lineColor={255,127,0}, + textColor={255,127,0}, textString="nOcc"), Text( extent={{28,98},{98,82}}, - lineColor={0,0,0}, + textColor={0,0,0}, textString="yDesZonPeaOcc"), Text( extent={{12,70},{96,54}}, - lineColor={0,0,0}, + textColor={0,0,0}, textString="VDesPopBreZon_flow"), Text( extent={{14,38},{98,22}}, - lineColor={0,0,0}, + textColor={0,0,0}, textString="VDesAreBreZon_flow"), Text( extent={{28,10},{98,-8}}, - lineColor={0,0,0}, + textColor={0,0,0}, textString="yDesPriOutAirFra"), Text( extent={{28,-20},{98,-36}}, - lineColor={0,0,0}, + textColor={0,0,0}, textString="VUncOutAir_flow"), Text( extent={{40,-50},{96,-66}}, - lineColor={0,0,0}, + textColor={0,0,0}, textString="yPriOutAirFra"), Text( extent={{48,-82},{98,-96}}, - lineColor={0,0,0}, + textColor={0,0,0}, textString="VPriAir_flow")}), Diagram(coordinateSystem(preserveAspectRatio=false, extent={{-160,-260},{180,260}})), Documentation(info=" diff --git a/Buildings/Controls/OBC/ASHRAE/G36_PR1/AHUs/MultiZone/VAV/SetPoints/ReturnFanDirectPressure.mo b/Buildings/Controls/OBC/ASHRAE/G36_PR1/AHUs/MultiZone/VAV/SetPoints/ReturnFanDirectPressure.mo index 7500c704d60..0d1b562d893 100644 --- a/Buildings/Controls/OBC/ASHRAE/G36_PR1/AHUs/MultiZone/VAV/SetPoints/ReturnFanDirectPressure.mo +++ b/Buildings/Controls/OBC/ASHRAE/G36_PR1/AHUs/MultiZone/VAV/SetPoints/ReturnFanDirectPressure.mo @@ -157,7 +157,7 @@ annotation ( defaultComponentName="buiPreCon", Icon(graphics={ Text(extent={{-98,142},{102,102}}, - lineColor={0,0,255}, + textColor={0,0,255}, textString="%name"), Rectangle( extent={{-100,-100},{100,100}}, @@ -177,7 +177,7 @@ annotation ( thickness=0.5), Text( extent={{-50,-36},{60,-62}}, - lineColor={28,108,200}, + textColor={28,108,200}, textString="Building pressure control loop signal")}), Diagram(coordinateSystem(preserveAspectRatio=false, extent={{-140,-140},{120,140}}), graphics={ @@ -195,14 +195,14 @@ annotation ( pattern=LinePattern.None), Text( extent={{-138,140},{-62,122}}, - lineColor={0,0,255}, + textColor={0,0,255}, fillColor={215,215,215}, fillPattern=FillPattern.Solid, horizontalAlignment=TextAlignment.Left, textString="Exhaust air damper control"), Text( extent={{-136,-98},{-12,-120}}, - lineColor={0,0,255}, + textColor={0,0,255}, fillColor={215,215,215}, fillPattern=FillPattern.Solid, horizontalAlignment=TextAlignment.Left, diff --git a/Buildings/Controls/OBC/ASHRAE/G36_PR1/AHUs/MultiZone/VAV/SetPoints/SupplyFan.mo b/Buildings/Controls/OBC/ASHRAE/G36_PR1/AHUs/MultiZone/VAV/SetPoints/SupplyFan.mo index c6c46ae4f5b..1d89c49706b 100644 --- a/Buildings/Controls/OBC/ASHRAE/G36_PR1/AHUs/MultiZone/VAV/SetPoints/SupplyFan.mo +++ b/Buildings/Controls/OBC/ASHRAE/G36_PR1/AHUs/MultiZone/VAV/SetPoints/SupplyFan.mo @@ -307,27 +307,27 @@ annotation ( pattern=LinePattern.None), Text( extent={{42,156},{124,134}}, - lineColor={0,0,255}, + textColor={0,0,255}, fillColor={215,215,215}, fillPattern=FillPattern.Solid, horizontalAlignment=TextAlignment.Left, textString="Check current operation mode"), Text( extent={{54,-26},{124,-38}}, - lineColor={0,0,255}, + textColor={0,0,255}, fillColor={215,215,215}, fillPattern=FillPattern.Solid, horizontalAlignment=TextAlignment.Left, textString="Reset pressure setpoint"), Text( extent={{-34,-106},{20,-136}}, - lineColor={0,0,255}, + textColor={0,0,255}, fillColor={215,215,215}, fillPattern=FillPattern.Solid, textString="Control fan speed"), Text( extent={{42,142},{96,126}}, - lineColor={0,0,255}, + textColor={0,0,255}, fillColor={215,215,215}, fillPattern=FillPattern.Solid, horizontalAlignment=TextAlignment.Left, @@ -335,7 +335,7 @@ annotation ( Icon(graphics={ Text( extent={{-102,140},{96,118}}, - lineColor={0,0,255}, + textColor={0,0,255}, textString="%name"), Rectangle( extent={{-100,100},{100,-100}}, @@ -344,27 +344,27 @@ annotation ( fillPattern=FillPattern.Solid), Text( extent={{-96,90},{-54,70}}, - lineColor={0,0,127}, + textColor={0,0,127}, textString="uOpeMod"), Text( extent={{-96,-16},{-44,-44}}, - lineColor={0,0,127}, + textColor={0,0,127}, textString="uZonPreResReq"), Text( extent={{-96,-70},{-54,-90}}, - lineColor={0,0,127}, + textColor={0,0,127}, textString="ducStaPre"), Text( extent={{54,-60},{96,-80}}, - lineColor={0,0,127}, + textColor={0,0,127}, textString="sumVDis_flow"), Text( extent={{52,10},{94,-10}}, - lineColor={0,0,127}, + textColor={0,0,127}, textString="yFanSpe"), Text( extent={{52,78},{94,58}}, - lineColor={0,0,127}, + textColor={0,0,127}, textString="ySupFan")}), Documentation(info="
diff --git a/Buildings/Controls/OBC/ASHRAE/G36_PR1/AHUs/MultiZone/VAV/SetPoints/SupplySignals.mo b/Buildings/Controls/OBC/ASHRAE/G36_PR1/AHUs/MultiZone/VAV/SetPoints/SupplySignals.mo index f7be96913d4..86ece77e2b0 100644 --- a/Buildings/Controls/OBC/ASHRAE/G36_PR1/AHUs/MultiZone/VAV/SetPoints/SupplySignals.mo +++ b/Buildings/Controls/OBC/ASHRAE/G36_PR1/AHUs/MultiZone/VAV/SetPoints/SupplySignals.mo @@ -179,37 +179,37 @@ annotation ( fillPattern=FillPattern.Solid), Text( extent={{-96,8},{-64,-6}}, - lineColor={0,0,127}, + textColor={0,0,127}, pattern=LinePattern.Dash, textString="TSup"), Text( extent={{-94,-38},{-48,-62}}, - lineColor={0,0,127}, + textColor={0,0,127}, pattern=LinePattern.Dash, textString="uSupFan"), Text( extent={{76,8},{96,-2}}, - lineColor={0,0,127}, + textColor={0,0,127}, pattern=LinePattern.Dash, textString="yHea"), Text( extent={{74,46},{96,34}}, - lineColor={0,0,127}, + textColor={0,0,127}, pattern=LinePattern.Dash, textString="uTSup"), Text( extent={{76,-34},{96,-44}}, - lineColor={0,0,127}, + textColor={0,0,127}, pattern=LinePattern.Dash, textString="yCoo"), Text( extent={{-96,56},{-56,42}}, - lineColor={0,0,127}, + textColor={0,0,127}, pattern=LinePattern.Dash, textString="TSupSet"), Text( extent={{-124,146},{96,108}}, - lineColor={0,0,255}, + textColor={0,0,255}, textString="%name")}),Documentation(info="
Block that outputs the supply temperature control loop signal, diff --git a/Buildings/Controls/OBC/ASHRAE/G36_PR1/AHUs/MultiZone/VAV/SetPoints/SupplyTemperature.mo b/Buildings/Controls/OBC/ASHRAE/G36_PR1/AHUs/MultiZone/VAV/SetPoints/SupplyTemperature.mo index 511300c8e83..7145d66f724 100644 --- a/Buildings/Controls/OBC/ASHRAE/G36_PR1/AHUs/MultiZone/VAV/SetPoints/SupplyTemperature.mo +++ b/Buildings/Controls/OBC/ASHRAE/G36_PR1/AHUs/MultiZone/VAV/SetPoints/SupplyTemperature.mo @@ -278,37 +278,37 @@ annotation ( fillPattern=FillPattern.Solid), Text( extent={{-94,92},{-42,66}}, - lineColor={0,0,127}, + textColor={0,0,127}, pattern=LinePattern.Dash, textString="TZonSetAve"), Text( extent={{-96,46},{-68,34}}, - lineColor={0,0,127}, + textColor={0,0,127}, pattern=LinePattern.Dash, textString="TOut"), Text( extent={{-94,-22},{-14,-58}}, - lineColor={0,0,127}, + textColor={0,0,127}, pattern=LinePattern.Dash, textString="uZonTemResReq"), Text( extent={{-94,12},{-48,-12}}, - lineColor={0,0,127}, + textColor={0,0,127}, pattern=LinePattern.Dash, textString="uSupFan"), Text( extent={{-94,-70},{-50,-90}}, - lineColor={0,0,127}, + textColor={0,0,127}, pattern=LinePattern.Dash, textString="uOpeMod"), Text( extent={{68,8},{96,-8}}, - lineColor={0,0,127}, + textColor={0,0,127}, pattern=LinePattern.Dash, textString="TSupSet"), Text( extent={{-124,146},{96,108}}, - lineColor={0,0,255}, + textColor={0,0,255}, textString="%name")}), Diagram(coordinateSystem(preserveAspectRatio=false, extent={{-140,-140},{140,120}})), Documentation(info=" diff --git a/Buildings/Controls/OBC/ASHRAE/G36_PR1/AHUs/MultiZone/VAV/SetPoints/package.mo b/Buildings/Controls/OBC/ASHRAE/G36_PR1/AHUs/MultiZone/VAV/SetPoints/package.mo index eb5b9c09697..0dad80d5c29 100644 --- a/Buildings/Controls/OBC/ASHRAE/G36_PR1/AHUs/MultiZone/VAV/SetPoints/package.mo +++ b/Buildings/Controls/OBC/ASHRAE/G36_PR1/AHUs/MultiZone/VAV/SetPoints/package.mo @@ -19,6 +19,6 @@ This package contains sequences generating setpoints for VAV AHU control. radius=25.0), Text( extent={{-100,100},{100,-100}}, - lineColor={0,0,0}, + textColor={0,0,0}, textString="S")})); end SetPoints; diff --git a/Buildings/Controls/OBC/ASHRAE/G36_PR1/AHUs/SingleZone/VAV/Controller.mo b/Buildings/Controls/OBC/ASHRAE/G36_PR1/AHUs/SingleZone/VAV/Controller.mo index 0e54ec484c5..d5f8a7bb3e0 100644 --- a/Buildings/Controls/OBC/ASHRAE/G36_PR1/AHUs/SingleZone/VAV/Controller.mo +++ b/Buildings/Controls/OBC/ASHRAE/G36_PR1/AHUs/SingleZone/VAV/Controller.mo @@ -643,142 +643,142 @@ annotation (defaultComponentName="conVAV", Text( extent={{-148,312},{152,272}}, textString="%name", - lineColor={0,0,255}), + textColor={0,0,255}), Text( extent={{-192,262},{-138,224}}, - lineColor={0,0,127}, + textColor={0,0,127}, fillColor={0,0,0}, fillPattern=FillPattern.Solid, textString="TOut"), Text( extent={{-194,218},{-140,180}}, - lineColor={0,0,127}, + textColor={0,0,127}, fillColor={0,0,0}, fillPattern=FillPattern.Solid, textString="tNexOcc"), Text( extent={{-192,180},{-138,142}}, - lineColor={0,0,127}, + textColor={0,0,127}, fillColor={0,0,0}, fillPattern=FillPattern.Solid, textString="TZon"), Text( extent={{-192,140},{-138,102}}, - lineColor={0,0,127}, + textColor={0,0,127}, fillColor={0,0,0}, fillPattern=FillPattern.Solid, textString="uOcc"), Text( extent={{-192,102},{-138,64}}, - lineColor={0,0,127}, + textColor={0,0,127}, fillColor={0,0,0}, fillPattern=FillPattern.Solid, textString="TCut"), Text( extent={{-192,62},{-138,24}}, - lineColor={0,0,127}, + textColor={0,0,127}, fillColor={0,0,0}, fillPattern=FillPattern.Solid, textString="TSup"), Text( visible=use_TMix, extent={{-192,20},{-138,-18}}, - lineColor={0,0,127}, + textColor={0,0,127}, fillColor={0,0,0}, fillPattern=FillPattern.Solid, textString="TMix"), Text( visible=have_occSen, extent={{-192,-56},{-138,-18}}, - lineColor={0,0,127}, + textColor={0,0,127}, fillColor={0,0,0}, fillPattern=FillPattern.Solid, textString="nOcc"), Text( extent={{-192,-58},{-138,-96}}, - lineColor={0,0,127}, + textColor={0,0,127}, fillColor={0,0,0}, fillPattern=FillPattern.Solid, textString="uWin"), Text( visible=use_enthalpy, extent={{-192,-136},{-138,-174}}, - lineColor={0,0,127}, + textColor={0,0,127}, fillColor={0,0,0}, fillPattern=FillPattern.Solid, textString="hCut"), Text( visible=use_enthalpy, extent={{-192,-98},{-138,-136}}, - lineColor={0,0,127}, + textColor={0,0,127}, fillColor={0,0,0}, fillPattern=FillPattern.Solid, textString="hOut"), Text( visible=use_fixed_plus_differential_drybulb, extent={{-192,-180},{-138,-218}}, - lineColor={0,0,127}, + textColor={0,0,127}, fillColor={0,0,0}, fillPattern=FillPattern.Solid, textString="TRet"), Text( visible=use_G36FrePro, extent={{-192,-218},{-138,-256}}, - lineColor={0,0,127}, + textColor={0,0,127}, fillColor={0,0,0}, fillPattern=FillPattern.Solid, textString="uFreProSta"), Text( extent={{132,242},{186,204}}, - lineColor={0,0,127}, + textColor={0,0,127}, fillColor={0,0,0}, fillPattern=FillPattern.Solid, textString="TSupHeaEco"), Text( extent={{136,190},{190,152}}, - lineColor={0,0,127}, + textColor={0,0,127}, fillColor={0,0,0}, fillPattern=FillPattern.Solid, textString="TSupCoo"), Text( extent={{136,140},{190,102}}, - lineColor={0,0,127}, + textColor={0,0,127}, fillColor={0,0,0}, fillPattern=FillPattern.Solid, textString="yFan"), Text( extent={{136,82},{190,44}}, - lineColor={0,0,127}, + textColor={0,0,127}, fillColor={0,0,0}, fillPattern=FillPattern.Solid, textString="TZonHeaSet"), Text( extent={{140,22},{194,-16}}, - lineColor={0,0,127}, + textColor={0,0,127}, fillColor={0,0,0}, fillPattern=FillPattern.Solid, textString="TZonCooSet"), Text( extent={{140,-40},{194,-78}}, - lineColor={0,0,127}, + textColor={0,0,127}, fillColor={0,0,0}, fillPattern=FillPattern.Solid, textString="yHeaCoi"), Text( extent={{140,-100},{194,-138}}, - lineColor={0,0,127}, + textColor={0,0,127}, fillColor={0,0,0}, fillPattern=FillPattern.Solid, textString="yCooCoi"), Text( extent={{138,-150},{192,-188}}, - lineColor={0,0,127}, + textColor={0,0,127}, fillColor={0,0,0}, fillPattern=FillPattern.Solid, textString="yOutDamPos"), Text( extent={{140,-200},{194,-238}}, - lineColor={0,0,127}, + textColor={0,0,127}, fillColor={0,0,0}, fillPattern=FillPattern.Solid, textString="yRetDamPos")}), diff --git a/Buildings/Controls/OBC/ASHRAE/G36_PR1/AHUs/SingleZone/VAV/CoolingCoil.mo b/Buildings/Controls/OBC/ASHRAE/G36_PR1/AHUs/SingleZone/VAV/CoolingCoil.mo index 5f33a8a7634..655ca6d027e 100644 --- a/Buildings/Controls/OBC/ASHRAE/G36_PR1/AHUs/SingleZone/VAV/CoolingCoil.mo +++ b/Buildings/Controls/OBC/ASHRAE/G36_PR1/AHUs/SingleZone/VAV/CoolingCoil.mo @@ -95,7 +95,7 @@ equation Text( extent={{-150,150},{150,110}}, textString="%name", - lineColor={0,0,255})}), + textColor={0,0,255})}), Diagram(coordinateSystem( preserveAspectRatio=false)), Documentation(info=" diff --git a/Buildings/Controls/OBC/ASHRAE/G36_PR1/AHUs/SingleZone/VAV/Economizers/Controller.mo b/Buildings/Controls/OBC/ASHRAE/G36_PR1/AHUs/SingleZone/VAV/Economizers/Controller.mo index f69846ad1d0..51bbaed9fce 100644 --- a/Buildings/Controls/OBC/ASHRAE/G36_PR1/AHUs/SingleZone/VAV/Economizers/Controller.mo +++ b/Buildings/Controls/OBC/ASHRAE/G36_PR1/AHUs/SingleZone/VAV/Economizers/Controller.mo @@ -430,7 +430,7 @@ annotation (defaultComponentName = "conEco", thickness=0.5), Text( extent={{-170,142},{158,104}}, - lineColor={0,0,127}, + textColor={0,0,127}, textString="%name")}), Diagram(coordinateSystem(preserveAspectRatio=false, extent={{-140,-160}, {140,160}}), @@ -441,7 +441,7 @@ annotation (defaultComponentName = "conEco", fillPattern=FillPattern.Solid), Text( extent={{56,-86},{134,-96}}, - lineColor={95,95,95}, + textColor={95,95,95}, textString="Freeze protection based on TMix, not a part of G36", horizontalAlignment=TextAlignment.Left)}), diff --git a/Buildings/Controls/OBC/ASHRAE/G36_PR1/AHUs/SingleZone/VAV/Economizers/Subsequences/Enable.mo b/Buildings/Controls/OBC/ASHRAE/G36_PR1/AHUs/SingleZone/VAV/Economizers/Subsequences/Enable.mo index a8c1377b5a2..9aca341d62f 100644 --- a/Buildings/Controls/OBC/ASHRAE/G36_PR1/AHUs/SingleZone/VAV/Economizers/Subsequences/Enable.mo +++ b/Buildings/Controls/OBC/ASHRAE/G36_PR1/AHUs/SingleZone/VAV/Economizers/Subsequences/Enable.mo @@ -314,7 +314,7 @@ annotation ( thickness=0.5), Text( extent={{-170,142},{158,104}}, - lineColor={0,0,127}, + textColor={0,0,127}, textString="%name")}), Diagram(coordinateSystem( preserveAspectRatio=false, @@ -346,29 +346,29 @@ annotation ( fillPattern=FillPattern.Solid), Text( extent={{102,168},{178,156}}, - lineColor={0,0,0}, + textColor={0,0,0}, horizontalAlignment=TextAlignment.Left, textString="Outdoor air conditions"), Text( extent={{100,70},{264,48}}, - lineColor={0,0,0}, + textColor={0,0,0}, horizontalAlignment=TextAlignment.Left, textString="Freeze protection - disable if stage1 and above"), Text( extent={{100,-34},{214,-86}}, - lineColor={0,0,0}, + textColor={0,0,0}, horizontalAlignment=TextAlignment.Left, textString="Damper position limit assignments"), Text( extent={{102,16},{206,-22}}, - lineColor={0,0,0}, + textColor={0,0,0}, horizontalAlignment=TextAlignment.Left, textString="Zone state - disable if heating"), Text( extent={{100,102},{182,92}}, - lineColor={0,0,0}, + textColor={0,0,0}, horizontalAlignment=TextAlignment.Left, textString="Supply fan status")}), Documentation(info=" diff --git a/Buildings/Controls/OBC/ASHRAE/G36_PR1/AHUs/SingleZone/VAV/Economizers/Subsequences/Limits.mo b/Buildings/Controls/OBC/ASHRAE/G36_PR1/AHUs/SingleZone/VAV/Economizers/Subsequences/Limits.mo index c63b72062b6..d3c94d2b92d 100644 --- a/Buildings/Controls/OBC/ASHRAE/G36_PR1/AHUs/SingleZone/VAV/Economizers/Subsequences/Limits.mo +++ b/Buildings/Controls/OBC/ASHRAE/G36_PR1/AHUs/SingleZone/VAV/Economizers/Subsequences/Limits.mo @@ -303,7 +303,7 @@ annotation (Placement(transformation(extent={{-20,110},{0,130}})), fillPattern=FillPattern.Solid), Text( extent={{-124,146},{128,110}}, - lineColor={0,0,127}, + textColor={0,0,127}, textString="%name"), Ellipse( extent={{-4,-10},{0,-14}}, @@ -318,7 +318,7 @@ annotation (Placement(transformation(extent={{-20,110},{0,130}})), fillPattern=FillPattern.Solid), Text( extent={{-52,-156},{158,-194}}, - lineColor={0,0,0}, + textColor={0,0,0}, horizontalAlignment=TextAlignment.Left, textString="Enable/disable conditions for damper position limits @@ -330,7 +330,7 @@ control loop"), fillPattern=FillPattern.Solid), Text( extent={{-140,212},{-32,194}}, - lineColor={0,0,0}, + textColor={0,0,0}, horizontalAlignment=TextAlignment.Left, textString="Values set at commissioning"), Rectangle( @@ -340,12 +340,12 @@ control loop"), fillPattern=FillPattern.Solid), Text( extent={{48,212},{126,196}}, - lineColor={0,0,0}, + textColor={0,0,0}, horizontalAlignment=TextAlignment.Left, textString="Damper position limit"), Text( extent={{50,198},{152,186}}, - lineColor={0,0,0}, + textColor={0,0,0}, textString="calculation and assignments")}), Documentation(info="
diff --git a/Buildings/Controls/OBC/ASHRAE/G36_PR1/AHUs/SingleZone/VAV/Economizers/Subsequences/Modulation.mo b/Buildings/Controls/OBC/ASHRAE/G36_PR1/AHUs/SingleZone/VAV/Economizers/Subsequences/Modulation.mo index b34be2d3f4d..793427b825b 100644 --- a/Buildings/Controls/OBC/ASHRAE/G36_PR1/AHUs/SingleZone/VAV/Economizers/Subsequences/Modulation.mo +++ b/Buildings/Controls/OBC/ASHRAE/G36_PR1/AHUs/SingleZone/VAV/Economizers/Subsequences/Modulation.mo @@ -217,7 +217,7 @@ equation thickness=0.5), Text( extent={{-108,138},{102,110}}, - lineColor={0,0,127}, + textColor={0,0,127}, textString="%name"), Line( points={{-50,-84},{-94,80}}, @@ -237,13 +237,13 @@ equation fillPattern=FillPattern.Solid), Text( extent={{-104,128},{-60,88}}, - lineColor={0,0,0}, + textColor={0,0,0}, horizontalAlignment=TextAlignment.Left, textString="Damper position supply air temperature control loop"), Text( extent={{32,128},{76,88}}, - lineColor={0,0,0}, + textColor={0,0,0}, horizontalAlignment=TextAlignment.Left, textString="Damper position assignments and heating coil signal")}), diff --git a/Buildings/Controls/OBC/ASHRAE/G36_PR1/AHUs/SingleZone/VAV/Economizers/Subsequences/Validation/Enable_FreProSta_ZonSta.mo b/Buildings/Controls/OBC/ASHRAE/G36_PR1/AHUs/SingleZone/VAV/Economizers/Subsequences/Validation/Enable_FreProSta_ZonSta.mo index 98521c176a1..e08df25b30e 100644 --- a/Buildings/Controls/OBC/ASHRAE/G36_PR1/AHUs/SingleZone/VAV/Economizers/Subsequences/Validation/Enable_FreProSta_ZonSta.mo +++ b/Buildings/Controls/OBC/ASHRAE/G36_PR1/AHUs/SingleZone/VAV/Economizers/Subsequences/Validation/Enable_FreProSta_ZonSta.mo @@ -126,12 +126,12 @@ equation coordinateSystem(preserveAspectRatio=false, extent={{-180,-180},{180,180}}), graphics={ Text( extent={{80,42},{164,14}}, - lineColor={0,0,0}, + textColor={0,0,0}, horizontalAlignment=TextAlignment.Left, textString="Tests zone state disable condition"), Text( extent={{80,-40},{178,-58}}, - lineColor={0,0,0}, + textColor={0,0,0}, horizontalAlignment=TextAlignment.Left, textString="Tests freeze protection disable condition")}), Documentation(info=" diff --git a/Buildings/Controls/OBC/ASHRAE/G36_PR1/AHUs/SingleZone/VAV/Economizers/Subsequences/Validation/Enable_TOut_hOut.mo b/Buildings/Controls/OBC/ASHRAE/G36_PR1/AHUs/SingleZone/VAV/Economizers/Subsequences/Validation/Enable_TOut_hOut.mo index fb59c6d948d..ea4a026f670 100644 --- a/Buildings/Controls/OBC/ASHRAE/G36_PR1/AHUs/SingleZone/VAV/Economizers/Subsequences/Validation/Enable_TOut_hOut.mo +++ b/Buildings/Controls/OBC/ASHRAE/G36_PR1/AHUs/SingleZone/VAV/Economizers/Subsequences/Validation/Enable_TOut_hOut.mo @@ -211,7 +211,7 @@ equation coordinateSystem(preserveAspectRatio=false, extent={{-260,-180},{260,180}}), graphics={Text( extent={{-234,168},{346,116}}, - lineColor={0,0,0}, + textColor={0,0,0}, horizontalAlignment=TextAlignment.Left, textString="Example high limit cutoff conditions: ASHRAE 90.1-2013: @@ -220,23 +220,23 @@ equation hOut > 28 Btu/lb [65.1 kJ/kg]"), Text( extent={{-82,-82},{0,-96}}, - lineColor={0,0,0}, + textColor={0,0,0}, horizontalAlignment=TextAlignment.Left, textString="Tests temperature hysteresis"), Text( extent={{80,-80},{156,-96}}, - lineColor={0,0,0}, + textColor={0,0,0}, horizontalAlignment=TextAlignment.Left, textString="Tests enthalpy hysteresis"), Text( extent={{208,-82},{260,-100}}, - lineColor={0,0,0}, + textColor={0,0,0}, horizontalAlignment=TextAlignment.Left, textString="No enthalpy sensor"), Text( extent={{116,146},{226,114}}, - lineColor={0,0,0}, + textColor={0,0,0}, horizontalAlignment=TextAlignment.Left, textString="Tests fixed + differential drybulb")}), Documentation(info=" diff --git a/Buildings/Controls/OBC/ASHRAE/G36_PR1/AHUs/SingleZone/VAV/Economizers/Subsequences/Validation/Limits_Disable.mo b/Buildings/Controls/OBC/ASHRAE/G36_PR1/AHUs/SingleZone/VAV/Economizers/Subsequences/Validation/Limits_Disable.mo index 2ae1352f5b1..3432206f4a4 100644 --- a/Buildings/Controls/OBC/ASHRAE/G36_PR1/AHUs/SingleZone/VAV/Economizers/Subsequences/Validation/Limits_Disable.mo +++ b/Buildings/Controls/OBC/ASHRAE/G36_PR1/AHUs/SingleZone/VAV/Economizers/Subsequences/Validation/Limits_Disable.mo @@ -156,7 +156,7 @@ equation Diagram(coordinateSystem(preserveAspectRatio=false, extent={{-180,-120},{180,120}}), graphics={ Text( extent={{-160,110},{-130,100}}, - lineColor={0,0,0}, + textColor={0,0,0}, lineThickness=0.5, fillColor={255,255,255}, fillPattern=FillPattern.Solid, @@ -164,7 +164,7 @@ equation textString="Fan status"), Text( extent={{-40,110},{4,98}}, - lineColor={0,0,0}, + textColor={0,0,0}, lineThickness=0.5, fillColor={255,255,255}, fillPattern=FillPattern.Solid, @@ -172,7 +172,7 @@ equation textString="Operation mode"), Text( extent={{80,112},{146,96}}, - lineColor={0,0,0}, + textColor={0,0,0}, lineThickness=0.5, fillColor={255,255,255}, fillPattern=FillPattern.Solid, diff --git a/Buildings/Controls/OBC/ASHRAE/G36_PR1/AHUs/SingleZone/VAV/Economizers/Subsequences/Validation/Limits_FanSpe_VOut_flow.mo b/Buildings/Controls/OBC/ASHRAE/G36_PR1/AHUs/SingleZone/VAV/Economizers/Subsequences/Validation/Limits_FanSpe_VOut_flow.mo index 91dfe41f5d3..ad2a374e0be 100644 --- a/Buildings/Controls/OBC/ASHRAE/G36_PR1/AHUs/SingleZone/VAV/Economizers/Subsequences/Validation/Limits_FanSpe_VOut_flow.mo +++ b/Buildings/Controls/OBC/ASHRAE/G36_PR1/AHUs/SingleZone/VAV/Economizers/Subsequences/Validation/Limits_FanSpe_VOut_flow.mo @@ -106,7 +106,7 @@ equation Diagram(coordinateSystem(preserveAspectRatio=false, extent={{-140,-120},{140,120}}), graphics={ Text( extent={{-126,114},{-2,98}}, - lineColor={0,0,0}, + textColor={0,0,0}, lineThickness=0.5, fillColor={255,255,255}, fillPattern=FillPattern.Solid, @@ -115,7 +115,7 @@ equation constant minimum outdoor airflow setpoint"), Text( extent={{8,110},{140,96}}, - lineColor={0,0,0}, + textColor={0,0,0}, lineThickness=0.5, fillColor={255,255,255}, fillPattern=FillPattern.Solid, diff --git a/Buildings/Controls/OBC/ASHRAE/G36_PR1/AHUs/SingleZone/VAV/Economizers/Validation/Controller_Disable.mo b/Buildings/Controls/OBC/ASHRAE/G36_PR1/AHUs/SingleZone/VAV/Economizers/Validation/Controller_Disable.mo index 38edaeeed7d..83f75e38eea 100644 --- a/Buildings/Controls/OBC/ASHRAE/G36_PR1/AHUs/SingleZone/VAV/Economizers/Validation/Controller_Disable.mo +++ b/Buildings/Controls/OBC/ASHRAE/G36_PR1/AHUs/SingleZone/VAV/Economizers/Validation/Controller_Disable.mo @@ -238,7 +238,7 @@ equation graphics={ Text( extent={{20,148},{166,124}}, - lineColor={0,0,0}, + textColor={0,0,0}, horizontalAlignment=TextAlignment.Left, textString="Disable modulation (zone state is heating), @@ -246,7 +246,7 @@ enable minimal outdoor air control"), Text( extent={{100,148},{212,120}}, - lineColor={0,0,0}, + textColor={0,0,0}, horizontalAlignment=TextAlignment.Left, textString="Disable modulation (zone state is heating) @@ -255,7 +255,7 @@ outdoor air control (freeze protection is at stage2)"), Text( extent={{180,10},{238,-18}}, - lineColor={0,0,0}, + textColor={0,0,0}, horizontalAlignment=TextAlignment.Left, textString="Overide damper positions based on the TMix tracking diff --git a/Buildings/Controls/OBC/ASHRAE/G36_PR1/AHUs/SingleZone/VAV/Economizers/Validation/Controller_Mod_DamLim.mo b/Buildings/Controls/OBC/ASHRAE/G36_PR1/AHUs/SingleZone/VAV/Economizers/Validation/Controller_Mod_DamLim.mo index dc01f656862..01987125834 100644 --- a/Buildings/Controls/OBC/ASHRAE/G36_PR1/AHUs/SingleZone/VAV/Economizers/Validation/Controller_Mod_DamLim.mo +++ b/Buildings/Controls/OBC/ASHRAE/G36_PR1/AHUs/SingleZone/VAV/Economizers/Validation/Controller_Mod_DamLim.mo @@ -204,20 +204,20 @@ equation fillPattern=FillPattern.Solid), Text( extent={{-128,-132},{-22,-154}}, - lineColor={0,0,0}, + textColor={0,0,0}, horizontalAlignment=TextAlignment.Left, textString="Enable both damper limit and modulation control loops"), Text( extent={{100,6},{154,-16}}, - lineColor={0,0,0}, + textColor={0,0,0}, horizontalAlignment=TextAlignment.Left, textString="Validate damper modulation (example without enthalpy measurement)"), Text( extent={{20,42},{84,22}}, - lineColor={0,0,0}, + textColor={0,0,0}, horizontalAlignment=TextAlignment.Left, textString="Economizer fully enabled - validate damper position limits")}), diff --git a/Buildings/Controls/OBC/ASHRAE/G36_PR1/AHUs/SingleZone/VAV/SetPoints/ExhaustDamper.mo b/Buildings/Controls/OBC/ASHRAE/G36_PR1/AHUs/SingleZone/VAV/SetPoints/ExhaustDamper.mo index 3b6409fa1ff..534b39b208a 100644 --- a/Buildings/Controls/OBC/ASHRAE/G36_PR1/AHUs/SingleZone/VAV/SetPoints/ExhaustDamper.mo +++ b/Buildings/Controls/OBC/ASHRAE/G36_PR1/AHUs/SingleZone/VAV/SetPoints/ExhaustDamper.mo @@ -125,19 +125,19 @@ annotation ( fillPattern=FillPattern.Solid), Text( extent={{-96,78},{-42,40}}, - lineColor={0,0,127}, + textColor={0,0,127}, fillColor={0,0,0}, fillPattern=FillPattern.Solid, textString="uOutDamPos"), Text( extent={{-94,-48},{-62,-72}}, - lineColor={0,0,127}, + textColor={0,0,127}, fillColor={0,0,0}, fillPattern=FillPattern.Solid, textString="uSupFan"), Text( extent={{46,18},{96,-18}}, - lineColor={0,0,127}, + textColor={0,0,127}, fillColor={0,0,0}, fillPattern=FillPattern.Solid, textString="yExhDamPos"), @@ -156,7 +156,7 @@ annotation ( Line(points={{-46,-78},{14,62},{80,62}}, color={0,0,127}), Text( extent={{-100,140},{100,100}}, - lineColor={0,0,255}, + textColor={0,0,255}, textString="%name")}), Diagram(coordinateSystem(preserveAspectRatio=false, extent={{-100,-100},{100, 100}})), diff --git a/Buildings/Controls/OBC/ASHRAE/G36_PR1/AHUs/SingleZone/VAV/SetPoints/OutsideAirFlow.mo b/Buildings/Controls/OBC/ASHRAE/G36_PR1/AHUs/SingleZone/VAV/SetPoints/OutsideAirFlow.mo index a654f4b1473..5975bd3edbc 100644 --- a/Buildings/Controls/OBC/ASHRAE/G36_PR1/AHUs/SingleZone/VAV/SetPoints/OutsideAirFlow.mo +++ b/Buildings/Controls/OBC/ASHRAE/G36_PR1/AHUs/SingleZone/VAV/SetPoints/OutsideAirFlow.mo @@ -223,11 +223,11 @@ Icon(graphics={Rectangle( fillColor={255,255,255}, fillPattern=FillPattern.Solid), Text( extent={{-84,78},{92,-72}}, - lineColor={0,0,0}, + textColor={0,0,0}, textString="VOutMinSet_flow"), Text( extent={{-100,140},{100,100}}, - lineColor={0,0,255}, + textColor={0,0,255}, textString="%name")}), Diagram( coordinateSystem(preserveAspectRatio=false, diff --git a/Buildings/Controls/OBC/ASHRAE/G36_PR1/AHUs/SingleZone/VAV/SetPoints/Supply.mo b/Buildings/Controls/OBC/ASHRAE/G36_PR1/AHUs/SingleZone/VAV/SetPoints/Supply.mo index c87e8c2f370..cba09aad696 100644 --- a/Buildings/Controls/OBC/ASHRAE/G36_PR1/AHUs/SingleZone/VAV/SetPoints/Supply.mo +++ b/Buildings/Controls/OBC/ASHRAE/G36_PR1/AHUs/SingleZone/VAV/SetPoints/Supply.mo @@ -373,7 +373,7 @@ annotation ( Text( extent={{-150,174},{150,134}}, textString="%name", - lineColor={0,0,255}), + textColor={0,0,255}), Polygon( points={{80,-76},{58,-70},{58,-82},{80,-76}}, lineColor={95,95,95}, @@ -388,11 +388,11 @@ annotation ( fillPattern=FillPattern.Solid), Text( extent={{-88,-6},{-47,-26}}, - lineColor={0,0,0}, + textColor={0,0,0}, textString="T"), Text( extent={{64,-82},{88,-93}}, - lineColor={0,0,0}, + textColor={0,0,0}, textString="u"), Line( points={{-44,-6},{-30,-6},{-14,-42},{26,-42},{38,-62},{60,-62}}, @@ -411,43 +411,43 @@ annotation ( fillPattern=FillPattern.Solid), Text( extent={{-98,104},{-72,82}}, - lineColor={0,0,127}, + textColor={0,0,127}, fillColor={0,0,0}, fillPattern=FillPattern.Solid, textString="uHea"), Text( extent={{-98,68},{-72,46}}, - lineColor={0,0,127}, + textColor={0,0,127}, fillColor={0,0,0}, fillPattern=FillPattern.Solid, textString="uCoo"), Text( extent={{68,72},{94,50}}, - lineColor={0,0,127}, + textColor={0,0,127}, fillColor={0,0,0}, fillPattern=FillPattern.Solid, textString="TSupHeaEco"), Text( extent={{68,12},{94,-10}}, - lineColor={0,0,127}, + textColor={0,0,127}, fillColor={0,0,0}, fillPattern=FillPattern.Solid, textString="TSupCoo"), Text( extent={{74,-50},{100,-72}}, - lineColor={0,0,127}, + textColor={0,0,127}, fillColor={0,0,0}, fillPattern=FillPattern.Solid, textString="y"), Text( extent={{-96,-12},{-70,-34}}, - lineColor={0,0,127}, + textColor={0,0,127}, fillColor={0,0,0}, fillPattern=FillPattern.Solid, textString="TZon"), Text( extent={{-98,-50},{-72,-72}}, - lineColor={0,0,127}, + textColor={0,0,127}, fillColor={0,0,0}, fillPattern=FillPattern.Solid, textString="TOut"), @@ -459,20 +459,20 @@ annotation ( fillPattern=FillPattern.Solid), Text( extent={{-88,68},{-47,48}}, - lineColor={0,0,0}, + textColor={0,0,0}, textString="y"), Line(points={{-46,44},{-28,20},{18,20},{28,36},{38,36},{50,54}}, color={ 0,0,0}), Line(points={{18,20},{38,20},{50,54},{28,54},{18,20}}, color={0,0,0}), Text( extent={{-96,30},{-70,8}}, - lineColor={0,0,127}, + textColor={0,0,127}, fillColor={0,0,0}, fillPattern=FillPattern.Solid, textString="TZonSet"), Text( extent={{-98,-82},{-72,-104}}, - lineColor={0,0,127}, + textColor={0,0,127}, fillColor={0,0,0}, fillPattern=FillPattern.Solid, textString="uFan")}), @@ -486,13 +486,13 @@ annotation ( fillPattern=FillPattern.Solid), Text( extent={{46,-252},{82,-234}}, - lineColor={0,0,0}, + textColor={0,0,0}, fillColor={215,215,215}, fillPattern=FillPattern.Solid, textString="0.25 < yCoo < 0.5"), Text( extent={{46,-316},{82,-298}}, - lineColor={0,0,0}, + textColor={0,0,0}, fillColor={215,215,215}, fillPattern=FillPattern.Solid, textString="0.75 < yCoo < 1"), @@ -503,7 +503,7 @@ annotation ( fillPattern=FillPattern.Solid), Text( extent={{28,-142},{64,-124}}, - lineColor={0,0,0}, + textColor={0,0,0}, fillColor={215,215,215}, fillPattern=FillPattern.Solid, textString="0.5 < yCoo < 0.75"), @@ -514,13 +514,13 @@ annotation ( fillPattern=FillPattern.Solid), Text( extent={{-16,-78},{14,-72}}, - lineColor={0,0,0}, + textColor={0,0,0}, fillColor={215,215,215}, fillPattern=FillPattern.Solid, textString="heating"), Text( extent={{-82,-98},{88,-90}}, - lineColor={0,0,0}, + textColor={0,0,0}, fillColor={215,215,215}, fillPattern=FillPattern.Solid, horizontalAlignment=TextAlignment.Left, diff --git a/Buildings/Controls/OBC/ASHRAE/G36_PR1/AHUs/SingleZone/VAV/SetPoints/package.mo b/Buildings/Controls/OBC/ASHRAE/G36_PR1/AHUs/SingleZone/VAV/SetPoints/package.mo index c3cc8d597ba..595895b6317 100644 --- a/Buildings/Controls/OBC/ASHRAE/G36_PR1/AHUs/SingleZone/VAV/SetPoints/package.mo +++ b/Buildings/Controls/OBC/ASHRAE/G36_PR1/AHUs/SingleZone/VAV/SetPoints/package.mo @@ -19,6 +19,6 @@ This package contains sequences generating setpoints for single zone VAV AHU con radius=25.0), Text( extent={{-100,100},{100,-100}}, - lineColor={0,0,0}, + textColor={0,0,0}, textString="S")})); end SetPoints; diff --git a/Buildings/Controls/OBC/ASHRAE/G36_PR1/AHUs/SingleZone/VAV/ZoneState.mo b/Buildings/Controls/OBC/ASHRAE/G36_PR1/AHUs/SingleZone/VAV/ZoneState.mo index 414951227a0..16941994c92 100644 --- a/Buildings/Controls/OBC/ASHRAE/G36_PR1/AHUs/SingleZone/VAV/ZoneState.mo +++ b/Buildings/Controls/OBC/ASHRAE/G36_PR1/AHUs/SingleZone/VAV/ZoneState.mo @@ -114,7 +114,7 @@ equation Text( extent={{-150,150},{150,110}}, textString="%name", - lineColor={0,0,255})}), Diagram(coordinateSystem( + textColor={0,0,255})}), Diagram(coordinateSystem( preserveAspectRatio=false, extent={{-140,-100},{140,100}})), Documentation(info="
diff --git a/Buildings/Controls/OBC/ASHRAE/G36_PR1/Generic/FreezeProtectionMixedAir.mo b/Buildings/Controls/OBC/ASHRAE/G36_PR1/Generic/FreezeProtectionMixedAir.mo index 1ff3b46fb98..dd48ab7501a 100644 --- a/Buildings/Controls/OBC/ASHRAE/G36_PR1/Generic/FreezeProtectionMixedAir.mo +++ b/Buildings/Controls/OBC/ASHRAE/G36_PR1/Generic/FreezeProtectionMixedAir.mo @@ -83,7 +83,7 @@ equation fillPattern=FillPattern.Solid), Text( extent={{-164,144},{164,106}}, - lineColor={0,0,127}, + textColor={0,0,127}, textString="%name"), Line( points={{-20,-46},{-20,40},{36,40},{-20,40},{-20,2},{26,2}}, diff --git a/Buildings/Controls/OBC/ASHRAE/G36_PR1/Generic/SetPoints/OperationMode.mo b/Buildings/Controls/OBC/ASHRAE/G36_PR1/Generic/SetPoints/OperationMode.mo index d7b5848f7db..c60b7150b6c 100644 --- a/Buildings/Controls/OBC/ASHRAE/G36_PR1/Generic/SetPoints/OperationMode.mo +++ b/Buildings/Controls/OBC/ASHRAE/G36_PR1/Generic/SetPoints/OperationMode.mo @@ -601,43 +601,43 @@ annotation ( pattern=LinePattern.None), Text( extent={{336,332},{426,314}}, - lineColor={0,0,255}, + textColor={0,0,255}, fillColor={215,215,215}, fillPattern=FillPattern.Solid, textString="Occupied mode"), Text( extent={{296,-32},{380,-54}}, - lineColor={0,0,255}, + textColor={0,0,255}, fillColor={215,215,215}, fillPattern=FillPattern.Solid, textString="Setback mode"), Text( extent={{324,-224},{396,-246}}, - lineColor={0,0,255}, + textColor={0,0,255}, fillColor={215,215,215}, fillPattern=FillPattern.Solid, textString="Setup mode"), Text( extent={{314,-308},{418,-338}}, - lineColor={0,0,255}, + textColor={0,0,255}, fillColor={215,215,215}, fillPattern=FillPattern.Solid, textString="Unoccupied mode"), Text( extent={{280,-114},{452,-142}}, - lineColor={0,0,255}, + textColor={0,0,255}, fillColor={215,215,215}, fillPattern=FillPattern.Solid, textString="Freeze protection setback mode"), Text( extent={{250,170},{338,146}}, - lineColor={0,0,255}, + textColor={0,0,255}, fillColor={215,215,215}, fillPattern=FillPattern.Solid, textString="Warm-up mode"), Text( extent={{188,262},{276,234}}, - lineColor={0,0,255}, + textColor={0,0,255}, fillColor={215,215,215}, fillPattern=FillPattern.Solid, textString="Cool-down mode")}), @@ -650,77 +650,77 @@ annotation ( fillPattern=FillPattern.Solid), Text( extent={{-98,80},{-52,68}}, - lineColor={0,0,127}, + textColor={0,0,127}, pattern=LinePattern.Dash, textString="maxCooDowTim"), Text( extent={{-98,64},{-56,54}}, - lineColor={0,0,127}, + textColor={0,0,127}, pattern=LinePattern.Dash, textString="maxWarUpTim"), Text( extent={{58,12},{96,-10}}, - lineColor={255,127,0}, + textColor={255,127,0}, pattern=LinePattern.Dash, textString="yOpeMod"), Text( extent={{-120,144},{100,106}}, - lineColor={0,0,255}, + textColor={0,0,255}, textString="%name"), Text( extent={{-98,94},{-74,82}}, - lineColor={0,0,127}, + textColor={0,0,127}, pattern=LinePattern.Dash, textString="tNexOcc"), Text( extent={{-100,104},{-82,96}}, - lineColor={0,0,127}, + textColor={0,0,127}, pattern=LinePattern.Dash, textString="uOcc"), Text( extent={{-98,42},{-50,30}}, - lineColor={255,0,255}, + textColor={255,0,255}, pattern=LinePattern.Dash, textString="occHeaHigMin"), Text( extent={{-98,24},{-48,12}}, - lineColor={255,0,255}, + textColor={255,0,255}, pattern=LinePattern.Dash, textString="maxHigOccCoo"), Text( extent={{-98,-14},{-60,-24}}, - lineColor={255,127,0}, + textColor={255,127,0}, pattern=LinePattern.Dash, textString="totColZon"), Text( extent={{-98,-32},{-48,-44}}, - lineColor={255,0,255}, + textColor={255,0,255}, pattern=LinePattern.Dash, textString="unoHeaHigMin"), Text( extent={{-98,-56},{-70,-64}}, - lineColor={0,0,127}, + textColor={0,0,127}, pattern=LinePattern.Dash, textString="TZonMax"), Text( extent={{-100,-76},{-70,-84}}, - lineColor={0,0,127}, + textColor={0,0,127}, pattern=LinePattern.Dash, textString="TZonMin"), Text( extent={{-98,-96},{-66,-104}}, - lineColor={255,127,0}, + textColor={255,127,0}, pattern=LinePattern.Dash, textString="totHotZon"), Text( extent={{-98,-112},{-48,-124}}, - lineColor={255,0,255}, + textColor={255,0,255}, pattern=LinePattern.Dash, textString="maxHigUnoCoo"), Text( visible=have_winSen, extent={{-98,8},{-68,-4}}, - lineColor={255,0,255}, + textColor={255,0,255}, pattern=LinePattern.Dash, textString="uWinSta")}), Documentation(info=" diff --git a/Buildings/Controls/OBC/ASHRAE/G36_PR1/Generic/SetPoints/TrimAndRespond.mo b/Buildings/Controls/OBC/ASHRAE/G36_PR1/Generic/SetPoints/TrimAndRespond.mo index 42a2f16f91b..1548e8234f7 100644 --- a/Buildings/Controls/OBC/ASHRAE/G36_PR1/Generic/SetPoints/TrimAndRespond.mo +++ b/Buildings/Controls/OBC/ASHRAE/G36_PR1/Generic/SetPoints/TrimAndRespond.mo @@ -295,11 +295,11 @@ annotation ( fillPattern=FillPattern.Solid), Text( extent={{-114,146},{106,108}}, - lineColor={0,0,255}, + textColor={0,0,255}, textString="%name"), Text( extent={{-88,58},{90,-42}}, - lineColor={192,192,192}, + textColor={192,192,192}, textString="Trim & Respond")}), Diagram(coordinateSystem(preserveAspectRatio=false, extent={{-220,-220},{220, 220}}), @@ -318,12 +318,12 @@ annotation ( pattern=LinePattern.None), Text( extent={{-214,122},{-124,98}}, - lineColor={0,0,255}, + textColor={0,0,255}, horizontalAlignment=TextAlignment.Left, textString="Check device status, Count time"), Text( extent={{-216,22},{-110,-6}}, - lineColor={0,0,255}, + textColor={0,0,255}, horizontalAlignment=TextAlignment.Left, textString="Reset setpoint based on request number")}), diff --git a/Buildings/Controls/OBC/ASHRAE/G36_PR1/Generic/SetPoints/ZoneStatus.mo b/Buildings/Controls/OBC/ASHRAE/G36_PR1/Generic/SetPoints/ZoneStatus.mo index 5dbabb07ecb..4ddee725f12 100644 --- a/Buildings/Controls/OBC/ASHRAE/G36_PR1/Generic/SetPoints/ZoneStatus.mo +++ b/Buildings/Controls/OBC/ASHRAE/G36_PR1/Generic/SetPoints/ZoneStatus.mo @@ -282,97 +282,97 @@ annotation ( fillPattern=FillPattern.Solid), Text( extent={{-96,98},{-46,82}}, - lineColor={0,0,127}, + textColor={0,0,127}, pattern=LinePattern.Dash, textString="cooDowTim"), Text( extent={{-98,76},{-50,64}}, - lineColor={0,0,127}, + textColor={0,0,127}, pattern=LinePattern.Dash, textString="warUpTim"), Text( extent={{-96,-84},{-32,-98}}, - lineColor={0,0,127}, + textColor={0,0,127}, pattern=LinePattern.Dash, textString="TZonCooSetUno"), Text( extent={{-96,38},{-30,20}}, - lineColor={0,0,127}, + textColor={0,0,127}, pattern=LinePattern.Dash, textString="TZonHeaSetOcc"), Text( extent={{-96,16},{-28,4}}, - lineColor={0,0,127}, + textColor={0,0,127}, pattern=LinePattern.Dash, textString="TZonCooSetOcc"), Text( extent={{-120,144},{100,106}}, - lineColor={0,0,255}, + textColor={0,0,255}, textString="%name"), Text( extent={{-100,-4},{-58,-14}}, - lineColor={0,0,127}, + textColor={0,0,127}, pattern=LinePattern.Dash, textString="TZonMax"), Text( extent={{-100,-24},{-74,-34}}, - lineColor={0,0,127}, + textColor={0,0,127}, pattern=LinePattern.Dash, textString="TZon"), Text( extent={{-100,-44},{-58,-54}}, - lineColor={0,0,127}, + textColor={0,0,127}, pattern=LinePattern.Dash, textString="TZonMin"), Text( extent={{-96,-64},{-32,-78}}, - lineColor={0,0,127}, + textColor={0,0,127}, pattern=LinePattern.Dash, textString="TZonHeaSetUno"), Text( visible=have_winSen, extent={{-98,56},{-60,46}}, - lineColor={0,0,127}, + textColor={0,0,127}, pattern=LinePattern.Dash, textString="uWinSta"), Text( extent={{60,100},{98,84}}, - lineColor={0,0,127}, + textColor={0,0,127}, pattern=LinePattern.Dash, textString="yCooTim"), Text( extent={{60,80},{98,64}}, - lineColor={0,0,127}, + textColor={0,0,127}, pattern=LinePattern.Dash, textString="yWarTim"), Text( extent={{30,40},{96,22}}, - lineColor={255,0,255}, + textColor={255,0,255}, pattern=LinePattern.Dash, textString="yOccHeaHigMin"), Text( extent={{30,20},{96,2}}, - lineColor={255,0,255}, + textColor={255,0,255}, pattern=LinePattern.Dash, textString="yMaxHigOccCoo"), Text( extent={{46,0},{96,-16}}, - lineColor={255,0,255}, + textColor={255,0,255}, pattern=LinePattern.Dash, textString="yLowUnoHea"), Text( extent={{30,-38},{96,-56}}, - lineColor={255,0,255}, + textColor={255,0,255}, pattern=LinePattern.Dash, textString="yUnoHeaHigMin"), Text( extent={{30,-58},{96,-76}}, - lineColor={255,0,255}, + textColor={255,0,255}, pattern=LinePattern.Dash, textString="yMaxHigUnoCoo"), Text( extent={{46,-80},{96,-96}}, - lineColor={255,0,255}, + textColor={255,0,255}, pattern=LinePattern.Dash, textString="yHigUnoCoo")}), Documentation(info=" diff --git a/Buildings/Controls/OBC/ASHRAE/G36_PR1/TerminalUnits/Controller.mo b/Buildings/Controls/OBC/ASHRAE/G36_PR1/TerminalUnits/Controller.mo index fd1cb7ffebc..9fbd0024235 100644 --- a/Buildings/Controls/OBC/ASHRAE/G36_PR1/TerminalUnits/Controller.mo +++ b/Buildings/Controls/OBC/ASHRAE/G36_PR1/TerminalUnits/Controller.mo @@ -498,70 +498,70 @@ annotation (defaultComponentName="terUniCon", fillPattern=FillPattern.Solid), Text( extent={{-100,-54},{-78,-64}}, - lineColor={0,0,127}, + textColor={0,0,127}, textString="TDis"), Text( extent={{-100,-70},{-70,-82}}, - lineColor={0,0,127}, + textColor={0,0,127}, textString="TSup"), Text( extent={{70,18},{98,4}}, - lineColor={0,0,127}, + textColor={0,0,127}, textString="yVal"), Text( extent={{68,70},{96,56}}, - lineColor={0,0,127}, + textColor={0,0,127}, textString="yDam"), Text( extent={{-98,100},{-46,88}}, - lineColor={0,0,127}, + textColor={0,0,127}, textString="TZonHeaSet"), Text( extent={{-98,-14},{-68,-26}}, - lineColor={0,0,127}, + textColor={0,0,127}, textString="VDis_flow"), Text( extent={{-120,160},{114,108}}, textString="%name", - lineColor={0,0,255}), + textColor={0,0,255}), Text( extent={{-96,6},{-74,-8}}, - lineColor={0,0,127}, + textColor={0,0,127}, textString="TZon"), Text( extent={{-100,84},{-46,74}}, - lineColor={0,0,127}, + textColor={0,0,127}, textString="TZonCooSet"), Text( extent={{-100,-86},{-52,-98}}, - lineColor={0,0,127}, + textColor={0,0,127}, textString="uOpeMod"), Text( visible=have_occSen, extent={{-100,36},{-74,26}}, - lineColor={0,0,127}, + textColor={0,0,127}, textString="nOcc"), Text( visible=have_CO2Sen, extent={{-96,60},{-58,42}}, - lineColor={0,0,127}, + textColor={0,0,127}, textString="ppmCO2"), Text( visible=have_winSen, extent={{-100,14},{-72,4}}, - lineColor={0,0,127}, + textColor={0,0,127}, textString="uWin"), Text( extent={{22,-20},{96,-58}}, - lineColor={0,0,127}, + textColor={0,0,127}, textString="yZonTemResReq"), Text( extent={{24,-62},{96,-96}}, - lineColor={0,0,127}, + textColor={0,0,127}, textString="yZonPreResReq"), Text( extent={{-98,-34},{-50,-44}}, - lineColor={0,0,127}, + textColor={0,0,127}, textString="uDam_actual")}), Diagram(coordinateSystem(extent={{-140,-180},{140,180}})), Documentation(info=" diff --git a/Buildings/Controls/OBC/ASHRAE/G36_PR1/TerminalUnits/ModeAndSetPoints.mo b/Buildings/Controls/OBC/ASHRAE/G36_PR1/TerminalUnits/ModeAndSetPoints.mo index 00a87ad2117..2ded03e9a99 100644 --- a/Buildings/Controls/OBC/ASHRAE/G36_PR1/TerminalUnits/ModeAndSetPoints.mo +++ b/Buildings/Controls/OBC/ASHRAE/G36_PR1/TerminalUnits/ModeAndSetPoints.mo @@ -361,7 +361,7 @@ annotation (defaultComponentName="modSetPoi", graphics={Text( extent={{-100,140},{98,102}}, textString="%name", - lineColor={0,0,255}), + textColor={0,0,255}), Rectangle( extent={{-100,-100},{100,100}}, lineColor={0,0,127}, @@ -369,56 +369,56 @@ annotation (defaultComponentName="modSetPoi", fillPattern=FillPattern.Solid), Text( extent={{-98,98},{-48,82}}, - lineColor={0,0,127}, + textColor={0,0,127}, pattern=LinePattern.Dash, textString="tNexOcc"), Text( extent={{-100,70},{-68,56}}, - lineColor={255,0,255}, + textColor={255,0,255}, pattern=LinePattern.Dash, textString="uOcc"), Text( extent={{-100,40},{-62,24}}, - lineColor={0,0,127}, + textColor={0,0,127}, pattern=LinePattern.Dash, textString="TZon"), Text( visible=cooAdj or sinAdj, extent={{-100,12},{-56,-8}}, - lineColor={0,0,127}, + textColor={0,0,127}, pattern=LinePattern.Dash, textString="setAdj"), Text( visible=heaAdj, extent={{-98,-20},{-34,-40}}, - lineColor={0,0,127}, + textColor={0,0,127}, pattern=LinePattern.Dash, textString="heaSetAdj"), Text( visible=have_occSen, extent={{-98,-50},{-50,-68}}, - lineColor={255,0,255}, + textColor={255,0,255}, pattern=LinePattern.Dash, textString="uOccSen"), Text( visible=have_winSen, extent={{-98,-80},{-56,-98}}, - lineColor={255,0,255}, + textColor={255,0,255}, pattern=LinePattern.Dash, textString="uWinSta"), Text( extent={{34,80},{98,64}}, - lineColor={0,0,127}, + textColor={0,0,127}, pattern=LinePattern.Dash, textString="TZonCooSet"), Text( extent={{34,10},{98,-6}}, - lineColor={0,0,127}, + textColor={0,0,127}, pattern=LinePattern.Dash, textString="TZonHeaSet"), Text( extent={{36,-60},{100,-76}}, - lineColor={255,127,0}, + textColor={255,127,0}, pattern=LinePattern.Dash, textString="yOpeMod")}), Documentation(info=" diff --git a/Buildings/Controls/OBC/ASHRAE/G36_PR1/TerminalUnits/Reheat/DamperValves.mo b/Buildings/Controls/OBC/ASHRAE/G36_PR1/TerminalUnits/Reheat/DamperValves.mo index 0512fd2e0bf..89fabe59383 100644 --- a/Buildings/Controls/OBC/ASHRAE/G36_PR1/TerminalUnits/Reheat/DamperValves.mo +++ b/Buildings/Controls/OBC/ASHRAE/G36_PR1/TerminalUnits/Reheat/DamperValves.mo @@ -636,7 +636,7 @@ annotation ( pattern=LinePattern.None), Text( extent={{-40,318},{154,280}}, - lineColor={0,0,127}, + textColor={0,0,127}, fillColor={215,215,215}, fillPattern=FillPattern.Solid, horizontalAlignment=TextAlignment.Right, @@ -644,7 +644,7 @@ annotation ( in cooling state"), Text( extent={{32,136},{216,104}}, - lineColor={0,0,127}, + textColor={0,0,127}, fillColor={215,215,215}, fillPattern=FillPattern.Solid, horizontalAlignment=TextAlignment.Left, @@ -652,7 +652,7 @@ in cooling state"), (e.g., AHU overcools)"), Text( extent={{-52,42},{154,0}}, - lineColor={0,0,127}, + textColor={0,0,127}, fillColor={215,215,215}, fillPattern=FillPattern.Solid, horizontalAlignment=TextAlignment.Right, @@ -660,14 +660,14 @@ in cooling state"), in deadband state"), Text( extent={{88,-26},{150,-44}}, - lineColor={0,0,127}, + textColor={0,0,127}, fillColor={215,215,215}, fillPattern=FillPattern.Solid, horizontalAlignment=TextAlignment.Right, textString="Valve control"), Text( extent={{-44,-164},{154,-200}}, - lineColor={0,0,127}, + textColor={0,0,127}, fillColor={215,215,215}, fillPattern=FillPattern.Solid, horizontalAlignment=TextAlignment.Right, @@ -682,51 +682,51 @@ in heating state")}), fillPattern=FillPattern.Solid), Text( extent={{-100,140},{100,100}}, - lineColor={0,0,255}, + textColor={0,0,255}, textString="%name"), Text( extent={{-98,68},{-62,54}}, - lineColor={0,0,127}, + textColor={0,0,127}, pattern=LinePattern.Dash, textString="VActCooMax_flow"), Text( extent={{-98,88},{-62,74}}, - lineColor={0,0,127}, + textColor={0,0,127}, pattern=LinePattern.Dash, textString="VActCooMin_flow"), Text( extent={{-98,-76},{-60,-90}}, - lineColor={0,0,127}, + textColor={0,0,127}, pattern=LinePattern.Dash, textString="VActHeaMax_flow"), Text( extent={{-98,-54},{-62,-66}}, - lineColor={0,0,127}, + textColor={0,0,127}, pattern=LinePattern.Dash, textString="VActHeaMin_flow"), Text( extent={{-98,44},{-70,38}}, - lineColor={0,0,127}, + textColor={0,0,127}, pattern=LinePattern.Dash, textString="VActMin_flow"), Text( extent={{-100,102},{-80,96}}, - lineColor={0,0,127}, + textColor={0,0,127}, pattern=LinePattern.Dash, textString="uCoo"), Text( extent={{-100,-18},{-80,-24}}, - lineColor={0,0,127}, + textColor={0,0,127}, pattern=LinePattern.Dash, textString="uHea"), Text( extent={{-100,2},{-76,-4}}, - lineColor={0,0,127}, + textColor={0,0,127}, pattern=LinePattern.Dash, textString="THeaSet"), Text( extent={{-100,24},{-80,16}}, - lineColor={0,0,127}, + textColor={0,0,127}, pattern=LinePattern.Dash, textString="TSup"), Text( @@ -738,7 +738,7 @@ in heating state")}), rotation=90), Text( extent={{-100,-36},{-80,-42}}, - lineColor={0,0,127}, + textColor={0,0,127}, pattern=LinePattern.Dash, textString="TZon"), Text( @@ -751,13 +751,13 @@ in heating state")}), textString="VDis_flow"), Text( extent={{72,44},{98,34}}, - lineColor={0,0,127}, + textColor={0,0,127}, pattern=LinePattern.Dash, textString="yDam", horizontalAlignment=TextAlignment.Right), Text( extent={{66,-34},{98,-48}}, - lineColor={0,0,127}, + textColor={0,0,127}, pattern=LinePattern.Dash, horizontalAlignment=TextAlignment.Right, textString="yHeaVal"), @@ -796,19 +796,19 @@ in heating state")}), fillPattern=FillPattern.Solid), Text( extent={{60,88},{98,76}}, - lineColor={0,0,127}, + textColor={0,0,127}, pattern=LinePattern.Dash, horizontalAlignment=TextAlignment.Right, textString="VDisSet_flow"), Text( extent={{60,-74},{98,-86}}, - lineColor={0,0,127}, + textColor={0,0,127}, pattern=LinePattern.Dash, horizontalAlignment=TextAlignment.Right, textString="TDisHeaSet"), Text( extent={{-98,-96},{-78,-102}}, - lineColor={0,0,127}, + textColor={0,0,127}, pattern=LinePattern.Dash, textString="uOpeMod")}), Documentation(info=" diff --git a/Buildings/Controls/OBC/ASHRAE/G36_PR1/TerminalUnits/Reheat/SetPoints/ActiveAirFlow.mo b/Buildings/Controls/OBC/ASHRAE/G36_PR1/TerminalUnits/Reheat/SetPoints/ActiveAirFlow.mo index f0492917edc..3204dfbb205 100644 --- a/Buildings/Controls/OBC/ASHRAE/G36_PR1/TerminalUnits/Reheat/SetPoints/ActiveAirFlow.mo +++ b/Buildings/Controls/OBC/ASHRAE/G36_PR1/TerminalUnits/Reheat/SetPoints/ActiveAirFlow.mo @@ -664,63 +664,63 @@ according to operation modes")}), fillPattern=FillPattern.Solid), Text( extent={{-100,140},{100,100}}, - lineColor={0,0,255}, + textColor={0,0,255}, textString="%name"), Text( extent={{-62,66},{58,-56}}, - lineColor={0,0,0}, + textColor={0,0,0}, textString="actAirSet"), Text( visible=have_CO2Sen, extent={{-98,48},{-70,36}}, - lineColor={0,0,127}, + textColor={0,0,127}, pattern=LinePattern.Dash, textString="CO2"), Text( visible=have_occSen, extent={{-98,-32},{-70,-44}}, - lineColor={0,0,127}, + textColor={0,0,127}, pattern=LinePattern.Dash, textString="nOcc"), Text( extent={{-94,90},{-48,72}}, - lineColor={255,127,0}, + textColor={255,127,0}, pattern=LinePattern.Dash, textString="uOpeMod"), Text( visible=have_winSen, extent={{-98,-74},{-72,-84}}, - lineColor={255,0,255}, + textColor={255,0,255}, pattern=LinePattern.Dash, textString="uWin"), Text( extent={{62,88},{98,74}}, - lineColor={0,0,127}, + textColor={0,0,127}, pattern=LinePattern.Dash, textString="VActCooMax_flow"), Text( extent={{62,58},{98,44}}, - lineColor={0,0,127}, + textColor={0,0,127}, pattern=LinePattern.Dash, textString="VActCooMin_flow"), Text( extent={{72,24},{98,14}}, - lineColor={0,0,127}, + textColor={0,0,127}, pattern=LinePattern.Dash, textString="VActMin_flow"), Text( extent={{62,-2},{98,-16}}, - lineColor={0,0,127}, + textColor={0,0,127}, pattern=LinePattern.Dash, textString="VActHeaMin_flow"), Text( extent={{62,-32},{98,-46}}, - lineColor={0,0,127}, + textColor={0,0,127}, pattern=LinePattern.Dash, textString="VActHeaMax_flow"), Text( extent={{62,-72},{98,-86}}, - lineColor={0,0,127}, + textColor={0,0,127}, pattern=LinePattern.Dash, textString="VOccDisMin_flow")}), Documentation(info=" diff --git a/Buildings/Controls/OBC/ASHRAE/G36_PR1/TerminalUnits/Reheat/SetPoints/package.mo b/Buildings/Controls/OBC/ASHRAE/G36_PR1/TerminalUnits/Reheat/SetPoints/package.mo index cb03ddc04ed..eaf6577297b 100644 --- a/Buildings/Controls/OBC/ASHRAE/G36_PR1/TerminalUnits/Reheat/SetPoints/package.mo +++ b/Buildings/Controls/OBC/ASHRAE/G36_PR1/TerminalUnits/Reheat/SetPoints/package.mo @@ -19,6 +19,6 @@ This package contains sequences generating setpoints for terminal units. radius=25.0), Text( extent={{-100,100},{100,-100}}, - lineColor={0,0,0}, + textColor={0,0,0}, textString="S")})); end SetPoints; diff --git a/Buildings/Controls/OBC/ASHRAE/G36_PR1/TerminalUnits/Reheat/SystemRequests.mo b/Buildings/Controls/OBC/ASHRAE/G36_PR1/TerminalUnits/Reheat/SystemRequests.mo index b7d533a1b68..d2b45e76d4c 100644 --- a/Buildings/Controls/OBC/ASHRAE/G36_PR1/TerminalUnits/Reheat/SystemRequests.mo +++ b/Buildings/Controls/OBC/ASHRAE/G36_PR1/TerminalUnits/Reheat/SystemRequests.mo @@ -715,33 +715,33 @@ annotation ( pattern=LinePattern.None), Text( extent={{18,480},{140,456}}, - lineColor={0,0,255}, + textColor={0,0,255}, horizontalAlignment=TextAlignment.Left, textString="Time-based suppression"), Text( extent={{-150,82},{-28,58}}, - lineColor={0,0,255}, + textColor={0,0,255}, horizontalAlignment=TextAlignment.Left, textString="Cooling SAT reset requests"), Text( extent={{-152,-156},{-8,-184}}, - lineColor={0,0,255}, + textColor={0,0,255}, horizontalAlignment=TextAlignment.Left, textString="Static pressure reset requests"), Text( extent={{-152,-360},{-26,-380}}, - lineColor={0,0,255}, + textColor={0,0,255}, horizontalAlignment=TextAlignment.Left, textString="Hot water reset requests"), Text( extent={{-150,-440},{-12,-462}}, - lineColor={0,0,255}, + textColor={0,0,255}, horizontalAlignment=TextAlignment.Left, textString="Boiler plant reset requests")}), Icon(graphics={ Text( extent={{-100,140},{100,100}}, - lineColor={0,0,255}, + textColor={0,0,255}, textString="%name"), Rectangle( extent={{-100,-100},{100,100}}, @@ -750,74 +750,74 @@ annotation ( fillPattern=FillPattern.Solid), Text( extent={{-98,90},{-62,76}}, - lineColor={0,0,127}, + textColor={0,0,127}, pattern=LinePattern.Dash, textString="TZonCooSet"), Text( extent={{-100,66},{-72,56}}, - lineColor={0,0,127}, + textColor={0,0,127}, pattern=LinePattern.Dash, textString="TZon"), Text( extent={{-100,46},{-72,36}}, - lineColor={0,0,127}, + textColor={0,0,127}, pattern=LinePattern.Dash, textString="uCoo"), Text( extent={{-98,30},{-52,14}}, - lineColor={0,0,127}, + textColor={0,0,127}, pattern=LinePattern.Dash, textString="VDisSet_flow"), Text( extent={{-98,6},{-64,-4}}, - lineColor={0,0,127}, + textColor={0,0,127}, pattern=LinePattern.Dash, textString="VDis_flow"), Text( extent={{-98,-14},{-70,-24}}, - lineColor={0,0,127}, + textColor={0,0,127}, pattern=LinePattern.Dash, textString="uDam"), Text( extent={{-98,-32},{-52,-48}}, - lineColor={0,0,127}, + textColor={0,0,127}, pattern=LinePattern.Dash, visible = (have_heaWatCoi or have_heaPla), textString="TDisHeaSet"), Text( extent={{-98,-56},{-64,-66}}, - lineColor={0,0,127}, + textColor={0,0,127}, pattern=LinePattern.Dash, visible = (have_heaWatCoi or have_heaPla), textString="TDis"), Text( extent={{-98,-76},{-64,-86}}, - lineColor={0,0,127}, + textColor={0,0,127}, pattern=LinePattern.Dash, visible = (have_heaWatCoi or have_heaPla), textString="uHeaVal"), Text( extent={{42,82},{98,62}}, - lineColor={0,0,127}, + textColor={0,0,127}, pattern=LinePattern.Dash, horizontalAlignment=TextAlignment.Right, textString="yZonTemResReq"), Text( extent={{42,32},{98,12}}, - lineColor={0,0,127}, + textColor={0,0,127}, pattern=LinePattern.Dash, horizontalAlignment=TextAlignment.Right, textString="yZonPreResReq"), Text( extent={{42,-28},{98,-48}}, - lineColor={0,0,127}, + textColor={0,0,127}, pattern=LinePattern.Dash, horizontalAlignment=TextAlignment.Right, visible = have_heaWatCoi, textString="yHeaValResReq"), Text( extent={{58,-84},{98,-100}}, - lineColor={0,0,127}, + textColor={0,0,127}, pattern=LinePattern.Dash, horizontalAlignment=TextAlignment.Right, visible = (have_heaWatCoi or have_heaPla), diff --git a/Buildings/Controls/OBC/ASHRAE/G36_PR1/TerminalUnits/SetPoints/ZoneTemperatures.mo b/Buildings/Controls/OBC/ASHRAE/G36_PR1/TerminalUnits/SetPoints/ZoneTemperatures.mo index 7a6597fe2cb..e2f4333e445 100644 --- a/Buildings/Controls/OBC/ASHRAE/G36_PR1/TerminalUnits/SetPoints/ZoneTemperatures.mo +++ b/Buildings/Controls/OBC/ASHRAE/G36_PR1/TerminalUnits/SetPoints/ZoneTemperatures.mo @@ -1113,49 +1113,49 @@ annotation ( fillPattern=FillPattern.Solid), Text( extent={{-196,146},{-118,116}}, - lineColor={0,0,127}, + textColor={0,0,127}, pattern=LinePattern.Dash, textString="TZonCooSetOcc"), Text( extent={{-194,62},{-112,38}}, - lineColor={0,0,127}, + textColor={0,0,127}, pattern=LinePattern.Dash, textString="TZonHeaSetOcc"), Text( extent={{-194,22},{-114,0}}, - lineColor={0,0,127}, + textColor={0,0,127}, pattern=LinePattern.Dash, textString="TZonHeaSetUno"), Text( extent={{-192,106},{-112,74}}, - lineColor={0,0,127}, + textColor={0,0,127}, pattern=LinePattern.Dash, textString="TZonCooSetUno"), Text( visible=heaAdj, extent={{-196,-58},{-126,-78}}, - lineColor={0,0,127}, + textColor={0,0,127}, pattern=LinePattern.Dash, textString="heaSetAdj"), Text( visible=cooAdj or sinAdj, extent={{-194,-16},{-152,-34}}, - lineColor={0,0,127}, + textColor={0,0,127}, pattern=LinePattern.Dash, textString="setAdj"), Text( extent={{-194,190},{-130,172}}, - lineColor={0,0,127}, + textColor={0,0,127}, pattern=LinePattern.Dash, textString="uOpeMod"), Text( extent={{-190,-122},{-88,-156}}, - lineColor={0,0,127}, + textColor={0,0,127}, pattern=LinePattern.Dash, textString="uCooDemLimLev"), Text( extent={{-192,-170},{-92,-190}}, - lineColor={0,0,127}, + textColor={0,0,127}, pattern=LinePattern.Dash, textString="uHeaDemLimLev"), Text( @@ -1176,22 +1176,22 @@ annotation ( rotation=90), Text( extent={{158,-68},{200,-86}}, - lineColor={0,0,127}, + textColor={0,0,127}, pattern=LinePattern.Dash, textString="yAla"), Text( extent={{142,86},{194,70}}, - lineColor={0,0,127}, + textColor={0,0,127}, pattern=LinePattern.Dash, textString="TZonCooSet"), Text( extent={{142,10},{196,-8}}, - lineColor={0,0,127}, + textColor={0,0,127}, pattern=LinePattern.Dash, textString="TZonHeaSet"), Text( extent={{-156,286},{124,208}}, - lineColor={0,0,255}, + textColor={0,0,255}, textString="%name")}), Diagram(coordinateSystem( preserveAspectRatio=false, @@ -1240,32 +1240,32 @@ annotation ( pattern=LinePattern.None), Text( extent={{124,632},{322,596}}, - lineColor={0,0,255}, + textColor={0,0,255}, fillColor={215,215,215}, fillPattern=FillPattern.Solid, textString="Operation mode recognition"), Text( extent={{176,550},{324,506}}, - lineColor={0,0,255}, + textColor={0,0,255}, fillColor={215,215,215}, fillPattern=FillPattern.Solid, textString="Setpoints recognition"), Text( extent={{132,382},{324,332}}, - lineColor={0,0,255}, + textColor={0,0,255}, fillColor={215,215,215}, fillPattern=FillPattern.Solid, textString="Local setpoints adjustment"), Text( extent={{-288,-264},{-36,-358}}, - lineColor={0,0,255}, + textColor={0,0,255}, fillColor={215,215,215}, fillPattern=FillPattern.Solid, horizontalAlignment=TextAlignment.Left, textString="Adjust setpoints due to occupancy"), Text( extent={{-34,-384},{252,-430}}, - lineColor={0,0,255}, + textColor={0,0,255}, fillColor={215,215,215}, fillPattern=FillPattern.Solid, horizontalAlignment=TextAlignment.Left, @@ -1284,7 +1284,7 @@ annotation ( pattern=LinePattern.None), Text( extent={{-394,-540},{-184,-584}}, - lineColor={0,0,255}, + textColor={0,0,255}, fillColor={215,215,215}, fillPattern=FillPattern.Solid, horizontalAlignment=TextAlignment.Left, @@ -1292,7 +1292,7 @@ annotation ( in the range"), Text( extent={{-124,-526},{76,-594}}, - lineColor={0,0,255}, + textColor={0,0,255}, fillColor={215,215,215}, fillPattern=FillPattern.Solid, horizontalAlignment=TextAlignment.Left, @@ -1300,7 +1300,7 @@ in the range"), unoccupied"), Text( extent={{34,-478},{298,-564}}, - lineColor={0,0,255}, + textColor={0,0,255}, fillColor={215,215,215}, fillPattern=FillPattern.Solid, horizontalAlignment=TextAlignment.Right, @@ -1308,7 +1308,7 @@ unoccupied"), by heating one"), Text( extent={{74,192},{326,98}}, - lineColor={0,0,255}, + textColor={0,0,255}, fillColor={215,215,215}, fillPattern=FillPattern.Solid, horizontalAlignment=TextAlignment.Right, diff --git a/Buildings/Controls/OBC/ASHRAE/G36_PR1/TerminalUnits/SetPoints/package.mo b/Buildings/Controls/OBC/ASHRAE/G36_PR1/TerminalUnits/SetPoints/package.mo index 6863c9432fa..95734cb29b7 100644 --- a/Buildings/Controls/OBC/ASHRAE/G36_PR1/TerminalUnits/SetPoints/package.mo +++ b/Buildings/Controls/OBC/ASHRAE/G36_PR1/TerminalUnits/SetPoints/package.mo @@ -20,6 +20,6 @@ terminal units control, according to ASHRAE Guideline 36, Part 5.B. radius=25.0), Text( extent={{-100,100},{100,-100}}, - lineColor={0,0,0}, + textColor={0,0,0}, textString="S")})); end SetPoints; diff --git a/Buildings/Controls/OBC/ASHRAE/G36_PR1/TerminalUnits/Validation/ModeAndSetPoints.mo b/Buildings/Controls/OBC/ASHRAE/G36_PR1/TerminalUnits/Validation/ModeAndSetPoints.mo index 856c905477d..f117563512a 100644 --- a/Buildings/Controls/OBC/ASHRAE/G36_PR1/TerminalUnits/Validation/ModeAndSetPoints.mo +++ b/Buildings/Controls/OBC/ASHRAE/G36_PR1/TerminalUnits/Validation/ModeAndSetPoints.mo @@ -114,23 +114,23 @@ First implementation. Diagram( coordinateSystem(preserveAspectRatio=false), graphics={Text( extent={{50,86},{126,76}}, - lineColor={85,0,255}, + textColor={85,0,255}, horizontalAlignment=TextAlignment.Left, textString="No window status sensor No occupancy sensor Zone 1"), Text( extent={{48,44},{102,36}}, - lineColor={85,0,255}, + textColor={85,0,255}, horizontalAlignment=TextAlignment.Left, textString="No local setpoint adjustment Zone 1"), Text( extent={{46,-46},{100,-54}}, - lineColor={85,0,255}, + textColor={85,0,255}, horizontalAlignment=TextAlignment.Left, textString="No local setpoint adjustment Zone 2"), Text( extent={{48,-4},{124,-14}}, - lineColor={85,0,255}, + textColor={85,0,255}, horizontalAlignment=TextAlignment.Left, textString="No window status sensor No occupancy sensor diff --git a/Buildings/Controls/OBC/CDL/Continuous/Abs.mo b/Buildings/Controls/OBC/CDL/Continuous/Abs.mo index 528238b6bf7..6882394aa58 100644 --- a/Buildings/Controls/OBC/CDL/Continuous/Abs.mo +++ b/Buildings/Controls/OBC/CDL/Continuous/Abs.mo @@ -15,7 +15,7 @@ annotation ( Icon(coordinateSystem(preserveAspectRatio=true, extent={{-100,-100},{100, 100}}), graphics={ Text( - lineColor={0,0,255}, + textColor={0,0,255}, extent={{-150,110},{150,150}}, textString="%name"), Rectangle( @@ -37,12 +37,12 @@ annotation ( fillPattern=FillPattern.Solid), Text( extent={{-34,-28},{38,-76}}, - lineColor={192,192,192}, + textColor={192,192,192}, textString="abs"), Line(points={{-88,0},{76,0}}, color={192,192,192}), Text( extent={{226,60},{106,10}}, - lineColor={0,0,0}, + textColor={0,0,0}, textString=DynamicSelect("", String(y, leftJustified=false, significantDigits=3)))}), Documentation(info="
diff --git a/Buildings/Controls/OBC/CDL/Continuous/Add.mo b/Buildings/Controls/OBC/CDL/Continuous/Add.mo index b899140b656..2e63c45f28f 100644 --- a/Buildings/Controls/OBC/CDL/Continuous/Add.mo +++ b/Buildings/Controls/OBC/CDL/Continuous/Add.mo @@ -57,7 +57,7 @@ Modelica Standard Library. Text( extent={{-150,150},{150,110}}, textString="%name", - lineColor={0,0,255}), + textColor={0,0,255}), Line(points={{-100,60},{-74,24},{-44,24}}, color={0,0,127}), Line(points={{-100,-60},{-74,-28},{-42,-28}}, color={0,0,127}), Line(points={{50,0},{100,0}}, color={0,0,127}), @@ -66,6 +66,6 @@ Modelica Standard Library. Text(extent={{-100,-92},{5,-52}}, textString="%k2"), Text( extent={{226,60},{106,10}}, - lineColor={0,0,0}, + textColor={0,0,0}, textString=DynamicSelect("", String(y, leftJustified=false, significantDigits=3)))})); end Add; diff --git a/Buildings/Controls/OBC/CDL/Continuous/AddParameter.mo b/Buildings/Controls/OBC/CDL/Continuous/AddParameter.mo index 5d3e0834da3..bfdf639de5e 100644 --- a/Buildings/Controls/OBC/CDL/Continuous/AddParameter.mo +++ b/Buildings/Controls/OBC/CDL/Continuous/AddParameter.mo @@ -44,7 +44,7 @@ Modelica Standard Library. fillColor={255,255,255}, fillPattern=FillPattern.Solid), Text( - lineColor={0,0,255}, + textColor={0,0,255}, extent={{-150,110},{150,150}}, textString="%name"), Line(points={{-54,66},{-28,30},{2,30}}, color={0,0,127}), @@ -52,7 +52,7 @@ Modelica Standard Library. color={0,0,127}), Text(extent={{-122,58},{-17,98}}, textString="%p", - lineColor={0,0,0}), + textColor={0,0,0}), Polygon( points={{-86,-36},{-86,36},{-34,0},{-86,-36}}, lineColor={0,0,127}, @@ -60,7 +60,7 @@ Modelica Standard Library. fillPattern=FillPattern.Solid), Text( extent={{-196,-84},{104,-44}}, - lineColor={0,0,0}, + textColor={0,0,0}, textString="k=%k"), Ellipse(lineColor={0,0,127}, extent={{-12,-52},{88,48}}, fillColor={255,255,255}, @@ -68,6 +68,6 @@ Modelica Standard Library. Text(extent={{-2,-22},{74,46}}, textString="+"), Text( extent={{226,60},{106,10}}, - lineColor={0,0,0}, + textColor={0,0,0}, textString=DynamicSelect("", String(y, leftJustified=false, significantDigits=3)))})); end AddParameter; diff --git a/Buildings/Controls/OBC/CDL/Continuous/Atan.mo b/Buildings/Controls/OBC/CDL/Continuous/Atan.mo index 19799891a22..e8b30da5fbc 100644 --- a/Buildings/Controls/OBC/CDL/Continuous/Atan.mo +++ b/Buildings/Controls/OBC/CDL/Continuous/Atan.mo @@ -20,12 +20,12 @@ annotation ( fillColor={255,255,255}, fillPattern=FillPattern.Solid), Text( - lineColor={0,0,255}, + textColor={0,0,255}, extent={{-150,110},{150,150}}, textString="%name"), Text( extent={{-86,68},{-14,20}}, - lineColor={192,192,192}, + textColor={192,192,192}, textString="atan"), Polygon( points={{0,90},{-8,68},{8,68},{0,90}}, @@ -47,7 +47,7 @@ annotation ( fillPattern=FillPattern.Solid), Text( extent={{226,60},{106,10}}, - lineColor={0,0,0}, + textColor={0,0,0}, textString=DynamicSelect("", String(y, leftJustified=false, significantDigits=3)))}), Documentation(info="
diff --git a/Buildings/Controls/OBC/CDL/Continuous/Atan2.mo b/Buildings/Controls/OBC/CDL/Continuous/Atan2.mo index cf941517986..ad4c1dd8185 100644 --- a/Buildings/Controls/OBC/CDL/Continuous/Atan2.mo +++ b/Buildings/Controls/OBC/CDL/Continuous/Atan2.mo @@ -55,7 +55,7 @@ Modelica Standard Library. fillPattern=FillPattern.Solid), Text( extent={{-150,150},{150,110}}, textString="%name", - lineColor={0,0,255}), + textColor={0,0,255}), Line(points={{0,-80},{0,68}}, color={192,192,192}), Line(points={{-90,0},{68,0}}, color={192,192,192}), Polygon( @@ -78,12 +78,12 @@ Modelica Standard Library. smooth=Smooth.Bezier), Text( extent={{-90,-46},{-18,-94}}, - lineColor={192,192,192}, + textColor={192,192,192}, textString="atan2"), Text( extent={{-150,150},{150,110}}, textString="%name", - lineColor={0,0,255}), + textColor={0,0,255}), Polygon( points={{0,90},{-8,68},{8,68},{0,90}}, lineColor={192,192,192}, @@ -91,6 +91,6 @@ Modelica Standard Library. fillPattern=FillPattern.Solid), Text( extent={{226,60},{106,10}}, - lineColor={0,0,0}, + textColor={0,0,0}, textString=DynamicSelect("", String(y, leftJustified=false, significantDigits=3)))})); end Atan2; diff --git a/Buildings/Controls/OBC/CDL/Continuous/Average.mo b/Buildings/Controls/OBC/CDL/Continuous/Average.mo index 54c2fa399fc..582a494688a 100644 --- a/Buildings/Controls/OBC/CDL/Continuous/Average.mo +++ b/Buildings/Controls/OBC/CDL/Continuous/Average.mo @@ -20,7 +20,7 @@ annotation ( Icon(coordinateSystem(preserveAspectRatio=true, extent={{-100,-100},{100, 100}}), graphics={ Text( - lineColor={0,0,255}, + textColor={0,0,255}, extent={{-150,110},{150,150}}, textString="%name"), Rectangle( @@ -30,7 +30,7 @@ annotation ( fillPattern=FillPattern.Solid), Text( extent={{-50,34},{52,-26}}, - lineColor={192,192,192}, + textColor={192,192,192}, textString="avg()"), Line(points={{-8,16}}, color={0,0,0}), Line( @@ -39,7 +39,7 @@ annotation ( thickness=1), Text( extent={{226,60},{106,10}}, - lineColor={0,0,0}, + textColor={0,0,0}, textString=DynamicSelect("", String(y, leftJustified=false, significantDigits=3)))}), Documentation(info="
diff --git a/Buildings/Controls/OBC/CDL/Continuous/ChangeSign.mo b/Buildings/Controls/OBC/CDL/Continuous/ChangeSign.mo index bfe1b520b55..cb851ec1b89 100644 --- a/Buildings/Controls/OBC/CDL/Continuous/ChangeSign.mo +++ b/Buildings/Controls/OBC/CDL/Continuous/ChangeSign.mo @@ -22,7 +22,7 @@ annotation ( fillColor={255,255,255}, fillPattern=FillPattern.Solid), Text( - lineColor={0,0,255}, + textColor={0,0,255}, extent={{-150,110},{150,150}}, textString="%name"), Line(points={{2,68},{2,-80}}, color={192,192,192}), @@ -45,7 +45,7 @@ annotation ( Line(points={{-100,60},{2,60}}, color={0,0,0}), Text( extent={{226,60},{106,10}}, - lineColor={0,0,0}, + textColor={0,0,0}, textString=DynamicSelect("", String(y, leftJustified=false, significantDigits=3)))}), Documentation(info="
diff --git a/Buildings/Controls/OBC/CDL/Continuous/Cos.mo b/Buildings/Controls/OBC/CDL/Continuous/Cos.mo index 2ac5c5d127f..0aaf3b78d42 100644 --- a/Buildings/Controls/OBC/CDL/Continuous/Cos.mo +++ b/Buildings/Controls/OBC/CDL/Continuous/Cos.mo @@ -27,7 +27,7 @@ annotation ( 69.5,73.4},{75.2,78.6},{80,80}}, smooth=Smooth.Bezier), Text( - lineColor={0,0,255}, + textColor={0,0,255}, extent={{-150,110},{150,150}}, textString="%name"), Polygon( @@ -44,11 +44,11 @@ annotation ( fillPattern=FillPattern.Solid), Text( extent={{-36,80},{36,32}}, - lineColor={192,192,192}, + textColor={192,192,192}, textString="cos"), Text( extent={{226,60},{106,10}}, - lineColor={0,0,0}, + textColor={0,0,0}, textString=DynamicSelect("", String(y, leftJustified=false, significantDigits=3)))}), Documentation(info="
diff --git a/Buildings/Controls/OBC/CDL/Continuous/Derivative.mo b/Buildings/Controls/OBC/CDL/Continuous/Derivative.mo index 121656f5097..63979ba13f6 100644 --- a/Buildings/Controls/OBC/CDL/Continuous/Derivative.mo +++ b/Buildings/Controls/OBC/CDL/Continuous/Derivative.mo @@ -90,7 +90,7 @@ Modelica Standard Library. points = {{-55.333,87.333},{-19.333,-40.667},{86.667,-52.667}}, color = {0,0,127}, smooth = Smooth.Bezier), - Text(lineColor={192,192,192}, + Text(textColor={192,192,192}, extent={{-30.0,14.0},{86.0,60.0}}, textString="DT1"), Text(extent={{-150.0,-150.0},{150.0,-110.0}}, @@ -98,9 +98,9 @@ Modelica Standard Library. Text( extent={{-150,150},{150,110}}, textString="%name", - lineColor={0,0,255}), + textColor={0,0,255}), Text( extent={{226,60},{106,10}}, - lineColor={0,0,0}, + textColor={0,0,0}, textString=DynamicSelect("", String(y, leftJustified=false, significantDigits=3)))})); end Derivative; diff --git a/Buildings/Controls/OBC/CDL/Continuous/Division.mo b/Buildings/Controls/OBC/CDL/Continuous/Division.mo index 1131a928f80..e67fa140ec3 100644 --- a/Buildings/Controls/OBC/CDL/Continuous/Division.mo +++ b/Buildings/Controls/OBC/CDL/Continuous/Division.mo @@ -54,19 +54,19 @@ Modelica Standard Library. Text( extent={{-150,150},{150,110}}, textString="%name", - lineColor={0,0,255}), + textColor={0,0,255}), Line(points={{50,0},{100,0}}, color={0,0,127}), Line(points={{-30,0},{30,0}}), Ellipse(fillPattern=FillPattern.Solid, extent={{-5,20},{5,30}}), Ellipse(fillPattern=FillPattern.Solid, extent={{-5,-30},{5,-20}}), Text( - lineColor={0,0,255}, + textColor={0,0,255}, extent={{-150,110},{150,150}}, textString="%name"), Line(points={{-100,60},{-66,60},{-40,30}}, color={0,0,127}), Line(points={{-100,-60},{0,-60},{0,-50}}, color={0,0,127}), Text( extent={{226,60},{106,10}}, - lineColor={0,0,0}, + textColor={0,0,0}, textString=DynamicSelect("", String(y, leftJustified=false, significantDigits=3)))})); end Division; diff --git a/Buildings/Controls/OBC/CDL/Continuous/Exp.mo b/Buildings/Controls/OBC/CDL/Continuous/Exp.mo index 087431e7fda..01ce96dcf98 100644 --- a/Buildings/Controls/OBC/CDL/Continuous/Exp.mo +++ b/Buildings/Controls/OBC/CDL/Continuous/Exp.mo @@ -26,15 +26,15 @@ annotation ( Line(points={{0,-80},{0,68}}, color={192,192,192}), Text( extent={{-86,50},{-14,2}}, - lineColor={192,192,192}, + textColor={192,192,192}, textString="exp"), Text( extent={{-150,150},{150,110}}, textString="%name", - lineColor={0,0,255}), + textColor={0,0,255}), Text( extent={{226,60},{106,10}}, - lineColor={0,0,0}, + textColor={0,0,0}, textString=DynamicSelect("", String(y, leftJustified=false, significantDigits=3)))}), Documentation(info="
diff --git a/Buildings/Controls/OBC/CDL/Continuous/Feedback.mo b/Buildings/Controls/OBC/CDL/Continuous/Feedback.mo index 0ac9666ff93..fe99c7a2ccc 100644 --- a/Buildings/Controls/OBC/CDL/Continuous/Feedback.mo +++ b/Buildings/Controls/OBC/CDL/Continuous/Feedback.mo @@ -50,14 +50,14 @@ Modelica Standard Library. Text(extent={{-14,-112},{74,-38}}, textString="-"), Text( - lineColor={0,0,255}, + textColor={0,0,255}, extent={{-150,48},{150,98}}, textString="%name"), Text(extent={{-100,-4},{-40,56}}, textString="+", - lineColor={0,0,0}), + textColor={0,0,0}), Text( extent={{226,60},{106,10}}, - lineColor={0,0,0}, + textColor={0,0,0}, textString=DynamicSelect("", String(y, leftJustified=false, significantDigits=3)))})); end Feedback; diff --git a/Buildings/Controls/OBC/CDL/Continuous/Gain.mo b/Buildings/Controls/OBC/CDL/Continuous/Gain.mo index 35400b116c3..ead0c44fc80 100644 --- a/Buildings/Controls/OBC/CDL/Continuous/Gain.mo +++ b/Buildings/Controls/OBC/CDL/Continuous/Gain.mo @@ -43,14 +43,14 @@ Modelica Standard Library. fillPattern=FillPattern.Solid), Text( extent={{-150,-140},{150,-100}}, - lineColor={0,0,0}, + textColor={0,0,0}, textString="k=%k"), Text( extent={{-150,144},{150,104}}, textString="%name", - lineColor={0,0,255}), + textColor={0,0,255}), Text( extent={{226,60},{106,10}}, - lineColor={0,0,0}, + textColor={0,0,0}, textString=DynamicSelect("", String(y, leftJustified=false, significantDigits=3)))})); end Gain; diff --git a/Buildings/Controls/OBC/CDL/Continuous/Greater.mo b/Buildings/Controls/OBC/CDL/Continuous/Greater.mo index 43e8f9a2f3d..2130f3f6d0e 100644 --- a/Buildings/Controls/OBC/CDL/Continuous/Greater.mo +++ b/Buildings/Controls/OBC/CDL/Continuous/Greater.mo @@ -39,7 +39,7 @@ annotation ( Text( extent={{-150,150},{150,110}}, textString="%name", - lineColor={0,0,255})}), + textColor={0,0,255})}), Documentation(info="
Block that outputs true if the Real input u1
diff --git a/Buildings/Controls/OBC/CDL/Continuous/GreaterEqual.mo b/Buildings/Controls/OBC/CDL/Continuous/GreaterEqual.mo
index 6337af2f110..dc65687bc71 100644
--- a/Buildings/Controls/OBC/CDL/Continuous/GreaterEqual.mo
+++ b/Buildings/Controls/OBC/CDL/Continuous/GreaterEqual.mo
@@ -43,7 +43,7 @@ annotation (
Text(
extent={{-150,150},{150,110}},
textString="%name",
- lineColor={0,0,255})}),
+ textColor={0,0,255})}),
Documentation(info="
Block that outputs true if Real the input u1
diff --git a/Buildings/Controls/OBC/CDL/Continuous/GreaterEqualThreshold.mo b/Buildings/Controls/OBC/CDL/Continuous/GreaterEqualThreshold.mo
index f69870909cb..4e955d19616 100644
--- a/Buildings/Controls/OBC/CDL/Continuous/GreaterEqualThreshold.mo
+++ b/Buildings/Controls/OBC/CDL/Continuous/GreaterEqualThreshold.mo
@@ -19,7 +19,7 @@ annotation (
{100,100}}), graphics={
Text(
extent={{-150,-140},{150,-110}},
- lineColor={0,0,0},
+ textColor={0,0,0},
textString="%threshold"),
Rectangle(
extent={{-100,100},{100,-100}},
@@ -38,7 +38,7 @@ annotation (
Text(
extent={{-150,150},{150,110}},
textString="%name",
- lineColor={0,0,255}),
+ textColor={0,0,255}),
Line(
points={{-54,22},{-8,2},{-54,-18}},
thickness=0.5),
diff --git a/Buildings/Controls/OBC/CDL/Continuous/GreaterThreshold.mo b/Buildings/Controls/OBC/CDL/Continuous/GreaterThreshold.mo
index 51edd2123c8..8a704e732d1 100644
--- a/Buildings/Controls/OBC/CDL/Continuous/GreaterThreshold.mo
+++ b/Buildings/Controls/OBC/CDL/Continuous/GreaterThreshold.mo
@@ -33,11 +33,11 @@ annotation (
fillPattern=FillPattern.Solid),
Text(
extent={{-150,-140},{150,-110}},
- lineColor={0,0,0},
+ textColor={0,0,0},
textString="%threshold"),
Text(
extent={{-150,150},{150,110}},
- lineColor={0,0,255},
+ textColor={0,0,255},
textString="%name"),
Line(
points={{-54,22},{-8,2},{-54,-18}},
diff --git a/Buildings/Controls/OBC/CDL/Continuous/Hysteresis.mo b/Buildings/Controls/OBC/CDL/Continuous/Hysteresis.mo
index 7ebde12cc3c..480ccc5af7c 100644
--- a/Buildings/Controls/OBC/CDL/Continuous/Hysteresis.mo
+++ b/Buildings/Controls/OBC/CDL/Continuous/Hysteresis.mo
@@ -59,11 +59,11 @@ annotation (
Line(points={{-49,51},{-49,-29}}),
Text(
extent={{-92,-49},{-9,-92}},
- lineColor={192,192,192},
+ textColor={192,192,192},
textString="%uLow"),
Text(
extent={{2,-49},{91,-92}},
- lineColor={192,192,192},
+ textColor={192,192,192},
textString="%uHigh"),
Rectangle(extent={{-91,-49},{-8,-92}}, lineColor={192,192,192}),
Line(points={{-49,-29},{-49,-49}}, color={192,192,192}),
@@ -71,7 +71,7 @@ annotation (
Line(points={{41,-29},{41,-49}}, color={192,192,192}),
Text(
extent={{-150,150},{150,110}},
- lineColor={0,0,255},
+ textColor={0,0,255},
textString="%name")}),
Documentation(info="
diff --git a/Buildings/Controls/OBC/CDL/Continuous/HysteresisWithHold.mo b/Buildings/Controls/OBC/CDL/Continuous/HysteresisWithHold.mo index d265aa200a7..40eb2534a1d 100644 --- a/Buildings/Controls/OBC/CDL/Continuous/HysteresisWithHold.mo +++ b/Buildings/Controls/OBC/CDL/Continuous/HysteresisWithHold.mo @@ -49,7 +49,7 @@ annotation ( borderPattern=BorderPattern.Raised), Text( extent={{-66,-40},{62,-82}}, - lineColor={0,0,0}, + textColor={0,0,0}, textString="%uLow %uHigh"), Polygon( points={{-22,8},{-10,2},{-22,-4},{-22,8}}, @@ -69,7 +69,7 @@ annotation ( Text( extent={{-140,148},{160,108}}, textString="%name", - lineColor={0,0,255}), + textColor={0,0,255}), Ellipse( extent={{71,7},{85,-7}}, lineColor=DynamicSelect({235,235,235}, if y then {0,255,0} diff --git a/Buildings/Controls/OBC/CDL/Continuous/IntegratorWithReset.mo b/Buildings/Controls/OBC/CDL/Continuous/IntegratorWithReset.mo index df8eba8efd4..36b4b75f296 100644 --- a/Buildings/Controls/OBC/CDL/Continuous/IntegratorWithReset.mo +++ b/Buildings/Controls/OBC/CDL/Continuous/IntegratorWithReset.mo @@ -85,7 +85,7 @@ Icon(coordinateSystem( fillPattern=FillPattern.Solid), Text( extent={{-88,-94},{212,-54}}, - lineColor={0,0,0}, + textColor={0,0,0}, textString="y_reset_in", visible= (reset == Types.Reset.Input), horizontalAlignment=TextAlignment.Left), @@ -93,26 +93,26 @@ Icon(coordinateSystem( "modelica://Buildings/Resources/Images/Controls/OBC/CDL/Continuous/int.png"), Text( extent={{-88,56},{206,92}}, - lineColor={0,0,0}, + textColor={0,0,0}, textString="k=%k", horizontalAlignment=TextAlignment.Left), Text( extent={{-92,-12},{208,28}}, - lineColor={0,0,0}, + textColor={0,0,0}, horizontalAlignment=TextAlignment.Left, textString="u"), Text( extent={{70,-14},{370,26}}, - lineColor={0,0,0}, + textColor={0,0,0}, horizontalAlignment=TextAlignment.Left, textString="y"), Text( extent={{-150,150},{150,110}}, textString="%name", - lineColor={0,0,255}), + textColor={0,0,255}), Text( extent={{226,60},{106,10}}, - lineColor={0,0,0}, + textColor={0,0,0}, textString=DynamicSelect("", String(y, leftJustified=false, significantDigits=3)))}), Documentation(info="
diff --git a/Buildings/Controls/OBC/CDL/Continuous/Less.mo b/Buildings/Controls/OBC/CDL/Continuous/Less.mo index 36011e86108..5dd76e85d78 100644 --- a/Buildings/Controls/OBC/CDL/Continuous/Less.mo +++ b/Buildings/Controls/OBC/CDL/Continuous/Less.mo @@ -37,7 +37,7 @@ equation thickness=0.5), Text( extent={{-150,150},{150,110}}, - lineColor={0,0,255}, + textColor={0,0,255}, textString="%name")}), Documentation(info="
diff --git a/Buildings/Controls/OBC/CDL/Continuous/LessEqual.mo b/Buildings/Controls/OBC/CDL/Continuous/LessEqual.mo index 92004ee43fc..d17fb276f30 100644 --- a/Buildings/Controls/OBC/CDL/Continuous/LessEqual.mo +++ b/Buildings/Controls/OBC/CDL/Continuous/LessEqual.mo @@ -41,7 +41,7 @@ equation thickness=0.5), Text( extent={{-150,150},{150,110}}, - lineColor={0,0,255}, + textColor={0,0,255}, textString="%name")}), Documentation(info="
diff --git a/Buildings/Controls/OBC/CDL/Continuous/LessEqualThreshold.mo b/Buildings/Controls/OBC/CDL/Continuous/LessEqualThreshold.mo index 878a04d4c23..c740b5d4db2 100644 --- a/Buildings/Controls/OBC/CDL/Continuous/LessEqualThreshold.mo +++ b/Buildings/Controls/OBC/CDL/Continuous/LessEqualThreshold.mo @@ -33,11 +33,11 @@ equation fillPattern=FillPattern.Solid), Text( extent={{-150,-140},{150,-110}}, - lineColor={0,0,0}, + textColor={0,0,0}, textString="%threshold"), Text( extent={{-150,150},{150,110}}, - lineColor={0,0,255}, + textColor={0,0,255}, textString="%name"), Line( points={{-54,-18},{-14,-34}}, diff --git a/Buildings/Controls/OBC/CDL/Continuous/LessThreshold.mo b/Buildings/Controls/OBC/CDL/Continuous/LessThreshold.mo index a640c54d8cb..e67e9c829b7 100644 --- a/Buildings/Controls/OBC/CDL/Continuous/LessThreshold.mo +++ b/Buildings/Controls/OBC/CDL/Continuous/LessThreshold.mo @@ -31,11 +31,11 @@ equation fillPattern=FillPattern.Solid), Text( extent={{-150,-140},{150,-110}}, - lineColor={0,0,0}, + textColor={0,0,0}, textString="%threshold"), Text( extent={{-150,150},{150,110}}, - lineColor={0,0,255}, + textColor={0,0,255}, textString="%name"), Line( points={{-10,20},{-54,0},{-10,-18}}, diff --git a/Buildings/Controls/OBC/CDL/Continuous/LimPID.mo b/Buildings/Controls/OBC/CDL/Continuous/LimPID.mo index 7d0973cd41c..8d5c2d0eb64 100644 --- a/Buildings/Controls/OBC/CDL/Continuous/LimPID.mo +++ b/Buildings/Controls/OBC/CDL/Continuous/LimPID.mo @@ -342,7 +342,7 @@ annotation (defaultComponentName="conPID", Text( extent={{-150,150},{150,110}}, textString="%name", - lineColor={0,0,255}), + textColor={0,0,255}), Line( points={{-80,-80},{-80,-22}}, color={0,0,0}), diff --git a/Buildings/Controls/OBC/CDL/Continuous/Limiter.mo b/Buildings/Controls/OBC/CDL/Continuous/Limiter.mo index 3c5091362e9..88020c1fc40 100644 --- a/Buildings/Controls/OBC/CDL/Continuous/Limiter.mo +++ b/Buildings/Controls/OBC/CDL/Continuous/Limiter.mo @@ -49,7 +49,7 @@ Modelica Standard Library. "), Icon(graphics={ - Text( lineColor={0,0,255}, + Text( textColor={0,0,255}, extent={{-150,110},{150,150}}, textString="%name"), Rectangle( @@ -73,21 +73,21 @@ Icon(graphics={ Text( extent={{-150,150},{150,110}}, textString="%name", - lineColor={0,0,255}), + textColor={0,0,255}), Line( points={{50,70},{80,70}}), Line( points={{-80,-70},{-50,-70}}), Text( extent={{12,72},{94,98}}, - lineColor={0,0,0}, + textColor={0,0,0}, textString="%uMax"), Text( extent={{-100,-98},{-18,-72}}, - lineColor={0,0,0}, + textColor={0,0,0}, textString="%uMin"), Text( extent={{226,60},{106,10}}, - lineColor={0,0,0}, + textColor={0,0,0}, textString=DynamicSelect("", String(y, leftJustified=false, significantDigits=3)))})); end Limiter; diff --git a/Buildings/Controls/OBC/CDL/Continuous/Line.mo b/Buildings/Controls/OBC/CDL/Continuous/Line.mo index 685b955ac15..522e4de13f2 100644 --- a/Buildings/Controls/OBC/CDL/Continuous/Line.mo +++ b/Buildings/Controls/OBC/CDL/Continuous/Line.mo @@ -59,7 +59,7 @@ equation fillColor={255,255,255}, fillPattern=FillPattern.Solid), Text( - lineColor={0,0,255}, + textColor={0,0,255}, extent={{-150,110},{150,150}}, textString="%name"), Polygon( @@ -175,7 +175,7 @@ equation fillPattern=FillPattern.Solid), Text( extent={{226,60},{106,10}}, - lineColor={0,0,0}, + textColor={0,0,0}, textString=DynamicSelect("", String(y, leftJustified=false, significantDigits=3)))}), Documentation(info="
diff --git a/Buildings/Controls/OBC/CDL/Continuous/Log.mo b/Buildings/Controls/OBC/CDL/Continuous/Log.mo index c60b7000ea7..3e73b7e6d84 100644 --- a/Buildings/Controls/OBC/CDL/Continuous/Log.mo +++ b/Buildings/Controls/OBC/CDL/Continuous/Log.mo @@ -29,18 +29,18 @@ annotation ( Text( extent={{-150,150},{150,110}}, textString="%name", - lineColor={0,0,255}), + textColor={0,0,255}), Line(points={{-90,0},{68,0}}, color={192,192,192}), Line(points={{-80,-80},{-79.2,-50.6},{-78.4,-37},{-77.6,-28},{-76.8,-21.3}, {-75.2,-11.4},{-72.8,-1.31},{-69.5,8.08},{-64.7,17.9},{-57.5,28}, {-47,38.1},{-31.8,48.1},{-10.1,58},{22.1,68},{68.7,78.1},{80,80}}), Text( extent={{-6,-24},{66,-72}}, - lineColor={192,192,192}, + textColor={192,192,192}, textString="log"), Text( extent={{226,60},{106,10}}, - lineColor={0,0,0}, + textColor={0,0,0}, textString=DynamicSelect("", String(y, leftJustified=false, significantDigits=3)))}), Documentation(info="
diff --git a/Buildings/Controls/OBC/CDL/Continuous/Log10.mo b/Buildings/Controls/OBC/CDL/Continuous/Log10.mo index 5c6a6e38bdb..9c89e8e4694 100644 --- a/Buildings/Controls/OBC/CDL/Continuous/Log10.mo +++ b/Buildings/Controls/OBC/CDL/Continuous/Log10.mo @@ -28,18 +28,18 @@ annotation ( Text( extent={{-150,150},{150,110}}, textString="%name", - lineColor={0,0,255}), + textColor={0,0,255}), Line(points={{-90,0},{68,0}}, color={192,192,192}), Line(points={{-80,-80},{-79.2,-50.6},{-78.4,-37},{-77.6,-28},{-76.8,-21.3}, {-75.2,-11.4},{-72.8,-1.31},{-69.5,8.08},{-64.7,17.9},{-57.5,28}, {-47,38.1},{-31.8,48.1},{-10.1,58},{22.1,68},{68.7,78.1},{80,80}}), Text( extent={{-6,-24},{66,-72}}, - lineColor={192,192,192}, + textColor={192,192,192}, textString="log10"), Text( extent={{226,60},{106,10}}, - lineColor={0,0,0}, + textColor={0,0,0}, textString=DynamicSelect("", String(y, leftJustified=false, significantDigits=3)))}), Documentation(info="
diff --git a/Buildings/Controls/OBC/CDL/Continuous/MatrixGain.mo b/Buildings/Controls/OBC/CDL/Continuous/MatrixGain.mo index a557a6d7089..d6a09a1421f 100644 --- a/Buildings/Controls/OBC/CDL/Continuous/MatrixGain.mo +++ b/Buildings/Controls/OBC/CDL/Continuous/MatrixGain.mo @@ -58,13 +58,13 @@ Modelica Standard Library. Text( extent={{-150,150},{150,110}}, textString="%name", - lineColor={0,0,255}), + textColor={0,0,255}), Text( extent={{-50,-30},{20,38}}, - lineColor={0,0,0}, + textColor={0,0,0}, textString="[ ]"), Text( extent={{8,-30},{80,10}}, - lineColor={0,0,0}, + textColor={0,0,0}, textString="*")}), Diagram(coordinateSystem(preserveAspectRatio=true, extent={{-100,-100},{ 100,100}}), graphics={Rectangle( @@ -74,9 +74,9 @@ Modelica Standard Library. fillPattern=FillPattern.Solid), Text( extent={{-50,-30},{20,38}}, - lineColor={0,0,0}, + textColor={0,0,0}, textString="[ ]"), Text( extent={{8,-30},{80,10}}, - lineColor={0,0,0}, + textColor={0,0,0}, textString="*")})); end MatrixGain; diff --git a/Buildings/Controls/OBC/CDL/Continuous/MatrixMax.mo b/Buildings/Controls/OBC/CDL/Continuous/MatrixMax.mo index baa01ba5648..ac82f1a1fa5 100644 --- a/Buildings/Controls/OBC/CDL/Continuous/MatrixMax.mo +++ b/Buildings/Controls/OBC/CDL/Continuous/MatrixMax.mo @@ -46,9 +46,9 @@ First implementation. Text( extent={{-150,150},{150,110}}, textString="%name", - lineColor={0,0,255}),Text( + textColor={0,0,255}),Text( extent={{-78,-62},{86,68}}, - lineColor={0,0,0}, + textColor={0,0,0}, textString="[ ] max()")}), Diagram(coordinateSystem(preserveAspectRatio=true, extent={{-100,-100},{ 100,100}}))); diff --git a/Buildings/Controls/OBC/CDL/Continuous/MatrixMin.mo b/Buildings/Controls/OBC/CDL/Continuous/MatrixMin.mo index a1bc5ce46e3..c1fdc90456c 100644 --- a/Buildings/Controls/OBC/CDL/Continuous/MatrixMin.mo +++ b/Buildings/Controls/OBC/CDL/Continuous/MatrixMin.mo @@ -46,10 +46,10 @@ First implementation. Text( extent={{-150,150},{150,110}}, textString="%name", - lineColor={0,0,255}), + textColor={0,0,255}), Text( extent={{-78,-62},{86,68}}, - lineColor={0,0,0}, + textColor={0,0,0}, textString="[ ] min()")}), Diagram(coordinateSystem(preserveAspectRatio=true, extent={{-100,-100},{ 100,100}}))); diff --git a/Buildings/Controls/OBC/CDL/Continuous/Max.mo b/Buildings/Controls/OBC/CDL/Continuous/Max.mo index 0010fe8a275..495faeadf93 100644 --- a/Buildings/Controls/OBC/CDL/Continuous/Max.mo +++ b/Buildings/Controls/OBC/CDL/Continuous/Max.mo @@ -46,13 +46,13 @@ Modelica Standard Library. Text( extent={{-150,150},{150,110}}, textString="%name", - lineColor={0,0,255}), + textColor={0,0,255}), Text( extent={{-90,36},{90,-36}}, - lineColor={160,160,164}, + textColor={160,160,164}, textString="max()"), Text( extent={{226,60},{106,10}}, - lineColor={0,0,0}, + textColor={0,0,0}, textString=DynamicSelect("", String(y, leftJustified=false, significantDigits=3)))})); end Max; diff --git a/Buildings/Controls/OBC/CDL/Continuous/Min.mo b/Buildings/Controls/OBC/CDL/Continuous/Min.mo index 24815a35d6a..3cc45186186 100644 --- a/Buildings/Controls/OBC/CDL/Continuous/Min.mo +++ b/Buildings/Controls/OBC/CDL/Continuous/Min.mo @@ -46,13 +46,13 @@ Modelica Standard Library. Text( extent={{-150,150},{150,110}}, textString="%name", - lineColor={0,0,255}), + textColor={0,0,255}), Text( extent={{-90,36},{90,-36}}, - lineColor={160,160,164}, + textColor={160,160,164}, textString="min()"), Text( extent={{226,60},{106,10}}, - lineColor={0,0,0}, + textColor={0,0,0}, textString=DynamicSelect("", String(y, leftJustified=false, significantDigits=3)))})); end Min; diff --git a/Buildings/Controls/OBC/CDL/Continuous/Modulo.mo b/Buildings/Controls/OBC/CDL/Continuous/Modulo.mo index 684ecec94ab..0e29633c790 100644 --- a/Buildings/Controls/OBC/CDL/Continuous/Modulo.mo +++ b/Buildings/Controls/OBC/CDL/Continuous/Modulo.mo @@ -27,12 +27,12 @@ equation fillColor={255,255,255}, fillPattern=FillPattern.Solid), Text( - lineColor={0,0,255}, + textColor={0,0,255}, extent={{-150,110},{150,150}}, textString="%name"), Text( extent={{-32,-52},{40,-100}}, - lineColor={192,192,192}, + textColor={192,192,192}, textString="mod"), Line(points={{-8,16}}, color={0,0,0}), Line( @@ -47,7 +47,7 @@ equation Ellipse(fillPattern=FillPattern.Solid, extent={{-21,12},{-11,22}}), Text( extent={{226,60},{106,10}}, - lineColor={0,0,0}, + textColor={0,0,0}, textString=DynamicSelect("", String(y, leftJustified=false, significantDigits=3)))}), Documentation(info="
diff --git a/Buildings/Controls/OBC/CDL/Continuous/MovingMean.mo b/Buildings/Controls/OBC/CDL/Continuous/MovingMean.mo index 8f5aa512ccc..13800f91a0d 100644 --- a/Buildings/Controls/OBC/CDL/Continuous/MovingMean.mo +++ b/Buildings/Controls/OBC/CDL/Continuous/MovingMean.mo @@ -67,14 +67,14 @@ equation Text( extent={{-140,152},{160,112}}, textString="%name", - lineColor={0,0,255}), + textColor={0,0,255}), Text( extent={{-42,-63},{41,-106}}, - lineColor={192,192,192}, + textColor={192,192,192}, textString="%delta s"), Text( extent={{226,60},{106,10}}, - lineColor={0,0,0}, + textColor={0,0,0}, textString=DynamicSelect("", String(y, leftJustified=false, significantDigits=3)))}), Documentation(info="
diff --git a/Buildings/Controls/OBC/CDL/Continuous/MultiMax.mo b/Buildings/Controls/OBC/CDL/Continuous/MultiMax.mo index a22b2d5187e..9531a57af9d 100644 --- a/Buildings/Controls/OBC/CDL/Continuous/MultiMax.mo +++ b/Buildings/Controls/OBC/CDL/Continuous/MultiMax.mo @@ -25,14 +25,14 @@ annotation ( Text( extent={{-150,150},{150,110}}, textString="%name", - lineColor={0,0,255}), + textColor={0,0,255}), Text( extent={{-90,36},{90,-36}}, - lineColor={160,160,164}, + textColor={160,160,164}, textString="max()"), Text( extent={{226,60},{106,10}}, - lineColor={0,0,0}, + textColor={0,0,0}, textString=DynamicSelect("", String(y, leftJustified=false, significantDigits=3)))}), Documentation(info="
diff --git a/Buildings/Controls/OBC/CDL/Continuous/MultiMin.mo b/Buildings/Controls/OBC/CDL/Continuous/MultiMin.mo index 422781640e9..9ae67538a36 100644 --- a/Buildings/Controls/OBC/CDL/Continuous/MultiMin.mo +++ b/Buildings/Controls/OBC/CDL/Continuous/MultiMin.mo @@ -25,14 +25,14 @@ annotation ( Text( extent={{-150,150},{150,110}}, textString="%name", - lineColor={0,0,255}), + textColor={0,0,255}), Text( extent={{-90,36},{90,-36}}, - lineColor={160,160,164}, + textColor={160,160,164}, textString="min()"), Text( extent={{226,60},{106,10}}, - lineColor={0,0,0}, + textColor={0,0,0}, textString=DynamicSelect("", String(y, leftJustified=false, significantDigits=3)))}), Documentation(info="
diff --git a/Buildings/Controls/OBC/CDL/Continuous/MultiSum.mo b/Buildings/Controls/OBC/CDL/Continuous/MultiSum.mo index c9afbaebfaf..89c888c99fc 100644 --- a/Buildings/Controls/OBC/CDL/Continuous/MultiSum.mo +++ b/Buildings/Controls/OBC/CDL/Continuous/MultiSum.mo @@ -27,22 +27,22 @@ equation fillPattern=FillPattern.Solid), Text( extent={{-200,-110},{200,-140}}, - lineColor={0,0,0}, + textColor={0,0,0}, fillColor={255,213,170}, fillPattern=FillPattern.Solid, textString="%k"), Text( extent={{-82,90},{82,-46}}, - lineColor={0,0,0}, + textColor={0,0,0}, fillColor={255,213,170}, fillPattern=FillPattern.Solid, textString="+"), Text( extent={{-144,150},{156,110}}, textString="%name", - lineColor={0,0,255}), + textColor={0,0,255}), Text( extent={{226,60},{106,10}}, - lineColor={0,0,0}, + textColor={0,0,0}, textString=DynamicSelect("", String(y, leftJustified=false, significantDigits=3)))}), Documentation(info="
diff --git a/Buildings/Controls/OBC/CDL/Continuous/NumberOfRequests.mo b/Buildings/Controls/OBC/CDL/Continuous/NumberOfRequests.mo index 24c9db60dbf..c99e7a7a3ae 100644 --- a/Buildings/Controls/OBC/CDL/Continuous/NumberOfRequests.mo +++ b/Buildings/Controls/OBC/CDL/Continuous/NumberOfRequests.mo @@ -93,7 +93,7 @@ First implementation. fillPattern=FillPattern.Solid), Text( extent={{-128,88},{-6,28}}, - lineColor={0,0,255}, + textColor={0,0,255}, textString="%threShold"), Line(points={{-62,-6},{-4,24}}, color={0,0,255}), Line(points={{-4,24},{64,60}}, color={255,0,0}), @@ -108,5 +108,5 @@ First implementation. Text( extent={{-150,150},{150,110}}, textString="%name", - lineColor={0,0,255})})); + textColor={0,0,255})})); end NumberOfRequests; diff --git a/Buildings/Controls/OBC/CDL/Continuous/Product.mo b/Buildings/Controls/OBC/CDL/Continuous/Product.mo index b0a716fb294..90a739b574a 100644 --- a/Buildings/Controls/OBC/CDL/Continuous/Product.mo +++ b/Buildings/Controls/OBC/CDL/Continuous/Product.mo @@ -55,9 +55,9 @@ Modelica Standard Library. Text( extent={{-150,150},{150,110}}, textString="%name", - lineColor={0,0,255}), + textColor={0,0,255}), Text( extent={{226,60},{106,10}}, - lineColor={0,0,0}, + textColor={0,0,0}, textString=DynamicSelect("", String(y, leftJustified=false, significantDigits=3)))})); end Product; diff --git a/Buildings/Controls/OBC/CDL/Continuous/Round.mo b/Buildings/Controls/OBC/CDL/Continuous/Round.mo index 71e22c3f1e3..ba298b885d1 100644 --- a/Buildings/Controls/OBC/CDL/Continuous/Round.mo +++ b/Buildings/Controls/OBC/CDL/Continuous/Round.mo @@ -27,20 +27,20 @@ Icon(coordinateSystem( fillColor={255,255,255}, fillPattern=FillPattern.Solid), Text( - lineColor={0,0,127}, + textColor={0,0,127}, extent={{-56,4},{72,106}}, textString="round( )"), Text( extent={{-150,150},{150,110}}, textString="%name", - lineColor={0,0,255}), + textColor={0,0,255}), Text( - lineColor={0,0,127}, + textColor={0,0,127}, extent={{-60,-88},{54,-34}}, textString="%n"), Text( extent={{226,60},{106,10}}, - lineColor={0,0,0}, + textColor={0,0,0}, textString=DynamicSelect("", String(y, leftJustified=false, significantDigits=3)))}), Documentation(info="
diff --git a/Buildings/Controls/OBC/CDL/Continuous/Sin.mo b/Buildings/Controls/OBC/CDL/Continuous/Sin.mo index 7d61e40b2aa..5ccea7d84a1 100644 --- a/Buildings/Controls/OBC/CDL/Continuous/Sin.mo +++ b/Buildings/Controls/OBC/CDL/Continuous/Sin.mo @@ -15,7 +15,7 @@ annotation ( Icon(coordinateSystem(preserveAspectRatio=true, extent={{-100,-100},{100, 100}}), graphics={ Text( - lineColor={0,0,255}, + textColor={0,0,255}, extent={{-150,110},{150,150}}, textString="%name"), Rectangle( @@ -44,11 +44,11 @@ annotation ( fillPattern=FillPattern.Solid), Text( extent={{12,84},{84,36}}, - lineColor={192,192,192}, + textColor={192,192,192}, textString="sin"), Text( extent={{226,60},{106,10}}, - lineColor={0,0,0}, + textColor={0,0,0}, textString=DynamicSelect("", String(y, leftJustified=false, significantDigits=3)))}), Documentation(info="
diff --git a/Buildings/Controls/OBC/CDL/Continuous/SlewRateLimiter.mo b/Buildings/Controls/OBC/CDL/Continuous/SlewRateLimiter.mo index 261ea0f049a..a0880c413a3 100644 --- a/Buildings/Controls/OBC/CDL/Continuous/SlewRateLimiter.mo +++ b/Buildings/Controls/OBC/CDL/Continuous/SlewRateLimiter.mo @@ -81,7 +81,7 @@ Modelica Standard Library. preserveAspectRatio=true, extent={{-100,-100},{100,100}}), graphics={ Text( - lineColor={0,0,255}, + textColor={0,0,255}, extent={{-150,110},{150,150}}, textString="%name"), Rectangle( @@ -104,11 +104,11 @@ Modelica Standard Library. Text( extent={{-150,150},{150,110}}, textString="%name", - lineColor={0,0,255}), + textColor={0,0,255}), Line( points={{-50,-70},{50,70}}), Text( extent={{226,60},{106,10}}, - lineColor={0,0,0}, + textColor={0,0,0}, textString=DynamicSelect("", String(y, leftJustified=false, significantDigits=3)))})); end SlewRateLimiter; diff --git a/Buildings/Controls/OBC/CDL/Continuous/Sort.mo b/Buildings/Controls/OBC/CDL/Continuous/Sort.mo index 639076a6a9e..9e4b13fbad1 100644 --- a/Buildings/Controls/OBC/CDL/Continuous/Sort.mo +++ b/Buildings/Controls/OBC/CDL/Continuous/Sort.mo @@ -22,10 +22,10 @@ Icon(coordinateSystem(preserveAspectRatio=true, extent={{-100,-100},{ fillPattern=FillPattern.Solid), Text( extent={{-150,150},{150,110}}, textString="%name", - lineColor={0,0,255}), + textColor={0,0,255}), Text( extent={{-58,70},{54,-60}}, - lineColor={0,0,89}, + textColor={0,0,89}, textString="sort")}), Documentation(info="
diff --git a/Buildings/Controls/OBC/CDL/Continuous/Sources/CalendarTime.mo b/Buildings/Controls/OBC/CDL/Continuous/Sources/CalendarTime.mo index e80bc425195..633af6c3559 100644 --- a/Buildings/Controls/OBC/CDL/Continuous/Sources/CalendarTime.mo +++ b/Buildings/Controls/OBC/CDL/Continuous/Sources/CalendarTime.mo @@ -120,7 +120,7 @@ First implementation. fillPattern=FillPattern.Solid), Text( extent={{-150,150},{150,110}}, textString="%name", - lineColor={0,0,255}), + textColor={0,0,255}), Ellipse( extent={{-94,94},{16,-16}}, lineColor={160,160,164}, @@ -128,32 +128,32 @@ First implementation. fillPattern=FillPattern.Solid), Text( extent={{-34,92},{96,82}}, - lineColor={28,108,200}, + textColor={28,108,200}, horizontalAlignment=TextAlignment.Right, textString="Minute"), Text( extent={{-28,64},{96,54}}, - lineColor={28,108,200}, + textColor={28,108,200}, horizontalAlignment=TextAlignment.Right, textString="Hour"), Text( extent={{-38,36},{96,24}}, - lineColor={28,108,200}, + textColor={28,108,200}, horizontalAlignment=TextAlignment.Right, textString="Day"), Text( extent={{-50,4},{96,-6}}, - lineColor={28,108,200}, + textColor={28,108,200}, horizontalAlignment=TextAlignment.Right, textString="Month"), Text( extent={{-70,-24},{96,-34}}, - lineColor={28,108,200}, + textColor={28,108,200}, horizontalAlignment=TextAlignment.Right, textString="Year"), Text( extent={{-68,-54},{96,-66}}, - lineColor={28,108,200}, + textColor={28,108,200}, horizontalAlignment=TextAlignment.Right, textString="Weekday"), Line( diff --git a/Buildings/Controls/OBC/CDL/Continuous/Sources/Constant.mo b/Buildings/Controls/OBC/CDL/Continuous/Sources/Constant.mo index b04915a205d..5ec5178c24a 100644 --- a/Buildings/Controls/OBC/CDL/Continuous/Sources/Constant.mo +++ b/Buildings/Controls/OBC/CDL/Continuous/Sources/Constant.mo @@ -19,7 +19,7 @@ equation fillColor={255,255,255}, fillPattern=FillPattern.Solid), Text( - lineColor={0,0,255}, + textColor={0,0,255}, extent={{-150,110},{150,150}}, textString="%name"), Line(points={{-80,68},{-80,-80}}, color={192,192,192}), @@ -37,11 +37,11 @@ equation Line(points={{-80,0},{80,0}}), Text( extent={{-150,-150},{150,-110}}, - lineColor={0,0,0}, + textColor={0,0,0}, textString="k=%k"), Text( extent={{226,60},{106,10}}, - lineColor={0,0,0}, + textColor={0,0,0}, textString=DynamicSelect("", String(y, leftJustified=false, significantDigits=3)))}), Documentation(info="
diff --git a/Buildings/Controls/OBC/CDL/Continuous/Sources/ModelTime.mo b/Buildings/Controls/OBC/CDL/Continuous/Sources/ModelTime.mo index a592035f7b8..f88e5e2cdef 100644 --- a/Buildings/Controls/OBC/CDL/Continuous/Sources/ModelTime.mo +++ b/Buildings/Controls/OBC/CDL/Continuous/Sources/ModelTime.mo @@ -16,7 +16,7 @@ equation grid={1,1}), graphics={ Text( extent={{-150,150},{150,110}}, textString="%name", - lineColor={0,0,255}), Rectangle( + textColor={0,0,255}), Rectangle( extent={{-100,-100},{100,100}}, lineColor={0,0,127}, fillColor={255,255,255}, @@ -44,7 +44,7 @@ equation thickness=0.5), Text( extent={{226,60},{106,10}}, - lineColor={0,0,0}, + textColor={0,0,0}, textString=DynamicSelect("", String(y, leftJustified=false, significantDigits=3)))}), Documentation(info="
Block that outputs the standard time. diff --git a/Buildings/Controls/OBC/CDL/Continuous/Sources/Pulse.mo b/Buildings/Controls/OBC/CDL/Continuous/Sources/Pulse.mo index d41e540ff8b..9534d9f1486 100644 --- a/Buildings/Controls/OBC/CDL/Continuous/Sources/Pulse.mo +++ b/Buildings/Controls/OBC/CDL/Continuous/Sources/Pulse.mo @@ -56,15 +56,15 @@ equation 44},{79,44}}), Text( extent={{-147,-152},{153,-112}}, - lineColor={0,0,0}, + textColor={0,0,0}, textString="period=%period"), Text( - lineColor={0,0,255}, + textColor={0,0,255}, extent={{-150,110},{150,150}}, textString="%name"), Text( extent={{226,60},{106,10}}, - lineColor={0,0,0}, + textColor={0,0,0}, textString=DynamicSelect("", String(y, leftJustified=false, significantDigits=3)))}), Documentation(info="
diff --git a/Buildings/Controls/OBC/CDL/Continuous/Sources/Ramp.mo b/Buildings/Controls/OBC/CDL/Continuous/Sources/Ramp.mo index b25fc6c8506..27d8e43c0d5 100644 --- a/Buildings/Controls/OBC/CDL/Continuous/Sources/Ramp.mo +++ b/Buildings/Controls/OBC/CDL/Continuous/Sources/Ramp.mo @@ -19,7 +19,7 @@ equation preserveAspectRatio=true, extent={{-100,-100},{100,100}}), graphics={ Text( - lineColor={0,0,255}, + textColor={0,0,255}, extent={{-150,110},{150,150}}, textString="%name"), Rectangle( extent={{-100,-100},{100,100}}, @@ -41,12 +41,12 @@ equation Line(points={{-80,-70},{-40,-70},{31,38}}), Text( extent={{-150,-150},{150,-110}}, - lineColor={0,0,0}, + textColor={0,0,0}, textString="duration=%duration"), Line(points={{31,38},{86,38}}), Text( extent={{226,60},{106,10}}, - lineColor={0,0,0}, + textColor={0,0,0}, textString=DynamicSelect("", String(y, leftJustified=false, significantDigits=3)))}), Documentation(info="
diff --git a/Buildings/Controls/OBC/CDL/Continuous/Sources/Sine.mo b/Buildings/Controls/OBC/CDL/Continuous/Sources/Sine.mo index f8300ecb79a..17ba46894ac 100644 --- a/Buildings/Controls/OBC/CDL/Continuous/Sources/Sine.mo +++ b/Buildings/Controls/OBC/CDL/Continuous/Sources/Sine.mo @@ -20,7 +20,7 @@ equation preserveAspectRatio=true, extent={{-100,-100},{100,100}}),graphics={ Text( - lineColor={0,0,255}, + textColor={0,0,255}, extent={{-148,104},{152,144}}, textString="%name"), Rectangle(extent={{-100,-100},{100,100}}, @@ -41,11 +41,11 @@ equation 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.1},{35,-78.4},{40.6,-80},{46.2,-77.6},{51.9,-71.5}, {57.5,-61.9},{63.9,-47.2},{72,-24.8},{80,0}}, smooth = Smooth.Bezier), - Text(extent={{-147,-152},{153,-112}},lineColor={0,0,0}, + Text(extent={{-147,-152},{153,-112}},textColor={0,0,0}, textString="freqHz=%freqHz"), Text( extent={{226,60},{106,10}}, - lineColor={0,0,0}, + textColor={0,0,0}, textString=DynamicSelect("", String(y, leftJustified=false, significantDigits=3)))}), Documentation(info="
diff --git a/Buildings/Controls/OBC/CDL/Continuous/Sources/TimeTable.mo b/Buildings/Controls/OBC/CDL/Continuous/Sources/TimeTable.mo index d0f4702aeec..a8806da2f6c 100644 --- a/Buildings/Controls/OBC/CDL/Continuous/Sources/TimeTable.mo +++ b/Buildings/Controls/OBC/CDL/Continuous/Sources/TimeTable.mo @@ -258,7 +258,7 @@ Initial CDL implementation. fillPattern=FillPattern.Solid), Text( extent={{-150,150},{150,110}}, textString="%name", - lineColor={0,0,255}), + textColor={0,0,255}), Polygon(lineColor={192,192,192}, fillColor={192,192,192}, fillPattern=FillPattern.Solid, diff --git a/Buildings/Controls/OBC/CDL/Continuous/Sqrt.mo b/Buildings/Controls/OBC/CDL/Continuous/Sqrt.mo index 5bebcf7c524..2eca513740c 100644 --- a/Buildings/Controls/OBC/CDL/Continuous/Sqrt.mo +++ b/Buildings/Controls/OBC/CDL/Continuous/Sqrt.mo @@ -37,15 +37,15 @@ equation Line(points={{-80,-88},{-80,68}}, color={192,192,192}), Text( extent={{-8,-4},{64,-52}}, - lineColor={192,192,192}, + textColor={192,192,192}, textString="sqrt"), Text( extent={{-150,150},{150,110}}, textString="%name", - lineColor={0,0,255}), + textColor={0,0,255}), Text( extent={{226,60},{106,10}}, - lineColor={0,0,0}, + textColor={0,0,0}, textString=DynamicSelect("", String(y, leftJustified=false, significantDigits=3)))}), Documentation(info="
diff --git a/Buildings/Controls/OBC/CDL/Continuous/Tan.mo b/Buildings/Controls/OBC/CDL/Continuous/Tan.mo index 524db039e47..3e9817b02e4 100644 --- a/Buildings/Controls/OBC/CDL/Continuous/Tan.mo +++ b/Buildings/Controls/OBC/CDL/Continuous/Tan.mo @@ -20,12 +20,12 @@ annotation ( fillColor={255,255,255}, fillPattern=FillPattern.Solid), Text( - lineColor={0,0,255}, + textColor={0,0,255}, extent={{-150,110},{150,150}}, textString="%name"), Text( extent={{-90,72},{-18,24}}, - lineColor={192,192,192}, + textColor={192,192,192}, textString="tan"), Line(points={{0,-80},{0,68}}, color={192,192,192}), Polygon( @@ -47,7 +47,7 @@ annotation ( smooth=Smooth.Bezier), Text( extent={{226,60},{106,10}}, - lineColor={0,0,0}, + textColor={0,0,0}, textString=DynamicSelect("", String(y, leftJustified=false, significantDigits=3)))}), Documentation(info="
diff --git a/Buildings/Controls/OBC/CDL/Continuous/package.mo b/Buildings/Controls/OBC/CDL/Continuous/package.mo index 07145e6f3a8..23f7ed7597d 100644 --- a/Buildings/Controls/OBC/CDL/Continuous/package.mo +++ b/Buildings/Controls/OBC/CDL/Continuous/package.mo @@ -26,7 +26,7 @@ Icon(graphics={ radius=25.0), Text( extent={{-52,86},{52,-92}}, - lineColor={0,0,0}, + textColor={0,0,0}, fillColor={0,0,0}, fillPattern=FillPattern.Solid, textString="R"), diff --git a/Buildings/Controls/OBC/CDL/Conversions/BooleanToInteger.mo b/Buildings/Controls/OBC/CDL/Conversions/BooleanToInteger.mo index fad258fa87e..dff2e199cc9 100644 --- a/Buildings/Controls/OBC/CDL/Conversions/BooleanToInteger.mo +++ b/Buildings/Controls/OBC/CDL/Conversions/BooleanToInteger.mo @@ -43,7 +43,7 @@ Modelica Standard Library. {100,100}}), graphics={ Text( extent={{-86,92},{-6,10}}, - lineColor={255,0,255}, + textColor={255,0,255}, textString="B"), Polygon( points={{-12,-46},{-32,-26},{-32,-36},{-64,-36},{-64,-56},{-32,-56}, @@ -53,7 +53,7 @@ Modelica Standard Library. fillPattern=FillPattern.Solid), Text( extent={{8,-4},{92,-94}}, - lineColor={255,170,85}, + textColor={255,170,85}, textString="I"), Rectangle( extent={{-100,100},{100,-100}}, fillColor={210,210,210}, @@ -69,5 +69,5 @@ Modelica Standard Library. fillPattern=FillPattern.Solid), Text( extent={{-150,150},{150,110}}, textString="%name", - lineColor={0,0,255})})); + textColor={0,0,255})})); end BooleanToInteger; diff --git a/Buildings/Controls/OBC/CDL/Conversions/BooleanToReal.mo b/Buildings/Controls/OBC/CDL/Conversions/BooleanToReal.mo index e49d6bd2760..41854221129 100644 --- a/Buildings/Controls/OBC/CDL/Conversions/BooleanToReal.mo +++ b/Buildings/Controls/OBC/CDL/Conversions/BooleanToReal.mo @@ -43,7 +43,7 @@ Modelica Standard Library. {100,100}}), graphics={ Text( extent={{-86,92},{-6,10}}, - lineColor={255,0,255}, + textColor={255,0,255}, textString="B"), Polygon( points={{-12,-46},{-32,-26},{-32,-36},{-64,-36},{-64,-56},{-32,-56}, @@ -53,7 +53,7 @@ Modelica Standard Library. fillPattern=FillPattern.Solid), Text( extent={{8,-4},{92,-94}}, - lineColor={255,170,85}, + textColor={255,170,85}, textString="I"), Rectangle( extent={{-100,100},{100,-100}}, fillColor={210,210,210}, @@ -69,5 +69,5 @@ Modelica Standard Library. fillPattern=FillPattern.Solid), Text( extent={{-150,150},{150,110}}, textString="%name", - lineColor={0,0,255})})); + textColor={0,0,255})})); end BooleanToReal; diff --git a/Buildings/Controls/OBC/CDL/Conversions/IntegerToReal.mo b/Buildings/Controls/OBC/CDL/Conversions/IntegerToReal.mo index 046d48d5776..4dce384a284 100644 --- a/Buildings/Controls/OBC/CDL/Conversions/IntegerToReal.mo +++ b/Buildings/Controls/OBC/CDL/Conversions/IntegerToReal.mo @@ -19,17 +19,17 @@ annotation ( Text( extent={{-150,150},{150,110}}, textString="%name", - lineColor={0,0,255}), Rectangle( + textColor={0,0,255}), Rectangle( extent={{-100,-100},{100,100}}, lineColor={0,0,127}, fillColor={255,255,255}, fillPattern=FillPattern.Solid), Text( - lineColor={255,127,0}, + textColor={255,127,0}, extent={{-120.0,-40.0},{-20.0,40.0}}, textString="I"), Text( - lineColor={0,0,127}, + textColor={0,0,127}, fillPattern=FillPattern.Solid, extent={{0.0,-40.0},{100.0,40.0}}, textString="R"), diff --git a/Buildings/Controls/OBC/CDL/Conversions/IsHoliday.mo b/Buildings/Controls/OBC/CDL/Conversions/IsHoliday.mo index c0512727132..b09c0fd2ea0 100644 --- a/Buildings/Controls/OBC/CDL/Conversions/IsHoliday.mo +++ b/Buildings/Controls/OBC/CDL/Conversions/IsHoliday.mo @@ -33,10 +33,10 @@ First implementation. borderPattern=BorderPattern.Raised), Text( extent={{-82,46},{82,-44}}, - lineColor={0,127,0}, + textColor={0,127,0}, textString="isHoliday"), Text( extent={{-140,148},{160,108}}, textString="%name", - lineColor={0,0,255})})); + textColor={0,0,255})})); end IsHoliday; diff --git a/Buildings/Controls/OBC/CDL/Conversions/IsNonWorkingDay.mo b/Buildings/Controls/OBC/CDL/Conversions/IsNonWorkingDay.mo index 9692c037181..74129b7f757 100644 --- a/Buildings/Controls/OBC/CDL/Conversions/IsNonWorkingDay.mo +++ b/Buildings/Controls/OBC/CDL/Conversions/IsNonWorkingDay.mo @@ -33,10 +33,10 @@ First implementation. borderPattern=BorderPattern.Raised), Text( extent={{-82,46},{82,-44}}, - lineColor={0,127,0}, + textColor={0,127,0}, textString="isNonWorkingDay"), Text( extent={{-140,148},{160,108}}, textString="%name", - lineColor={0,0,255})})); + textColor={0,0,255})})); end IsNonWorkingDay; diff --git a/Buildings/Controls/OBC/CDL/Conversions/IsWorkingDay.mo b/Buildings/Controls/OBC/CDL/Conversions/IsWorkingDay.mo index ba5538a4a6a..45b322bf59d 100644 --- a/Buildings/Controls/OBC/CDL/Conversions/IsWorkingDay.mo +++ b/Buildings/Controls/OBC/CDL/Conversions/IsWorkingDay.mo @@ -33,10 +33,10 @@ First implementation. borderPattern=BorderPattern.Raised), Text( extent={{-82,46},{82,-44}}, - lineColor={0,127,0}, + textColor={0,127,0}, textString="isWorkingDay"), Text( extent={{-140,148},{160,108}}, textString="%name", - lineColor={0,0,255})})); + textColor={0,0,255})})); end IsWorkingDay; diff --git a/Buildings/Controls/OBC/CDL/Conversions/RealToInteger.mo b/Buildings/Controls/OBC/CDL/Conversions/RealToInteger.mo index 24287814479..1a8f7242c9b 100644 --- a/Buildings/Controls/OBC/CDL/Conversions/RealToInteger.mo +++ b/Buildings/Controls/OBC/CDL/Conversions/RealToInteger.mo @@ -23,11 +23,11 @@ Icon(coordinateSystem( fillColor={255,255,255}, fillPattern=FillPattern.Solid), Text( - lineColor={0,0,127}, + textColor={0,0,127}, extent={{-100.0,-40.0},{0.0,40.0}}, textString="R"), Text( - lineColor={255,127,0}, + textColor={255,127,0}, extent={{20.0,-40.0},{120.0,40.0}}, textString="I"), Polygon( @@ -39,7 +39,7 @@ Icon(coordinateSystem( Text( extent={{-150,150},{150,110}}, textString="%name", - lineColor={0,0,255})}), + textColor={0,0,255})}), Documentation(info="
Block that outputs y
diff --git a/Buildings/Controls/OBC/CDL/Discrete/DayType.mo b/Buildings/Controls/OBC/CDL/Discrete/DayType.mo
index 42167c2003a..ca3902a621c 100644
--- a/Buildings/Controls/OBC/CDL/Discrete/DayType.mo
+++ b/Buildings/Controls/OBC/CDL/Discrete/DayType.mo
@@ -59,15 +59,15 @@ equation
fillPattern=FillPattern.Solid),
Text(
extent={{-68,54},{68,-38}},
- lineColor={0,0,255},
+ textColor={0,0,255},
textString="day"),
Text(
extent={{-150,150},{150,110}},
textString="%name",
- lineColor={0,0,255}),
+ textColor={0,0,255}),
Text(
extent={{226,60},{106,10}},
- lineColor={0,0,0},
+ textColor={0,0,0},
textString=DynamicSelect("", String(y, leftJustified=false, significantDigits=3)))}),
Documentation(info="
diff --git a/Buildings/Controls/OBC/CDL/Discrete/FirstOrderHold.mo b/Buildings/Controls/OBC/CDL/Discrete/FirstOrderHold.mo index e00c1864971..97031142283 100644 --- a/Buildings/Controls/OBC/CDL/Discrete/FirstOrderHold.mo +++ b/Buildings/Controls/OBC/CDL/Discrete/FirstOrderHold.mo @@ -64,7 +64,7 @@ equation fillPattern=FillPattern.Solid), Text( extent={{-150,150},{150,110}}, textString="%name", - lineColor={0,0,255}), + textColor={0,0,255}), Line(points={{-79.0,-41.0},{-59.0,-33.0},{-40.0,1.0},{-20.0,9.0}, {0.0,63.0},{21.0,20.0},{41.0,10.0},{60.0,20.0}}, color={0,0,127}), @@ -72,7 +72,7 @@ equation color={0,0,127}), Text( extent={{226,60},{106,10}}, - lineColor={0,0,0}, + textColor={0,0,0}, textString=DynamicSelect("", String(y, leftJustified=false, significantDigits=3)))}), Documentation(info="
diff --git a/Buildings/Controls/OBC/CDL/Discrete/Sampler.mo b/Buildings/Controls/OBC/CDL/Discrete/Sampler.mo index d18accae1e8..ae01b97323e 100644 --- a/Buildings/Controls/OBC/CDL/Discrete/Sampler.mo +++ b/Buildings/Controls/OBC/CDL/Discrete/Sampler.mo @@ -46,7 +46,7 @@ equation fillPattern=FillPattern.Solid), Text( extent={{-150,150},{150,110}}, textString="%name", - lineColor={0,0,255}), + textColor={0,0,255}), Ellipse(lineColor={0,0,127}, fillColor={255,255,255}, fillPattern=FillPattern.Solid, @@ -78,7 +78,7 @@ equation Line(points={{-35,0},{30,35}}, color={0,0,255}), Text( extent={{226,60},{106,10}}, - lineColor={0,0,0}, + textColor={0,0,0}, textString=DynamicSelect("", String(y, leftJustified=false, significantDigits=3)))}), Documentation(info="
diff --git a/Buildings/Controls/OBC/CDL/Discrete/TriggeredMax.mo b/Buildings/Controls/OBC/CDL/Discrete/TriggeredMax.mo index 125d659880d..d8b5a2d19a5 100644 --- a/Buildings/Controls/OBC/CDL/Discrete/TriggeredMax.mo +++ b/Buildings/Controls/OBC/CDL/Discrete/TriggeredMax.mo @@ -38,7 +38,7 @@ equation fillPattern=FillPattern.Solid), Text( extent={{-150,150},{150,110}}, textString="%name", - lineColor={0,0,255}), + textColor={0,0,255}), Ellipse(lineColor={0,0,127}, fillColor={255,255,255}, fillPattern=FillPattern.Solid, @@ -75,7 +75,7 @@ equation Line(points={{0,-100},{0,-26}}, color={255,0,255}), Text( extent={{226,60},{106,10}}, - lineColor={0,0,0}, + textColor={0,0,0}, textString=DynamicSelect("", String(y, leftJustified=false, significantDigits=3)))}), Documentation(info="
diff --git a/Buildings/Controls/OBC/CDL/Discrete/TriggeredMovingMean.mo b/Buildings/Controls/OBC/CDL/Discrete/TriggeredMovingMean.mo index a79c5e9894c..f524f2d5af6 100644 --- a/Buildings/Controls/OBC/CDL/Discrete/TriggeredMovingMean.mo +++ b/Buildings/Controls/OBC/CDL/Discrete/TriggeredMovingMean.mo @@ -55,7 +55,7 @@ equation Text( extent={{-150,150},{150,110}}, textString="%name", - lineColor={0,0,255}), + textColor={0,0,255}), Line(points={{-88,0},{70,0}}, color={192,192,192}), Polygon( points={{92,0},{70,8},{70,-8},{92,0}}, @@ -103,11 +103,11 @@ equation Line(points={{0,-100},{0,-26}}, color={255,0,255}), Text( extent={{56,92},{92,60}}, - lineColor={28,108,200}, + textColor={28,108,200}, textString="%n"), Text( extent={{226,60},{106,10}}, - lineColor={0,0,0}, + textColor={0,0,0}, textString=DynamicSelect("", String(y, leftJustified=false, significantDigits=3)))}), Documentation(info="
diff --git a/Buildings/Controls/OBC/CDL/Discrete/TriggeredSampler.mo b/Buildings/Controls/OBC/CDL/Discrete/TriggeredSampler.mo index d3c67ecd97a..485fa73feaf 100644 --- a/Buildings/Controls/OBC/CDL/Discrete/TriggeredSampler.mo +++ b/Buildings/Controls/OBC/CDL/Discrete/TriggeredSampler.mo @@ -56,10 +56,10 @@ equation Text( extent={{-150,150},{150,110}}, textString="%name", - lineColor={0,0,255}), + textColor={0,0,255}), Text( extent={{226,60},{106,10}}, - lineColor={0,0,0}, + textColor={0,0,0}, textString=DynamicSelect("", String(y, leftJustified=false, significantDigits=3)))}), Documentation(info="
diff --git a/Buildings/Controls/OBC/CDL/Discrete/UnitDelay.mo b/Buildings/Controls/OBC/CDL/Discrete/UnitDelay.mo index eb5847163d0..584592c4f85 100644 --- a/Buildings/Controls/OBC/CDL/Discrete/UnitDelay.mo +++ b/Buildings/Controls/OBC/CDL/Discrete/UnitDelay.mo @@ -86,17 +86,17 @@ Modelica Standard Library. fillPattern=FillPattern.Solid), Text( extent={{-150,150},{150,110}}, textString="%name", - lineColor={0,0,255}), + textColor={0,0,255}), Line(points={{-30.0,0.0},{30.0,0.0}}, color={0,0,127}), - Text(lineColor={0,0,127}, + Text(textColor={0,0,127}, extent={{-90.0,10.0},{90.0,90.0}}, textString="1"), - Text(lineColor={0,0,127}, + Text(textColor={0,0,127}, extent={{-90.0,-90.0},{90.0,-10.0}}, textString="z"), Text( extent={{226,60},{106,10}}, - lineColor={0,0,0}, + textColor={0,0,0}, textString=DynamicSelect("", String(y, leftJustified=false, significantDigits=3)))})); end UnitDelay; diff --git a/Buildings/Controls/OBC/CDL/Discrete/ZeroOrderHold.mo b/Buildings/Controls/OBC/CDL/Discrete/ZeroOrderHold.mo index 99e0d1ac9ca..62293654eb6 100644 --- a/Buildings/Controls/OBC/CDL/Discrete/ZeroOrderHold.mo +++ b/Buildings/Controls/OBC/CDL/Discrete/ZeroOrderHold.mo @@ -56,12 +56,12 @@ equation fillPattern=FillPattern.Solid), Text( extent={{-150,150},{150,110}}, textString="%name", - lineColor={0,0,255}), + textColor={0,0,255}), Line(points={{-78.0,-42.0},{-52.0,-42.0},{-52.0,0.0},{-26.0,0.0},{-26.0,24.0},{-6.0,24.0},{-6.0,64.0},{18.0,64.0},{18.0,20.0},{38.0,20.0},{38.0,0.0},{44.0,0.0},{44.0,0.0},{62.0,0.0}}, color={0,0,127}), Text( extent={{226,60},{106,10}}, - lineColor={0,0,0}, + textColor={0,0,0}, textString=DynamicSelect("", String(y, leftJustified=false, significantDigits=3)))}), Documentation(info="
diff --git a/Buildings/Controls/OBC/CDL/Integers/Abs.mo b/Buildings/Controls/OBC/CDL/Integers/Abs.mo index 0dc9b98f4c9..e46a252c7a4 100644 --- a/Buildings/Controls/OBC/CDL/Integers/Abs.mo +++ b/Buildings/Controls/OBC/CDL/Integers/Abs.mo @@ -20,7 +20,7 @@ equation Text( extent={{-150,150},{150,110}}, textString="%name", - lineColor={0,0,255}), + textColor={0,0,255}), Polygon( points={{92,0},{70,8},{70,-8},{92,0}}, lineColor={192,192,192}, @@ -34,7 +34,7 @@ equation fillPattern=FillPattern.Solid), Text( extent={{-34,-28},{38,-76}}, - lineColor={192,192,192}, + textColor={192,192,192}, textString="abs"), Line(points={{-88,0},{76,0}}, color={192,192,192}), Ellipse( diff --git a/Buildings/Controls/OBC/CDL/Integers/Add.mo b/Buildings/Controls/OBC/CDL/Integers/Add.mo index 2d9eb054e62..de86763faa1 100644 --- a/Buildings/Controls/OBC/CDL/Integers/Add.mo +++ b/Buildings/Controls/OBC/CDL/Integers/Add.mo @@ -45,7 +45,7 @@ Modelica Standard Library. Text( extent={{-150,150},{150,110}}, textString="%name", - lineColor={0,0,255}), Rectangle( + textColor={0,0,255}), Rectangle( extent={{-100,-100},{100,100}}, lineColor={255,127,0}, fillColor={255,255,255}, diff --git a/Buildings/Controls/OBC/CDL/Integers/Change.mo b/Buildings/Controls/OBC/CDL/Integers/Change.mo index 7a812b707b1..4de122d84fc 100644 --- a/Buildings/Controls/OBC/CDL/Integers/Change.mo +++ b/Buildings/Controls/OBC/CDL/Integers/Change.mo @@ -38,12 +38,12 @@ Icon(coordinateSystem(preserveAspectRatio=true), graphics={ borderPattern=BorderPattern.Raised), Text( extent={{-50,62},{50,-56}}, - lineColor={255,127,0}, + textColor={255,127,0}, textString="change"), Text( extent={{-150,150},{150,110}}, textString="%name", - lineColor={0,0,255})}), + textColor={0,0,255})}), Documentation(info="
Block that evaluates the integer input u to check if its value
diff --git a/Buildings/Controls/OBC/CDL/Integers/Equal.mo b/Buildings/Controls/OBC/CDL/Integers/Equal.mo
index 781957676ef..de705b00cb9 100644
--- a/Buildings/Controls/OBC/CDL/Integers/Equal.mo
+++ b/Buildings/Controls/OBC/CDL/Integers/Equal.mo
@@ -36,9 +36,9 @@ annotation (
Text(
extent={{-150,150},{150,110}},
textString="%name",
- lineColor={0,0,255}), Text(
+ textColor={0,0,255}), Text(
extent={{-76,-36},{20,54}},
- lineColor={255,127,0},
+ textColor={255,127,0},
textString="=")}),
Documentation(info="
diff --git a/Buildings/Controls/OBC/CDL/Integers/Greater.mo b/Buildings/Controls/OBC/CDL/Integers/Greater.mo index 01cfd1f64a0..8f89f0cf5eb 100644 --- a/Buildings/Controls/OBC/CDL/Integers/Greater.mo +++ b/Buildings/Controls/OBC/CDL/Integers/Greater.mo @@ -41,7 +41,7 @@ annotation ( Text( extent={{-150,150},{150,110}}, textString="%name", - lineColor={0,0,255})}), + textColor={0,0,255})}), Documentation(info="
Block that outputs true if the Integer input u1
diff --git a/Buildings/Controls/OBC/CDL/Integers/GreaterEqual.mo b/Buildings/Controls/OBC/CDL/Integers/GreaterEqual.mo
index ff96e67d8b5..8bc8a3723dd 100644
--- a/Buildings/Controls/OBC/CDL/Integers/GreaterEqual.mo
+++ b/Buildings/Controls/OBC/CDL/Integers/GreaterEqual.mo
@@ -45,7 +45,7 @@ annotation (
Text(
extent={{-150,150},{150,110}},
textString="%name",
- lineColor={0,0,255})}),
+ textColor={0,0,255})}),
Documentation(info="
Block that outputs true if Integer the input u1
diff --git a/Buildings/Controls/OBC/CDL/Integers/GreaterEqualThreshold.mo b/Buildings/Controls/OBC/CDL/Integers/GreaterEqualThreshold.mo
index 1981ce37eb9..492326d87b0 100644
--- a/Buildings/Controls/OBC/CDL/Integers/GreaterEqualThreshold.mo
+++ b/Buildings/Controls/OBC/CDL/Integers/GreaterEqualThreshold.mo
@@ -19,7 +19,7 @@ annotation (
{100,100}}), graphics={
Text(
extent={{-150,-140},{150,-110}},
- lineColor={0,0,0},
+ textColor={0,0,0},
textString="%threshold"),
Rectangle(
extent={{-100,100},{100,-100}},
@@ -38,7 +38,7 @@ annotation (
Text(
extent={{-150,150},{150,110}},
textString="%name",
- lineColor={0,0,255}),
+ textColor={0,0,255}),
Line(
points={{-54,22},{-8,2},{-54,-18}},
thickness=0.5,
diff --git a/Buildings/Controls/OBC/CDL/Integers/GreaterThreshold.mo b/Buildings/Controls/OBC/CDL/Integers/GreaterThreshold.mo
index b70fc397490..a10efc09337 100644
--- a/Buildings/Controls/OBC/CDL/Integers/GreaterThreshold.mo
+++ b/Buildings/Controls/OBC/CDL/Integers/GreaterThreshold.mo
@@ -33,11 +33,11 @@ annotation (
fillPattern=FillPattern.Solid),
Text(
extent={{-150,-140},{150,-110}},
- lineColor={0,0,0},
+ textColor={0,0,0},
textString="%threshold"),
Text(
extent={{-150,150},{150,110}},
- lineColor={0,0,255},
+ textColor={0,0,255},
textString="%name"),
Line(
points={{-54,22},{-8,2},{-54,-18}},
diff --git a/Buildings/Controls/OBC/CDL/Integers/Less.mo b/Buildings/Controls/OBC/CDL/Integers/Less.mo
index eeb7b678cec..2cf3def8b34 100644
--- a/Buildings/Controls/OBC/CDL/Integers/Less.mo
+++ b/Buildings/Controls/OBC/CDL/Integers/Less.mo
@@ -38,7 +38,7 @@ equation
color={255,127,0}),
Text(
extent={{-150,150},{150,110}},
- lineColor={0,0,255},
+ textColor={0,0,255},
textString="%name")}),
Documentation(info="
diff --git a/Buildings/Controls/OBC/CDL/Integers/LessEqual.mo b/Buildings/Controls/OBC/CDL/Integers/LessEqual.mo index c7f849ae383..05e34f122c3 100644 --- a/Buildings/Controls/OBC/CDL/Integers/LessEqual.mo +++ b/Buildings/Controls/OBC/CDL/Integers/LessEqual.mo @@ -44,7 +44,7 @@ annotation ( color={255,127,0}), Text( extent={{-150,150},{150,110}}, - lineColor={0,0,255}, + textColor={0,0,255}, textString="%name")}), Documentation(info="
diff --git a/Buildings/Controls/OBC/CDL/Integers/LessEqualThreshold.mo b/Buildings/Controls/OBC/CDL/Integers/LessEqualThreshold.mo index d568f979e2f..a93532e32cd 100644 --- a/Buildings/Controls/OBC/CDL/Integers/LessEqualThreshold.mo +++ b/Buildings/Controls/OBC/CDL/Integers/LessEqualThreshold.mo @@ -33,11 +33,11 @@ annotation ( fillPattern=FillPattern.Solid), Text( extent={{-150,-140},{150,-110}}, - lineColor={0,0,0}, + textColor={0,0,0}, textString="%threshold"), Text( extent={{-150,150},{150,110}}, - lineColor={0,0,255}, + textColor={0,0,255}, textString="%name"), Line( points={{-54,-18},{-14,-34}}, diff --git a/Buildings/Controls/OBC/CDL/Integers/LessThreshold.mo b/Buildings/Controls/OBC/CDL/Integers/LessThreshold.mo index 8b32a8c8eba..58e735baff7 100644 --- a/Buildings/Controls/OBC/CDL/Integers/LessThreshold.mo +++ b/Buildings/Controls/OBC/CDL/Integers/LessThreshold.mo @@ -32,11 +32,11 @@ equation fillPattern=FillPattern.Solid), Text( extent={{-150,-140},{150,-110}}, - lineColor={0,0,0}, + textColor={0,0,0}, textString="%threshold"), Text( extent={{-150,150},{150,110}}, - lineColor={0,0,255}, + textColor={0,0,255}, textString="%name"), Line( points={{-10,20},{-54,0},{-10,-18}}, diff --git a/Buildings/Controls/OBC/CDL/Integers/Max.mo b/Buildings/Controls/OBC/CDL/Integers/Max.mo index 9f11415320b..63d603b1a3b 100644 --- a/Buildings/Controls/OBC/CDL/Integers/Max.mo +++ b/Buildings/Controls/OBC/CDL/Integers/Max.mo @@ -46,9 +46,9 @@ Modelica Standard Library. Text( extent={{-150,150},{150,110}}, textString="%name", - lineColor={0,0,255}), + textColor={0,0,255}), Text( extent={{-90,36},{90,-36}}, - lineColor={160,160,164}, + textColor={160,160,164}, textString="max()")})); end Max; diff --git a/Buildings/Controls/OBC/CDL/Integers/Min.mo b/Buildings/Controls/OBC/CDL/Integers/Min.mo index 6d5dce283fe..57d52fd59c4 100644 --- a/Buildings/Controls/OBC/CDL/Integers/Min.mo +++ b/Buildings/Controls/OBC/CDL/Integers/Min.mo @@ -46,9 +46,9 @@ Modelica Standard Library. Text( extent={{-150,150},{150,110}}, textString="%name", - lineColor={0,0,255}), + textColor={0,0,255}), Text( extent={{-90,36},{90,-36}}, - lineColor={160,160,164}, + textColor={160,160,164}, textString="min()")})); end Min; diff --git a/Buildings/Controls/OBC/CDL/Integers/MultiSum.mo b/Buildings/Controls/OBC/CDL/Integers/MultiSum.mo index e969d0d213f..49a294a632b 100644 --- a/Buildings/Controls/OBC/CDL/Integers/MultiSum.mo +++ b/Buildings/Controls/OBC/CDL/Integers/MultiSum.mo @@ -26,19 +26,19 @@ equation fillPattern=FillPattern.Solid), Text( extent={{-200,-110},{200,-140}}, - lineColor={0,0,0}, + textColor={0,0,0}, fillColor={255,213,170}, fillPattern=FillPattern.Solid, textString="%k"), Text( extent={{-82,84},{82,-52}}, - lineColor={255,127,0}, + textColor={255,127,0}, fillColor={255,213,170}, fillPattern=FillPattern.Solid, textString="+"), Text( extent={{-144,150},{156,110}}, textString="%name", - lineColor={0,0,255})}), + textColor={0,0,255})}), Documentation(info="
Block that outputs diff --git a/Buildings/Controls/OBC/CDL/Integers/OnCounter.mo b/Buildings/Controls/OBC/CDL/Integers/OnCounter.mo index 1c372ee7c71..16006a6ea15 100644 --- a/Buildings/Controls/OBC/CDL/Integers/OnCounter.mo +++ b/Buildings/Controls/OBC/CDL/Integers/OnCounter.mo @@ -39,11 +39,11 @@ equation Text( visible=use_reset, extent={{-64,-62},{58,-86}}, - lineColor={0,0,0}, + textColor={0,0,0}, textString="reset"), Text( extent={{-150,150},{150,110}}, textString="%name", - lineColor={0,0,255})}), + textColor={0,0,255})}), Documentation(info="
Block that outputs how often the trigger input changed to true
diff --git a/Buildings/Controls/OBC/CDL/Integers/Product.mo b/Buildings/Controls/OBC/CDL/Integers/Product.mo
index 21818ec9759..f734769d154 100644
--- a/Buildings/Controls/OBC/CDL/Integers/Product.mo
+++ b/Buildings/Controls/OBC/CDL/Integers/Product.mo
@@ -48,5 +48,5 @@ Modelica Standard Library.
Text(
extent={{-150,150},{150,110}},
textString="%name",
- lineColor={0,0,255})}));
+ textColor={0,0,255})}));
end Product;
diff --git a/Buildings/Controls/OBC/CDL/Integers/Sources/Constant.mo b/Buildings/Controls/OBC/CDL/Integers/Sources/Constant.mo
index a82dfe5b061..1b9ac425b45 100644
--- a/Buildings/Controls/OBC/CDL/Integers/Sources/Constant.mo
+++ b/Buildings/Controls/OBC/CDL/Integers/Sources/Constant.mo
@@ -13,7 +13,7 @@ equation
100}}), graphics={ Text(
extent={{-150,150},{150,110}},
textString="%name",
- lineColor={0,0,255}), Rectangle(
+ textColor={0,0,255}), Rectangle(
extent={{-100,-100},{100,100}},
lineColor={255,127,0},
fillColor={255,255,255},
@@ -33,7 +33,7 @@ equation
Line(points={{-80,0},{80,0}}),
Text(
extent={{-150,-150},{150,-110}},
- lineColor={0,0,0},
+ textColor={0,0,0},
textString="k=%k")}),
Documentation(info="
diff --git a/Buildings/Controls/OBC/CDL/Integers/package.mo b/Buildings/Controls/OBC/CDL/Integers/package.mo index 34efef76ba4..316952f3986 100644 --- a/Buildings/Controls/OBC/CDL/Integers/package.mo +++ b/Buildings/Controls/OBC/CDL/Integers/package.mo @@ -29,7 +29,7 @@ Firt implementation, based on the blocks from the Modelica Standard Library. radius=25.0), Text( extent={{-56,90},{48,-88}}, - lineColor={0,0,0}, + textColor={0,0,0}, fillColor={0,0,0}, fillPattern=FillPattern.Solid, textString="Z")})); diff --git a/Buildings/Controls/OBC/CDL/Interfaces/BooleanInput.mo b/Buildings/Controls/OBC/CDL/Interfaces/BooleanInput.mo index fc188bf17cb..ee627014ef4 100644 --- a/Buildings/Controls/OBC/CDL/Interfaces/BooleanInput.mo +++ b/Buildings/Controls/OBC/CDL/Interfaces/BooleanInput.mo @@ -20,7 +20,7 @@ connector BooleanInput = input Boolean "'input Boolean' as connector" fillColor={255,0,255}, fillPattern=FillPattern.Solid), Text( extent={{-10,85},{-10,60}}, - lineColor={255,0,255}, + textColor={255,0,255}, textString="%name")}), Documentation(info="
diff --git a/Buildings/Controls/OBC/CDL/Interfaces/BooleanOutput.mo b/Buildings/Controls/OBC/CDL/Interfaces/BooleanOutput.mo index 32bcd9a50ed..fd44e1d41f8 100644 --- a/Buildings/Controls/OBC/CDL/Interfaces/BooleanOutput.mo +++ b/Buildings/Controls/OBC/CDL/Interfaces/BooleanOutput.mo @@ -20,7 +20,7 @@ connector BooleanOutput = output Boolean "'output Boolean' as connector" fillColor={255,255,255}, fillPattern=FillPattern.Solid), Text( extent={{30,110},{30,60}}, - lineColor={255,0,255}, + textColor={255,0,255}, textString="%name")}), Documentation(info="
diff --git a/Buildings/Controls/OBC/CDL/Interfaces/DayTypeInput.mo b/Buildings/Controls/OBC/CDL/Interfaces/DayTypeInput.mo index 00504874cf6..0da6520c610 100644 --- a/Buildings/Controls/OBC/CDL/Interfaces/DayTypeInput.mo +++ b/Buildings/Controls/OBC/CDL/Interfaces/DayTypeInput.mo @@ -23,7 +23,7 @@ annotation ( fillPattern=FillPattern.Solid, points={{0,50},{100,0},{0,-50}}), Text( - lineColor={0,127,0}, + textColor={0,127,0}, extent={{-10.0,60.0},{-10.0,85.0}}, textString="%name")}), Documentation(info=" diff --git a/Buildings/Controls/OBC/CDL/Interfaces/DayTypeOutput.mo b/Buildings/Controls/OBC/CDL/Interfaces/DayTypeOutput.mo index b1284d5736d..1848d2c1cd2 100644 --- a/Buildings/Controls/OBC/CDL/Interfaces/DayTypeOutput.mo +++ b/Buildings/Controls/OBC/CDL/Interfaces/DayTypeOutput.mo @@ -23,7 +23,7 @@ annotation ( fillPattern=FillPattern.Solid, points={{-100.0,50.0},{0.0,0.0},{-100.0,-50.0}}), Text( - lineColor={0,127,0}, + textColor={0,127,0}, extent={{30.0,60.0},{30.0,110.0}}, textString="%name")}), Documentation(info=" diff --git a/Buildings/Controls/OBC/CDL/Interfaces/IntegerInput.mo b/Buildings/Controls/OBC/CDL/Interfaces/IntegerInput.mo index d33d3f6d280..cda96a1b323 100644 --- a/Buildings/Controls/OBC/CDL/Interfaces/IntegerInput.mo +++ b/Buildings/Controls/OBC/CDL/Interfaces/IntegerInput.mo @@ -20,7 +20,7 @@ connector IntegerInput = input Integer "'input Integer' as connector" fillColor={255,127,0}, fillPattern=FillPattern.Solid), Text( extent={{-10,85},{-10,60}}, - lineColor={255,127,0}, + textColor={255,127,0}, textString="%name")}), Documentation(info="
diff --git a/Buildings/Controls/OBC/CDL/Interfaces/IntegerOutput.mo b/Buildings/Controls/OBC/CDL/Interfaces/IntegerOutput.mo index 0c9369a979e..b21be63425c 100644 --- a/Buildings/Controls/OBC/CDL/Interfaces/IntegerOutput.mo +++ b/Buildings/Controls/OBC/CDL/Interfaces/IntegerOutput.mo @@ -19,7 +19,7 @@ connector IntegerOutput = output Integer "'output Integer' as connector" fillColor={255,255,255}, fillPattern=FillPattern.Solid), Text( extent={{30,110},{30,60}}, - lineColor={255,127,0}, + textColor={255,127,0}, textString="%name")}), Documentation(info="
diff --git a/Buildings/Controls/OBC/CDL/Interfaces/RealInput.mo b/Buildings/Controls/OBC/CDL/Interfaces/RealInput.mo index 752515c0f93..3dbdb64c498 100644 --- a/Buildings/Controls/OBC/CDL/Interfaces/RealInput.mo +++ b/Buildings/Controls/OBC/CDL/Interfaces/RealInput.mo @@ -22,7 +22,7 @@ annotation ( fillPattern=FillPattern.Solid, points={{0.0,50.0},{100.0,0.0},{0.0,-50.0},{0.0,50.0}}), Text( - lineColor={0,0,127}, + textColor={0,0,127}, extent={{-10.0,60.0},{-10.0,85.0}}, textString="%name")}), Documentation(info=" diff --git a/Buildings/Controls/OBC/CDL/Interfaces/RealOutput.mo b/Buildings/Controls/OBC/CDL/Interfaces/RealOutput.mo index ac51bd22032..6837ebd8718 100644 --- a/Buildings/Controls/OBC/CDL/Interfaces/RealOutput.mo +++ b/Buildings/Controls/OBC/CDL/Interfaces/RealOutput.mo @@ -23,7 +23,7 @@ annotation ( fillPattern=FillPattern.Solid, points={{-100.0,50.0},{0.0,0.0},{-100.0,-50.0}}), Text( - lineColor={0,0,127}, + textColor={0,0,127}, extent={{30.0,60.0},{30.0,110.0}}, textString="%name")}), Documentation(info=" diff --git a/Buildings/Controls/OBC/CDL/Logical/And.mo b/Buildings/Controls/OBC/CDL/Logical/And.mo index e4febc834cd..77f89e28072 100644 --- a/Buildings/Controls/OBC/CDL/Logical/And.mo +++ b/Buildings/Controls/OBC/CDL/Logical/And.mo @@ -25,7 +25,7 @@ equation borderPattern=BorderPattern.Raised), Text( extent={{-90,40},{90,-40}}, - lineColor={0,0,0}, + textColor={0,0,0}, textString="and"), Ellipse( extent={{71,7},{85,-7}}, @@ -51,7 +51,7 @@ equation Text( extent={{-150,150},{150,110}}, textString="%name", - lineColor={0,0,255})}), + textColor={0,0,255})}), Documentation(info="
Block that outputs true if all inputs are true.
diff --git a/Buildings/Controls/OBC/CDL/Logical/And3.mo b/Buildings/Controls/OBC/CDL/Logical/And3.mo
index 3761174430f..d9adef1862a 100644
--- a/Buildings/Controls/OBC/CDL/Logical/And3.mo
+++ b/Buildings/Controls/OBC/CDL/Logical/And3.mo
@@ -28,7 +28,7 @@ equation
borderPattern=BorderPattern.Raised),
Text(
extent={{-90,40},{90,-40}},
- lineColor={0,0,0},
+ textColor={0,0,0},
textString="and"),
Ellipse(
extent={{71,7},{85,-7}},
@@ -54,7 +54,7 @@ equation
Text(
extent={{-150,150},{150,110}},
textString="%name",
- lineColor={0,0,255})}),
+ textColor={0,0,255})}),
Documentation(info="
Block that outputs true if all inputs are true.
diff --git a/Buildings/Controls/OBC/CDL/Logical/Change.mo b/Buildings/Controls/OBC/CDL/Logical/Change.mo
index 56ce59efeaf..73edc62b63b 100644
--- a/Buildings/Controls/OBC/CDL/Logical/Change.mo
+++ b/Buildings/Controls/OBC/CDL/Logical/Change.mo
@@ -27,7 +27,7 @@ equation
borderPattern=BorderPattern.Raised),
Text(
extent={{-50,62},{50,-56}},
- lineColor={0,0,0},
+ textColor={0,0,0},
textString="change"),
Ellipse(
extent={{71,7},{85,-7}},
@@ -39,7 +39,7 @@ equation
Text(
extent={{-150,150},{150,110}},
textString="%name",
- lineColor={0,0,255})}),
+ textColor={0,0,255})}),
Documentation(info="
Block that outputs true if the Boolean input has either a rising edge
diff --git a/Buildings/Controls/OBC/CDL/Logical/Edge.mo b/Buildings/Controls/OBC/CDL/Logical/Edge.mo
index b88becd0a42..a43dc1f8b71 100644
--- a/Buildings/Controls/OBC/CDL/Logical/Edge.mo
+++ b/Buildings/Controls/OBC/CDL/Logical/Edge.mo
@@ -27,7 +27,7 @@ equation
borderPattern=BorderPattern.Raised),
Text(
extent={{-50,52},{50,-46}},
- lineColor={0,0,0},
+ textColor={0,0,0},
textString="edge"),
Ellipse(
extent={{71,7},{85,-7}},
@@ -40,7 +40,7 @@ equation
Text(
extent={{-150,150},{150,110}},
textString="%name",
- lineColor={0,0,255})}),
+ textColor={0,0,255})}),
Documentation(info="
Block that outputs true if the Boolean input has a rising edge
diff --git a/Buildings/Controls/OBC/CDL/Logical/FallingEdge.mo b/Buildings/Controls/OBC/CDL/Logical/FallingEdge.mo
index 90e0276ba0f..b1140cfe077 100644
--- a/Buildings/Controls/OBC/CDL/Logical/FallingEdge.mo
+++ b/Buildings/Controls/OBC/CDL/Logical/FallingEdge.mo
@@ -31,7 +31,7 @@ equation
borderPattern=BorderPattern.Raised),
Text(
extent={{-62,64},{56,-54}},
- lineColor={0,0,0},
+ textColor={0,0,0},
textString="falling"),
Ellipse(
extent={{71,7},{85,-7}},
@@ -43,7 +43,7 @@ equation
Text(
extent={{-150,150},{150,110}},
textString="%name",
- lineColor={0,0,255})}), Documentation(info="
+ textColor={0,0,255})}), Documentation(info="
Block that outputs true if the Boolean input has a falling edge
from true to false.
diff --git a/Buildings/Controls/OBC/CDL/Logical/IntegerSwitch.mo b/Buildings/Controls/OBC/CDL/Logical/IntegerSwitch.mo
index 0451521c0b6..742de02083b 100644
--- a/Buildings/Controls/OBC/CDL/Logical/IntegerSwitch.mo
+++ b/Buildings/Controls/OBC/CDL/Logical/IntegerSwitch.mo
@@ -77,6 +77,6 @@ First implementation.
fillPattern=FillPattern.Solid),
Text(
extent={{-150,150},{150,110}},
- lineColor={0,0,255},
+ textColor={0,0,255},
textString="%name")}));
end IntegerSwitch;
diff --git a/Buildings/Controls/OBC/CDL/Logical/Latch.mo b/Buildings/Controls/OBC/CDL/Logical/Latch.mo
index c2e69779c7a..e30f4699a24 100644
--- a/Buildings/Controls/OBC/CDL/Logical/Latch.mo
+++ b/Buildings/Controls/OBC/CDL/Logical/Latch.mo
@@ -68,19 +68,19 @@ annotation (defaultComponentName="lat",
{54,56},{54,24},{74,24}}, color={255,0,255}),
Text(
extent={{-14,-8},{14,-18}},
- lineColor={0,0,0},
+ textColor={0,0,0},
fillColor={210,210,210},
fillPattern=FillPattern.Solid,
textString="Clear"),
Text(
extent={{-16,72},{24,58}},
- lineColor={0,0,0},
+ textColor={0,0,0},
fillColor={210,210,210},
fillPattern=FillPattern.Solid,
textString="Latch input"),
Text(
extent={{-150,150},{150,110}},
- lineColor={0,0,255},
+ textColor={0,0,255},
textString="%name")}),Documentation(info="
Block that generates a true output when the latch input u
diff --git a/Buildings/Controls/OBC/CDL/Logical/LogicalSwitch.mo b/Buildings/Controls/OBC/CDL/Logical/LogicalSwitch.mo
index c4cded88ef3..93d4823c351 100644
--- a/Buildings/Controls/OBC/CDL/Logical/LogicalSwitch.mo
+++ b/Buildings/Controls/OBC/CDL/Logical/LogicalSwitch.mo
@@ -98,6 +98,6 @@ Modelica Standard Library.
fillPattern=FillPattern.Solid),
Text(
extent={{-150,150},{150,110}},
- lineColor={0,0,255},
+ textColor={0,0,255},
textString="%name")}));
end LogicalSwitch;
diff --git a/Buildings/Controls/OBC/CDL/Logical/MultiAnd.mo b/Buildings/Controls/OBC/CDL/Logical/MultiAnd.mo
index f6840745152..720b30c4291 100644
--- a/Buildings/Controls/OBC/CDL/Logical/MultiAnd.mo
+++ b/Buildings/Controls/OBC/CDL/Logical/MultiAnd.mo
@@ -41,10 +41,10 @@ equation
Text(
extent={{-144,150},{156,110}},
textString="%name",
- lineColor={0,0,255}),
+ textColor={0,0,255}),
Text(
extent={{-80,52},{56,-52}},
- lineColor={0,0,0},
+ textColor={0,0,0},
textString="AND"),
Ellipse(
extent={{71,7},{85,-7}},
diff --git a/Buildings/Controls/OBC/CDL/Logical/MultiOr.mo b/Buildings/Controls/OBC/CDL/Logical/MultiOr.mo
index 6e114c0825b..33d4eb24afe 100644
--- a/Buildings/Controls/OBC/CDL/Logical/MultiOr.mo
+++ b/Buildings/Controls/OBC/CDL/Logical/MultiOr.mo
@@ -40,10 +40,10 @@ equation
Text(
extent={{-144,150},{156,110}},
textString="%name",
- lineColor={0,0,255}),
+ textColor={0,0,255}),
Text(
extent={{-80,52},{56,-52}},
- lineColor={0,0,0},
+ textColor={0,0,0},
textString="OR"),
Ellipse(
extent={{71,7},{85,-7}},
diff --git a/Buildings/Controls/OBC/CDL/Logical/Nand.mo b/Buildings/Controls/OBC/CDL/Logical/Nand.mo
index 4c1123a5a4a..41dda98c932 100644
--- a/Buildings/Controls/OBC/CDL/Logical/Nand.mo
+++ b/Buildings/Controls/OBC/CDL/Logical/Nand.mo
@@ -24,7 +24,7 @@ equation
borderPattern=BorderPattern.Raised),
Text(
extent={{-50,52},{50,-48}},
- lineColor={0,0,0},
+ textColor={0,0,0},
textString="nand"),
Ellipse(
extent={{71,7},{85,-7}},
@@ -49,7 +49,7 @@ equation
fillPattern=FillPattern.Solid),
Text(
extent={{-150,150},{150,110}},
- lineColor={0,0,255},
+ textColor={0,0,255},
textString="%name")}),Documentation(info="
Block that outputs true if at least
diff --git a/Buildings/Controls/OBC/CDL/Logical/Nor.mo b/Buildings/Controls/OBC/CDL/Logical/Nor.mo
index 76a593f1e9b..8cacd83dc9d 100644
--- a/Buildings/Controls/OBC/CDL/Logical/Nor.mo
+++ b/Buildings/Controls/OBC/CDL/Logical/Nor.mo
@@ -24,7 +24,7 @@ equation
borderPattern=BorderPattern.Raised),
Text(
extent={{-90,40},{90,-40}},
- lineColor={0,0,0},
+ textColor={0,0,0},
textString="nor"),
Ellipse(
extent={{71,7},{85,-7}},
@@ -49,7 +49,7 @@ equation
fillPattern=FillPattern.Solid),
Text(
extent={{-150,150},{150,110}},
- lineColor={0,0,255},
+ textColor={0,0,255},
textString="%name")}),
Documentation(info="
diff --git a/Buildings/Controls/OBC/CDL/Logical/Not.mo b/Buildings/Controls/OBC/CDL/Logical/Not.mo index 5e9ef441a27..77363b05b77 100644 --- a/Buildings/Controls/OBC/CDL/Logical/Not.mo +++ b/Buildings/Controls/OBC/CDL/Logical/Not.mo @@ -22,7 +22,7 @@ equation borderPattern=BorderPattern.Raised), Text( extent={{-56,28},{72,-24}}, - lineColor={0,0,0}, + textColor={0,0,0}, textString="not"), Ellipse( extent={{71,7},{85,-7}}, @@ -33,7 +33,7 @@ equation fillPattern=FillPattern.Solid), Text( extent={{-150,150},{150,110}}, - lineColor={0,0,255}, + textColor={0,0,255}, textString="%name")}), Documentation(info="
diff --git a/Buildings/Controls/OBC/CDL/Logical/OnOffController.mo b/Buildings/Controls/OBC/CDL/Logical/OnOffController.mo index d340e95faa1..57a8b30c473 100644 --- a/Buildings/Controls/OBC/CDL/Logical/OnOffController.mo +++ b/Buildings/Controls/OBC/CDL/Logical/OnOffController.mo @@ -56,7 +56,7 @@ equation fillPattern=FillPattern.Solid), Text( extent={{-150,150},{150,110}}, - lineColor={0,0,255}, + textColor={0,0,255}, textString="%name")}),Documentation(info="
Block that represents and on/off controller. diff --git a/Buildings/Controls/OBC/CDL/Logical/Or.mo b/Buildings/Controls/OBC/CDL/Logical/Or.mo index f8af6cb029d..615ec6afdf3 100644 --- a/Buildings/Controls/OBC/CDL/Logical/Or.mo +++ b/Buildings/Controls/OBC/CDL/Logical/Or.mo @@ -25,7 +25,7 @@ equation borderPattern=BorderPattern.Raised), Text( extent={{-90,40},{90,-40}}, - lineColor={0,0,0}, + textColor={0,0,0}, textString="or"), Ellipse( extent={{71,7},{85,-7}}, @@ -50,7 +50,7 @@ equation fillPattern=FillPattern.Solid), Text( extent={{-150,150},{150,110}}, - lineColor={0,0,255}, + textColor={0,0,255}, textString="%name")}), Documentation(info="
diff --git a/Buildings/Controls/OBC/CDL/Logical/Or3.mo b/Buildings/Controls/OBC/CDL/Logical/Or3.mo index ac7c79f9204..bd92a9ae979 100644 --- a/Buildings/Controls/OBC/CDL/Logical/Or3.mo +++ b/Buildings/Controls/OBC/CDL/Logical/Or3.mo @@ -28,7 +28,7 @@ equation borderPattern=BorderPattern.Raised), Text( extent={{-90,40},{90,-40}}, - lineColor={0,0,0}, + textColor={0,0,0}, textString="or"), Ellipse( extent={{71,7},{85,-7}}, @@ -53,7 +53,7 @@ equation fillPattern=FillPattern.Solid), Text( extent={{-150,150},{150,110}}, - lineColor={0,0,255}, + textColor={0,0,255}, textString="%name"), Ellipse( extent={{-75,72},{-89,86}}, diff --git a/Buildings/Controls/OBC/CDL/Logical/Pre.mo b/Buildings/Controls/OBC/CDL/Logical/Pre.mo index 93235980367..9a954964250 100644 --- a/Buildings/Controls/OBC/CDL/Logical/Pre.mo +++ b/Buildings/Controls/OBC/CDL/Logical/Pre.mo @@ -24,11 +24,11 @@ equation borderPattern=BorderPattern.Raised), Text( extent={{-90,40},{90,-40}}, - lineColor={0,0,0}, + textColor={0,0,0}, textString="pre"), Text( extent={{-150,150},{150,110}}, - lineColor={0,0,255}, + textColor={0,0,255}, textString="%name"), Ellipse( extent={{71,7},{85,-7}}, diff --git a/Buildings/Controls/OBC/CDL/Logical/Sources/Constant.mo b/Buildings/Controls/OBC/CDL/Logical/Sources/Constant.mo index 4176ee60500..7e74d4deec0 100644 --- a/Buildings/Controls/OBC/CDL/Logical/Sources/Constant.mo +++ b/Buildings/Controls/OBC/CDL/Logical/Sources/Constant.mo @@ -15,7 +15,7 @@ equation Text( extent={{-150,150},{150,110}}, textString="%name", - lineColor={0,0,255}), Rectangle( + textColor={0,0,255}), Rectangle( extent={{-100,100},{100,-100}}, fillColor={210,210,210}, lineThickness=5.0, @@ -43,7 +43,7 @@ equation Line(points={{-80,0},{64,0}}), Text( extent={{-150,-140},{150,-110}}, - lineColor={0,0,0}, + textColor={0,0,0}, textString="%k")}), Documentation(info="
diff --git a/Buildings/Controls/OBC/CDL/Logical/Sources/Pulse.mo b/Buildings/Controls/OBC/CDL/Logical/Sources/Pulse.mo index bedaa12cf29..7aa2b95cb5c 100644 --- a/Buildings/Controls/OBC/CDL/Logical/Sources/Pulse.mo +++ b/Buildings/Controls/OBC/CDL/Logical/Sources/Pulse.mo @@ -35,7 +35,7 @@ equation fillPattern=FillPattern.Solid, borderPattern=BorderPattern.Raised), Text( extent={{-150,-140},{150,-110}}, - lineColor={0,0,0}, + textColor={0,0,0}, textString="%period"), Line(points={{-80,-70},{-40,-70},{-40,44},{0, 44},{0,-70},{40,-70},{40,44},{79,44}}), Polygon( @@ -58,7 +58,7 @@ equation else {235,235,235}), fillPattern=FillPattern.Solid), Text( - lineColor={0,0,255}, + textColor={0,0,255}, extent={{-150,110},{150,150}}, textString="%name")}), Documentation(info=" diff --git a/Buildings/Controls/OBC/CDL/Logical/Sources/SampleTrigger.mo b/Buildings/Controls/OBC/CDL/Logical/Sources/SampleTrigger.mo index 88aeb1f1920..07b31cd6846 100644 --- a/Buildings/Controls/OBC/CDL/Logical/Sources/SampleTrigger.mo +++ b/Buildings/Controls/OBC/CDL/Logical/Sources/SampleTrigger.mo @@ -26,7 +26,7 @@ equation Line(points={{60,-70},{60,70}}), Text( extent={{-150,-140},{150,-110}}, - lineColor={0,0,0}, + textColor={0,0,0}, textString="%period"), Polygon( points={{-80,88},{-88,66},{-72,66},{-80,88}}, @@ -48,7 +48,7 @@ equation else {235,235,235}), fillPattern=FillPattern.Solid), Text( - lineColor={0,0,255}, + textColor={0,0,255}, extent={{-150,110},{150,150}}, textString="%name")}), Documentation(info=" diff --git a/Buildings/Controls/OBC/CDL/Logical/Switch.mo b/Buildings/Controls/OBC/CDL/Logical/Switch.mo index 3a69678b1b6..73d972d1c0d 100644 --- a/Buildings/Controls/OBC/CDL/Logical/Switch.mo +++ b/Buildings/Controls/OBC/CDL/Logical/Switch.mo @@ -75,6 +75,6 @@ Modelica Standard Library. fillPattern=FillPattern.Solid), Text( extent={{-150,150},{150,110}}, - lineColor={0,0,255}, + textColor={0,0,255}, textString="%name")})); end Switch; diff --git a/Buildings/Controls/OBC/CDL/Logical/Timer.mo b/Buildings/Controls/OBC/CDL/Logical/Timer.mo index 2bf64e4092d..f0dc80b51d0 100644 --- a/Buildings/Controls/OBC/CDL/Logical/Timer.mo +++ b/Buildings/Controls/OBC/CDL/Logical/Timer.mo @@ -80,7 +80,7 @@ annotation ( color={0,0,127}), Text( extent={{-150,150},{150,110}}, - lineColor={0,0,255}, + textColor={0,0,255}, textString="%name"), Ellipse( extent={{-83,7},{-69,-7}}, @@ -91,7 +91,7 @@ annotation ( fillPattern=FillPattern.Solid), Text( extent={{-88,-58},{88,-98}}, - lineColor={217,67,180}, + textColor={217,67,180}, textString="accumulate: %accumulate")}), Documentation(info="
diff --git a/Buildings/Controls/OBC/CDL/Logical/Toggle.mo b/Buildings/Controls/OBC/CDL/Logical/Toggle.mo index f5653fe20d0..c5d55933a48 100644 --- a/Buildings/Controls/OBC/CDL/Logical/Toggle.mo +++ b/Buildings/Controls/OBC/CDL/Logical/Toggle.mo @@ -61,13 +61,13 @@ annotation (defaultComponentName="tog", {54,56},{54,24},{74,24}}, color={255,0,255}), Text( extent={{-22,72},{28,58}}, - lineColor={0,0,0}, + textColor={0,0,0}, fillColor={210,210,210}, fillPattern=FillPattern.Solid, textString="Toggle input"), Text( extent={{-150,150},{150,110}}, - lineColor={0,0,255}, + textColor={0,0,255}, textString="%name"), Ellipse( extent={{71,7},{85,-7}}, @@ -78,7 +78,7 @@ annotation (defaultComponentName="tog", fillPattern=FillPattern.Solid), Text( extent={{-14,-10},{14,-20}}, - lineColor={0,0,0}, + textColor={0,0,0}, fillColor={210,210,210}, fillPattern=FillPattern.Solid, textString="Clear")}), diff --git a/Buildings/Controls/OBC/CDL/Logical/TriggeredTrapezoid.mo b/Buildings/Controls/OBC/CDL/Logical/TriggeredTrapezoid.mo index 6bb69f62530..6a6ce8a9c5a 100644 --- a/Buildings/Controls/OBC/CDL/Logical/TriggeredTrapezoid.mo +++ b/Buildings/Controls/OBC/CDL/Logical/TriggeredTrapezoid.mo @@ -70,7 +70,7 @@ equation points={{90.0,-70.0},{68.0,-62.0},{68.0,-78.0},{90.0,-70.0}}), Text( extent={{-150,150},{150,110}}, - lineColor={0,0,255}, + textColor={0,0,255}, textString="%name")}), Diagram(coordinateSystem(preserveAspectRatio=true, extent={{-100,-100},{ 100,100}}), graphics={Line(points={{-80,-20},{-60,-20},{-30,40},{ @@ -93,10 +93,10 @@ equation 0,0,0}),Line(points={{8,-20},{40,-20}}),Line(points= {{-20,40},{-20,-20}}),Line(points={{-20,-20},{-20,-70}}),Text( extent={{-44,50},{-44,40}}, - lineColor={0,0,0}, + textColor={0,0,0}, textString="rising"),Text( extent={{24,-10},{24,-20}}, - lineColor={0,0,0}, + textColor={0,0,0}, textString="falling"),Polygon( points={{-60,40},{-56,42},{-56,38},{-60,40}}, lineColor={0,0,0}, @@ -135,23 +135,23 @@ equation fillColor={255,255,255}, fillPattern=FillPattern.Solid),Text( extent={{-20,6},{-20,-4}}, - lineColor={0,0,0}, + textColor={0,0,0}, textString="amplitude"),Rectangle( extent={{-40,-48},{0,-58}}, lineColor={255,255,255}, fillColor={255,255,255}, fillPattern=FillPattern.Solid),Text( extent={{-20,-48},{-20,-58}}, - lineColor={0,0,0}, + textColor={0,0,0}, textString="offset"),Text( extent={{60,-82},{94,-92}}, - lineColor={0,0,0}, + textColor={0,0,0}, textString="time"),Text( extent={{-88,-4},{-54,-14}}, - lineColor={0,0,0}, + textColor={0,0,0}, textString="y"),Text( extent={{-88,-46},{-54,-56}}, - lineColor={0,0,0}, + textColor={0,0,0}, textString="u")}), Documentation(info="
diff --git a/Buildings/Controls/OBC/CDL/Logical/TrueDelay.mo b/Buildings/Controls/OBC/CDL/Logical/TrueDelay.mo index 28a53d98ab7..1ccb0c896a9 100644 --- a/Buildings/Controls/OBC/CDL/Logical/TrueDelay.mo +++ b/Buildings/Controls/OBC/CDL/Logical/TrueDelay.mo @@ -48,7 +48,7 @@ equation borderPattern=BorderPattern.Raised), Text( extent={{-250,-120},{250,-150}}, - lineColor={0,0,0}, + textColor={0,0,0}, textString="%delayTime"), Line(points={{-80,-66},{-60,-66},{-60,-22},{38,-22},{38,-66},{66,-66}}), Line(points={{-80,32},{-4,32},{-4,76},{38,76},{38,32},{66,32}}, @@ -69,7 +69,7 @@ equation fillPattern=FillPattern.Solid), Text( extent={{-150,150},{150,110}}, - lineColor={0,0,255}, + textColor={0,0,255}, textString="%name")}), Documentation(info="
Block that delays a signal when it becomes true.
diff --git a/Buildings/Controls/OBC/CDL/Logical/TrueFalseHold.mo b/Buildings/Controls/OBC/CDL/Logical/TrueFalseHold.mo
index c387f7f9af6..6ae1d3b8d52 100644
--- a/Buildings/Controls/OBC/CDL/Logical/TrueFalseHold.mo
+++ b/Buildings/Controls/OBC/CDL/Logical/TrueFalseHold.mo
@@ -119,10 +119,10 @@ equation
Text(
extent={{-150,150},{150,110}},
textString="%name",
- lineColor={0,0,255}),
+ textColor={0,0,255}),
Text(
extent={{-88,-62},{92,-90}},
- lineColor={0,0,255},
+ textColor={0,0,255},
textString="%falseHoldDuration"),
Ellipse(
extent={{71,7},{85,-7}},
@@ -140,7 +140,7 @@ equation
fillPattern=FillPattern.Solid),
Text(
extent={{-90,96},{96,68}},
- lineColor={0,0,255},
+ textColor={0,0,255},
textString="%trueHoldDuration")}),
Diagram(coordinateSystem(
preserveAspectRatio=false, extent={{-180,-120},{160,140}})),
diff --git a/Buildings/Controls/OBC/CDL/Logical/TrueHoldWithReset.mo b/Buildings/Controls/OBC/CDL/Logical/TrueHoldWithReset.mo
index 81a81c5b3b7..30d0ce78281 100644
--- a/Buildings/Controls/OBC/CDL/Logical/TrueHoldWithReset.mo
+++ b/Buildings/Controls/OBC/CDL/Logical/TrueHoldWithReset.mo
@@ -60,10 +60,10 @@ equation
Text(
extent={{-150,150},{150,110}},
textString="%name",
- lineColor={0,0,255}),
+ textColor={0,0,255}),
Text(
extent={{-90,-62},{96,-90}},
- lineColor={0,0,255},
+ textColor={0,0,255},
textString="%duration"),
Ellipse(
extent={{71,7},{85,-7}},
diff --git a/Buildings/Controls/OBC/CDL/Logical/Validation/Latch.mo b/Buildings/Controls/OBC/CDL/Logical/Validation/Latch.mo
index 139833f7abd..3b06d4adb06 100644
--- a/Buildings/Controls/OBC/CDL/Logical/Validation/Latch.mo
+++ b/Buildings/Controls/OBC/CDL/Logical/Validation/Latch.mo
@@ -124,78 +124,78 @@ First implementation.
Diagram(coordinateSystem(extent={{-180,-180},{180,180}}), graphics={
Text(
extent={{-110,130},{-42,118}},
- lineColor={28,108,200},
+ textColor={28,108,200},
textString="Clear input keeps false"),
Text(
extent={{-108,60},{-40,48}},
- lineColor={28,108,200},
+ textColor={28,108,200},
textString="Clear input keeps true"),
Text(
extent={{-108,-20},{-40,-32}},
- lineColor={28,108,200},
+ textColor={28,108,200},
textString="Clear input keeps false"),
Text(
extent={{-108,-26},{0,-48}},
- lineColor={28,108,200},
+ textColor={28,108,200},
textString="Start value of y is false (default)"),
Text(
extent={{-108,-100},{-40,-112}},
- lineColor={28,108,200},
+ textColor={28,108,200},
textString="Clear input keeps false"),
Text(
extent={{-110,-110},{-28,-124}},
- lineColor={28,108,200},
+ textColor={28,108,200},
textString="Start value of y is true"),
Text(
extent={{-108,50},{-28,38}},
- lineColor={28,108,200},
+ textColor={28,108,200},
textString="Start value of y is true"),
Text(
extent={{76,148},{136,140}},
- lineColor={28,108,200},
+ textColor={28,108,200},
textString="At 3rd second:"),
Text(
extent={{92,128},{172,118}},
- lineColor={28,108,200},
+ textColor={28,108,200},
textString="Clear input falls: true to false"),
Text(
extent={{92,138},{170,128}},
- lineColor={28,108,200},
+ textColor={28,108,200},
textString="Latch input falls: true to false"),
Text(
extent={{92,64},{170,56}},
- lineColor={28,108,200},
+ textColor={28,108,200},
textString="Clear input rises: false to true"),
Text(
extent={{92,76},{172,66}},
- lineColor={28,108,200},
+ textColor={28,108,200},
textString="Latch input rise: false to true"),
Text(
extent={{76,86},{136,78}},
- lineColor={28,108,200},
+ textColor={28,108,200},
textString="At 6th second:"),
Text(
extent={{92,-96},{172,-104}},
- lineColor={28,108,200},
+ textColor={28,108,200},
textString="Clear input falls: true to false"),
Text(
extent={{92,-84},{172,-94}},
- lineColor={28,108,200},
+ textColor={28,108,200},
textString="Latch input rise: false to true"),
Text(
extent={{76,-74},{136,-82}},
- lineColor={28,108,200},
+ textColor={28,108,200},
textString="At 6th second:"),
Text(
extent={{76,-12},{136,-20}},
- lineColor={28,108,200},
+ textColor={28,108,200},
textString="At 3rd second:"),
Text(
extent={{92,-32},{172,-42}},
- lineColor={28,108,200},
+ textColor={28,108,200},
textString="Clear input rises: false to true"),
Text(
extent={{92,-22},{170,-32}},
- lineColor={28,108,200},
+ textColor={28,108,200},
textString="Latch input falls: true to false")}));
end Latch;
diff --git a/Buildings/Controls/OBC/CDL/Logical/Validation/Toggle.mo b/Buildings/Controls/OBC/CDL/Logical/Validation/Toggle.mo
index a84cba32220..09c847c7cb6 100644
--- a/Buildings/Controls/OBC/CDL/Logical/Validation/Toggle.mo
+++ b/Buildings/Controls/OBC/CDL/Logical/Validation/Toggle.mo
@@ -124,78 +124,78 @@ First implementation.
Diagram(coordinateSystem(extent={{-180,-180},{180,180}}), graphics={
Text(
extent={{-110,130},{-42,118}},
- lineColor={28,108,200},
+ textColor={28,108,200},
textString="Clear input keeps false"),
Text(
extent={{-108,60},{-40,48}},
- lineColor={28,108,200},
+ textColor={28,108,200},
textString="Clear input keeps true"),
Text(
extent={{-108,-20},{-40,-32}},
- lineColor={28,108,200},
+ textColor={28,108,200},
textString="Clear input keeps false"),
Text(
extent={{-108,-26},{0,-48}},
- lineColor={28,108,200},
+ textColor={28,108,200},
textString="Start value of y is false (default)"),
Text(
extent={{-108,-100},{-40,-112}},
- lineColor={28,108,200},
+ textColor={28,108,200},
textString="Clear input keeps false"),
Text(
extent={{-110,-110},{-28,-124}},
- lineColor={28,108,200},
+ textColor={28,108,200},
textString="Start value of y is true"),
Text(
extent={{-108,50},{-28,38}},
- lineColor={28,108,200},
+ textColor={28,108,200},
textString="Start value of y is true"),
Text(
extent={{76,148},{136,140}},
- lineColor={28,108,200},
+ textColor={28,108,200},
textString="At 3rd second:"),
Text(
extent={{92,128},{172,118}},
- lineColor={28,108,200},
+ textColor={28,108,200},
textString="Clear input falls: true to false"),
Text(
extent={{92,138},{170,128}},
- lineColor={28,108,200},
+ textColor={28,108,200},
textString="Toggle input falls: true to false"),
Text(
extent={{92,64},{170,56}},
- lineColor={28,108,200},
+ textColor={28,108,200},
textString="Clear input rises: false to true"),
Text(
extent={{92,76},{172,66}},
- lineColor={28,108,200},
+ textColor={28,108,200},
textString="Toggle input rise: false to true"),
Text(
extent={{76,86},{136,78}},
- lineColor={28,108,200},
+ textColor={28,108,200},
textString="At 6th second:"),
Text(
extent={{92,-96},{172,-104}},
- lineColor={28,108,200},
+ textColor={28,108,200},
textString="Clear input falls: true to false"),
Text(
extent={{92,-84},{172,-94}},
- lineColor={28,108,200},
+ textColor={28,108,200},
textString="Toggle input rise: false to true"),
Text(
extent={{76,-74},{136,-82}},
- lineColor={28,108,200},
+ textColor={28,108,200},
textString="At 6th second:"),
Text(
extent={{76,-12},{136,-20}},
- lineColor={28,108,200},
+ textColor={28,108,200},
textString="At 3rd second:"),
Text(
extent={{92,-32},{172,-42}},
- lineColor={28,108,200},
+ textColor={28,108,200},
textString="Clear input rises: false to true"),
Text(
extent={{92,-22},{170,-32}},
- lineColor={28,108,200},
+ textColor={28,108,200},
textString="Toggle input falls: true to false")}));
end Toggle;
diff --git a/Buildings/Controls/OBC/CDL/Logical/Xor.mo b/Buildings/Controls/OBC/CDL/Logical/Xor.mo
index 30ae913c7c7..ff0568685f0 100644
--- a/Buildings/Controls/OBC/CDL/Logical/Xor.mo
+++ b/Buildings/Controls/OBC/CDL/Logical/Xor.mo
@@ -24,7 +24,7 @@ equation
borderPattern=BorderPattern.Raised),
Text(
extent={{-90,40},{90,-40}},
- lineColor={0,0,0},
+ textColor={0,0,0},
textString="xor"),
Ellipse(
extent={{71,7},{85,-7}},
@@ -49,7 +49,7 @@ equation
fillPattern=FillPattern.Solid),
Text(
extent={{-150,150},{150,110}},
- lineColor={0,0,255},
+ textColor={0,0,255},
textString="%name")}),
Documentation(info="
diff --git a/Buildings/Controls/OBC/CDL/Logical/ZeroCrossing.mo b/Buildings/Controls/OBC/CDL/Logical/ZeroCrossing.mo index 20e39467b29..b019055ab4a 100644 --- a/Buildings/Controls/OBC/CDL/Logical/ZeroCrossing.mo +++ b/Buildings/Controls/OBC/CDL/Logical/ZeroCrossing.mo @@ -87,7 +87,7 @@ Modelica Standard Library. fillPattern=FillPattern.Solid), Text( extent={{-150,150},{150,110}}, - lineColor={0,0,255}, + textColor={0,0,255}, textString="%name"), Ellipse( extent={{71,7},{85,-7}}, diff --git a/Buildings/Controls/OBC/CDL/Psychrometrics/TDewPoi_TDryBulPhi.mo b/Buildings/Controls/OBC/CDL/Psychrometrics/TDewPoi_TDryBulPhi.mo index aaf28200836..0a20b6229b9 100644 --- a/Buildings/Controls/OBC/CDL/Psychrometrics/TDewPoi_TDryBulPhi.mo +++ b/Buildings/Controls/OBC/CDL/Psychrometrics/TDewPoi_TDryBulPhi.mo @@ -66,10 +66,10 @@ First implementation. Text( extent={{-150,150},{150,110}}, textString="%name", - lineColor={0,0,255}), + textColor={0,0,255}), Text( extent={{-44,82},{-22,64}}, - lineColor={0,0,0}, + textColor={0,0,0}, fillColor={0,0,0}, fillPattern=FillPattern.Solid, textString="X"), @@ -80,15 +80,15 @@ First implementation. fillPattern=FillPattern.Solid), Text( extent={{-92,14},{-72,-12}}, - lineColor={0,0,127}, + textColor={0,0,127}, textString="phi"), Text( extent={{-92,100},{-62,56}}, - lineColor={0,0,127}, + textColor={0,0,127}, textString="TDryBul"), Text( extent={{-90,-72},{-72,-90}}, - lineColor={0,0,127}, + textColor={0,0,127}, textString="p"), Polygon( points={{86,-74},{76,-72},{76,-76},{86,-74}}, @@ -97,14 +97,14 @@ First implementation. fillPattern=FillPattern.Solid), Text( extent={{76,-78},{86,-94}}, - lineColor={0,0,0}, + textColor={0,0,0}, fillColor={0,0,0}, fillPattern=FillPattern.Solid, textString="T"), Line(points={{-48,84},{-48,-74}}), Text( extent={{60,14},{98,-12}}, - lineColor={0,0,127}, + textColor={0,0,127}, textString="TDewPoi"), Line(points={{82,-72},{-66,-72}}), Line(points={{-48,-40},{-38,-36},{-24,-30},{8,-2},{20,22},{28,54},{32, diff --git a/Buildings/Controls/OBC/CDL/Psychrometrics/TWetBul_TDryBulPhi.mo b/Buildings/Controls/OBC/CDL/Psychrometrics/TWetBul_TDryBulPhi.mo index f4031ce1280..07104f3191a 100644 --- a/Buildings/Controls/OBC/CDL/Psychrometrics/TWetBul_TDryBulPhi.mo +++ b/Buildings/Controls/OBC/CDL/Psychrometrics/TWetBul_TDryBulPhi.mo @@ -47,7 +47,7 @@ annotation ( Text( extent={{-150,150},{150,110}}, textString="%name", - lineColor={0,0,255}), + textColor={0,0,255}), Rectangle( extent={{-100,100},{100,-100}}, lineColor={0,0,0}, @@ -55,24 +55,24 @@ annotation ( fillPattern=FillPattern.Solid), Text( extent={{-92,100},{-62,56}}, - lineColor={0,0,127}, + textColor={0,0,127}, textString="TDryBul"), Text( extent={{-92,14},{-72,-12}}, - lineColor={0,0,127}, + textColor={0,0,127}, textString="phi"), Text( extent={{-90,-72},{-72,-90}}, - lineColor={0,0,127}, + textColor={0,0,127}, textString="p"), Text( extent={{62,22},{92,-22}}, - lineColor={0,0,127}, + textColor={0,0,127}, textString="TWetBul"), Line(points={{78,-74},{-48,-74}}), Text( extent={{76,-78},{86,-94}}, - lineColor={0,0,0}, + textColor={0,0,0}, fillColor={0,0,0}, fillPattern=FillPattern.Solid, textString="T"), @@ -86,7 +86,7 @@ annotation ( Line(points={{-48,84},{-48,-74}}), Text( extent={{-44,82},{-22,64}}, - lineColor={0,0,0}, + textColor={0,0,0}, fillColor={0,0,0}, fillPattern=FillPattern.Solid, textString="X"), diff --git a/Buildings/Controls/OBC/CDL/Psychrometrics/h_TDryBulPhi.mo b/Buildings/Controls/OBC/CDL/Psychrometrics/h_TDryBulPhi.mo index 12e381f88cd..e883868e1c7 100644 --- a/Buildings/Controls/OBC/CDL/Psychrometrics/h_TDryBulPhi.mo +++ b/Buildings/Controls/OBC/CDL/Psychrometrics/h_TDryBulPhi.mo @@ -66,7 +66,7 @@ First implementation. Text( extent={{-150,150},{150,110}}, textString="%name", - lineColor={0,0,255}), + textColor={0,0,255}), Rectangle( extent={{-100,100},{100,-100}}, lineColor={0,0,0}, @@ -81,7 +81,7 @@ First implementation. thickness=0.5), Text( extent={{-44,82},{-22,64}}, - lineColor={0,0,0}, + textColor={0,0,0}, fillColor={0,0,0}, fillPattern=FillPattern.Solid, textString="X"), @@ -92,15 +92,15 @@ First implementation. fillPattern=FillPattern.Solid), Text( extent={{-92,14},{-72,-12}}, - lineColor={0,0,127}, + textColor={0,0,127}, textString="phi"), Text( extent={{-92,100},{-62,56}}, - lineColor={0,0,127}, + textColor={0,0,127}, textString="TDryBul"), Text( extent={{-90,-72},{-72,-90}}, - lineColor={0,0,127}, + textColor={0,0,127}, textString="p"), Line(points={{78,-74},{-48,-74}}), Polygon( @@ -110,13 +110,13 @@ First implementation. fillPattern=FillPattern.Solid), Text( extent={{76,-78},{86,-94}}, - lineColor={0,0,0}, + textColor={0,0,0}, fillColor={0,0,0}, fillPattern=FillPattern.Solid, textString="T"), Line(points={{-48,84},{-48,-74}}), Text( extent={{74,14},{94,-12}}, - lineColor={0,0,127}, + textColor={0,0,127}, textString="h")})); end h_TDryBulPhi; diff --git a/Buildings/Controls/OBC/CDL/Psychrometrics/package.mo b/Buildings/Controls/OBC/CDL/Psychrometrics/package.mo index a83675d510e..9b18ef46f15 100644 --- a/Buildings/Controls/OBC/CDL/Psychrometrics/package.mo +++ b/Buildings/Controls/OBC/CDL/Psychrometrics/package.mo @@ -33,7 +33,7 @@ Firt implementation, based on the blocks from the Modelica Standard Library. fillPattern=FillPattern.Solid), Text( extent={{-74,84},{-52,66}}, - lineColor={0,0,0}, + textColor={0,0,0}, fillColor={0,0,0}, fillPattern=FillPattern.Solid, textString="X"), @@ -49,7 +49,7 @@ Firt implementation, based on the blocks from the Modelica Standard Library. fillPattern=FillPattern.Solid), Text( extent={{72,-80},{82,-96}}, - lineColor={0,0,0}, + textColor={0,0,0}, fillColor={0,0,0}, fillPattern=FillPattern.Solid, textString="T")})); diff --git a/Buildings/Controls/OBC/CDL/Routing/BooleanReplicator.mo b/Buildings/Controls/OBC/CDL/Routing/BooleanReplicator.mo index f0d35d13fa5..104ed43effb 100644 --- a/Buildings/Controls/OBC/CDL/Routing/BooleanReplicator.mo +++ b/Buildings/Controls/OBC/CDL/Routing/BooleanReplicator.mo @@ -26,7 +26,7 @@ annotation ( fillColor={255,0,255}, fillPattern=FillPattern.Solid), Text( - lineColor={0,0,255}, + textColor={0,0,255}, extent={{-150,110},{150,150}}, textString="%name")}), Documentation(info=" diff --git a/Buildings/Controls/OBC/CDL/Routing/IntegerReplicator.mo b/Buildings/Controls/OBC/CDL/Routing/IntegerReplicator.mo index 22edc6b89da..a35a8657214 100644 --- a/Buildings/Controls/OBC/CDL/Routing/IntegerReplicator.mo +++ b/Buildings/Controls/OBC/CDL/Routing/IntegerReplicator.mo @@ -26,7 +26,7 @@ annotation ( fillColor={255,127,0}, fillPattern=FillPattern.Solid), Text( - lineColor={0,0,255}, + textColor={0,0,255}, extent={{-150,110},{150,150}}, textString="%name")}), Documentation(info=" diff --git a/Buildings/Controls/OBC/CDL/Routing/RealExtractSignal.mo b/Buildings/Controls/OBC/CDL/Routing/RealExtractSignal.mo index 0afab2e3f6a..9a008859547 100644 --- a/Buildings/Controls/OBC/CDL/Routing/RealExtractSignal.mo +++ b/Buildings/Controls/OBC/CDL/Routing/RealExtractSignal.mo @@ -96,10 +96,10 @@ annotation ( Line(points={{49,-30},{60,-30},{74,-4}}, color={0,0,127}), Text( extent={{-150,-150},{150,-110}}, - lineColor={0,0,0}, + textColor={0,0,0}, textString="extract=%extract"), Text( - lineColor={0,0,255}, + textColor={0,0,255}, extent={{-150,110},{150,150}}, textString="%name")}), Documentation(info=" diff --git a/Buildings/Controls/OBC/CDL/Routing/RealExtractor.mo b/Buildings/Controls/OBC/CDL/Routing/RealExtractor.mo index f4c2c2f74b6..9a6bd1e9d6d 100644 --- a/Buildings/Controls/OBC/CDL/Routing/RealExtractor.mo +++ b/Buildings/Controls/OBC/CDL/Routing/RealExtractor.mo @@ -105,7 +105,7 @@ equation fillColor={255,128,0}, fillPattern=FillPattern.Solid), Text( - lineColor={0,0,255}, + textColor={0,0,255}, extent={{-150,110},{150,150}}, textString="%name")}), Documentation(info=" diff --git a/Buildings/Controls/OBC/CDL/Routing/RealReplicator.mo b/Buildings/Controls/OBC/CDL/Routing/RealReplicator.mo index 8abfbe55b9b..fc7b39b183a 100644 --- a/Buildings/Controls/OBC/CDL/Routing/RealReplicator.mo +++ b/Buildings/Controls/OBC/CDL/Routing/RealReplicator.mo @@ -26,7 +26,7 @@ annotation ( fillColor={0,0,127}, fillPattern=FillPattern.Solid), Text( - lineColor={0,0,255}, + textColor={0,0,255}, extent={{-150,110},{150,150}}, textString="%name")}), Documentation(info=" diff --git a/Buildings/Controls/OBC/CDL/SetPoints/SupplyReturnTemperatureReset.mo b/Buildings/Controls/OBC/CDL/SetPoints/SupplyReturnTemperatureReset.mo index 0b217460a8a..6191f118d02 100644 --- a/Buildings/Controls/OBC/CDL/SetPoints/SupplyReturnTemperatureReset.mo +++ b/Buildings/Controls/OBC/CDL/SetPoints/SupplyReturnTemperatureReset.mo @@ -133,22 +133,22 @@ First implementation. smooth=Smooth.Bezier), Text( extent={{-152,120},{-102,70}}, - lineColor={0,0,127}, + textColor={0,0,127}, textString="TOut"), Text( extent={{-152,-4},{-102,-54}}, - lineColor={0,0,127}, + textColor={0,0,127}, textString="TSetZon"), Text( extent={{40,86},{90,36}}, - lineColor={0,0,127}, + textColor={0,0,127}, textString="TSup"), Text( extent={{42,-30},{92,-80}}, - lineColor={0,0,127}, + textColor={0,0,127}, textString="TRet"), Text( extent={{-150,150},{150,110}}, textString="%name", - lineColor={0,0,255})})); + textColor={0,0,255})})); end SupplyReturnTemperatureReset; diff --git a/Buildings/Controls/OBC/CDL/Utilities/Assert.mo b/Buildings/Controls/OBC/CDL/Utilities/Assert.mo index cf7f1f5d9e2..dbdb2a85b02 100644 --- a/Buildings/Controls/OBC/CDL/Utilities/Assert.mo +++ b/Buildings/Controls/OBC/CDL/Utilities/Assert.mo @@ -26,7 +26,7 @@ annotation ( lineColor={0,0,0}), Text( extent={{-100,160},{100,106}}, - lineColor={0,0,255}, + textColor={0,0,255}, textString="%name"), Polygon( points={{0,72},{-72,-56},{72,-56},{0,72}}, diff --git a/Buildings/Controls/OBC/CDL/Utilities/SunRiseSet.mo b/Buildings/Controls/OBC/CDL/Utilities/SunRiseSet.mo index b8c4db2ce7f..2c0bb99d419 100644 --- a/Buildings/Controls/OBC/CDL/Utilities/SunRiseSet.mo +++ b/Buildings/Controls/OBC/CDL/Utilities/SunRiseSet.mo @@ -175,7 +175,7 @@ Icon(graphics={ Rectangle( fillPattern=FillPattern.Solid), Text( extent={{-100,160},{100,106}}, - lineColor={0,0,255}, + textColor={0,0,255}, textString="%name"), Ellipse( extent={{70,-100},{-70,20}}, diff --git a/Buildings/Controls/OBC/OutdoorLights/DaylightControlled.mo b/Buildings/Controls/OBC/OutdoorLights/DaylightControlled.mo index 43babb3ded3..2b4d11b49f6 100644 --- a/Buildings/Controls/OBC/OutdoorLights/DaylightControlled.mo +++ b/Buildings/Controls/OBC/OutdoorLights/DaylightControlled.mo @@ -119,6 +119,6 @@ Icon(graphics={ Line(points={{-76,78},{-72,74}}, color={238,46,47}), Text( extent={{-164,144},{164,106}}, - lineColor={0,0,255}, + textColor={0,0,255}, textString="%name")})); end DaylightControlled; diff --git a/Buildings/Controls/OBC/Shade/Shade_H.mo b/Buildings/Controls/OBC/Shade/Shade_H.mo index 9d9f97da02d..34fa83fb88d 100644 --- a/Buildings/Controls/OBC/Shade/Shade_H.mo +++ b/Buildings/Controls/OBC/Shade/Shade_H.mo @@ -48,7 +48,7 @@ equation fillPattern=FillPattern.Solid), Text( extent={{-164,144},{164,106}}, - lineColor={0,0,127}, + textColor={0,0,127}, textString="%name"), Polygon( points={{-80,90},{-88,68},{-72,68},{-80,90}}, @@ -72,11 +72,11 @@ equation Line(points={{-49,51},{-49,-29}}), Text( extent={{-92,-49},{-9,-92}}, - lineColor={192,192,192}, + textColor={192,192,192}, textString="%HLow"), Text( extent={{2,-49},{91,-92}}, - lineColor={192,192,192}, + textColor={192,192,192}, textString="%HHigh"), Rectangle(extent={{-91,-49},{-8,-92}}, lineColor={192,192,192}), Line(points={{-49,-29},{-49,-49}}, color={192,192,192}), diff --git a/Buildings/Controls/OBC/Shade/Shade_T.mo b/Buildings/Controls/OBC/Shade/Shade_T.mo index 6b01ee4e50e..da309f44255 100644 --- a/Buildings/Controls/OBC/Shade/Shade_T.mo +++ b/Buildings/Controls/OBC/Shade/Shade_T.mo @@ -51,7 +51,7 @@ equation fillPattern=FillPattern.Solid), Text( extent={{-164,144},{164,106}}, - lineColor={0,0,127}, + textColor={0,0,127}, textString="%name"), Polygon( points={{-80,90},{-88,68},{-72,68},{-80,90}}, @@ -75,11 +75,11 @@ equation Line(points={{-49,51},{-49,-29}}), Text( extent={{-92,-49},{-9,-92}}, - lineColor={192,192,192}, + textColor={192,192,192}, textString="%TLow"), Text( extent={{2,-49},{91,-92}}, - lineColor={192,192,192}, + textColor={192,192,192}, textString="%THigh"), Rectangle(extent={{-91,-49},{-8,-92}}, lineColor={192,192,192}), Line(points={{-49,-29},{-49,-49}}, color={192,192,192}), diff --git a/Buildings/Controls/OBC/UnitConversions/From_Btu.mo b/Buildings/Controls/OBC/UnitConversions/From_Btu.mo index c3a448d4095..bf119ab3925 100644 --- a/Buildings/Controls/OBC/UnitConversions/From_Btu.mo +++ b/Buildings/Controls/OBC/UnitConversions/From_Btu.mo @@ -34,16 +34,16 @@ equation fillPattern=FillPattern.Solid), Line(points={{20,58}}, color={28,108,200}), Text( - lineColor={0,0,255}, + textColor={0,0,255}, extent={{-150,110},{150,150}}, textString="%name"), Text( extent={{-80,50},{0,10}}, - lineColor={0,0,127}, + textColor={0,0,127}, textString="Btu"), Text( extent={{10,-70},{90,-30}}, - lineColor={0,0,127}, + textColor={0,0,127}, textString="J"), Polygon( points={{90,0},{30,20},{30,-20},{90,0}}, @@ -58,6 +58,11 @@ Converts work given in British thermal units [Btu] to joule [J]. ", revisions="
Text annotation using now the textColor attribute
+rather than the deprecated lineColor attribute.
+Buildings/Resources/src/Controls/OBC/UnitConversions/unit_converters.py.Text annotation using now the textColor attribute
+rather than the deprecated lineColor attribute.
+Buildings/Resources/src/Controls/OBC/UnitConversions/unit_converters.py.Text annotation using now the textColor attribute
+rather than the deprecated lineColor attribute.
+Buildings/Resources/src/Controls/OBC/UnitConversions/unit_converters.py.Text annotation using now the textColor attribute
+rather than the deprecated lineColor attribute.
+Buildings/Resources/src/Controls/OBC/UnitConversions/unit_converters.py.Text annotation using now the textColor attribute
+rather than the deprecated lineColor attribute.
+Buildings/Resources/src/Controls/OBC/UnitConversions/unit_converters.py.Text annotation using now the textColor attribute
+rather than the deprecated lineColor attribute.
+Buildings/Resources/src/Controls/OBC/UnitConversions/unit_converters.py.Text annotation using now the textColor attribute
+rather than the deprecated lineColor attribute.
+Buildings/Resources/src/Controls/OBC/UnitConversions/unit_converters.py.Text annotation using now the textColor attribute
+rather than the deprecated lineColor attribute.
+Buildings/Resources/src/Controls/OBC/UnitConversions/unit_converters.py.Text annotation using now the textColor attribute
+rather than the deprecated lineColor attribute.
+Buildings/Resources/src/Controls/OBC/UnitConversions/unit_converters.py.Text annotation using now the textColor attribute
+rather than the deprecated lineColor attribute.
+Buildings/Resources/src/Controls/OBC/UnitConversions/unit_converters.py.Text annotation using now the textColor attribute
+rather than the deprecated lineColor attribute.
+Buildings/Resources/src/Controls/OBC/UnitConversions/unit_converters.py.Text annotation using now the textColor attribute
+rather than the deprecated lineColor attribute.
+Buildings/Resources/src/Controls/OBC/UnitConversions/unit_converters.py.Text annotation using now the textColor attribute
+rather than the deprecated lineColor attribute.
+Buildings/Resources/src/Controls/OBC/UnitConversions/unit_converters.py.Text annotation using now the textColor attribute
+rather than the deprecated lineColor attribute.
+Buildings/Resources/src/Controls/OBC/UnitConversions/unit_converters.py.Text annotation using now the textColor attribute
+rather than the deprecated lineColor attribute.
+Buildings/Resources/src/Controls/OBC/UnitConversions/unit_converters.py.Text annotation using now the textColor attribute
+rather than the deprecated lineColor attribute.
+Buildings/Resources/src/Controls/OBC/UnitConversions/unit_converters.py.Text annotation using now the textColor attribute
+rather than the deprecated lineColor attribute.
+Buildings/Resources/src/Controls/OBC/UnitConversions/unit_converters.py.Text annotation using now the textColor attribute
+rather than the deprecated lineColor attribute.
+Buildings/Resources/src/Controls/OBC/UnitConversions/unit_converters.py.Text annotation using now the textColor attribute
+rather than the deprecated lineColor attribute.
+Buildings/Resources/src/Controls/OBC/UnitConversions/unit_converters.py.Text annotation using now the textColor attribute
+rather than the deprecated lineColor attribute.
+Buildings/Resources/src/Controls/OBC/UnitConversions/unit_converters.py.Text annotation using now the textColor attribute
+rather than the deprecated lineColor attribute.
+Buildings/Resources/src/Controls/OBC/UnitConversions/unit_converters.py.Text annotation using now the textColor attribute
+rather than the deprecated lineColor attribute.
+Buildings/Resources/src/Controls/OBC/UnitConversions/unit_converters.py.Text annotation using now the textColor attribute
+rather than the deprecated lineColor attribute.
+Buildings/Resources/src/Controls/OBC/UnitConversions/unit_converters.py.Text annotation using now the textColor attribute
+rather than the deprecated lineColor attribute.
+Buildings/Resources/src/Controls/OBC/UnitConversions/unit_converters.py.Text annotation using now the textColor attribute
+rather than the deprecated lineColor attribute.
+Buildings/Resources/src/Controls/OBC/UnitConversions/unit_converters.py.Text annotation using now the textColor attribute
+rather than the deprecated lineColor attribute.
+Buildings/Resources/src/Controls/OBC/UnitConversions/unit_converters.py.Text annotation using now the textColor attribute
+rather than the deprecated lineColor attribute.
+Buildings/Resources/src/Controls/OBC/UnitConversions/unit_converters.py.Text annotation using now the textColor attribute
+rather than the deprecated lineColor attribute.
+Buildings/Resources/src/Controls/OBC/UnitConversions/unit_converters.py.Text annotation using now the textColor attribute
+rather than the deprecated lineColor attribute.
+Buildings/Resources/src/Controls/OBC/UnitConversions/unit_converters.py.Text annotation using now the textColor attribute
+rather than the deprecated lineColor attribute.
+Buildings/Resources/src/Controls/OBC/UnitConversions/unit_converters.py.Text annotation using now the textColor attribute
+rather than the deprecated lineColor attribute.
+Buildings/Resources/src/Controls/OBC/UnitConversions/unit_converters.py.Text annotation using now the textColor attribute
+rather than the deprecated lineColor attribute.
+Buildings/Resources/src/Controls/OBC/UnitConversions/unit_converters.py.Text annotation using now the textColor attribute
+rather than the deprecated lineColor attribute.
+Buildings/Resources/src/Controls/OBC/UnitConversions/unit_converters.py.Text annotation using now the textColor attribute
+rather than the deprecated lineColor attribute.
+Buildings/Resources/src/Controls/OBC/UnitConversions/unit_converters.py.Text annotation using now the textColor attribute
+rather than the deprecated lineColor attribute.
+Buildings/Resources/src/Controls/OBC/UnitConversions/unit_converters.py.Text annotation using now the textColor attribute
+rather than the deprecated lineColor attribute.
+Buildings/Resources/src/Controls/OBC/UnitConversions/unit_converters.py.Text annotation using now the textColor attribute
+rather than the deprecated lineColor attribute.
+Buildings/Resources/src/Controls/OBC/UnitConversions/unit_converters.py.Text annotation using now the textColor attribute
+rather than the deprecated lineColor attribute.
+Buildings/Resources/src/Controls/OBC/UnitConversions/unit_converters.py.Text annotation using now the textColor attribute
+rather than the deprecated lineColor attribute.
+Buildings/Resources/src/Controls/OBC/UnitConversions/unit_converters.py.Text annotation using now the textColor attribute
+rather than the deprecated lineColor attribute.
+Buildings/Resources/src/Controls/OBC/UnitConversions/unit_converters.py.Text annotation using now the textColor attribute
+rather than the deprecated lineColor attribute.
+Buildings/Resources/src/Controls/OBC/UnitConversions/unit_converters.py.Text annotation using now the textColor attribute
+rather than the deprecated lineColor attribute.
+Buildings/Resources/src/Controls/OBC/UnitConversions/unit_converters.py.Text annotation using now the textColor attribute
+rather than the deprecated lineColor attribute.
+Buildings/Resources/src/Controls/OBC/UnitConversions/unit_converters.py.Text annotation using now the textColor attribute
+rather than the deprecated lineColor attribute.
+Buildings/Resources/src/Controls/OBC/UnitConversions/unit_converters.py.Text annotation using now the textColor attribute
+rather than the deprecated lineColor attribute.
+Buildings/Resources/src/Controls/OBC/UnitConversions/unit_converters.py.Text annotation using now the textColor attribute
+rather than the deprecated lineColor attribute.
+Buildings/Resources/src/Controls/OBC/UnitConversions/unit_converters.py.Text annotation using now the textColor attribute
+rather than the deprecated lineColor attribute.
+Buildings/Resources/src/Controls/OBC/UnitConversions/unit_converters.py.Text annotation using now the textColor attribute
+rather than the deprecated lineColor attribute.
+Buildings/Resources/src/Controls/OBC/UnitConversions/unit_converters.py.Text annotation using now the textColor attribute
+rather than the deprecated lineColor attribute.
+Buildings/Resources/src/Controls/OBC/UnitConversions/unit_converters.py.diff --git a/Buildings/Controls/SetPoints/OccupancySchedule.mo b/Buildings/Controls/SetPoints/OccupancySchedule.mo index 8843f050c88..29bfdfd6f6a 100644 --- a/Buildings/Controls/SetPoints/OccupancySchedule.mo +++ b/Buildings/Controls/SetPoints/OccupancySchedule.mo @@ -160,15 +160,15 @@ equation color={0,0,255}), Text( extent={{34,74},{90,50}}, - lineColor={0,0,255}, + textColor={0,0,255}, textString="occupancy"), Text( extent={{32,16},{92,-16}}, - lineColor={0,0,255}, + textColor={0,0,255}, textString="non-occupancy"), Text( extent={{34,-44},{94,-76}}, - lineColor={0,0,255}, + textColor={0,0,255}, textString="occupied")}), defaultComponentName="occSch", Documentation(info=" diff --git a/Buildings/Controls/SetPoints/SupplyReturnTemperatureReset.mo b/Buildings/Controls/SetPoints/SupplyReturnTemperatureReset.mo index 0193d5ead57..ba58ee45666 100644 --- a/Buildings/Controls/SetPoints/SupplyReturnTemperatureReset.mo +++ b/Buildings/Controls/SetPoints/SupplyReturnTemperatureReset.mo @@ -134,19 +134,19 @@ First implementation. smooth=Smooth.Bezier), Text( extent={{-152,120},{-102,70}}, - lineColor={0,0,127}, + textColor={0,0,127}, textString="TOut"), Text( visible=use_TRoo_in, extent={{-152,-4},{-102,-54}}, - lineColor={0,0,127}, + textColor={0,0,127}, textString="TRoo"), Text( extent={{40,86},{90,36}}, - lineColor={0,0,127}, + textColor={0,0,127}, textString="TSup"), Text( extent={{42,-30},{92,-80}}, - lineColor={0,0,127}, + textColor={0,0,127}, textString="TRet")})); end SupplyReturnTemperatureReset; diff --git a/Buildings/Controls/SetPoints/Table.mo b/Buildings/Controls/SetPoints/Table.mo index 113ebfea666..ce47e940840 100644 --- a/Buildings/Controls/SetPoints/Table.mo +++ b/Buildings/Controls/SetPoints/Table.mo @@ -91,7 +91,7 @@ First implementation. Icon(graphics={ Text( extent={{-78,-45},{-40,-56}}, - lineColor={0,0,0}, + textColor={0,0,0}, textString="offset"), Line( points={{-42,-24},{-42,-74}}, @@ -105,7 +105,7 @@ First implementation. Line(points={{-82,64},{-82,-84}}, color={95,95,95}), Text( extent={{-80,88},{-39,68}}, - lineColor={0,0,0}, + textColor={0,0,0}, textString="y"), Polygon( points={{-82,86},{-88,64},{-76,64},{-82,86}}, @@ -120,7 +120,7 @@ First implementation. Line(points={{-92,-74},{80,-74}}, color={95,95,95}), Text( extent={{68,-84},{92,-95}}, - lineColor={0,0,0}, + textColor={0,0,0}, textString="u"), Polygon( points={{-42,-24},{-44,-34},{-39,-34},{-42,-24}}, diff --git a/Buildings/Controls/Sources/DayType.mo b/Buildings/Controls/Sources/DayType.mo index e82c954315e..0d7031effc3 100644 --- a/Buildings/Controls/Sources/DayType.mo +++ b/Buildings/Controls/Sources/DayType.mo @@ -54,7 +54,7 @@ equation Icon(coordinateSystem(preserveAspectRatio=false, extent={{-100,-100}, {100,100}}), graphics={Text( extent={{-68,54},{68,-38}}, - lineColor={0,0,255}, + textColor={0,0,255}, textString="day")}), Documentation(info="
diff --git a/Buildings/Electrical/AC/Interfaces/PowerOutput.mo b/Buildings/Electrical/AC/Interfaces/PowerOutput.mo index e05485c9a71..ddd6533e29d 100644 --- a/Buildings/Electrical/AC/Interfaces/PowerOutput.mo +++ b/Buildings/Electrical/AC/Interfaces/PowerOutput.mo @@ -17,7 +17,7 @@ connector PowerOutput fillColor={255,255,255}, fillPattern=FillPattern.Solid), Text( extent={{30,110},{30,60}}, - lineColor={0,0,127}, + textColor={0,0,127}, textString="%name")}), Documentation(info=" This connector contains multiple quantities that can be used to monitor diff --git a/Buildings/Electrical/AC/OnePhase/Conversion/ACACConverter.mo b/Buildings/Electrical/AC/OnePhase/Conversion/ACACConverter.mo index b66af502b1b..6cdb60266c8 100644 --- a/Buildings/Electrical/AC/OnePhase/Conversion/ACACConverter.mo +++ b/Buildings/Electrical/AC/OnePhase/Conversion/ACACConverter.mo @@ -66,31 +66,31 @@ equation smooth=Smooth.None), Text( extent={{-100,92},{100,60}}, - lineColor={0,0,0}, + textColor={0,0,0}, textString="%name"), Text( extent={{-100,-60},{100,-92}}, - lineColor={0,0,0}, + textColor={0,0,0}, textString="%conversionFactor"), Text( extent={{-100,-100},{100,-132}}, - lineColor={0,120,120}, + textColor={0,120,120}, textString="%eta"), Text( extent={{-132,78},{-72,38}}, - lineColor={11,193,87}, + textColor={11,193,87}, textString="1"), Text( extent={{-88,52},{-28,12}}, - lineColor={11,193,87}, + textColor={11,193,87}, textString="AC"), Text( extent={{32,52},{92,12}}, - lineColor={0,120,120}, + textColor={0,120,120}, textString="AC"), Text( extent={{70,78},{130,38}}, - lineColor={0,120,120}, + textColor={0,120,120}, textString="2")}), Documentation(info="
diff --git a/Buildings/Electrical/AC/OnePhase/Conversion/ACACTransformer.mo b/Buildings/Electrical/AC/OnePhase/Conversion/ACACTransformer.mo index 718f4885422..80a6c26073a 100644 --- a/Buildings/Electrical/AC/OnePhase/Conversion/ACACTransformer.mo +++ b/Buildings/Electrical/AC/OnePhase/Conversion/ACACTransformer.mo @@ -114,23 +114,23 @@ equation graphics={ Text( extent={{-100,-60},{100,-92}}, - lineColor={0,0,0}, + textColor={0,0,0}, textString="%name"), Text( extent={{-130,60},{-70,20}}, - lineColor={11,193,87}, + textColor={11,193,87}, textString="1"), Text( extent={{-130,100},{-70,60}}, - lineColor={11,193,87}, + textColor={11,193,87}, textString="AC"), Text( extent={{70,100},{130,60}}, - lineColor={0,120,120}, + textColor={0,120,120}, textString="AC"), Text( extent={{70,60},{130,20}}, - lineColor={0,120,120}, + textColor={0,120,120}, textString="2"), Line( points={{-72,40},{-66,40},{-64,44},{-60,36},{-56,44},{-52,36},{-48,44}, @@ -232,11 +232,11 @@ equation smooth=Smooth.None), Text( extent={{-64,60},{-48,48}}, - lineColor={0,120,120}, + textColor={0,120,120}, textString="R"), Text( extent={{-20,60},{-4,48}}, - lineColor={0,120,120}, + textColor={0,120,120}, textString="L")}), Documentation(info="
diff --git a/Buildings/Electrical/AC/OnePhase/Conversion/ACACTransformerFull.mo b/Buildings/Electrical/AC/OnePhase/Conversion/ACACTransformerFull.mo index 1252abc7b32..a8a9fe54955 100644 --- a/Buildings/Electrical/AC/OnePhase/Conversion/ACACTransformerFull.mo +++ b/Buildings/Electrical/AC/OnePhase/Conversion/ACACTransformerFull.mo @@ -138,23 +138,23 @@ defaultComponentName="traACAC", graphics={ Text( extent={{-100,-60},{100,-92}}, - lineColor={0,0,0}, + textColor={0,0,0}, textString="%name"), Text( extent={{-140,60},{-80,20}}, - lineColor={11,193,87}, + textColor={11,193,87}, textString="1"), Text( extent={{-130,100},{-70,60}}, - lineColor={11,193,87}, + textColor={11,193,87}, textString="AC"), Text( extent={{70,100},{130,60}}, - lineColor={0,120,120}, + textColor={0,120,120}, textString="AC"), Text( extent={{80,60},{140,20}}, - lineColor={0,120,120}, + textColor={0,120,120}, textString="2"), Line( points={{-100,40},{-94,40},{-92,44},{-88,36},{-84,44},{-80,36},{-76,44}, @@ -247,11 +247,11 @@ defaultComponentName="traACAC", smooth=Smooth.None), Text( extent={{-80,60},{-64,48}}, - lineColor={0,120,120}, + textColor={0,120,120}, textString="R"), Text( extent={{-54,60},{-38,48}}, - lineColor={0,120,120}, + textColor={0,120,120}, textString="L"), Line( points={{66,40},{72,40},{74,44},{78,36},{82,44},{86,36},{90,44},{94,36}, @@ -285,11 +285,11 @@ defaultComponentName="traACAC", pattern=LinePattern.None), Text( extent={{76,60},{92,48}}, - lineColor={0,120,120}, + textColor={0,120,120}, textString="R"), Text( extent={{36,60},{52,48}}, - lineColor={0,120,120}, + textColor={0,120,120}, textString="L"), Line( points={{-26,-1},{-10,-1},{-9,4},{-5,-4},{-1,4},{3,-4},{7,4},{10,-5},{ @@ -343,11 +343,11 @@ defaultComponentName="traACAC", smooth=Smooth.None), Text( extent={{-70,22},{-54,10}}, - lineColor={0,120,120}, + textColor={0,120,120}, textString="Rm"), Text( extent={{-70,-8},{-54,-20}}, - lineColor={0,120,120}, + textColor={0,120,120}, textString="Lm")}), Documentation(info="
diff --git a/Buildings/Electrical/AC/OnePhase/Conversion/ACDCConverter.mo b/Buildings/Electrical/AC/OnePhase/Conversion/ACDCConverter.mo index c41f2615a73..e05e8c71387 100644 --- a/Buildings/Electrical/AC/OnePhase/Conversion/ACDCConverter.mo +++ b/Buildings/Electrical/AC/OnePhase/Conversion/ACDCConverter.mo @@ -60,7 +60,7 @@ defaultComponentName="conACDC", smooth=Smooth.None), Text( extent={{36,54},{96,14}}, - lineColor={0,0,255}, + textColor={0,0,255}, textString="DC"), Line( points={{-2,60},{-2,60},{-82,60},{-2,60},{-82,-60},{-2,-60},{-2,60},{ @@ -69,19 +69,19 @@ defaultComponentName="conACDC", smooth=Smooth.None), Text( extent={{-100,52},{-40,12}}, - lineColor={0,120,120}, + textColor={0,120,120}, textString="AC"), Text( extent={{-100,92},{100,60}}, - lineColor={0,0,0}, + textColor={0,0,0}, textString="%name"), Text( extent={{-100,-60},{100,-92}}, - lineColor={0,0,0}, + textColor={0,0,0}, textString="%conversionFactor"), Text( extent={{-100,-100},{100,-132}}, - lineColor={0,0,0}, + textColor={0,0,0}, textString="%eta"), Line(visible = ground_DC == true, points={{100,-100},{100,-12}}, diff --git a/Buildings/Electrical/AC/OnePhase/Interfaces/Terminal_n.mo b/Buildings/Electrical/AC/OnePhase/Interfaces/Terminal_n.mo index 0a5e73a90f5..9f6d8a9a3fc 100644 --- a/Buildings/Electrical/AC/OnePhase/Interfaces/Terminal_n.mo +++ b/Buildings/Electrical/AC/OnePhase/Interfaces/Terminal_n.mo @@ -12,7 +12,7 @@ connector Terminal_n "Terminal n for AC one phase systems" extent={{-100,-100},{100,100}}, grid={2,2}), graphics={ Text( extent={{-60,60},{60,-60}}, - lineColor={255,255,255}, + textColor={255,255,255}, pattern=LinePattern.None, textString=""), Polygon( points={{0,100},{-100,0},{0,-100},{100,0},{0,100}}, @@ -25,11 +25,11 @@ connector Terminal_n "Terminal n for AC one phase systems" grid={2,2}), graphics={ Text( extent={{-120,120},{100,60}}, - lineColor={0,120,120}, + textColor={0,120,120}, textString="%name"), Text( extent={{14,16},{114,-84}}, - lineColor={255,255,255}, + textColor={255,255,255}, pattern=LinePattern.None, textString=""), Polygon( points={{-50,50},{-100,0},{-50,-50},{0,0},{-50,50}}, diff --git a/Buildings/Electrical/AC/OnePhase/Interfaces/Terminal_p.mo b/Buildings/Electrical/AC/OnePhase/Interfaces/Terminal_p.mo index 56e2893cd33..9e70cd8b08b 100644 --- a/Buildings/Electrical/AC/OnePhase/Interfaces/Terminal_p.mo +++ b/Buildings/Electrical/AC/OnePhase/Interfaces/Terminal_p.mo @@ -12,7 +12,7 @@ connector Terminal_p "Terminal p for AC one phase systems" extent={{-100,-100},{100,100}}, grid={2,2}), graphics={ Text( extent={{-60,60},{60,-60}}, - lineColor={255,255,255}, + textColor={255,255,255}, pattern=LinePattern.None, textString=""), Polygon( points={{0,100},{-100,0},{0,-100},{100,0},{0,100}}, @@ -25,11 +25,11 @@ connector Terminal_p "Terminal p for AC one phase systems" grid={2,2}), graphics={ Text( extent={{-120,120},{100,60}}, - lineColor={0,120,120}, + textColor={0,120,120}, textString="%name"), Text( extent={{14,16},{114,-84}}, - lineColor={255,255,255}, + textColor={255,255,255}, pattern=LinePattern.None, textString=""), Polygon( points={{50,50},{0,0},{50,-50},{100,0},{50,50}}, diff --git a/Buildings/Electrical/AC/OnePhase/Lines/TwoPortInductance.mo b/Buildings/Electrical/AC/OnePhase/Lines/TwoPortInductance.mo index e6c5fa6cdcf..09786917546 100644 --- a/Buildings/Electrical/AC/OnePhase/Lines/TwoPortInductance.mo +++ b/Buildings/Electrical/AC/OnePhase/Lines/TwoPortInductance.mo @@ -42,7 +42,7 @@ equation graphics={ Text( extent={{-140,80},{140,40}}, - lineColor={0,0,0}, + textColor={0,0,0}, textString="%name")}), Documentation(info="
diff --git a/Buildings/Electrical/AC/OnePhase/Lines/TwoPortRL.mo b/Buildings/Electrical/AC/OnePhase/Lines/TwoPortRL.mo index e8bdb4ddaaf..58bb2a9cada 100644 --- a/Buildings/Electrical/AC/OnePhase/Lines/TwoPortRL.mo +++ b/Buildings/Electrical/AC/OnePhase/Lines/TwoPortRL.mo @@ -61,7 +61,7 @@ Diagram(graphics={ graphics={ Text( extent={{-140,80},{140,40}}, - lineColor={0,0,0}, + textColor={0,0,0}, textString="%name")}), Documentation(info="
diff --git a/Buildings/Electrical/AC/OnePhase/Lines/TwoPortRLC.mo b/Buildings/Electrical/AC/OnePhase/Lines/TwoPortRLC.mo index b554487d9c4..9718587e98d 100644 --- a/Buildings/Electrical/AC/OnePhase/Lines/TwoPortRLC.mo +++ b/Buildings/Electrical/AC/OnePhase/Lines/TwoPortRLC.mo @@ -69,7 +69,7 @@ Diagram(graphics={ graphics={ Text( extent={{-140,80},{140,40}}, - lineColor={0,0,0}, + textColor={0,0,0}, textString="%name")}), Documentation(info="
diff --git a/Buildings/Electrical/AC/OnePhase/Lines/TwoPortResistance.mo b/Buildings/Electrical/AC/OnePhase/Lines/TwoPortResistance.mo index 14c2d039f28..e410cac790e 100644 --- a/Buildings/Electrical/AC/OnePhase/Lines/TwoPortResistance.mo +++ b/Buildings/Electrical/AC/OnePhase/Lines/TwoPortResistance.mo @@ -23,7 +23,7 @@ equation graphics={ Text( extent={{-140,80},{140,40}}, - lineColor={0,0,0}, + textColor={0,0,0}, textString="%name")}), Documentation( info=" diff --git a/Buildings/Electrical/AC/OnePhase/Loads/Capacitive.mo b/Buildings/Electrical/AC/OnePhase/Loads/Capacitive.mo index 1ec207ee872..90545ef215b 100644 --- a/Buildings/Electrical/AC/OnePhase/Loads/Capacitive.mo +++ b/Buildings/Electrical/AC/OnePhase/Loads/Capacitive.mo @@ -92,7 +92,7 @@ equation rotation=90), Text( extent={{-120,80},{120,40}}, - lineColor={0,0,0}, + textColor={0,0,0}, textString="%name")}), Documentation(info="
diff --git a/Buildings/Electrical/AC/OnePhase/Loads/Impedance.mo b/Buildings/Electrical/AC/OnePhase/Loads/Impedance.mo index e6299b0b06b..805a9c16e97 100644 --- a/Buildings/Electrical/AC/OnePhase/Loads/Impedance.mo +++ b/Buildings/Electrical/AC/OnePhase/Loads/Impedance.mo @@ -37,7 +37,7 @@ equation rotation=180), Text( extent={{-120,-40},{120,-80}}, - lineColor={0,0,0}, + textColor={0,0,0}, textString="%name")}), Documentation(info="
diff --git a/Buildings/Electrical/AC/OnePhase/Loads/Inductive.mo b/Buildings/Electrical/AC/OnePhase/Loads/Inductive.mo index 598abcb3e32..666a70a742d 100644 --- a/Buildings/Electrical/AC/OnePhase/Loads/Inductive.mo +++ b/Buildings/Electrical/AC/OnePhase/Loads/Inductive.mo @@ -91,7 +91,7 @@ equation rotation=180), Text( extent={{-120,80},{120,40}}, - lineColor={0,0,0}, + textColor={0,0,0}, textString="%name")}), Documentation(info="
diff --git a/Buildings/Electrical/AC/OnePhase/Loads/Resistive.mo b/Buildings/Electrical/AC/OnePhase/Loads/Resistive.mo index 5fb352b5a90..cfa690e2653 100644 --- a/Buildings/Electrical/AC/OnePhase/Loads/Resistive.mo +++ b/Buildings/Electrical/AC/OnePhase/Loads/Resistive.mo @@ -38,7 +38,7 @@ equation rotation=180), Text( extent={{-120,80},{120,40}}, - lineColor={0,0,0}, + textColor={0,0,0}, textString="%name")}), Documentation(info="
diff --git a/Buildings/Electrical/AC/OnePhase/Sensors/GeneralizedSensor.mo b/Buildings/Electrical/AC/OnePhase/Sensors/GeneralizedSensor.mo index fc380e83e87..10e0a572dc0 100644 --- a/Buildings/Electrical/AC/OnePhase/Sensors/GeneralizedSensor.mo +++ b/Buildings/Electrical/AC/OnePhase/Sensors/GeneralizedSensor.mo @@ -77,7 +77,7 @@ First implementation. Icon(graphics={ Text( extent={{-120,-42},{0,-82}}, - lineColor={0,0,0}, + textColor={0,0,0}, lineThickness=1, fillColor={255,255,255}, fillPattern=FillPattern.Solid, diff --git a/Buildings/Electrical/AC/OnePhase/Sensors/Probe.mo b/Buildings/Electrical/AC/OnePhase/Sensors/Probe.mo index 8f13c9ea952..d8afcd588c8 100644 --- a/Buildings/Electrical/AC/OnePhase/Sensors/Probe.mo +++ b/Buildings/Electrical/AC/OnePhase/Sensors/Probe.mo @@ -31,13 +31,13 @@ equation Icon(coordinateSystem(preserveAspectRatio=false, extent={{-100,-100}, {100,100}}), graphics={Text( extent={{40,60},{100,40}}, - lineColor={0,0,0}, + textColor={0,0,0}, pattern=LinePattern.Dash, fillColor={0,120,120}, fillPattern=FillPattern.Solid, textString="V"), Text( extent={{18,-40},{140,-60}}, - lineColor={0,0,0}, + textColor={0,0,0}, pattern=LinePattern.Dash, fillColor={0,120,120}, fillPattern=FillPattern.Solid, diff --git a/Buildings/Electrical/AC/OnePhase/Sources/FixedVoltage.mo b/Buildings/Electrical/AC/OnePhase/Sources/FixedVoltage.mo index 1450f796886..1194f521354 100644 --- a/Buildings/Electrical/AC/OnePhase/Sources/FixedVoltage.mo +++ b/Buildings/Electrical/AC/OnePhase/Sources/FixedVoltage.mo @@ -31,7 +31,7 @@ equation smooth=Smooth.Bezier), Text( extent={{-120,100},{120,60}}, - lineColor={0,0,0}, + textColor={0,0,0}, textString="%name"), Line( points={{60,0},{90,0}}, @@ -53,7 +53,7 @@ equation smooth=Smooth.Bezier), Text( extent={{-118,-60},{122,-100}}, - lineColor={0,0,0}, + textColor={0,0,0}, textString="V = %V")}), Documentation(info="
diff --git a/Buildings/Electrical/AC/OnePhase/Sources/Generator.mo b/Buildings/Electrical/AC/OnePhase/Sources/Generator.mo index 3c2491256f7..8273d954c48 100644 --- a/Buildings/Electrical/AC/OnePhase/Sources/Generator.mo +++ b/Buildings/Electrical/AC/OnePhase/Sources/Generator.mo @@ -46,7 +46,7 @@ equation fillPattern=FillPattern.Solid), Text( extent={{-120,130},{120,100}}, - lineColor={0,0,0}, + textColor={0,0,0}, textString="%name"), Line(visible = definiteReference == true, points={{-20,-128},{20,-128}}, diff --git a/Buildings/Electrical/AC/OnePhase/Sources/Grid.mo b/Buildings/Electrical/AC/OnePhase/Sources/Grid.mo index 6eb7a398760..f6e50049fc1 100644 --- a/Buildings/Electrical/AC/OnePhase/Sources/Grid.mo +++ b/Buildings/Electrical/AC/OnePhase/Sources/Grid.mo @@ -73,7 +73,7 @@ First implementation. fillPattern=FillPattern.Solid), Text( extent={{-120,130},{120,100}}, - lineColor={0,0,0}, + textColor={0,0,0}, textString="%name"), Line( points={{-60,-32},{-60,-72}}, diff --git a/Buildings/Electrical/AC/OnePhase/Storage/Battery.mo b/Buildings/Electrical/AC/OnePhase/Storage/Battery.mo index be2359f1989..4b39c5f3fdc 100644 --- a/Buildings/Electrical/AC/OnePhase/Storage/Battery.mo +++ b/Buildings/Electrical/AC/OnePhase/Storage/Battery.mo @@ -142,7 +142,7 @@ defaultComponentName="bat", lineColor={0,0,0}), Text( extent={{-50,68},{-20,100}}, - lineColor={0,0,0}, + textColor={0,0,0}, fillColor={215,215,215}, fillPattern=FillPattern.Solid, textString="P"), @@ -152,13 +152,13 @@ defaultComponentName="bat", smooth=Smooth.None), Text( extent={{44,70},{100,116}}, - lineColor={0,0,0}, + textColor={0,0,0}, fillColor={215,215,215}, fillPattern=FillPattern.Solid, textString="SOC"), Text( extent={{44,154},{134,112}}, - lineColor={0,0,0}, + textColor={0,0,0}, textString="%name")}), Documentation( info=" diff --git a/Buildings/Electrical/AC/ThreePhasesBalanced/Interfaces/Terminal_n.mo b/Buildings/Electrical/AC/ThreePhasesBalanced/Interfaces/Terminal_n.mo index 72560453678..d9fdb1c3303 100644 --- a/Buildings/Electrical/AC/ThreePhasesBalanced/Interfaces/Terminal_n.mo +++ b/Buildings/Electrical/AC/ThreePhasesBalanced/Interfaces/Terminal_n.mo @@ -11,7 +11,7 @@ connector Terminal_n "AC three-phase balanced terminal ('negative')" extent={{-100,-100},{100,100}}, grid={2,2}), graphics={ Text( extent={{-60,60},{60,-60}}, - lineColor={255,255,255}, + textColor={255,255,255}, pattern=LinePattern.None, textString=""), Polygon( points={{-100,100},{-100,-100},{100,-100},{100,100},{-100,100}}, @@ -24,11 +24,11 @@ connector Terminal_n "AC three-phase balanced terminal ('negative')" grid={2,2}), graphics={ Text( extent={{-120,120},{100,60}}, - lineColor={0,120,120}, + textColor={0,120,120}, textString="%name"), Text( extent={{14,16},{114,-84}}, - lineColor={255,255,255}, + textColor={255,255,255}, pattern=LinePattern.None, textString=""), Polygon( points={{-100,50},{-100,-50},{0,-50},{0,50},{-100,50}}, diff --git a/Buildings/Electrical/AC/ThreePhasesBalanced/Interfaces/Terminal_p.mo b/Buildings/Electrical/AC/ThreePhasesBalanced/Interfaces/Terminal_p.mo index 3a3b4d3db54..03a776992e7 100644 --- a/Buildings/Electrical/AC/ThreePhasesBalanced/Interfaces/Terminal_p.mo +++ b/Buildings/Electrical/AC/ThreePhasesBalanced/Interfaces/Terminal_p.mo @@ -11,7 +11,7 @@ connector Terminal_p "AC three-phase balanced terminal ('positive')" extent={{-100,-100},{100,100}}, grid={2,2}), graphics={ Text( extent={{-60,60},{60,-60}}, - lineColor={255,255,255}, + textColor={255,255,255}, pattern=LinePattern.None, textString=""), Polygon( points={{-100,100},{-100,-100},{100,-100},{100,100},{-100,100}}, @@ -24,11 +24,11 @@ connector Terminal_p "AC three-phase balanced terminal ('positive')" grid={2,2}), graphics={ Text( extent={{-120,120},{100,60}}, - lineColor={0,120,120}, + textColor={0,120,120}, textString="%name"), Text( extent={{14,16},{114,-84}}, - lineColor={255,255,255}, + textColor={255,255,255}, pattern=LinePattern.None, textString=""), Polygon( points={{0,50},{0,-50},{100,-50},{100,50},{0,50}}, diff --git a/Buildings/Electrical/AC/ThreePhasesBalanced/Loads/Capacitive.mo b/Buildings/Electrical/AC/ThreePhasesBalanced/Loads/Capacitive.mo index 19d9187b722..671a1428c32 100644 --- a/Buildings/Electrical/AC/ThreePhasesBalanced/Loads/Capacitive.mo +++ b/Buildings/Electrical/AC/ThreePhasesBalanced/Loads/Capacitive.mo @@ -18,7 +18,7 @@ model Capacitive "Model of a capacitive and resistive load" rotation=180), Text( extent={{-120,120},{120,80}}, - lineColor={0,0,0}, + textColor={0,0,0}, textString="%name"), Rectangle( extent={{-11,22},{11,-22}}, diff --git a/Buildings/Electrical/AC/ThreePhasesBalanced/Loads/Examples/ThreePhases.mo b/Buildings/Electrical/AC/ThreePhasesBalanced/Loads/Examples/ThreePhases.mo index f51fbc2943c..1962832febb 100644 --- a/Buildings/Electrical/AC/ThreePhasesBalanced/Loads/Examples/ThreePhases.mo +++ b/Buildings/Electrical/AC/ThreePhasesBalanced/Loads/Examples/ThreePhases.mo @@ -179,15 +179,15 @@ equation -100},{100,100}}), graphics={ Text( extent={{-60,100},{60,80}}, - lineColor={0,0,0}, + textColor={0,0,0}, textString="Three phases, balanced (Y and D connection) "), Text( extent={{-100,10},{-4,-10}}, - lineColor={0,0,0}, + textColor={0,0,0}, textString="Three phases, balanced (Y connection) "), Text( extent={{4,10},{100,-10}}, - lineColor={0,0,0}, + textColor={0,0,0}, textString="Three phases, balanced (D connection) ")}), Documentation( revisions="
diff --git a/Buildings/Electrical/AC/ThreePhasesUnbalanced/Conversion/ACACTransformer.mo b/Buildings/Electrical/AC/ThreePhasesUnbalanced/Conversion/ACACTransformer.mo index adbd3a5e327..2cd808ffd8e 100644 --- a/Buildings/Electrical/AC/ThreePhasesUnbalanced/Conversion/ACACTransformer.mo +++ b/Buildings/Electrical/AC/ThreePhasesUnbalanced/Conversion/ACACTransformer.mo @@ -47,23 +47,23 @@ equation Icon(graphics={ Text( extent={{-100,-60},{100,-92}}, - lineColor={0,0,0}, + textColor={0,0,0}, textString="%name"), Text( extent={{-130,60},{-70,20}}, - lineColor={11,193,87}, + textColor={11,193,87}, textString="1"), Text( extent={{-130,100},{-70,60}}, - lineColor={11,193,87}, + textColor={11,193,87}, textString="AC"), Text( extent={{70,100},{130,60}}, - lineColor={0,120,120}, + textColor={0,120,120}, textString="AC"), Text( extent={{70,60},{130,20}}, - lineColor={0,120,120}, + textColor={0,120,120}, textString="2"), Line( points={{-72,40},{-66,40},{-64,44},{-60,36},{-56,44},{-52,36},{-48,44}, @@ -165,11 +165,11 @@ equation smooth=Smooth.None), Text( extent={{-64,60},{-48,48}}, - lineColor={0,120,120}, + textColor={0,120,120}, textString="R"), Text( extent={{-20,60},{-4,48}}, - lineColor={0,120,120}, + textColor={0,120,120}, textString="L")}), Documentation(info="
diff --git a/Buildings/Electrical/AC/ThreePhasesUnbalanced/Conversion/ACACTransformerDD.mo b/Buildings/Electrical/AC/ThreePhasesUnbalanced/Conversion/ACACTransformerDD.mo index 8d8abb789b2..0fc54d2b2ab 100644 --- a/Buildings/Electrical/AC/ThreePhasesUnbalanced/Conversion/ACACTransformerDD.mo +++ b/Buildings/Electrical/AC/ThreePhasesUnbalanced/Conversion/ACACTransformerDD.mo @@ -47,23 +47,23 @@ equation Icon(graphics={ Text( extent={{-100,-60},{100,-92}}, - lineColor={0,0,0}, + textColor={0,0,0}, textString="%name"), Text( extent={{-130,60},{-70,20}}, - lineColor={11,193,87}, + textColor={11,193,87}, textString="1"), Text( extent={{-130,100},{-70,60}}, - lineColor={11,193,87}, + textColor={11,193,87}, textString="AC"), Text( extent={{70,100},{130,60}}, - lineColor={0,120,120}, + textColor={0,120,120}, textString="AC"), Text( extent={{70,60},{130,20}}, - lineColor={0,120,120}, + textColor={0,120,120}, textString="2"), Line( points={{-72,40},{-66,40},{-64,44},{-60,36},{-56,44},{-52,36},{-48,44}, @@ -165,11 +165,11 @@ equation smooth=Smooth.None), Text( extent={{-64,60},{-48,48}}, - lineColor={0,120,120}, + textColor={0,120,120}, textString="R"), Text( extent={{-20,60},{-4,48}}, - lineColor={0,120,120}, + textColor={0,120,120}, textString="L"), Line( points={{-50,-8},{-30,22},{-10,-8},{-50,-8}}, diff --git a/Buildings/Electrical/AC/ThreePhasesUnbalanced/Conversion/ACACTransformerFull.mo b/Buildings/Electrical/AC/ThreePhasesUnbalanced/Conversion/ACACTransformerFull.mo index 42304e784df..b347722cebd 100644 --- a/Buildings/Electrical/AC/ThreePhasesUnbalanced/Conversion/ACACTransformerFull.mo +++ b/Buildings/Electrical/AC/ThreePhasesUnbalanced/Conversion/ACACTransformerFull.mo @@ -63,23 +63,23 @@ model ACACTransformerFull "AC AC transformer detailed equivalent circuit (YY)" Icon(graphics={ Text( extent={{-100,-60},{100,-92}}, - lineColor={0,0,0}, + textColor={0,0,0}, textString="%name"), Text( extent={{-130,60},{-70,20}}, - lineColor={11,193,87}, + textColor={11,193,87}, textString="1"), Text( extent={{-130,100},{-70,60}}, - lineColor={11,193,87}, + textColor={11,193,87}, textString="AC"), Text( extent={{70,100},{130,60}}, - lineColor={0,120,120}, + textColor={0,120,120}, textString="AC"), Text( extent={{70,60},{130,20}}, - lineColor={0,120,120}, + textColor={0,120,120}, textString="2"), Line( points={{-72,40},{-66,40},{-64,44},{-60,36},{-56,44},{-52,36},{-48,44}, @@ -181,11 +181,11 @@ model ACACTransformerFull "AC AC transformer detailed equivalent circuit (YY)" smooth=Smooth.None), Text( extent={{-64,60},{-48,48}}, - lineColor={0,120,120}, + textColor={0,120,120}, textString="R"), Text( extent={{-20,60},{-4,48}}, - lineColor={0,120,120}, + textColor={0,120,120}, textString="L")}), Documentation(info="
diff --git a/Buildings/Electrical/AC/ThreePhasesUnbalanced/Conversion/ACACTransformerStepDownDY.mo b/Buildings/Electrical/AC/ThreePhasesUnbalanced/Conversion/ACACTransformerStepDownDY.mo index 04d00a888ce..0aa65b38213 100644 --- a/Buildings/Electrical/AC/ThreePhasesUnbalanced/Conversion/ACACTransformerStepDownDY.mo +++ b/Buildings/Electrical/AC/ThreePhasesUnbalanced/Conversion/ACACTransformerStepDownDY.mo @@ -50,23 +50,23 @@ equation graphics={ Text( extent={{-100,-60},{100,-92}}, - lineColor={0,0,0}, + textColor={0,0,0}, textString="%name"), Text( extent={{-130,60},{-70,20}}, - lineColor={11,193,87}, + textColor={11,193,87}, textString="1"), Text( extent={{-130,100},{-70,60}}, - lineColor={11,193,87}, + textColor={11,193,87}, textString="AC"), Text( extent={{70,100},{130,60}}, - lineColor={0,120,120}, + textColor={0,120,120}, textString="AC"), Text( extent={{70,60},{130,20}}, - lineColor={0,120,120}, + textColor={0,120,120}, textString="2"), Line( points={{-72,40},{-66,40},{-64,44},{-60,36},{-56,44},{-52,36},{-48,44}, @@ -168,11 +168,11 @@ equation smooth=Smooth.None), Text( extent={{-64,60},{-48,48}}, - lineColor={0,120,120}, + textColor={0,120,120}, textString="R"), Text( extent={{-20,60},{-4,48}}, - lineColor={0,120,120}, + textColor={0,120,120}, textString="L"), Line( points={{60,26},{60,6},{46,-8}}, diff --git a/Buildings/Electrical/AC/ThreePhasesUnbalanced/Conversion/ACACTransformerStepDownYD.mo b/Buildings/Electrical/AC/ThreePhasesUnbalanced/Conversion/ACACTransformerStepDownYD.mo index 68357544508..8cda50f455c 100644 --- a/Buildings/Electrical/AC/ThreePhasesUnbalanced/Conversion/ACACTransformerStepDownYD.mo +++ b/Buildings/Electrical/AC/ThreePhasesUnbalanced/Conversion/ACACTransformerStepDownYD.mo @@ -48,23 +48,23 @@ equation Icon(graphics={ Text( extent={{-100,-60},{100,-92}}, - lineColor={0,0,0}, + textColor={0,0,0}, textString="%name"), Text( extent={{-130,60},{-70,20}}, - lineColor={11,193,87}, + textColor={11,193,87}, textString="1"), Text( extent={{-130,100},{-70,60}}, - lineColor={11,193,87}, + textColor={11,193,87}, textString="AC"), Text( extent={{70,100},{130,60}}, - lineColor={0,120,120}, + textColor={0,120,120}, textString="AC"), Text( extent={{70,60},{130,20}}, - lineColor={0,120,120}, + textColor={0,120,120}, textString="2"), Line( points={{-72,40},{-66,40},{-64,44},{-60,36},{-56,44},{-52,36},{-48,44}, @@ -166,11 +166,11 @@ equation smooth=Smooth.None), Text( extent={{-64,60},{-48,48}}, - lineColor={0,120,120}, + textColor={0,120,120}, textString="R"), Text( extent={{-20,60},{-4,48}}, - lineColor={0,120,120}, + textColor={0,120,120}, textString="L"), Line( points={{-40,20},{-40,0},{-54,-14}}, diff --git a/Buildings/Electrical/AC/ThreePhasesUnbalanced/Conversion/ACACTransformerStepUpDY.mo b/Buildings/Electrical/AC/ThreePhasesUnbalanced/Conversion/ACACTransformerStepUpDY.mo index 992b10a58d9..6ab35110a0f 100644 --- a/Buildings/Electrical/AC/ThreePhasesUnbalanced/Conversion/ACACTransformerStepUpDY.mo +++ b/Buildings/Electrical/AC/ThreePhasesUnbalanced/Conversion/ACACTransformerStepUpDY.mo @@ -48,23 +48,23 @@ equation Icon(graphics={ Text( extent={{-100,-60},{100,-92}}, - lineColor={0,0,0}, + textColor={0,0,0}, textString="%name"), Text( extent={{-130,60},{-70,20}}, - lineColor={11,193,87}, + textColor={11,193,87}, textString="1"), Text( extent={{-130,100},{-70,60}}, - lineColor={11,193,87}, + textColor={11,193,87}, textString="AC"), Text( extent={{70,100},{130,60}}, - lineColor={0,120,120}, + textColor={0,120,120}, textString="AC"), Text( extent={{70,60},{130,20}}, - lineColor={0,120,120}, + textColor={0,120,120}, textString="2"), Line( points={{-72,40},{-66,40},{-64,44},{-60,36},{-56,44},{-52,36},{-48,44}, @@ -166,11 +166,11 @@ equation smooth=Smooth.None), Text( extent={{-64,60},{-48,48}}, - lineColor={0,120,120}, + textColor={0,120,120}, textString="R"), Text( extent={{-20,60},{-4,48}}, - lineColor={0,120,120}, + textColor={0,120,120}, textString="L"), Line( points={{60,26},{60,6},{46,-8}}, diff --git a/Buildings/Electrical/AC/ThreePhasesUnbalanced/Conversion/ACACTransformerStepUpYD.mo b/Buildings/Electrical/AC/ThreePhasesUnbalanced/Conversion/ACACTransformerStepUpYD.mo index e426b07a3bd..d944aa4bc8c 100644 --- a/Buildings/Electrical/AC/ThreePhasesUnbalanced/Conversion/ACACTransformerStepUpYD.mo +++ b/Buildings/Electrical/AC/ThreePhasesUnbalanced/Conversion/ACACTransformerStepUpYD.mo @@ -48,23 +48,23 @@ equation Icon(graphics={ Text( extent={{-100,-60},{100,-92}}, - lineColor={0,0,0}, + textColor={0,0,0}, textString="%name"), Text( extent={{-130,60},{-70,20}}, - lineColor={11,193,87}, + textColor={11,193,87}, textString="1"), Text( extent={{-130,100},{-70,60}}, - lineColor={11,193,87}, + textColor={11,193,87}, textString="AC"), Text( extent={{70,100},{130,60}}, - lineColor={0,120,120}, + textColor={0,120,120}, textString="AC"), Text( extent={{70,60},{130,20}}, - lineColor={0,120,120}, + textColor={0,120,120}, textString="2"), Line( points={{-72,40},{-66,40},{-64,44},{-60,36},{-56,44},{-52,36},{-48,44}, @@ -166,11 +166,11 @@ equation smooth=Smooth.None), Text( extent={{-64,60},{-48,48}}, - lineColor={0,120,120}, + textColor={0,120,120}, textString="R"), Text( extent={{-20,60},{-4,48}}, - lineColor={0,120,120}, + textColor={0,120,120}, textString="L"), Line( points={{-40,20},{-40,0},{-54,-14}}, diff --git a/Buildings/Electrical/AC/ThreePhasesUnbalanced/Lines/TwoPortInductance.mo b/Buildings/Electrical/AC/ThreePhasesUnbalanced/Lines/TwoPortInductance.mo index 7f3159a0884..c8764b2663a 100644 --- a/Buildings/Electrical/AC/ThreePhasesUnbalanced/Lines/TwoPortInductance.mo +++ b/Buildings/Electrical/AC/ThreePhasesUnbalanced/Lines/TwoPortInductance.mo @@ -54,13 +54,13 @@ equation fillPattern=FillPattern.Solid), Text( extent={{-140,-28},{140,-60}}, - lineColor={0,0,0}, + textColor={0,0,0}, textString="L=%L"), Line(points={{-92,0},{-72,0}}, color={0,0,0}), Line(points={{68,0},{88,0}}, color={0,0,0}), Text( extent={{-142,80},{138,40}}, - lineColor={0,0,0}, + textColor={0,0,0}, textString="%name"), Line( points={{0,0},{12,1.46953e-15}}, diff --git a/Buildings/Electrical/AC/ThreePhasesUnbalanced/Lines/TwoPortInductance_N.mo b/Buildings/Electrical/AC/ThreePhasesUnbalanced/Lines/TwoPortInductance_N.mo index 05513eec0bd..178edd375af 100644 --- a/Buildings/Electrical/AC/ThreePhasesUnbalanced/Lines/TwoPortInductance_N.mo +++ b/Buildings/Electrical/AC/ThreePhasesUnbalanced/Lines/TwoPortInductance_N.mo @@ -67,13 +67,13 @@ equation fillPattern=FillPattern.Solid), Text( extent={{-140,-28},{140,-60}}, - lineColor={0,0,0}, + textColor={0,0,0}, textString="L=%L"), Line(points={{-92,0},{-72,0}}, color={0,0,0}), Line(points={{68,0},{88,0}}, color={0,0,0}), Text( extent={{-142,80},{138,40}}, - lineColor={0,0,0}, + textColor={0,0,0}, textString="%name"), Line( points={{0,0},{12,1.46953e-15}}, diff --git a/Buildings/Electrical/AC/ThreePhasesUnbalanced/Lines/TwoPortMatrixRL.mo b/Buildings/Electrical/AC/ThreePhasesUnbalanced/Lines/TwoPortMatrixRL.mo index 7b028848942..febad33304c 100644 --- a/Buildings/Electrical/AC/ThreePhasesUnbalanced/Lines/TwoPortMatrixRL.mo +++ b/Buildings/Electrical/AC/ThreePhasesUnbalanced/Lines/TwoPortMatrixRL.mo @@ -95,11 +95,11 @@ equation pattern=LinePattern.None), Text( extent={{-140,100},{140,60}}, - lineColor={0,0,0}, + textColor={0,0,0}, textString="%name"), Text( extent={{-70,10},{70,-10}}, - lineColor={0,0,0}, + textColor={0,0,0}, textString="R+jX 3x3")}), Documentation(revisions="
diff --git a/Buildings/Electrical/AC/ThreePhasesUnbalanced/Lines/TwoPortRLC.mo b/Buildings/Electrical/AC/ThreePhasesUnbalanced/Lines/TwoPortRLC.mo index 0d261467976..6d6e91b1269 100644 --- a/Buildings/Electrical/AC/ThreePhasesUnbalanced/Lines/TwoPortRLC.mo +++ b/Buildings/Electrical/AC/ThreePhasesUnbalanced/Lines/TwoPortRLC.mo @@ -111,7 +111,7 @@ equation graphics={ Text( extent={{-150,-28},{136,-60}}, - lineColor={0,0,0}, + textColor={0,0,0}, textString="R=%R, L=%L"), Line(points={{-92,0},{-72,0}}, color={0,0,0}), Line(points={{68,0},{88,0}}, color={0,0,0}), @@ -172,11 +172,11 @@ equation pattern=LinePattern.None), Text( extent={{-144,-56},{142,-88}}, - lineColor={0,0,0}, + textColor={0,0,0}, textString="C=%C"), Text( extent={{-142,80},{138,40}}, - lineColor={0,0,0}, + textColor={0,0,0}, textString="%name")}), Documentation(info="
diff --git a/Buildings/Electrical/AC/ThreePhasesUnbalanced/Lines/TwoPortRLC_N.mo b/Buildings/Electrical/AC/ThreePhasesUnbalanced/Lines/TwoPortRLC_N.mo index 23ffd7aa5a1..ae01370a2dd 100644 --- a/Buildings/Electrical/AC/ThreePhasesUnbalanced/Lines/TwoPortRLC_N.mo +++ b/Buildings/Electrical/AC/ThreePhasesUnbalanced/Lines/TwoPortRLC_N.mo @@ -139,7 +139,7 @@ equation graphics={ Text( extent={{-150,-28},{136,-60}}, - lineColor={0,0,0}, + textColor={0,0,0}, textString="R=%R, L=%L"), Line(points={{-92,0},{-72,0}}, color={0,0,0}), Line(points={{68,0},{88,0}}, color={0,0,0}), @@ -200,11 +200,11 @@ equation pattern=LinePattern.None), Text( extent={{-144,-56},{142,-88}}, - lineColor={0,0,0}, + textColor={0,0,0}, textString="C=%C"), Text( extent={{-142,80},{138,40}}, - lineColor={0,0,0}, + textColor={0,0,0}, textString="%name")}), Documentation(info="
diff --git a/Buildings/Electrical/AC/ThreePhasesUnbalanced/Lines/TwoPortRL_N.mo b/Buildings/Electrical/AC/ThreePhasesUnbalanced/Lines/TwoPortRL_N.mo index 21b5f2b371a..071416ae183 100644 --- a/Buildings/Electrical/AC/ThreePhasesUnbalanced/Lines/TwoPortRL_N.mo +++ b/Buildings/Electrical/AC/ThreePhasesUnbalanced/Lines/TwoPortRL_N.mo @@ -124,7 +124,7 @@ equation graphics={ Text( extent={{-150,-28},{136,-60}}, - lineColor={0,0,0}, + textColor={0,0,0}, textString="R=%R, L=%L"), Line(points={{-92,0},{-72,0}}, color={0,0,0}), Line(points={{68,0},{88,0}}, color={0,0,0}), @@ -165,7 +165,7 @@ equation pattern=LinePattern.None), Text( extent={{-142,80},{138,40}}, - lineColor={0,0,0}, + textColor={0,0,0}, textString="%name")}), Documentation(info="
diff --git a/Buildings/Electrical/AC/ThreePhasesUnbalanced/Lines/TwoPortResistance.mo b/Buildings/Electrical/AC/ThreePhasesUnbalanced/Lines/TwoPortResistance.mo index 98de9dfa9c5..7076a6ae02d 100644 --- a/Buildings/Electrical/AC/ThreePhasesUnbalanced/Lines/TwoPortResistance.mo +++ b/Buildings/Electrical/AC/ThreePhasesUnbalanced/Lines/TwoPortResistance.mo @@ -74,7 +74,7 @@ equation graphics={ Text( extent={{-140,-28},{138,-60}}, - lineColor={0,0,0}, + textColor={0,0,0}, textString="R=%R"), Line(points={{-92,0},{-72,0}}, color={0,0,0}), Line(points={{68,0},{88,0}}, color={0,0,0}), @@ -85,7 +85,7 @@ equation fillPattern=FillPattern.Solid), Text( extent={{-142,80},{138,40}}, - lineColor={0,0,0}, + textColor={0,0,0}, textString="%name")}), Documentation(info="
diff --git a/Buildings/Electrical/AC/ThreePhasesUnbalanced/Lines/TwoPortResistance_N.mo b/Buildings/Electrical/AC/ThreePhasesUnbalanced/Lines/TwoPortResistance_N.mo index 7320a7edbf9..d91ec4f799f 100644 --- a/Buildings/Electrical/AC/ThreePhasesUnbalanced/Lines/TwoPortResistance_N.mo +++ b/Buildings/Electrical/AC/ThreePhasesUnbalanced/Lines/TwoPortResistance_N.mo @@ -95,7 +95,7 @@ equation graphics={ Text( extent={{-140,-28},{138,-60}}, - lineColor={0,0,0}, + textColor={0,0,0}, textString="R=%R"), Line(points={{-92,0},{-72,0}}, color={0,0,0}), Line(points={{68,0},{88,0}}, color={0,0,0}), @@ -106,7 +106,7 @@ equation fillPattern=FillPattern.Solid), Text( extent={{-142,80},{138,40}}, - lineColor={0,0,0}, + textColor={0,0,0}, textString="%name")}), Documentation(info="
diff --git a/Buildings/Electrical/AC/ThreePhasesUnbalanced/Loads/Capacitive.mo b/Buildings/Electrical/AC/ThreePhasesUnbalanced/Loads/Capacitive.mo index f175fea1c75..eb8a2db16e0 100644 --- a/Buildings/Electrical/AC/ThreePhasesUnbalanced/Loads/Capacitive.mo +++ b/Buildings/Electrical/AC/ThreePhasesUnbalanced/Loads/Capacitive.mo @@ -90,7 +90,7 @@ equation rotation=180), Text( extent={{-120,120},{120,80}}, - lineColor={0,0,0}, + textColor={0,0,0}, textString="%name"), Rectangle( extent={{-11,22},{11,-22}}, diff --git a/Buildings/Electrical/AC/ThreePhasesUnbalanced/Loads/Capacitive_N.mo b/Buildings/Electrical/AC/ThreePhasesUnbalanced/Loads/Capacitive_N.mo index 7f5be34c378..eccebeac8dd 100644 --- a/Buildings/Electrical/AC/ThreePhasesUnbalanced/Loads/Capacitive_N.mo +++ b/Buildings/Electrical/AC/ThreePhasesUnbalanced/Loads/Capacitive_N.mo @@ -89,7 +89,7 @@ equation rotation=180), Text( extent={{-120,120},{120,80}}, - lineColor={0,0,0}, + textColor={0,0,0}, textString="%name"), Rectangle( extent={{-11,22},{11,-22}}, diff --git a/Buildings/Electrical/AC/ThreePhasesUnbalanced/Loads/Examples/Impedances.mo b/Buildings/Electrical/AC/ThreePhasesUnbalanced/Loads/Examples/Impedances.mo index 19ce9efacd4..43886c6d2df 100644 --- a/Buildings/Electrical/AC/ThreePhasesUnbalanced/Loads/Examples/Impedances.mo +++ b/Buildings/Electrical/AC/ThreePhasesUnbalanced/Loads/Examples/Impedances.mo @@ -75,11 +75,11 @@ equation annotation (Diagram(coordinateSystem(preserveAspectRatio=false, extent={{-100, -100},{100,100}}), graphics={Text( extent={{-80,80},{0,74}}, - lineColor={0,0,0}, + textColor={0,0,0}, pattern=LinePattern.Dash, textString="Without neutral"), Text( extent={{-80,-10},{0,-16}}, - lineColor={0,0,0}, + textColor={0,0,0}, pattern=LinePattern.Dash, textString="With neutral")}), Documentation(info="
diff --git a/Buildings/Electrical/AC/ThreePhasesUnbalanced/Loads/Impedance.mo b/Buildings/Electrical/AC/ThreePhasesUnbalanced/Loads/Impedance.mo index 0f417c94dcb..31a947259db 100644 --- a/Buildings/Electrical/AC/ThreePhasesUnbalanced/Loads/Impedance.mo +++ b/Buildings/Electrical/AC/ThreePhasesUnbalanced/Loads/Impedance.mo @@ -28,7 +28,7 @@ equation rotation=180), Text( extent={{-120,-80},{120,-120}}, - lineColor={0,0,0}, + textColor={0,0,0}, textString="%name"), Line( points={{-66,50},{-26,50}}, diff --git a/Buildings/Electrical/AC/ThreePhasesUnbalanced/Loads/Impedance_N.mo b/Buildings/Electrical/AC/ThreePhasesUnbalanced/Loads/Impedance_N.mo index 346606847d8..7122464ccbb 100644 --- a/Buildings/Electrical/AC/ThreePhasesUnbalanced/Loads/Impedance_N.mo +++ b/Buildings/Electrical/AC/ThreePhasesUnbalanced/Loads/Impedance_N.mo @@ -28,7 +28,7 @@ equation rotation=180), Text( extent={{-120,-80},{120,-120}}, - lineColor={0,0,0}, + textColor={0,0,0}, textString="%name"), Line( points={{-66,50},{-26,50}}, diff --git a/Buildings/Electrical/AC/ThreePhasesUnbalanced/Loads/Inductive.mo b/Buildings/Electrical/AC/ThreePhasesUnbalanced/Loads/Inductive.mo index e09a7c6381e..87e7037856d 100644 --- a/Buildings/Electrical/AC/ThreePhasesUnbalanced/Loads/Inductive.mo +++ b/Buildings/Electrical/AC/ThreePhasesUnbalanced/Loads/Inductive.mo @@ -122,7 +122,7 @@ equation rotation=180), Text( extent={{-120,120},{120,80}}, - lineColor={0,0,0}, + textColor={0,0,0}, textString="%name"), Ellipse(extent={{-10,-10},{10,10}}, origin={0,50}, diff --git a/Buildings/Electrical/AC/ThreePhasesUnbalanced/Loads/Inductive_N.mo b/Buildings/Electrical/AC/ThreePhasesUnbalanced/Loads/Inductive_N.mo index 0d74b855164..2356ce5e883 100644 --- a/Buildings/Electrical/AC/ThreePhasesUnbalanced/Loads/Inductive_N.mo +++ b/Buildings/Electrical/AC/ThreePhasesUnbalanced/Loads/Inductive_N.mo @@ -115,7 +115,7 @@ equation rotation=180), Text( extent={{-120,120},{120,80}}, - lineColor={0,0,0}, + textColor={0,0,0}, textString="%name"), Ellipse(extent={{-10,-10},{10,10}}, origin={0,50}, diff --git a/Buildings/Electrical/AC/ThreePhasesUnbalanced/Loads/Resistive.mo b/Buildings/Electrical/AC/ThreePhasesUnbalanced/Loads/Resistive.mo index de61b661458..5e40527b7f9 100644 --- a/Buildings/Electrical/AC/ThreePhasesUnbalanced/Loads/Resistive.mo +++ b/Buildings/Electrical/AC/ThreePhasesUnbalanced/Loads/Resistive.mo @@ -29,7 +29,7 @@ equation rotation=180), Text( extent={{-120,120},{120,80}}, - lineColor={0,0,0}, + textColor={0,0,0}, textString="%name"), Line( points={{-66,50},{-26,50}}, diff --git a/Buildings/Electrical/AC/ThreePhasesUnbalanced/Loads/Resistive_N.mo b/Buildings/Electrical/AC/ThreePhasesUnbalanced/Loads/Resistive_N.mo index 6b3609b2bae..6e4c2e16260 100644 --- a/Buildings/Electrical/AC/ThreePhasesUnbalanced/Loads/Resistive_N.mo +++ b/Buildings/Electrical/AC/ThreePhasesUnbalanced/Loads/Resistive_N.mo @@ -28,7 +28,7 @@ equation rotation=180), Text( extent={{-114,116},{126,76}}, - lineColor={0,0,0}, + textColor={0,0,0}, textString="%name"), Line( points={{-66,50},{-26,50}}, diff --git a/Buildings/Electrical/AC/ThreePhasesUnbalanced/Sensors/BaseClasses/GeneralizedProbe.mo b/Buildings/Electrical/AC/ThreePhasesUnbalanced/Sensors/BaseClasses/GeneralizedProbe.mo index 4667a715d36..07da5eecd65 100644 --- a/Buildings/Electrical/AC/ThreePhasesUnbalanced/Sensors/BaseClasses/GeneralizedProbe.mo +++ b/Buildings/Electrical/AC/ThreePhasesUnbalanced/Sensors/BaseClasses/GeneralizedProbe.mo @@ -14,13 +14,13 @@ partial model GeneralizedProbe -40},{80,-20}}))); annotation (Icon(graphics={ Text( extent={{40,60},{100,40}}, - lineColor={0,0,0}, + textColor={0,0,0}, pattern=LinePattern.Dash, fillColor={0,120,120}, fillPattern=FillPattern.Solid, textString="V"), Text( extent={{18,-40},{140,-60}}, - lineColor={0,0,0}, + textColor={0,0,0}, pattern=LinePattern.Dash, fillColor={0,120,120}, fillPattern=FillPattern.Solid, diff --git a/Buildings/Electrical/AC/ThreePhasesUnbalanced/Sensors/GeneralizedSensor.mo b/Buildings/Electrical/AC/ThreePhasesUnbalanced/Sensors/GeneralizedSensor.mo index 8e21a0c1ee4..9c081e3d6d9 100644 --- a/Buildings/Electrical/AC/ThreePhasesUnbalanced/Sensors/GeneralizedSensor.mo +++ b/Buildings/Electrical/AC/ThreePhasesUnbalanced/Sensors/GeneralizedSensor.mo @@ -64,7 +64,7 @@ equation smooth=Smooth.None), Text( extent={{-120,-42},{0,-82}}, - lineColor={0,0,0}, + textColor={0,0,0}, lineThickness=1, fillColor={255,255,255}, fillPattern=FillPattern.Solid, @@ -91,21 +91,21 @@ equation smooth=Smooth.None), Text( extent={{-60,-42},{60,-82}}, - lineColor={0,0,0}, + textColor={0,0,0}, lineThickness=1, fillColor={255,255,255}, fillPattern=FillPattern.Solid, textString="V"), Text( extent={{0,-40},{120,-80}}, - lineColor={0,0,0}, + textColor={0,0,0}, lineThickness=1, fillColor={255,255,255}, fillPattern=FillPattern.Solid, textString="I"), Text( extent={{-120,100},{120,60}}, - lineColor={0,0,0}, + textColor={0,0,0}, textString="%name")}), Documentation(info="
diff --git a/Buildings/Electrical/AC/ThreePhasesUnbalanced/Sensors/GeneralizedSensor_N.mo b/Buildings/Electrical/AC/ThreePhasesUnbalanced/Sensors/GeneralizedSensor_N.mo index 52a5b5d06f5..9f419476936 100644 --- a/Buildings/Electrical/AC/ThreePhasesUnbalanced/Sensors/GeneralizedSensor_N.mo +++ b/Buildings/Electrical/AC/ThreePhasesUnbalanced/Sensors/GeneralizedSensor_N.mo @@ -67,7 +67,7 @@ equation smooth=Smooth.None), Text( extent={{-120,-42},{0,-82}}, - lineColor={0,0,0}, + textColor={0,0,0}, lineThickness=1, fillColor={255,255,255}, fillPattern=FillPattern.Solid, @@ -94,21 +94,21 @@ equation smooth=Smooth.None), Text( extent={{-60,-42},{60,-82}}, - lineColor={0,0,0}, + textColor={0,0,0}, lineThickness=1, fillColor={255,255,255}, fillPattern=FillPattern.Solid, textString="V"), Text( extent={{0,-40},{120,-80}}, - lineColor={0,0,0}, + textColor={0,0,0}, lineThickness=1, fillColor={255,255,255}, fillPattern=FillPattern.Solid, textString="I"), Text( extent={{-120,100},{120,60}}, - lineColor={0,0,0}, + textColor={0,0,0}, textString="%name")}), Documentation(info="
diff --git a/Buildings/Electrical/AC/ThreePhasesUnbalanced/Sensors/ProbeDelta.mo b/Buildings/Electrical/AC/ThreePhasesUnbalanced/Sensors/ProbeDelta.mo index 74326357e93..d0462f3fe60 100644 --- a/Buildings/Electrical/AC/ThreePhasesUnbalanced/Sensors/ProbeDelta.mo +++ b/Buildings/Electrical/AC/ThreePhasesUnbalanced/Sensors/ProbeDelta.mo @@ -30,13 +30,13 @@ equation Icon(coordinateSystem(preserveAspectRatio=false, extent={{-100,-100}, {100,100}}), graphics={Text( extent={{40,60},{100,40}}, - lineColor={0,120,120}, + textColor={0,120,120}, pattern=LinePattern.Dash, fillColor={0,120,120}, fillPattern=FillPattern.Solid, textString="V"), Text( extent={{18,-40},{140,-60}}, - lineColor={0,120,120}, + textColor={0,120,120}, pattern=LinePattern.Dash, fillColor={0,120,120}, fillPattern=FillPattern.Solid, diff --git a/Buildings/Electrical/AC/ThreePhasesUnbalanced/Sources/BaseClasses/BaseUnbalancedPV.mo b/Buildings/Electrical/AC/ThreePhasesUnbalanced/Sources/BaseClasses/BaseUnbalancedPV.mo index 83727abff50..4555bf7c826 100644 --- a/Buildings/Electrical/AC/ThreePhasesUnbalanced/Sources/BaseClasses/BaseUnbalancedPV.mo +++ b/Buildings/Electrical/AC/ThreePhasesUnbalanced/Sources/BaseClasses/BaseUnbalancedPV.mo @@ -119,7 +119,7 @@ equation Text( extent={{-140,-100},{160,-60}}, textString="%name", - lineColor={0,0,255}), + textColor={0,0,255}), Polygon( points={{80,-52},{32,63},{-78,63},{-29,-52},{80,-52}}, smooth=Smooth.None, diff --git a/Buildings/Electrical/AC/ThreePhasesUnbalanced/Sources/BaseClasses/UnbalancedPV.mo b/Buildings/Electrical/AC/ThreePhasesUnbalanced/Sources/BaseClasses/UnbalancedPV.mo index eee915b9a6e..1a7b8545bf6 100644 --- a/Buildings/Electrical/AC/ThreePhasesUnbalanced/Sources/BaseClasses/UnbalancedPV.mo +++ b/Buildings/Electrical/AC/ThreePhasesUnbalanced/Sources/BaseClasses/UnbalancedPV.mo @@ -35,7 +35,7 @@ equation Text( extent={{-140,-100},{160,-60}}, textString="%name", - lineColor={0,0,255}), + textColor={0,0,255}), Polygon( points={{80,-52},{32,63},{-78,63},{-29,-52},{80,-52}}, smooth=Smooth.None, diff --git a/Buildings/Electrical/AC/ThreePhasesUnbalanced/Sources/BaseClasses/UnbalancedPV_N.mo b/Buildings/Electrical/AC/ThreePhasesUnbalanced/Sources/BaseClasses/UnbalancedPV_N.mo index 19ed4ff1ee6..eee29a57ac6 100644 --- a/Buildings/Electrical/AC/ThreePhasesUnbalanced/Sources/BaseClasses/UnbalancedPV_N.mo +++ b/Buildings/Electrical/AC/ThreePhasesUnbalanced/Sources/BaseClasses/UnbalancedPV_N.mo @@ -45,7 +45,7 @@ equation Text( extent={{-140,-100},{160,-60}}, textString="%name", - lineColor={0,0,255}), + textColor={0,0,255}), Polygon( points={{80,-52},{32,63},{-78,63},{-29,-52},{80,-52}}, smooth=Smooth.None, diff --git a/Buildings/Electrical/AC/ThreePhasesUnbalanced/Sources/FixedVoltage.mo b/Buildings/Electrical/AC/ThreePhasesUnbalanced/Sources/FixedVoltage.mo index 44f1d8892ce..5615e5bc1c1 100644 --- a/Buildings/Electrical/AC/ThreePhasesUnbalanced/Sources/FixedVoltage.mo +++ b/Buildings/Electrical/AC/ThreePhasesUnbalanced/Sources/FixedVoltage.mo @@ -53,11 +53,11 @@ equation smooth=Smooth.None), Text( extent={{-120,100},{120,60}}, - lineColor={0,0,0}, + textColor={0,0,0}, textString="%name"), Text( extent={{-120,-60},{120,-100}}, - lineColor={0,0,0}, + textColor={0,0,0}, textString="V = %V")}), Documentation(info="
diff --git a/Buildings/Electrical/AC/ThreePhasesUnbalanced/Sources/FixedVoltage_N.mo b/Buildings/Electrical/AC/ThreePhasesUnbalanced/Sources/FixedVoltage_N.mo index b9e0b74a014..aef5095ffaa 100644 --- a/Buildings/Electrical/AC/ThreePhasesUnbalanced/Sources/FixedVoltage_N.mo +++ b/Buildings/Electrical/AC/ThreePhasesUnbalanced/Sources/FixedVoltage_N.mo @@ -57,11 +57,11 @@ equation smooth=Smooth.None), Text( extent={{-120,100},{120,60}}, - lineColor={0,0,0}, + textColor={0,0,0}, textString="%name"), Text( extent={{-120,-60},{120,-100}}, - lineColor={0,0,0}, + textColor={0,0,0}, textString="V = %V")}), Documentation(info="
diff --git a/Buildings/Electrical/AC/ThreePhasesUnbalanced/Sources/Grid.mo b/Buildings/Electrical/AC/ThreePhasesUnbalanced/Sources/Grid.mo index 76f1151ff94..d9cf3ba31a7 100644 --- a/Buildings/Electrical/AC/ThreePhasesUnbalanced/Sources/Grid.mo +++ b/Buildings/Electrical/AC/ThreePhasesUnbalanced/Sources/Grid.mo @@ -74,7 +74,7 @@ Revised documentation. fillPattern=FillPattern.Solid), Text( extent={{-120,130},{120,100}}, - lineColor={0,120,120}, + textColor={0,120,120}, textString="%name"), Line( points={{-60,-32},{-60,-72}}, diff --git a/Buildings/Electrical/AC/ThreePhasesUnbalanced/Sources/Grid_N.mo b/Buildings/Electrical/AC/ThreePhasesUnbalanced/Sources/Grid_N.mo index e34962d813a..1af07e83710 100644 --- a/Buildings/Electrical/AC/ThreePhasesUnbalanced/Sources/Grid_N.mo +++ b/Buildings/Electrical/AC/ThreePhasesUnbalanced/Sources/Grid_N.mo @@ -75,7 +75,7 @@ Revised documentation. fillPattern=FillPattern.Solid), Text( extent={{-120,130},{120,100}}, - lineColor={0,120,120}, + textColor={0,120,120}, textString="%name"), Line( points={{-60,-32},{-60,-72}}, diff --git a/Buildings/Electrical/DC/Conversion/DCDCConverter.mo b/Buildings/Electrical/DC/Conversion/DCDCConverter.mo index eb979be4411..4228741bfaf 100644 --- a/Buildings/Electrical/DC/Conversion/DCDCConverter.mo +++ b/Buildings/Electrical/DC/Conversion/DCDCConverter.mo @@ -68,7 +68,7 @@ equation smooth=Smooth.None), Text( extent={{30,54},{90,14}}, - lineColor={0,0,255}, + textColor={0,0,255}, textString="DC"), Line( points={{-2,100},{-2,60},{-82,60},{-2,60},{-82,-60},{-2,-60},{-2,60}, @@ -77,27 +77,27 @@ equation smooth=Smooth.None), Text( extent={{-88,54},{-28,14}}, - lineColor={85,170,255}, + textColor={85,170,255}, textString="DC"), Text( extent={{-100,92},{100,60}}, - lineColor={0,0,0}, + textColor={0,0,0}, textString="%name"), Text( extent={{-120,-60},{-2,-90}}, - lineColor={0,0,0}, + textColor={0,0,0}, textString="%VHigh"), Text( extent={{-100,-100},{100,-132}}, - lineColor={0,0,255}, + textColor={0,0,255}, textString="%eta"), Text( extent={{-132,80},{-72,40}}, - lineColor={85,170,255}, + textColor={85,170,255}, textString="1"), Text( extent={{70,80},{130,40}}, - lineColor={0,0,255}, + textColor={0,0,255}, textString="2"), Line(visible = (ground_1 == true), points={{-120,-100},{-80,-100}}, @@ -133,7 +133,7 @@ equation smooth=Smooth.None), Text( extent={{2,-60},{120,-90}}, - lineColor={0,0,0}, + textColor={0,0,0}, textString="%VLow")}), Documentation(info="
diff --git a/Buildings/Electrical/DC/Lines/TwoPortRCLine.mo b/Buildings/Electrical/DC/Lines/TwoPortRCLine.mo index 46d9e1fcc22..ec3312cd903 100644 --- a/Buildings/Electrical/DC/Lines/TwoPortRCLine.mo +++ b/Buildings/Electrical/DC/Lines/TwoPortRCLine.mo @@ -41,7 +41,7 @@ equation graphics={ Text( extent={{-144,97},{156,57}}, - lineColor={0,0,0}, + textColor={0,0,0}, textString="%name"), Line(points={{-90,0},{-70,0}}, color={0,0,255}), Line(points={{70,0},{90,0}}, color={0,0,255}), diff --git a/Buildings/Electrical/DC/Lines/TwoPortResistance.mo b/Buildings/Electrical/DC/Lines/TwoPortResistance.mo index 8013ce2ed92..04b88b30f5e 100644 --- a/Buildings/Electrical/DC/Lines/TwoPortResistance.mo +++ b/Buildings/Electrical/DC/Lines/TwoPortResistance.mo @@ -23,11 +23,11 @@ equation graphics={ Text( extent={{-144,97},{156,57}}, - lineColor={0,0,0}, + textColor={0,0,0}, textString="%name"), Text( extent={{-142,-30},{144,-62}}, - lineColor={0,0,0}, + textColor={0,0,0}, textString="R=%R"), Line(points={{-90,0},{-70,0}}, color={0,0,255}), Line(points={{70,0},{90,0}}, color={0,0,255}), diff --git a/Buildings/Electrical/DC/Loads/Conductor.mo b/Buildings/Electrical/DC/Loads/Conductor.mo index f7f1670490e..51e4c697d92 100644 --- a/Buildings/Electrical/DC/Loads/Conductor.mo +++ b/Buildings/Electrical/DC/Loads/Conductor.mo @@ -168,11 +168,11 @@ Added and revised documentation. Line(points={{-90,0},{-70,0}}, color={0,0,255}), Text( extent={{-152,87},{148,47}}, - lineColor={0,0,0}, + textColor={0,0,0}, textString="%name"), Text( extent={{-144,-38},{142,-70}}, - lineColor={0,0,0}, + textColor={0,0,0}, textString="G=%G")}), Diagram(coordinateSystem( preserveAspectRatio=false, diff --git a/Buildings/Electrical/DC/Loads/Resistor.mo b/Buildings/Electrical/DC/Loads/Resistor.mo index 606e6374760..af4eda9a58c 100644 --- a/Buildings/Electrical/DC/Loads/Resistor.mo +++ b/Buildings/Electrical/DC/Loads/Resistor.mo @@ -76,7 +76,7 @@ Revised model and documentation. Line(points={{-90,0},{-70,0}}, color={0,0,255}), Text( extent={{-144,-40},{142,-72}}, - lineColor={0,0,0}, + textColor={0,0,0}, textString="R=%R"), Line( visible=useHeatPort, @@ -86,7 +86,7 @@ Revised model and documentation. pattern=LinePattern.Dot), Text( extent={{-152,87},{148,47}}, - lineColor={0,0,0}, + textColor={0,0,0}, textString="%name")}), Diagram(coordinateSystem( preserveAspectRatio=true, diff --git a/Buildings/Electrical/DC/Sensors/GeneralizedSensor.mo b/Buildings/Electrical/DC/Sensors/GeneralizedSensor.mo index 3b1d7c737dc..14bffe3325a 100644 --- a/Buildings/Electrical/DC/Sensors/GeneralizedSensor.mo +++ b/Buildings/Electrical/DC/Sensors/GeneralizedSensor.mo @@ -77,7 +77,7 @@ First implementation. Icon(graphics={ Text( extent={{-120,-42},{0,-82}}, - lineColor={0,0,0}, + textColor={0,0,0}, lineThickness=1, fillColor={255,255,255}, fillPattern=FillPattern.Solid, diff --git a/Buildings/Electrical/DC/Sources/BaseClasses/WindCorrection.mo b/Buildings/Electrical/DC/Sources/BaseClasses/WindCorrection.mo index dd90b5539c1..b3575d90cd4 100644 --- a/Buildings/Electrical/DC/Sources/BaseClasses/WindCorrection.mo +++ b/Buildings/Electrical/DC/Sources/BaseClasses/WindCorrection.mo @@ -20,7 +20,7 @@ equation graphics={ Text( extent={{-92,48},{-32,-50}}, - lineColor={0,128,255}, + textColor={0,128,255}, fillColor={85,170,255}, fillPattern=FillPattern.Solid, textString="vRef"), @@ -31,7 +31,7 @@ equation fillPattern=FillPattern.Solid), Text( extent={{30,50},{90,-48}}, - lineColor={0,128,0}, + textColor={0,128,0}, fillColor={85,170,255}, fillPattern=FillPattern.Solid, textString="vLoc")}),Documentation(info=" diff --git a/Buildings/Electrical/DC/Sources/ConstantVoltage.mo b/Buildings/Electrical/DC/Sources/ConstantVoltage.mo index 6946db4921c..85babb8c778 100644 --- a/Buildings/Electrical/DC/Sources/ConstantVoltage.mo +++ b/Buildings/Electrical/DC/Sources/ConstantVoltage.mo @@ -29,15 +29,15 @@ equation rotation=90), Text( extent={{50,70},{150,20}}, - lineColor={0,0,0}, + textColor={0,0,0}, textString="+"), Text( extent={{50,-12},{150,-62}}, - lineColor={0,0,0}, + textColor={0,0,0}, textString="-"), Text( extent={{-150,60},{150,100}}, - lineColor={0,0,0}, + textColor={0,0,0}, textString="V=%V")}), Documentation(info="
This model represents a simple DC voltage source with constant voltage. diff --git a/Buildings/Electrical/DC/Sources/PVSimple.mo b/Buildings/Electrical/DC/Sources/PVSimple.mo index 53a1e998211..d44b5d31556 100644 --- a/Buildings/Electrical/DC/Sources/PVSimple.mo +++ b/Buildings/Electrical/DC/Sources/PVSimple.mo @@ -29,11 +29,11 @@ equation Line(points={{-90,0},{-59,0}}, color={0,0,0}), Text( extent={{-150,61},{-50,11}}, - lineColor={0,0,0}, + textColor={0,0,0}, textString="+"), Text( extent={{-150,-12},{-50,-62}}, - lineColor={0,0,0}, + textColor={0,0,0}, textString="-")}), Documentation(revisions="
This model represents a simple DC voltage source with variable voltage. diff --git a/Buildings/Electrical/DC/Sources/WindTurbine.mo b/Buildings/Electrical/DC/Sources/WindTurbine.mo index 05750d11a74..c3b3d909a4f 100644 --- a/Buildings/Electrical/DC/Sources/WindTurbine.mo +++ b/Buildings/Electrical/DC/Sources/WindTurbine.mo @@ -24,11 +24,11 @@ equation graphics={ Text( extent={{-150,70},{-50,20}}, - lineColor={0,0,0}, + textColor={0,0,0}, textString="+"), Text( extent={{-150,-12},{-50,-62}}, - lineColor={0,0,0}, + textColor={0,0,0}, textString="-")}), Documentation(info="
diff --git a/Buildings/Electrical/DC/Storage/Battery.mo b/Buildings/Electrical/DC/Storage/Battery.mo index 3f08abb79b7..89d4067f1da 100644 --- a/Buildings/Electrical/DC/Storage/Battery.mo +++ b/Buildings/Electrical/DC/Storage/Battery.mo @@ -98,7 +98,7 @@ equation lineColor={0,0,0}), Text( extent={{-50,68},{-20,100}}, - lineColor={0,0,0}, + textColor={0,0,0}, fillColor={215,215,215}, fillPattern=FillPattern.Solid, textString="P"), @@ -108,21 +108,21 @@ equation smooth=Smooth.None), Text( extent={{-150,70},{-50,20}}, - lineColor={0,0,0}, + textColor={0,0,0}, textString="+"), Text( extent={{-150,-12},{-50,-62}}, - lineColor={0,0,0}, + textColor={0,0,0}, textString="-"), Text( extent={{44,70},{100,116}}, - lineColor={0,0,0}, + textColor={0,0,0}, fillColor={215,215,215}, fillPattern=FillPattern.Solid, textString="SOC"), Text( extent={{44,154},{134,112}}, - lineColor={0,0,255}, + textColor={0,0,255}, textString="%name")}), Documentation(info="
diff --git a/Buildings/Electrical/Icons/GeneralizedProbe.mo b/Buildings/Electrical/Icons/GeneralizedProbe.mo index ac31dc409e2..3cb384c7da1 100644 --- a/Buildings/Electrical/Icons/GeneralizedProbe.mo +++ b/Buildings/Electrical/Icons/GeneralizedProbe.mo @@ -33,7 +33,7 @@ partial class GeneralizedProbe fillPattern=FillPattern.Solid), Text( extent={{-140,110},{140,70}}, - lineColor={0,0,0}, + textColor={0,0,0}, textString="%name")}), Documentation(info="
This is the icon for a probe that measure voltage magnitude and phase. diff --git a/Buildings/Electrical/Icons/GeneralizedSensor.mo b/Buildings/Electrical/Icons/GeneralizedSensor.mo index 134d80589b7..897d3fed436 100644 --- a/Buildings/Electrical/Icons/GeneralizedSensor.mo +++ b/Buildings/Electrical/Icons/GeneralizedSensor.mo @@ -39,20 +39,20 @@ partial class GeneralizedSensor smooth=Smooth.None), Text( extent={{-60,-42},{60,-82}}, - lineColor={0,0,0}, + textColor={0,0,0}, lineThickness=1, fillColor={255,255,255}, fillPattern=FillPattern.Solid, textString="V"), Text( extent={{0,-40},{120,-80}}, - lineColor={0,0,0}, + textColor={0,0,0}, lineThickness=1, fillColor={255,255,255}, fillPattern=FillPattern.Solid, textString="I"), Text( extent={{-140,110},{140,70}}, - lineColor={0,0,0}, + textColor={0,0,0}, textString="%name")}), Documentation(info="
This is the icon for ideal sensors that measure power, voltage and current. diff --git a/Buildings/Electrical/Interfaces/PartialPV.mo b/Buildings/Electrical/Interfaces/PartialPV.mo index 95e653bf5b1..13bc825e148 100644 --- a/Buildings/Electrical/Interfaces/PartialPV.mo +++ b/Buildings/Electrical/Interfaces/PartialPV.mo @@ -37,7 +37,7 @@ equation Line(points={{-90,0},{-59,0}}, color={0,0,0}), Text( extent={{-150,-104},{150,-64}}, - lineColor={0,0,0}, + textColor={0,0,0}, textString="%name"), Polygon( points={{-80,-52},{-32,63},{78,63},{29,-52},{-80,-52}}, @@ -54,7 +54,7 @@ equation pattern=LinePattern.None), Text( extent={{-5,100},{98,136}}, - lineColor={0,0,127}, + textColor={0,0,127}, textString="G"), Polygon( points={{-53,-9},{-41,17},{-18,17},{-29,-9},{-53,-9}}, @@ -106,7 +106,7 @@ equation pattern=LinePattern.None), Text( extent={{102,107},{124,81}}, - lineColor={0,0,127}, + textColor={0,0,127}, textString="P")}), Documentation(revisions="
diff --git a/Buildings/Electrical/Transmission/BaseClasses/PartialBaseLine.mo b/Buildings/Electrical/Transmission/BaseClasses/PartialBaseLine.mo index 48934c8d48c..c47d18eb3e5 100644 --- a/Buildings/Electrical/Transmission/BaseClasses/PartialBaseLine.mo +++ b/Buildings/Electrical/Transmission/BaseClasses/PartialBaseLine.mo @@ -73,7 +73,7 @@ equation preserveAspectRatio=false, extent={{-100,-100},{100,100}}), graphics={ Text( extent={{-150,-19},{150,-59}}, - lineColor={0,0,0}, + textColor={0,0,0}, textString="%name")}), Documentation(info="
diff --git a/Buildings/Electrical/Transmission/BaseClasses/PartialLine.mo b/Buildings/Electrical/Transmission/BaseClasses/PartialLine.mo index 9e97eefaefb..7b4d5f47efc 100644 --- a/Buildings/Electrical/Transmission/BaseClasses/PartialLine.mo +++ b/Buildings/Electrical/Transmission/BaseClasses/PartialLine.mo @@ -18,7 +18,7 @@ protected preserveAspectRatio=false, extent={{-100,-100},{100,100}}), graphics={ Text( extent={{-150,-19},{150,-59}}, - lineColor={0,0,0}, + textColor={0,0,0}, textString="%name")}), Documentation(revisions="
diff --git a/Buildings/Examples/DualFanDualDuct/Controls/CoolingCoilTemperatureSetpoint.mo b/Buildings/Examples/DualFanDualDuct/Controls/CoolingCoilTemperatureSetpoint.mo index b040f93dd34..3a989692db7 100644 --- a/Buildings/Examples/DualFanDualDuct/Controls/CoolingCoilTemperatureSetpoint.mo +++ b/Buildings/Examples/DualFanDualDuct/Controls/CoolingCoilTemperatureSetpoint.mo @@ -34,10 +34,10 @@ equation annotation ( Icon(graphics={ Text( extent={{44,16},{90,-18}}, - lineColor={0,0,255}, + textColor={0,0,255}, textString="TSetCoo"), Text( extent={{-88,22},{-20,-26}}, - lineColor={0,0,255}, + textColor={0,0,255}, textString="TSetHea")})); end CoolingCoilTemperatureSetpoint; diff --git a/Buildings/Examples/DualFanDualDuct/Controls/FanVFD.mo b/Buildings/Examples/DualFanDualDuct/Controls/FanVFD.mo index 8ac09cb2807..bcc5c6b0888 100644 --- a/Buildings/Examples/DualFanDualDuct/Controls/FanVFD.mo +++ b/Buildings/Examples/DualFanDualDuct/Controls/FanVFD.mo @@ -96,6 +96,6 @@ equation smooth=Smooth.None)); annotation ( Icon(graphics={Text( extent={{-90,-50},{96,-96}}, - lineColor={0,0,255}, + textColor={0,0,255}, textString="r_N_min=%r_N_min")})); end FanVFD; diff --git a/Buildings/Examples/DualFanDualDuct/Controls/RoomMixingBox.mo b/Buildings/Examples/DualFanDualDuct/Controls/RoomMixingBox.mo index 41cba4462ab..d2063777773 100644 --- a/Buildings/Examples/DualFanDualDuct/Controls/RoomMixingBox.mo +++ b/Buildings/Examples/DualFanDualDuct/Controls/RoomMixingBox.mo @@ -164,31 +164,31 @@ equation annotation ( Icon(graphics={ Text( extent={{-86,92},{-38,68}}, - lineColor={0,0,127}, + textColor={0,0,127}, textString="TRoo"), Text( extent={{-88,-28},{-40,-52}}, - lineColor={0,0,127}, + textColor={0,0,127}, textString="m_flow"), Text( extent={{42,52},{90,28}}, - lineColor={0,0,127}, + textColor={0,0,127}, textString="yHea"), Text( extent={{46,-36},{94,-60}}, - lineColor={0,0,127}, + textColor={0,0,127}, textString="yCoo"), Text( extent={{-84,52},{-36,28}}, - lineColor={0,0,127}, + textColor={0,0,127}, textString="TSetH"), Text( extent={{-84,10},{-36,-14}}, - lineColor={0,0,127}, + textColor={0,0,127}, textString="TSetC"), Text( extent={{-86,-64},{-38,-88}}, - lineColor={0,0,127}, + textColor={0,0,127}, textString="yFan")}), Documentation(info=" This controller outputs the control signal for the air damper for the hot deck and the cold deck. diff --git a/Buildings/Examples/DualFanDualDuct/ThermalZones/SupplyBranch.mo b/Buildings/Examples/DualFanDualDuct/ThermalZones/SupplyBranch.mo index bd239b2eb9a..8c4aca01e7f 100644 --- a/Buildings/Examples/DualFanDualDuct/ThermalZones/SupplyBranch.mo +++ b/Buildings/Examples/DualFanDualDuct/ThermalZones/SupplyBranch.mo @@ -220,7 +220,7 @@ equation rotation=90), Text( extent={{-78,198},{24,156}}, - lineColor={0,0,255}, + textColor={0,0,255}, textString="%name"), Rectangle( extent={{-85.6,-32.2572},{74.4,-40.2572}}, diff --git a/Buildings/Examples/HydronicHeating/TwoRoomsWithStorage.mo b/Buildings/Examples/HydronicHeating/TwoRoomsWithStorage.mo index 776d2b76bb8..e170e1ac7d1 100644 --- a/Buildings/Examples/HydronicHeating/TwoRoomsWithStorage.mo +++ b/Buildings/Examples/HydronicHeating/TwoRoomsWithStorage.mo @@ -527,27 +527,27 @@ model TwoRoomsWithStorage {100,100}}), graphics={ Text( extent={{-94,38},{-64,80}}, - lineColor={0,0,255}, + textColor={0,0,255}, textString="TRoo"), Text( extent={{-94,-82},{-64,-40}}, - lineColor={0,0,255}, + textColor={0,0,255}, textString="TOut"), Text( extent={{66,42},{86,74}}, - lineColor={0,0,255}, + textColor={0,0,255}, textString="yC"), Text( extent={{-32,100},{24,124}}, - lineColor={0,0,255}, + textColor={0,0,255}, textString="%name"), Text( extent={{66,-16},{86,16}}, - lineColor={0,0,255}, + textColor={0,0,255}, textString="yF"), Text( extent={{68,-74},{88,-42}}, - lineColor={0,0,255}, + textColor={0,0,255}, textString="yHex")}),Documentation(info="
This block computes a control signal for free cooling and for mechanical cooling. diff --git a/Buildings/Examples/ScalableBenchmarks/BuildingVAV/BaseClasses/FanOnOffWithDP.mo b/Buildings/Examples/ScalableBenchmarks/BuildingVAV/BaseClasses/FanOnOffWithDP.mo index 6f07eced8af..cca95ffc0ec 100644 --- a/Buildings/Examples/ScalableBenchmarks/BuildingVAV/BaseClasses/FanOnOffWithDP.mo +++ b/Buildings/Examples/ScalableBenchmarks/BuildingVAV/BaseClasses/FanOnOffWithDP.mo @@ -52,12 +52,12 @@ equation fillPattern=FillPattern.Solid), Text( extent={{-90,-50},{96,-96}}, - lineColor={0,0,255}, + textColor={0,0,255}, textString="prescribed_dP=%dP_pre"), Text( extent={{-120,140},{120,104}}, textString="%name", - lineColor={0,0,255})}), + textColor={0,0,255})}), Documentation(info="
This model outputs ON/OFF signal to control fan operation.
When the system is in mode like unoccupiedOff, safety, it outputs
diff --git a/Buildings/Examples/ScalableBenchmarks/BuildingVAV/BaseClasses/VAVBranch.mo b/Buildings/Examples/ScalableBenchmarks/BuildingVAV/BaseClasses/VAVBranch.mo
index 57cb885de50..9df35d5a478 100644
--- a/Buildings/Examples/ScalableBenchmarks/BuildingVAV/BaseClasses/VAVBranch.mo
+++ b/Buildings/Examples/ScalableBenchmarks/BuildingVAV/BaseClasses/VAVBranch.mo
@@ -233,23 +233,23 @@ annotation (Diagram(coordinateSystem(preserveAspectRatio=true, extent={{-100,
lineColor={0,0,0}),
Text(
extent={{-78,198},{24,156}},
- lineColor={0,0,255},
+ textColor={0,0,255},
textString="%name"),
Text(
extent={{126,24},{194,-20}},
- lineColor={0,0,0},
+ textColor={0,0,0},
fillColor={255,255,255},
fillPattern=FillPattern.Solid,
textString="yDam"),
Text(
extent={{144,194},{184,168}},
- lineColor={0,0,0},
+ textColor={0,0,0},
fillColor={255,255,255},
fillPattern=FillPattern.Solid,
textString="p_rel"),
Text(
extent={{144,154},{192,122}},
- lineColor={0,0,0},
+ textColor={0,0,0},
fillColor={255,255,255},
fillPattern=FillPattern.Solid,
textString="TRooAir")}),
diff --git a/Buildings/Examples/ScalableBenchmarks/BuildingVAV/ThermalZones/MultiZone.mo b/Buildings/Examples/ScalableBenchmarks/BuildingVAV/ThermalZones/MultiZone.mo
index 98b9be33a2b..1884b668c2d 100644
--- a/Buildings/Examples/ScalableBenchmarks/BuildingVAV/ThermalZones/MultiZone.mo
+++ b/Buildings/Examples/ScalableBenchmarks/BuildingVAV/ThermalZones/MultiZone.mo
@@ -124,11 +124,11 @@ annotation (Icon(graphics={
Line(points={{2,-40},{2,-26}}, color={85,170,255}),
Text(
extent={{-100,102},{100,76}},
- lineColor={0,0,255},
+ textColor={0,0,255},
textString="Multizone model with: %nZon zones in %nZon floors"),
Text(
extent={{-94,134},{106,108}},
- lineColor={0,0,255},
+ textColor={0,0,255},
textString="%name")}),
Documentation(info="
diff --git a/Buildings/Examples/ScalableBenchmarks/BuildingVAV/ThermalZones/ThermalZone.mo b/Buildings/Examples/ScalableBenchmarks/BuildingVAV/ThermalZones/ThermalZone.mo index 4a18f1873e6..14e77984255 100644 --- a/Buildings/Examples/ScalableBenchmarks/BuildingVAV/ThermalZones/ThermalZone.mo +++ b/Buildings/Examples/ScalableBenchmarks/BuildingVAV/ThermalZones/ThermalZone.mo @@ -319,19 +319,19 @@ equation rotation=90), Text( extent={{-84,8},{-64,-6}}, - lineColor={0,0,255}, + textColor={0,0,255}, textString="Wall"), Text( extent={{64,8},{84,-6}}, - lineColor={0,0,255}, + textColor={0,0,255}, textString="Wall"), Text( extent={{-8,-74},{12,-88}}, - lineColor={0,0,255}, + textColor={0,0,255}, textString="Floor"), Text( extent={{-10,88},{10,74}}, - lineColor={0,0,255}, + textColor={0,0,255}, textString="Ceiling"), Rectangle( extent={{-42,42},{42,-42}}, diff --git a/Buildings/Examples/Tutorial/CDL/Controls/BoilerReturn.mo b/Buildings/Examples/Tutorial/CDL/Controls/BoilerReturn.mo index 389c7e8b72f..ca6cef17e6c 100644 --- a/Buildings/Examples/Tutorial/CDL/Controls/BoilerReturn.mo +++ b/Buildings/Examples/Tutorial/CDL/Controls/BoilerReturn.mo @@ -48,13 +48,13 @@ equation fillPattern=FillPattern.Solid), Text( extent={{-88,22},{-40,-18}}, - lineColor={0,0,0}, + textColor={0,0,0}, fillColor={255,255,255}, fillPattern=FillPattern.None, textString="TRet"), Text( extent={{40,24},{88,-16}}, - lineColor={0,0,0}, + textColor={0,0,0}, fillColor={255,255,255}, fillPattern=FillPattern.None, textString="yVal"), @@ -66,7 +66,7 @@ equation fillPattern=FillPattern.Solid, lineColor={0,0,0}), Text( - lineColor={0,0,255}, + textColor={0,0,255}, extent={{-154,104},{146,144}}, textString="%name")}), Diagram( coordinateSystem(preserveAspectRatio=false)), diff --git a/Buildings/Examples/Tutorial/CDL/Controls/EquipmentOnOff.mo b/Buildings/Examples/Tutorial/CDL/Controls/EquipmentOnOff.mo index fa5f7523823..5433741bb94 100644 --- a/Buildings/Examples/Tutorial/CDL/Controls/EquipmentOnOff.mo +++ b/Buildings/Examples/Tutorial/CDL/Controls/EquipmentOnOff.mo @@ -48,29 +48,29 @@ equation fillPattern=FillPattern.Solid), Text( extent={{-90,82},{-42,42}}, - lineColor={0,0,0}, + textColor={0,0,0}, fillColor={255,255,255}, fillPattern=FillPattern.None, textString="TBoi"), Text( extent={{38,-38},{86,-78}}, - lineColor={0,0,0}, + textColor={0,0,0}, fillColor={255,255,255}, fillPattern=FillPattern.None, textString="onPum"), Text( extent={{-92,-40},{-44,-80}}, - lineColor={0,0,0}, + textColor={0,0,0}, fillColor={255,255,255}, fillPattern=FillPattern.None, textString="onSys"), Text( - lineColor={0,0,255}, + textColor={0,0,255}, extent={{-148,104},{152,144}}, textString="%name"), Text( extent={{44,82},{92,42}}, - lineColor={0,0,0}, + textColor={0,0,0}, fillColor={255,255,255}, fillPattern=FillPattern.None, textString="onBoi")}), diff --git a/Buildings/Examples/Tutorial/CDL/Controls/OpenLoopBoilerReturn.mo b/Buildings/Examples/Tutorial/CDL/Controls/OpenLoopBoilerReturn.mo index 89580bbde93..c07590bd991 100644 --- a/Buildings/Examples/Tutorial/CDL/Controls/OpenLoopBoilerReturn.mo +++ b/Buildings/Examples/Tutorial/CDL/Controls/OpenLoopBoilerReturn.mo @@ -31,13 +31,13 @@ equation fillPattern=FillPattern.Solid), Text( extent={{-88,22},{-40,-18}}, - lineColor={0,0,0}, + textColor={0,0,0}, fillColor={255,255,255}, fillPattern=FillPattern.None, textString="TRet"), Text( extent={{40,24},{88,-16}}, - lineColor={0,0,0}, + textColor={0,0,0}, fillColor={255,255,255}, fillPattern=FillPattern.None, textString="yVal"), @@ -49,7 +49,7 @@ equation fillPattern=FillPattern.Solid, lineColor={0,0,0}), Text( - lineColor={0,0,255}, + textColor={0,0,255}, extent={{-154,104},{146,144}}, textString="%name")}), Diagram( coordinateSystem(preserveAspectRatio=false)), diff --git a/Buildings/Examples/Tutorial/CDL/Controls/OpenLoopEquipmentOnOff.mo b/Buildings/Examples/Tutorial/CDL/Controls/OpenLoopEquipmentOnOff.mo index ca7b952d972..682e8f15a73 100644 --- a/Buildings/Examples/Tutorial/CDL/Controls/OpenLoopEquipmentOnOff.mo +++ b/Buildings/Examples/Tutorial/CDL/Controls/OpenLoopEquipmentOnOff.mo @@ -33,30 +33,30 @@ equation fillColor={215,215,215}, fillPattern=FillPattern.Solid), Text( - lineColor={0,0,255}, + textColor={0,0,255}, extent={{-148,104},{152,144}}, textString="%name"), Text( extent={{-94,-40},{-46,-80}}, - lineColor={0,0,0}, + textColor={0,0,0}, fillColor={255,255,255}, fillPattern=FillPattern.None, textString="onSys"), Text( extent={{36,-38},{84,-78}}, - lineColor={0,0,0}, + textColor={0,0,0}, fillColor={255,255,255}, fillPattern=FillPattern.None, textString="onPum"), Text( extent={{42,82},{90,42}}, - lineColor={0,0,0}, + textColor={0,0,0}, fillColor={255,255,255}, fillPattern=FillPattern.None, textString="onBoi"), Text( extent={{-92,82},{-44,42}}, - lineColor={0,0,0}, + textColor={0,0,0}, fillColor={255,255,255}, fillPattern=FillPattern.None, textString="TBoi")}), diff --git a/Buildings/Examples/Tutorial/CDL/Controls/OpenLoopRadiatorSupply.mo b/Buildings/Examples/Tutorial/CDL/Controls/OpenLoopRadiatorSupply.mo index 99e0e1bc14f..95f7c064f84 100644 --- a/Buildings/Examples/Tutorial/CDL/Controls/OpenLoopRadiatorSupply.mo +++ b/Buildings/Examples/Tutorial/CDL/Controls/OpenLoopRadiatorSupply.mo @@ -33,24 +33,24 @@ equation fillPattern=FillPattern.Solid), Text( extent={{-90,82},{-42,42}}, - lineColor={0,0,0}, + textColor={0,0,0}, fillColor={255,255,255}, fillPattern=FillPattern.None, textString="TRoo"), Text( extent={{40,24},{88,-16}}, - lineColor={0,0,0}, + textColor={0,0,0}, fillColor={255,255,255}, fillPattern=FillPattern.None, textString="yVal"), Text( extent={{-92,-40},{-44,-80}}, - lineColor={0,0,0}, + textColor={0,0,0}, fillColor={255,255,255}, fillPattern=FillPattern.None, textString="TOut"), Text( - lineColor={0,0,255}, + textColor={0,0,255}, extent={{-154,104},{146,144}}, textString="%name"), Polygon( diff --git a/Buildings/Examples/Tutorial/CDL/Controls/OpenLoopSystemOnOff.mo b/Buildings/Examples/Tutorial/CDL/Controls/OpenLoopSystemOnOff.mo index eaa0e011325..f57ff667c19 100644 --- a/Buildings/Examples/Tutorial/CDL/Controls/OpenLoopSystemOnOff.mo +++ b/Buildings/Examples/Tutorial/CDL/Controls/OpenLoopSystemOnOff.mo @@ -30,24 +30,24 @@ equation fillPattern=FillPattern.Solid), Text( extent={{-90,82},{-42,42}}, - lineColor={0,0,0}, + textColor={0,0,0}, fillColor={255,255,255}, fillPattern=FillPattern.None, textString="TOut"), Text( extent={{40,24},{88,-16}}, - lineColor={0,0,0}, + textColor={0,0,0}, fillColor={255,255,255}, fillPattern=FillPattern.None, textString="onSys"), Text( extent={{-92,-40},{-44,-80}}, - lineColor={0,0,0}, + textColor={0,0,0}, fillColor={255,255,255}, fillPattern=FillPattern.None, textString="TRoo"), Text( - lineColor={0,0,255}, + textColor={0,0,255}, extent={{-152,104},{148,144}}, textString="%name")}), Diagram( diff --git a/Buildings/Examples/Tutorial/CDL/Controls/RadiatorSupply.mo b/Buildings/Examples/Tutorial/CDL/Controls/RadiatorSupply.mo index dbc98a5580c..410db19f735 100644 --- a/Buildings/Examples/Tutorial/CDL/Controls/RadiatorSupply.mo +++ b/Buildings/Examples/Tutorial/CDL/Controls/RadiatorSupply.mo @@ -83,24 +83,24 @@ equation fillPattern=FillPattern.Solid), Text( extent={{-90,82},{-42,42}}, - lineColor={0,0,0}, + textColor={0,0,0}, fillColor={255,255,255}, fillPattern=FillPattern.None, textString="TRoo"), Text( extent={{40,24},{88,-16}}, - lineColor={0,0,0}, + textColor={0,0,0}, fillColor={255,255,255}, fillPattern=FillPattern.None, textString="yVal"), Text( extent={{-92,-40},{-44,-80}}, - lineColor={0,0,0}, + textColor={0,0,0}, fillColor={255,255,255}, fillPattern=FillPattern.None, textString="TSup"), Text( - lineColor={0,0,255}, + textColor={0,0,255}, extent={{-154,104},{146,144}}, textString="%name"), Polygon( diff --git a/Buildings/Examples/Tutorial/CDL/Controls/SystemOnOff.mo b/Buildings/Examples/Tutorial/CDL/Controls/SystemOnOff.mo index 6f683704f5c..61d9292e8d5 100644 --- a/Buildings/Examples/Tutorial/CDL/Controls/SystemOnOff.mo +++ b/Buildings/Examples/Tutorial/CDL/Controls/SystemOnOff.mo @@ -67,24 +67,24 @@ equation fillPattern=FillPattern.Solid), Text( extent={{-90,82},{-42,42}}, - lineColor={0,0,0}, + textColor={0,0,0}, fillColor={255,255,255}, fillPattern=FillPattern.None, textString="TOut"), Text( extent={{40,24},{88,-16}}, - lineColor={0,0,0}, + textColor={0,0,0}, fillColor={255,255,255}, fillPattern=FillPattern.None, textString="onSys"), Text( extent={{-92,-40},{-44,-80}}, - lineColor={0,0,0}, + textColor={0,0,0}, fillColor={255,255,255}, fillPattern=FillPattern.None, textString="TRoo"), Text( - lineColor={0,0,255}, + textColor={0,0,255}, extent={{-152,104},{148,144}}, textString="%name")}), Diagram( diff --git a/Buildings/Examples/VAVCO2/BaseClasses/RoomLeakage.mo b/Buildings/Examples/VAVCO2/BaseClasses/RoomLeakage.mo index ad98a658b32..ba5643fcf55 100644 --- a/Buildings/Examples/VAVCO2/BaseClasses/RoomLeakage.mo +++ b/Buildings/Examples/VAVCO2/BaseClasses/RoomLeakage.mo @@ -57,7 +57,7 @@ equation Line(points={{80,0},{90,0}}, color={0,0,255}), Text( extent={{-136,54},{-104,14}}, - lineColor={0,0,255}, + textColor={0,0,255}, textString="P")}), Documentation(info="
diff --git a/Buildings/Examples/VAVReheat/BaseClasses/MixingBox.mo b/Buildings/Examples/VAVReheat/BaseClasses/MixingBox.mo index f465e68ef8b..ebcc667f5e8 100644 --- a/Buildings/Examples/VAVReheat/BaseClasses/MixingBox.mo +++ b/Buildings/Examples/VAVReheat/BaseClasses/MixingBox.mo @@ -314,7 +314,7 @@ equation points={{0,100},{0,60},{-54,60},{-54,24}}, color={0,0,255}), Text( extent={{-50,-84},{48,-132}}, - lineColor={0,0,255}, + textColor={0,0,255}, textString= "%name"), Line( diff --git a/Buildings/Examples/VAVReheat/Controls/CoolingCoilTemperatureSetpoint.mo b/Buildings/Examples/VAVReheat/Controls/CoolingCoilTemperatureSetpoint.mo index 82a30d7900f..04c0432028b 100644 --- a/Buildings/Examples/VAVReheat/Controls/CoolingCoilTemperatureSetpoint.mo +++ b/Buildings/Examples/VAVReheat/Controls/CoolingCoilTemperatureSetpoint.mo @@ -63,10 +63,10 @@ equation annotation ( Icon(graphics={ Text( extent={{44,16},{90,-18}}, - lineColor={0,0,255}, + textColor={0,0,255}, textString="TSetCoo"), Text( extent={{-88,22},{-20,-26}}, - lineColor={0,0,255}, + textColor={0,0,255}, textString="TSetHea")})); end CoolingCoilTemperatureSetpoint; diff --git a/Buildings/Examples/VAVReheat/Controls/DuctStaticPressureSetpoint.mo b/Buildings/Examples/VAVReheat/Controls/DuctStaticPressureSetpoint.mo index 537d450ccdf..2560ec31d4a 100644 --- a/Buildings/Examples/VAVReheat/Controls/DuctStaticPressureSetpoint.mo +++ b/Buildings/Examples/VAVReheat/Controls/DuctStaticPressureSetpoint.mo @@ -109,13 +109,13 @@ equation Text( extent={{-76,148},{50,-26}}, textString="PSet", - lineColor={0,0,127}), + textColor={0,0,127}), Text( extent={{-10,8},{44,-82}}, - lineColor={0,0,127}, + textColor={0,0,127}, textString="%pMax"), Text( extent={{-16,-54},{48,-90}}, - lineColor={0,0,127}, + textColor={0,0,127}, textString="%pMin")})); end DuctStaticPressureSetpoint; diff --git a/Buildings/Examples/VAVReheat/Controls/Economizer.mo b/Buildings/Examples/VAVReheat/Controls/Economizer.mo index 95253571a47..86bdcfa9463 100644 --- a/Buildings/Examples/VAVReheat/Controls/Economizer.mo +++ b/Buildings/Examples/VAVReheat/Controls/Economizer.mo @@ -203,31 +203,31 @@ equation fillPattern=FillPattern.Solid), Text( extent={{-90,170},{-50,150}}, - lineColor={0,0,255}, + textColor={0,0,255}, textString="TRet"), Text( extent={{-86,104},{-46,84}}, - lineColor={0,0,255}, + textColor={0,0,255}, textString="TMix"), Text( extent={{-90,60},{-22,12}}, - lineColor={0,0,255}, + textColor={0,0,255}, textString="VOut_flow"), Text( extent={{-90,-2},{-28,-40}}, - lineColor={0,0,255}, + textColor={0,0,255}, textString="TSupHeaSet"), Text( extent={{-86,-58},{-24,-96}}, - lineColor={0,0,255}, + textColor={0,0,255}, textString="TSupCooSet"), Text( extent={{138,96},{184,62}}, - lineColor={0,0,255}, + textColor={0,0,255}, textString="yOA"), Text( extent={{140,20},{186,-14}}, - lineColor={0,0,255}, + textColor={0,0,255}, textString="yRet")}), Documentation(info="
diff --git a/Buildings/Examples/VAVReheat/Controls/EconomizerTemperatureControl.mo b/Buildings/Examples/VAVReheat/Controls/EconomizerTemperatureControl.mo index 0d7ce577e1e..dfad65e805d 100644 --- a/Buildings/Examples/VAVReheat/Controls/EconomizerTemperatureControl.mo +++ b/Buildings/Examples/VAVReheat/Controls/EconomizerTemperatureControl.mo @@ -80,23 +80,23 @@ equation preserveAspectRatio=true, extent={{-100,-100},{100,100}}), graphics={ Text( extent={{-92,78},{-66,50}}, - lineColor={0,0,127}, + textColor={0,0,127}, textString="TRet"), Text( extent={{-88,34},{-62,6}}, - lineColor={0,0,127}, + textColor={0,0,127}, textString="TOut"), Text( extent={{-86,-6},{-60,-34}}, - lineColor={0,0,127}, + textColor={0,0,127}, textString="TMix"), Text( extent={{-84,-46},{-58,-74}}, - lineColor={0,0,127}, + textColor={0,0,127}, textString="TMixSet"), Text( extent={{64,14},{90,-14}}, - lineColor={0,0,127}, + textColor={0,0,127}, textString="yOA")}), Documentation(info="
This controller outputs the control signal for the outside diff --git a/Buildings/Examples/VAVReheat/Controls/FanVFD.mo b/Buildings/Examples/VAVReheat/Controls/FanVFD.mo index ddda1f9dbea..8d84bac07ee 100644 --- a/Buildings/Examples/VAVReheat/Controls/FanVFD.mo +++ b/Buildings/Examples/VAVReheat/Controls/FanVFD.mo @@ -73,7 +73,7 @@ equation connect(swi.y, y) annotation (Line(points={{61,0},{110,0}}, color={0,0,127})); annotation ( Icon(graphics={Text( extent={{-90,-50},{96,-96}}, - lineColor={0,0,255}, + textColor={0,0,255}, textString="r_N_min=%r_N_min")}), Documentation(revisions="
diff --git a/Buildings/Examples/VAVReheat/Controls/State.mo b/Buildings/Examples/VAVReheat/Controls/State.mo index 316015cc68f..857bd741cbf 100644 --- a/Buildings/Examples/VAVReheat/Controls/State.mo +++ b/Buildings/Examples/VAVReheat/Controls/State.mo @@ -9,6 +9,6 @@ equation y = if localActive then Integer(mode) else 0; annotation (Icon(graphics={Text( extent={{-82,96},{82,-84}}, - lineColor={0,0,255}, + textColor={0,0,255}, textString="state")})); end State; diff --git a/Buildings/Examples/VAVReheat/ThermalZones/Floor.mo b/Buildings/Examples/VAVReheat/ThermalZones/Floor.mo index b34cab4ab94..a7c0ec9f680 100644 --- a/Buildings/Examples/VAVReheat/ThermalZones/Floor.mo +++ b/Buildings/Examples/VAVReheat/ThermalZones/Floor.mo @@ -829,7 +829,7 @@ equation fillPattern=FillPattern.Solid), Text( extent={{-84,234},{-62,200}}, - lineColor={0,0,255}, + textColor={0,0,255}, textString="dP")}), Documentation(revisions="
diff --git a/Buildings/Experimental/DistrictHeatingCooling/SubStations/BaseClasses/HeatingOrCooling.mo b/Buildings/Experimental/DistrictHeatingCooling/SubStations/BaseClasses/HeatingOrCooling.mo index 653616654c8..80c9f779598 100644 --- a/Buildings/Experimental/DistrictHeatingCooling/SubStations/BaseClasses/HeatingOrCooling.mo +++ b/Buildings/Experimental/DistrictHeatingCooling/SubStations/BaseClasses/HeatingOrCooling.mo @@ -116,7 +116,7 @@ equation fillPattern=FillPattern.Solid), Text( extent={{52,70},{96,50}}, - lineColor={0,0,127}, + textColor={0,0,127}, textString="PPum")}), Documentation(info="
diff --git a/Buildings/Experimental/DistrictHeatingCooling/SubStations/Cooling.mo b/Buildings/Experimental/DistrictHeatingCooling/SubStations/Cooling.mo index 561f4476eac..0140104be35 100644 --- a/Buildings/Experimental/DistrictHeatingCooling/SubStations/Cooling.mo +++ b/Buildings/Experimental/DistrictHeatingCooling/SubStations/Cooling.mo @@ -54,7 +54,7 @@ equation fillPattern=FillPattern.Solid), Text( extent={{-106,70},{-62,50}}, - lineColor={0,0,127}, + textColor={0,0,127}, textString="Q")}), Documentation(info="
diff --git a/Buildings/Experimental/DistrictHeatingCooling/SubStations/Heating.mo b/Buildings/Experimental/DistrictHeatingCooling/SubStations/Heating.mo index 6ae61415164..cef731d8c38 100644 --- a/Buildings/Experimental/DistrictHeatingCooling/SubStations/Heating.mo +++ b/Buildings/Experimental/DistrictHeatingCooling/SubStations/Heating.mo @@ -44,6 +44,6 @@ First implementation. "), Icon(graphics={Text( extent={{-106,70},{-62,50}}, - lineColor={0,0,127}, + textColor={0,0,127}, textString="Q")})); end Heating; diff --git a/Buildings/Experimental/DistrictHeatingCooling/SubStations/VaporCompression/HeatingCoolingHotwaterTimeSeries_dT.mo b/Buildings/Experimental/DistrictHeatingCooling/SubStations/VaporCompression/HeatingCoolingHotwaterTimeSeries_dT.mo index 8e7d1db1bbb..676546b3a90 100644 --- a/Buildings/Experimental/DistrictHeatingCooling/SubStations/VaporCompression/HeatingCoolingHotwaterTimeSeries_dT.mo +++ b/Buildings/Experimental/DistrictHeatingCooling/SubStations/VaporCompression/HeatingCoolingHotwaterTimeSeries_dT.mo @@ -707,7 +707,7 @@ First implementation. fillPattern=FillPattern.Solid), Text( extent={{-169,-344},{131,-384}}, - lineColor={0,0,255}, + textColor={0,0,255}, textString="%name"), Rectangle( extent={{2,8},{282,-8}}, diff --git a/Buildings/Fluid/Actuators/BaseClasses/ActuatorSignal.mo b/Buildings/Fluid/Actuators/BaseClasses/ActuatorSignal.mo index 5dea608e021..c274cb45ca6 100644 --- a/Buildings/Fluid/Actuators/BaseClasses/ActuatorSignal.mo +++ b/Buildings/Fluid/Actuators/BaseClasses/ActuatorSignal.mo @@ -94,14 +94,14 @@ equation Text( visible=use_inputFilter, extent={{-20,94},{22,48}}, - lineColor={0,0,0}, + textColor={0,0,0}, fillColor={135,135,135}, fillPattern=FillPattern.Solid, textString="M", textStyle={TextStyle.Bold}), Text( extent={{-40,126},{-160,76}}, - lineColor={0,0,0}, + textColor={0,0,0}, textString=DynamicSelect("", String(y, format=".2f")))}), Documentation(info="
diff --git a/Buildings/Fluid/Actuators/Dampers/MixingBox.mo b/Buildings/Fluid/Actuators/Dampers/MixingBox.mo index 969a3c35afd..d858a60e8c7 100644 --- a/Buildings/Fluid/Actuators/Dampers/MixingBox.mo +++ b/Buildings/Fluid/Actuators/Dampers/MixingBox.mo @@ -252,7 +252,7 @@ equation fillPattern=FillPattern.Solid), Text( extent={{22,132},{48,110}}, - lineColor={0,0,127}, + textColor={0,0,127}, fillColor={0,0,0}, fillPattern=FillPattern.Solid, textString="y"), @@ -285,7 +285,7 @@ equation points={{0,40},{0,10},{0,12}}, color={0,0,255}), Text( extent={{-50,-84},{48,-132}}, - lineColor={0,0,255}, + textColor={0,0,255}, textString= "%name")}), defaultComponentName="eco", diff --git a/Buildings/Fluid/Actuators/Dampers/MixingBoxMinimumFlow.mo b/Buildings/Fluid/Actuators/Dampers/MixingBoxMinimumFlow.mo index ec991cb3e2e..5b8c6eea0cf 100644 --- a/Buildings/Fluid/Actuators/Dampers/MixingBoxMinimumFlow.mo +++ b/Buildings/Fluid/Actuators/Dampers/MixingBoxMinimumFlow.mo @@ -117,7 +117,7 @@ equation fillPattern=FillPattern.Solid), Text( extent={{-126,144},{-86,112}}, - lineColor={0,0,127}, + textColor={0,0,127}, fillColor={0,0,0}, fillPattern=FillPattern.Solid, textString="yMin"), diff --git a/Buildings/Fluid/Actuators/Motors/IdealMotor.mo b/Buildings/Fluid/Actuators/Motors/IdealMotor.mo index 4de7eb873ab..693e9250baa 100644 --- a/Buildings/Fluid/Actuators/Motors/IdealMotor.mo +++ b/Buildings/Fluid/Actuators/Motors/IdealMotor.mo @@ -126,11 +126,11 @@ First implementation. fillPattern=FillPattern.Solid), Text( extent={{66,-26},{94,-48}}, - lineColor={160,160,164}, + textColor={160,160,164}, textString="u-y"), Text( extent={{-3,83},{50,65}}, - lineColor={160,160,164}, + textColor={160,160,164}, textString="v"), Line( points={{-80,-74},{-8,-74}}, @@ -158,11 +158,11 @@ First implementation. thickness=0.5), Text( extent={{19,-35},{44,-18}}, - lineColor={0,0,0}, + textColor={0,0,0}, textString="+delta"), Text( extent={{-63,-18},{-40,-2}}, - lineColor={0,0,0}, + textColor={0,0,0}, textString="-delta"), Line( points={{-8,22},{-8,-74}}, @@ -172,11 +172,11 @@ First implementation. thickness=0.5), Text( extent={{-37,12},{-10,32}}, - lineColor={0,0,0}, + textColor={0,0,0}, textString="vOpen"), Text( extent={{-4,-86},{30,-64}}, - lineColor={0,0,0}, + textColor={0,0,0}, textString="vClose"), Line( points={{-20,-13},{-30,-18},{-20,-23}}, diff --git a/Buildings/Fluid/Actuators/Valves/ThreeWayEqualPercentageLinear.mo b/Buildings/Fluid/Actuators/Valves/ThreeWayEqualPercentageLinear.mo index 79a19a5ab05..17c736ae165 100644 --- a/Buildings/Fluid/Actuators/Valves/ThreeWayEqualPercentageLinear.mo +++ b/Buildings/Fluid/Actuators/Valves/ThreeWayEqualPercentageLinear.mo @@ -25,7 +25,7 @@ equation annotation ( Icon(coordinateSystem(preserveAspectRatio=false, extent={{-100, -100},{100,100}}), graphics={Text( extent={{-72,24},{-34,-20}}, - lineColor=DynamicSelect({255,255,255}, (1-y)*{255,255,255}), + textColor=DynamicSelect({255,255,255}, (1-y)*{255,255,255}), fillPattern=FillPattern.Solid, textString="%%")}), defaultComponentName="val", diff --git a/Buildings/Fluid/Actuators/Valves/TwoWayEqualPercentage.mo b/Buildings/Fluid/Actuators/Valves/TwoWayEqualPercentage.mo index 218ae2f78ab..251dd5bdf3e 100644 --- a/Buildings/Fluid/Actuators/Valves/TwoWayEqualPercentage.mo +++ b/Buildings/Fluid/Actuators/Valves/TwoWayEqualPercentage.mo @@ -89,7 +89,7 @@ First implementation. "), Icon(coordinateSystem(preserveAspectRatio=false, extent={{-100,-100}, {100,100}}), graphics={Text( extent={{-74,20},{-36,-24}}, - lineColor=DynamicSelect({255,255,255}, (1-y)*{255,255,255}), + textColor=DynamicSelect({255,255,255}, (1-y)*{255,255,255}), fillPattern=FillPattern.Solid, textString="%%")})); end TwoWayEqualPercentage; diff --git a/Buildings/Fluid/BaseClasses/FlowModels/basicFlowFunction_dp.mo b/Buildings/Fluid/BaseClasses/FlowModels/basicFlowFunction_dp.mo index 7b6aa6d99b7..2a57555715c 100644 --- a/Buildings/Fluid/BaseClasses/FlowModels/basicFlowFunction_dp.mo +++ b/Buildings/Fluid/BaseClasses/FlowModels/basicFlowFunction_dp.mo @@ -33,7 +33,7 @@ algorithm color={0,0,255}, thickness=1), Text( extent={{-40,-40},{40,-80}}, - lineColor={0,0,0}, + textColor={0,0,0}, fillPattern=FillPattern.Sphere, fillColor={232,0,0}, textString="%name")}), diff --git a/Buildings/Fluid/BaseClasses/FlowModels/basicFlowFunction_m_flow.mo b/Buildings/Fluid/BaseClasses/FlowModels/basicFlowFunction_m_flow.mo index fe15602cc2c..39f9476e040 100644 --- a/Buildings/Fluid/BaseClasses/FlowModels/basicFlowFunction_m_flow.mo +++ b/Buildings/Fluid/BaseClasses/FlowModels/basicFlowFunction_m_flow.mo @@ -35,7 +35,7 @@ algorithm color={0,0,255}, thickness=1), Text( extent={{-40,-40},{40,-80}}, - lineColor={0,0,0}, + textColor={0,0,0}, fillPattern=FillPattern.Sphere, fillColor={232,0,0}, textString="%name")}), diff --git a/Buildings/Fluid/Boilers/BoilerPolynomial.mo b/Buildings/Fluid/Boilers/BoilerPolynomial.mo index e9490ed6862..fdffe957500 100644 --- a/Buildings/Fluid/Boilers/BoilerPolynomial.mo +++ b/Buildings/Fluid/Boilers/BoilerPolynomial.mo @@ -148,11 +148,11 @@ equation smooth=Smooth.None), Text( extent={{160,144},{40,94}}, - lineColor={0,0,0}, + textColor={0,0,0}, textString=DynamicSelect("T", String(T-273.15, format=".1f"))), Text( extent={{-38,146},{-158,96}}, - lineColor={0,0,0}, + textColor={0,0,0}, textString=DynamicSelect("y", String(y, format=".2f")))}), defaultComponentName="boi", Documentation(info=" diff --git a/Buildings/Fluid/CHPs/BaseClasses/EfficiencyCurve.mo b/Buildings/Fluid/CHPs/BaseClasses/EfficiencyCurve.mo index c66382d85da..2f2771ebd95 100644 --- a/Buildings/Fluid/CHPs/BaseClasses/EfficiencyCurve.mo +++ b/Buildings/Fluid/CHPs/BaseClasses/EfficiencyCurve.mo @@ -104,6 +104,6 @@ revisions=" fillPattern=FillPattern.Solid)}), Icon(graphics={Text( extent={{-90,38},{90,-34}}, - lineColor={160,160,164}, + textColor={160,160,164}, textString="polynominal()")})); end EfficiencyCurve; diff --git a/Buildings/Fluid/CHPs/BaseClasses/FilterPower.mo b/Buildings/Fluid/CHPs/BaseClasses/FilterPower.mo index cbf1d4ebafa..b293630c2c4 100644 --- a/Buildings/Fluid/CHPs/BaseClasses/FilterPower.mo +++ b/Buildings/Fluid/CHPs/BaseClasses/FilterPower.mo @@ -74,19 +74,19 @@ annotation ( Icon(coordinateSystem(extent={{-100,-100},{100,100}}), graphics={ Text( extent={{-86,-64},{-46,-44}}, - lineColor={128,128,128}, + textColor={128,128,128}, textString="uMin"), Text( extent={{-34,76},{-9,56}}, - lineColor={128,128,128}, + textColor={128,128,128}, textString="output"), Text( extent={{50,50},{90,70}}, - lineColor={128,128,128}, + textColor={128,128,128}, textString="uMax"), Text( extent={{52,-8},{74,-20}}, - lineColor={128,128,128}, + textColor={128,128,128}, textString="input"), Line(points={{-90,0},{68,0}}, color={192,192,192}), Line( diff --git a/Buildings/Fluid/CHPs/BaseClasses/Interfaces/ModeTypeInput.mo b/Buildings/Fluid/CHPs/BaseClasses/Interfaces/ModeTypeInput.mo index 2c0569d5f77..9972ec22e83 100644 --- a/Buildings/Fluid/CHPs/BaseClasses/Interfaces/ModeTypeInput.mo +++ b/Buildings/Fluid/CHPs/BaseClasses/Interfaces/ModeTypeInput.mo @@ -23,7 +23,7 @@ annotation ( fillPattern=FillPattern.Solid, points={{0.0,50.0},{100.0,0.0},{0.0,-50.0},{0.0,50.0}}), Text( - lineColor={0,0,127}, + textColor={0,0,127}, extent={{-10.0,60.0},{-10.0,85.0}}, textString="%name")}), Documentation(info=" diff --git a/Buildings/Fluid/CHPs/BaseClasses/Interfaces/ModeTypeOutput.mo b/Buildings/Fluid/CHPs/BaseClasses/Interfaces/ModeTypeOutput.mo index b1e96eeebcc..ea7c0c0b7cd 100644 --- a/Buildings/Fluid/CHPs/BaseClasses/Interfaces/ModeTypeOutput.mo +++ b/Buildings/Fluid/CHPs/BaseClasses/Interfaces/ModeTypeOutput.mo @@ -22,7 +22,7 @@ annotation ( fillPattern=FillPattern.Solid, points={{-100.0,50.0},{0.0,0.0},{-100.0,-50.0}}), Text( - lineColor={0,0,127}, + textColor={0,0,127}, extent={{30.0,60.0},{30.0,110.0}}, textString="%name")}), Documentation(info=" diff --git a/Buildings/Fluid/CHPs/Validation/ElectricalFollowing.mo b/Buildings/Fluid/CHPs/Validation/ElectricalFollowing.mo index 285916ecf8c..55f7b711cad 100644 --- a/Buildings/Fluid/CHPs/Validation/ElectricalFollowing.mo +++ b/Buildings/Fluid/CHPs/Validation/ElectricalFollowing.mo @@ -224,7 +224,7 @@ First implementation. pattern=LinePattern.Dot), Text( extent={{78,98},{124,84}}, - lineColor={0,0,0}, + textColor={0,0,0}, pattern=LinePattern.Dash, lineThickness=0.5, textStyle={TextStyle.Bold}, diff --git a/Buildings/Fluid/CHPs/Validation/ThermalFollowing.mo b/Buildings/Fluid/CHPs/Validation/ThermalFollowing.mo index 2e5f6e4c00e..670ce79e130 100644 --- a/Buildings/Fluid/CHPs/Validation/ThermalFollowing.mo +++ b/Buildings/Fluid/CHPs/Validation/ThermalFollowing.mo @@ -271,7 +271,7 @@ First implementation. pattern=LinePattern.Dot), Text( extent={{86,98},{132,84}}, - lineColor={0,0,0}, + textColor={0,0,0}, pattern=LinePattern.Dash, lineThickness=0.5, textStyle={TextStyle.Bold}, diff --git a/Buildings/Fluid/Chillers/BaseClasses/PartialCarnot_y.mo b/Buildings/Fluid/Chillers/BaseClasses/PartialCarnot_y.mo index 29c4adb84ae..f0b9c18398c 100644 --- a/Buildings/Fluid/Chillers/BaseClasses/PartialCarnot_y.mo +++ b/Buildings/Fluid/Chillers/BaseClasses/PartialCarnot_y.mo @@ -145,12 +145,12 @@ equation fillPattern=FillPattern.Solid), Text( extent={{-130,128},{-78,106}}, - lineColor={0,0,127}, + textColor={0,0,127}, fillColor={255,255,255}, fillPattern=FillPattern.Solid, textString="y"), Text(extent={{66,28},{116,14}}, textString="P", - lineColor={0,0,127}), + textColor={0,0,127}), Line(points={{-100,90},{-80,90},{-80,14},{22,14}}, color={0,0,255}), Line(points={{62,0},{100,0}}, color={0,0,255})}), diff --git a/Buildings/Fluid/Chillers/BaseClasses/PartialElectric.mo b/Buildings/Fluid/Chillers/BaseClasses/PartialElectric.mo index cb4120480ac..0ffeef39228 100644 --- a/Buildings/Fluid/Chillers/BaseClasses/PartialElectric.mo +++ b/Buildings/Fluid/Chillers/BaseClasses/PartialElectric.mo @@ -186,9 +186,9 @@ equation {100,100}}), graphics={ Text(extent={{62,96},{112,82}}, textString="P", - lineColor={0,0,127}), + textColor={0,0,127}), Text(extent={{-94,-24},{-48,-36}}, textString="T_CHWS", - lineColor={0,0,127}), + textColor={0,0,127}), Rectangle( extent={{-99,-54},{102,-66}}, lineColor={0,0,255}, @@ -262,7 +262,7 @@ equation fillColor={255,255,255}, fillPattern=FillPattern.Solid), Text(extent={{-108,36},{-62,24}}, - lineColor={0,0,127}, + textColor={0,0,127}, textString="on")}), Documentation(info="
diff --git a/Buildings/Fluid/Chillers/Carnot_TEva.mo b/Buildings/Fluid/Chillers/Carnot_TEva.mo index 282fe62c948..5ceda3af576 100644 --- a/Buildings/Fluid/Chillers/Carnot_TEva.mo +++ b/Buildings/Fluid/Chillers/Carnot_TEva.mo @@ -63,7 +63,7 @@ equation {100,100}}), graphics={ Text( extent={{-148,156},{-92,114}}, - lineColor={0,0,127}, + textColor={0,0,127}, fillColor={255,255,255}, fillPattern=FillPattern.Solid, textString="TEva"), diff --git a/Buildings/Fluid/Chillers/Data/BaseClasses.mo b/Buildings/Fluid/Chillers/Data/BaseClasses.mo index 6a65eb16f2c..1a7482c353c 100644 --- a/Buildings/Fluid/Chillers/Data/BaseClasses.mo +++ b/Buildings/Fluid/Chillers/Data/BaseClasses.mo @@ -68,27 +68,27 @@ First implementation. Icon(graphics={ Text( extent={{-95,53},{-12,-2}}, - lineColor={0,0,255}, + textColor={0,0,255}, textString="COP"), Text( extent={{7,55},{90,0}}, - lineColor={0,0,255}, + textColor={0,0,255}, textString="%COP_nominal"), Text( extent={{-105,-9},{-48,-48}}, - lineColor={0,0,255}, + textColor={0,0,255}, textString="Q"), Text( extent={{2,-16},{94,-38}}, - lineColor={0,0,255}, + textColor={0,0,255}, textString="%QEva_flow_nominal"), Text( extent={{-95,-49},{-12,-104}}, - lineColor={0,0,255}, + textColor={0,0,255}, textString="PLR_minUnl"), Text( extent={{7,-53},{84,-94}}, - lineColor={0,0,255}, + textColor={0,0,255}, textString="%PLRMinUnl")})); end Chiller; diff --git a/Buildings/Fluid/Delays/DelayFirstOrder.mo b/Buildings/Fluid/Delays/DelayFirstOrder.mo index 46cd3bc767e..178fd2e6242 100644 --- a/Buildings/Fluid/Delays/DelayFirstOrder.mo +++ b/Buildings/Fluid/Delays/DelayFirstOrder.mo @@ -13,7 +13,7 @@ protected annotation ( Icon(coordinateSystem(preserveAspectRatio=true, extent={{-100,-100},{100, 100}}), graphics={ Text( extent={{-70,-26},{70,-66}}, - lineColor={255,255,255}, + textColor={255,255,255}, textString="tau=%tau")}), defaultComponentName="del", Documentation(info=" diff --git a/Buildings/Fluid/Examples/FlowSystem/Basic.mo b/Buildings/Fluid/Examples/FlowSystem/Basic.mo index 81ef1e6bd53..ac276f86c93 100644 --- a/Buildings/Fluid/Examples/FlowSystem/Basic.mo +++ b/Buildings/Fluid/Examples/FlowSystem/Basic.mo @@ -431,29 +431,29 @@ equation fillPattern=FillPattern.Solid), Text( extent={{-110,86},{-94,74}}, - lineColor={28,108,200}, + textColor={28,108,200}, textString="X4"), Text( extent={{-24,86},{-8,74}}, - lineColor={28,108,200}, + textColor={28,108,200}, textString="X8"), Text( extent={{8,86},{24,74}}, - lineColor={28,108,200}, + textColor={28,108,200}, textString="X4"), Text( extent={{96,86},{112,74}}, - lineColor={28,108,200}, + textColor={28,108,200}, textString="X8"), Text( extent={{-66,122},{-36,130}}, - lineColor={28,108,200}, + textColor={28,108,200}, fillColor={215,215,215}, fillPattern=FillPattern.Solid, textString="South"), Text( extent={{34,122},{64,130}}, - lineColor={28,108,200}, + textColor={28,108,200}, fillColor={215,215,215}, fillPattern=FillPattern.Solid, textString="North"), @@ -469,13 +469,13 @@ equation fillPattern=FillPattern.Solid), Text( extent={{-64,-156},{-34,-148}}, - lineColor={28,108,200}, + textColor={28,108,200}, fillColor={215,215,215}, fillPattern=FillPattern.Solid, textString="Heat"), Text( extent={{36,-156},{66,-148}}, - lineColor={28,108,200}, + textColor={28,108,200}, fillColor={215,215,215}, fillPattern=FillPattern.Solid, textString="Cold")}), diff --git a/Buildings/Fluid/Examples/Performance/Example5.mo b/Buildings/Fluid/Examples/Performance/Example5.mo index a9908c52184..75e984867bd 100644 --- a/Buildings/Fluid/Examples/Performance/Example5.mo +++ b/Buildings/Fluid/Examples/Performance/Example5.mo @@ -18,7 +18,7 @@ equation annotation (Diagram(coordinateSystem(preserveAspectRatio=false, extent={{-120, -40},{40,60}}), graphics={Text( extent={{-62,24},{-18,-4}}, - lineColor={0,0,255}, + textColor={0,0,255}, textString="See code")}), experiment(Tolerance=1e-6, StopTime=20), Documentation(revisions=" diff --git a/Buildings/Fluid/Examples/Performance/Example6.mo b/Buildings/Fluid/Examples/Performance/Example6.mo index 54fe55f7b67..41c3f63e79a 100644 --- a/Buildings/Fluid/Examples/Performance/Example6.mo +++ b/Buildings/Fluid/Examples/Performance/Example6.mo @@ -24,7 +24,7 @@ equation annotation (Diagram(coordinateSystem(preserveAspectRatio=false, extent={{-120, -40},{40,60}}), graphics={Text( extent={{-62,24},{-18,-4}}, - lineColor={0,0,255}, + textColor={0,0,255}, textString="See code")}), experiment( Tolerance=1e-6, StopTime=100), diff --git a/Buildings/Fluid/Examples/Performance/Example7.mo b/Buildings/Fluid/Examples/Performance/Example7.mo index d8b55b883a2..ad2f41e04dd 100644 --- a/Buildings/Fluid/Examples/Performance/Example7.mo +++ b/Buildings/Fluid/Examples/Performance/Example7.mo @@ -20,7 +20,7 @@ equation annotation (Diagram(coordinateSystem(preserveAspectRatio=false, extent={{-120, -40},{40,60}}), graphics={Text( extent={{-62,24},{-18,-4}}, - lineColor={0,0,255}, + textColor={0,0,255}, textString="See code")}), experiment( Tolerance=1e-6, StopTime=100), diff --git a/Buildings/Fluid/Examples/Performance/Example8.mo b/Buildings/Fluid/Examples/Performance/Example8.mo index 418b5cc582e..e5089ea2e88 100644 --- a/Buildings/Fluid/Examples/Performance/Example8.mo +++ b/Buildings/Fluid/Examples/Performance/Example8.mo @@ -7,7 +7,7 @@ model Example8 "Common subexpression elimination example" annotation (Diagram(coordinateSystem(preserveAspectRatio=false, extent={{-120, -40},{40,60}}), graphics={Text( extent={{-62,24},{-18,-4}}, - lineColor={0,0,255}, + textColor={0,0,255}, textString="See code")}), experiment( Tolerance=1e-6, StopTime=50), diff --git a/Buildings/Fluid/Examples/SimpleHouse.mo b/Buildings/Fluid/Examples/SimpleHouse.mo index 18654930ace..0eebb9a9dd6 100644 --- a/Buildings/Fluid/Examples/SimpleHouse.mo +++ b/Buildings/Fluid/Examples/SimpleHouse.mo @@ -256,7 +256,7 @@ equation pattern=LinePattern.None), Text( extent={{-78,182},{-212,198}}, - lineColor={0,0,127}, + textColor={0,0,127}, fillColor={255,213,170}, fillPattern=FillPattern.Solid, textString="Cooling and ventilation"), @@ -267,19 +267,19 @@ equation pattern=LinePattern.None), Text( extent={{98,20},{32,38}}, - lineColor={0,0,127}, + textColor={0,0,127}, fillColor={255,213,170}, fillPattern=FillPattern.Solid, textString="Wall"), Text( extent={{-148,-86},{-214,-68}}, - lineColor={0,0,127}, + textColor={0,0,127}, fillColor={255,213,170}, fillPattern=FillPattern.Solid, textString="Heating"), Text( extent={{-154,20},{-212,38}}, - lineColor={0,0,127}, + textColor={0,0,127}, fillColor={255,213,170}, fillPattern=FillPattern.Solid, textString="Weather")}), diff --git a/Buildings/Fluid/FMI/Adaptors/HVAC.mo b/Buildings/Fluid/FMI/Adaptors/HVAC.mo index ac11bc4125a..ea06603491c 100644 --- a/Buildings/Fluid/FMI/Adaptors/HVAC.mo +++ b/Buildings/Fluid/FMI/Adaptors/HVAC.mo @@ -128,12 +128,12 @@ protected borderPattern=BorderPattern.Raised), Text( extent={{-96,15},{96,-15}}, - lineColor={0,0,0}, + textColor={0,0,0}, textString="%y"), Text( extent={{-150,90},{140,50}}, textString="%name", - lineColor={0,0,255})}), Documentation(info=" + textColor={0,0,255})}), Documentation(info="
The (time varying) vector Real output signal of this block can be defined in its
parameter menu via variable y. The purpose is to support the
@@ -197,7 +197,7 @@ equation
Text(
extent={{-150,110},{150,150}},
textString="%name",
- lineColor={0,0,255}),
+ textColor={0,0,255}),
Rectangle(
extent={{-90,20},{40,14}},
lineColor={0,0,0},
@@ -231,7 +231,7 @@ equation
fillPattern=FillPattern.Solid),
Text(
extent={{-92,-42},{-6,-98}},
- lineColor={0,0,127},
+ textColor={0,0,127},
textString="[%nPorts]",
horizontalAlignment=TextAlignment.Left),
Ellipse(
diff --git a/Buildings/Fluid/FMI/Adaptors/Inlet.mo b/Buildings/Fluid/FMI/Adaptors/Inlet.mo
index d2a1e21ee69..a36580c1bea 100644
--- a/Buildings/Fluid/FMI/Adaptors/Inlet.mo
+++ b/Buildings/Fluid/FMI/Adaptors/Inlet.mo
@@ -107,7 +107,7 @@ equation
Text(
extent={{-150,110},{150,150}},
textString="%name",
- lineColor={0,0,255}),
+ textColor={0,0,255}),
Line(
points={{-100,0},{-60,0}},
color={0,0,255}),
@@ -128,7 +128,7 @@ equation
fillPattern=FillPattern.Solid),
Text(
extent={{-20,6},{14,-12}},
- lineColor={255,0,0},
+ textColor={255,0,0},
fillColor={255,0,0},
fillPattern=FillPattern.Solid,
textString="m"),
@@ -139,14 +139,14 @@ equation
fillPattern=FillPattern.Solid),
Text(
extent={{-120,34},{-98,16}},
- lineColor={0,0,255},
+ textColor={0,0,255},
textString="inlet"),
Line(
points={{0,-100},{0,-60}},
color={0,127,127}),
Text(
extent={{2,-76},{24,-94}},
- lineColor={0,127,127},
+ textColor={0,127,127},
visible=use_p_in,
textString="p")}),
Documentation(info="
diff --git a/Buildings/Fluid/FMI/Adaptors/Outlet.mo b/Buildings/Fluid/FMI/Adaptors/Outlet.mo
index cfd3d93315c..ad20e25087c 100644
--- a/Buildings/Fluid/FMI/Adaptors/Outlet.mo
+++ b/Buildings/Fluid/FMI/Adaptors/Outlet.mo
@@ -109,7 +109,7 @@ equation
Text(
extent={{-150,110},{150,150}},
textString="%name",
- lineColor={0,0,255}),
+ textColor={0,0,255}),
Line(
points={{60,0},{100,0}},
color={0,0,255}),
@@ -120,7 +120,7 @@ equation
fillColor={0,127,255}),
Text(
extent={{66,40},{100,0}},
- lineColor={0,0,255},
+ textColor={0,0,255},
textString="outlet"),
Line(
points={{0,-60},{0,-100}},
@@ -129,7 +129,7 @@ equation
visible=use_p_in),
Text(
extent={{10,-64},{44,-104}},
- lineColor={0,0,255},
+ textColor={0,0,255},
textString="p",
visible=use_p_in)}),
Documentation(info="
diff --git a/Buildings/Fluid/FMI/Adaptors/ThermalZone.mo b/Buildings/Fluid/FMI/Adaptors/ThermalZone.mo
index 14b7a81c806..121dfce30e6 100644
--- a/Buildings/Fluid/FMI/Adaptors/ThermalZone.mo
+++ b/Buildings/Fluid/FMI/Adaptors/ThermalZone.mo
@@ -108,12 +108,12 @@ protected
borderPattern=BorderPattern.Raised),
Text(
extent={{-96,15},{96,-15}},
- lineColor={0,0,0},
+ textColor={0,0,0},
textString="%y"),
Text(
extent={{-150,90},{140,50}},
textString="%name",
- lineColor={0,0,255})}), Documentation(info="
+ textColor={0,0,255})}), Documentation(info="
The (time varying) vector Real output signal of this block can be defined in its
parameter menu via variable y. The purpose is to support the
@@ -259,7 +259,7 @@ equation
Text(
extent={{-146,104},{150,140}},
textString="%name",
- lineColor={0,0,255}),
+ textColor={0,0,255}),
Polygon(
points={{100,-100},{-102,100},{-102,-100},{100,-100}},
lineColor={0,0,0},
@@ -329,7 +329,7 @@ equation
fillPattern=FillPattern.Solid),
Text(
extent={{-2,-20},{84,-76}},
- lineColor={0,0,127},
+ textColor={0,0,127},
horizontalAlignment=TextAlignment.Right,
textString="[%nPorts]")}),
Documentation(info="
diff --git a/Buildings/Fluid/FMI/Conversion/AirToOutlet.mo b/Buildings/Fluid/FMI/Conversion/AirToOutlet.mo
index 64c431079ea..539da56bc10 100644
--- a/Buildings/Fluid/FMI/Conversion/AirToOutlet.mo
+++ b/Buildings/Fluid/FMI/Conversion/AirToOutlet.mo
@@ -191,20 +191,20 @@ First implementation.
Icon(graphics={
Text(
extent={{-98,52},{-66,26}},
- lineColor={0,0,127},
+ textColor={0,0,127},
textString="h"),
Text(
extent={{-92,94},{-28,68}},
- lineColor={0,0,127},
+ textColor={0,0,127},
textString="m_flow"),
Text(
extent={{-104,-26},{-40,-52}},
- lineColor={0,0,127},
+ textColor={0,0,127},
visible=Medium.nXi > 0,
textString="Xi"),
Text(
extent={{-104,-64},{-40,-90}},
- lineColor={0,0,127},
+ textColor={0,0,127},
visible=Medium.nC > 0,
textString="C"),
Polygon(
diff --git a/Buildings/Fluid/FMI/Conversion/InletToAir.mo b/Buildings/Fluid/FMI/Conversion/InletToAir.mo
index cf815e0f961..879508d9cda 100644
--- a/Buildings/Fluid/FMI/Conversion/InletToAir.mo
+++ b/Buildings/Fluid/FMI/Conversion/InletToAir.mo
@@ -191,19 +191,19 @@ First implementation.
Icon(graphics={
Text(
extent={{58,60},{90,34}},
- lineColor={0,0,127},
+ textColor={0,0,127},
textString="T"),
Text(
extent={{20,96},{84,70}},
- lineColor={0,0,127},
+ textColor={0,0,127},
textString="m_flow"),
Text(
extent={{28,-26},{92,-52}},
- lineColor={0,0,127},
+ textColor={0,0,127},
textString="X_w"),
Text(
extent={{36,-66},{100,-92}},
- lineColor={0,0,127},
+ textColor={0,0,127},
textString="C"),
Line(points={{-80,0},{40,0}}, color={191,0,0}),
Polygon(
@@ -214,7 +214,7 @@ First implementation.
Text(
visible=allowFlowReversal,
extent={{-78,-70},{-46,-96}},
- lineColor={0,0,127},
+ textColor={0,0,127},
textString="T"),
Text(
visible=allowFlowReversal and Medium.nXi > 0,
diff --git a/Buildings/Fluid/FMI/ExportContainers/Examples/FMUs/HVACZone.mo b/Buildings/Fluid/FMI/ExportContainers/Examples/FMUs/HVACZone.mo
index 7d8ecc5a8d8..0f19acfd265 100644
--- a/Buildings/Fluid/FMI/ExportContainers/Examples/FMUs/HVACZone.mo
+++ b/Buildings/Fluid/FMI/ExportContainers/Examples/FMUs/HVACZone.mo
@@ -247,7 +247,7 @@ equation
{160,160}}), graphics={
Text(
extent={{-24,-132},{26,-152}},
- lineColor={0,0,127},
+ textColor={0,0,127},
textString="TOut")}), Diagram(
coordinateSystem(preserveAspectRatio=false, extent={{-160,-160},{160,160}})),
Documentation(info="
diff --git a/Buildings/Fluid/FMI/ExportContainers/Examples/FMUs/HVACZones.mo b/Buildings/Fluid/FMI/ExportContainers/Examples/FMUs/HVACZones.mo
index 54952ce862f..ac7b18546f2 100644
--- a/Buildings/Fluid/FMI/ExportContainers/Examples/FMUs/HVACZones.mo
+++ b/Buildings/Fluid/FMI/ExportContainers/Examples/FMUs/HVACZones.mo
@@ -300,7 +300,7 @@ equation
{160,180}}), graphics={
Text(
extent={{-24,-132},{26,-152}},
- lineColor={0,0,127},
+ textColor={0,0,127},
textString="TOut")}), Diagram(
coordinateSystem(preserveAspectRatio=false, extent={{-160,-160},{160,180}})),
Documentation(info="
diff --git a/Buildings/Fluid/FMI/ExportContainers/Examples/FMUs/HeaterCooler_u.mo b/Buildings/Fluid/FMI/ExportContainers/Examples/FMUs/HeaterCooler_u.mo
index 3937d07836d..06dea5040b4 100644
--- a/Buildings/Fluid/FMI/ExportContainers/Examples/FMUs/HeaterCooler_u.mo
+++ b/Buildings/Fluid/FMI/ExportContainers/Examples/FMUs/HeaterCooler_u.mo
@@ -90,7 +90,7 @@ __Dymola_Commands(file="modelica://Buildings/Resources/Scripts/Dymola/Fluid/FMI/
fillPattern=FillPattern.Solid),
Text(
extent={{-54,-12},{56,-72}},
- lineColor={255,255,255},
+ textColor={255,255,255},
textString="Q=%Q_flow_nominal"),
Rectangle(
extent={{-100,61},{-68,58}},
@@ -100,6 +100,6 @@ __Dymola_Commands(file="modelica://Buildings/Resources/Scripts/Dymola/Fluid/FMI/
fillPattern=FillPattern.Solid),
Text(
extent={{-104,94},{-60,66}},
- lineColor={0,0,255},
+ textColor={0,0,255},
textString="u")}));
end HeaterCooler_u;
diff --git a/Buildings/Fluid/FMI/ExportContainers/Examples/FMUs/Heater_T.mo b/Buildings/Fluid/FMI/ExportContainers/Examples/FMUs/Heater_T.mo
index a21af67a991..3cdcf2e8cd7 100644
--- a/Buildings/Fluid/FMI/ExportContainers/Examples/FMUs/Heater_T.mo
+++ b/Buildings/Fluid/FMI/ExportContainers/Examples/FMUs/Heater_T.mo
@@ -106,7 +106,7 @@ __Dymola_Commands(file="modelica://Buildings/Resources/Scripts/Dymola/Fluid/FMI/
fillPattern=FillPattern.Solid),
Text(
extent={{-56,74},{54,14}},
- lineColor={255,255,255},
+ textColor={255,255,255},
textString="TSet"),
Rectangle(
extent={{-100,61},{-68,58}},
@@ -116,14 +116,14 @@ __Dymola_Commands(file="modelica://Buildings/Resources/Scripts/Dymola/Fluid/FMI/
fillPattern=FillPattern.Solid),
Text(
extent={{-104,94},{-60,66}},
- lineColor={0,0,127},
+ textColor={0,0,127},
textString="T"),
Text(
extent={{64,92},{108,64}},
- lineColor={0,0,127},
+ textColor={0,0,127},
textString="Q"),
Text(
extent={{26,-28},{70,-74}},
- lineColor={255,255,255},
+ textColor={255,255,255},
textString="+")}));
end Heater_T;
diff --git a/Buildings/Fluid/FMI/ExportContainers/Examples/FMUs/Humidifier_u.mo b/Buildings/Fluid/FMI/ExportContainers/Examples/FMUs/Humidifier_u.mo
index f0750ad94dd..6ee4f602209 100644
--- a/Buildings/Fluid/FMI/ExportContainers/Examples/FMUs/Humidifier_u.mo
+++ b/Buildings/Fluid/FMI/ExportContainers/Examples/FMUs/Humidifier_u.mo
@@ -100,7 +100,7 @@ __Dymola_Commands(file="modelica://Buildings/Resources/Scripts/Dymola/Fluid/FMI/
fillPattern=FillPattern.Solid),
Text(
extent={{-54,-12},{56,-72}},
- lineColor={255,255,255},
+ textColor={255,255,255},
textString="Q=%Q_flow_nominal"),
Rectangle(
extent={{-100,61},{-68,58}},
@@ -110,6 +110,6 @@ __Dymola_Commands(file="modelica://Buildings/Resources/Scripts/Dymola/Fluid/FMI/
fillPattern=FillPattern.Solid),
Text(
extent={{-104,94},{-60,66}},
- lineColor={0,0,255},
+ textColor={0,0,255},
textString="u")}));
end Humidifier_u;
diff --git a/Buildings/Fluid/FMI/ExportContainers/Examples/FMUs/IdealSource_m_flow.mo b/Buildings/Fluid/FMI/ExportContainers/Examples/FMUs/IdealSource_m_flow.mo
index 3ae9979f818..4db9129cb7d 100644
--- a/Buildings/Fluid/FMI/ExportContainers/Examples/FMUs/IdealSource_m_flow.mo
+++ b/Buildings/Fluid/FMI/ExportContainers/Examples/FMUs/IdealSource_m_flow.mo
@@ -54,7 +54,7 @@ __Dymola_Commands(file="modelica://Buildings/Resources/Scripts/Dymola/Fluid/FMI/
fillPattern=FillPattern.HorizontalCylinder),
Text(
extent={{-94,110},{-50,52}},
- lineColor={0,0,127},
+ textColor={0,0,127},
textString="m_flow"),
Ellipse(
extent={{-16,18},{24,-22}},
diff --git a/Buildings/Fluid/FMI/ExportContainers/Examples/FMUs/ThermalZone.mo b/Buildings/Fluid/FMI/ExportContainers/Examples/FMUs/ThermalZone.mo
index 915189c73a7..730dea66c1a 100644
--- a/Buildings/Fluid/FMI/ExportContainers/Examples/FMUs/ThermalZone.mo
+++ b/Buildings/Fluid/FMI/ExportContainers/Examples/FMUs/ThermalZone.mo
@@ -116,7 +116,7 @@ equation
{160,180}}), graphics={
Text(
extent={{-22,-112},{28,-132}},
- lineColor={0,0,127},
+ textColor={0,0,127},
textString="TOut")}), Diagram(
coordinateSystem(preserveAspectRatio=false, extent={{-160,-140},{160,180}}),
graphics={
diff --git a/Buildings/Fluid/FMI/ExportContainers/Examples/FMUs/ThermalZones.mo b/Buildings/Fluid/FMI/ExportContainers/Examples/FMUs/ThermalZones.mo
index f44a7a04d07..af289fb4131 100644
--- a/Buildings/Fluid/FMI/ExportContainers/Examples/FMUs/ThermalZones.mo
+++ b/Buildings/Fluid/FMI/ExportContainers/Examples/FMUs/ThermalZones.mo
@@ -153,7 +153,7 @@ equation
{160,180}}), graphics={
Text(
extent={{-22,-112},{28,-132}},
- lineColor={0,0,127},
+ textColor={0,0,127},
textString="TOut")}), Diagram(
coordinateSystem(preserveAspectRatio=false, extent={{-160,-140},{160,180}}),
graphics={
diff --git a/Buildings/Fluid/FMI/ExportContainers/HVACZone.mo b/Buildings/Fluid/FMI/ExportContainers/HVACZone.mo
index 40ccbd5812a..a9a91a8233d 100644
--- a/Buildings/Fluid/FMI/ExportContainers/HVACZone.mo
+++ b/Buildings/Fluid/FMI/ExportContainers/HVACZone.mo
@@ -51,24 +51,24 @@ equation
lineColor={0,0,0}),
Text(
extent={{104,72},{154,52}},
- lineColor={0,0,127},
+ textColor={0,0,127},
textString="TRad",
horizontalAlignment=TextAlignment.Left),
Text(
extent={{100,-28},{150,-48}},
- lineColor={0,0,127},
+ textColor={0,0,127},
textString="QRad"),
Text(
extent={{100,-78},{150,-98}},
- lineColor={0,0,127},
+ textColor={0,0,127},
textString="QCon"),
Text(
extent={{100,-128},{150,-148}},
- lineColor={0,0,127},
+ textColor={0,0,127},
textString="QLat"),
Text(
extent={{-72,252},{70,146}},
- lineColor={0,0,255},
+ textColor={0,0,255},
textString="%name"),
Rectangle(
extent={{-144,-24},{36,-34}},
diff --git a/Buildings/Fluid/FMI/ExportContainers/HVACZones.mo b/Buildings/Fluid/FMI/ExportContainers/HVACZones.mo
index 4ca2e1fc6f6..d1dbe1df96c 100644
--- a/Buildings/Fluid/FMI/ExportContainers/HVACZones.mo
+++ b/Buildings/Fluid/FMI/ExportContainers/HVACZones.mo
@@ -61,23 +61,23 @@ equation
lineColor={0,0,0}),
Text(
extent={{104,76},{154,56}},
- lineColor={0,0,127},
+ textColor={0,0,127},
textString="TRad"),
Text(
extent={{100,-28},{150,-48}},
- lineColor={0,0,127},
+ textColor={0,0,127},
textString="QRad"),
Text(
extent={{100,-78},{150,-98}},
- lineColor={0,0,127},
+ textColor={0,0,127},
textString="QCon"),
Text(
extent={{106,-128},{156,-148}},
- lineColor={0,0,127},
+ textColor={0,0,127},
textString="QLat"),
Text(
extent={{-72,252},{70,146}},
- lineColor={0,0,255},
+ textColor={0,0,255},
textString="%name"),
Rectangle(
extent={{-144,-24},{80,-32}},
@@ -153,7 +153,7 @@ equation
coordinateSystem(preserveAspectRatio=false, extent={{-160,-160},{160,160}}),
graphics={Text(
extent={{104,152},{118,146}},
- lineColor={0,0,127},
+ textColor={0,0,127},
textString="[%nZon, %nPorts]")}),
Documentation(info="
diff --git a/Buildings/Fluid/FMI/ExportContainers/PartialTwoPort.mo b/Buildings/Fluid/FMI/ExportContainers/PartialTwoPort.mo index 44f9ed6eb54..ce0e7865f2a 100644 --- a/Buildings/Fluid/FMI/ExportContainers/PartialTwoPort.mo +++ b/Buildings/Fluid/FMI/ExportContainers/PartialTwoPort.mo @@ -40,7 +40,7 @@ partial block PartialTwoPort fillColor={255,255,255}), Text( extent={{-151,147},{149,107}}, - lineColor={0,0,255}, + textColor={0,0,255}, fillPattern=FillPattern.HorizontalCylinder, fillColor={0,127,255}, textString="%name")}), Documentation(info=" diff --git a/Buildings/Fluid/FMI/ExportContainers/ThermalZone.mo b/Buildings/Fluid/FMI/ExportContainers/ThermalZone.mo index a53af025803..17b19620f67 100644 --- a/Buildings/Fluid/FMI/ExportContainers/ThermalZone.mo +++ b/Buildings/Fluid/FMI/ExportContainers/ThermalZone.mo @@ -37,7 +37,7 @@ equation fillPattern=FillPattern.Solid), Text( extent={{-64,270},{78,164}}, - lineColor={0,0,255}, + textColor={0,0,255}, textString="%name"), Rectangle( extent={{-62,100},{80,-62}}, diff --git a/Buildings/Fluid/FMI/ExportContainers/ThermalZones.mo b/Buildings/Fluid/FMI/ExportContainers/ThermalZones.mo index 8c2153b9421..f45753ee304 100644 --- a/Buildings/Fluid/FMI/ExportContainers/ThermalZones.mo +++ b/Buildings/Fluid/FMI/ExportContainers/ThermalZones.mo @@ -46,7 +46,7 @@ equation fillPattern=FillPattern.Solid), Text( extent={{-64,270},{78,164}}, - lineColor={0,0,255}, + textColor={0,0,255}, textString="%name"), Rectangle( extent={{-68,140},{74,52}}, @@ -88,7 +88,7 @@ equation coordinateSystem(preserveAspectRatio=false, extent={{-160,-140},{160,180}}), graphics={Text( extent={{-118,172},{-104,166}}, - lineColor={0,0,127}, + textColor={0,0,127}, textString="[%nZon, %nPorts]")}), Documentation(info="
diff --git a/Buildings/Fluid/FMI/ExportContainers/Validation/FMUs/ThermalZoneAir1.mo b/Buildings/Fluid/FMI/ExportContainers/Validation/FMUs/ThermalZoneAir1.mo index 398d8af1d55..88edc5ee59a 100644 --- a/Buildings/Fluid/FMI/ExportContainers/Validation/FMUs/ThermalZoneAir1.mo +++ b/Buildings/Fluid/FMI/ExportContainers/Validation/FMUs/ThermalZoneAir1.mo @@ -104,7 +104,7 @@ equation {160,180}}), graphics={ Text( extent={{-26,176},{24,156}}, - lineColor={0,0,127}, + textColor={0,0,127}, textString="TOut")}), Diagram( coordinateSystem(preserveAspectRatio=false, extent={{-160,-140},{160,180}})), Documentation(info=" diff --git a/Buildings/Fluid/FMI/ExportContainers/Validation/RoomHVAC.mo b/Buildings/Fluid/FMI/ExportContainers/Validation/RoomHVAC.mo index f0948345ff2..93593c95bb7 100644 --- a/Buildings/Fluid/FMI/ExportContainers/Validation/RoomHVAC.mo +++ b/Buildings/Fluid/FMI/ExportContainers/Validation/RoomHVAC.mo @@ -91,7 +91,7 @@ Buildings.Fluid.FMI.ExportContainers.Validation.RoomHVAC fillPattern=FillPattern.Solid), Text( extent={{-72,190},{70,84}}, - lineColor={0,0,255}, + textColor={0,0,255}, textString="%name"), Polygon( points={{-28,-6},{-56,-18},{-28,-32},{-28,-6}}, diff --git a/Buildings/Fluid/FMI/FlowSplitter_u.mo b/Buildings/Fluid/FMI/FlowSplitter_u.mo index 216210cbcaf..cbc2fecce98 100644 --- a/Buildings/Fluid/FMI/FlowSplitter_u.mo +++ b/Buildings/Fluid/FMI/FlowSplitter_u.mo @@ -81,7 +81,7 @@ Icon(coordinateSystem(preserveAspectRatio=false, extent={{-100,-100}, {100,100}}), graphics={ Text( extent={{-100,98},{-60,60}}, - lineColor={0,0,127}, + textColor={0,0,127}, textString="u"), Rectangle( extent={{-100,14},{-22,-10}}, diff --git a/Buildings/Fluid/FMI/Interfaces/Inlet.mo b/Buildings/Fluid/FMI/Interfaces/Inlet.mo index 17b17e40fed..256b083962e 100644 --- a/Buildings/Fluid/FMI/Interfaces/Inlet.mo +++ b/Buildings/Fluid/FMI/Interfaces/Inlet.mo @@ -40,7 +40,7 @@ annotation (defaultComponentName="inlet", fillColor={0,0,255}), Text( extent={{-58,134},{48,94}}, - lineColor={0,0,255}, + textColor={0,0,255}, textString="%name")}), Documentation(info="
diff --git a/Buildings/Fluid/FMI/Interfaces/MassFractionConnector.mo b/Buildings/Fluid/FMI/Interfaces/MassFractionConnector.mo index 05a6eac2320..2421136fe5a 100644 --- a/Buildings/Fluid/FMI/Interfaces/MassFractionConnector.mo +++ b/Buildings/Fluid/FMI/Interfaces/MassFractionConnector.mo @@ -14,7 +14,7 @@ connector MassFractionConnector = extent={{-100.0,-100.0},{100.0,100.0}}), graphics={ Text( - lineColor={0,127,127}, + textColor={0,127,127}, extent={{-10.0,60.0},{-10.0,85.0}}, textString="%name")}), Documentation(info=" diff --git a/Buildings/Fluid/FMI/Interfaces/Outlet.mo b/Buildings/Fluid/FMI/Interfaces/Outlet.mo index 3392be72615..fffdf27b42b 100644 --- a/Buildings/Fluid/FMI/Interfaces/Outlet.mo +++ b/Buildings/Fluid/FMI/Interfaces/Outlet.mo @@ -41,7 +41,7 @@ connector Outlet "Connector for fluid outlet" fillColor={255,255,255}), Text( extent={{-58,134},{48,94}}, - lineColor={0,0,255}, + textColor={0,0,255}, textString="%name")}), Documentation(info="
diff --git a/Buildings/Fluid/FMI/Interfaces/PressureInput.mo b/Buildings/Fluid/FMI/Interfaces/PressureInput.mo index 28870fcd2da..01bf5894fd2 100644 --- a/Buildings/Fluid/FMI/Interfaces/PressureInput.mo +++ b/Buildings/Fluid/FMI/Interfaces/PressureInput.mo @@ -24,7 +24,7 @@ connector PressureInput = fillPattern=FillPattern.Solid, points={{0.0,50.0},{100.0,0.0},{0.0,-50.0},{0.0,50.0}}), Text( - lineColor={0,127,127}, + textColor={0,127,127}, extent={{-10.0,60.0},{-10.0,85.0}}, textString="%name")}), Documentation(info=" diff --git a/Buildings/Fluid/FMI/Interfaces/PressureOutput.mo b/Buildings/Fluid/FMI/Interfaces/PressureOutput.mo index a49dc9b5e71..47528eb01f9 100644 --- a/Buildings/Fluid/FMI/Interfaces/PressureOutput.mo +++ b/Buildings/Fluid/FMI/Interfaces/PressureOutput.mo @@ -23,7 +23,7 @@ connector PressureOutput = fillPattern=FillPattern.Solid, points={{-100.0,50.0},{0.0,0.0},{-100.0,-50.0}}), Text( - lineColor={0,127,127}, + textColor={0,127,127}, extent={{30.0,60.0},{30.0,110.0}}, textString="%name")}), Documentation(info=" diff --git a/Buildings/Fluid/FMI/Sink_T.mo b/Buildings/Fluid/FMI/Sink_T.mo index 89fbda46eee..c834bad02f7 100644 --- a/Buildings/Fluid/FMI/Sink_T.mo +++ b/Buildings/Fluid/FMI/Sink_T.mo @@ -89,7 +89,7 @@ equation fillPattern=FillPattern.Solid, fillColor={255,255,255}), Text( extent={{-98,-90},{-62,-72}}, - lineColor={0,0,255}, + textColor={0,0,255}, textString="P", visible=use_p_in)}), Documentation(info=" diff --git a/Buildings/Fluid/FMI/Source_T.mo b/Buildings/Fluid/FMI/Source_T.mo index 98f6e16ccad..a61332f8dab 100644 --- a/Buildings/Fluid/FMI/Source_T.mo +++ b/Buildings/Fluid/FMI/Source_T.mo @@ -82,7 +82,7 @@ equation fillPattern=FillPattern.Solid, fillColor={255,255,255}), Text( extent={{-94,60},{94,-58}}, - lineColor={0,0,255}, + textColor={0,0,255}, textString="m_flow p")}), Documentation(info=" diff --git a/Buildings/Fluid/FixedResistances/BaseClasses/Pipe.mo b/Buildings/Fluid/FixedResistances/BaseClasses/Pipe.mo index 51c8795909d..ea90261f294 100644 --- a/Buildings/Fluid/FixedResistances/BaseClasses/Pipe.mo +++ b/Buildings/Fluid/FixedResistances/BaseClasses/Pipe.mo @@ -100,7 +100,7 @@ equation fillColor={217,236,255}), Text( extent={{-42,12},{40,-12}}, - lineColor={0,0,0}, + textColor={0,0,0}, textString="%nSeg")}), Documentation(info="
diff --git a/Buildings/Fluid/FixedResistances/BaseClasses/PlugFlowTransportDelay.mo b/Buildings/Fluid/FixedResistances/BaseClasses/PlugFlowTransportDelay.mo index 15bddf901f6..3f9bc5b1db2 100644 --- a/Buildings/Fluid/FixedResistances/BaseClasses/PlugFlowTransportDelay.mo +++ b/Buildings/Fluid/FixedResistances/BaseClasses/PlugFlowTransportDelay.mo @@ -87,15 +87,15 @@ equation -47.2},{88,-24.8},{96,0}}, smooth=Smooth.Bezier), Text( extent={{20,100},{82,30}}, - lineColor={0,0,255}, + textColor={0,0,255}, textString="PDE"), Text( extent={{-82,-30},{-20,-100}}, - lineColor={0,0,255}, + textColor={0,0,255}, textString="tau"), Text( extent={{-100,140},{100,100}}, - lineColor={0,0,255}, + textColor={0,0,255}, textString="%name")}), Documentation(info="
diff --git a/Buildings/Fluid/FixedResistances/HydraulicDiameter.mo b/Buildings/Fluid/FixedResistances/HydraulicDiameter.mo index 2fac6f6a5c8..681020027d6 100644 --- a/Buildings/Fluid/FixedResistances/HydraulicDiameter.mo +++ b/Buildings/Fluid/FixedResistances/HydraulicDiameter.mo @@ -182,6 +182,6 @@ First implementation for "), Icon(graphics={Text( extent={{-40,18},{38,-20}}, - lineColor={255,255,255}, + textColor={255,255,255}, textString="dh")})); end HydraulicDiameter; diff --git a/Buildings/Fluid/FixedResistances/Junction.mo b/Buildings/Fluid/FixedResistances/Junction.mo index aa4bf99a5cd..d7d14290a81 100644 --- a/Buildings/Fluid/FixedResistances/Junction.mo +++ b/Buildings/Fluid/FixedResistances/Junction.mo @@ -67,7 +67,7 @@ initial equation fillColor={0,128,255}), Text( extent={{-151,142},{149,102}}, - lineColor={0,0,255}, + textColor={0,0,255}, textString="%name"), Rectangle( extent=DynamicSelect({{-100,10},{-100,10}}, {{-100,10},{-100+100*min(1, max(0, port_1.m_flow*3/(abs(m_flow_nominal[1])+abs(m_flow_nominal[2])+abs(m_flow_nominal[3])))),-10}}), diff --git a/Buildings/Fluid/FixedResistances/PlugFlowPipe.mo b/Buildings/Fluid/FixedResistances/PlugFlowPipe.mo index 742bb951cf9..e85b0827dc3 100644 --- a/Buildings/Fluid/FixedResistances/PlugFlowPipe.mo +++ b/Buildings/Fluid/FixedResistances/PlugFlowPipe.mo @@ -209,7 +209,7 @@ equation fillColor={215,202,187}), Text( extent={{-100,-72},{100,-88}}, - lineColor={0,0,0}, + textColor={0,0,0}, textString="L = %length d = %dh")}), Documentation(revisions=" diff --git a/Buildings/Fluid/Geothermal/Borefields/BaseClasses/Boreholes/BaseClasses/InternalResistancesOneUTube.mo b/Buildings/Fluid/Geothermal/Borefields/BaseClasses/Boreholes/BaseClasses/InternalResistancesOneUTube.mo index 7b7766639a5..ff2067aa6e1 100644 --- a/Buildings/Fluid/Geothermal/Borefields/BaseClasses/Boreholes/BaseClasses/InternalResistancesOneUTube.mo +++ b/Buildings/Fluid/Geothermal/Borefields/BaseClasses/Boreholes/BaseClasses/InternalResistancesOneUTube.mo @@ -118,7 +118,7 @@ First implementation. color={0,0,0}, thickness=1), Text( extent={{-100,144},{100,106}}, - lineColor={0,0,255}, + textColor={0,0,255}, fillPattern=FillPattern.HorizontalCylinder, fillColor={0,127,255}, textString="%name")})); diff --git a/Buildings/Fluid/Geothermal/Borefields/BaseClasses/Boreholes/BaseClasses/InternalResistancesTwoUTube.mo b/Buildings/Fluid/Geothermal/Borefields/BaseClasses/Boreholes/BaseClasses/InternalResistancesTwoUTube.mo index 778385f292b..d8afd01427c 100644 --- a/Buildings/Fluid/Geothermal/Borefields/BaseClasses/Boreholes/BaseClasses/InternalResistancesTwoUTube.mo +++ b/Buildings/Fluid/Geothermal/Borefields/BaseClasses/Boreholes/BaseClasses/InternalResistancesTwoUTube.mo @@ -211,7 +211,7 @@ equation rotation=135, thickness=0.5), Text( extent={{-100,144},{100,106}}, - lineColor={0,0,255}, + textColor={0,0,255}, fillPattern=FillPattern.HorizontalCylinder, fillColor={0,127,255}, textString="%name")}), Diagram( diff --git a/Buildings/Fluid/Geothermal/Borefields/BaseClasses/Boreholes/OneUTube.mo b/Buildings/Fluid/Geothermal/Borefields/BaseClasses/Boreholes/OneUTube.mo index 5c2d616bf60..7ed1d460aea 100644 --- a/Buildings/Fluid/Geothermal/Borefields/BaseClasses/Boreholes/OneUTube.mo +++ b/Buildings/Fluid/Geothermal/Borefields/BaseClasses/Boreholes/OneUTube.mo @@ -87,7 +87,7 @@ equation grid={2,2}, initialScale=0.5), graphics={Text( extent={{60,72},{84,58}}, - lineColor={0,0,255}, + textColor={0,0,255}, textString="")}), Documentation(info="
diff --git a/Buildings/Fluid/Geothermal/Borefields/BaseClasses/Boreholes/TwoUTube.mo b/Buildings/Fluid/Geothermal/Borefields/BaseClasses/Boreholes/TwoUTube.mo index 41e1f722b3a..96d7a9685c2 100644 --- a/Buildings/Fluid/Geothermal/Borefields/BaseClasses/Boreholes/TwoUTube.mo +++ b/Buildings/Fluid/Geothermal/Borefields/BaseClasses/Boreholes/TwoUTube.mo @@ -167,10 +167,10 @@ equation grid={2,2}, initialScale=0.5), graphics={Text( extent={{60,72},{84,58}}, - lineColor={0,0,255}, + textColor={0,0,255}, textString=""), Text( extent={{50,-32},{90,-38}}, - lineColor={0,0,255}, + textColor={0,0,255}, textString="")}), Documentation(info="
diff --git a/Buildings/Fluid/Geothermal/Borefields/BaseClasses/HeatTransfer/Cylindrical.mo b/Buildings/Fluid/Geothermal/Borefields/BaseClasses/HeatTransfer/Cylindrical.mo index 1dd15ee52e4..2a40d88daee 100644 --- a/Buildings/Fluid/Geothermal/Borefields/BaseClasses/HeatTransfer/Cylindrical.mo +++ b/Buildings/Fluid/Geothermal/Borefields/BaseClasses/HeatTransfer/Cylindrical.mo @@ -170,15 +170,15 @@ equation fillPattern=FillPattern.Solid), Text( extent={{-110,-74},{-26,-86}}, - lineColor={0,0,255}, + textColor={0,0,255}, textString="%r_a"), Text( extent={{-22,-62},{20,-76}}, - lineColor={0,0,255}, + textColor={0,0,255}, textString="%nSta"), Text( extent={{16,-76},{102,-88}}, - lineColor={0,0,255}, + textColor={0,0,255}, textString="%r_b"), Polygon( points={{-50,60},{-38,34},{-32,0},{-36,-30},{-50,-60},{-62,-60},{-48, @@ -196,7 +196,7 @@ equation fillColor={175,175,175}), Text( extent={{-100,100},{100,60}}, - lineColor={0,0,255}, + textColor={0,0,255}, textString="%name")}), defaultComponentName="lay", Documentation(info=" diff --git a/Buildings/Fluid/Geothermal/Borefields/BaseClasses/HeatTransfer/GroundTemperatureResponse.mo b/Buildings/Fluid/Geothermal/Borefields/BaseClasses/HeatTransfer/GroundTemperatureResponse.mo index edc7ed0b6ed..a43bf345cc8 100644 --- a/Buildings/Fluid/Geothermal/Borefields/BaseClasses/HeatTransfer/GroundTemperatureResponse.mo +++ b/Buildings/Fluid/Geothermal/Borefields/BaseClasses/HeatTransfer/GroundTemperatureResponse.mo @@ -177,7 +177,7 @@ equation fillPattern=FillPattern.Solid), Text( extent={{-151,147},{149,107}}, - lineColor={0,0,255}, + textColor={0,0,255}, fillPattern=FillPattern.HorizontalCylinder, fillColor={0,127,255}, textString="%name")}), diff --git a/Buildings/Fluid/Geothermal/Boreholes/BaseClasses/SingleUTubeBoundaryCondition.mo b/Buildings/Fluid/Geothermal/Boreholes/BaseClasses/SingleUTubeBoundaryCondition.mo index 31de103f731..3c885a0d6aa 100644 --- a/Buildings/Fluid/Geothermal/Boreholes/BaseClasses/SingleUTubeBoundaryCondition.mo +++ b/Buildings/Fluid/Geothermal/Boreholes/BaseClasses/SingleUTubeBoundaryCondition.mo @@ -71,12 +71,12 @@ annotation ( thickness=0.5), Text( extent={{0,0},{-100,-100}}, - lineColor={0,0,0}, + textColor={0,0,0}, textString="K"), Text( extent={{-150,150},{150,110}}, textString="%name", - lineColor={0,0,255}), + textColor={0,0,255}), Polygon( points={{40,-18},{40,22},{80,2},{40,-18}}, lineColor={191,0,0}, diff --git a/Buildings/Fluid/HeatExchangers/ActiveBeams/BaseClasses/ModificationFactor.mo b/Buildings/Fluid/HeatExchangers/ActiveBeams/BaseClasses/ModificationFactor.mo index 49b742a4b9e..9f3e39188f3 100644 --- a/Buildings/Fluid/HeatExchangers/ActiveBeams/BaseClasses/ModificationFactor.mo +++ b/Buildings/Fluid/HeatExchangers/ActiveBeams/BaseClasses/ModificationFactor.mo @@ -129,6 +129,6 @@ First implementation. Icon(coordinateSystem(preserveAspectRatio=false, extent={{-100,-100},{100, 100}}), graphics={Text( extent={{100,100},{-100,-100}}, - lineColor={0,0,0}, + textColor={0,0,0}, textString="f")})); end ModificationFactor; diff --git a/Buildings/Fluid/HeatExchangers/ActiveBeams/Cooling.mo b/Buildings/Fluid/HeatExchangers/ActiveBeams/Cooling.mo index 81da0300de5..be8711e3ff7 100644 --- a/Buildings/Fluid/HeatExchangers/ActiveBeams/Cooling.mo +++ b/Buildings/Fluid/HeatExchangers/ActiveBeams/Cooling.mo @@ -258,7 +258,7 @@ equation fillPattern=FillPattern.Solid), Text( extent={{-149,141},{151,101}}, - lineColor={0,0,255}, + textColor={0,0,255}, fillPattern=FillPattern.HorizontalCylinder, fillColor={0,127,255}, textString="%name"), diff --git a/Buildings/Fluid/HeatExchangers/BaseClasses/CoilRegister.mo b/Buildings/Fluid/HeatExchangers/BaseClasses/CoilRegister.mo index a741ffae91e..0285f2e6e10 100644 --- a/Buildings/Fluid/HeatExchangers/BaseClasses/CoilRegister.mo +++ b/Buildings/Fluid/HeatExchangers/BaseClasses/CoilRegister.mo @@ -292,10 +292,10 @@ Icon(coordinateSystem(preserveAspectRatio=false, extent={{-100,-100},{100, fillPattern=FillPattern.Solid), Text( extent={{62,-94},{88,-122}}, - lineColor={0,0,255}, + textColor={0,0,255}, textString="h"), Text( extent={{-80,112},{-58,84}}, - lineColor={0,0,255}, + textColor={0,0,255}, textString="h")})); end CoilRegister; diff --git a/Buildings/Fluid/HeatExchangers/BaseClasses/HACoilInside.mo b/Buildings/Fluid/HeatExchangers/BaseClasses/HACoilInside.mo index b0cbf92bc03..4f35fe08c06 100644 --- a/Buildings/Fluid/HeatExchangers/BaseClasses/HACoilInside.mo +++ b/Buildings/Fluid/HeatExchangers/BaseClasses/HACoilInside.mo @@ -77,7 +77,7 @@ First implementation. Icon(coordinateSystem(preserveAspectRatio=false, extent={{-100,-100},{100, 100}}), graphics={ Text( extent={{-66,88},{60,-2}}, - lineColor={0,0,0}, + textColor={0,0,0}, fillColor={255,255,255}, fillPattern=FillPattern.Solid, textString="hA"), diff --git a/Buildings/Fluid/HeatExchangers/BaseClasses/HADryCoil.mo b/Buildings/Fluid/HeatExchangers/BaseClasses/HADryCoil.mo index 1471aee38e2..683143425f6 100644 --- a/Buildings/Fluid/HeatExchangers/BaseClasses/HADryCoil.mo +++ b/Buildings/Fluid/HeatExchangers/BaseClasses/HADryCoil.mo @@ -153,7 +153,7 @@ First implementation. Icon(coordinateSystem(preserveAspectRatio=false, extent={{-100,-100},{100, 100}}), graphics={ Text( extent={{-60,90},{66,0}}, - lineColor={0,0,0}, + textColor={0,0,0}, fillColor={255,255,255}, fillPattern=FillPattern.Solid, textString="hA"), diff --git a/Buildings/Fluid/HeatExchangers/BaseClasses/HANaturalCylinder.mo b/Buildings/Fluid/HeatExchangers/BaseClasses/HANaturalCylinder.mo index d1d446e976c..c0065a4becd 100644 --- a/Buildings/Fluid/HeatExchangers/BaseClasses/HANaturalCylinder.mo +++ b/Buildings/Fluid/HeatExchangers/BaseClasses/HANaturalCylinder.mo @@ -189,7 +189,7 @@ First implementation. "), Icon(graphics={ Text( extent={{-66,88},{60,-2}}, - lineColor={0,0,0}, + textColor={0,0,0}, fillColor={255,255,255}, fillPattern=FillPattern.Solid, textString="hA"), diff --git a/Buildings/Fluid/HeatExchangers/BaseClasses/MassExchange.mo b/Buildings/Fluid/HeatExchangers/BaseClasses/MassExchange.mo index cf70c060398..3a94c0e56e0 100644 --- a/Buildings/Fluid/HeatExchangers/BaseClasses/MassExchange.mo +++ b/Buildings/Fluid/HeatExchangers/BaseClasses/MassExchange.mo @@ -76,25 +76,25 @@ equation fillPattern=FillPattern.Solid), Text( extent={{-92,96},{-48,54}}, - lineColor={0,0,127}, + textColor={0,0,127}, fillColor={255,255,255}, fillPattern=FillPattern.Solid, textString="TSur"), Text( extent={{-96,22},{-48,-26}}, - lineColor={0,0,127}, + textColor={0,0,127}, fillColor={255,255,255}, fillPattern=FillPattern.Solid, textString="XMed"), Text( extent={{-90,-66},{-58,-98}}, - lineColor={0,0,127}, + textColor={0,0,127}, fillColor={255,255,255}, fillPattern=FillPattern.Solid, textString="Gc"), Text( extent={{54,10},{94,-6}}, - lineColor={0,0,127}, + textColor={0,0,127}, fillColor={255,255,255}, fillPattern=FillPattern.Solid, textString="m"), diff --git a/Buildings/Fluid/HeatExchangers/BaseClasses/PartialDuctPipeManifold.mo b/Buildings/Fluid/HeatExchangers/BaseClasses/PartialDuctPipeManifold.mo index d3fc0e12e01..c564668b50c 100644 --- a/Buildings/Fluid/HeatExchangers/BaseClasses/PartialDuctPipeManifold.mo +++ b/Buildings/Fluid/HeatExchangers/BaseClasses/PartialDuctPipeManifold.mo @@ -57,7 +57,7 @@ partial model PartialDuctPipeManifold fillPattern=FillPattern.Solid), Text( extent={{-84,-48},{84,-120}}, - lineColor={0,0,255}, + textColor={0,0,255}, fillColor={0,0,255}, fillPattern=FillPattern.Solid)}), Documentation(info=" diff --git a/Buildings/Fluid/HeatExchangers/BaseClasses/PartialHexElement.mo b/Buildings/Fluid/HeatExchangers/BaseClasses/PartialHexElement.mo index fc2712b3fd9..e93de70f1bd 100644 --- a/Buildings/Fluid/HeatExchangers/BaseClasses/PartialHexElement.mo +++ b/Buildings/Fluid/HeatExchangers/BaseClasses/PartialHexElement.mo @@ -212,9 +212,9 @@ First implementation. "), Icon(coordinateSystem(preserveAspectRatio=false, extent={{-100,-100},{100, 100}}), graphics={Text( extent={{-84,114},{-62,86}}, - lineColor={0,0,255}, + textColor={0,0,255}, textString="h"), Text( extent={{58,-92},{84,-120}}, - lineColor={0,0,255}, + textColor={0,0,255}, textString="h")})); end PartialHexElement; diff --git a/Buildings/Fluid/HeatExchangers/ConstantEffectiveness.mo b/Buildings/Fluid/HeatExchangers/ConstantEffectiveness.mo index d2ffcbf9a86..fe3f12227cc 100644 --- a/Buildings/Fluid/HeatExchangers/ConstantEffectiveness.mo +++ b/Buildings/Fluid/HeatExchangers/ConstantEffectiveness.mo @@ -21,7 +21,7 @@ model ConstantEffectiveness "Heat exchanger with constant effectiveness" fillColor={95,95,95}, fillPattern=FillPattern.Solid), Text( extent={{-56,-12},{54,-72}}, - lineColor={255,255,255}, + textColor={255,255,255}, textString="eps=%eps")}), preferredView="info", defaultComponentName="hex", diff --git a/Buildings/Fluid/HeatExchangers/CoolingTowers/BaseClasses/Merkel.mo b/Buildings/Fluid/HeatExchangers/CoolingTowers/BaseClasses/Merkel.mo index 8ace7556f0e..473b03d04bb 100644 --- a/Buildings/Fluid/HeatExchangers/CoolingTowers/BaseClasses/Merkel.mo +++ b/Buildings/Fluid/HeatExchangers/CoolingTowers/BaseClasses/Merkel.mo @@ -273,7 +273,7 @@ equation fillPattern=FillPattern.Solid), Text( extent={{-54,-10},{58,-130}}, - lineColor={0,0,0}, + textColor={0,0,0}, fillColor={0,127,0}, fillPattern=FillPattern.Solid, textString="Merkel"), diff --git a/Buildings/Fluid/HeatExchangers/CoolingTowers/FixedApproach.mo b/Buildings/Fluid/HeatExchangers/CoolingTowers/FixedApproach.mo index f38709240ca..c9ce1afa86c 100644 --- a/Buildings/Fluid/HeatExchangers/CoolingTowers/FixedApproach.mo +++ b/Buildings/Fluid/HeatExchangers/CoolingTowers/FixedApproach.mo @@ -25,7 +25,7 @@ equation -100},{100,100}}), graphics={ Text( extent={{-100,70},{-70,32}}, - lineColor={0,0,127}, + textColor={0,0,127}, textString="TAir")}), Documentation(info="
diff --git a/Buildings/Fluid/HeatExchangers/CoolingTowers/Merkel.mo b/Buildings/Fluid/HeatExchangers/CoolingTowers/Merkel.mo index 62ed4fe99e2..8ccaf10b7a7 100644 --- a/Buildings/Fluid/HeatExchangers/CoolingTowers/Merkel.mo +++ b/Buildings/Fluid/HeatExchangers/CoolingTowers/Merkel.mo @@ -155,11 +155,11 @@ equation annotation (Icon(coordinateSystem(preserveAspectRatio=false), graphics={ Text( extent={{-98,100},{-86,84}}, - lineColor={0,0,127}, + textColor={0,0,127}, textString="y"), Text( extent={{-104,70},{-70,32}}, - lineColor={0,0,127}, + textColor={0,0,127}, textString="TWB"), Rectangle( extent={{-100,81},{-70,78}}, @@ -169,7 +169,7 @@ equation fillPattern=FillPattern.Solid), Text( extent={{-54,6},{58,-114}}, - lineColor={255,255,255}, + textColor={255,255,255}, fillColor={0,127,0}, fillPattern=FillPattern.Solid, textString="Merkel"), @@ -203,7 +203,7 @@ equation fillPattern=FillPattern.Solid), Text( extent={{64,114},{98,76}}, - lineColor={0,0,127}, + textColor={0,0,127}, textString="PFan"), Rectangle( extent={{78,-60},{82,-4}}, @@ -213,7 +213,7 @@ equation fillPattern=FillPattern.Solid), Text( extent={{70,-58},{104,-96}}, - lineColor={0,0,127}, + textColor={0,0,127}, textString="TLvg"), Rectangle( extent={{78,-58},{102,-62}}, diff --git a/Buildings/Fluid/HeatExchangers/CoolingTowers/YorkCalc.mo b/Buildings/Fluid/HeatExchangers/CoolingTowers/YorkCalc.mo index 4df7dd6490e..954825ebbfb 100644 --- a/Buildings/Fluid/HeatExchangers/CoolingTowers/YorkCalc.mo +++ b/Buildings/Fluid/HeatExchangers/CoolingTowers/YorkCalc.mo @@ -204,11 +204,11 @@ equation -100},{100,100}}), graphics={ Text( extent={{-104,70},{-70,32}}, - lineColor={0,0,127}, + textColor={0,0,127}, textString="TWB"), Text( extent={{-50,4},{42,-110}}, - lineColor={255,255,255}, + textColor={255,255,255}, fillColor={0,127,0}, fillPattern=FillPattern.Solid, textString="York"), @@ -232,7 +232,7 @@ equation fillPattern=FillPattern.Solid), Text( extent={{70,-58},{104,-96}}, - lineColor={0,0,127}, + textColor={0,0,127}, textString="TLvg"), Rectangle( extent={{70,56},{82,52}}, @@ -248,7 +248,7 @@ equation fillPattern=FillPattern.Solid), Text( extent={{64,114},{98,76}}, - lineColor={0,0,127}, + textColor={0,0,127}, textString="PFan"), Ellipse( extent={{0,62},{54,50}}, @@ -268,7 +268,7 @@ equation fillPattern=FillPattern.Solid), Text( extent={{-98,100},{-86,84}}, - lineColor={0,0,127}, + textColor={0,0,127}, textString="y")}), Documentation(info="
diff --git a/Buildings/Fluid/HeatExchangers/DXCoils/AirCooled/Data/Generic/BaseClasses/PerformanceCurve.mo b/Buildings/Fluid/HeatExchangers/DXCoils/AirCooled/Data/Generic/BaseClasses/PerformanceCurve.mo index 19828456b58..cc336e4e450 100644 --- a/Buildings/Fluid/HeatExchangers/DXCoils/AirCooled/Data/Generic/BaseClasses/PerformanceCurve.mo +++ b/Buildings/Fluid/HeatExchangers/DXCoils/AirCooled/Data/Generic/BaseClasses/PerformanceCurve.mo @@ -61,26 +61,26 @@ First implementation. Icon(graphics={ Text( extent={{-95,53},{-12,-2}}, - lineColor={0,0,255}, + textColor={0,0,255}, textString="capFunT"), Text( extent={{7,55},{90,0}}, - lineColor={0,0,255}, + textColor={0,0,255}, textString="%capFunT"), Text( extent={{-105,-9},{-48,-48}}, - lineColor={0,0,255}, + textColor={0,0,255}, textString="capFunFF"), Text( extent={{2,-16},{94,-38}}, - lineColor={0,0,255}, + textColor={0,0,255}, textString="%capFunFF"), Text( extent={{-95,-49},{-12,-104}}, - lineColor={0,0,255}, + textColor={0,0,255}, textString="EIRFunT"), Text( extent={{7,-53},{84,-94}}, - lineColor={0,0,255}, + textColor={0,0,255}, textString="%EIRFunT")})); end PerformanceCurve; diff --git a/Buildings/Fluid/HeatExchangers/DXCoils/AirCooled/Examples/PerformanceCurves/Curve_II.mo b/Buildings/Fluid/HeatExchangers/DXCoils/AirCooled/Examples/PerformanceCurves/Curve_II.mo index 4b432e295af..69732bb0eaf 100644 --- a/Buildings/Fluid/HeatExchangers/DXCoils/AirCooled/Examples/PerformanceCurves/Curve_II.mo +++ b/Buildings/Fluid/HeatExchangers/DXCoils/AirCooled/Examples/PerformanceCurves/Curve_II.mo @@ -41,26 +41,26 @@ First implementation. Icon(graphics={ Text( extent={{-95,53},{-12,-2}}, - lineColor={0,0,255}, + textColor={0,0,255}, textString="capFunT"), Text( extent={{7,55},{90,0}}, - lineColor={0,0,255}, + textColor={0,0,255}, textString="%capFunT"), Text( extent={{-105,-9},{-48,-48}}, - lineColor={0,0,255}, + textColor={0,0,255}, textString="capFunFF"), Text( extent={{2,-16},{94,-38}}, - lineColor={0,0,255}, + textColor={0,0,255}, textString="%capFunFF"), Text( extent={{-95,-49},{-12,-104}}, - lineColor={0,0,255}, + textColor={0,0,255}, textString="EIRFunT"), Text( extent={{7,-53},{84,-94}}, - lineColor={0,0,255}, + textColor={0,0,255}, textString="%EIRFunT")})); end Curve_II; diff --git a/Buildings/Fluid/HeatExchangers/DXCoils/AirCooled/Examples/PerformanceCurves/Curve_III.mo b/Buildings/Fluid/HeatExchangers/DXCoils/AirCooled/Examples/PerformanceCurves/Curve_III.mo index 8d944cecd6c..6d6e0681ce3 100644 --- a/Buildings/Fluid/HeatExchangers/DXCoils/AirCooled/Examples/PerformanceCurves/Curve_III.mo +++ b/Buildings/Fluid/HeatExchangers/DXCoils/AirCooled/Examples/PerformanceCurves/Curve_III.mo @@ -41,26 +41,26 @@ First implementation. Icon(graphics={ Text( extent={{-95,53},{-12,-2}}, - lineColor={0,0,255}, + textColor={0,0,255}, textString="capFunT"), Text( extent={{7,55},{90,0}}, - lineColor={0,0,255}, + textColor={0,0,255}, textString="%capFunT"), Text( extent={{-105,-9},{-48,-48}}, - lineColor={0,0,255}, + textColor={0,0,255}, textString="capFunFF"), Text( extent={{2,-16},{94,-38}}, - lineColor={0,0,255}, + textColor={0,0,255}, textString="%capFunFF"), Text( extent={{-95,-49},{-12,-104}}, - lineColor={0,0,255}, + textColor={0,0,255}, textString="EIRFunT"), Text( extent={{7,-53},{84,-94}}, - lineColor={0,0,255}, + textColor={0,0,255}, textString="%EIRFunT")})); end Curve_III; diff --git a/Buildings/Fluid/HeatExchangers/DXCoils/AirCooled/MultiStage.mo b/Buildings/Fluid/HeatExchangers/DXCoils/AirCooled/MultiStage.mo index 28ed2feeb12..bb13b7af4b7 100644 --- a/Buildings/Fluid/HeatExchangers/DXCoils/AirCooled/MultiStage.mo +++ b/Buildings/Fluid/HeatExchangers/DXCoils/AirCooled/MultiStage.mo @@ -72,6 +72,6 @@ First implementation. "), Icon(graphics={Text( extent={{-102,94},{-44,76}}, - lineColor={0,0,127}, + textColor={0,0,127}, textString="stage")})); end MultiStage; diff --git a/Buildings/Fluid/HeatExchangers/DXCoils/AirCooled/SingleSpeed.mo b/Buildings/Fluid/HeatExchangers/DXCoils/AirCooled/SingleSpeed.mo index 9b298801e2c..8893643c73e 100644 --- a/Buildings/Fluid/HeatExchangers/DXCoils/AirCooled/SingleSpeed.mo +++ b/Buildings/Fluid/HeatExchangers/DXCoils/AirCooled/SingleSpeed.mo @@ -56,6 +56,6 @@ First implementation. "), Icon(graphics={Text( extent={{-140,132},{-96,112}}, - lineColor={0,0,255}, + textColor={0,0,255}, textString="on")})); end SingleSpeed; diff --git a/Buildings/Fluid/HeatExchangers/DXCoils/AirCooled/VariableSpeed.mo b/Buildings/Fluid/HeatExchangers/DXCoils/AirCooled/VariableSpeed.mo index 5d96733a7ee..a1e5ae10631 100644 --- a/Buildings/Fluid/HeatExchangers/DXCoils/AirCooled/VariableSpeed.mo +++ b/Buildings/Fluid/HeatExchangers/DXCoils/AirCooled/VariableSpeed.mo @@ -67,6 +67,6 @@ First implementation. "), Icon(graphics={Text( extent={{-96,96},{-38,78}}, - lineColor={0,0,127}, + textColor={0,0,127}, textString="speRat")})); end VariableSpeed; diff --git a/Buildings/Fluid/HeatExchangers/DXCoils/BaseClasses/ApparatusDewPoint.mo b/Buildings/Fluid/HeatExchangers/DXCoils/BaseClasses/ApparatusDewPoint.mo index e91d334f8be..8130a7d3888 100644 --- a/Buildings/Fluid/HeatExchangers/DXCoils/BaseClasses/ApparatusDewPoint.mo +++ b/Buildings/Fluid/HeatExchangers/DXCoils/BaseClasses/ApparatusDewPoint.mo @@ -73,7 +73,7 @@ equation fillPattern=FillPattern.Solid), Text( extent={{-86,12},{-2,-50}}, - lineColor={255,0,0}, + textColor={255,0,0}, lineThickness=0.5, fillColor={0,0,255}, fillPattern=FillPattern.Solid, diff --git a/Buildings/Fluid/HeatExchangers/DXCoils/BaseClasses/CoolingCapacityAirCooled.mo b/Buildings/Fluid/HeatExchangers/DXCoils/BaseClasses/CoolingCapacityAirCooled.mo index 8524fab0018..78eaa5228fd 100644 --- a/Buildings/Fluid/HeatExchangers/DXCoils/BaseClasses/CoolingCapacityAirCooled.mo +++ b/Buildings/Fluid/HeatExchangers/DXCoils/BaseClasses/CoolingCapacityAirCooled.mo @@ -23,7 +23,7 @@ equation graphics={ Text( extent={{-100,100},{100,-100}}, - lineColor={0,0,255}, + textColor={0,0,255}, textStyle={TextStyle.Italic}, textString="f(T,m)")}), Documentation(info=" diff --git a/Buildings/Fluid/HeatExchangers/DXCoils/BaseClasses/CoolingCapacityWaterCooled.mo b/Buildings/Fluid/HeatExchangers/DXCoils/BaseClasses/CoolingCapacityWaterCooled.mo index 4d3c5083e22..d3cd8c68463 100644 --- a/Buildings/Fluid/HeatExchangers/DXCoils/BaseClasses/CoolingCapacityWaterCooled.mo +++ b/Buildings/Fluid/HeatExchangers/DXCoils/BaseClasses/CoolingCapacityWaterCooled.mo @@ -98,7 +98,7 @@ if stage > 0 then graphics={ Text( extent={{-100,100},{100,-100}}, - lineColor={0,0,255}, + textColor={0,0,255}, textStyle={TextStyle.Italic}, textString="f(T,m)")}), Documentation(info=" diff --git a/Buildings/Fluid/HeatExchangers/DXCoils/BaseClasses/DXCooling.mo b/Buildings/Fluid/HeatExchangers/DXCoils/BaseClasses/DXCooling.mo index c88d8b60cb9..95eeda3465f 100644 --- a/Buildings/Fluid/HeatExchangers/DXCoils/BaseClasses/DXCooling.mo +++ b/Buildings/Fluid/HeatExchangers/DXCoils/BaseClasses/DXCooling.mo @@ -177,7 +177,7 @@ First implementation. graphics={ Text( extent={{-64,-56},{78,-92}}, - lineColor={0,0,0}, + textColor={0,0,0}, lineThickness=0.5, fillColor={85,170,255}, fillPattern=FillPattern.Solid, diff --git a/Buildings/Fluid/HeatExchangers/DXCoils/BaseClasses/DryCoil.mo b/Buildings/Fluid/HeatExchangers/DXCoils/BaseClasses/DryCoil.mo index 199b3332d8b..b74df103551 100644 --- a/Buildings/Fluid/HeatExchangers/DXCoils/BaseClasses/DryCoil.mo +++ b/Buildings/Fluid/HeatExchangers/DXCoils/BaseClasses/DryCoil.mo @@ -44,7 +44,7 @@ First implementation. lineThickness=0.5), Text( extent={{-62,-18},{80,-54}}, - lineColor={0,0,0}, + textColor={0,0,0}, lineThickness=0.5, fillColor={85,170,255}, fillPattern=FillPattern.Solid, diff --git a/Buildings/Fluid/HeatExchangers/DXCoils/BaseClasses/DryWetSelector.mo b/Buildings/Fluid/HeatExchangers/DXCoils/BaseClasses/DryWetSelector.mo index eb107af68ee..6f499d4e8c5 100644 --- a/Buildings/Fluid/HeatExchangers/DXCoils/BaseClasses/DryWetSelector.mo +++ b/Buildings/Fluid/HeatExchangers/DXCoils/BaseClasses/DryWetSelector.mo @@ -141,7 +141,7 @@ First implementation. fillPattern=FillPattern.CrossDiag), Text( extent={{-70,94},{70,52}}, - lineColor={0,0,255}, + textColor={0,0,255}, fillColor={255,255,255}, fillPattern=FillPattern.Solid, textString="%name")})); diff --git a/Buildings/Fluid/HeatExchangers/DXCoils/BaseClasses/Examples/PerformanceCurves/Curve_III_AirCooled.mo b/Buildings/Fluid/HeatExchangers/DXCoils/BaseClasses/Examples/PerformanceCurves/Curve_III_AirCooled.mo index 7d6161b9e03..8b3abbbcf71 100644 --- a/Buildings/Fluid/HeatExchangers/DXCoils/BaseClasses/Examples/PerformanceCurves/Curve_III_AirCooled.mo +++ b/Buildings/Fluid/HeatExchangers/DXCoils/BaseClasses/Examples/PerformanceCurves/Curve_III_AirCooled.mo @@ -36,26 +36,26 @@ First implementation. Icon(graphics={ Text( extent={{-95,53},{-12,-2}}, - lineColor={0,0,255}, + textColor={0,0,255}, textString="capFunT"), Text( extent={{7,55},{90,0}}, - lineColor={0,0,255}, + textColor={0,0,255}, textString="%capFunT"), Text( extent={{-105,-9},{-48,-48}}, - lineColor={0,0,255}, + textColor={0,0,255}, textString="capFunFF"), Text( extent={{2,-16},{94,-38}}, - lineColor={0,0,255}, + textColor={0,0,255}, textString="%capFunFF"), Text( extent={{-95,-49},{-12,-104}}, - lineColor={0,0,255}, + textColor={0,0,255}, textString="EIRFunT"), Text( extent={{7,-53},{84,-94}}, - lineColor={0,0,255}, + textColor={0,0,255}, textString="%EIRFunT")})); end Curve_III_AirCooled; diff --git a/Buildings/Fluid/HeatExchangers/DXCoils/BaseClasses/Examples/PerformanceCurves/Curve_II_AirCooled.mo b/Buildings/Fluid/HeatExchangers/DXCoils/BaseClasses/Examples/PerformanceCurves/Curve_II_AirCooled.mo index edfd05235df..6c0c74e9b7f 100644 --- a/Buildings/Fluid/HeatExchangers/DXCoils/BaseClasses/Examples/PerformanceCurves/Curve_II_AirCooled.mo +++ b/Buildings/Fluid/HeatExchangers/DXCoils/BaseClasses/Examples/PerformanceCurves/Curve_II_AirCooled.mo @@ -36,26 +36,26 @@ First implementation. Icon(graphics={ Text( extent={{-95,53},{-12,-2}}, - lineColor={0,0,255}, + textColor={0,0,255}, textString="capFunT"), Text( extent={{7,55},{90,0}}, - lineColor={0,0,255}, + textColor={0,0,255}, textString="%capFunT"), Text( extent={{-105,-9},{-48,-48}}, - lineColor={0,0,255}, + textColor={0,0,255}, textString="capFunFF"), Text( extent={{2,-16},{94,-38}}, - lineColor={0,0,255}, + textColor={0,0,255}, textString="%capFunFF"), Text( extent={{-95,-49},{-12,-104}}, - lineColor={0,0,255}, + textColor={0,0,255}, textString="EIRFunT"), Text( extent={{7,-53},{84,-94}}, - lineColor={0,0,255}, + textColor={0,0,255}, textString="%EIRFunT")})); end Curve_II_AirCooled; diff --git a/Buildings/Fluid/HeatExchangers/DXCoils/BaseClasses/Examples/PerformanceCurves/Curve_I_WaterCooled.mo b/Buildings/Fluid/HeatExchangers/DXCoils/BaseClasses/Examples/PerformanceCurves/Curve_I_WaterCooled.mo index 30838eb3b03..70a37a84b24 100644 --- a/Buildings/Fluid/HeatExchangers/DXCoils/BaseClasses/Examples/PerformanceCurves/Curve_I_WaterCooled.mo +++ b/Buildings/Fluid/HeatExchangers/DXCoils/BaseClasses/Examples/PerformanceCurves/Curve_I_WaterCooled.mo @@ -40,26 +40,26 @@ First implementation. Icon(graphics={ Text( extent={{-95,53},{-12,-2}}, - lineColor={0,0,255}, + textColor={0,0,255}, textString="capFunT"), Text( extent={{7,55},{90,0}}, - lineColor={0,0,255}, + textColor={0,0,255}, textString="%capFunT"), Text( extent={{-105,-9},{-48,-48}}, - lineColor={0,0,255}, + textColor={0,0,255}, textString="capFunFF"), Text( extent={{2,-16},{94,-38}}, - lineColor={0,0,255}, + textColor={0,0,255}, textString="%capFunFF"), Text( extent={{-95,-49},{-12,-104}}, - lineColor={0,0,255}, + textColor={0,0,255}, textString="EIRFunT"), Text( extent={{7,-53},{84,-94}}, - lineColor={0,0,255}, + textColor={0,0,255}, textString="%EIRFunT")})); end Curve_I_WaterCooled; diff --git a/Buildings/Fluid/HeatExchangers/DXCoils/BaseClasses/InputPower.mo b/Buildings/Fluid/HeatExchangers/DXCoils/BaseClasses/InputPower.mo index b1134072876..9066cd15a21 100644 --- a/Buildings/Fluid/HeatExchangers/DXCoils/BaseClasses/InputPower.mo +++ b/Buildings/Fluid/HeatExchangers/DXCoils/BaseClasses/InputPower.mo @@ -29,7 +29,7 @@ equation 100}}), graphics={ Text( extent={{-50,44},{56,-40}}, - lineColor={0,0,255}, + textColor={0,0,255}, textString="P")}), Documentation(info="
diff --git a/Buildings/Fluid/HeatExchangers/DXCoils/BaseClasses/PartialCoolingCapacity.mo b/Buildings/Fluid/HeatExchangers/DXCoils/BaseClasses/PartialCoolingCapacity.mo index bf40079bd12..04e2fe5db27 100644 --- a/Buildings/Fluid/HeatExchangers/DXCoils/BaseClasses/PartialCoolingCapacity.mo +++ b/Buildings/Fluid/HeatExchangers/DXCoils/BaseClasses/PartialCoolingCapacity.mo @@ -212,7 +212,7 @@ if stage > 0 then graphics={ Text( extent={{-100,100},{100,-100}}, - lineColor={0,0,255}, + textColor={0,0,255}, textStyle={TextStyle.Italic}, textString="f(T,m)")}), Documentation(info=" diff --git a/Buildings/Fluid/HeatExchangers/DXCoils/BaseClasses/PartialDXCoil.mo b/Buildings/Fluid/HeatExchangers/DXCoils/BaseClasses/PartialDXCoil.mo index 10be77ad73b..b09688fb28d 100644 --- a/Buildings/Fluid/HeatExchangers/DXCoils/BaseClasses/PartialDXCoil.mo +++ b/Buildings/Fluid/HeatExchangers/DXCoils/BaseClasses/PartialDXCoil.mo @@ -270,15 +270,15 @@ First implementation. "), Icon(graphics={Text( extent={{-138,64},{-80,46}}, - lineColor={0,0,127}, + textColor={0,0,127}, textString="TConIn"), Text( extent={{58,98},{102,78}}, - lineColor={0,0,127}, + textColor={0,0,127}, textString="P"), Text( extent={{54,60},{98,40}}, - lineColor={0,0,127}, + textColor={0,0,127}, textString="QLat"), Text( extent={{54,80},{98,60}}, - lineColor={0,0,127}, + textColor={0,0,127}, textString="QSen")})); end PartialDXCoil; diff --git a/Buildings/Fluid/HeatExchangers/DXCoils/BaseClasses/PartialWaterCooledDXCoil.mo b/Buildings/Fluid/HeatExchangers/DXCoils/BaseClasses/PartialWaterCooledDXCoil.mo index 7fd9b0d4af9..b8e1b01abd4 100644 --- a/Buildings/Fluid/HeatExchangers/DXCoils/BaseClasses/PartialWaterCooledDXCoil.mo +++ b/Buildings/Fluid/HeatExchangers/DXCoils/BaseClasses/PartialWaterCooledDXCoil.mo @@ -313,10 +313,10 @@ equation fillPattern=FillPattern.Solid), Text( extent={{52,42},{96,22}}, - lineColor={0,0,127}, + textColor={0,0,127}, textString="QEvaLat"),Text( extent={{54,72},{98,52}}, - lineColor={0,0,127}, + textColor={0,0,127}, textString="QEvaSen"), Rectangle( extent={{0,-56},{62,-66}}, @@ -332,7 +332,7 @@ equation fillPattern=FillPattern.Solid), Text( extent={{54,100},{98,80}}, - lineColor={0,0,127}, + textColor={0,0,127}, textString="P"), Rectangle( extent={{-64,-66},{-56,-90}}, diff --git a/Buildings/Fluid/HeatExchangers/DXCoils/BaseClasses/SensibleHeatRatio.mo b/Buildings/Fluid/HeatExchangers/DXCoils/BaseClasses/SensibleHeatRatio.mo index 0020f432882..eb307df6bff 100644 --- a/Buildings/Fluid/HeatExchangers/DXCoils/BaseClasses/SensibleHeatRatio.mo +++ b/Buildings/Fluid/HeatExchangers/DXCoils/BaseClasses/SensibleHeatRatio.mo @@ -86,7 +86,7 @@ First implementation. "),Icon(graphics={Text( extent={{-100,98},{98,-98}}, - lineColor={0,0,255}, + textColor={0,0,255}, fillColor={0,0,255}, fillPattern=FillPattern.Solid, textString="Qs/Q")})); diff --git a/Buildings/Fluid/HeatExchangers/DXCoils/BaseClasses/SpeedShift.mo b/Buildings/Fluid/HeatExchangers/DXCoils/BaseClasses/SpeedShift.mo index 6858e570aac..d8587becb9d 100644 --- a/Buildings/Fluid/HeatExchangers/DXCoils/BaseClasses/SpeedShift.mo +++ b/Buildings/Fluid/HeatExchangers/DXCoils/BaseClasses/SpeedShift.mo @@ -59,7 +59,7 @@ First implementation. extent={{-100,-100},{100,100}}, grid={1,1}), graphics={ Text(extent={{-120,140},{120,100}}, - lineColor={0,0,255}, + textColor={0,0,255}, textString="%name"), Ellipse( extent={{-70,68},{70,-72}}, diff --git a/Buildings/Fluid/HeatExchangers/DXCoils/BaseClasses/WetCoil.mo b/Buildings/Fluid/HeatExchangers/DXCoils/BaseClasses/WetCoil.mo index 8bf63b70a06..b951d71ac08 100644 --- a/Buildings/Fluid/HeatExchangers/DXCoils/BaseClasses/WetCoil.mo +++ b/Buildings/Fluid/HeatExchangers/DXCoils/BaseClasses/WetCoil.mo @@ -216,7 +216,7 @@ First implementation. fillPattern=FillPattern.Solid), Text( extent={{-62,-18},{80,-54}}, - lineColor={0,0,0}, + textColor={0,0,0}, lineThickness=0.5, fillColor={85,170,255}, fillPattern=FillPattern.Solid, diff --git a/Buildings/Fluid/HeatExchangers/DXCoils/WaterCooled/Data/Generic/BaseClasses/PerformanceCurve.mo b/Buildings/Fluid/HeatExchangers/DXCoils/WaterCooled/Data/Generic/BaseClasses/PerformanceCurve.mo index 1b41253a103..9a0528433b7 100644 --- a/Buildings/Fluid/HeatExchangers/DXCoils/WaterCooled/Data/Generic/BaseClasses/PerformanceCurve.mo +++ b/Buildings/Fluid/HeatExchangers/DXCoils/WaterCooled/Data/Generic/BaseClasses/PerformanceCurve.mo @@ -41,26 +41,26 @@ First implementation. Icon(graphics={ Text( extent={{-95,53},{-12,-2}}, - lineColor={0,0,255}, + textColor={0,0,255}, textString="capFunT"), Text( extent={{7,55},{90,0}}, - lineColor={0,0,255}, + textColor={0,0,255}, textString="%capFunT"), Text( extent={{-105,-9},{-48,-48}}, - lineColor={0,0,255}, + textColor={0,0,255}, textString="capFunFF"), Text( extent={{2,-16},{94,-38}}, - lineColor={0,0,255}, + textColor={0,0,255}, textString="%capFunFF"), Text( extent={{-95,-49},{-12,-104}}, - lineColor={0,0,255}, + textColor={0,0,255}, textString="EIRFunT"), Text( extent={{7,-53},{84,-94}}, - lineColor={0,0,255}, + textColor={0,0,255}, textString="%EIRFunT")})); end PerformanceCurve; diff --git a/Buildings/Fluid/HeatExchangers/DXCoils/WaterCooled/MultiStage.mo b/Buildings/Fluid/HeatExchangers/DXCoils/WaterCooled/MultiStage.mo index 8d3baf2d2ef..f0e4f9ea676 100644 --- a/Buildings/Fluid/HeatExchangers/DXCoils/WaterCooled/MultiStage.mo +++ b/Buildings/Fluid/HeatExchangers/DXCoils/WaterCooled/MultiStage.mo @@ -14,7 +14,7 @@ equation annotation (Icon(coordinateSystem(preserveAspectRatio=false), graphics={ Text( extent={{54,100},{98,80}}, - lineColor={0,0,127}, + textColor={0,0,127}, textString="P"), Line(points={{-100,80},{-68,80},{-68,20}}, color={ 255,128,0})}), Documentation(revisions="
This model multiplies the heat flow rate so that diff --git a/Buildings/Fluid/HeatExchangers/RadiantSlabs/BaseClasses/PipeToSlabConductance.mo b/Buildings/Fluid/HeatExchangers/RadiantSlabs/BaseClasses/PipeToSlabConductance.mo index 95d996cc951..e09656d6db4 100644 --- a/Buildings/Fluid/HeatExchangers/RadiantSlabs/BaseClasses/PipeToSlabConductance.mo +++ b/Buildings/Fluid/HeatExchangers/RadiantSlabs/BaseClasses/PipeToSlabConductance.mo @@ -196,7 +196,7 @@ equation Line(points={{52,30},{72,20}}, color={191,0,0}), Text( extent={{-145,140},{155,100}}, - lineColor={0,0,255}, + textColor={0,0,255}, textString="%name")}), Documentation(info="
diff --git a/Buildings/Fluid/HeatExchangers/SensibleCooler_T.mo b/Buildings/Fluid/HeatExchangers/SensibleCooler_T.mo
index cf1b7d5a4b0..997160fd995 100644
--- a/Buildings/Fluid/HeatExchangers/SensibleCooler_T.mo
+++ b/Buildings/Fluid/HeatExchangers/SensibleCooler_T.mo
@@ -146,7 +146,7 @@ Buildings, #763.
fillPattern=FillPattern.Solid),
Text(
extent={{20,-10},{64,-56}},
- lineColor={255,255,255},
+ textColor={255,255,255},
textString="-"),
Rectangle(
extent={{-64,34},{-34,54}},
@@ -156,7 +156,7 @@ Buildings, #763.
Line(points={{-64,34},{-52,44},{-64,54}}, color={0,0,0}),
Text(
extent={{26,108},{94,84}},
- lineColor={0,0,127},
+ textColor={0,0,127},
textString="Q_flow"),
Rectangle(
extent={{70,82},{100,78}},
@@ -184,6 +184,6 @@ Buildings, #763.
fillPattern=FillPattern.Solid),
Text(
extent={{-110,102},{-74,84}},
- lineColor={0,0,127},
+ textColor={0,0,127},
textString="T")}));
end SensibleCooler_T;
diff --git a/Buildings/Fluid/HeatExchangers/WetCoilCounterFlow.mo b/Buildings/Fluid/HeatExchangers/WetCoilCounterFlow.mo
index c7ae0725857..f9f9a92f829 100644
--- a/Buildings/Fluid/HeatExchangers/WetCoilCounterFlow.mo
+++ b/Buildings/Fluid/HeatExchangers/WetCoilCounterFlow.mo
@@ -186,9 +186,9 @@ First implementation.
grid={2,2},
initialScale=0.5), graphics={Text(
extent={{60,72},{84,58}},
- lineColor={0,0,255},
+ textColor={0,0,255},
textString="water-side"), Text(
extent={{50,-32},{90,-38}},
- lineColor={0,0,255},
+ textColor={0,0,255},
textString="air-side")}));
end WetCoilCounterFlow;
diff --git a/Buildings/Fluid/HeatPumps/Calibration/ScrollWaterToWater.mo b/Buildings/Fluid/HeatPumps/Calibration/ScrollWaterToWater.mo
index 66cd6c36c95..96ec30bb30a 100644
--- a/Buildings/Fluid/HeatPumps/Calibration/ScrollWaterToWater.mo
+++ b/Buildings/Fluid/HeatPumps/Calibration/ScrollWaterToWater.mo
@@ -47,7 +47,7 @@ model ScrollWaterToWater
{100,100}})),
Diagram(coordinateSystem(preserveAspectRatio=false, extent={{-140,-100},{100,100}}),
graphics={Text(extent={{-88,92},{-64,90}},
- lineColor={28,108,200})}),
+ textColor={28,108,200})}),
preferredView="info",
__Dymola_Commands(file= "modelica://Buildings/Resources/Scripts/Dymola/Fluid/HeatPumps/Calibration/ScrollWaterToWater.mos"
"Simulate and plot"),
diff --git a/Buildings/Fluid/HeatPumps/Carnot_TCon.mo b/Buildings/Fluid/HeatPumps/Carnot_TCon.mo
index 917f1b54785..d7348e14307 100644
--- a/Buildings/Fluid/HeatPumps/Carnot_TCon.mo
+++ b/Buildings/Fluid/HeatPumps/Carnot_TCon.mo
@@ -67,7 +67,7 @@ equation
graphics={
Text(
extent={{-148,156},{-92,114}},
- lineColor={0,0,127},
+ textColor={0,0,127},
fillColor={255,255,255},
fillPattern=FillPattern.Solid,
textString="TCon"),
diff --git a/Buildings/Fluid/HeatPumps/Compressors/BaseClasses/PartialCompressor.mo b/Buildings/Fluid/HeatPumps/Compressors/BaseClasses/PartialCompressor.mo
index ba44b8ebf6a..c2d9c2b72ca 100644
--- a/Buildings/Fluid/HeatPumps/Compressors/BaseClasses/PartialCompressor.mo
+++ b/Buildings/Fluid/HeatPumps/Compressors/BaseClasses/PartialCompressor.mo
@@ -94,9 +94,9 @@ equation
Icon(coordinateSystem(preserveAspectRatio=false,extent={{-100,-100},
{100,100}}), graphics={
Text(extent={{62,-82},{72,-98}}, textString="P",
- lineColor={0,0,127}),
+ textColor={0,0,127}),
Text(extent={{62,98},{72,82}},
- lineColor={0,0,127},
+ textColor={0,0,127},
textString="y"),
Polygon(
points={{-70,-80},{-70,80},{70,60},{70,-60},{-70,-80}},
@@ -114,7 +114,7 @@ equation
Line(points={{60,58},{60,100}}, color={0,0,0}),
Text(
extent={{-149,-114},{151,-154}},
- lineColor={0,0,255},
+ textColor={0,0,255},
textString="%name")}),
defaultComponentName="com",
Documentation(info="
diff --git a/Buildings/Fluid/HeatPumps/Data/BaseClasses/HeatPumps.mo b/Buildings/Fluid/HeatPumps/Data/BaseClasses/HeatPumps.mo
index 947e99f5cac..9deadd784fa 100644
--- a/Buildings/Fluid/HeatPumps/Data/BaseClasses/HeatPumps.mo
+++ b/Buildings/Fluid/HeatPumps/Data/BaseClasses/HeatPumps.mo
@@ -42,14 +42,14 @@ First implementation.
Icon(graphics={
Text(
extent={{-95,53},{-12,-2}},
- lineColor={0,0,255},
+ textColor={0,0,255},
textString="etaEle"),
Text(
extent={{-95,-9},{-48,-48}},
- lineColor={0,0,255},
+ textColor={0,0,255},
textString="PLos"),
Text(
extent={{-95,-49},{-12,-104}},
- lineColor={0,0,255},
+ textColor={0,0,255},
textString="dTSup")}));
end HeatPumps;
diff --git a/Buildings/Fluid/Humidifiers/Humidifier_u.mo b/Buildings/Fluid/Humidifiers/Humidifier_u.mo
index efa911ed4fb..e9f182eed2f 100644
--- a/Buildings/Fluid/Humidifiers/Humidifier_u.mo
+++ b/Buildings/Fluid/Humidifiers/Humidifier_u.mo
@@ -54,7 +54,7 @@ equation
fillPattern=FillPattern.Solid),
Text(
extent={{-114,104},{-70,76}},
- lineColor={0,0,127},
+ textColor={0,0,127},
textString="u"),
Rectangle(
visible=use_T_in,
@@ -94,7 +94,7 @@ equation
fillPattern=FillPattern.Solid),
Text(
extent={{30,112},{96,58}},
- lineColor={0,0,127},
+ textColor={0,0,127},
textString="mWat_flow"),
Polygon(
points={{42,10},{54,2},{54,2},{42,-4},{42,-2},{50,2},{50,2},{42,8},{
diff --git a/Buildings/Fluid/Humidifiers/SprayAirWasher_X.mo b/Buildings/Fluid/Humidifiers/SprayAirWasher_X.mo
index 6beabae3f24..29232fa22ff 100644
--- a/Buildings/Fluid/Humidifiers/SprayAirWasher_X.mo
+++ b/Buildings/Fluid/Humidifiers/SprayAirWasher_X.mo
@@ -75,11 +75,11 @@ equation
fillPattern=FillPattern.Solid),
Text(
extent={{-100,98},{-64,80}},
- lineColor={0,0,127},
+ textColor={0,0,127},
textString="X_w"),
Text(
extent={{32,116},{98,62}},
- lineColor={0,0,127},
+ textColor={0,0,127},
textString="mWat_flow"),
Rectangle(
extent={{-100,62},{-70,58}},
diff --git a/Buildings/Fluid/Humidifiers/SteamHumidifier_X.mo b/Buildings/Fluid/Humidifiers/SteamHumidifier_X.mo
index 3729bb1aec1..b88a09a1d86 100644
--- a/Buildings/Fluid/Humidifiers/SteamHumidifier_X.mo
+++ b/Buildings/Fluid/Humidifiers/SteamHumidifier_X.mo
@@ -77,11 +77,11 @@ equation
fillPattern=FillPattern.Solid),
Text(
extent={{-100,98},{-64,80}},
- lineColor={0,0,127},
+ textColor={0,0,127},
textString="X_w"),
Text(
extent={{72,68},{138,14}},
- lineColor={0,0,127},
+ textColor={0,0,127},
textString="mWat_flow"),
Rectangle(
extent={{-100,62},{-70,58}},
@@ -138,7 +138,7 @@ equation
fillPattern=FillPattern.Solid),
Text(
extent={{72,108},{120,92}},
- lineColor={0,0,127},
+ textColor={0,0,127},
textString="Q_flow"),
Polygon(
points={{56,-26},{44,-34},{44,-34},{56,-40},{56,-38},{48,-34},{48,-34},
diff --git a/Buildings/Fluid/Interfaces/ConservationEquation.mo b/Buildings/Fluid/Interfaces/ConservationEquation.mo
index 57e8efc9a7f..078b3f6bae5 100644
--- a/Buildings/Fluid/Interfaces/ConservationEquation.mo
+++ b/Buildings/Fluid/Interfaces/ConservationEquation.mo
@@ -702,11 +702,11 @@ Implemented first version in Buildings library, based on model from
pattern=LinePattern.None),
Text(
extent={{-89,17},{-54,34}},
- lineColor={0,0,127},
+ textColor={0,0,127},
textString="mWat_flow"),
Text(
extent={{-89,52},{-54,69}},
- lineColor={0,0,127},
+ textColor={0,0,127},
textString="Q_flow"),
Line(points={{-56,-73},{81,-73}}, color={255,255,255}),
Line(points={{-42,55},{-42,-84}}, color={255,255,255}),
@@ -726,6 +726,6 @@ Implemented first version in Buildings library, based on model from
smooth=Smooth.Bezier),
Text(
extent={{-155,-120},{145,-160}},
- lineColor={0,0,255},
+ textColor={0,0,255},
textString="%name")}));
end ConservationEquation;
diff --git a/Buildings/Fluid/Interfaces/EightPort.mo b/Buildings/Fluid/Interfaces/EightPort.mo
index 530c55afa1a..3de74888084 100644
--- a/Buildings/Fluid/Interfaces/EightPort.mo
+++ b/Buildings/Fluid/Interfaces/EightPort.mo
@@ -163,7 +163,7 @@ See #1050.
extent={{-100,-100},{100,100}},
grid={1,1}), graphics={Text(
extent={{-151,147},{149,107}},
- lineColor={0,0,255},
+ textColor={0,0,255},
fillPattern=FillPattern.HorizontalCylinder,
fillColor={0,127,255},
textString="%name")}),
diff --git a/Buildings/Fluid/Interfaces/Examples/HeaterCooler_u.mo b/Buildings/Fluid/Interfaces/Examples/HeaterCooler_u.mo
index 87b739345ea..b795b831c7d 100644
--- a/Buildings/Fluid/Interfaces/Examples/HeaterCooler_u.mo
+++ b/Buildings/Fluid/Interfaces/Examples/HeaterCooler_u.mo
@@ -483,10 +483,10 @@ equation
annotation(Diagram(coordinateSystem(preserveAspectRatio=false, extent={{-200,
-400},{200,240}}), graphics={Text(
extent={{32,232},{160,190}},
- lineColor={0,0,255},
+ textColor={0,0,255},
textString="Temperature check"), Text(
extent={{-188,-20},{-38,-84}},
- lineColor={0,0,255},
+ textColor={0,0,255},
textString="Same system as above, but with flow reversed")}),
experiment(Tolerance=1e-6, StopTime=3600),
__Dymola_Commands(file="modelica://Buildings/Resources/Scripts/Dymola/Fluid/Interfaces/Examples/HeaterCooler_u.mos"
diff --git a/Buildings/Fluid/Interfaces/Examples/Humidifier_u.mo b/Buildings/Fluid/Interfaces/Examples/Humidifier_u.mo
index a11f02bf312..c05a009b8e5 100644
--- a/Buildings/Fluid/Interfaces/Examples/Humidifier_u.mo
+++ b/Buildings/Fluid/Interfaces/Examples/Humidifier_u.mo
@@ -536,15 +536,15 @@ equation
-320},{360,200}}), graphics={
Text(
extent={{30,204},{158,162}},
- lineColor={0,0,255},
+ textColor={0,0,255},
textString="Temperature check"),
Text(
extent={{220,198},{330,168}},
- lineColor={0,0,255},
+ textColor={0,0,255},
textString="Humidity check"),
Text(
extent={{-198,-4},{-6,-38}},
- lineColor={0,0,255},
+ textColor={0,0,255},
textString="Same models as above, but flow is reversed")}),
experiment(Tolerance=1e-6, StopTime=3600),
__Dymola_Commands(file="modelica://Buildings/Resources/Scripts/Dymola/Fluid/Interfaces/Examples/Humidifier_u.mos"
diff --git a/Buildings/Fluid/Interfaces/PartialFourPort.mo b/Buildings/Fluid/Interfaces/PartialFourPort.mo
index 2cace6e0a65..546db71cd3e 100644
--- a/Buildings/Fluid/Interfaces/PartialFourPort.mo
+++ b/Buildings/Fluid/Interfaces/PartialFourPort.mo
@@ -143,7 +143,7 @@ are often iteration variables in nonlinear equation systems.
extent={{-100,-100},{100,100}},
grid={1,1}), graphics={Text(
extent={{-151,147},{149,107}},
- lineColor={0,0,255},
+ textColor={0,0,255},
fillPattern=FillPattern.HorizontalCylinder,
fillColor={0,127,255},
textString="%name")}));
diff --git a/Buildings/Fluid/Interfaces/PartialFourPortParallel.mo b/Buildings/Fluid/Interfaces/PartialFourPortParallel.mo
index 1c796c82236..2ae78b1a952 100644
--- a/Buildings/Fluid/Interfaces/PartialFourPortParallel.mo
+++ b/Buildings/Fluid/Interfaces/PartialFourPortParallel.mo
@@ -98,7 +98,7 @@ Buildings.Fluid.Interfaces.PartialFourPort.
extent={{-100,-100},{100,100}},
grid={1,1}), graphics={Text(
extent={{-151,147},{149,107}},
- lineColor={0,0,255},
+ textColor={0,0,255},
fillPattern=FillPattern.HorizontalCylinder,
fillColor={0,127,255},
textString="%name")}));
diff --git a/Buildings/Fluid/Interfaces/PartialTwoPort.mo b/Buildings/Fluid/Interfaces/PartialTwoPort.mo
index f5973f8f255..019219a6463 100644
--- a/Buildings/Fluid/Interfaces/PartialTwoPort.mo
+++ b/Buildings/Fluid/Interfaces/PartialTwoPort.mo
@@ -105,6 +105,6 @@ First implementation.
visible=not allowFlowReversal),
Text(
extent={{-149,-114},{151,-154}},
- lineColor={0,0,255},
+ textColor={0,0,255},
textString="%name")}));
end PartialTwoPort;
diff --git a/Buildings/Fluid/Interfaces/PartialTwoPortVector.mo b/Buildings/Fluid/Interfaces/PartialTwoPortVector.mo
index 846f07bc6e9..8529cae4665 100644
--- a/Buildings/Fluid/Interfaces/PartialTwoPortVector.mo
+++ b/Buildings/Fluid/Interfaces/PartialTwoPortVector.mo
@@ -132,7 +132,7 @@ First implementation.
visible=not allowFlowReversal),
Text(
extent={{-149,-114},{151,-154}},
- lineColor={0,0,255},
+ textColor={0,0,255},
textString="%name")}),
Diagram(coordinateSystem(preserveAspectRatio=false, extent={{-100,-100},{100,
100}})));
diff --git a/Buildings/Fluid/Interfaces/PrescribedOutlet.mo b/Buildings/Fluid/Interfaces/PrescribedOutlet.mo
index f8f84ed2f6a..3ae18923c4a 100644
--- a/Buildings/Fluid/Interfaces/PrescribedOutlet.mo
+++ b/Buildings/Fluid/Interfaces/PrescribedOutlet.mo
@@ -353,12 +353,12 @@ equation
fillPattern=FillPattern.Solid),
Text(
extent={{-98,64},{-76,42}},
- lineColor={0,0,127},
+ textColor={0,0,127},
visible=use_X_wSet,
textString="X_w"),
Text(
extent={{74,72},{120,44}},
- lineColor={0,0,127},
+ textColor={0,0,127},
textString="mWat_flow"),
Rectangle(
extent={{-70,60},{70,-60}},
@@ -387,7 +387,7 @@ equation
fillPattern=FillPattern.Solid),
Text(
extent={{-106,102},{-74,88}},
- lineColor={0,0,127},
+ textColor={0,0,127},
visible=use_TSet,
textString="T"),
Rectangle(
@@ -399,7 +399,7 @@ equation
fillPattern=FillPattern.Solid),
Text(
extent={{72,108},{120,92}},
- lineColor={0,0,127},
+ textColor={0,0,127},
textString="Q_flow"),
Rectangle(
extent={{70,82},{100,78}},
diff --git a/Buildings/Fluid/Interfaces/StaticTwoPortConservationEquation.mo b/Buildings/Fluid/Interfaces/StaticTwoPortConservationEquation.mo
index 98370f2d1d8..1ef00671d2b 100644
--- a/Buildings/Fluid/Interfaces/StaticTwoPortConservationEquation.mo
+++ b/Buildings/Fluid/Interfaces/StaticTwoPortConservationEquation.mo
@@ -591,23 +591,23 @@ First implementation.
pattern=LinePattern.None),
Text(
extent={{-93,72},{-58,89}},
- lineColor={0,0,127},
+ textColor={0,0,127},
textString="Q_flow"),
Text(
extent={{-93,37},{-58,54}},
- lineColor={0,0,127},
+ textColor={0,0,127},
textString="mWat_flow"),
Text(
extent={{-41,103},{-10,117}},
- lineColor={0,0,127},
+ textColor={0,0,127},
textString="hOut"),
Text(
extent={{10,103},{41,117}},
- lineColor={0,0,127},
+ textColor={0,0,127},
textString="XiOut"),
Text(
extent={{61,103},{92,117}},
- lineColor={0,0,127},
+ textColor={0,0,127},
textString="COut"),
Line(points={{-42,55},{-42,-84}}, color={255,255,255}),
Polygon(
diff --git a/Buildings/Fluid/MassExchangers/ConstantEffectiveness.mo b/Buildings/Fluid/MassExchangers/ConstantEffectiveness.mo
index fabada0ce88..b273d282f1c 100644
--- a/Buildings/Fluid/MassExchangers/ConstantEffectiveness.mo
+++ b/Buildings/Fluid/MassExchangers/ConstantEffectiveness.mo
@@ -97,11 +97,11 @@ equation
fillPattern=FillPattern.Solid),
Text(
extent={{-62,50},{48,-10}},
- lineColor={255,255,255},
+ textColor={255,255,255},
textString="epsS=%epsS"),
Text(
extent={{-60,4},{50,-56}},
- lineColor={255,255,255},
+ textColor={255,255,255},
textString="epsL=%epsL")}),
preferredView="info",
defaultComponentName="masExc",
diff --git a/Buildings/Fluid/MixingVolumes/BaseClasses/PartialMixingVolume.mo b/Buildings/Fluid/MixingVolumes/BaseClasses/PartialMixingVolume.mo
index e7633166c1a..f0410772440 100644
--- a/Buildings/Fluid/MixingVolumes/BaseClasses/PartialMixingVolume.mo
+++ b/Buildings/Fluid/MixingVolumes/BaseClasses/PartialMixingVolume.mo
@@ -543,12 +543,12 @@ Buildings.Fluid.MixingVolumes.BaseClasses.ClosedVolume.
100}}), graphics={
Text(
extent={{-60,-26},{56,-58}},
- lineColor={255,255,255},
+ textColor={255,255,255},
textString="V=%V"),
Text(
extent={{-152,100},{148,140}},
textString="%name",
- lineColor={0,0,255}),
+ textColor={0,0,255}),
Ellipse(
extent={{-100,98},{100,-102}},
lineColor={0,0,0},
@@ -556,6 +556,6 @@ Buildings.Fluid.MixingVolumes.BaseClasses.ClosedVolume.
fillColor=DynamicSelect({170,213,255}, min(1, max(0, (1-(T-273.15)/50)))*{28,108,200}+min(1, max(0, (T-273.15)/50))*{255,0,0})),
Text(
extent={{62,28},{-58,-22}},
- lineColor={255,255,255},
+ textColor={255,255,255},
textString=DynamicSelect("", String(T-273.15, format=".1f")))}));
end PartialMixingVolume;
diff --git a/Buildings/Fluid/MixingVolumes/MixingVolume.mo b/Buildings/Fluid/MixingVolumes/MixingVolume.mo
index c531110d079..dfa3353a14e 100644
--- a/Buildings/Fluid/MixingVolumes/MixingVolume.mo
+++ b/Buildings/Fluid/MixingVolumes/MixingVolume.mo
@@ -250,5 +250,5 @@ Buildings.Fluid.MixingVolumes.BaseClasses.ClosedVolume.
Text(
extent={{-152,100},{148,140}},
textString="%name",
- lineColor={0,0,255})}));
+ textColor={0,0,255})}));
end MixingVolume;
diff --git a/Buildings/Fluid/MixingVolumes/Validation/MixingVolumeZeroFlow.mo b/Buildings/Fluid/MixingVolumes/Validation/MixingVolumeZeroFlow.mo
index 15f519ab384..514bee09cc1 100644
--- a/Buildings/Fluid/MixingVolumes/Validation/MixingVolumeZeroFlow.mo
+++ b/Buildings/Fluid/MixingVolumes/Validation/MixingVolumeZeroFlow.mo
@@ -172,7 +172,7 @@ equation
coordinateSystem(preserveAspectRatio=false, extent={{-100,-100},{100,100}}),
graphics={Text(
extent={{12,30},{106,10}},
- lineColor={28,108,200},
+ textColor={28,108,200},
textString="<- vol.prescribedHeatFlowRate = true")}),
experiment(
Tolerance=1E-6, StopTime=2),
diff --git a/Buildings/Fluid/Movers/BaseClasses/FlowMachineInterface.mo b/Buildings/Fluid/Movers/BaseClasses/FlowMachineInterface.mo
index 437c6accd17..a52b5029b4b 100644
--- a/Buildings/Fluid/Movers/BaseClasses/FlowMachineInterface.mo
+++ b/Buildings/Fluid/Movers/BaseClasses/FlowMachineInterface.mo
@@ -534,19 +534,19 @@ equation
Icon(coordinateSystem(preserveAspectRatio=false, extent={{-100,-100},{100,100}}),
graphics={
Text(extent={{56,66},{106,52}},
- lineColor={0,0,127},
+ textColor={0,0,127},
textString="dp"),
Text(extent={{56,8},{106,-6}},
- lineColor={0,0,127},
+ textColor={0,0,127},
textString="PEle"),
Text(extent={{52,-22},{102,-36}},
- lineColor={0,0,127},
+ textColor={0,0,127},
textString="eta"),
Text(extent={{50,-52},{100,-66}},
- lineColor={0,0,127},
+ textColor={0,0,127},
textString="etaHyd"),
Text(extent={{50,-72},{100,-86}},
- lineColor={0,0,127},
+ textColor={0,0,127},
textString="etaMot"),
Ellipse(
extent={{-78,34},{44,-88}},
@@ -596,10 +596,10 @@ equation
origin={-43,-31},
rotation=90),
Text(extent={{56,36},{106,22}},
- lineColor={0,0,127},
+ textColor={0,0,127},
textString="WFlo"),
Text(extent={{56,94},{106,80}},
- lineColor={0,0,127},
+ textColor={0,0,127},
textString="V_flow"),
Line(
points={{-74,92},{-74,40}},
diff --git a/Buildings/Fluid/Movers/BaseClasses/IdealSource.mo b/Buildings/Fluid/Movers/BaseClasses/IdealSource.mo
index fb0dade8819..549732cf243 100644
--- a/Buildings/Fluid/Movers/BaseClasses/IdealSource.mo
+++ b/Buildings/Fluid/Movers/BaseClasses/IdealSource.mo
@@ -71,12 +71,12 @@ equation
Text(
visible=not control_m_flow,
extent={{24,44},{80,24}},
- lineColor={255,255,255},
+ textColor={255,255,255},
textString="dp"),
Text(
visible=control_m_flow,
extent={{-80,44},{-24,24}},
- lineColor={255,255,255},
+ textColor={255,255,255},
textString="m")}),
Documentation(info="
diff --git a/Buildings/Fluid/Movers/BaseClasses/PartialFlowMachine.mo b/Buildings/Fluid/Movers/BaseClasses/PartialFlowMachine.mo index 630f23943d5..904d219c4b3 100644 --- a/Buildings/Fluid/Movers/BaseClasses/PartialFlowMachine.mo +++ b/Buildings/Fluid/Movers/BaseClasses/PartialFlowMachine.mo @@ -491,10 +491,10 @@ equation visible=energyDynamics <> Modelica.Fluid.Types.Dynamics.SteadyState, fillColor={0,100,199}), Text(extent={{64,106},{114,92}}, - lineColor={0,0,127}, + textColor={0,0,127}, textString="P"), Text(extent={{42,86},{92,72}}, - lineColor={0,0,127}, + textColor={0,0,127}, textString="y_actual"), Line( points={{0,100},{0,50}}, @@ -515,7 +515,7 @@ equation Text( visible=use_inputFilter, extent={{-20,92},{22,46}}, - lineColor={0,0,0}, + textColor={0,0,0}, fillColor={135,135,135}, fillPattern=FillPattern.Solid, textString="M", diff --git a/Buildings/Fluid/Movers/FlowControlled_dp.mo b/Buildings/Fluid/Movers/FlowControlled_dp.mo index e4a609bc287..f9c3bbc6618 100644 --- a/Buildings/Fluid/Movers/FlowControlled_dp.mo +++ b/Buildings/Fluid/Movers/FlowControlled_dp.mo @@ -115,7 +115,7 @@ equation Icon(graphics={ Text( extent={{-40,126},{-160,76}}, - lineColor={0,0,127}, + textColor={0,0,127}, visible=inputType == Buildings.Fluid.Types.InputType.Continuous or inputType == Buildings.Fluid.Types.InputType.Stages, textString=DynamicSelect("dp", if inputType == Buildings.Fluid.Types.InputType.Continuous then String(dp_in, format=".0f") else String(stage)))}), defaultComponentName="fan", diff --git a/Buildings/Fluid/Movers/FlowControlled_m_flow.mo b/Buildings/Fluid/Movers/FlowControlled_m_flow.mo index a56396c689e..016654e2d4c 100644 --- a/Buildings/Fluid/Movers/FlowControlled_m_flow.mo +++ b/Buildings/Fluid/Movers/FlowControlled_m_flow.mo @@ -85,7 +85,7 @@ equation Icon(graphics={ Text( extent={{-40,126},{-160,76}}, - lineColor={0,0,127}, + textColor={0,0,127}, visible=inputType == Buildings.Fluid.Types.InputType.Continuous or inputType == Buildings.Fluid.Types.InputType.Stages, textString=DynamicSelect("m_flow", if inputType == Buildings.Fluid.Types.InputType.Continuous then String(m_flow_in, leftJustified=false, significantDigits=3) else String(stage)))}), defaultComponentName="fan", diff --git a/Buildings/Fluid/Movers/SpeedControlled_Nrpm.mo b/Buildings/Fluid/Movers/SpeedControlled_Nrpm.mo index 8969d9ded20..9b04c646813 100644 --- a/Buildings/Fluid/Movers/SpeedControlled_Nrpm.mo +++ b/Buildings/Fluid/Movers/SpeedControlled_Nrpm.mo @@ -63,7 +63,7 @@ equation graphics={ Text( extent={{-40,126},{-160,76}}, - lineColor={0,0,127}, + textColor={0,0,127}, visible=inputType == Buildings.Fluid.Types.InputType.Continuous or inputType == Buildings.Fluid.Types.InputType.Stages, textString=DynamicSelect("Nrpm", if inputType == Buildings.Fluid.Types.InputType.Continuous then String(Nrpm, format=".0f") else String(stage)))}), Documentation(info=" diff --git a/Buildings/Fluid/Movers/SpeedControlled_y.mo b/Buildings/Fluid/Movers/SpeedControlled_y.mo index 15f21560db9..bbdd8142818 100644 --- a/Buildings/Fluid/Movers/SpeedControlled_y.mo +++ b/Buildings/Fluid/Movers/SpeedControlled_y.mo @@ -67,7 +67,7 @@ equation graphics={ Text( extent={{-40,126},{-160,76}}, - lineColor={0,0,127}, + textColor={0,0,127}, visible=inputType == Buildings.Fluid.Types.InputType.Continuous or inputType == Buildings.Fluid.Types.InputType.Stages, textString=DynamicSelect("y", if inputType == Buildings.Fluid.Types.InputType.Continuous then String(y, format=".2f") else String(stage)))}), Documentation(info=" diff --git a/Buildings/Fluid/Sensors/Conversions/To_VolumeFraction.mo b/Buildings/Fluid/Sensors/Conversions/To_VolumeFraction.mo index 9391981e7f9..dc6e188a635 100644 --- a/Buildings/Fluid/Sensors/Conversions/To_VolumeFraction.mo +++ b/Buildings/Fluid/Sensors/Conversions/To_VolumeFraction.mo @@ -24,19 +24,19 @@ equation fillPattern=FillPattern.Solid), Text( extent={{-84,52},{-14,14}}, - lineColor={0,0,255}, + textColor={0,0,255}, textString="M'"), Text( extent={{36,48},{102,8}}, - lineColor={0,0,255}, + textColor={0,0,255}, textString="V'"), Text( extent={{22,-14},{106,-52}}, - lineColor={0,0,255}, + textColor={0,0,255}, textString="V"), Text( extent={{-88,-12},{-22,-48}}, - lineColor={0,0,255}, + textColor={0,0,255}, textString="M"), Rectangle( extent={{-72,4},{-38,0}}, @@ -49,11 +49,11 @@ equation fillColor={0,0,255}, fillPattern=FillPattern.Solid),Text( extent={{-48,146},{50,98}}, - lineColor={0,0,255}, + textColor={0,0,255}, textString="%name"), Text( extent={{98,-46},{-22,-96}}, - lineColor={0,0,0}, + textColor={0,0,0}, textString=DynamicSelect("", String(V, leftJustified=false, significantDigits=3)))}), defaultComponentName="toVolFra", Documentation(info=" diff --git a/Buildings/Fluid/Sensors/Density.mo b/Buildings/Fluid/Sensors/Density.mo index 7e80b716d88..c66d54788ac 100644 --- a/Buildings/Fluid/Sensors/Density.mo +++ b/Buildings/Fluid/Sensors/Density.mo @@ -20,15 +20,15 @@ annotation (defaultComponentName="senDen", Text( extent={{-150,80},{150,120}}, textString="%name", - lineColor={0,0,255}), + textColor={0,0,255}), Text( extent={{154,-31},{56,-61}}, - lineColor={0,0,0}, + textColor={0,0,0}, textString="d"), Line(points={{70,0},{100,0}}, color={0,0,127}), Text( extent={{180,90},{60,40}}, - lineColor={0,0,0}, + textColor={0,0,0}, textString=DynamicSelect("", String(d, leftJustified=false, significantDigits=3)))}), Documentation(info="
diff --git a/Buildings/Fluid/Sensors/DensityTwoPort.mo b/Buildings/Fluid/Sensors/DensityTwoPort.mo index 5b6c8c5f881..7ca92bdf6d1 100644 --- a/Buildings/Fluid/Sensors/DensityTwoPort.mo +++ b/Buildings/Fluid/Sensors/DensityTwoPort.mo @@ -64,14 +64,14 @@ annotation (defaultComponentName="senDen", grid={1,1}), graphics={ Text( extent={{102,124},{6,95}}, - lineColor={0,0,0}, + textColor={0,0,0}, textString="d"), Line(points={{0,100},{0,70}}, color={0,0,127}), Line(points={{-100,0},{-70,0}}, color={0,128,255}), Line(points={{70,0},{100,0}}, color={0,128,255}), Text( extent={{-20,120},{-140,70}}, - lineColor={0,0,0}, + textColor={0,0,0}, textString=DynamicSelect("", String(d, leftJustified=false, significantDigits=3)))}), Documentation(info="
diff --git a/Buildings/Fluid/Sensors/EnthalpyFlowRate.mo b/Buildings/Fluid/Sensors/EnthalpyFlowRate.mo index 7d4ba9ad580..b4188064886 100644 --- a/Buildings/Fluid/Sensors/EnthalpyFlowRate.mo +++ b/Buildings/Fluid/Sensors/EnthalpyFlowRate.mo @@ -54,11 +54,11 @@ annotation (defaultComponentName="senEntFlo", Line(points={{0,100},{0,70}}, color={0,0,127}), Text( extent={{180,151},{20,99}}, - lineColor={0,0,0}, + textColor={0,0,0}, textString="H_flow"), Text( extent={{-20,120},{-140,70}}, - lineColor={0,0,0}, + textColor={0,0,0}, textString=DynamicSelect("", String(H_flow, leftJustified=false, significantDigits=3)))}), Documentation(info="
diff --git a/Buildings/Fluid/Sensors/EntropyFlowRate.mo b/Buildings/Fluid/Sensors/EntropyFlowRate.mo index 8e76b588c59..f59083ea2aa 100644 --- a/Buildings/Fluid/Sensors/EntropyFlowRate.mo +++ b/Buildings/Fluid/Sensors/EntropyFlowRate.mo @@ -64,12 +64,12 @@ annotation (defaultComponentName="senS_flow", Line(points={{0,100},{0,70}}, color={0,0,127}), Text( extent={{180,151},{20,99}}, - lineColor={0,0,0}, + textColor={0,0,0}, textString="S_flow"), Ellipse(extent={{-70,70},{70,-70}}, lineColor={255,0,0}), Text( extent={{-20,120},{-140,70}}, - lineColor={0,0,0}, + textColor={0,0,0}, textString=DynamicSelect("", String(S_flow, leftJustified=false, significantDigits=3)))}), Documentation(info="
diff --git a/Buildings/Fluid/Sensors/LatentEnthalpyFlowRate.mo b/Buildings/Fluid/Sensors/LatentEnthalpyFlowRate.mo index 55f80e63125..9671cd80075 100644 --- a/Buildings/Fluid/Sensors/LatentEnthalpyFlowRate.mo +++ b/Buildings/Fluid/Sensors/LatentEnthalpyFlowRate.mo @@ -76,7 +76,7 @@ annotation (defaultComponentName="senLatEnt", Line(points={{0,100},{0,70}}, color={0,0,127}), Text( extent={{180,151},{20,99}}, - lineColor={0,0,0}, + textColor={0,0,0}, textString="HL_flow"), Ellipse( extent={{-70,70},{70,-70}}, @@ -101,7 +101,7 @@ annotation (defaultComponentName="senLatEnt", Line(points={{37.6,13.7},{65.8,23.9}}), Text( extent={{-20,120},{-140,70}}, - lineColor={0,0,0}, + textColor={0,0,0}, textString=DynamicSelect("", String(H_flow, leftJustified=false, significantDigits=3)))}), Documentation(info="
diff --git a/Buildings/Fluid/Sensors/MassFlowRate.mo b/Buildings/Fluid/Sensors/MassFlowRate.mo index 8eb748653ee..6b639751ef0 100644 --- a/Buildings/Fluid/Sensors/MassFlowRate.mo +++ b/Buildings/Fluid/Sensors/MassFlowRate.mo @@ -21,13 +21,13 @@ Icon(coordinateSystem(preserveAspectRatio=false, extent={{-100,-100},{100,100}}) Line(points={{70,0},{100,0}}, color={0,128,255}), Text( extent={{162,120},{2,90}}, - lineColor={0,0,0}, + textColor={0,0,0}, textString="m_flow"), Line(points={{0,100},{0,70}}, color={0,0,127}), Line(points={{-100,0},{-70,0}}, color={0,128,255}), Text( extent={{-20,116},{-140,66}}, - lineColor={0,0,0}, + textColor={0,0,0}, textString=DynamicSelect("", String(m_flow, leftJustified=false, significantDigits=3)))}), Documentation(info="
diff --git a/Buildings/Fluid/Sensors/MassFraction.mo b/Buildings/Fluid/Sensors/MassFraction.mo index b353c3ab087..12c4f2741b8 100644 --- a/Buildings/Fluid/Sensors/MassFraction.mo +++ b/Buildings/Fluid/Sensors/MassFraction.mo @@ -25,15 +25,15 @@ annotation (defaultComponentName="senMasFra", Text( extent={{-150,80},{150,120}}, textString="%name", - lineColor={0,0,255}), + textColor={0,0,255}), Text( extent={{160,-30},{60,-60}}, - lineColor={0,0,0}, + textColor={0,0,0}, textString="X"), Line(points={{70,0},{100,0}}, color={0,0,127}), Text( extent={{180,90},{60,40}}, - lineColor={0,0,0}, + textColor={0,0,0}, textString=DynamicSelect("", String(X, leftJustified=false, significantDigits=3)))}), Documentation(info="
diff --git a/Buildings/Fluid/Sensors/MassFractionTwoPort.mo b/Buildings/Fluid/Sensors/MassFractionTwoPort.mo index 8bc2a9d5420..8f9911b510d 100644 --- a/Buildings/Fluid/Sensors/MassFractionTwoPort.mo +++ b/Buildings/Fluid/Sensors/MassFractionTwoPort.mo @@ -58,14 +58,14 @@ annotation (defaultComponentName="senMasFra", grid={1,1}), graphics={ Text( extent={{94,122},{0,92}}, - lineColor={0,0,0}, + textColor={0,0,0}, textString="X"), Line(points={{0,100},{0,70}}, color={0,0,127}), Line(points={{-100,0},{-70,0}}, color={0,128,255}), Line(points={{70,0},{100,0}}, color={0,128,255}), Text( extent={{-20,120},{-140,70}}, - lineColor={0,0,0}, + textColor={0,0,0}, textString=DynamicSelect("", String(X, leftJustified=false, significantDigits=3)))}), Documentation(info="
diff --git a/Buildings/Fluid/Sensors/PPM.mo b/Buildings/Fluid/Sensors/PPM.mo index 87a7d68dfb9..e6dd15befd1 100644 --- a/Buildings/Fluid/Sensors/PPM.mo +++ b/Buildings/Fluid/Sensors/PPM.mo @@ -60,15 +60,15 @@ annotation (defaultComponentName="senPPM", Text( extent={{-150,80},{150,120}}, textString="%name", - lineColor={0,0,255}), + textColor={0,0,255}), Text( extent={{160,-30},{60,-60}}, - lineColor={0,0,0}, + textColor={0,0,0}, textString="ppm"), Line(points={{70,0},{100,0}}, color={0,0,127}), Text( extent={{180,90},{60,40}}, - lineColor={0,0,0}, + textColor={0,0,0}, textString=DynamicSelect("", String(ppm, leftJustified=false, significantDigits=3)))}), Documentation(info="
diff --git a/Buildings/Fluid/Sensors/PPMTwoPort.mo b/Buildings/Fluid/Sensors/PPMTwoPort.mo index 89c567ae48b..57032315803 100644 --- a/Buildings/Fluid/Sensors/PPMTwoPort.mo +++ b/Buildings/Fluid/Sensors/PPMTwoPort.mo @@ -91,14 +91,14 @@ annotation (defaultComponentName="senPPM", graphics={ Text( extent={{82,122},{0,92}}, - lineColor={0,0,0}, + textColor={0,0,0}, textString="ppm"), Line(points={{0,100},{0,70}}, color={0,0,127}), Line(points={{-100,0},{-70,0}}, color={0,128,255}), Line(points={{70,0},{100,0}}, color={0,128,255}), Text( extent={{-20,120},{-140,70}}, - lineColor={0,0,0}, + textColor={0,0,0}, textString=DynamicSelect("", String(ppm, leftJustified=false, significantDigits=3)))}), Documentation(info="
diff --git a/Buildings/Fluid/Sensors/Pressure.mo b/Buildings/Fluid/Sensors/Pressure.mo index f13555175a2..313239a440a 100644 --- a/Buildings/Fluid/Sensors/Pressure.mo +++ b/Buildings/Fluid/Sensors/Pressure.mo @@ -18,15 +18,15 @@ equation Text( extent={{-150,80},{150,120}}, textString="%name", - lineColor={0,0,255}), + textColor={0,0,255}), Text( extent={{151,-20},{57,-50}}, - lineColor={0,0,0}, + textColor={0,0,0}, textString="p"), Line(points={{70,0},{100,0}}, color={0,0,127}), Text( extent={{180,90},{60,40}}, - lineColor={0,0,0}, + textColor={0,0,0}, textString=DynamicSelect("", String(p, leftJustified=false, significantDigits=5)))}), Documentation(info="
diff --git a/Buildings/Fluid/Sensors/RelativeHumidity.mo b/Buildings/Fluid/Sensors/RelativeHumidity.mo index 47474bdfbb3..0d1009a2030 100644 --- a/Buildings/Fluid/Sensors/RelativeHumidity.mo +++ b/Buildings/Fluid/Sensors/RelativeHumidity.mo @@ -30,15 +30,15 @@ annotation (defaultComponentName="senRelHum", Text( extent={{-150,80},{150,120}}, textString="%name", - lineColor={0,0,255}), + textColor={0,0,255}), Text( extent={{160,-30},{60,-60}}, - lineColor={0,0,0}, + textColor={0,0,0}, textString="phi"), Line(points={{70,0},{100,0}}, color={0,0,127}), Text( extent={{180,90},{60,40}}, - lineColor={0,0,0}, + textColor={0,0,0}, textString=DynamicSelect("", String(phi, leftJustified=false, significantDigits=2)))}), Documentation(info="
diff --git a/Buildings/Fluid/Sensors/RelativeHumidityTwoPort.mo b/Buildings/Fluid/Sensors/RelativeHumidityTwoPort.mo index fc828e83d9e..14c0cd1ac88 100644 --- a/Buildings/Fluid/Sensors/RelativeHumidityTwoPort.mo +++ b/Buildings/Fluid/Sensors/RelativeHumidityTwoPort.mo @@ -90,14 +90,14 @@ annotation (defaultComponentName="senRelHum", grid={1,1}), graphics={ Text( extent={{102,124},{6,95}}, - lineColor={0,0,0}, + textColor={0,0,0}, textString="phi"), Line(points={{0,100},{0,70}}, color={0,0,127}), Line(points={{-100,0},{-70,0}}, color={0,128,255}), Line(points={{70,0},{100,0}}, color={0,128,255}), Text( extent={{-20,120},{-140,70}}, - lineColor={0,0,0}, + textColor={0,0,0}, textString=DynamicSelect("", String(phi, leftJustified=false, significantDigits=2)))}), Documentation(info="
diff --git a/Buildings/Fluid/Sensors/RelativePressure.mo b/Buildings/Fluid/Sensors/RelativePressure.mo index e5590d8f4dd..f2c36cff2ed 100644 --- a/Buildings/Fluid/Sensors/RelativePressure.mo +++ b/Buildings/Fluid/Sensors/RelativePressure.mo @@ -53,10 +53,10 @@ equation Text( extent={{-150,40},{150,80}}, textString="%name", - lineColor={0,0,255}), + textColor={0,0,255}), Text( extent={{130,-70},{4,-100}}, - lineColor={0,0,0}, + textColor={0,0,0}, textString="p_rel"), Line( points={{32,3},{-58,3}}, @@ -68,7 +68,7 @@ equation fillPattern=FillPattern.Solid), Text( extent={{-20,-56},{-140,-106}}, - lineColor={0,0,0}, + textColor={0,0,0}, textString=DynamicSelect("", String(p_rel, leftJustified=false, significantDigits=3)))}), Documentation(info="
diff --git a/Buildings/Fluid/Sensors/RelativeTemperature.mo b/Buildings/Fluid/Sensors/RelativeTemperature.mo index 5364059cea7..74e8242b479 100644 --- a/Buildings/Fluid/Sensors/RelativeTemperature.mo +++ b/Buildings/Fluid/Sensors/RelativeTemperature.mo @@ -53,10 +53,10 @@ equation Text( extent={{-150,40},{150,80}}, textString="%name", - lineColor={0,0,255}), + textColor={0,0,255}), Text( extent={{128,-70},{10,-100}}, - lineColor={0,0,0}, + textColor={0,0,0}, textString="T_rel"), Line( points={{34,3},{-56,3}}, @@ -68,7 +68,7 @@ equation fillPattern=FillPattern.Solid), Text( extent={{-20,-56},{-140,-106}}, - lineColor={0,0,0}, + textColor={0,0,0}, textString=DynamicSelect("", String(T_rel, leftJustified=false, significantDigits=3)))}), Documentation(info="
diff --git a/Buildings/Fluid/Sensors/SensibleEnthalpyFlowRate.mo b/Buildings/Fluid/Sensors/SensibleEnthalpyFlowRate.mo index 1028b964e60..a5fa9e51984 100644 --- a/Buildings/Fluid/Sensors/SensibleEnthalpyFlowRate.mo +++ b/Buildings/Fluid/Sensors/SensibleEnthalpyFlowRate.mo @@ -73,7 +73,7 @@ annotation (defaultComponentName="senEntFlo", Line(points={{0,100},{0,70}}, color={0,0,127}), Text( extent={{180,151},{20,99}}, - lineColor={0,0,0}, + textColor={0,0,0}, textString="HS_flow"), Polygon( points={{-0.48,31.6},{18,26},{18,57.2},{-0.48,31.6}}, @@ -93,7 +93,7 @@ annotation (defaultComponentName="senEntFlo", Line(points={{-37.6,13.7},{-65.8,23.9}}), Text( extent={{-20,120},{-140,70}}, - lineColor={0,0,0}, + textColor={0,0,0}, textString=DynamicSelect("", String(H_flow, leftJustified=false, significantDigits=3)))}), Documentation(info="
diff --git a/Buildings/Fluid/Sensors/SpecificEnthalpy.mo b/Buildings/Fluid/Sensors/SpecificEnthalpy.mo index 39f2b6672c3..a2ec5e75e2f 100644 --- a/Buildings/Fluid/Sensors/SpecificEnthalpy.mo +++ b/Buildings/Fluid/Sensors/SpecificEnthalpy.mo @@ -15,15 +15,15 @@ annotation (defaultComponentName="senSpeEnt", Text( extent={{-150,80},{150,120}}, textString="%name", - lineColor={0,0,255}), + textColor={0,0,255}), Text( extent={{168,-30},{52,-60}}, - lineColor={0,0,0}, + textColor={0,0,0}, textString="h"), Line(points={{70,0},{100,0}}, color={0,0,127}), Text( extent={{180,90},{60,40}}, - lineColor={0,0,0}, + textColor={0,0,0}, textString=DynamicSelect("", String(h_out, format=".0f")))}), Documentation(info="
diff --git a/Buildings/Fluid/Sensors/SpecificEnthalpyTwoPort.mo b/Buildings/Fluid/Sensors/SpecificEnthalpyTwoPort.mo index 77fb7ead27c..4bd548191d8 100644 --- a/Buildings/Fluid/Sensors/SpecificEnthalpyTwoPort.mo +++ b/Buildings/Fluid/Sensors/SpecificEnthalpyTwoPort.mo @@ -47,14 +47,14 @@ annotation (defaultComponentName="senSpeEnt", graphics={ Text( extent={{102,120},{0,90}}, - lineColor={0,0,0}, + textColor={0,0,0}, textString="h"), Line(points={{0,100},{0,70}}, color={0,0,127}), Line(points={{-100,0},{-70,0}}, color={0,128,255}), Line(points={{70,0},{100,0}}, color={0,128,255}), Text( extent={{-20,120},{-140,70}}, - lineColor={0,0,0}, + textColor={0,0,0}, textString=DynamicSelect("", String(h_out, format=".0f")))}), Documentation(info="
diff --git a/Buildings/Fluid/Sensors/SpecificEntropy.mo b/Buildings/Fluid/Sensors/SpecificEntropy.mo index 60e83329db4..c5490ab12e0 100644 --- a/Buildings/Fluid/Sensors/SpecificEntropy.mo +++ b/Buildings/Fluid/Sensors/SpecificEntropy.mo @@ -17,16 +17,16 @@ annotation (defaultComponentName="senSpeEnt", Text( extent={{-150,80},{150,120}}, textString="%name", - lineColor={0,0,255}), + textColor={0,0,255}), Text( extent={{156,-24},{54,-54}}, - lineColor={0,0,0}, + textColor={0,0,0}, textString="s"), Line(points={{70,0},{100,0}}, color={0,0,127}), Ellipse(extent={{-70,70},{70,-70}}, lineColor={255,0,0}), Text( extent={{180,90},{60,40}}, - lineColor={0,0,0}, + textColor={0,0,0}, textString=DynamicSelect("", String(s, format=".0f")))}), Documentation(info="
diff --git a/Buildings/Fluid/Sensors/SpecificEntropyTwoPort.mo b/Buildings/Fluid/Sensors/SpecificEntropyTwoPort.mo index dfa2d5eef96..5dd5ab817b3 100644 --- a/Buildings/Fluid/Sensors/SpecificEntropyTwoPort.mo +++ b/Buildings/Fluid/Sensors/SpecificEntropyTwoPort.mo @@ -58,7 +58,7 @@ annotation (defaultComponentName="senSpeEnt", graphics={ Text( extent={{120,120},{0,90}}, - lineColor={0,0,0}, + textColor={0,0,0}, textString="s"), Line(points={{0,100},{0,70}}, color={0,0,127}), Line(points={{-100,0},{-70,0}}, color={0,128,255}), @@ -66,7 +66,7 @@ annotation (defaultComponentName="senSpeEnt", Ellipse(extent={{-70,70},{70,-70}}, lineColor={255,0,0}), Text( extent={{-20,120},{-140,70}}, - lineColor={0,0,0}, + textColor={0,0,0}, textString=DynamicSelect("", String(s, format=".0f")))}), Documentation(info="
diff --git a/Buildings/Fluid/Sensors/Temperature.mo b/Buildings/Fluid/Sensors/Temperature.mo
index 66e1e0afb38..9b0132f9fde 100644
--- a/Buildings/Fluid/Sensors/Temperature.mo
+++ b/Buildings/Fluid/Sensors/Temperature.mo
@@ -98,15 +98,15 @@ Implementation is based on Modelica.Fluid.
Line(points={{-40,70},{-12,70}}),
Text(
extent={{126,-30},{6,-60}},
- lineColor={0,0,0},
+ textColor={0,0,0},
textString="T"),
Text(
extent={{-150,110},{150,150}},
textString="%name",
- lineColor={0,0,255}),
+ textColor={0,0,255}),
Line(points={{12,0},{60,0}}, color={0,0,127}),
Text(
extent={{180,90},{60,40}},
- lineColor={0,0,0},
+ textColor={0,0,0},
textString=DynamicSelect("", String(T-273.15, format=".1f")))}));
end Temperature;
diff --git a/Buildings/Fluid/Sensors/TemperatureTwoPort.mo b/Buildings/Fluid/Sensors/TemperatureTwoPort.mo
index d288f2b67c1..b713e5df3dc 100644
--- a/Buildings/Fluid/Sensors/TemperatureTwoPort.mo
+++ b/Buildings/Fluid/Sensors/TemperatureTwoPort.mo
@@ -97,7 +97,7 @@ annotation (defaultComponentName="senTem",
lineThickness=0.5),
Text(
extent={{102,140},{-18,90}},
- lineColor={0,0,0},
+ textColor={0,0,0},
textString="T"),
Line(
points={{-12,60},{-12,-25}},
@@ -120,7 +120,7 @@ annotation (defaultComponentName="senTem",
visible=transferHeat),
Text(
extent={{-20,120},{-140,70}},
- lineColor={0,0,0},
+ textColor={0,0,0},
textString=DynamicSelect("", String(T-273.15, format=".1f")))}),
Documentation(info="
diff --git a/Buildings/Fluid/Sensors/TemperatureWetBulbTwoPort.mo b/Buildings/Fluid/Sensors/TemperatureWetBulbTwoPort.mo index 999998ff786..742d28661f9 100644 --- a/Buildings/Fluid/Sensors/TemperatureWetBulbTwoPort.mo +++ b/Buildings/Fluid/Sensors/TemperatureWetBulbTwoPort.mo @@ -87,7 +87,7 @@ annotation (defaultComponentName="senWetBul", lineThickness=0.5), Text( extent={{102,140},{-18,90}}, - lineColor={0,0,0}, + textColor={0,0,0}, textString="T"), Line( points={{-12,60},{-12,-25}}, @@ -98,7 +98,7 @@ annotation (defaultComponentName="senWetBul", Line(points={{0,100},{0,50}}, color={0,0,127}), Text( extent={{-20,120},{-140,70}}, - lineColor={0,0,0}, + textColor={0,0,0}, textString=DynamicSelect("", String(T-273.15, format=".1f")))}), Documentation(info="
diff --git a/Buildings/Fluid/Sensors/TraceSubstances.mo b/Buildings/Fluid/Sensors/TraceSubstances.mo index fa0cdc95326..94005f4c44e 100644 --- a/Buildings/Fluid/Sensors/TraceSubstances.mo +++ b/Buildings/Fluid/Sensors/TraceSubstances.mo @@ -34,15 +34,15 @@ annotation (defaultComponentName="senTraSub", Text( extent={{-150,80},{150,120}}, textString="%name", - lineColor={0,0,255}), + textColor={0,0,255}), Text( extent={{160,-30},{60,-60}}, - lineColor={0,0,0}, + textColor={0,0,0}, textString="C"), Line(points={{70,0},{100,0}}, color={0,0,127}), Text( extent={{180,90},{60,40}}, - lineColor={0,0,0}, + textColor={0,0,0}, textString=DynamicSelect("", String(C, leftJustified=false, significantDigits=3)))}), Documentation(info="
diff --git a/Buildings/Fluid/Sensors/TraceSubstancesTwoPort.mo b/Buildings/Fluid/Sensors/TraceSubstancesTwoPort.mo index 422ca189b2d..d3224b8ebda 100644 --- a/Buildings/Fluid/Sensors/TraceSubstancesTwoPort.mo +++ b/Buildings/Fluid/Sensors/TraceSubstancesTwoPort.mo @@ -60,14 +60,14 @@ annotation (defaultComponentName="senTraSub", graphics={ Text( extent={{82,122},{0,92}}, - lineColor={0,0,0}, + textColor={0,0,0}, textString="C"), Line(points={{0,100},{0,70}}, color={0,0,127}), Line(points={{-100,0},{-70,0}}, color={0,128,255}), Line(points={{70,0},{100,0}}, color={0,128,255}), Text( extent={{-20,120},{-140,70}}, - lineColor={0,0,0}, + textColor={0,0,0}, textString=DynamicSelect("", String(C, leftJustified=false, significantDigits=3)))}), Documentation(info="
diff --git a/Buildings/Fluid/Sensors/Velocity.mo b/Buildings/Fluid/Sensors/Velocity.mo index 3a2f2ca54a7..ba93d9cb5a8 100644 --- a/Buildings/Fluid/Sensors/Velocity.mo +++ b/Buildings/Fluid/Sensors/Velocity.mo @@ -79,14 +79,14 @@ annotation (defaultComponentName="senVel", graphics={ Text( extent={{48,120},{8,78}}, - lineColor={0,0,0}, + textColor={0,0,0}, textString="v"), Line(points={{0,100},{0,70}}, color={0,0,127}), Line(points={{-100,0},{-70,0}}, color={0,128,255}), Line(points={{70,0},{100,0}}, color={0,128,255}), Text( extent={{180,90},{60,40}}, - lineColor={0,0,0}, + textColor={0,0,0}, textString=DynamicSelect("", String(v, format=".3g")))}), Documentation(info="
diff --git a/Buildings/Fluid/Sensors/VolumeFlowRate.mo b/Buildings/Fluid/Sensors/VolumeFlowRate.mo index 60ec308c582..5f2667401a9 100644 --- a/Buildings/Fluid/Sensors/VolumeFlowRate.mo +++ b/Buildings/Fluid/Sensors/VolumeFlowRate.mo @@ -73,14 +73,14 @@ annotation (defaultComponentName="senVolFlo", graphics={ Text( extent={{160,120},{0,90}}, - lineColor={0,0,0}, + textColor={0,0,0}, textString="V_flow"), Line(points={{0,100},{0,70}}, color={0,0,127}), Line(points={{-100,0},{-70,0}}, color={0,128,255}), Line(points={{70,0},{100,0}}, color={0,128,255}), Text( extent={{-20,120},{-140,70}}, - lineColor={0,0,0}, + textColor={0,0,0}, textString=DynamicSelect("", String(V_flow, leftJustified=false, significantDigits=3)))}), Documentation(info="
diff --git a/Buildings/Fluid/Sources/BaseClasses/Outside.mo b/Buildings/Fluid/Sources/BaseClasses/Outside.mo index 2bdb50e1042..7b846a809a6 100644 --- a/Buildings/Fluid/Sources/BaseClasses/Outside.mo +++ b/Buildings/Fluid/Sources/BaseClasses/Outside.mo @@ -84,7 +84,7 @@ equation Text( extent={{-150,110},{150,150}}, textString="%name", - lineColor={0,0,255}), + textColor={0,0,255}), Line( visible=use_C_in, points={{-100,-80},{-60,-80}}, @@ -92,7 +92,7 @@ equation Text( visible=use_C_in, extent={{-164,-90},{-62,-130}}, - lineColor={0,0,0}, + textColor={0,0,0}, fillColor={255,255,255}, fillPattern=FillPattern.Solid, textString="C"), @@ -105,7 +105,7 @@ equation min(1, max(0, (weaBus.TDryBul-273.15)/50))*{255,0,0})), Text( extent={{62,28},{-58,-22}}, - lineColor={255,255,255}, + textColor={255,255,255}, textString=DynamicSelect("", String(weaBus.TDryBul-273.15, format=".1f")))}), Documentation(info="
diff --git a/Buildings/Fluid/Sources/BaseClasses/PartialPropertySource.mo b/Buildings/Fluid/Sources/BaseClasses/PartialPropertySource.mo
index 7a46285c6e4..f6d7ef8d57a 100644
--- a/Buildings/Fluid/Sources/BaseClasses/PartialPropertySource.mo
+++ b/Buildings/Fluid/Sources/BaseClasses/PartialPropertySource.mo
@@ -80,14 +80,14 @@ equation
Text(
visible=use_Xi_in,
extent={{-48,98},{54,58}},
- lineColor={0,0,0},
+ textColor={0,0,0},
fillColor={255,255,255},
fillPattern=FillPattern.Solid,
textString="Xi"),
Text(
visible=use_C_in,
extent={{-10,98},{92,58}},
- lineColor={0,0,0},
+ textColor={0,0,0},
fillColor={255,255,255},
fillPattern=FillPattern.Solid,
textString="C"),
diff --git a/Buildings/Fluid/Sources/BaseClasses/PartialSource_Xi_C.mo b/Buildings/Fluid/Sources/BaseClasses/PartialSource_Xi_C.mo
index ab39594da0f..71a0103a190 100644
--- a/Buildings/Fluid/Sources/BaseClasses/PartialSource_Xi_C.mo
+++ b/Buildings/Fluid/Sources/BaseClasses/PartialSource_Xi_C.mo
@@ -92,21 +92,21 @@ equation
Text(
visible=use_X_in,
extent={{-164,4},{-62,-36}},
- lineColor={0,0,0},
+ textColor={0,0,0},
fillColor={255,255,255},
fillPattern=FillPattern.Solid,
textString="X"),
Text(
visible=use_Xi_in,
extent={{-164,4},{-62,-36}},
- lineColor={0,0,0},
+ textColor={0,0,0},
fillColor={255,255,255},
fillPattern=FillPattern.Solid,
textString="Xi"),
Text(
visible=use_C_in,
extent={{-164,-90},{-62,-130}},
- lineColor={0,0,0},
+ textColor={0,0,0},
fillColor={255,255,255},
fillPattern=FillPattern.Solid,
textString="C")}),
diff --git a/Buildings/Fluid/Sources/Boundary_pT.mo b/Buildings/Fluid/Sources/Boundary_pT.mo
index 86a149dd89f..6b29459a56e 100644
--- a/Buildings/Fluid/Sources/Boundary_pT.mo
+++ b/Buildings/Fluid/Sources/Boundary_pT.mo
@@ -181,21 +181,21 @@ Implementation is based on Modelica.Fluid.
Text(
visible=use_p_in,
extent={{-152,134},{-68,94}},
- lineColor={0,0,0},
+ textColor={0,0,0},
fillColor={255,255,255},
fillPattern=FillPattern.Solid,
textString="p"),
Text(
visible=use_T_in,
extent={{-162,34},{-60,-6}},
- lineColor={0,0,0},
+ textColor={0,0,0},
fillColor={255,255,255},
fillPattern=FillPattern.Solid,
textString="T"),
Text(
extent={{-150,110},{150,150}},
textString="%name",
- lineColor={0,0,255}),
+ textColor={0,0,255}),
Ellipse(
extent={{-100,100},{100,-100}},
lineColor={0,0,0},
@@ -205,6 +205,6 @@ Implementation is based on Modelica.Fluid.
min(1, max(0, ((if use_T_in then T_in else T)-273.15)/50))*{255,0,0})),
Text(
extent={{62,28},{-58,-22}},
- lineColor={255,255,255},
+ textColor={255,255,255},
textString=DynamicSelect("", String((if use_T_in then T_in else T)-273.15, format=".1f")))}));
end Boundary_pT;
diff --git a/Buildings/Fluid/Sources/Boundary_ph.mo b/Buildings/Fluid/Sources/Boundary_ph.mo
index b135ce757f9..bb60241deef 100644
--- a/Buildings/Fluid/Sources/Boundary_ph.mo
+++ b/Buildings/Fluid/Sources/Boundary_ph.mo
@@ -170,14 +170,14 @@ Implementation is based on Modelica.Fluid.
Text(
visible=use_h_in,
extent={{-162,34},{-60,-6}},
- lineColor={0,0,0},
+ textColor={0,0,0},
fillColor={255,255,255},
fillPattern=FillPattern.Solid,
textString="h"),
Text(
visible=use_p_in,
extent={{-152,134},{-68,94}},
- lineColor={0,0,0},
+ textColor={0,0,0},
fillColor={255,255,255},
fillPattern=FillPattern.Solid,
textString="p"),
@@ -189,5 +189,5 @@ Implementation is based on Modelica.Fluid.
Text(
extent={{-150,110},{150,150}},
textString="%name",
- lineColor={0,0,255})}));
+ textColor={0,0,255})}));
end Boundary_ph;
diff --git a/Buildings/Fluid/Sources/MassFlowSource_T.mo b/Buildings/Fluid/Sources/MassFlowSource_T.mo
index 62ad9035cbc..7d2ba88ec86 100644
--- a/Buildings/Fluid/Sources/MassFlowSource_T.mo
+++ b/Buildings/Fluid/Sources/MassFlowSource_T.mo
@@ -135,14 +135,14 @@ First implementation.
Text(
visible=use_m_flow_in,
extent={{-185,132},{-45,100}},
- lineColor={0,0,0},
+ textColor={0,0,0},
fillColor={255,255,255},
fillPattern=FillPattern.Solid,
textString="m_flow"),
Text(
visible=use_T_in,
extent={{-162,34},{-60,-6}},
- lineColor={0,0,0},
+ textColor={0,0,0},
fillColor={255,255,255},
fillPattern=FillPattern.Solid,
textString="T"),
@@ -163,7 +163,7 @@ First implementation.
fillPattern=FillPattern.Solid),
Text(
extent={{-54,32},{16,-30}},
- lineColor={255,0,0},
+ textColor={255,0,0},
fillColor={255,0,0},
fillPattern=FillPattern.Solid,
textString="m"),
@@ -175,5 +175,5 @@ First implementation.
Text(
extent={{-161,110},{139,150}},
textString="%name",
- lineColor={0,0,255})}));
+ textColor={0,0,255})}));
end MassFlowSource_T;
diff --git a/Buildings/Fluid/Sources/MassFlowSource_WeatherData.mo b/Buildings/Fluid/Sources/MassFlowSource_WeatherData.mo
index f12efe8abfc..22100c637df 100644
--- a/Buildings/Fluid/Sources/MassFlowSource_WeatherData.mo
+++ b/Buildings/Fluid/Sources/MassFlowSource_WeatherData.mo
@@ -128,7 +128,7 @@ equation
fillPattern=FillPattern.Solid),
Text(
extent={{-54,32},{16,-30}},
- lineColor={255,0,0},
+ textColor={255,0,0},
fillColor={255,0,0},
fillPattern=FillPattern.Solid,
textString="m"),
@@ -140,20 +140,20 @@ equation
Text(
visible=use_m_flow_in,
extent={{-185,132},{-45,100}},
- lineColor={0,0,0},
+ textColor={0,0,0},
fillColor={255,255,255},
fillPattern=FillPattern.Solid,
textString="m_flow"),
Text(
visible=use_C_in,
extent={{-155,-98},{-35,-126}},
- lineColor={0,0,0},
+ textColor={0,0,0},
fillColor={255,255,255},
fillPattern=FillPattern.Solid,
textString="C"), Text(
extent={{-161,110},{139,150}},
textString="%name",
- lineColor={0,0,255})}),
+ textColor={0,0,255})}),
Documentation(info="
Models an ideal flow source, with prescribed values of flow rate and trace
diff --git a/Buildings/Fluid/Sources/MassFlowSource_h.mo b/Buildings/Fluid/Sources/MassFlowSource_h.mo
index 93c9d541432..2cdf307c8f0 100644
--- a/Buildings/Fluid/Sources/MassFlowSource_h.mo
+++ b/Buildings/Fluid/Sources/MassFlowSource_h.mo
@@ -131,14 +131,14 @@ Implemenation is based on Modelica.Fluid.
Text(
visible=use_m_flow_in,
extent={{-185,132},{-45,100}},
- lineColor={0,0,0},
+ textColor={0,0,0},
fillColor={255,255,255},
fillPattern=FillPattern.Solid,
textString="m_flow"),
Text(
visible=use_h_in,
extent={{-162,34},{-60,-6}},
- lineColor={0,0,0},
+ textColor={0,0,0},
fillColor={255,255,255},
fillPattern=FillPattern.Solid,
textString="h"),
@@ -159,7 +159,7 @@ Implemenation is based on Modelica.Fluid.
fillPattern=FillPattern.Solid),
Text(
extent={{-54,32},{16,-30}},
- lineColor={255,0,0},
+ textColor={255,0,0},
fillColor={255,0,0},
fillPattern=FillPattern.Solid,
textString="m"),
@@ -171,5 +171,5 @@ Implemenation is based on Modelica.Fluid.
Text(
extent={{-161,110},{139,150}},
textString="%name",
- lineColor={0,0,255})}));
+ textColor={0,0,255})}));
end MassFlowSource_h;
diff --git a/Buildings/Fluid/Sources/Outside_Cp.mo b/Buildings/Fluid/Sources/Outside_Cp.mo
index 205d1ce8794..8dbb650125a 100644
--- a/Buildings/Fluid/Sources/Outside_Cp.mo
+++ b/Buildings/Fluid/Sources/Outside_Cp.mo
@@ -88,15 +88,15 @@ First implementation.
Icon(graphics={Text(
visible=use_Cp_in,
extent={{-140,92},{-92,62}},
- lineColor={0,0,255},
+ textColor={0,0,255},
textString="C_p"),
Text(
visible=use_C_in,
extent={{-154,-28},{-102,-62}},
- lineColor={0,0,255},
+ textColor={0,0,255},
textString="C"),
Text(
extent={{-28,22},{28,-22}},
- lineColor={255,255,255},
+ textColor={255,255,255},
textString="Cp")}));
end Outside_Cp;
diff --git a/Buildings/Fluid/Sources/Outside_CpLowRise.mo b/Buildings/Fluid/Sources/Outside_CpLowRise.mo
index 0a86b6bb35c..b054fc0e168 100644
--- a/Buildings/Fluid/Sources/Outside_CpLowRise.mo
+++ b/Buildings/Fluid/Sources/Outside_CpLowRise.mo
@@ -150,15 +150,15 @@ First implementation.
Icon(graphics={Text(
visible=use_Cp_in,
extent={{-140,92},{-92,62}},
- lineColor={0,0,255},
+ textColor={0,0,255},
textString="C_p"),
Text(
visible=use_C_in,
extent={{-154,-28},{-102,-62}},
- lineColor={0,0,255},
+ textColor={0,0,255},
textString="C"),
Text(
extent={{-28,22},{28,-22}},
- lineColor={255,255,255},
+ textColor={255,255,255},
textString="Cp")}));
end Outside_CpLowRise;
diff --git a/Buildings/Fluid/Sources/PropertySource_T.mo b/Buildings/Fluid/Sources/PropertySource_T.mo
index 262d99cce55..dd42774edbd 100644
--- a/Buildings/Fluid/Sources/PropertySource_T.mo
+++ b/Buildings/Fluid/Sources/PropertySource_T.mo
@@ -41,7 +41,7 @@ annotation (defaultComponentName="proSou",
Text(
visible=use_T_in,
extent={{-90,98},{12,58}},
- lineColor={0,0,0},
+ textColor={0,0,0},
fillColor={255,255,255},
fillPattern=FillPattern.Solid,
textString="T")}),
diff --git a/Buildings/Fluid/Sources/PropertySource_h.mo b/Buildings/Fluid/Sources/PropertySource_h.mo
index ba8ea2e76c0..1063f62fb5b 100644
--- a/Buildings/Fluid/Sources/PropertySource_h.mo
+++ b/Buildings/Fluid/Sources/PropertySource_h.mo
@@ -28,7 +28,7 @@ annotation (defaultComponentName="proSou",
Text(
visible=use_h_in,
extent={{-90,98},{12,58}},
- lineColor={0,0,0},
+ textColor={0,0,0},
fillColor={255,255,255},
fillPattern=FillPattern.Solid,
textString="h")}),
diff --git a/Buildings/Fluid/Sources/TraceSubstancesFlowSource.mo b/Buildings/Fluid/Sources/TraceSubstancesFlowSource.mo
index e7a6e85b52e..9a3dbbd39d6 100644
--- a/Buildings/Fluid/Sources/TraceSubstancesFlowSource.mo
+++ b/Buildings/Fluid/Sources/TraceSubstancesFlowSource.mo
@@ -183,7 +183,7 @@ First implementation.
fillPattern=FillPattern.Solid),
Text(
extent={{-54,32},{16,-30}},
- lineColor={255,0,0},
+ textColor={255,0,0},
fillColor={255,0,0},
fillPattern=FillPattern.Solid,
textString="m"),
@@ -194,19 +194,19 @@ First implementation.
fillPattern=FillPattern.Solid),
Text(
extent={{-212,62},{-72,30}},
- lineColor={0,0,0},
+ textColor={0,0,0},
fillColor={255,255,255},
fillPattern=FillPattern.Solid,
visible=use_m_flow_in,
textString="m_flow"),
Text(
extent={{-100,14},{-60,-20}},
- lineColor={0,0,0},
+ textColor={0,0,0},
fillColor={255,255,255},
fillPattern=FillPattern.Solid,
textString="C"),
Text(
extent={{-150,110},{150,150}},
textString="%name",
- lineColor={0,0,255})}));
+ textColor={0,0,255})}));
end TraceSubstancesFlowSource;
diff --git a/Buildings/Fluid/Storage/BaseClasses/PartialStratified.mo b/Buildings/Fluid/Storage/BaseClasses/PartialStratified.mo
index 9d449235d83..ca47140a49e 100644
--- a/Buildings/Fluid/Storage/BaseClasses/PartialStratified.mo
+++ b/Buildings/Fluid/Storage/BaseClasses/PartialStratified.mo
@@ -382,7 +382,7 @@ Icon(graphics={
fillPattern=FillPattern.CrossDiag),
Text(
extent={{100,106},{134,74}},
- lineColor={0,0,127},
+ textColor={0,0,127},
textString="QLoss"),
Rectangle(
extent={{-10,10},{10,-10}},
diff --git a/Buildings/Fluid/Storage/ExpansionVessel.mo b/Buildings/Fluid/Storage/ExpansionVessel.mo
index 112fdfad614..28170dd3ab5 100644
--- a/Buildings/Fluid/Storage/ExpansionVessel.mo
+++ b/Buildings/Fluid/Storage/ExpansionVessel.mo
@@ -55,7 +55,7 @@ equation
Text(
extent={{-148,98},{152,138}},
textString="%name",
- lineColor={0,0,255}),
+ textColor={0,0,255}),
Rectangle(
extent={{-80,80},{80,-80}},
lineColor={0,0,0},
diff --git a/Buildings/Fluid/Storage/Stratified.mo b/Buildings/Fluid/Storage/Stratified.mo
index b7edfa823b3..0b9b020baf1 100644
--- a/Buildings/Fluid/Storage/Stratified.mo
+++ b/Buildings/Fluid/Storage/Stratified.mo
@@ -206,7 +206,7 @@ Icon(graphics={
fillPattern=FillPattern.CrossDiag),
Text(
extent={{100,106},{134,74}},
- lineColor={0,0,127},
+ textColor={0,0,127},
textString="QLoss"),
Rectangle(
extent={{-10,10},{10,-10}},
diff --git a/Buildings/HeatTransfer/Conduction/SingleLayer.mo b/Buildings/HeatTransfer/Conduction/SingleLayer.mo
index d97bfa3c8d0..59adcb1866d 100644
--- a/Buildings/HeatTransfer/Conduction/SingleLayer.mo
+++ b/Buildings/HeatTransfer/Conduction/SingleLayer.mo
@@ -204,11 +204,11 @@ equation
preserveAspectRatio=false,extent={{-100,-100},{100,100}}), graphics={
Text(
extent={{-100,-80},{6,-98}},
- lineColor={0,0,255},
+ textColor={0,0,255},
textString="%material.x"),
Text(
extent={{8,-74},{86,-104}},
- lineColor={0,0,255},
+ textColor={0,0,255},
textString="%nSta"),
Rectangle(
extent={{-60,80},{60,-80}}, fillColor={215,215,215},
diff --git a/Buildings/HeatTransfer/Conduction/SingleLayerCylinder.mo b/Buildings/HeatTransfer/Conduction/SingleLayerCylinder.mo
index 92f7321c07f..abe53e084de 100644
--- a/Buildings/HeatTransfer/Conduction/SingleLayerCylinder.mo
+++ b/Buildings/HeatTransfer/Conduction/SingleLayerCylinder.mo
@@ -133,15 +133,15 @@ equation
fillPattern=FillPattern.Solid),
Text(
extent={{-110,-74},{-26,-86}},
- lineColor={0,0,255},
+ textColor={0,0,255},
textString="%r_a"),
Text(
extent={{-22,-62},{20,-76}},
- lineColor={0,0,255},
+ textColor={0,0,255},
textString="%nSta"),
Text(
extent={{16,-76},{102,-88}},
- lineColor={0,0,255},
+ textColor={0,0,255},
textString="%r_b"),
Polygon(
points={{-50,60},{-38,34},{-32,0},{-36,-30},{-50,-60},{-62,-60},{-48,
diff --git a/Buildings/HeatTransfer/Convection/BaseClasses/PartialConvection.mo b/Buildings/HeatTransfer/Convection/BaseClasses/PartialConvection.mo
index c2a6c098a2d..af1e42bde4f 100644
--- a/Buildings/HeatTransfer/Convection/BaseClasses/PartialConvection.mo
+++ b/Buildings/HeatTransfer/Convection/BaseClasses/PartialConvection.mo
@@ -35,7 +35,7 @@ equation
Line(points={{100,0},{100,0}}, color={0,127,255}),
Text(
extent={{-35,42},{-5,20}},
- lineColor={255,0,0},
+ textColor={255,0,0},
textString="Q_flow"),
Line(points={{-60,20},{76,20}}, color={191,0,0}),
Line(points={{-60,-20},{76,-20}}, color={191,0,0}),
diff --git a/Buildings/HeatTransfer/Convection/Exterior.mo b/Buildings/HeatTransfer/Convection/Exterior.mo
index 03ffb612558..136a8f3709b 100644
--- a/Buildings/HeatTransfer/Convection/Exterior.mo
+++ b/Buildings/HeatTransfer/Convection/Exterior.mo
@@ -111,7 +111,7 @@ equation
Line(points={{100,0},{100,0}}, color={0,127,255}),
Text(
extent={{-35,42},{-5,20}},
- lineColor={255,0,0},
+ textColor={255,0,0},
textString="Q_flow"),
Line(points={{-60,20},{76,20}}, color={191,0,0}),
Line(points={{-60,-20},{76,-20}}, color={191,0,0}),
@@ -133,10 +133,10 @@ equation
Line(points={{56,30},{76,20}}, color={191,0,0}),
Text(
extent={{-102,128},{-64,98}},
- lineColor={0,0,127},
+ textColor={0,0,127},
textString="v"), Text(
extent={{-100,64},{-62,34}},
- lineColor={0,0,127},
+ textColor={0,0,127},
textString="dir")}),
defaultComponentName="con",
Documentation(info="
diff --git a/Buildings/HeatTransfer/Convection/Interior.mo b/Buildings/HeatTransfer/Convection/Interior.mo
index 27deff328b0..b2629a3d743 100644
--- a/Buildings/HeatTransfer/Convection/Interior.mo
+++ b/Buildings/HeatTransfer/Convection/Interior.mo
@@ -80,7 +80,7 @@ equation
Line(points={{100,0},{100,0}}, color={0,127,255}),
Text(
extent={{-35,42},{-5,20}},
- lineColor={255,0,0},
+ textColor={255,0,0},
textString="Q_flow"),
Line(points={{-60,20},{76,20}}, color={191,0,0}),
Line(points={{-60,-20},{76,-20}}, color={191,0,0}),
diff --git a/Buildings/HeatTransfer/Data/BaseClasses.mo b/Buildings/HeatTransfer/Data/BaseClasses.mo
index 19c4326a479..ec4ed2308ed 100644
--- a/Buildings/HeatTransfer/Data/BaseClasses.mo
+++ b/Buildings/HeatTransfer/Data/BaseClasses.mo
@@ -94,19 +94,19 @@ First implementation.
"), Icon(graphics={
Text(
extent={{-94,44},{-16,12}},
- lineColor={0,0,0},
+ textColor={0,0,0},
textString="x=%x"),
Text(
extent={{8,40},{86,8}},
- lineColor={0,0,0},
+ textColor={0,0,0},
textString="k=%k"),
Text(
extent={{-90,-58},{-12,-90}},
- lineColor={0,0,0},
+ textColor={0,0,0},
textString="R=%R"),
Text(
extent={{-92,-10},{-14,-42}},
- lineColor={0,0,0},
+ textColor={0,0,0},
textString="U=%U"),
Rectangle(
visible=(c == 0),
@@ -176,7 +176,7 @@ First implementation.
textString="c=%c"),
Text(
extent={{-74,-12},{-14,-36}},
- lineColor={0,0,0},
+ textColor={0,0,0},
textString="k=%k"),
Line(points={{-100,0},{100,0}}, color={0,0,0})}));
end ThermalProperties;
diff --git a/Buildings/HeatTransfer/Data/OpaqueConstructions.mo b/Buildings/HeatTransfer/Data/OpaqueConstructions.mo
index 8eb2c78beaa..f1ed7f51cc4 100644
--- a/Buildings/HeatTransfer/Data/OpaqueConstructions.mo
+++ b/Buildings/HeatTransfer/Data/OpaqueConstructions.mo
@@ -46,7 +46,7 @@ package OpaqueConstructions
Text(
extent={{-127,113},{127,53}},
textString="%name",
- lineColor={0,0,255}),
+ textColor={0,0,255}),
Rectangle(
extent={{-36,42},{4,-92}},
lineColor={0,0,0},
diff --git a/Buildings/HeatTransfer/Data/Resistances.mo b/Buildings/HeatTransfer/Data/Resistances.mo
index d713f1a550d..37e4aa662c0 100644
--- a/Buildings/HeatTransfer/Data/Resistances.mo
+++ b/Buildings/HeatTransfer/Data/Resistances.mo
@@ -22,7 +22,7 @@ package Resistances "Package with thermal resistances"
fillPattern=FillPattern.Solid,
lineColor={0,0,255}), Text(
extent={{-98,-72},{96,-94}},
- lineColor={0,0,255},
+ textColor={0,0,255},
textString="R=%R")}),
defaultComponentPrefixes="parameter",
defaultComponentName="datTheRes",
diff --git a/Buildings/HeatTransfer/Examples/ConductorInitialization.mo b/Buildings/HeatTransfer/Examples/ConductorInitialization.mo
index 184e3cfd628..ed5c4f67a00 100644
--- a/Buildings/HeatTransfer/Examples/ConductorInitialization.mo
+++ b/Buildings/HeatTransfer/Examples/ConductorInitialization.mo
@@ -49,7 +49,7 @@ equation
annotation (Diagram(coordinateSystem(preserveAspectRatio=true, extent={{-100,
-100},{100,100}}), graphics={Text(
extent={{-60,50},{58,58}},
- lineColor={0,0,0},
+ textColor={0,0,0},
textString="Steady state initialization (dT(0)/dt=0)")}),
experiment(Tolerance=1e-6, StopTime=86400),
__Dymola_Commands(file="modelica://Buildings/Resources/Scripts/Dymola/HeatTransfer/Examples/ConductorInitialization.mos"
diff --git a/Buildings/HeatTransfer/Interfaces/RadiosityInflow.mo b/Buildings/HeatTransfer/Interfaces/RadiosityInflow.mo
index ac50d48c4d8..8dfd17e9baa 100644
--- a/Buildings/HeatTransfer/Interfaces/RadiosityInflow.mo
+++ b/Buildings/HeatTransfer/Interfaces/RadiosityInflow.mo
@@ -9,7 +9,7 @@ connector RadiosityInflow = input Real(min=0, final unit="W", nominal=419)
fillPattern=FillPattern.Solid)}),
Diagram(graphics={ Text(
extent={{-38,120},{38,100}},
- lineColor={0,127,0},
+ textColor={0,127,0},
fillColor={0,127,0},
fillPattern=FillPattern.Solid,
textString="%name"), Polygon(
diff --git a/Buildings/HeatTransfer/Interfaces/RadiosityOutflow.mo b/Buildings/HeatTransfer/Interfaces/RadiosityOutflow.mo
index 96f217004fb..10fac931c13 100644
--- a/Buildings/HeatTransfer/Interfaces/RadiosityOutflow.mo
+++ b/Buildings/HeatTransfer/Interfaces/RadiosityOutflow.mo
@@ -14,7 +14,7 @@ connector RadiosityOutflow = output Real(min=0, final unit="W", nominal=419)
fillColor={255,255,255},
fillPattern=FillPattern.Solid), Text(
extent={{-42,122},{34,102}},
- lineColor={0,127,0},
+ textColor={0,127,0},
fillColor={255,255,255},
fillPattern=FillPattern.Solid,
textString="%name")}),
diff --git a/Buildings/HeatTransfer/Radiosity/Constant.mo b/Buildings/HeatTransfer/Radiosity/Constant.mo
index 6ebbb529659..8363a717887 100644
--- a/Buildings/HeatTransfer/Radiosity/Constant.mo
+++ b/Buildings/HeatTransfer/Radiosity/Constant.mo
@@ -29,7 +29,7 @@ equation
color={0,0,0}),
Text(
extent={{-150,-150},{150,-110}},
- lineColor={0,0,0},
+ textColor={0,0,0},
textString="k=%k")}),
Documentation(info="
diff --git a/Buildings/HeatTransfer/Radiosity/OutdoorRadiosity.mo b/Buildings/HeatTransfer/Radiosity/OutdoorRadiosity.mo index 572ff615a52..f17846703fb 100644 --- a/Buildings/HeatTransfer/Radiosity/OutdoorRadiosity.mo +++ b/Buildings/HeatTransfer/Radiosity/OutdoorRadiosity.mo @@ -44,11 +44,11 @@ equation Icon(graphics={ Text( extent={{-96,-10},{-54,-52}}, - lineColor={0,0,127}, + textColor={0,0,127}, textString="TOut"), Text( extent={{64,16},{94,-12}}, - lineColor={0,0,127}, + textColor={0,0,127}, textString="J"), Line( points={{6,-36},{28,-8},{20,-8},{28,-8},{28,-16},{28,-16}}, @@ -84,10 +84,10 @@ equation Text( extent={{-150,142},{150,102}}, textString="%name", - lineColor={0,0,255}), + textColor={0,0,255}), Text( extent={{-96,72},{-54,30}}, - lineColor={0,0,127}, + textColor={0,0,127}, textString="TBlaSky")}), defaultComponentName="radOut", Documentation(info=" diff --git a/Buildings/HeatTransfer/Sources/FixedHeatFlow.mo b/Buildings/HeatTransfer/Sources/FixedHeatFlow.mo index 6ee4d38fcd9..6a384b5694c 100644 --- a/Buildings/HeatTransfer/Sources/FixedHeatFlow.mo +++ b/Buildings/HeatTransfer/Sources/FixedHeatFlow.mo @@ -11,10 +11,10 @@ equation Text( extent={{-150,100},{150,60}}, textString="%name", - lineColor={0,0,255}), + textColor={0,0,255}), Text( extent={{-150,-55},{150,-85}}, - lineColor={0,0,0}, + textColor={0,0,0}, textString="Q_flow=%Q_flow"), Line( points={{-100,-20},{48,-20}}, @@ -43,7 +43,7 @@ equation {100,100}}), graphics={ Text( extent={{-100,40},{0,-36}}, - lineColor={0,0,0}, + textColor={0,0,0}, textString="Q_flow=const."), Line( points={{-48,-20},{60,-20}}, diff --git a/Buildings/HeatTransfer/Sources/FixedTemperature.mo b/Buildings/HeatTransfer/Sources/FixedTemperature.mo index 4e438811b39..be8831132e9 100644 --- a/Buildings/HeatTransfer/Sources/FixedTemperature.mo +++ b/Buildings/HeatTransfer/Sources/FixedTemperature.mo @@ -12,10 +12,10 @@ equation Text( extent={{-150,150},{150,110}}, textString="%name", - lineColor={0,0,255}), + textColor={0,0,255}), Text( extent={{-150,-110},{150,-140}}, - lineColor={0,0,0}, + textColor={0,0,0}, textString="T=%T"), Rectangle( extent={{-100,100},{100,-100}}, @@ -25,7 +25,7 @@ equation fillPattern=FillPattern.Backward), Text( extent={{0,0},{-100,-100}}, - lineColor={0,0,0}, + textColor={0,0,0}, textString="K"), Line( points={{-52,0},{56,0}}, @@ -55,7 +55,7 @@ i.e., it defines a fixed temperature as a boundary condition. thickness=0.5), Text( extent={{0,0},{-100,-100}}, - lineColor={0,0,0}, + textColor={0,0,0}, textString="K"), Polygon( points={{52,-20},{52,20},{90,0},{52,-20}}, diff --git a/Buildings/HeatTransfer/Sources/PrescribedHeatFlow.mo b/Buildings/HeatTransfer/Sources/PrescribedHeatFlow.mo index 2f0962aa22d..dad271af69e 100644 --- a/Buildings/HeatTransfer/Sources/PrescribedHeatFlow.mo +++ b/Buildings/HeatTransfer/Sources/PrescribedHeatFlow.mo @@ -46,7 +46,7 @@ equation Text( extent={{-150,100},{150,60}}, textString="%name", - lineColor={0,0,255})}), + textColor={0,0,255})}), Documentation(info="
This model allows a specified amount of heat flow rate to be \"injected\"
diff --git a/Buildings/HeatTransfer/Sources/PrescribedTemperature.mo b/Buildings/HeatTransfer/Sources/PrescribedTemperature.mo
index 8754b58c31f..4b22ac486df 100644
--- a/Buildings/HeatTransfer/Sources/PrescribedTemperature.mo
+++ b/Buildings/HeatTransfer/Sources/PrescribedTemperature.mo
@@ -22,12 +22,12 @@ equation
thickness=0.5),
Text(
extent={{0,0},{-100,-100}},
- lineColor={0,0,0},
+ textColor={0,0,0},
textString="K"),
Text(
extent={{-150,150},{150,110}},
textString="%name",
- lineColor={0,0,255}),
+ textColor={0,0,255}),
Polygon(
points={{50,-20},{50,20},{90,0},{50,-20}},
lineColor={191,0,0},
@@ -51,7 +51,7 @@ as required to keep the temperature at the specified value.
fillPattern=FillPattern.Backward),
Text(
extent={{0,0},{-100,-100}},
- lineColor={0,0,0},
+ textColor={0,0,0},
textString="K"),
Line(
points={{-102,0},{64,0}},
diff --git a/Buildings/HeatTransfer/Windows/BaseClasses/AbsorbedRadiation.mo b/Buildings/HeatTransfer/Windows/BaseClasses/AbsorbedRadiation.mo
index 48603f888d0..ec223067f70 100644
--- a/Buildings/HeatTransfer/Windows/BaseClasses/AbsorbedRadiation.mo
+++ b/Buildings/HeatTransfer/Windows/BaseClasses/AbsorbedRadiation.mo
@@ -334,22 +334,22 @@ First implementation.
Icon(graphics={
Text(
extent={{26,86},{102,74}},
- lineColor={0,0,127},
+ textColor={0,0,127},
textString="QAbsExtSha"),
Text(
extent={{-101,-73},{-54,-82}},
- lineColor={0,0,127},
+ textColor={0,0,127},
textString="HRoo"),
Text(
extent={{24,-68},{102,-80}},
- lineColor={0,0,127},
+ textColor={0,0,127},
textString="QAbsIntSha"),
Text(
extent={{34,46},{94,32}},
- lineColor={0,0,127},
+ textColor={0,0,127},
textString="QAbsGlaUns"),
Text(
extent={{30,-32},{104,-44}},
- lineColor={0,0,127},
+ textColor={0,0,127},
textString="QAbsGlaSha")}));
end AbsorbedRadiation;
diff --git a/Buildings/HeatTransfer/Windows/BaseClasses/CenterOfGlass.mo b/Buildings/HeatTransfer/Windows/BaseClasses/CenterOfGlass.mo
index fad47b794d8..d64fe3b0a35 100644
--- a/Buildings/HeatTransfer/Windows/BaseClasses/CenterOfGlass.mo
+++ b/Buildings/HeatTransfer/Windows/BaseClasses/CenterOfGlass.mo
@@ -140,7 +140,7 @@ equation
annotation (Diagram(coordinateSystem(preserveAspectRatio=true, extent={{-100,-100},
{100,100}}), graphics={Text(
extent={{-82,100},{-32,86}},
- lineColor={0,0,255},
+ textColor={0,0,255},
textString="outside"),
Ellipse(
extent={{-108,110},{-88,90}},
@@ -149,7 +149,7 @@ equation
fillPattern=FillPattern.Sphere),
Text(
extent={{44,98},{94,84}},
- lineColor={0,0,255},
+ textColor={0,0,255},
textString="room-side")}), Icon(coordinateSystem(
preserveAspectRatio=true, extent={{-100,-100},{100,100}}), graphics={
Rectangle(
@@ -173,7 +173,7 @@ equation
fillColor={170,213,255},
fillPattern=FillPattern.Solid), Text(
extent={{-90,86},{-78,74}},
- lineColor={0,0,127},
+ textColor={0,0,127},
textString="u")}),
Documentation(info="
This is a model for the heat transfer through the center of the glass.
diff --git a/Buildings/HeatTransfer/Windows/BaseClasses/ExteriorConvectionCoefficient.mo b/Buildings/HeatTransfer/Windows/BaseClasses/ExteriorConvectionCoefficient.mo
index 648183e7805..d9aba471934 100644
--- a/Buildings/HeatTransfer/Windows/BaseClasses/ExteriorConvectionCoefficient.mo
+++ b/Buildings/HeatTransfer/Windows/BaseClasses/ExteriorConvectionCoefficient.mo
@@ -15,11 +15,11 @@ equation
annotation ( Icon(graphics={
Text(
extent={{-92,22},{-50,-22}},
- lineColor={0,0,127},
+ textColor={0,0,127},
textString="v"),
Text(
extent={{40,26},{92,-20}},
- lineColor={0,0,127},
+ textColor={0,0,127},
textString="GCon")}),
Documentation(info="
Model for the convective heat transfer coefficient at the outside of a window.
diff --git a/Buildings/HeatTransfer/Windows/BaseClasses/GasConvection.mo b/Buildings/HeatTransfer/Windows/BaseClasses/GasConvection.mo
index 300bee7487b..5724a8639e5 100644
--- a/Buildings/HeatTransfer/Windows/BaseClasses/GasConvection.mo
+++ b/Buildings/HeatTransfer/Windows/BaseClasses/GasConvection.mo
@@ -141,7 +141,7 @@ equation
Line(points={{100,0},{100,0}}, color={0,127,255}),
Text(
extent={{-51,42},{-21,20}},
- lineColor={127,0,0},
+ textColor={127,0,0},
textString="Q_flow"),
Line(points={{-68,20},{68,20}}, color={191,0,0}),
Line(points={{-68,-20},{68,-20}}, color={191,0,0}),
@@ -171,7 +171,7 @@ equation
pattern=LinePattern.None),
Text(
extent={{-100,86},{-86,76}},
- lineColor={0,0,127},
+ textColor={0,0,127},
textString="u")}),
Documentation(info="
Model for convective heat tranfer in a single layer of window gas.
diff --git a/Buildings/HeatTransfer/Windows/BaseClasses/GlassLayer.mo b/Buildings/HeatTransfer/Windows/BaseClasses/GlassLayer.mo
index 40db1d7fd92..93b3ec52610 100644
--- a/Buildings/HeatTransfer/Windows/BaseClasses/GlassLayer.mo
+++ b/Buildings/HeatTransfer/Windows/BaseClasses/GlassLayer.mo
@@ -95,11 +95,11 @@ equation
pattern=LinePattern.None),
Text(
extent={{8,-70},{60,-98}},
- lineColor={0,0,127},
+ textColor={0,0,127},
textString="QAbs"),
Text(
extent={{-96,88},{-64,70}},
- lineColor={0,0,127},
+ textColor={0,0,127},
textString="u")}),
Documentation(info="
Model of a single layer of window glass. The input port QAbs_flow
diff --git a/Buildings/HeatTransfer/Windows/BaseClasses/HeatCapacity.mo b/Buildings/HeatTransfer/Windows/BaseClasses/HeatCapacity.mo
index 897b39888f2..a165e89b550 100644
--- a/Buildings/HeatTransfer/Windows/BaseClasses/HeatCapacity.mo
+++ b/Buildings/HeatTransfer/Windows/BaseClasses/HeatCapacity.mo
@@ -103,11 +103,11 @@ equation
color={255,0,0}),
Text(
extent={{-94,64},{-60,22}},
- lineColor={0,0,127},
+ textColor={0,0,127},
textString="ySha"),
Text(
extent={{-92,-16},{-58,-58}},
- lineColor={0,0,127},
+ textColor={0,0,127},
textString="yCom"),
Ellipse(
extent={{-6,-35},{6,-46}},
diff --git a/Buildings/HeatTransfer/Windows/BaseClasses/InteriorConvection.mo b/Buildings/HeatTransfer/Windows/BaseClasses/InteriorConvection.mo
index 857a97e63c4..509ae2db8b5 100644
--- a/Buildings/HeatTransfer/Windows/BaseClasses/InteriorConvection.mo
+++ b/Buildings/HeatTransfer/Windows/BaseClasses/InteriorConvection.mo
@@ -86,7 +86,7 @@ equation
Line(points={{100,0},{100,0}}, color={0,127,255}),
Text(
extent={{-35,42},{-5,20}},
- lineColor={255,0,0},
+ textColor={255,0,0},
textString="Q_flow"),
Line(points={{-60,20},{76,20}}, color={191,0,0}),
Line(points={{-60,-20},{76,-20}}, color={191,0,0}),
diff --git a/Buildings/HeatTransfer/Windows/BaseClasses/InteriorConvectionCoefficient.mo b/Buildings/HeatTransfer/Windows/BaseClasses/InteriorConvectionCoefficient.mo
index da590762772..af9c47b2dd2 100644
--- a/Buildings/HeatTransfer/Windows/BaseClasses/InteriorConvectionCoefficient.mo
+++ b/Buildings/HeatTransfer/Windows/BaseClasses/InteriorConvectionCoefficient.mo
@@ -13,7 +13,7 @@ equation
annotation ( Icon(graphics={
Text(
extent={{40,26},{92,-20}},
- lineColor={0,0,127},
+ textColor={0,0,127},
textString="GCon")}),
Documentation(info="
Model for the convective heat transfer coefficient at the room-facing surface of a window.
diff --git a/Buildings/HeatTransfer/Windows/BaseClasses/PartialRadiation.mo b/Buildings/HeatTransfer/Windows/BaseClasses/PartialRadiation.mo
index 63cca5afadd..671161dbdd1 100644
--- a/Buildings/HeatTransfer/Windows/BaseClasses/PartialRadiation.mo
+++ b/Buildings/HeatTransfer/Windows/BaseClasses/PartialRadiation.mo
@@ -99,19 +99,19 @@ First implementation.
Icon(graphics={
Text(
extent={{-92,0},{-62,-20}},
- lineColor={0,0,127},
+ textColor={0,0,127},
textString="incAng"),
Text(
extent={{-94,84},{-70,70}},
- lineColor={0,0,127},
+ textColor={0,0,127},
textString="HDif"),
Text(
extent={{-96,42},{-62,30}},
- lineColor={0,0,127},
+ textColor={0,0,127},
textString="HDir"),
Text(
extent={{-32,-82},{22,-94}},
- lineColor={0,0,127},
+ textColor={0,0,127},
textString="uSha"),
Polygon(
points={{-46,66},{-46,-10},{-6,-50},{-6,22},{-46,66}},
diff --git a/Buildings/HeatTransfer/Windows/BaseClasses/PartialWindowBoundaryCondition.mo b/Buildings/HeatTransfer/Windows/BaseClasses/PartialWindowBoundaryCondition.mo
index 720ac6d7cce..031c0c2ee4e 100644
--- a/Buildings/HeatTransfer/Windows/BaseClasses/PartialWindowBoundaryCondition.mo
+++ b/Buildings/HeatTransfer/Windows/BaseClasses/PartialWindowBoundaryCondition.mo
@@ -77,11 +77,11 @@ equation
pattern=LinePattern.None),
Text(
extent={{-94,88},{-86,74}},
- lineColor={0,0,127},
+ textColor={0,0,127},
textString="u"), Text(
extent={{-160,144},{140,104}},
textString="%name",
- lineColor={0,0,255}),
+ textColor={0,0,255}),
Polygon(
points={{-20,48},{-20,40},{20,52},{20,60},{-20,48}},
lineColor={0,0,0},
diff --git a/Buildings/HeatTransfer/Windows/BaseClasses/ShadeConvection.mo b/Buildings/HeatTransfer/Windows/BaseClasses/ShadeConvection.mo
index 74e7af2d01a..e09f9aeef38 100644
--- a/Buildings/HeatTransfer/Windows/BaseClasses/ShadeConvection.mo
+++ b/Buildings/HeatTransfer/Windows/BaseClasses/ShadeConvection.mo
@@ -67,7 +67,7 @@ equation
Text(
extent={{-100,132},{100,102}},
textString="%name",
- lineColor={0,0,255}),
+ textColor={0,0,255}),
Polygon(
points={{-20,54},{-20,46},{20,58},{20,66},{-20,54}},
lineColor={0,0,0},
@@ -123,7 +123,7 @@ equation
fillPattern=FillPattern.Solid),
Text(
extent={{-100,52},{-66,34}},
- lineColor={0,0,127},
+ textColor={0,0,127},
textString="Gc"),
Rectangle(
extent={{88,100},{100,-100}},
@@ -132,11 +132,11 @@ equation
fillPattern=FillPattern.Solid),
Text(
extent={{-68,-80},{-34,-98}},
- lineColor={0,0,127},
+ textColor={0,0,127},
textString="QAbsNet"),
Text(
extent={{42,-82},{76,-100}},
- lineColor={0,0,127},
+ textColor={0,0,127},
textString="T")}),
Documentation(info="
diff --git a/Buildings/HeatTransfer/Windows/BaseClasses/ShadeRadiation.mo b/Buildings/HeatTransfer/Windows/BaseClasses/ShadeRadiation.mo index ef938813112..ba17d68ba06 100644 --- a/Buildings/HeatTransfer/Windows/BaseClasses/ShadeRadiation.mo +++ b/Buildings/HeatTransfer/Windows/BaseClasses/ShadeRadiation.mo @@ -138,7 +138,7 @@ equation Text( extent={{-100,132},{100,102}}, textString="%name", - lineColor={0,0,255}), + textColor={0,0,255}), Polygon( points={{-20,54},{-20,46},{20,58},{20,66},{-20,54}}, lineColor={0,0,0}, @@ -183,7 +183,7 @@ equation fillPattern=FillPattern.Solid), Text( extent={{-18,-82},{16,-100}}, - lineColor={0,0,127}, + textColor={0,0,127}, textString="QAbs"), Rectangle( extent={{-2,90},{2,-80}}, @@ -198,7 +198,7 @@ equation fillPattern=FillPattern.Solid), Text( extent={{-102,90},{-68,72}}, - lineColor={0,0,127}, + textColor={0,0,127}, textString="u"), Rectangle( extent={{88,100},{100,-100}}, @@ -207,11 +207,11 @@ equation fillPattern=FillPattern.Solid), Text( extent={{42,-82},{76,-100}}, - lineColor={0,0,127}, + textColor={0,0,127}, textString="T"), Text( extent={{-68,-80},{-34,-98}}, - lineColor={0,0,127}, + textColor={0,0,127}, textString="QAbsNet")}), Documentation(info="
diff --git a/Buildings/HeatTransfer/Windows/BaseClasses/ShadingSignal.mo b/Buildings/HeatTransfer/Windows/BaseClasses/ShadingSignal.mo index e8497b4705f..568c3f3eb26 100644 --- a/Buildings/HeatTransfer/Windows/BaseClasses/ShadingSignal.mo +++ b/Buildings/HeatTransfer/Windows/BaseClasses/ShadingSignal.mo @@ -29,15 +29,15 @@ equation annotation ( Icon(graphics={ Text( extent={{-92,22},{-50,-22}}, - lineColor={0,0,127}, + textColor={0,0,127}, textString="u"), Text( extent={{48,22},{90,-22}}, - lineColor={0,0,127}, + textColor={0,0,127}, textString="u'"), Text( extent={{-14,-40},{92,-80}}, - lineColor={0,0,127}, + textColor={0,0,127}, textString="1-u'")}), Documentation(info=" This model changes the shading control signal to avoid a singularity diff --git a/Buildings/HeatTransfer/Windows/BaseClasses/ThermalConductor.mo b/Buildings/HeatTransfer/Windows/BaseClasses/ThermalConductor.mo index 2b12986d781..c6e2ce750ae 100644 --- a/Buildings/HeatTransfer/Windows/BaseClasses/ThermalConductor.mo +++ b/Buildings/HeatTransfer/Windows/BaseClasses/ThermalConductor.mo @@ -29,14 +29,14 @@ equation thickness=0.5), Text( extent={{-113,136},{115,96}}, - lineColor={0,0,0}, + textColor={0,0,0}, textString="G=%G"), Text( extent={{-105,90},{-64,64}}, - lineColor={0,0,0}, + textColor={0,0,0}, textString="u"), Text( extent={{-50,-84},{48,-132}}, - lineColor={0,0,255}, + textColor={0,0,255}, textString= "%name")}), Diagram(coordinateSystem(preserveAspectRatio=true, extent={{-100,-100},{100, @@ -48,11 +48,11 @@ equation arrow={Arrow.None,Arrow.Filled}), Text( extent={{-26,-10},{27,-39}}, - lineColor={255,0,0}, + textColor={255,0,0}, textString="Q_flow"), Text( extent={{-80,50},{80,20}}, - lineColor={0,0,0}, + textColor={0,0,0}, textString="dT = port_a.T - port_b.T")}), Documentation(info="
diff --git a/Buildings/HeatTransfer/Windows/BaseClasses/TransmittedRadiation.mo b/Buildings/HeatTransfer/Windows/BaseClasses/TransmittedRadiation.mo index dd47b0f364b..1458fb67b7b 100644 --- a/Buildings/HeatTransfer/Windows/BaseClasses/TransmittedRadiation.mo +++ b/Buildings/HeatTransfer/Windows/BaseClasses/TransmittedRadiation.mo @@ -181,13 +181,13 @@ First implementation. "), Icon(graphics={Text( extent={{-32,-80},{22,-96}}, - lineColor={0,0,127}, + textColor={0,0,127}, textString="uSha"), Text( extent={{56,28},{98,14}}, - lineColor={0,0,127}, + textColor={0,0,127}, textString="QTraDif"), Text( extent={{54,-14},{96,-28}}, - lineColor={0,0,127}, + textColor={0,0,127}, textString="QTraDir")})); end TransmittedRadiation; diff --git a/Buildings/HeatTransfer/Windows/BaseClasses/WindowRadiation.mo b/Buildings/HeatTransfer/Windows/BaseClasses/WindowRadiation.mo index b34383b4169..612e8f77cb6 100644 --- a/Buildings/HeatTransfer/Windows/BaseClasses/WindowRadiation.mo +++ b/Buildings/HeatTransfer/Windows/BaseClasses/WindowRadiation.mo @@ -335,34 +335,34 @@ First implementation. Icon(graphics={ Text( extent={{0,86},{90,72}}, - lineColor={0,0,127}, + textColor={0,0,127}, textString="QAbsExtSha"), Text( extent={{-4,-22},{92,-36}}, - lineColor={0,0,127}, + textColor={0,0,127}, textString="QAbsIntSha"), Text( extent={{2,58},{94,44}}, - lineColor={0,0,127}, + textColor={0,0,127}, textString="QAbsGlaUns"), Text( extent={{-2,20},{92,6}}, - lineColor={0,0,127}, + textColor={0,0,127}, textString="QAbsGlaSha"), Text( extent={{42,-52},{106,-66}}, - lineColor={0,0,127}, + textColor={0,0,127}, textString="QTraDif"), Text( extent={{-104,-70},{-50,-84}}, - lineColor={0,0,127}, + textColor={0,0,127}, textString="HRoo"), Text( extent={{8,-82},{62,-94}}, - lineColor={0,0,127}, + textColor={0,0,127}, textString="uSta"), Text( extent={{44,-80},{108,-94}}, - lineColor={0,0,127}, + textColor={0,0,127}, textString="QTraDir")})); end WindowRadiation; diff --git a/Buildings/HeatTransfer/Windows/ExteriorHeatTransfer.mo b/Buildings/HeatTransfer/Windows/ExteriorHeatTransfer.mo index db34be60771..179e23dad8c 100644 --- a/Buildings/HeatTransfer/Windows/ExteriorHeatTransfer.mo +++ b/Buildings/HeatTransfer/Windows/ExteriorHeatTransfer.mo @@ -217,7 +217,7 @@ equation annotation ( Icon(graphics={ Text( extent={{-94,48},{-52,32}}, - lineColor={0,0,127}, + textColor={0,0,127}, textString="vWind"), Ellipse( extent={{-110,110},{-90,90}}, lineColor={255,255,0}, @@ -225,15 +225,15 @@ equation fillPattern=FillPattern.Sphere), Text( extent={{-96,-76},{-66,-88}}, - lineColor={0,0,127}, + textColor={0,0,127}, textString="TOut"), Text( extent={{-94,-34},{-54,-46}}, - lineColor={0,0,127}, + textColor={0,0,127}, textString="TBlaSky"), Text( extent={{-38,-84},{28,-102}}, - lineColor={0,0,127}, + textColor={0,0,127}, textString="QSolAbs")}), defaultComponentName="extHeaTra", Documentation(info=" diff --git a/Buildings/HeatTransfer/Windows/InteriorHeatTransferConvective.mo b/Buildings/HeatTransfer/Windows/InteriorHeatTransferConvective.mo index 4121a83d80d..f53af446a5d 100644 --- a/Buildings/HeatTransfer/Windows/InteriorHeatTransferConvective.mo +++ b/Buildings/HeatTransfer/Windows/InteriorHeatTransferConvective.mo @@ -142,10 +142,10 @@ First implementation. graphics={ Text( extent={{-94,-82},{-28,-100}}, - lineColor={0,0,127}, + textColor={0,0,127}, textString="QRadAbs"), Text( extent={{-28,-84},{34,-100}}, - lineColor={0,0,127}, + textColor={0,0,127}, textString="TSha")})); end InteriorHeatTransferConvective; diff --git a/Buildings/HeatTransfer/Windows/Window.mo b/Buildings/HeatTransfer/Windows/Window.mo index fcb1b41c4c9..958d030499b 100644 --- a/Buildings/HeatTransfer/Windows/Window.mo +++ b/Buildings/HeatTransfer/Windows/Window.mo @@ -274,10 +274,10 @@ equation fillPattern=FillPattern.Solid), Text( extent={{-184,176},{-134,140}}, - lineColor={0,0,127}, + textColor={0,0,127}, textString="uSha"), Text( extent={{-60,238},{38,190}}, - lineColor={0,0,255}, + textColor={0,0,255}, textString="%name"), Polygon( points={{38,138},{38,-84},{78,-124},{78,96},{38,138}}, @@ -374,12 +374,12 @@ equation smooth=Smooth.None), Text( extent={{36,-162},{126,-202}}, - lineColor={0,0,127}, + textColor={0,0,127}, textString="QAbsSha"), Text( visible = haveShade, extent={{-124,-164},{-34,-204}}, - lineColor={0,0,127}, + textColor={0,0,127}, textString="QAbsUns")}), defaultComponentName="win", Documentation(info=" diff --git a/Buildings/Media/Specialized/Water/ConstantProperties_pT/package.mo b/Buildings/Media/Specialized/Water/ConstantProperties_pT/package.mo index 695b84f3335..937c98b8531 100644 --- a/Buildings/Media/Specialized/Water/ConstantProperties_pT/package.mo +++ b/Buildings/Media/Specialized/Water/ConstantProperties_pT/package.mo @@ -122,6 +122,6 @@ First implementation. fillColor={95,95,95}), Text( extent={{-110,40},{50,-36}}, - lineColor={238,46,47}, + textColor={238,46,47}, textString="pT")})); end ConstantProperties_pT; diff --git a/Buildings/Media/Specialized/Water/TemperatureDependentDensity.mo b/Buildings/Media/Specialized/Water/TemperatureDependentDensity.mo index 55941bdf7f7..38e8dcc9b22 100644 --- a/Buildings/Media/Specialized/Water/TemperatureDependentDensity.mo +++ b/Buildings/Media/Specialized/Water/TemperatureDependentDensity.mo @@ -949,6 +949,6 @@ First implementation. fillColor={95,95,95}), Text( extent={{-64,88},{-42,58}}, - lineColor={255,0,0}, + textColor={255,0,0}, textString="T")})); end TemperatureDependentDensity; diff --git a/Buildings/Obsolete/Controls/OBC/CDL/Discrete/MovingMean.mo b/Buildings/Obsolete/Controls/OBC/CDL/Discrete/MovingMean.mo index ffe1487d5e4..fe8b31d06c7 100644 --- a/Buildings/Obsolete/Controls/OBC/CDL/Discrete/MovingMean.mo +++ b/Buildings/Obsolete/Controls/OBC/CDL/Discrete/MovingMean.mo @@ -55,7 +55,7 @@ algorithm Text( extent={{-150,150},{150,110}}, textString="%name", - lineColor={0,0,255}), + textColor={0,0,255}), Line(points={{-88,0},{70,0}}, color={192,192,192}), Polygon( points={{92,0},{70,8},{70,-8},{92,0}}, diff --git a/Buildings/Obsolete/Fluid/Sources/FixedBoundary.mo b/Buildings/Obsolete/Fluid/Sources/FixedBoundary.mo index 49bac68789c..49a8fe639d4 100644 --- a/Buildings/Obsolete/Fluid/Sources/FixedBoundary.mo +++ b/Buildings/Obsolete/Fluid/Sources/FixedBoundary.mo @@ -100,7 +100,7 @@ annotation (defaultComponentName="bou", fillColor={0,127,255}), Text( extent={{-150,110},{150,150}}, textString="%name", - lineColor={0,0,255})}), + textColor={0,0,255})}), Documentation(info="
This model defines constant values for boundary conditions: diff --git a/Buildings/Obsolete/Utilities/IO/package.mo b/Buildings/Obsolete/Utilities/IO/package.mo index 64834ebc69a..856e10a9220 100644 --- a/Buildings/Obsolete/Utilities/IO/package.mo +++ b/Buildings/Obsolete/Utilities/IO/package.mo @@ -4,7 +4,7 @@ package IO "Input and output" annotation (Icon(graphics={Text( extent={{-92,72},{84,-66}}, - lineColor={0,0,0}, + textColor={0,0,0}, textString="I/O")}), Documentation(info="
This package contains models for input and output. diff --git a/Buildings/Occupants/Office/Blinds/Haldi2008BlindsTIn.mo b/Buildings/Occupants/Office/Blinds/Haldi2008BlindsTIn.mo index 8d3942f67ce..6e60997fd4d 100644 --- a/Buildings/Occupants/Office/Blinds/Haldi2008BlindsTIn.mo +++ b/Buildings/Occupants/Office/Blinds/Haldi2008BlindsTIn.mo @@ -57,7 +57,7 @@ equation annotation (Icon(graphics={ Rectangle(extent={{-60,40},{60,-40}}, lineColor={28,108,200}), Text( extent={{-40,20},{40,-20}}, - lineColor={28,108,200}, + textColor={28,108,200}, fillColor={0,0,255}, fillPattern=FillPattern.Solid, textStyle={TextStyle.Bold}, diff --git a/Buildings/Occupants/Office/Blinds/Haldi2008BlindsTOut.mo b/Buildings/Occupants/Office/Blinds/Haldi2008BlindsTOut.mo index ac564c15618..5c900f251e8 100644 --- a/Buildings/Occupants/Office/Blinds/Haldi2008BlindsTOut.mo +++ b/Buildings/Occupants/Office/Blinds/Haldi2008BlindsTOut.mo @@ -57,7 +57,7 @@ equation annotation (Icon(graphics={ Rectangle(extent={{-60,40},{60,-40}}, lineColor={28,108,200}), Text( extent={{-40,20},{40,-20}}, - lineColor={28,108,200}, + textColor={28,108,200}, fillColor={0,0,255}, fillPattern=FillPattern.Solid, textStyle={TextStyle.Bold}, diff --git a/Buildings/Occupants/Office/Blinds/Inkarojrit2008BlindsSolarIntensity.mo b/Buildings/Occupants/Office/Blinds/Inkarojrit2008BlindsSolarIntensity.mo index 9697de3f112..09838c23802 100644 --- a/Buildings/Occupants/Office/Blinds/Inkarojrit2008BlindsSolarIntensity.mo +++ b/Buildings/Occupants/Office/Blinds/Inkarojrit2008BlindsSolarIntensity.mo @@ -61,7 +61,7 @@ equation annotation (Icon(graphics={ Rectangle(extent={{-60,40},{60,-40}}, lineColor={28,108,200}), Text( extent={{-40,20},{40,-20}}, - lineColor={28,108,200}, + textColor={28,108,200}, fillColor={0,0,255}, fillPattern=FillPattern.Solid, textStyle={TextStyle.Bold}, diff --git a/Buildings/Occupants/Office/Blinds/Newsham1994BlindsSolarIntensity.mo b/Buildings/Occupants/Office/Blinds/Newsham1994BlindsSolarIntensity.mo index d71b6b16714..c7a62602bd7 100644 --- a/Buildings/Occupants/Office/Blinds/Newsham1994BlindsSolarIntensity.mo +++ b/Buildings/Occupants/Office/Blinds/Newsham1994BlindsSolarIntensity.mo @@ -43,7 +43,7 @@ equation annotation (Icon(graphics={ Rectangle(extent={{-60,40},{60,-40}}, lineColor={28,108,200}), Text( extent={{-40,20},{40,-20}}, - lineColor={28,108,200}, + textColor={28,108,200}, fillColor={0,0,255}, fillPattern=FillPattern.Solid, textStyle={TextStyle.Bold}, diff --git a/Buildings/Occupants/Office/Blinds/Zhang2012BlindsSolarAltitude.mo b/Buildings/Occupants/Office/Blinds/Zhang2012BlindsSolarAltitude.mo index 04265b3ce4a..bb649a88565 100644 --- a/Buildings/Occupants/Office/Blinds/Zhang2012BlindsSolarAltitude.mo +++ b/Buildings/Occupants/Office/Blinds/Zhang2012BlindsSolarAltitude.mo @@ -73,7 +73,7 @@ equation annotation (Icon(graphics={ Rectangle(extent={{-60,40},{60,-40}}, lineColor={28,108,200}), Text( extent={{-40,20},{40,-20}}, - lineColor={28,108,200}, + textColor={28,108,200}, fillColor={0,0,255}, fillPattern=FillPattern.Solid, textStyle={TextStyle.Bold}, diff --git a/Buildings/Occupants/Office/Blinds/Zhang2012BlindsSolarIntensity.mo b/Buildings/Occupants/Office/Blinds/Zhang2012BlindsSolarIntensity.mo index 932deabedd8..c54208d9fb6 100644 --- a/Buildings/Occupants/Office/Blinds/Zhang2012BlindsSolarIntensity.mo +++ b/Buildings/Occupants/Office/Blinds/Zhang2012BlindsSolarIntensity.mo @@ -71,7 +71,7 @@ equation annotation (Icon(graphics={ Rectangle(extent={{-60,40},{60,-40}}, lineColor={28,108,200}), Text( extent={{-40,20},{40,-20}}, - lineColor={28,108,200}, + textColor={28,108,200}, fillColor={0,0,255}, fillPattern=FillPattern.Solid, textStyle={TextStyle.Bold}, diff --git a/Buildings/Occupants/Office/Lighting/Gunay2016Light.mo b/Buildings/Occupants/Office/Lighting/Gunay2016Light.mo index d5b698372bd..dc69b0f4495 100644 --- a/Buildings/Occupants/Office/Lighting/Gunay2016Light.mo +++ b/Buildings/Occupants/Office/Lighting/Gunay2016Light.mo @@ -62,7 +62,7 @@ equation annotation (Icon(graphics={ Rectangle(extent={{-60,40},{60,-40}}, lineColor={28,108,200}), Text( extent={{-40,20},{40,-20}}, - lineColor={28,108,200}, + textColor={28,108,200}, fillColor={0,0,255}, fillPattern=FillPattern.Solid, textStyle={TextStyle.Bold}, diff --git a/Buildings/Occupants/Office/Lighting/Hunt1979Light.mo b/Buildings/Occupants/Office/Lighting/Hunt1979Light.mo index f57d48e11c2..6f47e66453d 100644 --- a/Buildings/Occupants/Office/Lighting/Hunt1979Light.mo +++ b/Buildings/Occupants/Office/Lighting/Hunt1979Light.mo @@ -56,7 +56,7 @@ equation annotation (Icon(graphics={ Rectangle(extent={{-60,40},{60,-40}}, lineColor={28,108,200}), Text( extent={{-40,20},{40,-20}}, - lineColor={28,108,200}, + textColor={28,108,200}, fillColor={0,0,255}, fillPattern=FillPattern.Solid, textStyle={TextStyle.Bold}, diff --git a/Buildings/Occupants/Office/Lighting/Love1998Light1.mo b/Buildings/Occupants/Office/Lighting/Love1998Light1.mo index afe6e354646..a3e38acc426 100644 --- a/Buildings/Occupants/Office/Lighting/Love1998Light1.mo +++ b/Buildings/Occupants/Office/Lighting/Love1998Light1.mo @@ -48,7 +48,7 @@ equation annotation (Icon(graphics={ Rectangle(extent={{-60,40},{60,-40}}, lineColor={28,108,200}), Text( extent={{-40,20},{40,-20}}, - lineColor={28,108,200}, + textColor={28,108,200}, fillColor={0,0,255}, fillPattern=FillPattern.Solid, textStyle={TextStyle.Bold}, diff --git a/Buildings/Occupants/Office/Lighting/Love1998Light2.mo b/Buildings/Occupants/Office/Lighting/Love1998Light2.mo index 9488eea1ce1..fd264e31f77 100644 --- a/Buildings/Occupants/Office/Lighting/Love1998Light2.mo +++ b/Buildings/Occupants/Office/Lighting/Love1998Light2.mo @@ -51,7 +51,7 @@ equation annotation (Icon(graphics={ Rectangle(extent={{-60,40},{60,-40}}, lineColor={28,108,200}), Text( extent={{-40,20},{40,-20}}, - lineColor={28,108,200}, + textColor={28,108,200}, fillColor={0,0,255}, fillPattern=FillPattern.Solid, textStyle={TextStyle.Bold}, diff --git a/Buildings/Occupants/Office/Lighting/Reinhart2003Light.mo b/Buildings/Occupants/Office/Lighting/Reinhart2003Light.mo index 31c5efbd245..860476ffa10 100644 --- a/Buildings/Occupants/Office/Lighting/Reinhart2003Light.mo +++ b/Buildings/Occupants/Office/Lighting/Reinhart2003Light.mo @@ -65,7 +65,7 @@ equation annotation (Icon(graphics={ Rectangle(extent={{-60,40},{60,-40}}, lineColor={28,108,200}), Text( extent={{-40,20},{40,-20}}, - lineColor={28,108,200}, + textColor={28,108,200}, fillColor={0,0,255}, fillPattern=FillPattern.Solid, textStyle={TextStyle.Bold}, diff --git a/Buildings/Occupants/Office/Occupancy/Wang2005Occupancy.mo b/Buildings/Occupants/Office/Occupancy/Wang2005Occupancy.mo index 6fbc0b7cf59..3e674ae1d64 100644 --- a/Buildings/Occupants/Office/Occupancy/Wang2005Occupancy.mo +++ b/Buildings/Occupants/Office/Occupancy/Wang2005Occupancy.mo @@ -39,7 +39,7 @@ algorithm annotation (Icon(graphics={ Rectangle(extent={{-60,40},{60,-40}}, lineColor={28,108,200}), Text( extent={{-40,20},{40,-20}}, - lineColor={28,108,200}, + textColor={28,108,200}, fillColor={0,0,255}, fillPattern=FillPattern.Solid, textStyle={TextStyle.Bold}, diff --git a/Buildings/Occupants/Office/Windows/Haldi2008WindowsTIn.mo b/Buildings/Occupants/Office/Windows/Haldi2008WindowsTIn.mo index 374462db8d8..58f8deba4c5 100644 --- a/Buildings/Occupants/Office/Windows/Haldi2008WindowsTIn.mo +++ b/Buildings/Occupants/Office/Windows/Haldi2008WindowsTIn.mo @@ -47,7 +47,7 @@ equation annotation (Icon(graphics={ Rectangle(extent={{-60,40},{60,-40}}, lineColor={28,108,200}), Text( extent={{-40,20},{40,-20}}, - lineColor={28,108,200}, + textColor={28,108,200}, fillColor={0,0,255}, fillPattern=FillPattern.Solid, textStyle={TextStyle.Bold}, diff --git a/Buildings/Occupants/Office/Windows/Haldi2008WindowsTOut.mo b/Buildings/Occupants/Office/Windows/Haldi2008WindowsTOut.mo index 4393a8b318f..e46a313f908 100644 --- a/Buildings/Occupants/Office/Windows/Haldi2008WindowsTOut.mo +++ b/Buildings/Occupants/Office/Windows/Haldi2008WindowsTOut.mo @@ -46,7 +46,7 @@ equation annotation (Icon(graphics={ Rectangle(extent={{-60,40},{60,-40}}, lineColor={28,108,200}), Text( extent={{-40,20},{40,-20}}, - lineColor={28,108,200}, + textColor={28,108,200}, fillColor={0,0,255}, fillPattern=FillPattern.Solid, textStyle={TextStyle.Bold}, diff --git a/Buildings/Occupants/Office/Windows/Haldi2009WindowsTInTout.mo b/Buildings/Occupants/Office/Windows/Haldi2009WindowsTInTout.mo index 8324e22a7ec..d7aa6a4af7c 100644 --- a/Buildings/Occupants/Office/Windows/Haldi2009WindowsTInTout.mo +++ b/Buildings/Occupants/Office/Windows/Haldi2009WindowsTInTout.mo @@ -68,7 +68,7 @@ equation annotation (Icon(graphics={ Rectangle(extent={{-60,40},{60,-40}}, lineColor={28,108,200}), Text( extent={{-40,20},{40,-20}}, - lineColor={28,108,200}, + textColor={28,108,200}, fillColor={0,0,255}, fillPattern=FillPattern.Solid, textStyle={TextStyle.Bold}, diff --git a/Buildings/Occupants/Office/Windows/Herkel2008WindowsCompletelyOpen.mo b/Buildings/Occupants/Office/Windows/Herkel2008WindowsCompletelyOpen.mo index 5f611be16a7..b9725b34165 100644 --- a/Buildings/Occupants/Office/Windows/Herkel2008WindowsCompletelyOpen.mo +++ b/Buildings/Occupants/Office/Windows/Herkel2008WindowsCompletelyOpen.mo @@ -47,7 +47,7 @@ equation annotation (Icon(graphics={ Rectangle(extent={{-60,40},{60,-40}}, lineColor={28,108,200}), Text( extent={{-40,20},{40,-20}}, - lineColor={28,108,200}, + textColor={28,108,200}, fillColor={0,0,255}, fillPattern=FillPattern.Solid, textStyle={TextStyle.Bold}, diff --git a/Buildings/Occupants/Office/Windows/Herkel2008WindowsSmall.mo b/Buildings/Occupants/Office/Windows/Herkel2008WindowsSmall.mo index 43a5c127299..a05b71ca1dd 100644 --- a/Buildings/Occupants/Office/Windows/Herkel2008WindowsSmall.mo +++ b/Buildings/Occupants/Office/Windows/Herkel2008WindowsSmall.mo @@ -46,7 +46,7 @@ equation annotation (Icon(graphics={ Rectangle(extent={{-60,40},{60,-40}}, lineColor={28,108,200}), Text( extent={{-40,20},{40,-20}}, - lineColor={28,108,200}, + textColor={28,108,200}, fillColor={0,0,255}, fillPattern=FillPattern.Solid, textStyle={TextStyle.Bold}, diff --git a/Buildings/Occupants/Office/Windows/Herkel2008WindowsTiltedOpen.mo b/Buildings/Occupants/Office/Windows/Herkel2008WindowsTiltedOpen.mo index 9d13acb1bc1..24b8082f6cf 100644 --- a/Buildings/Occupants/Office/Windows/Herkel2008WindowsTiltedOpen.mo +++ b/Buildings/Occupants/Office/Windows/Herkel2008WindowsTiltedOpen.mo @@ -47,7 +47,7 @@ equation annotation (Icon(graphics={ Rectangle(extent={{-60,40},{60,-40}}, lineColor={28,108,200}), Text( extent={{-40,20},{40,-20}}, - lineColor={28,108,200}, + textColor={28,108,200}, fillColor={0,0,255}, fillPattern=FillPattern.Solid, textStyle={TextStyle.Bold}, diff --git a/Buildings/Occupants/Office/Windows/Rijal2007WindowsTInTOutTComf.mo b/Buildings/Occupants/Office/Windows/Rijal2007WindowsTInTOutTComf.mo index 9a9e6d0948f..87423f09298 100644 --- a/Buildings/Occupants/Office/Windows/Rijal2007WindowsTInTOutTComf.mo +++ b/Buildings/Occupants/Office/Windows/Rijal2007WindowsTInTOutTComf.mo @@ -78,7 +78,7 @@ equation annotation (Icon(graphics={ Rectangle(extent={{-60,40},{60,-40}}, lineColor={28,108,200}), Text( extent={{-40,20},{40,-20}}, - lineColor={28,108,200}, + textColor={28,108,200}, fillColor={0,0,255}, fillPattern=FillPattern.Solid, textStyle={TextStyle.Bold}, diff --git a/Buildings/Occupants/Office/Windows/Yun2008WindowsTIn.mo b/Buildings/Occupants/Office/Windows/Yun2008WindowsTIn.mo index a64dbf81631..be8998d92af 100644 --- a/Buildings/Occupants/Office/Windows/Yun2008WindowsTIn.mo +++ b/Buildings/Occupants/Office/Windows/Yun2008WindowsTIn.mo @@ -63,7 +63,7 @@ equation annotation (Icon(graphics={ Rectangle(extent={{-60,40},{60,-40}}, lineColor={28,108,200}), Text( extent={{-40,20},{40,-20}}, - lineColor={28,108,200}, + textColor={28,108,200}, fillColor={0,0,255}, fillPattern=FillPattern.Solid, textStyle={TextStyle.Bold}, diff --git a/Buildings/Occupants/Office/Windows/Yun2008WindowsTOut.mo b/Buildings/Occupants/Office/Windows/Yun2008WindowsTOut.mo index a331e4cb808..6d2507f80da 100644 --- a/Buildings/Occupants/Office/Windows/Yun2008WindowsTOut.mo +++ b/Buildings/Occupants/Office/Windows/Yun2008WindowsTOut.mo @@ -62,7 +62,7 @@ equation annotation (Icon(graphics={ Rectangle(extent={{-60,40},{60,-40}}, lineColor={28,108,200}), Text( extent={{-40,20},{40,-20}}, - lineColor={28,108,200}, + textColor={28,108,200}, fillColor={0,0,255}, fillPattern=FillPattern.Solid, textStyle={TextStyle.Bold}, diff --git a/Buildings/Occupants/Office/Windows/Zhang2012WindowsAll.mo b/Buildings/Occupants/Office/Windows/Zhang2012WindowsAll.mo index 5ebfa2100ff..5c71bf916c2 100644 --- a/Buildings/Occupants/Office/Windows/Zhang2012WindowsAll.mo +++ b/Buildings/Occupants/Office/Windows/Zhang2012WindowsAll.mo @@ -48,7 +48,7 @@ equation annotation (Icon(graphics={ Rectangle(extent={{-60,40},{60,-40}}, lineColor={28,108,200}), Text( extent={{-40,20},{40,-20}}, - lineColor={28,108,200}, + textColor={28,108,200}, fillColor={0,0,255}, fillPattern=FillPattern.Solid, textStyle={TextStyle.Bold}, diff --git a/Buildings/Occupants/Office/Windows/Zhang2012WindowsEast.mo b/Buildings/Occupants/Office/Windows/Zhang2012WindowsEast.mo index 6da3b32f3d2..13c82f4108b 100644 --- a/Buildings/Occupants/Office/Windows/Zhang2012WindowsEast.mo +++ b/Buildings/Occupants/Office/Windows/Zhang2012WindowsEast.mo @@ -48,7 +48,7 @@ equation annotation (Icon(graphics={ Rectangle(extent={{-60,40},{60,-40}}, lineColor={28,108,200}), Text( extent={{-40,20},{40,-20}}, - lineColor={28,108,200}, + textColor={28,108,200}, fillColor={0,0,255}, fillPattern=FillPattern.Solid, textStyle={TextStyle.Bold}, diff --git a/Buildings/Occupants/Office/Windows/Zhang2012WindowsNorth.mo b/Buildings/Occupants/Office/Windows/Zhang2012WindowsNorth.mo index 12981378bf7..b6e8e0af796 100644 --- a/Buildings/Occupants/Office/Windows/Zhang2012WindowsNorth.mo +++ b/Buildings/Occupants/Office/Windows/Zhang2012WindowsNorth.mo @@ -46,7 +46,7 @@ equation annotation (Icon(graphics={ Rectangle(extent={{-60,40},{60,-40}}, lineColor={28,108,200}), Text( extent={{-40,20},{40,-20}}, - lineColor={28,108,200}, + textColor={28,108,200}, fillColor={0,0,255}, fillPattern=FillPattern.Solid, textStyle={TextStyle.Bold}, diff --git a/Buildings/Occupants/Office/Windows/Zhang2012WindowsSouth.mo b/Buildings/Occupants/Office/Windows/Zhang2012WindowsSouth.mo index 40a84170594..aa1cde0cbbf 100644 --- a/Buildings/Occupants/Office/Windows/Zhang2012WindowsSouth.mo +++ b/Buildings/Occupants/Office/Windows/Zhang2012WindowsSouth.mo @@ -48,7 +48,7 @@ equation annotation (Icon(graphics={ Rectangle(extent={{-60,40},{60,-40}}, lineColor={28,108,200}), Text( extent={{-40,20},{40,-20}}, - lineColor={28,108,200}, + textColor={28,108,200}, fillColor={0,0,255}, fillPattern=FillPattern.Solid, textStyle={TextStyle.Bold}, diff --git a/Buildings/Occupants/Office/Windows/Zhang2012WindowsWest.mo b/Buildings/Occupants/Office/Windows/Zhang2012WindowsWest.mo index 4d1c458ea80..8e0164d1105 100644 --- a/Buildings/Occupants/Office/Windows/Zhang2012WindowsWest.mo +++ b/Buildings/Occupants/Office/Windows/Zhang2012WindowsWest.mo @@ -46,7 +46,7 @@ equation annotation (Icon(graphics={ Rectangle(extent={{-60,40},{60,-40}}, lineColor={28,108,200}), Text( extent={{-40,20},{40,-20}}, - lineColor={28,108,200}, + textColor={28,108,200}, fillColor={0,0,255}, fillPattern=FillPattern.Solid, textStyle={TextStyle.Bold}, diff --git a/Buildings/Occupants/Residential/AirConditioning/Ren2014ACBedroom.mo b/Buildings/Occupants/Residential/AirConditioning/Ren2014ACBedroom.mo index 1bbc1af69ab..b4e70bd6ca1 100644 --- a/Buildings/Occupants/Residential/AirConditioning/Ren2014ACBedroom.mo +++ b/Buildings/Occupants/Residential/AirConditioning/Ren2014ACBedroom.mo @@ -76,7 +76,7 @@ equation annotation (Icon(graphics={ Rectangle(extent={{-60,40},{60,-40}}, lineColor={28,108,200}), Text( extent={{-40,20},{40,-20}}, - lineColor={28,108,200}, + textColor={28,108,200}, fillColor={0,0,255}, fillPattern=FillPattern.Solid, textStyle={TextStyle.Bold}, diff --git a/Buildings/Occupants/Residential/AirConditioning/Ren2014ACLivingroom.mo b/Buildings/Occupants/Residential/AirConditioning/Ren2014ACLivingroom.mo index e70d4842303..debc88f186a 100644 --- a/Buildings/Occupants/Residential/AirConditioning/Ren2014ACLivingroom.mo +++ b/Buildings/Occupants/Residential/AirConditioning/Ren2014ACLivingroom.mo @@ -75,7 +75,7 @@ equation annotation (Icon(graphics={ Rectangle(extent={{-60,40},{60,-40}}, lineColor={28,108,200}), Text( extent={{-40,20},{40,-20}}, - lineColor={28,108,200}, + textColor={28,108,200}, fillColor={0,0,255}, fillPattern=FillPattern.Solid, textStyle={TextStyle.Bold}, diff --git a/Buildings/Occupants/Residential/Heating/Nicol2001HeatingEU.mo b/Buildings/Occupants/Residential/Heating/Nicol2001HeatingEU.mo index d083ec18b76..dcb0388aa48 100644 --- a/Buildings/Occupants/Residential/Heating/Nicol2001HeatingEU.mo +++ b/Buildings/Occupants/Residential/Heating/Nicol2001HeatingEU.mo @@ -48,7 +48,7 @@ equation annotation (Icon(graphics={ Rectangle(extent={{-60,40},{60,-40}}, lineColor={28,108,200}), Text( extent={{-40,20},{40,-20}}, - lineColor={28,108,200}, + textColor={28,108,200}, fillColor={0,0,255}, fillPattern=FillPattern.Solid, textStyle={TextStyle.Bold}, diff --git a/Buildings/Occupants/Residential/Heating/Nicol2001HeatingPakistan.mo b/Buildings/Occupants/Residential/Heating/Nicol2001HeatingPakistan.mo index ce5feb7deba..23a75281747 100644 --- a/Buildings/Occupants/Residential/Heating/Nicol2001HeatingPakistan.mo +++ b/Buildings/Occupants/Residential/Heating/Nicol2001HeatingPakistan.mo @@ -49,7 +49,7 @@ equation annotation (Icon(graphics={ Rectangle(extent={{-60,40},{60,-40}}, lineColor={28,108,200}), Text( extent={{-40,20},{40,-20}}, - lineColor={28,108,200}, + textColor={28,108,200}, fillColor={0,0,255}, fillPattern=FillPattern.Solid, textStyle={TextStyle.Bold}, diff --git a/Buildings/Occupants/Residential/Heating/Nicol2001HeatingUK.mo b/Buildings/Occupants/Residential/Heating/Nicol2001HeatingUK.mo index 3b9dce078a9..1db8cf7c216 100644 --- a/Buildings/Occupants/Residential/Heating/Nicol2001HeatingUK.mo +++ b/Buildings/Occupants/Residential/Heating/Nicol2001HeatingUK.mo @@ -49,7 +49,7 @@ equation annotation (Icon(graphics={ Rectangle(extent={{-60,40},{60,-40}}, lineColor={28,108,200}), Text( extent={{-40,20},{40,-20}}, - lineColor={28,108,200}, + textColor={28,108,200}, fillColor={0,0,255}, fillPattern=FillPattern.Solid, textStyle={TextStyle.Bold}, diff --git a/Buildings/Occupants/Residential/Windows/Nicol2001WindowsEU.mo b/Buildings/Occupants/Residential/Windows/Nicol2001WindowsEU.mo index 48bacaeded0..5469f48c176 100644 --- a/Buildings/Occupants/Residential/Windows/Nicol2001WindowsEU.mo +++ b/Buildings/Occupants/Residential/Windows/Nicol2001WindowsEU.mo @@ -46,7 +46,7 @@ equation annotation (Icon(graphics={ Rectangle(extent={{-60,40},{60,-40}}, lineColor={28,108,200}), Text( extent={{-40,20},{40,-20}}, - lineColor={28,108,200}, + textColor={28,108,200}, fillColor={0,0,255}, fillPattern=FillPattern.Solid, textStyle={TextStyle.Bold}, diff --git a/Buildings/Occupants/Residential/Windows/Nicol2001WindowsPakistan.mo b/Buildings/Occupants/Residential/Windows/Nicol2001WindowsPakistan.mo index 973cdcff2f4..59d4c217241 100644 --- a/Buildings/Occupants/Residential/Windows/Nicol2001WindowsPakistan.mo +++ b/Buildings/Occupants/Residential/Windows/Nicol2001WindowsPakistan.mo @@ -46,7 +46,7 @@ equation annotation (Icon(graphics={ Rectangle(extent={{-60,40},{60,-40}}, lineColor={28,108,200}), Text( extent={{-40,20},{40,-20}}, - lineColor={28,108,200}, + textColor={28,108,200}, fillColor={0,0,255}, fillPattern=FillPattern.Solid, textStyle={TextStyle.Bold}, diff --git a/Buildings/Occupants/Residential/Windows/Nicol2001WindowsUK.mo b/Buildings/Occupants/Residential/Windows/Nicol2001WindowsUK.mo index 0056dfbb27b..1bffa42dd65 100644 --- a/Buildings/Occupants/Residential/Windows/Nicol2001WindowsUK.mo +++ b/Buildings/Occupants/Residential/Windows/Nicol2001WindowsUK.mo @@ -46,7 +46,7 @@ equation annotation (Icon(graphics={ Rectangle(extent={{-60,40},{60,-40}}, lineColor={28,108,200}), Text( extent={{-40,20},{40,-20}}, - lineColor={28,108,200}, + textColor={28,108,200}, fillColor={0,0,255}, fillPattern=FillPattern.Solid, textStyle={TextStyle.Bold}, diff --git a/Buildings/Resources/src/Controls/OBC/UnitConversions/unit_converters.py b/Buildings/Resources/src/Controls/OBC/UnitConversions/unit_converters.py index bab9b6daeb4..53a548db66c 100644 --- a/Buildings/Resources/src/Controls/OBC/UnitConversions/unit_converters.py +++ b/Buildings/Resources/src/Controls/OBC/UnitConversions/unit_converters.py @@ -511,16 +511,16 @@ def write_unit_converters(self): " fillPattern=FillPattern.Solid),\n"\ " Line(points={{20,58}}, color={28,108,200}),\n"\ " Text(\n"\ - " lineColor={0,0,255},\n"\ + " textColor={0,0,255},\n"\ " extent={{-150,110},{150,150}},\n"\ " textString=\"%name\"),\n"\ " Text(\n"\ " extent={{-80,50},{0,10}},\n"\ - " lineColor={0,0,127},\n"\ + " textColor={0,0,127},\n"\ " textString=\"" + from_unit_symbol + "\"),\n"\ " Text(\n"\ " extent={{10,-70},{90,-30}},\n"\ - " lineColor={0,0,127},\n"\ + " textColor={0,0,127},\n"\ " textString=\"" + to_unit_symbol + "\"),\n"\ " Polygon(\n"\ " points={{90,0},{30,20},{30,-20},{90,0}},\n"\ @@ -535,6 +535,11 @@ def write_unit_converters(self): "\", revisions=\"\n"\ "
Text annotation using now the textColor attribute\n"\
+ "rather than the deprecated lineColor attribute.\n"\
+ ""+ self.fullpath_to_this_script +".Text annotation using now the textColor attribute
+rather than the deprecated lineColor attribute.
+""" + self.fullpath_to_this_script + """.Text annotation using now the textColor attribute\n"\
+ "rather than the deprecated lineColor attribute.\n"\
+ ""+ self.fullpath_to_this_script +".diff --git a/Buildings/ThermalZones/Detailed/BaseClasses/RadiationAdapter.mo b/Buildings/ThermalZones/Detailed/BaseClasses/RadiationAdapter.mo index f522505bbe7..2f44e32a8c5 100644 --- a/Buildings/ThermalZones/Detailed/BaseClasses/RadiationAdapter.mo +++ b/Buildings/ThermalZones/Detailed/BaseClasses/RadiationAdapter.mo @@ -46,11 +46,11 @@ First implementation. fillPattern=FillPattern.Solid), Text( extent={{-90,24},{-40,-26}}, - lineColor={0,0,127}, + textColor={0,0,127}, textString="TRad"), Text( extent={{50,14},{92,-12}}, - lineColor={0,0,127}, + textColor={0,0,127}, textString="Q")}), Documentation(info = " This is a dummy model that is required to implement the room diff --git a/Buildings/ThermalZones/Detailed/BaseClasses/RoomHeatMassBalance.mo b/Buildings/ThermalZones/Detailed/BaseClasses/RoomHeatMassBalance.mo index 0dea1ce1a00..a092a58fcc2 100644 --- a/Buildings/ThermalZones/Detailed/BaseClasses/RoomHeatMassBalance.mo +++ b/Buildings/ThermalZones/Detailed/BaseClasses/RoomHeatMassBalance.mo @@ -785,17 +785,17 @@ equation 200}}), graphics={ Text( extent={{-104,210},{84,242}}, - lineColor={0,0,255}, + textColor={0,0,255}, fillColor={255,255,255}, fillPattern=FillPattern.Solid, textString="%name"), Text( extent={{-220,100},{-144,68}}, - lineColor={0,0,127}, + textColor={0,0,127}, textString="q"), Text( extent={{-14,-160},{44,-186}}, - lineColor={0,0,0}, + textColor={0,0,0}, fillColor={61,61,61}, fillPattern=FillPattern.Solid, textString="boundary"), @@ -822,25 +822,25 @@ equation fillPattern=FillPattern.Solid), Text( extent={{-60,12},{-22,-10}}, - lineColor={0,0,0}, + textColor={0,0,0}, fillColor={61,61,61}, fillPattern=FillPattern.Solid, textString="air"), Text( extent={{-72,-22},{-22,-50}}, - lineColor={0,0,0}, + textColor={0,0,0}, fillColor={61,61,61}, fillPattern=FillPattern.Solid, textString="radiation"), Text( extent={{-104,-124},{-54,-152}}, - lineColor={0,0,0}, + textColor={0,0,0}, fillColor={61,61,61}, fillPattern=FillPattern.Solid, textString="surface"), Text( extent={{-198,144},{-122,112}}, - lineColor={0,0,127}, + textColor={0,0,127}, textString="uWin"), Rectangle( extent={{-140,140},{140,-140}}, @@ -851,7 +851,7 @@ equation min(1, max(0, (heaPorAir.T-295.15)/10))*{255,0,0})), Text( extent={{134,-84},{14,-134}}, - lineColor={255,255,255}, + textColor={255,255,255}, textString=DynamicSelect("", String(heaPorAir.T-273.15, format=".1f")))}), preferredView="info", defaultComponentName="roo", diff --git a/Buildings/ThermalZones/Detailed/BaseClasses/SkyRadiationExchange.mo b/Buildings/ThermalZones/Detailed/BaseClasses/SkyRadiationExchange.mo index 5c5124e6563..0eb6b810873 100644 --- a/Buildings/ThermalZones/Detailed/BaseClasses/SkyRadiationExchange.mo +++ b/Buildings/ThermalZones/Detailed/BaseClasses/SkyRadiationExchange.mo @@ -77,15 +77,15 @@ equation thickness=0.5), Text( extent={{-128,12},{-78,-34}}, - lineColor={0,0,127}, + textColor={0,0,127}, textString="TOut"), Text( extent={{-130,96},{-80,50}}, - lineColor={0,0,127}, + textColor={0,0,127}, textString="TSky"), Text( extent={{86,52},{136,6}}, - lineColor={0,0,127}, + textColor={0,0,127}, textString="QIR_flow")}), Documentation(info = " This model computes the infrared radiative heat flow diff --git a/Buildings/ThermalZones/Detailed/BaseClasses/to_W.mo b/Buildings/ThermalZones/Detailed/BaseClasses/to_W.mo index 70b533fe038..0049c5e324a 100644 --- a/Buildings/ThermalZones/Detailed/BaseClasses/to_W.mo +++ b/Buildings/ThermalZones/Detailed/BaseClasses/to_W.mo @@ -25,5 +25,5 @@ First implementation. 100}}), graphics={Text( extent={{-150,110},{150,150}}, textString="%name", - lineColor={0,0,255})})); + textColor={0,0,255})})); end to_W; diff --git a/Buildings/ThermalZones/Detailed/CFD.mo b/Buildings/ThermalZones/Detailed/CFD.mo index 762937ec7fd..f1108c8a40a 100644 --- a/Buildings/ThermalZones/Detailed/CFD.mo +++ b/Buildings/ThermalZones/Detailed/CFD.mo @@ -103,19 +103,19 @@ equation fileName="modelica://Buildings/Resources/Images/ThermalZones/Detailed/cfd.png"), Text( extent={{162,98},{196,140}}, - lineColor={0,0,127}, + textColor={0,0,127}, textString="yCFD"), Text( extent={{-86,-14},{0,16}}, - lineColor={0,0,0}, + textColor={0,0,0}, textString="air"), Text( extent={{-102,-50},{-22,-26}}, - lineColor={0,0,0}, + textColor={0,0,0}, textString="radiation"), Text( extent={{-114,-134},{-36,-116}}, - lineColor={0,0,0}, + textColor={0,0,0}, textString="surface")}), Documentation(info="
diff --git a/Buildings/ThermalZones/Detailed/Constructions/BaseClasses/PartialConstruction.mo b/Buildings/ThermalZones/Detailed/Constructions/BaseClasses/PartialConstruction.mo index 4960b568844..4864a045cd9 100644 --- a/Buildings/ThermalZones/Detailed/Constructions/BaseClasses/PartialConstruction.mo +++ b/Buildings/ThermalZones/Detailed/Constructions/BaseClasses/PartialConstruction.mo @@ -99,7 +99,7 @@ equation fillPattern=FillPattern.Backward), Text( extent={{-314,336},{286,302}}, - lineColor={0,0,255}, + textColor={0,0,255}, textString="%name")}), Documentation(info="
diff --git a/Buildings/ThermalZones/Detailed/Examples/Controls/ElectrochromicWindow.mo b/Buildings/ThermalZones/Detailed/Examples/Controls/ElectrochromicWindow.mo index ec0571597e8..f6cf556c17c 100644 --- a/Buildings/ThermalZones/Detailed/Examples/Controls/ElectrochromicWindow.mo +++ b/Buildings/ThermalZones/Detailed/Examples/Controls/ElectrochromicWindow.mo @@ -117,14 +117,14 @@ First implementation. 100}}), graphics={ Text( extent={{-118,58},{-42,26}}, - lineColor={0,0,127}, + textColor={0,0,127}, textString="T"), Text( extent={{-118,-24},{-42,-56}}, - lineColor={0,0,127}, + textColor={0,0,127}, textString="H"), Text( extent={{42,22},{118,-10}}, - lineColor={0,0,127}, + textColor={0,0,127}, textString="u")})); end ElectrochromicWindow; diff --git a/Buildings/ThermalZones/Detailed/Examples/MixedAirCO2.mo b/Buildings/ThermalZones/Detailed/Examples/MixedAirCO2.mo index 2ddcbed0085..d05023deffc 100644 --- a/Buildings/ThermalZones/Detailed/Examples/MixedAirCO2.mo +++ b/Buildings/ThermalZones/Detailed/Examples/MixedAirCO2.mo @@ -120,12 +120,12 @@ experiment(StopTime=86400, Tolerance=1e-06), fillPattern=FillPattern.Solid), Text( extent={{-164,-86},{-92,-108}}, - lineColor={0,0,0}, + textColor={0,0,0}, horizontalAlignment=TextAlignment.Left, textString="Feedback control for fresh air"), Text( extent={{84,-22},{140,-42}}, - lineColor={0,0,0}, + textColor={0,0,0}, horizontalAlignment=TextAlignment.Left, textString="CO2 sensor for room air")})); end MixedAirCO2; diff --git a/Buildings/ThermalZones/Detailed/FLEXLAB/Rooms/X3A/Closet.mo b/Buildings/ThermalZones/Detailed/FLEXLAB/Rooms/X3A/Closet.mo index 53e0f9231ab..63b3409d755 100644 --- a/Buildings/ThermalZones/Detailed/FLEXLAB/Rooms/X3A/Closet.mo +++ b/Buildings/ThermalZones/Detailed/FLEXLAB/Rooms/X3A/Closet.mo @@ -181,25 +181,25 @@ model Closet "Model of the closet connected to test cell X3A" fillPattern=FillPattern.Solid), Text( extent={{-60,12},{-22,-10}}, - lineColor={0,0,0}, + textColor={0,0,0}, fillColor={61,61,61}, fillPattern=FillPattern.Solid, textString="air"), Text( extent={{-72,-22},{-22,-50}}, - lineColor={0,0,0}, + textColor={0,0,0}, fillColor={61,61,61}, fillPattern=FillPattern.Solid, textString="radiation"), Text( extent={{-104,-124},{-54,-152}}, - lineColor={0,0,0}, + textColor={0,0,0}, fillColor={61,61,61}, fillPattern=FillPattern.Solid, textString="surface"), Text( extent={{-138,-82},{-96,-100}}, - lineColor={0,0,0}, + textColor={0,0,0}, fillColor={61,61,61}, fillPattern=FillPattern.Solid, textString="fluid")})); diff --git a/Buildings/ThermalZones/Detailed/FLEXLAB/Rooms/X3A/ClosetFullBed.mo b/Buildings/ThermalZones/Detailed/FLEXLAB/Rooms/X3A/ClosetFullBed.mo index f7ee1fc24af..8221ae25b69 100644 --- a/Buildings/ThermalZones/Detailed/FLEXLAB/Rooms/X3A/ClosetFullBed.mo +++ b/Buildings/ThermalZones/Detailed/FLEXLAB/Rooms/X3A/ClosetFullBed.mo @@ -168,25 +168,25 @@ model ClosetFullBed fillPattern=FillPattern.Solid), Text( extent={{-60,12},{-22,-10}}, - lineColor={0,0,0}, + textColor={0,0,0}, fillColor={61,61,61}, fillPattern=FillPattern.Solid, textString="air"), Text( extent={{-72,-22},{-22,-50}}, - lineColor={0,0,0}, + textColor={0,0,0}, fillColor={61,61,61}, fillPattern=FillPattern.Solid, textString="radiation"), Text( extent={{-104,-124},{-54,-152}}, - lineColor={0,0,0}, + textColor={0,0,0}, fillColor={61,61,61}, fillPattern=FillPattern.Solid, textString="surface"), Text( extent={{-138,-82},{-96,-100}}, - lineColor={0,0,0}, + textColor={0,0,0}, fillColor={61,61,61}, fillPattern=FillPattern.Solid, textString="fluid")})); diff --git a/Buildings/ThermalZones/Detailed/FLEXLAB/Rooms/X3A/Electrical.mo b/Buildings/ThermalZones/Detailed/FLEXLAB/Rooms/X3A/Electrical.mo index 78137e966f3..0da9d9720f7 100644 --- a/Buildings/ThermalZones/Detailed/FLEXLAB/Rooms/X3A/Electrical.mo +++ b/Buildings/ThermalZones/Detailed/FLEXLAB/Rooms/X3A/Electrical.mo @@ -176,25 +176,25 @@ model Electrical "Model of the electrical room attached to test cell X3A" fillPattern=FillPattern.Solid), Text( extent={{-60,12},{-22,-10}}, - lineColor={0,0,0}, + textColor={0,0,0}, fillColor={61,61,61}, fillPattern=FillPattern.Solid, textString="air"), Text( extent={{-72,-22},{-22,-50}}, - lineColor={0,0,0}, + textColor={0,0,0}, fillColor={61,61,61}, fillPattern=FillPattern.Solid, textString="radiation"), Text( extent={{-104,-124},{-54,-152}}, - lineColor={0,0,0}, + textColor={0,0,0}, fillColor={61,61,61}, fillPattern=FillPattern.Solid, textString="surface"), Text( extent={{-138,-82},{-96,-100}}, - lineColor={0,0,0}, + textColor={0,0,0}, fillColor={61,61,61}, fillPattern=FillPattern.Solid, textString="fluid")})); diff --git a/Buildings/ThermalZones/Detailed/FLEXLAB/Rooms/X3A/TestCell.mo b/Buildings/ThermalZones/Detailed/FLEXLAB/Rooms/X3A/TestCell.mo index 89e8af83f34..08e4bf8de7a 100644 --- a/Buildings/ThermalZones/Detailed/FLEXLAB/Rooms/X3A/TestCell.mo +++ b/Buildings/ThermalZones/Detailed/FLEXLAB/Rooms/X3A/TestCell.mo @@ -229,25 +229,25 @@ model TestCell "Model of LBNL User Test Facility Cell X3A" fillPattern=FillPattern.Solid), Text( extent={{-60,12},{-22,-10}}, - lineColor={0,0,0}, + textColor={0,0,0}, fillColor={61,61,61}, fillPattern=FillPattern.Solid, textString="air"), Text( extent={{-72,-22},{-22,-50}}, - lineColor={0,0,0}, + textColor={0,0,0}, fillColor={61,61,61}, fillPattern=FillPattern.Solid, textString="radiation"), Text( extent={{-104,-124},{-54,-152}}, - lineColor={0,0,0}, + textColor={0,0,0}, fillColor={61,61,61}, fillPattern=FillPattern.Solid, textString="surface"), Text( extent={{-138,-82},{-96,-100}}, - lineColor={0,0,0}, + textColor={0,0,0}, fillColor={61,61,61}, fillPattern=FillPattern.Solid, textString="fluid")})); diff --git a/Buildings/ThermalZones/Detailed/FLEXLAB/Rooms/X3A/TestCellFullBed.mo b/Buildings/ThermalZones/Detailed/FLEXLAB/Rooms/X3A/TestCellFullBed.mo index f3bcaa49152..1a05c9f6f8b 100644 --- a/Buildings/ThermalZones/Detailed/FLEXLAB/Rooms/X3A/TestCellFullBed.mo +++ b/Buildings/ThermalZones/Detailed/FLEXLAB/Rooms/X3A/TestCellFullBed.mo @@ -197,25 +197,25 @@ model TestCellFullBed fillPattern=FillPattern.Solid), Text( extent={{-60,12},{-22,-10}}, - lineColor={0,0,0}, + textColor={0,0,0}, fillColor={61,61,61}, fillPattern=FillPattern.Solid, textString="air"), Text( extent={{-72,-22},{-22,-50}}, - lineColor={0,0,0}, + textColor={0,0,0}, fillColor={61,61,61}, fillPattern=FillPattern.Solid, textString="radiation"), Text( extent={{-104,-124},{-54,-152}}, - lineColor={0,0,0}, + textColor={0,0,0}, fillColor={61,61,61}, fillPattern=FillPattern.Solid, textString="surface"), Text( extent={{-138,-82},{-96,-100}}, - lineColor={0,0,0}, + textColor={0,0,0}, fillColor={61,61,61}, fillPattern=FillPattern.Solid, textString="fluid")})); diff --git a/Buildings/ThermalZones/Detailed/FLEXLAB/Rooms/X3B/Closet.mo b/Buildings/ThermalZones/Detailed/FLEXLAB/Rooms/X3B/Closet.mo index ff52e5a95fa..4be0656e94b 100644 --- a/Buildings/ThermalZones/Detailed/FLEXLAB/Rooms/X3B/Closet.mo +++ b/Buildings/ThermalZones/Detailed/FLEXLAB/Rooms/X3B/Closet.mo @@ -178,25 +178,25 @@ model Closet "Model of the closet connected to test cell X3A" fillPattern=FillPattern.Solid), Text( extent={{-60,12},{-22,-10}}, - lineColor={0,0,0}, + textColor={0,0,0}, fillColor={61,61,61}, fillPattern=FillPattern.Solid, textString="air"), Text( extent={{-72,-22},{-22,-50}}, - lineColor={0,0,0}, + textColor={0,0,0}, fillColor={61,61,61}, fillPattern=FillPattern.Solid, textString="radiation"), Text( extent={{-104,-124},{-54,-152}}, - lineColor={0,0,0}, + textColor={0,0,0}, fillColor={61,61,61}, fillPattern=FillPattern.Solid, textString="surface"), Text( extent={{-138,-82},{-96,-100}}, - lineColor={0,0,0}, + textColor={0,0,0}, fillColor={61,61,61}, fillPattern=FillPattern.Solid, textString="fluid")})); diff --git a/Buildings/ThermalZones/Detailed/FLEXLAB/Rooms/X3B/Electrical.mo b/Buildings/ThermalZones/Detailed/FLEXLAB/Rooms/X3B/Electrical.mo index 9b6b8fee7e9..b3edb41b58c 100644 --- a/Buildings/ThermalZones/Detailed/FLEXLAB/Rooms/X3B/Electrical.mo +++ b/Buildings/ThermalZones/Detailed/FLEXLAB/Rooms/X3B/Electrical.mo @@ -167,25 +167,25 @@ model Electrical "Model of the electrical room attached to test cell X3A" fillPattern=FillPattern.Solid), Text( extent={{-60,12},{-22,-10}}, - lineColor={0,0,0}, + textColor={0,0,0}, fillColor={61,61,61}, fillPattern=FillPattern.Solid, textString="air"), Text( extent={{-72,-22},{-22,-50}}, - lineColor={0,0,0}, + textColor={0,0,0}, fillColor={61,61,61}, fillPattern=FillPattern.Solid, textString="radiation"), Text( extent={{-104,-124},{-54,-152}}, - lineColor={0,0,0}, + textColor={0,0,0}, fillColor={61,61,61}, fillPattern=FillPattern.Solid, textString="surface"), Text( extent={{-138,-82},{-96,-100}}, - lineColor={0,0,0}, + textColor={0,0,0}, fillColor={61,61,61}, fillPattern=FillPattern.Solid, textString="fluid")})); diff --git a/Buildings/ThermalZones/Detailed/FLEXLAB/Rooms/X3B/TestCell.mo b/Buildings/ThermalZones/Detailed/FLEXLAB/Rooms/X3B/TestCell.mo index ef3a575bc5a..b20910736d0 100644 --- a/Buildings/ThermalZones/Detailed/FLEXLAB/Rooms/X3B/TestCell.mo +++ b/Buildings/ThermalZones/Detailed/FLEXLAB/Rooms/X3B/TestCell.mo @@ -197,25 +197,25 @@ model TestCell "Model of LBNL User Test Facility Cell X3A" fillPattern=FillPattern.Solid), Text( extent={{-60,12},{-22,-10}}, - lineColor={0,0,0}, + textColor={0,0,0}, fillColor={61,61,61}, fillPattern=FillPattern.Solid, textString="air"), Text( extent={{-72,-22},{-22,-50}}, - lineColor={0,0,0}, + textColor={0,0,0}, fillColor={61,61,61}, fillPattern=FillPattern.Solid, textString="radiation"), Text( extent={{-104,-124},{-54,-152}}, - lineColor={0,0,0}, + textColor={0,0,0}, fillColor={61,61,61}, fillPattern=FillPattern.Solid, textString="surface"), Text( extent={{-138,-82},{-96,-100}}, - lineColor={0,0,0}, + textColor={0,0,0}, fillColor={61,61,61}, fillPattern=FillPattern.Solid, textString="fluid")})); diff --git a/Buildings/ThermalZones/Detailed/MixedAir.mo b/Buildings/ThermalZones/Detailed/MixedAir.mo index 1bbb8f9b227..9db1d05dab8 100644 --- a/Buildings/ThermalZones/Detailed/MixedAir.mo +++ b/Buildings/ThermalZones/Detailed/MixedAir.mo @@ -243,11 +243,11 @@ First implementation. {200,200}}), graphics={ Text( extent={{-198,198},{-122,166}}, - lineColor={0,0,127}, + textColor={0,0,127}, textString="uSha"), Text( extent={{-190,44},{-128,14}}, - lineColor={0,0,127}, + textColor={0,0,127}, textString="C_flow", visible=use_C_flow)})); end MixedAir; diff --git a/Buildings/ThermalZones/Detailed/Validation/BESTEST/Cases9xx/Case960.mo b/Buildings/ThermalZones/Detailed/Validation/BESTEST/Cases9xx/Case960.mo index fbfeef8477b..fd38de79546 100644 --- a/Buildings/ThermalZones/Detailed/Validation/BESTEST/Cases9xx/Case960.mo +++ b/Buildings/ThermalZones/Detailed/Validation/BESTEST/Cases9xx/Case960.mo @@ -220,10 +220,10 @@ equation Diagram(coordinateSystem(preserveAspectRatio=true, extent={{-120,-240},{260, 120}}), graphics={Text( extent={{106,-200},{252,-220}}, - lineColor={0,0,255}, + textColor={0,0,255}, textString="SunZone"), Text( extent={{-12,-202},{134,-222}}, - lineColor={0,0,255}, + textColor={0,0,255}, textString="BackZone")}), Documentation(revisions="
This model is used to weight thermal ports (inputs) according to given split diff --git a/Buildings/ThermalZones/ReducedOrder/RC/FourElements.mo b/Buildings/ThermalZones/ReducedOrder/RC/FourElements.mo index 57a0af6ac20..c8367175646 100644 --- a/Buildings/ThermalZones/ReducedOrder/RC/FourElements.mo +++ b/Buildings/ThermalZones/ReducedOrder/RC/FourElements.mo @@ -181,7 +181,7 @@ equation fillPattern=FillPattern.Solid), Text( extent={{16,168},{46,156}}, - lineColor={0,0,255}, + textColor={0,0,255}, fillColor={215,215,215}, fillPattern=FillPattern.Solid, textString="Roof")}), @@ -193,7 +193,7 @@ equation fillColor={230,230,230}, fillPattern=FillPattern.Solid), Text( extent={{-60,60},{64,-64}}, - lineColor={0,0,0}, + textColor={0,0,0}, textString="4")}), Documentation(revisions="
diff --git a/Buildings/ThermalZones/ReducedOrder/RC/ThreeElements.mo b/Buildings/ThermalZones/ReducedOrder/RC/ThreeElements.mo index 81c12c3abf2..1c2ca39569e 100644 --- a/Buildings/ThermalZones/ReducedOrder/RC/ThreeElements.mo +++ b/Buildings/ThermalZones/ReducedOrder/RC/ThreeElements.mo @@ -167,7 +167,7 @@ equation fillPattern=FillPattern.Solid), Text( extent={{6,-152},{48,-166}}, - lineColor={0,0,255}, + textColor={0,0,255}, fillColor={215,215,215}, fillPattern=FillPattern.Solid, textString="Floor Plate")}), Icon(coordinateSystem(extent={{-240, @@ -177,7 +177,7 @@ equation fillColor={230,230,230}, fillPattern=FillPattern.Solid), Text( extent={{-62,62},{62,-62}}, - lineColor={0,0,0}, + textColor={0,0,0}, textString="3")}), Documentation(revisions="
Partial model for correction factors for transmitted solar radiation diff --git a/Buildings/Utilities/Comfort/Fanger.mo b/Buildings/Utilities/Comfort/Fanger.mo index 62eacf7b3f5..2f393f432ce 100644 --- a/Buildings/Utilities/Comfort/Fanger.mo +++ b/Buildings/Utilities/Comfort/Fanger.mo @@ -396,43 +396,43 @@ rather than computing it in model, added model to UTC library. fillPattern=FillPattern.Solid), Text( extent={{-108,100},{-46,80}}, - lineColor={0,0,255}, + textColor={0,0,255}, textString="TAir"), Text( extent={{-100,68},{-38,48}}, - lineColor={0,0,255}, + textColor={0,0,255}, textString="TRad"), Text( visible=use_vAir_in, extent={{-106,0},{-44,-20}}, - lineColor={0,0,255}, + textColor={0,0,255}, textString="vAir"), Text( visible=use_M_in, extent={{-114,-30},{-52,-50}}, - lineColor={0,0,255}, + textColor={0,0,255}, textString="M"), Text( extent={{-100,32},{-50,10}}, - lineColor={0,0,255}, + textColor={0,0,255}, textString="phi"), Text( visible=use_pAir_in, extent={{-104,-84},{-48,-100}}, - lineColor={0,0,255}, + textColor={0,0,255}, textString="pAir"), Text( visible=use_ICl_in, extent={{-108,-62},{-52,-78}}, - lineColor={0,0,255}, + textColor={0,0,255}, textString="ICl"), Text( extent={{40,48},{102,28}}, - lineColor={0,0,255}, + textColor={0,0,255}, textString="PMV"), Text( extent={{44,-34},{106,-54}}, - lineColor={0,0,255}, + textColor={0,0,255}, textString="PPD"), Line( points={{-50,42},{-50,-38}}, diff --git a/Buildings/Utilities/Diagnostics/AssertEquality.mo b/Buildings/Utilities/Diagnostics/AssertEquality.mo index 3a5a2e3b7eb..1074d01e83b 100644 --- a/Buildings/Utilities/Diagnostics/AssertEquality.mo +++ b/Buildings/Utilities/Diagnostics/AssertEquality.mo @@ -14,7 +14,7 @@ annotation ( defaultComponentName="assEqu", Icon(graphics={Text( extent={{-84,108},{90,-28}}, - lineColor={255,0,0}, + textColor={255,0,0}, textString="u1 = u2")}), Documentation(info="
diff --git a/Buildings/Utilities/Diagnostics/AssertInequality.mo b/Buildings/Utilities/Diagnostics/AssertInequality.mo index 24d24486ceb..649f829dce8 100644 --- a/Buildings/Utilities/Diagnostics/AssertInequality.mo +++ b/Buildings/Utilities/Diagnostics/AssertInequality.mo @@ -15,7 +15,7 @@ annotation ( defaultComponentName="assIne", Icon(graphics={Text( extent={{-84,108},{90,-28}}, - lineColor={255,0,0}, + textColor={255,0,0}, textString="u1 > u2")}), Documentation( info=" diff --git a/Buildings/Utilities/Diagnostics/BaseClasses/PartialInputCheck.mo b/Buildings/Utilities/Diagnostics/BaseClasses/PartialInputCheck.mo index 5c5ce2c7f97..008bec05e9b 100644 --- a/Buildings/Utilities/Diagnostics/BaseClasses/PartialInputCheck.mo +++ b/Buildings/Utilities/Diagnostics/BaseClasses/PartialInputCheck.mo @@ -16,7 +16,7 @@ initial equation annotation (Icon(graphics={Text( extent={{-62,-38},{54,-68}}, - lineColor={0,0,255}, + textColor={0,0,255}, textString="%threShold")}), Documentation(info="
diff --git a/Buildings/Utilities/Diagnostics/CheckEquality.mo b/Buildings/Utilities/Diagnostics/CheckEquality.mo index 5d88d487210..c9043fa2b04 100644 --- a/Buildings/Utilities/Diagnostics/CheckEquality.mo +++ b/Buildings/Utilities/Diagnostics/CheckEquality.mo @@ -39,10 +39,10 @@ First implementation. Icon(graphics={ Text( extent={{-84,108},{90,-28}}, - lineColor={255,0,0}, + textColor={255,0,0}, textString="u1 = u2"), Text( extent={{-62,-38},{54,-68}}, - lineColor={0,0,255}, + textColor={0,0,255}, textString="%threShold")})); end CheckEquality; diff --git a/Buildings/Utilities/IO/BCVTB/BCVTB.mo b/Buildings/Utilities/IO/BCVTB/BCVTB.mo index 1d634dc245d..e06eb0ff5bb 100644 --- a/Buildings/Utilities/IO/BCVTB/BCVTB.mo +++ b/Buildings/Utilities/IO/BCVTB/BCVTB.mo @@ -278,7 +278,7 @@ algorithm fillPattern=FillPattern.Solid), Text( extent={{-82,108},{30,40}}, - lineColor={0,0,0}, + textColor={0,0,0}, fillColor={95,95,95}, fillPattern=FillPattern.Solid, textString="tS=%samplePeriod%")}), diff --git a/Buildings/Utilities/IO/BCVTB/BaseClasses/FluidInterface.mo b/Buildings/Utilities/IO/BCVTB/BaseClasses/FluidInterface.mo index 84abd151155..5d5f2c8afe8 100644 --- a/Buildings/Utilities/IO/BCVTB/BaseClasses/FluidInterface.mo +++ b/Buildings/Utilities/IO/BCVTB/BaseClasses/FluidInterface.mo @@ -98,7 +98,7 @@ equation Line(points={{-100,-40},{-92,-40}}, color={0,0,255}), Text( extent={{-168,50},{-66,10}}, - lineColor={0,0,0}, + textColor={0,0,0}, fillColor={255,255,255}, fillPattern=FillPattern.Solid, textString="T"), @@ -119,7 +119,7 @@ equation fillPattern=FillPattern.Solid), Text( extent={{-54,32},{16,-30}}, - lineColor={255,0,0}, + textColor={255,0,0}, fillColor={255,0,0}, fillPattern=FillPattern.Solid, textString="m"), diff --git a/Buildings/Utilities/IO/BCVTB/From_degC.mo b/Buildings/Utilities/IO/BCVTB/From_degC.mo index 61c2d0312ab..ea287963a95 100644 --- a/Buildings/Utilities/IO/BCVTB/From_degC.mo +++ b/Buildings/Utilities/IO/BCVTB/From_degC.mo @@ -34,7 +34,7 @@ First implementation.
This package contains models for input and output. diff --git a/Buildings/Utilities/Math/Average.mo b/Buildings/Utilities/Math/Average.mo index 15b0e4061f7..f38b70ba0be 100644 --- a/Buildings/Utilities/Math/Average.mo +++ b/Buildings/Utilities/Math/Average.mo @@ -19,6 +19,6 @@ First implementation.
diff --git a/Buildings/Utilities/Math/Binomial.mo b/Buildings/Utilities/Math/Binomial.mo index 1f0bd2ecda9..8c199331d70 100644 --- a/Buildings/Utilities/Math/Binomial.mo +++ b/Buildings/Utilities/Math/Binomial.mo @@ -10,7 +10,7 @@ equation annotation ( defaultComponentName="bin", Icon(graphics={ Text( extent={{-90,38},{90,-34}}, - lineColor={160,160,164}, + textColor={160,160,164}, textString="binomial()")}), Documentation(info="
This block computes the binomial coefficient \"n choose k\".
diff --git a/Buildings/Utilities/Math/Biquadratic.mo b/Buildings/Utilities/Math/Biquadratic.mo index 32163e2a04d..e2432a5402d 100644 --- a/Buildings/Utilities/Math/Biquadratic.mo +++ b/Buildings/Utilities/Math/Biquadratic.mo @@ -6,7 +6,7 @@ equation y = Buildings.Utilities.Math.Functions.biquadratic(a=a, x1=u1, x2=u2); annotation (Icon(graphics={Text( extent={{-88,40},{92,-32}}, - lineColor={160,160,164}, + textColor={160,160,164}, textString="biquadratic()")}), Documentation(info="diff --git a/Buildings/Utilities/Math/ExponentialIntegralE1.mo b/Buildings/Utilities/Math/ExponentialIntegralE1.mo index 09a877915e9..e8047a45652 100644 --- a/Buildings/Utilities/Math/ExponentialIntegralE1.mo +++ b/Buildings/Utilities/Math/ExponentialIntegralE1.mo @@ -12,6 +12,6 @@ equation
This block computes the factorial of the integer input, y=n!.
diff --git a/Buildings/Utilities/Math/FallingFactorial.mo b/Buildings/Utilities/Math/FallingFactorial.mo index ac2ca9dfbe0..0a0c2d9089e 100644 --- a/Buildings/Utilities/Math/FallingFactorial.mo +++ b/Buildings/Utilities/Math/FallingFactorial.mo @@ -10,7 +10,7 @@ equation annotation ( defaultComponentName="falFac", Icon(graphics={ Text( extent={{-90,38},{90,-34}}, - lineColor={160,160,164}, + textColor={160,160,164}, textString="fallingFactorial()")}), Documentation(info="This block computes the falling factorial, y = nḵ.
diff --git a/Buildings/Utilities/Math/IntegratorWithReset.mo b/Buildings/Utilities/Math/IntegratorWithReset.mo index d85c02b6ba0..57956478d2d 100644 --- a/Buildings/Utilities/Math/IntegratorWithReset.mo +++ b/Buildings/Utilities/Math/IntegratorWithReset.mo @@ -152,7 +152,7 @@ Icon(coordinateSystem( graphics={ Text( extent={{-88,-94},{212,-54}}, - lineColor={0,0,0}, + textColor={0,0,0}, textString="y_reset_in", visible=reset == Buildings.Types.Reset.Input, horizontalAlignment=TextAlignment.Left), @@ -160,17 +160,17 @@ Icon(coordinateSystem( "modelica://Buildings/Resources/Images/Utilities/Math/int.png"), Text( extent={{-88,56},{206,92}}, - lineColor={0,0,0}, + textColor={0,0,0}, textString="k=%k", horizontalAlignment=TextAlignment.Left), Text( extent={{-92,-12},{208,28}}, - lineColor={0,0,0}, + textColor={0,0,0}, horizontalAlignment=TextAlignment.Left, textString="u"), Text( extent={{70,-14},{370,26}}, - lineColor={0,0,0}, + textColor={0,0,0}, horizontalAlignment=TextAlignment.Left, textString="y")})); end IntegratorWithReset; diff --git a/Buildings/Utilities/Math/InverseXRegularized.mo b/Buildings/Utilities/Math/InverseXRegularized.mo index 76d52bd7873..ca7229c42cd 100644 --- a/Buildings/Utilities/Math/InverseXRegularized.mo +++ b/Buildings/Utilities/Math/InverseXRegularized.mo @@ -17,6 +17,6 @@ Implementation based on Functions.inverseXRegularized.diff --git a/Buildings/Utilities/Math/SmoothMax.mo b/Buildings/Utilities/Math/SmoothMax.mo index b65300dae8b..73f43bf913d 100644 --- a/Buildings/Utilities/Math/SmoothMax.mo +++ b/Buildings/Utilities/Math/SmoothMax.mo @@ -7,10 +7,10 @@ equation y = Buildings.Utilities.Math.Functions.smoothMax(x1=u1, x2=u2, deltaX=deltaX); annotation (Icon(graphics={Text( extent={{-88,40},{92,-32}}, - lineColor={160,160,164}, + textColor={160,160,164}, textString="smoothMax()"), Text( extent={{-74,-44},{68,-114}}, - lineColor={0,0,255}, + textColor={0,0,255}, textString="dX=%deltaX%")}), Documentation(info="
diff --git a/Buildings/Utilities/Math/SmoothMin.mo b/Buildings/Utilities/Math/SmoothMin.mo index 516eb09ebe5..591090c2092 100644 --- a/Buildings/Utilities/Math/SmoothMin.mo +++ b/Buildings/Utilities/Math/SmoothMin.mo @@ -7,10 +7,10 @@ equation y = Buildings.Utilities.Math.Functions.smoothMin(x1=u1, x2=u2, deltaX=deltaX); annotation (Icon(graphics={Text( extent={{-88,40},{92,-32}}, - lineColor={160,160,164}, + textColor={160,160,164}, textString="smoothMin()"), Text( extent={{-66,-50},{76,-120}}, - lineColor={0,0,255}, + textColor={0,0,255}, textString="dX=%deltaX%")}), Documentation(info="
diff --git a/Buildings/Utilities/Math/Splice.mo b/Buildings/Utilities/Math/Splice.mo index 63bf89b8653..7cc57248895 100644 --- a/Buildings/Utilities/Math/Splice.mo +++ b/Buildings/Utilities/Math/Splice.mo @@ -25,7 +25,7 @@ equation fillPattern=FillPattern.Solid), Text( extent={{-35,90},{-6,72}}, - lineColor={160,160,164}, + textColor={160,160,164}, textString="y"), Line(points={{0,-90},{0,84}}, color={192,192,192}), Line( @@ -33,11 +33,11 @@ equation {46,48},{80,48}}), Text( extent={{-53,-78},{-24,-96}}, - lineColor={160,160,164}, + textColor={160,160,164}, textString="-delta"), Text( extent={{34,-78},{60,-94}}, - lineColor={160,160,164}, + textColor={160,160,164}, textString="delta"), Line(points={{46,-78},{46,56}}, color={192,192,192}), @@ -45,19 +45,19 @@ equation color={192,192,192}), Text( extent={{49,38},{88,22}}, - lineColor={160,160,164}, + textColor={160,160,164}, textString="if x > 0"), Text( extent={{-81,-58},{-42,-74}}, - lineColor={160,160,164}, + textColor={160,160,164}, textString="if x < 0"), Text( extent={{-74,-46},{-52,-58}}, - lineColor={160,160,164}, + textColor={160,160,164}, textString="u2"), Text( extent={{54,48},{76,36}}, - lineColor={160,160,164}, + textColor={160,160,164}, textString="u1")}), Documentation(info="
diff --git a/Buildings/Utilities/Math/TrapezoidalIntegration.mo b/Buildings/Utilities/Math/TrapezoidalIntegration.mo index 7ca374556e6..36e7a18f112 100644 --- a/Buildings/Utilities/Math/TrapezoidalIntegration.mo +++ b/Buildings/Utilities/Math/TrapezoidalIntegration.mo @@ -7,7 +7,7 @@ equation y = Buildings.Utilities.Math.Functions.trapezoidalIntegration(N=N, f=u, deltaX=deltaX); annotation (Icon(graphics={Text( extent={{-90,36},{90,-36}}, - lineColor={160,160,164}, + textColor={160,160,164}, textString="trapezoidalIntegration()")}), Documentation(info="
This function computes a definite integral using the trapezoidal rule.
", revisions=" diff --git a/Buildings/Utilities/Plotters/Configuration.mo b/Buildings/Utilities/Plotters/Configuration.mo index 16b82cc03ed..3cd9405f28b 100644 --- a/Buildings/Utilities/Plotters/Configuration.mo +++ b/Buildings/Utilities/Plotters/Configuration.mo @@ -78,7 +78,7 @@ Icon(coordinateSystem(preserveAspectRatio=false), graphics={ smooth = Smooth.Bezier), Text( extent={{-42,-44},{34,-74}}, - lineColor={0,0,0}, + textColor={0,0,0}, textString="delay=%activationDelay"), Ellipse( extent={{-95,67},{-81,53}}, diff --git a/Buildings/Utilities/Plotters/Examples/BaseClasses/CoolingCoilValve.mo b/Buildings/Utilities/Plotters/Examples/BaseClasses/CoolingCoilValve.mo index d106f44b50d..df23ca237e3 100644 --- a/Buildings/Utilities/Plotters/Examples/BaseClasses/CoolingCoilValve.mo +++ b/Buildings/Utilities/Plotters/Examples/BaseClasses/CoolingCoilValve.mo @@ -226,11 +226,11 @@ equation Line(points={{20,58}}, color={28,108,200}), Text( extent={{-108,138},{102,110}}, - lineColor={0,0,127}, + textColor={0,0,127}, textString="%name"), Text( extent={{-64,-132},{60,-18}}, - lineColor={0,0,127}, + textColor={0,0,127}, textString="Cooling coil valve")}), Diagram(coordinateSystem(preserveAspectRatio=false, extent={{-120,-120},{120, 120}}), graphics={ @@ -241,7 +241,7 @@ equation fillPattern=FillPattern.Solid), Text( extent={{80,-102},{120,-110}}, - lineColor={0,0,127}, + textColor={0,0,127}, textString="Limiter for low TSup"), Rectangle( @@ -251,7 +251,7 @@ low TSup"), fillPattern=FillPattern.Solid), Text( extent={{-48,-106},{-20,-112}}, - lineColor={0,0,127}, + textColor={0,0,127}, textString="Enbale/Disable"), Rectangle( extent={{-120,120},{-12,2}}, @@ -260,7 +260,7 @@ low TSup"), fillPattern=FillPattern.Solid), Text( extent={{-112,12},{-92,6}}, - lineColor={0,0,127}, + textColor={0,0,127}, textString="Controller")}), Documentation(info="diff --git a/Buildings/Utilities/Plotters/Examples/BaseClasses/Validation/CoolingCoilValve.mo b/Buildings/Utilities/Plotters/Examples/BaseClasses/Validation/CoolingCoilValve.mo index 03123860e29..728c7f97da4 100644 --- a/Buildings/Utilities/Plotters/Examples/BaseClasses/Validation/CoolingCoilValve.mo +++ b/Buildings/Utilities/Plotters/Examples/BaseClasses/Validation/CoolingCoilValve.mo @@ -228,7 +228,7 @@ annotation (experiment(StopTime=1800.0, Tolerance=1e-06), fillPattern=FillPattern.Solid), Text( extent={{-158,18},{-102,6}}, - lineColor={0,0,127}, + textColor={0,0,127}, textString="Supply fan signal"), Rectangle( extent={{-176,-4},{-14,-116}}, @@ -237,7 +237,7 @@ annotation (experiment(StopTime=1800.0, Tolerance=1e-06), fillPattern=FillPattern.Solid), Text( extent={{-160,-102},{-96,-114}}, - lineColor={0,0,127}, + textColor={0,0,127}, textString="TOut is above cuttoff - disable control"), Rectangle( extent={{14,116},{176,4}}, @@ -246,7 +246,7 @@ annotation (experiment(StopTime=1800.0, Tolerance=1e-06), fillPattern=FillPattern.Solid), Text( extent={{22,22},{116,2}}, - lineColor={0,0,127}, + textColor={0,0,127}, horizontalAlignment=TextAlignment.Left, textString="Normal operation above the upper limit TSup range."), @@ -257,7 +257,7 @@ the upper limit TSup range."), fillPattern=FillPattern.Solid), Text( extent={{22,-98},{116,-118}}, - lineColor={0,0,127}, + textColor={0,0,127}, horizontalAlignment=TextAlignment.Left, textString="Operation within the upper limit TSup range.")}), diff --git a/Buildings/Utilities/Plotters/Scatter.mo b/Buildings/Utilities/Plotters/Scatter.mo index c637275bf90..44f681ebf7b 100644 --- a/Buildings/Utilities/Plotters/Scatter.mo +++ b/Buildings/Utilities/Plotters/Scatter.mo @@ -71,13 +71,13 @@ equation Icon(graphics={ Text( extent={{48,-70},{74,-94}}, - lineColor={0,0,0}, + textColor={0,0,0}, fillColor={192,192,192}, fillPattern=FillPattern.Solid, textString="x"), Text( extent={{-102,96},{-76,72}}, - lineColor={0,0,0}, + textColor={0,0,0}, fillColor={192,192,192}, fillPattern=FillPattern.Solid, textString="y"), diff --git a/Buildings/Utilities/Plotters/TimeSeries.mo b/Buildings/Utilities/Plotters/TimeSeries.mo index e65b6f620ab..c5085dcf79c 100644 --- a/Buildings/Utilities/Plotters/TimeSeries.mo +++ b/Buildings/Utilities/Plotters/TimeSeries.mo @@ -92,7 +92,7 @@ equation smooth=Smooth.Bezier), Text( extent={{50,-70},{76,-94}}, - lineColor={0,0,0}, + textColor={0,0,0}, fillColor={192,192,192}, fillPattern=FillPattern.Solid, textString="t"), diff --git a/Buildings/Utilities/Psychrometrics/BaseClasses/HumidityRatioVaporPressure.mo b/Buildings/Utilities/Psychrometrics/BaseClasses/HumidityRatioVaporPressure.mo index 280067e0407..ac1961c3fec 100644 --- a/Buildings/Utilities/Psychrometrics/BaseClasses/HumidityRatioVaporPressure.mo +++ b/Buildings/Utilities/Psychrometrics/BaseClasses/HumidityRatioVaporPressure.mo @@ -61,6 +61,6 @@ First implementation. Text( visible=use_p_in, extent={{-90,108},{-34,16}}, - lineColor={0,0,0}, + textColor={0,0,0}, textString="p_in")})); end HumidityRatioVaporPressure; diff --git a/Buildings/Utilities/Psychrometrics/Density_pTX.mo b/Buildings/Utilities/Psychrometrics/Density_pTX.mo index 917d034753a..c5bcb6358e1 100644 --- a/Buildings/Utilities/Psychrometrics/Density_pTX.mo +++ b/Buildings/Utilities/Psychrometrics/Density_pTX.mo @@ -64,7 +64,7 @@ First implementation. fillPattern=FillPattern.Solid), Text( extent={{-70,84},{-48,66}}, - lineColor={0,0,0}, + textColor={0,0,0}, fillColor={0,0,0}, fillPattern=FillPattern.Solid, textString="X"), @@ -79,13 +79,13 @@ First implementation. fillPattern=FillPattern.Solid), Text( extent={{76,-80},{86,-96}}, - lineColor={0,0,0}, + textColor={0,0,0}, fillColor={0,0,0}, fillPattern=FillPattern.Solid, textString="T"), Text( extent={{24,-14},{78,-32}}, - lineColor={0,0,0}, + textColor={0,0,0}, fillColor={0,0,0}, fillPattern=FillPattern.Solid, textString="density"), diff --git a/Buildings/Utilities/Psychrometrics/Phi_pTX.mo b/Buildings/Utilities/Psychrometrics/Phi_pTX.mo index 5a7fe5bc6db..fb263bc904e 100644 --- a/Buildings/Utilities/Psychrometrics/Phi_pTX.mo +++ b/Buildings/Utilities/Psychrometrics/Phi_pTX.mo @@ -58,7 +58,7 @@ First implementation. fillPattern=FillPattern.Solid), Text( extent={{-70,84},{-48,66}}, - lineColor={0,0,0}, + textColor={0,0,0}, fillColor={0,0,0}, fillPattern=FillPattern.Solid, textString="X"), @@ -73,7 +73,7 @@ First implementation. fillPattern=FillPattern.Solid), Text( extent={{76,-80},{86,-96}}, - lineColor={0,0,0}, + textColor={0,0,0}, fillColor={0,0,0}, fillPattern=FillPattern.Solid, textString="T"), @@ -83,7 +83,7 @@ First implementation. smooth=Smooth.Bezier), Text( extent={{34,-10},{56,-28}}, - lineColor={0,0,0}, + textColor={0,0,0}, fillColor={0,0,0}, fillPattern=FillPattern.Solid, textString="phi")})); diff --git a/Buildings/Utilities/Psychrometrics/SaturationPressure.mo b/Buildings/Utilities/Psychrometrics/SaturationPressure.mo index ce561708079..902d7e06469 100644 --- a/Buildings/Utilities/Psychrometrics/SaturationPressure.mo +++ b/Buildings/Utilities/Psychrometrics/SaturationPressure.mo @@ -43,12 +43,12 @@ First implementation. Icon(coordinateSystem(preserveAspectRatio=false, extent={{-100,-100},{100, 100}}), graphics={Text( extent={{-92,22},{-56,-24}}, - lineColor={0,0,0}, + textColor={0,0,0}, fillColor={0,0,0}, fillPattern=FillPattern.Solid, textString="T"), Text( extent={{54,34},{90,-22}}, - lineColor={0,0,0}, + textColor={0,0,0}, fillColor={0,0,0}, fillPattern=FillPattern.Solid, textString="p"), diff --git a/Buildings/Utilities/Psychrometrics/SaturationPressureLiquid.mo b/Buildings/Utilities/Psychrometrics/SaturationPressureLiquid.mo index d9365d54dc5..ecbfb839c16 100644 --- a/Buildings/Utilities/Psychrometrics/SaturationPressureLiquid.mo +++ b/Buildings/Utilities/Psychrometrics/SaturationPressureLiquid.mo @@ -43,12 +43,12 @@ First implementation. Icon(coordinateSystem(preserveAspectRatio=false, extent={{-100,-100},{100, 100}}), graphics={Text( extent={{-92,22},{-56,-24}}, - lineColor={0,0,0}, + textColor={0,0,0}, fillColor={0,0,0}, fillPattern=FillPattern.Solid, textString="T"), Text( extent={{54,34},{90,-22}}, - lineColor={0,0,0}, + textColor={0,0,0}, fillColor={0,0,0}, fillPattern=FillPattern.Solid, textString="p"), diff --git a/Buildings/Utilities/Psychrometrics/SublimationPressureIce.mo b/Buildings/Utilities/Psychrometrics/SublimationPressureIce.mo index cc99af0b43b..3b21bc866c0 100644 --- a/Buildings/Utilities/Psychrometrics/SublimationPressureIce.mo +++ b/Buildings/Utilities/Psychrometrics/SublimationPressureIce.mo @@ -43,12 +43,12 @@ First implementation. Icon(coordinateSystem(preserveAspectRatio=false, extent={{-100,-100},{100, 100}}), graphics={Text( extent={{-92,22},{-56,-24}}, - lineColor={0,0,0}, + textColor={0,0,0}, fillColor={0,0,0}, fillPattern=FillPattern.Solid, textString="T"), Text( extent={{54,34},{90,-22}}, - lineColor={0,0,0}, + textColor={0,0,0}, fillColor={0,0,0}, fillPattern=FillPattern.Solid, textString="p"), diff --git a/Buildings/Utilities/Psychrometrics/TDewPoi_pW.mo b/Buildings/Utilities/Psychrometrics/TDewPoi_pW.mo index 023c2372d42..ba5dfbdd575 100644 --- a/Buildings/Utilities/Psychrometrics/TDewPoi_pW.mo +++ b/Buildings/Utilities/Psychrometrics/TDewPoi_pW.mo @@ -53,11 +53,11 @@ First implementation. fillPattern=FillPattern.Solid), Text( extent={{-124,50},{-86,4}}, - lineColor={0,0,255}, + textColor={0,0,255}, textString="p_w"), Text( extent={{102,46},{140,0}}, - lineColor={0,0,255}, + textColor={0,0,255}, textString="TDP"), Line(points={{-68,86},{-68,-72}}), Line(points={{82,-72},{-66,-72}}), @@ -84,13 +84,13 @@ First implementation. fillPattern=FillPattern.Solid), Text( extent={{-64,84},{-42,66}}, - lineColor={0,0,0}, + textColor={0,0,0}, fillColor={0,0,0}, fillPattern=FillPattern.Solid, textString="X"), Text( extent={{82,-80},{92,-96}}, - lineColor={0,0,0}, + textColor={0,0,0}, fillColor={0,0,0}, fillPattern=FillPattern.Solid, textString="T"), diff --git a/Buildings/Utilities/Psychrometrics/TWetBul_TDryBulPhi.mo b/Buildings/Utilities/Psychrometrics/TWetBul_TDryBulPhi.mo index ee4b7b9749f..645930eb40c 100644 --- a/Buildings/Utilities/Psychrometrics/TWetBul_TDryBulPhi.mo +++ b/Buildings/Utilities/Psychrometrics/TWetBul_TDryBulPhi.mo @@ -82,24 +82,24 @@ annotation ( 100}}), graphics={ Text( extent={{-92,100},{-62,56}}, - lineColor={0,0,127}, + textColor={0,0,127}, textString="TDryBul"), Text( extent={{-92,14},{-72,-12}}, - lineColor={0,0,127}, + textColor={0,0,127}, textString="phi"), Text( extent={{-90,-72},{-72,-90}}, - lineColor={0,0,127}, + textColor={0,0,127}, textString="p"), Text( extent={{62,22},{92,-22}}, - lineColor={0,0,127}, + textColor={0,0,127}, textString="TWetBul"), Line(points={{78,-74},{-48,-74}}), Text( extent={{76,-78},{86,-94}}, - lineColor={0,0,0}, + textColor={0,0,0}, fillColor={0,0,0}, fillPattern=FillPattern.Solid, textString="T"), @@ -113,7 +113,7 @@ annotation ( Line(points={{-48,84},{-48,-74}}), Text( extent={{-44,82},{-22,64}}, - lineColor={0,0,0}, + textColor={0,0,0}, fillColor={0,0,0}, fillPattern=FillPattern.Solid, textString="X"), diff --git a/Buildings/Utilities/Psychrometrics/TWetBul_TDryBulXi.mo b/Buildings/Utilities/Psychrometrics/TWetBul_TDryBulXi.mo index ce7af0089bc..9cb38b1315c 100644 --- a/Buildings/Utilities/Psychrometrics/TWetBul_TDryBulXi.mo +++ b/Buildings/Utilities/Psychrometrics/TWetBul_TDryBulXi.mo @@ -87,24 +87,24 @@ annotation ( 100}}), graphics={ Text( extent={{-92,100},{-62,56}}, - lineColor={0,0,127}, + textColor={0,0,127}, textString="TDryBul"), Text( extent={{-86,14},{-72,-6}}, - lineColor={0,0,127}, + textColor={0,0,127}, textString="Xi"), Text( extent={{-90,-72},{-72,-90}}, - lineColor={0,0,127}, + textColor={0,0,127}, textString="p"), Text( extent={{62,22},{92,-22}}, - lineColor={0,0,127}, + textColor={0,0,127}, textString="TWetBul"), Line(points={{78,-74},{-48,-74}}), Text( extent={{76,-78},{86,-94}}, - lineColor={0,0,0}, + textColor={0,0,0}, fillColor={0,0,0}, fillPattern=FillPattern.Solid, textString="T"), @@ -118,7 +118,7 @@ annotation ( Line(points={{-48,84},{-48,-74}}), Text( extent={{-44,82},{-22,64}}, - lineColor={0,0,0}, + textColor={0,0,0}, fillColor={0,0,0}, fillPattern=FillPattern.Solid, textString="X"), diff --git a/Buildings/Utilities/Psychrometrics/ToDryAir.mo b/Buildings/Utilities/Psychrometrics/ToDryAir.mo index 9b474eb481a..5f88d71c357 100644 --- a/Buildings/Utilities/Psychrometrics/ToDryAir.mo +++ b/Buildings/Utilities/Psychrometrics/ToDryAir.mo @@ -28,12 +28,12 @@ First implementation. Icon(coordinateSystem(preserveAspectRatio=true, extent={{-100,-100},{100, 100}}), graphics={Text( extent={{34,30},{86,-34}}, - lineColor={0,0,0}, + textColor={0,0,0}, fillColor={0,0,0}, fillPattern=FillPattern.Solid, textString="XiDry"), Text( extent={{-86,48},{-14,-52}}, - lineColor={0,0,0}, + textColor={0,0,0}, fillColor={0,0,0}, fillPattern=FillPattern.Solid, textString="XiTotal")})); diff --git a/Buildings/Utilities/Psychrometrics/ToTotalAir.mo b/Buildings/Utilities/Psychrometrics/ToTotalAir.mo index e953a848eb8..212fe753c92 100644 --- a/Buildings/Utilities/Psychrometrics/ToTotalAir.mo +++ b/Buildings/Utilities/Psychrometrics/ToTotalAir.mo @@ -36,12 +36,12 @@ First implementation. Icon(coordinateSystem(preserveAspectRatio=false, extent={{-100,-100},{100, 100}}), graphics={Text( extent={{-88,32},{-36,-32}}, - lineColor={0,0,0}, + textColor={0,0,0}, fillColor={0,0,0}, fillPattern=FillPattern.Solid, textString="XiDry"), Text( extent={{20,50},{92,-50}}, - lineColor={0,0,0}, + textColor={0,0,0}, fillColor={0,0,0}, fillPattern=FillPattern.Solid, textString="XiTotal")})); diff --git a/Buildings/Utilities/Psychrometrics/X_pTphi.mo b/Buildings/Utilities/Psychrometrics/X_pTphi.mo index 36abfe53393..24de151c576 100644 --- a/Buildings/Utilities/Psychrometrics/X_pTphi.mo +++ b/Buildings/Utilities/Psychrometrics/X_pTphi.mo @@ -85,14 +85,14 @@ First implementation. "), Icon(graphics={ Text( extent={{-96,16},{-54,-22}}, - lineColor={0,0,0}, + textColor={0,0,0}, textString="T"), Text( extent={{-86,-18},{-36,-100}}, - lineColor={0,0,0}, + textColor={0,0,0}, textString="phi"), Text( extent={{26,56},{90,-54}}, - lineColor={0,0,0}, + textColor={0,0,0}, textString="X_steam")})); end X_pTphi; diff --git a/Buildings/Utilities/Psychrometrics/X_pW.mo b/Buildings/Utilities/Psychrometrics/X_pW.mo index 83c7ebc324a..d2a17026104 100644 --- a/Buildings/Utilities/Psychrometrics/X_pW.mo +++ b/Buildings/Utilities/Psychrometrics/X_pW.mo @@ -51,9 +51,9 @@ First implementation. "), Icon(graphics={Text( extent={{-92,52},{-36,-40}}, - lineColor={0,0,0}, + textColor={0,0,0}, textString="pW"), Text( extent={{46,44},{94,-24}}, - lineColor={0,0,0}, + textColor={0,0,0}, textString="X")})); end X_pW; diff --git a/Buildings/Utilities/Psychrometrics/pW_TDewPoi.mo b/Buildings/Utilities/Psychrometrics/pW_TDewPoi.mo index c5b68745a3f..343abfde883 100644 --- a/Buildings/Utilities/Psychrometrics/pW_TDewPoi.mo +++ b/Buildings/Utilities/Psychrometrics/pW_TDewPoi.mo @@ -68,11 +68,11 @@ First implementation. fillPattern=FillPattern.Solid), Text( extent={{104,44},{142,-2}}, - lineColor={0,0,255}, + textColor={0,0,255}, textString="p_w"), Text( extent={{-136,50},{-98,4}}, - lineColor={0,0,255}, + textColor={0,0,255}, textString="TDP"), Line(points={{-68,86},{-68,-72}}), Line(points={{82,-72},{-66,-72}}), @@ -99,13 +99,13 @@ First implementation. fillPattern=FillPattern.Solid), Text( extent={{-64,84},{-42,66}}, - lineColor={0,0,0}, + textColor={0,0,0}, fillColor={0,0,0}, fillPattern=FillPattern.Solid, textString="X"), Text( extent={{82,-80},{92,-96}}, - lineColor={0,0,0}, + textColor={0,0,0}, fillColor={0,0,0}, fillPattern=FillPattern.Solid, textString="T"), diff --git a/Buildings/Utilities/Psychrometrics/pW_X.mo b/Buildings/Utilities/Psychrometrics/pW_X.mo index 5d3b1c8cefe..4646528f48a 100644 --- a/Buildings/Utilities/Psychrometrics/pW_X.mo +++ b/Buildings/Utilities/Psychrometrics/pW_X.mo @@ -52,9 +52,9 @@ First implementation. "), Icon(graphics={Text( extent={{-88,26},{-60,-26}}, - lineColor={0,0,0}, + textColor={0,0,0}, textString="X"), Text( extent={{46,30},{90,-32}}, - lineColor={0,0,0}, + textColor={0,0,0}, textString="pW")})); end pW_X; diff --git a/Buildings/Utilities/Time/CalendarTime.mo b/Buildings/Utilities/Time/CalendarTime.mo index fc2bdf926ee..b2f0c4aca46 100644 --- a/Buildings/Utilities/Time/CalendarTime.mo +++ b/Buildings/Utilities/Time/CalendarTime.mo @@ -371,37 +371,37 @@ that it changes the time based on which the solar position is computed and TMY3 Icon(graphics={ Text( extent={{-34,90},{96,80}}, - lineColor={28,108,200}, + textColor={28,108,200}, horizontalAlignment=TextAlignment.Right, textString="Minute"), Text( extent={{-28,68},{96,58}}, - lineColor={28,108,200}, + textColor={28,108,200}, horizontalAlignment=TextAlignment.Right, textString="Hour"), Text( extent={{-38,44},{96,32}}, - lineColor={28,108,200}, + textColor={28,108,200}, horizontalAlignment=TextAlignment.Right, textString="Day"), Text( extent={{-50,18},{96,8}}, - lineColor={28,108,200}, + textColor={28,108,200}, horizontalAlignment=TextAlignment.Right, textString="Month"), Text( extent={{-70,-8},{96,-18}}, - lineColor={28,108,200}, + textColor={28,108,200}, horizontalAlignment=TextAlignment.Right, textString="Year"), Text( extent={{-68,-30},{96,-42}}, - lineColor={28,108,200}, + textColor={28,108,200}, horizontalAlignment=TextAlignment.Right, textString="Weekday"), Text( extent={{-102,-60},{94,-72}}, - lineColor={28,108,200}, + textColor={28,108,200}, horizontalAlignment=TextAlignment.Right, textString="Unix time stamp (local)"), Ellipse( @@ -417,7 +417,7 @@ that it changes the time based on which the solar position is computed and TMY3 thickness=0.5), Text( extent={{-102,-82},{94,-94}}, - lineColor={28,108,200}, + textColor={28,108,200}, horizontalAlignment=TextAlignment.Right, visible=outputUnixTimeStamp, textString="Unix time stamp (GMT)")})); diff --git a/bin/verifyFiles.py b/bin/verifyFiles.py index a1ddd25f06b..c7a98b51695 100755 --- a/bin/verifyFiles.py +++ b/bin/verifyFiles.py @@ -51,10 +51,13 @@ # List of invalid strings in .mos files INVALID_IN_MOS=[] # List of invalid regular expressions in .mo files +# The check for lineColor is from +# https://github.com/modelica/ModelicaStandardLibrary/blob/master/.CI/check_deprecated_line_color.py INVALID_REGEXP_IN_MO=["StopTime\s*=\s*\d\s*[*]\s*\d+", "fontSize\s*=", "file\s*=\s*\"Resources", # This should be file=\"modelica://Buildings/Resources - "parameter.*Boolean.*homotopyInitialization"] + "parameter.*Boolean.*homotopyInitialization", + "(Text\s*\([^\).]*)lineColor"] # List of strings that are required in .mo files, except in Examples REQUIRED_IN_MO=["documentation"]