help pixel_drawing_mode: page overhauled 99/18799/5
Samuel GOUGEON [Sun, 18 Dec 2016 01:04:43 +0000 (02:04 +0100)]
 * PDF rendering: http://bugzilla.scilab.org/attachment.cgi?id=4459
 * the description was not very clear
 * the values given in the table were all wrong: they are no longer
   numeric, and strings were wrong
 * There was no example
 * There was no illustration
 * There was no See also section

Change-Id: Ib98681cea9c6554d0f15f354cd7d820f62124756

scilab/CHANGES.md
scilab/modules/graphics/help/en_US/figure_operations/pixel_drawing_mode.xml
scilab/modules/graphics/help/fr_FR/figure_operations/pixel_drawing_mode.xml [new file with mode: 0644]
scilab/modules/graphics/help/images/pixel_drawing_mode_70.png [new file with mode: 0644]
scilab/modules/graphics/help/ja_JP/figure_operations/pixel_drawing_mode.xml [deleted file]
scilab/modules/graphics/help/ru_RU/figure_operations/pixel_drawing_mode.xml [deleted file]
scilab/modules/helptools/images/pixel_drawing_mode_70.png [new file with mode: 0644]

index 4575ff1..06a2808 100644 (file)
@@ -210,7 +210,7 @@ Help pages:
 * fixed / improved:  `members`, `part`, `ode`, `ode_optional_output`, `ode_roots`, `plot2d`, `roots`,
   `printf`, `sprintf`, `iconvert`, `stdev`, `xlabel`, `and_op`, `or_op`, `tree2code`, `%helps`,
   `scilab|scilex`
-* rewritten: `consolebox`, `double`, `isoview`, `householder`, `or`, `and`, `format`, `typeof`,
+* rewritten: `consolebox`, `double`, `isoview`, `pixel_drawing_mode`, `householder`, `or`, `and`, `format`, `typeof`,
 `brackets`, `setlanguage`, `sleep`, `isinf`, `bitor`, `bitxor`, `bitand`, `macr2tree`, `geomean`
 * reorganized:
   - `else`, `elseif`, `end`, `try`, `sciargs`, `global`, `halt`, `empty`, `power`
index 26099ad..4543f02 100644 (file)
@@ -2,6 +2,7 @@
 <!--
  * Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
  * Copyright (C) 2010 - DIGITEO - Pierre Lando <pierre.lando@scilab.org>
+ * Copyright (C) 2016 - Samuel GOUGEON
  *
  * Copyright (C) 2012 - 2016 - Scilab Enterprises
  *
  * along with this program.
  *
  -->
-<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" xmlns:scilab="http://www.scilab.org"  xml:lang="en" xml:id="pixel_drawing_mode">
+<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" xmlns:scilab="http://www.scilab.org"
+    xml:lang="en" xml:id="pixel_drawing_mode">
     <refnamediv>
         <refname>pixel_drawing_mode</refname>
-        <refpurpose>bitwise pixel rendering functions.</refpurpose>
+        <refpurpose>Figure's property setting the RGBwise pixels update mode when drawing</refpurpose>
     </refnamediv>
     <refsection>
         <title>Description</title>
         <para>
-            Here, the color encoding is RGB.
-            The <literal>pixel_drawing_mode</literal> is a <link
-            linkend="figure_properties">figure property</link> that
-            specifies a bitwise operation applied on any figure pixel
-            between the incoming color and the already existing color
-            on the figure. The result of this operation will be the new pixel color.
-
-
-            <literal>src</literal> is the incoming color of the pixel.
-            <literal>prv</literal> is the previous color of the pixel (which is already drawn).
-            <literal>res</literal> is the resulting color of the pixel (which will be drawn).
-
-            Possible values for <literal>pixel_drawing_mode</literal> are:
+            Pixels colors are RGB encoded. Each R, G or B channel has an uint(8) value on [0, 255].
+        </para>
+        <para>
+            The <literal>pixel_drawing_mode</literal> is a <link linkend="figure_properties">figure property</link> that specifies a RGBwise operation applied on every pixel of the incoming object, between RGB values of the input pixel color and RGB values the already existing pixel color of the figure. The result of this operation sets the new pixel color.
         </para>
