Added better looking icons

dzimmer · Apr 3, 2014 · 5faddb7 · 5faddb7
1 parent ec2914c
commit 5faddb7
Show file tree

Hide file tree

Showing 19 changed files with 78 additions and 25 deletions.
diff --git a/PlanarMechanics/GearComponents/Examples/Utilities/package.mo b/PlanarMechanics/GearComponents/Examples/Utilities/package.mo
@@ -2,7 +2,6 @@ within PlanarMechanics.GearComponents.Examples;
 package Utilities "Package with example models"
 
 
-
 annotation (Icon(graphics={              Rectangle(
           extent={{-80,100},{100,-80}},
           lineColor={0,0,0},

diff --git a/PlanarMechanics/Joints/package.mo b/PlanarMechanics/Joints/package.mo
@@ -1,5 +1,10 @@
 within PlanarMechanics;
 package Joints "Planar joint models"
+  extends PlanarMechanics.Utilities.Icons.Joints;
+
+
+
+
 annotation (Documentation(revisions="<html><p><img src=\"./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 package contains idealized, massless <b>joint components </b>and<b> Rolling components</b>.</p>
 </html>"));

diff --git a/PlanarMechanics/Parts/Fixed.mo b/PlanarMechanics/Parts/Fixed.mo
@@ -1,5 +1,6 @@
 within PlanarMechanics.Parts;
 model Fixed "FixedPosition"
+
   Interfaces.Frame_a frame_a
     annotation (Placement(transformation(extent={{-110,-10},{-90,10}}),
         iconTransformation(extent={{-120,-20},{-80,20}})));

diff --git a/PlanarMechanics/Parts/package.mo b/PlanarMechanics/Parts/package.mo
@@ -1,5 +1,14 @@
 within PlanarMechanics;
 package Parts 
+  extends PlanarMechanics.Utilities.Icons.Parts;
+
+
+
+
+
+
+
+
 annotation (Documentation(revisions="<html><p><img src=\"./Resources/Images/dlr_logo.png\"/> <b>Developed 2010-2014 at the DLR Institute of System Dynamics and Control</b> </p></html>",  info="<html>
 <p>Package <b>Parts</b> contains rigid components and spring/damper components for planar mechanical systems, which could be used to build up a complex planar system.</p>
 </html>"));

diff --git a/PlanarMechanics/Sensors/AbsolutePosition.mo b/PlanarMechanics/Sensors/AbsolutePosition.mo
@@ -71,12 +71,12 @@ equation
           lineColor={0,0,0},
           textString="r"),
         Text(
-          visible = (resolveInFrame == Modelica.Mechanics.MultiBody.Types.ResolveInFrameA.frame_resolve),
+          visible=  (resolveInFrame == Modelica.Mechanics.MultiBody.Types.ResolveInFrameA.frame_resolve),
           extent={{15,-67},{146,-92}},
           lineColor={95,95,95},
           textString="resolve"),
         Line(
-          visible = (resolveInFrame == Modelica.Mechanics.MultiBody.Types.ResolveInFrameA.frame_resolve),
+          visible=  (resolveInFrame == Modelica.Mechanics.MultiBody.Types.ResolveInFrameA.frame_resolve),
           points={{0,-96},{0,-96},{0,-70},{0,-70}},
           color={0,0,0},
           smooth=Smooth.None,

diff --git a/PlanarMechanics/Types/package.mo b/PlanarMechanics/Types/package.mo
@@ -1,5 +1,7 @@
 within PlanarMechanics;
 package Types 
+  extends Modelica.Icons.TypesPackage;
+
 annotation (Documentation(revisions="<html><p><img src=\"./Resources/Images/dlr_logo.png\"/> <b>Developed 2010-2014 at the DLR Institute of System Dynamics and Control</b> </p></html>",  info="<html>
 <p>In this package <b>types</b> and <b>constants</b> are defined that are used in the PlanarMechanics library. The types have additional annotation choices definitions that define the menus to be built up in the graphical user interface when the type is used as parameter in a declaration. </p>
 </html>"));

diff --git a/PlanarMechanics/Utilities/AtanLib/atan3b.mo b/PlanarMechanics/Utilities/AtanLib/atan3b.mo
@@ -85,7 +85,7 @@ algorithm
           smooth=Smooth.None)}),
     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>
+</html>",                                                                                                  info="<HTML>
 <p>
 This function returns y = <b>atan3</b>(u1,u2,y0) such that
 <b>tan</b>(y) = u1/u2 and

diff --git a/PlanarMechanics/Utilities/AtanLib/package.mo b/PlanarMechanics/Utilities/AtanLib/package.mo
@@ -1,5 +1,9 @@
 within PlanarMechanics.Utilities;
 package AtanLib "Library for the atan3 function which is double differentiable"
+extends Modelica.Icons.Package;
+
+
+
   annotation (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>"));

diff --git a/PlanarMechanics/Utilities/Icons/Joints/package.mo b/PlanarMechanics/Utilities/Icons/Joints/package.mo
@@ -0,0 +1,23 @@
+within PlanarMechanics.Utilities.Icons;
+package Joints 
+extends Modelica.Icons.Package;
+
+  annotation (Icon(graphics={
+        Ellipse(
+          extent={{-4,10},{42,-36}},
+          lineColor={95,95,95},
+          fillPattern=FillPattern.Sphere,
+          fillColor={95,95,95}),
+        Polygon(
+          points={{14,8},{36,0},{62,82},{40,88},{14,8}},
+          lineColor={95,95,95},
+          fillPattern=FillPattern.Sphere,
+          smooth=Smooth.None,
+          fillColor={255,255,255}),
+        Polygon(
+          points={{-4,-16},{8,-34},{-62,-82},{-74,-64},{-4,-16}},
+          lineColor={95,95,95},
+          fillPattern=FillPattern.Sphere,
+          smooth=Smooth.None,
+          fillColor={255,255,255})}));
+end Joints;
diff --git a/PlanarMechanics/Utilities/Icons/Joints/package.order b/PlanarMechanics/Utilities/Icons/Joints/package.order
diff --git a/PlanarMechanics/Utilities/Icons/Parts/package.mo b/PlanarMechanics/Utilities/Icons/Parts/package.mo
@@ -0,0 +1,16 @@
+within PlanarMechanics.Utilities.Icons;
+package Parts 
+extends Modelica.Icons.Package;
+
+annotation (Icon(graphics={
+                          Rectangle(
+          extent={{-82,22},{0,-22}},
+          lineColor={95,95,95},
+          fillPattern=FillPattern.HorizontalCylinder,
+          fillColor={215,215,215},
+          radius=10), Ellipse(
+          extent={{-10,46},{84,-48}},
+          lineColor={95,95,95},
+          fillPattern=FillPattern.Sphere,
+          fillColor={215,215,215})}));
+end Parts;
diff --git a/PlanarMechanics/Utilities/Icons/Parts/package.order b/PlanarMechanics/Utilities/Icons/Parts/package.order
diff --git a/PlanarMechanics/Utilities/Icons/package.order b/PlanarMechanics/Utilities/Icons/package.order
@@ -2,3 +2,5 @@ PlanarGearContactExternalL1
 PlanarGearContactInternalL1
 GearConnections
 PlanetaryGear
+Parts
+Joints
diff --git a/PlanarMechanics/Utilities/package.mo b/PlanarMechanics/Utilities/package.mo
@@ -1,26 +1,13 @@
 within PlanarMechanics;
 package Utilities 
+  extends Modelica.Icons.UtilitiesPackage;
 
 
-  annotation (Icon(graphics={            Rectangle(
-          extent={{-80,100},{100,-80}},
-          lineColor={0,0,0},
-          fillColor={215,230,240},
-          fillPattern=FillPattern.Solid), Rectangle(
-          extent={{-100,80},{80,-100}},
-          lineColor={0,0,0},
-          fillColor={240,240,240},
-          fillPattern=FillPattern.Solid),
-                              Polygon(
-          points={{52,-10},{34,10},{14,10},{-6,-10},{-70,-10},{-78,-18},{-78,-28},
-              {-70,-36},{-4,-36},{14,-54},{34,-54},{54,-34},{26,-34},{18,-28},{18,
-              -16},{26,-10},{52,-10}},
-          lineThickness=0.5,
-          smooth=Smooth.None,
-          fillColor={95,95,95},
-          fillPattern=FillPattern.Solid,
-          pattern=LinePattern.None,
-          lineColor={0,0,0})}), Documentation(info="<html>
+
+
+
+
+  annotation (Icon(graphics),   Documentation(info="<html>
 <p>This package contains auxiliary functions and blocks for internal usage.</p>
 </html>", 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>

diff --git a/PlanarMechanics/VehicleComponents/package.mo b/PlanarMechanics/VehicleComponents/package.mo
@@ -1,5 +1,7 @@
 within PlanarMechanics;
 package VehicleComponents 
+extends Modelica.Icons.Package;
+
 
 
 annotation (Documentation(info="<html>

diff --git a/PlanarMechanics/Visualizers/Advanced/package.mo b/PlanarMechanics/Visualizers/Advanced/package.mo
@@ -1,3 +1,5 @@
 within PlanarMechanics.Visualizers;
 package Advanced 
+   extends Modelica.Icons.Package;
+
 end Advanced;
diff --git a/PlanarMechanics/Visualizers/package.mo b/PlanarMechanics/Visualizers/package.mo
@@ -1,3 +1,4 @@
 within PlanarMechanics;
 package Visualizers 
+  extends Modelica.Icons.Package;
 end Visualizers;
diff --git a/PlanarMechanics/package.mo b/PlanarMechanics/package.mo
@@ -8,8 +8,7 @@ import MB = Modelica.Mechanics.MultiBody;
   preferredView="info",
   version="1.2.0",
   versionDate="2014-01-30",
-  uses(Modelica(version="3.2")),
-                                 Documentation( revisions="<html><p><img src=\"./Resources/Images/dlr_logo.png\"/> <b>Developed 2010-2014 at the DLR Institute of System Dynamics and Control</b> </p>
+  uses(Modelica(version="3.2")), Documentation( revisions="<html><p><img src=\"./Resources/Images/dlr_logo.png\"/> <b>Developed 2010-2014 at the DLR Institute of System Dynamics and Control</b> </p>
 </html>", info="<html>
 <p>Library <b>PlanarMechanics</b> is a <b>free</b> Modelica package providing 2-dimentional mechanical components to model mechanical systems, such as robots, mechanisms, vehicles, where MultiBody library is unneccesarily complex.</p>
 <p>In order to know how the library works, first have a look at:</p>

diff --git a/PlanarMechanics/package.order b/PlanarMechanics/package.order
@@ -10,3 +10,4 @@ GearComponents
 VehicleComponents
 Types
 Utilities
+Visualizers