Skip to content

Commit b05f26a

Browse files
maltelenzmaltelenz
authored
Merge pull request #4772 from maltelenz/bugfix/sloppy-lines
Fix some sloppy lines on Blocks icons.
2 parents 2c0d22b + 2ac074b commit b05f26a

2 files changed

Lines changed: 27 additions & 28 deletions

File tree

‎Modelica/Blocks/Math.mo‎

Lines changed: 16 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1670,6 +1670,9 @@ y = <strong>tanh</strong>( u );
16701670
annotation (
16711671
Icon(coordinateSystem(preserveAspectRatio=true, extent={{-100,-100},{100,
16721672
100}}), graphics={
1673+
Line(
1674+
points={{-90,-80},{68,-80}},
1675+
color={192,192,192}),
16731676
Line(points={{0,-80},{0,68}}, color={192,192,192}),
16741677
Polygon(
16751678
points={{0,90},{-8,68},{8,68},{0,90}},
@@ -1682,13 +1685,10 @@ y = <strong>tanh</strong>( u );
16821685
textString="exp"),
16831686
Line(points={{-80,-80},{-31,-77.9},{-6.03,-74},{10.9,-68.4},{23.7,-61},
16841687
{34.2,-51.6},{43,-40.3},{50.3,-27.8},{56.7,-13.5},{62.3,2.23},{
1685-
67.1,18.6},{72,38.2},{76,57.6},{80,80}}),
1686-
Line(
1687-
points={{-90,-80.3976},{68,-80.3976}},
1688-
color={192,192,192},
1689-
smooth=Smooth.Bezier),
1688+
67.1,18.6},{72,38.2},{76,57.6},{80,80}},
1689+
smooth=Smooth.Bezier),
16901690
Polygon(
1691-
points={{90,-80.3976},{68,-72.3976},{68,-88.3976},{90,-80.3976}},
1691+
points={{90,-80},{68,-72.3976},{68,-88.3976},{90,-80}},
16921692
lineColor={192,192,192},
16931693
fillColor={192,192,192},
16941694
fillPattern=FillPattern.Solid)}),
@@ -1718,6 +1718,9 @@ y = <strong>exp</strong>( u );
17181718
annotation (
17191719
Icon(coordinateSystem(preserveAspectRatio=true, extent={{-100,-100},{100,
17201720
100}}), graphics={
1721+
Line(
1722+
points={{-90,-80},{68,-80}},
1723+
color={192,192,192}),
17211724
Line(points={{0,-80},{0,68}}, color={192,192,192}),
17221725
Polygon(
17231726
points={{0,90},{-8,68},{8,68},{0,90}},
@@ -1730,13 +1733,10 @@ y = <strong>exp</strong>( u );
17301733
textString="^"),
17311734
Line(points={{-80,-80},{-31,-77.9},{-6.03,-74},{10.9,-68.4},{23.7,-61},
17321735
{34.2,-51.6},{43,-40.3},{50.3,-27.8},{56.7,-13.5},{62.3,2.23},{
1733-
67.1,18.6},{72,38.2},{76,57.6},{80,80}}),
1734-
Line(
1735-
points={{-90,-80.3976},{68,-80.3976}},
1736-
color={192,192,192},
1737-
smooth=Smooth.Bezier),
1736+
67.1,18.6},{72,38.2},{76,57.6},{80,80}},
1737+
smooth=Smooth.Bezier),
17381738
Polygon(
1739-
points={{90,-80.3976},{68,-72.3976},{68,-88.3976},{90,-80.3976}},
1739+
points={{90,-80},{68,-72.3976},{68,-88.3976},{90,-80}},
17401740
lineColor={192,192,192},
17411741
fillColor={192,192,192},
17421742
fillPattern=FillPattern.Solid)}),
@@ -1766,6 +1766,9 @@ y = base <strong>^</strong> u;
17661766
y = u^exponent;
17671767
annotation (Icon(coordinateSystem(preserveAspectRatio=true, extent={{-100,-100},
17681768
{100,100}}), graphics={
1769+
Line(
1770+
points={{-90,-80},{68,-80}},
1771+
color={192,192,192}),
17691772
Line(points={{0,-80},{0,68}}, color={192,192,192}),
17701773
Polygon(
17711774
points={{0,90},{-8,68},{8,68},{0,90}},
@@ -1779,12 +1782,8 @@ y = base <strong>^</strong> u;
17791782
Line(points={{-80,60},{-70,27.2},{-60,-1.3},{-50,-25.3},{-40,-45},{-30,-60.3},
17801783
{-20,-71.3},{-10,-77.8},{0,-80},{10,-77.8},{20,-71.3},{30,-60.3},{
17811784
40,-45},{50,-25.3},{60,-1.3},{70,27.2},{80,60}}, smooth=Smooth.Bezier),
1782-
Line(
1783-
points={{-90,-80.3976},{68,-80.3976}},
1784-
color={192,192,192},
1785-
smooth=Smooth.Bezier),
17861785
Polygon(
1787-
points={{90,-80.3976},{68,-72.3976},{68,-88.3976},{90,-80.3976}},
1786+
points={{90,-80},{68,-72.3976},{68,-88.3976},{90,-80}},
17881787
lineColor={192,192,192},
17891788
fillColor={192,192,192},
17901789
fillPattern=FillPattern.Solid)}), Documentation(info="<html>

‎Modelica/Blocks/Sources.mo‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -267,11 +267,11 @@ The Real output y is a step signal:
267267
lineColor={192,192,192},
268268
fillColor={192,192,192},
269269
fillPattern=FillPattern.Solid),
270-
Line(points={{-80,-70},{-40,-70},{31,38}}),
270+
Line(points={{-80,-70},{-40,-70},{31,38}, {86, 38}}),
271271
Text(
272272
extent={{-150,-150},{150,-110}},
273-
textString="duration=%duration"),
274-
Line(points={{31,38},{86,38}})}),
273+
textString="duration=%duration")
274+
}),
275275
Documentation(info="<html>
276276
<p>
277277
The Real output y is a ramp signal:
@@ -377,12 +377,12 @@ The Real output y is a sine signal:
377377
Line(points={{-80,80},{-76.2,79.8},{-70.6,76.6},{-64.9,69.7},{-59.3,
378378
59.4},{-52.9,44.1},{-44.83,21.2},{-27.9,-30.8},{-20.7,-50.2},{-14.3,
379379
-64.2},{-8.7,-73.1},{-3,-78.4},{2.6,-80},{8.2,-77.6},{13.9,-71.5},
380-
{19.5,-61.9},{25.9,-47.2},{34,-24.8},{42,0}}, smooth=Smooth.Bezier),
380+
{19.5,-61.9},{25.9,-47.2},{34,-24.8},{42,0},{53.3,35.2},{60.5,54.1},{66.9,67.4},{72.6,75.6},{
381+
78.2,80.1},{83.8,80.8}}, smooth=Smooth.Bezier),
381382
Text(
382383
extent={{-147,-152},{153,-112}},
383-
textString="f=%f"),
384-
Line(points={{42,1},{53.3,35.2},{60.5,54.1},{66.9,67.4},{72.6,75.6},{
385-
78.2,80.1},{83.8,80.8}})}),
384+
textString="f=%f")
385+
}),
386386
Documentation(info="<html>
387387
<p>
388388
The Real output y is a cosine signal:
@@ -1504,7 +1504,7 @@ a flange according to a given acceleration.
15041504
fillColor={192,192,192},
15051505
fillPattern=FillPattern.Solid),
15061506
Line(points={{-48,-50},{-48,70},{52,70},{52,-50},{-48,-50},{-48,-20},
1507-
{52,-20},{52,10},{-48,10},{-48,40},{52,40},{52,70},{2,70},{2,-51}}),
1507+
{52,-20},{52,10},{-48,10},{-48,40},{52,40},{52,70},{2,70},{2,-50}}),
15081508
Text(
15091509
extent={{-150,-150},{150,-110}},
15101510
textString="offset=%offset")}),
@@ -1947,7 +1947,7 @@ MATLAB is a registered trademark of The MathWorks, Inc.
19471947
fillColor={255,215,136},
19481948
fillPattern=FillPattern.Solid,
19491949
extent={{-48,-50},{2,70}}),
1950-
Line(points={{-48,-50},{-48,70},{52,70},{52,-50},{-48,-50},{-48,-20},{52,-20},{52,10},{-48,10},{-48,40},{52,40},{52,70},{2,70},{2,-51}}),
1950+
Line(points={{-48,-50},{-48,70},{52,70},{52,-50},{-48,-50},{-48,-20},{52,-20},{52,10},{-48,10},{-48,40},{52,40},{52,70},{2,70},{2,-50}}),
19511951
Text(extent={{-150,-150},{150,-110}}, textString="tableOnFile=%tableOnFile")}));
19521952
end CombiTimeTable;
19531953

