From d96f2b393a3b5b424c3b92230be572c247da97e1 Mon Sep 17 00:00:00 2001 From: HOS Date: Mon, 8 Dec 2025 09:54:34 +0100 Subject: [PATCH 1/7] Automatically set LinePattern.None instead of solid lines for gradients. --- Complex.mo | 10 ++++++--- .../Electrical/Analog/Basic/RotationalEMF.mo | 6 ++++-- .../Analog/Basic/TranslationalEMF.mo | 3 ++- .../Analog/Sources/DCPowerSupply.mo | 6 ++++-- .../Batteries/BatteryStacks/package.mo | 6 ++++-- .../BatteryStacksWithSensors/package.mo | 6 ++++-- .../Icons/TransientRecordsPackage.mo | 3 ++- Modelica/Electrical/Batteries/package.mo | 19 +++++++++++------ .../BasicMachines/Components/PartialAirGap.mo | 3 ++- .../Components/PartialAirGapDC.mo | 3 ++- .../BasicMachines/Transformers/package.mo | 15 ++++++++----- .../Machines/BasicMachines/package.mo | 9 +++++--- Modelica/Electrical/Machines/Icons/Drive.mo | 9 +++++--- .../Machines/Icons/FundamentalWaveMachine.mo | 9 +++++--- Modelica/Electrical/Machines/Icons/Machine.mo | 9 +++++--- .../QuasiStaticFundamentalWaveMachine.mo | 9 +++++--- .../Machines/Icons/QuasiStaticMachine.mo | 9 +++++--- .../Machines/Icons/QuasiStaticTransformer.mo | 15 ++++++++----- .../Machines/Icons/TransientMachine.mo | 9 +++++--- .../Machines/Icons/TransientTransformer.mo | 15 ++++++++----- .../Electrical/Machines/Losses/Friction.mo | 18 ++++++++++------ .../Electrical/Machines/Utilities/Coupling.mo | 6 ++++-- Modelica/Electrical/Machines/package.mo | 9 +++++--- .../Polyphase/Basic/SaturatingInductor.mo | 3 ++- .../BasicMachines/Transformers/package.mo | 15 ++++++++----- .../Machines/BasicMachines/package.mo | 9 +++++--- .../QuasiStatic/Machines/package.mo | 9 +++++--- .../SinglePhase/Ideal/IdealTransformer.mo | 3 ++- Modelica/Fluid/Examples/AST_BatchPlant.mo | 12 +++++++---- Modelica/Fluid/Examples/DrumBoiler.mo | 6 ++++-- Modelica/Fluid/Examples/HeatExchanger.mo | 9 +++++--- Modelica/Fluid/Fittings.mo | 16 +++++++++----- Modelica/Fluid/Machines.mo | 9 +++++--- Modelica/Fluid/Pipes.mo | 7 +++++-- Modelica/Fluid/Sources.mo | 16 +++++++++----- Modelica/Fluid/Vessels.mo | 10 ++++++--- Modelica/Icons.mo | 6 ++++-- .../Transformer1PhaseWithHysteresis.mo | 12 +++++++---- .../Transformer3PhaseYyWithHysteresis.mo | 21 ++++++++++++------- .../TranslatoryArmatureAndStopper.mo | 6 ++++-- Modelica/Magnetic/FundamentalWave/package.mo | 9 +++++--- .../Losses/PermanentMagnetLosses.mo | 4 ++-- .../QuasiStatic/FundamentalWave/package.mo | 9 +++++--- .../Examples/Loops/Utilities/Cylinder.mo | 3 ++- .../Examples/Loops/Utilities/CylinderBase.mo | 3 ++- .../Systems/RobotR3/Utilities/AxisType1.mo | 12 +++++++---- .../Systems/RobotR3/Utilities/AxisType2.mo | 9 +++++--- .../MultiBody/Forces/LineForceWithMass.mo | 18 ++++++++++------ .../Forces/LineForceWithTwoMasses.mo | 18 ++++++++++------ .../MultiBody/Interfaces/FlangeWithBearing.mo | 6 ++++-- .../MultiBody/Joints/Assemblies/JointSSP.mo | 12 +++++++---- .../MultiBody/Joints/Assemblies/JointSSR.mo | 18 ++++++++++------ .../MultiBody/Joints/Assemblies/JointUPS.mo | 3 ++- .../MultiBody/Joints/Assemblies/JointUSP.mo | 9 +++++--- .../MultiBody/Joints/Assemblies/JointUSR.mo | 15 ++++++++----- .../MultiBody/Joints/Constraints/Revolute.mo | 6 ++++-- .../MultiBody/Joints/Constraints/Spherical.mo | 6 ++++-- .../MultiBody/Joints/Constraints/Universal.mo | 3 ++- .../Mechanics/MultiBody/Joints/Cylindrical.mo | 6 ++++-- .../MultiBody/Joints/GearConstraint.mo | 21 ++++++++++++------- .../Internal/RevoluteWithLengthConstraint.mo | 9 +++++--- .../Mechanics/MultiBody/Joints/Revolute.mo | 9 +++++--- .../Joints/RevolutePlanarLoopConstraint.mo | 6 ++++-- .../Mechanics/MultiBody/Joints/Spherical.mo | 6 ++++-- .../MultiBody/Joints/SphericalSpherical.mo | 9 +++++--- .../Mechanics/MultiBody/Joints/Universal.mo | 3 ++- .../MultiBody/Joints/UniversalSpherical.mo | 3 ++- .../Mechanics/MultiBody/Joints/package.mo | 9 +++++--- .../Mechanics/MultiBody/Parts/BevelGear1D.mo | 21 ++++++++++++------- Modelica/Mechanics/MultiBody/Parts/Body.mo | 7 +++++-- .../Mechanics/MultiBody/Parts/BodyCylinder.mo | 3 ++- .../Mechanics/MultiBody/Parts/BodyShape.mo | 6 ++++-- .../Mechanics/MultiBody/Parts/PointMass.mo | 4 +++- .../Mechanics/MultiBody/Parts/RollingWheel.mo | 3 ++- .../MultiBody/Parts/RollingWheelSet.mo | 6 ++++-- Modelica/Mechanics/MultiBody/Parts/Rotor1D.mo | 12 +++++++---- Modelica/Mechanics/MultiBody/Parts/package.mo | 7 +++++-- .../Advanced/PipeWithScalarField.mo | 3 ++- .../Visualizers/PipeWithScalarField.mo | 3 ++- .../MultiBody/Visualizers/VoluminousWheel.mo | 9 +++++--- Modelica/Mechanics/MultiBody/package.mo | 3 ++- .../Components/AngleToTorqueAdaptor.mo | 9 +++++--- .../Rotational/Components/BearingFriction.mo | 3 ++- .../Mechanics/Rotational/Components/Brake.mo | 9 +++++--- .../Mechanics/Rotational/Components/Disc.mo | 12 +++++++---- .../Rotational/Components/IdealGearR2T.mo | 3 ++- .../Rotational/Components/IdealPlanetary.mo | 18 ++++++++++------ .../Components/IdealRollingWheel.mo | 9 +++++--- .../Rotational/Components/Inertia.mo | 9 +++++--- .../Components/TorqueToAngleAdaptor.mo | 3 ++- .../Rotational/Components/package.mo | 9 +++++--- Modelica/Mechanics/Rotational/Icons/Clutch.mo | 12 +++++++---- Modelica/Mechanics/Rotational/Icons/Gear.mo | 21 ++++++++++++------- .../Mechanics/Rotational/Icons/Gearbox.mo | 12 +++++++---- .../Rotational/Sources/Accelerate.mo | 3 ++- Modelica/Mechanics/Rotational/Sources/Move.mo | 3 ++- .../Mechanics/Rotational/Sources/Position.mo | 3 ++- .../Mechanics/Rotational/Sources/Speed.mo | 3 ++- Modelica/Mechanics/Rotational/package.mo | 9 +++++--- .../Translational/Components/Mass.mo | 3 ++- .../Components/MassWithStopAndFriction.mo | 3 ++- .../Components/RollingResistance.mo | 3 ++- .../Components/SupportFriction.mo | 18 ++++++++++------ .../Translational/Components/Vehicle.mo | 6 ++++-- .../Translational/Components/package.mo | 3 ++- Modelica/Mechanics/Translational/package.mo | 3 ++- Modelica/Mechanics/package.mo | 3 ++- Modelica/Media/package.mo | 18 ++++++++++------ Modelica/StateGraph.mo | 3 ++- .../FluidHeatFlow/Components/Cylinder.mo | 6 ++++-- .../FluidHeatFlow/Components/OpenTank.mo | 15 ++++++++----- .../FluidHeatFlow/Sources/IdealPump.mo | 6 ++++-- ModelicaTest/Fluid/BaseClasses.mo | 15 ++++++++----- 113 files changed, 643 insertions(+), 318 deletions(-) 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/Analog/Sources/DCPowerSupply.mo b/Modelica/Electrical/Analog/Sources/DCPowerSupply.mo index 383b7d1c88..35f9acd5ea 100644 --- a/Modelica/Electrical/Analog/Sources/DCPowerSupply.mo +++ b/Modelica/Electrical/Analog/Sources/DCPowerSupply.mo @@ -65,9 +65,11 @@ equation Rectangle(extent={{-94,94},{94,6}}, lineColor={0,0,255}, fillColor={215,215,215}, fillPattern=FillPattern.Solid), Ellipse(extent={{-80,-10},{-20,-70}}, lineColor={0,0,255}, - fillColor={215,215,215}, fillPattern=FillPattern.Sphere), + fillColor={215,215,215}, fillPattern=FillPattern.Sphere, + pattern=LinePattern.None), Ellipse(extent={{20,-10},{80,-70}}, lineColor={0,0,255}, - fillColor={215,215,215}, fillPattern=FillPattern.Sphere), + fillColor={215,215,215}, fillPattern=FillPattern.Sphere, + pattern=LinePattern.None), Text(extent={{-140,140},{140,100}}, textColor={0,0,255}, textString="%name"), Text(extent={{-80,60},{80,40}}, textColor={0,0,0}, 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/Icons/TransientRecordsPackage.mo b/Modelica/Electrical/Batteries/Icons/TransientRecordsPackage.mo index 4531c96d34..eee24d1fc0 100644 --- a/Modelica/Electrical/Batteries/Icons/TransientRecordsPackage.mo +++ b/Modelica/Electrical/Batteries/Icons/TransientRecordsPackage.mo @@ -9,7 +9,8 @@ partial package TransientRecordsPackage 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( origin={0,-20}, lineColor={64,64,64}, diff --git a/Modelica/Electrical/Batteries/package.mo b/Modelica/Electrical/Batteries/package.mo index 3665c6b767..bacfad8074 100644 --- a/Modelica/Electrical/Batteries/package.mo +++ b/Modelica/Electrical/Batteries/package.mo @@ -7,32 +7,39 @@ package Batteries "Simple battery models" fillColor={215,215,215}, fillPattern=FillPattern.Sphere, origin={0,-80}, - 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), Ellipse(extent={{-10,50},{10,-50}},lineColor={95,95,95}, fillColor={215,215,215}, fillPattern=FillPattern.Sphere, origin={0,60}, - rotation=90), + rotation=90, + pattern=LinePattern.None), Ellipse(extent={{-4,20},{4,-20}}, lineColor={95,95,95}, fillColor={215,215,215}, fillPattern=FillPattern.Sphere, origin={0,60}, - rotation=90), + rotation=90, + pattern=LinePattern.None), Rectangle(extent={{-13,20},{13,-20}}, lineColor={95,95,95}, 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, origin={0,86}, - rotation=90)}), Documentation(info=" + rotation=90, + pattern=LinePattern.None)}), + Documentation(info="

Library offering simple battery models

")); end Batteries; 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/Losses/Friction.mo b/Modelica/Electrical/Machines/Losses/Friction.mo index 0056d1a0f3..5c781ea4ac 100644 --- a/Modelica/Electrical/Machines/Losses/Friction.mo +++ b/Modelica/Electrical/Machines/Losses/Friction.mo @@ -27,27 +27,33 @@ equation Ellipse( extent={{-12,50},{8,30}}, fillPattern=FillPattern.Sphere, - fillColor={135,135,135}), + fillColor={135,135,135}, + pattern=LinePattern.None), Ellipse( extent={{-10,-30},{10,-50}}, fillPattern=FillPattern.Sphere, - fillColor={135,135,135}), + fillColor={135,135,135}, + pattern=LinePattern.None), Ellipse( extent={{24,-10},{44,-30}}, fillPattern=FillPattern.Sphere, - fillColor={135,135,135}), + fillColor={135,135,135}, + pattern=LinePattern.None), Ellipse( extent={{22,34},{42,14}}, fillPattern=FillPattern.Sphere, - fillColor={135,135,135}), + fillColor={135,135,135}, + pattern=LinePattern.None), Ellipse( extent={{-44,30},{-24,10}}, fillPattern=FillPattern.Sphere, - fillColor={135,135,135}), + fillColor={135,135,135}, + pattern=LinePattern.None), Ellipse( extent={{-44,-12},{-24,-32}}, fillPattern=FillPattern.Sphere, - fillColor={135,135,135}), + fillColor={135,135,135}, + pattern=LinePattern.None), Ellipse( extent={{-30,30},{30,-30}}, fillColor={175,175,175}, 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/Polyphase/Basic/SaturatingInductor.mo b/Modelica/Electrical/Polyphase/Basic/SaturatingInductor.mo index 680d81de6f..a73c76c529 100644 --- a/Modelica/Electrical/Polyphase/Basic/SaturatingInductor.mo +++ b/Modelica/Electrical/Polyphase/Basic/SaturatingInductor.mo @@ -27,7 +27,8 @@ equation Rectangle( extent={{-60,-10},{60,-20}}, fillPattern=FillPattern.Sphere, - fillColor={0,0,255}), + fillColor={0,0,255}, + pattern=LinePattern.None), Line( points={{-60,0},{-59,6},{-52,14},{-38,14},{-31,6},{-30,0}}, color={0,0,255}, 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..a683b8bf70 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..e77d3d63ea 100644 --- a/Modelica/Fluid/Sources.mo +++ b/Modelica/Fluid/Sources.mo @@ -100,7 +100,9 @@ package Sources "Define fixed or prescribed boundary conditions" extent={{-100,-100},{100,100}}), graphics={Ellipse( extent={{-100,100},{100,-100}}, fillPattern=FillPattern.Sphere, - fillColor={0,127,255}), Text( + fillColor={0,127,255}, + pattern=LinePattern.None), + Text( extent={{-150,110},{150,150}}, textString="%name", textColor={0,0,255})}), @@ -209,7 +211,8 @@ with exception of boundary pressure, do not have an effect. Ellipse( extent={{-100,100},{100,-100}}, fillPattern=FillPattern.Sphere, - fillColor={0,127,255}), + fillColor={0,127,255}, + pattern=LinePattern.None), Text( extent={{-150,120},{150,160}}, textString="%name", @@ -353,7 +356,8 @@ with exception of boundary pressure, do not have an effect. Ellipse( extent={{-100,100},{100,-100}}, fillPattern=FillPattern.Sphere, - fillColor={0,127,255}), + fillColor={0,127,255}, + pattern=LinePattern.None), Text( extent={{-150,110},{150,150}}, textString="%name", @@ -497,7 +501,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 +649,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..4faf6848c4 100644 --- a/Modelica/Fluid/Vessels.mo +++ b/Modelica/Fluid/Vessels.mo @@ -25,7 +25,8 @@ package Vessels "Devices for storing fluid" 100,100}}), graphics={Ellipse( extent={{-100,100},{100,-100}}, fillPattern=FillPattern.Sphere, - fillColor={170,213,255}), Text( + fillColor={170,213,255}, + pattern=LinePattern.None),Text( extent={{-150,12},{150,-18}}, textString="V=%V")}), Documentation(info=" @@ -125,7 +126,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}}, @@ -493,7 +495,9 @@ Base class for vessel heat transfer models. {100,100}}), graphics={Ellipse( extent={{-60,64},{60,-56}}, fillPattern=FillPattern.Sphere, - fillColor={232,0,0}), Text( + fillColor={232,0,0}, + pattern=LinePattern.None), + Text( extent={{-38,26},{40,-14}}, textString="%name")})); end PartialVesselHeatTransfer; 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/Losses/PermanentMagnetLosses.mo b/Modelica/Magnetic/QuasiStatic/FundamentalWave/Losses/PermanentMagnetLosses.mo index 0614f29de8..c029f4e8fa 100644 --- a/Modelica/Magnetic/QuasiStatic/FundamentalWave/Losses/PermanentMagnetLosses.mo +++ b/Modelica/Magnetic/QuasiStatic/FundamentalWave/Losses/PermanentMagnetLosses.mo @@ -22,8 +22,8 @@ equation sign(w)*(abs(w)/permanentMagnetLossParameters.wRef)^permanentMagnetLossParameters.power_w; end if; lossPower = -tau*w; - annotation (defaultComponentName="magnetLoss", Icon(graphics={Ellipse(extent={{-40,-40},{40,40}}, lineColor= - {200,0,0})}), Documentation(info=" + annotation (defaultComponentName="magnetLoss", Icon(graphics={Ellipse(extent={{-40,-40},{40,40}}, lineColor + = {200,0,0})}), Documentation(info="

Permanent magnet losses are modeled dependent on current and speed.

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/Forces/LineForceWithMass.mo b/Modelica/Mechanics/MultiBody/Forces/LineForceWithMass.mo index b8c28a18ab..244504e990 100644 --- a/Modelica/Mechanics/MultiBody/Forces/LineForceWithMass.mo +++ b/Modelica/Mechanics/MultiBody/Forces/LineForceWithMass.mo @@ -184,11 +184,13 @@ equation Ellipse( extent={{-76,16},{-44,-16}}, fillPattern=FillPattern.Sphere, - fillColor={192,192,192}), + fillColor={192,192,192}, + pattern=LinePattern.None), Ellipse( extent={{44,16},{76,-16}}, fillPattern=FillPattern.Sphere, - fillColor={192,192,192}), + fillColor={192,192,192}, + pattern=LinePattern.None), Line(points={{-60,0},{-30,30},{-30,70},{-60,70},{-60,100}}), Line(points={{60,0},{30,30},{30,70},{60,70},{60,100}}), Line( @@ -227,7 +229,8 @@ equation Ellipse( extent={{-100,-40},{-20,40}}, fillPattern=FillPattern.Sphere, - fillColor={192,192,192}), + fillColor={192,192,192}, + pattern=LinePattern.None), Ellipse( extent={{-90,-30},{-30,30}}, fillColor={255,255,255}, @@ -235,7 +238,8 @@ equation Ellipse( extent={{20,-40},{100,40}}, fillPattern=FillPattern.Sphere, - fillColor={192,192,192}), + fillColor={192,192,192}, + pattern=LinePattern.None), Ellipse( extent={{31,-29},{91,30}}, lineColor={128,128,128}, @@ -249,11 +253,13 @@ equation Ellipse( extent={{-74,15},{-45,-13}}, fillPattern=FillPattern.Sphere, - fillColor={192,192,192}), + fillColor={192,192,192}, + pattern=LinePattern.None), Ellipse( extent={{45,15},{74,-13}}, fillPattern=FillPattern.Sphere, - fillColor={192,192,192}), + fillColor={192,192,192}, + pattern=LinePattern.None), Line(points={{-60,0},{-60,24},{-40,24},{-40,60},{-60,60},{-60,100}}), Line(points={{60,1},{60,21},{40,21},{40,60},{60,60},{60,100}}), Line( diff --git a/Modelica/Mechanics/MultiBody/Forces/LineForceWithTwoMasses.mo b/Modelica/Mechanics/MultiBody/Forces/LineForceWithTwoMasses.mo index eed991f7ef..c979524e08 100644 --- a/Modelica/Mechanics/MultiBody/Forces/LineForceWithTwoMasses.mo +++ b/Modelica/Mechanics/MultiBody/Forces/LineForceWithTwoMasses.mo @@ -251,11 +251,13 @@ equation Ellipse( extent={{-76,16},{-44,-16}}, fillPattern=FillPattern.Sphere, - fillColor={192,192,192}), + fillColor={192,192,192}, + pattern=LinePattern.None), Ellipse( extent={{44,16},{76,-16}}, fillPattern=FillPattern.Sphere, - fillColor={192,192,192}), + fillColor={192,192,192}, + pattern=LinePattern.None), Line(points={{30,0},{60,0},{30,30},{30,70},{60,70},{60,100}}), Line(points={{-30,0},{-60,0},{-30,30},{-30,70},{-60,70},{-60,101}}), Ellipse( @@ -297,7 +299,8 @@ equation Ellipse( extent={{-100,-40},{-20,40}}, fillPattern=FillPattern.Sphere, - fillColor={192,192,192}), + fillColor={192,192,192}, + pattern=LinePattern.None), Ellipse( extent={{-90,-30},{-30,30}}, fillColor={255,255,255}, @@ -305,7 +308,8 @@ equation Ellipse( extent={{20,-40},{100,40}}, fillPattern=FillPattern.Sphere, - fillColor={192,192,192}), + fillColor={192,192,192}, + pattern=LinePattern.None), Ellipse( extent={{31,-29},{91,30}}, lineColor={128,128,128}, @@ -319,11 +323,13 @@ equation Ellipse( extent={{-74,15},{-45,-13}}, fillPattern=FillPattern.Sphere, - fillColor={192,192,192}), + fillColor={192,192,192}, + pattern=LinePattern.None), Ellipse( extent={{45,15},{74,-13}}, fillPattern=FillPattern.Sphere, - fillColor={192,192,192}), + fillColor={192,192,192}, + pattern=LinePattern.None), Line(points={{-60,0},{-60,24},{-40,24},{-40,60},{-60,60},{-60,100}}), Line(points={{60,1},{60,21},{40,21},{40,60},{60,60},{60,100}}), Line( 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..9badd100e4 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}, @@ -335,11 +337,13 @@ component). Ellipse( extent={{-20,10},{0,-10}}, fillPattern=FillPattern.Sphere, - fillColor={192,192,192}), + fillColor={192,192,192}, + pattern=LinePattern.None), Ellipse( extent={{-86,10},{-66,-10}}, fillPattern=FillPattern.Sphere, - fillColor={192,192,192}), + fillColor={192,192,192}, + pattern=LinePattern.None), Line( points={{14,0},{14,80},{0,80},{0,100}}, color={95,95,95}, diff --git a/Modelica/Mechanics/MultiBody/Joints/Assemblies/JointSSR.mo b/Modelica/Mechanics/MultiBody/Joints/Assemblies/JointSSR.mo index b8f0e6c92d..6026d440db 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,15 +331,18 @@ 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, - fillColor={192,192,192}), + fillColor={192,192,192}, + pattern=LinePattern.None), Ellipse( extent={{-86,10},{-66,-10}}, fillPattern=FillPattern.Sphere, - fillColor={192,192,192}), + fillColor={192,192,192}, + pattern=LinePattern.None), Line( points={{14,0},{14,80},{0,80},{0,100}}, color={95,95,95}, diff --git a/Modelica/Mechanics/MultiBody/Joints/Assemblies/JointUPS.mo b/Modelica/Mechanics/MultiBody/Joints/Assemblies/JointUPS.mo index b6dfca9a1a..bec1bc7e9a 100644 --- a/Modelica/Mechanics/MultiBody/Joints/Assemblies/JointUPS.mo +++ b/Modelica/Mechanics/MultiBody/Joints/Assemblies/JointUPS.mo @@ -417,7 +417,8 @@ component). Ellipse( extent={{44,16},{76,-16}}, fillPattern=FillPattern.Sphere, - fillColor={192,192,192}), + fillColor={192,192,192}, + pattern=LinePattern.None), Ellipse( extent={{-100,-40},{-20,40}}, startAngle=90, diff --git a/Modelica/Mechanics/MultiBody/Joints/Assemblies/JointUSP.mo b/Modelica/Mechanics/MultiBody/Joints/Assemblies/JointUSP.mo index 548bb0b117..7bf6ff5aa8 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,11 +419,13 @@ 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, - fillColor={192,192,192}), + fillColor={192,192,192}, + pattern=LinePattern.None), Line( points={{-70,28},{-70,-30}}, thickness=0.5), diff --git a/Modelica/Mechanics/MultiBody/Joints/Assemblies/JointUSR.mo b/Modelica/Mechanics/MultiBody/Joints/Assemblies/JointUSR.mo index dd0611708c..5c7753319d 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( @@ -447,7 +451,8 @@ the origin of frame_a to the middle of rod 1, this might be defined as: Ellipse( extent={{-20,10},{0,-10}}, fillPattern=FillPattern.Sphere, - fillColor={192,192,192}), + fillColor={192,192,192}, + pattern=LinePattern.None), Line( points={{-70,28},{-70,-30}}, thickness=0.5), 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..4197580840 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, @@ -110,7 +111,8 @@ equation extent={{-26,26},{26,-26}}, fillPattern=FillPattern.Sphere, fillColor={192,192,192}, - lineColor={0,0,0}), + lineColor={0,0,0}, + pattern=LinePattern.None), Text( extent={{-100,-70},{100,-100}}, textColor={95,95,95}, 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..37cd7eaab1 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, @@ -268,7 +269,8 @@ frame_b of the joint. extent={{-26,26},{26,-26}}, fillPattern=FillPattern.Sphere, fillColor={192,192,192}, - lineColor={0,0,0}), + lineColor={0,0,0}, + pattern=LinePattern.None), Text( extent={{-150,110},{150,70}}, textString="%name", diff --git a/Modelica/Mechanics/MultiBody/Joints/SphericalSpherical.mo b/Modelica/Mechanics/MultiBody/Joints/SphericalSpherical.mo index 3279ee49c1..29718450b7 100644 --- a/Modelica/Mechanics/MultiBody/Joints/SphericalSpherical.mo +++ b/Modelica/Mechanics/MultiBody/Joints/SphericalSpherical.mo @@ -241,15 +241,18 @@ 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, - fillColor={192,192,192}), + fillColor={192,192,192}, + pattern=LinePattern.None), Ellipse( extent={{44,16},{76,-16}}, fillPattern=FillPattern.Sphere, - fillColor={192,192,192}), + fillColor={192,192,192}, + pattern=LinePattern.None), Text( extent={{-150,90},{150,50}}, textString="%name", 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/UniversalSpherical.mo b/Modelica/Mechanics/MultiBody/Joints/UniversalSpherical.mo index 17bf8fe6cb..6c71f233a8 100644 --- a/Modelica/Mechanics/MultiBody/Joints/UniversalSpherical.mo +++ b/Modelica/Mechanics/MultiBody/Joints/UniversalSpherical.mo @@ -479,7 +479,8 @@ the origin of frame_a to the middle of the rod, this might be defined as: Ellipse( extent={{44,16},{76,-16}}, fillPattern=FillPattern.Sphere, - fillColor={192,192,192}), + fillColor={192,192,192}, + pattern=LinePattern.None), Ellipse( extent={{-80,-10},{-40,10}}, 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..9d13fa5548 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"), @@ -279,7 +280,9 @@ equation extent={{-20,60},{100,-60}}, lineColor={0,24,48}, fillPattern=FillPattern.Sphere, - fillColor={0,127,255})}), Documentation(info=" + fillColor={0,127,255}, + pattern=LinePattern.None)}), + Documentation(info="

Rigid body with mass and inertia tensor. All parameter vectors have to be resolved in frame_a. 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..ff8626e09d 100644 --- a/Modelica/Mechanics/MultiBody/Parts/BodyShape.mo +++ b/Modelica/Mechanics/MultiBody/Parts/BodyShape.mo @@ -275,12 +275,14 @@ 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}, fillPattern=FillPattern.Sphere, - fillColor={0,127,255}), + fillColor={0,127,255}, + pattern=LinePattern.None), Text( extent={{-50,24},{55,-27}}, textString="%m"), diff --git a/Modelica/Mechanics/MultiBody/Parts/PointMass.mo b/Modelica/Mechanics/MultiBody/Parts/PointMass.mo index fc00148a0e..7814f0d44f 100644 --- a/Modelica/Mechanics/MultiBody/Parts/PointMass.mo +++ b/Modelica/Mechanics/MultiBody/Parts/PointMass.mo @@ -98,7 +98,9 @@ the only case where this is done. extent={{-50,50},{50,-50}}, lineColor={0,24,48}, fillPattern=FillPattern.Sphere, - fillColor={0,127,255})}), Documentation(info=" + fillColor={0,127,255}, + pattern=LinePattern.None)}), + Documentation(info="

Rigid body where the inertia tensor is neglected. This body is diff --git a/Modelica/Mechanics/MultiBody/Parts/RollingWheel.mo b/Modelica/Mechanics/MultiBody/Parts/RollingWheel.mo index 68eb8c2a09..e9a6697166 100644 --- a/Modelica/Mechanics/MultiBody/Parts/RollingWheel.mo +++ b/Modelica/Mechanics/MultiBody/Parts/RollingWheel.mo @@ -111,7 +111,8 @@ equation extent={{-80,80},{80,-80}}, fillColor={215,215,215}, fillPattern=FillPattern.Sphere, - lineColor={175,175,175}), + lineColor={175,175,175}, + pattern=LinePattern.None), Text( extent={{-150,120},{150,80}}, textString="%name", diff --git a/Modelica/Mechanics/MultiBody/Parts/RollingWheelSet.mo b/Modelica/Mechanics/MultiBody/Parts/RollingWheelSet.mo index ff51e24dc2..5e50cd83a8 100644 --- a/Modelica/Mechanics/MultiBody/Parts/RollingWheelSet.mo +++ b/Modelica/Mechanics/MultiBody/Parts/RollingWheelSet.mo @@ -203,7 +203,8 @@ equation extent={{42,80},{118,-80}}, fillColor={215,215,215}, fillPattern=FillPattern.Sphere, - lineColor={64,64,64}), + lineColor={64,64,64}, + pattern=LinePattern.None), Ellipse(extent={{42,80},{118,-80}}, lineColor={64,64,64}), Rectangle( extent={{-100,-80},{100,-100}}, @@ -226,7 +227,8 @@ equation extent={{-118,80},{-42,-80}}, fillColor={215,215,215}, fillPattern=FillPattern.Sphere, - lineColor={64,64,64}), + lineColor={64,64,64}, + pattern=LinePattern.None), Line( points={{-96,100},{-80,100},{-80,4}}), Ellipse(extent={{-118,80},{-42,-80}}, lineColor={64,64,64}), 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..d46d2d131b 100644 --- a/Modelica/Mechanics/MultiBody/Parts/package.mo +++ b/Modelica/Mechanics/MultiBody/Parts/package.mo @@ -104,9 +104,12 @@ 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, - fillColor={215,215,215})})); + fillColor={215,215,215}, + pattern=LinePattern.None)})); end Parts; 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/MultiBody/Visualizers/VoluminousWheel.mo b/Modelica/Mechanics/MultiBody/Visualizers/VoluminousWheel.mo index 15f34cd53f..4588383b47 100644 --- a/Modelica/Mechanics/MultiBody/Visualizers/VoluminousWheel.mo +++ b/Modelica/Mechanics/MultiBody/Visualizers/VoluminousWheel.mo @@ -60,11 +60,14 @@ equation annotation ( Icon( graphics={ - Polygon(lineColor = {64, 64, 64}, fillColor = {191, 191, 191}, fillPattern = FillPattern.Sphere, points = {{-40, 80}, {-20, 90}, {15, 90}, {40, 85}, {58.776, 73.91}, {70.456, 56.568}, {74.951, 44.383}, {78.26, 30.614}, {80.302, 15.68}, {81, 0}, {81, 0}, {80.302, -15.68}, {78.26, -30.614}, {74.951, -44.383}, {70.456, -56.568}, {58.776, -73.91}, {40, -85}, {15, -90}, {-20, -90}, {-40, -80}, {-48.776, -73.91}, {-60.456, -56.568}, {-64.951, -44.383}, {-68.26, -30.614}, {-70.302, -15.68}, {-71, 0}, {-71, 0}, {-70.302, 15.68}, {-68.26, 30.614}, {-64.951, 44.383}, {-60.456, 56.568}, {-48.776, 73.91}}, smooth = Smooth.Bezier), + Polygon(lineColor = {64, 64, 64}, fillColor = {191, 191, 191}, fillPattern = FillPattern.Sphere, points = {{-40, 80}, {-20, 90}, {15, 90}, {40, 85}, {58.776, 73.91}, {70.456, 56.568}, {74.951, 44.383}, {78.26, 30.614}, {80.302, 15.68}, {81, 0}, {81, 0}, {80.302, -15.68}, {78.26, -30.614}, {74.951, -44.383}, {70.456, -56.568}, {58.776, -73.91}, {40, -85}, {15, -90}, {-20, -90}, {-40, -80}, {-48.776, -73.91}, {-60.456, -56.568}, {-64.951, -44.383}, {-68.26, -30.614}, {-70.302, -15.68}, {-71, 0}, {-71, 0}, {-70.302, 15.68}, {-68.26, 30.614}, {-64.951, 44.383}, {-60.456, 56.568}, {-48.776, 73.91}}, smooth = Smooth.Bezier, + pattern=LinePattern.None), Polygon(lineColor = {64, 64, 64}, fillColor = {64, 64, 64}, fillPattern = FillPattern.Solid, points = {{1, 0}, {0.302, 15.68}, {-1.74, 30.614}, {-5.049, 44.383}, {-9.544, 56.568}, {-21.224, 73.91}, {-35, 80}, {-48.776, 73.91}, {-60.456, 56.568}, {-64.951, 44.383}, {-68.26, 30.614}, {-70.302, 15.68}, {-71, 0}, {-70.302, -15.68}, {-68.26, -30.614}, {-64.951, -44.383}, {-60.456, -56.568}, {-48.776, -73.91}, {-35, -80}, {-21.224, -73.91}, {-9.544, -56.568}, {-5.049, -44.383}, {-1.74, -30.614}, {0.302, -15.68}, {1, 0}}, smooth = Smooth.Bezier), - Polygon(lineColor = {64, 64, 64}, fillColor = {191, 191, 191}, fillPattern = FillPattern.HorizontalCylinder, points = {{-12.5, 0}, {-14.213, -19.134}, {-19.09, -35.355}, {-26.39, -46.194}, {-35, -50}, {-43.61, -46.194}, {-50.91, -35.355}, {-55.787, -19.134}, {-57.5, 0}, {-55.787, 19.134}, {-50.91, 35.355}, {-43.61, 46.194}, {-35, 50}, {-26.39, 46.194}, {-19.09, 35.355}, {-14.213, 19.134}, {-12.5, 0}}, smooth = Smooth.Bezier), + Polygon(lineColor = {64, 64, 64}, fillColor = {191, 191, 191}, fillPattern = FillPattern.HorizontalCylinder, points = {{-12.5, 0}, {-14.213, -19.134}, {-19.09, -35.355}, {-26.39, -46.194}, {-35, -50}, {-43.61, -46.194}, {-50.91, -35.355}, {-55.787, -19.134}, {-57.5, 0}, {-55.787, 19.134}, {-50.91, 35.355}, {-43.61, 46.194}, {-35, 50}, {-26.39, 46.194}, {-19.09, 35.355}, {-14.213, 19.134}, {-12.5, 0}}, smooth = Smooth.Bezier, + pattern=LinePattern.None), Text(textColor = {0,0,255}, extent = {{-150, 100}, {150, 140}}, textString = "%name"), - Rectangle(origin = {6.091, 0}, lineColor = {95, 95, 95}, fillColor = {215, 215, 215}, fillPattern = FillPattern.HorizontalCylinder, extent = {{-102.091, -8}, {-19.142, 8}})}, + Rectangle(origin = {6.091, 0}, lineColor = {95, 95, 95}, fillColor = {215, 215, 215}, fillPattern = FillPattern.HorizontalCylinder, extent = {{-102.091, -8}, {-19.142, 8}}, + pattern=LinePattern.None)}, coordinateSystem(extent = {{-100, -100}, {100, 100}}, preserveAspectRatio = true)), Documentation(info = "

diff --git a/Modelica/Mechanics/MultiBody/package.mo b/Modelica/Mechanics/MultiBody/package.mo index c4c9743c82..17da3a827e 100644 --- a/Modelica/Mechanics/MultiBody/package.mo +++ b/Modelica/Mechanics/MultiBody/package.mo @@ -500,5 +500,6 @@ Copyright © 1998-2025, Modelica Association and contributors extent={{-4,-14},{60,-78}}, lineColor={135,135,135}, fillPattern=FillPattern.Sphere, - fillColor={255,255,255})})); + fillColor={255,255,255}, + pattern=LinePattern.None)})); end MultiBody; 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/Translational/Components/Mass.mo b/Modelica/Mechanics/Translational/Components/Mass.mo index dcf44282a2..0d9d0d4b78 100644 --- a/Modelica/Mechanics/Translational/Components/Mass.mo +++ b/Modelica/Mechanics/Translational/Components/Mass.mo @@ -32,7 +32,8 @@ A negative force at flange flange_a moves the sliding mass to the negative direc extent={{-55,-30},{56,30}}, fillPattern=FillPattern.Sphere, fillColor={160,215,160}, - lineColor={0,127,0}), + lineColor={0,127,0}, + pattern=LinePattern.None), Polygon( points={{50,-90},{20,-80},{20,-100},{50,-90}}, lineColor={95,127,95}, diff --git a/Modelica/Mechanics/Translational/Components/MassWithStopAndFriction.mo b/Modelica/Mechanics/Translational/Components/MassWithStopAndFriction.mo index 09b834ba54..167daf7d19 100644 --- a/Modelica/Mechanics/Translational/Components/MassWithStopAndFriction.mo +++ b/Modelica/Mechanics/Translational/Components/MassWithStopAndFriction.mo @@ -287,7 +287,8 @@ between the stops. extent={{-30,30},{30,-30}}, fillPattern=FillPattern.Sphere, fillColor={166,221,166}, - lineColor={0,127,0}), + lineColor={0,127,0}, + pattern=LinePattern.None), Rectangle( extent={{-64,-16},{-56,-46}}, fillPattern=FillPattern.Solid, diff --git a/Modelica/Mechanics/Translational/Components/RollingResistance.mo b/Modelica/Mechanics/Translational/Components/RollingResistance.mo index 5392ac1758..5f7bf4c00f 100644 --- a/Modelica/Mechanics/Translational/Components/RollingResistance.mo +++ b/Modelica/Mechanics/Translational/Components/RollingResistance.mo @@ -51,7 +51,8 @@ equation Ellipse(extent={{-60,60},{60,-60}}, lineColor={0,127,0}, fillColor={160,215,160}, - fillPattern=FillPattern.Sphere), + fillPattern=FillPattern.Sphere, + pattern=LinePattern.None), Ellipse(extent={{-40,40},{40,-40}}, lineColor={0,127,0}, fillColor={255,255,255}, diff --git a/Modelica/Mechanics/Translational/Components/SupportFriction.mo b/Modelica/Mechanics/Translational/Components/SupportFriction.mo index b67740a809..f25fd62987 100644 --- a/Modelica/Mechanics/Translational/Components/SupportFriction.mo +++ b/Modelica/Mechanics/Translational/Components/SupportFriction.mo @@ -163,32 +163,38 @@ following references, especially (Armstrong and Canudas de Wit 1996): extent={{-48,-10},{-28,-30}}, lineColor={0,127,0}, fillPattern=FillPattern.Sphere, - fillColor={255,255,255}), + fillColor={255,255,255}, + pattern=LinePattern.None), Ellipse( extent={{-10,-10},{10,-30}}, lineColor={0,127,0}, fillPattern=FillPattern.Sphere, - fillColor={255,255,255}), + fillColor={255,255,255}, + pattern=LinePattern.None), Ellipse( extent={{30,-10},{50,-30}}, lineColor={0,127,0}, fillPattern=FillPattern.Sphere, - fillColor={255,255,255}), + fillColor={255,255,255}, + pattern=LinePattern.None), Ellipse( extent={{-50,30},{-30,10}}, lineColor={0,127,0}, fillPattern=FillPattern.Sphere, - fillColor={255,255,255}), + fillColor={255,255,255}, + pattern=LinePattern.None), Ellipse( extent={{-10,30},{10,10}}, lineColor={0,127,0}, fillPattern=FillPattern.Sphere, - fillColor={255,255,255}), + fillColor={255,255,255}, + pattern=LinePattern.None), Ellipse( extent={{30,30},{50,10}}, lineColor={0,127,0}, fillPattern=FillPattern.Sphere, - fillColor={255,255,255}), + fillColor={255,255,255}, + pattern=LinePattern.None), Rectangle( extent={{-90,10},{90,-10}}, lineColor={0,127,0}, diff --git a/Modelica/Mechanics/Translational/Components/Vehicle.mo b/Modelica/Mechanics/Translational/Components/Vehicle.mo index 4aaebe883b..0f574ab63c 100644 --- a/Modelica/Mechanics/Translational/Components/Vehicle.mo +++ b/Modelica/Mechanics/Translational/Components/Vehicle.mo @@ -158,8 +158,10 @@ equation extent={{30,-80},{90,-100}}, textColor={64,64,64}, textString="wind"), - Ellipse(extent={{-50,-34},{-26,-58}},lineColor={0,127,0}, fillPattern=FillPattern.Sphere, fillColor={160,215,160}), - Ellipse(extent={{20,-16},{44,-40}}, lineColor={0,127,0}, fillPattern=FillPattern.Sphere, fillColor={160,215,160}), + Ellipse(extent={{-50,-34},{-26,-58}},lineColor={0,127,0}, fillPattern=FillPattern.Sphere, fillColor={160,215,160}, + pattern=LinePattern.None), + Ellipse(extent={{20,-16},{44,-40}}, lineColor={0,127,0}, fillPattern=FillPattern.Sphere, fillColor={160,215,160}, + pattern=LinePattern.None), Ellipse(extent={{26,-22},{38,-34}}, lineColor={0,127,0}, fillPattern=FillPattern.Solid, fillColor={255,255,255}), Ellipse(extent={{-44,-40},{-32,-52}},lineColor={0,127,0}, fillPattern=FillPattern.Solid, diff --git a/Modelica/Mechanics/Translational/Components/package.mo b/Modelica/Mechanics/Translational/Components/package.mo index 127262400c..9b2f5db367 100644 --- a/Modelica/Mechanics/Translational/Components/package.mo +++ b/Modelica/Mechanics/Translational/Components/package.mo @@ -8,7 +8,8 @@ package Components "Components for 1D translational mechanical drive trains" lineColor={64,64,64}, fillColor={255,255,255}, fillPattern=FillPattern.Sphere, - extent={{-67,-66},{44,-6}})}), Documentation(info=" + extent={{-67,-66},{44,-6}}, + pattern=LinePattern.None)}), Documentation(info="

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

diff --git a/Modelica/Mechanics/Translational/package.mo b/Modelica/Mechanics/Translational/package.mo index 55c3abdd1a..f15527fe69 100644 --- a/Modelica/Mechanics/Translational/package.mo +++ b/Modelica/Mechanics/Translational/package.mo @@ -10,7 +10,8 @@ package Translational "Library to model 1-dimensional, translational mechanical lineColor={64,64,64}, fillColor={192,192,192}, fillPattern=FillPattern.Sphere, - extent={{-81,-65},{-8,-22}}), + extent={{-81,-65},{-8,-22}}, + pattern=LinePattern.None), Line( origin={14,53}, points={{-8,-43},{-1,-43},{6,-64},{17,-23},{29,-65},{40,-23},{50,-44}, 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..e6620fe3f8 100644 --- a/Modelica/Media/package.mo +++ b/Modelica/Media/package.mo @@ -3360,7 +3360,8 @@ equation in one unknown with function

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}, From cb74cb8083b85dac00794351fa5a2b6621fb2705 Mon Sep 17 00:00:00 2001 From: HOS Date: Wed, 10 Dec 2025 09:35:16 +0100 Subject: [PATCH 2/7] SkipSpheres --- Modelica/Electrical/Batteries/package.mo | 13 ++++--------- .../Electrical/Machines/Losses/Friction.mo | 18 ++++++------------ Modelica/Fluid/Machines.mo | 3 +-- Modelica/Fluid/Sources.mo | 10 +++------- Modelica/Fluid/Vessels.mo | 7 ++----- .../MultiBody/Forces/LineForceWithMass.mo | 18 ++++++------------ .../MultiBody/Forces/LineForceWithTwoMasses.mo | 18 ++++++------------ .../MultiBody/Joints/Assemblies/JointSSP.mo | 6 ++---- .../MultiBody/Joints/Assemblies/JointSSR.mo | 6 ++---- .../MultiBody/Joints/Assemblies/JointUPS.mo | 3 +-- .../MultiBody/Joints/Assemblies/JointUSP.mo | 3 +-- .../MultiBody/Joints/Assemblies/JointUSR.mo | 3 +-- .../MultiBody/Joints/Constraints/Spherical.mo | 3 +-- .../Mechanics/MultiBody/Joints/Spherical.mo | 3 +-- .../MultiBody/Joints/SphericalSpherical.mo | 6 ++---- .../MultiBody/Joints/UniversalSpherical.mo | 3 +-- Modelica/Mechanics/MultiBody/Parts/Body.mo | 4 +--- .../Mechanics/MultiBody/Parts/BodyShape.mo | 3 +-- .../Mechanics/MultiBody/Parts/PointMass.mo | 4 +--- .../Mechanics/MultiBody/Parts/RollingWheel.mo | 3 +-- .../MultiBody/Parts/RollingWheelSet.mo | 6 ++---- Modelica/Mechanics/MultiBody/Parts/package.mo | 3 +-- Modelica/Mechanics/MultiBody/package.mo | 3 +-- .../Mechanics/Translational/Components/Mass.mo | 3 +-- .../Components/MassWithStopAndFriction.mo | 3 +-- .../Components/RollingResistance.mo | 3 +-- .../Components/SupportFriction.mo | 18 ++++++------------ .../Translational/Components/Vehicle.mo | 6 ++---- .../Translational/Components/package.mo | 3 +-- Modelica/Mechanics/Translational/package.mo | 3 +-- Modelica/Media/package.mo | 6 ++---- .../FluidHeatFlow/Components/OpenTank.mo | 9 +++------ 32 files changed, 66 insertions(+), 137 deletions(-) diff --git a/Modelica/Electrical/Batteries/package.mo b/Modelica/Electrical/Batteries/package.mo index bacfad8074..832a0bf60e 100644 --- a/Modelica/Electrical/Batteries/package.mo +++ b/Modelica/Electrical/Batteries/package.mo @@ -7,8 +7,7 @@ package Batteries "Simple battery models" fillColor={215,215,215}, fillPattern=FillPattern.Sphere, origin={0,-80}, - rotation=90, - pattern=LinePattern.None), + rotation=90), Rectangle(extent={{-70,50},{70,-50}}, lineColor={95,95,95}, fillColor={215,215,215}, fillPattern=FillPattern.HorizontalCylinder, @@ -19,14 +18,12 @@ package Batteries "Simple battery models" fillColor={215,215,215}, fillPattern=FillPattern.Sphere, origin={0,60}, - rotation=90, - pattern=LinePattern.None), + rotation=90), Ellipse(extent={{-4,20},{4,-20}}, lineColor={95,95,95}, fillColor={215,215,215}, fillPattern=FillPattern.Sphere, origin={0,60}, - rotation=90, - pattern=LinePattern.None), + rotation=90), Rectangle(extent={{-13,20},{13,-20}}, lineColor={95,95,95}, fillColor={215,215,215}, fillPattern=FillPattern.HorizontalCylinder, @@ -37,9 +34,7 @@ package Batteries "Simple battery models" fillColor={215,215,215}, fillPattern=FillPattern.Sphere, origin={0,86}, - rotation=90, - pattern=LinePattern.None)}), - Documentation(info=" + rotation=90)}), Documentation(info="

Library offering simple battery models

")); end Batteries; diff --git a/Modelica/Electrical/Machines/Losses/Friction.mo b/Modelica/Electrical/Machines/Losses/Friction.mo index 5c781ea4ac..0056d1a0f3 100644 --- a/Modelica/Electrical/Machines/Losses/Friction.mo +++ b/Modelica/Electrical/Machines/Losses/Friction.mo @@ -27,33 +27,27 @@ equation Ellipse( extent={{-12,50},{8,30}}, fillPattern=FillPattern.Sphere, - fillColor={135,135,135}, - pattern=LinePattern.None), + fillColor={135,135,135}), Ellipse( extent={{-10,-30},{10,-50}}, fillPattern=FillPattern.Sphere, - fillColor={135,135,135}, - pattern=LinePattern.None), + fillColor={135,135,135}), Ellipse( extent={{24,-10},{44,-30}}, fillPattern=FillPattern.Sphere, - fillColor={135,135,135}, - pattern=LinePattern.None), + fillColor={135,135,135}), Ellipse( extent={{22,34},{42,14}}, fillPattern=FillPattern.Sphere, - fillColor={135,135,135}, - pattern=LinePattern.None), + fillColor={135,135,135}), Ellipse( extent={{-44,30},{-24,10}}, fillPattern=FillPattern.Sphere, - fillColor={135,135,135}, - pattern=LinePattern.None), + fillColor={135,135,135}), Ellipse( extent={{-44,-12},{-24,-32}}, fillPattern=FillPattern.Sphere, - fillColor={135,135,135}, - pattern=LinePattern.None), + fillColor={135,135,135}), Ellipse( extent={{-30,30},{30,-30}}, fillColor={175,175,175}, diff --git a/Modelica/Fluid/Machines.mo b/Modelica/Fluid/Machines.mo index 5ca1124734..1a09d4ada8 100644 --- a/Modelica/Fluid/Machines.mo +++ b/Modelica/Fluid/Machines.mo @@ -515,8 +515,7 @@ Then the model can be replaced with a Pump with rotational shaft or with a Presc Ellipse( extent={{-80,80},{80,-80}}, fillPattern=FillPattern.Sphere, - fillColor={0,100,199}, - pattern=LinePattern.None), + fillColor={0,100,199}), Polygon( points={{-28,30},{-28,-30},{50,-2},{-28,30}}, pattern=LinePattern.None, diff --git a/Modelica/Fluid/Sources.mo b/Modelica/Fluid/Sources.mo index e77d3d63ea..bfea40b255 100644 --- a/Modelica/Fluid/Sources.mo +++ b/Modelica/Fluid/Sources.mo @@ -100,9 +100,7 @@ package Sources "Define fixed or prescribed boundary conditions" extent={{-100,-100},{100,100}}), graphics={Ellipse( extent={{-100,100},{100,-100}}, fillPattern=FillPattern.Sphere, - fillColor={0,127,255}, - pattern=LinePattern.None), - Text( + fillColor={0,127,255}), Text( extent={{-150,110},{150,150}}, textString="%name", textColor={0,0,255})}), @@ -211,8 +209,7 @@ with exception of boundary pressure, do not have an effect. Ellipse( extent={{-100,100},{100,-100}}, fillPattern=FillPattern.Sphere, - fillColor={0,127,255}, - pattern=LinePattern.None), + fillColor={0,127,255}), Text( extent={{-150,120},{150,160}}, textString="%name", @@ -356,8 +353,7 @@ with exception of boundary pressure, do not have an effect. Ellipse( extent={{-100,100},{100,-100}}, fillPattern=FillPattern.Sphere, - fillColor={0,127,255}, - pattern=LinePattern.None), + fillColor={0,127,255}), Text( extent={{-150,110},{150,150}}, textString="%name", diff --git a/Modelica/Fluid/Vessels.mo b/Modelica/Fluid/Vessels.mo index 4faf6848c4..118f01e540 100644 --- a/Modelica/Fluid/Vessels.mo +++ b/Modelica/Fluid/Vessels.mo @@ -25,8 +25,7 @@ package Vessels "Devices for storing fluid" 100,100}}), graphics={Ellipse( extent={{-100,100},{100,-100}}, fillPattern=FillPattern.Sphere, - fillColor={170,213,255}, - pattern=LinePattern.None),Text( + fillColor={170,213,255}), Text( extent={{-150,12},{150,-18}}, textString="V=%V")}), Documentation(info=" @@ -495,9 +494,7 @@ Base class for vessel heat transfer models. {100,100}}), graphics={Ellipse( extent={{-60,64},{60,-56}}, fillPattern=FillPattern.Sphere, - fillColor={232,0,0}, - pattern=LinePattern.None), - Text( + fillColor={232,0,0}), Text( extent={{-38,26},{40,-14}}, textString="%name")})); end PartialVesselHeatTransfer; diff --git a/Modelica/Mechanics/MultiBody/Forces/LineForceWithMass.mo b/Modelica/Mechanics/MultiBody/Forces/LineForceWithMass.mo index 244504e990..b8c28a18ab 100644 --- a/Modelica/Mechanics/MultiBody/Forces/LineForceWithMass.mo +++ b/Modelica/Mechanics/MultiBody/Forces/LineForceWithMass.mo @@ -184,13 +184,11 @@ equation Ellipse( extent={{-76,16},{-44,-16}}, fillPattern=FillPattern.Sphere, - fillColor={192,192,192}, - pattern=LinePattern.None), + fillColor={192,192,192}), Ellipse( extent={{44,16},{76,-16}}, fillPattern=FillPattern.Sphere, - fillColor={192,192,192}, - pattern=LinePattern.None), + fillColor={192,192,192}), Line(points={{-60,0},{-30,30},{-30,70},{-60,70},{-60,100}}), Line(points={{60,0},{30,30},{30,70},{60,70},{60,100}}), Line( @@ -229,8 +227,7 @@ equation Ellipse( extent={{-100,-40},{-20,40}}, fillPattern=FillPattern.Sphere, - fillColor={192,192,192}, - pattern=LinePattern.None), + fillColor={192,192,192}), Ellipse( extent={{-90,-30},{-30,30}}, fillColor={255,255,255}, @@ -238,8 +235,7 @@ equation Ellipse( extent={{20,-40},{100,40}}, fillPattern=FillPattern.Sphere, - fillColor={192,192,192}, - pattern=LinePattern.None), + fillColor={192,192,192}), Ellipse( extent={{31,-29},{91,30}}, lineColor={128,128,128}, @@ -253,13 +249,11 @@ equation Ellipse( extent={{-74,15},{-45,-13}}, fillPattern=FillPattern.Sphere, - fillColor={192,192,192}, - pattern=LinePattern.None), + fillColor={192,192,192}), Ellipse( extent={{45,15},{74,-13}}, fillPattern=FillPattern.Sphere, - fillColor={192,192,192}, - pattern=LinePattern.None), + fillColor={192,192,192}), Line(points={{-60,0},{-60,24},{-40,24},{-40,60},{-60,60},{-60,100}}), Line(points={{60,1},{60,21},{40,21},{40,60},{60,60},{60,100}}), Line( diff --git a/Modelica/Mechanics/MultiBody/Forces/LineForceWithTwoMasses.mo b/Modelica/Mechanics/MultiBody/Forces/LineForceWithTwoMasses.mo index c979524e08..eed991f7ef 100644 --- a/Modelica/Mechanics/MultiBody/Forces/LineForceWithTwoMasses.mo +++ b/Modelica/Mechanics/MultiBody/Forces/LineForceWithTwoMasses.mo @@ -251,13 +251,11 @@ equation Ellipse( extent={{-76,16},{-44,-16}}, fillPattern=FillPattern.Sphere, - fillColor={192,192,192}, - pattern=LinePattern.None), + fillColor={192,192,192}), Ellipse( extent={{44,16},{76,-16}}, fillPattern=FillPattern.Sphere, - fillColor={192,192,192}, - pattern=LinePattern.None), + fillColor={192,192,192}), Line(points={{30,0},{60,0},{30,30},{30,70},{60,70},{60,100}}), Line(points={{-30,0},{-60,0},{-30,30},{-30,70},{-60,70},{-60,101}}), Ellipse( @@ -299,8 +297,7 @@ equation Ellipse( extent={{-100,-40},{-20,40}}, fillPattern=FillPattern.Sphere, - fillColor={192,192,192}, - pattern=LinePattern.None), + fillColor={192,192,192}), Ellipse( extent={{-90,-30},{-30,30}}, fillColor={255,255,255}, @@ -308,8 +305,7 @@ equation Ellipse( extent={{20,-40},{100,40}}, fillPattern=FillPattern.Sphere, - fillColor={192,192,192}, - pattern=LinePattern.None), + fillColor={192,192,192}), Ellipse( extent={{31,-29},{91,30}}, lineColor={128,128,128}, @@ -323,13 +319,11 @@ equation Ellipse( extent={{-74,15},{-45,-13}}, fillPattern=FillPattern.Sphere, - fillColor={192,192,192}, - pattern=LinePattern.None), + fillColor={192,192,192}), Ellipse( extent={{45,15},{74,-13}}, fillPattern=FillPattern.Sphere, - fillColor={192,192,192}, - pattern=LinePattern.None), + fillColor={192,192,192}), Line(points={{-60,0},{-60,24},{-40,24},{-40,60},{-60,60},{-60,100}}), Line(points={{60,1},{60,21},{40,21},{40,60},{60,60},{60,100}}), Line( diff --git a/Modelica/Mechanics/MultiBody/Joints/Assemblies/JointSSP.mo b/Modelica/Mechanics/MultiBody/Joints/Assemblies/JointSSP.mo index 9badd100e4..32c2f3eda7 100644 --- a/Modelica/Mechanics/MultiBody/Joints/Assemblies/JointSSP.mo +++ b/Modelica/Mechanics/MultiBody/Joints/Assemblies/JointSSP.mo @@ -337,13 +337,11 @@ component). Ellipse( extent={{-20,10},{0,-10}}, fillPattern=FillPattern.Sphere, - fillColor={192,192,192}, - pattern=LinePattern.None), + fillColor={192,192,192}), Ellipse( extent={{-86,10},{-66,-10}}, fillPattern=FillPattern.Sphere, - fillColor={192,192,192}, - pattern=LinePattern.None), + fillColor={192,192,192}), Line( points={{14,0},{14,80},{0,80},{0,100}}, color={95,95,95}, diff --git a/Modelica/Mechanics/MultiBody/Joints/Assemblies/JointSSR.mo b/Modelica/Mechanics/MultiBody/Joints/Assemblies/JointSSR.mo index 6026d440db..7733297e20 100644 --- a/Modelica/Mechanics/MultiBody/Joints/Assemblies/JointSSR.mo +++ b/Modelica/Mechanics/MultiBody/Joints/Assemblies/JointSSR.mo @@ -336,13 +336,11 @@ component). Ellipse( extent={{-20,10},{0,-10}}, fillPattern=FillPattern.Sphere, - fillColor={192,192,192}, - pattern=LinePattern.None), + fillColor={192,192,192}), Ellipse( extent={{-86,10},{-66,-10}}, fillPattern=FillPattern.Sphere, - fillColor={192,192,192}, - pattern=LinePattern.None), + fillColor={192,192,192}), Line( points={{14,0},{14,80},{0,80},{0,100}}, color={95,95,95}, diff --git a/Modelica/Mechanics/MultiBody/Joints/Assemblies/JointUPS.mo b/Modelica/Mechanics/MultiBody/Joints/Assemblies/JointUPS.mo index bec1bc7e9a..b6dfca9a1a 100644 --- a/Modelica/Mechanics/MultiBody/Joints/Assemblies/JointUPS.mo +++ b/Modelica/Mechanics/MultiBody/Joints/Assemblies/JointUPS.mo @@ -417,8 +417,7 @@ component). Ellipse( extent={{44,16},{76,-16}}, fillPattern=FillPattern.Sphere, - fillColor={192,192,192}, - pattern=LinePattern.None), + fillColor={192,192,192}), Ellipse( extent={{-100,-40},{-20,40}}, startAngle=90, diff --git a/Modelica/Mechanics/MultiBody/Joints/Assemblies/JointUSP.mo b/Modelica/Mechanics/MultiBody/Joints/Assemblies/JointUSP.mo index 7bf6ff5aa8..f978623971 100644 --- a/Modelica/Mechanics/MultiBody/Joints/Assemblies/JointUSP.mo +++ b/Modelica/Mechanics/MultiBody/Joints/Assemblies/JointUSP.mo @@ -424,8 +424,7 @@ the origin of frame_a to the middle of rod 1, this might be defined as: Ellipse( extent={{-20,10},{0,-10}}, fillPattern=FillPattern.Sphere, - fillColor={192,192,192}, - pattern=LinePattern.None), + fillColor={192,192,192}), Line( points={{-70,28},{-70,-30}}, thickness=0.5), diff --git a/Modelica/Mechanics/MultiBody/Joints/Assemblies/JointUSR.mo b/Modelica/Mechanics/MultiBody/Joints/Assemblies/JointUSR.mo index 5c7753319d..95ed4731e7 100644 --- a/Modelica/Mechanics/MultiBody/Joints/Assemblies/JointUSR.mo +++ b/Modelica/Mechanics/MultiBody/Joints/Assemblies/JointUSR.mo @@ -451,8 +451,7 @@ the origin of frame_a to the middle of rod 1, this might be defined as: Ellipse( extent={{-20,10},{0,-10}}, fillPattern=FillPattern.Sphere, - fillColor={192,192,192}, - pattern=LinePattern.None), + fillColor={192,192,192}), Line( points={{-70,28},{-70,-30}}, thickness=0.5), diff --git a/Modelica/Mechanics/MultiBody/Joints/Constraints/Spherical.mo b/Modelica/Mechanics/MultiBody/Joints/Constraints/Spherical.mo index 4197580840..98a0d61aa7 100644 --- a/Modelica/Mechanics/MultiBody/Joints/Constraints/Spherical.mo +++ b/Modelica/Mechanics/MultiBody/Joints/Constraints/Spherical.mo @@ -111,8 +111,7 @@ equation extent={{-26,26},{26,-26}}, fillPattern=FillPattern.Sphere, fillColor={192,192,192}, - lineColor={0,0,0}, - pattern=LinePattern.None), + lineColor={0,0,0}), Text( extent={{-100,-70},{100,-100}}, textColor={95,95,95}, diff --git a/Modelica/Mechanics/MultiBody/Joints/Spherical.mo b/Modelica/Mechanics/MultiBody/Joints/Spherical.mo index 37cd7eaab1..c290f75b7d 100644 --- a/Modelica/Mechanics/MultiBody/Joints/Spherical.mo +++ b/Modelica/Mechanics/MultiBody/Joints/Spherical.mo @@ -269,8 +269,7 @@ frame_b of the joint. extent={{-26,26},{26,-26}}, fillPattern=FillPattern.Sphere, fillColor={192,192,192}, - lineColor={0,0,0}, - pattern=LinePattern.None), + lineColor={0,0,0}), Text( extent={{-150,110},{150,70}}, textString="%name", diff --git a/Modelica/Mechanics/MultiBody/Joints/SphericalSpherical.mo b/Modelica/Mechanics/MultiBody/Joints/SphericalSpherical.mo index 29718450b7..374bdd330f 100644 --- a/Modelica/Mechanics/MultiBody/Joints/SphericalSpherical.mo +++ b/Modelica/Mechanics/MultiBody/Joints/SphericalSpherical.mo @@ -246,13 +246,11 @@ equation Ellipse( extent={{-76,16},{-44,-16}}, fillPattern=FillPattern.Sphere, - fillColor={192,192,192}, - pattern=LinePattern.None), + fillColor={192,192,192}), Ellipse( extent={{44,16},{76,-16}}, fillPattern=FillPattern.Sphere, - fillColor={192,192,192}, - pattern=LinePattern.None), + fillColor={192,192,192}), Text( extent={{-150,90},{150,50}}, textString="%name", diff --git a/Modelica/Mechanics/MultiBody/Joints/UniversalSpherical.mo b/Modelica/Mechanics/MultiBody/Joints/UniversalSpherical.mo index 6c71f233a8..17bf8fe6cb 100644 --- a/Modelica/Mechanics/MultiBody/Joints/UniversalSpherical.mo +++ b/Modelica/Mechanics/MultiBody/Joints/UniversalSpherical.mo @@ -479,8 +479,7 @@ the origin of frame_a to the middle of the rod, this might be defined as: Ellipse( extent={{44,16},{76,-16}}, fillPattern=FillPattern.Sphere, - fillColor={192,192,192}, - pattern=LinePattern.None), + fillColor={192,192,192}), Ellipse( extent={{-80,-10},{-40,10}}, lineColor={64,64,64}, diff --git a/Modelica/Mechanics/MultiBody/Parts/Body.mo b/Modelica/Mechanics/MultiBody/Parts/Body.mo index 9d13fa5548..37c72e85ab 100644 --- a/Modelica/Mechanics/MultiBody/Parts/Body.mo +++ b/Modelica/Mechanics/MultiBody/Parts/Body.mo @@ -280,9 +280,7 @@ equation extent={{-20,60},{100,-60}}, lineColor={0,24,48}, fillPattern=FillPattern.Sphere, - fillColor={0,127,255}, - pattern=LinePattern.None)}), - Documentation(info=" + fillColor={0,127,255})}), Documentation(info="

Rigid body with mass and inertia tensor. All parameter vectors have to be resolved in frame_a. diff --git a/Modelica/Mechanics/MultiBody/Parts/BodyShape.mo b/Modelica/Mechanics/MultiBody/Parts/BodyShape.mo index ff8626e09d..73345031c1 100644 --- a/Modelica/Mechanics/MultiBody/Parts/BodyShape.mo +++ b/Modelica/Mechanics/MultiBody/Parts/BodyShape.mo @@ -281,8 +281,7 @@ states and of the \"Advanced\" menu parameters, see model extent={{-60,60},{60,-60}}, lineColor={0,24,48}, fillPattern=FillPattern.Sphere, - fillColor={0,127,255}, - pattern=LinePattern.None), + fillColor={0,127,255}), Text( extent={{-50,24},{55,-27}}, textString="%m"), diff --git a/Modelica/Mechanics/MultiBody/Parts/PointMass.mo b/Modelica/Mechanics/MultiBody/Parts/PointMass.mo index 7814f0d44f..fc00148a0e 100644 --- a/Modelica/Mechanics/MultiBody/Parts/PointMass.mo +++ b/Modelica/Mechanics/MultiBody/Parts/PointMass.mo @@ -98,9 +98,7 @@ the only case where this is done. extent={{-50,50},{50,-50}}, lineColor={0,24,48}, fillPattern=FillPattern.Sphere, - fillColor={0,127,255}, - pattern=LinePattern.None)}), - Documentation(info=" + fillColor={0,127,255})}), Documentation(info="

Rigid body where the inertia tensor is neglected. This body is diff --git a/Modelica/Mechanics/MultiBody/Parts/RollingWheel.mo b/Modelica/Mechanics/MultiBody/Parts/RollingWheel.mo index e9a6697166..68eb8c2a09 100644 --- a/Modelica/Mechanics/MultiBody/Parts/RollingWheel.mo +++ b/Modelica/Mechanics/MultiBody/Parts/RollingWheel.mo @@ -111,8 +111,7 @@ equation extent={{-80,80},{80,-80}}, fillColor={215,215,215}, fillPattern=FillPattern.Sphere, - lineColor={175,175,175}, - pattern=LinePattern.None), + lineColor={175,175,175}), Text( extent={{-150,120},{150,80}}, textString="%name", diff --git a/Modelica/Mechanics/MultiBody/Parts/RollingWheelSet.mo b/Modelica/Mechanics/MultiBody/Parts/RollingWheelSet.mo index 5e50cd83a8..ff51e24dc2 100644 --- a/Modelica/Mechanics/MultiBody/Parts/RollingWheelSet.mo +++ b/Modelica/Mechanics/MultiBody/Parts/RollingWheelSet.mo @@ -203,8 +203,7 @@ equation extent={{42,80},{118,-80}}, fillColor={215,215,215}, fillPattern=FillPattern.Sphere, - lineColor={64,64,64}, - pattern=LinePattern.None), + lineColor={64,64,64}), Ellipse(extent={{42,80},{118,-80}}, lineColor={64,64,64}), Rectangle( extent={{-100,-80},{100,-100}}, @@ -227,8 +226,7 @@ equation extent={{-118,80},{-42,-80}}, fillColor={215,215,215}, fillPattern=FillPattern.Sphere, - lineColor={64,64,64}, - pattern=LinePattern.None), + lineColor={64,64,64}), Line( points={{-96,100},{-80,100},{-80,4}}), Ellipse(extent={{-118,80},{-42,-80}}, lineColor={64,64,64}), diff --git a/Modelica/Mechanics/MultiBody/Parts/package.mo b/Modelica/Mechanics/MultiBody/Parts/package.mo index d46d2d131b..0002e50038 100644 --- a/Modelica/Mechanics/MultiBody/Parts/package.mo +++ b/Modelica/Mechanics/MultiBody/Parts/package.mo @@ -110,6 +110,5 @@ definition of the colors used in the MultiBody library extent={{-8,52},{86,-42}}, lineColor={95,95,95}, fillPattern=FillPattern.Sphere, - fillColor={215,215,215}, - pattern=LinePattern.None)})); + fillColor={215,215,215})})); end Parts; diff --git a/Modelica/Mechanics/MultiBody/package.mo b/Modelica/Mechanics/MultiBody/package.mo index 17da3a827e..c4c9743c82 100644 --- a/Modelica/Mechanics/MultiBody/package.mo +++ b/Modelica/Mechanics/MultiBody/package.mo @@ -500,6 +500,5 @@ Copyright © 1998-2025, Modelica Association and contributors extent={{-4,-14},{60,-78}}, lineColor={135,135,135}, fillPattern=FillPattern.Sphere, - fillColor={255,255,255}, - pattern=LinePattern.None)})); + fillColor={255,255,255})})); end MultiBody; diff --git a/Modelica/Mechanics/Translational/Components/Mass.mo b/Modelica/Mechanics/Translational/Components/Mass.mo index 0d9d0d4b78..dcf44282a2 100644 --- a/Modelica/Mechanics/Translational/Components/Mass.mo +++ b/Modelica/Mechanics/Translational/Components/Mass.mo @@ -32,8 +32,7 @@ A negative force at flange flange_a moves the sliding mass to the negative direc extent={{-55,-30},{56,30}}, fillPattern=FillPattern.Sphere, fillColor={160,215,160}, - lineColor={0,127,0}, - pattern=LinePattern.None), + lineColor={0,127,0}), Polygon( points={{50,-90},{20,-80},{20,-100},{50,-90}}, lineColor={95,127,95}, diff --git a/Modelica/Mechanics/Translational/Components/MassWithStopAndFriction.mo b/Modelica/Mechanics/Translational/Components/MassWithStopAndFriction.mo index 167daf7d19..09b834ba54 100644 --- a/Modelica/Mechanics/Translational/Components/MassWithStopAndFriction.mo +++ b/Modelica/Mechanics/Translational/Components/MassWithStopAndFriction.mo @@ -287,8 +287,7 @@ between the stops. extent={{-30,30},{30,-30}}, fillPattern=FillPattern.Sphere, fillColor={166,221,166}, - lineColor={0,127,0}, - pattern=LinePattern.None), + lineColor={0,127,0}), Rectangle( extent={{-64,-16},{-56,-46}}, fillPattern=FillPattern.Solid, diff --git a/Modelica/Mechanics/Translational/Components/RollingResistance.mo b/Modelica/Mechanics/Translational/Components/RollingResistance.mo index 5f7bf4c00f..5392ac1758 100644 --- a/Modelica/Mechanics/Translational/Components/RollingResistance.mo +++ b/Modelica/Mechanics/Translational/Components/RollingResistance.mo @@ -51,8 +51,7 @@ equation Ellipse(extent={{-60,60},{60,-60}}, lineColor={0,127,0}, fillColor={160,215,160}, - fillPattern=FillPattern.Sphere, - pattern=LinePattern.None), + fillPattern=FillPattern.Sphere), Ellipse(extent={{-40,40},{40,-40}}, lineColor={0,127,0}, fillColor={255,255,255}, diff --git a/Modelica/Mechanics/Translational/Components/SupportFriction.mo b/Modelica/Mechanics/Translational/Components/SupportFriction.mo index f25fd62987..b67740a809 100644 --- a/Modelica/Mechanics/Translational/Components/SupportFriction.mo +++ b/Modelica/Mechanics/Translational/Components/SupportFriction.mo @@ -163,38 +163,32 @@ following references, especially (Armstrong and Canudas de Wit 1996): extent={{-48,-10},{-28,-30}}, lineColor={0,127,0}, fillPattern=FillPattern.Sphere, - fillColor={255,255,255}, - pattern=LinePattern.None), + fillColor={255,255,255}), Ellipse( extent={{-10,-10},{10,-30}}, lineColor={0,127,0}, fillPattern=FillPattern.Sphere, - fillColor={255,255,255}, - pattern=LinePattern.None), + fillColor={255,255,255}), Ellipse( extent={{30,-10},{50,-30}}, lineColor={0,127,0}, fillPattern=FillPattern.Sphere, - fillColor={255,255,255}, - pattern=LinePattern.None), + fillColor={255,255,255}), Ellipse( extent={{-50,30},{-30,10}}, lineColor={0,127,0}, fillPattern=FillPattern.Sphere, - fillColor={255,255,255}, - pattern=LinePattern.None), + fillColor={255,255,255}), Ellipse( extent={{-10,30},{10,10}}, lineColor={0,127,0}, fillPattern=FillPattern.Sphere, - fillColor={255,255,255}, - pattern=LinePattern.None), + fillColor={255,255,255}), Ellipse( extent={{30,30},{50,10}}, lineColor={0,127,0}, fillPattern=FillPattern.Sphere, - fillColor={255,255,255}, - pattern=LinePattern.None), + fillColor={255,255,255}), Rectangle( extent={{-90,10},{90,-10}}, lineColor={0,127,0}, diff --git a/Modelica/Mechanics/Translational/Components/Vehicle.mo b/Modelica/Mechanics/Translational/Components/Vehicle.mo index 0f574ab63c..4aaebe883b 100644 --- a/Modelica/Mechanics/Translational/Components/Vehicle.mo +++ b/Modelica/Mechanics/Translational/Components/Vehicle.mo @@ -158,10 +158,8 @@ equation extent={{30,-80},{90,-100}}, textColor={64,64,64}, textString="wind"), - Ellipse(extent={{-50,-34},{-26,-58}},lineColor={0,127,0}, fillPattern=FillPattern.Sphere, fillColor={160,215,160}, - pattern=LinePattern.None), - Ellipse(extent={{20,-16},{44,-40}}, lineColor={0,127,0}, fillPattern=FillPattern.Sphere, fillColor={160,215,160}, - pattern=LinePattern.None), + Ellipse(extent={{-50,-34},{-26,-58}},lineColor={0,127,0}, fillPattern=FillPattern.Sphere, fillColor={160,215,160}), + Ellipse(extent={{20,-16},{44,-40}}, lineColor={0,127,0}, fillPattern=FillPattern.Sphere, fillColor={160,215,160}), Ellipse(extent={{26,-22},{38,-34}}, lineColor={0,127,0}, fillPattern=FillPattern.Solid, fillColor={255,255,255}), Ellipse(extent={{-44,-40},{-32,-52}},lineColor={0,127,0}, fillPattern=FillPattern.Solid, diff --git a/Modelica/Mechanics/Translational/Components/package.mo b/Modelica/Mechanics/Translational/Components/package.mo index 9b2f5db367..127262400c 100644 --- a/Modelica/Mechanics/Translational/Components/package.mo +++ b/Modelica/Mechanics/Translational/Components/package.mo @@ -8,8 +8,7 @@ package Components "Components for 1D translational mechanical drive trains" lineColor={64,64,64}, fillColor={255,255,255}, fillPattern=FillPattern.Sphere, - extent={{-67,-66},{44,-6}}, - pattern=LinePattern.None)}), Documentation(info=" + extent={{-67,-66},{44,-6}})}), Documentation(info="

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

diff --git a/Modelica/Mechanics/Translational/package.mo b/Modelica/Mechanics/Translational/package.mo index f15527fe69..55c3abdd1a 100644 --- a/Modelica/Mechanics/Translational/package.mo +++ b/Modelica/Mechanics/Translational/package.mo @@ -10,8 +10,7 @@ package Translational "Library to model 1-dimensional, translational mechanical lineColor={64,64,64}, fillColor={192,192,192}, fillPattern=FillPattern.Sphere, - extent={{-81,-65},{-8,-22}}, - pattern=LinePattern.None), + extent={{-81,-65},{-8,-22}}), Line( origin={14,53}, points={{-8,-43},{-1,-43},{6,-64},{17,-23},{29,-65},{40,-23},{50,-44}, diff --git a/Modelica/Media/package.mo b/Modelica/Media/package.mo index e6620fe3f8..d16f1a08d8 100644 --- a/Modelica/Media/package.mo +++ b/Modelica/Media/package.mo @@ -3360,8 +3360,7 @@ equation in one unknown with function Date: Wed, 10 Dec 2025 09:50:51 +0100 Subject: [PATCH 4/7] Update Modelica/Magnetic/QuasiStatic/FundamentalWave/Losses/PermanentMagnetLosses.mo --- .../FundamentalWave/Losses/PermanentMagnetLosses.mo | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Modelica/Magnetic/QuasiStatic/FundamentalWave/Losses/PermanentMagnetLosses.mo b/Modelica/Magnetic/QuasiStatic/FundamentalWave/Losses/PermanentMagnetLosses.mo index c029f4e8fa..0614f29de8 100644 --- a/Modelica/Magnetic/QuasiStatic/FundamentalWave/Losses/PermanentMagnetLosses.mo +++ b/Modelica/Magnetic/QuasiStatic/FundamentalWave/Losses/PermanentMagnetLosses.mo @@ -22,8 +22,8 @@ equation sign(w)*(abs(w)/permanentMagnetLossParameters.wRef)^permanentMagnetLossParameters.power_w; end if; lossPower = -tau*w; - annotation (defaultComponentName="magnetLoss", Icon(graphics={Ellipse(extent={{-40,-40},{40,40}}, lineColor - = {200,0,0})}), Documentation(info=" + annotation (defaultComponentName="magnetLoss", Icon(graphics={Ellipse(extent={{-40,-40},{40,40}}, lineColor= + {200,0,0})}), Documentation(info="

Permanent magnet losses are modeled dependent on current and speed.

From 9db0d1ffcefc903b5505c5d8eb28e7b22c856993 Mon Sep 17 00:00:00 2001 From: Hans Olsson Date: Wed, 10 Dec 2025 10:08:38 +0100 Subject: [PATCH 5/7] Update Modelica/Electrical/Batteries/Icons/TransientRecordsPackage.mo --- Modelica/Electrical/Batteries/Icons/TransientRecordsPackage.mo | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/Modelica/Electrical/Batteries/Icons/TransientRecordsPackage.mo b/Modelica/Electrical/Batteries/Icons/TransientRecordsPackage.mo index eee24d1fc0..4531c96d34 100644 --- a/Modelica/Electrical/Batteries/Icons/TransientRecordsPackage.mo +++ b/Modelica/Electrical/Batteries/Icons/TransientRecordsPackage.mo @@ -9,8 +9,7 @@ partial package TransientRecordsPackage fillColor={248,248,248}, fillPattern=FillPattern.HorizontalCylinder, extent={{-100.0,-100.0},{100.0,100.0}}, - radius=25.0, - pattern=LinePattern.None), + radius=25.0), Rectangle( origin={0,-20}, lineColor={64,64,64}, From 73c441272fb9655dbfc9c6da038c73f863ece905 Mon Sep 17 00:00:00 2001 From: Hans Olsson Date: Wed, 10 Dec 2025 10:11:24 +0100 Subject: [PATCH 6/7] Apply suggestions from code review Polygons that are not exactly level shouldn't use cylinder-gradient. --- Modelica/Fluid/Examples/AST_BatchPlant.mo | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/Modelica/Fluid/Examples/AST_BatchPlant.mo b/Modelica/Fluid/Examples/AST_BatchPlant.mo index a683b8bf70..98be9f9baa 100644 --- a/Modelica/Fluid/Examples/AST_BatchPlant.mo +++ b/Modelica/Fluid/Examples/AST_BatchPlant.mo @@ -896,16 +896,14 @@ Documentation for this example can be found on the Date: Wed, 10 Dec 2025 13:17:55 +0100 Subject: [PATCH 7/7] Apply suggestions from code review --- .../Mechanics/MultiBody/Visualizers/VoluminousWheel.mo | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/Modelica/Mechanics/MultiBody/Visualizers/VoluminousWheel.mo b/Modelica/Mechanics/MultiBody/Visualizers/VoluminousWheel.mo index 4588383b47..15f34cd53f 100644 --- a/Modelica/Mechanics/MultiBody/Visualizers/VoluminousWheel.mo +++ b/Modelica/Mechanics/MultiBody/Visualizers/VoluminousWheel.mo @@ -60,14 +60,11 @@ equation annotation ( Icon( graphics={ - Polygon(lineColor = {64, 64, 64}, fillColor = {191, 191, 191}, fillPattern = FillPattern.Sphere, points = {{-40, 80}, {-20, 90}, {15, 90}, {40, 85}, {58.776, 73.91}, {70.456, 56.568}, {74.951, 44.383}, {78.26, 30.614}, {80.302, 15.68}, {81, 0}, {81, 0}, {80.302, -15.68}, {78.26, -30.614}, {74.951, -44.383}, {70.456, -56.568}, {58.776, -73.91}, {40, -85}, {15, -90}, {-20, -90}, {-40, -80}, {-48.776, -73.91}, {-60.456, -56.568}, {-64.951, -44.383}, {-68.26, -30.614}, {-70.302, -15.68}, {-71, 0}, {-71, 0}, {-70.302, 15.68}, {-68.26, 30.614}, {-64.951, 44.383}, {-60.456, 56.568}, {-48.776, 73.91}}, smooth = Smooth.Bezier, - pattern=LinePattern.None), + Polygon(lineColor = {64, 64, 64}, fillColor = {191, 191, 191}, fillPattern = FillPattern.Sphere, points = {{-40, 80}, {-20, 90}, {15, 90}, {40, 85}, {58.776, 73.91}, {70.456, 56.568}, {74.951, 44.383}, {78.26, 30.614}, {80.302, 15.68}, {81, 0}, {81, 0}, {80.302, -15.68}, {78.26, -30.614}, {74.951, -44.383}, {70.456, -56.568}, {58.776, -73.91}, {40, -85}, {15, -90}, {-20, -90}, {-40, -80}, {-48.776, -73.91}, {-60.456, -56.568}, {-64.951, -44.383}, {-68.26, -30.614}, {-70.302, -15.68}, {-71, 0}, {-71, 0}, {-70.302, 15.68}, {-68.26, 30.614}, {-64.951, 44.383}, {-60.456, 56.568}, {-48.776, 73.91}}, smooth = Smooth.Bezier), Polygon(lineColor = {64, 64, 64}, fillColor = {64, 64, 64}, fillPattern = FillPattern.Solid, points = {{1, 0}, {0.302, 15.68}, {-1.74, 30.614}, {-5.049, 44.383}, {-9.544, 56.568}, {-21.224, 73.91}, {-35, 80}, {-48.776, 73.91}, {-60.456, 56.568}, {-64.951, 44.383}, {-68.26, 30.614}, {-70.302, 15.68}, {-71, 0}, {-70.302, -15.68}, {-68.26, -30.614}, {-64.951, -44.383}, {-60.456, -56.568}, {-48.776, -73.91}, {-35, -80}, {-21.224, -73.91}, {-9.544, -56.568}, {-5.049, -44.383}, {-1.74, -30.614}, {0.302, -15.68}, {1, 0}}, smooth = Smooth.Bezier), - Polygon(lineColor = {64, 64, 64}, fillColor = {191, 191, 191}, fillPattern = FillPattern.HorizontalCylinder, points = {{-12.5, 0}, {-14.213, -19.134}, {-19.09, -35.355}, {-26.39, -46.194}, {-35, -50}, {-43.61, -46.194}, {-50.91, -35.355}, {-55.787, -19.134}, {-57.5, 0}, {-55.787, 19.134}, {-50.91, 35.355}, {-43.61, 46.194}, {-35, 50}, {-26.39, 46.194}, {-19.09, 35.355}, {-14.213, 19.134}, {-12.5, 0}}, smooth = Smooth.Bezier, - pattern=LinePattern.None), + Polygon(lineColor = {64, 64, 64}, fillColor = {191, 191, 191}, fillPattern = FillPattern.HorizontalCylinder, points = {{-12.5, 0}, {-14.213, -19.134}, {-19.09, -35.355}, {-26.39, -46.194}, {-35, -50}, {-43.61, -46.194}, {-50.91, -35.355}, {-55.787, -19.134}, {-57.5, 0}, {-55.787, 19.134}, {-50.91, 35.355}, {-43.61, 46.194}, {-35, 50}, {-26.39, 46.194}, {-19.09, 35.355}, {-14.213, 19.134}, {-12.5, 0}}, smooth = Smooth.Bezier), Text(textColor = {0,0,255}, extent = {{-150, 100}, {150, 140}}, textString = "%name"), - Rectangle(origin = {6.091, 0}, lineColor = {95, 95, 95}, fillColor = {215, 215, 215}, fillPattern = FillPattern.HorizontalCylinder, extent = {{-102.091, -8}, {-19.142, 8}}, - pattern=LinePattern.None)}, + Rectangle(origin = {6.091, 0}, lineColor = {95, 95, 95}, fillColor = {215, 215, 215}, fillPattern = FillPattern.HorizontalCylinder, extent = {{-102.091, -8}, {-19.142, 8}})}, coordinateSystem(extent = {{-100, -100}, {100, 100}}, preserveAspectRatio = true)), Documentation(info = "