* Bug #12370 fixed - Example with marks added in help page of xpoly. 69/10869/3
Charlotte HECQUET [Mon, 18 Mar 2013 10:42:28 +0000 (11:42 +0100)]
Change-Id: I7794c735acddc9e97d0ec06d68e69848e28dc42e

scilab/CHANGES_5.4.X
scilab/modules/graphics/help/en_US/polygon/xpoly.xml
scilab/modules/graphics/help/fr_FR/polygon/xpoly.xml
scilab/modules/helptools/etc/images_md5.txt
scilab/modules/helptools/images/xpoly_2.png [new file with mode: 0644]

index 58587e7..56bbcdb 100644 (file)
@@ -554,6 +554,8 @@ Bug fixes
 
 * Bug #12361 fixed - Error fixed in replot() help page examples.
 
+* Bug #12370 fixed - Example with marks added in help page of xpoly.
+
 * Bug #12373 fixed - pmodulo(n,m<0) returned a negative result.
 
 * Bug #12374 fixed - Unexpected mark was drawn with xsegs.
index 0f2126f..a75fb67 100644 (file)
     y=cos(2*%pi*(0:4)/5);
 
     plot2d(0,0,-1,"010"," ",[-2,-2,2,2])
-    xset("color",5)
-    xpoly(x,y,"lines",1) // by default closed
-
+    xpoly(x,y,"lines") // by default closed
     e=gce(); // get the current entity (the last created: here the polyline)
+    set(e,"foreground",5);
+
     e.closed = 'off' // the polyline is now open
     ]]></programlisting>
         <scilab:image>
             y=cos(2*%pi*(0:4)/5);
             
             plot2d(0,0,-1,"010"," ",[-2,-2,2,2])
-            xset("color",5)
-            xpoly(x,y,"lines",1)
-            
+            xpoly(x,y,"lines")
             e=gce();
+            set(e,"foreground",5)
             e.closed = 'off'
             
         </scilab:image>
-        
+        <programlisting role="example"><![CDATA[
+    // With marks instead of lines
+    plot2d(0,0,1,rect=[0,0,12,10], frameflag=3)
+    t=[0:4]*2*%pi/5;
+    x=5+5*cos(t);
+    y=5+5*sin(t);
+    xpoly(x,y,"marks")
+    e=gce();
+    set(e,"mark_style",2);
+    ]]></programlisting>
+        <scilab:image>
+            plot2d(0,0,1,rect=[0,0,12,10], frameflag=3)
+            t=[0:4]*2*%pi/5;
+            x=5+5*cos(t);
+            y=5+5*sin(t);
+            xpoly(x,y,"marks")
+            e=gce();
+            set(e,"mark_style",2);
+        </scilab:image>
     </refsection>
     <refsection role="see also">
         <title>See Also</title>
             <member>
                 <link linkend="xpolys">xpolys</link>
             </member>
+            <member>
+                <link linkend="polyline_properties">polyline_properties</link>
+            </member>
         </simplelist>
     </refsection>
 </refentry>
index 287e232..8f7861d 100644 (file)
@@ -57,25 +57,42 @@ x=sin(2*%pi*(0:4)/5);
 y=cos(2*%pi*(0:4)/5);
 
 plot2d(0,0,-1,"010"," ",[-2,-2,2,2])
-xset("color",5)
-xpoly(x,y,"lines",1) // by default closed
+xpoly(x,y,"lines") // par défaut, close=1
+e=gce(); // entité courante (dernière créée : ici la polyline)
+set(e,"foreground",5);
 
-e=gce(); // get the current entity (the last created: here the polyline)
-e.closed = 'off' // the polyline is now open
+e.closed = 'off' // la polyline est maintenant ouverte
  ]]></programlisting>
         <scilab:image>
             x=sin(2*%pi*(0:4)/5);
             y=cos(2*%pi*(0:4)/5);
             
             plot2d(0,0,-1,"010"," ",[-2,-2,2,2])
-            xset("color",5)
-            xpoly(x,y,"lines",1)
-            
+            xpoly(x,y,"lines")
             e=gce();
+            set(e,"foreground",5)
             e.closed = 'off'
             
         </scilab:image>
-        
+        <programlisting role="example"><![CDATA[
+// Avec des marqueurs
+plot2d(0,0,1,rect=[0,0,12,10], frameflag=3)
+t=[0:4]*2*%pi/5;
+x=5+5*cos(t);
+y=5+5*sin(t);
+xpoly(x,y,"marks")
+e=gce();
+set(e,"mark_style",2);
+]]></programlisting>
+        <scilab:image>
+            plot2d(0,0,1,rect=[0,0,12,10], frameflag=3)
+            t=[0:4]*2*%pi/5;
+            x=5+5*cos(t);
+            y=5+5*sin(t);
+            xpoly(x,y,"marks")
+            e=gce();
+            set(e,"mark_style",2);
+        </scilab:image>
     </refsection>
     <refsection role="see also">
         <title>Voir aussi</title>
@@ -89,6 +106,9 @@ e.closed = 'off' // the polyline is now open
             <member>
                 <link linkend="xpolys">xpolys</link>
             </member>
+            <member>
+                <link linkend="polyline_properties">polyline_properties</link>
+            </member>
         </simplelist>
     </refsection>
 </refentry>
index 65ba256..0dc29f0 100644 (file)
@@ -982,7 +982,8 @@ xgetech_1.png=302937507487b5bbfbe401ff9e5ea2df
 xgrid_1.png=c567d74666ee05d3df7daccc1467f211
 xlabel_1.png=bf6da6ce47e88b65cf8a1cbf734ab8f0
 xnumb_1.png=e2966910792ea6c60caf87dc7d25f856
-xpoly_1.png=32b66a8dcccf64a51a0cb60174c7f34c
+xpoly_1.png=de3eb8cacec4aa4ced6992f2df68ad55
+xpoly_2.png=56e4bf7c2fbf668f6c3da56bd3bd64ea
 xpolys_1.png=a594e34ed433c4453de64d4c5640f032
 xrect_1.png=eb1fb07d2abe3e664b1bfa1603e361f
 xrects_1.png=6ba2f52a6d5b6103f1b40aa20992f34f
diff --git a/scilab/modules/helptools/images/xpoly_2.png b/scilab/modules/helptools/images/xpoly_2.png
new file mode 100644 (file)
index 0000000..0c999bf
Binary files /dev/null and b/scilab/modules/helptools/images/xpoly_2.png differ