Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 7 additions & 3 deletions Complex.mo
Original file line number Diff line number Diff line change
Expand Up @@ -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)}));
Expand Down Expand Up @@ -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}},
Expand Down Expand Up @@ -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}},
Expand Down
6 changes: 4 additions & 2 deletions Modelica/Electrical/Analog/Basic/RotationalEMF.mo
Original file line number Diff line number Diff line change
Expand Up @@ -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},
Expand Down
3 changes: 2 additions & 1 deletion Modelica/Electrical/Analog/Basic/TranslationalEMF.mo
Original file line number Diff line number Diff line change
Expand Up @@ -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},
Expand Down
6 changes: 4 additions & 2 deletions Modelica/Electrical/Batteries/BatteryStacks/package.mo
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Original file line number Diff line number Diff line change
Expand Up @@ -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},
Expand Down
6 changes: 4 additions & 2 deletions Modelica/Electrical/Batteries/package.mo
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,8 @@ package Batteries "Simple battery models"
fillColor={215,215,215},
fillPattern=FillPattern.HorizontalCylinder,
origin={0,-10},
rotation=90),
rotation=90,
pattern=LinePattern.None),
Ellipse(extent={{-10,50},{10,-50}},lineColor={95,95,95},
fillColor={215,215,215},
fillPattern=FillPattern.Sphere,
Expand All @@ -27,7 +28,8 @@ package Batteries "Simple battery models"
fillColor={215,215,215},
fillPattern=FillPattern.HorizontalCylinder,
origin={0,73},
rotation=90),
rotation=90,
pattern=LinePattern.None),
Ellipse(extent={{-4,20},{4,-20}}, lineColor={95,95,95},
fillColor={215,215,215},
fillPattern=FillPattern.Sphere,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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},
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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}},
Expand Down
15 changes: 10 additions & 5 deletions Modelica/Electrical/Machines/BasicMachines/Transformers/package.mo
Original file line number Diff line number Diff line change
Expand Up @@ -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},
Expand Down
9 changes: 6 additions & 3 deletions Modelica/Electrical/Machines/BasicMachines/package.mo
Original file line number Diff line number Diff line change
Expand Up @@ -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},
Expand Down
9 changes: 6 additions & 3 deletions Modelica/Electrical/Machines/Icons/Drive.mo
Original file line number Diff line number Diff line change
Expand Up @@ -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},
Expand Down
9 changes: 6 additions & 3 deletions Modelica/Electrical/Machines/Icons/FundamentalWaveMachine.mo
Original file line number Diff line number Diff line change
Expand Up @@ -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},
Expand Down
9 changes: 6 additions & 3 deletions Modelica/Electrical/Machines/Icons/Machine.mo
Original file line number Diff line number Diff line change
Expand Up @@ -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},
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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},
Expand Down
9 changes: 6 additions & 3 deletions Modelica/Electrical/Machines/Icons/QuasiStaticMachine.mo
Original file line number Diff line number Diff line change
Expand Up @@ -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},
Expand Down
15 changes: 10 additions & 5 deletions Modelica/Electrical/Machines/Icons/QuasiStaticTransformer.mo
Original file line number Diff line number Diff line change
Expand Up @@ -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},
Expand Down
9 changes: 6 additions & 3 deletions Modelica/Electrical/Machines/Icons/TransientMachine.mo
Original file line number Diff line number Diff line change
Expand Up @@ -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},
Expand Down
15 changes: 10 additions & 5 deletions Modelica/Electrical/Machines/Icons/TransientTransformer.mo
Original file line number Diff line number Diff line change
Expand Up @@ -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},
Expand Down
Loading