-        <informaltable border="1">
+        <para>
+            <itemizedlist>
+                <listitem>
+                    <literal>src</literal> is the incoming color of the pixel.
+                </listitem>
+                <listitem>
+                    <literal>cur</literal> is the current color of the pixel (which is already drawn).
+                </listitem>
+            </itemizedlist>
+            Possible case-sensitive values for <literal>pixel_drawing_mode</literal> are listed herebelow.
+            <itemizedlist>
+                <listitem>
+                    <literal>NOT v</literal> means <literal>255 - v</literal>
+                </listitem>
+                <listitem>
+                    <literal>a AND b</literal> means <literal>a &amp; b</literal>
+                </listitem>
+                <listitem>
+                    <literal>a OR b</literal> means <literal>a | b</literal>
+                </listitem>
+                <listitem>
+                    <literal>a XOR b</literal> means <literal>(a OR b) AND NOT (a AND b)</literal>
+                </listitem>
+            </itemizedlist>
+        </para>
+        <informaltable border="1" cellpadding="3px">
             <tr>
-                <td>value</td>
-                <td>bitwise operation</td>
-                <td>comments</td>
+                <th>Value</th>
+                <th>result</th>
             </tr>
             <tr>
-                <td>0</td>
-                <td>CLEAR</td>
-                <td>Result color is black</td>
+                <td>"copy" (default)</td>
+                <td>src</td>
             </tr>
             <tr>
-                <td>1</td>
-                <td>AND</td>
-                <td>res = src AND prv</td>
+                <td>"copyInverted"</td>
+                <td>NOT src</td>
             </tr>
             <tr>
-                <td>2</td>
-                <td>AND REVERSE</td>
-                <td>res = src AND (NOT prv)</td>
+                <td>"noop"</td>
+                <td>cur</td>
             </tr>
             <tr>
-                <td>3</td>
-                <td>COPY</td>
-                <td>res = src, default value</td>
+                <td>"invert"</td>
+                <td>NOT cur</td>
             </tr>
             <tr>
-                <td>4</td>
-                <td>AND INVERTED</td>
-                <td>res = (NOT src) AND prv</td>
+                <td>"set"</td>
+                <td>White</td>
             </tr>
             <tr>
-                <td>5</td>
-                <td>NOOP</td>
-                <td>res = prv</td>
+                <td>"clear"</td>
+                <td>Black</td>
             </tr>
             <tr>
-                <td>6</td>
-                <td>XOR</td>
-                <td>res = src XOR prv</td>
+                <td>"equiv"</td>
+                <td>cur XOR (NOT src)</td>
             </tr>
             <tr>
-                <td>7</td>
-                <td>OR</td>
-                <td>res = src OR prv</td>
+                <td>"xor"</td>
+                <td>cur XOR src</td>
             </tr>
             <tr>
-                <td>8</td>
-                <td>NOR</td>
-                <td>res = NOT (src OR prv)</td>
+                <td>"or"</td>
+                <td>cur OR src</td>
             </tr>
             <tr>
-                <td>9</td>
-                <td>EQUIV</td>
-                <td>res = (NOT src) XOR prv</td>
+                <td>"orInverted"</td>
+                <td>cur OR (NOT src)</td>
             </tr>
             <tr>
-                <td>10</td>
-                <td>INVERT</td>
-                <td>res = NOT prv</td>
+                <td>"orReverse"</td>
+                <td>(NOT cur) OR src</td>
             </tr>
             <tr>
-                <td>11</td>
-                <td>OR REVERSE</td>
-                <td>res = src OR (NOT prv)</td>
+                <td>"nor"</td>
+                <td>NOT (cur OR src)</td>
             </tr>
             <tr>
-                <td>12</td>
-                <td>COPY INVERTED</td>
-                <td>res = NOT src</td>
+                <td>"and"</td>
+                <td>cur AND src</td>
             </tr>
             <tr>
-                <td>13</td>
-                <td>OR INVERTED</td>
-                <td>res = (NOT src) OR prv</td>
+                <td>"andInverted"</td>
+                <td>cur AND (NOT src)</td>
             </tr>
             <tr>
-                <td>14</td>
-                <td>NAND</td>
-                <td>res = NOT (src AND prv)</td>
+                <td>"andReverse"</td>
+                <td>(NOT cur) AND src</td>
             </tr>
             <tr>
