diff options
-rw-r--r-- | scilab/CHANGES_5.2.X | 5 | ||||
-rw-r--r-- | scilab/modules/gui/help/en_US/tree/uiConcatTree.xml | 24 | ||||
-rw-r--r-- | scilab/modules/gui/help/en_US/tree/uiCreateNode.xml | 8 | ||||
-rw-r--r-- | scilab/modules/gui/help/en_US/tree/uiCreateTree.xml | 7 | ||||
-rw-r--r-- | scilab/modules/gui/help/en_US/tree/uiDeleteNode.xml | 20 | ||||
-rw-r--r-- | scilab/modules/gui/help/en_US/tree/uiDisplayTree.xml | 16 | ||||
-rw-r--r-- | scilab/modules/gui/help/en_US/tree/uiDumpTree.xml | 7 | ||||
-rw-r--r-- | scilab/modules/gui/help/en_US/tree/uiEqualsTree.xml | 19 | ||||
-rw-r--r-- | scilab/modules/gui/help/en_US/tree/uiFindNode.xml | 31 | ||||
-rw-r--r-- | scilab/modules/gui/help/en_US/tree/uiGetChildrenNode.xml | 18 | ||||
-rw-r--r-- | scilab/modules/gui/help/en_US/tree/uiGetNodePosition.xml | 21 | ||||
-rw-r--r-- | scilab/modules/gui/help/en_US/tree/uiGetParentNode.xml | 22 | ||||
-rw-r--r-- | scilab/modules/gui/help/en_US/tree/uiInsertNode.xml | 26 | ||||
-rw-r--r-- | scilab/modules/gui/macros/tree/uiFindNode.sci | 8 | ||||
-rw-r--r-- | scilab/modules/xcos/etc/Xcos-style.xml | 4 |
15 files changed, 216 insertions, 20 deletions
diff --git a/scilab/CHANGES_5.2.X b/scilab/CHANGES_5.2.X index 66b7523..adf3530 100644 --- a/scilab/CHANGES_5.2.X +++ b/scilab/CHANGES_5.2.X | |||
@@ -1952,6 +1952,8 @@ Bug fixes: | |||
1952 | 1952 | ||
1953 | * bug 4773 fixed - Using "axes_reverse" produced a switch between the front and back color of a figure | 1953 | * bug 4773 fixed - Using "axes_reverse" produced a switch between the front and back color of a figure |
1954 | 1954 | ||
1955 | * bug 4785 fixed - tand(0) generated an error | ||
1956 | |||
1955 | * bug 4789 fixed - Number of input arguments was not checked in ilib_functions (dynamic_link module) | 1957 | * bug 4789 fixed - Number of input arguments was not checked in ilib_functions (dynamic_link module) |
1956 | 1958 | ||
1957 | * bug 4792 fixed - Macro name too long | 1959 | * bug 4792 fixed - Macro name too long |
@@ -2055,5 +2057,4 @@ Bug fixes: | |||
2055 | 2057 | ||
2056 | * bug 6495 fixed - in lqr, variable Q not defined. | 2058 | * bug 6495 fixed - in lqr, variable Q not defined. |
2057 | 2059 | ||
2058 | * bug 4785 fixed - tand(0) generated an error | 2060 | * bug 6587 fixed - loadmatfile makes scilab hang on sparse matrix reading. |
2059 | |||
diff --git a/scilab/modules/gui/help/en_US/tree/uiConcatTree.xml b/scilab/modules/gui/help/en_US/tree/uiConcatTree.xml new file mode 100644 index 0000000..4880732 --- /dev/null +++ b/scilab/modules/gui/help/en_US/tree/uiConcatTree.xml | |||
@@ -0,0 +1,24 @@ | |||
1 | <?xml version="1.0" encoding="UTF-8"?> <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" xml:id="uiConcatTree"> <info> <pubdate>$LastChangedDate$</pubdate> </info> <refnamediv> <refname>uiConcatTree</refname> <refpurpose> Concatenation of Trees </refpurpose> </refnamediv> <refsynopsisdiv> <title>Calling Sequence</title> <synopsis>concatenatedTree = uiConcatTree(tree1, tree2) </synopsis> </refsynopsisdiv> <refsection> <title>Input parameters</title> <variablelist> <varlistentry> <term>tree1, tree2</term> <listitem> <para>are of type Tree</para> </listitem> </varlistentry> </variablelist> </refsection> <refsection> <title>Output parameters</title> <variablelist> <varlistentry> <term>concatenatedTree</term> <listitem> <para>a Tree, which is the concatenation of tree1 and tree2</para> </listitem> </varlistentry> </variablelist> </refsection> <refsection> <title>Description</title> <para> | ||
2 | Concatenation will return a tree which is the concatenation of the first tree with the second one. | ||
3 | The concatenation will took place at the parent level of the first tree. | ||
4 | </para> </refsection> <refsection> <title>Examples</title> <programlisting role="example"><![CDATA[ // We should create nodes(subTrees) before creating trees | ||
5 | leaf11 = uiCreateNode('leaf 1.1', 'iconLeaf1.1', 'callbackLeaf1.1') | ||
6 | leaf12 = uiCreateNode('leaf 1.2', 'iconLeaf1.2', 'callbackLeaf1.2') | ||
7 | leaf21 = uiCreateNode('leaf 2.1', 'iconLeaf2.1', 'callbackLeaf2.1') | ||
8 | leaf22 = uiCreateNode('leaf 2.2', 'iconLeaf2.2', 'callbackLeaf2.2') | ||
9 | node1 = uiCreateNode('Node 1', 'iconNode1', 'callbackNode1') | ||
10 | node2 = uiCreateNode('Node 2', 'iconNode2', 'callbackNode2') | ||
11 | root = uiCreateNode('Root', 'iconRoot', 'callbackRoot') | ||
12 | |||
13 | myTree1 = uiCreateTree(node1, leaf11, leaf12) | ||
14 | myTree2 = uiCreateTree(node2, leaf21, leaf22) | ||
15 | |||
16 | concatTree = uiConcatTree(myTree1, myTree2) | ||
17 | |||
18 | uiDisplayTree(concatTree) ]]></programlisting> </refsection> <refsection> <title>See Also</title> <simplelist type="inline"> <member> <link linkend="uiCreateNode">uiCreateNode</link> </member> <member> <link linkend="uiCreateTree">uiCreateTree</link> </member> | ||
19 | <member> <link linkend="uiDisplayTree">uiDisplayTree</link> </member> <member> <link linkend="uiDumpTree">uiDumpTree</link> </member> | ||
20 | <member> <link linkend="uiInsertNode">uiInsertNode</link> </member> | ||
21 | <member> <link linkend="uiDeleteNode">uiDeleteNode</link> </member> <member> <link linkend="uiEqualsTree">uiEqualsTree</link> </member> <member> <link linkend="uiFindNode">uiFindNode</link> </member> | ||
22 | <member> <link linkend="uiGetParentNode">uiGetParentNode</link> </member> <member> <link linkend="uiGetChildrenNode">uiGetChildrenNode</link> </member> | ||
23 | <member> <link linkend="uiGetNodePosition">uiGetNodePosition</link> </member> | ||
24 | </simplelist> </refsection> </refentry> | ||
diff --git a/scilab/modules/gui/help/en_US/tree/uiCreateNode.xml b/scilab/modules/gui/help/en_US/tree/uiCreateNode.xml index 8bde874..eaf5714 100644 --- a/scilab/modules/gui/help/en_US/tree/uiCreateNode.xml +++ b/scilab/modules/gui/help/en_US/tree/uiCreateNode.xml | |||
@@ -1 +1,7 @@ | |||
1 | <?xml version="1.0" encoding="UTF-8"?> <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" xml:id="uiCreateNode"> <info> <pubdate>$LastChangedDate$</pubdate> </info> <refnamediv> <refname>uiCreateNode</refname> <refpurpose> Creation of node (for Scilab Tree) </refpurpose> </refnamediv> <refsynopsisdiv> <title>Calling Sequence</title> <synopsis>myNode = uiCreateNode(label[, icon[, callback]]) </synopsis> </refsynopsisdiv> <refsection> <title>Input parameters</title> <variablelist> <varlistentry> <term>label</term> <listitem> <para>a string matrix which gives the label of the nodes.</para> </listitem> </varlistentry> <varlistentry> <term>icon (optional)</term> <listitem> <para>a string matrix which gives the icon image of the nodes.</para> </listitem> </varlistentry> <varlistentry> <term>callback (optional)</term> <listitem> <para>a string matrix which gives the callback instruction of the nodes.</para> </listitem> </varlistentry> </variablelist> </refsection> <refsection> <title>Output parameters</title> <variablelist> <varlistentry> <term>myNode</term> <listitem> <para>a node of type Tree</para> </listitem> </varlistentry> </variablelist> </refsection> <refsection> <title>Description</title> <para>Creates a node(a node or a leaf) of type Tree.</para> </refsection> <refsection> <title>Examples</title> <programlisting role="example"><![CDATA[ leaf11 = uiCreateNode('leaf 1.1', 'iconLeaf1.1', 'callbackLeaf1.1') leaf12 = uiCreateNode('leaf 1.2', 'iconLeaf1.2', 'callbackLeaf1.2') leaf31 = uiCreateNode('leaf 3.1', 'iconLeaf3.1', 'callbackLeaf3.1') leaf32 = uiCreateNode('leaf 3.2', 'iconLeaf3.2', 'callbackLeaf3.2') node1 = uiCreateNode('Node 1', 'iconNode1', 'callbackNode1') node2 = uiCreateNode('Node 2', 'iconNode2', 'callbackNode2') node3 = uiCreateNode('Node 3', 'iconNode3', 'callbackNode3') root = uiCreateNode('Root', 'iconRoot', 'callbackRoot') ]]></programlisting> </refsection> <refsection> <title>See Also</title> <simplelist type="inline"> <member> <link linkend="uiCreateTree">uiCreateTree</link> </member> <member> <link linkend="uiDumpTree">uiDumpTree</link> </member> </simplelist> </refsection> </refentry> \ No newline at end of file | 1 | <?xml version="1.0" encoding="UTF-8"?> <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" xml:id="uiCreateNode"> <info> <pubdate>$LastChangedDate$</pubdate> </info> <refnamediv> <refname>uiCreateNode</refname> <refpurpose> Creation of node (for Scilab Tree) </refpurpose> </refnamediv> <refsynopsisdiv> <title>Calling Sequence</title> <synopsis>myNode = uiCreateNode(label[, icon[, callback]]) </synopsis> </refsynopsisdiv> <refsection> <title>Input parameters</title> <variablelist> <varlistentry> <term>label</term> <listitem> <para>a string matrix which gives the label of the nodes.</para> </listitem> </varlistentry> <varlistentry> <term>icon (optional)</term> <listitem> <para>a string matrix which gives the icon image of the nodes.</para> </listitem> </varlistentry> <varlistentry> <term>callback (optional)</term> <listitem> <para>a string matrix which gives the callback instruction of the nodes.</para> </listitem> </varlistentry> </variablelist> </refsection> <refsection> <title>Output parameters</title> <variablelist> <varlistentry> <term>myNode</term> <listitem> <para>a node of type Tree</para> </listitem> </varlistentry> </variablelist> </refsection> <refsection> <title>Description</title> <para>Creates a node(a node or a leaf) of type Tree.</para> </refsection> <refsection> <title>Examples</title> <programlisting role="example"><![CDATA[ leaf11 = uiCreateNode('leaf 1.1', 'iconLeaf1.1', 'callbackLeaf1.1') leaf12 = uiCreateNode('leaf 1.2', 'iconLeaf1.2', 'callbackLeaf1.2') leaf31 = uiCreateNode('leaf 3.1', 'iconLeaf3.1', 'callbackLeaf3.1') leaf32 = uiCreateNode('leaf 3.2', 'iconLeaf3.2', 'callbackLeaf3.2') node1 = uiCreateNode('Node 1', 'iconNode1', 'callbackNode1') node2 = uiCreateNode('Node 2', 'iconNode2', 'callbackNode2') node3 = uiCreateNode('Node 3', 'iconNode3', 'callbackNode3') root = uiCreateNode('Root', 'iconRoot', 'callbackRoot') ]]></programlisting> </refsection> <refsection> <title>See Also</title> <simplelist type="inline"> <member> <link linkend="uiCreateTree">uiCreateTree</link> </member> |
2 | <member> <link linkend="uiDisplayTree">uiDisplayTree</link> </member> <member> <link linkend="uiDumpTree">uiDumpTree</link> </member> | ||
3 | <member> <link linkend="uiInsertNode">uiInsertNode</link> </member> | ||
4 | <member> <link linkend="uiDeleteNode">uiDeleteNode</link> </member> | ||
5 | <member> <link linkend="uiConcatTree">uiConcatTree</link> </member> <member> <link linkend="uiEqualsTree">uiEqualsTree</link> </member> <member> <link linkend="uiFindNode">uiFindNode</link> </member> | ||
6 | <member> <link linkend="uiGetParentNode">uiGetParentNode</link> </member> <member> <link linkend="uiGetChildrenNode">uiGetChildrenNode</link> </member> | ||
7 | <member> <link linkend="uiGetNodePosition">uiGetNodePosition</link> </member> </simplelist> </refsection> </refentry> | ||
diff --git a/scilab/modules/gui/help/en_US/tree/uiCreateTree.xml b/scilab/modules/gui/help/en_US/tree/uiCreateTree.xml index 14e1dc7..43b93a1 100644 --- a/scilab/modules/gui/help/en_US/tree/uiCreateTree.xml +++ b/scilab/modules/gui/help/en_US/tree/uiCreateTree.xml | |||
@@ -1 +1,6 @@ | |||
1 | <?xml version="1.0" encoding="UTF-8"?> <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" xml:id="uiCreateTree"> <info> <pubdate>$LastChangedDate$</pubdate> </info> <refnamediv> <refname>uiCreateTree</refname> <refpurpose> Creation of a Tree </refpurpose> </refnamediv> <refsynopsisdiv> <title>Calling Sequence</title> <synopsis>myTree = uiCreateTree(myParentTree, mySubTree1, mySubTree2,...,mySubTreeN) </synopsis> </refsynopsisdiv> <refsection> <title>Input parameters</title> <variablelist> <varlistentry> <term>myParentTree</term> <listitem> <para>a Tree.</para> </listitem> </varlistentry> <varlistentry> <term>mySubTree(s)</term> <listitem> <para>one or many trees</para> </listitem> </varlistentry> </variablelist> </refsection> <refsection> <title>Output parameters</title> <variablelist> <varlistentry> <term>myTree</term> <listitem> <para>a Tree</para> </listitem> </varlistentry> </variablelist> </refsection> <refsection> <title>Description</title> <para>Creates a Tree in which myParentTree will have children(mySubTree1, mySubTree2,...,mySubTreeN).</para> </refsection> <refsection> <title>Examples</title> <programlisting role="example"><![CDATA[ // We should create nodes(subTrees) before creating trees leaf11 = uiCreateNode('leaf 1.1', 'iconLeaf1.1', 'callbackLeaf1.1') leaf12 = uiCreateNode('leaf 1.2', 'iconLeaf1.2', 'callbackLeaf1.2') leaf31 = uiCreateNode('leaf 3.1', 'iconLeaf3.1', 'callbackLeaf3.1') leaf32 = uiCreateNode('leaf 3.2', 'iconLeaf3.2', 'callbackLeaf3.2') node1 = uiCreateNode('Node 1', 'iconNode1', 'callbackNode1') node2 = uiCreateNode('Node 2', 'iconNode2', 'callbackNode2') node3 = uiCreateNode('Node 3', 'iconNode3', 'callbackNode3') root = uiCreateNode('Root', 'iconRoot', 'callbackRoot') treeNode1 = uiCreateTree(node1, leaf11, leaf12) treeNode3 = uiCreateTree(node3, leaf31, leaf32) treeRoot = uiCreateTree( root, treeNode1, node2, treeNode3) uiDisplayTree(treeRoot) ]]></programlisting> </refsection> <refsection> <title>See Also</title> <simplelist type="inline"> <member> <link linkend="uiCreateNode">uiCreateNode</link> </member> <member> <link linkend="uiDumpTree">uiDumpTree</link> </member> </simplelist> </refsection> </refentry> \ No newline at end of file | 1 | <?xml version="1.0" encoding="UTF-8"?> <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" xml:id="uiCreateTree"> <info> <pubdate>$LastChangedDate$</pubdate> </info> <refnamediv> <refname>uiCreateTree</refname> <refpurpose> Creation of a Tree </refpurpose> </refnamediv> <refsynopsisdiv> <title>Calling Sequence</title> <synopsis>myTree = uiCreateTree(myParentTree, mySubTree1, mySubTree2,...,mySubTreeN) </synopsis> </refsynopsisdiv> <refsection> <title>Input parameters</title> <variablelist> <varlistentry> <term>myParentTree</term> <listitem> <para>a Tree.</para> </listitem> </varlistentry> <varlistentry> <term>mySubTree(s)</term> <listitem> <para>one or many trees</para> </listitem> </varlistentry> </variablelist> </refsection> <refsection> <title>Output parameters</title> <variablelist> <varlistentry> <term>myTree</term> <listitem> <para>a Tree</para> </listitem> </varlistentry> </variablelist> </refsection> <refsection> <title>Description</title> <para>Creates a Tree in which myParentTree will have children(mySubTree1, mySubTree2,...,mySubTreeN).</para> </refsection> <refsection> <title>Examples</title> <programlisting role="example"><![CDATA[ // We should create nodes(subTrees) before creating trees leaf11 = uiCreateNode('leaf 1.1', 'iconLeaf1.1', 'callbackLeaf1.1') leaf12 = uiCreateNode('leaf 1.2', 'iconLeaf1.2', 'callbackLeaf1.2') leaf31 = uiCreateNode('leaf 3.1', 'iconLeaf3.1', 'callbackLeaf3.1') leaf32 = uiCreateNode('leaf 3.2', 'iconLeaf3.2', 'callbackLeaf3.2') node1 = uiCreateNode('Node 1', 'iconNode1', 'callbackNode1') node2 = uiCreateNode('Node 2', 'iconNode2', 'callbackNode2') node3 = uiCreateNode('Node 3', 'iconNode3', 'callbackNode3') root = uiCreateNode('Root', 'iconRoot', 'callbackRoot') treeNode1 = uiCreateTree(node1, leaf11, leaf12) treeNode3 = uiCreateTree(node3, leaf31, leaf32) treeRoot = uiCreateTree(root, treeNode1, node2, treeNode3) uiDisplayTree(treeRoot) ]]></programlisting> </refsection> <refsection> <title>See Also</title> <simplelist type="inline"> <member> <link linkend="uiCreateNode">uiCreateNode</link> </member> <member> <link linkend="uiDisplayTree">uiDisplayTree</link> </member> <member> <link linkend="uiDumpTree">uiDumpTree</link> </member> |
2 | <member> <link linkend="uiInsertNode">uiInsertNode</link> </member> | ||
3 | <member> <link linkend="uiDeleteNode">uiDeleteNode</link> </member> | ||
4 | <member> <link linkend="uiConcatTree">uiConcatTree</link> </member> <member> <link linkend="uiEqualsTree">uiEqualsTree</link> </member> <member> <link linkend="uiFindNode">uiFindNode</link> </member> | ||
5 | <member> <link linkend="uiGetParentNode">uiGetParentNode</link> </member> <member> <link linkend="uiGetChildrenNode">uiGetChildrenNode</link> </member> | ||
6 | <member> <link linkend="uiGetNodePosition">uiGetNodePosition</link> </member> </simplelist> </refsection> </refentry> | ||
diff --git a/scilab/modules/gui/help/en_US/tree/uiDeleteNode.xml b/scilab/modules/gui/help/en_US/tree/uiDeleteNode.xml new file mode 100644 index 0000000..fef1cfe --- /dev/null +++ b/scilab/modules/gui/help/en_US/tree/uiDeleteNode.xml | |||
@@ -0,0 +1,20 @@ | |||
1 | <?xml version="1.0" encoding="UTF-8"?> <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" xml:id="uiDeleteNode"> <info> <pubdate>$LastChangedDate$</pubdate> </info> <refnamediv> <refname>uiDeleteNode</refname> <refpurpose> Deletion in a Tree </refpurpose> </refnamediv> <refsynopsisdiv> <title>Calling Sequence</title> <synopsis>delTree = uiDeleteNode(tree, node)</synopsis> | ||
2 | <synopsis>delTree = uiDeleteNode(tree, position)</synopsis> </refsynopsisdiv> <refsection> <title>Input parameters</title> <variablelist> <varlistentry> <term>tree</term> <listitem> <para>Tree were we do the deletion</para> </listitem> </varlistentry> | ||
3 | <varlistentry> <term>node</term> <listitem> <para>node we want to delete</para> </listitem> </varlistentry> | ||
4 | <varlistentry> <term>position</term> <listitem> <para>a string, which is the position of the node we want to delete</para> </listitem> </varlistentry> </variablelist> </refsection> <refsection> <title>Output parameters</title> <variablelist> <varlistentry> <term>delTree</term> <listitem> <para>a Tree without the deleted node</para> </listitem> </varlistentry> </variablelist> </refsection> <refsection> <title>Description</title> <para> | ||
5 | Deletion of a node (subTree) from a tree. | ||
6 | If we have 3 nodes called 'Node1', 'Node2' and 'Node3' each one at position 1.1, 1.2, and 1.3. Deletion of node at position 1.2 ('Node2') will pull up the 'Node 3' to position 1.2. | ||
7 | </para> </refsection> <refsection> <title>Examples</title> <programlisting role="example"><![CDATA[ // We should create nodes(subTrees) before creating trees leaf11 = uiCreateNode('leaf 1.1', 'iconLeaf1.1', 'callbackLeaf1.1') leaf12 = uiCreateNode('leaf 1.2', 'iconLeaf1.2', 'callbackLeaf1.2') leaf31 = uiCreateNode('leaf 3.1', 'iconLeaf3.1', 'callbackLeaf3.1') leaf32 = uiCreateNode('leaf 3.2', 'iconLeaf3.2', 'callbackLeaf3.2') node1 = uiCreateNode('Node 1', 'iconNode1', 'callbackNode1') node2 = uiCreateNode('Node 2', 'iconNode2', 'callbackNode2') node3 = uiCreateNode('Node 3', 'iconNode3', 'callbackNode3') root = uiCreateNode('Root', 'iconRoot', 'callbackRoot') treeNode1 = uiCreateTree(node1, leaf11, leaf12) treeNode3 = uiCreateTree(node3, leaf31, leaf32) treeRoot = uiCreateTree(root, treeNode1, node2, treeNode3) | ||
8 | |||
9 | // Deletion of 'node2' | ||
10 | treeDel = uiDeleteNode(treeRoot, node2) uiDisplayTree(treeDel) | ||
11 | |||
12 | // Deletion of node at position '3.2' | ||
13 | treeDel = uiDeleteNode(treeRoot, '3.2') uiDisplayTree(treeDel) | ||
14 | ]]></programlisting> </refsection> <refsection> <title>See Also</title> <simplelist type="inline"> <member> <link linkend="uiCreateNode">uiCreateNode</link> </member> <member> <link linkend="uiCreateTree">uiCreateTree</link> </member> | ||
15 | <member> <link linkend="uiDisplayTree">uiDisplayTree</link> </member> <member> <link linkend="uiDumpTree">uiDumpTree</link> </member> | ||
16 | <member> <link linkend="uiInsertNode">uiInsertNode</link> </member> | ||
17 | <member> <link linkend="uiConcatTree">uiConcatTree</link> </member> <member> <link linkend="uiEqualsTree">uiEqualsTree</link> </member> <member> <link linkend="uiFindNode">uiFindNode</link> </member> | ||
18 | <member> <link linkend="uiGetParentNode">uiGetParentNode</link> </member> <member> <link linkend="uiGetChildrenNode">uiGetChildrenNode</link> </member> | ||
19 | <member> <link linkend="uiGetNodePosition">uiGetNodePosition</link> </member> | ||
20 | </simplelist> </refsection> </refentry> | ||
diff --git a/scilab/modules/gui/help/en_US/tree/uiDisplayTree.xml b/scilab/modules/gui/help/en_US/tree/uiDisplayTree.xml index 472d06e..c070dba 100644 --- a/scilab/modules/gui/help/en_US/tree/uiDisplayTree.xml +++ b/scilab/modules/gui/help/en_US/tree/uiDisplayTree.xml | |||
@@ -51,15 +51,13 @@ uiDisplayTree(treeRoot) | |||
51 | <refsection> | 51 | <refsection> |
52 | <title>See Also</title> | 52 | <title>See Also</title> |
53 | <simplelist type="inline"> | 53 | <simplelist type="inline"> |
54 | <member> | 54 | <member> <link linkend="uiCreateNode">uiCreateNode</link> </member> <member> <link linkend="uiCreateTree">uiCreateTree</link> </member> |
55 | <link linkend="uiCreateNode">uiCreateNode</link> | 55 | <member> <link linkend="uiDumpTree">uiDumpTree</link> </member> |
56 | </member> | 56 | <member> <link linkend="uiInsertNode">uiInsertNode</link> </member> |
57 | <member> | 57 | <member> <link linkend="uiDeleteNode">uiDeleteNode</link> </member> |
58 | <link linkend="uiCreateTree">uiCreateTree</link> | 58 | <member> <link linkend="uiConcatTree">uiConcatTree</link> </member> <member> <link linkend="uiEqualsTree">uiEqualsTree</link> </member> <member> <link linkend="uiFindNode">uiFindNode</link> </member> |
59 | </member> | 59 | <member> <link linkend="uiGetParentNode">uiGetParentNode</link> </member> <member> <link linkend="uiGetChildrenNode">uiGetChildrenNode</link> </member> |
60 | <member> | 60 | <member> <link linkend="uiGetNodePosition">uiGetNodePosition</link> </member> |
61 | <link linkend="uiDumpTree">uiDumpTree</link> | ||
62 | </member> | ||
63 | </simplelist> | 61 | </simplelist> |
64 | </refsection> | 62 | </refsection> |
65 | </refentry> | 63 | </refentry> |
diff --git a/scilab/modules/gui/help/en_US/tree/uiDumpTree.xml b/scilab/modules/gui/help/en_US/tree/uiDumpTree.xml index 6420b9b..07d33e1 100644 --- a/scilab/modules/gui/help/en_US/tree/uiDumpTree.xml +++ b/scilab/modules/gui/help/en_US/tree/uiDumpTree.xml | |||
@@ -1 +1,6 @@ | |||
1 | <?xml version="1.0" encoding="UTF-8"?> <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" xml:id="uiDumpTree"> <info> <pubdate>$LastChangedDate$</pubdate> </info> <refnamediv> <refname>uiDumpTree</refname> <refpurpose> Printing a Tree in the console (text mode)</refpurpose> </refnamediv> <refsynopsisdiv> <title>Calling Sequence</title> <synopsis>uiDumpTree(tree[,b]) </synopsis> </refsynopsisdiv> <refsection> <title>Input parameters</title> <variablelist> <varlistentry> <term>tree</term> <listitem> <para>a Tree.</para> </listitem> </varlistentry> <varlistentry> <term>b(optional)</term> <listitem> <para>display features of each node of the tree. By default b is '%F'.</para> </listitem> </varlistentry> </variablelist> </refsection> <refsection> <title>Description</title> <para>Display a tree into the console(text mode).</para> </refsection> <refsection> <title>Examples</title> <programlisting role="example"><![CDATA[ // We should create nodes(subTrees) before creating trees leaf11 = uiCreateNode('leaf 1.1', 'iconLeaf1.1', 'callbackLeaf1.1') leaf12 = uiCreateNode('leaf 1.2', 'iconLeaf1.2', 'callbackLeaf1.2') leaf31 = uiCreateNode('leaf 3.1', 'iconLeaf3.1', 'callbackLeaf3.1') leaf32 = uiCreateNode('leaf 3.2', 'iconLeaf3.2', 'callbackLeaf3.2') node1 = uiCreateNode('Node 1', 'iconNode1', 'callbackNode1') node2 = uiCreateNode('Node 2', 'iconNode2', 'callbackNode2') node3 = uiCreateNode('Node 3', 'iconNode3', 'callbackNode3') root = uiCreateNode('Root', 'iconRoot', 'callbackRoot') treeNode1 = uiCreateTree(node1, leaf11,leaf12) treeNode3 = uiCreateTree(node3, leaf31,leaf32) treeRoot = uiCreateTree(root, node1,node2,node3) uiDumpTree(treeRoot) ]]></programlisting> </refsection> <refsection> <title>See Also</title> <simplelist type="inline"> <member> <link linkend="uiCreateNode">uiCreateNode</link> </member> <member> <link linkend="uiCreateTree">uiCreateTree</link> </member> </simplelist> </refsection> </refentry> \ No newline at end of file | 1 | <?xml version="1.0" encoding="UTF-8"?> <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" xml:id="uiDumpTree"> <info> <pubdate>$LastChangedDate$</pubdate> </info> <refnamediv> <refname>uiDumpTree</refname> <refpurpose> Printing a Tree in the console (text mode)</refpurpose> </refnamediv> <refsynopsisdiv> <title>Calling Sequence</title> <synopsis>uiDumpTree(tree[,b]) </synopsis> </refsynopsisdiv> <refsection> <title>Input parameters</title> <variablelist> <varlistentry> <term>tree</term> <listitem> <para>a Tree.</para> </listitem> </varlistentry> <varlistentry> <term>b(optional)</term> <listitem> <para>display features of each node of the tree. By default b is '%F'.</para> </listitem> </varlistentry> </variablelist> </refsection> <refsection> <title>Description</title> <para>Display a tree into the console(text mode).</para> </refsection> <refsection> <title>Examples</title> <programlisting role="example"><![CDATA[ // We should create nodes(subTrees) before creating trees leaf11 = uiCreateNode('leaf 1.1', 'iconLeaf1.1', 'callbackLeaf1.1') leaf12 = uiCreateNode('leaf 1.2', 'iconLeaf1.2', 'callbackLeaf1.2') leaf31 = uiCreateNode('leaf 3.1', 'iconLeaf3.1', 'callbackLeaf3.1') leaf32 = uiCreateNode('leaf 3.2', 'iconLeaf3.2', 'callbackLeaf3.2') node1 = uiCreateNode('Node 1', 'iconNode1', 'callbackNode1') node2 = uiCreateNode('Node 2', 'iconNode2', 'callbackNode2') node3 = uiCreateNode('Node 3', 'iconNode3', 'callbackNode3') root = uiCreateNode('Root', 'iconRoot', 'callbackRoot') treeNode1 = uiCreateTree(node1, leaf11,leaf12) treeNode3 = uiCreateTree(node3, leaf31,leaf32) treeRoot = uiCreateTree(root, node1,node2,node3) uiDumpTree(treeRoot) ]]></programlisting> </refsection> <refsection> <title>See Also</title> <simplelist type="inline"> <member> <link linkend="uiCreateNode">uiCreateNode</link> </member> <member> <link linkend="uiCreateTree">uiCreateTree</link> </member> |
2 | <member> <link linkend="uiDisplayTree">uiDisplayTree</link> </member> <member> <link linkend="uiInsertNode">uiInsertNode</link> </member> | ||
3 | <member> <link linkend="uiDeleteNode">uiDeleteNode</link> </member> | ||
4 | <member> <link linkend="uiConcatTree">uiConcatTree</link> </member> <member> <link linkend="uiEqualsTree">uiEqualsTree</link> </member> <member> <link linkend="uiFindNode">uiFindNode</link> </member> | ||
5 | <member> <link linkend="uiGetParentNode">uiGetParentNode</link> </member> <member> <link linkend="uiGetChildrenNode">uiGetChildrenNode</link> </member> | ||
6 | <member> <link linkend="uiGetNodePosition">uiGetNodePosition</link> </member> </simplelist> </refsection> </refentry> | ||
diff --git a/scilab/modules/gui/help/en_US/tree/uiEqualsTree.xml b/scilab/modules/gui/help/en_US/tree/uiEqualsTree.xml new file mode 100644 index 0000000..59b434c --- /dev/null +++ b/scilab/modules/gui/help/en_US/tree/uiEqualsTree.xml | |||
@@ -0,0 +1,19 @@ | |||
1 | <?xml version="1.0" encoding="UTF-8"?> <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" xml:id="uiEqualsTree"> <info> <pubdate>$LastChangedDate$</pubdate> </info> <refnamediv> <refname>uiEqualsTree</refname> <refpurpose> Comparing two trees </refpurpose> </refnamediv> <refsynopsisdiv> <title>Calling Sequence</title> <synopsis>isEqual = uiEqualsTree(tree1, tree2) </synopsis> </refsynopsisdiv> <refsection> <title>Input parameters</title> <variablelist> <varlistentry> <term>tree1, tree2</term> <listitem> <para>are of type Tree</para> </listitem> </varlistentry> </variablelist> </refsection> <refsection> <title>Output parameters</title> <variablelist> <varlistentry> <term>isEqual</term> <listitem> <para>a Boolean, which indicate if those trees are equal or not</para> </listitem> </varlistentry> </variablelist> </refsection> <refsection> <title>Description</title> <para> | ||
2 | Compare two trees structures. | ||
3 | </para> </refsection> <refsection> <title>Examples</title> <programlisting role="example"><![CDATA[ // Creation of trees | ||
4 | root = uiCreateNode('Root', 'path\rootImage.jpg', 'rootCallback') | ||
5 | node1 = uiCreateNode('Node 1', 'default', 'node1Callback') | ||
6 | node2 = uiCreateNode('Node 2', 'default', 'node2Callback') | ||
7 | myTree1 = uiCreateTree(root, node1, node2) | ||
8 | myTree2 = uiCreateTree(root, node1, node2) | ||
9 | |||
10 | // Compare myTree1 with myTree2 | ||
11 | isEqual = uiEqualsTree(myTree1, myTree2) | ||
12 | |||
13 | // will return 'isEqual = T' ]]></programlisting> </refsection> <refsection> <title>See Also</title> <simplelist type="inline"> <member> <link linkend="uiCreateNode">uiCreateNode</link> </member> <member> <link linkend="uiCreateTree">uiCreateTree</link> </member> | ||
14 | <member> <link linkend="uiDisplayTree">uiDisplayTree</link> </member> <member> <link linkend="uiDumpTree">uiDumpTree</link> </member> | ||
15 | <member> <link linkend="uiInsertNode">uiInsertNode</link> </member> | ||
16 | <member> <link linkend="uiDeleteNode">uiDeleteNode</link> </member> <member> <link linkend="uiConcatTree">uiConcatTree</link> </member> <member> <link linkend="uiFindNode">uiFindNode</link> </member> | ||
17 | <member> <link linkend="uiGetParentNode">uiGetParentNode</link> </member> <member> <link linkend="uiGetChildrenNode">uiGetChildrenNode</link> </member> | ||
18 | <member> <link linkend="uiGetNodePosition">uiGetNodePosition</link> </member> | ||
19 | </simplelist> </refsection> </refentry> | ||
diff --git a/scilab/modules/gui/help/en_US/tree/uiFindNode.xml b/scilab/modules/gui/help/en_US/tree/uiFindNode.xml new file mode 100644 index 0000000..3507bf0 --- /dev/null +++ b/scilab/modules/gui/help/en_US/tree/uiFindNode.xml | |||
@@ -0,0 +1,31 @@ | |||
1 | <?xml version="1.0" encoding="UTF-8"?> <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" xml:id="uiFindNode"> <info> <pubdate>$LastChangedDate$</pubdate> </info> <refnamediv> <refname>uiFindNode</refname> <refpurpose> Find node in Tree </refpurpose> </refnamediv> <refsynopsisdiv> <title>Calling Sequence</title> <synopsis>nodeList = uiFindNode(tree, node)</synopsis> | ||
2 | <synopsis>nodeList = uiFindNode(tree, position)</synopsis> | ||
3 | <synopsis>nodeList = uiFindNode(tree, property, value)</synopsis> </refsynopsisdiv> <refsection> <title>Input parameters</title> <variablelist> <varlistentry> <term>tree</term> <listitem> <para>Tree in which we find the node</para> </listitem> </varlistentry> | ||
4 | <varlistentry> <term>node</term> <listitem> <para>the node we find</para> </listitem> </varlistentry> | ||
5 | <varlistentry> <term>position</term> <listitem> <para>a string, which is the position of the node we find in the tree </para> </listitem> </varlistentry> | ||
6 | <varlistentry> <term>property</term> <listitem> <para>a string, which finds node(s) by properties (label, icon or callback)</para> </listitem> </varlistentry> | ||
7 | <varlistentry> <term>value</term> <listitem> <para>a string, which is the value of the property</para> </listitem> </varlistentry> </variablelist> </refsection> <refsection> <title>Output parameters</title> <variablelist> <varlistentry> <term>nodeList</term> <listitem> <para>a list of matching node(s)</para> </listitem> </varlistentry> </variablelist> </refsection> <refsection> <title>Description</title> <para> | ||
8 | Finds node(s) in a tree. | ||
9 | </para> </refsection> <refsection> <title>Examples</title> <programlisting role="example"><![CDATA[ | ||
10 | // We should create nodes(subTrees) before creating trees leaf11 = uiCreateNode('leaf 1.1', 'iconLeaf1.1', 'callbackLeaf1.1') leaf12 = uiCreateNode('leaf 1.2', 'iconLeaf1.2', 'callbackLeaf1.2') leaf31 = uiCreateNode('leaf 3.1', 'iconLeaf3.1', 'callbackLeaf3.1') leaf32 = uiCreateNode('leaf 3.2', 'iconLeaf3.2', 'callbackLeaf3.2') node1 = uiCreateNode('Node 1', 'iconNode1', 'callbackNode1') node2 = uiCreateNode('Node 2', 'iconNode2', 'callbackNode2') node3 = uiCreateNode('Node 3', 'iconNode3', 'callbackNode3') root = uiCreateNode('Root', 'iconRoot', 'callbackRoot') treeNode1 = uiCreateTree(node1, leaf11, leaf12) treeNode3 = uiCreateTree(node3, leaf31, leaf32) treeRoot = uiCreateTree(root, treeNode1, node2, treeNode3) | ||
11 | |||
12 | // Creation of a node | ||
13 | myNode = uiCreateNode('Node 2', 'iconNode2', 'callbackNode2') | ||
14 | |||
15 | // Find if treeRoot contains myNode | ||
16 | result = uiFindNode(treeRoot, myNode) | ||
17 | //will return 'result = list(node1)' | ||
18 | |||
19 | // Find node at position '1.1' | ||
20 | result = uiFindNode(treeRoot, '3.1') | ||
21 | //will return 'result = list(leaf31)' | ||
22 | |||
23 | // Find node where 'text' equals 'Node 2' | ||
24 | result = uiFindNode(treeRoot, 'label', 'Node 2') | ||
25 | //will return 'result = list(node2)' ]]></programlisting> </refsection> <refsection> <title>See Also</title> <simplelist type="inline"> <member> <link linkend="uiCreateNode">uiCreateNode</link> </member> <member> <link linkend="uiCreateTree">uiCreateTree</link> </member> | ||
26 | <member> <link linkend="uiDisplayTree">uiDisplayTree</link> </member> <member> <link linkend="uiDumpTree">uiDumpTree</link> </member> | ||
27 | <member> <link linkend="uiInsertNode">uiInsertNode</link> </member> | ||
28 | <member> <link linkend="uiDeleteNode">uiDeleteNode</link> </member> | ||
29 | <member> <link linkend="uiConcatTree">uiConcatTree</link> </member> <member> <link linkend="uiEqualsTree">uiEqualsTree</link> </member> <member> <link linkend="uiGetParentNode">uiGetParentNode</link> </member> <member> <link linkend="uiGetChildrenNode">uiGetChildrenNode</link> </member> | ||
30 | <member> <link linkend="uiGetNodePosition">uiGetNodePosition</link> </member> | ||
31 | </simplelist> </refsection> </refentry> | ||
diff --git a/scilab/modules/gui/help/en_US/tree/uiGetChildrenNode.xml b/scilab/modules/gui/help/en_US/tree/uiGetChildrenNode.xml new file mode 100644 index 0000000..cdbf604 --- /dev/null +++ b/scilab/modules/gui/help/en_US/tree/uiGetChildrenNode.xml | |||
@@ -0,0 +1,18 @@ | |||
1 | <?xml version="1.0" encoding="UTF-8"?> <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" xml:id="uiGetChildrenNode"> <info> <pubdate>$LastChangedDate$</pubdate> </info> <refnamediv> <refname>uiGetChildrenNode</refname> <refpurpose> Get Children of a node </refpurpose> </refnamediv> <refsynopsisdiv> <title>Calling Sequence</title> <synopsis>children = uiGetChildrenNode(tree, node)</synopsis> | ||
2 | <synopsis>children = uiGetChildrenNode(tree, position)</synopsis> | ||
3 | </refsynopsisdiv> <refsection> <title>Input parameters</title> <variablelist> <varlistentry> <term>tree</term> <listitem> <para>Tree in which we look for children node(s)</para> </listitem> </varlistentry> | ||
4 | <varlistentry> <term>node</term> <listitem> <para>the node we look for children</para> </listitem> </varlistentry> | ||
5 | <varlistentry> <term>position</term> <listitem> <para>a string, which is the position of the node we look for children</para> </listitem> </varlistentry> </variablelist> </refsection> <refsection> <title>Output parameters</title> <variablelist> <varlistentry> <term>children</term> <listitem> <para>a list of children nodes</para> </listitem> </varlistentry> </variablelist> </refsection> <refsection> <title>Description</title> <para> | ||
6 | Finds the children of a specific node. | ||
7 | </para> </refsection> <refsection> <title>Examples</title> <programlisting role="example"><![CDATA[ | ||
8 | // We should create nodes(subTrees) before creating trees leaf11 = uiCreateNode('leaf 1.1', 'iconLeaf1.1', 'callbackLeaf1.1') leaf12 = uiCreateNode('leaf 1.2', 'iconLeaf1.2', 'callbackLeaf1.2') leaf31 = uiCreateNode('leaf 3.1', 'iconLeaf3.1', 'callbackLeaf3.1') leaf32 = uiCreateNode('leaf 3.2', 'iconLeaf3.2', 'callbackLeaf3.2') node1 = uiCreateNode('Node 1', 'iconNode1', 'callbackNode1') node2 = uiCreateNode('Node 2', 'iconNode2', 'callbackNode2') node3 = uiCreateNode('Node 3', 'iconNode3', 'callbackNode3') root = uiCreateNode('Root', 'iconRoot', 'callbackRoot') treeNode1 = uiCreateTree(node1, leaf11, leaf12) treeNode3 = uiCreateTree(node3, leaf31, leaf32) treeRoot = uiCreateTree(root, treeNode1, node2, treeNode3) | ||
9 | |||
10 | // Search children node(s) of node 'node1' | ||
11 | children = uiGetChildrenNode(treeRoot, node1) | ||
12 | // will return 'children = list(leaf11, leaf12)' ]]></programlisting> </refsection> <refsection> <title>See Also</title> <simplelist type="inline"> <member> <link linkend="uiCreateNode">uiCreateNode</link> </member> <member> <link linkend="uiCreateTree">uiCreateTree</link> </member> | ||
13 | <member> <link linkend="uiDisplayTree">uiDisplayTree</link> </member> <member> <link linkend="uiDumpTree">uiDumpTree</link> </member> | ||
14 | <member> <link linkend="uiInsertNode">uiInsertNode</link> </member> | ||
15 | <member> <link linkend="uiDeleteNode">uiDeleteNode</link> </member> | ||
16 | <member> <link linkend="uiConcatTree">uiConcatTree</link> </member> <member> <link linkend="uiEqualsTree">uiEqualsTree</link> </member> <member> <link linkend="uiFindNode">uiFindNode</link> </member> <member> <link linkend="uiGetParentNode">uiGetParentNode</link> </member> | ||
17 | <member> <link linkend="uiGetNodePosition">uiGetNodePosition</link> </member> | ||
18 | </simplelist> </refsection> </refentry> | ||
diff --git a/scilab/modules/gui/help/en_US/tree/uiGetNodePosition.xml b/scilab/modules/gui/help/en_US/tree/uiGetNodePosition.xml new file mode 100644 index 0000000..b6d2c41 --- /dev/null +++ b/scilab/modules/gui/help/en_US/tree/uiGetNodePosition.xml | |||
@@ -0,0 +1,21 @@ | |||
1 | <?xml version="1.0" encoding="UTF-8"?> <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" xml:id="uiGetNodePosition"> <info> <pubdate>$LastChangedDate$</pubdate> </info> <refnamediv> <refname>uiGetNodePosition</refname> <refpurpose> Get the position(s) of a node </refpurpose> </refnamediv> <refsynopsisdiv> <title>Calling Sequence</title> <synopsis>position = uiGetNodePosition(tree, node)</synopsis> | ||
2 | </refsynopsisdiv> <refsection> <title>Input parameters</title> <variablelist> <varlistentry> <term>tree</term> <listitem> <para>Tree in which we look for position(s) of a node</para> </listitem> </varlistentry> | ||
3 | <varlistentry> <term>node</term> <listitem> <para>the node we look for position(s)</para> </listitem> </varlistentry> | ||
4 | </variablelist> </refsection> <refsection> <title>Output parameters</title> <variablelist> <varlistentry> <term>position</term> <listitem> <para>a matrix of string which contains node position(s).</para> </listitem> </varlistentry> </variablelist> </refsection> <refsection> <title>Description</title> <para> | ||
5 | Get the position of a given node. | ||
6 | </para> </refsection> <refsection> <title>Examples</title> <programlisting role="example"><![CDATA[ | ||
7 | // We should create nodes(subTrees) before creating trees leaf11 = uiCreateNode('leaf 1.1', 'iconLeaf1.1', 'callbackLeaf1.1') leaf12 = uiCreateNode('leaf 1.2', 'iconLeaf1.2', 'callbackLeaf1.2') leaf31 = uiCreateNode('leaf 3.1', 'iconLeaf3.1', 'callbackLeaf3.1') leaf32 = uiCreateNode('leaf 3.2', 'iconLeaf3.2', 'callbackLeaf3.2') node1 = uiCreateNode('Node 1', 'iconNode1', 'callbackNode1') node2 = uiCreateNode('Node 2', 'iconNode2', 'callbackNode2') node3 = uiCreateNode('Node 3', 'iconNode3', 'callbackNode3') root = uiCreateNode('Root', 'iconRoot', 'callbackRoot') treeNode1 = uiCreateTree(node1, leaf11, leaf12) treeNode3 = uiCreateTree(node3, leaf31, leaf32) treeRoot = uiCreateTree(root, treeNode1, node2, treeNode3) | ||
8 | |||
9 | // Get the position of node 'node1' | ||
10 | position = uiGetNodePosition(treeRoot, node1) | ||
11 | // will return 'position = ['1']' | ||
12 | |||
13 | // Get the position of leaf 'leaf31' | ||
14 | position = uiGetNodePosition(treeRoot, leaf31) | ||
15 | // will return 'position = ['3.1']' ]]></programlisting> </refsection> <refsection> <title>See Also</title> <simplelist type="inline"> <member> <link linkend="uiCreateNode">uiCreateNode</link> </member> <member> <link linkend="uiCreateTree">uiCreateTree</link> </member> | ||
16 | <member> <link linkend="uiDisplayTree">uiDisplayTree</link> </member> <member> <link linkend="uiDumpTree">uiDumpTree</link> </member> | ||
17 | <member> <link linkend="uiInsertNode">uiInsertNode</link> </member> | ||
18 | <member> <link linkend="uiDeleteNode">uiDeleteNode</link> </member> | ||
19 | <member> <link linkend="uiConcatTree">uiConcatTree</link> </member> <member> <link linkend="uiEqualsTree">uiEqualsTree</link> </member> <member> <link linkend="uiFindNode">uiFindNode</link> </member> <member> <link linkend="uiGetParentNode">uiGetParentNode</link> </member> | ||
20 | <member> <link linkend="uiGetChildrenNode">uiGetChildrenNode</link> </member> | ||
21 | </simplelist> </refsection> </refentry> | ||
diff --git a/scilab/modules/gui/help/en_US/tree/uiGetParentNode.xml b/scilab/modules/gui/help/en_US/tree/uiGetParentNode.xml new file mode 100644 index 0000000..b709293 --- /dev/null +++ b/scilab/modules/gui/help/en_US/tree/uiGetParentNode.xml | |||
@@ -0,0 +1,22 @@ | |||
1 | <?xml version="1.0" encoding="UTF-8"?> <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" xml:id="uiGetParentNode"> <info> <pubdate>$LastChangedDate$</pubdate> </info> <refnamediv> <refname>uiGetParentNode</refname> <refpurpose> Get Parent of a node </refpurpose> </refnamediv> <refsynopsisdiv> <title>Calling Sequence</title> <synopsis>parent = uiGetParentNode(tree, node)</synopsis> | ||
2 | <synopsis>parent = uiGetParentNode(tree, position)</synopsis> | ||
3 | </refsynopsisdiv> <refsection> <title>Input parameters</title> <variablelist> <varlistentry> <term>tree</term> <listitem> <para>Tree in which we look for parent of a node</para> </listitem> </varlistentry> | ||
4 | <varlistentry> <term>node</term> <listitem> <para>the node we look for parent</para> </listitem> </varlistentry> | ||
5 | <varlistentry> <term>position</term> <listitem> <para>a string, which is the position of the node we look for parent</para> </listitem> </varlistentry> </variablelist> </refsection> <refsection> <title>Output parameters</title> <variablelist> <varlistentry> <term>parent</term> <listitem> <para>the parent node</para> </listitem> </varlistentry> </variablelist> </refsection> <refsection> <title>Description</title> <para> | ||
6 | Finds the parent of a specific node. | ||
7 | </para> </refsection> <refsection> <title>Examples</title> <programlisting role="example"><![CDATA[ | ||
8 | // We should create nodes(subTrees) before creating trees leaf11 = uiCreateNode('leaf 1.1', 'iconLeaf1.1', 'callbackLeaf1.1') leaf12 = uiCreateNode('leaf 1.2', 'iconLeaf1.2', 'callbackLeaf1.2') leaf31 = uiCreateNode('leaf 3.1', 'iconLeaf3.1', 'callbackLeaf3.1') leaf32 = uiCreateNode('leaf 3.2', 'iconLeaf3.2', 'callbackLeaf3.2') node1 = uiCreateNode('Node 1', 'iconNode1', 'callbackNode1') node2 = uiCreateNode('Node 2', 'iconNode2', 'callbackNode2') node3 = uiCreateNode('Node 3', 'iconNode3', 'callbackNode3') root = uiCreateNode('Root', 'iconRoot', 'callbackRoot') treeNode1 = uiCreateTree(node1, leaf11, leaf12) treeNode3 = uiCreateTree(node3, leaf31, leaf32) treeRoot = uiCreateTree(root, treeNode1, node2, treeNode3) | ||
9 | |||
10 | |||
11 | // Search parent node of 'node1' | ||
12 | parentNode = uiGetParentNode(treeRoot, node1) | ||
13 | // will return 'parentNode = root' | ||
14 | // Search parent node of 'leaf31' | ||
15 | parentNode = uiGetParentNode(treeRoot, leaf31) | ||
16 | // will return 'parentNode = node3' ]]></programlisting> </refsection> <refsection> <title>See Also</title> <simplelist type="inline"> <member> <link linkend="uiCreateNode">uiCreateNode</link> </member> <member> <link linkend="uiCreateTree">uiCreateTree</link> </member> | ||
17 | <member> <link linkend="uiDisplayTree">uiDisplayTree</link> </member> <member> <link linkend="uiDumpTree">uiDumpTree</link> </member> | ||
18 | <member> <link linkend="uiInsertNode">uiInsertNode</link> </member> | ||
19 | <member> <link linkend="uiDeleteNode">uiDeleteNode</link> </member> | ||
20 | <member> <link linkend="uiConcatTree">uiConcatTree</link> </member> <member> <link linkend="uiEqualsTree">uiEqualsTree</link> </member> <member> <link linkend="uiFindNode">uiFindNode</link> </member> <member> <link linkend="uiGetChildrenNode">uiGetChildrenNode</link> </member> | ||
21 | <member> <link linkend="uiGetNodePosition">uiGetNodePosition</link> </member> | ||
22 | </simplelist> </refsection> </refentry> | ||
diff --git a/scilab/modules/gui/help/en_US/tree/uiInsertNode.xml b/scilab/modules/gui/help/en_US/tree/uiInsertNode.xml new file mode 100644 index 0000000..a0bd194 --- /dev/null +++ b/scilab/modules/gui/help/en_US/tree/uiInsertNode.xml | |||
@@ -0,0 +1,26 @@ | |||
1 | <?xml version="1.0" encoding="UTF-8"?> <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" xml:id="uiInsertNode"> <info> <pubdate>$LastChangedDate$</pubdate> </info> <refnamediv> <refname>uiInsertNode</refname> <refpurpose> Insertion in a Tree </refpurpose> </refnamediv> <refsynopsisdiv> <title>Calling Sequence</title> <synopsis>insertTree = uiInsertNode(tree, position, node)</synopsis> | ||
2 | <synopsis>insertTree = uiInsertNode(tree, parentNode, node)</synopsis> </refsynopsisdiv> <refsection> <title>Input parameters</title> <variablelist> <varlistentry> <term>tree</term> <listitem> <para>Tree were we do the insertion</para> </listitem> </varlistentry> | ||
3 | <varlistentry> <term>position</term> <listitem> <para>a string, which is the position where we want to insert the node</para> </listitem> </varlistentry> | ||
4 | <varlistentry> <term>parentNode</term> <listitem> <para>which is the parent node into we want to insert the node</para> </listitem> </varlistentry> | ||
5 | <varlistentry> <term>node</term> <listitem> <para>node we want to insert</para> </listitem> </varlistentry> | ||
6 | </variablelist> </refsection> <refsection> <title>Output parameters</title> <variablelist> <varlistentry> <term>insertTree</term> <listitem> <para>a Tree with the node inserted</para> </listitem> </varlistentry> </variablelist> </refsection> <refsection> <title>Description</title> <para> | ||
7 | Insertion of a node (subTree) into a tree. | ||
8 | If we have 2 nodes called 'Node1' and 'Node2' each one at position 1.1 and 1.2. Insertion of a new node 'Node3' at position '1.2', will move the 'Node2' to position 1.3. | ||
9 | </para> </refsection> <refsection> <title>Examples</title> <programlisting role="example"><![CDATA[ // We should create nodes(subTrees) before creating trees leaf11 = uiCreateNode('leaf 1.1', 'iconLeaf1.1', 'callbackLeaf1.1') leaf12 = uiCreateNode('leaf 1.2', 'iconLeaf1.2', 'callbackLeaf1.2') leaf31 = uiCreateNode('leaf 3.1', 'iconLeaf3.1', 'callbackLeaf3.1') leaf32 = uiCreateNode('leaf 3.2', 'iconLeaf3.2', 'callbackLeaf3.2') node1 = uiCreateNode('Node 1', 'iconNode1', 'callbackNode1') node2 = uiCreateNode('Node 2', 'iconNode2', 'callbackNode2') node3 = uiCreateNode('Node 3', 'iconNode3', 'callbackNode3') root = uiCreateNode('Root', 'iconRoot', 'callbackRoot') treeNode1 = uiCreateTree(node1, leaf11, leaf12) treeNode3 = uiCreateTree(node3, leaf31, leaf32) treeRoot = uiCreateTree(root, treeNode1, node2, treeNode3) | ||
10 | |||
11 | // Creation of a new nodes to insert | ||
12 | leaf13 = uiCreateNode('leaf 1.3', 'iconLeaf1.3', 'callbackLeaf1.3') | ||
13 | testNode = uiCreateNode('test', 'icon_test', 'callback_test') | ||
14 | |||
15 | // Insertion of 'leaf13' in 'node2' | ||
16 | treeInsert = uiInsertNode(treeRoot, node2, leaf13) uiDisplayTree(treeInsert) | ||
17 | |||
18 | // Insertion of 'testNode' at position '1.1' | ||
19 | treeInsert = uiInsertNode(treeRoot, '1.1', testNode) uiDisplayTree(treeInsert) | ||
20 | ]]></programlisting> </refsection> <refsection> <title>See Also</title> <simplelist type="inline"> <member> <link linkend="uiCreateNode">uiCreateNode</link> </member> <member> <link linkend="uiCreateTree">uiCreateTree</link> </member> | ||
21 | <member> <link linkend="uiDisplayTree">uiDisplayTree</link> </member> <member> <link linkend="uiDumpTree">uiDumpTree</link> </member> | ||
22 | <member> <link linkend="uiDeleteNode">uiDeleteNode</link> </member> | ||
23 | <member> <link linkend="uiConcatTree">uiConcatTree</link> </member> <member> <link linkend="uiEqualsTree">uiEqualsTree</link> </member> <member> <link linkend="uiFindNode">uiFindNode</link> </member> | ||
24 | <member> <link linkend="uiGetParentNode">uiGetParentNode</link> </member> <member> <link linkend="uiGetChildrenNode">uiGetChildrenNode</link> </member> | ||
25 | <member> <link linkend="uiGetNodePosition">uiGetNodePosition</link> </member> | ||
26 | </simplelist> </refsection> </refentry> | ||
diff --git a/scilab/modules/gui/macros/tree/uiFindNode.sci b/scilab/modules/gui/macros/tree/uiFindNode.sci index 5437267..5a8d04e 100644 --- a/scilab/modules/gui/macros/tree/uiFindNode.sci +++ b/scilab/modules/gui/macros/tree/uiFindNode.sci | |||
@@ -30,14 +30,14 @@ function nodeList = uiFindNode(tree, node, value) | |||
30 | end | 30 | end |
31 | 31 | ||
32 | if (typeof(node) == 'Tree') then | 32 | if (typeof(node) == 'Tree') then |
33 | |||
34 | myNode = node; | 33 | myNode = node; |
35 | isNode = %T; | 34 | isNode = %T; |
36 | 35 | ||
37 | elseif (type(node) == 10) then | 36 | elseif (type(node) == 10) then |
38 | 37 | if rhs == 2 | |
39 | myPosition = node; | 38 | myPosition = node; |
40 | isPosition = %T; | 39 | isPosition = %T; |
40 | end | ||
41 | else | 41 | else |
42 | error(msprintf(gettext("%s: Wrong type for input argument #%d: Tree or String expected.\n"), "uiFindNode",2)); | 42 | error(msprintf(gettext("%s: Wrong type for input argument #%d: Tree or String expected.\n"), "uiFindNode",2)); |
43 | return; | 43 | return; |
diff --git a/scilab/modules/xcos/etc/Xcos-style.xml b/scilab/modules/xcos/etc/Xcos-style.xml index 2c570cc..bc94651 100644 --- a/scilab/modules/xcos/etc/Xcos-style.xml +++ b/scilab/modules/xcos/etc/Xcos-style.xml | |||
@@ -1095,8 +1095,8 @@ | |||
1095 | <add as="DOLLAR_m" extend="Icon"> | 1095 | <add as="DOLLAR_m" extend="Icon"> |
1096 | <add as="image" value="$SCILAB/modules/xcos/images/blocks/DOLLAR_m.gif"/> | 1096 | <add as="image" value="$SCILAB/modules/xcos/images/blocks/DOLLAR_m.gif"/> |
1097 | </add> | 1097 | </add> |
1098 | <add as="DIFF_f" extend="Icon"> | 1098 | <add as="DIFF_f" extend="blockWithLabel"> |
1099 | <add as="image" value="$SCILAB/modules/xcos/images/blocks/DIFF_f.gif"/> | 1099 | <add as="displayedLabel" value="S"/> |
1100 | </add> | 1100 | </add> |
1101 | <add as="DEMUX_f" extend="DEMUX"/> | 1101 | <add as="DEMUX_f" extend="DEMUX"/> |
1102 | <add as="DEADBAND" extend="Icon"> | 1102 | <add as="DEADBAND" extend="Icon"> |