Connector with one input signal of type Clock. diff --git a/Modelica/Clocked/Examples/Systems/ControlledMixingUnit.mo b/Modelica/Clocked/Examples/Systems/ControlledMixingUnit.mo index 5c388d52fa..1aa907839f 100644 --- a/Modelica/Clocked/Examples/Systems/ControlledMixingUnit.mo +++ b/Modelica/Clocked/Examples/Systems/ControlledMixingUnit.mo @@ -130,8 +130,6 @@ equation {60,-44}}, lineColor={255,0,0}), Text( extent={{12,42},{58,34}}, textColor={255,0,0}, - fillColor={0,0,255}, - fillPattern=FillPattern.Solid, textString="controller")}), experiment(StopTime=300), Documentation(info=" diff --git a/Modelica/Clocked/Examples/Systems/Utilities/ComponentsThrottleControl/Engine.mo b/Modelica/Clocked/Examples/Systems/Utilities/ComponentsThrottleControl/Engine.mo index 2b9a433a55..6e60e49a25 100644 --- a/Modelica/Clocked/Examples/Systems/Utilities/ComponentsThrottleControl/Engine.mo +++ b/Modelica/Clocked/Examples/Systems/Utilities/ComponentsThrottleControl/Engine.mo @@ -163,7 +163,5 @@ equation Text( extent={{-100,-50},{100,-90}}, textColor={0,0,255}, - fillColor={255,255,0}, - fillPattern=FillPattern.Solid, textString="%name")})); end Engine; diff --git a/Modelica/Clocked/RealSignals/Periodic/FIRbyCoefficients.mo b/Modelica/Clocked/RealSignals/Periodic/FIRbyCoefficients.mo index fcfd62b811..794618d4b7 100644 --- a/Modelica/Clocked/RealSignals/Periodic/FIRbyCoefficients.mo +++ b/Modelica/Clocked/RealSignals/Periodic/FIRbyCoefficients.mo @@ -68,11 +68,8 @@ At the first clock tick i=1 the past values are filled with u at this clock tick Text( extent={{-26,86},{88,56}}, textColor={175,175,175}, - fillColor={255,255,255}, - fillPattern=FillPattern.Backward, textString="FIR"), Text( extent={{-150,-110},{150,-150}}, - fillPattern=FillPattern.Solid, textString="a=%a")})); end FIRbyCoefficients; diff --git a/Modelica/Clocked/RealSignals/Periodic/MovingAverage.mo b/Modelica/Clocked/RealSignals/Periodic/MovingAverage.mo index 8efe4b5b31..948538beb9 100644 --- a/Modelica/Clocked/RealSignals/Periodic/MovingAverage.mo +++ b/Modelica/Clocked/RealSignals/Periodic/MovingAverage.mo @@ -75,11 +75,8 @@ contrary to a general FIR filter. Text( extent={{-26,88},{88,48}}, textColor={175,175,175}, - fillColor={255,255,255}, - fillPattern=FillPattern.Backward, textString="MA"), Text( extent={{-150,-110},{150,-150}}, - fillPattern=FillPattern.Solid, textString="n=%n")})); end MovingAverage; diff --git a/Modelica/ComplexBlocks/ComplexMath/ComplexToReal.mo b/Modelica/ComplexBlocks/ComplexMath/ComplexToReal.mo index 5a8df50c98..7f84891f76 100644 --- a/Modelica/ComplexBlocks/ComplexMath/ComplexToReal.mo +++ b/Modelica/ComplexBlocks/ComplexMath/ComplexToReal.mo @@ -28,8 +28,6 @@ equation fillPattern=FillPattern.Solid),Text( extent={{-100,60},{-20,-60}}, textColor={85,170,255}, - fillColor={85,170,255}, - fillPattern=FillPattern.Solid, textString="C")}), Documentation(info="
Converts the Complex input u to the Real outputs re (real part) and im (imaginary part).
")); diff --git a/Modelica/Electrical/Analog/Examples/OpAmps/OpAmpCircuits/Buffer.mo b/Modelica/Electrical/Analog/Examples/OpAmps/OpAmpCircuits/Buffer.mo index 18695d0582..e7664b1ed1 100644 --- a/Modelica/Electrical/Analog/Examples/OpAmps/OpAmpCircuits/Buffer.mo +++ b/Modelica/Electrical/Analog/Examples/OpAmps/OpAmpCircuits/Buffer.mo @@ -48,7 +48,5 @@ equation Text( extent={{-100,10},{100,-10}}, textColor={0,0,255}, - fillColor={255,255,255}, - fillPattern=FillPattern.None, textString="non-inverting")})); end Buffer; diff --git a/Modelica/Electrical/Machines/Sensors/SinCosResolver.mo b/Modelica/Electrical/Machines/Sensors/SinCosResolver.mo index e910004d91..1355ed28be 100644 --- a/Modelica/Electrical/Machines/Sensors/SinCosResolver.mo +++ b/Modelica/Electrical/Machines/Sensors/SinCosResolver.mo @@ -25,7 +25,6 @@ equation Text( extent={{-150,120},{150,80}}, textColor={0,0,255}, - fillColor={255,255,255}, textString="%name"), Ellipse(extent={{-20,20},{20,-20}}, lineColor={95,95,95}, fillColor={255,255,255}, diff --git a/Modelica/Electrical/Polyphase/Examples/PolyphaseRectifier.mo b/Modelica/Electrical/Polyphase/Examples/PolyphaseRectifier.mo index 7b901470c6..bfb3e2925b 100644 --- a/Modelica/Electrical/Polyphase/Examples/PolyphaseRectifier.mo +++ b/Modelica/Electrical/Polyphase/Examples/PolyphaseRectifier.mo @@ -172,14 +172,10 @@ as well as DC values per subsystem (rectifier) and total (load): radius=5), Text( extent={{-24,10},{36,-10}}, textColor={0,0,0}, - fillColor={215,215,215}, - fillPattern=FillPattern.None, textString="rectifiers[mSystems]"), Text( extent={{-58,10},{58,-10}}, textColor={0,0,0}, - fillColor={215,215,215}, - fillPattern=FillPattern.Solid, origin={50,0}, rotation=90, textString="connected in series / in parallel"), diff --git a/Modelica/Magnetic/FundamentalWave/Examples/BasicMachines/InductionMachines/ComparisonPolyphase/IMC_DOL_CommonLeakage.mo b/Modelica/Magnetic/FundamentalWave/Examples/BasicMachines/InductionMachines/ComparisonPolyphase/IMC_DOL_CommonLeakage.mo index e366887c7b..3f9a69972b 100644 --- a/Modelica/Magnetic/FundamentalWave/Examples/BasicMachines/InductionMachines/ComparisonPolyphase/IMC_DOL_CommonLeakage.mo +++ b/Modelica/Magnetic/FundamentalWave/Examples/BasicMachines/InductionMachines/ComparisonPolyphase/IMC_DOL_CommonLeakage.mo @@ -270,21 +270,15 @@ Only when fed by switching power electronics, parameterratioCommonLeakage
"),
Diagram(graphics={ Text(
extent={{10,80},{90,72}},
- fillColor={255,255,170},
- fillPattern=FillPattern.Solid,
textStyle={TextStyle.Bold},
textString="ratioCommonLeakage=0",
textColor={0,0,0}), Text(
extent={{10,22},{90,14}},
- fillColor={255,255,170},
- fillPattern=FillPattern.Solid,
textStyle={TextStyle.Bold},
textColor={0,0,0},
textString="ratioCommonLeakage=0.5"),
Text(
extent={{10,-38},{90,-46}},
- fillColor={255,255,170},
- fillPattern=FillPattern.Solid,
textStyle={TextStyle.Bold},
textColor={0,0,0},
textString="ratioCommonLeakage=1")}));
diff --git a/Modelica/Magnetic/FundamentalWave/Examples/BasicMachines/InductionMachines/ComparisonPolyphase/IMC_DOL_Polyphase.mo b/Modelica/Magnetic/FundamentalWave/Examples/BasicMachines/InductionMachines/ComparisonPolyphase/IMC_DOL_Polyphase.mo
index 1dcf1dc9fb..7c269b5fa7 100644
--- a/Modelica/Magnetic/FundamentalWave/Examples/BasicMachines/InductionMachines/ComparisonPolyphase/IMC_DOL_Polyphase.mo
+++ b/Modelica/Magnetic/FundamentalWave/Examples/BasicMachines/InductionMachines/ComparisonPolyphase/IMC_DOL_Polyphase.mo
@@ -256,13 +256,9 @@ Simulate for 1.5 seconds and plot (versus time):
-100},{100,100}}),
graphics={ Text(
extent={{20,88},{100,80}},
- fillColor={255,255,170},
- fillPattern=FillPattern.Solid,
textString="%m-phase machine",
textStyle={TextStyle.Bold}),Text(
extent={{20,-22},{100,-30}},
- fillColor={255,255,170},
- fillPattern=FillPattern.Solid,
textString="Three-phase machine",
textStyle={TextStyle.Bold})}));
end IMC_DOL_Polyphase;
diff --git a/Modelica/Magnetic/FundamentalWave/Examples/BasicMachines/InductionMachines/ComparisonPolyphase/IMS_Start_Polyphase.mo b/Modelica/Magnetic/FundamentalWave/Examples/BasicMachines/InductionMachines/ComparisonPolyphase/IMS_Start_Polyphase.mo
index 3819349a18..fe8d00a5a6 100644
--- a/Modelica/Magnetic/FundamentalWave/Examples/BasicMachines/InductionMachines/ComparisonPolyphase/IMS_Start_Polyphase.mo
+++ b/Modelica/Magnetic/FundamentalWave/Examples/BasicMachines/InductionMachines/ComparisonPolyphase/IMS_Start_Polyphase.mo
@@ -288,13 +288,9 @@ Simulate for 1.5 seconds and plot (versus time):
-100},{100,100}}),
graphics={ Text(
extent={{40,68},{100,60}},
- fillColor={255,255,170},
- fillPattern=FillPattern.Solid,
textString="%m-phase machine",
textStyle={TextStyle.Bold}),Text(
extent={{40,-32},{100,-40}},
- fillColor={255,255,170},
- fillPattern=FillPattern.Solid,
textString="Three-phase machine",
textStyle={TextStyle.Bold})}));
end IMS_Start_Polyphase;
diff --git a/Modelica/Magnetic/FundamentalWave/Examples/BasicMachines/SynchronousMachines/ComparisonPolyphase/SMEE_Generator_Polyphase.mo b/Modelica/Magnetic/FundamentalWave/Examples/BasicMachines/SynchronousMachines/ComparisonPolyphase/SMEE_Generator_Polyphase.mo
index 248d050eb0..7c7df35591 100644
--- a/Modelica/Magnetic/FundamentalWave/Examples/BasicMachines/SynchronousMachines/ComparisonPolyphase/SMEE_Generator_Polyphase.mo
+++ b/Modelica/Magnetic/FundamentalWave/Examples/BasicMachines/SynchronousMachines/ComparisonPolyphase/SMEE_Generator_Polyphase.mo
@@ -356,14 +356,10 @@ Simulate for 30 seconds and plot (versus rotorAngleM3.rotorDisplacementAng
fillPattern=FillPattern.Solid,
pattern=LinePattern.Dash),Text(
extent={{10,16},{70,8}},
- fillColor={255,255,170},
- fillPattern=FillPattern.Solid,
textStyle={TextStyle.Bold},
textString="%m-phase machine
"), Text(
extent={{10,-52},{70,-60}},
- fillColor={255,255,170},
- fillPattern=FillPattern.Solid,
textStyle={TextStyle.Bold},
textString="Three-phase machine
"), Rectangle(
diff --git a/Modelica/Magnetic/FundamentalWave/Examples/BasicMachines/SynchronousMachines/ComparisonPolyphase/SMPM_Inverter_Polyphase.mo b/Modelica/Magnetic/FundamentalWave/Examples/BasicMachines/SynchronousMachines/ComparisonPolyphase/SMPM_Inverter_Polyphase.mo
index e448e8e795..8a9dae3289 100644
--- a/Modelica/Magnetic/FundamentalWave/Examples/BasicMachines/SynchronousMachines/ComparisonPolyphase/SMPM_Inverter_Polyphase.mo
+++ b/Modelica/Magnetic/FundamentalWave/Examples/BasicMachines/SynchronousMachines/ComparisonPolyphase/SMPM_Inverter_Polyphase.mo
@@ -300,14 +300,10 @@ and accelerate the inertias. Two equivalent machines with different numbers of p
fillPattern=FillPattern.Solid,
pattern=LinePattern.Dash),Text(
extent={{40,-54},{100,-62}},
- fillColor={255,255,170},
- fillPattern=FillPattern.Solid,
textStyle={TextStyle.Bold},
textString="Three-phase machine
"), Text(
extent={{40,-44},{100,-52}},
- fillColor={255,255,170},
- fillPattern=FillPattern.Solid,
textStyle={TextStyle.Bold},
textString="%m-phase machine
")}));
diff --git a/Modelica/Magnetic/FundamentalWave/Examples/BasicMachines/SynchronousMachines/ComparisonPolyphase/SMR_Inverter_Polyphase.mo b/Modelica/Magnetic/FundamentalWave/Examples/BasicMachines/SynchronousMachines/ComparisonPolyphase/SMR_Inverter_Polyphase.mo
index 132b089b56..e5cfbfe053 100644
--- a/Modelica/Magnetic/FundamentalWave/Examples/BasicMachines/SynchronousMachines/ComparisonPolyphase/SMR_Inverter_Polyphase.mo
+++ b/Modelica/Magnetic/FundamentalWave/Examples/BasicMachines/SynchronousMachines/ComparisonPolyphase/SMR_Inverter_Polyphase.mo
@@ -275,14 +275,10 @@ Simulate for 1.5 seconds and plot (versus time):
fillPattern=FillPattern.Solid,
pattern=LinePattern.Dash),Text(
extent={{40,-44},{100,-52}},
- fillColor={255,255,170},
- fillPattern=FillPattern.Solid,
textStyle={TextStyle.Bold},
textString="%m-phase machine
"), Text(
extent={{40,-54},{100,-62}},
- fillColor={255,255,170},
- fillPattern=FillPattern.Solid,
textStyle={TextStyle.Bold},
textString="Three-phase machine
"), Rectangle(
diff --git a/Modelica/Magnetic/QuasiStatic/FluxTubes/Basic/ElectroMagneticConverter.mo b/Modelica/Magnetic/QuasiStatic/FluxTubes/Basic/ElectroMagneticConverter.mo
index 5be3608641..7a76aae9f6 100644
--- a/Modelica/Magnetic/QuasiStatic/FluxTubes/Basic/ElectroMagneticConverter.mo
+++ b/Modelica/Magnetic/QuasiStatic/FluxTubes/Basic/ElectroMagneticConverter.mo
@@ -76,7 +76,6 @@ equation
Text(
extent={{-150,150},{150,110}},
textString="%name",
- pattern=LinePattern.None,
textColor={0,0,255}),
Line(
points={{-15,-7},{-14,-1},{-7,7},{7,7},{14,-1},{15,-7}},
diff --git a/Modelica/Magnetic/QuasiStatic/FluxTubes/Examples/FixedShapes/CuboidSections.mo b/Modelica/Magnetic/QuasiStatic/FluxTubes/Examples/FixedShapes/CuboidSections.mo
index 024c54679d..d371af841a 100644
--- a/Modelica/Magnetic/QuasiStatic/FluxTubes/Examples/FixedShapes/CuboidSections.mo
+++ b/Modelica/Magnetic/QuasiStatic/FluxTubes/Examples/FixedShapes/CuboidSections.mo
@@ -86,7 +86,6 @@ equation
annotation (Diagram(coordinateSystem(preserveAspectRatio=false), graphics={Text(
extent={{-100,100},{100,80}},
textColor={0,0,255},
- pattern=LinePattern.Dash,
textString="Added short and idle model for testing purposes only")}),
Documentation(info="
This model investigates a magnetic circuit consisting of four different cuboid sections. The circuit is operated at 50Hz and variable magnetic potential difference.
diff --git a/Modelica/Magnetic/QuasiStatic/FluxTubes/Interfaces/AbsoluteSensor.mo b/Modelica/Magnetic/QuasiStatic/FluxTubes/Interfaces/AbsoluteSensor.mo
index 0e70d217d0..c4ce8cc998 100644
--- a/Modelica/Magnetic/QuasiStatic/FluxTubes/Interfaces/AbsoluteSensor.mo
+++ b/Modelica/Magnetic/QuasiStatic/FluxTubes/Interfaces/AbsoluteSensor.mo
@@ -11,9 +11,6 @@ equation
Text(
extent={{-150,120},{150,80}},
textColor={0,0,255},
- pattern=LinePattern.None,
- fillColor={170,85,255},
- fillPattern=FillPattern.Solid,
textString="%name")}), Documentation(info="
The absolute sensor partial model provides a single
diff --git a/Modelica/Magnetic/QuasiStatic/FluxTubes/Interfaces/NegativeMagneticPort.mo b/Modelica/Magnetic/QuasiStatic/FluxTubes/Interfaces/NegativeMagneticPort.mo
index a1c71d5114..c9eee8fc96 100644
--- a/Modelica/Magnetic/QuasiStatic/FluxTubes/Interfaces/NegativeMagneticPort.mo
+++ b/Modelica/Magnetic/QuasiStatic/FluxTubes/Interfaces/NegativeMagneticPort.mo
@@ -9,8 +9,6 @@ connector NegativeMagneticPort "Negative quasi-static magnetic port"
graphics={Text(
extent={{-100,100},{100,60}},
textColor={255,170,85},
- fillColor={0,0,255},
- fillPattern=FillPattern.Solid,
textString="%name"), Rectangle(
extent={{-40,40},{40,-40}},
lineColor={255,170,85},
diff --git a/Modelica/Magnetic/QuasiStatic/FluxTubes/Interfaces/PositiveMagneticPort.mo b/Modelica/Magnetic/QuasiStatic/FluxTubes/Interfaces/PositiveMagneticPort.mo
index 33ce701ee6..7031109450 100644
--- a/Modelica/Magnetic/QuasiStatic/FluxTubes/Interfaces/PositiveMagneticPort.mo
+++ b/Modelica/Magnetic/QuasiStatic/FluxTubes/Interfaces/PositiveMagneticPort.mo
@@ -9,8 +9,6 @@ connector PositiveMagneticPort "Positive quasi-static magnetic port"
graphics={Text(
extent={{-100,100},{100,60}},
textColor={255,170,85},
- fillColor={0,0,255},
- fillPattern=FillPattern.Solid,
textString="%name"), Rectangle(
extent={{-40,40},{40,-40}},
lineColor={255,170,85},
diff --git a/Modelica/Magnetic/QuasiStatic/FluxTubes/Interfaces/RelativeSensor.mo b/Modelica/Magnetic/QuasiStatic/FluxTubes/Interfaces/RelativeSensor.mo
index 05a9b06c6c..0356999432 100644
--- a/Modelica/Magnetic/QuasiStatic/FluxTubes/Interfaces/RelativeSensor.mo
+++ b/Modelica/Magnetic/QuasiStatic/FluxTubes/Interfaces/RelativeSensor.mo
@@ -15,9 +15,6 @@ partial model RelativeSensor "Partial magnetic voltage or flux sensor"
Text(
extent={{-150,120},{150,80}},
textColor={0,0,255},
- pattern=LinePattern.None,
- fillColor={170,85,255},
- fillPattern=FillPattern.Solid,
textString="%name"),
Line(
points={{0,-70},{0,-100}}, color={85,170,255})}),
diff --git a/Modelica/Magnetic/QuasiStatic/FluxTubes/Sensors/Transient/Permeability.mo b/Modelica/Magnetic/QuasiStatic/FluxTubes/Sensors/Transient/Permeability.mo
index 6729c43416..214134a76f 100644
--- a/Modelica/Magnetic/QuasiStatic/FluxTubes/Sensors/Transient/Permeability.mo
+++ b/Modelica/Magnetic/QuasiStatic/FluxTubes/Sensors/Transient/Permeability.mo
@@ -38,8 +38,6 @@ equation
fillColor={255,255,255},
fillPattern=FillPattern.Solid), Text(
extent={{60,-60},{-60,60}},
- fillColor={255,170,85},
- fillPattern=FillPattern.Solid,
textString="μ")}),
Documentation(info="
This model determines the absolute and relative permeability from two real inputs:
diff --git a/Modelica/Magnetic/QuasiStatic/FluxTubes/package.mo b/Modelica/Magnetic/QuasiStatic/FluxTubes/package.mo
index ac98361fdc..4dcf7db31e 100644
--- a/Modelica/Magnetic/QuasiStatic/FluxTubes/package.mo
+++ b/Modelica/Magnetic/QuasiStatic/FluxTubes/package.mo
@@ -11,8 +11,7 @@ package FluxTubes "Library for modelling of quasi-static electromagnetic devices
This library is intended to provide models for the investigation of
quasi-static electromagnetic devices with lumped magnetic networks.
-"),
- Icon(coordinateSystem(preserveAspectRatio=false), graphics={
+"), Icon(coordinateSystem(preserveAspectRatio=false), graphics={
Polygon(
origin={-3.75,0.0},
fillColor={255,170,85},
diff --git a/Modelica/Magnetic/QuasiStatic/FundamentalWave/Examples/BasicMachines/InductionMachines/IMC_Conveyor.mo b/Modelica/Magnetic/QuasiStatic/FundamentalWave/Examples/BasicMachines/InductionMachines/IMC_Conveyor.mo
index f50654c4d3..dec33d7be9 100644
--- a/Modelica/Magnetic/QuasiStatic/FundamentalWave/Examples/BasicMachines/InductionMachines/IMC_Conveyor.mo
+++ b/Modelica/Magnetic/QuasiStatic/FundamentalWave/Examples/BasicMachines/InductionMachines/IMC_Conveyor.mo
@@ -214,8 +214,6 @@ The mechanical load is a constant torque like a conveyor (with regularization ar
textString="%m phase quasi-static"),
Text(
extent={{20,-40},{100,-48}},
- fillColor={255,255,170},
- fillPattern=FillPattern.Solid,
textStyle={TextStyle.Bold},
textString="%m phase transient")}));
end IMC_Conveyor;
diff --git a/Modelica/Magnetic/QuasiStatic/FundamentalWave/Examples/BasicMachines/InductionMachines/IMC_Initialize.mo b/Modelica/Magnetic/QuasiStatic/FundamentalWave/Examples/BasicMachines/InductionMachines/IMC_Initialize.mo
index 883e6cfba1..8e978c76db 100644
--- a/Modelica/Magnetic/QuasiStatic/FundamentalWave/Examples/BasicMachines/InductionMachines/IMC_Initialize.mo
+++ b/Modelica/Magnetic/QuasiStatic/FundamentalWave/Examples/BasicMachines/InductionMachines/IMC_Initialize.mo
@@ -189,8 +189,6 @@ Default machine parameters of model IM_SquirrelCage are used.
textString="%m phase quasi-static"),
Text(
extent={{20,-92},{100,-100}},
- fillColor={255,255,170},
- fillPattern=FillPattern.Solid,
textStyle={TextStyle.Bold},
textString="%m phase transient")}));
end IMC_Initialize;
diff --git a/Modelica/Magnetic/QuasiStatic/FundamentalWave/Examples/BasicMachines/InductionMachines/IMC_Transformer.mo b/Modelica/Magnetic/QuasiStatic/FundamentalWave/Examples/BasicMachines/InductionMachines/IMC_Transformer.mo
index 5a8a441e46..18f0e5683c 100644
--- a/Modelica/Magnetic/QuasiStatic/FundamentalWave/Examples/BasicMachines/InductionMachines/IMC_Transformer.mo
+++ b/Modelica/Magnetic/QuasiStatic/FundamentalWave/Examples/BasicMachines/InductionMachines/IMC_Transformer.mo
@@ -267,8 +267,6 @@ Simulate for 2.5 seconds and plot (versus time):
textString="%m phase quasi-static"),
Text(
extent={{80,-92},{160,-100}},
- fillColor={255,255,170},
- fillPattern=FillPattern.Solid,
textStyle={TextStyle.Bold},
textString="%m phase transient")}));
end IMC_Transformer;
diff --git a/Modelica/Magnetic/QuasiStatic/FundamentalWave/Examples/BasicMachines/InductionMachines/IMC_YD.mo b/Modelica/Magnetic/QuasiStatic/FundamentalWave/Examples/BasicMachines/InductionMachines/IMC_YD.mo
index fc1e097c02..2e90affd64 100644
--- a/Modelica/Magnetic/QuasiStatic/FundamentalWave/Examples/BasicMachines/InductionMachines/IMC_YD.mo
+++ b/Modelica/Magnetic/QuasiStatic/FundamentalWave/Examples/BasicMachines/InductionMachines/IMC_YD.mo
@@ -196,8 +196,6 @@ Default machine parameters are used.
textStyle={TextStyle.Bold},
textString="%m phase quasi-static"), Text(
extent={{-60,-80},{20,-88}},
- fillColor={255,255,170},
- fillPattern=FillPattern.Solid,
textStyle={TextStyle.Bold},
textString="%m phase transient")}));
end IMC_YD;
diff --git a/Modelica/Magnetic/QuasiStatic/FundamentalWave/Examples/BasicMachines/InductionMachines/IMS_Characteristics.mo b/Modelica/Magnetic/QuasiStatic/FundamentalWave/Examples/BasicMachines/InductionMachines/IMS_Characteristics.mo
index 2def1aea8e..2e94767d18 100644
--- a/Modelica/Magnetic/QuasiStatic/FundamentalWave/Examples/BasicMachines/InductionMachines/IMS_Characteristics.mo
+++ b/Modelica/Magnetic/QuasiStatic/FundamentalWave/Examples/BasicMachines/InductionMachines/IMS_Characteristics.mo
@@ -149,8 +149,6 @@ Simulate for 1 second and plot (versus imsQS.wMechanical or s
-100},{100,100}}),
graphics={ Text(
extent={{20,8},{100,0}},
- fillColor={255,255,170},
- fillPattern=FillPattern.Solid,
textStyle={TextStyle.Bold},
textString="%m phase quasi-static")}));
end IMS_Characteristics;
diff --git a/Modelica/Magnetic/QuasiStatic/FundamentalWave/Examples/BasicMachines/SynchronousMachines/SMPM_CurrentSource.mo b/Modelica/Magnetic/QuasiStatic/FundamentalWave/Examples/BasicMachines/SynchronousMachines/SMPM_CurrentSource.mo
index 1a06880722..1d2becbeef 100644
--- a/Modelica/Magnetic/QuasiStatic/FundamentalWave/Examples/BasicMachines/SynchronousMachines/SMPM_CurrentSource.mo
+++ b/Modelica/Magnetic/QuasiStatic/FundamentalWave/Examples/BasicMachines/SynchronousMachines/SMPM_CurrentSource.mo
@@ -330,8 +330,6 @@ to numerically stabilize the simulation.
textStyle={TextStyle.Bold},
textString="%m phase quasi-static"), Text(
extent={{30,-52},{110,-60}},
- fillColor={255,255,170},
- fillPattern=FillPattern.Solid,
textStyle={TextStyle.Bold},
textString="%m phase transient")}));
end SMPM_CurrentSource;
diff --git a/Modelica/Magnetic/QuasiStatic/FundamentalWave/Examples/BasicMachines/SynchronousMachines/SMPM_Mains.mo b/Modelica/Magnetic/QuasiStatic/FundamentalWave/Examples/BasicMachines/SynchronousMachines/SMPM_Mains.mo
index bdb7a933a7..eebb27ba46 100644
--- a/Modelica/Magnetic/QuasiStatic/FundamentalWave/Examples/BasicMachines/SynchronousMachines/SMPM_Mains.mo
+++ b/Modelica/Magnetic/QuasiStatic/FundamentalWave/Examples/BasicMachines/SynchronousMachines/SMPM_Mains.mo
@@ -245,8 +245,6 @@ equation
textStyle={TextStyle.Bold},
textString="%m phase quasi-static"), Text(
extent={{20,-92},{100,-100}},
- fillColor={255,255,170},
- fillPattern=FillPattern.Solid,
textStyle={TextStyle.Bold},
textString="%m phase transient")}),
Documentation(info="
diff --git a/Modelica/Magnetic/QuasiStatic/FundamentalWave/Examples/BasicMachines/SynchronousMachines/SMPM_OpenCircuit.mo b/Modelica/Magnetic/QuasiStatic/FundamentalWave/Examples/BasicMachines/SynchronousMachines/SMPM_OpenCircuit.mo
index 6cd073a4cd..d03b967d05 100644
--- a/Modelica/Magnetic/QuasiStatic/FundamentalWave/Examples/BasicMachines/SynchronousMachines/SMPM_OpenCircuit.mo
+++ b/Modelica/Magnetic/QuasiStatic/FundamentalWave/Examples/BasicMachines/SynchronousMachines/SMPM_OpenCircuit.mo
@@ -162,8 +162,6 @@ Simulate for 0.1 second and plot (versus time):
textStyle={TextStyle.Bold},
textString="%m phase quasi-static"), Text(
extent={{-100,-92},{-20,-100}},
- fillColor={255,255,170},
- fillPattern=FillPattern.Solid,
textStyle={TextStyle.Bold},
textString="%m phase transient")}));
end SMPM_OpenCircuit;
diff --git a/Modelica/Magnetic/QuasiStatic/FundamentalWave/Examples/BasicMachines/SynchronousMachines/SMR_CurrentSource.mo b/Modelica/Magnetic/QuasiStatic/FundamentalWave/Examples/BasicMachines/SynchronousMachines/SMR_CurrentSource.mo
index 47aaab9e37..7f39621d49 100644
--- a/Modelica/Magnetic/QuasiStatic/FundamentalWave/Examples/BasicMachines/SynchronousMachines/SMR_CurrentSource.mo
+++ b/Modelica/Magnetic/QuasiStatic/FundamentalWave/Examples/BasicMachines/SynchronousMachines/SMR_CurrentSource.mo
@@ -205,8 +205,8 @@ model SMR_CurrentSource
origin={0,60})));
Modelica.Electrical.QuasiStatic.Polyphase.Sensors.VoltageQuasiRMSSensor voltageQuasiRMSSensorQS(m=m)
annotation (Placement(transformation(extent={{-40,60},{-20,40}})));
- Modelica.Electrical.QuasiStatic.Polyphase.Basic.Star starMQS(m=m) annotation
- (Placement(transformation(
+ Modelica.Electrical.QuasiStatic.Polyphase.Basic.Star starMQS(m=m) annotation (
+ Placement(transformation(
extent={{-10,10},{10,-10}},
rotation=270,
origin={-50,40})));
@@ -346,8 +346,6 @@ Simulate for 2 seconds and plot (versus time):
textStyle={TextStyle.Bold},
textString="%m phase quasi-static"), Text(
extent={{30,-52},{110,-60}},
- fillColor={255,255,170},
- fillPattern=FillPattern.Solid,
textStyle={TextStyle.Bold},
textString="%m phase transient")}));
end SMR_CurrentSource;
diff --git a/Modelica/Mechanics/MultiBody/Visualizers/Rectangle.mo b/Modelica/Mechanics/MultiBody/Visualizers/Rectangle.mo
index 96e76a2111..0aac20c5bc 100644
--- a/Modelica/Mechanics/MultiBody/Visualizers/Rectangle.mo
+++ b/Modelica/Mechanics/MultiBody/Visualizers/Rectangle.mo
@@ -38,7 +38,8 @@ protected
final r_0=frame_a.r_0,
final nu=nu,
final nv=nv,
- redeclare function surfaceCharacteristic = Advanced.SurfaceCharacteristics.rectangle (
+ redeclare function surfaceCharacteristic =
+ Advanced.SurfaceCharacteristics.rectangle (
lu=length_u, lv=length_v)) if world.enableAnimation and animation
annotation (Placement(transformation(extent={{-20,-10},{0,10}})));
Modelica.Mechanics.MultiBody.Forces.Internal.ZeroForceAndTorque zeroForceAndTorque annotation (Placement(transformation(extent={{-80,-10},{-60,10}})));
@@ -67,9 +68,6 @@ equation
Line(points={{-100,0},{0,0},{0,-20}}, color={95,95,95}),
Text(
extent={{-140,-60},{140,-90}},
- lineThickness=0.5,
- fillColor={95,95,95},
- fillPattern=FillPattern.Solid,
textString="%length_u x %length_v")}),
Documentation(info="
diff --git a/Modelica/Mechanics/MultiBody/package.mo b/Modelica/Mechanics/MultiBody/package.mo
index bcb21b0624..0c8c3acace 100644
--- a/Modelica/Mechanics/MultiBody/package.mo
+++ b/Modelica/Mechanics/MultiBody/package.mo
@@ -145,8 +145,8 @@ model World
annotation (Dialog(tab="Defaults"));
replaceable function gravityAcceleration =
- Modelica.Mechanics.MultiBody.Forces.Internal.standardGravityAcceleration (
- gravityType=gravityType, g=g*Modelica.Math.Vectors.normalizeWithAssert(n), mu=mu)
+ Modelica.Mechanics.MultiBody.Forces.Internal.standardGravityAcceleration
+ ( gravityType=gravityType, g=g*Modelica.Math.Vectors.normalizeWithAssert(n), mu=mu)
constrainedby Modelica.Mechanics.MultiBody.Interfaces.partialGravityAcceleration
"Function to compute the gravity acceleration, resolved in world frame"
annotation(choicesAllMatching=true,Dialog(enable=gravityType==
@@ -335,7 +335,8 @@ protected
final nu=2,
final nv=2,
redeclare function surfaceCharacteristic =
- Modelica.Mechanics.MultiBody.Visualizers.Advanced.SurfaceCharacteristics.rectangle(
+ Modelica.Mechanics.MultiBody.Visualizers.Advanced.SurfaceCharacteristics.rectangle
+ (
lu=groundLength_u, lv=groundLength_v)) if
enableAnimation and animateGround and gravityType == GravityTypes.UniformGravity;
equation
diff --git a/Modelica/Mechanics/Translational/Components/Mass.mo b/Modelica/Mechanics/Translational/Components/Mass.mo
index 68d6ec2e7e..dcf44282a2 100644
--- a/Modelica/Mechanics/Translational/Components/Mass.mo
+++ b/Modelica/Mechanics/Translational/Components/Mass.mo
@@ -42,13 +42,9 @@ A negative force at flange flange_a moves the sliding mass to the negative direc
Text(
extent={{-150,85},{150,45}},
textString="%name",
- textColor={0,0,255},
- fillColor={110,210,110},
- fillPattern=FillPattern.Solid),
+ textColor={0,0,255}),
Text(
extent={{-150,-45},{150,-75}},
textString="m=%m",
- fillColor={110,221,110},
- fillPattern=FillPattern.Solid,
fontSize=0)}));
end Mass;
diff --git a/Modelica/Mechanics/Translational/Examples/Friction.mo b/Modelica/Mechanics/Translational/Examples/Friction.mo
index a668347f1d..bdaccee503 100644
--- a/Modelica/Mechanics/Translational/Examples/Friction.mo
+++ b/Modelica/Mechanics/Translational/Examples/Friction.mo
@@ -67,10 +67,10 @@ equation
{100,100}}), graphics={Text(
extent={{-100,80},{-80,60}},
textString="1)",
- lineColor={0,0,255}),Text(
+ textColor={0,0,255}),Text(
extent={{-100,20},{-80,0}},
textString="2)",
- lineColor={0,0,255}),Text(
+ textColor={0,0,255}),Text(
extent={{-100,-40},{-80,-60}},
textColor={0,0,255},
textString="3)")}),
diff --git a/Modelica/Mechanics/Translational/Examples/SignConvention.mo b/Modelica/Mechanics/Translational/Examples/SignConvention.mo
index 58e1024298..e5609710b7 100644
--- a/Modelica/Mechanics/Translational/Examples/SignConvention.mo
+++ b/Modelica/Mechanics/Translational/Examples/SignConvention.mo
@@ -80,12 +80,12 @@ the two other examples).
{100,100}}),graphics={Text(
extent={{-100,80},{-82,60}},
textString="1)",
- lineColor={0,0,255}),Text(
+ textColor={0,0,255}),Text(
extent={{-100,40},{-82,20}},
textString="2)",
- lineColor={0,0,255}),Text(
+ textColor={0,0,255}),Text(
extent={{-100,-20},{-82,-40}},
textString="3)",
- lineColor={0,0,255})}),
+ textColor={0,0,255})}),
experiment(StopTime=1.0, Interval=0.001));
end SignConvention;
diff --git a/Modelica/Units.mo b/Modelica/Units.mo
index e718d8624e..2ec746e642 100644
--- a/Modelica/Units.mo
+++ b/Modelica/Units.mo
@@ -1187,8 +1187,6 @@ which is only valid in the rotor-fixed coordinate system.
annotation (Icon(graphics={Text(
extent={{-80,80},{80,-78}},
textColor={128,128,128},
- fillColor={128,128,128},
- fillPattern=FillPattern.None,
fontName="serif",
textString="SI",
textStyle={TextStyle.Italic})}),