Skip to content
Merged
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
33 changes: 16 additions & 17 deletions Modelica/Blocks/Math.mo
Original file line number Diff line number Diff line change
Expand Up @@ -1670,6 +1670,9 @@ y = <strong>tanh</strong>( u );
annotation (
Icon(coordinateSystem(preserveAspectRatio=true, extent={{-100,-100},{100,
100}}), graphics={
Line(
points={{-90,-80},{68,-80}},
color={192,192,192}),
Line(points={{0,-80},{0,68}}, color={192,192,192}),
Polygon(
points={{0,90},{-8,68},{8,68},{0,90}},
Expand All @@ -1682,13 +1685,10 @@ y = <strong>tanh</strong>( u );
textString="exp"),
Line(points={{-80,-80},{-31,-77.9},{-6.03,-74},{10.9,-68.4},{23.7,-61},
{34.2,-51.6},{43,-40.3},{50.3,-27.8},{56.7,-13.5},{62.3,2.23},{
67.1,18.6},{72,38.2},{76,57.6},{80,80}}),
Line(
points={{-90,-80.3976},{68,-80.3976}},
color={192,192,192},
smooth=Smooth.Bezier),
67.1,18.6},{72,38.2},{76,57.6},{80,80}},
smooth=Smooth.Bezier),
Polygon(
points={{90,-80.3976},{68,-72.3976},{68,-88.3976},{90,-80.3976}},
points={{90,-80},{68,-72.3976},{68,-88.3976},{90,-80}},
lineColor={192,192,192},
fillColor={192,192,192},
fillPattern=FillPattern.Solid)}),
Expand Down Expand Up @@ -1718,6 +1718,9 @@ y = <strong>exp</strong>( u );
annotation (
Icon(coordinateSystem(preserveAspectRatio=true, extent={{-100,-100},{100,
100}}), graphics={
Line(
points={{-90,-80},{68,-80}},
color={192,192,192}),
Line(points={{0,-80},{0,68}}, color={192,192,192}),
Polygon(
points={{0,90},{-8,68},{8,68},{0,90}},
Expand All @@ -1730,13 +1733,10 @@ y = <strong>exp</strong>( u );
textString="^"),
Line(points={{-80,-80},{-31,-77.9},{-6.03,-74},{10.9,-68.4},{23.7,-61},
{34.2,-51.6},{43,-40.3},{50.3,-27.8},{56.7,-13.5},{62.3,2.23},{
67.1,18.6},{72,38.2},{76,57.6},{80,80}}),
Line(
points={{-90,-80.3976},{68,-80.3976}},
color={192,192,192},
smooth=Smooth.Bezier),
67.1,18.6},{72,38.2},{76,57.6},{80,80}},
smooth=Smooth.Bezier),
Polygon(
points={{90,-80.3976},{68,-72.3976},{68,-88.3976},{90,-80.3976}},
points={{90,-80},{68,-72.3976},{68,-88.3976},{90,-80}},
lineColor={192,192,192},
fillColor={192,192,192},
fillPattern=FillPattern.Solid)}),
Expand Down Expand Up @@ -1766,6 +1766,9 @@ y = base <strong>^</strong> u;
y = u^exponent;
annotation (Icon(coordinateSystem(preserveAspectRatio=true, extent={{-100,-100},
{100,100}}), graphics={
Line(
points={{-90,-80},{68,-80}},
color={192,192,192}),
Line(points={{0,-80},{0,68}}, color={192,192,192}),
Polygon(
points={{0,90},{-8,68},{8,68},{0,90}},
Expand All @@ -1779,12 +1782,8 @@ y = base <strong>^</strong> u;
Line(points={{-80,60},{-70,27.2},{-60,-1.3},{-50,-25.3},{-40,-45},{-30,-60.3},
{-20,-71.3},{-10,-77.8},{0,-80},{10,-77.8},{20,-71.3},{30,-60.3},{
40,-45},{50,-25.3},{60,-1.3},{70,27.2},{80,60}}, smooth=Smooth.Bezier),
Line(
points={{-90,-80.3976},{68,-80.3976}},
color={192,192,192},
smooth=Smooth.Bezier),
Polygon(
points={{90,-80.3976},{68,-72.3976},{68,-88.3976},{90,-80.3976}},
points={{90,-80},{68,-72.3976},{68,-88.3976},{90,-80}},
lineColor={192,192,192},
fillColor={192,192,192},
fillPattern=FillPattern.Solid)}), Documentation(info="<html>
Expand Down
22 changes: 11 additions & 11 deletions Modelica/Blocks/Sources.mo
Original file line number Diff line number Diff line change
Expand Up @@ -267,11 +267,11 @@ The Real output y is a step signal:
lineColor={192,192,192},
fillColor={192,192,192},
fillPattern=FillPattern.Solid),
Line(points={{-80,-70},{-40,-70},{31,38}}),
Line(points={{-80,-70},{-40,-70},{31,38}, {86, 38}}),
Text(
extent={{-150,-150},{150,-110}},
textString="duration=%duration"),
Line(points={{31,38},{86,38}})}),
textString="duration=%duration")
}),
Documentation(info="<html>
<p>
The Real output y is a ramp signal:
Expand Down Expand Up @@ -377,12 +377,12 @@ The Real output y is a sine signal:
Line(points={{-80,80},{-76.2,79.8},{-70.6,76.6},{-64.9,69.7},{-59.3,
59.4},{-52.9,44.1},{-44.83,21.2},{-27.9,-30.8},{-20.7,-50.2},{-14.3,
-64.2},{-8.7,-73.1},{-3,-78.4},{2.6,-80},{8.2,-77.6},{13.9,-71.5},
{19.5,-61.9},{25.9,-47.2},{34,-24.8},{42,0}}, smooth=Smooth.Bezier),
{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},{
78.2,80.1},{83.8,80.8}}, smooth=Smooth.Bezier),
Text(
extent={{-147,-152},{153,-112}},
textString="f=%f"),
Line(points={{42,1},{53.3,35.2},{60.5,54.1},{66.9,67.4},{72.6,75.6},{
78.2,80.1},{83.8,80.8}})}),
textString="f=%f")
}),
Documentation(info="<html>
<p>
The Real output y is a cosine signal:
Expand Down Expand Up @@ -1504,7 +1504,7 @@ a flange according to a given acceleration.
fillColor={192,192,192},
fillPattern=FillPattern.Solid),
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}}),
{52,-20},{52,10},{-48,10},{-48,40},{52,40},{52,70},{2,70},{2,-50}}),
Text(
extent={{-150,-150},{150,-110}},
textString="offset=%offset")}),
Expand Down Expand Up @@ -1947,7 +1947,7 @@ MATLAB is a registered trademark of The MathWorks, Inc.
fillColor={255,215,136},
fillPattern=FillPattern.Solid,
extent={{-48,-50},{2,70}}),
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}}),
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}}),
Text(extent={{-150,-150},{150,-110}}, textString="tableOnFile=%tableOnFile")}));
end CombiTimeTable;

Expand Down Expand Up @@ -2157,7 +2157,7 @@ at sample times (defined by parameter <strong>period</strong>) and is otherwise
fillColor={192,192,192},
fillPattern=FillPattern.Solid), Line(points={{-18,-50},{-18,70},{32,
70},{32,-50},{-18,-50},{-18,-20},{32,-20},{32,10},{-18,10},{-18,
40},{32,40},{32,70},{32,70},{32,-51}})}),
40},{32,40},{32,70},{32,70},{32,-50}})}),
Documentation(info="<html>
<p>
The Boolean output y is a signal defined by parameter vector <strong>table</strong>.
Expand Down Expand Up @@ -2433,7 +2433,7 @@ The Integer output y is a step signal:
fillColor={192,192,192},
fillPattern=FillPattern.Solid),
Line(points={{-46,-52},{-46,68},{54,68},{54,-52},{-46,-52},{-46,-22},
{54,-22},{54,8},{-46,8},{-46,38},{54,38},{54,68},{4,68},{4,-53}})}),
{54,-22},{54,8},{-46,8},{-46,38},{54,38},{54,68},{4,68},{4,-52}})}),
Documentation(info="<html>

<p>
Expand Down
Loading