diff --git a/Complex.mo b/Complex.mo index 877e323c42..b1a0dcd8dc 100644 --- a/Complex.mo +++ b/Complex.mo @@ -23,7 +23,9 @@ operator record Complex "Complex number with overloaded operators" fillColor={248,248,248}, fillPattern=FillPattern.HorizontalCylinder, extent={{-100,-100},{100,100}}, - radius=25.0), Rectangle( + radius=25.0, + pattern=LinePattern.None), + Rectangle( lineColor={128,128,128}, extent={{-100,-100},{100,100}}, radius=25.0)})); @@ -71,7 +73,8 @@ operator record Complex "Complex number with overloaded operators" fillColor={248,248,248}, fillPattern=FillPattern.HorizontalCylinder, extent={{-100,-100},{100,100}}, - radius=25.0), + radius=25.0, + pattern=LinePattern.None), Rectangle( lineColor={128,128,128}, extent={{-100,-100},{100,100}}, @@ -128,7 +131,8 @@ operator record Complex "Complex number with overloaded operators" fillColor={248,248,248}, fillPattern=FillPattern.HorizontalCylinder, extent={{-100,-100},{100,100}}, - radius=25.0), + radius=25.0, + pattern=LinePattern.None), Rectangle( lineColor={128,128,128}, extent={{-100,-100},{100,100}}, diff --git a/Modelica/Electrical/Analog/Basic/RotationalEMF.mo b/Modelica/Electrical/Analog/Basic/RotationalEMF.mo index 1b77a1df8e..80921c36f5 100644 --- a/Modelica/Electrical/Analog/Basic/RotationalEMF.mo +++ b/Modelica/Electrical/Analog/Basic/RotationalEMF.mo @@ -56,11 +56,13 @@ equation Rectangle( extent={{-85,10},{-36,-10}}, fillPattern=FillPattern.HorizontalCylinder, - fillColor={192,192,192}), + fillColor={192,192,192}, + pattern=LinePattern.None), Rectangle( extent={{35,10},{100,-10}}, fillPattern=FillPattern.HorizontalCylinder, - fillColor={192,192,192}), + fillColor={192,192,192}, + pattern=LinePattern.None), Ellipse( extent={{-40,40},{40,-40}}, fillColor={255,255,255}, diff --git a/Modelica/Electrical/Analog/Basic/TranslationalEMF.mo b/Modelica/Electrical/Analog/Basic/TranslationalEMF.mo index 14ca003d16..8176352fb6 100644 --- a/Modelica/Electrical/Analog/Basic/TranslationalEMF.mo +++ b/Modelica/Electrical/Analog/Basic/TranslationalEMF.mo @@ -58,7 +58,8 @@ equation Rectangle( extent={{-90,51},{-40,-50}}, fillColor={135,135,135}, - fillPattern=FillPattern.HorizontalCylinder), + fillPattern=FillPattern.HorizontalCylinder, + pattern=LinePattern.None), Rectangle( extent={{-21,20},{90,-20}}, lineColor={135,135,135}, diff --git a/Modelica/Electrical/Batteries/BatteryStacks/package.mo b/Modelica/Electrical/Batteries/BatteryStacks/package.mo index 0f6cefa2b5..68b950a01f 100644 --- a/Modelica/Electrical/Batteries/BatteryStacks/package.mo +++ b/Modelica/Electrical/Batteries/BatteryStacks/package.mo @@ -10,10 +10,12 @@ package BatteryStacks "Battery stacks built from cells" fillColor={215,215,215}, fillPattern=FillPattern.HorizontalCylinder, origin={0,73}, - rotation=90), + rotation=90, + pattern=LinePattern.None), Rectangle(extent={{-70,50},{70,-50}}, lineColor={95,95,95}, fillColor={215,215,215}, fillPattern=FillPattern.HorizontalCylinder, origin={0,-10}, - rotation=90)})); + rotation=90, + pattern=LinePattern.None)})); end BatteryStacks; diff --git a/Modelica/Electrical/Batteries/BatteryStacksWithSensors/package.mo b/Modelica/Electrical/Batteries/BatteryStacksWithSensors/package.mo index 65acf6161f..20541adabe 100644 --- a/Modelica/Electrical/Batteries/BatteryStacksWithSensors/package.mo +++ b/Modelica/Electrical/Batteries/BatteryStacksWithSensors/package.mo @@ -10,12 +10,14 @@ package BatteryStacksWithSensors "Battery cells and stacks with sensors" fillColor={215,215,215}, fillPattern=FillPattern.HorizontalCylinder, origin={0,73}, - rotation=90), + rotation=90, + pattern=LinePattern.None), Rectangle(extent={{-70,50},{70,-50}}, lineColor={95,95,95}, fillColor={215,215,215}, fillPattern=FillPattern.HorizontalCylinder, origin={0,-10}, - rotation=90), + rotation=90, + pattern=LinePattern.None), Polygon( points={{-40,25},{40,25},{50,15},{40,-20},{30,-25},{-30,-25},{-40,-20},{-50,15}}, fillColor={255,204,51}, diff --git a/Modelica/Electrical/Batteries/package.mo b/Modelica/Electrical/Batteries/package.mo index 3665c6b767..832a0bf60e 100644 --- a/Modelica/Electrical/Batteries/package.mo +++ b/Modelica/Electrical/Batteries/package.mo @@ -12,7 +12,8 @@ package Batteries "Simple battery models" fillColor={215,215,215}, fillPattern=FillPattern.HorizontalCylinder, origin={0,-10}, - rotation=90), + rotation=90, + pattern=LinePattern.None), Ellipse(extent={{-10,50},{10,-50}},lineColor={95,95,95}, fillColor={215,215,215}, fillPattern=FillPattern.Sphere, @@ -27,7 +28,8 @@ package Batteries "Simple battery models" fillColor={215,215,215}, fillPattern=FillPattern.HorizontalCylinder, origin={0,73}, - rotation=90), + rotation=90, + pattern=LinePattern.None), Ellipse(extent={{-4,20},{4,-20}}, lineColor={95,95,95}, fillColor={215,215,215}, fillPattern=FillPattern.Sphere, diff --git a/Modelica/Electrical/Machines/BasicMachines/Components/PartialAirGap.mo b/Modelica/Electrical/Machines/BasicMachines/Components/PartialAirGap.mo index 4f445d9653..d1478e7f80 100644 --- a/Modelica/Electrical/Machines/BasicMachines/Components/PartialAirGap.mo +++ b/Modelica/Electrical/Machines/BasicMachines/Components/PartialAirGap.mo @@ -86,7 +86,8 @@ equation Rectangle( extent={{-10,90},{10,-80}}, fillPattern=FillPattern.VerticalCylinder, - fillColor={128,128,128}), + fillColor={128,128,128}, + pattern=LinePattern.None), Text( extent={{-150,-110},{150,-150}}, textColor={0,0,255}, diff --git a/Modelica/Electrical/Machines/BasicMachines/Components/PartialAirGapDC.mo b/Modelica/Electrical/Machines/BasicMachines/Components/PartialAirGapDC.mo index 80b761583f..a1e89ad879 100644 --- a/Modelica/Electrical/Machines/BasicMachines/Components/PartialAirGapDC.mo +++ b/Modelica/Electrical/Machines/BasicMachines/Components/PartialAirGapDC.mo @@ -56,7 +56,8 @@ equation fillPattern=FillPattern.Solid),Rectangle( extent={{-10,90},{10,-80}}, fillPattern=FillPattern.VerticalCylinder, - fillColor={128,128,128}),Text( + fillColor={128,128,128}, + pattern=LinePattern.None), Text( extent={{0,40},{80,-40}}, textString="E"),Text( extent={{-150,-160},{150,-120}}, diff --git a/Modelica/Electrical/Machines/BasicMachines/Transformers/package.mo b/Modelica/Electrical/Machines/BasicMachines/Transformers/package.mo index b0f447394e..76c78684c7 100644 --- a/Modelica/Electrical/Machines/BasicMachines/Transformers/package.mo +++ b/Modelica/Electrical/Machines/BasicMachines/Transformers/package.mo @@ -76,30 +76,35 @@ even though the source's and/or load's starpoint are grounded; you may use a rea origin={10,10}, fillColor={135,135,135}, fillPattern=FillPattern.VerticalCylinder, - points={{-80,50},{-60,30},{-60,-50},{-80,-70},{-80,50}}), + points={{-80,50},{-60,30},{-60,-50},{-80,-70},{-80,50}}, + pattern=LinePattern.None), Polygon( origin={10,10}, fillColor={135,135,135}, fillPattern=FillPattern.VerticalCylinder, - points={{60,50},{40,30},{40,-50},{60,-70},{60,50}}), + points={{60,50},{40,30},{40,-50},{60,-70},{60,50}}, + pattern=LinePattern.None), Polygon( origin={10,10}, fillColor={135,135,135}, fillPattern=FillPattern.VerticalCylinder, points={{-10,40},{-20,30},{-20,-50},{-10,-60},{0,-50},{0,30},{-10, - 40}}), + 40}}, + pattern=LinePattern.None), Polygon( origin={10,10}, fillColor={135,135,135}, fillPattern=FillPattern.VerticalCylinder, points={{-80,50},{60,50},{40,30},{0,30},{-10,40},{-20,30},{-60,30}, - {-80,50}}), + {-80,50}}, + pattern=LinePattern.None), Polygon( origin={10,10}, fillColor={135,135,135}, fillPattern=FillPattern.VerticalCylinder, points={{-80,-70},{60,-70},{40,-50},{0,-50},{-10,-60},{-20,-50},{ - -60,-50},{-80,-70}}), + -60,-50},{-80,-70}}, + pattern=LinePattern.None), Rectangle( origin={10,10}, lineColor={0,0,0}, diff --git a/Modelica/Electrical/Machines/BasicMachines/package.mo b/Modelica/Electrical/Machines/BasicMachines/package.mo index c37aa70b23..4ca2852607 100644 --- a/Modelica/Electrical/Machines/BasicMachines/package.mo +++ b/Modelica/Electrical/Machines/BasicMachines/package.mo @@ -61,17 +61,20 @@ The induction machine models use package SpacePhasors. origin={2.835,10}, fillColor={0,128,255}, fillPattern=FillPattern.HorizontalCylinder, - extent={{-60,-60},{60,60}}), + extent={{-60,-60},{60,60}}, + pattern=LinePattern.None), Rectangle( origin={2.835,10}, fillColor={128,128,128}, fillPattern=FillPattern.HorizontalCylinder, - extent={{-80,-60},{-60,60}}), + extent={{-80,-60},{-60,60}}, + pattern=LinePattern.None), Rectangle( origin={2.835,10}, fillColor={95,95,95}, fillPattern=FillPattern.HorizontalCylinder, - extent={{60,-10},{80,10}}), + extent={{60,-10},{80,10}}, + pattern=LinePattern.None), Rectangle( origin={2.835,10}, lineColor={95,95,95}, diff --git a/Modelica/Electrical/Machines/Icons/Drive.mo b/Modelica/Electrical/Machines/Icons/Drive.mo index ac73e2619a..69f6232922 100644 --- a/Modelica/Electrical/Machines/Icons/Drive.mo +++ b/Modelica/Electrical/Machines/Icons/Drive.mo @@ -5,15 +5,18 @@ partial model Drive "Generic icon of an electric drive" Rectangle( extent={{-40,60},{80,-60}}, fillPattern=FillPattern.HorizontalCylinder, - fillColor={215,215,215}), + fillColor={215,215,215}, + pattern=LinePattern.None), Rectangle( extent={{-40,60},{-60,-60}}, fillPattern=FillPattern.HorizontalCylinder, - fillColor={128,128,128}), + fillColor={128,128,128}, + pattern=LinePattern.None), Rectangle( extent={{80,10},{100,-10}}, fillPattern=FillPattern.HorizontalCylinder, - fillColor={95,95,95}), + fillColor={95,95,95}, + pattern=LinePattern.None), Rectangle( extent={{-40,100},{40,50}}, lineColor={95,95,95}, diff --git a/Modelica/Electrical/Machines/Icons/FundamentalWaveMachine.mo b/Modelica/Electrical/Machines/Icons/FundamentalWaveMachine.mo index ac0fcbbb8a..2e926ea9a2 100644 --- a/Modelica/Electrical/Machines/Icons/FundamentalWaveMachine.mo +++ b/Modelica/Electrical/Machines/Icons/FundamentalWaveMachine.mo @@ -4,15 +4,18 @@ partial model FundamentalWaveMachine Rectangle( extent={{-40,60},{80,-60}}, fillPattern=FillPattern.HorizontalCylinder, - fillColor={255,128,0}), + fillColor={255,128,0}, + pattern=LinePattern.None), Rectangle( extent={{-40,60},{-60,-60}}, fillPattern=FillPattern.HorizontalCylinder, - fillColor={128,128,128}), + fillColor={128,128,128}, + pattern=LinePattern.None), Rectangle( extent={{80,10},{100,-10}}, fillPattern=FillPattern.HorizontalCylinder, - fillColor={95,95,95}), + fillColor={95,95,95}, + pattern=LinePattern.None), Rectangle( extent={{-40,70},{40,50}}, lineColor={95,95,95}, diff --git a/Modelica/Electrical/Machines/Icons/Machine.mo b/Modelica/Electrical/Machines/Icons/Machine.mo index dc8d5fb353..0dc1e9a332 100644 --- a/Modelica/Electrical/Machines/Icons/Machine.mo +++ b/Modelica/Electrical/Machines/Icons/Machine.mo @@ -5,15 +5,18 @@ partial model Machine "Generic icon of an electric machine" Rectangle( extent={{-40,60},{80,-60}}, fillPattern=FillPattern.HorizontalCylinder, - fillColor={215,215,215}), + fillColor={215,215,215}, + pattern=LinePattern.None), Rectangle( extent={{-40,60},{-60,-60}}, fillPattern=FillPattern.HorizontalCylinder, - fillColor={128,128,128}), + fillColor={128,128,128}, + pattern=LinePattern.None), Rectangle( extent={{80,10},{100,-10}}, fillPattern=FillPattern.HorizontalCylinder, - fillColor={95,95,95}), + fillColor={95,95,95}, + pattern=LinePattern.None), Rectangle( extent={{-40,70},{40,50}}, lineColor={95,95,95}, diff --git a/Modelica/Electrical/Machines/Icons/QuasiStaticFundamentalWaveMachine.mo b/Modelica/Electrical/Machines/Icons/QuasiStaticFundamentalWaveMachine.mo index 3da640a76b..c8ab6c0ebf 100644 --- a/Modelica/Electrical/Machines/Icons/QuasiStaticFundamentalWaveMachine.mo +++ b/Modelica/Electrical/Machines/Icons/QuasiStaticFundamentalWaveMachine.mo @@ -6,15 +6,18 @@ partial model QuasiStaticFundamentalWaveMachine Rectangle( extent={{-40,60},{80,-60}}, fillPattern=FillPattern.HorizontalCylinder, - fillColor={255,206,120}), + fillColor={255,206,120}, + pattern=LinePattern.None), Rectangle( extent={{-40,60},{-60,-60}}, fillPattern=FillPattern.HorizontalCylinder, - fillColor={128,128,128}), + fillColor={128,128,128}, + pattern=LinePattern.None), Rectangle( extent={{80,10},{100,-10}}, fillPattern=FillPattern.HorizontalCylinder, - fillColor={95,95,95}), + fillColor={95,95,95}, + pattern=LinePattern.None), Rectangle( extent={{-40,70},{40,50}}, lineColor={95,95,95}, diff --git a/Modelica/Electrical/Machines/Icons/QuasiStaticMachine.mo b/Modelica/Electrical/Machines/Icons/QuasiStaticMachine.mo index 637f70a901..f1d9bb2966 100644 --- a/Modelica/Electrical/Machines/Icons/QuasiStaticMachine.mo +++ b/Modelica/Electrical/Machines/Icons/QuasiStaticMachine.mo @@ -3,13 +3,16 @@ partial model QuasiStaticMachine annotation (Icon(graphics={Rectangle( extent={{-40,60},{80,-60}}, fillPattern=FillPattern.HorizontalCylinder, - fillColor={170,213,255}),Rectangle( + fillColor={170,213,255}, + pattern=LinePattern.None), Rectangle( extent={{-40,60},{-60,-60}}, fillPattern=FillPattern.HorizontalCylinder, - fillColor={128,128,128}),Rectangle( + fillColor={128,128,128}, + pattern=LinePattern.None), Rectangle( extent={{80,10},{100,-10}}, fillPattern=FillPattern.HorizontalCylinder, - fillColor={95,95,95}),Rectangle( + fillColor={95,95,95}, + pattern=LinePattern.None),Rectangle( extent={{-40,70},{40,50}}, lineColor={95,95,95}, fillColor={95,95,95}, diff --git a/Modelica/Electrical/Machines/Icons/QuasiStaticTransformer.mo b/Modelica/Electrical/Machines/Icons/QuasiStaticTransformer.mo index 950b82511e..53c6584443 100644 --- a/Modelica/Electrical/Machines/Icons/QuasiStaticTransformer.mo +++ b/Modelica/Electrical/Machines/Icons/QuasiStaticTransformer.mo @@ -3,26 +3,31 @@ partial model QuasiStaticTransformer annotation (Icon(graphics={Polygon( points={{-70,60},{-50,40},{-50,-40},{-70,-60},{-70,60}}, fillColor={135,135,135}, - fillPattern=FillPattern.VerticalCylinder), + fillPattern=FillPattern.VerticalCylinder, + pattern=LinePattern.None), Polygon( points={{70,60},{50,40},{50,-40},{70,-60},{70,60}}, fillColor={135,135,135}, - fillPattern=FillPattern.VerticalCylinder), + fillPattern=FillPattern.VerticalCylinder, + pattern=LinePattern.None), Polygon( points={{0,50},{-10,40},{-10,-40},{0,-50},{10,-40},{10,40},{0, 50}}, fillPattern=FillPattern.VerticalCylinder, - fillColor={135,135,135}), + fillColor={135,135,135}, + pattern=LinePattern.None), Polygon( points={{-70,60},{70,60},{50,40},{10,40},{0,50},{-10,40},{-50, 40},{-70,60}}, fillPattern=FillPattern.VerticalCylinder, - fillColor={135,135,135}), + fillColor={135,135,135}, + pattern=LinePattern.None), Polygon( points={{-70,-60},{70,-60},{50,-40},{10,-40},{0,-50},{-10,-40}, {-50,-40},{-70,-60}}, fillPattern=FillPattern.VerticalCylinder, - fillColor={135,135,135}), + fillColor={135,135,135}, + pattern=LinePattern.None), Rectangle( extent={{-78,36},{-42,-36}}, lineColor={0,0,0}, diff --git a/Modelica/Electrical/Machines/Icons/TransientMachine.mo b/Modelica/Electrical/Machines/Icons/TransientMachine.mo index c0853f3b3d..a666ee2059 100644 --- a/Modelica/Electrical/Machines/Icons/TransientMachine.mo +++ b/Modelica/Electrical/Machines/Icons/TransientMachine.mo @@ -4,15 +4,18 @@ partial model TransientMachine Rectangle( extent={{-40,60},{80,-60}}, fillPattern=FillPattern.HorizontalCylinder, - fillColor={0,128,255}), + fillColor={0,128,255}, + pattern=LinePattern.None), Rectangle( extent={{-40,60},{-60,-60}}, fillPattern=FillPattern.HorizontalCylinder, - fillColor={128,128,128}), + fillColor={128,128,128}, + pattern=LinePattern.None), Rectangle( extent={{80,10},{100,-10}}, fillPattern=FillPattern.HorizontalCylinder, - fillColor={95,95,95}), + fillColor={95,95,95}, + pattern=LinePattern.None), Rectangle( extent={{-40,70},{40,50}}, lineColor={95,95,95}, diff --git a/Modelica/Electrical/Machines/Icons/TransientTransformer.mo b/Modelica/Electrical/Machines/Icons/TransientTransformer.mo index a968b14cd3..77c24885c6 100644 --- a/Modelica/Electrical/Machines/Icons/TransientTransformer.mo +++ b/Modelica/Electrical/Machines/Icons/TransientTransformer.mo @@ -3,26 +3,31 @@ model TransientTransformer annotation (Icon(graphics={Polygon( points={{-70,60},{-50,40},{-50,-40},{-70,-60},{-70,60}}, fillColor={135,135,135}, - fillPattern=FillPattern.VerticalCylinder), + fillPattern=FillPattern.VerticalCylinder, + pattern=LinePattern.None), Polygon( points={{70,60},{50,40},{50,-40},{70,-60},{70,60}}, fillColor={135,135,135}, - fillPattern=FillPattern.VerticalCylinder), + fillPattern=FillPattern.VerticalCylinder, + pattern=LinePattern.None), Polygon( points={{0,50},{-10,40},{-10,-40},{0,-50},{10,-40},{10,40},{0, 50}}, fillPattern=FillPattern.VerticalCylinder, - fillColor={135,135,135}), + fillColor={135,135,135}, + pattern=LinePattern.None), Polygon( points={{-70,60},{70,60},{50,40},{10,40},{0,50},{-10,40},{-50, 40},{-70,60}}, fillPattern=FillPattern.VerticalCylinder, - fillColor={135,135,135}), + fillColor={135,135,135}, + pattern=LinePattern.None), Polygon( points={{-70,-60},{70,-60},{50,-40},{10,-40},{0,-50},{-10,-40}, {-50,-40},{-70,-60}}, fillPattern=FillPattern.VerticalCylinder, - fillColor={135,135,135}), + fillColor={135,135,135}, + pattern=LinePattern.None), Rectangle( extent={{-78,36},{-42,-36}}, lineColor={0,0,0}, diff --git a/Modelica/Electrical/Machines/Utilities/Coupling.mo b/Modelica/Electrical/Machines/Utilities/Coupling.mo index 05bdfbbbb3..b3a52a847f 100644 --- a/Modelica/Electrical/Machines/Utilities/Coupling.mo +++ b/Modelica/Electrical/Machines/Utilities/Coupling.mo @@ -16,7 +16,8 @@ equation lineColor={64,64,64}, fillColor={192,192,192}, fillPattern=FillPattern.HorizontalCylinder, - extent={{-100,-10},{100,10}}), + extent={{-100,-10},{100,10}}, + pattern=LinePattern.None), Text(textColor={0,0,255}, extent={{-150,80},{150,120}}, textString="%name"), @@ -24,7 +25,8 @@ equation lineColor={64,64,64}, fillColor={192,192,192}, fillPattern=FillPattern.HorizontalCylinder, - extent={{-30,-60},{30,60}}), + extent={{-30,-60},{30,60}}, + pattern=LinePattern.None), Rectangle( extent={{-10,42},{10,38}}, lineColor={0,0,0}, diff --git a/Modelica/Electrical/Machines/package.mo b/Modelica/Electrical/Machines/package.mo index 3c085e5557..8a636f564b 100644 --- a/Modelica/Electrical/Machines/package.mo +++ b/Modelica/Electrical/Machines/package.mo @@ -16,17 +16,20 @@ Copyright © 1998-2025, Modelica Association and contributors origin={2.835,10}, fillColor={0,128,255}, fillPattern=FillPattern.HorizontalCylinder, - extent={{-60,-60},{60,60}}), + extent={{-60,-60},{60,60}}, + pattern=LinePattern.None), Rectangle( origin={2.835,10}, fillColor={128,128,128}, fillPattern=FillPattern.HorizontalCylinder, - extent={{-80,-60},{-60,60}}), + extent={{-80,-60},{-60,60}}, + pattern=LinePattern.None), Rectangle( origin={2.835,10}, fillColor={95,95,95}, fillPattern=FillPattern.HorizontalCylinder, - extent={{60,-10},{80,10}}), + extent={{60,-10},{80,10}}, + pattern=LinePattern.None), Rectangle( origin={2.835,10}, lineColor={95,95,95}, diff --git a/Modelica/Electrical/QuasiStatic/Machines/BasicMachines/Transformers/package.mo b/Modelica/Electrical/QuasiStatic/Machines/BasicMachines/Transformers/package.mo index b304ff1bb0..8ac93adf2a 100644 --- a/Modelica/Electrical/QuasiStatic/Machines/BasicMachines/Transformers/package.mo +++ b/Modelica/Electrical/QuasiStatic/Machines/BasicMachines/Transformers/package.mo @@ -77,30 +77,35 @@ even though the source's and/or load's starpoint are grounded; you may use a rea origin={10,10}, fillColor={135,135,135}, fillPattern=FillPattern.VerticalCylinder, - points={{-80,50},{-60,30},{-60,-50},{-80,-70},{-80,50}}), + points={{-80,50},{-60,30},{-60,-50},{-80,-70},{-80,50}}, + pattern=LinePattern.None), Polygon( origin={10,10}, fillColor={135,135,135}, fillPattern=FillPattern.VerticalCylinder, - points={{60,50},{40,30},{40,-50},{60,-70},{60,50}}), + points={{60,50},{40,30},{40,-50},{60,-70},{60,50}}, + pattern=LinePattern.None), Polygon( origin={10,10}, fillColor={135,135,135}, fillPattern=FillPattern.VerticalCylinder, points={{-10,40},{-20,30},{-20,-50},{-10,-60},{0,-50},{0,30},{-10, - 40}}), + 40}}, + pattern=LinePattern.None), Polygon( origin={10,10}, fillColor={135,135,135}, fillPattern=FillPattern.VerticalCylinder, points={{-80,50},{60,50},{40,30},{0,30},{-10,40},{-20,30},{-60,30}, - {-80,50}}), + {-80,50}}, + pattern=LinePattern.None), Polygon( origin={10,10}, fillColor={135,135,135}, fillPattern=FillPattern.VerticalCylinder, points={{-80,-70},{60,-70},{40,-50},{0,-50},{-10,-60},{-20,-50},{ - -60,-50},{-80,-70}}), + -60,-50},{-80,-70}}, + pattern=LinePattern.None), Rectangle( origin={10,10}, lineColor={0,0,0}, diff --git a/Modelica/Electrical/QuasiStatic/Machines/BasicMachines/package.mo b/Modelica/Electrical/QuasiStatic/Machines/BasicMachines/package.mo index 962c3a6e5b..3aa809f3f4 100644 --- a/Modelica/Electrical/QuasiStatic/Machines/BasicMachines/package.mo +++ b/Modelica/Electrical/QuasiStatic/Machines/BasicMachines/package.mo @@ -6,17 +6,20 @@ package BasicMachines "Basic machine models" origin={0,14.817}, fillColor={170,213,255}, fillPattern=FillPattern.HorizontalCylinder, - extent={{-54.179,-59.817},{65.821,60.183}}), + extent={{-54.179,-59.817},{65.821,60.183}}, + pattern=LinePattern.None), Rectangle( origin={5.821,15}, fillColor={128,128,128}, fillPattern=FillPattern.HorizontalCylinder, - extent={{-80,-60},{-60,60}}), + extent={{-80,-60},{-60,60}}, + pattern=LinePattern.None), Rectangle( origin={5.821,15}, fillColor={95,95,95}, fillPattern=FillPattern.HorizontalCylinder, - extent={{60,-10},{80,10}}), + extent={{60,-10},{80,10}}, + pattern=LinePattern.None), Rectangle( origin={5.821,15}, lineColor={95,95,95}, diff --git a/Modelica/Electrical/QuasiStatic/Machines/package.mo b/Modelica/Electrical/QuasiStatic/Machines/package.mo index 628dc2a535..a1fbfe3c30 100644 --- a/Modelica/Electrical/QuasiStatic/Machines/package.mo +++ b/Modelica/Electrical/QuasiStatic/Machines/package.mo @@ -6,17 +6,20 @@ package Machines "Quasi-static machine models" origin={0,14.817}, fillColor={170,213,255}, fillPattern=FillPattern.HorizontalCylinder, - extent={{-54.179,-59.817},{65.821,60.183}}), + extent={{-54.179,-59.817},{65.821,60.183}}, + pattern=LinePattern.None), Rectangle( origin={5.821,15}, fillColor={128,128,128}, fillPattern=FillPattern.HorizontalCylinder, - extent={{-80,-60},{-60,60}}), + extent={{-80,-60},{-60,60}}, + pattern=LinePattern.None), Rectangle( origin={5.821,15}, fillColor={95,95,95}, fillPattern=FillPattern.HorizontalCylinder, - extent={{60,-10},{80,10}}), + extent={{60,-10},{80,10}}, + pattern=LinePattern.None), Rectangle( origin={5.821,15}, lineColor={95,95,95}, diff --git a/Modelica/Electrical/QuasiStatic/SinglePhase/Ideal/IdealTransformer.mo b/Modelica/Electrical/QuasiStatic/SinglePhase/Ideal/IdealTransformer.mo index 28e2b0bddc..f1dd7c4c8a 100644 --- a/Modelica/Electrical/QuasiStatic/SinglePhase/Ideal/IdealTransformer.mo +++ b/Modelica/Electrical/QuasiStatic/SinglePhase/Ideal/IdealTransformer.mo @@ -102,7 +102,8 @@ equation Polygon( points={{120,53},{110,50},{120,47},{120,53}}, fillPattern=FillPattern.HorizontalCylinder, - fillColor={160,160,164}), + fillColor={160,160,164}, + pattern=LinePattern.None), Line(points={{111,50},{136,50}})}), Icon(coordinateSystem(preserveAspectRatio=false, extent={{-100,-100},{ 100,100}}), graphics={ diff --git a/Modelica/Fluid/Examples/AST_BatchPlant.mo b/Modelica/Fluid/Examples/AST_BatchPlant.mo index 47a4b73ead..98be9f9baa 100644 --- a/Modelica/Fluid/Examples/AST_BatchPlant.mo +++ b/Modelica/Fluid/Examples/AST_BatchPlant.mo @@ -886,7 +886,8 @@ Documentation for this example can be found on the + fillColor={0,127,255}, + pattern=LinePattern.None)}), + Documentation(info="

Base class for one dimensional flow models. It specializes a PartialTwoPort with a parameter interface and icon graphics.

diff --git a/Modelica/Fluid/Sources.mo b/Modelica/Fluid/Sources.mo index 553055db43..bfea40b255 100644 --- a/Modelica/Fluid/Sources.mo +++ b/Modelica/Fluid/Sources.mo @@ -497,7 +497,8 @@ with exception of boundary pressure, do not have an effect. Rectangle( extent={{35,45},{100,-45}}, fillPattern=FillPattern.HorizontalCylinder, - fillColor={0,127,255}), + fillColor={0,127,255}, + pattern=LinePattern.None), Ellipse( extent={{-100,80},{60,-80}}, lineColor={0,0,255}, @@ -644,7 +645,8 @@ with exception of boundary flow rate, do not have an effect. Rectangle( extent={{36,45},{100,-45}}, fillPattern=FillPattern.HorizontalCylinder, - fillColor={0,127,255}), + fillColor={0,127,255}, + pattern=LinePattern.None), Ellipse( extent={{-100,80},{60,-80}}, lineColor={0,0,255}, diff --git a/Modelica/Fluid/Vessels.mo b/Modelica/Fluid/Vessels.mo index 0f7d127793..118f01e540 100644 --- a/Modelica/Fluid/Vessels.mo +++ b/Modelica/Fluid/Vessels.mo @@ -125,7 +125,8 @@ initial equation extent=DynamicSelect({{-100,-100},{100,10}}, {{-100,-100},{100,(-100 + 200*level/height)}}), fillColor={85,170,255}, - fillPattern=FillPattern.VerticalCylinder), + fillPattern=FillPattern.VerticalCylinder, + pattern=LinePattern.None), Line(points={{-100,100},{-100,-100},{100,-100},{100,100}}), Text( extent={{-95,60},{95,40}}, diff --git a/Modelica/Icons.mo b/Modelica/Icons.mo index d63282f47a..2284088f1b 100644 --- a/Modelica/Icons.mo +++ b/Modelica/Icons.mo @@ -145,7 +145,8 @@ package Icons "Library of icons" fillColor={248,248,248}, fillPattern=FillPattern.HorizontalCylinder, extent={{-100.0,-100.0},{100.0,100.0}}, - radius=25.0), + radius=25.0, + pattern=LinePattern.None), Rectangle( lineColor={128,128,128}, extent={{-100.0,-100.0},{100.0,100.0}}, @@ -350,7 +351,8 @@ package Icons "Library of icons" fillColor={255,255,255}, fillPattern=FillPattern.HorizontalCylinder, extent={{-100,-100},{100,100}}, - radius=25), + radius=25, + pattern=LinePattern.None), Rectangle( lineColor={215,215,215}, extent={{-100,-100},{100,100}}, diff --git a/Modelica/Magnetic/FluxTubes/Examples/Hysteresis/Components/Transformer1PhaseWithHysteresis.mo b/Modelica/Magnetic/FluxTubes/Examples/Hysteresis/Components/Transformer1PhaseWithHysteresis.mo index a36f6fa8a8..3ec5a204c0 100644 --- a/Modelica/Magnetic/FluxTubes/Examples/Hysteresis/Components/Transformer1PhaseWithHysteresis.mo +++ b/Modelica/Magnetic/FluxTubes/Examples/Hysteresis/Components/Transformer1PhaseWithHysteresis.mo @@ -184,11 +184,13 @@ equation Polygon( points={{50,60},{30,40},{30,-40},{50,-60},{50,60}}, fillColor={255,128,0}, - fillPattern=FillPattern.VerticalCylinder), + fillPattern=FillPattern.VerticalCylinder, + pattern=LinePattern.None), Polygon( points={{-50,60},{-30,40},{-30,-40},{-50,-60},{-50,60}}, fillColor={255,128,0}, - fillPattern=FillPattern.VerticalCylinder), + fillPattern=FillPattern.VerticalCylinder, + pattern=LinePattern.None), Rectangle( extent={{-68,36},{-12,-36}}, lineColor={0,0,0}, @@ -210,13 +212,15 @@ equation fillColor={255,128,0}, fillPattern=FillPattern.VerticalCylinder, origin={10,-50}, - rotation=90), + rotation=90, + pattern=LinePattern.None), Polygon( points={{-10,20},{-30,0},{-30,-60},{-10,-80},{-10,-44.0625},{-10,20}}, fillColor={255,128,0}, fillPattern=FillPattern.VerticalCylinder, origin={-30,70}, - rotation=90), + rotation=90, + pattern=LinePattern.None), Line(points={{-100,90},{-100,36},{-68,36}}, color={0,0,255}), Line(points={{-100,-90},{-100,-36},{-68,-36}}, color={0,0,255}), Line(points={{100,-90},{100,-20},{60,-20}}, color={0,0,255}), diff --git a/Modelica/Magnetic/FluxTubes/Examples/Hysteresis/Components/Transformer3PhaseYyWithHysteresis.mo b/Modelica/Magnetic/FluxTubes/Examples/Hysteresis/Components/Transformer3PhaseYyWithHysteresis.mo index 2c66db83c8..146de17ab1 100644 --- a/Modelica/Magnetic/FluxTubes/Examples/Hysteresis/Components/Transformer3PhaseYyWithHysteresis.mo +++ b/Modelica/Magnetic/FluxTubes/Examples/Hysteresis/Components/Transformer3PhaseYyWithHysteresis.mo @@ -346,11 +346,13 @@ equation Polygon( points={{70,60},{50,40},{50,-40},{70,-60},{70,60}}, fillColor={255,128,0}, - fillPattern=FillPattern.VerticalCylinder), + fillPattern=FillPattern.VerticalCylinder, + pattern=LinePattern.None), Polygon( points={{-70,60},{-50,40},{-50,-40},{-70,-60},{-70,60}}, fillColor={255,128,0}, - fillPattern=FillPattern.VerticalCylinder), + fillPattern=FillPattern.VerticalCylinder, + pattern=LinePattern.None), Rectangle( extent={{-74,36},{-46,-36}}, lineColor={0,0,0}, @@ -366,29 +368,34 @@ equation fillColor={255,128,0}, fillPattern=FillPattern.VerticalCylinder, origin={-60,-40}, - rotation=90), + rotation=90, + pattern=LinePattern.None), Polygon( points={{-10,40},{0,50},{10,40},{10,-40},{0,-50},{-10,-40},{-10,40}}, fillColor={255,128,0}, - fillPattern=FillPattern.VerticalCylinder), + fillPattern=FillPattern.VerticalCylinder, + pattern=LinePattern.None), Polygon( points={{-20,-10},{0,10},{0,50},{-10,60},{-20,60},{-20,-10}}, fillColor={255,128,0}, fillPattern=FillPattern.VerticalCylinder, origin={60,-40}, - rotation=90), + rotation=90, + pattern=LinePattern.None), Polygon( points={{20,10},{0,-10},{0,-50},{10,-60},{20,-60},{20,10}}, fillColor={255,128,0}, fillPattern=FillPattern.VerticalCylinder, origin={-60,40}, - rotation=90), + rotation=90, + pattern=LinePattern.None), Polygon( points={{20,-10},{0,10},{0,50},{10,60},{20,60},{20,-10}}, fillColor={255,128,0}, fillPattern=FillPattern.VerticalCylinder, origin={60,40}, - rotation=90), + rotation=90, + pattern=LinePattern.None), Rectangle( extent={{-80,26},{-40,-26}}, lineColor={0,0,0}, diff --git a/Modelica/Magnetic/FluxTubes/Examples/Utilities/TranslatoryArmatureAndStopper.mo b/Modelica/Magnetic/FluxTubes/Examples/Utilities/TranslatoryArmatureAndStopper.mo index ac67aa59f9..cf26b63f1c 100644 --- a/Modelica/Magnetic/FluxTubes/Examples/Utilities/TranslatoryArmatureAndStopper.mo +++ b/Modelica/Magnetic/FluxTubes/Examples/Utilities/TranslatoryArmatureAndStopper.mo @@ -91,7 +91,8 @@ equation Rectangle( extent={{-90,10},{90,-10}}, fillPattern=FillPattern.HorizontalCylinder, - fillColor={255,127,0}), + fillColor={255,127,0}, + pattern=LinePattern.None), Text( extent={{-120,140},{120,100}}, textColor={0,0,255}, @@ -99,7 +100,8 @@ equation Rectangle( extent={{-50,60},{50,-60}}, fillPattern=FillPattern.HorizontalCylinder, - fillColor={255,127,0}), + fillColor={255,127,0}, + pattern=LinePattern.None), Rectangle( extent={{-80,-20},{-88,-80}}, lineColor={255,128,0}, diff --git a/Modelica/Magnetic/FundamentalWave/package.mo b/Modelica/Magnetic/FundamentalWave/package.mo index 75fa2dcd78..c4846dfc8d 100644 --- a/Modelica/Magnetic/FundamentalWave/package.mo +++ b/Modelica/Magnetic/FundamentalWave/package.mo @@ -15,7 +15,8 @@ Copyright © 2009-2025, Modelica Association and contributors Rectangle( extent={{-40,60},{-60,-60}}, fillPattern=FillPattern.HorizontalCylinder, - fillColor={128,128,128}), + fillColor={128,128,128}, + pattern=LinePattern.None), Rectangle( extent={{-40,70},{40,50}}, lineColor={95,95,95}, @@ -24,11 +25,13 @@ Copyright © 2009-2025, Modelica Association and contributors Rectangle( extent={{-40,60},{80,-60}}, fillPattern=FillPattern.HorizontalCylinder, - fillColor={255,128,0}), + fillColor={255,128,0}, + pattern=LinePattern.None), Rectangle( extent={{80,10},{100,-10}}, fillPattern=FillPattern.HorizontalCylinder, - fillColor={95,95,95}), + fillColor={95,95,95}, + pattern=LinePattern.None), Polygon( points={{-50,-90},{-40,-90},{-10,-20},{40,-20},{70,-90},{80,-90}, {80,-100},{-50,-100},{-50,-90}}, diff --git a/Modelica/Magnetic/QuasiStatic/FundamentalWave/package.mo b/Modelica/Magnetic/QuasiStatic/FundamentalWave/package.mo index 6d4cb59039..369ccc7cff 100644 --- a/Modelica/Magnetic/QuasiStatic/FundamentalWave/package.mo +++ b/Modelica/Magnetic/QuasiStatic/FundamentalWave/package.mo @@ -11,7 +11,8 @@ Copyright © 2013-2025, Modelica Association and contributors Rectangle( extent={{-40,60},{-60,-60}}, fillPattern=FillPattern.HorizontalCylinder, - fillColor={128,128,128}), + fillColor={128,128,128}, + pattern=LinePattern.None), Rectangle( extent={{-40,70},{40,50}}, lineColor={95,95,95}, @@ -20,11 +21,13 @@ Copyright © 2013-2025, Modelica Association and contributors Rectangle( extent={{-40,60},{80,-60}}, fillPattern=FillPattern.HorizontalCylinder, - fillColor={255,206,120}), + fillColor={255,206,120}, + pattern=LinePattern.None), Rectangle( extent={{80,10},{100,-10}}, fillPattern=FillPattern.HorizontalCylinder, - fillColor={95,95,95}), + fillColor={95,95,95}, + pattern=LinePattern.None), Polygon( points={{-50,-90},{-40,-90},{-10,-20},{40,-20},{70,-90},{80,-90}, {80,-100},{-50,-100},{-50,-90}}, diff --git a/Modelica/Mechanics/MultiBody/Examples/Loops/Utilities/Cylinder.mo b/Modelica/Mechanics/MultiBody/Examples/Loops/Utilities/Cylinder.mo index 38007de5a8..d10f084a0d 100644 --- a/Modelica/Mechanics/MultiBody/Examples/Loops/Utilities/Cylinder.mo +++ b/Modelica/Mechanics/MultiBody/Examples/Loops/Utilities/Cylinder.mo @@ -215,7 +215,8 @@ equation Rectangle( extent={{-58,53},{58,-23}}, fillPattern=FillPattern.VerticalCylinder, - fillColor={192,192,192}), + fillColor={192,192,192}, + pattern=LinePattern.None), Rectangle( extent={{-60,45},{60,39}}, fillPattern=FillPattern.Solid), diff --git a/Modelica/Mechanics/MultiBody/Examples/Loops/Utilities/CylinderBase.mo b/Modelica/Mechanics/MultiBody/Examples/Loops/Utilities/CylinderBase.mo index 74fbf12aec..d86c248161 100644 --- a/Modelica/Mechanics/MultiBody/Examples/Loops/Utilities/CylinderBase.mo +++ b/Modelica/Mechanics/MultiBody/Examples/Loops/Utilities/CylinderBase.mo @@ -193,7 +193,8 @@ equation Rectangle( extent={{-58,53},{58,-23}}, fillPattern=FillPattern.VerticalCylinder, - fillColor={192,192,192}), + fillColor={192,192,192}, + pattern=LinePattern.None), Rectangle( extent={{-60,45},{60,39}}, fillPattern=FillPattern.Solid), diff --git a/Modelica/Mechanics/MultiBody/Examples/Systems/RobotR3/Utilities/AxisType1.mo b/Modelica/Mechanics/MultiBody/Examples/Systems/RobotR3/Utilities/AxisType1.mo index be0ffeb39c..46fcc6244b 100644 --- a/Modelica/Mechanics/MultiBody/Examples/Systems/RobotR3/Utilities/AxisType1.mo +++ b/Modelica/Mechanics/MultiBody/Examples/Systems/RobotR3/Utilities/AxisType1.mo @@ -18,17 +18,20 @@ a model of the electrical motor and a continuous-time cascade controller. extent={{80,10},{100,-10}}, fillPattern=FillPattern.HorizontalCylinder, fillColor={192,192,192}, - lineColor={64,64,64}), + lineColor={64,64,64}, + pattern=LinePattern.None), Rectangle( extent={{28,10},{46,-10}}, fillPattern=FillPattern.HorizontalCylinder, fillColor={192,192,192}, - lineColor={64,64,64}), + lineColor={64,64,64}, + pattern=LinePattern.None), Rectangle( extent={{-100,50},{22,-50}}, fillPattern=FillPattern.HorizontalCylinder, fillColor={175,175,175}, - lineColor={0,0,0}), + lineColor={0,0,0}, + pattern=LinePattern.None), Text( extent={{-150,100},{150,60}}, textString="%name", @@ -41,7 +44,8 @@ a model of the electrical motor and a continuous-time cascade controller. Rectangle( extent={{10,54},{30,-54}}, fillPattern=FillPattern.HorizontalCylinder, - fillColor={160,160,164}), + fillColor={160,160,164}, + pattern=LinePattern.None), Rectangle( extent={{10,54},{30,-54}}, lineColor={0,0,0})})); end AxisType1; diff --git a/Modelica/Mechanics/MultiBody/Examples/Systems/RobotR3/Utilities/AxisType2.mo b/Modelica/Mechanics/MultiBody/Examples/Systems/RobotR3/Utilities/AxisType2.mo index 367e0763d4..8bbb17035a 100644 --- a/Modelica/Mechanics/MultiBody/Examples/Systems/RobotR3/Utilities/AxisType2.mo +++ b/Modelica/Mechanics/MultiBody/Examples/Systems/RobotR3/Utilities/AxisType2.mo @@ -131,7 +131,8 @@ Default values of the parameters are given for the axis of joint 1. extent={{68,10},{100,-10}}, fillPattern=FillPattern.HorizontalCylinder, fillColor={192,192,192}, - lineColor={64,64,64}), + lineColor={64,64,64}, + pattern=LinePattern.None), Text( extent={{-150,100},{150,60}}, textString="%name", @@ -140,7 +141,8 @@ Default values of the parameters are given for the axis of joint 1. extent={{-100,50},{66,-50}}, fillPattern=FillPattern.HorizontalCylinder, fillColor={175,175,175}, - lineColor={0,0,0}), + lineColor={0,0,0}, + pattern=LinePattern.None), Rectangle( extent={{-100,34},{62,-34}}, fillPattern=FillPattern.Solid, @@ -149,7 +151,8 @@ Default values of the parameters are given for the axis of joint 1. Rectangle( extent={{60,54},{80,-54}}, fillPattern=FillPattern.HorizontalCylinder, - fillColor={160,160,164}), + fillColor={160,160,164}, + pattern=LinePattern.None), Rectangle( extent={{60,54},{80,-54}}, lineColor={0,0,0})})); end AxisType2; diff --git a/Modelica/Mechanics/MultiBody/Interfaces/FlangeWithBearing.mo b/Modelica/Mechanics/MultiBody/Interfaces/FlangeWithBearing.mo index e1942a750a..ab266cf487 100644 --- a/Modelica/Mechanics/MultiBody/Interfaces/FlangeWithBearing.mo +++ b/Modelica/Mechanics/MultiBody/Interfaces/FlangeWithBearing.mo @@ -25,7 +25,8 @@ connector FlangeWithBearing extent={{-100,25},{100,-25}}, lineColor={64,64,64}, fillPattern=FillPattern.HorizontalCylinder, - fillColor={192,192,192}), + fillColor={192,192,192}, + pattern=LinePattern.None), Line(points={{-80,60},{80,60}}), Line(points={{-80,-60},{80,-60}}), Line(points={{0,100},{0,60}}), @@ -54,7 +55,8 @@ connector FlangeWithBearing extent={{-60,15},{60,-15}}, lineColor={64,64,64}, fillPattern=FillPattern.HorizontalCylinder, - fillColor={192,192,192}), + fillColor={192,192,192}, + pattern=LinePattern.None), Line(points={{0,60},{0,40}}), Line(points={{0,-40},{0,-60}}), Line(points={{-50,40},{50,40}}), diff --git a/Modelica/Mechanics/MultiBody/Joints/Assemblies/JointSSP.mo b/Modelica/Mechanics/MultiBody/Joints/Assemblies/JointSSP.mo index 0084690fd9..32c2f3eda7 100644 --- a/Modelica/Mechanics/MultiBody/Joints/Assemblies/JointSSP.mo +++ b/Modelica/Mechanics/MultiBody/Joints/Assemblies/JointSSP.mo @@ -255,7 +255,8 @@ component). Rectangle( extent={{10,6},{61,-6}}, fillPattern=FillPattern.HorizontalCylinder, - fillColor={192,192,192}), + fillColor={192,192,192}, + pattern=LinePattern.None), Ellipse( extent={{-100,-24},{-52,24}}, startAngle=70, @@ -301,7 +302,8 @@ component). Rectangle( extent={{-76,5},{-10,-5}}, fillPattern=FillPattern.HorizontalCylinder, - fillColor={192,192,192}), + fillColor={192,192,192}, + pattern=LinePattern.None), Rectangle( extent={{50,20},{80,-20}}, fillColor={192,192,192}, diff --git a/Modelica/Mechanics/MultiBody/Joints/Assemblies/JointSSR.mo b/Modelica/Mechanics/MultiBody/Joints/Assemblies/JointSSR.mo index b8f0e6c92d..7733297e20 100644 --- a/Modelica/Mechanics/MultiBody/Joints/Assemblies/JointSSR.mo +++ b/Modelica/Mechanics/MultiBody/Joints/Assemblies/JointSSR.mo @@ -260,7 +260,8 @@ component). Rectangle( extent={{8,6},{61,-6}}, fillPattern=FillPattern.HorizontalCylinder, - fillColor={192,192,192}), + fillColor={192,192,192}, + pattern=LinePattern.None), Ellipse( extent={{-100,-24},{-52,24}}, startAngle=70, @@ -306,11 +307,13 @@ component). Rectangle( extent={{60,-30},{76,30}}, fillPattern=FillPattern.HorizontalCylinder, - fillColor={192,192,192}), + fillColor={192,192,192}, + pattern=LinePattern.None), Rectangle( extent={{85,-30},{100,30}}, fillPattern=FillPattern.HorizontalCylinder, - fillColor={192,192,192}), + fillColor={192,192,192}, + pattern=LinePattern.None), Rectangle(extent={{60,30},{76,-30}}), Rectangle(extent={{85,30},{100,-30}}), Line( @@ -328,7 +331,8 @@ component). Rectangle( extent={{-76,5},{-10,-5}}, fillPattern=FillPattern.HorizontalCylinder, - fillColor={192,192,192}), + fillColor={192,192,192}, + pattern=LinePattern.None), Ellipse( extent={{-20,10},{0,-10}}, fillPattern=FillPattern.Sphere, diff --git a/Modelica/Mechanics/MultiBody/Joints/Assemblies/JointUSP.mo b/Modelica/Mechanics/MultiBody/Joints/Assemblies/JointUSP.mo index 548bb0b117..f978623971 100644 --- a/Modelica/Mechanics/MultiBody/Joints/Assemblies/JointUSP.mo +++ b/Modelica/Mechanics/MultiBody/Joints/Assemblies/JointUSP.mo @@ -372,7 +372,8 @@ the origin of frame_a to the middle of rod 1, this might be defined as: Rectangle( extent={{10,6},{52,-6}}, fillPattern=FillPattern.HorizontalCylinder, - fillColor={192,192,192}), + fillColor={192,192,192}, + pattern=LinePattern.None), Ellipse( extent={{-34,-24},{14,24}}, startAngle=-110, @@ -418,7 +419,8 @@ the origin of frame_a to the middle of rod 1, this might be defined as: Rectangle( extent={{-50,5},{-10,-5}}, fillPattern=FillPattern.HorizontalCylinder, - fillColor={192,192,192}), + fillColor={192,192,192}, + pattern=LinePattern.None), Ellipse( extent={{-20,10},{0,-10}}, fillPattern=FillPattern.Sphere, diff --git a/Modelica/Mechanics/MultiBody/Joints/Assemblies/JointUSR.mo b/Modelica/Mechanics/MultiBody/Joints/Assemblies/JointUSR.mo index dd0611708c..95ed4731e7 100644 --- a/Modelica/Mechanics/MultiBody/Joints/Assemblies/JointUSR.mo +++ b/Modelica/Mechanics/MultiBody/Joints/Assemblies/JointUSR.mo @@ -375,7 +375,8 @@ the origin of frame_a to the middle of rod 1, this might be defined as: Rectangle( extent={{10,6},{61,-6}}, fillPattern=FillPattern.HorizontalCylinder, - fillColor={192,192,192}), + fillColor={192,192,192}, + pattern=LinePattern.None), Ellipse( extent={{-34,-24},{14,24}}, startAngle=-110, @@ -421,15 +422,18 @@ the origin of frame_a to the middle of rod 1, this might be defined as: Rectangle( extent={{-50,5},{-10,-5}}, fillPattern=FillPattern.HorizontalCylinder, - fillColor={192,192,192}), + fillColor={192,192,192}, + pattern=LinePattern.None), Rectangle( extent={{60,-30},{76,30}}, fillPattern=FillPattern.HorizontalCylinder, - fillColor={192,192,192}), + fillColor={192,192,192}, + pattern=LinePattern.None), Rectangle( extent={{85,-30},{100,30}}, fillPattern=FillPattern.HorizontalCylinder, - fillColor={192,192,192}), + fillColor={192,192,192}, + pattern=LinePattern.None), Rectangle(extent={{60,30},{76,-30}}), Rectangle(extent={{85,30},{100,-30}}), Line( diff --git a/Modelica/Mechanics/MultiBody/Joints/Constraints/Revolute.mo b/Modelica/Mechanics/MultiBody/Joints/Constraints/Revolute.mo index cc3bad276a..5e9a7ec739 100644 --- a/Modelica/Mechanics/MultiBody/Joints/Constraints/Revolute.mo +++ b/Modelica/Mechanics/MultiBody/Joints/Constraints/Revolute.mo @@ -112,13 +112,15 @@ equation lineColor={64,64,64}, fillPattern=FillPattern.HorizontalCylinder, fillColor={255,255,255}, - radius=10), + radius=10, + pattern=LinePattern.None), Rectangle( extent={{30,-60},{100,60}}, lineColor={64,64,64}, fillPattern=FillPattern.HorizontalCylinder, fillColor={255,255,255}, - radius=10), + radius=10, + pattern=LinePattern.None), Rectangle(extent={{-100,60},{-30,-60}}, lineColor={64,64,64}, radius=10), Rectangle(extent={{30,60},{100,-60}}, lineColor={64,64,64}, radius=10), Rectangle( diff --git a/Modelica/Mechanics/MultiBody/Joints/Constraints/Spherical.mo b/Modelica/Mechanics/MultiBody/Joints/Constraints/Spherical.mo index 83e7b39270..98a0d61aa7 100644 --- a/Modelica/Mechanics/MultiBody/Joints/Constraints/Spherical.mo +++ b/Modelica/Mechanics/MultiBody/Joints/Constraints/Spherical.mo @@ -83,7 +83,8 @@ equation Rectangle( extent={{-100,10},{100,-10}}, fillPattern=FillPattern.HorizontalCylinder, - fillColor={192,192,192}), + fillColor={192,192,192}, + pattern=LinePattern.None), Ellipse( extent={{-60,-60},{60,60}}, fillPattern=FillPattern.Solid, diff --git a/Modelica/Mechanics/MultiBody/Joints/Constraints/Universal.mo b/Modelica/Mechanics/MultiBody/Joints/Constraints/Universal.mo index 9dce558fb0..ac70af883b 100644 --- a/Modelica/Mechanics/MultiBody/Joints/Constraints/Universal.mo +++ b/Modelica/Mechanics/MultiBody/Joints/Constraints/Universal.mo @@ -82,7 +82,8 @@ equation Rectangle( extent={{-100,10},{100,-10}}, fillPattern=FillPattern.HorizontalCylinder, - fillColor={192,192,192}), + fillColor={192,192,192}, + pattern=LinePattern.None), Ellipse( extent={{-80,-80},{80,80}}, lineColor={64,64,64}, diff --git a/Modelica/Mechanics/MultiBody/Joints/Cylindrical.mo b/Modelica/Mechanics/MultiBody/Joints/Cylindrical.mo index 834a085f4a..2dcfc0168d 100644 --- a/Modelica/Mechanics/MultiBody/Joints/Cylindrical.mo +++ b/Modelica/Mechanics/MultiBody/Joints/Cylindrical.mo @@ -120,7 +120,8 @@ vector \"n\" defining the cylinder axis lineColor={64,64,64}, fillPattern=FillPattern.HorizontalCylinder, fillColor={255,255,255}, - radius=10), + radius=10, + pattern=LinePattern.None), Rectangle( extent={{-30,-30},{100,30}}, lineColor={64,64,64}, @@ -130,7 +131,8 @@ vector \"n\" defining the cylinder axis lineColor={64,64,64}, fillPattern=FillPattern.HorizontalCylinder, fillColor={255,255,255}, - radius=10), + radius=10, + pattern=LinePattern.None), Rectangle( extent={{-100,-50},{0,50}}, lineColor={64,64,64}, diff --git a/Modelica/Mechanics/MultiBody/Joints/GearConstraint.mo b/Modelica/Mechanics/MultiBody/Joints/GearConstraint.mo index ff09f5293f..dd6f8afc00 100644 --- a/Modelica/Mechanics/MultiBody/Joints/GearConstraint.mo +++ b/Modelica/Mechanics/MultiBody/Joints/GearConstraint.mo @@ -155,11 +155,13 @@ equation Rectangle(origin = {-35,60}, fillColor = {255,255,255}, fillPattern = FillPattern.HorizontalCylinder, - extent = {{-15,-40},{15,40}}), + extent = {{-15,-40},{15,40}}, + pattern=LinePattern.None), Rectangle(origin = {-35,0}, fillColor = {255,255,255}, fillPattern = FillPattern.HorizontalCylinder, - extent = {{-15,-21},{15,21}}), + extent = {{-15,-21},{15,21}}, + pattern=LinePattern.None), Line(points = {{-80,20},{-60,20}}), Line(points = {{-80,-20},{-60,-20}}), Line(points = {{-70,-20},{-70,-86}}), @@ -173,12 +175,14 @@ equation lineColor = {64,64,64}, fillColor = {191,191,191}, fillPattern = FillPattern.HorizontalCylinder, - extent = {{-25,-10},{25,10}}), + extent = {{-25,-10},{25,10}}, + pattern=LinePattern.None), Rectangle(origin = {75,0}, lineColor = {64,64,64}, fillColor = {191,191,191}, fillPattern = FillPattern.HorizontalCylinder, - extent = {{-25,-10},{25,10}}), + extent = {{-25,-10},{25,10}}, + pattern=LinePattern.None), Rectangle(origin = {-35,-19}, fillColor = {153,153,153}, fillPattern = FillPattern.Solid, @@ -199,7 +203,8 @@ equation lineColor = {64,64,64}, fillColor = {191,191,191}, fillPattern = FillPattern.HorizontalCylinder, - extent = {{-20,-10},{20,10}}), + extent = {{-20,-10},{20,10}}, + pattern=LinePattern.None), Rectangle(origin = {-35,98}, fillColor = {153,153,153}, fillPattern = FillPattern.Solid, @@ -227,7 +232,8 @@ equation Rectangle(origin = {35,60}, fillColor = {255,255,255}, fillPattern = FillPattern.HorizontalCylinder, - extent = {{-15,-21},{15,21}}), + extent = {{-15,-21},{15,21}}, + pattern=LinePattern.None), Rectangle(origin = {35,41}, fillColor = {153,153,153}, fillPattern = FillPattern.Solid, @@ -247,7 +253,8 @@ equation Rectangle(origin = {35,0}, fillColor = {255,255,255}, fillPattern = FillPattern.HorizontalCylinder, - extent = {{-15,-40},{15,40}}), + extent = {{-15,-40},{15,40}}, + pattern=LinePattern.None), Rectangle(origin = {35,38}, fillColor = {153,153,153}, fillPattern = FillPattern.Solid, diff --git a/Modelica/Mechanics/MultiBody/Joints/Internal/RevoluteWithLengthConstraint.mo b/Modelica/Mechanics/MultiBody/Joints/Internal/RevoluteWithLengthConstraint.mo index 779d6fbc84..d1b2e22144 100644 --- a/Modelica/Mechanics/MultiBody/Joints/Internal/RevoluteWithLengthConstraint.mo +++ b/Modelica/Mechanics/MultiBody/Joints/Internal/RevoluteWithLengthConstraint.mo @@ -250,13 +250,15 @@ position a degree of freedom is lost. lineColor={64,64,64}, fillPattern=FillPattern.HorizontalCylinder, fillColor={255,255,255}, - radius=10), + radius=10, + pattern=LinePattern.None), Rectangle( extent={{30,-60},{100,60}}, lineColor={64,64,64}, fillPattern=FillPattern.HorizontalCylinder, fillColor={255,255,255}, - radius=10), + radius=10, + pattern=LinePattern.None), Text( extent={{-139,-168},{137,-111}}, textString="%name", @@ -285,7 +287,8 @@ position a degree of freedom is lost. extent={{-10,90},{10,50}}, lineColor={64,64,64}, fillPattern=FillPattern.VerticalCylinder, - fillColor={192,192,192})}), + fillColor={192,192,192}, + pattern=LinePattern.None)}), Documentation(info="

Joint where frame_b rotates around axis n which is fixed in frame_a. diff --git a/Modelica/Mechanics/MultiBody/Joints/Revolute.mo b/Modelica/Mechanics/MultiBody/Joints/Revolute.mo index 640f58178a..9398f45c85 100644 --- a/Modelica/Mechanics/MultiBody/Joints/Revolute.mo +++ b/Modelica/Mechanics/MultiBody/Joints/Revolute.mo @@ -132,13 +132,15 @@ equation lineColor={64,64,64}, fillPattern=FillPattern.HorizontalCylinder, fillColor={255,255,255}, - radius=10), + radius=10, + pattern=LinePattern.None), Rectangle( extent={{30,-60},{100,60}}, lineColor={64,64,64}, fillPattern=FillPattern.HorizontalCylinder, fillColor={255,255,255}, - radius=10), + radius=10, + pattern=LinePattern.None), Rectangle(extent={{-100,60},{-30,-60}}, lineColor={64,64,64}, radius=10), Rectangle(extent={{30,60},{100,-60}}, lineColor={64,64,64}, radius=10), Text( @@ -159,7 +161,8 @@ equation visible=useAxisFlange, extent={{-10,100},{10,50}}, fillPattern=FillPattern.VerticalCylinder, - fillColor={192,192,192}), + fillColor={192,192,192}, + pattern=LinePattern.None), Polygon( visible=useAxisFlange, points={{-10,30},{10,30},{30,50},{-30,50},{-10,30}}, diff --git a/Modelica/Mechanics/MultiBody/Joints/RevolutePlanarLoopConstraint.mo b/Modelica/Mechanics/MultiBody/Joints/RevolutePlanarLoopConstraint.mo index cf2b39ffbc..1827dd150e 100644 --- a/Modelica/Mechanics/MultiBody/Joints/RevolutePlanarLoopConstraint.mo +++ b/Modelica/Mechanics/MultiBody/Joints/RevolutePlanarLoopConstraint.mo @@ -121,13 +121,15 @@ definition of the axes vectors n in the revolute joints of the planar loop. lineColor={64,64,64}, fillPattern=FillPattern.HorizontalCylinder, fillColor={255,255,255}, - radius=10), + radius=10, + pattern=LinePattern.None), Rectangle( extent={{20,-60},{100,60}}, lineColor={64,64,64}, fillPattern=FillPattern.HorizontalCylinder, fillColor={255,255,255}, - radius=10), + radius=10, + pattern=LinePattern.None), Rectangle(extent={{-100,60},{-20,-60}}, lineColor={64,64,64}, radius=10), Rectangle(extent={{20,60},{100,-60}}, lineColor={64,64,64}, radius=10), Text( diff --git a/Modelica/Mechanics/MultiBody/Joints/Spherical.mo b/Modelica/Mechanics/MultiBody/Joints/Spherical.mo index b223740b09..c290f75b7d 100644 --- a/Modelica/Mechanics/MultiBody/Joints/Spherical.mo +++ b/Modelica/Mechanics/MultiBody/Joints/Spherical.mo @@ -241,7 +241,8 @@ frame_b of the joint. Rectangle( extent={{-100,10},{100,-10}}, fillPattern=FillPattern.HorizontalCylinder, - fillColor={192,192,192}), + fillColor={192,192,192}, + pattern=LinePattern.None), Ellipse( extent={{-60,-60},{60,60}}, fillPattern=FillPattern.Solid, diff --git a/Modelica/Mechanics/MultiBody/Joints/SphericalSpherical.mo b/Modelica/Mechanics/MultiBody/Joints/SphericalSpherical.mo index 3279ee49c1..374bdd330f 100644 --- a/Modelica/Mechanics/MultiBody/Joints/SphericalSpherical.mo +++ b/Modelica/Mechanics/MultiBody/Joints/SphericalSpherical.mo @@ -241,7 +241,8 @@ equation Rectangle( extent={{-60,6},{60,-6}}, fillPattern=FillPattern.HorizontalCylinder, - fillColor={192,192,192}), + fillColor={192,192,192}, + pattern=LinePattern.None), Ellipse( extent={{-76,16},{-44,-16}}, fillPattern=FillPattern.Sphere, diff --git a/Modelica/Mechanics/MultiBody/Joints/Universal.mo b/Modelica/Mechanics/MultiBody/Joints/Universal.mo index 1727e0fce8..c0eb7a2286 100644 --- a/Modelica/Mechanics/MultiBody/Joints/Universal.mo +++ b/Modelica/Mechanics/MultiBody/Joints/Universal.mo @@ -118,7 +118,8 @@ phi_b.start = 45o). Rectangle( extent={{-100,10},{100,-10}}, fillPattern=FillPattern.HorizontalCylinder, - fillColor={192,192,192}), + fillColor={192,192,192}, + pattern=LinePattern.None), Ellipse( extent={{-80,-80},{80,80}}, lineColor={64,64,64}, diff --git a/Modelica/Mechanics/MultiBody/Joints/package.mo b/Modelica/Mechanics/MultiBody/Joints/package.mo index 9042d9095a..39061c626f 100644 --- a/Modelica/Mechanics/MultiBody/Joints/package.mo +++ b/Modelica/Mechanics/MultiBody/Joints/package.mo @@ -87,13 +87,15 @@ solved, i.e., robustly and efficiently). fillColor={235,235,235}, fillPattern=FillPattern.VerticalCylinder, extent={{-20,0},{20,100}}, - rotation=110), + rotation=110, + pattern=LinePattern.None), Rectangle( origin={30,-22}, lineColor={64,64,64}, fillColor={215,215,215}, fillPattern=FillPattern.VerticalCylinder, - extent={{-20,0},{20,100}}), + extent={{-20,0},{20,100}}, + pattern=LinePattern.None), Rectangle( origin={30,-22}, lineColor={64,64,64}, @@ -109,7 +111,8 @@ solved, i.e., robustly and efficiently). lineColor={64,64,64}, fillColor={255,255,255}, fillPattern=FillPattern.HorizontalCylinder, - extent={{-34,-34},{34,34}}), + extent={{-34,-34},{34,34}}, + pattern=LinePattern.None), Ellipse( origin={30,-22}, lineColor={64,64,64}, diff --git a/Modelica/Mechanics/MultiBody/Parts/BevelGear1D.mo b/Modelica/Mechanics/MultiBody/Parts/BevelGear1D.mo index ded4b43496..d2c66661d9 100644 --- a/Modelica/Mechanics/MultiBody/Parts/BevelGear1D.mo +++ b/Modelica/Mechanics/MultiBody/Parts/BevelGear1D.mo @@ -63,11 +63,13 @@ equation Rectangle(origin = {-35,60}, fillColor = {255,255,255}, fillPattern = FillPattern.HorizontalCylinder, - extent = {{-15,-40},{15,40}}), + extent = {{-15,-40},{15,40}}, + pattern=LinePattern.None), Rectangle(origin = {-35,0}, fillColor = {255,255,255}, fillPattern = FillPattern.HorizontalCylinder, - extent = {{-15,-21},{15,21}}), + extent = {{-15,-21},{15,21}}, + pattern=LinePattern.None), Line(points = {{-80,20},{-60,20}}), Line(points = {{-80,-20},{-60,-20}}), Line(points = {{-70,-20},{-70,-86}}), @@ -82,12 +84,14 @@ equation lineColor = {64,64,64}, fillColor = {191,191,191}, fillPattern = FillPattern.HorizontalCylinder, - extent = {{-25,-10},{25,10}}), + extent = {{-25,-10},{25,10}}, + pattern=LinePattern.None), Rectangle(origin = {75,0}, lineColor = {64,64,64}, fillColor = {191,191,191}, fillPattern = FillPattern.HorizontalCylinder, - extent = {{-25,-10},{25,10}}), + extent = {{-25,-10},{25,10}}, + pattern=LinePattern.None), Rectangle(origin = {-35,-19}, fillColor = {153,153,153}, fillPattern = FillPattern.Solid, @@ -108,7 +112,8 @@ equation lineColor = {64,64,64}, fillColor = {191,191,191}, fillPattern = FillPattern.HorizontalCylinder, - extent = {{-20,-10},{20,10}}), + extent = {{-20,-10},{20,10}}, + pattern=LinePattern.None), Rectangle(origin = {-35,98}, fillColor = {153,153,153}, fillPattern = FillPattern.Solid, @@ -136,7 +141,8 @@ equation Rectangle(origin = {35,60}, fillColor = {255,255,255}, fillPattern = FillPattern.HorizontalCylinder, - extent = {{-15,-21},{15,21}}), + extent = {{-15,-21},{15,21}}, + pattern=LinePattern.None), Rectangle(origin = {35,41}, fillColor = {153,153,153}, fillPattern = FillPattern.Solid, @@ -156,7 +162,8 @@ equation Rectangle(origin = {35,0}, fillColor = {255,255,255}, fillPattern = FillPattern.HorizontalCylinder, - extent = {{-15,-40},{15,40}}), + extent = {{-15,-40},{15,40}}, + pattern=LinePattern.None), Rectangle(origin = {35,38}, fillColor = {153,153,153}, fillPattern = FillPattern.Solid, diff --git a/Modelica/Mechanics/MultiBody/Parts/Body.mo b/Modelica/Mechanics/MultiBody/Parts/Body.mo index b18e6ff678..37c72e85ab 100644 --- a/Modelica/Mechanics/MultiBody/Parts/Body.mo +++ b/Modelica/Mechanics/MultiBody/Parts/Body.mo @@ -267,7 +267,8 @@ equation lineColor={0,24,48}, fillPattern=FillPattern.HorizontalCylinder, fillColor={0,127,255}, - radius=10), + radius=10, + pattern=LinePattern.None), Text( extent={{150,-100},{-150,-70}}, textString="m=%m"), diff --git a/Modelica/Mechanics/MultiBody/Parts/BodyCylinder.mo b/Modelica/Mechanics/MultiBody/Parts/BodyCylinder.mo index 3289482161..b503a6918b 100644 --- a/Modelica/Mechanics/MultiBody/Parts/BodyCylinder.mo +++ b/Modelica/Mechanics/MultiBody/Parts/BodyCylinder.mo @@ -208,7 +208,8 @@ states and of the \"Advanced\" menu parameters, see model lineColor={0,24,48}, fillPattern=FillPattern.HorizontalCylinder, fillColor={0,127,255}, - radius=10), + radius=10, + pattern=LinePattern.None), Text( extent={{-87,13},{-51,-12}}, textString="a"), diff --git a/Modelica/Mechanics/MultiBody/Parts/BodyShape.mo b/Modelica/Mechanics/MultiBody/Parts/BodyShape.mo index 9fc242a377..73345031c1 100644 --- a/Modelica/Mechanics/MultiBody/Parts/BodyShape.mo +++ b/Modelica/Mechanics/MultiBody/Parts/BodyShape.mo @@ -275,7 +275,8 @@ states and of the \"Advanced\" menu parameters, see model lineColor={0,24,48}, fillPattern=FillPattern.HorizontalCylinder, fillColor={0,127,255}, - radius=10), + radius=10, + pattern=LinePattern.None), Ellipse( extent={{-60,60},{60,-60}}, lineColor={0,24,48}, diff --git a/Modelica/Mechanics/MultiBody/Parts/Rotor1D.mo b/Modelica/Mechanics/MultiBody/Parts/Rotor1D.mo index 7fee209ed9..7e52e17b2c 100644 --- a/Modelica/Mechanics/MultiBody/Parts/Rotor1D.mo +++ b/Modelica/Mechanics/MultiBody/Parts/Rotor1D.mo @@ -226,7 +226,8 @@ November 3-4, 2003, pp. 149-158