-                <td>15</td>
-                <td>SET</td>
-                <td>Result color is white</td>
+                <td>"nand"</td>
+                <td>NOT (cur AND src)</td>
             </tr>
         </informaltable>
     </refsection>
+    <refsection>
+        <title>Examples</title>
+        <programlisting role="example"><![CDATA[
+pxmodes = ["copy", "copyInverted", "equiv", "xor", ..
+            "and", "nand", "andReverse", "andInverted", ..
+            "or", "nor", "orReverse", "orInverted", ..
+            "noop", "set", "clear", "invert" ..
+           ];
+// sizes, and overlaying margins of figures
+s = 300;
+hm = 8;
+vm = 52;
+//
+for k = 16:-1:1
+    m = pxmodes(k);
+
+    // Position of the figure
+    i = fix((k-1)/4);
+    j = modulo(k-1,4);
+
+    // Creating the figure
+    f = figure("toolbar_visible","off", ..
+               "menubar_visible","off", ..
+               "infobar_visible","off", ..
+               "figure_position", [j*(s-hm), i*(s-vm)], ..
+               "figure_size", [s s], ..
+               "background", color("grey85"), ..
+               "pixel_drawing_mode", m ..
+               );
+    drawlater
+
+    // Setting the axes
+    b = 0.82;
+    plot2d([],[],0,"051"," ",[-1 -1 1 1]*b)
+    plot2d([-1 1]*b,[0 0])
+    a = gca();
+    a.isoview = "on";
+    a.tight_limits = "on";
+    title(m,"fontsize",4)
+
+    // Drawing 3 overlaying colored disks
+    xfarc(-0.7, 0.8, 1, 1, 0, 360*64)
+    e = gce();
+    e.background = color("red");
+    e.fill_mode = "on";
+
+    xfarc(-0.2, 0.5, 1, 1, 0, 360*64)
+    e = gce();
+    e.background = color("blue");
+    e.fill_mode = "on";
+
+    xfarc(-0.7,  0.2, 1, 1, 0, 360*64)
+    e = gce();
+    e.background = color("green");
+    e.fill_mode = "on";
+
+    drawnow
+end
+// Removing all figures
+b = messagebox(_("Press OK to close all figures"),_("End of demo"), "question", "modal");
+w = winsid();
+xdel(w($-15:$));
+    ]]></programlisting>
+        <para>
+            <inlinemediaobject>
+                <imageobject>
+                    <imagedata fileref="../../images/pixel_drawing_mode_70.png" />
+                </imageobject>
+            </inlinemediaobject>
+        </para>
+    </refsection>
+    <refsection role="see also">
+        <title>See also</title>
+        <simplelist type="inline">
+            <member>
+                <link linkend="figure_properties">Figure properties</link>
+            </member>
+            <member>
+                <link linkend="colordef">colordef</link>
+            </member>
+            <member>
+                <link linkend="lighting">lighting</link>
+            </member>
+            <member>
+                <link linkend="Matplot">Matplot</link>
+            </member>
+        </simplelist>
+    </refsection>
 </refentry>
