* Bug #15039 fixed - Xcos demos: showcase auto-positioning (link + node) 40/19140/3
Paul Bignier [Wed, 15 Feb 2017 15:25:06 +0000 (16:25 +0100)]
Change-Id: I67e2e5d94a50680be5ea9a4663ef5c5100c6e7a9

scilab/CHANGES.md
scilab/modules/xcos/demos/optimal_link.dem.sce [new file with mode: 0644]
scilab/modules/xcos/demos/optimal_link.zcos [new file with mode: 0644]
scilab/modules/xcos/demos/optimal_positions.dem.gateway.sce [new file with mode: 0644]
scilab/modules/xcos/demos/optimal_split_block.dem.sce [new file with mode: 0644]
scilab/modules/xcos/demos/optimal_split_block.zcos [new file with mode: 0644]
scilab/modules/xcos/demos/xcos.dem.gateway.sce

index 0392aea..0e21891 100644 (file)
@@ -355,6 +355,7 @@ the [development mailing list](dev@lists.scilab.org) for a particular toolbox.
 * [#15015](http://bugzilla.scilab.org/show_bug.cgi?id=15015): Xcos blocks using the `ascii` didn't work
 * [#15019](http://bugzilla.scilab.org/show_bug.cgi?id=15019): Add 'csci6' in the calling of ilib_build in 'Getting started with API_Scilab' help page.
 * [#15023](http://bugzilla.scilab.org/show_bug.cgi?id=15023): `clf()` wrongly reset `figure_id`.
+* [#15039](http://bugzilla.scilab.org/show_bug.cgi?id=15039): Added demos to showcase Xcos' new graphical features
 * [#15052](http://bugzilla.scilab.org/show_bug.cgi?id=15052): `getpid` wasn't available anymore
 * [#15054](http://bugzilla.scilab.org/show_bug.cgi?id=15054): The callbacks of `wfir_gui()` were not prioritary.
 * [#15057](http://bugzilla.scilab.org/show_bug.cgi?id=15057): Matplot .data assignation did not take care of >2 dimension
diff --git a/scilab/modules/xcos/demos/optimal_link.dem.sce b/scilab/modules/xcos/demos/optimal_link.dem.sce
new file mode 100644 (file)
index 0000000..de59dc9
--- /dev/null
@@ -0,0 +1,7 @@
+// Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
+// Copyright (C) 2017 - Scilab Enterprises - Paul Bignier
+//
+// This file is released under the 3-clause BSD license. See COPYING-BSD.
+
+xcos("SCI/modules/xcos/demos/optimal_link.zcos");
+
diff --git a/scilab/modules/xcos/demos/optimal_link.zcos b/scilab/modules/xcos/demos/optimal_link.zcos
new file mode 100644 (file)
index 0000000..fb1b72f
Binary files /dev/null and b/scilab/modules/xcos/demos/optimal_link.zcos differ
diff --git a/scilab/modules/xcos/demos/optimal_positions.dem.gateway.sce b/scilab/modules/xcos/demos/optimal_positions.dem.gateway.sce
new file mode 100644 (file)
index 0000000..bde7c16
--- /dev/null
@@ -0,0 +1,11 @@
+// Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
+// Copyright (C) 2017 - Scilab Enterprises - Paul Bignier
+//
+// This file is released under the 3-clause BSD license. See COPYING-BSD.
+
+subdemolist = [
+_("Optimal link route")           , "optimal_link.dem.sce"        ; ..
+_("Optimal split block position") , "optimal_split_block.dem.sce" ; ..
+];
+
+subdemolist(:,2) = SCI + "/modules/xcos/demos/" + subdemolist(:,2);
diff --git a/scilab/modules/xcos/demos/optimal_split_block.dem.sce b/scilab/modules/xcos/demos/optimal_split_block.dem.sce
new file mode 100644 (file)
index 0000000..48579a8
--- /dev/null
@@ -0,0 +1,7 @@
+// Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
+// Copyright (C) 2017 - Scilab Enterprises - Paul Bignier
+//
+// This file is released under the 3-clause BSD license. See COPYING-BSD.
+
+xcos("SCI/modules/xcos/demos/optimal_split_block.zcos");
+
diff --git a/scilab/modules/xcos/demos/optimal_split_block.zcos b/scilab/modules/xcos/demos/optimal_split_block.zcos
new file mode 100644 (file)
index 0000000..20aa904
Binary files /dev/null and b/scilab/modules/xcos/demos/optimal_split_block.zcos differ
index c74bf74..7b05225 100644 (file)
@@ -2,6 +2,7 @@
 // Copyright (C) 2008 - INRIA
 // Copyright (C) 2009-2010 - DIGITEO
 // Copyright (C) 2011 - DIGITEO - Allan CORNET
+// Copyright (C) 2017 - Scilab Enterprises - Paul Bignier
 //
 // This file is released under the 3-clause BSD license. See COPYING-BSD.
 
@@ -10,20 +11,24 @@ function subdemolist = demo_gateway()
     demopath = get_absolute_file_path("xcos.dem.gateway.sce");
     add_demo(gettext("Xcos"), demopath + "xcos.dem.gateway.sce");
 
-    subdemolist = [_("Standard demos")      , "standard.dem.gateway.sce"       ; ..
+    subdemolist = [
+    _("Standard demos")      , "standard.dem.gateway.sce"           ; ..
     _("Control Systems")     , "control_systems.dem.gateway.sce"    ; ..
     _("Electrical Systems")  , "electrical_systems.dem.gateway.sce" ; ..
-    _("Mechanical Systems")  , "mechanical_systems.dem.gateway.sce" ;];
+    _("Mechanical Systems")  , "mechanical_systems.dem.gateway.sce" ];
 
     if with_modelica_compiler() then
         subdemolist = [subdemolist; ..
-        _("Modelica demos")      , "modelica_demos.dem.gateway.sce"];
+        _("Modelica demos")  , "modelica_demos.dem.gateway.sce"];
     end
 
     subdemolist = [subdemolist; ..
     _("Event demos")         , "event.dem.gateway.sce" ; ..
     _("Old demos")           , "old_demos.dem.gateway.sce"];
 
+    subdemolist = [subdemolist; ..
+    _("Optimal positions")   , "optimal_positions.dem.gateway.sce"];
+
     subdemolist(:,2) = demopath + subdemolist(:,2);
 endfunction