extent={{-100,10},{100,-10}}, lineColor={64,64,64}, fillPattern=FillPattern.HorizontalCylinder, - fillColor={192,192,192}), + fillColor={192,192,192}, + pattern=LinePattern.None), Line(points={{-80,-25},{-60,-25}}), Line(points={{60,-25},{80,-25}}), Line(points={{-70,-25},{-70,-70}}), @@ -241,7 +242,8 @@ November 3-4, 2003, pp. 149-158

lineColor={64,64,64}, fillPattern=FillPattern.HorizontalCylinder, fillColor={255,255,255}, - radius=10), + radius=10, + pattern=LinePattern.None), Rectangle( extent={{-50,50},{50,-50}}, lineColor={64,64,64}, @@ -344,7 +346,8 @@ November 3-4, 2003, pp. 149-158

extent={{-100,10},{100,-10}}, lineColor={64,64,64}, fillPattern=FillPattern.HorizontalCylinder, - fillColor={192,192,192}), + fillColor={192,192,192}, + pattern=LinePattern.None), Line(points={{-80,-25},{-60,-25}}), Line(points={{60,-25},{80,-25}}), Line(points={{-70,-25},{-70,-70}}), @@ -359,7 +362,8 @@ November 3-4, 2003, pp. 149-158

lineColor={64,64,64}, fillPattern=FillPattern.HorizontalCylinder, fillColor={255,255,255}, - radius=10), + radius=10, + pattern=LinePattern.None), Rectangle( extent={{-50,50},{50,-50}}, lineColor={64,64,64}, diff --git a/Modelica/Mechanics/MultiBody/Parts/package.mo b/Modelica/Mechanics/MultiBody/Parts/package.mo index b093e51421..0002e50038 100644 --- a/Modelica/Mechanics/MultiBody/Parts/package.mo +++ b/Modelica/Mechanics/MultiBody/Parts/package.mo @@ -104,7 +104,9 @@ definition of the colors used in the MultiBody library lineColor={95,95,95}, fillPattern=FillPattern.HorizontalCylinder, fillColor={215,215,215}, - radius=10), Ellipse( + radius=10, + pattern=LinePattern.None), + Ellipse( extent={{-8,52},{86,-42}}, lineColor={95,95,95}, fillPattern=FillPattern.Sphere, diff --git a/Modelica/Mechanics/MultiBody/Visualizers/Advanced/PipeWithScalarField.mo b/Modelica/Mechanics/MultiBody/Visualizers/Advanced/PipeWithScalarField.mo index 0f4c79dfe8..40c8a60175 100644 --- a/Modelica/Mechanics/MultiBody/Visualizers/Advanced/PipeWithScalarField.mo +++ b/Modelica/Mechanics/MultiBody/Visualizers/Advanced/PipeWithScalarField.mo @@ -95,7 +95,8 @@ protected Polygon(fillColor = {253, 77, 0}, pattern = LinePattern.None, fillPattern = FillPattern.Solid, points = {{71.667, 33.5}, {71.667, 33.5}, {65.667, 33.333}, {59.289, 30.796}, {53.882, 23.57}, {51.227, 16.645}, {49.571, 8.651}, {49, 0}, {49.571, -8.651}, {51.227, -16.645}, {53.882, -23.57}, {59.289, -30.796}, {65.667, -33.333}, {71.667, -33.5}, {71.667, -33.5}}, smooth = Smooth.Bezier), Polygon(fillColor = {252, 52, 0}, pattern = LinePattern.None, fillPattern = FillPattern.Solid, points = {{74.5, 33.5}, {74.5, 33.5}, {69.833, 33.333}, {63.455, 30.796}, {58.048, 23.57}, {55.394, 16.645}, {53.738, 8.651}, {53.167, 0}, {53.738, -8.651}, {55.394, -16.645}, {58.048, -23.57}, {63.455, -30.796}, {69.833, -33.333}, {74, -33.5}, {74.5, -34}}, smooth = Smooth.Bezier), Polygon(fillColor = {251, 0, 7}, pattern = LinePattern.None, fillPattern = FillPattern.Solid, points = {{74, 33.333}, {67.622, 30.796}, {62.215, 23.57}, {59.56, 16.645}, {57.904, 8.651}, {57.333, 0}, {57.904, -8.651}, {59.56, -16.645}, {62.215, -23.57}, {67.622, -30.796}, {74, -33.333}}, smooth = Smooth.Bezier), - Polygon(lineColor = {107, 0, 4}, fillColor = {251, 0, 7}, fillPattern = FillPattern.Sphere, points = {{90.667, 0}, {90.096, 8.651}, {88.44, 16.645}, {85.785, 23.57}, {80.378, 30.796}, {74, 33.333}, {67.622, 30.796}, {62.215, 23.57}, {59.56, 16.645}, {57.904, 8.651}, {57.333, 0}, {57.904, -8.651}, {59.56, -16.645}, {62.215, -23.57}, {67.622, -30.796}, {74, -33.333}, {80.378, -30.796}, {85.785, -23.57}, {88.44, -16.645}, {90.096, -8.651}, {90.667, 0}}, smooth=Smooth.Bezier), + Polygon(lineColor = {107, 0, 4}, fillColor = {251, 0, 7}, fillPattern = FillPattern.Sphere, points = {{90.667, 0}, {90.096, 8.651}, {88.44, 16.645}, {85.785, 23.57}, {80.378, 30.796}, {74, 33.333}, {67.622, 30.796}, {62.215, 23.57}, {59.56, 16.645}, {57.904, 8.651}, {57.333, 0}, {57.904, -8.651}, {59.56, -16.645}, {62.215, -23.57}, {67.622, -30.796}, {74, -33.333}, {80.378, -30.796}, {85.785, -23.57}, {88.44, -16.645}, {90.096, -8.651}, {90.667, 0}}, smooth=Smooth.Bezier, + pattern=LinePattern.None), Line(points = {{-76, 33.333}, {-76, 33.333}, {-82.378, 30.796}, {-87.785, 23.57}, {-90.44, 16.645}, {-92.096, 8.651}, {-92.667, 0}, {-92.096, -8.651}, {-90.44, -16.645}, {-87.785, -23.57}, {-82.378, -30.796}, {-76, -33.333}, {-76, -33.333}, {74, -33.333}, {74, -33.333}, {80.378, -30.796}, {85.785, -23.57}, {88.44, -16.645}, {90.096, -8.651}, {90.667, 0}, {90.096, 8.651}, {88.44, 16.645}, {85.785, 23.57}, {80.378, 30.796}, {74, 33.333}, {74, 33.333}, {-76, 33.333}}, color = {64, 64, 64}, arrowSize = 8, smooth = Smooth.Bezier)}, coordinateSystem(extent = {{-100, -100}, {100, 100}}, preserveAspectRatio = true)), Documentation(info = " diff --git a/Modelica/Mechanics/MultiBody/Visualizers/PipeWithScalarField.mo b/Modelica/Mechanics/MultiBody/Visualizers/PipeWithScalarField.mo index 03ac43e723..0a1179c12a 100644 --- a/Modelica/Mechanics/MultiBody/Visualizers/PipeWithScalarField.mo +++ b/Modelica/Mechanics/MultiBody/Visualizers/PipeWithScalarField.mo @@ -97,7 +97,8 @@ equation Polygon(origin = {-5, 0}, fillColor = {253, 77, 0}, pattern = LinePattern.None, fillPattern = FillPattern.Solid, points = {{71.667, 33.5}, {71.667, 33.5}, {65.667, 33.333}, {59.289, 30.796}, {53.882, 23.57}, {51.227, 16.645}, {49.571, 8.651}, {49, 0}, {49.571, -8.651}, {51.227, -16.645}, {53.882, -23.57}, {59.289, -30.796}, {65.667, -33.333}, {71.667, -33.5}, {71.667, -33.5}}, smooth = Smooth.Bezier), Polygon(origin = {-5, 0}, fillColor = {252, 52, 0}, pattern = LinePattern.None, fillPattern = FillPattern.Solid, points = {{74.5, 33.5}, {74.5, 33.5}, {69.833, 33.333}, {63.455, 30.796}, {58.048, 23.57}, {55.394, 16.645}, {53.738, 8.651}, {53.167, 0}, {53.738, -8.651}, {55.394, -16.645}, {58.048, -23.57}, {63.455, -30.796}, {69.833, -33.333}, {74, -33.5}, {74.5, -34}}, smooth = Smooth.Bezier), Polygon(origin = {-5, 0}, fillColor = {251, 0, 7}, pattern = LinePattern.None, fillPattern = FillPattern.Solid, points = {{74, 33.333}, {67.622, 30.796}, {62.215, 23.57}, {59.56, 16.645}, {57.904, 8.651}, {57.333, 0}, {57.904, -8.651}, {59.56, -16.645}, {62.215, -23.57}, {67.622, -30.796}, {74, -33.333}}, smooth = Smooth.Bezier), - Polygon(origin = {-5, 0}, lineColor = {107, 0, 4}, fillColor = {251, 0, 7}, fillPattern = FillPattern.Sphere, points = {{90.667, 0}, {90.096, 8.651}, {88.44, 16.645}, {85.785, 23.57}, {80.378, 30.796}, {74, 33.333}, {67.622, 30.796}, {62.215, 23.57}, {59.56, 16.645}, {57.904, 8.651}, {57.333, 0}, {57.904, -8.651}, {59.56, -16.645}, {62.215, -23.57}, {67.622, -30.796}, {74, -33.333}, {80.378, -30.796}, {85.785, -23.57}, {88.44, -16.645}, {90.096, -8.651}, {90.667, 0}}, smooth=Smooth.Bezier), Line(origin = {-5, 0}, points = {{-76, 33.333}, {-76, 33.333}, {-82.378, 30.796}, {-87.785, 23.57}, {-90.44, 16.645}, {-92.096, 8.651}, {-92.667, 0}, {-92.096, -8.651}, {-90.44, -16.645}, {-87.785, -23.57}, {-82.378, -30.796}, {-76, -33.333}, {-76, -33.333}, {74, -33.333}, {74, -33.333}, {80.378, -30.796}, {85.785, -23.57}, {88.44, -16.645}, {90.096, -8.651}, {90.667, 0}, {90.096, 8.651}, {88.44, 16.645}, {85.785, 23.57}, {80.378, 30.796}, {74, 33.333}, {74, 33.333}, {-76, 33.333}}, color = {64, 64, 64}, arrowSize = 8, smooth = Smooth.Bezier)}, + Polygon(origin = {-5, 0}, lineColor = {107, 0, 4}, fillColor = {251, 0, 7}, fillPattern = FillPattern.Sphere, points = {{90.667, 0}, {90.096, 8.651}, {88.44, 16.645}, {85.785, 23.57}, {80.378, 30.796}, {74, 33.333}, {67.622, 30.796}, {62.215, 23.57}, {59.56, 16.645}, {57.904, 8.651}, {57.333, 0}, {57.904, -8.651}, {59.56, -16.645}, {62.215, -23.57}, {67.622, -30.796}, {74, -33.333}, {80.378, -30.796}, {85.785, -23.57}, {88.44, -16.645}, {90.096, -8.651}, {90.667, 0}}, smooth=Smooth.Bezier, + pattern=LinePattern.None), Line(origin = {-5, 0}, points = {{-76, 33.333}, {-76, 33.333}, {-82.378, 30.796}, {-87.785, 23.57}, {-90.44, 16.645}, {-92.096, 8.651}, {-92.667, 0}, {-92.096, -8.651}, {-90.44, -16.645}, {-87.785, -23.57}, {-82.378, -30.796}, {-76, -33.333}, {-76, -33.333}, {74, -33.333}, {74, -33.333}, {80.378, -30.796}, {85.785, -23.57}, {88.44, -16.645}, {90.096, -8.651}, {90.667, 0}, {90.096, 8.651}, {88.44, 16.645}, {85.785, 23.57}, {80.378, 30.796}, {74, 33.333}, {74, 33.333}, {-76, 33.333}}, color = {64, 64, 64}, arrowSize = 8, smooth = Smooth.Bezier)}, coordinateSystem(extent = {{-100, -100}, {100, 100}}, preserveAspectRatio = true)), Documentation(info = "

diff --git a/Modelica/Mechanics/Rotational/Components/AngleToTorqueAdaptor.mo b/Modelica/Mechanics/Rotational/Components/AngleToTorqueAdaptor.mo index 98a76769da..f21a3671b6 100644 --- a/Modelica/Mechanics/Rotational/Components/AngleToTorqueAdaptor.mo +++ b/Modelica/Mechanics/Rotational/Components/AngleToTorqueAdaptor.mo @@ -82,7 +82,8 @@ blocks of the block library Modelica.Blocks.Sources. extent={{-100,20},{100,-20}}, lineColor={64,64,64}, fillPattern=FillPattern.HorizontalCylinder, - fillColor={192,192,192}),Line(points={{-30,-32},{30,-32}}),Line(points={{0,52},{0,32}}),Line( + fillColor={192,192,192}, + pattern=LinePattern.None), Line(points={{-30,-32},{30,-32}}),Line(points={{0,52},{0,32}}),Line( points={{-29,32},{30,32}}),Line(points={{0,-32}, {0,-100}}),Line(points={{30,-42},{20,-52}}),Line(points={{30,-32},{10,-52}}), Line(points={{20,-32},{0,-52}}),Line(points={{10, @@ -154,7 +155,8 @@ blocks of the block library Modelica.Blocks.Sources. extent={{-100,20},{100,-20}}, lineColor={64,64,64}, fillPattern=FillPattern.HorizontalCylinder, - fillColor={192,192,192}),Line(points={{-30,-32},{30,-32}}),Line(points={{0,52},{0,32}}),Line( + fillColor={192,192,192}, + pattern=LinePattern.None), Line(points={{-30,-32},{30,-32}}),Line(points={{0,52},{0,32}}),Line( points={{-29,32},{30,32}}),Line(points={{0,-32}, {0,-100}}),Line(points={{30,-42},{20,-52}}),Line(points={{30,-32},{10,-52}}), Line(points={{20,-32},{0,-52}}),Line(points={{10, @@ -208,7 +210,8 @@ equation lineColor={95,95,95}, fillColor={255,255,255}, fillPattern=FillPattern.HorizontalCylinder, - radius=10), + radius=10, + pattern=LinePattern.None), Rectangle( extent={{-20,100},{20,-100}}, lineColor={95,95,95}, diff --git a/Modelica/Mechanics/Rotational/Components/BearingFriction.mo b/Modelica/Mechanics/Rotational/Components/BearingFriction.mo index c9bbf7d707..b78846befa 100644 --- a/Modelica/Mechanics/Rotational/Components/BearingFriction.mo +++ b/Modelica/Mechanics/Rotational/Components/BearingFriction.mo @@ -159,7 +159,8 @@ following references, especially (Armstrong and Canudas de Wit 1996): Rectangle(lineColor={64,64,64}, fillColor={192,192,192}, fillPattern=FillPattern.HorizontalCylinder, - extent={{-100.0,-10.0},{100.0,10.0}}), + extent={{-100.0,-10.0},{100.0,10.0}}, + pattern=LinePattern.None), Rectangle(extent={{-60.0,-60.0},{60.0,-10.0}}), Rectangle(fillColor={192,192,192}, fillPattern=FillPattern.Solid, diff --git a/Modelica/Mechanics/Rotational/Components/Brake.mo b/Modelica/Mechanics/Rotational/Components/Brake.mo index a22fae9783..0e5c8ac996 100644 --- a/Modelica/Mechanics/Rotational/Components/Brake.mo +++ b/Modelica/Mechanics/Rotational/Components/Brake.mo @@ -95,19 +95,22 @@ equation Rectangle( lineColor={64,64,64}, fillColor={192,192,192}, fillPattern=FillPattern.HorizontalCylinder, - extent={{-100.0,-10.0},{-20.0,10.0}}), + extent={{-100.0,-10.0},{-20.0,10.0}}, + pattern=LinePattern.None), Rectangle( lineColor={64,64,64}, fillColor={255,255,255}, fillPattern=FillPattern.HorizontalCylinder, extent={{-20.0,-60.0},{20.0,60.0}}, - radius=10.0), + radius=10.0, + pattern=LinePattern.None), Rectangle( lineColor={64,64,64}, extent={{-20.0,-60.0},{20.0,60.0}}, radius=10.0), Rectangle( lineColor={64,64,64}, fillColor={192,192,192}, fillPattern=FillPattern.HorizontalCylinder, - extent={{20.0,-10.0},{100.0,10.0}}), + extent={{20.0,-10.0},{100.0,10.0}}, + pattern=LinePattern.None), Polygon( lineColor={0,0,127}, fillColor={0,0,127}, fillPattern=FillPattern.Solid, diff --git a/Modelica/Mechanics/Rotational/Components/Disc.mo b/Modelica/Mechanics/Rotational/Components/Disc.mo index f93f6961c1..672ba9984e 100644 --- a/Modelica/Mechanics/Rotational/Components/Disc.mo +++ b/Modelica/Mechanics/Rotational/Components/Disc.mo @@ -24,20 +24,24 @@ flange. Rectangle(lineColor={64,64,64}, fillColor={192,192,192}, fillPattern=FillPattern.HorizontalCylinder, - extent={{-30.0,10.0},{-10.0,50.0}}), + extent={{-30.0,10.0},{-10.0,50.0}}, + pattern=LinePattern.None), Rectangle(lineColor={64,64,64}, fillColor={192,192,192}, fillPattern=FillPattern.HorizontalCylinder, - extent={{10.0,-50.0},{30.0,-10.0}}), + extent={{10.0,-50.0},{30.0,-10.0}}, + pattern=LinePattern.None), Rectangle( lineColor={64,64,64}, fillColor={192,192,192}, fillPattern=FillPattern.HorizontalCylinder, - extent={{-100.0,-10.0},{100.0,10.0}}), + extent={{-100.0,-10.0},{100.0,10.0}}, + pattern=LinePattern.None), Rectangle(lineColor={64,64,64}, fillColor={192,192,192}, fillPattern=FillPattern.HorizontalCylinder, - extent={{-10.0,-50.0},{10.0,50.0}}), + extent={{-10.0,-50.0},{10.0,50.0}}, + pattern=LinePattern.None), Text(extent={{-160.0,-87.0},{160.0,-62.0}}, textString="deltaPhi = %deltaPhi"), Text(textColor={0,0,255}, diff --git a/Modelica/Mechanics/Rotational/Components/IdealGearR2T.mo b/Modelica/Mechanics/Rotational/Components/IdealGearR2T.mo index 942882a209..bbbb434d94 100644 --- a/Modelica/Mechanics/Rotational/Components/IdealGearR2T.mo +++ b/Modelica/Mechanics/Rotational/Components/IdealGearR2T.mo @@ -31,7 +31,8 @@ This component defines the kinematic constraint: lineColor={64,64,64}, fillColor={192,192,192}, fillPattern=FillPattern.HorizontalCylinder, - extent={{-233.3333,-10.0},{-163.3333,10.0}}), + extent={{-233.3333,-10.0},{-163.3333,10.0}}, + pattern=LinePattern.None), Text(textColor={0,0,255}, extent={{-150.0,85.0},{150.0,125.0}}, textString="%name"), diff --git a/Modelica/Mechanics/Rotational/Components/IdealPlanetary.mo b/Modelica/Mechanics/Rotational/Components/IdealPlanetary.mo index ebd5c934be..217aaa40e5 100644 --- a/Modelica/Mechanics/Rotational/Components/IdealPlanetary.mo +++ b/Modelica/Mechanics/Rotational/Components/IdealPlanetary.mo @@ -84,23 +84,28 @@ in the flanges, are along the axis vector displayed in the icon. Rectangle(lineColor={64,64,64}, fillColor={255,255,255}, fillPattern=FillPattern.HorizontalCylinder, - extent={{10.0,-100.0},{50.0,100.0}}), + extent={{10.0,-100.0},{50.0,100.0}}, + pattern=LinePattern.None), Rectangle(lineColor={64,64,64}, fillColor={192,192,192}, fillPattern=FillPattern.HorizontalCylinder, - extent={{-100.0,-10.0},{-50.0,10.0}}), + extent={{-100.0,-10.0},{-50.0,10.0}}, + pattern=LinePattern.None), Rectangle(lineColor={64,64,64}, fillColor={192,192,192}, fillPattern=FillPattern.HorizontalCylinder, - extent={{50.0,-10.0},{100.0,10.0}}), + extent={{50.0,-10.0},{100.0,10.0}}, + pattern=LinePattern.None), Rectangle(lineColor={64,64,64}, fillColor={192,192,192}, fillPattern=FillPattern.HorizontalCylinder, - extent={{-80.0,60.0},{-50.0,70.0}}), + extent={{-80.0,60.0},{-50.0,70.0}}, + pattern=LinePattern.None), Rectangle(origin={-30.0,65.0}, fillColor={192,192,192}, fillPattern=FillPattern.HorizontalCylinder, - extent={{-20.0,-19.0},{20.0,19.0}}), + extent={{-20.0,-19.0},{20.0,19.0}}, + pattern=LinePattern.None), Rectangle(origin={-30.0,48.0}, fillColor={153,153,153}, fillPattern=FillPattern.Solid, @@ -120,7 +125,8 @@ in the flanges, are along the axis vector displayed in the icon. Rectangle(origin={-30.0,-1.0}, fillColor={255,255,255}, fillPattern=FillPattern.HorizontalCylinder, - extent={{-20.0,-35.0},{20.0,35.0}}), + extent={{-20.0,-35.0},{20.0,35.0}}, + pattern=LinePattern.None), Rectangle(origin={-30.0,32.0}, fillColor={153,153,153}, fillPattern=FillPattern.Solid, diff --git a/Modelica/Mechanics/Rotational/Components/IdealRollingWheel.mo b/Modelica/Mechanics/Rotational/Components/IdealRollingWheel.mo index 85e3a2c001..d4d68d6428 100644 --- a/Modelica/Mechanics/Rotational/Components/IdealRollingWheel.mo +++ b/Modelica/Mechanics/Rotational/Components/IdealRollingWheel.mo @@ -17,11 +17,13 @@ equation Rectangle( lineColor={64,64,64}, fillColor={192,192,192}, fillPattern=FillPattern.HorizontalCylinder, - extent={{-100.0,-10.0},{-46.0,10.0}}), + extent={{-100.0,-10.0},{-46.0,10.0}}, + pattern=LinePattern.None), Ellipse( lineColor={64,64,64}, fillColor={255,255,255}, fillPattern=FillPattern.HorizontalCylinder, - extent={{-50.0,-80.0},{10.0,80.0}}), + extent={{-50.0,-80.0},{10.0,80.0}}, + pattern=LinePattern.None), Rectangle( lineColor={64,64,64}, fillColor={255,255,255}, pattern=LinePattern.None, @@ -38,7 +40,8 @@ equation Ellipse( lineColor={64,64,64}, fillColor={192,192,192}, fillPattern=FillPattern.HorizontalCylinder, - extent={{12.0,-10.0},{20.0,10.0}}), + extent={{12.0,-10.0},{20.0,10.0}}, + pattern=LinePattern.None), Rectangle( lineColor={64,64,64}, fillColor={192,192,192}, pattern=LinePattern.None, diff --git a/Modelica/Mechanics/Rotational/Components/Inertia.mo b/Modelica/Mechanics/Rotational/Components/Inertia.mo index 6f9ec93d9a..28a71ecc65 100644 --- a/Modelica/Mechanics/Rotational/Components/Inertia.mo +++ b/Modelica/Mechanics/Rotational/Components/Inertia.mo @@ -33,11 +33,13 @@ Rotational component with inertia and two rigidly connected fla Rectangle(lineColor={64,64,64}, fillColor={192,192,192}, fillPattern=FillPattern.HorizontalCylinder, - extent={{-100.0,-10.0},{-50.0,10.0}}), + extent={{-100.0,-10.0},{-50.0,10.0}}, + pattern=LinePattern.None), Rectangle(lineColor={64,64,64}, fillColor={192,192,192}, fillPattern=FillPattern.HorizontalCylinder, - extent={{50.0,-10.0},{100.0,10.0}}), + extent={{50.0,-10.0},{100.0,10.0}}, + pattern=LinePattern.None), Line(points={{-80.0,-25.0},{-60.0,-25.0}}), Line(points={{60.0,-25.0},{80.0,-25.0}}), Line(points={{-70.0,-25.0},{-70.0,-70.0}}), @@ -51,7 +53,8 @@ Rotational component with inertia and two rigidly connected fla fillColor={255,255,255}, fillPattern=FillPattern.HorizontalCylinder, extent={{-50.0,-50.0},{50.0,50.0}}, - radius=10.0), + radius=10.0, + pattern=LinePattern.None), Text(textColor={0,0,255}, extent={{-150.0,60.0},{150.0,100.0}}, textString="%name"), diff --git a/Modelica/Mechanics/Rotational/Components/TorqueToAngleAdaptor.mo b/Modelica/Mechanics/Rotational/Components/TorqueToAngleAdaptor.mo index 1771d9267c..9b29953ffc 100644 --- a/Modelica/Mechanics/Rotational/Components/TorqueToAngleAdaptor.mo +++ b/Modelica/Mechanics/Rotational/Components/TorqueToAngleAdaptor.mo @@ -56,7 +56,8 @@ equation lineColor={95,95,95}, fillColor={255,255,255}, fillPattern=FillPattern.HorizontalCylinder, - radius=10), + radius=10, + pattern=LinePattern.None), Rectangle( extent={{-20,100},{20,-100}}, lineColor={95,95,95}, diff --git a/Modelica/Mechanics/Rotational/Components/package.mo b/Modelica/Mechanics/Rotational/Components/package.mo index 7856e16e4c..8c8ccdff14 100644 --- a/Modelica/Mechanics/Rotational/Components/package.mo +++ b/Modelica/Mechanics/Rotational/Components/package.mo @@ -11,7 +11,8 @@ package Components "Components for 1D rotational mechanical drive trains" fillColor={255,255,255}, fillPattern=FillPattern.HorizontalCylinder, extent={{-63.5135,-126.9841},{36.4865,-26.9841}}, - radius=10.0), + radius=10.0, + pattern=LinePattern.None), Rectangle(origin={13.5135,76.9841}, lineColor={64,64,64}, extent={{-63.5135,-126.9841},{36.4865,-26.9841}}, @@ -20,12 +21,14 @@ package Components "Components for 1D rotational mechanical drive trains" lineColor={64,64,64}, fillColor={192,192,192}, fillPattern=FillPattern.HorizontalCylinder, - extent={{-87.0,-83.0769},{-47.0,-63.0769}}), + extent={{-87.0,-83.0769},{-47.0,-63.0769}}, + pattern=LinePattern.None), Rectangle(origin={22.3077,70.0}, lineColor={64,64,64}, fillColor={192,192,192}, fillPattern=FillPattern.HorizontalCylinder, - extent={{27.6923,-80.0},{67.6923,-60.0}})}), Documentation(info=" + extent={{27.6923,-80.0},{67.6923,-60.0}}, + pattern=LinePattern.None)}), Documentation(info="

This package contains basic components 1D mechanical rotational drive trains.

diff --git a/Modelica/Mechanics/Rotational/Icons/Clutch.mo b/Modelica/Mechanics/Rotational/Icons/Clutch.mo index 6b14fceb97..e8e321a633 100644 --- a/Modelica/Mechanics/Rotational/Icons/Clutch.mo +++ b/Modelica/Mechanics/Rotational/Icons/Clutch.mo @@ -5,23 +5,27 @@ model Clutch "Icon of a clutch" Rectangle( lineColor={64,64,64}, fillColor={192,192,192}, fillPattern=FillPattern.HorizontalCylinder, - extent={{-100.0,-10.0},{-30.0,10.0}}), + extent={{-100.0,-10.0},{-30.0,10.0}}, + pattern=LinePattern.None), Rectangle( lineColor={64,64,64}, fillColor={255,255,255}, fillPattern=FillPattern.HorizontalCylinder, - extent={{-30.0,-60.0},{-10.0,60.0}}), + extent={{-30.0,-60.0},{-10.0,60.0}}, + pattern=LinePattern.None), Rectangle( lineColor={64,64,64}, extent={{-30.0,-60.0},{-10.0,60.0}}), Rectangle( lineColor={64,64,64}, fillColor={255,255,255}, fillPattern=FillPattern.HorizontalCylinder, - extent={{10.0,-60.0},{30.0,60.0}}), + extent={{10.0,-60.0},{30.0,60.0}}, + pattern=LinePattern.None), Rectangle( lineColor={64,64,64}, extent={{10.0,-60.0},{30.0,60.0}}), Rectangle( lineColor={64,64,64}, fillColor={192,192,192}, fillPattern=FillPattern.HorizontalCylinder, - extent={{30.0,-10.0},{100.0,10.0}}), + extent={{30.0,-10.0},{100.0,10.0}}, + pattern=LinePattern.None), Polygon( lineColor={0,0,127}, fillColor={0,0,127}, fillPattern=FillPattern.Solid, diff --git a/Modelica/Mechanics/Rotational/Icons/Gear.mo b/Modelica/Mechanics/Rotational/Icons/Gear.mo index 3366aeba42..4b6d1c3ffe 100644 --- a/Modelica/Mechanics/Rotational/Icons/Gear.mo +++ b/Modelica/Mechanics/Rotational/Icons/Gear.mo @@ -9,12 +9,14 @@ partial class Gear "Icon of a rotational gear" origin={-35.0,60.0}, fillColor={255,255,255}, fillPattern=FillPattern.HorizontalCylinder, - extent={{-15.0,-40.0},{15.0,40.0}}), + extent={{-15.0,-40.0},{15.0,40.0}}, + pattern=LinePattern.None), Rectangle( origin={-35.0,0.0}, fillColor={255,255,255}, fillPattern=FillPattern.HorizontalCylinder, - extent={{-15.0,-21.0},{15.0,21.0}}), + extent={{-15.0,-21.0},{15.0,21.0}}, + pattern=LinePattern.None), Line( points={{-80.0,20.0},{-60.0,20.0}}), Line( @@ -40,13 +42,15 @@ partial class Gear "Icon of a rotational gear" lineColor={64,64,64}, fillColor={191,191,191}, fillPattern=FillPattern.HorizontalCylinder, - extent={{-25.0,-10.0},{25.0,10.0}}), + extent={{-25.0,-10.0},{25.0,10.0}}, + pattern=LinePattern.None), Rectangle( origin={75.0,0.0}, lineColor={64,64,64}, fillColor={191,191,191}, fillPattern=FillPattern.HorizontalCylinder, - extent={{-25.0,-10.0},{25.0,10.0}}), + extent={{-25.0,-10.0},{25.0,10.0}}, + pattern=LinePattern.None), Rectangle( origin={-35.0,-19.0}, fillColor={153,153,153}, @@ -72,7 +76,8 @@ partial class Gear "Icon of a rotational gear" lineColor={64,64,64}, fillColor={191,191,191}, fillPattern=FillPattern.HorizontalCylinder, - extent={{-20.0,-10.0},{20.0,10.0}}), + extent={{-20.0,-10.0},{20.0,10.0}}, + pattern=LinePattern.None), Rectangle( origin={-35.0,98.0}, fillColor={153,153,153}, @@ -107,7 +112,8 @@ partial class Gear "Icon of a rotational gear" origin={35.0,60.0}, fillColor={255,255,255}, fillPattern=FillPattern.HorizontalCylinder, - extent={{-15.0,-21.0},{15.0,21.0}}), + extent={{-15.0,-21.0},{15.0,21.0}}, + pattern=LinePattern.None), Rectangle( origin={35.0,41.0}, fillColor={153,153,153}, @@ -132,7 +138,8 @@ partial class Gear "Icon of a rotational gear" origin={35.0,0.0}, fillColor={255,255,255}, fillPattern=FillPattern.HorizontalCylinder, - extent={{-15.0,-40.0},{15.0,40.0}}), + extent={{-15.0,-40.0},{15.0,40.0}}, + pattern=LinePattern.None), Rectangle( origin={35.0,38.0}, fillColor={153,153,153}, diff --git a/Modelica/Mechanics/Rotational/Icons/Gearbox.mo b/Modelica/Mechanics/Rotational/Icons/Gearbox.mo index 178bb7f3f7..e9f07a1384 100644 --- a/Modelica/Mechanics/Rotational/Icons/Gearbox.mo +++ b/Modelica/Mechanics/Rotational/Icons/Gearbox.mo @@ -9,21 +9,25 @@ model Gearbox "Icon of a gear box" lineColor={64,64,64}, fillColor={192,192,192}, fillPattern=FillPattern.HorizontalCylinder, - extent={{-100,-10},{100,10}}), + extent={{-100,-10},{100,10}}, + pattern=LinePattern.None), Polygon(fillColor={192,192,192}, fillPattern=FillPattern.HorizontalCylinder, - points={{-60.0,10.0},{-60.0,20.0},{-40.0,40.0},{-40.0,-40.0},{-60.0,-20.0},{-60.0,10.0}}), + points={{-60.0,10.0},{-60.0,20.0},{-40.0,40.0},{-40.0,-40.0},{-60.0,-20.0},{-60.0,10.0}}, + pattern=LinePattern.None), Rectangle(lineColor={64,64,64}, fillColor={255,255,255}, fillPattern=FillPattern.HorizontalCylinder, extent={{-40.0,-60.0},{40.0,60.0}}, - radius=10.0), + radius=10.0, + pattern=LinePattern.None), Rectangle(lineColor={64,64,64}, extent={{-40.0,-60.0},{40.0,60.0}}, radius=10.0), Polygon(fillColor={192,192,192}, fillPattern=FillPattern.HorizontalCylinder, - points={{60.0,20.0},{40.0,40.0},{40.0,-40.0},{60.0,-20.0},{60.0,20.0}}), + points={{60.0,20.0},{40.0,40.0},{40.0,-40.0},{60.0,-20.0},{60.0,20.0}}, + pattern=LinePattern.None), Polygon( fillColor={64,64,64}, fillPattern=FillPattern.Solid, diff --git a/Modelica/Mechanics/Rotational/Sources/Accelerate.mo b/Modelica/Mechanics/Rotational/Sources/Accelerate.mo index 9bfa98ab2f..7bbb9eb265 100644 --- a/Modelica/Mechanics/Rotational/Sources/Accelerate.mo +++ b/Modelica/Mechanics/Rotational/Sources/Accelerate.mo @@ -46,7 +46,8 @@ blocks of the block library Modelica.Blocks.Sources. Rectangle(lineColor={64,64,64}, fillColor={192,192,192}, fillPattern=FillPattern.HorizontalCylinder, - extent={{-100.0,-20.0},{100.0,20.0}}), + extent={{-100.0,-20.0},{100.0,20.0}}, + pattern=LinePattern.None), Line(points={{-30.0,-32.0},{30.0,-32.0}}), Line(points={{0.0,52.0},{0.0,32.0}}), Line(points={{-29.0,32.0},{30.0,32.0}}), diff --git a/Modelica/Mechanics/Rotational/Sources/Move.mo b/Modelica/Mechanics/Rotational/Sources/Move.mo index 8f1ac99c08..0479b953a5 100644 --- a/Modelica/Mechanics/Rotational/Sources/Move.mo +++ b/Modelica/Mechanics/Rotational/Sources/Move.mo @@ -84,7 +84,8 @@ blocks of the block library Modelica.Blocks.Sources. Rectangle(lineColor={64,64,64}, fillColor={192,192,192}, fillPattern=FillPattern.HorizontalCylinder, - extent={{-100.0,-20.0},{100.0,20.0}}), + extent={{-100.0,-20.0},{100.0,20.0}}, + pattern=LinePattern.None), Line(points={{-30.0,-32.0},{30.0,-32.0}}), Line(points={{0.0,52.0},{0.0,32.0}}), Line(points={{-29.0,32.0},{30.0,32.0}}), diff --git a/Modelica/Mechanics/Rotational/Sources/Position.mo b/Modelica/Mechanics/Rotational/Sources/Position.mo index 16db91646e..cbf28a20fc 100644 --- a/Modelica/Mechanics/Rotational/Sources/Position.mo +++ b/Modelica/Mechanics/Rotational/Sources/Position.mo @@ -82,7 +82,8 @@ blocks of the block library Modelica.Blocks.Sources. Rectangle(lineColor={64,64,64}, fillColor={192,192,192}, fillPattern=FillPattern.HorizontalCylinder, - extent={{-100.0,-20.0},{100.0,20.0}}), + extent={{-100.0,-20.0},{100.0,20.0}}, + pattern=LinePattern.None), Line(points={{-30,-32},{30,-32}}), Line(points={{0,52},{0,32}}), Line(points={{-29,32},{30,32}}), diff --git a/Modelica/Mechanics/Rotational/Sources/Speed.mo b/Modelica/Mechanics/Rotational/Sources/Speed.mo index 8f667557de..8591950af2 100644 --- a/Modelica/Mechanics/Rotational/Sources/Speed.mo +++ b/Modelica/Mechanics/Rotational/Sources/Speed.mo @@ -87,7 +87,8 @@ blocks of the block library Modelica.Blocks.Sources. Rectangle(lineColor={64,64,64}, fillColor={192,192,192}, fillPattern=FillPattern.HorizontalCylinder, - extent={{-100.0,-20.0},{100.0,20.0}}), + extent={{-100.0,-20.0},{100.0,20.0}}, + pattern=LinePattern.None), Line(points={{-30.0,-32.0},{30.0,-32.0}}), Line(points={{0.0,52.0},{0.0,32.0}}), Line(points={{-29.0,32.0},{30.0,32.0}}), diff --git a/Modelica/Mechanics/Rotational/package.mo b/Modelica/Mechanics/Rotational/package.mo index 0b677f4e0a..e8efc1fd73 100644 --- a/Modelica/Mechanics/Rotational/package.mo +++ b/Modelica/Mechanics/Rotational/package.mo @@ -69,7 +69,8 @@ Copyright © 1998-2025, Modelica Association and contributors fillColor={255,255,255}, fillPattern=FillPattern.HorizontalCylinder, extent={{-63.5135,-126.9841},{36.4865,-26.9841}}, - radius=10.0), + radius=10.0, + pattern=LinePattern.None), Rectangle(origin={13.5135,76.9841}, lineColor={64,64,64}, extent={{-63.5135,-126.9841},{36.4865,-26.9841}}, @@ -78,10 +79,12 @@ Copyright © 1998-2025, Modelica Association and contributors lineColor={64,64,64}, fillColor={192,192,192}, fillPattern=FillPattern.HorizontalCylinder, - extent={{-87.0,-83.0769},{-47.0,-63.0769}}), + extent={{-87.0,-83.0769},{-47.0,-63.0769}}, + pattern=LinePattern.None), Rectangle(origin={22.3077,70.0}, lineColor={64,64,64}, fillColor={192,192,192}, fillPattern=FillPattern.HorizontalCylinder, - extent={{27.6923,-80.0},{67.6923,-60.0}})})); + extent={{27.6923,-80.0},{67.6923,-60.0}}, + pattern=LinePattern.None)})); end Rotational; diff --git a/Modelica/Mechanics/package.mo b/Modelica/Mechanics/package.mo index 6b7d689967..6fa67ed232 100644 --- a/Modelica/Mechanics/package.mo +++ b/Modelica/Mechanics/package.mo @@ -9,7 +9,8 @@ package Mechanics "Library of 1-dim. and 3-dim. mechanical components (multi-bod lineColor={64,64,64}, fillColor={192,192,192}, fillPattern=FillPattern.HorizontalCylinder, - extent={{-4.6,-93.3333},{41.4,-53.3333}}), + extent={{-4.6,-93.3333},{41.4,-53.3333}}, + pattern=LinePattern.None), Ellipse( origin={9.0,46.0}, extent={{-90.0,-60.0},{-80.0,-50.0}}), diff --git a/Modelica/Media/package.mo b/Modelica/Media/package.mo index 727e616df3..d16f1a08d8 100644 --- a/Modelica/Media/package.mo +++ b/Modelica/Media/package.mo @@ -3431,10 +3431,12 @@ transport. extent={{-100,-100},{100,100}}), graphics={Rectangle( extent={{20,60},{100,-60}}, fillPattern=FillPattern.HorizontalCylinder, - fillColor={192,192,192}),Rectangle( + fillColor={192,192,192}, + pattern=LinePattern.None), Rectangle( extent={{38,40},{100,-40}}, fillPattern=FillPattern.HorizontalCylinder, - fillColor={0,127,255}),Ellipse( + fillColor={0,127,255}, + pattern=LinePattern.None), Ellipse( extent={{-100,80},{60,-80}}, fillColor={255,255,255}, fillPattern=FillPattern.Solid, @@ -3590,10 +3592,12 @@ with exception of ambient pressure, do not have an effect. -100},{100,100}}), graphics={Rectangle( extent={{-100,60},{100,-60}}, fillPattern=FillPattern.HorizontalCylinder, - fillColor={192,192,192}),Rectangle( + fillColor={192,192,192}, + pattern=LinePattern.None), Rectangle( extent={{-100,34},{100,-36}}, fillPattern=FillPattern.HorizontalCylinder, - fillColor={0,127,255}),Text( + fillColor={0,127,255}, + pattern=LinePattern.None), Text( extent={{-150,110},{150,70}}, textString="%name", textColor={0,0,255}), Text( extent={{-150,-70},{150,-110}}, diff --git a/Modelica/StateGraph.mo b/Modelica/StateGraph.mo index 49784803f7..edde5b5897 100644 --- a/Modelica/StateGraph.mo +++ b/Modelica/StateGraph.mo @@ -1564,7 +1564,8 @@ buttons: + level*100)}}), lineThickness=0.5, fillPattern=FillPattern.HorizontalCylinder, - fillColor={191,0,95})})); + fillColor={191,0,95}, + pattern=LinePattern.None)})); end Tank; model Source diff --git a/Modelica/Thermal/FluidHeatFlow/Components/Cylinder.mo b/Modelica/Thermal/FluidHeatFlow/Components/Cylinder.mo index 4cf72b6b00..f4bf3ffa03 100644 --- a/Modelica/Thermal/FluidHeatFlow/Components/Cylinder.mo +++ b/Modelica/Thermal/FluidHeatFlow/Components/Cylinder.mo @@ -60,13 +60,15 @@ The position of the flange (as well as of the support, if useSupport=true) is in extent={{-24,58},{-14,-58}}, lineThickness=0.5, fillColor={192,192,192}, - fillPattern=FillPattern.HorizontalCylinder), + fillPattern=FillPattern.HorizontalCylinder, + pattern=LinePattern.None), Rectangle( extent={{-14,10},{90,-10}}, lineThickness=0.5, lineColor={0,127,0}, fillColor={160,215,160}, - fillPattern=FillPattern.HorizontalCylinder), + fillPattern=FillPattern.HorizontalCylinder, + pattern=LinePattern.None), Line(points={{-10,-72},{70,-72}}), Polygon( points={{-40,-72},{-10,-62},{-10,-82},{-40,-72}}, diff --git a/Modelica/Thermal/FluidHeatFlow/Components/OpenTank.mo b/Modelica/Thermal/FluidHeatFlow/Components/OpenTank.mo index 90c9cf3a4f..cbf77a605d 100644 --- a/Modelica/Thermal/FluidHeatFlow/Components/OpenTank.mo +++ b/Modelica/Thermal/FluidHeatFlow/Components/OpenTank.mo @@ -53,12 +53,14 @@ equation Rectangle( extent={{-80,80},{80,-80}}, fillPattern=FillPattern.VerticalCylinder, - fillColor={255,255,255}), + fillColor={255,255,255}, + pattern=LinePattern.None), Rectangle( extent=DynamicSelect({{-80,0},{80,-80}}, {{-80,(-80+160*level/hTank)},{80,-80}}), fillPattern=FillPattern.VerticalCylinder, - fillColor={170,170,255}), + fillColor={170,170,255}, + pattern=LinePattern.None), Ellipse( extent=DynamicSelect({{-80,20},{80,-20}}, {{-80,(-60+160*level/hTank)},{80,(-100+160*level/hTank)}}), diff --git a/Modelica/Thermal/FluidHeatFlow/Sources/IdealPump.mo b/Modelica/Thermal/FluidHeatFlow/Sources/IdealPump.mo index e6c3a95838..0e5eba0b7d 100644 --- a/Modelica/Thermal/FluidHeatFlow/Sources/IdealPump.mo +++ b/Modelica/Thermal/FluidHeatFlow/Sources/IdealPump.mo @@ -64,9 +64,11 @@ Thermodynamic equations are defined by BaseClasses.TwoPort. Rectangle( extent={{-10,-40},{10,-100}}, fillPattern=FillPattern.VerticalCylinder, - fillColor={175,175,175}), + fillColor={175,175,175}, + pattern=LinePattern.None), Polygon( points={{-60,68},{90,10},{90,-10},{-60,-68},{-60,68}}, fillPattern=FillPattern.HorizontalCylinder, - fillColor={0,0,255})})); + fillColor={0,0,255}, + pattern=LinePattern.None)})); end IdealPump; diff --git a/ModelicaTest/Fluid/BaseClasses.mo b/ModelicaTest/Fluid/BaseClasses.mo index 8fcfcc8c3c..191c5accc2 100644 --- a/ModelicaTest/Fluid/BaseClasses.mo +++ b/ModelicaTest/Fluid/BaseClasses.mo @@ -49,7 +49,8 @@ package BaseClasses "Specific models used for testing" {100,100}}), graphics={Rectangle( extent={{-100,60},{100,-60}}, fillPattern=FillPattern.HorizontalCylinder, - fillColor={0,127,255})}), Documentation(info=" + fillColor={0,127,255}, + pattern=LinePattern.None)}), Documentation(info="

This component is intended for early designs and later replacement by more detailed models. It describes the static head due to the height difference between its two ports. @@ -226,11 +227,13 @@ pipe wall/environment). Rectangle( extent={{-100,60},{100,-60}}, fillPattern=FillPattern.HorizontalCylinder, - fillColor={192,192,192}), + fillColor={192,192,192}, + pattern=LinePattern.None), Rectangle( extent={{-100,34},{100,-36}}, fillPattern=FillPattern.HorizontalCylinder, - fillColor={0,127,255}), + fillColor={0,127,255}, + pattern=LinePattern.None), Text( extent={{-134,-66},{130,-92}}, textString="quad.turbulent")}), @@ -336,11 +339,13 @@ pipe wall/environment). Rectangle( extent={{-100,60},{100,-60}}, fillPattern=FillPattern.HorizontalCylinder, - fillColor={192,192,192}), + fillColor={192,192,192}, + pattern=LinePattern.None), Rectangle( extent={{-100,44},{100,-45}}, fillPattern=FillPattern.HorizontalCylinder, - fillColor={0,127,255}), + fillColor={0,127,255}, + pattern=LinePattern.None), Text( extent={{-150,80},{150,120}}, textColor={0,0,255},