diff --git a/scilab/modules/graphics/help/fr_FR/figure_operations/pixel_drawing_mode.xml b/scilab/modules/graphics/help/fr_FR/figure_operations/pixel_drawing_mode.xml
new file mode 100644 (file)
index 0000000..152a7b0
--- /dev/null
@@ -0,0 +1,217 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ * Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
+ * Copyright (C) 2010 - DIGITEO - Pierre Lando <pierre.lando@scilab.org>
+ * Copyright (C) 2017 - Samuel GOUGEON
+ *
+ * Copyright (C) 2012 - 2017 - Scilab Enterprises
+ *
+ * This file is hereby licensed under the terms of the GNU GPL v2.0,
+ * pursuant to article 5.3.4 of the CeCILL v.2.1.
+ * This file was originally licensed under the terms of the CeCILL v2.1,
+ * and continues to be available under such terms.
+ * For more information, see the COPYING file which you should have received
+ * along with this program.
+ *
+ -->
+<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" xmlns:scilab="http://www.scilab.org"
+    xml:lang="fr" xml:id="pixel_drawing_mode">
+    <refnamediv>
+        <refname>pixel_drawing_mode</refname>
+        <refpurpose>mode d'actualisation des couleurs RVB des pixels lors des tracés graphiques</refpurpose>
+    </refnamediv>
+    <refsection>
+        <title>Description</title>
+        <para>
+            Les couleurs des pixels sont encodées selon les 3 canaux RVB (Rouge Vert Bleu). Pour chaque pixel, chaque canal a une valeur entière sur [0, 255] (uint8).
+        </para>
+        <para>
+            <literal>.pixel_drawing_mode</literal> est une des propriétés des  <link linkend="figure_properties">fenêtres graphiques</link>. Elle indique l'opération binaire à effectuer pour chaque canal RVB de chaque pixel entre la couleur préexistante du pixel de la fenêtre avant le tracé, et la couleur du même pixel de l'objet à tracer. Scilab n'actualise pas nécessairement la couleur du pixel en imposant la couleur de l'objet à tracer comme nouvelle couleur "opaque". La couleur du fond peut par exemple être prise en compte, autorisant certains effets de transparence.
+        </para>
+        <para>
+            <itemizedlist>
+                <listitem>
+                    <literal>src</literal> est la couleur du pixel considéré dans l'objet à tracer / dessiner.
+                </listitem>
+                <listitem>
+                    <literal>cur</literal> est la couleur courante préxistante du même pixel, avant le tracé.
+                </listitem>
+            </itemizedlist>
+            Les valeurs possibles (de type texte) de l'attribut <literal>pixel_drawing_mode</literal> sont listées ci-après, suivies de l'opération binaire correspondante. Dans ces expressions logiques,
+            <itemizedlist>
+                <listitem>
+                    <literal>NOT v</literal> signifie <literal>255 - v</literal>
+                </listitem>
+                <listitem>
+                    <literal>a AND b</literal> signifie <literal>a &amp; b</literal>
+                </listitem>
+                <listitem>
+                    <literal>a OR b</literal> signifie <literal>a | b</literal>
+                </listitem>
+                <listitem>
+                    <literal>a XOR b</literal> signifie <literal>(a OR b) AND NOT (a AND b)</literal>
+                </listitem>
+            </itemizedlist>
+        </para>
+        <informaltable border="1" cellpadding="3px">
+            <tr>
+                <th>Valeur</th>
+                <th>opération effectuée / résultat</th>
+            </tr>
+            <tr>
+                <td>"copy" (par défaut)</td>
+                <td>src</td>
+            </tr>
+            <tr>
+                <td>"copyInverted"</td>
+                <td>NOT src</td>
+            </tr>
+            <tr>
+                <td>"noop"</td>
+                <td>cur</td>
+            </tr>
+            <tr>
+                <td>"invert"</td>
+                <td>NOT cur</td>
+            </tr>
+            <tr>
+                <td>"set"</td>
+                <td>White</td>
+            </tr>
+            <tr>
+                <td>"clear"</td>
+                <td>Black</td>
+            </tr>
+            <tr>
+                <td>"equiv"</td>
+                <td>cur XOR (NOT src)</td>
+            </tr>
+            <tr>
+                <td>"xor"</td>
+                <td>cur XOR src</td>
+            </tr>
+            <tr>
+                <td>"or"</td>
+                <td>cur OR src</td>
+            </tr>
+            <tr>
+                <td>"orInverted"</td>
+                <td>cur OR (NOT src)</td>
+            </tr>
+            <tr>
+                <td>"orReverse"</td>
+                <td>(NOT cur) OR src</td>
+            </tr>
+            <tr>
+                <td>"nor"</td>
+                <td>NOT (cur OR src)</td>
+            </tr>
+            <tr>
+                <td>"and"</td>
+                <td>cur AND src</td>
+            </tr>
+            <tr>
+                <td>"andInverted"</td>
+                <td>cur AND (NOT src)</td>
+            </tr>
+            <tr>
+                <td>"andReverse"</td>
+                <td>(NOT cur) AND src</td>
+            </tr>
+            <tr>
+                <td>"nand"</td>
+                <td>NOT (cur AND src)</td>
+            </tr>
+        </informaltable>
+    </refsection>
+    <refsection>
+        <title>Exemples</title>
+        <programlisting role="example"><![CDATA[
+pxmodes = ["copy", "copyInverted", "equiv", "xor", ..
+           "and",  "nand", "andReverse", "andInverted", ..
+           "or",   "nor",  "orReverse",  "orInverted", ..
+           "noop", "set",  "clear",      "invert" ..
+           ];
+// Dimensions et recouvrement marginal des fenêtres en damier
+s = 300;
+hm = 8;
+vm = 52;
+//
+for k = 16:-1:1
+    m = pxmodes(k);
+
+    // Position de la fenêtre
+    i = fix((k-1)/4);
+    j = modulo(k-1,4);
+
+    // Création et paramétrage de la fenêtre
+    f = figure("toolbar_visible","off", ..
+               "menubar_visible","off", ..
+               "infobar_visible","off", ..
+               "figure_position", [j*(s-hm), i*(s-vm)], ..
+               "figure_size", [s s], ..
+               "background", color("grey85"), ..
+               "pixel_drawing_mode", m ..
+               );
+    drawlater
+
+    // Configuration du tracé
+    b = 0.82;
+    plot2d([],[],0,"051"," ",[-1 -1 1 1]*b)
+    plot2d([-1 1]*b,[0 0])
+    a = gca();
+    a.isoview = "on";
+    a.tight_limits = "on";
+    title(m,"fontsize",4)
+
+    // Affichage de 3 disques rouge, vert et bleu se recouvrant partiellement
+    xfarc(-0.7, 0.8, 1, 1, 0, 360*64)
+    e = gce();
+    e.background = color("red");
+    e.fill_mode = "on";
+
+    xfarc(-0.2, 0.5, 1, 1, 0, 360*64)
+    e = gce();
+    e.background = color("blue");
+    e.fill_mode = "on";
+
+    xfarc(-0.7,  0.2, 1, 1, 0, 360*64)
+    e = gce();
+    e.background = color("green");
+    e.fill_mode = "on";
+
+    drawnow
+end
+// Ménage : on supprime les 16 fenêtres
+b = messagebox(_("Presser OK pour fermer les fenêtres"),"Clore la démonstration", "question", "modal");
+w = winsid();
+xdel(w($-15:$));
+    ]]></programlisting>
+        <para>
+            <inlinemediaobject>
+                <imageobject>
+                    <imagedata fileref="../../images/pixel_drawing_mode_70.png" />
+                </imageobject>
+            </inlinemediaobject>
+        </para>
+    </refsection>
+    <refsection role="see also">
+        <title>Voir ausi</title>
+        <simplelist type="inline">
+            <member>
+                <link linkend="figure_properties">figure_properties</link>
+            </member>
+            <member>
+                <link linkend="colordef">colordef</link>
+            </member>
+            <member>
+                <link linkend="lighting">lighting</link>
+            </member>
+            <member>
+                <link linkend="Matplot">Matplot</link>
+            </member>
+        </simplelist>
+    </refsection>
+</refentry>
diff --git a/scilab/modules/graphics/help/images/pixel_drawing_mode_70.png b/scilab/modules/graphics/help/images/pixel_drawing_mode_70.png
new file mode 100644 (file)
index 0000000..56df9ad
Binary files /dev/null and b/scilab/modules/graphics/help/images/pixel_drawing_mode_70.png differ
diff --git a/scilab/modules/graphics/help/ja_JP/figure_operations/pixel_drawing_mode.xml b/scilab/modules/graphics/help/ja_JP/figure_operations/pixel_drawing_mode.xml
deleted file mode 100644 (file)
index bc22ce5..0000000
+++ /dev/null
@@ -1,242 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!--
-
- * Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
-
- * Copyright (C) 2010 - DIGITEO - Pierre Lando <pierre.lando@scilab.org>
-
- *
-
-
- * Copyright (C) 2012 - 2016 - Scilab Enterprises
- *
- * This file is hereby licensed under the terms of the GNU GPL v2.0,
- * pursuant to article 5.3.4 of the CeCILL v.2.1.
- * This file was originally licensed under the terms of the CeCILL v2.1,
- * and continues to be available under such terms.
- * For more information, see the COPYING file which you should have received
- * along with this program.
-
- *
-
- -->
-
-<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" xmlns:scilab="http://www.scilab.org" xml:lang="ja" xml:id="pixel_drawing_mode">
-
-    <refnamediv>
-
-        <refname>pixel_drawing_mode</refname>
-
-        <refpurpose>ビット単位のピクセルレンダリング関数.</refpurpose>
-
-    </refnamediv>
-
-    <refsection>
-
-        <title>説明</title>
-
-        <para>
-
-            ここで,カラーエンコーディングはRGBです.
-
-            ピクセル描画モードは,
-
-            図の上の描画される色と既存の色の間で図のピクセル上で適用されるビット単位の処理
-
-            を指定する<link linkend="figure_properties">図のプロパティ</link>です.
-
-            この処理の結果は新しいピクセル色となります.
-
-
-
-            <literal>src</literal> はピクセルに指定される色です.
-
-            <literal>prv</literal> は(描画済みの)ピクセルの前の色です.
-
-            <literal>res</literal> は(描画される)ピクセルの結果の色です.
-
-
-
-            <literal>pixel_drawing_mode</literal>には以下の値を指定できます:
-
-        </para>
-
-        <informaltable border="1">
-
-            <tr>
-
-                <td>値</td>
-
-                <td>ビット単位の操作</td>
-
-                <td>コメント</td>
-
-            </tr>
-
-            <tr>
-
-                <td>0</td>
-
-                <td>CLEAR</td>
-
-                <td>結果の色は黒です</td>
-
-            </tr>
-
-            <tr>
-
-                <td>1</td>
-
-                <td>AND</td>
-
-                <td>res = src AND prv</td>
-
-            </tr>
-
-            <tr>
-
-                <td>2</td>
-
-                <td>AND REVERSE</td>
-
-                <td>res = src AND (NOT prv)</td>
-
-            </tr>
-
-            <tr>
-
-                <td>3</td>
-
-                <td>COPY</td>
-
-                <td>res = src, デフォルト値</td>
-
-            </tr>
-
-            <tr>
-
-                <td>4</td>
-
-                <td>AND INVERTED</td>
-
-                <td>res = (NOT src) AND prv</td>
-
-            </tr>
-
-            <tr>
-
-                <td>5</td>
-
-                <td>NOOP</td>
-
-                <td>res = prv</td>
-
-            </tr>
-
-            <tr>
-
-                <td>6</td>
-
-                <td>XOR</td>
-
-                <td>res = src XOR prv</td>
-
-            </tr>
-
-            <tr>
-
-                <td>7</td>
-
-                <td>OR</td>
-
-                <td>res = src OR prv</td>
-
-            </tr>
-
-            <tr>
-
-                <td>8</td>
-
-                <td>NOR</td>
-
-                <td>res = NOT (src OR prv)</td>
-
-            </tr>
-
-            <tr>
-
-                <td>9</td>
-
-                <td>EQUIV</td>
-
-                <td>res = (NOT src) XOR prv</td>
-
-            </tr>
-
-            <tr>
-
-                <td>10</td>
-
-                <td>INVERT</td>
-
-                <td>res = NOT prv</td>
-
-            </tr>
-
-            <tr>
-
-                <td>11</td>
-
-                <td>OR REVERSE</td>
-
-                <td>res = src OR (NOT prv)</td>
-
-            </tr>
-
-            <tr>
-
-                <td>12</td>
-
-                <td>COPY INVERTED</td>
-
-                <td>res = NOT src</td>
-
-            </tr>
-
-            <tr>
-
-                <td>13</td>
-
-                <td>OR INVERTED</td>
-
-                <td>res = (NOT src) OR prv</td>
-
-            </tr>
-
-            <tr>
-
-                <td>14</td>
-
-                <td>NAND</td>
-
-                <td>res = NOT (src AND prv)</td>
-
-            </tr>
-
-            <tr>
-
-                <td>15</td>
-
-                <td>SET</td>
-
-                <td>結果の色は白です</td>
-
-            </tr>
-
-        </informaltable>
-
-    </refsection>
-
-</refentry>
-
diff --git a/scilab/modules/graphics/help/ru_RU/figure_operations/pixel_drawing_mode.xml b/scilab/modules/graphics/help/ru_RU/figure_operations/pixel_drawing_mode.xml
deleted file mode 100644 (file)
index f565bb5..0000000
+++ /dev/null
@@ -1,117 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- * Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
- * Copyright (C) 2010 - DIGITEO - Pierre Lando <pierre.lando@scilab.org>
- *
- * Copyright (C) 2012 - 2016 - Scilab Enterprises
- *
- * This file is hereby licensed under the terms of the GNU GPL v2.0,
- * pursuant to article 5.3.4 of the CeCILL v.2.1.
- * This file was originally licensed under the terms of the CeCILL v2.1,
- * and continues to be available under such terms.
- * For more information, see the COPYING file which you should have received
- * along with this program.
- *
- -->
-<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" xmlns:scilab="http://www.scilab.org"  xml:lang="ru" xml:id="pixel_drawing_mode">
-    <refnamediv>
-        <refname>pixel_drawing_mode</refname>
-        <refpurpose>побитовые функции рендеринга пикселей</refpurpose>
-    </refnamediv>
-    <refsection>
-        <title>Описание</title>
-        <para>
-            Здесь цвет кодируется в RGB.
-            <literal>pixel_drawing_mode</literal> - <link
-            linkend="figure_properties">свойство графического окна</link>, которое определяет побитовую операцию, применяемую к любому пикселю графического окна между накладываемым цветом и уже существующим цветом в графическом окне. Результатом этой операции будет новый цвет пикселя. <literal>src</literal> - накладываемый цвет пикселя.
-            <literal>prv</literal> - предыдущий цвет пикселя (который уже нарисован). <literal>res</literal> - результирующий цвет пикселя (который будет нарисован). Возможными значениями для  <literal>pixel_drawing_mode</literal> являются:
-        </para>
-        <informaltable border="1">
-            <tr>
-                <td>значение</td>
-                <td>побитовая операция</td>
-                <td>комментарии</td>
-            </tr>
-            <tr>
-                <td>0</td>
-                <td>CLEAR</td>
-                <td>результирующий цвет - чёрный</td>
-            </tr>
-            <tr>
-                <td>1</td>
-                <td>AND</td>
-                <td>res = src И prv</td>
-            </tr>
-            <tr>
-                <td>2</td>
-                <td>AND REVERSE</td>
-                <td>res = src И (НЕ prv)</td>
-            </tr>
-            <tr>
-                <td>3</td>
-                <td>COPY</td>
-                <td>res = src, значение по умолчанию</td>
-            </tr>
-            <tr>
-                <td>4</td>
-                <td>AND INVERTED</td>
-                <td>res = (НЕ src) И prv</td>
-            </tr>
-            <tr>
-                <td>5</td>
-                <td>NOOP</td>
-                <td>res = prv</td>
-            </tr>
-            <tr>
-                <td>6</td>
-                <td>XOR</td>
-                <td>res = src ИСКЛЮЧАЮЩЕЕ ИЛИ prv</td>
-            </tr>
-            <tr>
-                <td>7</td>
-                <td>OR</td>
-                <td>res = src ИЛИ prv</td>
-            </tr>
-            <tr>
-                <td>8</td>
-                <td>NOR</td>
-                <td>res = НЕ (src ИЛИ prv)</td>
-            </tr>
-            <tr>
-                <td>9</td>
-                <td>EQUIV</td>
-                <td>res = (НЕ src) ИСКЛЮЧАЮЩЕЕ ИЛИ prv</td>
-            </tr>
-            <tr>
-                <td>10</td>
-                <td>INVERT</td>
-                <td>res = ИЛИ prv</td>
-            </tr>
-            <tr>
-                <td>11</td>
-                <td>OR REVERSE</td>
-                <td>res = src ИЛИ (НЕ prv)</td>
-            </tr>
-            <tr>
-                <td>12</td>
-                <td>COPY INVERTED</td>
-                <td>res = НЕ src</td>
-            </tr>
-            <tr>
-                <td>13</td>
-                <td>OR INVERTED</td>
-                <td>res = (НЕ src) ИЛИ prv</td>
-            </tr>
-            <tr>
-                <td>14</td>
-                <td>NAND</td>
-                <td>res = НЕ (src И prv)</td>
-            </tr>
-            <tr>
-                <td>15</td>
-                <td>SET</td>
-                <td>результирующий цвет - белый</td>
-            </tr>
-        </informaltable>
-    </refsection>
-</refentry>
diff --git a/scilab/modules/helptools/images/pixel_drawing_mode_70.png b/scilab/modules/helptools/images/pixel_drawing_mode_70.png
new file mode 100644 (file)
index 0000000..56df9ad
Binary files /dev/null and b/scilab/modules/helptools/images/pixel_drawing_mode_70.png differ