datatips tools updated 05/3905/8
Serge Steer [Thu, 28 Apr 2011 13:47:31 +0000 (15:47 +0200)]
Change-Id: Ied17621f3e382d3d6e130da21ac39877addc0f0f

58 files changed:
SEP/SEP_029_datatips.odt
scilab/CHANGES_5.4.X
scilab/modules/graphics/demos/datatips/curvature.sci [new file with mode: 0644]
scilab/modules/graphics/demos/datatips/datatip1.sce [new file with mode: 0644]
scilab/modules/graphics/demos/datatips/datatip2.sce [new file with mode: 0644]
scilab/modules/graphics/demos/datatips/datatips.dem.gateway.sce [new file with mode: 0644]
scilab/modules/graphics/demos/graphics.dem.gateway.sce
scilab/modules/graphics/help/en_US/datatips/datatipCreate.xml
scilab/modules/graphics/help/en_US/datatips/datatipGetStruct.xml
scilab/modules/graphics/help/en_US/datatips/datatipInitStruct.xml
scilab/modules/graphics/help/en_US/datatips/datatipManagerMode.xml
scilab/modules/graphics/help/en_US/datatips/datatipMove.xml
scilab/modules/graphics/help/en_US/datatips/datatipRedraw.xml
scilab/modules/graphics/help/en_US/datatips/datatipRemove.xml
scilab/modules/graphics/help/en_US/datatips/datatipRemoveAll.xml
scilab/modules/graphics/help/en_US/datatips/datatipSetDisplay.xml
scilab/modules/graphics/help/en_US/datatips/datatipSetInterp.xml
scilab/modules/graphics/help/en_US/datatips/datatipSetOrientation.xml
scilab/modules/graphics/help/en_US/datatips/datatipSetStruct.xml
scilab/modules/graphics/help/en_US/datatips/datatipSetStyle.xml [new file with mode: 0644]
scilab/modules/graphics/help/images/datatips.svg
scilab/modules/graphics/help/images/datatips2.svg
scilab/modules/graphics/help/images/datatips4.svg
scilab/modules/graphics/help/images/datatips6.svg [new file with mode: 0644]
scilab/modules/graphics/macros/datatips/%datatips_p.sci
scilab/modules/graphics/macros/datatips/datatipContextMenu.sci [new file with mode: 0644]
scilab/modules/graphics/macros/datatips/datatipCreate.sci
scilab/modules/graphics/macros/datatips/datatipCreatePopupMenu.sci [new file with mode: 0644]
scilab/modules/graphics/macros/datatips/datatipDefaultDisplay.sci
scilab/modules/graphics/macros/datatips/datatipDeleteSelected.sci [new file with mode: 0644]
scilab/modules/graphics/macros/datatips/datatipEventhandler.sci
scilab/modules/graphics/macros/datatips/datatipGUIEventHandler.sci [new file with mode: 0644]
scilab/modules/graphics/macros/datatips/datatipGetEntities.sci
scilab/modules/graphics/macros/datatips/datatipGetSelected.sci [new file with mode: 0644]
scilab/modules/graphics/macros/datatips/datatipGetStruct.sci
scilab/modules/graphics/macros/datatips/datatipHilite.sci [new file with mode: 0644]
scilab/modules/graphics/macros/datatips/datatipInitStruct.sci
scilab/modules/graphics/macros/datatips/datatipManagerMode.sci
scilab/modules/graphics/macros/datatips/datatipMove.sci
scilab/modules/graphics/macros/datatips/datatipRadioCallback.sci [new file with mode: 0644]
scilab/modules/graphics/macros/datatips/datatipRedraw.sci
scilab/modules/graphics/macros/datatips/datatipRemove.sci
scilab/modules/graphics/macros/datatips/datatipRemoveAll.sci
scilab/modules/graphics/macros/datatips/datatipRemoveNearest.sci [new file with mode: 0644]
scilab/modules/graphics/macros/datatips/datatipSetDisplay.sci
scilab/modules/graphics/macros/datatips/datatipSetGUI.sci [new file with mode: 0644]
scilab/modules/graphics/macros/datatips/datatipSetInterp.sci
scilab/modules/graphics/macros/datatips/datatipSetOrientation.sci
scilab/modules/graphics/macros/datatips/datatipSetSelected.sci [new file with mode: 0644]
scilab/modules/graphics/macros/datatips/datatipSetStruct.sci
scilab/modules/graphics/macros/datatips/datatipSetStyle.sci [new file with mode: 0644]
scilab/modules/graphics/macros/datatips/datatipSetTipPosition.sci [new file with mode: 0644]
scilab/modules/graphics/macros/datatips/datatipSetTipStyle.sci [new file with mode: 0644]
scilab/modules/graphics/macros/datatips/datatipToggle.sci
scilab/modules/graphics/macros/datatips/datatipsGUI.sci [new file with mode: 0644]
scilab/modules/graphics/macros/datatips/orthProj.sci
scilab/modules/graphics/macros/datatips/setStringPosition.sci
scilab/modules/graphics/macros/ged.sci

index 16dd1e2..e15d2a1 100644 (file)
Binary files a/SEP/SEP_029_datatips.odt and b/SEP/SEP_029_datatips.odt differ
index e94873d..bd55951 100644 (file)
@@ -176,6 +176,19 @@ File input/output:
 * tempname function added (SEP 68).
 
 
+Graphics:
+=========
+
+* datatips tool improved on several aspects:
+  - It is now possible to manage directional arrows as well as
+    square marks markers.
+  - The automatic label placement has been improved to avoid avoid the
+    overlapping with the curve.
+  - It is now possible to have  painted box or box free labels.
+  - Markers can now be selected and moved using the arrow keys
+    or deleted with the "Del" key.
+
+
 New functions
 =============
 
@@ -711,4 +724,3 @@ Bug fixes:
 
 * bug 10073 fixed - Use the new Scilab icon for GNU/Linux installations.
                     Icons renamed from XPM to PNG.
-
diff --git a/scilab/modules/graphics/demos/datatips/curvature.sci b/scilab/modules/graphics/demos/datatips/curvature.sci
new file mode 100644 (file)
index 0000000..d1bf934
--- /dev/null
@@ -0,0 +1,23 @@
+// Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
+// Copyright (C) 2010-2011 - INRIA - Serge Steer <serge.steer@inria.fr>
+//
+// This file must be used under the terms of the CeCILL.
+// This source file is licensed as described in the file COPYING, which
+// you should have received as part of this distribution.  The terms
+// are also available at;
+// http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt
+
+function c=curvature(data)
+  d1=diff(data,1,1);
+  d2=diff(data,2,1);
+  if size(data,2)==3 then
+    c=sqrt(...
+        (d2(:,3).*d1(2:$,2)-d2(:,2).*d1(2:$,3)).^2 +...
+        (d2(:,1).*d1(2:$,3)-d2(:,3).*d1(2:$,1)).^2  +...
+        (d2(:,2).*d1(2:$,1)-d2(:,1).*d1(2:$,2)).^2)/...
+      ((d1(2:$,1)^2+d1(2:$,2)^2+d1(2:$,3)^2)^1.5)
+  else
+    c=(d1(2:$,1).*d2(:,2)-d1(2:$,2).*d2(:,1))./((d1(2:$,1)^2+d1(2:$,2)^2)^1.5)
+  end
+endfunction
+
diff --git a/scilab/modules/graphics/demos/datatips/datatip1.sce b/scilab/modules/graphics/demos/datatips/datatip1.sce
new file mode 100644 (file)
index 0000000..bcca627
--- /dev/null
@@ -0,0 +1,43 @@
+// Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
+// Copyright (C) 2011 - INRIA - Serge Steer <serge.steer@inria.fr>
+//
+// This file must be used under the terms of the CeCILL.
+// This source file is licensed as described in the file COPYING, which
+// you should have received as part of this distribution.  The terms
+// are also available at;
+// http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt
+
+function datatip1
+
+  my_handle = scf(100001);
+  clf(my_handle,"reset");
+  fig=gcf();fig.axes_size=[760 460];
+   title(_("datatips on 2D curves"),"fontsize",3);
+  
+  x1=linspace(-1,1,300)';
+  plot(x1,x1.^3,x1,sinc(10*x1));
+  e=gce();
+  p1=e.children(1);//the handle on the sinc(10*x1) curve
+  p2=e.children(2); //the handle on the x1^3  curve
+  
+  //Create 2 datatips on the sinc curve
+  datatipCreate(p1,50); //by index
+  datatipCreate(p1,[0.8 0.5]);//by nearest mesh point
+  
+  //Create 2 datatips on the x^3 curve
+  datatipSetStyle(p2,2,%f) //directional arrow no box
+  function s=mydisp(curve,pt,index),s=msprintf("%.2g",pt(1)),endfunction
+  datatipSetDisplay(p2,mydisp) // Change the default datatip label
+  datatipCreate(p2,[0.1,0]);
+  datatipCreate(p2,[0.8 0.4]);
+  datatipManagerMode(gcf(),'on') //activate the interactive editor
+
+  
+  demo_viewCode("datatip1.sce");
+
+endfunction
+
+datatip1();
+clear datatip1;
diff --git a/scilab/modules/graphics/demos/datatips/datatip2.sce b/scilab/modules/graphics/demos/datatips/datatip2.sce
new file mode 100644 (file)
index 0000000..16a0b8f
--- /dev/null
@@ -0,0 +1,54 @@
+// Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
+// Copyright (C) 2011 - INRIA - Serge Steer <serge.steer@inria.fr>
+//
+// This file must be used under the terms of the CeCILL.
+// This source file is licensed as described in the file COPYING, which
+// you should have received as part of this distribution.  The terms
+// are also available at;
+// http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt
+
+function datatip2
+
+  my_handle = scf(100001);
+  clf(my_handle,"reset");
+  fig=gcf();
+  title(_("datatips on 3D curves"),"fontsize",3);
+  
+  r=1;
+  k=tan(%pi/27);
+  t=linspace(-40,40,1000);
+  x=r*cos(t)./cosh(k*t);
+  y=r*sin(t)./cosh(k*t);
+  z=r*tanh(k*t);
+  param3d(x,y,z);c=gce();c.thickness=2;C.foreground=color('blue')
+  
+  ax=gca();ax.rotation_angles=[70 50];ax.axes_visible='off';
+  drawnow()
+  
+  datatipInitStruct(c,'t',t)
+  datatipSetStyle(c,2,%f) //directional arrow no box
+  
+  function s=mydisp(curve,pt,index),
+    ud=datatipGetStruct(curve);
+    if index<>[] then
+      t=ud.t(index);
+    else //interpolated
+      [d,ptp,i,c]=orthProj(curve.data,pt);
+      t=ud.t(i)+(ud.t(i+1)-ud.t(i))*c;
+    end
+    s=msprintf("%.2g", t);
+  endfunction
+
+  datatipSetDisplay(c,mydisp) // Change the default datatip label
+  for k=[350 400 450 500 520  550 600]
+    dt=datatipCreate(c,k);
+  end
+
+  demo_viewCode("datatip2.sce");
+
+endfunction
+
+datatip2();
+clear datatip2;
diff --git a/scilab/modules/graphics/demos/datatips/datatips.dem.gateway.sce b/scilab/modules/graphics/demos/datatips/datatips.dem.gateway.sce
new file mode 100644 (file)
index 0000000..809fe20
--- /dev/null
@@ -0,0 +1,17 @@
+// Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
+// Copyright (C) 2011 - INRIA - Serge Steer <serge.steer@inria.fr>
+//
+// This file must be used under the terms of the CeCILL.
+// This source file is licensed as described in the file COPYING, which
+// you should have received as part of this distribution.  The terms
+// are also available at;
+// http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt
+demopath = get_absolute_file_path("datatips.dem.gateway.sce");
+
+subdemolist=[
+    _("2D curves")              , "datatip1.sce";
+    _("3D curve")               , "datatip2.sce"];
+
+
+subdemolist(:,2) = demopath + subdemolist(:,2);
+clear demopath;
index fae7446..dba503d 100644 (file)
@@ -19,6 +19,7 @@ function subdemolist = demo_gateway()
                  _("More surfaces")               ,"surface/surfaces.dem.gateway.sce"                    ; ..
                  _("Complex elementary functions"),"cmplxfunc/cmplxfunc.dem.gateway.sce"                 ; ..
                  _("bar histogram")               ,"bar/bar.dem.sce"; ..
+                 _("Datatips")                    ,"datatips/datatips.dem.gateway.sce"                   ; ..
                  _("LaTeX/MathML")                ,"textrendering/textrendering.dem.gateway.sce"                                     ];
 
   if ~ usecanvas() then
index 7bf68a1..3178ef6 100644 (file)
@@ -8,7 +8,7 @@
  * are also available at    
  * http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt
 -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:svg="http://www.w3.org/2000/svg"  xmlns:mml="http://www.w3.org/1998/Math/MathML" xmlns:db="http://docbook.org/ns/docbook" version="5.0-subset Scilab" xml:lang="en_US" xml:id="datatipCreate">
+<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:svg="http://www.w3.org/2000/svg" xmlns:mml="http://www.w3.org/1998/Math/MathML" xmlns:db="http://docbook.org/ns/docbook" version="5.0-subset Scilab" xml:lang="en_US" xml:id="datatipCreate">
   <info>
     <pubdate>$LastChangedDate: 19-02-2010 $</pubdate>
   </info>
@@ -48,7 +48,6 @@
           </para>
         </listitem>
       </varlistentry>
-      
       <varlistentry>
         <term>datatip_handle</term>
         <listitem>
   <refsection>
     <title>Description</title>
     <para>
-       This function can be used to create data tips on a curve by
-       program. Called with an index, it set the tip at the
-       coordinates given by polyline point specified by the
-       index. Called with point it set the tip at the coordinates
-       corresponding to the orthogonal projection of the point on the
-       curve if the interpolation mode is on or to the nearest mesh
-       point.
+       This function can be used to create data tips on a polyline by
+       program. Called with an index as second argument, it sets the
+       tip at the coordinates given by polyline point specified by the
+       index. Called with a point as second argument it sets the tip
+       at the coordinates corresponding to the orthogonal projection
+       of the point on the polyline if the interpolation mode is on or to
+       the nearest mesh point.
     </para>
   </refsection>
   <refsection>
     <title>Examples</title>
     <programlisting role="example"><![CDATA[
-    x=linspace(0,1,8)';
+    x=linspace(0,1,9)';
     y=x.^3;
     clf();
     plot(x,y);
     e=gce();p=e.children(1);//get the handle on the polyline
-    p.mark_mode="on";p.mark_style=2;p.mark_size=5;
-    t=datatipCreate(p,2);
+    p.mark_mode="on";p.mark_style=2;p.mark_size=12;
+    t=datatipCreate(p,3);
 
-    datatipCreate(p,[0.8,0.5]);
+    datatipCreate(p,[0.6,0.2]);
     datatipSetInterp(p,%t);
-    datatipCreate(p,[0.8,0.5]);
+    datatipCreate(p,[0.82,0.62]);
     ]]></programlisting>
-   <para>
+    <para>
       <inlinemediaobject>
-       <imageobject>
-         <imagedata fileref="../../images/datatips3.svg"/>
-       </imageobject>
+        <imageobject>
+          <imagedata fileref="../../images/datatips3.svg"/>
+        </imageobject>
       </inlinemediaobject>
-   </para>
+    </para>
   </refsection>
   <refsection role="see also">
-<title>See Also</title>
+    <title>See Also</title>
     <simplelist type="inline">
       <member>
-        <link linkend="datatipInitStruct" >datatipInitStruct</link>
+        <link linkend="datatipInitStruct">datatipInitStruct</link>
       </member>
       <member>
         <link linkend="datatips">datatips</link>
       <member>Serge Steer, INRIA</member>
     </simplelist>
   </refsection>
 </refentry>
index e1ecf3d..50e9369 100644 (file)
@@ -8,14 +8,13 @@
  * are also available at    
  * http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt
 -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:svg="http://www.w3.org/2000/svg"  xmlns:mml="http://www.w3.org/1998/Math/MathML" xmlns:db="http://docbook.org/ns/docbook" version="5.0-subset Scilab" xml:lang="en_US" xml:id="datatipGetStruct">
+<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:svg="http://www.w3.org/2000/svg" xmlns:mml="http://www.w3.org/1998/Math/MathML" xmlns:db="http://docbook.org/ns/docbook" version="5.0-subset Scilab" xml:lang="en_US" xml:id="datatipGetStruct">
   <info>
     <pubdate>$LastChangedDate: 19-02-2010 $</pubdate>
   </info>
-
-  <refnamediv> 
+  <refnamediv>
     <refname>datatipGetStruct</refname>
-    <refpurpose>Extract the datatips data structure infrom the curve or surface entity. </refpurpose>
+    <refpurpose>Retreive the datatips data structure from the polyline entity. </refpurpose>
   </refnamediv>
   <refsynopsisdiv>
     <title>Calling Sequence</title>
         <term>curve_handle</term>
         <listitem>
           <para>
-            A handle on a curve or surface. 
+            A handle on a polyline. 
           </para>
         </listitem>
       </varlistentry>
     </variablelist>
     <variablelist>
       <varlistentry>
-       <term>datatips_struct</term>
+        <term>datatips_struct</term>
         <listitem>
           <para>
             A tlist of type  <literal>datatips</literal>.
   </refsection>
   <refsection>
     <title>Description</title>
-  
-    <para>
-        <literal>datatipGetStruct</literal> extract the datatips data
-        structure out of the curve or surface entity. It may be called
+    <para><literal>datatipGetStruct</literal> extract the datatips data
+        structure out of the polyline  entity. It may be called
         to retreive properties of the datatips data structure to
         customize the tip display.
     </para>
-  
   </refsection>
   <refsection>
     <title>Examples</title>
     ]]></programlisting>
   </refsection>
   <refsection role="see also">
-<title>See Also</title>
+    <title>See Also</title>
     <simplelist type="inline">
-      <member><link linkend="datatips" >datatips</link></member>
-      <member><link linkend="datatipSetDisplay" >datatipSetDisplay</link></member>
-      <member><link linkend="datatipInitStruct" >datatipInitStruct</link></member>
+      <member>
+        <link linkend="datatips">datatips</link>
+      </member>
+      <member>
+        <link linkend="datatipSetDisplay">datatipSetDisplay</link>
+      </member>
+      <member>
+        <link linkend="datatipInitStruct">datatipInitStruct</link>
+      </member>
     </simplelist>
   </refsection>
   <refsection>
@@ -85,5 +87,4 @@
       <member>Serge Steer, INRIA</member>
     </simplelist>
   </refsection>
 </refentry>
index 719bcb8..b05a49f 100644 (file)
@@ -8,13 +8,13 @@
  * are also available at    
  * http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt
 -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:svg="http://www.w3.org/2000/svg"  xmlns:mml="http://www.w3.org/1998/Math/MathML" xmlns:db="http://docbook.org/ns/docbook" version="5.0-subset Scilab" xml:lang="en_US" xml:id="datatipInitStruct">
+<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:svg="http://www.w3.org/2000/svg" xmlns:mml="http://www.w3.org/1998/Math/MathML" xmlns:db="http://docbook.org/ns/docbook" version="5.0-subset Scilab" xml:lang="en_US" xml:id="datatipInitStruct">
   <info>
     <pubdate>$LastChangedDate: 19-02-2010 $</pubdate>
   </info>
   <refnamediv>
     <refname>datatipInitStruct</refname>
-    <refpurpose>initialize the datatip structure associated with the given polyline. </refpurpose>
+    <refpurpose>Initialize the datatip structure associated with the given polyline. </refpurpose>
   </refnamediv>
   <refsynopsisdiv>
     <title>Calling Sequence</title>
           </para>
         </listitem>
       </varlistentry>
+      <varlistentry>
+        <term>ok</term>
+        <listitem>
+          <para>
+            notification flag. set to %f if the datatip structure
+            cannot be stored in the curve user_data field.
+          </para>
+        </listitem>
+      </varlistentry>
     </variablelist>
   </refsection>
   <refsection>
     <title>Description</title>
     <para>
-      This function is called by <link
-      linkend="datatipCreate">datatipCreate</link>to create a data
+      This function is called by <link linkend="datatipCreate">datatipCreate</link>to create a data
       structure for tips stored in the polyline entity user_data
       field.
     </para>
     <para>
-      This function as to be called only is one want to customize the datatips data structure fields
+      This function as to be called only is one want to customize the
+      datatips data structure fields
     </para>
   </refsection>
   <refsection>
           </para>
         </listitem>
       </varlistentry>
-
+      <varlistentry>
+        <term>style</term>
+        <listitem>
+          <para>
+             A two elements vector with integer values.
+             <literal>style(1)</literal> is a number in <literal>[1
+             2]</literal> that gives the the datatips style,
+             <literal>style(2)</literal> is a number in <literal>[0
+             1]</literal>. If set to 1 the datatip text is boxed (see
+             <link linkend="datatipSetStyle">datatipSetStyle</link>).
+          </para>
+        </listitem>
+      </varlistentry>
       <varlistentry>
         <term>formatfunction</term>
         <listitem>
         </listitem>
       </varlistentry>
       <varlistentry>
+        <term>selected</term>
+        <listitem>
+          <para>
+             A scalar with integer value: the index of the selected datatip if any or 0.
+          </para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
         <term>tips</term>
         <listitem>
           <para>
-             An array of handles. Each of these points to a given tip on the curve.
+             An array of handles. Each of these points to a given tip
+             on the curve. This field cannot be changed by the
+             <literal>datatipInitStruct</literal> function.
           </para>
         </listitem>
       </varlistentry>
       data structure throught the <literal>datatipInitStruct</literal>
       <literal>varargin</literal> optional arguments.
     </para>
-   
-   
   </refsection>
   <refsection role="see also">
-<title>See Also</title>
+    <title>See Also</title>
     <simplelist type="inline">
       <member>
         <link linkend="datatipCreate">datatipCreate</link>
       </member>
-     <member>
+      <member>
         <link linkend="datatips">datatips</link>
-     </member>
+      </member>
     </simplelist>
   </refsection>
   <refsection>
       str=msprintf("%s\nt=%-0.3g",ds.name,t);
     endfunction
 
-    ok=datatipInitStruct(p1,"formatfunction","mytipfmt","param",t,"name","spiral");
-    ok=datatipInitStruct(p2,"formatfunction","mytipfmt","param",t,"name","curve");
+    ok=datatipInitStruct(p1,"formatfunction","mytipfmt","param",t,"name","curve");
+    ok=datatipInitStruct(p2,"formatfunction","mytipfmt","param",t,"name","spiral","style",[2 0]);
 
     datatipCreate(p1,500);
     datatipCreate(p1,900);
     ]]></programlisting>
     <para>
       <inlinemediaobject>
-       <imageobject>
-         <imagedata fileref="../../images/datatips2.svg"/>
-       </imageobject>
+        <imageobject>
+          <imagedata fileref="../../images/datatips2.svg"/>
+        </imageobject>
       </inlinemediaobject>
     </para>
   </refsection>
index e134a7e..431fb6f 100644 (file)
@@ -8,7 +8,7 @@
  * are also available at    
  * http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt
 -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:svg="http://www.w3.org/2000/svg"  xmlns:mml="http://www.w3.org/1998/Math/MathML" xmlns:db="http://docbook.org/ns/docbook" version="5.0-subset Scilab" xml:lang="en_US" xml:id="datatipManagerMode">
+<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:svg="http://www.w3.org/2000/svg" xmlns:mml="http://www.w3.org/1998/Math/MathML" xmlns:db="http://docbook.org/ns/docbook" version="5.0-subset Scilab" xml:lang="en_US" xml:id="datatipManagerMode">
   <info>
     <pubdate>$LastChangedDate: 19-02-2010 $</pubdate>
   </info>
     <title>Description</title>
     <para>
       When enabled, the data tips mode allow
-      to add and edit tips at selected points of curve. The selection is
+      to add and edit tips at selected points of polylines. The selection is
       made by a right click on the selected point.
     </para>
-    <para>
-      <literal>datatipManagerMode()</literal>, toggles the data tips mode
+    <para><literal>datatipManagerMode()</literal>, toggles the data tips mode
       for the current figure while
       <literal>datatipManagerMode(fig)</literal> toggles the data tips mode
       for figure given by the handle <literal>fig</literal>.
     </para>
-    <para>
-      <literal>datatipManagerMode('on')</literal>, enables the data tips mode
+    <para><literal>datatipManagerMode('on')</literal>, enables the data tips mode
       for the current figure while
       <literal>datatipManagerMode(fig,'on')</literal> enables the data tips mode
       for figure given by the handle <literal>fig</literal>.
     </para>
-    <para>
-      <literal>datatipManagerMode('off')</literal>, disables the data tips mode
+    <para><literal>datatipManagerMode('off')</literal>, disables the data tips mode
       for the current figure while
       <literal>datatipManagerMode(fig,'off')</literal> disables the data tips mode
       for figure given by the handle <literal>fig</literal>.
     </para>
-
   </refsection>
   <refsection>
     <title>Examples</title>
     ]]></programlisting>
   </refsection>
   <refsection role="see also">
-<title>See Also</title>
+    <title>See Also</title>
     <simplelist type="inline">
       <member>
-        <link linkend="datatipToggle" >datatipToggle</link>
+        <link linkend="datatipToggle">datatipToggle</link>
       </member>
     </simplelist>
   </refsection>
@@ -91,6 +85,4 @@
       <member>Serge Steer, INRIA</member>
     </simplelist>
   </refsection>
-
-  
 </refentry>
index 9f45dd0..6ee8e95 100644 (file)
@@ -8,13 +8,13 @@
  * are also available at    
  * http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt
 -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:svg="http://www.w3.org/2000/svg"  xmlns:mml="http://www.w3.org/1998/Math/MathML" xmlns:db="http://docbook.org/ns/docbook" version="5.0-subset Scilab" xml:lang="en_US" xml:id="datatipMove">
+<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:svg="http://www.w3.org/2000/svg" xmlns:mml="http://www.w3.org/1998/Math/MathML" xmlns:db="http://docbook.org/ns/docbook" version="5.0-subset Scilab" xml:lang="en_US" xml:id="datatipMove">
   <info>
     <pubdate>$LastChangedDate: 19-02-2010 $</pubdate>
   </info>
   <refnamediv>
     <refname>datatipMove</refname>
-    <refpurpose>Move a specified datatip using the mouse. </refpurpose>
+    <refpurpose>Move a specified datatip using the mouse.</refpurpose>
   </refnamediv>
   <refsynopsisdiv>
     <title>Calling Sequence</title>
       the associated figure and left click for the desired position.
     </para>
   </refsection>
   <refsection role="see also">
-<title>See Also</title>
+    <title>See Also</title>
     <simplelist type="inline">
       <member>
-        <link linkend="datatips" >datatips</link>
+        <link linkend="datatips">datatips</link>
       </member>
       <member>
         <link linkend="datatipCreate">datatipCreate</link>
@@ -58,5 +57,4 @@
       <member>Serge Steer, INRIA</member>
     </simplelist>
   </refsection>
-
 </refentry>
index 0d3bbf0..5bc5ae8 100644 (file)
@@ -8,13 +8,13 @@
  * are also available at    
  * http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt
 -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:svg="http://www.w3.org/2000/svg"  xmlns:mml="http://www.w3.org/1998/Math/MathML" xmlns:db="http://docbook.org/ns/docbook" version="5.0-subset Scilab" xml:lang="en_US" xml:id="datatipRedraw">
+<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:svg="http://www.w3.org/2000/svg" xmlns:mml="http://www.w3.org/1998/Math/MathML" xmlns:db="http://docbook.org/ns/docbook" version="5.0-subset Scilab" xml:lang="en_US" xml:id="datatipRedraw">
   <info>
     <pubdate>$LastChangedDate: 19-02-2010 $</pubdate>
   </info>
   <refnamediv>
     <refname>datatipRedraw</refname>
-    <refpurpose>Adjust datatip text boxes positions after a 3D rotation</refpurpose>
+    <refpurpose>Redraw all datatips  after a 3D rotation to adjust their positions</refpurpose>
   </refnamediv>
   <refsynopsisdiv>
     <title>Calling Sequence</title>
@@ -43,7 +43,6 @@
           </para>
         </listitem>
       </varlistentry>
-
     </variablelist>
   </refsection>
   <refsection>
     <para>
         Due to graphic system limitations it is not possible to adjust
         the datatip textbox positions during a rotation. Calling this
-        function recomputes the positions for a clean rendrering.
+        function recomputes the positions for a clean rendering.
     </para>
   </refsection>
   <refsection>
     <title>Examples</title>
     <programlisting role="example"><![CDATA[
-    param3d()
+    clf();param3d()
     p=gce();//get the handle on the polyline
     datatipCreate(p,30);
     datatipCreate(p,100);
     ]]></programlisting>
     <para>
       <inlinemediaobject>
-       <imageobject>
-         <imagedata fileref="../../images/datatips_rot1.svg"/>
-       </imageobject>
+        <imageobject>
+          <imagedata fileref="../../images/datatips_rot1.svg"/>
+        </imageobject>
       </inlinemediaobject>
       <inlinemediaobject>
-       <imageobject>
-         <imagedata fileref="../../images/datatips_rot2.svg"/>
-       </imageobject>
+        <imageobject>
+          <imagedata fileref="../../images/datatips_rot2.svg"/>
+        </imageobject>
       </inlinemediaobject>
-
     </para>
   </refsection>
   <refsection role="see also">
-<title>See Also</title>
+    <title>See Also</title>
     <simplelist type="inline">
       <member>
-        <link linkend="datatips" >datatips</link>
+        <link linkend="datatips">datatips</link>
       </member>
     </simplelist>
   </refsection>
@@ -93,5 +91,4 @@
       <member>Serge Steer, INRIA</member>
     </simplelist>
   </refsection>
 </refentry>
index a361107..da183c8 100644 (file)
@@ -8,7 +8,7 @@
  * are also available at    
  * http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt
 -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:svg="http://www.w3.org/2000/svg"  xmlns:mml="http://www.w3.org/1998/Math/MathML" xmlns:db="http://docbook.org/ns/docbook" version="5.0-subset Scilab" xml:lang="en_US" xml:id="datatipRemove">
+<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:svg="http://www.w3.org/2000/svg" xmlns:mml="http://www.w3.org/1998/Math/MathML" xmlns:db="http://docbook.org/ns/docbook" version="5.0-subset Scilab" xml:lang="en_US" xml:id="datatipRemove">
   <info>
     <pubdate>$LastChangedDate: 19-02-2010 $</pubdate>
   </info>
@@ -18,8 +18,9 @@
   </refnamediv>
   <refsynopsisdiv>
     <title>Calling Sequence</title>
-    <synopsis>datatipRemove(polyline_handle,ind)
-    datatipRemove(datatip_handle)</synopsis>
+    <synopsis>
+     datatipRemove(polyline_handle,ind)
+     datatipRemove(datatip_handle)</synopsis>
   </refsynopsisdiv>
   <refsection>
     <title>Arguments</title>
@@ -40,7 +41,6 @@
           </para>
         </listitem>
       </varlistentry>
-
       <varlistentry>
         <term>ind</term>
         <listitem>
     clf()
     plot(x,y);
     e=gce();p=e.children(1);//get the handle on the polyline
-    t1=datatipCreate(p,50);
-    datatipCreate(p,20);
+    t1=datatipCreate(p,80);
+    datatipCreate(p,40);
     datatipRemove(p,2) 
     datatipRemove(t1)
     ]]></programlisting>
   </refsection>
   <refsection role="see also">
-<title>See Also</title>
+    <title>See Also</title>
     <simplelist type="inline">
       <member>
-        <link linkend="datatips" >datatips</link>
+        <link linkend="datatips">datatips</link>
       </member>
       <member>
         <link linkend="datatipCreate">datatipCreate</link>
@@ -88,5 +88,4 @@
       <member>Serge Steer, INRIA</member>
     </simplelist>
   </refsection>
 </refentry>
index 8f3cbe7..ca05106 100644 (file)
@@ -8,7 +8,7 @@
  * are also available at    
  * http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt
 -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:svg="http://www.w3.org/2000/svg"  xmlns:mml="http://www.w3.org/1998/Math/MathML" xmlns:db="http://docbook.org/ns/docbook" version="5.0-subset Scilab" xml:lang="en_US" xml:id="datatipRemoveAll">
+<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:svg="http://www.w3.org/2000/svg" xmlns:mml="http://www.w3.org/1998/Math/MathML" xmlns:db="http://docbook.org/ns/docbook" version="5.0-subset Scilab" xml:lang="en_US" xml:id="datatipRemoveAll">
   <info>
     <pubdate>$LastChangedDate: 19-02-2010 $</pubdate>
   </info>
@@ -18,7 +18,9 @@
   </refnamediv>
   <refsynopsisdiv>
     <title>Calling Sequence</title>
-    <synopsis>datatipRemoveAll(curve_handles)</synopsis>
+    <synopsis>
+    datatipRemoveAll(curve_handles)
+    datatipRemoveAll()</synopsis>
   </refsynopsisdiv>
   <refsection>
     <title>Arguments</title>
@@ -27,7 +29,7 @@
         <term>curve_handles</term>
         <listitem>
           <para>
-            A vector of polyline  handles.
+            A vector of polyline  handles. 
           </para>
         </listitem>
       </varlistentry>
@@ -36,7 +38,9 @@
   <refsection>
     <title>Description</title>
     <para>
-        Removes all datatips on a set of polylines. 
+        Removes all datatips on a set of polylines. If the
+        <literal>curve_handles</literal> argument is omitted, all
+        datatips associated to current axes entities are removed.
     </para>
   </refsection>
   <refsection>
     datatipCreate(e(1),50);
     datatipCreate(e(2),20);
     datatipRemoveAll(e) 
+
+    plot(x,x.^3,'b',x,x.^2,'r');
+    e=gce();e=e.children
+    datatipCreate(e(1),50);
+    datatipCreate(e(2),20);
+    datatipRemoveAll() 
+
     ]]></programlisting>
   </refsection>
   <refsection role="see also">
-<title>See Also</title>
+    <title>See Also</title>
     <simplelist type="inline">
       <member>
-        <link linkend="datatips" >datatips</link>
+        <link linkend="datatips">datatips</link>
       </member>
       <member>
         <link linkend="datatipCreate">datatipCreate</link>
       </member>
-     <member>
+      <member>
         <link linkend="datatipRemove">datatipRemove</link>
       </member>
     </simplelist>
@@ -72,5 +83,4 @@
       <member>Serge Steer, INRIA</member>
     </simplelist>
   </refsection>
 </refentry>
index c9c76cc..0838b22 100644 (file)
@@ -8,18 +8,19 @@
  * are also available at    
  * http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt
 -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:svg="http://www.w3.org/2000/svg"  xmlns:mml="http://www.w3.org/1998/Math/MathML" xmlns:db="http://docbook.org/ns/docbook" version="5.0-subset Scilab" xml:lang="en_US" xml:id="datatipSetDisplay">
+<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:svg="http://www.w3.org/2000/svg" xmlns:mml="http://www.w3.org/1998/Math/MathML" xmlns:db="http://docbook.org/ns/docbook" version="5.0-subset Scilab" xml:lang="en_US" xml:id="datatipSetDisplay">
   <info>
     <pubdate>$LastChangedDate: 19-02-2010 $</pubdate>
   </info>
   <refnamediv>
     <refname>datatipSetDisplay</refname>
-    <refpurpose>Search the nearest datatip of a given point. </refpurpose>
+    <refpurpose>Set the function used to compute the datatip string. </refpurpose>
   </refnamediv>
   <refsynopsisdiv>
     <title>Calling Sequence</title>
     <synopsis>
-      datatipSetDisplay(tip_handle,orient)
+      datatipSetDisplay(curve_handle,fun)
+      datatipSetDisplay(curve_handle)
     </synopsis>
   </refsynopsisdiv>
   <refsection>
     </variablelist>
     <variablelist>
       <varlistentry>
-       <term>orient</term>
+        <term>fun</term>
         <listitem>
           <para>
-            A character string with possible values:
-            <literal>"automatic"</literal> <literal>"upper
-            left"</literal> <literal>"upper right"</literal>,
-            <literal>"lower left"</literal>, <literal>"lower
-            right"</literal>.
+            A variable that contains a function (type==11 or
+            type==13). This function calling sequence must be
+            <literal>str=fun(curve, pt, index)</literal> where
+            <literal>curve</literal> is the handle of the polyline
+            associated with the datatip, <literal>pt</literal> is the
+            vector of datatip coordinates and <literal>index</literal>
+            is the mesh point index of the datatip point or the index
+            of the previous mesh point if interpolation is allowed.
+          </para>
+          <para>
+            This function must return a string or a vector of strings
+            in <literal>str</literal>.
           </para>
         </listitem>
       </varlistentry>
   <refsection>
     <title>Description</title>
     <para>
-        Set the position on the text box with respect to the curve
-        point. With the <literal>"automatic"</literal> orientation the
-        program makes the choice to keep the text box within the plot
-        boundaries.
+        Set the function used to format the text to be displayed at the datatip point.
     </para>
   </refsection>
-  <refsection>
-    <title>Examples</title>
-    <programlisting role="example"><![CDATA[
+  <refsection><title>Examples</title><programlisting role="example"><![CDATA[
     x=linspace(-1,1,1000);
     clf()
     plot(x,sinc(20*x),x,1-x^2);
        str=msprintf('sinc(%-0.2g)=%-0.2g', 20*pt(1),pt(2))
     endfunction
     datatipSetDisplay(e(2),mydisplay) 
+    ]]></programlisting><para><inlinemediaobject><imageobject><imagedata fileref="../../images/datatips5.svg"/></imageobject></inlinemediaobject></para>
+
+    The display function can also be used to place tip text in different locations:
+
+    <programlisting role="example"><![CDATA[
+    function str=infodisplay(curve,pt,index)
+       xinfo(msprintf('x=%0.2g,\t 1-x^2=%0.2g', pt(1),pt(2)))
+       str=''
+    endfunction
+    datatipSetDisplay(e(1),infodisplay) //tip text displayed in the info bar
     ]]></programlisting>
-    <para>
-      <inlinemediaobject>
-       <imageobject>
-         <imagedata fileref="../../images/datatips5.svg"/>
-       </imageobject>
-      </inlinemediaobject>
-    </para>
   </refsection>
   <refsection role="see also">
-<title>See Also</title>
+    <title>See Also</title>
     <simplelist type="inline">
-      <member><link linkend="datatips" >datatips</link></member>
-      <member><link linkend="datatipSetOrientation">datatipSetOrientation</link></member>
+      <member>
+        <link linkend="datatips">datatips</link>
+      </member>
+      <member>
+        <link linkend="datatipSetOrientation">datatipSetOrientation</link>
+      </member>
     </simplelist>
   </refsection>
   <refsection>
       <member>Serge Steer, INRIA</member>
     </simplelist>
   </refsection>
 </refentry>
index 5be8947..c4b05a6 100644 (file)
@@ -8,7 +8,7 @@
  * are also available at    
  * http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt
 -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:svg="http://www.w3.org/2000/svg"  xmlns:mml="http://www.w3.org/1998/Math/MathML" xmlns:db="http://docbook.org/ns/docbook" version="5.0-subset Scilab" xml:lang="en_US" xml:id="datatipSetInterp">
+<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:svg="http://www.w3.org/2000/svg" xmlns:mml="http://www.w3.org/1998/Math/MathML" xmlns:db="http://docbook.org/ns/docbook" version="5.0-subset Scilab" xml:lang="en_US" xml:id="datatipSetInterp">
   <info>
     <pubdate>$LastChangedDate: 19-02-2010 $</pubdate>
   </info>
         <term>curve_handle</term>
         <listitem>
           <para>
-            A handle on a curve or surface. 
+            A handle on a polyline. 
           </para>
         </listitem>
       </varlistentry>
     </variablelist>
     <variablelist>
       <varlistentry>
-       <term>interp_mode</term>
+        <term>interp_mode</term>
         <listitem>
           <para>
             A boolean, if false the tips can only be located at the
             mesh points, if true interpolation is made between mesh
-            points. The defaul value is false.
+            points. The default value is false.
           </para>
         </listitem>
       </varlistentry>
     ]]></programlisting>
   </refsection>
   <refsection role="see also">
-<title>See Also</title>
+    <title>See Also</title>
     <simplelist type="inline">
-      <member><link linkend="datatips" >datatips</link></member>
-      <member><link linkend="datatipMove" >datatipMove</link></member>
+      <member>
+        <link linkend="datatips">datatips</link>
+      </member>
+      <member>
+        <link linkend="datatipMove">datatipMove</link>
+      </member>
     </simplelist>
   </refsection>
   <refsection>
@@ -80,5 +84,4 @@
       <member>Serge Steer, INRIA</member>
     </simplelist>
   </refsection>
 </refentry>
index 950895f..a2fa1d9 100644 (file)
@@ -8,13 +8,13 @@
  * are also available at    
  * http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt
 -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:svg="http://www.w3.org/2000/svg"  xmlns:mml="http://www.w3.org/1998/Math/MathML" xmlns:db="http://docbook.org/ns/docbook" version="5.0-subset Scilab" xml:lang="en_US" xml:id="datatipSetOrientation">
+<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:svg="http://www.w3.org/2000/svg" xmlns:mml="http://www.w3.org/1998/Math/MathML" xmlns:db="http://docbook.org/ns/docbook" version="5.0-subset Scilab" xml:lang="en_US" xml:id="datatipSetOrientation">
   <info>
     <pubdate>$LastChangedDate: 19-02-2010 $</pubdate>
   </info>
   <refnamediv>
     <refname>datatipSetOrientation</refname>
-    <refpurpose>Search the nearest datatip of a given point. </refpurpose>
+    <refpurpose>Set the position of the text box associated with the given tip.</refpurpose>
   </refnamediv>
   <refsynopsisdiv>
     <title>Calling Sequence</title>
@@ -36,7 +36,7 @@
     </variablelist>
     <variablelist>
       <varlistentry>
-       <term>orient</term>
+        <term>orient</term>
         <listitem>
           <para>
             A character string with possible values:
   <refsection>
     <title>Description</title>
     <para>
-        Set the position on the text box with respect to the curve
+        Set the position on the text box with respect to the polyline
         point. With the <literal>"automatic"</literal> orientation the
-        program makes the choice to keep the text box within the plot
-        boundaries.
+        program makes the choice of the position trying to prevent
+        text from overlapping polyline, it also tries to to keep the text
+        box within the plot boundaries.
     </para>
   </refsection>
   <refsection>
     <title>Examples</title>
     <programlisting role="example"><![CDATA[
     x=linspace(-20,20,1000);
     clf()
     plot(x,sinc(x),x,sinc(x^2));
-    e=gce();e=e.children
+    e=gce();e=e.children;
     d1=datatipCreate(e(1),500);
-    d2=datatipCreate(e(2),200);
+    d2=datatipCreate(e(2),60);
     datatipSetOrientation(d2,"lower left") 
     ]]></programlisting>
   </refsection>
   <refsection role="see also">
-<title>See Also</title>
+    <title>See Also</title>
     <simplelist type="inline">
-      <member><link linkend="datatips" >datatips</link></member>
-      <member><link linkend="datatipCreate">datatipCreate</link></member>
-     <member><link linkend="datatipRemove">datatipRemove</link></member>
+      <member>
+        <link linkend="datatips">datatips</link>
+      </member>
+      <member>
+        <link linkend="datatipCreate">datatipCreate</link>
+      </member>
+      <member>
+        <link linkend="datatipRemove">datatipRemove</link>
+      </member>
     </simplelist>
   </refsection>
   <refsection>
@@ -86,5 +91,4 @@
       <member>Serge Steer, INRIA</member>
     </simplelist>
   </refsection>
 </refentry>
index 85f55ef..842b824 100644 (file)
@@ -8,19 +8,18 @@
  * are also available at    
  * http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt
 -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:svg="http://www.w3.org/2000/svg"  xmlns:mml="http://www.w3.org/1998/Math/MathML" xmlns:db="http://docbook.org/ns/docbook" version="5.0-subset Scilab" xml:lang="en_US" xml:id="datatipSetStruct">
+<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:svg="http://www.w3.org/2000/svg" xmlns:mml="http://www.w3.org/1998/Math/MathML" xmlns:db="http://docbook.org/ns/docbook" version="5.0-subset Scilab" xml:lang="en_US" xml:id="datatipSetStruct">
   <info>
     <pubdate>$LastChangedDate: 19-02-2010 $</pubdate>
   </info>
   <refnamediv>
-     <refname>datatipSetStruct</refname>
-    <refpurpose>Stores the datatips data structure in the curve or surface entity. </refpurpose>
+    <refname>datatipSetStruct</refname>
+    <refpurpose>Stores the datatips data structure in the polyline entity. </refpurpose>
   </refnamediv>
   <refsynopsisdiv>
     <title>Calling Sequence</title>
     <synopsis>
-       datatipSetStruct(curve_handle,datatips_struct)
+       ok=datatipSetStruct(curve_handle,datatips_struct)
     </synopsis>
   </refsynopsisdiv>
   <refsection>
         <term>curve_handle</term>
         <listitem>
           <para>
-            A handle on a curve or surface. 
+            A handle on a polyline. 
           </para>
         </listitem>
       </varlistentry>
-    </variablelist>
-    <variablelist>
       <varlistentry>
-       <term>datatips_struct</term>
+        <term>datatips_struct</term>
         <listitem>
           <para>
             A tlist of type  <literal>datatips</literal>.
           </para>
         </listitem>
       </varlistentry>
+      <varlistentry>
+        <term>ok</term>
+        <listitem>
+          <para>
+            A boolean flag set to %f if the operations fail.
+          </para>
+        </listitem>
+      </varlistentry>
     </variablelist>
   </refsection>
   <refsection>
     <title>Description</title>
-    <para>
-        <literal>datatipSetStruct</literal> stores the datatips data structure in the curve or surface
+    <para><literal>datatipSetStruct</literal> stores the datatips data structure in the polyline
         entity. This is a subsidiary functions which is not to be called directly.
     </para>
-   
   </refsection>
   <refsection role="see also">
-<title>See Also</title>
+    <title>See Also</title>
     <simplelist type="inline">
-      <member><link linkend="datatips" >datatips</link></member>
-     <member><link linkend="datatipGetStruct" >datatipGetStruct</link></member>
+      <member>
+        <link linkend="datatips">datatips</link>
+      </member>
+      <member>
+        <link linkend="datatipGetStruct">datatipGetStruct</link>
+      </member>
     </simplelist>
   </refsection>
   <refsection>
@@ -68,5 +74,4 @@
       <member>Serge Steer, INRIA</member>
     </simplelist>
   </refsection>
 </refentry>
diff --git a/scilab/modules/graphics/help/en_US/datatips/datatipSetStyle.xml b/scilab/modules/graphics/help/en_US/datatips/datatipSetStyle.xml
new file mode 100644 (file)
index 0000000..2320710
--- /dev/null
@@ -0,0 +1,131 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ * Copyright (C) INRIA -  Serge Steer Serge.Steer@inria.fr
+ * 
+ * This file must be used under the terms of the CeCILL.
+ * This source file is licensed as described in the file COPYING, which
+ * you should have received as part of this distribution.  The terms
+ * are also available at    
+ * http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt
+-->
+<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:svg="http://www.w3.org/2000/svg" xmlns:mml="http://www.w3.org/1998/Math/MathML" xmlns:db="http://docbook.org/ns/docbook" version="5.0-subset Scilab" xml:lang="en_US" xml:id="datatipSetStyle">
+  <info>
+    <pubdate>$LastChangedDate: 19-04-2011 $</pubdate>
+  </info>
+  <refnamediv>
+    <refname>datatipSetStyle</refname>
+    <refpurpose>Set the tip style for the given polyline datatips.</refpurpose>
+  </refnamediv>
+  <refsynopsisdiv>
+    <title>Calling Sequence</title>
+    <synopsis>
+      datatipSetStyle(curve_handle)
+      datatipSetStyle(curve_handle,t [,boxed [,labeled]])
+    </synopsis>
+  </refsynopsisdiv>
+  <refsection>
+    <title>Arguments</title>
+    <variablelist>
+      <varlistentry>
+        <term>curve_handle</term>
+        <listitem>
+          <para>
+            A handle on a polyline. 
+          </para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term>t</term>
+        <listitem>
+          <para>
+            A number with possible value 1 or 2. If omitted a choose popup will open.
+          </para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term>boxed</term>
+        <listitem>
+          <para>
+            A a boolean, default value is %t.
+          </para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term>labeled</term>
+        <listitem>
+          <para>
+            A a boolean, default value is %t.
+          </para>
+        </listitem>
+      </varlistentry>
+    </variablelist>
+  </refsection>
+  <refsection>
+    <title>Description</title>
+    <para>
+      There are two different styles for the datatip polyline marker:
+    </para>
+    <para>
+     - Square mark, centered on the tip point. 
+    </para>
+    <para>
+     - Directional arrows drawn along the tangeant at the tip point. The arrowhead is on the  tip point.
+    </para>
+    <para>
+      If the boxed option is selected the text associated with the datatip is written in a boxed area.
+    </para>
+  </refsection>
+  <refsection>
+    <title>Examples</title>
+    <programlisting role="example"><![CDATA[
+    x=linspace(-20,20,1000);
+    clf();plot(x,sinc(x),x,sinc(x^2));
+    e=gce();e=e.children;
+    function str=mydisplay(curve,pt,index),str=msprintf('%0.2g', pt(1)),endfunction
+    datatipSetDisplay(e(1),mydisplay) 
+    datatipSetStyle(e(1),2,%f) 
+    d1=datatipCreate(e(1),540);
+    
+    datatipSetStyle(e(2),1,%t) 
+    d2=datatipCreate(e(2),200);
+    
+    ]]></programlisting>
+    <para>
+      <inlinemediaobject>
+        <imageobject>
+          <imagedata fileref="../../images/datatips6.svg"/>
+        </imageobject>
+      </inlinemediaobject>
+    </para>
+  </refsection>
+  <refsection role="see also">
+    <title>See Also</title>
+    <simplelist type="inline">
+      <member>
+        <link linkend="datatips">datatips</link>
+      </member>
+      <member>
+        <link linkend="datatipCreate">datatipCreate</link>
+      </member>
+      <member>
+        <link linkend="datatipInitStruct">datatipInitStruct</link>
+      </member>
+    </simplelist>
+  </refsection>
+  <refsection>
+    <title>Authors</title>
+    <simplelist type="vert">
+      <member>Serge Steer, INRIA</member>
+    </simplelist>
+  </refsection>
+  <refsection>
+    <title>History</title>
+    <revhistory>
+      <revision>
+        <revnumber>5.4.0</revnumber>
+        <revremark>Function datatipSetStyle introduced.</revremark>
+      </revision>
+    </revhistory>
+  </refsection>
+</refentry>
index a0f88d0..14d7fd2 100644 (file)
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <svg xmlns="http://www.w3.org/2000/svg"
      xmlns:xlink="http://www.w3.org/1999/xlink"
-     width="475px" height="292px" viewBox="0 0 475 292"
+     width="612px" height="381px" viewBox="0 0 612 381"
      style="stroke:none">
-<title>Graphic window number 0</title>
+<title>Figure n°0</title>
 <desc>
 Creator: GL2PS 1.3.2, (C) 1999-2006 Christophe Geuzaine (geuz@geuz.org)
 For: Scilab
-CreationDate: Tue Apr 27 13:42:23 2010
+CreationDate: Wed Apr 27 17:52:53 2011
 </desc>
 <defs>
 </defs>
-<polygon fill="#ffffff" points="0,0 475,0 475,292 0,292"/>
+<polygon fill="#ffffff" points="0,0 612,0 612,381 0,381"/>
 <g>
-<polyline fill="none" stroke="#000000" stroke-width="0.5" points="59.375,255.5 59.375,36.5 59.375,36.5 415.625,36.5 415.625,255.5 415.625,255.5 59.375,255.5"/>
-<polyline fill="none" stroke="#000000" stroke-width="0.5" points="415.625,36.5 59.375,36.5"/>
-<polyline fill="none" stroke="#000000" stroke-width="0.5" points="415.625,36.5 415.625,255.5"/>
-<polyline fill="none" stroke="#000000" stroke-width="0.5" points="415.625,36.5 415.625,36.5"/>
-<polygon fill="#ffffff" points="59.375,255.5 59.375,36.5 59.375,36.5"/>
-<polygon fill="#ffffff" points="59.375,255.5 59.375,36.5 59.375,255.5"/>
-<polygon fill="#ffffff" points="59.375,255.5 415.625,255.5 415.625,255.5"/>
-<polygon fill="#ffffff" points="59.375,255.5 415.625,255.5 59.375,255.5"/>
-<polygon fill="#ffffff" points="59.375,255.5 415.625,255.5 415.625,36.5"/>
-<polygon fill="#ffffff" points="59.375,255.5 415.625,36.5 59.375,36.5"/>
-<polyline fill="none" stroke="#0000ff" stroke-width="0.5" points="59.375,192.929 62.9736,192.928 66.5718,192.927 70.1704,192.924 73.769,192.918 77.3672,192.908 80.9658,192.894 84.5645,192.873 88.1631,192.846 91.7612,192.811 95.3599,192.768 98.9585,192.714 102.557,192.65 106.155,192.574 109.754,192.486 113.352,192.384 116.951,192.268 120.549,192.137 124.148,191.988 127.746,191.823 131.345,191.639 134.943,191.436 138.542,191.212 142.14,190.967 145.739,190.7 149.337,190.41 152.936,190.095 156.534,189.755 160.133,189.39 163.731,188.997 167.33,188.576 170.928,188.126 174.526,187.646 178.125,187.135 181.724,186.592 185.322,186.017 188.92,185.407 192.519,184.763 196.117,184.083 199.716,183.365 203.314,182.611 206.913,181.817 210.511,180.984 214.11,180.111 217.708,179.195 221.307,178.238 224.905,177.236 228.504,176.19 232.102,175.099 235.701,173.961 239.299,172.776 242.898,171.543 246.496,170.26 250.095,168.927 253.693,167.542 257.292,166.106 260.89,164.616 264.489,163.072 268.087,161.473 271.686,159.818 275.284,158.106 278.883,156.335 282.481,154.506 286.08,152.617 289.678,150.667 293.276,148.654 296.875,146.58 300.474,144.44 304.072,142.237 307.67,139.967 311.269,137.631 314.867,135.227 318.466,132.755 322.064,130.212 325.663,127.6 329.261,124.915 332.86,122.158 336.458,119.328 340.057,116.423 343.655,113.442 347.254,110.386 350.852,107.251 354.451,104.039 358.049,100.747 361.648,97.3745 365.246,93.9214 368.845,90.3857 372.443,86.7666 376.042,83.064 379.64,79.2759 383.239,75.4014 386.837,71.4404 390.436,67.3911 394.034,63.2524 397.633,59.0244 401.231,54.7051 404.83,50.2944 408.428,45.7905 412.026,41.1924 415.625,36.5"/>
-<polyline fill="none" stroke="#007f00" stroke-width="0.5" points="59.375,36.5 62.9736,36.7661 66.5718,37.562 70.1704,38.8833 73.769,40.7217 77.3672,43.0659 80.9658,45.9019 84.5645,49.2124 88.1631,52.9771 91.7612,57.1738 95.3599,61.7764 98.9585,66.7573 102.557,72.0874 106.155,77.7349 109.754,83.666 113.352,89.8457 116.951,96.2378 120.549,102.806 124.148,109.512 127.746,116.318 131.345,123.185 134.943,130.075 138.542,136.951 142.14,143.774 145.739,150.509 149.337,157.121 152.936,163.575 156.534,169.838 160.133,175.882 163.731,181.676 167.33,187.195 170.928,192.415 174.526,197.313 178.125,201.872 181.724,206.073 185.322,209.904 188.92,213.355 192.519,216.416 196.117,219.083 199.716,221.353 203.314,223.227 206.913,224.709 210.511,225.804 214.11,226.52 217.708,226.869 221.307,226.864 224.905,226.521 228.504,225.858 232.102,224.894 235.701,223.649 239.299,222.148 242.898,220.413 246.496,218.47 250.095,216.346 253.693,214.065 257.292,211.656 260.89,209.146 264.489,206.561 268.087,203.928 271.686,201.275 275.284,198.626 278.883,196.007 282.481,193.442 286.08,190.953 289.678,188.562 293.276,186.288 296.875,184.149 300.474,182.163 304.072,180.343 307.67,178.703 311.269,177.252 314.867,176 318.466,174.952 322.064,174.114 325.663,173.488 329.261,173.074 332.86,172.871 336.458,172.875 340.057,173.08 343.655,173.48 347.254,174.066 350.852,174.828 354.451,175.753 358.049,176.829 361.648,178.041 365.246,179.375 368.845,180.814 372.443,182.342 376.042,183.943 379.64,185.598 383.239,187.29 386.837,189.001 390.436,190.716 394.034,192.415 397.633,194.083 401.231,195.706 404.83,197.266 408.428,198.75 412.026,200.145 415.625,201.438"/>
-<polygon fill="#ffffee" points="232,220 232,228 240,228"/>
-<polygon fill="#ffffee" points="232,220 240,228 240,220"/>
-<polyline fill="none" stroke="#007f00" stroke-width="0.5" points="232,220 232,228 240,228 240,220 232,220"/>
-<polygon fill="#ffffee" points="135,133 135,141 143,141"/>
-<polygon fill="#ffffee" points="135,133 143,141 143,133"/>
-<polyline fill="none" stroke="#007f00" stroke-width="0.5" points="135,133 135,141 143,141 143,133 135,133"/>
-<polygon fill="#ffffee" points="91,189 91,197 99,197"/>
-<polygon fill="#ffffee" points="91,189 99,197 99,189"/>
-<polyline fill="none" stroke="#0000ff" stroke-width="0.5" points="91,189 91,197 99,197 99,189 91,189"/>
-<polygon fill="#ffffee" points="325,121 325,129 333,129"/>
-<polygon fill="#ffffee" points="325,121 333,129 333,121"/>
-<polyline fill="none" stroke="#0000ff" stroke-width="0.5" points="325,121 325,129 333,129 333,121 325,121"/>
-<polygon fill="#ffffee" points="238.5,212.5 238.5,240.5 288.5,240.5"/>
-<polygon fill="#ffffee" points="238.5,212.5 288.5,240.5 288.5,212.5"/>
-<polyline fill="none" stroke="#bebebe" stroke-width="0.5" points="238.5,212.5 238.5,240.5 288.5,240.5 288.5,212.5 238.5,212.5"/>
-<text fill="#000000" style="stroke:none" x="239" y="223" transform="rotate(0, 239, 223)" font-size="10" font-family="SansSerif" font-style="normal" font-weight="normal">sinc</text>
-<text fill="#000000" style="stroke:none" x="239" y="239" transform="rotate(0, 239, 239)" font-size="10" font-family="SansSerif" font-style="normal" font-weight="normal">[0.5,-0.2]</text>
-<polygon fill="#ffffee" points="141.5,106.5 141.5,134.5 185.5,134.5"/>
-<polygon fill="#ffffee" points="141.5,106.5 185.5,134.5 185.5,106.5"/>
-<polyline fill="none" stroke="#bebebe" stroke-width="0.5" points="141.5,106.5 141.5,134.5 185.5,134.5 185.5,106.5 141.5,106.5"/>
-<text fill="#000000" style="stroke:none" x="142" y="117" transform="rotate(0, 142, 117)" font-size="10" font-family="SansSerif" font-style="normal" font-weight="normal">sinc</text>
-<text fill="#000000" style="stroke:none" x="142" y="133" transform="rotate(0, 142, 133)" font-size="10" font-family="SansSerif" font-style="normal" font-weight="normal">[0.2,0.4]</text>
-<polygon fill="#ffffee" points="98.5,166.5 98.5,190.5 143.5,190.5"/>
-<polygon fill="#ffffee" points="98.5,166.5 143.5,190.5 143.5,166.5"/>
-<polyline fill="none" stroke="#bebebe" stroke-width="0.5" points="98.5,166.5 98.5,190.5 143.5,190.5 143.5,166.5 98.5,166.5"/>
-<text fill="#000000" style="stroke:none" x="99" y="177" transform="rotate(0, 99, 177)" font-size="10" font-family="SansSerif" font-style="normal" font-weight="normal">X: 0.1</text>
-<text fill="#000000" style="stroke:none" x="99" y="189" transform="rotate(0, 99, 189)" font-size="10" font-family="SansSerif" font-style="normal" font-weight="normal">Y: 0.001</text>
-<polygon fill="#ffffee" points="296.5,98.5 296.5,122.5 334.5,122.5"/>
-<polygon fill="#ffffee" points="296.5,98.5 334.5,122.5 334.5,98.5"/>
-<polyline fill="none" stroke="#bebebe" stroke-width="0.5" points="296.5,98.5 296.5,122.5 334.5,122.5 334.5,98.5 296.5,98.5"/>
-<text fill="#000000" style="stroke:none" x="297" y="109" transform="rotate(0, 297, 109)" font-size="10" font-family="SansSerif" font-style="normal" font-weight="normal">X: 0.76</text>
-<text fill="#000000" style="stroke:none" x="297" y="121" transform="rotate(0, 297, 121)" font-size="10" font-family="SansSerif" font-style="normal" font-weight="normal">Y: 0.43</text>
-<polyline fill="none" stroke="#000000" stroke-width="0.5" points="59.375,255.5 59.375,36.5"/>
-<polyline fill="none" stroke="#000000" stroke-width="0.5" points="59.375,255.5 54.0352,255.5"/>
-<polyline fill="none" stroke="#000000" stroke-width="0.5" points="59.375,224.214 54.0352,224.214"/>
-<polyline fill="none" stroke="#000000" stroke-width="0.5" points="59.375,192.929 54.0352,192.929"/>
-<polyline fill="none" stroke="#000000" stroke-width="0.5" points="59.375,161.643 54.0352,161.643"/>
-<polyline fill="none" stroke="#000000" stroke-width="0.5" points="59.375,130.357 54.0352,130.357"/>
-<polyline fill="none" stroke="#000000" stroke-width="0.5" points="59.375,99.0713 54.0352,99.0713"/>
-<polyline fill="none" stroke="#000000" stroke-width="0.5" points="59.375,67.7856 54.0352,67.7856"/>
-<polyline fill="none" stroke="#000000" stroke-width="0.5" points="59.375,36.5 54.0352,36.5"/>
-<polyline fill="none" stroke="#000000" stroke-width="0.5" points="59.375,245.071 56.1709,245.071"/>
-<polyline fill="none" stroke="#000000" stroke-width="0.5" points="59.375,234.643 56.1709,234.643"/>
-<polyline fill="none" stroke="#000000" stroke-width="0.5" points="59.375,213.786 56.1709,213.786"/>
-<polyline fill="none" stroke="#000000" stroke-width="0.5" points="59.375,203.357 56.1709,203.357"/>
-<polyline fill="none" stroke="#000000" stroke-width="0.5" points="59.375,182.5 56.1709,182.5"/>
-<polyline fill="none" stroke="#000000" stroke-width="0.5" points="59.375,172.071 56.1709,172.071"/>
-<polyline fill="none" stroke="#000000" stroke-width="0.5" points="59.375,151.214 56.1709,151.214"/>
-<polyline fill="none" stroke="#000000" stroke-width="0.5" points="59.375,140.786 56.1709,140.786"/>
-<polyline fill="none" stroke="#000000" stroke-width="0.5" points="59.375,119.929 56.1709,119.929"/>
-<polyline fill="none" stroke="#000000" stroke-width="0.5" points="59.375,109.5 56.1709,109.5"/>
-<polyline fill="none" stroke="#000000" stroke-width="0.5" points="59.375,88.6431 56.1709,88.6431"/>
-<polyline fill="none" stroke="#000000" stroke-width="0.5" points="59.375,78.2144 56.1709,78.2144"/>
-<polyline fill="none" stroke="#000000" stroke-width="0.5" points="59.375,57.3569 56.1709,57.3569"/>
-<polyline fill="none" stroke="#000000" stroke-width="0.5" points="59.375,46.9287 56.1709,46.9287"/>
-<text fill="#000000" style="stroke:none" x="31" y="261" transform="rotate(-0, 31, 261)" font-size="10" font-family="SansSerif" font-style="normal" font-weight="normal">-0.4</text>
-<text fill="#000000" style="stroke:none" x="31" y="229" transform="rotate(-0, 31, 229)" font-size="10" font-family="SansSerif" font-style="normal" font-weight="normal">-0.2</text>
-<text fill="#000000" style="stroke:none" x="36" y="198" transform="rotate(-0, 36, 198)" font-size="10" font-family="SansSerif" font-style="normal" font-weight="normal">0.0</text>
-<text fill="#000000" style="stroke:none" x="37" y="167" transform="rotate(-0, 37, 167)" font-size="10" font-family="SansSerif" font-style="normal" font-weight="normal">0.2</text>
-<text fill="#000000" style="stroke:none" x="37" y="135" transform="rotate(-0, 37, 135)" font-size="10" font-family="SansSerif" font-style="normal" font-weight="normal">0.4</text>
-<text fill="#000000" style="stroke:none" x="37" y="104" transform="rotate(-0, 37, 104)" font-size="10" font-family="SansSerif" font-style="normal" font-weight="normal">0.6</text>
-<text fill="#000000" style="stroke:none" x="36" y="73" transform="rotate(-0, 36, 73)" font-size="10" font-family="SansSerif" font-style="normal" font-weight="normal">0.8</text>
-<text fill="#000000" style="stroke:none" x="37" y="42" transform="rotate(-0, 37, 42)" font-size="10" font-family="SansSerif" font-style="normal" font-weight="normal">1.0</text>
-<polyline fill="none" stroke="#000000" stroke-width="0.5" points="59.375,255.5 415.625,255.5"/>
-<polyline fill="none" stroke="#000000" stroke-width="0.5" points="59.375,255.5 59.375,258.785"/>
-<polyline fill="none" stroke="#000000" stroke-width="0.5" points="95,255.5 95,258.785"/>
-<polyline fill="none" stroke="#000000" stroke-width="0.5" points="130.625,255.5 130.625,258.785"/>
-<polyline fill="none" stroke="#000000" stroke-width="0.5" points="166.25,255.5 166.25,258.785"/>
-<polyline fill="none" stroke="#000000" stroke-width="0.5" points="201.875,255.5 201.875,258.785"/>
-<polyline fill="none" stroke="#000000" stroke-width="0.5" points="237.5,255.5 237.5,258.785"/>
-<polyline fill="none" stroke="#000000" stroke-width="0.5" points="273.125,255.5 273.125,258.785"/>
-<polyline fill="none" stroke="#000000" stroke-width="0.5" points="308.75,255.5 308.75,258.785"/>
-<polyline fill="none" stroke="#000000" stroke-width="0.5" points="344.375,255.5 344.375,258.785"/>
-<polyline fill="none" stroke="#000000" stroke-width="0.5" points="380,255.5 380,258.785"/>
-<polyline fill="none" stroke="#000000" stroke-width="0.5" points="415.625,255.5 415.625,258.785"/>
-<polyline fill="none" stroke="#000000" stroke-width="0.5" points="77.1875,255.5 77.1875,257.471"/>
-<polyline fill="none" stroke="#000000" stroke-width="0.5" points="112.812,255.5 112.812,257.471"/>
-<polyline fill="none" stroke="#000000" stroke-width="0.5" points="148.438,255.5 148.438,257.471"/>
-<polyline fill="none" stroke="#000000" stroke-width="0.5" points="184.062,255.5 184.062,257.471"/>
-<polyline fill="none" stroke="#000000" stroke-width="0.5" points="219.688,255.5 219.688,257.471"/>
-<polyline fill="none" stroke="#000000" stroke-width="0.5" points="255.312,255.5 255.312,257.471"/>
-<polyline fill="none" stroke="#000000" stroke-width="0.5" points="290.938,255.5 290.938,257.471"/>
-<polyline fill="none" stroke="#000000" stroke-width="0.5" points="326.562,255.5 326.562,257.471"/>
-<polyline fill="none" stroke="#000000" stroke-width="0.5" points="362.188,255.5 362.188,257.471"/>
-<polyline fill="none" stroke="#000000" stroke-width="0.5" points="397.812,255.5 397.812,257.471"/>
-<text fill="#000000" style="stroke:none" x="51" y="270" transform="rotate(-0, 51, 270)" font-size="10" font-family="SansSerif" font-style="normal" font-weight="normal">0.0</text>
-<text fill="#000000" style="stroke:none" x="87" y="270" transform="rotate(-0, 87, 270)" font-size="10" font-family="SansSerif" font-style="normal" font-weight="normal">0.1</text>
-<text fill="#000000" style="stroke:none" x="123" y="270" transform="rotate(-0, 123, 270)" font-size="10" font-family="SansSerif" font-style="normal" font-weight="normal">0.2</text>
-<text fill="#000000" style="stroke:none" x="158" y="270" transform="rotate(-0, 158, 270)" font-size="10" font-family="SansSerif" font-style="normal" font-weight="normal">0.3</text>
-<text fill="#000000" style="stroke:none" x="194" y="270" transform="rotate(-0, 194, 270)" font-size="10" font-family="SansSerif" font-style="normal" font-weight="normal">0.4</text>
-<text fill="#000000" style="stroke:none" x="230" y="270" transform="rotate(-0, 230, 270)" font-size="10" font-family="SansSerif" font-style="normal" font-weight="normal">0.5</text>
-<text fill="#000000" style="stroke:none" x="265" y="270" transform="rotate(-0, 265, 270)" font-size="10" font-family="SansSerif" font-style="normal" font-weight="normal">0.6</text>
-<text fill="#000000" style="stroke:none" x="300" y="270" transform="rotate(-0, 300, 270)" font-size="10" font-family="SansSerif" font-style="normal" font-weight="normal">0.7</text>
-<text fill="#000000" style="stroke:none" x="336" y="270" transform="rotate(-0, 336, 270)" font-size="10" font-family="SansSerif" font-style="normal" font-weight="normal">0.8</text>
-<text fill="#000000" style="stroke:none" x="371" y="270" transform="rotate(-0, 371, 270)" font-size="10" font-family="SansSerif" font-style="normal" font-weight="normal">0.9</text>
-<text fill="#000000" style="stroke:none" x="408" y="270" transform="rotate(-0, 408, 270)" font-size="10" font-family="SansSerif" font-style="normal" font-weight="normal">1.0</text>
+<polygon fill="#ffffff" points="76.5,333.375 76.5,47.625 76.5,47.625"/>
+<polygon fill="#ffffff" points="76.5,333.375 76.5,47.625 76.5,333.375"/>
+<polygon fill="#ffffff" points="76.5,333.375 535.5,333.375 535.5,333.375"/>
+<polygon fill="#ffffff" points="76.5,333.375 535.5,333.375 76.5,333.375"/>
+<polygon fill="#ffffff" points="76.5,333.375 535.5,333.375 535.5,47.625"/>
+<polygon fill="#ffffff" points="76.5,333.375 535.5,47.625 76.5,47.625"/>
+<polyline fill="none" stroke="#000000" stroke-width="0.5" points="76.5,333.375 76.5,47.625 76.5,47.625 535.5,47.625 535.5,333.375 535.5,333.375 76.5,333.375"/>
+<polyline fill="none" stroke="#000000" stroke-width="0.5" points="535.5,47.625 76.5,47.625"/>
+<polyline fill="none" stroke="#000000" stroke-width="0.5" points="535.5,47.625 535.5,333.375"/>
+<polyline fill="none" stroke="#000000" stroke-width="0.5" points="535.5,47.625 535.5,47.625"/>
+<polyline fill="none" stroke="#0000ff" stroke-width="0.5" points="76.5,251.732 81.1362,251.732 85.7729,251.73 90.4092,251.727 95.0454,251.719 99.6816,251.706 104.318,251.687 108.955,251.66 113.591,251.625 118.227,251.579 122.864,251.522 127.5,251.452 132.136,251.369 136.773,251.27 141.409,251.155 146.045,251.022 150.682,250.871 155.318,250.699 159.955,250.505 164.591,250.29 169.227,250.049 173.864,249.784 178.5,249.492 183.136,249.173 187.773,248.824 192.409,248.445 197.045,248.035 201.682,247.592 206.318,247.114 210.955,246.602 215.591,246.053 220.227,245.465 224.864,244.839 229.5,244.173 234.136,243.464 238.773,242.713 243.409,241.918 248.045,241.077 252.682,240.189 257.318,239.254 261.955,238.27 266.591,237.234 271.227,236.147 275.864,235.007 280.5,233.813 285.136,232.563 289.773,231.257 294.409,229.893 299.045,228.469 303.682,226.984 308.318,225.438 312.955,223.828 317.591,222.155 322.227,220.415 326.864,218.609 331.5,216.734 336.136,214.791 340.773,212.776 345.409,210.689 350.045,208.53 354.682,206.295 359.318,203.985 363.955,201.599 368.591,199.133 373.227,196.589 377.864,193.963 382.5,191.256 387.136,188.465 391.773,185.59 396.409,182.628 401.045,179.581 405.682,176.444 410.318,173.218 414.955,169.9 419.591,166.491 424.227,162.989 428.864,159.392 433.5,155.698 438.136,151.908 442.773,148.019 447.409,144.03 452.045,139.941 456.682,135.749 461.318,131.454 465.955,127.054 470.591,122.548 475.227,117.935 479.864,113.213 484.5,108.381 489.136,103.438 493.773,98.3833 498.409,93.2148 503.045,87.9312 507.682,82.5317 512.318,77.0146 516.955,71.3789 521.591,65.6235 526.227,59.7471 530.864,53.7476 535.5,47.625"/>
+<polyline fill="none" stroke="#007f00" stroke-width="0.5" points="76.5,47.625 81.1362,47.9717 85.7729,49.0107 90.4092,50.7344 95.0454,53.1333 99.6816,56.1924 104.318,59.8926 108.955,64.2119 113.591,69.1245 118.227,74.5996 122.864,80.6055 127.5,87.105 132.136,94.0596 136.773,101.428 141.409,109.167 146.045,117.23 150.682,125.571 155.318,134.141 159.955,142.891 164.591,151.771 169.227,160.731 173.864,169.722 178.5,178.692 183.136,187.596 187.773,196.384 192.409,205.01 197.045,213.431 201.682,221.604 206.318,229.49 210.955,237.05 215.591,244.251 220.227,251.062 224.864,257.454 229.5,263.401 234.136,268.883 238.773,273.882 243.409,278.384 248.045,282.378 252.682,285.858 257.318,288.82 261.955,291.266 266.591,293.199 271.227,294.627 275.864,295.562 280.5,296.018 285.136,296.012 289.773,295.564 294.409,294.698 299.045,293.44 303.682,291.816 308.318,289.857 312.955,287.594 317.591,285.059 322.227,282.287 326.864,279.311 331.5,276.167 336.136,272.892 340.773,269.519 345.409,266.084 350.045,262.622 354.682,259.167 359.318,255.75 363.955,252.402 368.591,249.154 373.227,246.034 377.864,243.067 382.5,240.277 387.136,237.685 391.773,235.311 396.409,233.17 401.045,231.277 405.682,229.643 410.318,228.276 414.955,227.183 419.591,226.366 424.227,225.826 428.864,225.561 433.5,225.566 438.136,225.834 442.773,226.356 447.409,227.121 452.045,228.114 456.682,229.321 461.318,230.725 465.955,232.307 470.591,234.047 475.227,235.925 479.864,237.919 484.5,240.008 489.136,242.167 493.773,244.375 498.409,246.608 503.045,248.845 507.682,251.062 512.318,253.239 516.955,255.355 521.591,257.391 526.227,259.327 530.864,261.147 535.5,262.836"/>
+<polygon fill="#ffffee" points="300,288 300,296 308,296"/>
+<polygon fill="#ffffee" points="300,288 308,296 308,288"/>
+<polyline fill="none" stroke="#007f00" stroke-width="0.5" points="300,288 300,296 308,296 308,288 300,288"/>
+<polygon fill="#ffffee" points="174,175 174,183 182,183"/>
+<polygon fill="#ffffee" points="174,175 182,183 182,175"/>
+<polyline fill="none" stroke="#007f00" stroke-width="0.5" points="174,175 174,183 182,183 182,175 174,175"/>
+<polyline fill="none" stroke="#000000" stroke-width="0.5" points="122.864,251.522 122.91,251.521"/>
+<polygon fill="#ffffee" points="119,248 119,256 127,256"/>
+<polygon fill="#ffffee" points="119,248 127,256 127,248"/>
+<polyline fill="none" stroke="#0000ff" stroke-width="0.5" points="119,248 119,256 127,256 127,248 119,248"/>
+<polygon fill="#ffffee" points="119,248 119,256 127,256"/>
+<polygon fill="#ffffee" points="119,248 127,256 127,248"/>
+<polyline fill="none" stroke="#0000ff" stroke-width="0.5" points="119,248 119,256 127,256 127,248 119,248"/>
+<polyline fill="none" stroke="#000000" stroke-width="0.5" points="424.227,162.989 424.25,162.971"/>
+<polygon fill="#ffffee" points="420,159 420,167 428,167"/>
+<polygon fill="#ffffee" points="420,159 428,167 428,159"/>
+<polyline fill="none" stroke="#0000ff" stroke-width="0.5" points="420,159 420,167 428,167 428,159 420,159"/>
+<polygon fill="#ffffee" points="420,159 420,167 428,167"/>
+<polygon fill="#ffffee" points="420,159 428,167 428,159"/>
+<polyline fill="none" stroke="#0000ff" stroke-width="0.5" points="420,159 420,167 428,167 428,159 420,159"/>
+<polygon fill="#ffffee" points="307.5,294.5 307.5,333.5 377.5,333.5"/>
+<polygon fill="#ffffee" points="307.5,294.5 377.5,333.5 377.5,294.5"/>
+<polyline fill="none" stroke="#bebebe" stroke-width="0.5" points="307.5,294.5 307.5,333.5 377.5,333.5 377.5,294.5 307.5,294.5"/>
+<text fill="#000000" style="stroke:none" x="308" y="305" transform="rotate(0, 308, 305)" font-size="10" font-family="SansSerif" font-style="normal" font-weight="normal">sinc</text>
+<text fill="#000000" style="stroke:none" x="308" y="319" transform="rotate(0, 308, 319)" font-size="10" font-family="SansSerif" font-style="normal" font-weight="normal">[0.5,-0.2;sinc</text>
+<text fill="#000000" style="stroke:none" x="308" y="332" transform="rotate(0, 308, 332)" font-size="10" font-family="SansSerif" font-style="normal" font-weight="normal">0.5,-0.2]</text>
+<polygon fill="#ffffee" points="109.5,181.5 109.5,220.5 175.5,220.5"/>
+<polygon fill="#ffffee" points="109.5,181.5 175.5,220.5 175.5,181.5"/>
+<polyline fill="none" stroke="#bebebe" stroke-width="0.5" points="109.5,181.5 109.5,220.5 175.5,220.5 175.5,181.5 109.5,181.5"/>
+<text fill="#000000" style="stroke:none" x="110" y="192" transform="rotate(0, 110, 192)" font-size="10" font-family="SansSerif" font-style="normal" font-weight="normal">sinc</text>
+<text fill="#000000" style="stroke:none" x="110" y="206" transform="rotate(0, 110, 206)" font-size="10" font-family="SansSerif" font-style="normal" font-weight="normal">[0.2,0.4;sinc</text>
+<text fill="#000000" style="stroke:none" x="110" y="219" transform="rotate(0, 110, 219)" font-size="10" font-family="SansSerif" font-style="normal" font-weight="normal">0.2,0.4]</text>
+<polygon fill="#ffffee" points="126.5,254.5 126.5,278.5 172.5,278.5"/>
+<polygon fill="#ffffee" points="126.5,254.5 172.5,278.5 172.5,254.5"/>
+<polyline fill="none" stroke="#bebebe" stroke-width="0.5" points="126.5,254.5 126.5,278.5 172.5,278.5 172.5,254.5 126.5,254.5"/>
+<text fill="#000000" style="stroke:none" x="127" y="265" transform="rotate(0, 127, 265)" font-size="10" font-family="SansSerif" font-style="normal" font-weight="normal">X: 0.1</text>
+<text fill="#000000" style="stroke:none" x="127" y="277" transform="rotate(0, 127, 277)" font-size="10" font-family="SansSerif" font-style="normal" font-weight="normal">Y: 0.001</text>
+<polygon fill="#ffffee" points="381.5,134.5 381.5,158.5 420.5,158.5"/>
+<polygon fill="#ffffee" points="381.5,134.5 420.5,158.5 420.5,134.5"/>
+<polyline fill="none" stroke="#bebebe" stroke-width="0.5" points="381.5,134.5 381.5,158.5 420.5,158.5 420.5,134.5 381.5,134.5"/>
+<text fill="#000000" style="stroke:none" x="382" y="145" transform="rotate(0, 382, 145)" font-size="10" font-family="SansSerif" font-style="normal" font-weight="normal">X: 0.76</text>
+<text fill="#000000" style="stroke:none" x="382" y="157" transform="rotate(0, 382, 157)" font-size="10" font-family="SansSerif" font-style="normal" font-weight="normal">Y: 0.43</text>
+<polyline fill="none" stroke="#000000" stroke-width="0.5" points="76.5,333.375 76.5,47.625"/>
+<polyline fill="none" stroke="#000000" stroke-width="0.5" points="76.5,333.375 69.6147,333.375"/>
+<polyline fill="none" stroke="#000000" stroke-width="0.5" points="76.5,292.554 69.6147,292.554"/>
+<polyline fill="none" stroke="#000000" stroke-width="0.5" points="76.5,251.732 69.6147,251.732"/>
+<polyline fill="none" stroke="#000000" stroke-width="0.5" points="76.5,210.911 69.6147,210.911"/>
+<polyline fill="none" stroke="#000000" stroke-width="0.5" points="76.5,170.089 69.6147,170.089"/>
+<polyline fill="none" stroke="#000000" stroke-width="0.5" points="76.5,129.268 69.6147,129.268"/>
+<polyline fill="none" stroke="#000000" stroke-width="0.5" points="76.5,88.4463 69.6147,88.4463"/>
+<polyline fill="none" stroke="#000000" stroke-width="0.5" points="76.5,47.625 69.6147,47.625"/>
+<polyline fill="none" stroke="#000000" stroke-width="0.5" points="76.5,312.964 72.3691,312.964"/>
+<polyline fill="none" stroke="#000000" stroke-width="0.5" points="76.5,272.143 72.3691,272.143"/>
+<polyline fill="none" stroke="#000000" stroke-width="0.5" points="76.5,231.321 72.3691,231.321"/>
+<polyline fill="none" stroke="#000000" stroke-width="0.5" points="76.5,190.5 72.3691,190.5"/>
+<polyline fill="none" stroke="#000000" stroke-width="0.5" points="76.5,149.679 72.3691,149.679"/>
+<polyline fill="none" stroke="#000000" stroke-width="0.5" points="76.5,108.857 72.3691,108.857"/>
+<polyline fill="none" stroke="#000000" stroke-width="0.5" points="76.5,68.0356 72.3691,68.0356"/>
+<text fill="#000000" style="stroke:none" x="47" y="338" transform="rotate(-0, 47, 338)" font-size="10" font-family="SansSerif" font-style="normal" font-weight="normal">-0.4</text>
+<text fill="#000000" style="stroke:none" x="48" y="298" transform="rotate(-0, 48, 298)" font-size="10" font-family="SansSerif" font-style="normal" font-weight="normal">-0.2</text>
+<text fill="#000000" style="stroke:none" x="51" y="257" transform="rotate(-0, 51, 257)" font-size="10" font-family="SansSerif" font-style="normal" font-weight="normal">0.0</text>
+<text fill="#000000" style="stroke:none" x="52" y="216" transform="rotate(-0, 52, 216)" font-size="10" font-family="SansSerif" font-style="normal" font-weight="normal">0.2</text>
+<text fill="#000000" style="stroke:none" x="51" y="175" transform="rotate(-0, 51, 175)" font-size="10" font-family="SansSerif" font-style="normal" font-weight="normal">0.4</text>
+<text fill="#000000" style="stroke:none" x="51" y="134" transform="rotate(-0, 51, 134)" font-size="10" font-family="SansSerif" font-style="normal" font-weight="normal">0.6</text>
+<text fill="#000000" style="stroke:none" x="51" y="93" transform="rotate(-0, 51, 93)" font-size="10" font-family="SansSerif" font-style="normal" font-weight="normal">0.8</text>
+<text fill="#000000" style="stroke:none" x="52" y="53" transform="rotate(-0, 52, 53)" font-size="10" font-family="SansSerif" font-style="normal" font-weight="normal">1.0</text>
+<polyline fill="none" stroke="#000000" stroke-width="0.5" points="76.5,333.375 535.5,333.375"/>
+<polyline fill="none" stroke="#000000" stroke-width="0.5" points="76.5,333.375 76.5,337.65"/>
+<polyline fill="none" stroke="#000000" stroke-width="0.5" points="122.4,333.375 122.4,337.65"/>
+<polyline fill="none" stroke="#000000" stroke-width="0.5" points="168.3,333.375 168.3,337.65"/>
+<polyline fill="none" stroke="#000000" stroke-width="0.5" points="214.2,333.375 214.2,337.65"/>
+<polyline fill="none" stroke="#000000" stroke-width="0.5" points="260.1,333.375 260.1,337.65"/>
+<polyline fill="none" stroke="#000000" stroke-width="0.5" points="306,333.375 306,337.65"/>
+<polyline fill="none" stroke="#000000" stroke-width="0.5" points="351.9,333.375 351.9,337.65"/>
+<polyline fill="none" stroke="#000000" stroke-width="0.5" points="397.8,333.375 397.8,337.65"/>
+<polyline fill="none" stroke="#000000" stroke-width="0.5" points="443.7,333.375 443.7,337.65"/>
+<polyline fill="none" stroke="#000000" stroke-width="0.5" points="489.6,333.375 489.6,337.65"/>
+<polyline fill="none" stroke="#000000" stroke-width="0.5" points="535.5,333.375 535.5,337.65"/>
+<polyline fill="none" stroke="#000000" stroke-width="0.5" points="99.4502,333.375 99.4502,335.94"/>
+<polyline fill="none" stroke="#000000" stroke-width="0.5" points="145.35,333.375 145.35,335.94"/>
+<polyline fill="none" stroke="#000000" stroke-width="0.5" points="191.25,333.375 191.25,335.94"/>
+<polyline fill="none" stroke="#000000" stroke-width="0.5" points="237.15,333.375 237.15,335.94"/>
+<polyline fill="none" stroke="#000000" stroke-width="0.5" points="283.05,333.375 283.05,335.94"/>
+<polyline fill="none" stroke="#000000" stroke-width="0.5" points="328.95,333.375 328.95,335.94"/>
+<polyline fill="none" stroke="#000000" stroke-width="0.5" points="374.85,333.375 374.85,335.94"/>
+<polyline fill="none" stroke="#000000" stroke-width="0.5" points="420.75,333.375 420.75,335.94"/>
+<polyline fill="none" stroke="#000000" stroke-width="0.5" points="466.65,333.375 466.65,335.94"/>
+<polyline fill="none" stroke="#000000" stroke-width="0.5" points="512.55,333.375 512.55,335.94"/>
+<text fill="#000000" style="stroke:none" x="68" y="349" transform="rotate(-0, 68, 349)" font-size="10" font-family="SansSerif" font-style="normal" font-weight="normal">0.0</text>
+<text fill="#000000" style="stroke:none" x="114" y="349" transform="rotate(-0, 114, 349)" font-size="10" font-family="SansSerif" font-style="normal" font-weight="normal">0.1</text>
+<text fill="#000000" style="stroke:none" x="160" y="349" transform="rotate(-0, 160, 349)" font-size="10" font-family="SansSerif" font-style="normal" font-weight="normal">0.2</text>
+<text fill="#000000" style="stroke:none" x="206" y="349" transform="rotate(-0, 206, 349)" font-size="10" font-family="SansSerif" font-style="normal" font-weight="normal">0.3</text>
+<text fill="#000000" style="stroke:none" x="252" y="349" transform="rotate(-0, 252, 349)" font-size="10" font-family="SansSerif" font-style="normal" font-weight="normal">0.4</text>
+<text fill="#000000" style="stroke:none" x="298" y="349" transform="rotate(-0, 298, 349)" font-size="10" font-family="SansSerif" font-style="normal" font-weight="normal">0.5</text>
+<text fill="#000000" style="stroke:none" x="343" y="349" transform="rotate(-0, 343, 349)" font-size="10" font-family="SansSerif" font-style="normal" font-weight="normal">0.6</text>
+<text fill="#000000" style="stroke:none" x="390" y="349" transform="rotate(-0, 390, 349)" font-size="10" font-family="SansSerif" font-style="normal" font-weight="normal">0.7</text>
+<text fill="#000000" style="stroke:none" x="435" y="349" transform="rotate(-0, 435, 349)" font-size="10" font-family="SansSerif" font-style="normal" font-weight="normal">0.8</text>
+<text fill="#000000" style="stroke:none" x="482" y="349" transform="rotate(-0, 482, 349)" font-size="10" font-family="SansSerif" font-style="normal" font-weight="normal">0.9</text>
+<text fill="#000000" style="stroke:none" x="528" y="349" transform="rotate(-0, 528, 349)" font-size="10" font-family="SansSerif" font-style="normal" font-weight="normal">1.0</text>
 </g>
 </svg>
index 6ff4997..9608356 100644 (file)
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <svg xmlns="http://www.w3.org/2000/svg"
      xmlns:xlink="http://www.w3.org/1999/xlink"
-     width="612px" height="461px" viewBox="0 0 612 461"
+     width="612px" height="381px" viewBox="0 0 612 381"
      style="stroke:none">
-<title>Graphic window number 0</title>
+<title>Figure n°0</title>
 <desc>
 Creator: GL2PS 1.3.2, (C) 1999-2006 Christophe Geuzaine (geuz@geuz.org)
 For: Scilab
-CreationDate: Mon Apr 19 11:30:37 2010
+CreationDate: Wed Apr 27 11:52:33 2011
 </desc>
 <defs>
 </defs>
-<polygon fill="#ffffff" points="0,0 612,0 612,461 0,461"/>
+<polygon fill="#ffffff" points="0,0 612,0 612,381 0,381"/>
 <g>
-<polyline fill="none" stroke="#000000" stroke-width="0.5" points="76.5,403.375 76.5,57.625 76.5,57.625 535.5,57.625 535.5,403.375 535.5,403.375 76.5,403.375"/>
-<polyline fill="none" stroke="#000000" stroke-width="0.5" points="535.5,57.625 76.5,57.625"/>
-<polyline fill="none" stroke="#000000" stroke-width="0.5" points="535.5,57.625 535.5,403.375"/>
-<polyline fill="none" stroke="#000000" stroke-width="0.5" points="535.5,57.625 535.5,57.625"/>
-<polygon fill="#ffffff" points="76.5,403.375 76.5,57.625 76.5,57.625"/>
-<polygon fill="#ffffff" points="76.5,403.375 76.5,57.625 76.5,403.375"/>
-<polygon fill="#ffffff" points="76.5,403.375 535.5,403.375 535.5,403.375"/>
-<polygon fill="#ffffff" points="76.5,403.375 535.5,403.375 76.5,403.375"/>
-<polygon fill="#ffffff" points="76.5,403.375 535.5,403.375 535.5,57.625"/>
-<polygon fill="#ffffff" points="76.5,403.375 535.5,57.625 76.5,57.625"/>
-<polyline fill="none" stroke="#0000ff" stroke-width="0.5" points="260.1,230.5 260.102,230.385 260.107,230.27 260.117,230.154 260.129,230.039 260.146,229.924 260.166,229.809 260.19,229.694 260.218,229.58 260.249,229.466 260.284,229.352 260.322,229.239 260.364,229.125 260.41,229.013 260.459,228.901 260.512,228.789 260.569,228.678 260.629,228.567 260.693,228.457 260.76,228.348 260.831,228.239 260.905,228.131 260.983,228.023 261.064,227.917 261.149,227.811 261.238,227.706 261.33,227.602 261.425,227.498 261.523,227.396 261.625,227.294 261.731,227.194 261.84,227.094 261.952,226.996 262.067,226.899 262.186,226.803 262.308,226.708 262.433,226.614 262.562,226.521 262.693,226.429 262.828,226.339 262.965,226.25 263.106,226.163 263.25,226.077 263.397,225.992 263.547,225.908 263.701,225.826 263.856,225.746 264.016,225.667 264.177,225.589 264.342,225.514 264.51,225.439 264.68,225.367 264.853,225.295 265.029,225.226 265.207,225.158 265.388,225.092 265.572,225.028 265.758,224.966 265.947,224.905 266.138,224.846 266.332,224.79 266.528,224.734 266.727,224.681 266.927,224.63 267.13,224.581 267.336,224.533 267.543,224.488 267.753,224.445 267.965,224.403 268.179,224.364 268.395,224.327 268.613,224.292 268.833,224.259 269.054,224.229 269.278,224.2 269.503,224.173 269.73,224.149 269.959,224.127 270.189,224.108 270.421,224.09 270.655,224.075 270.891,224.062 271.127,224.052 271.365,224.043 271.604,224.038 271.845,224.034 272.087,224.033 272.33,224.035 272.574,224.039 272.819,224.044 273.066,224.053 273.313,224.064 273.562,224.078 273.811,224.094 274.061,224.112 274.312,224.133 274.563,224.157 274.815,224.183 275.068,224.211 275.321,224.243 275.575,224.276 275.829,224.313 276.083,224.352 276.338,224.393 276.594,224.437 276.849,224.484 277.104,224.533 277.36,224.585 277.616,224.639 277.872,224.696 278.127,224.756 278.382,224.818 278.638,224.884 278.893,224.951 279.147,225.021 279.401,225.095 279.655,225.17 279.908,225.249 280.161,225.329 280.414,225.413 280.665,225.499 280.916,225.588 281.166,225.68 281.415,225.773 281.663,225.871 281.91,225.97 282.156,226.072 282.401,226.177 282.646,226.284 282.888,226.395 283.129,226.507 283.37,226.622 283.608,226.74 283.846,226.861 284.082,226.984 284.316,227.11 284.548,227.238 284.779,227.369 285.008,227.502 285.236,227.639 285.461,227.777 285.685,227.918 285.907,228.062 286.126,228.208 286.344,228.357 286.559,228.508 286.772,228.662 286.983,228.818 287.191,228.977 287.397,229.138 287.602,229.302 287.803,229.468 288.001,229.636 288.197,229.807 288.391,229.98 288.581,230.156 288.769,230.334 288.954,230.514 289.136,230.697 289.315,230.881 289.491,231.068 289.665,231.258 289.834,231.449 290.001,231.643 290.165,231.839 290.325,232.038 290.482,232.238 290.636,232.44 290.786,232.645 290.933,232.851 291.076,233.06 291.215,233.271 291.352,233.483 291.484,233.698 291.612,233.915 291.737,234.133 291.858,234.354 291.975,234.576 292.088,234.8 292.197,235.026 292.302,235.254 292.403,235.484 292.5,235.715 292.593,235.949 292.682,236.183 292.766,236.42 292.846,236.658 292.922,236.897 292.993,237.139 293.06,237.381 293.122,237.625 293.18,237.872 293.233,238.119 293.282,238.367 293.327,238.617 293.366,238.869 293.401,239.121 293.431,239.375 293.456,239.63 293.477,239.886 293.492,240.144 293.503,240.402 293.509,240.662 293.509,240.923 293.505,241.185 293.496,241.447 293.482,241.711 293.463,241.976 293.438,242.241 293.409,242.507 293.374,242.775 293.334,243.042 293.289,243.311 293.239,243.581 293.183,243.851 293.122,244.121 293.056,244.392 292.984,244.664 292.907,244.936 292.825,245.208 292.737,245.481 292.644,245.755 292.545,246.028 292.441,246.302 292.331,246.577 292.216,246.851 292.095,247.125 291.969,247.4 291.837,247.675 291.699,247.95 291.556,248.225 291.408,248.499 291.253,248.774 291.093,249.048 290.928,249.322 290.756,249.597 290.58,249.87 290.397,250.144 290.208,250.417 290.015,250.689 289.815,250.961 289.61,251.233 289.399,251.504 289.182,251.775 288.959,252.045 288.731,252.314 288.498,252.583 288.258,252.851 288.013,253.118 287.762,253.384 287.505,253.649 287.243,253.914 286.975,254.177 286.701,254.439 286.421,254.7 286.136,254.96 285.846,255.219 285.549,255.477 285.247,255.733 284.939,255.989 284.626,256.243 284.307,256.495 283.982,256.746 283.652,256.996 283.316,257.243 282.975,257.49 282.628,257.734 282.276,257.978 281.918,258.219 281.555,258.458 281.186,258.696 280.812,258.933 280.432,259.167 280.047,259.399 279.656,259.629 279.261,259.857 278.859,260.083 278.453,260.307 278.042,260.529 277.625,260.749 277.202,260.966 276.775,261.181 276.342,261.394 275.905,261.604 275.462,261.812 275.015,262.018 274.562,262.221 274.104,262.421 273.641,262.62 273.173,262.815 272.701,263.007 272.224,263.197 271.742,263.384 271.255,263.569 270.763,263.75 270.267,263.929 269.766,264.105 269.26,264.277 268.75,264.447 268.236,264.614 267.717,264.778 267.193,264.938 266.666,265.096 266.133,265.25 265.597,265.401 265.057,265.548 264.512,265.693 263.963,265.834 263.41,265.972 262.853,266.106 262.292,266.237 261.728,266.364 261.159,266.488 260.586,266.608 260.011,266.725 259.431,266.837 258.847,266.947 258.26,267.053 257.67,267.154 257.076,267.252 256.479,267.347 255.878,267.438 255.274,267.524 254.667,267.606 254.058,267.686 253.444,267.76 252.828,267.831 252.209,267.898 251.587,267.96 250.962,268.019 250.335,268.074 249.705,268.125 249.072,268.17 248.437,268.212 247.8,268.25 247.16,268.284 246.517,268.313 245.873,268.338 245.226,268.359 244.577,268.375 243.927,268.388 243.274,268.395 242.619,268.398 241.963,268.397 241.305,268.392 240.646,268.381 239.984,268.367 239.321,268.347 238.657,268.324 237.992,268.295 237.325,268.262 236.657,268.225 235.988,268.183 235.318,268.136 234.648,268.084 233.976,268.028 233.304,267.967 232.631,267.902 231.957,267.832 231.283,267.757 230.608,267.677 229.933,267.593 229.258,267.503 228.583,267.41 227.907,267.311 227.232,267.208 226.557,267.099 225.881,266.986 225.207,266.868 224.532,266.745 223.858,266.617 223.184,266.485 222.511,266.347 221.839,266.205 221.167,266.058 220.497,265.906 219.827,265.749 219.158,265.587 218.491,265.421 217.824,265.249 217.159,265.073 216.496,264.892 215.833,264.706 215.173,264.514 214.514,264.318 213.857,264.118 213.202,263.912 212.548,263.701 211.897,263.486 211.248,263.266 210.601,263.041 209.957,262.811 209.314,262.576 208.674,262.336 208.037,262.091 207.403,261.842 206.771,261.588 206.142,261.329 205.516,261.065 204.893,260.796 204.273,260.523 203.656,260.245 203.042,259.962 202.433,259.674 201.826,259.382 201.223,259.085 200.624,258.783 200.028,258.477 199.436,258.166 198.848,257.85 198.265,257.53 197.685,257.205 197.109,256.875 196.538,256.542 195.971,256.203 195.408,255.86 194.85,255.512 194.297,255.16 193.748,254.803 193.204,254.442 192.665,254.077 192.131,253.707 191.602,253.333 191.079,252.955 190.56,252.572 190.046,252.185 189.539,251.793 189.036,251.398 188.539,250.999 188.048,250.595 187.562,250.187 187.083,249.774 186.609,249.358 186.141,248.938 185.679,248.514 185.224,248.086 184.774,247.654 184.331,247.218 183.894,246.778 183.464,246.335 183.04,245.888 182.623,245.437 182.212,244.981 181.809,244.523 181.412,244.061 181.021,243.595 180.639,243.126 180.263,242.653 179.894,242.177 179.532,241.698 179.178,241.215 178.831,240.729 178.491,240.239 178.159,239.746 177.834,239.25 177.518,238.75 177.208,238.248 176.907,237.743 176.613,237.234 176.328,236.723 176.05,236.209 175.78,235.692 175.519,235.172 175.265,234.649 175.02,234.124 174.783,233.595 174.554,233.064 174.334,232.531 174.122,231.996 173.919,231.458 173.724,230.917 173.538,230.374 173.361,229.828 173.192,229.281 173.032,228.731 172.881,228.179 172.739,227.625 172.605,227.069 172.481,226.511 172.366,225.951 172.26,225.39 172.163,224.826 172.076,224.261 171.997,223.694 171.928,223.125 171.868,222.556 171.817,221.984 171.776,221.411 171.745,220.837 171.722,220.261 171.709,219.685 171.707,219.106 171.713,218.527 171.729,217.947 171.755,217.366 171.79,216.784 171.835,216.201 171.891,215.617 171.955,215.032 172.03,214.447 172.114,213.861 172.208,213.274 172.312,212.688 172.427,212.101 172.551,211.513 172.685,210.925 172.829,210.337 172.983,209.749 173.147,209.16 173.321,208.572 173.506,207.983 173.7,207.395 173.904,206.807 174.119,206.219 174.344,205.632 174.578,205.045 174.823,204.458 175.078,203.873 175.344,203.287 175.619,202.702 175.905,202.118 176.2,201.535 176.506,200.953 176.822,200.371 177.149,199.791 177.485,199.211 177.832,198.633 178.189,198.057 178.556,197.481 178.933,196.907 179.32,196.334 179.718,195.763 180.125,195.193 180.543,194.625 180.971,194.059 181.409,193.494 181.857,192.932 182.315,192.371 182.783,191.812 183.262,191.255 183.75,190.701 184.248,190.148 184.756,189.598 185.275,189.051 185.803,188.505 186.341,187.962 186.889,187.422 187.446,186.885 188.014,186.35 188.591,185.818 189.179,185.289 189.775,184.762 190.382,184.239 190.999,183.718 191.624,183.201 192.26,182.687 192.905,182.176 193.559,181.669 194.223,181.165 194.896,180.664 195.579,180.167 196.271,179.673 196.973,179.184 197.683,178.698 198.403,178.215 199.132,177.737 199.87,177.262 200.617,176.792 201.373,176.325 202.138,175.863 202.912,175.405 203.694,174.951 204.486,174.501 205.286,174.057 206.095,173.616 206.912,173.18 207.738,172.748 208.572,172.321 209.415,171.899 210.266,171.481 211.125,171.069 211.992,170.661 212.868,170.258 213.751,169.86 214.643,169.468 215.542,169.08 216.449,168.698 217.364,168.321 218.287,167.949 219.217,167.583 220.154,167.221 221.099,166.866 222.052,166.516 223.011,166.172 223.978,165.833 224.952,165.5 225.933,165.173 226.921,164.852 227.916,164.536 228.917,164.227 229.925,163.923 230.94,163.625 231.961,163.334 232.988,163.048 234.022,162.77 235.062,162.497 236.108,162.23 237.16,161.97 238.218,161.716 239.282,161.468 240.352,161.228 241.427,160.993 242.507,160.766 243.593,160.544 244.685,160.33 245.781,160.122 246.882,159.921 247.989,159.727 249.1,159.54 250.216,159.359 251.337,159.185 252.462,159.019 253.592,158.859 254.727,158.707 255.865,158.561 257.007,158.423 258.154,158.292 259.304,158.167 260.458,158.051 261.616,157.941 262.777,157.839 263.941,157.744 265.109,157.657 266.28,157.577 267.455,157.504 268.632,157.439 269.812,157.381 270.994,157.331 272.179,157.289 273.367,157.253 274.557,157.226 275.749,157.206 276.943,157.194 278.139,157.189 279.337,157.192 280.537,157.204 281.738,157.222 282.941,157.249 284.145,157.283 285.35,157.325 286.557,157.375 287.764,157.432 288.972,157.498 290.181,157.571 291.39,157.652 292.6,157.742 293.81,157.839 295.02,157.944 296.23,158.057 297.44,158.178 298.65,158.307 299.859,158.443 301.068,158.588 302.276,158.741 303.484,158.902 304.69,159.07 305.896,159.247 307.101,159.432 308.304,159.625 309.505,159.826 310.705,160.034 311.904,160.251 313.1,160.476 314.294,160.709 315.487,160.95 316.677,161.199 317.865,161.456 319.05,161.72 320.232,161.993 321.412,162.274 322.589,162.562 323.763,162.859 324.933,163.164 326.1,163.477 327.264,163.797 328.424,164.125 329.58,164.462 330.732,164.806 331.881,165.158 333.025,165.518 334.165,165.886 335.301,166.262 336.432,166.645 337.558,167.037 338.679,167.436 339.795,167.842 340.907,168.257 342.013,168.679 343.113,169.109 344.208,169.546 345.298,169.991 346.382,170.444 347.459,170.904 348.531,171.372 349.597,171.847 350.656,172.33 351.709,172.82 352.755,173.318 353.794,173.823 354.827,174.335 355.853,174.855 356.872,175.382 357.883,175.916 358.887,176.458 359.884,177.006 360.873,177.562 361.854,178.124 362.827,178.694 363.792,179.271 364.75,179.854 365.699,180.445 366.64,181.042 367.572,181.646 368.496,182.258 369.41,182.875 370.316,183.5 371.213,184.131 372.101,184.769 372.98,185.413 373.849,186.063 374.709,186.72 375.56,187.383 376.4,188.053 377.231,188.729 378.052,189.411 378.863,190.099 379.664,190.793 380.454,191.494 381.234,192.2 382.004,192.912 382.763,193.63 383.511,194.354 384.249,195.083 384.975,195.819 385.691,196.56 386.395,197.306 387.088,198.058 387.771,198.815 388.441,199.577 389.1,200.345 389.747,201.118 390.382,201.896 391.006,202.679 391.618,203.467 392.218,204.26 392.805,205.058 393.38,205.86 393.943,206.667 394.494,207.479 395.032,208.295 395.558,209.116 396.071,209.941 396.571,210.771 397.058,211.605 397.533,212.443 397.994,213.285 398.442,214.13 398.877,214.98 399.299,215.834 399.707,216.691 400.102,217.553 400.484,218.417 400.852,219.285 401.206,220.157 401.547,221.032 401.874,221.91 402.187,222.792 402.485,223.676 402.771,224.563 403.042,225.454 403.298,226.347 403.542,227.242 403.77,228.141 403.984,229.042 404.184,229.945 404.369,230.851 404.54,231.759 404.697,232.669 404.838,233.582 404.966,234.496 405.078,235.413 405.176,236.331 405.259,237.25 405.327,238.172 405.38,239.095 405.419,240.019 405.442,240.945 405.451,241.872 405.444,242.8 405.423,243.729 405.386,244.659 405.334,245.59 405.268,246.522 405.186,247.455 405.088,248.388 404.976,249.321 404.848,250.255 404.705,251.189 404.546,252.124 404.373,253.058 404.184,253.992 403.979,254.927 403.76,255.861 403.524,256.794 403.274,257.728 403.008,258.661 402.727,259.593 402.43,260.524 402.117,261.455 401.79,262.385 401.446,263.313 401.088,264.241 400.714,265.167 400.324,266.092 399.919,267.016 399.499,267.938 399.063,268.858 398.612,269.777 398.146,270.694 397.664,271.609 397.167,272.522 396.654,273.433 396.125,274.341 395.583,275.248 395.024,276.151 394.45,277.053 393.861,277.951 393.257,278.847 392.637,279.74 392.002,280.63 391.353,281.517 390.688,282.401 390.008,283.282 389.313,284.159 388.604,285.033 387.878,285.903 387.139,286.77 386.384,287.632 385.615,288.492 384.831,289.347 384.032,290.198 383.218,291.044 382.39,291.887 381.548,292.726 380.69,293.559 379.819,294.389 378.933,295.213 378.033,296.033 377.118,296.848 376.189,297.658 375.247,298.463 374.29,299.263 373.319,300.058 372.334,300.848 371.335,301.631 370.323,302.41 369.297,303.183 368.257,303.95 367.204,304.711 366.137,305.467 365.057,306.217 363.963,306.96 362.857,307.697 361.737,308.429 360.604,309.153 359.458,309.872 358.3,310.583 357.129,311.289 355.945,311.987 354.749,312.679 353.54,313.363 352.318,314.041 351.084,314.712 349.838,315.375 348.581,316.032 347.311,316.681 346.029,317.322 344.736,317.957 343.431,318.583 342.114,319.202 340.787,319.813 339.447,320.417 338.097,321.012 336.735,321.6 335.363,322.18 333.98,322.751 332.586,323.314 331.182,323.869 329.767,324.416 328.341,324.954 326.906,325.483 325.461,326.004 324.005,326.517 322.54,327.02 321.065,327.515 319.581,328.001 318.087,328.478 316.584,328.946 315.072,329.405 313.551,329.854 312.021,330.295 310.482,330.727 308.935,331.148 307.379,331.561 305.815,331.964 304.244,332.357 302.664,332.741 301.076,333.115 299.48,333.48 297.877,333.834 296.267,334.18 294.649,334.515 293.025,334.84 291.393,335.155 289.755,335.459 288.11,335.754 286.458,336.039 284.801,336.313 283.137,336.578 281.467,336.832 279.792,337.075 278.111,337.309 276.424,337.531 274.732,337.743 273.035,337.945 271.333,338.136 269.626,338.316 267.915,338.486 266.199,338.645 264.479,338.793 262.755,338.931 261.027,339.057 259.295,339.173 257.559,339.278 255.82,339.372 254.078,339.455 252.333,339.527 250.584,339.587 248.833,339.637 247.08,339.676 245.324,339.704 243.566,339.72 241.806,339.726 240.044,339.72 238.281,339.703 236.516,339.675 234.75,339.635 232.982,339.584 231.214,339.522 229.445,339.449 227.675,339.364 225.905,339.269 224.135,339.161 222.365,339.042 220.595,338.912 218.825,338.771 217.056,338.618 215.288,338.454 213.521,338.278 211.754,338.091 209.99,337.893 208.226,337.683 206.464,337.461 204.705,337.229 202.947,336.984 201.191,336.729 199.438,336.462 197.688,336.184 195.94,335.894 194.195,335.593 192.454,335.281 190.715,334.957 188.98,334.622 187.25,334.275 185.523,333.917 183.8,333.548 182.082,333.167 180.367,332.776 178.658,332.373 176.954,331.958 175.254,331.533 173.56,331.097 171.871,330.648 170.188,330.189 168.511,329.72 166.839,329.238 165.174,328.746 163.516,328.243 161.863,327.729 160.218,327.203"/>
-<polyline fill="none" stroke="#007f00" stroke-width="0.5" points="260.1,230.5 260.103,230.327 260.111,230.154 260.125,229.981 260.144,229.809 260.169,229.637 260.199,229.466 260.235,229.295 260.276,229.125 260.323,228.957 260.375,228.789 260.433,228.623 260.497,228.457 260.565,228.293 260.639,228.131 260.719,227.97 260.803,227.811 260.894,227.653 260.989,227.498 261.09,227.345 261.196,227.194 261.308,227.045 261.425,226.899 261.547,226.755 261.674,226.614 261.807,226.475 261.944,226.339 262.087,226.207 262.235,226.077 262.388,225.95 262.546,225.826 262.709,225.706 262.877,225.589 263.051,225.476 263.229,225.367 263.412,225.261 263.6,225.158 263.792,225.06 263.989,224.966 264.191,224.875 264.398,224.79 264.609,224.708 264.826,224.63 265.046,224.557 265.271,224.488 265.501,224.424 265.735,224.364 265.973,224.309 266.216,224.259 266.463,224.214 266.714,224.173 266.97,224.138 267.229,224.108 267.493,224.083 267.761,224.062 268.032,224.047 268.308,224.038 268.587,224.034 268.87,224.035 269.157,224.041 269.448,224.053 269.742,224.071 270.04,224.094 270.341,224.123 270.646,224.157 270.954,224.197 271.265,224.243 271.58,224.294 271.897,224.352 272.218,224.415 272.542,224.484 272.869,224.559 273.199,224.639 273.531,224.726 273.867,224.818 274.205,224.917 274.545,225.021 274.889,225.132 275.234,225.249 275.583,225.371 275.933,225.499 276.286,225.633 276.641,225.773 276.998,225.92 277.356,226.072 277.717,226.23 278.08,226.395 278.445,226.564 278.812,226.74 279.179,226.922 279.549,227.11 279.92,227.303 280.292,227.502 280.666,227.708 281.041,227.918 281.417,228.135 281.794,228.357 282.172,228.585 282.552,228.818 282.932,229.057 283.312,229.302 283.693,229.552 284.075,229.807 284.458,230.068 284.84,230.334 285.224,230.605 285.607,230.881 285.99,231.163 286.374,231.449 286.757,231.741 287.14,232.038 287.523,232.339 287.906,232.645 288.289,232.956 288.67,233.271 289.052,233.59 289.433,233.915 289.812,234.243 290.192,234.576 290.57,234.913 290.947,235.254 291.323,235.6 291.698,235.949 292.072,236.301 292.444,236.658 292.815,237.018 293.185,237.381 293.552,237.749 293.918,238.119 294.282,238.492 294.644,238.869 295.004,239.248 295.363,239.63 295.719,240.015 296.072,240.402 296.424,240.792 296.772,241.185 297.119,241.579 297.463,241.976 297.804,242.374 298.142,242.775 298.478,243.177 298.81,243.581 299.139,243.986 299.466,244.392 299.789,244.8 300.108,245.208 300.425,245.618 300.737,246.028 301.046,246.439 301.352,246.851 301.654,247.263 301.952,247.675 302.246,248.087 302.536,248.499 302.822,248.911 303.104,249.322 303.381,249.733 303.654,250.144 303.923,250.553 304.187,250.961 304.447,251.369 304.702,251.775 304.952,252.18 305.197,252.583 305.438,252.984 305.673,253.384 305.904,253.781 306.129,254.177 306.349,254.57 306.564,254.96 306.773,255.348 306.977,255.733 307.176,256.116 307.368,256.495 307.556,256.871 307.737,257.243 307.913,257.612 308.082,257.978 308.246,258.339 308.403,258.696 308.555,259.05 308.701,259.399 308.839,259.743 308.973,260.083 309.099,260.418 309.219,260.749 309.333,261.074 309.439,261.394 309.54,261.709 309.633,262.018 309.72,262.322 309.8,262.62 309.874,262.912 309.939,263.197 309.999,263.477 310.051,263.75 310.096,264.017 310.134,264.277 310.165,264.531 310.188,264.778 310.204,265.018 310.213,265.25 310.214,265.475 310.208,265.693 310.194,265.903 310.173,266.106 310.144,266.301 310.107,266.488 310.063,266.667 310.011,266.837 309.952,267 309.884,267.154 309.808,267.3 309.725,267.438 309.633,267.566 309.534,267.686 309.426,267.796 309.311,267.898 309.187,267.99 309.056,268.074 308.916,268.148 308.768,268.212 308.611,268.268 308.446,268.313 308.273,268.349 308.092,268.375 307.903,268.392 307.705,268.398 307.499,268.395 307.284,268.381 307.062,268.357 306.83,268.324 306.59,268.279 306.342,268.225 306.084,268.16 305.819,268.084 305.545,267.999 305.263,267.902 304.972,267.795 304.673,267.677 304.365,267.549 304.048,267.41 303.723,267.26 303.39,267.099 303.047,266.927 302.696,266.745 302.337,266.552 301.969,266.347 301.593,266.132 301.208,265.906 300.814,265.669 300.412,265.421 300.001,265.162 299.582,264.892 299.155,264.61 298.718,264.318 298.274,264.015 297.821,263.701 297.359,263.376 296.889,263.041 296.411,262.693 295.923,262.336 295.428,261.967 294.925,261.588 294.413,261.197 293.893,260.796 293.364,260.385 292.827,259.962 292.282,259.529 291.729,259.085 291.167,258.631 290.598,258.166 290.021,257.691 289.435,257.205 288.841,256.709 288.239,256.203 287.63,255.687 287.012,255.16 286.387,254.624 285.753,254.077 285.112,253.521 284.464,252.955 283.807,252.379 283.143,251.793 282.472,251.199 281.792,250.595 281.106,249.981 280.412,249.358 279.71,248.727 279.001,248.086 278.286,247.437 277.562,246.778 276.832,246.112 276.095,245.437 275.35,244.753 274.599,244.061 273.84,243.361 273.075,242.653 272.304,241.938 271.525,241.215 270.74,240.484 269.948,239.746 269.15,239 268.346,238.248 267.535,237.489 266.718,236.723 265.895,235.951 265.065,235.172 264.23,234.387 263.389,233.595 262.542,232.798 261.688,231.996 260.83,231.188 259.966,230.374 259.096,229.555 258.221,228.731 257.341,227.902 256.455,227.069 255.564,226.231 254.668,225.39 253.768,224.544 252.862,223.694 251.952,222.841 251.036,221.984 250.117,221.124 249.192,220.261 248.264,219.396 247.331,218.527 246.394,217.656 245.453,216.784 244.508,215.909 243.559,215.032 242.606,214.154 241.649,213.274 240.689,212.394 239.726,211.513 238.759,210.631 237.789,209.749 236.816,208.866 235.84,207.983 234.861,207.101 233.879,206.219 232.895,205.338 231.907,204.458 230.918,203.58 229.926,202.702 228.932,201.827 227.936,200.953 226.938,200.081 225.938,199.211 224.936,198.345 223.933,197.481 222.928,196.62 221.922,195.763 220.914,194.909 219.906,194.059 218.896,193.212 217.886,192.371 216.875,191.533 215.862,190.701 214.85,189.873 213.837,189.051 212.824,188.233 211.811,187.422 210.798,186.617 209.785,185.818 208.772,185.025 207.76,184.239 206.748,183.459 205.737,182.687 204.726,181.922 203.717,181.165 202.708,180.415 201.701,179.673 200.695,178.94 199.69,178.215 198.688,177.499 197.686,176.792 196.687,176.094 195.689,175.405 194.694,174.726 193.701,174.057 192.709,173.397 191.721,172.748 190.736,172.109 189.753,171.481 188.773,170.864 187.796,170.258 186.822,169.664 185.852,169.08 184.885,168.508 183.921,167.949 182.961,167.401 182.006,166.866 181.054,166.343 180.106,165.833 179.163,165.335 178.224,164.852 177.289,164.38 176.359,163.923 175.434,163.479 174.514,163.048 173.599,162.632 172.689,162.23 171.785,161.842 170.886,161.468 169.992,161.109 169.104,160.766 168.223,160.436 167.347,160.122 166.477,159.823 165.614,159.54 164.756,159.271 163.906,159.019 163.062,158.782 162.225,158.561 161.395,158.356 160.572,158.167 159.756,157.995 158.948,157.839 158.147,157.7 157.354,157.577 156.567,157.471 155.79,157.381 155.02,157.309 154.258,157.253 153.504,157.215 152.759,157.194 152.022,157.19 151.293,157.204 150.574,157.234 149.863,157.283 149.162,157.349 148.469,157.432 147.786,157.534 147.111,157.652 146.447,157.789 145.792,157.944 145.146,158.116 144.51,158.307 143.884,158.515 143.269,158.741 142.663,158.985 142.067,159.247 141.482,159.527 140.908,159.826 140.344,160.142 139.791,160.476 139.249,160.828 138.717,161.199 138.196,161.587 137.687,161.993 137.189,162.417 136.702,162.859 136.227,163.319 135.763,163.797 135.311,164.293 134.87,164.806 134.442,165.337 134.025,165.886 133.621,166.453 133.228,167.037 132.848,167.638 132.48,168.257 132.125,168.893 131.781,169.546 131.451,170.217 131.133,170.904 130.828,171.609 130.536,172.33 130.257,173.068 129.991,173.823 129.738,174.594 129.498,175.382 129.271,176.186 129.058,177.006 128.858,177.842 128.672,178.694 128.5,179.562 128.34,180.445 128.195,181.344 128.063,182.258 127.945,183.187 127.842,184.131 127.752,185.089 127.676,186.063 127.614,187.051 127.567,188.053 127.533,189.069 127.514,190.099 127.51,191.143 127.52,192.2 127.543,193.271 127.582,194.354 127.635,195.451 127.703,196.56 127.786,197.681 127.883,198.815 127.995,199.96 128.121,201.118 128.263,202.287 128.419,203.467 128.59,204.658 128.776,205.86 128.978,207.073 129.193,208.295 129.425,209.528 129.671,210.771 129.932,212.023 130.208,213.285 130.5,214.555 130.807,215.834 131.128,217.122 131.465,218.417 131.817,219.721 132.185,221.032 132.567,222.35 132.965,223.676 133.378,225.008 133.807,226.347 134.25,227.691 134.709,229.042 135.184,230.398 135.673,231.759 136.178,233.125 136.698,234.496 137.233,235.871 137.784,237.25 138.35,238.633 138.93,240.019 139.527,241.408 140.138,242.8 140.765,244.194 141.407,245.59 142.063,246.988 142.736,248.388 143.423,249.788 144.125,251.189 144.842,252.591 145.575,253.992 146.322,255.394 147.084,256.794 147.862,258.194 148.654,259.593 149.461,260.99 150.283,262.385 151.12,263.777 151.971,265.167 152.837,266.554 153.718,267.938 154.613,269.318 155.523,270.694 156.448,272.066 157.386,273.433 158.339,274.795 159.307,276.151 160.289,277.502 161.285,278.847 162.294,280.186 163.319,281.517 164.357,282.842 165.409,284.159 166.475,285.468 167.555,286.77 168.648,288.062 169.755,289.347 170.875,290.622 172.01,291.887 173.157,293.143 174.318,294.389 175.492,295.624 176.679,296.848 177.879,298.062 179.092,299.263 180.318,300.454 181.557,301.631 182.808,302.797 184.072,303.95 185.348,305.09 186.637,306.217 187.938,307.33 189.251,308.429 190.577,309.513 191.914,310.583 193.263,311.639 194.624,312.679 195.996,313.703 197.38,314.712 198.775,315.705 200.182,316.681 201.599,317.641 203.028,318.583 204.467,319.509 205.917,320.417 207.378,321.307 208.85,322.18 210.332,323.034 211.824,323.869 213.326,324.686 214.838,325.483 216.36,326.262 217.892,327.02 219.433,327.759 220.983,328.478 222.543,329.177 224.112,329.854 225.69,330.512 227.277,331.148 228.873,331.764 230.478,332.357 232.09,332.93 233.711,333.48 235.34,334.008 236.977,334.515 238.621,334.999 240.273,335.459 241.933,335.898 243.601,336.313 245.274,336.706 246.956,337.075 248.644,337.421 250.338,337.743 252.04,338.042 253.747,338.316 255.461,338.567 257.18,338.793 258.906,338.995 260.637,339.173 262.374,339.326 264.115,339.455 265.862,339.559 267.614,339.637 269.371,339.691 271.132,339.72 272.897,339.724 274.667,339.703 276.441,339.656 278.219,339.584 280,339.487 281.785,339.364 283.573,339.216 285.365,339.042 287.159,338.843 288.956,338.618 290.755,338.367 292.558,338.091 294.361,337.789 296.167,337.461 297.976,337.108 299.785,336.729 301.596,336.324 303.408,335.894 305.221,335.438 307.035,334.957 308.85,334.45 310.665,333.917 312.479,333.359 314.295,332.776 316.11,332.167 317.925,331.533 319.739,330.874 321.552,330.189 323.365,329.48 325.176,328.746 326.986,327.987 328.794,327.203 330.601,326.395 332.405,325.562 334.208,324.704 336.008,323.822 337.805,322.917 339.6,321.987 341.392,321.033 343.18,320.056 344.965,319.055 346.747,318.031 348.525,316.983 350.299,315.913 352.068,314.82 353.833,313.704 355.594,312.566 357.35,311.406 359.101,310.223 360.846,309.019 362.586,307.793 364.32,306.546 366.049,305.277 367.771,303.988 369.488,302.678 371.198,301.348 372.901,299.997 374.597,298.627 376.287,297.237 377.969,295.828 379.643,294.399 381.31,292.952 382.969,291.486 384.62,290.002 386.263,288.5 387.897,286.98 389.522,285.443 391.139,283.89 392.747,282.319 394.345,280.732 395.934,279.128 397.513,277.51 399.083,275.875 400.642,274.226 402.191,272.562 403.729,270.884 405.257,269.191 406.774,267.485 408.281,265.766 409.775,264.034 411.259,262.289 412.731,260.532 414.191,258.763 415.639,256.983 417.075,255.192 418.499,253.39 419.91,251.578 421.308,249.755 422.693,247.924 424.065,246.083 425.424,244.234 426.77,242.376 428.102,240.511 429.42,238.638 430.724,236.758 432.014,234.872 433.289,232.979 434.55,231.081 435.796,229.177 437.028,227.268 438.244,225.355 439.445,223.438 440.631,221.517 441.801,219.593 442.956,217.667 444.094,215.738 445.217,213.807 446.323,211.875 447.413,209.942 448.486,208.008 449.543,206.075 450.583,204.142 451.605,202.209 452.611,200.278 453.6,198.349 454.57,196.422 455.523,194.498 456.459,192.576 457.377,190.658 458.276,188.745 459.158,186.835 460.021,184.931 460.865,183.033 461.691,181.14 462.499,179.253 463.287,177.373 464.056,175.5 464.806,173.635 465.537,171.779 466.249,169.93 466.941,168.091 467.613,166.261 468.266,164.441 468.898,162.632 469.511,160.833 470.104,159.046 470.676,157.271 471.228,155.507 471.759,153.756 472.27,152.019 472.76,150.294 473.23,148.584 473.678,146.888 474.106,145.207 474.513,143.541 474.898,141.891 475.262,140.256 475.604,138.638 475.926,137.038 476.226,135.454 476.504,133.888 476.76,132.34 476.995,130.811 477.208,129.3 477.398,127.81 477.567,126.338 477.714,124.887 477.838,123.456 477.941,122.046 478.021,120.658 478.079,119.291 478.114,117.946 478.126,116.624 478.117,115.324 478.084,114.047 478.03,112.794 477.952,111.565 477.852,110.36 477.729,109.179 477.583,108.023 477.414,106.892 477.222,105.787 477.007,104.708 476.77,103.654 476.509,102.627 476.226,101.626 475.919,100.653 475.589,99.7075 475.236,98.7891 474.861,97.8984 474.462,97.0361 474.04,96.2021 473.594,95.397 473.126,94.6206 472.634,93.873 472.12,93.1553 471.582,92.4673 471.021,91.8091 470.437,91.1812 469.829,90.583 469.198,90.0161 468.545,89.4795 467.868,88.9741 467.168,88.4995 466.445,88.0562 465.7,87.645 464.931,87.2646 464.139,86.9165 463.324,86.6006 462.486,86.3164 461.625,86.0649 460.741,85.8457 459.835,85.6587 458.906,85.5049 457.954,85.3833 456.979,85.2949 455.982,85.2397 454.962,85.2173 453.92,85.228 452.855,85.272 451.768,85.3491 450.658,85.46 449.526,85.6035 448.373,85.7812 447.196,85.9922 445.998,86.2368 444.778,86.5146 443.536,86.8262 442.271,87.1714 440.986,87.5498 439.679,87.9624 438.35,88.4082 436.999,88.8872 435.627,89.3999 434.234,89.9463 432.82,90.5259 431.385,91.1387 429.928,91.7847 428.451,92.4639 426.953,93.1763 425.435,93.9219 423.895,94.7002 422.335,95.5112 420.756,96.355 419.156,97.2314 417.535,98.1401 415.896,99.0815 414.235,100.055 412.556,101.06 410.856,102.098 409.138,103.167 407.4,104.267 405.643,105.398 403.867,106.562 402.072,107.755 400.259,108.98 398.427,110.235 396.577,111.521 394.708,112.836 392.821,114.182 390.917,115.557 388.994,116.961 387.054,118.395 385.096,119.856 383.122,121.348 381.129,122.867 379.121,124.414 377.095,125.988 375.053,127.59 372.995,129.22 370.92,130.875 368.829,132.558 366.722,134.267 364.6,136 362.462,137.76 360.309,139.545 358.141,141.354 355.958,143.188 353.76,145.046 351.548,146.928 349.321,148.833 347.081,150.76 344.826,152.71 342.558,154.682 340.276,156.676 337.981,158.691 335.673,160.727 333.353,162.783 331.02,164.859 328.673,166.955 326.315,169.069 323.945,171.203 321.564,173.354 319.17,175.523 316.766,177.71 314.351,179.913 311.924,182.133 309.487,184.368 307.04,186.619 304.582,188.885 302.115,191.165 299.638,193.459 297.151,195.767 294.656,198.087 292.151,200.42 289.638,202.765 287.116,205.121 284.586,207.488 282.048,209.865 279.503,212.252 276.95,214.648 274.39,217.053 271.823,219.467 269.249,221.888 266.669,224.316 264.083,226.75 261.49,229.191 258.892,231.637 256.289,234.088 253.68,236.544 251.067,239.003 248.449,241.466 245.827,243.931 243.2,246.399 240.57,248.868 237.936,251.338 235.299,253.809 232.659,256.279 230.016,258.749 227.371,261.217 224.723,263.684 222.074,266.148 219.423,268.61 216.771,271.067 214.117,273.521 211.462,275.97 208.808,278.414 206.152,280.852 203.497,283.284 200.842,285.708 198.188,288.125 195.535,290.534 192.882,292.934 190.231,295.325 187.582,297.707 184.935,300.077 182.29,302.437 179.646,304.785 177.007,307.122 174.37,309.445 171.737,311.755 169.107,314.052 166.481,316.334 163.86,318.602 161.243,320.854 158.63,323.09 156.023,325.309 153.421,327.512 150.825,329.696 148.234,331.863 145.65,334.011 143.072,336.14 140.501,338.249 137.937,340.337 135.38,342.406 132.831,344.452 130.29,346.477 127.757,348.48 125.232,350.459 122.716,352.416 120.209,354.349 117.711,356.257 115.223,358.14 112.745,359.999 110.276,361.831"/>
-<polygon fill="#ffffee" points="124,196 124,204 132,204"/>
-<polygon fill="#ffffee" points="124,196 132,204 132,196"/>
-<polyline fill="none" stroke="#007f00" stroke-width="0.5" points="124,196 124,204 132,204 132,196 124,196"/>
-<polygon fill="#ffffee" points="358,134 358,142 366,142"/>
-<polygon fill="#ffffee" points="358,134 366,142 366,134"/>
-<polyline fill="none" stroke="#007f00" stroke-width="0.5" points="358,134 358,142 366,142 366,134 358,134"/>
-<polygon fill="#ffffee" points="385,196 385,204 393,204"/>
-<polygon fill="#ffffee" points="385,196 393,204 393,196"/>
-<polyline fill="none" stroke="#0000ff" stroke-width="0.5" points="385,196 385,204 393,204 393,196 385,196"/>
-<polygon fill="#ffffee" points="131.5,167.5 131.5,195.5 169.5,195.5"/>
-<polygon fill="#ffffee" points="131.5,167.5 169.5,195.5 169.5,167.5"/>
-<polyline fill="none" stroke="#bebebe" stroke-width="0.5" points="131.5,167.5 131.5,195.5 169.5,195.5 169.5,167.5 131.5,167.5"/>
-<text fill="#000000" style="stroke:none" x="132" y="179" transform="rotate(0, 132, 179)" font-size="10" font-family="SansSerif" font-style="normal" font-weight="normal">spiral</text>
-<text fill="#000000" style="stroke:none" x="132" y="193" transform="rotate(0, 132, 193)" font-size="10" font-family="SansSerif" font-style="normal" font-weight="normal">t=4.99</text>
-<polygon fill="#ffffee" points="366.5,105.5 366.5,133.5 396.5,133.5"/>
-<polygon fill="#ffffee" points="366.5,105.5 396.5,133.5 396.5,105.5"/>
-<polyline fill="none" stroke="#bebebe" stroke-width="0.5" points="366.5,105.5 366.5,133.5 396.5,133.5 396.5,105.5 366.5,105.5"/>
-<text fill="#000000" style="stroke:none" x="367" y="117" transform="rotate(0, 367, 117)" font-size="10" font-family="SansSerif" font-style="normal" font-weight="normal">spiral</text>
-<text fill="#000000" style="stroke:none" x="367" y="131" transform="rotate(0, 367, 131)" font-size="10" font-family="SansSerif" font-style="normal" font-weight="normal">t=9</text>
-<polygon fill="#ffffee" points="393.5,172.5 393.5,196.5 423.5,196.5"/>
-<polygon fill="#ffffee" points="393.5,172.5 423.5,196.5 423.5,172.5"/>
-<polyline fill="none" stroke="#bebebe" stroke-width="0.5" points="393.5,172.5 393.5,196.5 423.5,196.5 423.5,172.5 393.5,172.5"/>
-<text fill="#000000" style="stroke:none" x="394" y="182" transform="rotate(0, 394, 182)" font-size="10" font-family="SansSerif" font-style="normal" font-weight="normal">curve</text>
-<text fill="#000000" style="stroke:none" x="394" y="195" transform="rotate(0, 394, 195)" font-size="10" font-family="SansSerif" font-style="normal" font-weight="normal">t=7.5</text>
-<polyline fill="none" stroke="#000000" stroke-width="0.5" points="76.5,403.375 76.5,57.625"/>
-<polyline fill="none" stroke="#000000" stroke-width="0.5" points="76.5,403.375 69.6147,403.375"/>
-<polyline fill="none" stroke="#000000" stroke-width="0.5" points="76.5,345.75 69.6147,345.75"/>
-<polyline fill="none" stroke="#000000" stroke-width="0.5" points="76.5,288.125 69.6147,288.125"/>
-<polyline fill="none" stroke="#000000" stroke-width="0.5" points="76.5,230.5 69.6147,230.5"/>
-<polyline fill="none" stroke="#000000" stroke-width="0.5" points="76.5,172.875 69.6147,172.875"/>
-<polyline fill="none" stroke="#000000" stroke-width="0.5" points="76.5,115.25 69.6147,115.25"/>
-<polyline fill="none" stroke="#000000" stroke-width="0.5" points="76.5,57.625 69.6147,57.625"/>
-<polyline fill="none" stroke="#000000" stroke-width="0.5" points="76.5,388.969 72.3691,388.969"/>
-<polyline fill="none" stroke="#000000" stroke-width="0.5" points="76.5,374.562 72.3691,374.562"/>
-<polyline fill="none" stroke="#000000" stroke-width="0.5" points="76.5,360.156 72.3691,360.156"/>
-<polyline fill="none" stroke="#000000" stroke-width="0.5" points="76.5,331.344 72.3691,331.344"/>
-<polyline fill="none" stroke="#000000" stroke-width="0.5" points="76.5,316.938 72.3691,316.938"/>
-<polyline fill="none" stroke="#000000" stroke-width="0.5" points="76.5,302.531 72.3691,302.531"/>
-<polyline fill="none" stroke="#000000" stroke-width="0.5" points="76.5,273.719 72.3691,273.719"/>
-<polyline fill="none" stroke="#000000" stroke-width="0.5" points="76.5,259.312 72.3691,259.312"/>
-<polyline fill="none" stroke="#000000" stroke-width="0.5" points="76.5,244.906 72.3691,244.906"/>
-<polyline fill="none" stroke="#000000" stroke-width="0.5" points="76.5,216.094 72.3691,216.094"/>
-<polyline fill="none" stroke="#000000" stroke-width="0.5" points="76.5,201.688 72.3691,201.688"/>
-<polyline fill="none" stroke="#000000" stroke-width="0.5" points="76.5,187.281 72.3691,187.281"/>
-<polyline fill="none" stroke="#000000" stroke-width="0.5" points="76.5,158.469 72.3691,158.469"/>
-<polyline fill="none" stroke="#000000" stroke-width="0.5" points="76.5,144.062 72.3691,144.062"/>
-<polyline fill="none" stroke="#000000" stroke-width="0.5" points="76.5,129.656 72.3691,129.656"/>
-<polyline fill="none" stroke="#000000" stroke-width="0.5" points="76.5,100.844 72.3691,100.844"/>
-<polyline fill="none" stroke="#000000" stroke-width="0.5" points="76.5,86.4375 72.3691,86.4375"/>
-<polyline fill="none" stroke="#000000" stroke-width="0.5" points="76.5,72.0312 72.3691,72.0312"/>
-<text fill="#000000" style="stroke:none" x="49" y="408" transform="rotate(-0, 49, 408)" font-size="10" font-family="SansSerif" font-style="normal" font-weight="normal">-15</text>
-<text fill="#000000" style="stroke:none" x="49" y="351" transform="rotate(-0, 49, 351)" font-size="10" font-family="SansSerif" font-style="normal" font-weight="normal">-10</text>
-<text fill="#000000" style="stroke:none" x="55" y="293" transform="rotate(-0, 55, 293)" font-size="10" font-family="SansSerif" font-style="normal" font-weight="normal">-5</text>
-<text fill="#000000" style="stroke:none" x="60" y="235" transform="rotate(-0, 60, 235)" font-size="10" font-family="SansSerif" font-style="normal" font-weight="normal">0</text>
-<text fill="#000000" style="stroke:none" x="62" y="178" transform="rotate(-0, 62, 178)" font-size="10" font-family="SansSerif" font-style="normal" font-weight="normal">5</text>
-<text fill="#000000" style="stroke:none" x="55" y="120" transform="rotate(-0, 55, 120)" font-size="10" font-family="SansSerif" font-style="normal" font-weight="normal">10</text>
-<text fill="#000000" style="stroke:none" x="56" y="63" transform="rotate(-0, 56, 63)" font-size="10" font-family="SansSerif" font-style="normal" font-weight="normal">15</text>
-<polyline fill="none" stroke="#000000" stroke-width="0.5" points="76.5,403.375 535.5,403.375"/>
-<polyline fill="none" stroke="#000000" stroke-width="0.5" points="76.5,403.375 76.5,408.55"/>
-<polyline fill="none" stroke="#000000" stroke-width="0.5" points="168.3,403.375 168.3,408.55"/>
-<polyline fill="none" stroke="#000000" stroke-width="0.5" points="260.1,403.375 260.1,408.55"/>
-<polyline fill="none" stroke="#000000" stroke-width="0.5" points="351.9,403.375 351.9,408.55"/>
-<polyline fill="none" stroke="#000000" stroke-width="0.5" points="443.7,403.375 443.7,408.55"/>
-<polyline fill="none" stroke="#000000" stroke-width="0.5" points="535.5,403.375 535.5,408.55"/>
-<polyline fill="none" stroke="#000000" stroke-width="0.5" points="99.4502,403.375 99.4502,406.48"/>
-<polyline fill="none" stroke="#000000" stroke-width="0.5" points="122.4,403.375 122.4,406.48"/>
-<polyline fill="none" stroke="#000000" stroke-width="0.5" points="145.35,403.375 145.35,406.48"/>
-<polyline fill="none" stroke="#000000" stroke-width="0.5" points="191.25,403.375 191.25,406.48"/>
-<polyline fill="none" stroke="#000000" stroke-width="0.5" points="214.2,403.375 214.2,406.48"/>
-<polyline fill="none" stroke="#000000" stroke-width="0.5" points="237.15,403.375 237.15,406.48"/>
-<polyline fill="none" stroke="#000000" stroke-width="0.5" points="283.05,403.375 283.05,406.48"/>
-<polyline fill="none" stroke="#000000" stroke-width="0.5" points="306,403.375 306,406.48"/>
-<polyline fill="none" stroke="#000000" stroke-width="0.5" points="328.95,403.375 328.95,406.48"/>
-<polyline fill="none" stroke="#000000" stroke-width="0.5" points="374.85,403.375 374.85,406.48"/>
-<polyline fill="none" stroke="#000000" stroke-width="0.5" points="397.8,403.375 397.8,406.48"/>
-<polyline fill="none" stroke="#000000" stroke-width="0.5" points="420.75,403.375 420.75,406.48"/>
-<polyline fill="none" stroke="#000000" stroke-width="0.5" points="466.65,403.375 466.65,406.48"/>
-<polyline fill="none" stroke="#000000" stroke-width="0.5" points="489.6,403.375 489.6,406.48"/>
-<polyline fill="none" stroke="#000000" stroke-width="0.5" points="512.55,403.375 512.55,406.48"/>
-<text fill="#000000" style="stroke:none" x="67" y="420" transform="rotate(-0, 67, 420)" font-size="10" font-family="SansSerif" font-style="normal" font-weight="normal">-10</text>
-<text fill="#000000" style="stroke:none" x="162" y="420" transform="rotate(-0, 162, 420)" font-size="10" font-family="SansSerif" font-style="normal" font-weight="normal">-5</text>
-<text fill="#000000" style="stroke:none" x="256" y="420" transform="rotate(-0, 256, 420)" font-size="10" font-family="SansSerif" font-style="normal" font-weight="normal">0</text>
-<text fill="#000000" style="stroke:none" x="349" y="420" transform="rotate(-0, 349, 420)" font-size="10" font-family="SansSerif" font-style="normal" font-weight="normal">5</text>
-<text fill="#000000" style="stroke:none" x="437" y="420" transform="rotate(-0, 437, 420)" font-size="10" font-family="SansSerif" font-style="normal" font-weight="normal">10</text>
-<text fill="#000000" style="stroke:none" x="529" y="420" transform="rotate(-0, 529, 420)" font-size="10" font-family="SansSerif" font-style="normal" font-weight="normal">15</text>
+<polygon fill="#ffffff" points="76.5,333.375 76.5,47.625 76.5,47.625"/>
+<polygon fill="#ffffff" points="76.5,333.375 76.5,47.625 76.5,333.375"/>
+<polygon fill="#ffffff" points="76.5,333.375 535.5,333.375 535.5,333.375"/>
+<polygon fill="#ffffff" points="76.5,333.375 535.5,333.375 76.5,333.375"/>
+<polygon fill="#ffffff" points="76.5,333.375 535.5,333.375 535.5,47.625"/>
+<polygon fill="#ffffff" points="76.5,333.375 535.5,47.625 76.5,47.625"/>
+<polyline fill="none" stroke="#000000" stroke-width="0.5" points="76.5,333.375 76.5,47.625 76.5,47.625 535.5,47.625 535.5,333.375 535.5,333.375 76.5,333.375"/>
+<polyline fill="none" stroke="#000000" stroke-width="0.5" points="535.5,47.625 76.5,47.625"/>
+<polyline fill="none" stroke="#000000" stroke-width="0.5" points="535.5,47.625 535.5,333.375"/>
+<polyline fill="none" stroke="#000000" stroke-width="0.5" points="535.5,47.625 535.5,47.625"/>
+<polyline fill="none" stroke="#0000ff" stroke-width="0.5" points="260.1,190.5 260.102,190.405 260.107,190.31 260.117,190.214 260.129,190.119 260.146,190.024 260.166,189.929 260.19,189.834 260.218,189.74 260.249,189.646 260.284,189.551 260.322,189.458 260.364,189.364 260.41,189.271 260.459,189.178 260.512,189.086 260.569,188.994 260.629,188.902 260.693,188.812 260.76,188.721 260.831,188.631 260.905,188.542 260.983,188.453 261.064,188.365 261.149,188.277 261.238,188.19 261.33,188.104 261.425,188.019 261.523,187.935 261.625,187.851 261.731,187.768 261.84,187.686 261.952,187.604 262.067,187.524 262.186,187.444 262.308,187.366 262.433,187.288 262.562,187.211 262.693,187.136 262.828,187.062 262.965,186.988 263.106,186.916 263.25,186.844 263.397,186.774 263.547,186.705 263.701,186.637 263.856,186.571 264.016,186.506 264.177,186.441 264.342,186.379 264.51,186.317 264.68,186.257 264.853,186.199 265.029,186.141 265.207,186.085 265.388,186.031 265.572,185.978 265.758,185.926 265.947,185.876 266.138,185.828 266.332,185.78 266.528,185.735 266.727,185.691 266.927,185.648 267.13,185.608 267.336,185.569 267.543,185.531 267.753,185.496 267.965,185.461 268.179,185.429 268.395,185.398 268.613,185.37 268.833,185.342 269.054,185.317 269.278,185.293 269.503,185.271 269.73,185.251 269.959,185.233 270.189,185.217 270.421,185.203 270.655,185.19 270.891,185.18 271.127,185.171 271.365,185.164 271.604,185.159 271.845,185.156 272.087,185.156 272.33,185.157 272.574,185.16 272.819,185.165 273.066,185.172 273.313,185.181 273.562,185.192 273.811,185.206 274.061,185.221 274.312,185.238 274.563,185.258 274.815,185.279 275.068,185.303 275.321,185.329 275.575,185.356 275.829,185.387 276.083,185.418 276.338,185.453 276.594,185.489 276.849,185.528 277.104,185.568 277.36,185.611 277.616,185.656 277.872,185.704 278.127,185.753 278.382,185.805 278.638,185.858 278.893,185.914 279.147,185.972 279.401,186.033 279.655,186.095 279.908,186.16 280.161,186.227 280.414,186.296 280.665,186.367 280.916,186.44 281.166,186.516 281.415,186.594 281.663,186.674 281.91,186.756 282.156,186.84 282.401,186.927 282.646,187.016 282.888,187.107 283.129,187.2 283.37,187.295 283.608,187.393 283.846,187.492 284.082,187.594 284.316,187.698 284.548,187.804 284.779,187.912 285.008,188.022 285.236,188.135 285.461,188.25 285.685,188.366 285.907,188.485 286.126,188.606 286.344,188.729 286.559,188.854 286.772,188.981 286.983,189.11 287.191,189.241 287.398,189.375 287.602,189.51 287.803,189.647 288.001,189.786 288.197,189.927 288.391,190.07 288.581,190.216 288.769,190.363 288.954,190.512 289.136,190.663 289.315,190.815 289.491,190.97 289.665,191.126 289.834,191.285 290.001,191.445 290.165,191.607 290.325,191.771 290.482,191.936 290.636,192.104 290.786,192.272 290.933,192.443 291.076,192.616 291.215,192.79 291.352,192.966 291.484,193.143 291.612,193.322 291.737,193.503 291.858,193.685 291.975,193.869 292.088,194.054 292.197,194.241 292.302,194.429 292.403,194.619 292.5,194.811 292.593,195.003 292.682,195.197 292.766,195.393 292.846,195.589 292.922,195.787 292.993,195.987 293.06,196.188 293.122,196.389 293.18,196.592 293.233,196.796 293.282,197.002 293.327,197.208 293.366,197.416 293.401,197.625 293.431,197.835 293.456,198.045 293.477,198.257 293.492,198.47 293.503,198.684 293.509,198.898 293.509,199.114 293.505,199.331 293.496,199.547 293.482,199.766 293.463,199.984 293.438,200.204 293.409,200.424 293.374,200.645 293.334,200.866 293.289,201.088 293.239,201.311 293.183,201.534 293.122,201.757 293.056,201.981 292.984,202.206 292.907,202.431 292.825,202.656 292.737,202.882 292.644,203.107 292.545,203.334 292.441,203.56 292.331,203.787 292.216,204.014 292.095,204.241 291.969,204.467 291.837,204.694 291.699,204.921 291.556,205.148 291.408,205.375 291.253,205.603 291.093,205.83 290.928,206.056 290.756,206.283 290.58,206.509 290.397,206.735 290.208,206.96 290.015,207.186 289.815,207.411 289.61,207.635 289.399,207.859 289.182,208.083 288.959,208.306 288.731,208.529 288.498,208.751 288.258,208.972 288.013,209.193 287.762,209.413 287.505,209.632 287.243,209.851 286.975,210.068 286.701,210.285 286.421,210.5 286.136,210.716 285.846,210.93 285.549,211.143 285.247,211.354 284.939,211.565 284.626,211.775 284.307,211.984 283.982,212.191 283.652,212.397 283.316,212.603 282.975,212.806 282.628,213.008 282.276,213.209 281.918,213.409 281.555,213.607 281.186,213.803 280.812,213.999 280.432,214.192 280.047,214.384 279.656,214.574 279.261,214.763 278.859,214.95 278.453,215.135 278.042,215.318 277.625,215.5 277.202,215.679 276.775,215.857 276.342,216.033 275.905,216.207 275.462,216.378 275.015,216.548 274.562,216.716 274.104,216.882 273.641,217.045 273.173,217.207 272.701,217.366 272.224,217.523 271.742,217.678 271.255,217.83 270.763,217.98 270.267,218.128 269.766,218.273 269.26,218.416 268.75,218.556 268.236,218.694 267.717,218.829 267.193,218.962 266.666,219.092 266.133,219.22 265.597,219.344 265.057,219.466 264.512,219.586 263.963,219.702 263.41,219.816 262.853,219.927 262.292,220.035 261.728,220.14 261.159,220.243 260.586,220.342 260.011,220.438 259.431,220.532 258.847,220.622 258.26,220.709 257.67,220.793 257.076,220.875 256.479,220.953 255.878,221.027 255.274,221.099 254.667,221.167 254.058,221.232 253.444,221.294 252.828,221.353 252.209,221.408 251.587,221.46 250.962,221.508 250.335,221.553 249.705,221.595 249.072,221.633 248.437,221.668 247.8,221.699 247.16,221.727 246.517,221.751 245.873,221.772 245.226,221.789 244.577,221.803 243.927,221.812 243.274,221.819 242.619,221.822 241.963,221.821 241.305,221.816 240.646,221.808 239.984,221.795 239.321,221.779 238.657,221.76 237.992,221.736 237.325,221.709 236.657,221.678 235.988,221.644 235.318,221.604 234.648,221.562 233.976,221.516 233.304,221.466 232.631,221.412 231.957,221.354 231.283,221.292 230.608,221.226 229.933,221.156 229.258,221.082 228.583,221.004 227.907,220.923 227.232,220.837 226.557,220.748 225.881,220.654 225.207,220.557 224.532,220.455 223.858,220.35 223.184,220.24 222.511,220.126 221.839,220.009 221.167,219.887 220.497,219.762 219.827,219.632 219.158,219.499 218.491,219.361 217.824,219.219 217.159,219.073 216.496,218.923 215.833,218.77 215.173,218.612 214.514,218.45 213.857,218.284 213.202,218.114 212.548,217.94 211.897,217.762 211.248,217.58 210.601,217.394 209.957,217.204 209.314,217.009 208.674,216.811 208.037,216.609 207.403,216.403 206.771,216.193 206.142,215.979 205.516,215.761 204.893,215.539 204.273,215.313 203.656,215.083 203.042,214.849 202.433,214.612 201.826,214.37 201.223,214.125 200.624,213.875 200.028,213.622 199.436,213.365 198.848,213.104 198.265,212.839 197.685,212.571 197.109,212.298 196.538,212.022 195.971,211.743 195.408,211.459 194.85,211.172 194.297,210.881 193.748,210.586 193.204,210.288 192.665,209.986 192.131,209.68 191.602,209.371 191.079,209.058 190.56,208.742 190.046,208.422 189.539,208.099 189.036,207.771 188.539,207.441 188.048,207.107 187.562,206.771 187.083,206.43 186.609,206.086 186.141,205.739 185.679,205.388 185.224,205.034 184.774,204.677 184.331,204.317 183.894,203.954 183.464,203.587 183.04,203.217 182.623,202.844 182.212,202.469 181.809,202.09 181.412,201.708 181.021,201.323 180.639,200.935 180.263,200.544 179.894,200.151 179.532,199.754 179.178,199.355 178.831,198.953 178.491,198.549 178.159,198.141 177.834,197.731 177.518,197.319 177.208,196.904 176.907,196.486 176.613,196.066 176.328,195.643 176.05,195.218 175.78,194.791 175.519,194.361 175.265,193.929 175.02,193.495 174.783,193.058 174.554,192.62 174.334,192.179 174.122,191.736 173.919,191.291 173.724,190.844 173.538,190.396 173.361,189.945 173.192,189.492 173.032,189.038 172.881,188.582 172.739,188.124 172.605,187.665 172.481,187.204 172.366,186.741 172.26,186.276 172.163,185.811 172.076,185.344 171.997,184.875 171.928,184.405 171.868,183.934 171.817,183.462 171.776,182.988 171.745,182.514 171.722,182.038 171.709,181.561 171.707,181.083 171.713,180.605 171.729,180.125 171.755,179.645 171.79,179.164 171.835,178.682 171.891,178.199 171.955,177.716 172.03,177.232 172.114,176.749 172.208,176.264 172.312,175.779 172.427,175.293 172.551,174.808 172.685,174.322 172.829,173.836 172.983,173.35 173.147,172.863 173.321,172.377 173.506,171.891 173.7,171.405 173.904,170.919 174.119,170.433 174.344,169.947 174.578,169.462 174.823,168.978 175.078,168.493 175.344,168.009 175.619,167.526 175.905,167.043 176.2,166.562 176.506,166.08 176.822,165.6 177.149,165.12 177.485,164.641 177.832,164.164 178.189,163.687 178.556,163.211 178.933,162.736 179.32,162.263 179.718,161.791 180.125,161.32 180.543,160.851 180.971,160.382 181.409,159.916 181.857,159.451 182.315,158.987 182.783,158.526 183.262,158.065 183.75,157.607 184.248,157.151 184.756,156.696 185.275,156.244 185.803,155.793 186.341,155.344 186.889,154.898 187.446,154.454 188.014,154.012 188.591,153.572 189.179,153.134 189.775,152.699 190.382,152.267 190.999,151.836 191.624,151.409 192.26,150.984 192.905,150.562 193.559,150.143 194.223,149.726 194.896,149.312 195.579,148.902 196.271,148.494 196.973,148.089 197.683,147.687 198.403,147.289 199.132,146.893 199.87,146.501 200.617,146.112 201.373,145.727 202.138,145.345 202.912,144.966 203.694,144.591 204.486,144.219 205.286,143.852 206.095,143.487 206.912,143.127 207.738,142.77 208.572,142.417 209.415,142.068 210.266,141.723 211.125,141.382 211.992,141.045 212.868,140.712 213.751,140.383 214.643,140.059 215.542,139.739 216.449,139.423 217.364,139.111 218.287,138.804 219.217,138.501 220.154,138.203 221.099,137.909 222.052,137.62 223.011,137.335 223.979,137.055 224.952,136.78 225.933,136.509 226.921,136.244 227.916,135.983 228.917,135.727 229.925,135.477 230.94,135.23 231.961,134.99 232.988,134.754 234.022,134.523 235.062,134.297 236.108,134.077 237.16,133.862 238.218,133.652 239.282,133.448 240.352,133.249 241.427,133.055 242.507,132.867 243.593,132.684 244.685,132.507 245.781,132.335 246.882,132.169 247.989,132.008 249.1,131.854 250.216,131.705 251.337,131.561 252.462,131.423 253.592,131.292 254.727,131.166 255.865,131.045 257.007,130.931 258.154,130.822 259.304,130.72 260.458,130.624 261.616,130.533 262.777,130.448 263.941,130.37 265.109,130.298 266.28,130.231 267.455,130.171 268.632,130.118 269.812,130.07 270.994,130.028 272.179,129.993 273.367,129.964 274.557,129.941 275.749,129.925 276.943,129.915 278.139,129.912 279.337,129.914 280.537,129.923 281.738,129.938 282.941,129.96 284.145,129.989 285.35,130.023 286.557,130.064 287.764,130.112 288.972,130.167 290.181,130.227 291.39,130.294 292.6,130.368 293.81,130.448 295.02,130.535 296.23,130.628 297.44,130.728 298.65,130.834 299.859,130.948 301.068,131.067 302.276,131.194 303.484,131.327 304.69,131.466 305.896,131.612 307.101,131.765 308.304,131.924 309.505,132.09 310.705,132.263 311.904,132.442 313.1,132.628 314.294,132.82 315.487,133.019 316.677,133.225 317.865,133.437 319.05,133.656 320.232,133.881 321.412,134.113 322.589,134.352 323.763,134.597 324.933,134.849 326.1,135.107 327.264,135.373 328.424,135.644 329.58,135.922 330.732,136.207 331.881,136.498 333.025,136.795 334.165,137.099 335.301,137.409 336.432,137.727 337.558,138.05 338.679,138.379 339.795,138.716 340.907,139.058 342.013,139.407 343.113,139.762 344.208,140.124 345.298,140.492 346.382,140.866 347.459,141.246 348.531,141.633 349.597,142.026 350.656,142.425 351.709,142.83 352.755,143.241 353.794,143.659 354.827,144.082 355.853,144.511 356.872,144.947 357.883,145.388 358.887,145.836 359.884,146.289 360.873,146.748 361.854,147.213 362.827,147.684 363.792,148.161 364.75,148.643 365.699,149.131 366.64,149.625 367.572,150.125 368.496,150.629 369.41,151.14 370.316,151.656 371.213,152.177 372.101,152.705 372.98,153.237 373.849,153.774 374.709,154.317 375.56,154.866 376.4,155.419 377.231,155.978 378.052,156.542 378.863,157.11 379.664,157.684 380.454,158.263 381.234,158.847 382.004,159.435 382.763,160.029 383.511,160.627 384.249,161.229 384.975,161.837 385.691,162.45 386.395,163.066 387.088,163.688 387.771,164.313 388.441,164.943 389.1,165.578 389.747,166.217 390.382,166.86 391.006,167.507 391.618,168.158 392.218,168.813 392.805,169.473 393.38,170.136 393.943,170.803 394.494,171.474 395.032,172.149 395.558,172.827 396.071,173.509 396.571,174.195 397.058,174.884 397.533,175.576 397.994,176.272 398.442,176.971 398.877,177.674 399.299,178.379 399.707,179.088 400.102,179.799 400.484,180.514 400.852,181.231 401.206,181.952 401.547,182.675 401.874,183.401 402.187,184.129 402.485,184.86 402.771,185.593 403.042,186.329 403.298,187.067 403.542,187.808 403.77,188.55 403.984,189.295 404.184,190.042 404.369,190.79 404.54,191.541 404.697,192.293 404.838,193.047 404.966,193.803 405.078,194.56 405.176,195.319 405.259,196.079 405.327,196.84 405.38,197.603 405.419,198.367 405.442,199.132 405.451,199.898 405.444,200.666 405.423,201.434 405.386,202.202 405.334,202.972 405.268,203.742 405.186,204.512 405.088,205.284 404.976,206.055 404.848,206.827 404.705,207.599 404.546,208.371 404.373,209.143 404.184,209.916 403.979,210.688 403.76,211.459 403.524,212.231 403.274,213.003 403.008,213.773 402.727,214.544 402.43,215.314 402.117,216.083 401.79,216.852 401.446,217.619 401.088,218.386 400.714,219.151 400.324,219.916 399.919,220.679 399.499,221.441 399.063,222.202 398.612,222.961 398.146,223.719 397.664,224.475 397.167,225.229 396.654,225.982 396.125,226.733 395.583,227.482 395.024,228.229 394.45,228.974 393.861,229.717 393.257,230.457 392.637,231.195 392.002,231.931 391.353,232.664 390.688,233.395 390.008,234.122 389.313,234.847 388.604,235.569 387.878,236.289 387.139,237.005 386.384,237.718 385.615,238.428 384.831,239.135 384.032,239.838 383.218,240.538 382.39,241.234 381.548,241.927 380.69,242.616 379.819,243.302 378.933,243.983 378.033,244.661 377.118,245.334 376.189,246.004 375.247,246.669 374.29,247.331 373.319,247.987 372.334,248.64 371.335,249.288 370.323,249.931 369.297,250.57 368.257,251.204 367.204,251.833 366.137,252.458 365.057,253.077 363.963,253.691 362.857,254.301 361.737,254.905 360.604,255.504 359.458,256.098 358.3,256.686 357.129,257.269 355.945,257.846 354.749,258.417 353.54,258.983 352.318,259.544 351.084,260.098 349.838,260.646 348.581,261.189 347.311,261.726 346.029,262.256 344.736,262.78 343.431,263.298 342.114,263.809 340.787,264.314 339.447,264.813 338.097,265.305 336.735,265.791 335.363,266.27 333.98,266.742 332.586,267.208 331.182,267.666 329.767,268.118 328.341,268.562 326.906,269 325.461,269.431 324.005,269.854 322.54,270.271 321.065,270.68 319.581,271.081 318.087,271.475 316.584,271.862 315.072,272.241 313.551,272.613 312.021,272.977 310.482,273.333 308.935,273.682 307.379,274.023 305.815,274.356 304.244,274.682 302.664,274.999 301.076,275.308 299.48,275.609 297.877,275.902 296.267,276.188 294.649,276.464 293.025,276.733 291.393,276.993 289.755,277.246 288.11,277.489 286.458,277.725 284.801,277.951 283.137,278.169 281.467,278.379 279.792,278.581 278.111,278.773 276.424,278.958 274.732,279.133 273.035,279.299 271.333,279.457 269.626,279.606 267.915,279.747 266.199,279.878 264.479,280 262.755,280.114 261.027,280.219 259.295,280.314 257.559,280.401 255.82,280.479 254.078,280.547 252.333,280.606 250.584,280.657 248.833,280.698 247.08,280.73 245.324,280.753 243.566,280.767 241.806,280.771 240.044,280.767 238.281,280.752 236.516,280.729 234.75,280.696 232.982,280.654 231.214,280.603 229.445,280.542 227.675,280.473 225.905,280.393 224.135,280.304 222.365,280.207 220.595,280.099 218.825,279.982 217.056,279.855 215.288,279.72 213.521,279.575 211.754,279.42 209.99,279.256 208.226,279.083 206.464,278.9 204.705,278.708 202.947,278.506 201.191,278.294 199.438,278.074 197.688,277.844 195.94,277.604 194.195,277.355 192.454,277.098 190.715,276.83 188.98,276.553 187.25,276.267 185.523,275.971 183.8,275.666 182.082,275.351 180.367,275.027 178.658,274.694 176.954,274.352 175.254,274 173.56,273.64 171.871,273.27 170.188,272.89 168.511,272.501 166.839,272.104 165.174,271.697 163.516,271.281 161.863,270.856 160.218,270.421"/>
+<polyline fill="none" stroke="#007f00" stroke-width="0.5" points="260.1,190.5 260.103,190.357 260.111,190.214 260.125,190.071 260.144,189.929 260.169,189.787 260.199,189.646 260.235,189.504 260.276,189.364 260.323,189.225 260.375,189.086 260.433,188.948 260.497,188.812 260.565,188.676 260.639,188.542 260.719,188.409 260.803,188.277 260.894,188.147 260.989,188.019 261.09,187.893 261.196,187.768 261.308,187.645 261.425,187.524 261.547,187.405 261.674,187.288 261.807,187.173 261.944,187.062 262.087,186.952 262.235,186.844 262.388,186.739 262.546,186.637 262.709,186.538 262.877,186.441 263.051,186.348 263.229,186.257 263.412,186.17 263.6,186.085 263.792,186.004 263.989,185.926 264.191,185.852 264.398,185.78 264.609,185.713 264.826,185.648 265.046,185.588 265.271,185.531 265.501,185.478 265.735,185.429 265.973,185.384 266.216,185.342 266.463,185.305 266.714,185.271 266.97,185.242 267.229,185.217 267.493,185.196 267.761,185.18 268.032,185.167 268.308,185.159 268.587,185.156 268.87,185.157 269.157,185.162 269.448,185.172 269.742,185.187 270.04,185.206 270.341,185.229 270.646,185.258 270.954,185.291 271.265,185.329 271.58,185.371 271.897,185.418 272.218,185.471 272.542,185.528 272.869,185.59 273.199,185.656 273.531,185.728 273.867,185.805 274.205,185.886 274.545,185.972 274.889,186.063 275.234,186.16 275.583,186.261 275.933,186.367 276.286,186.478 276.641,186.594 276.998,186.715 277.356,186.84 277.717,186.971 278.08,187.107 278.445,187.247 278.812,187.393 279.179,187.543 279.549,187.698 279.92,187.858 280.292,188.022 280.666,188.192 281.041,188.366 281.417,188.545 281.794,188.729 282.172,188.917 282.552,189.11 282.932,189.308 283.312,189.51 283.693,189.716 284.075,189.927 284.458,190.143 284.84,190.363 285.224,190.587 285.607,190.815 285.99,191.048 286.374,191.285 286.757,191.526 287.14,191.771 287.523,192.02 287.906,192.272 288.289,192.529 288.67,192.79 289.052,193.054 289.433,193.322 289.812,193.594 290.192,193.869 290.57,194.147 290.947,194.429 291.323,194.715 291.698,195.003 292.072,195.294 292.444,195.589 292.815,195.887 293.185,196.188 293.552,196.491 293.918,196.796 294.282,197.105 294.644,197.416 295.004,197.73 295.363,198.045 295.719,198.364 296.072,198.684 296.424,199.006 296.772,199.331 297.119,199.656 297.463,199.984 297.804,200.313 298.142,200.645 298.478,200.977 298.81,201.311 299.139,201.646 299.466,201.981 299.789,202.318 300.108,202.656 300.425,202.995 300.737,203.334 301.046,203.673 301.352,204.014 301.654,204.354 301.952,204.694 302.246,205.035 302.536,205.375 302.822,205.716 303.104,206.056 303.381,206.396 303.654,206.735 303.923,207.073 304.187,207.411 304.447,207.748 304.702,208.083 304.952,208.417 305.197,208.751 305.438,209.083 305.673,209.413 305.904,209.741 306.129,210.068 306.349,210.393 306.564,210.716 306.773,211.036 306.977,211.354 307.176,211.67 307.368,211.984 307.556,212.294 307.737,212.603 307.913,212.907 308.082,213.209 308.246,213.508 308.403,213.803 308.555,214.095 308.701,214.384 308.84,214.668 308.973,214.95 309.099,215.227 309.219,215.5 309.333,215.769 309.439,216.033 309.54,216.293 309.633,216.548 309.72,216.799 309.8,217.045 309.874,217.287 309.939,217.523 309.999,217.754 310.051,217.98 310.096,218.201 310.134,218.416 310.165,218.625 310.188,218.829 310.204,219.027 310.213,219.22 310.214,219.406 310.208,219.586 310.194,219.76 310.173,219.927 310.144,220.088 310.107,220.243 310.063,220.391 310.011,220.532 309.952,220.666 309.884,220.793 309.808,220.914 309.725,221.027 309.633,221.134 309.534,221.232 309.426,221.324 309.311,221.408 309.187,221.484 309.056,221.553 308.916,221.615 308.768,221.668 308.611,221.714 308.447,221.751 308.273,221.781 308.092,221.803 307.903,221.816 307.705,221.822 307.499,221.819 307.284,221.808 307.062,221.788 306.83,221.76 306.59,221.723 306.342,221.678 306.084,221.625 305.819,221.562 305.545,221.491 305.263,221.412 304.972,221.323 304.673,221.226 304.365,221.12 304.048,221.004 303.723,220.881 303.39,220.748 303.047,220.606 302.696,220.455 302.337,220.295 301.969,220.126 301.593,219.949 301.208,219.762 300.814,219.566 300.412,219.361 300.001,219.146 299.582,218.923 299.155,218.691 298.718,218.45 298.274,218.199 297.821,217.94 297.359,217.671 296.889,217.394 296.411,217.107 295.924,216.811 295.428,216.506 294.925,216.193 294.413,215.871 293.893,215.539 293.364,215.199 292.827,214.849 292.282,214.491 291.729,214.125 291.167,213.749 290.598,213.365 290.021,212.972 289.435,212.571 288.841,212.161 288.239,211.743 287.63,211.316 287.012,210.881 286.387,210.437 285.753,209.986 285.112,209.526 284.464,209.058 283.807,208.582 283.143,208.099 282.472,207.607 281.792,207.107 281.106,206.601 280.412,206.086 279.71,205.564 279.001,205.034 278.286,204.498 277.562,203.954 276.832,203.402 276.095,202.844 275.35,202.279 274.599,201.708 273.84,201.129 273.075,200.544 272.304,199.953 271.525,199.355 270.74,198.751 269.948,198.141 269.15,197.525 268.346,196.904 267.535,196.276 266.718,195.643 265.895,195.005 265.065,194.361 264.23,193.712 263.389,193.058 262.542,192.399 261.688,191.736 260.83,191.068 259.966,190.396 259.096,189.719 258.221,189.038 257.341,188.353 256.455,187.665 255.564,186.972 254.668,186.276 253.768,185.578 252.862,184.875 251.952,184.17 251.036,183.462 250.117,182.751 249.192,182.038 248.264,181.322 247.331,180.605 246.394,179.885 245.453,179.164 244.508,178.441 243.559,177.716 242.606,176.991 241.649,176.264 240.689,175.536 239.726,174.808 238.759,174.079 237.789,173.35 236.816,172.62 235.84,171.891 234.861,171.162 233.879,170.433 232.895,169.705 231.907,168.978 230.918,168.251 229.926,167.526 228.932,166.802 227.936,166.08 226.938,165.36 225.938,164.641 224.936,163.925 223.933,163.211 222.928,162.5 221.922,161.791 220.914,161.085 219.906,160.382 218.896,159.683 217.886,158.987 216.875,158.295 215.862,157.607 214.85,156.923 213.837,156.244 212.824,155.568 211.811,154.898 210.798,154.232 209.785,153.572 208.772,152.917 207.76,152.267 206.748,151.623 205.737,150.984 204.726,150.352 203.717,149.726 202.708,149.106 201.701,148.494 200.695,147.888 199.69,147.289 198.688,146.697 197.686,146.112 196.687,145.535 195.689,144.966 194.694,144.405 193.701,143.852 192.709,143.307 191.721,142.77 190.736,142.242 189.753,141.723 188.773,141.213 187.796,140.712 186.822,140.221 185.852,139.739 184.885,139.266 183.921,138.804 182.961,138.351 182.006,137.909 181.054,137.477 180.106,137.055 179.163,136.644 178.224,136.244 177.289,135.854 176.359,135.477 175.434,135.109 174.514,134.754 173.599,134.41 172.689,134.077 171.785,133.757 170.886,133.448 169.992,133.151 169.104,132.867 168.223,132.595 167.347,132.335 166.477,132.088 165.614,131.854 164.756,131.632 163.906,131.423 163.062,131.228 162.225,131.045 161.395,130.876 160.572,130.72 159.756,130.578 158.948,130.448 158.147,130.333 157.354,130.231 156.567,130.144 155.79,130.07 155.02,130.01 154.258,129.964 153.504,129.933 152.759,129.915 152.022,129.912 151.294,129.923 150.574,129.949 149.863,129.989 149.162,130.043 148.469,130.112 147.786,130.196 147.111,130.294 146.447,130.407 145.792,130.535 145.146,130.677 144.51,130.834 143.884,131.007 143.269,131.194 142.663,131.396 142.067,131.612 141.482,131.844 140.908,132.09 140.344,132.352 139.791,132.628 139.249,132.919 138.717,133.225 138.196,133.546 137.687,133.881 137.189,134.232 136.702,134.597 136.227,134.978 135.763,135.373 135.311,135.782 134.87,136.207 134.442,136.646 134.025,137.099 133.621,137.567 133.228,138.05 132.848,138.547 132.48,139.058 132.125,139.584 131.781,140.124 131.451,140.678 131.133,141.246 130.828,141.829 130.536,142.425 130.257,143.035 129.991,143.659 129.738,144.296 129.498,144.947 129.271,145.611 129.058,146.289 128.858,146.98 128.672,147.684 128.5,148.401 128.34,149.131 128.195,149.874 128.063,150.629 127.946,151.397 127.842,152.177 127.752,152.97 127.676,153.774 127.614,154.591 127.567,155.419 127.533,156.259 127.514,157.11 127.51,157.973 127.52,158.847 127.543,159.731 127.582,160.627 127.635,161.533 127.703,162.45 127.786,163.376 127.883,164.313 127.995,165.26 128.121,166.217 128.263,167.183 128.419,168.158 128.59,169.143 128.776,170.136 128.978,171.138 129.193,172.149 129.425,173.168 129.671,174.195 129.932,175.229 130.208,176.272 130.5,177.322 130.807,178.379 131.128,179.443 131.465,180.514 131.817,181.591 132.185,182.675 132.567,183.765 132.965,184.86 133.378,185.961 133.807,187.067 134.25,188.179 134.709,189.295 135.184,190.416 135.673,191.541 136.178,192.67 136.698,193.803 137.233,194.939 137.784,196.079 138.35,197.222 138.93,198.367 139.527,199.515 140.138,200.666 140.765,201.818 141.407,202.972 142.063,204.127 142.736,205.284 143.423,206.441 144.125,207.599 144.842,208.757 145.575,209.916 146.322,211.074 147.084,212.231 147.862,213.388 148.654,214.544 149.461,215.699 150.283,216.852 151.12,218.002 151.971,219.151 152.837,220.297 153.718,221.441 154.613,222.582 155.523,223.719 156.448,224.853 157.386,225.982 158.339,227.108 159.307,228.229 160.289,229.346 161.285,230.457 162.294,231.563 163.319,232.664 164.357,233.759 165.409,234.847 166.475,235.929 167.555,237.005 168.648,238.073 169.755,239.135 170.875,240.188 172.01,241.234 173.157,242.272 174.318,243.302 175.492,244.322 176.679,245.334 177.879,246.337 179.092,247.331 180.318,248.314 181.557,249.288 182.808,250.251 184.072,251.204 185.348,252.146 186.637,253.077 187.938,253.997 189.251,254.905 190.577,255.802 191.914,256.686 193.263,257.558 194.624,258.417 195.996,259.264 197.38,260.098 198.775,260.918 200.182,261.726 201.599,262.519 203.028,263.298 204.467,264.062 205.917,264.813 207.378,265.549 208.85,266.27 210.332,266.976 211.824,267.666 213.326,268.341 214.838,269 216.36,269.644 217.892,270.271 219.433,270.881 220.983,271.475 222.543,272.053 224.112,272.613 225.69,273.156 227.277,273.682 228.873,274.191 230.478,274.682 232.09,275.154 233.711,275.609 235.34,276.046 236.977,276.464 238.621,276.864 240.273,277.246 241.933,277.608 243.601,277.951 245.274,278.275 246.956,278.581 248.644,278.867 250.338,279.133 252.04,279.379 253.747,279.606 255.461,279.813 257.18,280 258.906,280.167 260.637,280.314 262.374,280.441 264.115,280.547 265.862,280.633 267.614,280.698 269.371,280.743 271.132,280.767 272.897,280.77 274.667,280.752 276.441,280.714 278.219,280.654 280,280.574 281.785,280.473 283.573,280.35 285.365,280.207 287.159,280.042 288.956,279.855 290.755,279.648 292.558,279.42 294.361,279.17 296.167,278.9 297.976,278.608 299.785,278.294 301.596,277.96 303.408,277.604 305.221,277.228 307.035,276.83 308.85,276.411 310.665,275.971 312.479,275.51 314.295,275.027 316.11,274.524 317.925,274 319.739,273.456 321.552,272.89 323.365,272.304 325.176,271.697 326.986,271.069 328.794,270.421 330.601,269.753 332.405,269.065 334.208,268.356 336.008,267.627 337.805,266.879 339.6,266.11 341.392,265.322 343.18,264.515 344.965,263.688 346.747,262.841 348.525,261.976 350.299,261.091 352.068,260.188 353.833,259.266 355.594,258.325 357.35,257.366 359.101,256.388 360.846,255.393 362.586,254.38 364.32,253.349 366.049,252.301 367.771,251.235 369.488,250.153 371.198,249.053 372.901,247.937 374.597,246.805 376.287,245.656 377.969,244.491 379.643,243.31 381.31,242.114 382.969,240.903 384.62,239.676 386.263,238.435 387.897,237.179 389.522,235.909 391.139,234.625 392.747,233.326 394.345,232.015 395.934,230.69 397.513,229.352 399.083,228.001 400.642,226.638 402.191,225.263 403.729,223.876 405.257,222.477 406.774,221.067 408.281,219.646 409.775,218.214 411.259,216.772 412.731,215.32 414.191,213.858 415.639,212.387 417.075,210.907 418.499,209.417 419.91,207.92 421.308,206.414 422.693,204.9 424.065,203.379 425.424,201.851 426.77,200.315 428.102,198.773 429.42,197.226 430.724,195.672 432.014,194.113 433.289,192.549 434.55,190.98 435.796,189.406 437.028,187.829 438.244,186.248 439.445,184.664 440.631,183.076 441.801,181.486 442.956,179.894 444.094,178.299 445.217,176.704 446.323,175.107 447.413,173.509 448.486,171.912 449.543,170.313 450.583,168.716 451.605,167.119 452.611,165.523 453.6,163.928 454.57,162.335 455.523,160.745 456.459,159.157 457.377,157.572 458.276,155.991 459.158,154.413 460.021,152.839 460.865,151.27 461.691,149.706 462.499,148.146 463.287,146.593 464.056,145.045 464.806,143.503 465.537,141.969 466.249,140.441 466.941,138.921 467.613,137.409 468.266,135.905 468.898,134.41 469.511,132.923 470.104,131.446 470.676,129.979 471.228,128.521 471.759,127.074 472.27,125.638 472.76,124.213 473.23,122.799 473.678,121.398 474.106,120.008 474.513,118.631 474.898,117.268 475.262,115.917 475.604,114.58 475.926,113.256 476.226,111.948 476.504,110.653 476.76,109.375 476.995,108.11 477.208,106.862 477.398,105.63 477.567,104.414 477.714,103.215 477.838,102.032 477.941,100.867 478.021,99.7197 478.079,98.5898 478.114,97.4785 478.126,96.3853 478.117,95.311 478.084,94.2563 478.03,93.2207 477.952,92.2046 477.852,91.2085 477.729,90.2324 477.583,89.2773 477.414,88.3428 477.222,87.4292 477.007,86.5371 476.77,85.6665 476.509,84.8174 476.226,83.9907 475.919,83.1865 475.589,82.4048 475.237,81.6455 474.861,80.9097 474.462,80.1968 474.04,79.5078 473.594,78.8423 473.126,78.2007 472.634,77.583 472.12,76.9897 471.582,76.4209 471.021,75.877 470.437,75.3579 469.829,74.8638 469.198,74.395 468.545,73.9517 467.868,73.5337 467.168,73.1416 466.445,72.7754 465.7,72.4351 464.931,72.1211 464.139,71.8335 463.324,71.5723 462.486,71.3374 461.625,71.1294 460.741,70.9482 459.835,70.7939 458.906,70.6665 457.954,70.5664 456.979,70.4932 455.982,70.4473 454.962,70.4287 453.92,70.438 452.855,70.4741 451.768,70.5381 450.658,70.6294 449.526,70.7485 448.373,70.895 447.196,71.0693 445.998,71.2715 444.778,71.5015 443.536,71.7588 442.271,72.0439 440.986,72.3569 439.679,72.6978 438.35,73.0659 436.999,73.4624 435.627,73.8857 434.234,74.3374 432.82,74.8164 431.385,75.3228 429.928,75.8569 428.451,76.418 426.953,77.0068 425.435,77.623 423.895,78.2661 422.335,78.9365 420.756,79.6338 419.156,80.3584 417.536,81.1094 415.896,81.8872 414.235,82.6919 412.556,83.5229 410.856,84.3799 409.138,85.2632 407.4,86.1729 405.643,87.1084 403.867,88.0693 402.072,89.0562 400.259,90.0684 398.427,91.1055 396.577,92.168 394.708,93.2554 392.821,94.3672 390.917,95.5034 388.994,96.6641 387.054,97.8486 385.096,99.0571 383.122,100.29 381.129,101.545 379.121,102.823 377.095,104.125 375.053,105.449 372.995,106.795 370.92,108.164 368.829,109.554 366.722,110.966 364.6,112.4 362.462,113.854 360.309,115.329 358.141,116.825 355.958,118.34 353.76,119.875 351.548,121.431 349.321,123.005 347.081,124.598 344.826,126.209 342.558,127.839 340.276,129.487 337.981,131.152 335.673,132.835 333.353,134.534 331.02,136.25 328.673,137.982 326.315,139.729 323.945,141.493 321.564,143.271 319.17,145.064 316.766,146.871 314.351,148.692 311.924,150.526 309.487,152.374 307.04,154.234 304.582,156.107 302.115,157.991 299.638,159.887 297.151,161.794 294.656,163.712 292.151,165.64 289.638,167.578 287.116,169.525 284.586,171.481 282.048,173.446 279.503,175.419 276.95,177.399 274.39,179.387 271.823,181.381 269.249,183.382 266.669,185.389 264.083,187.401 261.49,189.418 258.892,191.44 256.289,193.466 253.68,195.495 251.067,197.528 248.449,199.563 245.827,201.601 243.2,203.64 240.57,205.681 237.936,207.722 235.299,209.764 232.659,211.806 230.016,213.847 227.371,215.887 224.723,217.925 222.074,219.962 219.423,221.996 216.771,224.028 214.117,226.056 211.462,228.08 208.808,230.099 206.152,232.114 203.498,234.124 200.842,236.127 198.188,238.125 195.535,240.116 192.882,242.1 190.231,244.076 187.582,246.044 184.935,248.003 182.29,249.954 179.647,251.894 177.007,253.825 174.37,255.745 171.737,257.655 169.107,259.553 166.481,261.439 163.86,263.313 161.243,265.174 158.63,267.022 156.023,268.856 153.421,270.677 150.825,272.482 148.234,274.273 145.65,276.048 143.072,277.808 140.501,279.55 137.937,281.277 135.38,282.986 132.831,284.678 130.29,286.351 127.757,288.006 125.232,289.642 122.716,291.259 120.209,292.856 117.711,294.434 115.223,295.99 112.745,297.526 110.276,299.041"/>
+<polyline fill="none" stroke="#000000" stroke-width="0.5" points="127.995,165.26 127.995,165.261"/>
+<polygon fill="#ffffee" points="124,161 124,169 132,169"/>
+<polygon fill="#ffffee" points="124,161 132,169 132,161"/>
+<polyline fill="none" stroke="#007f00" stroke-width="0.5" points="124,161 124,169 132,169 132,161 124,161"/>
+<polygon fill="#ffffee" points="124,161 124,169 132,169"/>
+<polygon fill="#ffffee" points="124,161 132,169 132,161"/>
+<polyline fill="none" stroke="#007f00" stroke-width="0.5" points="124,161 124,169 132,169 132,161 124,161"/>
+<polyline fill="none" stroke="#000000" stroke-width="0.5" points="362.462,113.854 362.461,113.855"/>
+<polygon fill="#ffffee" points="358,110 358,118 366,118"/>
+<polygon fill="#ffffee" points="358,110 366,118 366,110"/>
+<polyline fill="none" stroke="#007f00" stroke-width="0.5" points="358,110 358,118 366,118 366,110 358,110"/>
+<polygon fill="#ffffee" points="358,110 358,118 366,118"/>
+<polygon fill="#ffffee" points="358,110 366,118 366,110"/>
+<polyline fill="none" stroke="#007f00" stroke-width="0.5" points="358,110 358,118 366,118 366,110 358,110"/>
+<polygon fill="#0000ff" points="381.317,161.987 389.101,165.579 385.447,157.824"/>
+<polyline fill="none" stroke="#0000ff" stroke-width="0.5" points="389.1,165.578 389.101,165.579"/>
+<polygon fill="#ffffee" points="131.5,137.5 131.5,161.5 169.5,161.5"/>
+<polygon fill="#ffffee" points="131.5,137.5 169.5,161.5 169.5,137.5"/>
+<polyline fill="none" stroke="#bebebe" stroke-width="0.5" points="131.5,137.5 131.5,161.5 169.5,161.5 169.5,137.5 131.5,137.5"/>
+<text fill="#000000" style="stroke:none" x="132" y="147" transform="rotate(0, 132, 147)" font-size="10" font-family="SansSerif" font-style="normal" font-weight="normal">curve</text>
+<text fill="#000000" style="stroke:none" x="132" y="160" transform="rotate(0, 132, 160)" font-size="10" font-family="SansSerif" font-style="normal" font-weight="normal">t=4.99</text>
+<polygon fill="#ffffee" points="328.5,85.5 328.5,109.5 359.5,109.5"/>
+<polygon fill="#ffffee" points="328.5,85.5 359.5,109.5 359.5,85.5"/>
+<polyline fill="none" stroke="#bebebe" stroke-width="0.5" points="328.5,85.5 328.5,109.5 359.5,109.5 359.5,85.5 328.5,85.5"/>
+<text fill="#000000" style="stroke:none" x="329" y="95" transform="rotate(0, 329, 95)" font-size="10" font-family="SansSerif" font-style="normal" font-weight="normal">curve</text>
+<text fill="#000000" style="stroke:none" x="329" y="108" transform="rotate(0, 329, 108)" font-size="10" font-family="SansSerif" font-style="normal" font-weight="normal">t=9</text>
+<text fill="#0000ff" style="stroke:none" x="390" y="149" transform="rotate(0, 390, 149)" font-size="10" font-family="SansSerif" font-style="normal" font-weight="normal">spiral</text>
+<text fill="#0000ff" style="stroke:none" x="390" y="163" transform="rotate(0, 390, 163)" font-size="10" font-family="SansSerif" font-style="normal" font-weight="normal">t=7.5</text>
+<polyline fill="none" stroke="#000000" stroke-width="0.5" points="76.5,333.375 76.5,47.625"/>
+<polyline fill="none" stroke="#000000" stroke-width="0.5" points="76.5,333.375 69.6147,333.375"/>
+<polyline fill="none" stroke="#000000" stroke-width="0.5" points="76.5,285.75 69.6147,285.75"/>
+<polyline fill="none" stroke="#000000" stroke-width="0.5" points="76.5,238.125 69.6147,238.125"/>
+<polyline fill="none" stroke="#000000" stroke-width="0.5" points="76.5,190.5 69.6147,190.5"/>
+<polyline fill="none" stroke="#000000" stroke-width="0.5" points="76.5,142.875 69.6147,142.875"/>
+<polyline fill="none" stroke="#000000" stroke-width="0.5" points="76.5,95.25 69.6147,95.25"/>
+<polyline fill="none" stroke="#000000" stroke-width="0.5" points="76.5,47.625 69.6147,47.625"/>
+<text fill="#000000" style="stroke:none" x="51" y="338" transform="rotate(-0, 51, 338)" font-size="10" font-family="SansSerif" font-style="normal" font-weight="normal">-15</text>
+<text fill="#000000" style="stroke:none" x="50" y="291" transform="rotate(-0, 50, 291)" font-size="10" font-family="SansSerif" font-style="normal" font-weight="normal">-10</text>
+<text fill="#000000" style="stroke:none" x="57" y="243" transform="rotate(-0, 57, 243)" font-size="10" font-family="SansSerif" font-style="normal" font-weight="normal">-5</text>
+<text fill="#000000" style="stroke:none" x="60" y="195" transform="rotate(-0, 60, 195)" font-size="10" font-family="SansSerif" font-style="normal" font-weight="normal">0</text>
+<text fill="#000000" style="stroke:none" x="61" y="148" transform="rotate(-0, 61, 148)" font-size="10" font-family="SansSerif" font-style="normal" font-weight="normal">5</text>
+<text fill="#000000" style="stroke:none" x="55" y="100" transform="rotate(-0, 55, 100)" font-size="10" font-family="SansSerif" font-style="normal" font-weight="normal">10</text>
+<text fill="#000000" style="stroke:none" x="55" y="53" transform="rotate(-0, 55, 53)" font-size="10" font-family="SansSerif" font-style="normal" font-weight="normal">15</text>
+<polyline fill="none" stroke="#000000" stroke-width="0.5" points="76.5,333.375 535.5,333.375"/>
+<polyline fill="none" stroke="#000000" stroke-width="0.5" points="76.5,333.375 76.5,337.65"/>
+<polyline fill="none" stroke="#000000" stroke-width="0.5" points="168.3,333.375 168.3,337.65"/>
+<polyline fill="none" stroke="#000000" stroke-width="0.5" points="260.1,333.375 260.1,337.65"/>
+<polyline fill="none" stroke="#000000" stroke-width="0.5" points="351.9,333.375 351.9,337.65"/>
+<polyline fill="none" stroke="#000000" stroke-width="0.5" points="443.7,333.375 443.7,337.65"/>
+<polyline fill="none" stroke="#000000" stroke-width="0.5" points="535.5,333.375 535.5,337.65"/>
+<polyline fill="none" stroke="#000000" stroke-width="0.5" points="94.8599,333.375 94.8599,335.94"/>
+<polyline fill="none" stroke="#000000" stroke-width="0.5" points="113.22,333.375 113.22,335.94"/>
+<polyline fill="none" stroke="#000000" stroke-width="0.5" points="131.58,333.375 131.58,335.94"/>
+<polyline fill="none" stroke="#000000" stroke-width="0.5" points="149.94,333.375 149.94,335.94"/>
+<polyline fill="none" stroke="#000000" stroke-width="0.5" points="186.66,333.375 186.66,335.94"/>
+<polyline fill="none" stroke="#000000" stroke-width="0.5" points="205.02,333.375 205.02,335.94"/>
+<polyline fill="none" stroke="#000000" stroke-width="0.5" points="223.38,333.375 223.38,335.94"/>
+<polyline fill="none" stroke="#000000" stroke-width="0.5" points="241.74,333.375 241.74,335.94"/>
+<polyline fill="none" stroke="#000000" stroke-width="0.5" points="278.46,333.375 278.46,335.94"/>
+<polyline fill="none" stroke="#000000" stroke-width="0.5" points="296.82,333.375 296.82,335.94"/>
+<polyline fill="none" stroke="#000000" stroke-width="0.5" points="315.18,333.375 315.18,335.94"/>
+<polyline fill="none" stroke="#000000" stroke-width="0.5" points="333.54,333.375 333.54,335.94"/>
+<polyline fill="none" stroke="#000000" stroke-width="0.5" points="370.26,333.375 370.26,335.94"/>
+<polyline fill="none" stroke="#000000" stroke-width="0.5" points="388.62,333.375 388.62,335.94"/>
+<polyline fill="none" stroke="#000000" stroke-width="0.5" points="406.98,333.375 406.98,335.94"/>
+<polyline fill="none" stroke="#000000" stroke-width="0.5" points="425.34,333.375 425.34,335.94"/>
+<polyline fill="none" stroke="#000000" stroke-width="0.5" points="462.06,333.375 462.06,335.94"/>
+<polyline fill="none" stroke="#000000" stroke-width="0.5" points="480.42,333.375 480.42,335.94"/>
+<polyline fill="none" stroke="#000000" stroke-width="0.5" points="498.78,333.375 498.78,335.94"/>
+<polyline fill="none" stroke="#000000" stroke-width="0.5" points="517.14,333.375 517.14,335.94"/>
+<text fill="#000000" style="stroke:none" x="67" y="349" transform="rotate(-0, 67, 349)" font-size="10" font-family="SansSerif" font-style="normal" font-weight="normal">-10</text>
+<text fill="#000000" style="stroke:none" x="163" y="349" transform="rotate(-0, 163, 349)" font-size="10" font-family="SansSerif" font-style="normal" font-weight="normal">-5</text>
+<text fill="#000000" style="stroke:none" x="256" y="349" transform="rotate(-0, 256, 349)" font-size="10" font-family="SansSerif" font-style="normal" font-weight="normal">0</text>
+<text fill="#000000" style="stroke:none" x="348" y="349" transform="rotate(-0, 348, 349)" font-size="10" font-family="SansSerif" font-style="normal" font-weight="normal">5</text>
+<text fill="#000000" style="stroke:none" x="437" y="349" transform="rotate(-0, 437, 349)" font-size="10" font-family="SansSerif" font-style="normal" font-weight="normal">10</text>
+<text fill="#000000" style="stroke:none" x="529" y="349" transform="rotate(-0, 529, 349)" font-size="10" font-family="SansSerif" font-style="normal" font-weight="normal">15</text>
 </g>
 </svg>
index 46c8202..f4c87df 100644 (file)
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <svg xmlns="http://www.w3.org/2000/svg"
      xmlns:xlink="http://www.w3.org/1999/xlink"
-     width="475px" height="292px" viewBox="0 0 475 292"
+     width="612px" height="381px" viewBox="0 0 612 381"
      style="stroke:none">
-<title>Graphic window number 0</title>
+<title>Figure n°0</title>
 <desc>
 Creator: GL2PS 1.3.2, (C) 1999-2006 Christophe Geuzaine (geuz@geuz.org)
 For: Scilab
-CreationDate: Tue Apr 27 13:52:57 2010
+CreationDate: Wed Apr 27 17:53:18 2011
 </desc>
 <defs>
 </defs>
-<polygon fill="#ffffff" points="0,0 475,0 475,292 0,292"/>
+<polygon fill="#ffffff" points="0,0 612,0 612,381 0,381"/>
 <g>
-<polygon fill="#ffffff" points="193.088,166.527 415.625,69.8945 193.088,36.5"/>
-<polygon fill="#ffffff" points="193.088,166.527 59.375,92.0781 193.088,36.5"/>
-<polygon fill="#ffffff" points="193.088,166.527 415.625,199.922 415.625,69.8945"/>
-<polygon fill="#ffffff" points="193.088,166.527 59.375,222.105 59.375,92.0781"/>
-<polygon fill="#ffffff" points="193.088,166.527 281.912,255.5 415.625,199.922"/>
-<polygon fill="#ffffff" points="193.088,166.527 59.375,222.105 281.912,255.5"/>
-<polyline fill="none" stroke="#000000" stroke-width="0.5" points="234.543,102.729 221.281,101.452"/>
-<polyline fill="none" stroke="#000000" stroke-width="0.5" points="247.478,104.503 234.543,102.729"/>
-<polyline fill="none" stroke="#000000" stroke-width="0.5" points="221.281,101.452 208.001,100.688"/>
-<polyline fill="none" stroke="#000000" stroke-width="0.5" points="259.791,106.75 247.478,104.503"/>
-<polyline fill="none" stroke="#000000" stroke-width="0.5" points="208.001,100.688 195.023,100.438"/>
-<polyline fill="none" stroke="#000000" stroke-width="0.5" points="271.212,109.435 259.791,106.75"/>
-<polyline fill="none" stroke="#000000" stroke-width="0.5" points="195.023,100.438 182.67,100.692"/>
-<polyline fill="none" stroke="#000000" stroke-width="0.5" points="281.499,112.51 271.212,109.435"/>
-<polyline fill="none" stroke="#000000" stroke-width="0.5" points="182.67,100.692 171.255,101.426"/>
-<polyline fill="none" stroke="#000000" stroke-width="0.5" points="290.444,115.923 281.499,112.51"/>
-<polyline fill="none" stroke="#000000" stroke-width="0.5" points="415.625,199.922 420.713,200.686"/>
-<text fill="#000000" style="stroke:none" x="422" y="206" transform="rotate(-0, 422, 206)" font-size="10" font-family="SansSerif" font-style="normal" font-weight="normal">-1.5</text>
-<polygon fill="#ffffee" points="277.5,163.5 277.5,199.5 315.5,199.5"/>
-<polygon fill="#ffffee" points="277.5,163.5 315.5,199.5 315.5,163.5"/>
-<text fill="#000000" style="stroke:none" x="278" y="174" transform="rotate(0, 278, 174)" font-size="10" font-family="SansSerif" font-style="normal" font-weight="normal">X: 0.31</text>
-<text fill="#000000" style="stroke:none" x="278" y="186" transform="rotate(0, 278, 186)" font-size="10" font-family="SansSerif" font-style="normal" font-weight="normal">Y: 0.67</text>
-<text fill="#000000" style="stroke:none" x="278" y="198" transform="rotate(0, 278, 198)" font-size="10" font-family="SansSerif" font-style="normal" font-weight="normal">Z: 0.74</text>
-<polyline fill="none" stroke="#bebebe" stroke-width="0.5" points="277.5,163.5 277.5,199.5 315.5,199.5 315.5,163.5 277.5,163.5"/>
-<polyline fill="none" stroke="#000000" stroke-width="0.5" points="171.255,101.426 161.08,102.604"/>
-<polyline fill="none" stroke="#000000" stroke-width="0.5" points="297.88,119.614 290.444,115.923"/>
-<polyline fill="none" stroke="#000000" stroke-width="0.5" points="410.054,202.238 413.106,202.696"/>
-<polyline fill="none" stroke="#000000" stroke-width="0.5" points="161.08,102.604 152.423,104.18"/>
-<polyline fill="none" stroke="#000000" stroke-width="0.5" points="303.679,123.517 297.88,119.614"/>
-<polyline fill="none" stroke="#000000" stroke-width="0.5" points="404.482,204.554 407.535,205.012"/>
-<polyline fill="none" stroke="#000000" stroke-width="0.5" points="234.057,170.037 228.843,168.63 223.445,167.437"/>
-<polyline fill="none" stroke="#000000" stroke-width="0.5" points="238.956,171.641 234.057,170.037"/>
-<polyline fill="none" stroke="#000000" stroke-width="0.5" points="243.426,173.42 238.956,171.641"/>
-<polyline fill="none" stroke="#000000" stroke-width="0.5" points="223.445,167.437 218.005,166.469"/>
-<polygon fill="#ffffee" points="148,100 148,108 156,108"/>
-<polygon fill="#ffffee" points="148,100 156,108 156,100"/>
-<polyline fill="none" stroke="#000000" stroke-width="0.5" points="247.373,175.35 243.426,173.42"/>
-<polyline fill="none" stroke="#000000" stroke-width="0.5" points="218.005,166.469 212.677,165.731"/>
-<polyline fill="none" stroke="#000000" stroke-width="0.5" points="148,100 148,108 156,108 156,100 148,100"/>
-<polyline fill="none" stroke="#000000" stroke-width="0.5" points="250.721,177.4 247.373,175.35"/>
-<polyline fill="none" stroke="#000000" stroke-width="0.5" points="212.677,165.731 207.617,165.223"/>
-<polyline fill="none" stroke="#000000" stroke-width="0.5" points="253.419,179.541 250.721,177.4"/>
-<polyline fill="none" stroke="#000000" stroke-width="0.5" points="398.911,206.869 401.964,207.328"/>
-<polyline fill="none" stroke="#000000" stroke-width="0.5" points="307.757,127.565 303.679,123.517"/>
-<polyline fill="none" stroke="#000000" stroke-width="0.5" points="207.617,165.223 202.985,164.936"/>
-<polyline fill="none" stroke="#000000" stroke-width="0.5" points="152.423,104.18 145.535,106.095"/>
-<polyline fill="none" stroke="#000000" stroke-width="0.5" points="255.438,181.741 253.419,179.541"/>
-<polyline fill="none" stroke="#000000" stroke-width="0.5" points="256.771,183.97 255.438,181.741"/>
-<polyline fill="none" stroke="#000000" stroke-width="0.5" points="202.985,164.936 198.935,164.856"/>
-<polyline fill="none" stroke="#000000" stroke-width="0.5" points="257.435,186.195 256.771,183.97"/>
-<polyline fill="none" stroke="#000000" stroke-width="0.5" points="393.339,209.185 398.428,209.949"/>
-<text fill="#000000" style="stroke:none" x="400" y="215" transform="rotate(-0, 400, 215)" font-size="10" font-family="SansSerif" font-style="normal" font-weight="normal">-1.0</text>
-<polyline fill="none" stroke="#000000" stroke-width="0.5" points="310.073,131.688 307.757,127.565"/>
-<polyline fill="none" stroke="#000000" stroke-width="0.5" points="198.935,164.856 195.612,164.962"/>
-<polyline fill="none" stroke="#000000" stroke-width="0.5" points="257.464,188.389 257.435,186.195"/>
-<polyline fill="none" stroke="#000000" stroke-width="0.5" points="256.914,190.526 257.464,188.389"/>
-<polyline fill="none" stroke="#000000" stroke-width="0.5" points="145.535,106.095 140.627,108.281"/>
-<polyline fill="none" stroke="#000000" stroke-width="0.5" points="237.5,211.014 237.002,210.003"/>
-<polyline fill="none" stroke="#000000" stroke-width="0.5" points="364.14,76.8618 360.646,70.7334"/>
-<polyline fill="none" stroke="#000000" stroke-width="0.5" points="237.002,210.003 236.882,209.023"/>
-<polyline fill="none" stroke="#000000" stroke-width="0.5" points="387.768,211.501 390.821,211.959"/>
-<polyline fill="none" stroke="#000000" stroke-width="0.5" points="255.856,192.583 256.914,190.526"/>
-<polyline fill="none" stroke="#000000" stroke-width="0.5" points="195.612,164.962 193.15,165.225"/>
-<polyline fill="none" stroke="#000000" stroke-width="0.5" points="236.882,209.023 237.16,208.052"/>
-<polyline fill="none" stroke="#000000" stroke-width="0.5" points="254.374,194.542 255.856,192.583"/>
-<polyline fill="none" stroke="#000000" stroke-width="0.5" points="237.16,208.052 237.841,207.067"/>
-<polyline fill="none" stroke="#000000" stroke-width="0.5" points="310.631,135.818 310.073,131.688"/>
-<polyline fill="none" stroke="#000000" stroke-width="0.5" points="237.841,207.067 238.909,206.046"/>
-<polyline fill="none" stroke="#000000" stroke-width="0.5" points="252.561,196.39 254.374,194.542"/>
-<polyline fill="none" stroke="#000000" stroke-width="0.5" points="238.909,206.046 240.331,204.967"/>
-<polyline fill="none" stroke="#000000" stroke-width="0.5" points="250.518,198.118 252.561,196.39"/>
-<polyline fill="none" stroke="#000000" stroke-width="0.5" points="240.331,204.967 242.057,203.81"/>
-<polyline fill="none" stroke="#000000" stroke-width="0.5" points="193.15,165.225 191.664,165.613"/>
-<polyline fill="none" stroke="#000000" stroke-width="0.5" points="248.346,199.72 250.518,198.118"/>
-<polyline fill="none" stroke="#000000" stroke-width="0.5" points="242.057,203.81 244.023,202.558"/>
-<polyline fill="none" stroke="#000000" stroke-width="0.5" points="246.149,201.198 248.346,199.72"/>
-<polyline fill="none" stroke="#000000" stroke-width="0.5" points="244.023,202.558 246.149,201.198"/>
-<polyline fill="none" stroke="#000000" stroke-width="0.5" points="382.197,213.816 385.25,214.275"/>
-<polyline fill="none" stroke="#000000" stroke-width="0.5" points="140.627,108.281 137.872,110.66"/>
-<polyline fill="none" stroke="#000000" stroke-width="0.5" points="309.479,139.887 310.631,135.818"/>
-<polyline fill="none" stroke="#000000" stroke-width="0.5" points="191.664,165.613 191.248,166.086"/>
-<polyline fill="none" stroke="#000000" stroke-width="0.5" points="364.665,83.0176 364.14,76.8618"/>
-<polyline fill="none" stroke="#000000" stroke-width="0.5" points="376.625,216.132 379.678,216.59"/>
-<polyline fill="none" stroke="#000000" stroke-width="0.5" points="191.248,166.086 191.97,166.602"/>
-<polyline fill="none" stroke="#000000" stroke-width="0.5" points="306.702,143.832 309.479,139.887"/>
-<polyline fill="none" stroke="#000000" stroke-width="0.5" points="137.872,110.66 137.39,113.151"/>
-<polyline fill="none" stroke="#000000" stroke-width="0.5" points="371.054,218.448 376.142,219.211"/>
-<text fill="#000000" style="stroke:none" x="377" y="224" transform="rotate(-0, 377, 224)" font-size="10" font-family="SansSerif" font-style="normal" font-weight="normal">-0.5</text>
-<polyline fill="none" stroke="#000000" stroke-width="0.5" points="191.97,166.602 193.873,167.115"/>
-<polyline fill="none" stroke="#000000" stroke-width="0.5" points="302.422,147.594 306.702,143.832"/>
-<polyline fill="none" stroke="#000000" stroke-width="0.5" points="362.268,89.0879 364.665,83.0176"/>
-<text fill="#000000" style="stroke:none" x="36" y="226" transform="rotate(-0, 36, 226)" font-size="10" font-family="SansSerif" font-style="normal" font-weight="normal">0.0</text>
-<polyline fill="none" stroke="#000000" stroke-width="0.5" points="365.482,220.764 368.535,221.222"/>
-<polyline fill="none" stroke="#000000" stroke-width="0.5" points="193.873,167.115 196.966,167.577"/>
-<text fill="#000000" style="stroke:none" x="24" y="157" transform="rotate(0, 24, 157)" font-size="10" font-family="SansSerif" font-style="normal" font-weight="normal">Z</text>
-<polyline fill="none" stroke="#000000" stroke-width="0.5" points="59.375,222.105 54.2866,221.342"/>
-<polyline fill="none" stroke="#000000" stroke-width="0.5" points="59.375,213.437 56.3223,212.979"/>
-<polyline fill="none" stroke="#000000" stroke-width="0.5" points="137.39,113.151 139.253,115.665"/>
-<polyline fill="none" stroke="#000000" stroke-width="0.5" points="296.797,151.122 302.422,147.594"/>
-<polyline fill="none" stroke="#000000" stroke-width="0.5" points="196.966,167.577 201.229,167.939"/>
-<polyline fill="none" stroke="#000000" stroke-width="0.5" points="59.375,204.769 56.3223,204.31"/>
-<polyline fill="none" stroke="#000000" stroke-width="0.5" points="59.375,222.105 54.9199,223.957"/>
-<polyline fill="none" stroke="#000000" stroke-width="0.5" points="359.911,223.08 362.964,223.538"/>
-<polyline fill="none" stroke="#000000" stroke-width="0.5" points="59.375,196.1 56.3223,195.642"/>
-<text fill="#000000" style="stroke:none" x="37" y="183" transform="rotate(-0, 37, 183)" font-size="10" font-family="SansSerif" font-style="normal" font-weight="normal">0.5</text>
-<polyline fill="none" stroke="#000000" stroke-width="0.5" points="59.375,187.432 56.3223,186.973"/>
-<polyline fill="none" stroke="#000000" stroke-width="0.5" points="68.6475,223.497 65.9741,224.608"/>
-<text fill="#000000" style="stroke:none" x="32" y="229" transform="rotate(-0, 32, 229)" font-size="10" font-family="SansSerif" font-style="normal" font-weight="normal">-1.5</text>
-<polyline fill="none" stroke="#000000" stroke-width="0.5" points="59.375,178.763 54.2866,178"/>
-<polyline fill="none" stroke="#000000" stroke-width="0.5" points="201.229,167.939 206.61,168.152"/>
-<polyline fill="none" stroke="#000000" stroke-width="0.5" points="290.008,154.372 296.797,151.122"/>
-<polyline fill="none" stroke="#000000" stroke-width="0.5" points="59.375,170.094 56.3223,169.636"/>
-<polyline fill="none" stroke="#000000" stroke-width="0.5" points="357.065,94.9648 362.268,89.0879"/>
-<polyline fill="none" stroke="#000000" stroke-width="0.5" points="77.9199,224.888 75.2466,226"/>
-<polyline fill="none" stroke="#000000" stroke-width="0.5" points="354.34,225.396 357.393,225.854"/>
-<polyline fill="none" stroke="#000000" stroke-width="0.5" points="59.375,161.426 56.3223,160.968"/>
-<polyline fill="none" stroke="#000000" stroke-width="0.5" points="206.61,168.152 213.022,168.171"/>
-<polyline fill="none" stroke="#000000" stroke-width="0.5" points="59.375,222.105 59.375,92.0781"/>
-<polyline fill="none" stroke="#000000" stroke-width="0.5" points="59.375,152.757 56.3223,152.299"/>
-<text fill="#000000" style="stroke:none" x="37" y="139" transform="rotate(-0, 37, 139)" font-size="10" font-family="SansSerif" font-style="normal" font-weight="normal">1.0</text>
-<polyline fill="none" stroke="#000000" stroke-width="0.5" points="282.261,157.307 290.008,154.372"/>
-<polyline fill="none" stroke="#000000" stroke-width="0.5" points="139.253,115.665 143.478,118.111"/>
-<polyline fill="none" stroke="#000000" stroke-width="0.5" points="59.375,144.089 56.3223,143.631"/>
-<polyline fill="none" stroke="#000000" stroke-width="0.5" points="87.1919,226.28 84.519,227.391"/>
-<polyline fill="none" stroke="#000000" stroke-width="0.5" points="59.375,135.42 54.2866,134.657"/>
-<polyline fill="none" stroke="#000000" stroke-width="0.5" points="213.022,168.171 220.349,167.951"/>
-<polyline fill="none" stroke="#000000" stroke-width="0.5" points="273.778,159.9 282.261,157.307"/>
-<polyline fill="none" stroke="#000000" stroke-width="0.5" points="415.625,199.922 281.912,255.5"/>
-<polyline fill="none" stroke="#000000" stroke-width="0.5" points="59.375,126.752 56.3223,126.294"/>
-<polygon fill="#ffffee" points="270,156 270,164 278,164"/>
-<polygon fill="#ffffee" points="270,156 278,164 278,156"/>
-<polyline fill="none" stroke="#000000" stroke-width="0.5" points="348.768,227.711 353.856,228.475"/>
-<polyline fill="none" stroke="#000000" stroke-width="0.5" points="270,156 270,164 278,164 278,156 270,156"/>
-<polyline fill="none" stroke="#000000" stroke-width="0.5" points="59.375,118.083 56.3223,117.625"/>
-<text fill="#000000" style="stroke:none" x="355" y="234" transform="rotate(-0, 355, 234)" font-size="10" font-family="SansSerif" font-style="normal" font-weight="normal">0.0</text>
-<polyline fill="none" stroke="#000000" stroke-width="0.5" points="220.349,167.951 228.447,167.454"/>
-<polyline fill="none" stroke="#000000" stroke-width="0.5" points="96.4644,227.671 92.0093,229.523"/>
-<polyline fill="none" stroke="#000000" stroke-width="0.5" points="264.79,162.134 273.778,159.9"/>
-<polyline fill="none" stroke="#000000" stroke-width="0.5" points="59.375,109.415 56.3223,108.957"/>
-<text fill="#000000" style="stroke:none" x="38" y="96" transform="rotate(-0, 38, 96)" font-size="10" font-family="SansSerif" font-style="normal" font-weight="normal">1.5</text>
-<polyline fill="none" stroke="#000000" stroke-width="0.5" points="228.447,167.454 237.143,166.646"/>
-<polyline fill="none" stroke="#000000" stroke-width="0.5" points="255.534,164.001 264.79,162.134"/>
-<polyline fill="none" stroke="#000000" stroke-width="0.5" points="59.375,100.747 56.3223,100.288"/>
-<polyline fill="none" stroke="#000000" stroke-width="0.5" points="237.143,166.646 246.243,165.501"/>
-<polyline fill="none" stroke="#000000" stroke-width="0.5" points="349.233,100.547 357.065,94.9648"/>
-<polyline fill="none" stroke="#000000" stroke-width="0.5" points="105.737,229.062 103.063,230.174"/>
-<polyline fill="none" stroke="#000000" stroke-width="0.5" points="246.243,165.501 255.534,164.001"/>
-<text fill="#000000" style="stroke:none" x="69" y="235" transform="rotate(-0, 69, 235)" font-size="10" font-family="SansSerif" font-style="normal" font-weight="normal">-1.0</text>
-<polyline fill="none" stroke="#000000" stroke-width="0.5" points="59.375,92.0781 54.2866,91.3145"/>
-<polyline fill="none" stroke="#000000" stroke-width="0.5" points="143.478,118.111 150.022,120.398"/>
-<polyline fill="none" stroke="#000000" stroke-width="0.5" points="343.197,230.027 346.25,230.485"/>
-<polyline fill="none" stroke="#000000" stroke-width="0.5" points="115.009,230.454 112.336,231.565"/>
-<polyline fill="none" stroke="#000000" stroke-width="0.5" points="124.281,231.846 121.608,232.957"/>
-<text fill="#000000" style="stroke:none" x="384" y="237" transform="rotate(0, 384, 237)" font-size="10" font-family="SansSerif" font-style="normal" font-weight="normal">X</text>
-<polyline fill="none" stroke="#000000" stroke-width="0.5" points="337.625,232.343 340.678,232.801"/>
-<polyline fill="none" stroke="#000000" stroke-width="0.5" points="339.009,105.742 349.233,100.547"/>
-<polyline fill="none" stroke="#000000" stroke-width="0.5" points="150.022,120.398 158.791,122.437"/>
-<polyline fill="none" stroke="#000000" stroke-width="0.5" points="133.554,233.237 129.099,235.089"/>
-<polyline fill="none" stroke="#000000" stroke-width="0.5" points="332.054,234.658 335.107,235.116"/>
-<polyline fill="none" stroke="#000000" stroke-width="0.5" points="142.826,234.628 140.153,235.739"/>
-<text fill="#000000" style="stroke:none" x="106" y="241" transform="rotate(-0, 106, 241)" font-size="10" font-family="SansSerif" font-style="normal" font-weight="normal">-0.5</text>
-<polyline fill="none" stroke="#000000" stroke-width="0.5" points="152.099,236.02 149.425,237.131"/>
-<polyline fill="none" stroke="#000000" stroke-width="0.5" points="158.791,122.437 169.627,124.14"/>
-<polyline fill="none" stroke="#000000" stroke-width="0.5" points="326.678,110.468 339.009,105.742"/>
-<polyline fill="none" stroke="#000000" stroke-width="0.5" points="326.483,236.974 331.571,237.738"/>
-<text fill="#000000" style="stroke:none" x="333" y="243" transform="rotate(-0, 333, 243)" font-size="10" font-family="SansSerif" font-style="normal" font-weight="normal">0.5</text>
-<polyline fill="none" stroke="#000000" stroke-width="0.5" points="161.371,237.411 158.698,238.522"/>
-<polyline fill="none" stroke="#000000" stroke-width="0.5" points="59.375,222.105 281.912,255.5"/>
-<polyline fill="none" stroke="#000000" stroke-width="0.5" points="320.911,239.29 323.964,239.748"/>
-<polyline fill="none" stroke="#000000" stroke-width="0.5" points="170.643,238.803 166.188,240.654"/>
-<polyline fill="none" stroke="#000000" stroke-width="0.5" points="169.627,124.14 182.327,125.429"/>
-<polyline fill="none" stroke="#000000" stroke-width="0.5" points="312.57,114.656 326.678,110.468"/>
-<polyline fill="none" stroke="#000000" stroke-width="0.5" points="179.916,240.194 177.243,241.305"/>
-<text fill="#000000" style="stroke:none" x="148" y="246" transform="rotate(-0, 148, 246)" font-size="10" font-family="SansSerif" font-style="normal" font-weight="normal">0.0</text>
-<polyline fill="none" stroke="#000000" stroke-width="0.5" points="315.34,241.605 318.393,242.063"/>
-<polyline fill="none" stroke="#000000" stroke-width="0.5" points="189.188,241.585 186.515,242.697"/>
-<polyline fill="none" stroke="#000000" stroke-width="0.5" points="182.327,125.429 196.631,126.231"/>
-<polyline fill="none" stroke="#000000" stroke-width="0.5" points="297.049,118.251 312.57,114.656"/>
-<polyline fill="none" stroke="#000000" stroke-width="0.5" points="198.46,242.977 195.787,244.088"/>
-<polyline fill="none" stroke="#000000" stroke-width="0.5" points="309.769,243.921 312.821,244.379"/>
-<polyline fill="none" stroke="#000000" stroke-width="0.5" points="196.631,126.231 212.24,126.484"/>
-<polyline fill="none" stroke="#000000" stroke-width="0.5" points="280.506,121.214 297.049,118.251"/>
-<polyline fill="none" stroke="#000000" stroke-width="0.5" points="207.733,244.369 203.277,246.22"/>
-<polyline fill="none" stroke="#000000" stroke-width="0.5" points="212.24,126.484 228.812,126.139"/>
-<polyline fill="none" stroke="#000000" stroke-width="0.5" points="263.346,123.519 280.506,121.214"/>
-<polyline fill="none" stroke="#000000" stroke-width="0.5" points="217.005,245.76 214.332,246.871"/>
-<polyline fill="none" stroke="#000000" stroke-width="0.5" points="228.812,126.139 245.979,125.158"/>
-<text fill="#000000" style="stroke:none" x="186" y="252" transform="rotate(-0, 186, 252)" font-size="10" font-family="SansSerif" font-style="normal" font-weight="normal">0.5</text>
-<polyline fill="none" stroke="#000000" stroke-width="0.5" points="245.979,125.158 263.346,123.519"/>
-<polyline fill="none" stroke="#000000" stroke-width="0.5" points="304.197,246.237 309.285,247"/>
-<text fill="#000000" style="stroke:none" x="311" y="252" transform="rotate(-0, 311, 252)" font-size="10" font-family="SansSerif" font-style="normal" font-weight="normal">1.0</text>
-<polyline fill="none" stroke="#000000" stroke-width="0.5" points="226.277,247.151 223.604,248.262"/>
-<polyline fill="none" stroke="#000000" stroke-width="0.5" points="298.625,248.553 301.679,249.011"/>
-<polyline fill="none" stroke="#000000" stroke-width="0.5" points="235.55,248.543 232.876,249.654"/>
-<polyline fill="none" stroke="#000000" stroke-width="0.5" points="244.822,249.934 240.367,251.786"/>
-<polyline fill="none" stroke="#000000" stroke-width="0.5" points="293.054,250.869 296.107,251.327"/>
-<text fill="#000000" style="stroke:none" x="131" y="256" transform="rotate(0, 131, 256)" font-size="10" font-family="SansSerif" font-style="normal" font-weight="normal">Y</text>
-<polyline fill="none" stroke="#000000" stroke-width="0.5" points="254.094,251.326 251.421,252.437"/>
-<text fill="#000000" style="stroke:none" x="223" y="257" transform="rotate(-0, 223, 257)" font-size="10" font-family="SansSerif" font-style="normal" font-weight="normal">1.0</text>
-<polyline fill="none" stroke="#000000" stroke-width="0.5" points="263.367,252.717 260.694,253.828"/>
-<polyline fill="none" stroke="#000000" stroke-width="0.5" points="287.483,253.184 290.536,253.643"/>
-<polyline fill="none" stroke="#000000" stroke-width="0.5" points="272.639,254.108 269.966,255.22"/>
-<polyline fill="none" stroke="#000000" stroke-width="0.5" points="281.912,255.5 287,256.264"/>
-<text fill="#000000" style="stroke:none" x="288" y="261" transform="rotate(-0, 288, 261)" font-size="10" font-family="SansSerif" font-style="normal" font-weight="normal">1.5</text>
-<polyline fill="none" stroke="#000000" stroke-width="0.5" points="281.912,255.5 277.457,257.352"/>
-<text fill="#000000" style="stroke:none" x="261" y="263" transform="rotate(-0, 261, 263)" font-size="10" font-family="SansSerif" font-style="normal" font-weight="normal">1.5</text>
-<polygon fill="#ffffee" points="157.5,63.5 157.5,99.5 202.5,99.5"/>
-<polygon fill="#ffffee" points="157.5,63.5 202.5,99.5 202.5,63.5"/>
-<text fill="#000000" style="stroke:none" x="158" y="74" transform="rotate(0, 158, 74)" font-size="10" font-family="SansSerif" font-style="normal" font-weight="normal">X: 0.072</text>
-<text fill="#000000" style="stroke:none" x="158" y="86" transform="rotate(0, 158, 86)" font-size="10" font-family="SansSerif" font-style="normal" font-weight="normal">Y: -1.1</text>
-<text fill="#000000" style="stroke:none" x="158" y="98" transform="rotate(0, 158, 98)" font-size="10" font-family="SansSerif" font-style="normal" font-weight="normal">Z: 1.1</text>
-<polyline fill="none" stroke="#bebebe" stroke-width="0.5" points="157.5,63.5 157.5,99.5 202.5,99.5 202.5,63.5 157.5,63.5"/>
+<polygon fill="#ffffff" points="248.779,217.284 535.5,91.1982 248.779,47.625"/>
+<polygon fill="#ffffff" points="248.779,217.284 76.5,120.143 248.779,47.625"/>
+<polygon fill="#ffffff" points="248.779,217.284 535.5,260.857 535.5,91.1982"/>
+<polygon fill="#ffffff" points="248.779,217.284 76.5,289.802 76.5,120.143"/>
+<polygon fill="#ffffff" points="248.779,217.284 363.221,333.375 535.5,260.857"/>
+<polygon fill="#ffffff" points="248.779,217.284 76.5,289.802 363.221,333.375"/>
+<polyline fill="none" stroke="#000000" stroke-width="0.5" points="302.191,134.04 285.103,132.374"/>
+<polyline fill="none" stroke="#000000" stroke-width="0.5" points="318.856,136.355 302.191,134.04"/>
+<polyline fill="none" stroke="#000000" stroke-width="0.5" points="285.103,132.374 267.993,131.377"/>
+<polyline fill="none" stroke="#000000" stroke-width="0.5" points="334.72,139.288 318.856,136.355"/>
+<polyline fill="none" stroke="#000000" stroke-width="0.5" points="267.993,131.377 251.272,131.051"/>
+<polyline fill="none" stroke="#000000" stroke-width="0.5" points="349.435,142.79 334.72,139.288"/>
+<polyline fill="none" stroke="#000000" stroke-width="0.5" points="251.272,131.051 235.355,131.382"/>
+<polyline fill="none" stroke="#000000" stroke-width="0.5" points="362.688,146.802 349.435,142.79"/>
+<polyline fill="none" stroke="#000000" stroke-width="0.5" points="235.355,131.382 220.648,132.34"/>
+<polyline fill="none" stroke="#000000" stroke-width="0.5" points="374.215,151.255 362.688,146.802"/>
+<polyline fill="none" stroke="#000000" stroke-width="0.5" points="535.5,260.857 542.059,261.854"/>
+<text fill="#000000" style="stroke:none" x="544" y="267" transform="rotate(-0, 544, 267)" font-size="10" font-family="SansSerif" font-style="normal" font-weight="normal">-1.5</text>
+<polygon fill="#ffffee" points="356.5,211.5 356.5,247.5 395.5,247.5"/>
+<polygon fill="#ffffee" points="356.5,211.5 395.5,247.5 395.5,211.5"/>
+<text fill="#000000" style="stroke:none" x="357" y="222" transform="rotate(0, 357, 222)" font-size="10" font-family="SansSerif" font-style="normal" font-weight="normal">X: 0.31</text>
+<text fill="#000000" style="stroke:none" x="357" y="234" transform="rotate(0, 357, 234)" font-size="10" font-family="SansSerif" font-style="normal" font-weight="normal">Y: 0.67</text>
+<text fill="#000000" style="stroke:none" x="357" y="246" transform="rotate(0, 357, 246)" font-size="10" font-family="SansSerif" font-style="normal" font-weight="normal">Z: 0.74</text>
+<polyline fill="none" stroke="#000000" stroke-width="0.5" points="220.648,132.34 207.539,133.878"/>
+<polyline fill="none" stroke="#bebebe" stroke-width="0.5" points="356.5,211.5 356.5,247.5 395.5,247.5 395.5,211.5 356.5,211.5"/>
+<polyline fill="none" stroke="#000000" stroke-width="0.5" points="383.795,156.071 374.215,151.255"/>
+<polyline fill="none" stroke="#000000" stroke-width="0.5" points="207.539,133.878 196.386,135.934"/>
+<polyline fill="none" stroke="#000000" stroke-width="0.5" points="391.267,161.164 383.795,156.071"/>
+<polyline fill="none" stroke="#000000" stroke-width="0.5" points="301.563,221.863 294.846,220.027 287.891,218.471"/>
+<polyline fill="none" stroke="#000000" stroke-width="0.5" points="307.876,223.957 301.563,221.863"/>
+<polyline fill="none" stroke="#000000" stroke-width="0.5" points="313.636,226.278 307.876,223.957"/>
+<polyline fill="none" stroke="#000000" stroke-width="0.5" points="287.891,218.471 280.882,217.208"/>
+<polygon fill="#ffffee" points="192,132 192,140 200,140"/>
+<polygon fill="#ffffee" points="192,132 200,140 200,132"/>
+<polygon fill="#ffffee" points="192,132 192,140 200,140"/>
+<polygon fill="#ffffee" points="192,132 200,140 200,132"/>
+<polyline fill="none" stroke="#000000" stroke-width="0.5" points="318.72,228.795 313.636,226.278"/>
+<polyline fill="none" stroke="#000000" stroke-width="0.5" points="280.882,217.208 274.017,216.245"/>
+<polyline fill="none" stroke="#000000" stroke-width="0.5" points="192,132 192,140 200,140 200,132 192,132"/>
+<polyline fill="none" stroke="#000000" stroke-width="0.5" points="196.386,135.934 196.38,135.936"/>
+<polyline fill="none" stroke="#000000" stroke-width="0.5" points="192,132 192,140 200,140 200,132 192,132"/>
+<polyline fill="none" stroke="#000000" stroke-width="0.5" points="323.034,231.47 318.72,228.795"/>
+<polyline fill="none" stroke="#000000" stroke-width="0.5" points="274.017,216.245 267.499,215.582"/>
+<polyline fill="none" stroke="#000000" stroke-width="0.5" points="326.511,234.264 323.034,231.47"/>
+<polyline fill="none" stroke="#000000" stroke-width="0.5" points="396.52,166.446 391.267,161.164"/>
+<polyline fill="none" stroke="#000000" stroke-width="0.5" points="267.499,215.582 261.531,215.208"/>
+<polyline fill="none" stroke="#000000" stroke-width="0.5" points="196.386,135.934 187.51,138.432"/>
+<polyline fill="none" stroke="#000000" stroke-width="0.5" points="329.112,237.135 326.511,234.264"/>
+<polyline fill="none" stroke="#000000" stroke-width="0.5" points="330.83,240.042 329.112,237.135"/>
+<polyline fill="none" stroke="#000000" stroke-width="0.5" points="261.531,215.208 256.312,215.104"/>
+<polyline fill="none" stroke="#000000" stroke-width="0.5" points="331.684,242.946 330.83,240.042"/>
+<polyline fill="none" stroke="#000000" stroke-width="0.5" points="506.787,272.943 513.346,273.94"/>
+<text fill="#000000" style="stroke:none" x="515" y="279" transform="rotate(-0, 515, 279)" font-size="10" font-family="SansSerif" font-style="normal" font-weight="normal">-1.0</text>
+<polyline fill="none" stroke="#000000" stroke-width="0.5" points="399.504,171.826 396.52,166.446"/>
+<polyline fill="none" stroke="#000000" stroke-width="0.5" points="256.312,215.104 252.031,215.241"/>
+<polyline fill="none" stroke="#000000" stroke-width="0.5" points="331.722,245.809 331.684,242.946"/>
+<polyline fill="none" stroke="#000000" stroke-width="0.5" points="331.014,248.597 331.722,245.809"/>
+<polyline fill="none" stroke="#000000" stroke-width="0.5" points="187.51,138.432 181.188,141.284"/>
+<polyline fill="none" stroke="#000000" stroke-width="0.5" points="306,275.33 305.358,274.011"/>
+<polyline fill="none" stroke="#000000" stroke-width="0.5" points="469.166,100.289 464.665,92.2925"/>
+<polyline fill="none" stroke="#000000" stroke-width="0.5" points="305.358,274.011 305.203,272.732"/>
+<polyline fill="none" stroke="#000000" stroke-width="0.5" points="329.65,251.281 331.014,248.597"/>
+<polyline fill="none" stroke="#000000" stroke-width="0.5" points="252.031,215.241 248.859,215.584"/>
+<polyline fill="none" stroke="#000000" stroke-width="0.5" points="305.203,272.732 305.562,271.465"/>
+<polyline fill="none" stroke="#000000" stroke-width="0.5" points="327.74,253.838 329.65,251.281"/>
+<polyline fill="none" stroke="#000000" stroke-width="0.5" points="305.562,271.465 306.439,270.18"/>
+<polyline fill="none" stroke="#000000" stroke-width="0.5" points="400.224,177.214 399.504,171.826"/>
+<polyline fill="none" stroke="#000000" stroke-width="0.5" points="306.439,270.18 307.815,268.848"/>
+<polyline fill="none" stroke="#000000" stroke-width="0.5" points="325.405,256.249 327.74,253.838"/>
+<polyline fill="none" stroke="#000000" stroke-width="0.5" points="307.815,268.848 309.647,267.439"/>
+<polyline fill="none" stroke="#000000" stroke-width="0.5" points="322.772,258.502 325.405,256.249"/>
+<polyline fill="none" stroke="#000000" stroke-width="0.5" points="309.647,267.439 311.872,265.93"/>
+<polyline fill="none" stroke="#000000" stroke-width="0.5" points="248.859,215.584 246.944,216.09"/>
+<polyline fill="none" stroke="#000000" stroke-width="0.5" points="319.975,260.593 322.772,258.502"/>
+<polyline fill="none" stroke="#000000" stroke-width="0.5" points="311.872,265.93 314.404,264.297"/>
+<polyline fill="none" stroke="#000000" stroke-width="0.5" points="317.144,262.522 319.975,260.593"/>
+<polyline fill="none" stroke="#000000" stroke-width="0.5" points="314.404,264.297 317.144,262.522"/>
+<polyline fill="none" stroke="#000000" stroke-width="0.5" points="181.188,141.284 177.636,144.389"/>
+<polyline fill="none" stroke="#000000" stroke-width="0.5" points="398.739,182.523 400.224,177.214"/>
+<polyline fill="none" stroke="#000000" stroke-width="0.5" points="246.944,216.09 246.408,216.708"/>
+<polyline fill="none" stroke="#000000" stroke-width="0.5" points="469.841,108.321 469.166,100.289"/>
+<polyline fill="none" stroke="#000000" stroke-width="0.5" points="246.408,216.708 247.339,217.381"/>
+<polyline fill="none" stroke="#000000" stroke-width="0.5" points="395.161,187.67 398.739,182.523"/>
+<polyline fill="none" stroke="#000000" stroke-width="0.5" points="177.636,144.389 177.016,147.639"/>
+<polyline fill="none" stroke="#000000" stroke-width="0.5" points="478.074,285.03 484.633,286.027"/>
+<text fill="#000000" style="stroke:none" x="486" y="291" transform="rotate(-0, 486, 291)" font-size="10" font-family="SansSerif" font-style="normal" font-weight="normal">-0.5</text>
+<polyline fill="none" stroke="#000000" stroke-width="0.5" points="247.339,217.381 249.79,218.051"/>
+<polyline fill="none" stroke="#000000" stroke-width="0.5" points="389.647,192.58 395.161,187.67"/>
+<polyline fill="none" stroke="#000000" stroke-width="0.5" points="466.753,116.241 469.841,108.321"/>
+<text fill="#000000" style="stroke:none" x="51" y="294" transform="rotate(-0, 51, 294)" font-size="10" font-family="SansSerif" font-style="normal" font-weight="normal">0.0</text>
+<polyline fill="none" stroke="#000000" stroke-width="0.5" points="249.79,218.051 253.775,218.654"/>
+<polyline fill="none" stroke="#000000" stroke-width="0.5" points="76.5,289.802 69.9409,288.805"/>
+<text fill="#000000" style="stroke:none" x="39" y="204" transform="rotate(0, 39, 204)" font-size="10" font-family="SansSerif" font-style="normal" font-weight="normal">Z</text>
+<polyline fill="none" stroke="#000000" stroke-width="0.5" points="76.5,278.491 72.5645,277.893"/>
+<polyline fill="none" stroke="#000000" stroke-width="0.5" points="177.016,147.639 179.417,150.919"/>
+<polyline fill="none" stroke="#000000" stroke-width="0.5" points="382.399,197.183 389.647,192.58"/>
+<polyline fill="none" stroke="#000000" stroke-width="0.5" points="253.775,218.654 259.269,219.126"/>
+<polyline fill="none" stroke="#000000" stroke-width="0.5" points="76.5,267.181 72.5645,266.583"/>
+<polyline fill="none" stroke="#000000" stroke-width="0.5" points="76.5,289.802 70.7646,292.216"/>
+<polyline fill="none" stroke="#000000" stroke-width="0.5" points="76.5,255.87 72.5645,255.272"/>
+<text fill="#000000" style="stroke:none" x="52" y="237" transform="rotate(-0, 52, 237)" font-size="10" font-family="SansSerif" font-style="normal" font-weight="normal">0.5</text>
+<polyline fill="none" stroke="#000000" stroke-width="0.5" points="76.5,244.56 72.5645,243.961"/>
+<text fill="#000000" style="stroke:none" x="49" y="298" transform="rotate(-0, 49, 298)" font-size="10" font-family="SansSerif" font-style="normal" font-weight="normal">-1.5</text>
+<polyline fill="none" stroke="#000000" stroke-width="0.5" points="76.5,233.249 69.9409,232.252"/>
+<polyline fill="none" stroke="#000000" stroke-width="0.5" points="259.269,219.126 266.2,219.404"/>
+<polyline fill="none" stroke="#000000" stroke-width="0.5" points="373.653,201.423 382.399,197.183"/>
+<polyline fill="none" stroke="#000000" stroke-width="0.5" points="76.5,221.938 72.5645,221.34"/>
+<polyline fill="none" stroke="#000000" stroke-width="0.5" points="460.05,123.91 466.753,116.241"/>
+<polyline fill="none" stroke="#000000" stroke-width="0.5" points="76.5,210.627 72.5645,210.03"/>
+<polyline fill="none" stroke="#000000" stroke-width="0.5" points="266.2,219.404 274.462,219.429"/>
+<polyline fill="none" stroke="#000000" stroke-width="0.5" points="76.5,289.802 76.5,120.143"/>
+<polyline fill="none" stroke="#000000" stroke-width="0.5" points="76.5,199.317 72.5645,198.719"/>
+<text fill="#000000" style="stroke:none" x="52" y="180" transform="rotate(-0, 52, 180)" font-size="10" font-family="SansSerif" font-style="normal" font-weight="normal">1.0</text>
+<polyline fill="none" stroke="#000000" stroke-width="0.5" points="363.671,205.253 373.653,201.423"/>
+<polyline fill="none" stroke="#000000" stroke-width="0.5" points="179.417,150.919 184.86,154.111"/>
+<polyline fill="none" stroke="#000000" stroke-width="0.5" points="76.5,188.006 72.5645,187.408"/>
+<polyline fill="none" stroke="#000000" stroke-width="0.5" points="76.5,176.696 69.9409,175.699"/>
+<polyline fill="none" stroke="#000000" stroke-width="0.5" points="274.462,219.429 283.903,219.142"/>
+<polyline fill="none" stroke="#000000" stroke-width="0.5" points="352.741,208.637 363.671,205.253"/>
+<polyline fill="none" stroke="#000000" stroke-width="0.5" points="535.5,260.857 363.221,333.375"/>
+<polyline fill="none" stroke="#000000" stroke-width="0.5" points="76.5,165.385 72.5645,164.787"/>
+<polygon fill="#ffffee" points="349,205 349,213 357,213"/>
+<polygon fill="#ffffee" points="349,205 357,213 357,205"/>
+<polygon fill="#ffffee" points="349,205 349,213 357,213"/>
+<polygon fill="#ffffee" points="349,205 357,213 357,205"/>
+<polyline fill="none" stroke="#000000" stroke-width="0.5" points="449.36,297.116 455.919,298.113"/>
+<polyline fill="none" stroke="#000000" stroke-width="0.5" points="349,205 349,213 357,213 357,205 349,205"/>
+<polyline fill="none" stroke="#000000" stroke-width="0.5" points="352.741,208.637 352.751,208.634"/>
+<polyline fill="none" stroke="#000000" stroke-width="0.5" points="349,205 349,213 357,213 357,205 349,205"/>
+<polyline fill="none" stroke="#000000" stroke-width="0.5" points="76.5,154.075 72.5645,153.477"/>
+<text fill="#000000" style="stroke:none" x="458" y="303" transform="rotate(-0, 458, 303)" font-size="10" font-family="SansSerif" font-style="normal" font-weight="normal">0.0</text>
+<polyline fill="none" stroke="#000000" stroke-width="0.5" points="283.903,219.142 294.336,218.493"/>
+<polyline fill="none" stroke="#000000" stroke-width="0.5" points="124.287,297.064 118.551,299.479"/>
+<polyline fill="none" stroke="#000000" stroke-width="0.5" points="341.161,211.552 352.741,208.637"/>
+<polyline fill="none" stroke="#000000" stroke-width="0.5" points="76.5,142.764 72.5645,142.166"/>
+<text fill="#000000" style="stroke:none" x="52" y="124" transform="rotate(-0, 52, 124)" font-size="10" font-family="SansSerif" font-style="normal" font-weight="normal">1.5</text>
+<polyline fill="none" stroke="#000000" stroke-width="0.5" points="294.336,218.493 305.54,217.439"/>
+<polyline fill="none" stroke="#000000" stroke-width="0.5" points="329.235,213.987 341.161,211.552"/>
+<polyline fill="none" stroke="#000000" stroke-width="0.5" points="76.5,131.453 72.5645,130.855"/>
+<polyline fill="none" stroke="#000000" stroke-width="0.5" points="305.54,217.439 317.264,215.945"/>
+<polyline fill="none" stroke="#000000" stroke-width="0.5" points="449.959,131.194 460.05,123.91"/>
+<polyline fill="none" stroke="#000000" stroke-width="0.5" points="317.264,215.945 329.235,213.987"/>
+<text fill="#000000" style="stroke:none" x="96" y="305" transform="rotate(-0, 96, 305)" font-size="10" font-family="SansSerif" font-style="normal" font-weight="normal">-1.0</text>
+<polyline fill="none" stroke="#000000" stroke-width="0.5" points="76.5,120.143 69.9409,119.146"/>
+<polyline fill="none" stroke="#000000" stroke-width="0.5" points="184.86,154.111 193.292,157.095"/>
+<text fill="#000000" style="stroke:none" x="485" y="306" transform="rotate(0, 485, 306)" font-size="10" font-family="SansSerif" font-style="normal" font-weight="normal">X</text>
+<polyline fill="none" stroke="#000000" stroke-width="0.5" points="436.786,137.972 449.959,131.194"/>
+<polyline fill="none" stroke="#000000" stroke-width="0.5" points="193.292,157.095 204.589,159.754"/>
+<polyline fill="none" stroke="#000000" stroke-width="0.5" points="172.074,304.326 166.338,306.741"/>
+<text fill="#000000" style="stroke:none" x="145" y="312" transform="rotate(-0, 145, 312)" font-size="10" font-family="SansSerif" font-style="normal" font-weight="normal">-0.5</text>
+<polyline fill="none" stroke="#000000" stroke-width="0.5" points="204.589,159.754 218.551,161.978"/>
+<polyline fill="none" stroke="#000000" stroke-width="0.5" points="420.898,144.139 436.786,137.972"/>
+<polyline fill="none" stroke="#000000" stroke-width="0.5" points="420.647,309.203 427.207,310.199"/>
+<text fill="#000000" style="stroke:none" x="429" y="315" transform="rotate(-0, 429, 315)" font-size="10" font-family="SansSerif" font-style="normal" font-weight="normal">0.5</text>
+<polyline fill="none" stroke="#000000" stroke-width="0.5" points="76.5,289.802 363.221,333.375"/>
+<polyline fill="none" stroke="#000000" stroke-width="0.5" points="219.86,311.588 214.125,314.003"/>
+<polyline fill="none" stroke="#000000" stroke-width="0.5" points="218.551,161.978 234.914,163.659"/>
+<polyline fill="none" stroke="#000000" stroke-width="0.5" points="402.721,149.603 420.898,144.139"/>
+<text fill="#000000" style="stroke:none" x="196" y="320" transform="rotate(-0, 196, 320)" font-size="10" font-family="SansSerif" font-style="normal" font-weight="normal">0.0</text>
+<polyline fill="none" stroke="#000000" stroke-width="0.5" points="234.914,163.659 253.344,164.706"/>
+<polyline fill="none" stroke="#000000" stroke-width="0.5" points="382.725,154.294 402.721,149.603"/>
+<polyline fill="none" stroke="#000000" stroke-width="0.5" points="253.344,164.706 273.454,165.036"/>
+<polyline fill="none" stroke="#000000" stroke-width="0.5" points="361.41,158.159 382.725,154.294"/>
+<polyline fill="none" stroke="#000000" stroke-width="0.5" points="267.647,318.851 261.912,321.265"/>
+<polyline fill="none" stroke="#000000" stroke-width="0.5" points="273.454,165.036 294.807,164.586"/>
+<polyline fill="none" stroke="#000000" stroke-width="0.5" points="339.3,161.167 361.41,158.159"/>
+<polyline fill="none" stroke="#000000" stroke-width="0.5" points="294.807,164.586 316.924,163.306"/>
+<text fill="#000000" style="stroke:none" x="244" y="327" transform="rotate(-0, 244, 327)" font-size="10" font-family="SansSerif" font-style="normal" font-weight="normal">0.5</text>
+<polyline fill="none" stroke="#000000" stroke-width="0.5" points="316.924,163.306 339.3,161.167"/>
+<polyline fill="none" stroke="#000000" stroke-width="0.5" points="391.934,321.289 398.493,322.286"/>
+<text fill="#000000" style="stroke:none" x="400" y="328" transform="rotate(-0, 400, 328)" font-size="10" font-family="SansSerif" font-style="normal" font-weight="normal">1.0</text>
+<text fill="#000000" style="stroke:none" x="179" y="329" transform="rotate(0, 179, 329)" font-size="10" font-family="SansSerif" font-style="normal" font-weight="normal">Y</text>
+<polyline fill="none" stroke="#000000" stroke-width="0.5" points="315.434,326.113 309.698,328.527"/>
+<text fill="#000000" style="stroke:none" x="292" y="334" transform="rotate(-0, 292, 334)" font-size="10" font-family="SansSerif" font-style="normal" font-weight="normal">1.0</text>
+<polyline fill="none" stroke="#000000" stroke-width="0.5" points="363.221,333.375 369.78,334.372"/>
+<text fill="#000000" style="stroke:none" x="371" y="340" transform="rotate(-0, 371, 340)" font-size="10" font-family="SansSerif" font-style="normal" font-weight="normal">1.5</text>
+<polyline fill="none" stroke="#000000" stroke-width="0.5" points="363.221,333.375 357.485,335.789"/>
+<text fill="#000000" style="stroke:none" x="340" y="341" transform="rotate(-0, 340, 341)" font-size="10" font-family="SansSerif" font-style="normal" font-weight="normal">1.5</text>
+<polygon fill="#ffffee" points="148.5,95.5 148.5,131.5 193.5,131.5"/>
+<polygon fill="#ffffee" points="148.5,95.5 193.5,131.5 193.5,95.5"/>
+<text fill="#000000" style="stroke:none" x="149" y="106" transform="rotate(0, 149, 106)" font-size="10" font-family="SansSerif" font-style="normal" font-weight="normal">X: 0.072</text>
+<text fill="#000000" style="stroke:none" x="149" y="118" transform="rotate(0, 149, 118)" font-size="10" font-family="SansSerif" font-style="normal" font-weight="normal">Y: -1.1</text>
+<text fill="#000000" style="stroke:none" x="149" y="130" transform="rotate(0, 149, 130)" font-size="10" font-family="SansSerif" font-style="normal" font-weight="normal">Z: 1.1</text>
+<polyline fill="none" stroke="#bebebe" stroke-width="0.5" points="148.5,95.5 148.5,131.5 193.5,131.5 193.5,95.5 148.5,95.5"/>
 </g>
 </svg>
diff --git a/scilab/modules/graphics/help/images/datatips6.svg b/scilab/modules/graphics/help/images/datatips6.svg
new file mode 100644 (file)
index 0000000..9894f4d
--- /dev/null
@@ -0,0 +1,87 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg xmlns="http://www.w3.org/2000/svg"
+     xmlns:xlink="http://www.w3.org/1999/xlink"
+     width="612px" height="381px" viewBox="0 0 612 381"
+     style="stroke:none">
+<title>Figure n°0</title>
+<desc>
+Creator: GL2PS 1.3.2, (C) 1999-2006 Christophe Geuzaine (geuz@geuz.org)
+For: Scilab
+CreationDate: Wed Apr 27 17:49:42 2011
+</desc>
+<defs>
+</defs>
+<polygon fill="#ffffff" points="0,0 612,0 612,381 0,381"/>
+<g>
+<polygon fill="#ffffff" points="76.5,333.375 76.5,47.625 76.5,47.625"/>
+<polygon fill="#ffffff" points="76.5,333.375 76.5,47.625 76.5,333.375"/>
+<polygon fill="#ffffff" points="76.5,333.375 535.5,333.375 535.5,333.375"/>
+<polygon fill="#ffffff" points="76.5,333.375 535.5,333.375 76.5,333.375"/>
+<polygon fill="#ffffff" points="76.5,333.375 535.5,333.375 535.5,47.625"/>
+<polygon fill="#ffffff" points="76.5,333.375 535.5,47.625 76.5,47.625"/>
+<polyline fill="none" stroke="#000000" stroke-width="0.5" points="76.5,333.375 76.5,47.625 76.5,47.625 535.5,47.625 535.5,333.375 535.5,333.375 76.5,333.375"/>
+<polyline fill="none" stroke="#000000" stroke-width="0.5" points="535.5,47.625 76.5,47.625"/>
+<polyline fill="none" stroke="#000000" stroke-width="0.5" points="535.5,47.625 535.5,333.375"/>
+<polyline fill="none" stroke="#000000" stroke-width="0.5" points="535.5,47.625 535.5,47.625"/>
+<polyline fill="none" stroke="#0000ff" stroke-width="0.5" points="76.5,242.415 76.9595,242.571 77.4189,242.742 77.8784,242.929 78.3379,243.13 78.7974,243.346 79.2568,243.576 79.7163,243.82 80.1758,244.078 80.6353,244.349 81.0947,244.633 81.5542,244.93 82.0137,245.239 82.4731,245.56 82.9326,245.892 83.3921,246.234 83.8516,246.587 84.311,246.95 84.7705,247.321 85.2295,247.702 85.689,248.09 86.1484,248.486 86.6079,248.889 87.0674,249.298 87.5269,249.713 87.9863,250.133 88.4458,250.557 88.9053,250.984 89.3647,251.415 89.8242,251.848 90.2837,252.283 90.7432,252.719 91.2026,253.155 91.6621,253.59 92.1216,254.025 92.5811,254.458 93.0405,254.888 93.5,255.314 93.9595,255.737 94.4189,256.156 94.8784,256.569 95.3379,256.976 95.7974,257.377 96.2568,257.77 96.7163,258.155 97.1758,258.532 97.6353,258.899 98.0947,259.257 98.5542,259.604 99.0137,259.939 99.4731,260.264 99.9326,260.576 100.392,260.875 100.852,261.161 101.311,261.432 101.77,261.69 102.229,261.933 102.689,262.16 103.148,262.372 103.608,262.567 104.067,262.746 104.527,262.908 104.986,263.053 105.446,263.181 105.905,263.29 106.365,263.382 106.824,263.455 107.284,263.51 107.743,263.546 108.203,263.563 108.662,263.562 109.122,263.541 109.581,263.501 110.041,263.442 110.5,263.364 110.959,263.267 111.419,263.151 111.878,263.016 112.338,262.862 112.797,262.69 113.257,262.5 113.716,262.291 114.176,262.063 114.635,261.819 115.095,261.557 115.554,261.278 116.014,260.982 116.473,260.67 116.933,260.342 117.392,259.999 117.852,259.641 118.311,259.268 118.77,258.881 119.229,258.481 119.689,258.068 120.148,257.644 120.608,257.207 121.067,256.759 121.527,256.301 121.986,255.833 122.446,255.357 122.905,254.872 123.365,254.38 123.824,253.881 124.284,253.376 124.743,252.866 125.203,252.351 125.662,251.833 126.122,251.312 126.581,250.789 127.041,250.265 127.5,249.74 127.959,249.216 128.419,248.693 128.878,248.173 129.338,247.655 129.797,247.142 130.257,246.633 130.716,246.129 131.176,245.632 131.635,245.143 132.095,244.661 132.554,244.188 133.014,243.724 133.473,243.271 133.933,242.829 134.392,242.399 134.852,241.982 135.311,241.578 135.77,241.188 136.229,240.813 136.689,240.454 137.148,240.111 137.608,239.785 138.067,239.476 138.527,239.185 138.986,238.913 139.446,238.659 139.905,238.426 140.365,238.212 140.824,238.019 141.284,237.847 141.743,237.696 142.203,237.567 142.662,237.46 143.122,237.376 143.581,237.314 144.041,237.275 144.5,237.259 144.959,237.266 145.419,237.296 145.878,237.35 146.338,237.427 146.797,237.527 147.257,237.651 147.716,237.799 148.176,237.97 148.635,238.163 149.095,238.38 149.554,238.62 150.014,238.881 150.473,239.166 150.933,239.472 151.392,239.799 151.852,240.148 152.311,240.517 152.77,240.907 153.229,241.316 153.689,241.745 154.148,242.192 154.608,242.657 155.067,243.14 155.527,243.64 155.986,244.155 156.446,244.686 156.905,245.232 157.365,245.791 157.824,246.363 158.284,246.948 158.743,247.544 159.203,248.15 159.662,248.766 160.122,249.391 160.581,250.023 161.041,250.662 161.5,251.307 161.959,251.957 162.419,252.61 162.878,253.267 163.338,253.924 163.797,254.583 164.257,255.242 164.716,255.898 165.176,256.553 165.635,257.205 166.095,257.851 166.554,258.492 167.014,259.126 167.473,259.753 167.933,260.371 168.392,260.979 168.852,261.577 169.311,262.163 169.77,262.735 170.229,263.294 170.689,263.838 171.148,264.367 171.608,264.878 172.067,265.373 172.527,265.848 172.986,266.304 173.446,266.74 173.905,267.155 174.365,267.548 174.824,267.918 175.284,268.265 175.743,268.587 176.203,268.885 176.662,269.157 177.122,269.403 177.581,269.623 178.041,269.815 178.5,269.979 178.959,270.116 179.419,270.224 179.878,270.302 180.338,270.352 180.797,270.372 181.257,270.362 181.716,270.322 182.176,270.252 182.635,270.151 183.095,270.021 183.554,269.859 184.014,269.667 184.473,269.446 184.933,269.193 185.392,268.911 185.852,268.6 186.311,268.258 186.771,267.887 187.229,267.488 187.689,267.06 188.148,266.604 188.608,266.12 189.067,265.609 189.527,265.073 189.986,264.51 190.446,263.922 190.905,263.311 191.365,262.675 191.824,262.017 192.284,261.337 192.743,260.636 193.203,259.915 193.662,259.174 194.122,258.416 194.581,257.641 195.041,256.85 195.5,256.044 195.959,255.224 196.419,254.392 196.878,253.549 197.338,252.695 197.797,251.833 198.257,250.963 198.716,250.087 199.176,249.206 199.635,248.322 200.095,247.435 200.554,246.547 201.014,245.661 201.473,244.776 201.933,243.895 202.392,243.018 202.852,242.147 203.311,241.284 203.771,240.431 204.229,239.587 204.689,238.756 205.148,237.938 205.608,237.135 206.067,236.348 206.527,235.578 206.986,234.827 207.446,234.096 207.905,233.387 208.365,232.701 208.824,232.039 209.284,231.402 209.743,230.792 210.203,230.21 210.662,229.658 211.122,229.135 211.581,228.644 212.041,228.184 212.5,227.759 212.959,227.367 213.419,227.012 213.878,226.692 214.338,226.41 214.797,226.165 215.257,225.959 215.716,225.793 216.176,225.667 216.635,225.581 217.095,225.537 217.554,225.534 218.014,225.574 218.473,225.656 218.933,225.781 219.392,225.949 219.852,226.161 220.311,226.416 220.771,226.714 221.229,227.057 221.689,227.442 222.148,227.871 222.608,228.343 223.067,228.858 223.527,229.416 223.986,230.016 224.446,230.658 224.905,231.341 225.365,232.064 225.824,232.828 226.284,233.631 226.743,234.473 227.203,235.352 227.662,236.267 228.122,237.219 228.581,238.205 229.041,239.225 229.5,240.277 229.959,241.36 230.419,242.474 230.878,243.616 231.338,244.785 231.797,245.979 232.257,247.198 232.716,248.44 233.176,249.702 233.635,250.984 234.095,252.283 234.554,253.598 235.014,254.928 235.473,256.269 235.933,257.621 236.392,258.98 236.852,260.347 237.311,261.717 237.771,263.09 238.229,264.464 238.689,265.835 239.148,267.203 239.608,268.564 240.067,269.918 240.527,271.261 240.986,272.591 241.446,273.907 241.905,275.206 242.365,276.485 242.824,277.744 243.284,278.979 243.743,280.188 244.203,281.369 244.662,282.519 245.122,283.638 245.581,284.722 246.041,285.769 246.5,286.777 246.959,287.745 247.419,288.669 247.878,289.549 248.338,290.381 248.797,291.165 249.257,291.897 249.716,292.576 250.176,293.201 250.635,293.769 251.095,294.278 251.554,294.727 252.014,295.114 252.473,295.438 252.933,295.697 253.392,295.889 253.852,296.014 254.311,296.068 254.771,296.052 255.229,295.964 255.689,295.803 256.148,295.568 256.608,295.257 257.067,294.871 257.527,294.407 257.986,293.865 258.446,293.244 258.905,292.544 259.365,291.764 259.824,290.904 260.284,289.963 260.743,288.941 261.203,287.838 261.662,286.654 262.122,285.388 262.581,284.041 263.041,282.613 263.5,281.104 263.959,279.514 264.419,277.844 264.878,276.095 265.338,274.266 265.797,272.359 266.257,270.375 266.716,268.313 267.176,266.177 267.635,263.965 268.095,261.681 268.554,259.324 269.014,256.896 269.473,254.398 269.933,251.833 270.392,249.201 270.852,246.505 271.311,243.745 271.771,240.925 272.229,238.045 272.689,235.108 273.148,232.117 273.608,229.071 274.067,225.976 274.527,222.832 274.986,219.641 275.446,216.407 275.905,213.132 276.365,209.818 276.824,206.467 277.284,203.083 277.743,199.669 278.203,196.227 278.662,192.759 279.122,189.269 279.581,185.759 280.041,182.232 280.5,178.692 280.959,175.142 281.419,171.583 281.878,168.021 282.338,164.456 282.797,160.893 283.257,157.334 283.716,153.784 284.176,150.244 284.635,146.718 285.095,143.209 285.554,139.72 286.014,136.254 286.473,132.815 286.933,129.406 287.392,126.029 287.852,122.687 288.311,119.384 288.771,116.123 289.229,112.906 289.689,109.737 290.148,106.619 290.608,103.554 291.067,100.545 291.527,97.5952 291.986,94.707 292.446,91.8833 292.905,89.127 293.365,86.4399 293.824,83.8252 294.284,81.2847 294.743,78.8218 295.203,76.438 295.662,74.1357 296.122,71.917 296.581,69.7847 297.041,67.7397 297.5,65.7852 297.959,63.9219 298.419,62.1523 298.878,60.4775 299.338,58.8999 299.797,57.4204 300.257,56.0405 300.716,54.7617 301.176,53.585 301.635,52.5117 302.095,51.5425 302.554,50.6787 303.014,49.9214 303.473,49.271 303.933,48.7275 304.392,48.2925 304.852,47.9658 305.311,47.7476 305.771,47.6387 306.229,47.6387 306.689,47.7476 307.148,47.9658 307.608,48.2925 308.067,48.7275 308.527,49.271 308.986,49.9214 309.446,50.6787 309.905,51.5425 310.365,52.5117 310.824,53.585 311.284,54.7617 311.743,56.0405 312.203,57.4204 312.662,58.8999 313.122,60.4775 313.581,62.1523 314.041,63.9219 314.5,65.7852 314.959,67.7397 315.419,69.7847 315.878,71.917 316.338,74.1357 316.797,76.438 317.257,78.8218 317.716,81.2847 318.176,83.8252 318.635,86.4399 319.095,89.127 319.554,91.8833 320.014,94.707 320.473,97.5952 320.933,100.545 321.392,103.554 321.852,106.619 322.311,109.737 322.771,112.906 323.229,116.123 323.689,119.384 324.148,122.687 324.608,126.029 325.067,129.406 325.527,132.815 325.986,136.254 326.446,139.72 326.905,143.209 327.365,146.718 327.824,150.244 328.284,153.784 328.743,157.334 329.203,160.893 329.662,164.456 330.122,168.021 330.581,171.583 331.041,175.142 331.5,178.692 331.959,182.232 332.419,185.759 332.878,189.269 333.338,192.759 333.797,196.227 334.257,199.669 334.716,203.083 335.176,206.467 335.635,209.818 336.095,213.132 336.554,216.407 337.014,219.641 337.473,222.832 337.933,225.976 338.392,229.071 338.852,232.117 339.311,235.108 339.771,238.045 340.229,240.925 340.689,243.745 341.148,246.505 341.608,249.201 342.067,251.833 342.527,254.398 342.986,256.896 343.446,259.324 343.905,261.681 344.365,263.965 344.824,266.177 345.284,268.313 345.743,270.375 346.203,272.359 346.662,274.266 347.122,276.095 347.581,277.844 348.041,279.514 348.5,281.104 348.959,282.613 349.419,284.041 349.878,285.388 350.338,286.654 350.797,287.838 351.257,288.941 351.716,289.963 352.176,290.904 352.635,291.764 353.095,292.544 353.554,293.244 354.014,293.865 354.473,294.407 354.933,294.871 355.392,295.257 355.852,295.568 356.311,295.803 356.771,295.964 357.229,296.052 357.689,296.068 358.148,296.014 358.608,295.889 359.067,295.697 359.527,295.438 359.986,295.114 360.446,294.727 360.905,294.278 361.365,293.769 361.824,293.201 362.284,292.576 362.743,291.897 363.203,291.165 363.662,290.381 364.122,289.549 364.581,288.669 365.041,287.745 365.5,286.777 365.959,285.769 366.419,284.722 366.878,283.638 367.338,282.519 367.797,281.369 368.257,280.188 368.716,278.979 369.176,277.744 369.635,276.485 370.095,275.206 370.554,273.907 371.014,272.591 371.473,271.261 371.933,269.918 372.392,268.564 372.852,267.203 373.311,265.835 373.771,264.464 374.229,263.09 374.689,261.717 375.148,260.347 375.608,258.98 376.067,257.621 376.527,256.269 376.986,254.928 377.446,253.598 377.905,252.283 378.365,250.984 378.824,249.702 379.284,248.44 379.743,247.198 380.203,245.979 380.662,244.785 381.122,243.616 381.581,242.474 382.041,241.36 382.5,240.277 382.959,239.225 383.419,238.205 383.878,237.219 384.338,236.267 384.797,235.352 385.257,234.473 385.716,233.631 386.176,232.828 386.635,232.064 387.095,231.341 387.554,230.658 388.014,230.016 388.473,229.416 388.933,228.858 389.392,228.343 389.852,227.871 390.311,227.442 390.771,227.057 391.229,226.714 391.689,226.416 392.148,226.161 392.608,225.949 393.067,225.781 393.527,225.656 393.986,225.574 394.446,225.534 394.905,225.537 395.365,225.581 395.824,225.667 396.284,225.793 396.743,225.959 397.203,226.165 397.662,226.41 398.122,226.692 398.581,227.012 399.041,227.367 399.5,227.759 399.959,228.184 400.419,228.644 400.878,229.135 401.338,229.658 401.797,230.21 402.257,230.792 402.716,231.402 403.176,232.039 403.635,232.701 404.095,233.387 404.554,234.096 405.014,234.827 405.473,235.578 405.933,236.348 406.392,237.135 406.852,237.938 407.311,238.756 407.771,239.587 408.229,240.431 408.689,241.284 409.148,242.147 409.608,243.018 410.067,243.895 410.527,244.776 410.986,245.661 411.446,246.547 411.905,247.435 412.365,248.322 412.824,249.206 413.284,250.087 413.743,250.963 414.203,251.833 414.662,252.695 415.122,253.549 415.581,254.392 416.041,255.224 416.5,256.044 416.959,256.85 417.419,257.641 417.878,258.416 418.338,259.174 418.797,259.915 419.257,260.636 419.716,261.337 420.176,262.017 420.635,262.675 421.095,263.311 421.554,263.922 422.014,264.51 422.473,265.073 422.933,265.609 423.392,266.12 423.852,266.604 424.311,267.06 424.771,267.488 425.229,267.887 425.689,268.258 426.148,268.6 426.608,268.911 427.067,269.193 427.527,269.446 427.986,269.667 428.446,269.859 428.905,270.021 429.365,270.151 429.824,270.252 430.284,270.322 430.743,270.362 431.203,270.372 431.662,270.352 432.122,270.302 432.581,270.224 433.041,270.116 433.5,269.979 433.959,269.815 434.419,269.623 434.878,269.403 435.338,269.157 435.797,268.885 436.257,268.587 436.716,268.265 437.176,267.918 437.635,267.548 438.095,267.155 438.554,266.74 439.014,266.304 439.473,265.848 439.933,265.373 440.392,264.878 440.852,264.367 441.311,263.838 441.771,263.294 442.23,262.735 442.689,262.163 443.148,261.577 443.608,260.979 444.067,260.371 444.527,259.753 444.986,259.126 445.446,258.492 445.905,257.851 446.365,257.205 446.824,256.553 447.284,255.898 447.743,255.242 448.203,254.583 448.662,253.924 449.122,253.267 449.581,252.61 450.041,251.957 450.5,251.307 450.959,250.662 451.419,250.023 451.878,249.391 452.338,248.766 452.797,248.15 453.257,247.544 453.716,246.948 454.176,246.363 454.635,245.791 455.095,245.232 455.554,244.686 456.014,244.155 456.473,243.64 456.933,243.14 457.392,242.657 457.852,242.192 458.311,241.745 458.771,241.316 459.23,240.907 459.689,240.517 460.148,240.148 460.608,239.799 461.067,239.472 461.527,239.166 461.986,238.881 462.446,238.62 462.905,238.38 463.365,238.163 463.824,237.97 464.284,237.799 464.743,237.651 465.203,237.527 465.662,237.427 466.122,237.35 466.581,237.296 467.041,237.266 467.5,237.259 467.959,237.275 468.419,237.314 468.878,237.376 469.338,237.46 469.797,237.567 470.257,237.696 470.716,237.847 471.176,238.019 471.635,238.212 472.095,238.426 472.554,238.659 473.014,238.913 473.473,239.185 473.933,239.476 474.392,239.785 474.852,240.111 475.311,240.454 475.771,240.813 476.23,241.188 476.689,241.578 477.148,241.982 477.608,242.399 478.067,242.829 478.527,243.271 478.986,243.724 479.446,244.188 479.905,244.661 480.365,245.143 480.824,245.632 481.284,246.129 481.743,246.633 482.203,247.142 482.662,247.655 483.122,248.173 483.581,248.693 484.041,249.216 484.5,249.74 484.959,250.265 485.419,250.789 485.878,251.312 486.338,251.833 486.797,252.351 487.257,252.866 487.716,253.376 488.176,253.881 488.635,254.38 489.095,254.872 489.554,255.357 490.014,255.833 490.473,256.301 490.933,256.759 491.392,257.207 491.852,257.644 492.311,258.068 492.771,258.481 493.23,258.881 493.689,259.268 494.148,259.641 494.608,259.999 495.067,260.342 495.527,260.67 495.986,260.982 496.446,261.278 496.905,261.557 497.365,261.819 497.824,262.063 498.284,262.291 498.743,262.5 499.203,262.69 499.662,262.862 500.122,263.016 500.581,263.151 501.041,263.267 501.5,263.364 501.959,263.442 502.419,263.501 502.878,263.541 503.338,263.562 503.797,263.563 504.257,263.546 504.716,263.51 505.176,263.455 505.635,263.382 506.095,263.29 506.554,263.181 507.014,263.053 507.473,262.908 507.933,262.746 508.392,262.567 508.852,262.372 509.311,262.16 509.771,261.933 510.23,261.69 510.689,261.432 511.148,261.161 511.608,260.875 512.067,260.576 512.527,260.264 512.986,259.939 513.446,259.604 513.905,259.257 514.365,258.899 514.824,258.532 515.284,258.155 515.743,257.77 516.203,257.377 516.662,256.976 517.122,256.569 517.581,256.156 518.041,255.737 518.5,255.314 518.959,254.888 519.419,254.458 519.878,254.025 520.338,253.59 520.797,253.155 521.257,252.719 521.716,252.283 522.176,251.848 522.635,251.415 523.095,250.984 523.554,250.557 524.014,250.133 524.473,249.713 524.933,249.298 525.392,248.889 525.852,248.486 526.311,248.09 526.771,247.702 527.229,247.321 527.689,246.95 528.148,246.587 528.608,246.234 529.067,245.892 529.527,245.56 529.986,245.239 530.446,244.93 530.905,244.633 531.365,244.349 531.824,244.078 532.284,243.82 532.743,243.576 533.203,243.346 533.662,243.13 534.122,242.929 534.581,242.742 535.041,242.571 535.5,242.415"/>
+<polyline fill="none" stroke="#007f00" stroke-width="0.5" points="76.5,252.167 76.9595,251.45 77.4189,251.31 77.8784,252.037 78.3379,252.145 78.7974,251.41 79.2568,251.326 79.7163,252.066 80.1758,252.136 80.6353,251.391 81.0947,251.326 81.5542,252.075 82.0137,252.145 82.4731,251.393 82.9326,251.309 83.3921,252.062 83.8516,252.17 84.311,251.417 84.7705,251.275 85.2295,252.025 85.689,252.21 86.1484,251.469 86.6079,251.23 87.0674,251.958 87.5269,252.257 87.9863,251.554 88.4458,251.185 88.9053,251.854 89.3647,252.298 89.8242,251.676 90.2837,251.155 90.7432,251.713 91.2026,252.312 91.6621,251.834 92.1216,251.163 92.5811,251.54 93.0405,252.274 93.5,252.019 93.9595,251.236 94.4189,251.353 94.8784,252.161 95.3379,252.198 95.7974,251.394 96.2568,251.191 96.7163,251.957 97.1758,252.327 97.6353,251.641 98.0947,251.111 98.5542,251.675 99.0137,252.345 99.4731,251.944 99.9326,251.169 100.392,251.368 100.852,252.201 101.311,252.229 101.77,251.401 102.229,251.134 102.689,251.888 103.148,252.383 103.608,251.777 104.067,251.09 104.527,251.479 104.986,252.296 105.446,252.177 105.905,251.315 106.365,251.139 106.824,251.942 107.284,252.407 107.743,251.769 108.203,251.065 108.662,251.442 109.122,252.293 109.581,252.245 110.041,251.372 110.5,251.068 110.959,251.823 111.419,252.439 111.878,251.941 112.338,251.108 112.797,251.249 113.257,252.147 113.716,252.406 114.176,251.621 114.635,251 115.095,251.502 115.554,252.361 116.014,252.267 116.473,251.358 116.933,251.008 117.392,251.748 117.852,252.47 118.311,252.095 118.77,251.175 119.229,251.074 119.689,251.945 120.148,252.51 120.608,251.94 121.067,251.062 121.527,251.149 121.986,252.082 122.446,252.519 122.905,251.831 123.365,250.996 123.824,251.201 124.284,252.16 124.743,252.525 125.203,251.78 125.662,250.961 126.122,251.208 126.581,252.184 127.041,252.545 127.5,251.793 127.959,250.951 128.419,251.164 128.878,252.149 129.338,252.581 129.797,251.876 130.257,250.973 130.716,251.071 131.176,252.046 131.635,252.616 132.095,252.031 132.554,251.049 133.014,250.947 133.473,251.86 133.933,252.617 134.392,252.246 134.852,251.215 135.311,250.832 135.77,251.583 136.229,252.529 136.689,252.485 137.148,251.501 137.608,250.794 138.067,251.239 138.527,252.293 138.986,252.672 139.446,251.91 139.905,250.925 140.365,250.904 140.824,251.876 141.284,252.686 141.743,252.371 142.203,251.298 142.662,250.725 143.122,251.325 143.581,252.405 144.041,252.716 144.5,251.896 144.959,250.879 145.419,250.827 145.878,251.801 146.338,252.708 146.797,252.527 147.257,251.456 147.716,250.681 148.176,251.062 148.635,252.184 149.095,252.823 149.554,252.28 150.014,251.138 150.473,250.625 150.933,251.294 151.392,252.438 151.852,252.844 152.311,252.082 152.77,250.945 153.229,250.618 153.689,251.445 154.148,252.577 154.608,252.853 155.067,251.987 155.527,250.853 155.986,250.595 156.446,251.477 156.905,252.623 157.365,252.896 157.824,252.022 158.284,250.854 158.743,250.532 159.203,251.372 159.662,252.569 160.122,252.975 160.581,252.198 161.041,250.971 161.5,250.449 161.959,251.126 162.419,252.376 162.878,253.042 163.338,252.507 163.797,251.256 164.257,250.425 164.716,250.77 165.176,251.985 165.635,252.988 166.095,252.884 166.554,251.76 167.014,250.599 167.473,250.416 167.933,251.375 168.392,252.652 168.852,253.155 169.311,252.449 169.77,251.128 170.229,250.301 170.689,250.663 171.148,251.918 171.608,253.035 172.067,253.093 172.527,252.042 172.986,250.727 173.446,250.208 173.905,250.903 174.365,252.267 174.824,253.224 175.284,253.02 175.743,251.808 176.203,250.523 176.662,250.155 177.122,250.989 177.581,252.398 178.041,253.32 178.5,253.062 178.959,251.81 179.419,250.485 179.878,250.062 180.338,250.853 180.797,252.292 181.257,253.345 181.716,253.257 182.176,252.084 182.635,250.649 183.095,249.955 183.554,250.49 184.014,251.889 184.473,253.198 184.933,253.524 185.392,252.642 185.852,251.138 186.311,250.011 186.771,250.01 187.229,251.141 187.689,252.672 188.148,253.614 188.608,253.357 189.067,252.06 189.527,250.538 189.986,249.748 190.446,250.187 190.905,251.589 191.365,253.098 191.824,253.792 192.284,253.248 192.743,251.785 193.203,250.271 193.662,249.603 194.122,250.177 194.581,251.666 195.041,253.212 195.5,253.93 195.959,253.406 196.419,251.928 196.878,250.321 197.338,249.477 197.797,249.866 198.257,251.281 198.716,252.961 199.176,254.002 199.635,253.845 200.095,252.566 200.554,250.832 201.014,249.542 201.473,249.366 201.933,250.4 202.392,252.126 202.852,253.678 203.311,254.28 203.771,253.628 204.229,252.035 204.689,250.272 205.148,249.188 205.608,249.307 206.067,250.578 206.527,252.411 206.986,253.954 207.446,254.494 207.905,253.776 208.365,252.12 208.824,250.265 209.284,249.036 209.743,248.979 210.203,250.127 210.662,251.989 211.122,253.769 211.581,254.708 212.041,254.407 212.5,252.982 212.959,251.018 213.419,249.316 213.878,248.569 214.338,249.083 214.797,250.661 215.257,252.687 215.716,254.372 216.176,255.063 216.635,254.488 217.095,252.857 217.554,250.778 218.014,249.019 218.473,248.23 218.933,248.706 219.392,250.282 219.852,252.402 220.311,254.321 220.771,255.366 221.229,255.17 221.689,253.793 222.148,251.693 222.608,249.569 223.067,248.128 223.527,247.845 223.986,248.821 224.446,250.75 224.905,253.025 225.365,254.935 225.824,255.881 226.284,255.568 226.743,254.082 227.203,251.862 227.662,249.562 228.122,247.859 228.581,247.251 229.041,247.919 229.5,249.685 229.959,252.058 230.419,254.385 230.878,256.029 231.338,256.539 231.797,255.771 232.257,253.918 232.716,251.458 233.176,249.021 233.635,247.227 234.095,246.534 234.554,247.122 235.014,248.855 235.473,251.322 235.933,253.937 236.392,256.084 236.852,257.257 237.311,257.18 237.771,255.86 238.229,253.585 238.689,250.851 239.148,248.251 239.608,246.348 240.067,245.552 240.527,246.038 240.986,247.715 241.446,250.251 241.905,253.142 242.365,255.816 242.824,257.75 243.284,258.562 243.743,258.092 244.203,256.415 244.662,253.832 245.122,250.806 245.581,247.875 246.041,245.56 246.5,244.267 246.959,244.227 247.419,245.457 247.878,247.764 248.338,250.779 248.797,254.023 249.257,256.982 249.716,259.193 250.176,260.309 250.635,260.151 251.095,258.732 251.554,256.249 252.014,253.047 252.473,249.575 252.933,246.312 253.392,243.707 253.852,242.115 254.311,241.757 254.771,242.691 255.229,244.81 255.689,247.86 256.148,251.475 256.608,255.224 257.067,258.664 257.527,261.391 257.986,263.087 258.446,263.552 258.905,262.721 259.365,260.671 259.824,257.606 260.284,253.834 260.743,249.729 261.203,245.697 261.662,242.132 262.122,239.379 262.581,237.706 263.041,237.277 263.5,238.145 263.959,240.247 264.419,243.419 264.878,247.406 265.338,251.889 265.797,256.516 266.257,260.925 266.716,264.776 267.176,267.774 267.635,269.689 268.095,270.372 268.554,269.759 269.014,267.875 269.473,264.83 269.933,260.803 270.392,256.036 270.852,250.81 271.311,245.429 271.771,240.204 272.229,235.431 272.689,231.378 273.148,228.271 273.608,226.285 274.067,225.535 274.527,226.076 274.986,227.902 275.446,230.949 275.905,235.1 276.365,240.195 276.824,246.038 277.284,252.406 277.743,259.06 278.203,265.758 278.662,272.258 279.122,278.331 279.581,283.767 280.041,288.38 280.5,292.014 280.959,294.542 281.419,295.873 281.878,295.946 282.338,294.738 282.797,292.251 283.257,288.519 283.716,283.599 284.176,277.57 284.635,270.529 285.095,262.587 285.554,253.863 286.014,244.485 286.473,234.581 286.933,224.28 287.392,213.71 287.852,202.99 288.311,192.234 288.771,181.548 289.229,171.026 289.689,160.752 290.148,150.801 290.608,141.235 291.067,132.104 291.527,123.452 291.986,115.306 292.446,107.688 292.905,100.612 293.365,94.0811 293.824,88.0923 294.284,82.6372 294.743,77.7007 295.203,73.2651 295.662,69.3071 296.122,65.8013 296.581,62.7202 297.041,60.0342 297.5,57.7139 297.959,55.7271 298.419,54.0444 298.878,52.6343 299.338,51.4683 299.797,50.5166 300.257,49.7529 300.716,49.1509 301.176,48.686 301.635,48.3364 302.095,48.0811 302.554,47.9014 303.014,47.7812 303.473,47.7051 303.933,47.6606 304.392,47.6382 304.852,47.6284 305.311,47.6255 305.771,47.625 306.229,47.625 306.689,47.6255 307.148,47.6284 307.608,47.6382 308.067,47.6606 308.527,47.7051 308.986,47.7812 309.446,47.9014 309.905,48.0811 310.365,48.3364 310.824,48.686 311.284,49.1509 311.743,49.7529 312.203,50.5166 312.662,51.4683 313.122,52.6343 313.581,54.0444 314.041,55.7271 314.5,57.7139 314.959,60.0342 315.419,62.7202 315.878,65.8013 316.338,69.3071 316.797,73.2651 317.257,77.7007 317.716,82.6372 318.176,88.0923 318.635,94.0811 319.095,100.612 319.554,107.688 320.014,115.306 320.473,123.452 320.933,132.104 321.392,141.235 321.852,150.801 322.311,160.752 322.771,171.026 323.229,181.548 323.689,192.234 324.148,202.99 324.608,213.71 325.067,224.28 325.527,234.581 325.986,244.485 326.446,253.863 326.905,262.587 327.365,270.529 327.824,277.57 328.284,283.599 328.743,288.519 329.203,292.251 329.662,294.738 330.122,295.946 330.581,295.873 331.041,294.542 331.5,292.014 331.959,288.38 332.419,283.767 332.878,278.331 333.338,272.258 333.797,265.758 334.257,259.06 334.716,252.406 335.176,246.038 335.635,240.195 336.095,235.1 336.554,230.949 337.014,227.902 337.473,226.076 337.933,225.535 338.392,226.285 338.852,228.271 339.311,231.378 339.771,235.431 340.229,240.204 340.689,245.429 341.148,250.81 341.608,256.036 342.067,260.803 342.527,264.83 342.986,267.875 343.446,269.759 343.905,270.372 344.365,269.689 344.824,267.774 345.284,264.776 345.743,260.925 346.203,256.516 346.662,251.889 347.122,247.406 347.581,243.419 348.041,240.247 348.5,238.145 348.959,237.277 349.419,237.706 349.878,239.379 350.338,242.132 350.797,245.697 351.257,249.729 351.716,253.834 352.176,257.606 352.635,260.671 353.095,262.721 353.554,263.552 354.014,263.087 354.473,261.391 354.933,258.664 355.392,255.224 355.852,251.475 356.311,247.86 356.771,244.81 357.229,242.691 357.689,241.757 358.148,242.115 358.608,243.707 359.067,246.312 359.527,249.575 359.986,253.047 360.446,256.249 360.905,258.732 361.365,260.151 361.824,260.309 362.284,259.193 362.743,256.982 363.203,254.023 363.662,250.779 364.122,247.764 364.581,245.457 365.041,244.227 365.5,244.267 365.959,245.56 366.419,247.875 366.878,250.806 367.338,253.832 367.797,256.415 368.257,258.092 368.716,258.562 369.176,257.75 369.635,255.816 370.095,253.142 370.554,250.251 371.014,247.715 371.473,246.038 371.933,245.552 372.392,246.348 372.852,248.251 373.311,250.851 373.771,253.585 374.229,255.86 374.689,257.18 375.148,257.257 375.608,256.084 376.067,253.937 376.527,251.322 376.986,248.855 377.446,247.122 377.905,246.534 378.365,247.227 378.824,249.021 379.284,251.458 379.743,253.918 380.203,255.771 380.662,256.539 381.122,256.029 381.581,254.385 382.041,252.058 382.5,249.685 382.959,247.919 383.419,247.251 383.878,247.859 384.338,249.562 384.797,251.862 385.257,254.082 385.716,255.568 386.176,255.881 386.635,254.935 387.095,253.025 387.554,250.75 388.014,248.821 388.473,247.845 388.933,248.128 389.392,249.569 389.852,251.693 390.311,253.793 390.771,255.17 391.229,255.366 391.689,254.321 392.148,252.402 392.608,250.282 393.067,248.706 393.527,248.23 393.986,249.019 394.446,250.778 394.905,252.857 395.365,254.488 395.824,255.063 396.284,254.372 396.743,252.687 397.203,250.661 397.662,249.083 398.122,248.569 398.581,249.316 399.041,251.018 399.5,252.982 399.959,254.407 400.419,254.708 400.878,253.769 401.338,251.989 401.797,250.127 402.257,248.979 402.716,249.036 403.176,250.265 403.635,252.12 404.095,253.776 404.554,254.494 405.014,253.954 405.473,252.411 405.933,250.578 406.392,249.307 406.852,249.188 407.311,250.272 407.771,252.035 408.229,253.628 408.689,254.28 409.148,253.678 409.608,252.126 410.067,250.4 410.527,249.366 410.986,249.542 411.446,250.832 411.905,252.566 412.365,253.845 412.824,254.002 413.284,252.961 413.743,251.281 414.203,249.866 414.662,249.477 415.122,250.321 415.581,251.928 416.041,253.406 416.5,253.93 416.959,253.212 417.419,251.666 417.878,250.177 418.338,249.603 418.797,250.271 419.257,251.785 419.716,253.248 420.176,253.792 420.635,253.098 421.095,251.589 421.554,250.187 422.014,249.748 422.473,250.538 422.933,252.06 423.392,253.357 423.852,253.614 424.311,252.672 424.771,251.141 425.229,250.01 425.689,250.011 426.148,251.138 426.608,252.642 427.067,253.524 427.527,253.198 427.986,251.889 428.446,250.49 428.905,249.955 429.365,250.649 429.824,252.084 430.284,253.257 430.743,253.345 431.203,252.292 431.662,250.853 432.122,250.062 432.581,250.485 433.041,251.81 433.5,253.062 433.959,253.32 434.419,252.398 434.878,250.989 435.338,250.155 435.797,250.523 436.257,251.808 436.716,253.02 437.176,253.224 437.635,252.267 438.095,250.903 438.554,250.208 439.014,250.727 439.473,252.042 439.933,253.093 440.392,253.035 440.852,251.918 441.311,250.663 441.771,250.301 442.23,251.128 442.689,252.449 443.148,253.155 443.608,252.652 444.067,251.375 444.527,250.416 444.986,250.599 445.446,251.76 445.905,252.884 446.365,252.988 446.824,251.985 447.284,250.77 447.743,250.425 448.203,251.256 448.662,252.507 449.122,253.042 449.581,252.376 450.041,251.126 450.5,250.449 450.959,250.971 451.419,252.198 451.878,252.975 452.338,252.569 452.797,251.372 453.257,250.532 453.716,250.854 454.176,252.022 454.635,252.896 455.095,252.623 455.554,251.477 456.014,250.595 456.473,250.853 456.933,251.987 457.392,252.853 457.852,252.577 458.311,251.445 458.771,250.618 459.23,250.945 459.689,252.082 460.148,252.844 460.608,252.438 461.067,251.294 461.527,250.625 461.986,251.138 462.446,252.28 462.905,252.823 463.365,252.184 463.824,251.062 464.284,250.681 464.743,251.456 465.203,252.527 465.662,252.708 466.122,251.801 466.581,250.827 467.041,250.879 467.5,251.896 467.959,252.716 468.419,252.405 468.878,251.325 469.338,250.725 469.797,251.298 470.257,252.371 470.716,252.686 471.176,251.876 471.635,250.904 472.095,250.925 472.554,251.91 473.014,252.672 473.473,252.293 473.933,251.239 474.392,250.794 474.852,251.501 475.311,252.485 475.771,252.529 476.23,251.583 476.689,250.832 477.148,251.215 477.608,252.246 478.067,252.617 478.527,251.86 478.986,250.947 479.446,251.049 479.905,252.031 480.365,252.616 480.824,252.046 481.284,251.071 481.743,250.973 482.203,251.876 482.662,252.581 483.122,252.149 483.581,251.164 484.041,250.951 484.5,251.793 484.959,252.545 485.419,252.184 485.878,251.208 486.338,250.961 486.797,251.78 487.257,252.525 487.716,252.16 488.176,251.201 488.635,250.996 489.095,251.831 489.554,252.519 490.014,252.082 490.473,251.149 490.933,251.062 491.392,251.94 491.852,252.51 492.311,251.945 492.771,251.074 493.23,251.175 493.689,252.095 494.148,252.47 494.608,251.748 495.067,251.008 495.527,251.358 495.986,252.267 496.446,252.361 496.905,251.502 497.365,251 497.824,251.621 498.284,252.406 498.743,252.147 499.203,251.249 499.662,251.108 500.122,251.941 500.581,252.439 501.041,251.823 501.5,251.068 501.959,251.372 502.419,252.245 502.878,252.293 503.338,251.442 503.797,251.065 504.257,251.769 504.716,252.407 505.176,251.942 505.635,251.139 506.095,251.315 506.554,252.177 507.014,252.296 507.473,251.479 507.933,251.09 508.392,251.777 508.852,252.383 509.311,251.888 509.771,251.134 510.23,251.401 510.689,252.229 511.148,252.201 511.608,251.368 512.067,251.169 512.527,251.944 512.986,252.345 513.446,251.675 513.905,251.111 514.365,251.641 514.824,252.327 515.284,251.957 515.743,251.191 516.203,251.394 516.662,252.198 517.122,252.161 517.581,251.353 518.041,251.236 518.5,252.019 518.959,252.274 519.419,251.54 519.878,251.163 520.338,251.834 520.797,252.312 521.257,251.713 521.716,251.155 522.176,251.676 522.635,252.298 523.095,251.854 523.554,251.185 524.014,251.554 524.473,252.257 524.933,251.958 525.392,251.23 525.852,251.469 526.311,252.21 526.771,252.025 527.229,251.275 527.689,251.417 528.148,252.17 528.608,252.062 529.067,251.309 529.527,251.393 529.986,252.145 530.446,252.075 530.905,251.326 531.365,251.391 531.824,252.136 532.284,252.066 532.743,251.326 533.203,251.41 533.662,252.145 534.122,252.037 534.581,251.31 535.041,251.45 535.5,252.167"/>
+<polygon fill="#007f00" points="320.875,195.083 324.149,203.006 326.734,194.833"/>
+<polyline fill="none" stroke="#007f00" stroke-width="0.5" points="324.148,202.99 324.149,203.006"/>
+<polyline fill="none" stroke="#000000" stroke-width="0.5" points="167.933,260.371 167.934,260.373"/>
+<polygon fill="#ffffee" points="164,256 164,264 172,264"/>
+<polygon fill="#ffffee" points="164,256 172,264 172,256"/>
+<polyline fill="none" stroke="#0000ff" stroke-width="0.5" points="164,256 164,264 172,264 172,256 164,256"/>
+<polygon fill="#ffffee" points="164,256 164,264 172,264"/>
+<polygon fill="#ffffee" points="164,256 172,264 172,256"/>
+<polyline fill="none" stroke="#0000ff" stroke-width="0.5" points="164,256 164,264 172,264 172,256 164,256"/>
+<text fill="#007f00" style="stroke:none" x="308" y="213" transform="rotate(0, 308, 213)" font-size="10" font-family="SansSerif" font-style="normal" font-weight="normal">1.6</text>
+<polygon fill="#ffffee" points="114.5,263.5 114.5,287.5 164.5,287.5"/>
+<polygon fill="#ffffee" points="114.5,263.5 164.5,287.5 164.5,263.5"/>
+<polyline fill="none" stroke="#bebebe" stroke-width="0.5" points="114.5,263.5 114.5,287.5 164.5,287.5 164.5,263.5 114.5,263.5"/>
+<text fill="#000000" style="stroke:none" x="115" y="274" transform="rotate(0, 115, 274)" font-size="10" font-family="SansSerif" font-style="normal" font-weight="normal">X: -12</text>
+<text fill="#000000" style="stroke:none" x="115" y="286" transform="rotate(0, 115, 286)" font-size="10" font-family="SansSerif" font-style="normal" font-weight="normal">Y: -0.042</text>
+<polyline fill="none" stroke="#000000" stroke-width="0.5" points="76.5,333.375 76.5,47.625"/>
+<polyline fill="none" stroke="#000000" stroke-width="0.5" points="76.5,333.375 69.6147,333.375"/>
+<polyline fill="none" stroke="#000000" stroke-width="0.5" points="76.5,292.554 69.6147,292.554"/>
+<polyline fill="none" stroke="#000000" stroke-width="0.5" points="76.5,251.732 69.6147,251.732"/>
+<polyline fill="none" stroke="#000000" stroke-width="0.5" points="76.5,210.911 69.6147,210.911"/>
+<polyline fill="none" stroke="#000000" stroke-width="0.5" points="76.5,170.089 69.6147,170.089"/>
+<polyline fill="none" stroke="#000000" stroke-width="0.5" points="76.5,129.268 69.6147,129.268"/>
+<polyline fill="none" stroke="#000000" stroke-width="0.5" points="76.5,88.4463 69.6147,88.4463"/>
+<polyline fill="none" stroke="#000000" stroke-width="0.5" points="76.5,47.625 69.6147,47.625"/>
+<polyline fill="none" stroke="#000000" stroke-width="0.5" points="76.5,312.964 72.3691,312.964"/>
+<polyline fill="none" stroke="#000000" stroke-width="0.5" points="76.5,272.143 72.3691,272.143"/>
+<polyline fill="none" stroke="#000000" stroke-width="0.5" points="76.5,231.321 72.3691,231.321"/>
+<polyline fill="none" stroke="#000000" stroke-width="0.5" points="76.5,190.5 72.3691,190.5"/>
+<polyline fill="none" stroke="#000000" stroke-width="0.5" points="76.5,149.679 72.3691,149.679"/>
+<polyline fill="none" stroke="#000000" stroke-width="0.5" points="76.5,108.857 72.3691,108.857"/>
+<polyline fill="none" stroke="#000000" stroke-width="0.5" points="76.5,68.0356 72.3691,68.0356"/>
+<text fill="#000000" style="stroke:none" x="47" y="338" transform="rotate(-0, 47, 338)" font-size="10" font-family="SansSerif" font-style="normal" font-weight="normal">-0.4</text>
+<text fill="#000000" style="stroke:none" x="48" y="298" transform="rotate(-0, 48, 298)" font-size="10" font-family="SansSerif" font-style="normal" font-weight="normal">-0.2</text>
+<text fill="#000000" style="stroke:none" x="51" y="257" transform="rotate(-0, 51, 257)" font-size="10" font-family="SansSerif" font-style="normal" font-weight="normal">0.0</text>
+<text fill="#000000" style="stroke:none" x="52" y="216" transform="rotate(-0, 52, 216)" font-size="10" font-family="SansSerif" font-style="normal" font-weight="normal">0.2</text>
+<text fill="#000000" style="stroke:none" x="51" y="175" transform="rotate(-0, 51, 175)" font-size="10" font-family="SansSerif" font-style="normal" font-weight="normal">0.4</text>
+<text fill="#000000" style="stroke:none" x="51" y="134" transform="rotate(-0, 51, 134)" font-size="10" font-family="SansSerif" font-style="normal" font-weight="normal">0.6</text>
+<text fill="#000000" style="stroke:none" x="51" y="93" transform="rotate(-0, 51, 93)" font-size="10" font-family="SansSerif" font-style="normal" font-weight="normal">0.8</text>
+<text fill="#000000" style="stroke:none" x="52" y="53" transform="rotate(-0, 52, 53)" font-size="10" font-family="SansSerif" font-style="normal" font-weight="normal">1.0</text>
+<polyline fill="none" stroke="#000000" stroke-width="0.5" points="76.5,333.375 535.5,333.375"/>
+<polyline fill="none" stroke="#000000" stroke-width="0.5" points="76.5,333.375 76.5,337.65"/>
+<polyline fill="none" stroke="#000000" stroke-width="0.5" points="133.875,333.375 133.875,337.65"/>
+<polyline fill="none" stroke="#000000" stroke-width="0.5" points="191.25,333.375 191.25,337.65"/>
+<polyline fill="none" stroke="#000000" stroke-width="0.5" points="248.625,333.375 248.625,337.65"/>
+<polyline fill="none" stroke="#000000" stroke-width="0.5" points="306,333.375 306,337.65"/>
+<polyline fill="none" stroke="#000000" stroke-width="0.5" points="363.375,333.375 363.375,337.65"/>
+<polyline fill="none" stroke="#000000" stroke-width="0.5" points="420.75,333.375 420.75,337.65"/>
+<polyline fill="none" stroke="#000000" stroke-width="0.5" points="478.125,333.375 478.125,337.65"/>
+<polyline fill="none" stroke="#000000" stroke-width="0.5" points="535.5,333.375 535.5,337.65"/>
+<text fill="#000000" style="stroke:none" x="67" y="349" transform="rotate(-0, 67, 349)" font-size="10" font-family="SansSerif" font-style="normal" font-weight="normal">-20</text>
+<text fill="#000000" style="stroke:none" x="125" y="349" transform="rotate(-0, 125, 349)" font-size="10" font-family="SansSerif" font-style="normal" font-weight="normal">-15</text>
+<text fill="#000000" style="stroke:none" x="182" y="349" transform="rotate(-0, 182, 349)" font-size="10" font-family="SansSerif" font-style="normal" font-weight="normal">-10</text>
+<text fill="#000000" style="stroke:none" x="243" y="349" transform="rotate(-0, 243, 349)" font-size="10" font-family="SansSerif" font-style="normal" font-weight="normal">-5</text>
+<text fill="#000000" style="stroke:none" x="302" y="349" transform="rotate(-0, 302, 349)" font-size="10" font-family="SansSerif" font-style="normal" font-weight="normal">0</text>
+<text fill="#000000" style="stroke:none" x="360" y="349" transform="rotate(-0, 360, 349)" font-size="10" font-family="SansSerif" font-style="normal" font-weight="normal">5</text>
+<text fill="#000000" style="stroke:none" x="414" y="349" transform="rotate(-0, 414, 349)" font-size="10" font-family="SansSerif" font-style="normal" font-weight="normal">10</text>
+<text fill="#000000" style="stroke:none" x="472" y="349" transform="rotate(-0, 472, 349)" font-size="10" font-family="SansSerif" font-style="normal" font-weight="normal">15</text>
+<text fill="#000000" style="stroke:none" x="529" y="349" transform="rotate(-0, 529, 349)" font-size="10" font-family="SansSerif" font-style="normal" font-weight="normal">20</text>
+</g>
+</svg>
index 9b71feb..294afe1 100644 (file)
@@ -9,7 +9,7 @@
 
 function %datatips_p(d)
   fun=fun2string(d.formatfunction)
-  
+
   F=getfield(1,d);
   txt=[];
   L=max(length(F(2:$)))
@@ -19,10 +19,10 @@ function %datatips_p(d)
       txt=[txt;
            part(f,1:L+1)+'= '+sci2exp(d.interpolate)]
     elseif  f=="replace" then
-       txt=[txt;
+      txt=[txt;
            part(f,1:L+1)+'= '+sci2exp(d.replace)]
     elseif  f=="formatfunction" then
-       txt=[txt;
+      txt=[txt;
            part(f,1:L+1)+': '
            '  '+fun2string(d.formatfunction)]
     elseif f=="tips" then
diff --git a/scilab/modules/graphics/macros/datatips/datatipContextMenu.sci b/scilab/modules/graphics/macros/datatips/datatipContextMenu.sci
new file mode 100644 (file)
index 0000000..8494e1e
--- /dev/null
@@ -0,0 +1,63 @@
+// Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
+// Copyright (C) 2010 - INRIA - Serge Steer <serge.steer@inria.fr>
+//
+// This file must be used under the terms of the CeCILL.
+// This source file is licensed as described in the file COPYING, which
+// you should have received as part of this distribution.  The terms
+// are also available at;
+// http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt
+function  datatipContextMenu(ax)
+//datatip utility function
+  curve_handles=datatipGetEntities(ax);
+  [curve,dmin,ptmin,l]=datatipGetNearestEntity(pt,curve_handles)
+  if curve<>[]&dmin<10 then
+    ud=datatipGetStruct(curve);
+    items=[_("Delete all datatips")
+           _("Delete all datatips for the selected curve")
+           _("Delete nearest datatip")
+           _("Delete last datatip")
+           _("Delete selected datatip")
+           _("Open curve tip style editor")
+           _("Redraw all datatips")];
+  else
+    items=[_("Delete all datatips");
+           _("Delete selected datatip")
+           _("Redraw all datatips")];
+  end
+  sel=x_choose(items,'');
+  if sel>0 then
+    select items(sel)
+    case _("Delete all datatips") then
+      datatipRemoveAll(curve_handles);
+    case _("Delete all datatips for the selected curve") then;
+      datatipRemoveAll(curve);
+    case _("Delete nearest datatip") then
+      datatipRemoveNearest(curve,pt);
+    case _("Delete last datatip") then
+      //l=size(ud.tips,'*');
+      l=size(ud.tips.children,'*');
+      if l<>0 then
+        datatipRemove(curve,1)
+      end
+    case _("Delete selected datatip") then
+      datatipDeleteSelected(curve_handles)
+    case _("Edit the curve tip display function") then
+      datatipSetDisplay(curve);
+    case _("select the curve tip display function")  then
+      datatipSelectFunction(curve);
+    case _("Enable interpolation") then
+      datatipSetInterp(curve,%T);
+    case _("Disable interpolation") then
+      datatipSetInterp(curve,%F);
+    case _("Multiple datatips mode") then
+      datatipSetReplaceMode(curve,%F);
+    case _("Unique datatip mode") then
+      datatipSetReplaceMode(curve,%t);
+    case _("Redraw all datatips") then
+      datatipRedraw(curve_handles);
+    case _("Open curve tip style editor")  then
+      datatipsGUI(curve)
+      //datatipSetStyle(curve);
+    end
+  end
+endfunction
index 9d483cf..d317ed0 100644 (file)
@@ -7,8 +7,7 @@
 // are also available at;
 // http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt
 
-
-function datatip_handle=datatipCreate(curve,index,ax)
+function tip_handle=datatipCreate(curve,index,ax)
 //add a datatip at the given location of the given curve
 //curve : handle on the curve
 //index : index of the mesh point of the curve
@@ -16,9 +15,8 @@ function datatip_handle=datatipCreate(curve,index,ax)
   if argn(2)<2 then
     error(msprintf(_("%s: Wrong number of input argument(s): At least %d expected.\n"),"datatipCreate",2))
   end
-  
-  bg=addcolor([255 255 238]/255);
-  if type(curve)<>9|and(curve.type<>["Polyline"]) then
+
+  if type(curve)<>9|size(curve,'*')<>1|and(curve.type<>["Polyline"]) then
     error(msprintf(_("%s: Wrong type for input argument #%d: A ''%s'' handle expected.\n"),"datatipCreate",1,"Polyline"))
   end
 
@@ -32,30 +30,35 @@ function datatip_handle=datatipCreate(curve,index,ax)
     ud=datatipGetStruct(curve)
   end
 
-  formatfunction=ud.formatfunction;
   if argn(2)<3 then
     ax=curve.parent
     while ax.type<>"Axes" then ax=ax.parent,end
   else
-    if type(ax)<>9|or(ax.type<>"Axes") then
+    if type(ax)<>9|size(ax,'*')<>1|or(ax.type<>"Axes") then
       error(msprintf(_( "%s: Wrong type for input argument #%d: A ''%s'' handle expected.\n"),"datatipCreate",3,"Axes"))
     end
   end
+  fig=ax.parent;
   if curve.type=="Polyline" then
     if size(index,'*')==1 then
       pt = curve.data(index,:);
+      l=index
     else
       [d,pt,ind,c]=orthProj(curve.data,index)
       if ~ud.interpolate then
-        if c<0.5 then 
+        if c<0.5 then
           pt=curve.data(ind,:)
+          l=ind
         else
           pt=curve.data(ind+1,:)
+          l=ind+1
         end
+      else
+        l=ind
       end
       index=[]
     end
-  elseif curve.type=="Plot3d" then
+  elseif curve.type=="Plot3d" then //not implemented yet
     if size(index,'*')==2 then
       pt = [curve.data.x(index(1)) curve.data.y(index(2)) curve.data.z(index(1),index(2))]
     else
@@ -63,33 +66,26 @@ function datatip_handle=datatipCreate(curve,index,ax)
       index=[]
     end
   end
-  drawlater()
+
+  id=fig.immediate_drawing;
+  fig.immediate_drawing="off"
   //create the curve marker
-  xpoly(pt(1),pt(2));point_handle=gce();
-  if size(pt,'*')==3 then point_handle.data(3)=pt(3),end
-  point_handle.mark_mode='on';
-  point_handle.mark_style=11;;
-  point_handle.mark_size_unit='point';
-  point_handle.mark_size=6;
-  point_handle.mark_background=bg;
-  point_handle.mark_foreground=curve.foreground;
-  point_handle.user_data=list(curve,index)
-  //create the text box
-  xstring(pt(1),pt(2),formatfunction(curve,pt,index))
-;
-  string_handle=gce();
-  if size(pt,'*')==3 then string_handle.data(3)=pt(3),end
-  string_handle.background=bg;
-  string_handle.foreground=color('gray');
-  string_handle.box='on';
-  string_handle.fill_mode='on';
-  string_handle.clip_state='off';
-  string_handle.user_data=0; //automatic orientation
-  setStringPosition(string_handle,pt)
-  drawnow()
-  datatip_handle= glue([string_handle,point_handle])
+  xpoly(0,0);point_handle=gce();
+  point_handle.user_data=list(curve,l)
+  xstring(0,0,'');string_handle=gce();
+  string_handle.user_data=[0,ud.style];
+  tip_handle= glue([string_handle,point_handle])
+  datatipSetTipStyle(tip_handle,ud.style)
+  if ud.tips==[] then
+    //create a compound that will contains all the curve tips
+    ud.tips=glue(tip_handle)
+    datatipSetStruct(curve,ud)
+  else
+    relocate_handle(tip_handle,ud.tips)
+  end
+
+  datatipSetTipPosition(ud,tip_handle,pt,l)
+  fig.immediate_drawing=id
+
 
-  ud.tips=[ud.tips datatip_handle]
-  //store the datatips data structure into the curve data structure
-  datatipSetStruct(curve,ud)
 endfunction
diff --git a/scilab/modules/graphics/macros/datatips/datatipCreatePopupMenu.sci b/scilab/modules/graphics/macros/datatips/datatipCreatePopupMenu.sci
new file mode 100644 (file)
index 0000000..c26559e
--- /dev/null
@@ -0,0 +1,44 @@
+// Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
+// Copyright (C) 2010 - INRIA - Serge Steer
+//
+// This file must be used under the terms of the CeCILL.
+// This source file is licensed as described in the file COPYING, which
+// you should have received as part of this distribution.  The terms
+// are also available at
+// http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt
+
+// Create a popupmenu and waits for a user input
+function h = datatipCreatePopupMenu(listOfMenus)
+//datatip utility function
+// Create a contextmenu
+  h = uicontextmenu();
+
+  // Create its items
+  createPopupItems(h, listOfMenus);
+
+  // Display and wait for a user answer
+  Cmenu = uiwait(h);
+
+endfunction
+
+function createPopupItems(parent, listOfMenus)
+
+  for menu=listOfMenus
+    if type(menu) == 10 then
+      if size(menu,'*')==1 then
+        h1 = uimenu("Parent", parent, "label", menu);
+      else
+        h1 = uimenu("Parent", parent, "label", menu(1), "callback", ...
+                    menu(2));
+      end
+    else
+      if length(menu) >= 2
+        h1 = uimenu("Parent", parent, "label", menu(1));
+        menu(1)=null();
+        createPopupItems(h1, menu);
+      else
+        error(gettext("createPopupItems: found an empty cascading menu."));
+      end
+    end
+  end
+endfunction
index e76322b..e59efce 100644 (file)
@@ -7,7 +7,6 @@
 // are also available at;
 // http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt
 
-
 function str=datatipDefaultDisplay(curve,pt,index)
   if size(pt,'*')==2 then
     str=msprintf('X: %.2g\nY: %.2g', pt(1),pt(2))
diff --git a/scilab/modules/graphics/macros/datatips/datatipDeleteSelected.sci b/scilab/modules/graphics/macros/datatips/datatipDeleteSelected.sci
new file mode 100644 (file)
index 0000000..3e9644b
--- /dev/null
@@ -0,0 +1,19 @@
+// Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
+// Copyright (C) 2010 - INRIA - Serge Steer <serge.steer@inria.fr>
+//
+// This file must be used under the terms of the CeCILL.
+// This source file is licensed as described in the file COPYING, which
+// you should have received as part of this distribution.  The terms
+// are also available at;
+// http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt
+
+function datatipDeleteSelected(curve_handles)
+//datatip utility function
+//set the selected datatip(s)
+
+  [curve,ind]=datatipGetSelected(curve_handles)
+  if ind<>[] then
+    datatipRemove(curve,ind)
+  end
+endfunction
+
index 7ca814b..f6b666c 100644 (file)
@@ -1,5 +1,5 @@
 // Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
-// Copyright (C) 2010 - INRIA - Serge Steer <serge.steer@inria.fr>
+// Copyright (C) 2010-2011 - INRIA - Serge Steer <serge.steer@inria.fr>
 //
 // This file must be used under the terms of the CeCILL.
 // This source file is licensed as described in the file COPYING, which
@@ -8,10 +8,18 @@
 // http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt
 
 function datatipEventhandler(win,x,y,ibut)
+//datatip utility function
 //The event handler which rules the datatips interactive edition;
   fig=get_figure_handle(win);
   global datatipAngles zoom_box;
   if ibut<0 then
+    if ibut==-1000 then
+      global datatipGUIwin
+      if datatipGUIwin<>[]&or(datatipGUIwin==winsid()) then //the gui window isopened
+        delete(get_figure_handle(datatipGUIwin))
+        clearglobal datatipGUIHandles datatipGUICurve datatipGUIwin
+      end
+    end
     //     ax=getAxes([x,y],fig);
     //     if or(datatipAngles<>ax.rotation_angles)|or(zoom_box<>ax.zoom_box) then
     //       datatipRedraw();
@@ -25,9 +33,32 @@ function datatipEventhandler(win,x,y,ibut)
   ax=getAxes([x,y],fig);
   sca(ax);
   //change the pixel coordinates to user coordinates
+
   [x,y]=xchange(x,y,'i2f');pt=[x,y]
+  if or(ibut==[127 100]) then //delete current
+    curve_handles=datatipGetEntities(ax);
+    datatipDeleteSelected(curve_handles)
+  elseif or(ibut==[37 39]) then //left and right arrows
+    curve_handles=datatipGetEntities(ax);
+    [curve,ind]=datatipGetSelected(curve_handles)
+    if ind<>[] then
+      ud=datatipGetStruct(curve)
+      tip_handle=ud.tips.children(ind)
+      point_handle=tip_handle.children(1)
 
-  if or(ibut==[0 3]) then //select a point on a curve
+      if ibut==39 then
+        k=point_handle.user_data(2)+1
+        if k<=size(curve.data,1) then
+          datatipSetTipPosition(ud,tip_handle,curve.data(k,:),k)
+        end
+      else
+        k=point_handle.user_data(2)-1
+        if k>=1 then
+          datatipSetTipPosition(ud,tip_handle,curve.data(k,:),k)
+        end
+      end
+    end
+  elseif or(ibut==[0 3]) then //select a point on a curve
 
     //find  curves in the current axes
     curve_handles=datatipGetEntities(ax);
@@ -51,9 +82,12 @@ function datatipEventhandler(win,x,y,ibut)
     //check for a text box present near the selected point
     [k,l]=datatipLookfor(curve_handles,pt);
     if k<>[] then;
-      ud=datatipGetStruct(curve_handles(k));
-      tip_handle=ud.tips(l);
-      datatipMove(tip_handle);
+      datatipSetSelected(curve_handles,[k,l])
+      if ibut==0 then
+        ud=datatipGetStruct(curve_handles(k));
+        tip_handle=ud.tips.children(l);
+        datatipMove(tip_handle);
+      end
       fig.event_handler_enable = "on";
       return,
     end
@@ -66,91 +100,40 @@ function datatipEventhandler(win,x,y,ibut)
         datatipInitStruct(curve);
         ud=datatipGetStruct(curve);
       end
-      if ud.replace then
-        datatipRemoveAll(curve);
-      end
-      if ud.interpolate then
-        datatipCreate(curve,ptmin);
+      if ud.replace&ud.tips.children<>[] then
+        tip_handle=ud.tips.children($)
+        if ud.interpolate then
+          datatipSetTipPosition(ud,tip_handle,ptmin,l)
+        else
+          datatipSetTipPosition(ud,tip_handle,curve.data(l,:),l)
+        end
       else
-        datatipCreate(curve,l); //
+        if ud.interpolate then
+          datatipCreate(curve,ptmin);
+        else
+          datatipCreate(curve,l); //
+        end
       end
     else
-      //      datatipRemoveAll(curve_handles)
-    end
-  elseif or(ibut==5) then
-    curve_handles=datatipGetEntities(ax);
-    [curve,dmin,ptmin,l]=datatipGetNearestEntity(pt,curve_handles)
-    if curve<>[] then
-      ud=datatipGetStruct(curve);
-      items=[_("Delete all datatips")
-             _("Delete all datatips for the selected curve")
-             _("Delete nearest datatip")
-             _("Delete last datatip")
-             _("Edit the curve tip display function")
-             _("select the curve tip display function")];
-      if ax.view=='3d' then
-        items=[items; _("Redraw all datatips")];
-      end
-      if ud.interpolate then
-        items=[items; _("Disable interpolation")];
-      else
-        items=[items;_("Enable interpolation")];
-      end
-      if ud.replace then
-        items=[items;_("Multiple datatips mode")];
-      else
-        items=[items; _("Unique datatip mode")];
-      end
-      sel=x_choose(items,'');
-      if sel>0 then
-        select items(sel)
-        case _("Delete all datatips") then
-          datatipRemoveAll(curve_handles);
-        case _("Delete all datatips for the selected curve") then;
-          datatipRemoveAll(curve);
-        case _("Delete nearest datatip") then
-          ud=datatipGetStruct(curve)
-          if typeof(ud)=='datatips' then
-            tips=ud.tips
-            dmin=%inf;l=[];
-            for tip_index=1:size(tips,'*')
-              d=norm(tips(tip_index).children(1).data(1:2)-pt(1:2))
-              if d<dmin then
-                l=tip_index;dmin=d;
-              end
-            end
-            if l<>[] then
-              datatipRemove(curve,l);
-            end
-          end
-        case _("Delete last datatip") then
-          l=size(ud.tips,'*');
-          if l<>0 then
-            datatipRemove(curve,l)
-          end
-        case _("Edit the curve tip display function") then
-          datatipSetDisplay(curve);
-        case _("select the curve tip display function")  then
-          datatipSelectFunction(curve);
-        case _("Enable interpolation") then
-          datatipSetInterp(curve,%T);
-        case _("Disable interpolation") then
-          datatipSetInterp(curve,%F);
-        case _("Multiple datatips mode") then
-          datatipSetReplaceMode(curve,%F);
-        case _("Unique datatip mode") then
-          datatipSetReplaceMode(curve,%t);
-        case _("Redraw all datatips") then
-          datatipRedraw(curve_handles);
-        end
+      //      unselect all
+      [curve,ind]=datatipGetSelected(curve_handles)
+      if ind<>[] then
+        ud=datatipGetStruct(curve);
+        tip_handle=ud.tips.children(ind);
+        datatipHilite(tip_handle) //unhilite
+        ud.selected=0
+        datatipSetStruct(curve,ud);
       end
     end
+  elseif or(ibut==5) then
+    datatipContextMenu(ax)
+
   elseif or(ibut==[1 4]) then //middle button
     curve_handles=datatipGetEntities(ax);
     [k,l]=datatipLookfor(curve_handles,pt);
     if k<>[] then;
       ud=datatipGetStruct(curve_handles(k))// the curve datatips data structure
-      tip_handle=ud.tips(l);
+      tip_handle=ud.tips.children(l);
       orient=["automatic" "upper left" "upper right", "lower left", "lower right"];
       orientations=[_("automatic") _("upper left") _("upper right"), _("lower left"), _("lower right")];
       r=x_choose(orientations,_("Select tip orientation"));
@@ -158,9 +141,13 @@ function datatipEventhandler(win,x,y,ibut)
         datatipSetOrientation(tip_handle,orient(r));
       end
     end
+  elseif ibut==1004 then //Ctrl-D
+    curve_handles=datatipGetEntities(ax);
+    datatipDeleteSelected(curve_handles)
   end
   fig.event_handler_enable = "on";
 endfunction
+
 function [curve_index,tip_index]=datatipLookfor(curve_handles,pt)
 //looks for a datatip in the neighborhood of a given point
 //curve_handles:  a vector of curves which are supposed to have datatips
@@ -170,9 +157,9 @@ function [curve_index,tip_index]=datatipLookfor(curve_handles,pt)
   for curve_index=1:size(curve_handles,'*')
     ud=datatipGetStruct(curve_handles(curve_index));
     if typeof(ud)=='datatips' then
-      tips=ud.tips;
+      tips=ud.tips.children;
       for tip_index=1:size(tips,'*')
-        data=tips(tip_index).children(1).data;
+        data=tips(tip_index).children(1).data(1,:);
         if size(data,'*')==3 then
           [xx,yy]=geom3d(data(1),data(2),data(3));
           d=pixDist([xx,yy],pt)/2;
@@ -198,7 +185,7 @@ function [curve,dmin,ptmin,l]=datatipGetNearestEntity(pt,ax)
 
   dmin=%inf;
   l=0;
-  curve=[];kmin=[]
+  curve=[];
   ptmin=[];
   if argn(2)==1 then
     //only a point given look into the axes where the point lies
@@ -214,6 +201,7 @@ function [curve,dmin,ptmin,l]=datatipGetNearestEntity(pt,ax)
                      "datatipGetNearestEntity",2,"Polyline"))
     end
   end
+  kmin=[]
   for k=1:size(curves,'*')
     ck=curves(k)
     ax=ck.parent;
@@ -256,9 +244,7 @@ function [curve,dmin,ptmin,l]=datatipGetNearestEntity(pt,ax)
       end
     end
   end
-  if kmin<>[] then
-    curve=curves(kmin)
-  end
+  curve=curves(kmin)
 endfunction
 
 function datatipSelectFunction(curve)
@@ -285,7 +271,7 @@ function datatipSetReplaceMode(curve_handle,m)
   if argn(2)==1 then m=%f,end
   if type(curve_handle)<>9|or(curve_handle.type<>"Polyline") then
     error(msprintf(_("%s: Wrong type for input argument #%d: A ''%s'' handle expected.\n"),...
-                  "datatipCreate",1,"Polyline"))
+                   "datatipCreate",1,"Polyline"))
   end
 
   ud=datatipGetStruct(curve_handle);
diff --git a/scilab/modules/graphics/macros/datatips/datatipGUIEventHandler.sci b/scilab/modules/graphics/macros/datatips/datatipGUIEventHandler.sci
new file mode 100644 (file)
index 0000000..d6ad99e
--- /dev/null
@@ -0,0 +1,13 @@
+// Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
+// Copyright (C) 2010 - INRIA - Serge Steer <serge.steer@inria.fr>
+//
+// This file must be used under the terms of the CeCILL.
+// This source file is licensed as described in the file COPYING, which
+// you should have received as part of this distribution.  The terms
+// are also available at;
+// http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt
+function datatipGUIEventHandler(win,x,y,ibut)
+  if ibut==-1000 then
+    clearglobal datatipGUIHandles datatipGUICurve datatipGUIwin
+  end
+endfunction
index fc124c5..60a9ac8 100644 (file)
@@ -7,24 +7,30 @@
 // are also available at;
 // http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt
 
-
 function curve_handles=datatipGetEntities(ax)
 //Collects all entities supporting datatips in a given axes
   curve_handles=[];
-  if argn(2)<1 then ax=gca(),end
+  if argn(2)<1 then
+    ax=gca(),
+  else
+    if type(ax)<>9|size(ax,'*')<>1|and(ax.type<>["Axes" "Compound"]) then
+      error(msprintf(_("%s: Wrong type for input argument #%d: A ''%s'' handle expected.\n"),"datatipGetEntities",1,"Axes"))
+    end
+  end
   for k=1:size(ax.children,'*')
     ck=ax.children(k);
     select ck.type
     case 'Compound' then
       curve_handles=[curve_handles datatipGetEntities(ck)]
     case 'Polyline' then
-      if size(ck.data,1)>1 then
+      if size(ck.data,1)>2 then
         curve_handles=[curve_handles ck];
       end
-//     case 'Plot3d' then
-//       if size(ck.data.x,1)>1 then
-//         curve_handles=[curve_handles ck];
-//       end
+    case 'Plot3d' then
+      //TBD
+      //the surface are ignored
+    else
+      //the other type of entities are ignored
     end
   end
 endfunction
diff --git a/scilab/modules/graphics/macros/datatips/datatipGetSelected.sci b/scilab/modules/graphics/macros/datatips/datatipGetSelected.sci
new file mode 100644 (file)
index 0000000..ccde71c
--- /dev/null
@@ -0,0 +1,22 @@
+// Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
+// Copyright (C) 2010 - INRIA - Serge Steer <serge.steer@inria.fr>
+//
+// This file must be used under the terms of the CeCILL.
+// This source file is licensed as described in the file COPYING, which
+// you should have received as part of this distribution.  The terms
+// are also available at;
+// http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt
+
+function [curve,ind]=datatipGetSelected(curve_handles)
+//datatip utility function
+//get the selected datatip(s)
+  ind=[]
+  for kc=1:size(curve_handles,'*')
+    curve=curve_handles(kc);
+    ud=datatipGetStruct(curve);
+    sel=ud.selected
+    if sel>0 then ind=sel,break,end
+  end
+  if ind==[] then curve=[],end
+endfunction
+
index 970215f..e54d042 100644 (file)
@@ -9,8 +9,16 @@
 
 function t=datatipGetStruct(curve)
 //to be customized when a specific field will be dedicated to datatips
-  if argn(2)<>1 then
-    error(msprintf(_("%s: Wrong number of input argument(s): %d expected.\n"),"datatipGetStruct",1))
+  if type(curve)<>9|size(curve,'*')<>1 then
+    error(msprintf(_("%s: Wrong type for input argument #%d: Graphic handle expected.\n"),"datatipGetStruct",1))
+  end
+
+  u_d=get(curve,'user_data')
+  if  typeof(u_d)=="datatips" then //compatibility
+    t=u_d
+  elseif typeof(u_d)=="st"&isfield(u_d,"datatips")
+    t=u_d.datatips
+  else
+    t=[]
   end
-  t=curve.user_data
 endfunction
diff --git a/scilab/modules/graphics/macros/datatips/datatipHilite.sci b/scilab/modules/graphics/macros/datatips/datatipHilite.sci
new file mode 100644 (file)
index 0000000..68a19ca
--- /dev/null
@@ -0,0 +1,29 @@
+// Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
+// Copyright (C) 2010 - INRIA - Serge Steer <serge.steer@inria.fr>
+//
+// This file must be used under the terms of the CeCILL.
+// This source file is licensed as described in the file COPYING, which
+// you should have received as part of this distribution.  The terms
+// are also available at;
+// http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt
+
+function datatipHilite(datatip_handle)
+//datatip utility function
+  point_handle=datatip_handle.children(1)
+  string_handle=datatip_handle.children(2)
+  style=string_handle.user_data(2);
+  if style(1)==1 then
+    if point_handle.mark_background==point_handle.mark_foreground then
+      point_handle.mark_background=addcolor([255 255 238]/255);
+    else
+      point_handle.mark_background=point_handle.mark_foreground;
+    end
+  else
+    if point_handle.mark_mode=="on" then
+      point_handle.mark_mode="off"
+    else
+      point_handle.mark_mode="on"
+    end
+
+  end
+endfunction
index ea026b7..370cbe7 100644 (file)
@@ -7,7 +7,6 @@
 // are also available at;
 // http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt
 
-
 function ok=datatipInitStruct(curve_handle,varargin)
 //This function is used to initialize the data structure dedicated to
 //data tips handling.;
@@ -18,37 +17,79 @@ function ok=datatipInitStruct(curve_handle,varargin)
   if argn(2)<1 then
     error(msprintf(_("%s: Wrong number of input argument(s): At least %d expected.\n"),"datatipInitStruct",1))
   end
+  if type(curve_handle)<>9|size(curve_handle,'*')<>1|curve_handle.type<>"Polyline" then
+    error(msprintf(_("%s: Wrong type for input argument #%d: A ''%s'' handle expected.\n"),"datatipInitStruct",1,"Polyline"))
+  end
+  ok=%t;
+  ud=datatipGetStruct(curve_handle);
+  if typeof(ud)<>"datatips" then
+    //Create structure and set  default values
+    ud=tlist(["datatips","style","interpolate","replace", "formatfunction",      "tips","selected"],..
+             [1 1 1],     %t,          %t,      datatipDefaultDisplay,  [],      0);
+  end
+  //loop on argument pairs
+  for k=1:2:size(varargin)
+    key=varargin(k)
+    wh=find(key==["interpolate","replace","formatfunction","style","selected"])
+    if wh==[] then  ud(1)=[ud(1) key];end //add a new property
 
-  ok=%t
-  ud=datatipGetStruct(curve_handle)
-  if typeof(ud)<>'datatips' then;
-    if prod(size(ud))==0 then
-      ud=tlist(['datatips','interpolate','replace','formatfunction','tips'],%f,%t,datatipDefaultDisplay,[])
-      for k=1:2:size(varargin)
-        key=varargin(k)
-        if and(key<>['interpolate','replace','formatfunction']) then
-          ud(1)=[ud(1) key]
-        end
-        if key<>'formatfunction' then
-          ud(key)=varargin(k+1)
+    select key
+    case "style" then
+      style=varargin(k+1)
+      if type(style)<>1|~isreal(style) then
+        error(msprintf(_("%s: Wrong type for input argument #%d: Real matrix expected.\n"),..
+                       "datatipInitStruct",k+1))
+      end
+      if size(style,'*')<>2 then
+        error(msprintf(_("%s: Wrong size for input argument #%d: A %d elements array expected.\n"),..
+                       "datatipInitStruct",k+1,2))
+      end
+      if and(style(1)<>[1 2]) then
+        error(msprintf(_("%s: Wrong value for input argument #%d(1): Must be between %d and %d.\n"),..
+                       "datatipInitStruct",k+1,1,2))
+      end
+      if and(style(2)<>[0 1]) then
+        error(msprintf(_("%s: Wrong value for input argument #%d(2): Must be between %d and %d.\n"),..
+                       "datatipInitStruct",k+1,0,1))
+
+      end
+      ud(key)=style
+    case "interpolate" then
+      interpolate=varargin(k+1)
+      if type(interpolate)<>4|size(interpolate,'*')<>1 then
+        error(msprintf(_("%s: Wrong type for input argument #%d: A boolean expected.\n"),..
+                       "datatipInitStruct",k+1))
+      end
+      ud(key)=interpolate
+    case "replace" then
+      replace=varargin(k+1)
+      if type(replace)<>4|size(replace,'*')<>1 then
+        error(msprintf(_("%s: Wrong type for input argument #%d: A boolean expected.\n"),..
+                       "datatipInitStruct",k+1))
+      end
+      ud(key)=replace
+    case "formatfunction" then
+      if exists(varargin(k+1))==1 then
+        ffun=eval(varargin(k+1))
+        if or(type(ffun)==[11 13]) then
+          ud(key)=eval(varargin(k+1))
         else
-          if exists(varargin(k+1))==1 then
-            ffun=eval(varargin(k+1))
-            if or(type(ffun)==[11 13]) then
-              ud(key)=eval(varargin(k+1))
-            else
-              ud(key)=datatipDefaultDisplay
-            end
-          else
-            ud(key)=datatipDefaultDisplay
-          end
-;
+          ud(key)=datatipDefaultDisplay
         end
+      else
+        ud(key)=datatipDefaultDisplay
+      end
+    case "selected"
+      selected=varargin(k+1)
+      if type(selected)<>1|~isreal(selected)|size(selected,'*')<>1|selected<0 then
+        error(msprintf(_("%s: Wrong type for input argument #%d: Non-negative int expected.\n"),..
+                       "datatipInitStruct",k+1))
       end
+      ud(key)=selected
     else
-      ok=%f
-      warning(msprintf(_("Data tips cannot be attached to this curve,\nthe user_data field is already used")))
+      //user defined property (no tests)
+      ud(key)=varargin(k+1)
     end
   end
-  datatipSetStruct(curve_handle,ud)
+  ok=datatipSetStruct(curve_handle,ud)
 endfunction
index b03556e..3bd878d 100644 (file)
@@ -11,7 +11,7 @@ function datatipManagerMode(varargin)
 //Toggle or sets the interactive mode for datatips edition.;
 //  This function is called by the datatips menu callbacks.;
   global datatipAngles; //to be able to detect that a rotation occurred
-  old=[] //to preserve cuurent figure
+  old=[] //to preserve current figure
   if winsid()<>[] then  old=gcf();end
   select size(varargin)
   case 0 then //toggle mode
@@ -44,8 +44,31 @@ function datatipManagerMode(varargin)
   else
     error(msprintf(_("%s: too many input arguments"),'datatipManagerMode'))
   end
+  fig_ud=get(fig,"user_data")
+  if action =="toggle" then
+    if fig.event_handler <> "datatipEventhandler" then
+      action="on"
+    elseif fig.event_handler_enable == "on"
+      action="off"
+    else
+      action="on"
+    end
+  end
   select action
   case 'on'
+    if fig.event_handler<>""& fig.event_handler<>"datatipEventhandler" then
+      //push current event handler in fig user data if possible
+      if fig_ud==[] then fig_ud=struct();end
+      if typeof(fig_ud)=="st" then
+        if ~isfield(fig_ud,"handlers") then  fig_ud.handlers=[],end
+        fig_ud.handlers=[fig_ud.handlers;
+                         fig.event_handler fig.event_handler_enable]
+        set(fig,"user_data",fig_ud)
+      else
+        warning(_("Datatip manager cannot be enabled, user data figure field is already used" ))
+        return
+      end
+    end
     fig.event_handler_enable = "off" //to prevent against bug 7855
     fig.event_handler = "datatipEventhandler"
     fig.event_handler_enable = "on"
@@ -53,27 +76,15 @@ function datatipManagerMode(varargin)
     show_window(fig)
   case 'off'
     fig.event_handler_enable = "off"
-    clearglobal datatipAngles
-    xinfo("")
-  case 'toggle'
-    if  fig.event_handler_enable == "on" then
-      fig.event_handler_enable = "off"
-      if fig.event_handler <> "datatipEventhandler" then
-        fig.event_handler = "datatipEventhandler"
-        fig.event_handler_enable = "on"
-        xinfo(_("Left click on a curve to create a datatip, right opens"+...
-                " contextual menu"))
-      else
-        clearglobal datatipAngles
-        xinfo("")
-      end
-      
+    if typeof(fig_ud)=="st"&isfield(fig_ud,"handlers")&fig_ud.handlers<>[] then
+      fig.event_handler=fig_ud.handlers($,1)
+      fig.event_handler_enable=fig_ud.handlers($,2)
+      fig_ud.handlers= fig_ud.handlers(1:$-1,:)
+      set(fig,"user_data",fig_ud)
     else
-      fig.event_handler_enable = "off" //to prevent against bug 7855
-      fig.event_handler = "datatipEventhandler"
-      fig.event_handler_enable = "on"
-      xinfo(_("Left click on a curve to create a datatip, right opens contextual menu"))
-      show_window(fig)
+      fig.event_handler_enable = "off"
     end
+    clearglobal datatipAngles
+    xinfo("")
   end
 endfunction
index af05ccd..90b906b 100644 (file)
@@ -14,7 +14,7 @@ function datatipMove(tip_handle,ax)
     error(msprintf(_("%s: Wrong number of input argument(s): At least %d expected.\n"),"datatipMove",1))
   end
 
-  if type(tip_handle)<>9|or(tip_handle.type<>"Compound") then
+  if type(tip_handle)<>9|size(tip_handle,'*')<>1|or(tip_handle.type<>"Compound") then
     error(msprintf(_("%s: Wrong type for input argument #%d: A ''%s'' handle expected.\n"),"datatipMove",1,"datatip"))
   end
 
@@ -22,39 +22,27 @@ function datatipMove(tip_handle,ax)
     ax=tip_handle.parent
     while ax.type<>"Axes" then ax=ax.parent,end
   else
-    if type(ax)<>9|or(ax.type<>"Axes") then
+    if type(ax)<>9|size(ax,'*')<>1|or(ax.type<>"Axes") then
       error(msprintf(_( "%s: Wrong type for input argument #%d: A ''%s'' handle expected.\n"),"datatipMove",2,"Axes"))
     end
   end
-  point_handle=tip_handle.children(1)
-  string_handle=tip_handle.children(2)
-  tip_refs=point_handle.user_data
-  [curve_handle,point_index]=tip_refs(:)
+  curve_handle=tip_handle.children(1).user_data(1)
   data=curve_handle.data //the curve data points
   ud=datatipGetStruct(curve_handle);
-  formatfunction=ud.formatfunction;
-  interpolate=ud.interpolate;
-  np=size(data,1)
+
   if ax.view=="3d"&curve_handle.type=="Polyline" then
     [xx,yy]=geom3d(data(:,1),data(:,2),data(:,3))
     data=[xx,yy]
   end
+
   rep=[0 0 -1];
-  if ~interpolate then //position restricted to knots
+  if ~ud.interpolate then //position restricted to knots
+    np=size(data,1)
     while rep(3)==-1
       rep=xgetmouse([%t %t])
       //find data point which is at minimum distance to the pointer
       [m,k]=min(sum((data-ones(np,1).*.rep(1:2)).^2,2))
-      pt=curve_handle.data(k,:)
-      lab=formatfunction(curve_handle,pt,k)
-      r=xstringl(0,0,lab);r=r(3:4)'
-      drawlater()
-      point_handle.data=pt
-      tip_refs(2)=k;
-      point_handle.user_data=tip_refs
-      string_handle.text=lab
-      setStringPosition(string_handle,pt)
-      drawnow()
+      datatipSetTipPosition(ud,tip_handle,curve_handle.data(k,:),k)
     end
   else //interpolated position
     while rep(3)==-1
@@ -65,15 +53,7 @@ function datatipMove(tip_handle,ax)
         if ax.view=="3d"&curve_handle.type=="Polyline" then
           pt=curve_handle.data(k,:)+c*(curve_handle.data(k+1,:)-curve_handle.data(k,:))
         end
-        lab=formatfunction(curve_handle,pt,k)
-        r=xstringl(0,0,lab);r=r(3:4)'
-        drawlater()
-        point_handle.data=pt
-        tip_refs(2)=k;
-        point_handle.user_data=tip_refs
-        string_handle.text=lab
-        setStringPosition(string_handle,pt)
-        drawnow()
+        datatipSetTipPosition(ud,tip_handle,pt,k)
       end
     end
   end
diff --git a/scilab/modules/graphics/macros/datatips/datatipRadioCallback.sci b/scilab/modules/graphics/macros/datatips/datatipRadioCallback.sci
new file mode 100644 (file)
index 0000000..b5f904f
--- /dev/null
@@ -0,0 +1,50 @@
+// Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
+// Copyright (C) 2010 - INRIA - Serge Steer <serge.steer@inria.fr>
+//
+// This file must be used under the terms of the CeCILL.
+// This source file is licensed as described in the file COPYING, which
+// you should have received as part of this distribution.  The terms
+// are also available at;
+// http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt
+
+function datatipRadioCallback(key,v)
+  global datatipGUIHandles datatipGUICurve
+  Keys=["sty" "lab" "box" "pos" "mul"]
+  i=find(key==Keys)
+  if v then 
+     datatipGUIHandles(i,1).value=1
+     datatipGUIHandles(i,2).value=0
+  else 
+     datatipGUIHandles(i,1).value=0
+     datatipGUIHandles(i,2).value=1
+  end
+  if i<=3 then
+    ud=datatipGetStruct(datatipGUICurve)
+    style=ud.style
+  end
+  select key
+  case "sty"
+    style(1)=bool2s(~v)+1
+  case "lab"
+    style(3)=bool2s(v)
+  case "box"
+    style(2)=bool2s(v)
+  case "pos"
+    datatipSetInterp(datatipGUICurve,~v);
+  case "mul"
+    datatipSetReplaceMode(datatipGUICurve,~v);
+  end
+  
+  if i<=3 then
+    ud.style=style
+    datatipSetStruct(datatipGUICurve,ud)
+    fig=datatipGUICurve.parent
+    while fig.type<>"Figure" then fig=fig.parent,end
+    id=fig.immediate_drawing;
+    fig.immediate_drawing="off"
+    for i=1:size(ud.tips.children,'*')
+      datatipSetTipStyle(ud.tips.children(i),style)
+    end
+    fig.immediate_drawing=id
+  end
+endfunction
index a99c355..74fe2ac 100644 (file)
@@ -9,28 +9,50 @@
 
 function datatipRedraw(curve_handles)
 //Recomputes the datatip text box position after a rotation
-  
+
 //These coordinates must be expressed in user coordinates units but their
 //computation takes into account the pixel dimensions of the text boxes
 //when they are not located in the upper right position. So during
 //rotation or zoom the  text box positions has to be recomputed.
-  
-    drawlater()
-    if argn(2)<>1 then //search for curves in the current axes
-      curve_handles=datatipGetEntities()
-    end
-    if size(curve_handles,"*")==1&curve_handles.type=="axes" then
-      //the argument is a handle on an axes, search for curves in it
-      curve_handles=datatipGetEntities(curve_handles)
-    end
+
+
+  if argn(2)<>1 then //search for curves in the current axes
+    ax=gca()
+    curve_handles=datatipGetEntities(ax)
+  elseif type(curve_handles)<>9 then
+    error(msprintf(_("%s: Wrong type for input argument #%d: an array of graphic handle expected.\n"),"datatipRedraw",1))
+  elseif size(curve_handles,"*")==1&curve_handles.type=="Axes" then
+    //the argument is a handle on an axes, search for curves in it
+    ax=curve_handles
+    curve_handles=datatipGetEntities(ax)
+  elseif and(curve_handles<>"Figure") then
+    //check for a common axes entity for parent
+    ax=[]
     for k=1:size(curve_handles,'*')
-      ud=datatipGetStruct(curve_handles(k))
-      for l=1:size(ud.tips,'*')
-        tip_handle=ud.tips(l)
+      a=curve_handles(k)
+      while a.type<>"Axes" then a=a.parent,end
+      if ax<>[]&a<>ax then
+        error(msprintf(_("%s: Wrong value for input argument #%d: the handles must have the same parent.\n"),"datatipRedraw",1))
+      end
+      ax=a
+    end
+  else
+    error(msprintf(_("%s: Wrong type for input argument #%d: handle on axes or axes children expected.\n"),"datatipRedraw",1))
+  end
+
+  fig=ax.parent
+  id=fig.immediate_drawing;
+  fig.immediate_drawing="off"
+
+  for k=1:size(curve_handles,'*')
+    ud=datatipGetStruct(curve_handles(k))
+    if  typeof(ud)=='datatips' then
+      for l=1:size(ud.tips.children,'*')
+        tip_handle=ud.tips.children(l)
         point_handle=tip_handle.children(1)
-        string_handle=tip_handle.children(2)
-        setStringPosition(string_handle,point_handle.data)
+        setStringPosition(tip_handle,point_handle.data)
       end
     end
-    drawnow()
+  end
+  fig.immediate_drawing=id
 endfunction
index 0d1c8f3..c21444a 100644 (file)
@@ -9,21 +9,24 @@
 
 function datatipRemove(handle,ind)
   if argn(2)<1 then
-    error(msprintf(_("%s: Wrong number of input argument(s): At least %d expected.\n"),"datatipRemove",1))
+    error(msprintf(_("%s: Wrong number of input argument(s): At least %d expected.\n"),...
+                   "datatipRemove",1))
   end
 
-  drawlater()
+
   if argn(2)==1 then //handle on a tip
-    if type(handle)<>9|or(handle.type<>"Compound") then
-      error(msprintf(_("%s: Wrong type for input argument #%d: A ''%s'' handle expected.\n"),"datatipRemove",1,"datatip"))
+    if type(handle)<>9|size(handle,'*')<>1|or(handle.type<>"Compound") then
+      error(msprintf(_("%s: Wrong type for input argument #%d: A ''%s'' handle expected.\n"),...
+                     "datatipRemove",1,"datatip"))
     end
     ind=[]
-    curve_handles=datatipGetEntities(handle.parent)
+
+    curve_handles=datatipGetEntities(ax)
     for k=1:size(curve_handles,'*')
       ck=curve_handles(k)
       ud=datatipGetStruct(ck);
       if typeof(ud)=='datatips' then
-        ind=find(ud.tips==handle)
+        ind=find(ud.tips.children==handle)
         if ind<>[] then
           curve_handle=ck
           break
@@ -34,19 +37,21 @@ function datatipRemove(handle,ind)
   else
     curve_handle=handle;
     if type(curve_handle)<>9|or(curve_handle.type<>"Polyline") then
-      error(msprintf(_("%s: Wrong type for input argument #%d: A ''%s'' handle expected.\n"),"datatipRemove",1,"Polyline"))
+      error(msprintf(_("%s: Wrong type for input argument #%d: A ''%s'' handle expected.\n"),...
+                     "datatipRemove",1,"Polyline"))
     end
   end
 
   ud=datatipGetStruct(curve_handle);// the curve datatips data structure
   if  typeof(ud)<>'datatips' then return,end
-  if ind<=size(ud.tips,'*') then
-    tips=ud.tips;
+  tips=ud.tips.children
+  if ind<=size(tips,'*') then
     del=tips(ind)
-    tips(ind)=[]
-    ud.tips=tips
+    if ud.selected==ind then
+      ud.selected=0;
+      datatipSetStruct(curve_handle,ud);
+    end
     delete(del);
-    datatipSetStruct(curve_handle,ud)
   end
-  drawnow()
+
 endfunction
index f52bd98..7f2512a 100644 (file)
@@ -9,20 +9,44 @@
 
 function datatipRemoveAll(curve_handles)
 //remove all the datatips for the given curves
-  if argn(2)<1 then
-    error(msprintf(_("%s: Wrong number of input argument(s): %d expected.\n"),"datatipRemoveAll",1))
+  if argn(2)<>1 then //search for curves in the current axes
+    ax=gca()
+    curve_handles=datatipGetEntities(ax)
+  elseif type(curve_handles)<>9 then
+    error(msprintf(_("%s: Wrong type for input argument #%d: an array of graphic handle expected.\n"),"datatipRemoveAll",1))
+  elseif size(curve_handles,"*")==1&curve_handles.type=="Axes" then
+    //the argument is a handle on an axes, search for curves in it
+    ax=curve_handles
+    curve_handles=datatipGetEntities(ax)
+  elseif and(curve_handles<>"Figure") then
+    //check for a common axes entity for parent
+    ax=[]
+    for k=1:size(curve_handles,'*')
+      a=curve_handles(k)
+      while a.type<>"Axes" then a=a.parent,end
+      if ax<>[]&a<>ax then
+        error(msprintf(_("%s: Wrong value for input argument #%d: the handles must have the same parent.\n"),"datatipRemoveAll",1))
+      end
+      ax=a
+    end
+  else
+    error(msprintf(_("%s: Wrong type for input argument #%d: handle on axes or axes children expected.\n"),"datatipRemoveAll",1))
   end
 
-  drawlater()
+
+  fig=ax.parent
+  id=fig.immediate_drawing;
+  fig.immediate_drawing="off"
 
   for k=1:size(curve_handles,'*')
     ck=curve_handles(k);
     ud=datatipGetStruct(ck)// the curve datatips data structure
     if typeof(ud)=='datatips' then
-      for i=1:size(ud.tips,'*'), delete(ud.tips(i));end
+      delete(ud.tips);
       ud.tips=[]
+      ud.selected=0;
       datatipSetStruct(ck,ud)
     end
   end
-  drawnow()
+  fig.immediate_drawing=id
 endfunction
diff --git a/scilab/modules/graphics/macros/datatips/datatipRemoveNearest.sci b/scilab/modules/graphics/macros/datatips/datatipRemoveNearest.sci
new file mode 100644 (file)
index 0000000..19c641f
--- /dev/null
@@ -0,0 +1,27 @@
+// Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
+// Copyright (C) 2010 - INRIA - Serge Steer <serge.steer@inria.fr>
+//
+// This file must be used under the terms of the CeCILL.
+// This source file is licensed as described in the file COPYING, which
+// you should have received as part of this distribution.  The terms
+// are also available at;
+// http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt
+
+function datatipRemoveNearest(curve,pt)
+//datatip utility function
+  ud=datatipGetStruct(curve)
+  if typeof(ud)=='datatips' then
+    tips=ud.tips.children
+    dmin=%inf;l=[];
+    pt=pt(:);
+    for tip_index=1:size(tips,'*')
+      d=norm(tips(tip_index).children(1).data(1:2)-pt(1:2))
+      if d<dmin then
+        l=tip_index;dmin=d;
+      end
+    end
+    if l<>[] then
+      datatipRemove(curve,l);
+    end
+  end
+endfunction
index cc548a2..8cf052e 100644 (file)
@@ -7,21 +7,23 @@
 // are also available at;
 // http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt
 
-
 function datatipSetDisplay(curve_handle,fun)
 //Changes the datatips visualisation function for a given curve
   if argn(2)<1 then
-    error(msprintf(_("%s: Wrong number of input argument(s): At least %d expected.\n"),"datatipSetDisplay",1))
+    error(msprintf(_("%s: Wrong number of input argument(s): At least %d expected.\n"),...
+                   "datatipSetDisplay",1))
   end
-
-  ud=datatipGetStruct(curve_handle)
-  if typeof(ud)<>'datatips' then;
+  if type(curve_handle)<>9|size(curve_handle,'*')<>1|curve_handle.type<>"Polyline" then
+    error(msprintf(_("%s: Wrong type for input argument #%d: A ''%s'' handle expected.\n"),"datatipSetDisplay",1,"Polyline"))
+  end
+  ds=datatipGetStruct(curve_handle)
+  if  typeof(ds)<>'datatips' then;
     if ~datatipInitStruct(curve_handle) then return,end
-    ud=datatipGetStruct(curve_handle)
+    ds=datatipGetStruct(curve_handle)
   end
   if argn(2)==1 then
     // function definition is queried
-    txt=fun2string(ud.formatfunction,'fun')
+    txt=fun2string(ds.formatfunction,'fun')
     while %t then
       txt=x_dialog('Function Editor',txt)
       if txt==[] then ok=%f,break,end
@@ -32,14 +34,15 @@ function datatipSetDisplay(curve_handle,fun)
     if ~ok then return,end
   end
   if ~datatipCheckFunction(fun) then return,end
-  ud.formatfunction=fun
-  datatipSetStruct(curve_handle,ud)
-  for k=1:size(ud.tips,'*')
-    tip_handle=ud.tips(k)
+  ds.formatfunction=fun
+  datatipSetStruct(curve_handle,ds)
+  for k=1:size(ds.tips,'*')
+    tip_handle=ds.tips(k)
     point_handle=tip_handle.children(1)
     string_handle=tip_handle.children(2)
     tip_index=point_handle.user_data(2)
     string_handle.text=fun(curve_handle,point_handle.data)
+    datatipSetTipStyle(tip_handle,ds.style)
   end
 
 endfunction
diff --git a/scilab/modules/graphics/macros/datatips/datatipSetGUI.sci b/scilab/modules/graphics/macros/datatips/datatipSetGUI.sci
new file mode 100644 (file)
index 0000000..576c75e
--- /dev/null
@@ -0,0 +1,59 @@
+// Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
+// Copyright (C) 2010 - INRIA - Serge Steer <serge.steer@inria.fr>
+//
+// This file must be used under the terms of the CeCILL.
+// This source file is licensed as described in the file COPYING, which
+// you should have received as part of this distribution.  The terms
+// are also available at;
+// http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt
+function datatipSetGUI()
+  global datatipGUIwin
+  if datatipGUIwin==[] then return,end
+  global datatipGUIHandles datatipGUICurve
+  ud=datatipGetStruct(datatipGUICurve)
+  if typeof(ud)<>'datatips' then
+    //no datatips structure yet, initialize it
+    if ~datatipInitStruct(curve) then
+      return
+    end
+    ud=datatipGetStruct(curve)
+  end
+  style=ud.style
+  if style(1)==1 then
+    datatipGUIHandles(1,1).value=1
+    datatipGUIHandles(1,2).value=0
+  else
+    datatipGUIHandles(1,1).value=0
+    datatipGUIHandles(1,2).value=1
+  end
+  if style(3)==1 then
+    datatipGUIHandles(2,1).value=1
+    datatipGUIHandles(2,2).value=0
+  else
+    datatipGUIHandles(2,1).value=0
+    datatipGUIHandles(2,2).value=1
+  end
+  if style(2)==1 then
+    datatipGUIHandles(3,1).value=1
+    datatipGUIHandles(3,2).value=0
+  else
+    datatipGUIHandles(3,1).value=0
+    datatipGUIHandles(3,2).value=1
+  end
+  if ~ud.interpolate then
+    datatipGUIHandles(4,1).value=1
+    datatipGUIHandles(4,2).value=0
+  else
+    datatipGUIHandles(4,1).value=0
+    datatipGUIHandles(4,2).value=1
+  end
+  if ~ud.replace then
+    datatipGUIHandles(5,1).value=1
+    datatipGUIHandles(5,2).value=0
+  else
+    datatipGUIHandles(5,1).value=0
+    datatipGUIHandles(5,2).value=1
+  end
+endfunction
+
index 23c7539..9bee64a 100644 (file)
@@ -12,16 +12,18 @@ function datatipSetInterp(curve_handle,m)
 // curve_handle : a handle on a polyline
 // m            : %t (interpolation active) or %f
   if argn(2)<1 then
-    error(msprintf(_("%s: Wrong number of input argument(s): At least %d expected.\n"),"datatipSetInterp",1))
+    error(msprintf(_("%s: Wrong number of input argument(s): At least %d expected.\n"),...
+                   "datatipSetInterp",1))
   end
 
   if argn(2)==1 then m=%f,end
-  if type(curve_handle)<>9|or(curve_handle.type<>"Polyline") then
-    error(msprintf(_("%s: Wrong type for input argument #%d: A ''%s'' handle expected.\n"),"datatipSetInterp",1,"Polyline"))
+  if type(curve_handle)<>9|size(curve_handle,'*')<>1|or(curve_handle.type<>"Polyline") then
+    error(msprintf(_("%s: Wrong type for input argument #%d: A ''%s'' handle expected.\n"),...
+                   "datatipSetInterp",1,"Polyline"))
   end
 
   ud=datatipGetStruct(curve_handle)
-  if typeof(ud)<>'datatips' then;
+  if typeof(ud)<>"datatips" then;
     datatipInitStruct(curve_handle)
     ud=datatipGetStruct(curve_handle)
   end
index 5664cbb..4515d32 100644 (file)
@@ -7,22 +7,23 @@
 // are also available at;
 // http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt
 
-
 function datatipSetOrientation(tip_handle,o)
   if argn(2)<>2 then
-    error(msprintf(_("%s: Wrong number of input argument(s): %d expected.\n"),"datatipSetOrientation",2))
+    error(msprintf(_("%s: Wrong number of input argument(s): %d expected.\n"),...
+                   "datatipSetOrientation",2))
   end
   orientations=["automatic" "upper left" "upper right", "lower left","lower right"]
-  if type(tip_handle)<>9|or(tip_handle.type<>"Compound") then
-    error(msprintf(_("%s: Wrong type for input argument #%d: A ''%s'' handle expected.\n"),"datatipSetOrientation",1,"datatip"))
+  if type(tip_handle)<>9|size(tip_handle,'*')<>1|or(tip_handle.type<>"Compound") then
+    error(msprintf(_("%s: Wrong type for input argument #%d: A ''%s'' handle expected.\n"),...
+                   "datatipSetOrientation",1,"datatip"))
   end
 
   k=find(orientations==convstr(o))
   if k<>[] then
     string_handle=tip_handle.children(2)
     point_handle=tip_handle.children(1)
-    string_handle.user_data=k-1
-    setStringPosition(string_handle, point_handle.data)
+    string_handle.user_data(1)=k-1
+    setStringPosition(tip_handle, point_handle.data)
     drawnow()
   end
 endfunction
diff --git a/scilab/modules/graphics/macros/datatips/datatipSetSelected.sci b/scilab/modules/graphics/macros/datatips/datatipSetSelected.sci
new file mode 100644 (file)
index 0000000..45c2988
--- /dev/null
@@ -0,0 +1,38 @@
+// Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
+// Copyright (C) 2010 - INRIA - Serge Steer <serge.steer@inria.fr>
+//
+// This file must be used under the terms of the CeCILL.
+// This source file is licensed as described in the file COPYING, which
+// you should have received as part of this distribution.  The terms
+// are also available at;
+// http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt
+
+function datatipSetSelected(curve_handles,tip_indices)
+//datatip utility function
+//set the selected datatip(s)
+
+  [curve,ind]=datatipGetSelected(curve_handles)
+  //unselect the current datatip if any
+  if ind<>[] then
+    ud=datatipGetStruct(curve);
+    tips=ud.tips.children
+    tip_handle=tips(ind);
+    datatipHilite(tip_handle) //unhilite
+    ud.selected=0
+    datatipSetStruct(curve,ud);
+  end
+
+  //select the new one
+  if tip_indices<>[] then
+    k=tip_indices(1);
+    l=tip_indices(2);
+    curve=curve_handles(k);
+    ud=datatipGetStruct(curve);
+    tips=ud.tips.children
+    tip_handle=tips(l);
+    datatipHilite(tip_handle)  //hilite
+    ud.selected=l
+    datatipSetStruct(curve,ud);
+  end
+endfunction
+
index 64ca919..6c303de 100644 (file)
@@ -7,9 +7,33 @@
 // are also available at;
 // http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt
 
-function datatipSetStruct(curve,t)
+function ok=datatipSetStruct(curve,t)
   if argn(2)<>2 then
-    error(msprintf(_("%s: Wrong number of input argument(s): %d expected.\n"),"datatipSetStruct",2))
+    error(msprintf(_("%s: Wrong number of input argument(s): %d expected.\n"),...
+                   "datatipSetStruct",2))
   end
-  set(curve,'user_data',t)
+  if type(curve)<>9|size(curve,'*')<>1|or(curve.type<>"Polyline") then
+    error(msprintf(_("%s: Wrong type for input argument #%d: A ''%s'' handle expected.\n"),...
+                   "datatipSetType",1,"Polyline"))
+  end
+
+  ok=%t
+  %datatips_i_s=generic_i_s
+  %datatips_i_st=generic_i_st
+  u_d=get(curve,'user_data')
+  if u_d==[] then
+    u_d.datatips=t
+  else
+    if typeof(u_d)=="st"  then
+      u_d.datatips=t
+    elseif typeof(u_d)=="datatips" //for compatibilty
+      u.datatips=u_d
+      u_d=u
+    else
+      ok=%f
+      warning(msprintf(_("%s: Wrong type for curve user_data field: a struct expected.\n"),...
+                       "datatipSetStruct"))
+    end
+  end
+  set(curve,'user_data',u_d)
 endfunction
diff --git a/scilab/modules/graphics/macros/datatips/datatipSetStyle.sci b/scilab/modules/graphics/macros/datatips/datatipSetStyle.sci
new file mode 100644 (file)
index 0000000..b66a82d
--- /dev/null
@@ -0,0 +1,82 @@
+// Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
+// Copyright (C) 2011 - INRIA - Serge Steer <serge.steer@inria.fr>
+//
+// This file must be used under the terms of the CeCILL.
+// This source file is licensed as described in the file COPYING, which
+// you should have received as part of this distribution.  The terms
+// are also available at;
+// http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt
+
+function datatipSetStyle(curve_handle,t,boxed,labeled)
+//changes the tips interpolation modes for a given curve
+// curve_handle : a handle on a polyline
+// t            : 1 "square mark" or 2 "Directional arrow"
+// boxed        : a boolean
+// labeled      : a boolean
+  if argn(2)<1 then
+    error(msprintf(_("%s: Wrong number of input argument(s): At least %d expected.\n"),...
+                   "datatipSetType",1))
+  end
+  if argn(2)<4 then labeled=%t,end
+  if argn(2)<3 then boxed=%t,end
+
+  if type(curve_handle)<>9|size(curve_handle,'*')<>1|or(curve_handle.type<>"Polyline") then
+    error(msprintf(_("%s: Wrong type for input argument #%d: A ''%s'' handle expected.\n"),...
+                   "datatipSetType",1,"Polyline"))
+  end
+
+  if argn(2)==1 then
+    items=[_("Square mark, boxed label")
+           _("Square mark, simple label")
+           _("Square mark, no label")
+           _("Directional arrow, boxed label")
+           _("Directional arrow, simple label")
+           _("Directional arrow, no label")
+          ];
+    sel=x_choose(items,_("Select tip style"))
+    if sel==0 then return,end
+    t=floor(sel/3)+1
+    boxed=(modulo(sel,3)==1)
+    labeled=~(modulo(sel,3)==0)
+  else
+    if type(t)<>1|size(t,'*')<>1 then
+      error(msprintf(_("%s: Wrong type for input argument #%d: A scalar expected.\n"),...
+                     "datatipSetType",2))
+    end
+    if and(t<>[1 2]) then
+      error(msprintf(_("%s: Wrong value for input argument #%d: Must be in the set {%s}.\n"),...
+                     "datatipSetType",2,"1,2"))
+    end
+    if type(boxed)<>4 |size(t,'*')<>1 then
+      error(msprintf(_("%s: Wrong type for input argument #%d: A boolean scalar expected.\n"),...
+                     "datatipSetType",3))
+    end
+    if type(labeled)<>4 |size(labeled,'*')<>1 then
+      error(msprintf(_("%s: Wrong type for input argument #%d: A boolean scalar expected.\n"),...
+                     "datatipSetType",4))
+    end
+
+  end
+  style=[t bool2s(boxed) bool2s(labeled)]
+
+  ud=datatipGetStruct(curve_handle)
+  if typeof(ud)<>'datatips' then;
+    datatipInitStruct(curve_handle)
+    ud=datatipGetStruct(curve_handle)
+  end
+  if or(ud.style<>style) then
+
+    fig=curve_handle.parent
+    while fig.type<>"Figure" then fig=fig.parent,end
+    id=fig.immediate_drawing;
+    fig.immediate_drawing="off"
+    tips=ud.tips.children
+    for i=1:size(tips,'*')
+      datatipSetTipStyle(tips(i),style)
+    end
+    fig.immediate_drawing=id
+    ud.style=style
+    datatipSetStruct(curve_handle,ud)
+  end
+
+endfunction
diff --git a/scilab/modules/graphics/macros/datatips/datatipSetTipPosition.sci b/scilab/modules/graphics/macros/datatips/datatipSetTipPosition.sci
new file mode 100644 (file)
index 0000000..250437c
--- /dev/null
@@ -0,0 +1,35 @@
+// Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
+// Copyright (C) 2011 - INRIA - Serge Steer <serge.steer@inria.fr>
+//
+// This file must be used under the terms of the CeCILL.
+// This source file is licensed as described in the file COPYING, which
+// you should have received as part of this distribution.  The terms
+// are also available at;
+// http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt
+
+function datatipSetTipPosition(ud,tip_handle,pt,k)
+//datatip utility function
+  point_handle=tip_handle.children(1)
+  string_handle=tip_handle.children(2)
+
+  tip_refs=point_handle.user_data
+  [curve_handle,point_index]=tip_refs(:)
+  formatfunction=ud.formatfunction
+
+  if ud.style==0 then
+    point_handle.data=pt
+  else
+    if k<size(curve_handle.data,1)
+      dxy=curve_handle.data(k+1,:)-pt;
+    else
+      dxy=pt-curve_handle.data(k-1,:);
+    end
+    dxy=dxy/norm(dxy)/10000;
+    point_handle.data=[pt;pt+dxy]
+  end
+  tip_refs(2)=k;
+  point_handle.user_data=tip_refs
+  string_handle.text=formatfunction(curve_handle,pt,k)
+  setStringPosition(tip_handle,pt)
+
+endfunction
diff --git a/scilab/modules/graphics/macros/datatips/datatipSetTipStyle.sci b/scilab/modules/graphics/macros/datatips/datatipSetTipStyle.sci
new file mode 100644 (file)
index 0000000..8ccc990
--- /dev/null
@@ -0,0 +1,76 @@
+// Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
+// Copyright (C) 2011 - INRIA - Serge Steer <serge.steer@inria.fr>
+//
+// This file must be used under the terms of the CeCILL.
+// This source file is licensed as described in the file COPYING, which
+// you should have received as part of this distribution.  The terms
+// are also available at;
+// http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt
+
+function datatipSetTipStyle(tip_handle,style)
+//datatip utility function
+  point_handle=tip_handle.children(1)
+  string_handle=tip_handle.children(2)
+  bg=addcolor([255 255 238]/255);
+  tip_refs=point_handle.user_data
+  [curve_handle,k]=tip_refs(1:2)
+
+  pt=point_handle.data(1,:)
+
+  //label
+  if style(3)==0 then //no label
+    string_handle.visible="off"
+  else
+    string_handle.visible="on"
+  end
+  if style(2)==1 then //boxed
+    string_handle.background=bg;
+    string_handle.box='on';
+    string_handle.fill_mode='on';
+    string_handle.font_foreground=curve_handle.foreground;
+  else
+    string_handle.box="off"
+    string_handle.foreground=color('gray');
+    string_handle.fill_mode='off';
+    string_handle.font_foreground=curve_handle.foreground;
+  end
+  string_handle.clip_state='off';
+  if string_handle.user_data<>[] then //preserve orientation if any
+    orient=string_handle.user_data(1)
+  else
+    orient=0;
+  end
+  string_handle.user_data=[orient style(2)]
+
+  //marker
+  point_handle.mark_style=11;
+  point_handle.mark_size_unit='point';
+  point_handle.mark_size=6;
+  select style(1)
+  case 1  then //square marker
+    point_handle.data= pt
+    point_handle.mark_mode='on';
+    point_handle.mark_background=bg;
+    point_handle.mark_foreground=curve_handle.foreground;
+    point_handle.arrow_size_factor = 0;
+  case 2 then //directional arrow marker
+
+    //compute tangeant
+    tip_refs=point_handle.user_data
+    [curve_handle,k]=tip_refs(1:2)
+    if k<size(curve_handle.data,1)
+      dxy=(curve_handle.data(k+1,:)-pt)/100000;
+    else
+      dxy=(pt-curve_handle.data(k-1,:))/100000;
+    end
+    point_handle.data=[pt;pt+dxy]
+    //set properties
+    point_handle.mark_background=curve_handle.foreground;
+    point_handle.mark_foreground=curve_handle.foreground;
+    point_handle.mark_mode='off';
+    point_handle.arrow_size_factor = 1.5;
+    point_handle.polyline_style = 4;
+    point_handle.foreground=curve_handle.foreground;
+  end
+  if style(3)<>0 then setStringPosition(tip_handle,pt),end
+endfunction
index 5191da4..ae95935 100644 (file)
@@ -7,16 +7,17 @@
 // are also available at;
 // http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt
 
-
 function datatipToggle(fig)
 //Toggles activation of the datatip edition mode for the given or current
 //figure
   if argn(2)<1 then
     fig=gcf();
   else
-    if type(fig)<>9|or(fig.type<>"Figure") then
-      error(msprintf(_("%s: Wrong type for input argument #%d: A ''%s'' handle expected.\n"),"datatipCreate",1,"Figure"))
+    if type(fig)<>9|size(fig,'*')<>1|or(fig.type<>"Figure") then
+      error(msprintf(_("%s: Wrong type for input argument #%d: A ''%s'' handle expected.\n"),...
+                     "datatipToggle",1,"Figure"))
     end
   end
   datatipManagerMode(fig)
 endfunction
+
diff --git a/scilab/modules/graphics/macros/datatips/datatipsGUI.sci b/scilab/modules/graphics/macros/datatips/datatipsGUI.sci
new file mode 100644 (file)
index 0000000..326e48d
--- /dev/null
@@ -0,0 +1,416 @@
+// Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
+// Copyright (C) 2010 - INRIA - Serge Steer <serge.steer@inria.fr>
+//
+// This file must be used under the terms of the CeCILL.
+// This source file is licensed as described in the file COPYING, which
+// you should have received as part of this distribution.  The terms
+// are also available at;
+// http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt
+
+function datatipsGUI(curve_handle)
+  global datatipGUIwin
+  if datatipGUIwin<>[]&or(datatipGUIwin==winsid()) then //the gui window is already opened
+    global  datatipGUICurve
+    datatipGUICurve= curve_handle
+    datatipSetGUI()
+    return
+  end
+
+  
+  global datatipGUIHandles datatipGUICurve datatipGUIwin
+  margin_x     = 5;      // Horizontal margin between each elements
+  margin_y     = 5;      // Vertical margin between each elements
+  button_w     = 150;
+  button_h     = 25;
+  label_h      = 20;
+  label_w      = 160;
+  slabel_w     = 80;
+  editor_h     = 120; 
+  axes_w       = 3*margin_x+label_w+2*(slabel_w+4*margin_x+label_h);
+  editor_w     = axes_w-2*margin_x;
+  axes_h       = 4*margin_y+6*(label_h+margin_y)+ button_h;
+  defaultfont  = "arial"; // Default Font
+  datatipGUICurve= curve_handle
+  ud=datatipGetStruct(datatipGUICurve)
+  if typeof(ud)<>'datatips' then
+    //no datatips structure yet, initialize it
+    if ~datatipInitStruct(curve) then
+      return
+    end
+    ud=datatipGetStruct(curve)
+  end
+  style=ud.style
+  
+  datatipGUIwin=max(winsid())+1
+  
+  fig_id=datatipGUIwin
+  fig = scf(fig_id)
+  fig.event_handler="datatipGUIEventHandler"
+  fig.event_handler_enable="on"
+
+  // Remove Scilab graphics menus & toolbar
+  //  drawlater (bug)
+  delmenu(fig.figure_id, gettext("&File"));
+  delmenu(fig.figure_id, gettext("&Tools"));
+  delmenu(fig.figure_id, gettext("&Edit"));
+  delmenu(fig.figure_id, gettext("&?"));
+  toolbar(fig.figure_id, "off");
+  fig.axes_size       = [axes_w axes_h];
+
+  
+  fig.background      = addcolor([0.8 0.8 0.8]);
+  fig.figure_name     = _("Datatips style");
+  ax=fig.children;
+  ax.background= fig.background ;
+  gui=uicontrol( ...
+      "parent"              , fig,...
+      "style"               , "frame",...
+      "units"               , "pixels",...
+      "position"            , [0 0 axes_w axes_h],...
+      "background"          , [1 1 1]*0.8, ...
+      "visible"             , "on");
+
+  yo=axes_h-margin_y-label_h;
+  xo=margin_x;
+  H=[]
+  //Datatips positionning
+  x=xo;
+  y=yo;
+  uicontrol( ...
+      "parent"              , gui,...
+      "style"               , "text",...
+      "string"              , _("Marker style:"),...
+      "units"               , "pixels",...
+      "position"            , [x y label_w label_h],....
+      "fontname"            , defaultfont,...
+      "fontunits"           , "points",...
+      "fontsize"            , 12,...
+      "fontweight"          , "bold", ...
+      "horizontalalignment" , "left", ...
+      "background"          , [1 1 1]*0.8, ...
+      "visible"             , "on");
+  x=x+label_w+margin_x;
+  uicontrol( ...
+      "parent"              , gui,...
+      "style"               , "text",...
+      "string"              , _("Square"),...
+      "units"               , "pixels",...
+      "position"            , [x y slabel_w label_h],...
+      "HorizontalAlignment" , "right",...
+      "fontname"            , defaultfont,...
+      "fontunits"           , "points",...
+      "fontsize"            , 12,...
+      "background"          , [1 1 1]*0.8, ...
+      "visible"             , "on");
+  x=x+slabel_w+margin_x
+  r1=  uicontrol( ...
+      "parent"              , gui,...
+      "style"               , "radiobutton",...
+      "value"               , 1,...
+      "units"               , "pixels",...
+      "position"            , [x y label_h label_h],....
+      "background"          , [1 1 1]*0.8, ...
+      "callback"            , "datatipRadioCallback(""sty"",%t)",...
+      "visible"             , "on");
+  x=x+label_h+4*margin_x;
+  uicontrol( ...
+      "parent"              , gui,...
+      "style"               , "text",...
+      "string"              , _("Arrow"),...
+      "units"               , "pixels",...
+      "position"            , [x y slabel_w label_h],....
+      "HorizontalAlignment" , "right",...
+      "fontname"            , defaultfont,...
+      "fontunits"           , "points",...
+      "fontsize"            , 12,...
+      "background"          , [1 1 1]*0.8, ...
+      "visible"             , "on");
+  
+  x=x+slabel_w+margin_x;
+  r2=  uicontrol( ...
+      "parent"              , gui,...
+      "style"               , "radiobutton",...
+      "value"               , 0,...
+      "units"               , "pixels",...
+      "position"            , [x y label_h label_h],....
+      "background"          , [1 1 1]*0.8, ...
+      "callback"            , "datatipRadioCallback(""sty"",%f)",...
+      "visible"             , "on");
+  H=[H;r1 r2]
+  //Datatips Label   
+  x=xo;
+  y=y-margin_y-label_h;
+  uicontrol( ...
+      "parent"              , gui,...
+      "style"               , "text",...
+      "string"              , _("Labeled?"),...
+      "units"               , "pixels",...
+      "position"            , [x y label_w label_h],....
+      "fontname"            , defaultfont,...
+      "fontunits"           , "points",...
+      "fontsize"            , 12,...
+      "fontweight"          , "bold", ...
+      "horizontalalignment" , "left", ...
+      "background"          , [1 1 1]*0.8, ...
+      "visible"             , "on");
+  x=x+label_w+margin_x;
+  uicontrol( ...
+      "parent"              , gui,...
+      "style"               , "text",...
+      "string"              , _("Yes"),...
+      "units"               , "pixels",...
+      "position"            , [x y slabel_w label_h],....
+      "fontname"            , defaultfont,...
+      "fontunits"           , "points",...
+      "fontsize"            , 12,...
+      "horizontalalignment" , "right", ...
+      "background"          , [1 1 1]*0.8, ...
+      "visible"             , "on");
+  x=x+slabel_w+margin_x
+  r1=  uicontrol( ...
+      "parent"              , gui,...
+      "style"               , "radiobutton",...
+      "value"               , 1,...
+      "units"               , "pixels",...
+      "position"            , [x y label_h label_h],....
+      "background"          , [1 1 1]*0.8, ...
+      "callback"            , "datatipRadioCallback(""lab"",%t)",...
+      "visible"             , "on");
+  x=x+label_h+4*margin_x;
+  uicontrol( ...
+      "parent"              , gui,...
+      "style"               , "text",...
+      "string"              , _("No"),...
+      "units"               , "pixels",...
+      "position"            , [x y slabel_w label_h],....
+      "fontname"            , defaultfont,...
+      "fontunits"           , "points",...
+      "fontsize"            , 12,...
+      "horizontalalignment" , "right", ...
+      "background"          , [1 1 1]*0.8, ...
+      "visible"             , "on");
+  
+  x=x+slabel_w+margin_x;
+  r2=  uicontrol( ...
+      "parent"              , gui,...
+      "style"               , "radiobutton",...
+      "value"               , 0,...
+      "units"               , "pixels",...
+      "position"            , [x y label_h label_h],....
+      "background"          , [1 1 1]*0.8, ...
+      "callback"            , "datatipRadioCallback(""lab"",%f)",...
+      "visible"             , "on");
+  H=[H;r1 r2]
+  
+  //Datatips box   
+  x=xo;
+  y=y-margin_y-label_h;
+  uicontrol( ...
+      "parent"              , gui,...
+      "style"               , "text",...
+      "string"              , _("Boxed?"),...
+      "units"               , "pixels",...
+      "position"            , [x y label_w label_h],....
+      "fontname"            , defaultfont,...
+      "fontunits"           , "points",...
+      "fontsize"            , 12,...
+      "fontweight"          , "bold", ...
+      "horizontalalignment" , "left", ...
+      "background"          , [1 1 1]*0.8, ...
+      "visible"             , "on");
+  x=x+label_w+margin_x;
+  uicontrol( ...
+      "parent"              , gui,...
+      "style"               , "text",...
+      "string"              , _("Yes"),...
+      "units"               , "pixels",...
+      "position"            , [x y slabel_w label_h],....
+      "fontname"            , defaultfont,...
+      "fontunits"           , "points",...
+      "fontsize"            , 12,...
+      "horizontalalignment" , "right", ...
+      "background"          , [1 1 1]*0.8, ...
+      "visible"             , "on");
+  x=x+slabel_w+margin_x;
+  r1=  uicontrol( ...
+      "parent"              , gui,...
+      "style"               , "radiobutton",...
+      "value"               , 1,...
+      "units"               , "pixels",...
+      "position"            , [x y label_h label_h],....
+      "background"          , [1 1 1]*0.8, ...
+      "callback"            , "datatipRadioCallback(""box"",%t)",...
+      "visible"             , "on");
+  x=x+label_h+4*margin_x;
+  uicontrol( ...
+      "parent"              , gui,...
+      "style"               , "text",...
+      "string"              , _("No"),...
+      "units"               , "pixels",...
+      "position"            , [x y slabel_w label_h],....
+      "fontname"            , defaultfont,...
+      "fontunits"           , "points",...
+      "fontsize"            , 12,...
+      "horizontalalignment" , "right", ...
+      "background"          , [1 1 1]*0.8, ...
+      "visible"             , "on");
+  
+  x=x+slabel_w+margin_x;
+  r2=  uicontrol( ...
+      "parent"              , gui,...
+      "style"               , "radiobutton",...
+      "value"               , 0,...
+      "units"               , "pixels",...
+      "position"            , [x y label_h label_h],....
+      "background"          , [1 1 1]*0.8, ...
+      "callback"            , "datatipRadioCallback(""box"",%f)",...
+      "visible"             , "on"); 
+  H=[H;r1 r2]
+  //marker position   
+  x=xo;
+  y=y-margin_y-label_h;
+  uicontrol( ...
+      "parent"              , gui,...
+      "style"               , "text",...
+      "string"              , _("Positionning?"),...
+      "units"               , "pixels",...
+      "position"            , [x y label_w label_h],....
+      "fontname"            , defaultfont,...
+      "fontunits"           , "points",...
+      "fontsize"            , 12,...
+      "fontweight"          , "bold", ...
+      "horizontalalignment" , "left", ...
+      "background"          , [1 1 1]*0.8, ...
+      "visible"             , "on");
+  x=x+label_w+margin_x;
+  uicontrol( ...
+      "parent"              , gui,...
+      "style"               , "text",...
+      "string"              , _("Knots"),...
+      "units"               , "pixels",...
+      "position"            , [x y slabel_w label_h],....
+      "fontname"            , defaultfont,...
+      "fontunits"           , "points",...
+      "fontsize"            , 12,...
+      "horizontalalignment" , "right", ...
+      "background"          , [1 1 1]*0.8, ...
+      "visible"             , "on");
+  x=x+slabel_w+margin_x;
+  r1=  uicontrol( ...
+      "parent"              , gui,...
+      "style"               , "radiobutton",...
+      "value"               , 1,...
+      "units"               , "pixels",...
+      "position"            , [x y label_h label_h],....
+      "background"          , [1 1 1]*0.8, ...
+      "callback"            , "datatipRadioCallback(""pos"",%t)",...
+      "visible"             , "on");
+  x=x+label_h+4*margin_x;
+  uicontrol( ...
+      "parent"              , gui,...
+      "style"               , "text",...
+      "string"              , _("Interpolated"),...
+      "units"               , "pixels",...
+      "position"            , [x y slabel_w label_h],....
+      "fontname"            , defaultfont,...
+      "fontunits"           , "points",...
+      "fontsize"            , 12,...
+      "horizontalalignment" , "right", ...
+      "background"          , [1 1 1]*0.8, ...
+      "visible"             , "on");
+  
+  x=x+slabel_w+margin_x;
+  r2=  uicontrol( ...
+      "parent"              , gui,...
+      "style"               , "radiobutton",...
+      "value"               , 0,...
+      "units"               , "pixels",...
+      "position"            , [x y label_h label_h],....
+      "background"          , [1 1 1]*0.8, ...
+      "callback"            , "datatipRadioCallback(""pos"",%f)",...
+      "visible"             , "on"); 
+   H=[H;r1 r2]
+  //Multiple datatips   
+  x=xo;
+  y=y-margin_y-label_h;
+  uicontrol( ...
+      "parent"              , gui,...
+      "style"               , "text",...
+      "string"              , _("Allow multiple datatips?"),...
+      "units"               , "pixels",...
+      "position"            , [x y label_w label_h],....
+      "fontname"            , defaultfont,...
+      "fontunits"           , "points",...
+      "fontsize"            , 12,...
+      "fontweight"          , "bold", ...
+      "horizontalalignment" , "left", ...
+      "background"          , [1 1 1]*0.8, ...
+      "visible"             , "on");
+  x=x+label_w+margin_x;
+  uicontrol( ...
+      "parent"              , gui,...
+      "style"               , "text",...
+      "string"              , _("Yes"),...
+      "units"               , "pixels",...
+      "position"            , [x y slabel_w label_h],....
+      "fontname"            , defaultfont,...
+      "fontunits"           , "points",...
+      "fontsize"            , 12,...
+      "horizontalalignment" , "right", ...
+      "background"          , [1 1 1]*0.8, ...
+      "visible"             , "on");
+  x=x+slabel_w+margin_x;
+  r1=  uicontrol( ...
+      "parent"              , gui,...
+      "style"               , "radiobutton",...
+      "value"               , 1,...
+      "units"               , "pixels",...
+      "position"            , [x y label_h label_h],....
+      "background"          , [1 1 1]*0.8, ...
+      "callback"            , "datatipRadioCallback(""mul"",%t)",...
+      "visible"             , "on");
+  x=x+label_h+4*margin_x;
+  uicontrol( ...
+      "parent"              , gui,...
+      "style"               , "text",...
+      "string"              , _("No"),...
+      "units"               , "pixels",...
+      "position"            , [x y slabel_w label_h],....
+      "fontname"            , defaultfont,...
+      "fontunits"           , "points",...
+      "fontsize"            , 12,...
+      "horizontalalignment" , "right", ...
+      "background"          , [1 1 1]*0.8, ...
+      "visible"             , "on");
+  
+  x=x+slabel_w+margin_x;
+  r2=  uicontrol( ...
+      "parent"              , gui,...
+      "style"               , "radiobutton",...
+      "value"               , 0,...
+      "units"               , "pixels",...
+      "position"            , [x y label_h label_h],....
+      "background"          , [1 1 1]*0.8, ...
+      "callback"            , "datatipRadioCallback(""mul"",%f)",...
+      "visible"             , "on"); 
+  H=[H;r1 r2]
+  //label edition function
+  x=xo;
+  y=y-2*margin_y-button_h;
+  
+  E=  uicontrol( ...
+      "parent"              , gui, ...
+      "style"               , "pushbutton", ...
+      "string"              , _("Edit label generator"), ...
+      "units"               , "pixels",...
+      "position"            , [x y button_w button_h], ...
+      "fontname"            , defaultfont, ...
+      "fontunits"           , "points", ...
+      "fontsize"            , 12, ...
+      "callback"            , "global  datatipGUICurve;datatipSetDisplay(datatipGUICurve)", ...
+      "visible"             , "on");
+
+
+  datatipGUIHandles=H
+  datatipSetGUI()
+endfunction
index 3a53c64..348d9b8 100644 (file)
@@ -33,7 +33,6 @@ function [d,ptp,ind,c]=orthProj(data,pt)
   L = sum(X.*X,2); //segment lengths
   nz = find(L>0)
   X = X(nz,:); Y = Y(nz,:);
-
   P = sum(X.*Y,2)./L(nz);
   //the projected point lies in the segment nz(i) if 0 <= P(i)<1
   i_in = find(P >= 0 & P<1); //find segments the projected point falls in
index bce2467..04dac7c 100644 (file)
@@ -1,5 +1,5 @@
 // Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
-// Copyright (C) 2010 - INRIA - Serge Steer <serge.steer@inria.fr>
+// Copyright (C) 2010-2011 - INRIA - Serge Steer <serge.steer@inria.fr>
 //
 // This file must be used under the terms of the CeCILL.
 // This source file is licensed as described in the file COPYING, which
 // are also available at;
 // http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt
 
-function setStringPosition(string_handle,pt)
-//Computes the position of the lower left corner of the string box. 
+function setStringPosition(tip_handle,pt)
+//Computes the position of the lower left corner of the string box.
 //
 //These coordinates must be expressed in user coordinates units but their
 //computation takes into account the pixel dimensions of the text boxes
 //when they are not located in the upper right position
-  ax=string_handle.parent
+  ax=tip_handle.parent
   while ax.type<>"Axes" then ax=ax.parent,end
+  string_handle=tip_handle.children(2);
+  point_handle=tip_handle.children(1);
+
+
+  params=string_handle.user_data
+  orient=params(1);
+  if size(params,'*')>1 then //for compatibility
+    style=params(2)
+  else
+    style=1
+  end
+  pt=pt(1,:)
 
-  
   r=xstringl(0,0,string_handle.text);r=r(3:4)';
-  d=mark_usersize(point_handle);
-  orient=string_handle.user_data;
+  if style==1 then
+    d=mark_usersize(point_handle);
+  else
+    d=[0 0]
+  end
+  orient=string_handle.user_data(1);
   if orient==0 then //automatic
-    if ax.zoom_box==[] then
-      t=[pt(1:2)+r-ax.data_bounds(2,1:2)<0; //a l'interieur des max
-         pt(1:2)-r-ax.data_bounds(1,1:2)>0] //a l'interieur des min
+
+    //compute the slope and curvature at the tip point
+    curve_handle=point_handle.user_data(1)
+    k=point_handle.user_data(2)
+    np=size(curve_handle.data,1)
+    T=curve_handle.data([max(k-1,1) k min(np,k+1)],:)
+
+
+    if size(T,2)==3 then
+      [Tx,Ty]=geom3d(T(:,1),T(:,2),T(:,3))
+      T=[Tx Ty];
+    end
+    d1=sum(diff(T,1,1),1)/2;
+    d2=diff(T,2,1);
+    c=(d1(1)*d2(2)-d1(2)*d2(1))
+
+    //set position according to the slope and curvature sign
+    if d1(1)>0 then
+      if  d1(2)>0 then
+        if c<0 then//upper left
+          orient=1
+        else //lower right
+          orient=4
+        end
+      else
+        if c<0 then//upper right
+          orient=2
+        else //lower left
+          orient=3
+        end
+      end
     else
-      t=[pt(1:2)+r-ax.zoom_box([3 4])<0; //a l'interieur des max
-         pt(1:2)-r-ax.zoom_box([1 2])>0] //a l'interieur des min
+      if  d1(2)>0 then
+        if c>0 then //upper right
+          orient=2
+        else //lower left
+          orient=3
+        end
+      else
+        if c>0 then//upper left
+          orient=1
+        else //lower right
+          orient=4
+        end
+
+      end
+    end
+    //    mprintf("d1=[%f %f], c=%f, orient=%d\n",d1(1),d1(2),c,orient)
+    if ax.zoom_box==[]
+      box=ax.data_bounds
+    else
+      box=[ax.zoom_box(1:2);ax.zoom_box(3:4)];
+    end
+    //take care of  the plot boundaries
+    //    mprintf("Y:%f< [%f %f]<%f\n",box(1,2),pt(2)-r(2),pt(2)+r(2),box(2,2))
+    //    mprintf("X:%f< [%f %f]<%f\n",box(1,1),pt(1)-r(1),pt(1)+r(1),box(2,1))
+    if or(orient==[1 2])&pt(2)+r(2)>box(2,2) then//upper bound on Y
+      orient=5-orient
     end
-    if and(t(1,:)) then //les deux sont inf aux max (upper right)
-      orient=2;//1
-    elseif and(t(2,:)) //les deux sont sup aux min (lower left)
-      orient=3;//2
-    elseif t(1,1)&t(2,2) //x est sup au min y est inf au max (upper left)
-      orient=1;//3
-    else//if t(1,2)*t(2,1) //y est sup au min   et x est inf au max (lower right)
-      orient=4;
+    if or(orient==[3 4])&pt(2)-r(2)<box(1,2) then//lower bound on Y
+      orient=5-orient
+    end
+    if or(orient==[2 4])&pt(1)+r(1)>box(2,1) then//right bound on X
+      orient=orient-1
+    end
+    if or(orient==[1 3])&pt(1)-r(1)<box(1,1) then//left bound on X
+      orient=orient+1
     end
   end
   select orient
   case 1 then //upper left
-    dx=(-d(1)-r(1));dy=d(2);
+    dx=-d(1)-r(1);dy=d(2);
   case 2 then //upper right
     dx=d(1);dy=d(2)
   case 3 then //lower left
@@ -48,17 +115,19 @@ function setStringPosition(string_handle,pt)
   case 4 then //lower right
     dx=d(1);dy=-d(2)-r(2)
   end
-  
+
   if ax.view=="3d" then
     angles=ax.rotation_angles*%pi/180;
     t=angles(2);a=angles(1);
     st=sin(t);ct=cos(t);sa=sin(a);ca=cos(a)
-    //apply inverse transformation matrix to [dx,dy,0]
-    //the transformation matrix is R=[-st ct 0;-ct*ca -st*sa sa;ct*sa st*sa ca] 
-    //and the inserve is R'
-    pos=pt+[-st*dx-ct*ca*dy,ct*dx-st*ca*dy,sa*dy]
+    c=sum(ax.data_bounds,1)/2
+    x=pt(1)-c(1)
+    y=pt(2)-c(2)
+    z=pt(3)-c(3)
+    pos=c+[(st*x-ct*y-dx)/st,0,(st*dy+st*sa*z-ca*y-ct*ca*dx)/(sa*st)]
   else
     pos=pt+[dx dy]
+
   end
   string_handle.data=pos
 endfunction
index 1d3f4a4..57d870c 100644 (file)
@@ -117,10 +117,36 @@ function ged(k,win)
 
     ged_axes(gca())
   case 10 then //start Entity picker
-    seteventhandler("ged_eventhandler")
+    fig=ged_cur_fig_handle
+    fig_ud=get(fig,"user_data")
+    if fig.event_handler<>""& fig.event_handler<>"ged_eventhandler" then
+      //push current event handler in fig user data if possible
+      if fig_ud==[] then fig_ud=struct();end
+      if typeof(fig_ud)=="st" then
+        if ~isfield(fig_ud,"handlers") then  fig_ud.handlers=[],end
+        fig_ud.handlers=[fig_ud.handlers;
+                         fig.event_handler fig.event_handler_enable]
+        set(fig,"user_data",fig_ud)
+      else
+        warning(_("Entity picker cannot be enabled, user data figure field is already used" ))
+        return
+      end
+      fig.event_handler_enable = "off" //to prevent against bug 7855
+      fig.event_handler="ged_eventhandler"
+      fig.event_handler_enable="on"
+    end
     ged_cur_fig_handle.info_message=_("Left click on a graphic entity to open its property editor");
   case 11 then //stop Entity picker
     seteventhandler("")
+    fig.event_handler_enable = "off"
+    if typeof(fig_ud)=="st"&isfield(fig_ud,"handlers")&fig_ud.handlers<>[] then
+      fig.event_handler=fig_ud.handlers($,1)
+      fig.event_handler_enable=fig_ud.handlers($,2)
+      fig_ud.handlers= fig_ud.handlers(1:$-1,:)
+      set(fig,"user_data",fig_ud)
+    else
+      fig.event_handler_enable = "off"
+    end
   end
   scf(ged_current_figure)
 endfunction