Bug #10781 fixed - DFlipflop incorrectly reported problem in port size or type

Change-Id: I840b3bcf5ecdbf895c2d6a419b675a24a624e99f

diff --git a/scilab/CHANGES_5.4.X b/scilab/CHANGES_5.4.X
index 13e51ec..7f859f9 100644 (file)
--- a/scilab/CHANGES_5.4.X
+++ b/scilab/CHANGES_5.4.X
@@ -1,6 +1,11 @@
             Changes between version 5.4.0-beta-2 and 5.4.0-beta-3 of Scilab
             ===============================================================
 
+Xcos
+====
+
+* Bug #10781 fixed - DFlipflop incorrectly reported problem in port size or type
+
 
 Obsolete functions
 ==================

diff --git a/scilab/modules/scicos_blocks/macros/IntegerOp/DFLIPFLOP.sci b/scilab/modules/scicos_blocks/macros/IntegerOp/DFLIPFLOP.sci
index 6fb3e6f..5f5af80 100644 (file)
--- a/scilab/modules/scicos_blocks/macros/IntegerOp/DFLIPFLOP.sci
+++ b/scilab/modules/scicos_blocks/macros/IntegerOp/DFLIPFLOP.sci
@@ -182,7 +182,7 @@ function [x,y,typ]=DFLIPFLOP(job,arg1,arg2)
                        sz=[40,40],..
                        flip=%t,..
                        theta=0,..
-                       exprs="1",..
+                       exprs="5",..
                        pin=5,..
                        pout=33,..
                        pein=42,..

diff --git a/scilab/modules/scicos_blocks/macros/Linear/SAMPHOLD_m.sci b/scilab/modules/scicos_blocks/macros/Linear/SAMPHOLD_m.sci
index ffd4963..cf67ea6 100644 (file)
--- a/scilab/modules/scicos_blocks/macros/Linear/SAMPHOLD_m.sci
+++ b/scilab/modules/scicos_blocks/macros/Linear/SAMPHOLD_m.sci
@@ -44,7 +44,7 @@ case 'set' then
       in=[model.in model.in2];
       [model,graphics,ok]=set_io(model,graphics,list(in,it),list(in,it),1,[])
       if ok then
-         graphics.exprs=label;
+         graphics.exprs=exprs;
          arg1.graphics=graphics;arg1.model=model;
          x=arg1
          break

diff --git a/scilab/modules/xcos/tests/nonreg_tests/bug_10781.dia.ref b/scilab/modules/xcos/tests/nonreg_tests/bug_10781.dia.ref
new file mode 100644 (file)
index 0000000..78b771e
--- /dev/null
+++ b/scilab/modules/xcos/tests/nonreg_tests/bug_10781.dia.ref
@@ -0,0 +1,22 @@
+// =============================================================================
+// Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
+// Copyright (C) 2012 - DIGITEO - Alexandre HERISSE
+//
+//  This file is distributed under the same license as the Scilab package.
+// =============================================================================
+// <-- TEST WITH XCOS -->
+//
+// <-- Non-regression test for bug 10781 -->
+//
+// <-- Bugzilla URL -->
+// http://bugzilla.scilab.org/show_bug.cgi?id=10781
+//
+// <-- Short Description -->
+// DFlipflop should not report problem in port size or type
+assert_checktrue(importXcosDiagram(SCI + "/modules/xcos/tests/nonreg_tests/bug_10781.xcos"));
+// compile and simulate
+xcos_simulate(scs_m, 4);
+lastQ=double(Q.values($));
+lastnonQ=double(nonQ.values($));
+assert_checkequal(lastQ, 1);
+assert_checkequal(lastnonQ, 0);

diff --git a/scilab/modules/xcos/tests/nonreg_tests/bug_10781.tst b/scilab/modules/xcos/tests/nonreg_tests/bug_10781.tst
new file mode 100644 (file)
index 0000000..db476ec
--- /dev/null
+++ b/scilab/modules/xcos/tests/nonreg_tests/bug_10781.tst
@@ -0,0 +1,27 @@
+// =============================================================================
+// Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
+// Copyright (C) 2012 - DIGITEO - Alexandre HERISSE
+//
+//  This file is distributed under the same license as the Scilab package.
+// =============================================================================
+
+// <-- TEST WITH XCOS -->
+//
+// <-- Non-regression test for bug 10781 -->
+//
+// <-- Bugzilla URL -->
+// http://bugzilla.scilab.org/show_bug.cgi?id=10781
+//
+// <-- Short Description -->
+// DFlipflop should not report problem in port size or type
+
+assert_checktrue(importXcosDiagram(SCI + "/modules/xcos/tests/nonreg_tests/bug_10781.xcos"));
+
+// compile and simulate
+xcos_simulate(scs_m, 4);
+
+lastQ=double(Q.values($));
+lastnonQ=double(nonQ.values($));
+
+assert_checkequal(lastQ, 1);
+assert_checkequal(lastnonQ, 0);

diff --git a/scilab/modules/xcos/tests/nonreg_tests/bug_10781.xcos b/scilab/modules/xcos/tests/nonreg_tests/bug_10781.xcos
new file mode 100644 (file)
index 0000000..e048988
Binary files /dev/null and b/scilab/modules/xcos/tests/nonreg_tests/bug_10781.xcos differ