Maint 7.0.x text annotation (#2788)

* Added check for lineColor * Corrected Text annotation from lineColor to textColor * Updated script that generates unit conversion * Changed python from 3.6 to 3.6.9 Travis picked version 3.6.10, and the python installation of sphinx failed (https://app.travis-ci.com/github/lbl-srg/modelica-buildings/jobs/550046172#L3068). This change tests if 3.6.9 works on travis, as it works locally in a virtual environment. * Corrected html
lbl-srg · Dec 1, 2021 · 2afa252 · 2afa252
1 parent 713c188
commit 2afa252
Show file tree

Hide file tree

Showing 803 changed files with 2,389 additions and 2,121 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -3,7 +3,7 @@ dist: bionic
 language: python
 
 python:
-  - "3.6"
+  - "3.6.9"
 
 cache: pip
 

diff --git a/Buildings/Airflow/Multizone/DoorDiscretizedOperable.mo b/Buildings/Airflow/Multizone/DoorDiscretizedOperable.mo
@@ -63,7 +63,7 @@ equation
   annotation (Icon(graphics={
         Text(
           extent={{-118,34},{-98,16}},
-          lineColor={0,0,127},
+          textColor={0,0,127},
           textString=
                "y"),
         Rectangle(

diff --git a/Buildings/Airflow/Multizone/EffectiveAirLeakageArea.mo b/Buildings/Airflow/Multizone/EffectiveAirLeakageArea.mo
@@ -32,15 +32,15 @@ equation
           fillPattern=FillPattern.Solid),
         Text(
           extent={{-104,92},{-20,54}},
-          lineColor={0,0,255},
+          textColor={0,0,255},
           pattern=LinePattern.None,
           fillColor={255,255,255},
           fillPattern=FillPattern.Solid,
           textString=
                "L=%L"),
         Text(
           extent={{22,94},{98,56}},
-          lineColor={0,0,255},
+          textColor={0,0,255},
           pattern=LinePattern.None,
           fillColor={255,255,255},
           fillPattern=FillPattern.Solid,

diff --git a/Buildings/Airflow/Multizone/MediumColumn.mo b/Buildings/Airflow/Multizone/MediumColumn.mo
@@ -102,15 +102,15 @@ equation
           points={{0,100},{0,-100},{0,-98}}),
         Text(
           extent={{24,-78},{106,-100}},
-          lineColor={0,0,127},
+          textColor={0,0,127},
           textString="Bottom"),
         Text(
           extent={{32,104},{98,70}},
-          lineColor={0,0,127},
+          textColor={0,0,127},
           textString="Top"),
         Text(
           extent={{36,26},{88,-10}},
-          lineColor={0,0,127},
+          textColor={0,0,127},
           fillColor={255,0,0},
           fillPattern=FillPattern.Solid,
           textString="h=%h"),

diff --git a/Buildings/Airflow/Multizone/MediumColumnDynamic.mo b/Buildings/Airflow/Multizone/MediumColumnDynamic.mo
@@ -96,15 +96,15 @@ equation
           points={{0,100},{0,-100},{0,-98}}),
         Text(
           extent={{24,-78},{106,-100}},
-          lineColor={0,0,127},
+          textColor={0,0,127},
           textString="Bottom"),
         Text(
           extent={{32,104},{98,70}},
-          lineColor={0,0,127},
+          textColor={0,0,127},
           textString="Top"),
         Text(
           extent={{42,26},{94,-10}},
-          lineColor={0,0,127},
+          textColor={0,0,127},
           fillColor={255,0,0},
           fillPattern=FillPattern.Solid,
           textString="h=%h"),

diff --git a/Buildings/Airflow/Multizone/Orifice.mo b/Buildings/Airflow/Multizone/Orifice.mo
@@ -32,7 +32,7 @@ equation
           fillPattern=FillPattern.Solid),
         Text(
           extent={{24,-24},{96,-100}},
-          lineColor={0,0,255},
+          textColor={0,0,255},
           fillColor={0,127,0},
           fillPattern=FillPattern.Solid,
           textString="A=%A")}),

diff --git a/Buildings/Airflow/Multizone/ZonalFlow_ACS.mo b/Buildings/Airflow/Multizone/ZonalFlow_ACS.mo
@@ -43,7 +43,7 @@ equation
   annotation (Icon(graphics={
         Text(
           extent={{-92,108},{16,66}},
-          lineColor={0,0,127},
+          textColor={0,0,127},
           textString=
                "ACS = %ACS")}),
 defaultComponentName="floExc",

diff --git a/Buildings/Applications/DataCenters/ChillerCooled/Controls/CoolingModeNonIntegrated.mo b/Buildings/Applications/DataCenters/ChillerCooled/Controls/CoolingModeNonIntegrated.mo
@@ -102,7 +102,7 @@ equation
   annotation (      Diagram(coordinateSystem(preserveAspectRatio=false), graphics={
         Text(
           extent={{128,114},{-128,166}},
-          lineColor={0,0,255},
+          textColor={0,0,255},
           textString="%name")}),
     Documentation(info="<html>
 <p>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
@@ -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
@@ -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/...s/DataCenters/ChillerCooled/Equipment/BaseClasses/PartialCoolingCoilHumidifyingHeating.mo b/...s/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="<html>
 <p>

diff --git 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
@@ -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
@@ -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
@@ -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="<html>
 <p>

diff --git 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="<html>

diff --git 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="<html>
 <p>

diff --git 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="<html>

diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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;
-Original file line number
+Diff line change
@@ Expand Up / @@ -3,7 +3,7 @@ dist: bionic @@
     language: python
     python:
-      - "3.6"
+      - "3.6.9"
     cache: pip
@@ Expand Down @@