Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Damper: changed icon to highlight that this model is Point-to-Point #87

Merged
merged 1 commit into from
Mar 12, 2015
Merged

Damper: changed icon to highlight that this model is Point-to-Point #87

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
19 changes: 14 additions & 5 deletions PlanarMechanics/Parts/Damper.mo
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,9 +31,9 @@ model Damper "Linear (velocity dependent) damper"
input SI.Diameter diameter_b = 0.6*diameter_a
"Diameter of cylinder at frame_b side"
annotation (Dialog(tab="Animation", group="Damper cylinders (if animation = true)", enable=animate));
input Types.Color color_a = {100,100,100} "Color of cylinder at frame_a side"
input Types.Color color_a = {0,127,255} "Color of cylinder at frame_a side"
annotation (HideResult=true, Dialog(tab="Animation", group="Damper cylinders (if animation = true)", enable=animate, colorSelector=true));
input Types.Color color_b = {155,155,155} "Color of cylinder at frame_b side"
input Types.Color color_b = {0,64,200} "Color of cylinder at frame_b side"
annotation (HideResult=true, Dialog(tab="Animation", group="Damper cylinders (if animation = true)", enable=animate, colorSelector=true));

SI.Distance length
Expand Down Expand Up @@ -107,8 +107,7 @@ equation
Icon(graphics={
Line(points={{-60,30},{60,30}}),
Line(points={{-60,-30},{60,-30}}),
Line(points={{30,0},{100,0}}),
Line(points={{-101,0},{-60,0}}),
Line(points={{-100,0},{100,0}}),
Rectangle(
extent={{-60,30},{30,-30}},
fillColor={192,192,192},
Expand All @@ -126,7 +125,17 @@ equation
points={{-100,-100},{-100,-80},{-18,0}},
color={191,0,0},
pattern=LinePattern.Dot,
smooth=Smooth.None)}),
smooth=Smooth.None),
Ellipse(
extent={{-90,10},{-70,-10}},
lineColor={0,0,0},
fillColor={255,255,255},
fillPattern=FillPattern.Solid),
Ellipse(
extent={{70,10},{90,-10}},
lineColor={0,0,0},
fillColor={255,255,255},
fillPattern=FillPattern.Solid)}),
Documentation(revisions="<html><p><img src=\"modelica://PlanarMechanics/Resources/Images/dlr_logo.png\"/> <b>Developed 2010-2014 at the DLR Institute of System Dynamics and Control</b></p></html>", info="<html>
<p>This component is a <b>linear damper</b>, which acts as a line force between frame_a and frame_b. A <b>force f</b> is exerted on the origin of frame_b and with opposite sign on the origin of frame_a along the line from the origin of frame_a to the origin of frame_b according to the equation: </p>
<p><code>f = d*<b>der</b>(s);</code></p>
Expand Down