Rename lever and change its icon

Author: tobolar

Modelica/Mechanics/Translational/Components/IdealLever.mo renamed to Modelica/Mechanics/Translational/Components/IdealGear.mo

@@ -1,5 +1,5 @@
 within Modelica.Mechanics.Translational.Components;
-model IdealLever "Ideal lever without mass"
+model IdealGear "Ideal gear without mass"
   extends Modelica.Mechanics.Translational.Interfaces.PartialElementaryTwoFlangesAndSupport2;
   parameter Real ratio(start=1)
     "Transmission ratio (flange_a.s/flange_b.s)";
@@ -51,45 +51,31 @@ to <var>i</var> only when <code>flange_a</code> is the driving flange.
     Icon(
       coordinateSystem(preserveAspectRatio=true,
         extent={{-100,-100},{100,100}}),
-      graphics={
-        Polygon(
-          points={{-6,-30},{-6,50},{0,50},{6,50},{6,-30},{-6,-30}},
-          lineColor={0,0,0},
-          fillColor={160,215,160},
-          fillPattern=FillPattern.Solid),
+      graphics={                  Line(points={{70,0},{100,0}},  color={0,127,0}),
+                                  Line(points={{-100,0},{-70,0}},color={0,127,0}),
         Ellipse(
-          extent={{-20,-10},{20,-50}},
-          fillColor={160,215,160},
+          extent={{-38,38},{38,-38}},
+          fillColor={255,255,255},
           fillPattern=FillPattern.Solid,
-          pattern=LinePattern.None),
-        Ellipse(
-          extent={{-20,-10},{20,-50}},
-          startAngle=-73,
-          endAngle=253,
-          closure=EllipseClosure.None),
+          lineColor={95,95,95}),
         Ellipse(
-          extent={{-10,-20},{10,-40}},
-          fillColor={175,190,175},
+          extent={{-16,16},{16,-16}},
+          fillColor={255,255,255},
+          fillPattern=FillPattern.Solid,
+          lineColor={95,95,95}),
+        Polygon(
+          points={{76,-10},{76,0},{76,24},{-42,24},{-42,16},{56,16},{66,-10},{76,-10}},
+          lineColor={0,127,0},
+          fillColor={160,215,160},
           fillPattern=FillPattern.Solid),
         Line(
-          points={{0,-54},{0,-30}},
+          points={{0,-54},{0,0}},
           color={0,127,0}),
         Line(
           points={{0,-100},{0,-78}},
           color={0,127,0}),
-        Line(
-         points={{-98,0},{0,50}},
-         color={0,127,0}),
-        Line(
-          points={{0,20},{100,0}},
-          color={0,127,0}),
-        Ellipse(
-          extent={{-4,54},{4,46}},
-          lineColor={0,127,0},
-          fillColor={160,215,160},
-          fillPattern=FillPattern.Solid),
         Ellipse(
-          extent={{-4,24},{4,16}},
+          extent={{-4,4},{4,-4}},
           lineColor={0,127,0},
           fillColor={160,215,160},
           fillPattern=FillPattern.Solid),
@@ -99,5 +85,10 @@ to <var>i</var> only when <code>flange_a</code> is the driving flange.
           textString="%name"),
         Text(
           extent={{-100,-50},{100,-80}},
-          textString="ratio=%ratio")}));
-end IdealLever;
+          textString="ratio=%ratio"),
+        Polygon(
+          points={{50,48},{50,38},{-52,38},{-66,-10},{-76,-10},{-76,48},{50,48}},
+          lineColor={95,95,95},
+          fillColor={131,175,131},
+          fillPattern=FillPattern.Solid)}));
+end IdealGear;

Modelica/Mechanics/Translational/Components/package.order

@@ -7,8 +7,8 @@ SpringDamper
 ElastoGap
 SupportFriction
 Brake
+IdealGear
 IdealGearR2T
-IdealLever
 IdealRollingWheel
 RollingResistance
 Vehicle

Modelica/Mechanics/Translational/Examples/LeverGrounded.mo renamed to Modelica/Mechanics/Translational/Examples/GearGrounded.mo

@@ -1,37 +1,43 @@
 within Modelica.Mechanics.Translational.Examples;
