* Bug #14644 fixed - Xcos: delete obsolete WFILE block, regen some diagrams & images 64/19064/4
Paul Bignier [Thu, 9 Feb 2017 09:33:05 +0000 (10:33 +0100)]
 * In the continuity of 7eea231698

Change-Id: Ibc8a21fcfad9e1bf2d397c118becea4b3463ccb7

scilab/CHANGES.md
scilab/modules/helptools/etc/images_md5.txt
scilab/modules/helptools/images/SELF_SWITCH_on_off_Example.zcos.png
scilab/modules/helptools/images/SHIFT_en_US.zcos.png
scilab/modules/helptools/images/SHIFT_fr_FR.zcos.png
scilab/modules/scicos/macros/scicos_scicos/do_version.sci
scilab/modules/scicos_blocks/macros/Sinks/WFILE_f.sci [deleted file]
scilab/modules/xcos/examples/integer_pal/en_US/SHIFT_en_US.zcos
scilab/modules/xcos/examples/integer_pal/fr_FR/SHIFT_fr_FR.zcos
scilab/modules/xcos/examples/signalrouting_pal/SELF_SWITCH_on_off_Example.zcos
scilab/modules/xcos/examples/sinks_pal/en_US/wfile_f_en_US.zcos [deleted file]

index 9749cc0..0a09c9c 100644 (file)
@@ -271,6 +271,7 @@ Added to the CVode package, it also benefits from the CVode rootfinding feature.
   - dynamic palette with the last used blocks
   - zoom using CTRL(+), CTRL(-) and CTRL(mousewheel)
   - load SVG icons
+* Deleted obsolete WFILE_f block, please use WRITEC_f instead.
 
 
 API modification
