From 2afa252718aa8beabe9fcde8bbb884635ddfa16e Mon Sep 17 00:00:00 2001 From: Michael Wetter Date: Wed, 1 Dec 2021 14:49:18 -0800 Subject: [PATCH] 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 --- .travis.yml | 2 +- .../Multizone/DoorDiscretizedOperable.mo | 2 +- .../Multizone/EffectiveAirLeakageArea.mo | 4 +- Buildings/Airflow/Multizone/MediumColumn.mo | 6 +- .../Airflow/Multizone/MediumColumnDynamic.mo | 6 +- Buildings/Airflow/Multizone/Orifice.mo | 2 +- Buildings/Airflow/Multizone/ZonalFlow_ACS.mo | 2 +- .../Controls/CoolingModeNonIntegrated.mo | 2 +- .../ChillerCooled/Controls/Reheat.mo | 2 +- .../BaseClasses/PartialChillerWSE.mo | 2 +- .../PartialCoolingCoilHumidifyingHeating.mo | 4 +- .../CoolingCoilHumidifyingHeating.mo | 4 +- .../ChillerCooled/Equipment/ElectricHeater.mo | 6 +- .../Examples/BaseClasses/PostProcess.mo | 8 +-- .../DXCooled/Controls/AirsideEconomizer.mo | 2 +- .../DXCooled/Controls/Compressor.mo | 2 +- .../DXCooled/Controls/CoolingMode.mo | 2 +- Buildings/BaseClasses/BaseIcon.mo | 2 +- Buildings/BaseClasses/BaseIconLow.mo | 2 +- .../SkyTemperature/BlackBody.mo | 14 ++-- .../SolarGeometry/BaseClasses/Declination.mo | 2 +- .../BaseClasses/IncidenceAngle.mo | 6 +- .../SolarGeometry/BaseClasses/SolarAzimuth.mo | 8 +-- .../BaseClasses/SolarHourAngle.mo | 2 +- .../SolarGeometry/BaseClasses/ZenithAngle.mo | 6 +- .../SolarGeometry/IncidenceAngle.mo | 2 +- .../SolarGeometry/ProjectedShadowLength.mo | 2 +- .../SolarGeometry/ZenithAngle.mo | 2 +- .../BaseClasses/BrighteningCoefficient.mo | 12 ++-- .../BaseClasses/DiffuseIsotropic.mo | 2 +- .../BaseClasses/DiffusePerez.mo | 14 ++-- .../BaseClasses/DirectTiltedSurface.mo | 6 +- .../BaseClasses/PartialSolarIrradiation.mo | 2 +- .../BaseClasses/RelativeAirMass.mo | 2 +- .../BaseClasses/SkyBrightness.mo | 6 +- .../BaseClasses/SkyClearness.mo | 8 +-- .../SolarIrradiation/DiffuseIsotropic.mo | 2 +- .../SolarIrradiation/DiffusePerez.mo | 2 +- .../SolarIrradiation/DirectTiltedSurface.mo | 2 +- .../WeatherData/BaseClasses/CheckPressure.mo | 2 +- .../WeatherData/BaseClasses/ConvertTime.mo | 4 +- .../WeatherData/BaseClasses/EquationOfTime.mo | 6 +- .../WeatherData/BaseClasses/LocalCivilTime.mo | 4 +- .../WeatherData/BaseClasses/PartialLimiter.mo | 2 +- .../BaseClasses/PartialLimiterMin.mo | 2 +- .../WeatherData/BaseClasses/SolarTime.mo | 10 +-- .../WeatherData/ReaderTMY3.mo | 8 +-- Buildings/Controls/Continuous/LimPID.mo | 8 +-- .../Controls/Continuous/NumberOfRequests.mo | 2 +- .../Controls/Continuous/PIDHysteresis.mo | 2 +- Buildings/Controls/Continuous/SignalRanker.mo | 2 +- .../BaseClasses/BaselinePrediction.mo | 2 +- .../BaseClasses/NormalOperation.mo | 2 +- .../BaseClasses/ShedOperation.mo | 2 +- Buildings/Controls/DemandResponse/Client.mo | 2 +- Buildings/Controls/Interfaces/DayTypeInput.mo | 2 +- .../Controls/Interfaces/DayTypeOutput.mo | 2 +- .../G36_PR1/AHUs/MultiZone/VAV/Controller.mo | 66 +++++++++---------- .../MultiZone/VAV/Economizers/Controller.mo | 6 +- .../VAV/Economizers/Subsequences/Enable.mo | 10 +-- .../VAV/Economizers/Subsequences/Limits.mo | 12 ++-- .../Economizers/Subsequences/Modulation.mo | 8 +-- .../Validation/Enable_FreProSta.mo | 2 +- .../Validation/Enable_TOut_hOut.mo | 8 +-- .../Validation/Limits_LoopDisable.mo | 6 +- .../Validation/Controller_Disable.mo | 6 +- .../Validation/Controller_Mod_DamLim.mo | 6 +- .../MultiZone/VAV/SetPoints/ExhaustDamper.mo | 8 +-- .../VAV/SetPoints/OutdoorAirFlow/AHU.mo | 32 ++++----- .../VAV/SetPoints/OutdoorAirFlow/SumZone.mo | 32 ++++----- .../VAV/SetPoints/OutdoorAirFlow/Zone.mo | 30 ++++----- .../VAV/SetPoints/ReturnFanDirectPressure.mo | 8 +-- .../AHUs/MultiZone/VAV/SetPoints/SupplyFan.mo | 22 +++---- .../MultiZone/VAV/SetPoints/SupplySignals.mo | 14 ++-- .../VAV/SetPoints/SupplyTemperature.mo | 14 ++-- .../AHUs/MultiZone/VAV/SetPoints/package.mo | 2 +- .../G36_PR1/AHUs/SingleZone/VAV/Controller.mo | 46 ++++++------- .../AHUs/SingleZone/VAV/CoolingCoil.mo | 2 +- .../SingleZone/VAV/Economizers/Controller.mo | 4 +- .../VAV/Economizers/Subsequences/Enable.mo | 12 ++-- .../VAV/Economizers/Subsequences/Limits.mo | 10 +-- .../Economizers/Subsequences/Modulation.mo | 6 +- .../Validation/Enable_FreProSta_ZonSta.mo | 4 +- .../Validation/Enable_TOut_hOut.mo | 10 +-- .../Subsequences/Validation/Limits_Disable.mo | 6 +- .../Validation/Limits_FanSpe_VOut_flow.mo | 4 +- .../Validation/Controller_Disable.mo | 6 +- .../Validation/Controller_Mod_DamLim.mo | 6 +- .../SingleZone/VAV/SetPoints/ExhaustDamper.mo | 8 +-- .../VAV/SetPoints/OutsideAirFlow.mo | 4 +- .../AHUs/SingleZone/VAV/SetPoints/Supply.mo | 36 +++++----- .../AHUs/SingleZone/VAV/SetPoints/package.mo | 2 +- .../G36_PR1/AHUs/SingleZone/VAV/ZoneState.mo | 2 +- .../Generic/FreezeProtectionMixedAir.mo | 2 +- .../Generic/SetPoints/OperationMode.mo | 44 ++++++------- .../Generic/SetPoints/TrimAndRespond.mo | 8 +-- .../G36_PR1/Generic/SetPoints/ZoneStatus.mo | 38 +++++------ .../G36_PR1/TerminalUnits/Controller.mo | 32 ++++----- .../G36_PR1/TerminalUnits/ModeAndSetPoints.mo | 22 +++---- .../TerminalUnits/Reheat/DamperValves.mo | 42 ++++++------ .../Reheat/SetPoints/ActiveAirFlow.mo | 24 +++---- .../TerminalUnits/Reheat/SetPoints/package.mo | 2 +- .../TerminalUnits/Reheat/SystemRequests.mo | 38 +++++------ .../SetPoints/ZoneTemperatures.mo | 44 ++++++------- .../TerminalUnits/SetPoints/package.mo | 2 +- .../Validation/ModeAndSetPoints.mo | 8 +-- Buildings/Controls/OBC/CDL/Continuous/Abs.mo | 6 +- Buildings/Controls/OBC/CDL/Continuous/Add.mo | 4 +- .../OBC/CDL/Continuous/AddParameter.mo | 8 +-- Buildings/Controls/OBC/CDL/Continuous/Atan.mo | 6 +- .../Controls/OBC/CDL/Continuous/Atan2.mo | 8 +-- .../Controls/OBC/CDL/Continuous/Average.mo | 6 +- .../Controls/OBC/CDL/Continuous/ChangeSign.mo | 4 +- Buildings/Controls/OBC/CDL/Continuous/Cos.mo | 6 +- .../Controls/OBC/CDL/Continuous/Derivative.mo | 6 +- .../Controls/OBC/CDL/Continuous/Division.mo | 6 +- Buildings/Controls/OBC/CDL/Continuous/Exp.mo | 6 +- .../Controls/OBC/CDL/Continuous/Feedback.mo | 6 +- Buildings/Controls/OBC/CDL/Continuous/Gain.mo | 6 +- .../Controls/OBC/CDL/Continuous/Greater.mo | 2 +- .../OBC/CDL/Continuous/GreaterEqual.mo | 2 +- .../CDL/Continuous/GreaterEqualThreshold.mo | 4 +- .../OBC/CDL/Continuous/GreaterThreshold.mo | 4 +- .../Controls/OBC/CDL/Continuous/Hysteresis.mo | 6 +- .../OBC/CDL/Continuous/HysteresisWithHold.mo | 4 +- .../OBC/CDL/Continuous/IntegratorWithReset.mo | 12 ++-- Buildings/Controls/OBC/CDL/Continuous/Less.mo | 2 +- .../Controls/OBC/CDL/Continuous/LessEqual.mo | 2 +- .../OBC/CDL/Continuous/LessEqualThreshold.mo | 4 +- .../OBC/CDL/Continuous/LessThreshold.mo | 4 +- .../Controls/OBC/CDL/Continuous/LimPID.mo | 2 +- .../Controls/OBC/CDL/Continuous/Limiter.mo | 10 +-- Buildings/Controls/OBC/CDL/Continuous/Line.mo | 4 +- Buildings/Controls/OBC/CDL/Continuous/Log.mo | 6 +- .../Controls/OBC/CDL/Continuous/Log10.mo | 6 +- .../Controls/OBC/CDL/Continuous/MatrixGain.mo | 10 +-- .../Controls/OBC/CDL/Continuous/MatrixMax.mo | 4 +- .../Controls/OBC/CDL/Continuous/MatrixMin.mo | 4 +- Buildings/Controls/OBC/CDL/Continuous/Max.mo | 6 +- Buildings/Controls/OBC/CDL/Continuous/Min.mo | 6 +- .../Controls/OBC/CDL/Continuous/Modulo.mo | 6 +- .../Controls/OBC/CDL/Continuous/MovingMean.mo | 6 +- .../Controls/OBC/CDL/Continuous/MultiMax.mo | 6 +- .../Controls/OBC/CDL/Continuous/MultiMin.mo | 6 +- .../Controls/OBC/CDL/Continuous/MultiSum.mo | 8 +-- .../OBC/CDL/Continuous/NumberOfRequests.mo | 4 +- .../Controls/OBC/CDL/Continuous/Product.mo | 4 +- .../Controls/OBC/CDL/Continuous/Round.mo | 8 +-- Buildings/Controls/OBC/CDL/Continuous/Sin.mo | 6 +- .../OBC/CDL/Continuous/SlewRateLimiter.mo | 6 +- Buildings/Controls/OBC/CDL/Continuous/Sort.mo | 4 +- .../CDL/Continuous/Sources/CalendarTime.mo | 14 ++-- .../OBC/CDL/Continuous/Sources/Constant.mo | 6 +- .../OBC/CDL/Continuous/Sources/ModelTime.mo | 4 +- .../OBC/CDL/Continuous/Sources/Pulse.mo | 6 +- .../OBC/CDL/Continuous/Sources/Ramp.mo | 6 +- .../OBC/CDL/Continuous/Sources/Sine.mo | 6 +- .../OBC/CDL/Continuous/Sources/TimeTable.mo | 2 +- Buildings/Controls/OBC/CDL/Continuous/Sqrt.mo | 6 +- Buildings/Controls/OBC/CDL/Continuous/Tan.mo | 6 +- .../Controls/OBC/CDL/Continuous/package.mo | 2 +- .../OBC/CDL/Conversions/BooleanToInteger.mo | 6 +- .../OBC/CDL/Conversions/BooleanToReal.mo | 6 +- .../OBC/CDL/Conversions/IntegerToReal.mo | 6 +- .../Controls/OBC/CDL/Conversions/IsHoliday.mo | 4 +- .../OBC/CDL/Conversions/IsNonWorkingDay.mo | 4 +- .../OBC/CDL/Conversions/IsWorkingDay.mo | 4 +- .../OBC/CDL/Conversions/RealToInteger.mo | 6 +- .../Controls/OBC/CDL/Discrete/DayType.mo | 6 +- .../OBC/CDL/Discrete/FirstOrderHold.mo | 4 +- .../Controls/OBC/CDL/Discrete/Sampler.mo | 4 +- .../Controls/OBC/CDL/Discrete/TriggeredMax.mo | 4 +- .../OBC/CDL/Discrete/TriggeredMovingMean.mo | 6 +- .../OBC/CDL/Discrete/TriggeredSampler.mo | 4 +- .../Controls/OBC/CDL/Discrete/UnitDelay.mo | 8 +-- .../OBC/CDL/Discrete/ZeroOrderHold.mo | 4 +- Buildings/Controls/OBC/CDL/Integers/Abs.mo | 4 +- Buildings/Controls/OBC/CDL/Integers/Add.mo | 2 +- Buildings/Controls/OBC/CDL/Integers/Change.mo | 4 +- Buildings/Controls/OBC/CDL/Integers/Equal.mo | 4 +- .../Controls/OBC/CDL/Integers/Greater.mo | 2 +- .../Controls/OBC/CDL/Integers/GreaterEqual.mo | 2 +- .../OBC/CDL/Integers/GreaterEqualThreshold.mo | 4 +- .../OBC/CDL/Integers/GreaterThreshold.mo | 4 +- Buildings/Controls/OBC/CDL/Integers/Less.mo | 2 +- .../Controls/OBC/CDL/Integers/LessEqual.mo | 2 +- .../OBC/CDL/Integers/LessEqualThreshold.mo | 4 +- .../OBC/CDL/Integers/LessThreshold.mo | 4 +- Buildings/Controls/OBC/CDL/Integers/Max.mo | 4 +- Buildings/Controls/OBC/CDL/Integers/Min.mo | 4 +- .../Controls/OBC/CDL/Integers/MultiSum.mo | 6 +- .../Controls/OBC/CDL/Integers/OnCounter.mo | 4 +- .../Controls/OBC/CDL/Integers/Product.mo | 2 +- .../OBC/CDL/Integers/Sources/Constant.mo | 4 +- .../Controls/OBC/CDL/Integers/package.mo | 2 +- .../OBC/CDL/Interfaces/BooleanInput.mo | 2 +- .../OBC/CDL/Interfaces/BooleanOutput.mo | 2 +- .../OBC/CDL/Interfaces/DayTypeInput.mo | 2 +- .../OBC/CDL/Interfaces/DayTypeOutput.mo | 2 +- .../OBC/CDL/Interfaces/IntegerInput.mo | 2 +- .../OBC/CDL/Interfaces/IntegerOutput.mo | 2 +- .../Controls/OBC/CDL/Interfaces/RealInput.mo | 2 +- .../Controls/OBC/CDL/Interfaces/RealOutput.mo | 2 +- Buildings/Controls/OBC/CDL/Logical/And.mo | 4 +- Buildings/Controls/OBC/CDL/Logical/And3.mo | 4 +- Buildings/Controls/OBC/CDL/Logical/Change.mo | 4 +- Buildings/Controls/OBC/CDL/Logical/Edge.mo | 4 +- .../Controls/OBC/CDL/Logical/FallingEdge.mo | 4 +- .../Controls/OBC/CDL/Logical/IntegerSwitch.mo | 2 +- Buildings/Controls/OBC/CDL/Logical/Latch.mo | 6 +- .../Controls/OBC/CDL/Logical/LogicalSwitch.mo | 2 +- .../Controls/OBC/CDL/Logical/MultiAnd.mo | 4 +- Buildings/Controls/OBC/CDL/Logical/MultiOr.mo | 4 +- Buildings/Controls/OBC/CDL/Logical/Nand.mo | 4 +- Buildings/Controls/OBC/CDL/Logical/Nor.mo | 4 +- Buildings/Controls/OBC/CDL/Logical/Not.mo | 4 +- .../OBC/CDL/Logical/OnOffController.mo | 2 +- Buildings/Controls/OBC/CDL/Logical/Or.mo | 4 +- Buildings/Controls/OBC/CDL/Logical/Or3.mo | 4 +- Buildings/Controls/OBC/CDL/Logical/Pre.mo | 4 +- .../OBC/CDL/Logical/Sources/Constant.mo | 4 +- .../Controls/OBC/CDL/Logical/Sources/Pulse.mo | 4 +- .../OBC/CDL/Logical/Sources/SampleTrigger.mo | 4 +- Buildings/Controls/OBC/CDL/Logical/Switch.mo | 2 +- Buildings/Controls/OBC/CDL/Logical/Timer.mo | 4 +- Buildings/Controls/OBC/CDL/Logical/Toggle.mo | 6 +- .../OBC/CDL/Logical/TriggeredTrapezoid.mo | 16 ++--- .../Controls/OBC/CDL/Logical/TrueDelay.mo | 4 +- .../Controls/OBC/CDL/Logical/TrueFalseHold.mo | 6 +- .../OBC/CDL/Logical/TrueHoldWithReset.mo | 4 +- .../OBC/CDL/Logical/Validation/Latch.mo | 38 +++++------ .../OBC/CDL/Logical/Validation/Toggle.mo | 38 +++++------ Buildings/Controls/OBC/CDL/Logical/Xor.mo | 4 +- .../Controls/OBC/CDL/Logical/ZeroCrossing.mo | 2 +- .../CDL/Psychrometrics/TDewPoi_TDryBulPhi.mo | 14 ++-- .../CDL/Psychrometrics/TWetBul_TDryBulPhi.mo | 14 ++-- .../OBC/CDL/Psychrometrics/h_TDryBulPhi.mo | 14 ++-- .../OBC/CDL/Psychrometrics/package.mo | 4 +- .../OBC/CDL/Routing/BooleanReplicator.mo | 2 +- .../OBC/CDL/Routing/IntegerReplicator.mo | 2 +- .../OBC/CDL/Routing/RealExtractSignal.mo | 4 +- .../Controls/OBC/CDL/Routing/RealExtractor.mo | 2 +- .../OBC/CDL/Routing/RealReplicator.mo | 2 +- .../SetPoints/SupplyReturnTemperatureReset.mo | 10 +-- .../Controls/OBC/CDL/Utilities/Assert.mo | 2 +- .../Controls/OBC/CDL/Utilities/SunRiseSet.mo | 2 +- .../OBC/OutdoorLights/DaylightControlled.mo | 2 +- Buildings/Controls/OBC/Shade/Shade_H.mo | 6 +- Buildings/Controls/OBC/Shade/Shade_T.mo | 6 +- .../Controls/OBC/UnitConversions/From_Btu.mo | 11 +++- .../OBC/UnitConversions/From_BtuPerHour.mo | 11 +++- .../Controls/OBC/UnitConversions/From_bar.mo | 11 +++- .../Controls/OBC/UnitConversions/From_cfm.mo | 11 +++- .../Controls/OBC/UnitConversions/From_degC.mo | 11 +++- .../Controls/OBC/UnitConversions/From_degF.mo | 11 +++- .../Controls/OBC/UnitConversions/From_gal.mo | 11 +++- .../Controls/OBC/UnitConversions/From_hp.mo | 11 +++- .../OBC/UnitConversions/From_inH2O.mo | 11 +++- .../Controls/OBC/UnitConversions/From_psi.mo | 11 +++- .../Controls/OBC/UnitConversions/From_quad.mo | 11 +++- .../Controls/OBC/UnitConversions/From_ton.mo | 11 +++- .../Controls/OBC/UnitConversions/To_Btu.mo | 11 +++- .../OBC/UnitConversions/To_BtuPerHour.mo | 11 +++- .../Controls/OBC/UnitConversions/To_bar.mo | 11 +++- .../Controls/OBC/UnitConversions/To_cfm.mo | 11 +++- .../Controls/OBC/UnitConversions/To_degC.mo | 11 +++- .../Controls/OBC/UnitConversions/To_degF.mo | 11 +++- .../Controls/OBC/UnitConversions/To_gal.mo | 11 +++- .../Controls/OBC/UnitConversions/To_hp.mo | 11 +++- .../Controls/OBC/UnitConversions/To_inH2O.mo | 11 +++- .../Controls/OBC/UnitConversions/To_psi.mo | 11 +++- .../Controls/OBC/UnitConversions/To_quad.mo | 11 +++- .../Controls/OBC/UnitConversions/To_ton.mo | 11 +++- .../UnitConversions/Validation/From_Btu.mo | 5 ++ .../Validation/From_BtuPerHour.mo | 5 ++ .../UnitConversions/Validation/From_bar.mo | 5 ++ .../UnitConversions/Validation/From_cfm.mo | 5 ++ .../UnitConversions/Validation/From_degC.mo | 5 ++ .../UnitConversions/Validation/From_degF.mo | 5 ++ .../UnitConversions/Validation/From_gal.mo | 5 ++ .../OBC/UnitConversions/Validation/From_hp.mo | 5 ++ .../UnitConversions/Validation/From_inH2O.mo | 5 ++ .../UnitConversions/Validation/From_psi.mo | 5 ++ .../UnitConversions/Validation/From_quad.mo | 5 ++ .../UnitConversions/Validation/From_ton.mo | 5 ++ .../OBC/UnitConversions/Validation/To_Btu.mo | 5 ++ .../Validation/To_BtuPerHour.mo | 5 ++ .../OBC/UnitConversions/Validation/To_bar.mo | 5 ++ .../OBC/UnitConversions/Validation/To_cfm.mo | 5 ++ .../OBC/UnitConversions/Validation/To_degC.mo | 5 ++ .../OBC/UnitConversions/Validation/To_degF.mo | 5 ++ .../OBC/UnitConversions/Validation/To_gal.mo | 5 ++ .../OBC/UnitConversions/Validation/To_hp.mo | 5 ++ .../UnitConversions/Validation/To_inH2O.mo | 5 ++ .../OBC/UnitConversions/Validation/To_psi.mo | 5 ++ .../OBC/UnitConversions/Validation/To_quad.mo | 5 ++ .../OBC/UnitConversions/Validation/To_ton.mo | 5 ++ .../Controls/OBC/UnitConversions/package.mo | 7 +- .../BaseClasses/OptimalStartCalculation.mo | 2 +- .../Controls/OBC/Utilities/OptimalStart.mo | 6 +- .../Controls/Predictors/ElectricalLoad.mo | 2 +- .../Controls/SetPoints/OccupancySchedule.mo | 6 +- .../SetPoints/SupplyReturnTemperatureReset.mo | 8 +-- Buildings/Controls/SetPoints/Table.mo | 6 +- Buildings/Controls/Sources/DayType.mo | 2 +- .../Electrical/AC/Interfaces/PowerOutput.mo | 2 +- .../AC/OnePhase/Conversion/ACACConverter.mo | 14 ++-- .../AC/OnePhase/Conversion/ACACTransformer.mo | 14 ++-- .../Conversion/ACACTransformerFull.mo | 22 +++---- .../AC/OnePhase/Conversion/ACDCConverter.mo | 10 +-- .../AC/OnePhase/Interfaces/Terminal_n.mo | 6 +- .../AC/OnePhase/Interfaces/Terminal_p.mo | 6 +- .../AC/OnePhase/Lines/TwoPortInductance.mo | 2 +- .../Electrical/AC/OnePhase/Lines/TwoPortRL.mo | 2 +- .../AC/OnePhase/Lines/TwoPortRLC.mo | 2 +- .../AC/OnePhase/Lines/TwoPortResistance.mo | 2 +- .../AC/OnePhase/Loads/Capacitive.mo | 2 +- .../Electrical/AC/OnePhase/Loads/Impedance.mo | 2 +- .../Electrical/AC/OnePhase/Loads/Inductive.mo | 2 +- .../Electrical/AC/OnePhase/Loads/Resistive.mo | 2 +- .../AC/OnePhase/Sensors/GeneralizedSensor.mo | 2 +- .../Electrical/AC/OnePhase/Sensors/Probe.mo | 4 +- .../AC/OnePhase/Sources/FixedVoltage.mo | 4 +- .../AC/OnePhase/Sources/Generator.mo | 2 +- .../Electrical/AC/OnePhase/Sources/Grid.mo | 2 +- .../Electrical/AC/OnePhase/Storage/Battery.mo | 6 +- .../Interfaces/Terminal_n.mo | 6 +- .../Interfaces/Terminal_p.mo | 6 +- .../ThreePhasesBalanced/Loads/Capacitive.mo | 2 +- .../Loads/Examples/ThreePhases.mo | 6 +- .../AC/ThreePhasesBalanced/Loads/Impedance.mo | 2 +- .../AC/ThreePhasesBalanced/Loads/Inductive.mo | 2 +- .../AC/ThreePhasesBalanced/Loads/Resistive.mo | 2 +- .../Sensors/GeneralizedSensor.mo | 2 +- .../Conversion/ACACConverter.mo | 12 ++-- .../Conversion/ACACTransformer.mo | 14 ++-- .../Conversion/ACACTransformerDD.mo | 14 ++-- .../Conversion/ACACTransformerFull.mo | 14 ++-- .../Conversion/ACACTransformerStepDownDY.mo | 14 ++-- .../Conversion/ACACTransformerStepDownYD.mo | 14 ++-- .../Conversion/ACACTransformerStepUpDY.mo | 14 ++-- .../Conversion/ACACTransformerStepUpYD.mo | 14 ++-- .../Lines/TwoPortInductance.mo | 4 +- .../Lines/TwoPortInductance_N.mo | 4 +- .../Lines/TwoPortMatrixRL.mo | 4 +- .../Lines/TwoPortMatrixRLC.mo | 6 +- .../Lines/TwoPortMatrixRLC_N.mo | 6 +- .../Lines/TwoPortMatrixRL_N.mo | 4 +- .../ThreePhasesUnbalanced/Lines/TwoPortRL.mo | 4 +- .../ThreePhasesUnbalanced/Lines/TwoPortRLC.mo | 6 +- .../Lines/TwoPortRLC_N.mo | 6 +- .../Lines/TwoPortRL_N.mo | 4 +- .../Lines/TwoPortResistance.mo | 4 +- .../Lines/TwoPortResistance_N.mo | 4 +- .../ThreePhasesUnbalanced/Loads/Capacitive.mo | 2 +- .../Loads/Capacitive_N.mo | 2 +- .../Loads/Examples/Impedances.mo | 4 +- .../ThreePhasesUnbalanced/Loads/Impedance.mo | 2 +- .../Loads/Impedance_N.mo | 2 +- .../ThreePhasesUnbalanced/Loads/Inductive.mo | 2 +- .../Loads/Inductive_N.mo | 2 +- .../ThreePhasesUnbalanced/Loads/Resistive.mo | 2 +- .../Loads/Resistive_N.mo | 2 +- .../Sensors/BaseClasses/GeneralizedProbe.mo | 4 +- .../Sensors/GeneralizedSensor.mo | 8 +-- .../Sensors/GeneralizedSensor_N.mo | 8 +-- .../Sensors/ProbeDelta.mo | 4 +- .../Sources/BaseClasses/BaseUnbalancedPV.mo | 2 +- .../Sources/BaseClasses/UnbalancedPV.mo | 2 +- .../Sources/BaseClasses/UnbalancedPV_N.mo | 2 +- .../Sources/FixedVoltage.mo | 4 +- .../Sources/FixedVoltage_N.mo | 4 +- .../AC/ThreePhasesUnbalanced/Sources/Grid.mo | 2 +- .../ThreePhasesUnbalanced/Sources/Grid_N.mo | 2 +- .../Electrical/DC/Conversion/DCDCConverter.mo | 16 ++--- .../Electrical/DC/Lines/TwoPortRCLine.mo | 2 +- .../Electrical/DC/Lines/TwoPortResistance.mo | 4 +- Buildings/Electrical/DC/Loads/Conductor.mo | 4 +- Buildings/Electrical/DC/Loads/Resistor.mo | 4 +- .../DC/Sensors/GeneralizedSensor.mo | 2 +- .../DC/Sources/BaseClasses/WindCorrection.mo | 4 +- .../Electrical/DC/Sources/ConstantVoltage.mo | 6 +- Buildings/Electrical/DC/Sources/PVSimple.mo | 4 +- .../Electrical/DC/Sources/PVSimpleOriented.mo | 4 +- .../Electrical/DC/Sources/VoltageSource.mo | 6 +- .../Electrical/DC/Sources/WindTurbine.mo | 4 +- Buildings/Electrical/DC/Storage/Battery.mo | 10 +-- .../Electrical/Icons/GeneralizedProbe.mo | 2 +- .../Electrical/Icons/GeneralizedSensor.mo | 6 +- Buildings/Electrical/Interfaces/PartialPV.mo | 6 +- .../Interfaces/PartialPVOriented.mo | 4 +- .../Interfaces/PartialWindTurbine.mo | 4 +- .../BaseClasses/PartialBaseLine.mo | 2 +- .../Transmission/BaseClasses/PartialLine.mo | 2 +- .../BaseClasses/PartialNetwork.mo | 2 +- .../BaseClasses/PartialTwoPortInductance.mo | 2 +- .../BaseClasses/PartialTwoPortRLC.mo | 4 +- .../BaseClasses/PartialTwoPortResistance.mo | 2 +- .../Transmission/Grids/PartialGrid.mo | 2 +- .../Electrical/Utilities/VoltageControl.mo | 4 +- .../BaseClasses/Controls/BatteryControl.mo | 2 +- .../BaseClasses/Controls/ChillerSwitch.mo | 4 +- .../BaseClasses/Controls/KMinusU.mo | 4 +- .../Controls/LinearPiecewiseTwo.mo | 20 +++--- .../BaseClasses/Controls/RequestCounter.mo | 6 +- .../BaseClasses/Controls/WSEControl.mo | 2 +- .../CoolingCoilTemperatureSetpoint.mo | 4 +- .../DualFanDualDuct/Controls/FanVFD.mo | 2 +- .../DualFanDualDuct/Controls/RoomMixingBox.mo | 14 ++-- .../ThermalZones/SupplyBranch.mo | 2 +- .../HydronicHeating/TwoRoomsWithStorage.mo | 12 ++-- .../BuildingVAV/BaseClasses/FanOnOffWithDP.mo | 4 +- .../BuildingVAV/BaseClasses/VAVBranch.mo | 8 +-- .../BuildingVAV/ThermalZones/MultiZone.mo | 4 +- .../BuildingVAV/ThermalZones/ThermalZone.mo | 8 +-- .../Tutorial/CDL/Controls/BoilerReturn.mo | 6 +- .../Tutorial/CDL/Controls/EquipmentOnOff.mo | 10 +-- .../CDL/Controls/OpenLoopBoilerReturn.mo | 6 +- .../CDL/Controls/OpenLoopEquipmentOnOff.mo | 10 +-- .../CDL/Controls/OpenLoopRadiatorSupply.mo | 8 +-- .../CDL/Controls/OpenLoopSystemOnOff.mo | 8 +-- .../Tutorial/CDL/Controls/RadiatorSupply.mo | 8 +-- .../Tutorial/CDL/Controls/SystemOnOff.mo | 8 +-- .../VAVCO2/BaseClasses/RoomLeakage.mo | 2 +- .../VAVReheat/BaseClasses/MixingBox.mo | 2 +- .../CoolingCoilTemperatureSetpoint.mo | 4 +- .../Controls/DuctStaticPressureSetpoint.mo | 6 +- .../Examples/VAVReheat/Controls/Economizer.mo | 14 ++-- .../Controls/EconomizerTemperatureControl.mo | 10 +-- .../Examples/VAVReheat/Controls/FanVFD.mo | 2 +- .../VAVReheat/Controls/ModeSelector.mo | 2 +- .../Controls/RoomTemperatureSetpoint.mo | 12 ++-- .../Examples/VAVReheat/Controls/RoomVAV.mo | 10 +-- .../Examples/VAVReheat/Controls/State.mo | 2 +- .../Examples/VAVReheat/ThermalZones/Floor.mo | 2 +- .../Plants/LakeWaterHeatExchanger_T.mo | 12 ++-- .../BaseClasses/HeatingOrCooling.mo | 2 +- .../SubStations/Cooling.mo | 2 +- .../SubStations/Heating.mo | 2 +- .../HeatingCoolingHotwaterTimeSeries_dT.mo | 2 +- .../Actuators/BaseClasses/ActuatorSignal.mo | 4 +- .../Fluid/Actuators/Dampers/MixingBox.mo | 4 +- .../Actuators/Dampers/MixingBoxMinimumFlow.mo | 2 +- .../Fluid/Actuators/Motors/IdealMotor.mo | 12 ++-- .../Valves/ThreeWayEqualPercentageLinear.mo | 2 +- .../Actuators/Valves/TwoWayEqualPercentage.mo | 2 +- .../FlowModels/basicFlowFunction_dp.mo | 2 +- .../FlowModels/basicFlowFunction_m_flow.mo | 2 +- Buildings/Fluid/Boilers/BoilerPolynomial.mo | 4 +- .../Fluid/CHPs/BaseClasses/EfficiencyCurve.mo | 2 +- .../Fluid/CHPs/BaseClasses/FilterPower.mo | 8 +-- .../BaseClasses/Interfaces/ModeTypeInput.mo | 2 +- .../BaseClasses/Interfaces/ModeTypeOutput.mo | 2 +- .../CHPs/Validation/ElectricalFollowing.mo | 2 +- .../Fluid/CHPs/Validation/ThermalFollowing.mo | 2 +- .../Chillers/BaseClasses/PartialCarnot_y.mo | 4 +- .../Chillers/BaseClasses/PartialElectric.mo | 6 +- Buildings/Fluid/Chillers/Carnot_TEva.mo | 2 +- Buildings/Fluid/Chillers/Data/BaseClasses.mo | 12 ++-- Buildings/Fluid/Delays/DelayFirstOrder.mo | 2 +- Buildings/Fluid/Examples/FlowSystem/Basic.mo | 16 ++--- .../Fluid/Examples/Performance/Example5.mo | 2 +- .../Fluid/Examples/Performance/Example6.mo | 2 +- .../Fluid/Examples/Performance/Example7.mo | 2 +- .../Fluid/Examples/Performance/Example8.mo | 2 +- Buildings/Fluid/Examples/SimpleHouse.mo | 8 +-- Buildings/Fluid/FMI/Adaptors/HVAC.mo | 8 +-- Buildings/Fluid/FMI/Adaptors/Inlet.mo | 8 +-- Buildings/Fluid/FMI/Adaptors/Outlet.mo | 6 +- Buildings/Fluid/FMI/Adaptors/ThermalZone.mo | 8 +-- Buildings/Fluid/FMI/Conversion/AirToOutlet.mo | 8 +-- Buildings/Fluid/FMI/Conversion/InletToAir.mo | 10 +-- .../Examples/FMUs/HVACZone.mo | 2 +- .../Examples/FMUs/HVACZones.mo | 2 +- .../Examples/FMUs/HeaterCooler_u.mo | 4 +- .../Examples/FMUs/Heater_T.mo | 8 +-- .../Examples/FMUs/Humidifier_u.mo | 4 +- .../Examples/FMUs/IdealSource_m_flow.mo | 2 +- .../Examples/FMUs/ThermalZone.mo | 2 +- .../Examples/FMUs/ThermalZones.mo | 2 +- .../Fluid/FMI/ExportContainers/HVACZone.mo | 10 +-- .../Fluid/FMI/ExportContainers/HVACZones.mo | 12 ++-- .../FMI/ExportContainers/PartialTwoPort.mo | 2 +- .../Fluid/FMI/ExportContainers/ThermalZone.mo | 2 +- .../FMI/ExportContainers/ThermalZones.mo | 4 +- .../Validation/FMUs/ThermalZoneAir1.mo | 2 +- .../ExportContainers/Validation/RoomHVAC.mo | 2 +- Buildings/Fluid/FMI/FlowSplitter_u.mo | 2 +- Buildings/Fluid/FMI/Interfaces/Inlet.mo | 2 +- .../FMI/Interfaces/MassFractionConnector.mo | 2 +- Buildings/Fluid/FMI/Interfaces/Outlet.mo | 2 +- .../Fluid/FMI/Interfaces/PressureInput.mo | 2 +- .../Fluid/FMI/Interfaces/PressureOutput.mo | 2 +- Buildings/Fluid/FMI/Sink_T.mo | 2 +- Buildings/Fluid/FMI/Source_T.mo | 2 +- .../FixedResistances/BaseClasses/Pipe.mo | 2 +- .../BaseClasses/PlugFlowTransportDelay.mo | 6 +- .../FixedResistances/HydraulicDiameter.mo | 2 +- Buildings/Fluid/FixedResistances/Junction.mo | 2 +- .../Fluid/FixedResistances/PlugFlowPipe.mo | 2 +- .../InternalResistancesOneUTube.mo | 2 +- .../InternalResistancesTwoUTube.mo | 2 +- .../BaseClasses/Boreholes/OneUTube.mo | 2 +- .../BaseClasses/Boreholes/TwoUTube.mo | 4 +- .../BaseClasses/HeatTransfer/Cylindrical.mo | 8 +-- .../HeatTransfer/GroundTemperatureResponse.mo | 2 +- .../SingleUTubeBoundaryCondition.mo | 4 +- .../BaseClasses/ModificationFactor.mo | 2 +- .../HeatExchangers/ActiveBeams/Cooling.mo | 2 +- .../BaseClasses/CoilRegister.mo | 4 +- .../BaseClasses/HACoilInside.mo | 2 +- .../HeatExchangers/BaseClasses/HADryCoil.mo | 2 +- .../BaseClasses/HANaturalCylinder.mo | 2 +- .../BaseClasses/MassExchange.mo | 8 +-- .../BaseClasses/PartialDuctPipeManifold.mo | 2 +- .../BaseClasses/PartialHexElement.mo | 4 +- .../HeatExchangers/ConstantEffectiveness.mo | 2 +- .../CoolingTowers/BaseClasses/Merkel.mo | 2 +- .../CoolingTowers/FixedApproach.mo | 2 +- .../HeatExchangers/CoolingTowers/Merkel.mo | 10 +-- .../HeatExchangers/CoolingTowers/YorkCalc.mo | 10 +-- .../Generic/BaseClasses/PerformanceCurve.mo | 12 ++-- .../Examples/PerformanceCurves/Curve_II.mo | 12 ++-- .../Examples/PerformanceCurves/Curve_III.mo | 12 ++-- .../DXCoils/AirCooled/MultiStage.mo | 2 +- .../DXCoils/AirCooled/SingleSpeed.mo | 2 +- .../DXCoils/AirCooled/VariableSpeed.mo | 2 +- .../DXCoils/BaseClasses/ApparatusDewPoint.mo | 2 +- .../BaseClasses/CoolingCapacityAirCooled.mo | 2 +- .../BaseClasses/CoolingCapacityWaterCooled.mo | 2 +- .../DXCoils/BaseClasses/DXCooling.mo | 2 +- .../DXCoils/BaseClasses/DryCoil.mo | 2 +- .../DXCoils/BaseClasses/DryWetSelector.mo | 2 +- .../PerformanceCurves/Curve_III_AirCooled.mo | 12 ++-- .../PerformanceCurves/Curve_II_AirCooled.mo | 12 ++-- .../PerformanceCurves/Curve_I_WaterCooled.mo | 12 ++-- .../DXCoils/BaseClasses/InputPower.mo | 2 +- .../BaseClasses/PartialCoolingCapacity.mo | 2 +- .../DXCoils/BaseClasses/PartialDXCoil.mo | 8 +-- .../BaseClasses/PartialWaterCooledDXCoil.mo | 6 +- .../DXCoils/BaseClasses/SensibleHeatRatio.mo | 2 +- .../DXCoils/BaseClasses/SpeedShift.mo | 2 +- .../DXCoils/BaseClasses/WetCoil.mo | 2 +- .../Generic/BaseClasses/PerformanceCurve.mo | 12 ++-- .../DXCoils/WaterCooled/MultiStage.mo | 2 +- .../HeatExchangers/DryCoilCounterFlow.mo | 4 +- .../HeatExchangers/DryCoilDiscretized.mo | 4 +- .../HeatExchangers/EvaporatorCondenser.mo | 2 +- .../Fluid/HeatExchangers/HeaterCooler_u.mo | 6 +- Buildings/Fluid/HeatExchangers/Heater_T.mo | 6 +- .../Fluid/HeatExchangers/PrescribedOutlet.mo | 8 +-- .../BaseClasses/HeatFlowRateMultiplier.mo | 2 +- .../BaseClasses/PipeToSlabConductance.mo | 2 +- .../Fluid/HeatExchangers/SensibleCooler_T.mo | 6 +- .../HeatExchangers/WetCoilCounterFlow.mo | 4 +- .../Calibration/ScrollWaterToWater.mo | 2 +- Buildings/Fluid/HeatPumps/Carnot_TCon.mo | 2 +- .../BaseClasses/PartialCompressor.mo | 6 +- .../HeatPumps/Data/BaseClasses/HeatPumps.mo | 6 +- Buildings/Fluid/Humidifiers/Humidifier_u.mo | 4 +- .../Fluid/Humidifiers/SprayAirWasher_X.mo | 4 +- .../Fluid/Humidifiers/SteamHumidifier_X.mo | 6 +- .../Fluid/Interfaces/ConservationEquation.mo | 6 +- Buildings/Fluid/Interfaces/EightPort.mo | 2 +- .../Interfaces/Examples/HeaterCooler_u.mo | 4 +- .../Fluid/Interfaces/Examples/Humidifier_u.mo | 6 +- Buildings/Fluid/Interfaces/PartialFourPort.mo | 2 +- .../Interfaces/PartialFourPortParallel.mo | 2 +- Buildings/Fluid/Interfaces/PartialTwoPort.mo | 2 +- .../Fluid/Interfaces/PartialTwoPortVector.mo | 2 +- .../Fluid/Interfaces/PrescribedOutlet.mo | 8 +-- .../StaticTwoPortConservationEquation.mo | 10 +-- .../MassExchangers/ConstantEffectiveness.mo | 4 +- .../BaseClasses/PartialMixingVolume.mo | 6 +- Buildings/Fluid/MixingVolumes/MixingVolume.mo | 2 +- .../Validation/MixingVolumeZeroFlow.mo | 2 +- .../BaseClasses/FlowMachineInterface.mo | 14 ++-- .../Fluid/Movers/BaseClasses/IdealSource.mo | 4 +- .../Movers/BaseClasses/PartialFlowMachine.mo | 6 +- Buildings/Fluid/Movers/FlowControlled_dp.mo | 2 +- .../Fluid/Movers/FlowControlled_m_flow.mo | 2 +- .../Fluid/Movers/SpeedControlled_Nrpm.mo | 2 +- Buildings/Fluid/Movers/SpeedControlled_y.mo | 2 +- .../Sensors/Conversions/To_VolumeFraction.mo | 12 ++-- Buildings/Fluid/Sensors/Density.mo | 6 +- Buildings/Fluid/Sensors/DensityTwoPort.mo | 4 +- Buildings/Fluid/Sensors/EnthalpyFlowRate.mo | 4 +- Buildings/Fluid/Sensors/EntropyFlowRate.mo | 4 +- .../Fluid/Sensors/LatentEnthalpyFlowRate.mo | 4 +- Buildings/Fluid/Sensors/MassFlowRate.mo | 4 +- Buildings/Fluid/Sensors/MassFraction.mo | 6 +- .../Fluid/Sensors/MassFractionTwoPort.mo | 4 +- Buildings/Fluid/Sensors/PPM.mo | 6 +- Buildings/Fluid/Sensors/PPMTwoPort.mo | 4 +- Buildings/Fluid/Sensors/Pressure.mo | 6 +- Buildings/Fluid/Sensors/RelativeHumidity.mo | 6 +- .../Fluid/Sensors/RelativeHumidityTwoPort.mo | 4 +- Buildings/Fluid/Sensors/RelativePressure.mo | 6 +- .../Fluid/Sensors/RelativeTemperature.mo | 6 +- .../Fluid/Sensors/SensibleEnthalpyFlowRate.mo | 4 +- Buildings/Fluid/Sensors/SpecificEnthalpy.mo | 6 +- .../Fluid/Sensors/SpecificEnthalpyTwoPort.mo | 4 +- Buildings/Fluid/Sensors/SpecificEntropy.mo | 6 +- .../Fluid/Sensors/SpecificEntropyTwoPort.mo | 4 +- Buildings/Fluid/Sensors/Temperature.mo | 6 +- Buildings/Fluid/Sensors/TemperatureTwoPort.mo | 4 +- .../Sensors/TemperatureWetBulbTwoPort.mo | 4 +- Buildings/Fluid/Sensors/TraceSubstances.mo | 6 +- .../Fluid/Sensors/TraceSubstancesTwoPort.mo | 4 +- Buildings/Fluid/Sensors/Velocity.mo | 4 +- Buildings/Fluid/Sensors/VolumeFlowRate.mo | 4 +- .../Fluid/Sources/BaseClasses/Outside.mo | 6 +- .../BaseClasses/PartialPropertySource.mo | 4 +- .../Sources/BaseClasses/PartialSource_Xi_C.mo | 6 +- Buildings/Fluid/Sources/Boundary_pT.mo | 8 +-- Buildings/Fluid/Sources/Boundary_ph.mo | 6 +- Buildings/Fluid/Sources/MassFlowSource_T.mo | 8 +-- .../Sources/MassFlowSource_WeatherData.mo | 8 +-- Buildings/Fluid/Sources/MassFlowSource_h.mo | 8 +-- Buildings/Fluid/Sources/Outside_Cp.mo | 6 +- Buildings/Fluid/Sources/Outside_CpLowRise.mo | 6 +- Buildings/Fluid/Sources/PropertySource_T.mo | 2 +- Buildings/Fluid/Sources/PropertySource_h.mo | 2 +- .../Sources/TraceSubstancesFlowSource.mo | 8 +-- .../Storage/BaseClasses/PartialStratified.mo | 2 +- Buildings/Fluid/Storage/ExpansionVessel.mo | 2 +- Buildings/Fluid/Storage/Stratified.mo | 2 +- .../HeatTransfer/Conduction/SingleLayer.mo | 4 +- .../Conduction/SingleLayerCylinder.mo | 6 +- .../BaseClasses/PartialConvection.mo | 2 +- Buildings/HeatTransfer/Convection/Exterior.mo | 6 +- Buildings/HeatTransfer/Convection/Interior.mo | 2 +- Buildings/HeatTransfer/Data/BaseClasses.mo | 10 +-- .../HeatTransfer/Data/OpaqueConstructions.mo | 2 +- Buildings/HeatTransfer/Data/Resistances.mo | 2 +- .../Examples/ConductorInitialization.mo | 2 +- .../Interfaces/RadiosityInflow.mo | 2 +- .../Interfaces/RadiosityOutflow.mo | 2 +- Buildings/HeatTransfer/Radiosity/Constant.mo | 2 +- .../Radiosity/OutdoorRadiosity.mo | 8 +-- .../HeatTransfer/Sources/FixedHeatFlow.mo | 6 +- .../HeatTransfer/Sources/FixedTemperature.mo | 8 +-- .../Sources/PrescribedHeatFlow.mo | 2 +- .../Sources/PrescribedTemperature.mo | 6 +- .../Windows/BaseClasses/AbsorbedRadiation.mo | 10 +-- .../Windows/BaseClasses/CenterOfGlass.mo | 6 +- .../ExteriorConvectionCoefficient.mo | 4 +- .../Windows/BaseClasses/GasConvection.mo | 4 +- .../Windows/BaseClasses/GlassLayer.mo | 4 +- .../Windows/BaseClasses/HeatCapacity.mo | 4 +- .../Windows/BaseClasses/InteriorConvection.mo | 2 +- .../InteriorConvectionCoefficient.mo | 2 +- .../Windows/BaseClasses/PartialRadiation.mo | 8 +-- .../PartialWindowBoundaryCondition.mo | 4 +- .../Windows/BaseClasses/ShadeConvection.mo | 8 +-- .../Windows/BaseClasses/ShadeRadiation.mo | 10 +-- .../Windows/BaseClasses/ShadingSignal.mo | 6 +- .../Windows/BaseClasses/ThermalConductor.mo | 10 +-- .../BaseClasses/TransmittedRadiation.mo | 6 +- .../Windows/BaseClasses/WindowRadiation.mo | 16 ++--- .../Windows/ExteriorHeatTransfer.mo | 8 +-- .../Windows/InteriorHeatTransferConvective.mo | 4 +- Buildings/HeatTransfer/Windows/Window.mo | 8 +-- .../Water/ConstantProperties_pT/package.mo | 2 +- .../Water/TemperatureDependentDensity.mo | 2 +- .../Controls/OBC/CDL/Discrete/MovingMean.mo | 2 +- .../Obsolete/Fluid/Sources/FixedBoundary.mo | 2 +- Buildings/Obsolete/Utilities/IO/package.mo | 2 +- .../Office/Blinds/Haldi2008BlindsTIn.mo | 2 +- .../Office/Blinds/Haldi2008BlindsTOut.mo | 2 +- .../Inkarojrit2008BlindsSolarIntensity.mo | 2 +- .../Blinds/Newsham1994BlindsSolarIntensity.mo | 2 +- .../Blinds/Zhang2012BlindsSolarAltitude.mo | 2 +- .../Blinds/Zhang2012BlindsSolarIntensity.mo | 2 +- .../Office/Lighting/Gunay2016Light.mo | 2 +- .../Office/Lighting/Hunt1979Light.mo | 2 +- .../Office/Lighting/Love1998Light1.mo | 2 +- .../Office/Lighting/Love1998Light2.mo | 2 +- .../Office/Lighting/Reinhart2003Light.mo | 2 +- .../Office/Occupancy/Wang2005Occupancy.mo | 2 +- .../Office/Windows/Haldi2008WindowsTIn.mo | 2 +- .../Office/Windows/Haldi2008WindowsTOut.mo | 2 +- .../Office/Windows/Haldi2009WindowsTInTout.mo | 2 +- .../Herkel2008WindowsCompletelyOpen.mo | 2 +- .../Office/Windows/Herkel2008WindowsSmall.mo | 2 +- .../Windows/Herkel2008WindowsTiltedOpen.mo | 2 +- .../Windows/Rijal2007WindowsTInTOutTComf.mo | 2 +- .../Office/Windows/Yun2008WindowsTIn.mo | 2 +- .../Office/Windows/Yun2008WindowsTOut.mo | 2 +- .../Office/Windows/Zhang2012WindowsAll.mo | 2 +- .../Office/Windows/Zhang2012WindowsEast.mo | 2 +- .../Office/Windows/Zhang2012WindowsNorth.mo | 2 +- .../Office/Windows/Zhang2012WindowsSouth.mo | 2 +- .../Office/Windows/Zhang2012WindowsWest.mo | 2 +- .../AirConditioning/Ren2014ACBedroom.mo | 2 +- .../AirConditioning/Ren2014ACLivingroom.mo | 2 +- .../Residential/Heating/Nicol2001HeatingEU.mo | 2 +- .../Heating/Nicol2001HeatingPakistan.mo | 2 +- .../Residential/Heating/Nicol2001HeatingUK.mo | 2 +- .../Residential/Windows/Nicol2001WindowsEU.mo | 2 +- .../Windows/Nicol2001WindowsPakistan.mo | 2 +- .../Residential/Windows/Nicol2001WindowsUK.mo | 2 +- .../OBC/UnitConversions/unit_converters.py | 23 +++++-- .../BaseClasses/ExteriorBoundaryConditions.mo | 2 +- .../Detailed/BaseClasses/HeatGain.mo | 8 +-- .../InfraredRadiationGainDistribution.mo | 4 +- .../BaseClasses/MixedAirHeatMassBalance.mo | 2 +- .../BaseClasses/PartialAirHeatMassBalance.mo | 12 ++-- .../BaseClasses/PartialSurfaceInterface.mo | 2 +- .../PartialSurfaceInterfaceRadiative.mo | 2 +- .../Detailed/BaseClasses/RadiationAdapter.mo | 4 +- .../BaseClasses/RoomHeatMassBalance.mo | 16 ++--- .../BaseClasses/SkyRadiationExchange.mo | 6 +- .../ThermalZones/Detailed/BaseClasses/to_W.mo | 2 +- Buildings/ThermalZones/Detailed/CFD.mo | 8 +-- .../BaseClasses/PartialConstruction.mo | 2 +- .../Examples/Controls/ElectrochromicWindow.mo | 6 +- .../Detailed/Examples/MixedAirCO2.mo | 4 +- .../Detailed/FLEXLAB/Rooms/X3A/Closet.mo | 8 +-- .../FLEXLAB/Rooms/X3A/ClosetFullBed.mo | 8 +-- .../Detailed/FLEXLAB/Rooms/X3A/Electrical.mo | 8 +-- .../Detailed/FLEXLAB/Rooms/X3A/TestCell.mo | 8 +-- .../FLEXLAB/Rooms/X3A/TestCellFullBed.mo | 8 +-- .../Detailed/FLEXLAB/Rooms/X3B/Closet.mo | 8 +-- .../Detailed/FLEXLAB/Rooms/X3B/Electrical.mo | 8 +-- .../Detailed/FLEXLAB/Rooms/X3B/TestCell.mo | 8 +-- Buildings/ThermalZones/Detailed/MixedAir.mo | 4 +- .../Validation/BESTEST/Cases9xx/Case960.mo | 4 +- .../Validation/BaseClasses/SingleZoneFloor.mo | 2 +- .../BaseClasses/PartialVDI6007.mo | 2 +- .../RC/BaseClasses/ExteriorWall.mo | 6 +- .../RC/BaseClasses/InteriorWall.mo | 7 +- .../RC/BaseClasses/ThermSplitter.mo | 4 +- .../ReducedOrder/RC/FourElements.mo | 4 +- .../ReducedOrder/RC/OneElement.mo | 12 ++-- .../ReducedOrder/RC/ThreeElements.mo | 4 +- .../ReducedOrder/RC/TwoElements.mo | 4 +- .../BaseClasses/PartialCorrectionG.mo | 2 +- Buildings/Utilities/Comfort/Fanger.mo | 18 ++--- .../Utilities/Diagnostics/AssertEquality.mo | 2 +- .../Utilities/Diagnostics/AssertInequality.mo | 2 +- .../BaseClasses/PartialInputCheck.mo | 2 +- .../Utilities/Diagnostics/CheckEquality.mo | 4 +- Buildings/Utilities/IO/BCVTB/BCVTB.mo | 2 +- .../IO/BCVTB/BaseClasses/FluidInterface.mo | 4 +- Buildings/Utilities/IO/BCVTB/From_degC.mo | 4 +- .../Utilities/IO/BCVTB/MoistAirInterface.mo | 4 +- Buildings/Utilities/IO/BCVTB/To_degC.mo | 4 +- .../IO/Files/BaseClasses/FileWriter.mo | 6 +- Buildings/Utilities/IO/Files/CSVWriter.mo | 2 +- .../IO/Files/CombiTimeTableWriter.mo | 2 +- Buildings/Utilities/IO/Files/JSONWriter.mo | 2 +- Buildings/Utilities/IO/Files/Printer.mo | 2 +- Buildings/Utilities/IO/SignalExchange/Read.mo | 2 +- Buildings/Utilities/IO/package.mo | 2 +- Buildings/Utilities/Math/Average.mo | 2 +- Buildings/Utilities/Math/BesselJ0.mo | 2 +- Buildings/Utilities/Math/BesselJ1.mo | 2 +- Buildings/Utilities/Math/BesselY0.mo | 2 +- Buildings/Utilities/Math/BesselY1.mo | 2 +- Buildings/Utilities/Math/Bicubic.mo | 2 +- Buildings/Utilities/Math/Binomial.mo | 2 +- Buildings/Utilities/Math/Biquadratic.mo | 2 +- .../Utilities/Math/ExponentialIntegralE1.mo | 2 +- Buildings/Utilities/Math/Factorial.mo | 2 +- Buildings/Utilities/Math/FallingFactorial.mo | 2 +- .../Utilities/Math/IntegratorWithReset.mo | 8 +-- .../Utilities/Math/InverseXRegularized.mo | 2 +- Buildings/Utilities/Math/Max.mo | 2 +- Buildings/Utilities/Math/Min.mo | 2 +- Buildings/Utilities/Math/Polynominal.mo | 2 +- Buildings/Utilities/Math/PowerLinearized.mo | 2 +- Buildings/Utilities/Math/QuadraticLinear.mo | 2 +- Buildings/Utilities/Math/RegNonZeroPower.mo | 2 +- Buildings/Utilities/Math/SmoothExponential.mo | 2 +- Buildings/Utilities/Math/SmoothHeaviside.mo | 10 +-- Buildings/Utilities/Math/SmoothLimit.mo | 2 +- Buildings/Utilities/Math/SmoothMax.mo | 4 +- Buildings/Utilities/Math/SmoothMin.mo | 4 +- Buildings/Utilities/Math/Splice.mo | 14 ++-- .../Utilities/Math/TrapezoidalIntegration.mo | 2 +- Buildings/Utilities/Plotters/Configuration.mo | 2 +- .../Examples/BaseClasses/CoolingCoilValve.mo | 10 +-- .../Validation/CoolingCoilValve.mo | 8 +-- Buildings/Utilities/Plotters/Scatter.mo | 4 +- Buildings/Utilities/Plotters/TimeSeries.mo | 2 +- .../BaseClasses/HumidityRatioVaporPressure.mo | 2 +- .../Utilities/Psychrometrics/Density_pTX.mo | 6 +- Buildings/Utilities/Psychrometrics/Phi_pTX.mo | 6 +- .../Psychrometrics/SaturationPressure.mo | 4 +- .../SaturationPressureLiquid.mo | 4 +- .../Psychrometrics/SublimationPressureIce.mo | 4 +- .../Utilities/Psychrometrics/TDewPoi_pW.mo | 8 +-- .../Psychrometrics/TWetBul_TDryBulPhi.mo | 12 ++-- .../Psychrometrics/TWetBul_TDryBulXi.mo | 12 ++-- .../Utilities/Psychrometrics/ToDryAir.mo | 4 +- .../Utilities/Psychrometrics/ToTotalAir.mo | 4 +- Buildings/Utilities/Psychrometrics/X_pTphi.mo | 6 +- Buildings/Utilities/Psychrometrics/X_pW.mo | 4 +- .../Utilities/Psychrometrics/pW_TDewPoi.mo | 8 +-- Buildings/Utilities/Psychrometrics/pW_X.mo | 4 +- Buildings/Utilities/Time/CalendarTime.mo | 16 ++--- bin/verifyFiles.py | 5 +- 803 files changed, 2389 insertions(+), 2121 deletions(-) diff --git a/.travis.yml b/.travis.yml index cfe424344b7..19f37d51e51 100644 --- 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 index 9bc0393857f..2bf7a0c4b01 100644 --- 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 index 6911052f723..91dc99e2359 100644 --- a/Buildings/Airflow/Multizone/EffectiveAirLeakageArea.mo +++ b/Buildings/Airflow/Multizone/EffectiveAirLeakageArea.mo @@ -32,7 +32,7 @@ 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, @@ -40,7 +40,7 @@ equation "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 index 86f175681dc..9c8e63fd292 100644 --- 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 index be3f2d5ddcd..0b21be48409 100644 --- 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 index 2298c6563a4..858ed0cdad8 100644 --- 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 index f09dcf26465..fb75718b29f 100644 --- 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 index 25b0e6b4135..37bc298579f 100644 --- 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="

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="