Skip to content

Commit

Permalink
Combined MultiBody.Joints.Prismatic/ActuatedPrismatic in one joint "P…
Browse files Browse the repository at this point in the history 
…rismatic".

Via the new flag "useAxisFlange", the optional axis/support flanges are enabled.
Changed the previous "bearing" connector to "support" connector.
Adapted all occurrences of ActuatedPrismatic joint to the new Prismatic joint.

For unknown reasons, also some other files are updated, although no changes have
been performed.


git-svn-id: https://svn.modelica.org/projects/Modelica/trunk@912 7ce873d0-865f-4ce7-a662-4bb36ea78beb
  • Loading branch information
otter committed Dec 9, 2007
1 parent b9455e9 commit c025e05
Show file tree
Hide file tree
Showing 31 changed files with 1,167 additions and 1,589 deletions.
3 changes: 1 addition & 2 deletions Modelica/Blocks/Continuous.mo
View file
Expand Up @@ -816,8 +816,7 @@ This is discussed in the description of package
lineColor={192,192,192},
fillColor={192,192,192},
fillPattern=FillPattern.Solid),
Line(points={{-80,-80},{-80,50},{-80,-20},{60,80}}, color={0,0,127}),

Line(points={{-80,-80},{-80,50},{-80,-20},{60,80}}, color={0,0,127}),
Text(
extent={{-20,-20},{80,-60}},
lineColor={192,192,192},
Expand Down
112 changes: 56 additions & 56 deletions Modelica/Blocks/Interfaces.mo
View file
Expand Up @@ -1098,16 +1098,16 @@ in the Blocks.Logical library.
annotation (Icon(coordinateSystem(preserveAspectRatio=false, extent={{-100,
-100},{100,100}}), graphics={Ellipse(
extent={{-71,7},{-85,-7}},
lineColor=DynamicSelect({235,235,235}, if u > 0.5 then {0,255,0}
else {235,235,235}),
fillColor=DynamicSelect({235,235,235}, if u > 0.5 then {0,255,0}
else {235,235,235}),
lineColor=DynamicSelect({235,235,235}, if u > 0.5 then {0,255,0} else
{235,235,235}),
fillColor=DynamicSelect({235,235,235}, if u > 0.5 then {0,255,0} else
{235,235,235}),
fillPattern=FillPattern.Solid), Ellipse(
extent={{71,7},{85,-7}},
lineColor=DynamicSelect({235,235,235}, if y > 0.5 then {0,255,0}
else {235,235,235}),
fillColor=DynamicSelect({235,235,235}, if y > 0.5 then {0,255,0}
else {235,235,235}),
lineColor=DynamicSelect({235,235,235}, if y > 0.5 then {0,255,0} else
{235,235,235}),
fillColor=DynamicSelect({235,235,235}, if y > 0.5 then {0,255,0} else
{235,235,235}),
fillPattern=FillPattern.Solid)}),
Documentation(info="<html>
<p>
Expand Down Expand Up @@ -1139,24 +1139,24 @@ with a 3D icon (e.g. used in Blocks.Logical library).
grid={1,1}), graphics={
Ellipse(
extent={{-71,7},{-85,-7}},
lineColor=DynamicSelect({235,235,235}, if u1 > 0.5 then {0,255,0}
else {235,235,235}),
fillColor=DynamicSelect({235,235,235}, if u1 > 0.5 then {0,255,0}
else {235,235,235}),
lineColor=DynamicSelect({235,235,235}, if u1 > 0.5 then {0,255,0} else
{235,235,235}),
fillColor=DynamicSelect({235,235,235}, if u1 > 0.5 then {0,255,0} else
{235,235,235}),
fillPattern=FillPattern.Solid),
Ellipse(
extent={{-71,-74},{-85,-88}},
lineColor=DynamicSelect({235,235,235}, if u2 > 0.5 then {0,255,0}
else {235,235,235}),
fillColor=DynamicSelect({235,235,235}, if u2 > 0.5 then {0,255,0}
else {235,235,235}),
lineColor=DynamicSelect({235,235,235}, if u2 > 0.5 then {0,255,0} else
{235,235,235}),
fillColor=DynamicSelect({235,235,235}, if u2 > 0.5 then {0,255,0} else
{235,235,235}),
fillPattern=FillPattern.Solid),
Ellipse(
extent={{71,7},{85,-7}},
lineColor=DynamicSelect({235,235,235}, if y > 0.5 then {0,255,0}
else {235,235,235}),
fillColor=DynamicSelect({235,235,235}, if y > 0.5 then {0,255,0}
else {235,235,235}),
lineColor=DynamicSelect({235,235,235}, if y > 0.5 then {0,255,0} else
{235,235,235}),
fillColor=DynamicSelect({235,235,235}, if y > 0.5 then {0,255,0} else
{235,235,235}),
fillPattern=FillPattern.Solid)}),
Documentation(info="<html>
<p>
Expand Down Expand Up @@ -1192,31 +1192,31 @@ with a 3D icon (e.g. used in Blocks.Logical library).
grid={1,1}), graphics={
Ellipse(
extent={{-71,74},{-85,88}},
lineColor=DynamicSelect({235,235,235}, if u1 > 0.5 then {0,255,0}
else {235,235,235}),
fillColor=DynamicSelect({235,235,235}, if u1 > 0.5 then {0,255,0}
else {235,235,235}),
lineColor=DynamicSelect({235,235,235}, if u1 > 0.5 then {0,255,0} else
{235,235,235}),
fillColor=DynamicSelect({235,235,235}, if u1 > 0.5 then {0,255,0} else
{235,235,235}),
fillPattern=FillPattern.Solid),
Ellipse(
extent={{-71,7},{-85,-7}},
lineColor=DynamicSelect({235,235,235}, if u2 > 0.5 then {0,255,0}
else {235,235,235}),
fillColor=DynamicSelect({235,235,235}, if u2 > 0.5 then {0,255,0}
else {235,235,235}),
lineColor=DynamicSelect({235,235,235}, if u2 > 0.5 then {0,255,0} else
{235,235,235}),
fillColor=DynamicSelect({235,235,235}, if u2 > 0.5 then {0,255,0} else
{235,235,235}),
fillPattern=FillPattern.Solid),
Ellipse(
extent={{-71,-74},{-85,-88}},
lineColor=DynamicSelect({235,235,235}, if u3 > 0.5 then {0,255,0}
else {235,235,235}),
fillColor=DynamicSelect({235,235,235}, if u3 > 0.5 then {0,255,0}
else {235,235,235}),
lineColor=DynamicSelect({235,235,235}, if u3 > 0.5 then {0,255,0} else
{235,235,235}),
fillColor=DynamicSelect({235,235,235}, if u3 > 0.5 then {0,255,0} else
{235,235,235}),
fillPattern=FillPattern.Solid),
Ellipse(
extent={{71,7},{85,-7}},
lineColor=DynamicSelect({235,235,235}, if y > 0.5 then {0,255,0}
else {235,235,235}),
fillColor=DynamicSelect({235,235,235}, if y > 0.5 then {0,255,0}
else {235,235,235}),
lineColor=DynamicSelect({235,235,235}, if y > 0.5 then {0,255,0} else
{235,235,235}),
fillColor=DynamicSelect({235,235,235}, if y > 0.5 then {0,255,0} else
{235,235,235}),
fillPattern=FillPattern.Solid)}),
Documentation(info="<html>
Block has three continuous Boolean input and one continuous Boolean output signal
Expand All @@ -1236,10 +1236,10 @@ with a 3D icon (e.g. used in Blocks.Logical library).
annotation (Icon(coordinateSystem(preserveAspectRatio=false, extent={{-100,
-100},{100,100}}), graphics={Ellipse(
extent={{-71,7},{-85,-7}},
lineColor=DynamicSelect({235,235,235}, if u > 0.5 then {0,255,0}
else {235,235,235}),
fillColor=DynamicSelect({235,235,235}, if u > 0.5 then {0,255,0}
else {235,235,235}),
lineColor=DynamicSelect({235,235,235}, if u > 0.5 then {0,255,0} else
{235,235,235}),
fillColor=DynamicSelect({235,235,235}, if u > 0.5 then {0,255,0} else
{235,235,235}),
fillPattern=FillPattern.Solid)}),
Documentation(info="<html>
<p>
Expand All @@ -1260,10 +1260,10 @@ with a 3D icon (e.g. used in Blocks.Logical library).
annotation (Icon(coordinateSystem(preserveAspectRatio=false, extent={{-100,
-100},{100,100}}), graphics={Ellipse(
extent={{71,7},{85,-7}},
lineColor=DynamicSelect({235,235,235}, if y > 0.5 then {0,255,0}
else {235,235,235}),
fillColor=DynamicSelect({235,235,235}, if y > 0.5 then {0,255,0}
else {235,235,235}),
lineColor=DynamicSelect({235,235,235}, if y > 0.5 then {0,255,0} else
{235,235,235}),
fillColor=DynamicSelect({235,235,235}, if y > 0.5 then {0,255,0} else
{235,235,235}),
fillPattern=FillPattern.Solid)}),
Documentation(info="<html>
<p>
Expand Down Expand Up @@ -1298,10 +1298,10 @@ with a 3D icon (e.g. used in Blocks.Logical library).
fillPattern=FillPattern.Solid),
Ellipse(
extent={{71,7},{85,-7}},
lineColor=DynamicSelect({235,235,235}, if y > 0.5 then {0,255,0}
else {235,235,235}),
fillColor=DynamicSelect({235,235,235}, if y > 0.5 then {0,255,0}
else {235,235,235}),
lineColor=DynamicSelect({235,235,235}, if y > 0.5 then {0,255,0} else
{235,235,235}),
fillColor=DynamicSelect({235,235,235}, if y > 0.5 then {0,255,0} else
{235,235,235}),
fillPattern=FillPattern.Solid)}),
Diagram(coordinateSystem(preserveAspectRatio=false, extent={{-100,-100},
{100,100}}), graphics={
Expand Down Expand Up @@ -1365,10 +1365,10 @@ and a 3D icon (e.g. used in Blocks.Logical library).
textString="%threshold"),
Ellipse(
extent={{71,7},{85,-7}},
lineColor=DynamicSelect({235,235,235}, if y > 0.5 then {0,255,0}
else {235,235,235}),
fillColor=DynamicSelect({235,235,235}, if y > 0.5 then {0,255,0}
else {235,235,235}),
lineColor=DynamicSelect({235,235,235}, if y > 0.5 then {0,255,0} else
{235,235,235}),
fillColor=DynamicSelect({235,235,235}, if y > 0.5 then {0,255,0} else
{235,235,235}),
fillPattern=FillPattern.Solid)}),
Diagram(coordinateSystem(preserveAspectRatio=false, extent={{-100,-100},
{100,100}}),
Expand Down Expand Up @@ -1405,10 +1405,10 @@ as well as a 3D icon (e.g. used in Blocks.Logical library).
borderPattern=BorderPattern.Raised),
Ellipse(
extent={{73,7},{87,-7}},
lineColor=DynamicSelect({235,235,235}, if y > 0.5 then {0,255,0}
else {235,235,235}),
fillColor=DynamicSelect({235,235,235}, if y > 0.5 then {0,255,0}
else {235,235,235}),
lineColor=DynamicSelect({235,235,235}, if y > 0.5 then {0,255,0} else
{235,235,235}),
fillColor=DynamicSelect({235,235,235}, if y > 0.5 then {0,255,0} else
{235,235,235}),
fillPattern=FillPattern.Solid),
Ellipse(extent={{32,10},{52,-10}}, lineColor={0,0,255}),
Line(points={{-100,-80},{42,-80},{42,0}}, color={0,0,255})}),
Expand Down
10 changes: 5 additions & 5 deletions Modelica/Blocks/Logical.mo
View file
Expand Up @@ -818,7 +818,7 @@ The default value of this parameter is <b>false</b>.
Line(points={{-78,-2},{-6,18},{82,-12}}, color={255,0,0}),
Line(points={{-78,12},{-6,30},{82,0}}, color={0,0,0}),
Line(points={{-78,-16},{-6,4},{82,-26}}, color={0,0,0}),
Line(points={{-82,-18},{-56,-18},{-56,-40},{64,-40},{64,-20},{90,-20}},
Line(points={{-82,-18},{-56,-18},{-56,-40},{64,-40},{64,-20},{90,-20}},
color={255,0,255})}), Documentation(info="<html>
<p>The block OnOffController sets the output signal <b>y</b> to <b>true</b> when
the input signal <b>u</b> falls below the <b>reference</b> signal minus half of
Expand Down Expand Up @@ -884,7 +884,7 @@ signal <b>u</b> exceeds the <b>reference</b> signal plus half of the bandwidth.<
lineColor={0,0,0},
fillColor={255,255,255},
fillPattern=FillPattern.Solid),
Line(points={{-80,-68},{-60,-68},{-60,-42},{8,-42},{8,-68},{60,-68}},
Line(points={{-80,-68},{-60,-68},{-60,-42},{8,-42},{8,-68},{60,-68}},
color={255,0,255}),
Line(
points={{-60,40},{-60,-42}},
Expand Down Expand Up @@ -1054,7 +1054,7 @@ handled properly.</p>
lineColor={192,192,192},
fillColor={192,192,192},
fillPattern=FillPattern.Solid),
Line(points={{-80,-70},{-60,-70},{-60,-26},{38,-26},{38,-70},{66,-70}},
Line(points={{-80,-70},{-60,-70},{-60,-26},{38,-26},{38,-70},{66,-70}},
color={255,0,255}),
Line(points={{-80,0},{-62,0},{40,90},{40,0},{68,0}}, color={0,0,255})}),
Diagram(coordinateSystem(preserveAspectRatio=false, extent={{-100,-100},{
Expand All @@ -1071,9 +1071,9 @@ handled properly.</p>
lineColor={0,0,0},
fillColor={255,255,255},
fillPattern=FillPattern.Solid),
Line(points={{-80,-68},{-60,-68},{-60,-40},{20,-40},{20,-68},{60,-68}},
Line(points={{-80,-68},{-60,-68},{-60,-40},{20,-40},{20,-68},{60,-68}},
color={255,0,255}),
Line(points={{-80,-20},{-60,-20},{20,60},{20,-20},{60,-20},{60,-20}},
Line(points={{-80,-20},{-60,-20},{20,60},{20,-20},{60,-20},{60,-20}},
color={0,0,255}),
Text(
extent={{-88,6},{-54,-4}},
Expand Down
13 changes: 5 additions & 8 deletions Modelica/Blocks/Math.mo
View file
Expand Up @@ -1707,8 +1707,7 @@ as <b>cos</b> of the input <b>u</b>:
Line(points={{-80,-80},{-78.4,-68.4},{-76.8,-59.7},{-74.4,-50},{-71.2,
-40.9},{-67.1,-33},{-60.7,-24.8},{-51.1,-17.2},{-35.8,-9.98},{-4.42,
-1.07},{33.4,9.12},{49.4,16.2},{59.1,23.2},{65.5,30.6},{70.4,
39.1},{73.6,47.4},{76,56.1},{77.6,63.8},{80,80}}, color={0,0,0}),

39.1},{73.6,47.4},{76,56.1},{77.6,63.8},{80,80}}, color={0,0,0}),
Line(points={{-90,0},{68,0}}, color={192,192,192}),
Polygon(
points={{90,0},{68,8},{68,-8},{90,0}},
Expand Down Expand Up @@ -1756,8 +1755,7 @@ as <b>cos</b> of the input <b>u</b>:
Line(points={{-80,-80},{-78.4,-68.4},{-76.8,-59.7},{-74.4,-50},{-71.2,
-40.9},{-67.1,-33},{-60.7,-24.8},{-51.1,-17.2},{-35.8,-9.98},{-4.42,
-1.07},{33.4,9.12},{49.4,16.2},{59.1,23.2},{65.5,30.6},{70.4,
39.1},{73.6,47.4},{76,56.1},{77.6,63.8},{80,80}}, color={0,0,0}),

39.1},{73.6,47.4},{76,56.1},{77.6,63.8},{80,80}}, color={0,0,0}),
Text(
extent={{70,-6},{94,-26}},
lineColor={160,160,164},
Expand Down Expand Up @@ -2526,8 +2524,7 @@ This blocks computes the output <b>y</b> as the
fillPattern=FillPattern.Solid),
Line(points={{-100,-80.3976},{84,-80.3976}}, color={192,192,192}),
Polygon(
points={{100,-80.3976},{84,-74.3976},{84,-86.3976},{100,-80.3976}},

points={{100,-80.3976},{84,-74.3976},{84,-86.3976},{100,-80.3976}},
lineColor={192,192,192},
fillColor={192,192,192},
fillPattern=FillPattern.Solid),
Expand Down Expand Up @@ -2595,7 +2592,7 @@ This blocks computes the output <b>y</b> as the
fillPattern=FillPattern.Solid),
Line(points={{-80,-80},{-79.2,-50.6},{-78.4,-37},{-77.6,-28},{-76.8,-21.3},
{-75.2,-11.4},{-72.8,-1.31},{-69.5,8.08},{-64.7,17.9},{-57.5,28},
{-47,38.1},{-31.8,48.1},{-10.1,58},{22.1,68},{68.7,78.1},{80,80}},
{-47,38.1},{-31.8,48.1},{-10.1,58},{22.1,68},{68.7,78.1},{80,80}},
color={0,0,0}),
Line(points={{-90,0},{68,0}}, color={192,192,192}),
Polygon(
Expand Down Expand Up @@ -2631,7 +2628,7 @@ This blocks computes the output <b>y</b> as the
fillPattern=FillPattern.Solid),
Line(points={{-80,-80},{-79.2,-50.6},{-78.4,-37},{-77.6,-28},{-76.8,-21.3},
{-75.2,-11.4},{-72.8,-1.31},{-69.5,8.08},{-64.7,17.9},{-57.5,28},
{-47,38.1},{-31.8,48.1},{-10.1,58},{22.1,68},{68.7,78.1},{80,80}},
{-47,38.1},{-31.8,48.1},{-10.1,58},{22.1,68},{68.7,78.1},{80,80}},
color={0,0,0}),
Text(
extent={{-105,72},{-85,88}},
Expand Down

0 comments on commit c025e05

Please sign in to comment.