@@ -442,6 +443,7 @@ Bug Fixes
 * [#14654](http://bugzilla.scilab.org/show_bug.cgi?id=14654): `bitor`, `bitxor` and `bitand` did not accept positive inputs of type `int8`, `int16`, `int32`, `int64` or `uint64`
 * [#14659](http://bugzilla.scilab.org/show_bug.cgi?id=14659): number of I/O ports of the superblock was not updated when adding or deleting I/O blocks inside a superblock.
 * [#14662](http://bugzilla.scilab.org/show_bug.cgi?id=14662): Matrix of strings concatenation with single quote led to a parser error.
+* [#14664](http://bugzilla.scilab.org/show_bug.cgi?id=14664): Deleted obsolete WFILE_f block. Regenerated some Xcos demos to work with Scilab 6.
 * [#14667](http://bugzilla.scilab.org/show_bug.cgi?id=14667): Multi line string without final quote generated a non terminal parser state.
 * [#14681](http://bugzilla.scilab.org/show_bug.cgi?id=14681): Short-circuited AND operation was not possible with double matrices in if and while clauses
 * [#14689](http://bugzilla.scilab.org/show_bug.cgi?id=14689): `resize_matrix(rand(2,3),[0 2])` did not return `[]`. Usage of new sizes <0 to keep them unchanged was not documented.
index 73d62a0..4fe4f65 100644 (file)
@@ -173,7 +173,6 @@ Sgrayplot_2.png=e692f0b328fbc704e6d55565f5ba9b2d
 Sgrayplot_3.png=47a5069d75ec6f83ed08c8c2a601675b
 VARIABLE_DELAY_1.png=dbe9f368a724f06454aa03acb698e295
 VARIABLE_DELAY_fr_FR_1.png=80162a521eb442cba349151f8412c297
-WFILE_f_1.png=1f7308744c9656b1ec4ba31e1f747685
 _LaTeX_0-LSodar.xml_1.png=e130ce3936e3d90b95bf43660f09cb4e
 _LaTeX_1-CVode.xml_1.png=e130ce3936e3d90b95bf43660f09cb4e
 _LaTeX_1-CVode.xml_2.png=d7c48296c566102dc6b62253742d996d
index b993d1e..306fdfe 100644 (file)
Binary files a/scilab/modules/helptools/images/SELF_SWITCH_on_off_Example.zcos.png and b/scilab/modules/helptools/images/SELF_SWITCH_on_off_Example.zcos.png differ
index 9ae903f..be5e105 100644 (file)
Binary files a/scilab/modules/helptools/images/SHIFT_en_US.zcos.png and b/scilab/modules/helptools/images/SHIFT_en_US.zcos.png differ
index f5f24fa..14b05bb 100644 (file)
Binary files a/scilab/modules/helptools/images/SHIFT_fr_FR.zcos.png and b/scilab/modules/helptools/images/SHIFT_fr_FR.zcos.png differ
index 97a4267..14d1125 100644 (file)
@@ -2012,22 +2012,10 @@ function o=block_version(o)
         label=" "
         gr_i=["xstringb(orig(1),orig(2),''Trash'',sz(1),sz(2),''fill'')"]
     case "WFILE_f" then
-        state=model(7)
-        [in,ipar]=model([2  9])
-        N=ipar(3);
-        lunit=state(2)
-        N=ipar(4)
-        lfil=ipar(1)
-        lfmt=ipar(2)
-        if lfil>0 then fname=ascii(ipar(5:4+lfil)),else fname=" ",end
-        if lfmt>0 then Fmt=ascii(ipar(5+lfil:4+lfil+lfmt)),else Fmt=" ",end
-        label=[sci2exp(in);
-        fname;
-        Fmt;
-        string(N)]
-
-        gr_i=["txt=[''write to'';''output file''];";
-        "xstringb(orig(1),orig(2),txt,sz(1),sz(2),''fill'')"]
+        write(%io(2),["PB with WFILE_f";
+        "Obsolete block, please use WRITEC_f instead."])
+        label=[]
+        gr_i=[]
     case "ZCROSS_f" then
         in=model(2)
         label=strcat(sci2exp(in))
diff --git a/scilab/modules/scicos_blocks/macros/Sinks/WFILE_f.sci b/scilab/modules/scicos_blocks/macros/Sinks/WFILE_f.sci
deleted file mode 100644 (file)
index 6f8f717..0000000
+++ /dev/null
@@ -1,128 +0,0 @@
-//  Xcos
-//
-//  Copyright (C) INRIA - METALAU Project <scicos@inria.fr>
-//  Copyright 2011 - Bernard DUJARDIN <bernard.dujardin@contrib.scilab.org>
-//
-// This program is free software; you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation; either version 2 of the License, or
-// (at your option) any later version.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License
-// along with this program; if not, write to the Free Software
-// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-//
-// See the file ../license.txt
-//
-
-function [x,y,typ]=WFILE_f(job,arg1,arg2)
-    x=[];
-    y=[];
-    typ=[];
-    select job
-    case "set" then
-        warnobsolete("WRITEC_f", "6.0.0");
-        warnMessage = msprintf(_("Feature %s is obsolete."), "WFILE_f");
-        warnAdvise = msprintf(_("Please use %s instead."), "WRITEC_f");
-        warnXcosMessage = msprintf("%s %s", warnMessage, warnAdvise);
-        warnBlockByUID(arg1.model.label, warnXcosMessage);
-        x=arg1;
-        graphics=arg1.graphics;
-        exprs=graphics.exprs
-        model=arg1.model;
-        dstate=model.dstate
-        lunit=dstate(2)
-        fname=exprs(2)
-        frmt=exprs(3)
-        while %t do
-            [ok,in,fname1,frmt1,N,exprs] = scicos_getvalue([msprintf(gettext("Set %s block parameters"), "WFILE_f");" "; gettext("Write to output file"); " "; ..
-            gettext("Write is done on:"); gettext("&nbsp; - A binary file if no format given"); ..
-            gettext("&nbsp; - A formatted text file if a  format (Fortran type) is given")], [gettext("Input Size"); gettext("Output File Name"); ..
-            gettext("Output Format"); gettext("Buffer Size")], list("vec",1,"str",1,"str",1,"vec",1),exprs)
-
-            if ~ok then
-                break,
-            end //user cancel modification
-            in=int(in)
-
-            nin=in
-
-            fname1 = pathconvert(stripblanks(fname1), %f, %t) // File name expansion
-            frmt1=stripblanks(frmt1)
-
-            if lunit > 0 & min(length(frmt),1) <> min(length(frmt1),1) then
-                block_parameter_error(gettext("Simulation running !!! You cannot switch<br />between formatted and unformatted when running"), gettext("End current simulation first."));
-                ok=%f
-            elseif lunit > 0 & fname1 <> fname then
-                block_parameter_error(gettext("You cannot modify ''Output File Name'' when running."), gettext("End current simulation first."));
-                ok=%f
-            elseif fname1 == "" then
-                block_parameter_error(gettext("Wrong value for ''Output File Name'' parameter"), gettext("You must provide a filename."));
-                ok=%f
-                //Check if directory exist
-            elseif fileparts(fname1) ~= "" then
-                [pa, fn, ex] = fileparts(fname1)
-                if ~isdir(pa) then
-                    block_parameter_error(msprintf(gettext("Wrong value for ''%s'' parameter."), gettext("Output File Name")), ..
-                    msprintf(gettext("Directory ''%s'' does not exist"), pa ));
-                    ok=%f
-                end
-                // Simple check for including of the format's string  in parenthesis
-            elseif frmt1 ~= "" &  (part(frmt1, 1) ~= "(" | part(frmt1, length(frmt1)) ~= ")")
-                block_parameter_error(msprintf(gettext("Wrong value for ''%s'' parameter: %s."), gettext("Input Format"), frmt1), ..
-                gettext("You must enclose the format''s string between parentheses."));
-                ok=%f
-            elseif N < 2 then
-                block_parameter_error(msprintf(gettext("Wrong value for ''%s'' parameter: %d."), gettext("Buffer Size"), N), ..
-                gettext("Must be greater than 1."));
-                ok=%f
-            elseif in <= 0 then
-                block_parameter_error(msprintf(gettext("Wrong value for ''%s'' parameter: %d."), gettext("Input Size"), in), ..
-                gettext("Strictly positive integer expected."));
-                ok=%f
-            end
-
-            if ok then
-                ipar=[length(ascii(fname1));length(ascii(frmt1));0;N;ascii(fname1)';ascii(frmt1)']
-                if prod(size(dstate))<>(nin+1)*N+2 then
-                    dstate=[-1;lunit;zeros((nin+1)*N,1)]
-                end
-                model.in=nin
-                model.dstate=dstate;model.ipar=ipar
-                model.dep_ut=[%t %f] //compatibility
-                graphics.exprs=exprs;
-                x.graphics=graphics;
-                x.model=model
-                break
-            end
-        end
-    case "define" then
-        in=1;
-        nin=sum(in)
-        frmt="(7(e10.3,1x))"
-        fname="foo"
-        lunit=0
-        N=2;
-
-        model=scicos_model()
-        model.sim="writef"
-        model.in=in
-        model.evtin=1
-        model.dstate=[-1;lunit;zeros((nin+1)*N,1)]
-        model.ipar=[length(ascii(fname));length(ascii(frmt));0;N;ascii(fname)';ascii(frmt)']
-        model.blocktype="d"
-        model.dep_ut=[%t %f]
-
-        exprs=[sci2exp(in);
-        fname;
-        frmt;
-        string(N)]
-        gr_i=[]
-        x=standard_define([3 2],model,exprs,gr_i)
-    end
-endfunction
index db8e10b..a856480 100644 (file)
Binary files a/scilab/modules/xcos/examples/integer_pal/en_US/SHIFT_en_US.zcos and b/scilab/modules/xcos/examples/integer_pal/en_US/SHIFT_en_US.zcos differ
index 098301d..cfb2b32 100644 (file)
Binary files a/scilab/modules/xcos/examples/integer_pal/fr_FR/SHIFT_fr_FR.zcos and b/scilab/modules/xcos/examples/integer_pal/fr_FR/SHIFT_fr_FR.zcos differ
index f91fe8f..703ec8a 100644 (file)
Binary files a/scilab/modules/xcos/examples/signalrouting_pal/SELF_SWITCH_on_off_Example.zcos and b/scilab/modules/xcos/examples/signalrouting_pal/SELF_SWITCH_on_off_Example.zcos differ
diff --git a/scilab/modules/xcos/examples/sinks_pal/en_US/wfile_f_en_US.zcos b/scilab/modules/xcos/examples/sinks_pal/en_US/wfile_f_en_US.zcos
deleted file mode 100644 (file)
index 814bbae..0000000
Binary files a/scilab/modules/xcos/examples/sinks_pal/en_US/wfile_f_en_US.zcos and /dev/null differ