Xcos: Bug #9995 fixed - LOGICAL_OP drawing the parameters over block. 65/14365/3
Vladislav TRUBKIN [Tue, 8 Apr 2014 08:22:31 +0000 (10:22 +0200)]
Change-Id: I1ebc09e8a8c1cc2a5b17785117373c5d99c0b3eb

scilab/CHANGES_5.5.X
scilab/modules/helptools/etc/images_md5.txt
scilab/modules/helptools/images/LOGICAL_OP.png
scilab/modules/helptools/images/barhomogenize_1.png
scilab/modules/helptools/images/barhomogenize_2.png
scilab/modules/scicos_blocks/macros/Misc/LOGICAL_OP.sci
scilab/modules/xcos/etc/Xcos-style.xml
scilab/modules/xcos/images/palettes/LOGICAL_OP.png

index fd62942..6d2d66d 100644 (file)
@@ -2609,6 +2609,8 @@ Scilab Bug Fixes
 Xcos Bug Fixes
 ==============
 
+* Bug #9995 fixed - LOGICAL_OP drawing the parameters over block.
+
 * Bug #11975 fixed - Inverted Pendulum demonstration did not compile.
 
 * Bug #12423 fixed - Data types of SWITCH2_m were not documented.
index 5b751ac..c80c7fb 100644 (file)
@@ -649,8 +649,8 @@ barh_1.png=b708acffc2f268acecbfc73aa846675
 barh_2.png=b0c9fd105c8654d8bd29d5653638e090
 barh_3.png=3c8e049a779aa39557f06c0f1100d9de
 barh_4.png=d512ecebeca33e008379e73a9b7e4ee0
-barhomogenize_1.png=a532d5743de27d25b35bb9dc575ce26f
-barhomogenize_2.png=919ddf0c39a51099650e0cee8dda96c0
+barhomogenize_1.png=7aa36029b0680d3d91e8071fe92555d2
+barhomogenize_2.png=dbc9e4ccd2c57ac43463dbcd069c5133
 bessel_1.png=a99ebb6beeb99537ca3ab9d1b15f707c
 bessel_2.png=b812fd51dfafe021ced32d86d51c792
 bessel_3.png=cbce4edf613965d74ad8327f769ef4e8
index c5c5faf..e93f6de 100644 (file)
Binary files a/scilab/modules/helptools/images/LOGICAL_OP.png and b/scilab/modules/helptools/images/LOGICAL_OP.png differ
index 979dc74..b8a100b 100644 (file)
Binary files a/scilab/modules/helptools/images/barhomogenize_1.png and b/scilab/modules/helptools/images/barhomogenize_1.png differ
index ce8ba19..8245bcb 100644 (file)
Binary files a/scilab/modules/helptools/images/barhomogenize_2.png and b/scilab/modules/helptools/images/barhomogenize_2.png differ
index fa170a3..c06c633 100644 (file)
@@ -29,6 +29,7 @@ function [x,y,typ]=LOGICAL_OP(job,arg1,arg2)
         graphics=arg1.graphics;
         exprs=graphics.exprs
         model=arg1.model;
+
         if size(exprs,1)==2 then
             exprs=[exprs;sci2exp(1);sci2exp(0)];
         end
@@ -97,7 +98,21 @@ function [x,y,typ]=LOGICAL_OP(job,arg1,arg2)
                     end
                 end
                 if ok then
+                    if rule == 0 then
+                        label = "AND";
+                    elseif rule == 1 then
+                        label = "OR";
+                    elseif rule == 2 then
+                        label = "NAND";
+                    elseif rule == 3 then
+                        label = "NOR";
+                    elseif rule == 4 then
+                        label = "XOR";
+                    elseif rule == 5 then
+                        label = "NOT";
+                    end
                     graphics.exprs=exprs;
+                    graphics.style = ["blockWithLabel;displayedLabel="+label];
                     x.graphics=graphics;
                     x.model=model
                     break
@@ -119,6 +134,6 @@ function [x,y,typ]=LOGICAL_OP(job,arg1,arg2)
 
         exprs=[string(nin);string(ipar)]
         gr_i=[]
-        x=standard_define([4 2],model,exprs,gr_i)
+        x=standard_define([3 2],model,exprs,gr_i)
     end
 endfunction
index 915c661..c93ca21 100644 (file)
     <add as="MUX_f" extend="MUX"/>
     <add as="MEMORY_f" extend="blockWithLabel"/>
     <add as="LOGICAL_OP" extend="blockWithLabel">
-        <!-- FIXME : Show parameters over block  -->
-        <add as="displayedLabel" value="Logical op :&lt;BR&gt;         AND"/>
+        <add as="displayedLabel" value="AND"/>
     </add>
     <add as="generic_block" extend="blockWithLabel">
         <add as="displayedLabel" value="GENERIC"/>
index c5c5faf..e93f6de 100644 (file)
Binary files a/scilab/modules/xcos/images/palettes/LOGICAL_OP.png and b/scilab/modules/xcos/images/palettes/LOGICAL_OP.png differ