Merge pull request #4466 from lbl-srg/issue4456_annotationText_v2_bash

Added verification that no old annotation is present

Author: mwetter

.github/workflows/formatting.yml

@@ -49,6 +49,19 @@ jobs:
               done;
               test -z "${ff}"
 
+      - name: "Test for old Text annotations (see https://github.com/lbl-srg/modelica-buildings/issues/4456). If it fails, correct library with sed command below."
+        run : |
+              for FILE in `find . -name '*.mo'`; do
+                sed -i -z -E \
+                    -e 's/(Text[^)]*)(lineThickness[^,)]*[,]*[[:space:]]*)([^)]*)\)/\1\3)/g' \
+                    -e 's/(Text[^)]*)(fillColor[^})]*[},]*[[:space:]]*)([^)]*)\)/\1\3)/g' \
+                    -e 's/(Text[^)]*)(fillPattern[^,)]*[,]*[[:space:]]*)([^)]*)\)/\1\3)/g' \
+                    -e 's/(Text[^)]*)(pattern[^,)]*[,]*[[:space:]]*)([^)]*)\)/\1\3)/g' \
+                    -e 's/(Text\([^)]*),[[:space:]]*\)/\1)/g' \
+                    "$FILE"
+              done;
+              git diff --exit-code --quiet .
+
       - name: "Test html syntax"
         run : ../bin/runUnitTests.py --validate-html-only
 

Buildings/Air/Systems/SingleZone/VAV/Examples/OptimalStart/BaseClasses/ZoneWithAHUConventional.mo

@@ -120,8 +120,6 @@ equation
       Text(
           extent={{-151,147},{149,107}},
           textColor={0,0,255},
-          fillPattern=FillPattern.HorizontalCylinder,
-          fillColor={0,127,255},
           textString="%name")}),
       Diagram(coordinateSystem(
           preserveAspectRatio=false)),

Buildings/Air/Systems/SingleZone/VAV/Examples/OptimalStart/BaseClasses/ZoneWithAHUG36.mo

@@ -222,8 +222,6 @@ equation
       Text(
           extent={{-151,147},{149,107}},
           textColor={0,0,255},
-          fillPattern=FillPattern.HorizontalCylinder,
-          fillColor={0,127,255},
           textString="%name")}),
        Diagram(coordinateSystem(
           preserveAspectRatio=false, extent={{-160,-160},{160,160}})),

Buildings/Air/Systems/SingleZone/VAV/Examples/OptimalStart/ConventionalSpring.mo

@@ -123,8 +123,6 @@ equation
         Text(
           extent={{40,-2},{92,-20}},
           textColor={238,46,47},
-          fillColor={229,229,229},
-          fillPattern=FillPattern.Solid,
           textString="System with optimal start"),
         Rectangle(
           extent={{-108,-28},{106,-94}},
@@ -135,8 +133,6 @@ equation
         Text(
           extent={{40,-80},{98,-96}},
           textColor={238,46,47},
-          fillColor={229,229,229},
-          fillPattern=FillPattern.Solid,
           textString="System without optimal start")}),
     experiment(
       StartTime=6393600,

Buildings/Air/Systems/SingleZone/VAV/Examples/OptimalStart/Guideline36Spring.mo

@@ -92,8 +92,6 @@ equation
         Text(
           extent={{0,-76},{54,-102}},
           textColor={238,46,47},
-          fillColor={229,229,229},
-          fillPattern=FillPattern.Solid,
           textString="System without optimal start"),
         Rectangle(
           extent={{-70,96},{72,8}},
@@ -104,8 +102,6 @@ equation
         Text(
           extent={{0,104},{48,80}},
           textColor={238,46,47},
-          fillColor={229,229,229},
-          fillPattern=FillPattern.Solid,
           textString="System with optimal start")}),
     experiment(
       StartTime=6393600,

Buildings/Airflow/Multizone/EffectiveAirLeakageArea.mo

@@ -33,17 +33,11 @@ model EffectiveAirLeakageArea "Effective air leakage area"
         Text(
           extent={{-104,92},{-20,54}},
           textColor={0,0,255},
-          pattern=LinePattern.None,
-          fillColor={255,255,255},
-          fillPattern=FillPattern.Solid,
           textString=
                "L=%L"),
         Text(
           extent={{22,94},{98,56}},
           textColor={0,0,255},
-          pattern=LinePattern.None,
-          fillColor={255,255,255},
-          fillPattern=FillPattern.Solid,
           textString=
                "m=%m"),
         Rectangle(

Buildings/Airflow/Multizone/MediumColumn.mo

@@ -113,8 +113,6 @@ equation
         Text(
           extent={{36,26},{88,-10}},
           textColor={0,0,127},
-          fillColor={255,0,0},
-          fillPattern=FillPattern.Solid,
           textString="h=%h"),
         Rectangle(
           extent={{-16,80},{16,-80}},

Buildings/Airflow/Multizone/MediumColumnDynamic.mo

@@ -108,8 +108,6 @@ equation
         Text(
           extent={{42,26},{94,-10}},
           textColor={0,0,127},
-          fillColor={255,0,0},
-          fillPattern=FillPattern.Solid,
           textString="h=%h"),
         Text(
           extent={{-50.5,20.5},{50.5,-20.5}},

Buildings/Airflow/Multizone/Orifice.mo

@@ -34,8 +34,6 @@ model Orifice "Orifice"
         Text(
           extent={{24,-24},{96,-100}},
           textColor={0,0,255},
-          fillColor={0,127,0},
-          fillPattern=FillPattern.Solid,
           textString="A=%A")}),
 defaultComponentName="ori",
 Documentation(info="<html>

Buildings/Applications/DataCenters/ChillerCooled/Equipment/BaseClasses/PartialChillerWSE.mo

@@ -458,8 +458,6 @@ equation
         Text(
           extent={{6,16},{16,8}},
           textColor={0,0,0},
-          fillColor={255,255,255},
-          fillPattern=FillPattern.Solid,
           textStyle={TextStyle.Bold},
           textString="T"),
         Line(points={{-90,60},{-76,60},{-76,40},{-72,40}}, color={28,108,200}),