-model LeverGrounded "Translational grounded lever"
+model GearGrounded "Translational grounded gear"
   extends Modelica.Icons.Example;
 
   Sources.Force force(
-    useSupport=false) annotation (Placement(transformation(extent={{-50,-10},{-30,10}})));
+    useSupport=false) annotation (Placement(transformation(extent={{-70,-10},{-50,10}})));
   Components.Mass mass1(
-    m=0.1) annotation (Placement(transformation(extent={{-20,-10},{0,10}})));
-  Components.IdealLever idealLever(
-    ratio=1.6, useSupport=true)
-    annotation (Placement(transformation(extent={{10,-10},{30,10}})));
+    m=0.1) annotation (Placement(transformation(extent={{-40,-10},{-20,10}})));
+  Components.IdealGear idealLever(ratio=1.6, useSupport=true) annotation (Placement(transformation(extent={{-10,-10},{10,10}})));
   Components.Mass mass2(
     m=7,
     s(fixed=true, start=0),
-    v(fixed=true, start=0)) annotation (Placement(transformation(extent={{40,-10},{60,10}})));
-  Modelica.Blocks.Sources.Sine sine(amplitude=10,
-    f=5)
-    annotation (Placement(transformation(extent={{-80,-10},{-60,10}})));
-  Components.Fixed fixed annotation (Placement(transformation(extent={{-48,-60},{-28,-40}})));
+    v(fixed=true, start=0)) annotation (Placement(transformation(extent={{20,-10},{40,10}})));
+  Blocks.Sources.Ramp          ramp(
+    height=10,
+    duration=0.6,
+    startTime=0.2)
+    annotation (Placement(transformation(extent={{-100,-10},{-80,10}})));
+  Components.Fixed fixed annotation (Placement(transformation(extent={{-68,-50},{-48,-30}})));
   Components.SpringDamper springDamper(
     s_rel(fixed=true),
     v_rel(fixed=true),
     c=800,
-    d=50) annotation (Placement(transformation(extent={{-20,-60},{0,-40}})));
+    d=50) annotation (Placement(transformation(extent={{-40,-50},{-20,-30}})));
+  Components.Fixed fixed1 annotation (Placement(transformation(extent={{70,-10},{90,10}})));
+  Components.SpringDamper
+                    springDamper1(c=160, d=10)
+                                 annotation (Placement(transformation(extent={{50,-10},{70,10}})));
 equation
-  connect(mass1.flange_b, idealLever.flange_a) annotation (Line(points={{0,0},{10,0}},    color={0,127,0}));
-  connect(idealLever.flange_b, mass2.flange_a) annotation (Line(points={{30,0},{40,0}}, color={0,127,0}));
-  connect(sine.y, force.f) annotation (Line(points={{-59,0},{-52,0}}, color={0,0,127}));
-  connect(force.flange, mass1.flange_a) annotation (Line(points={{-30,0},{-20,0}}, color={0,127,0}));
-  connect(fixed.flange, springDamper.flange_a) annotation (Line(points={{-38,-50},{-20,-50}}, color={0,127,0}));
-  connect(springDamper.flange_b, idealLever.support) annotation (Line(points={{0,-50},{20,-50},{20,-10}}, color={0,127,0}));
+  connect(mass1.flange_b, idealLever.flange_a) annotation (Line(points={{-20,0},{-10,0}}, color={0,127,0}));
+  connect(idealLever.flange_b, mass2.flange_a) annotation (Line(points={{10,0},{20,0}}, color={0,127,0}));
+  connect(ramp.y, force.f) annotation (Line(points={{-79,0},{-72,0}}, color={0,0,127}));
+  connect(force.flange, mass1.flange_a) annotation (Line(points={{-50,0},{-40,0}}, color={0,127,0}));
+  connect(fixed.flange, springDamper.flange_a) annotation (Line(points={{-58,-40},{-40,-40}}, color={0,127,0}));
+  connect(springDamper.flange_b, idealLever.support) annotation (Line(points={{-20,-40},{0,-40},{0,-10}}, color={0,127,0}));
+  connect(mass2.flange_b, springDamper1.flange_a) annotation (Line(points={{40,0},{50,0}}, color={0,127,0}));
+  connect(springDamper1.flange_b, fixed1.flange) annotation (Line(points={{70,0},{80,0}}, color={0,127,0}));
   annotation (
     experiment(
-      StopTime=1.0,
+      StopTime=3.0,
       Interval=0.001),
     Documentation(info="<html>
 <p>
@@ -47,4 +53,4 @@ Simulate for 1&nbsp;second and plot the velocities of masses:
 <code>mass2.v</code>, <code>mass2.v</code>
 </p>
 </html>"));
-end LeverGrounded;
+end GearGrounded;

Modelica/Mechanics/Translational/Examples/package.order

@@ -4,7 +4,7 @@ WhyArrows
 Accelerate
 CompareBrakingForce
 Damper
-LeverGrounded
+GearGrounded
 Oscillator
 Sensors
 Friction