@@ -2157,7 +2157,7 @@ at sample times (defined by parameter <strong>period</strong>) and is otherwise
21572157
fillColor={192,192,192},
21582158
fillPattern=FillPattern.Solid), Line(points={{-18,-50},{-18,70},{32,
21592159
70},{32,-50},{-18,-50},{-18,-20},{32,-20},{32,10},{-18,10},{-18,
2160-
40},{32,40},{32,70},{32,70},{32,-51}})}),
2160+
40},{32,40},{32,70},{32,70},{32,-50}})}),
21612161
Documentation(info="<html>
21622162
<p>
21632163
The Boolean output y is a signal defined by parameter vector <strong>table</strong>.
@@ -2433,7 +2433,7 @@ The Integer output y is a step signal:
24332433
fillColor={192,192,192},
24342434
fillPattern=FillPattern.Solid),
24352435
Line(points={{-46,-52},{-46,68},{54,68},{54,-52},{-46,-52},{-46,-22},
2436-
{54,-22},{54,8},{-46,8},{-46,38},{54,38},{54,68},{4,68},{4,-53}})}),
2436+
{54,-22},{54,8},{-46,8},{-46,38},{54,38},{54,68},{4,68},{4,-52}})}),
24372437
Documentation(info="<html>
24382438
24392439
<p>

0 commit comments

Comments
 (0)