Xcos: Bug #9995 fixed - LOGICAL_OP drawing the parameters over block.

[scilab.git] / scilab / modules / scicos_blocks / macros / Misc / LOGICAL_OP.sci

diff --git a/scilab/modules/scicos_blocks/macros/Misc/LOGICAL_OP.sci b/scilab/modules/scicos_blocks/macros/Misc/LOGICAL_OP.sci
index fa170a3..c06c633 100644 (file)
--- a/scilab/modules/scicos_blocks/macros/Misc/LOGICAL_OP.sci
+++ b/scilab/modules/scicos_blocks/macros/Misc/LOGICAL_OP.sci
@@ -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