Revert "Xcos: Bug #9995 fixed - The RELATION_OP box drawn." 65/14565/1
Clément DAVID [Mon, 26 May 2014 08:45:29 +0000 (10:45 +0200)]
reverted due to the introduced bug #13439.

This reverts commit aa539e33aa337681656bbd44adf2e109cca165c3.

Change-Id: I1605c63ba69b0bf518b94f361f1a8ed5c2d3251f

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

index 78004e1..5e7056c 100644 (file)
@@ -74,9 +74,6 @@ Scilab Bug Fixes
 Xcos Bug Fixes
 ==============
 
-* Bug #9996 fixed - The RELATION_OP box drawn in the work space is not compliant
-                    to the programming.
-
 * Bug #11823 fixed - Ctrl+F2 shortcut did not work on a selected block.
 
 * Bug #12718 fixed - Modelica Generic block reshaped the output ports and the label was double-written.
index 623f0ac..e93f6de 100644 (file)
Binary files a/scilab/modules/helptools/images/LOGICAL_OP.png and b/scilab/modules/helptools/images/LOGICAL_OP.png differ
index 07d64fc..8e3b9bb 100644 (file)
Binary files a/scilab/modules/helptools/images/RELATIONALOP.png and b/scilab/modules/helptools/images/RELATIONALOP.png differ
index bc76864..c06c633 100644 (file)
@@ -134,6 +134,6 @@ function [x,y,typ]=LOGICAL_OP(job,arg1,arg2)
 
         exprs=[string(nin);string(ipar)]
         gr_i=[]
-        x=standard_define([2 2],model,exprs,gr_i)
+        x=standard_define([3 2],model,exprs,gr_i)
     end
 endfunction
index 1dc73fb..a4db6e5 100644 (file)
@@ -47,7 +47,6 @@ function [x,y,typ] = RELATIONALOP(job,arg1,arg2)
             end
             if (rule<0)|(rule>5) then
                 message("Incorrect operator "+string(rule)+" ; must be 0 to 5.")
-                ok=%f;
             end
             if (Datatype==1) then
                 model.sim=list("relational_op",4)
@@ -75,21 +74,7 @@ function [x,y,typ] = RELATIONALOP(job,arg1,arg2)
                 [model,graphics,ok]=set_io(model,graphics,list(in,it),list(out,ot),[],[])
             end
             if ok then
-                if rule == 0 then
-                    label = "==";
-                elseif rule == 1 then
-                    label = "~=";
-                elseif rule == 2 then
-                    label = "&lt";
-                elseif rule == 3 then
-                    label = "&lt=";
-                elseif rule == 4 then
-                    label = "&gt";
-                elseif rule == 5 then
-                    label = "&gt=";
-                end
                 graphics.exprs=exprs;
-                graphics.style=["fontSize=13;fontStyle=1;displayedLabel="+label];
                 model.ipar=[rule],
                 model.nzcross=zcr,
                 model.nmode=zcr,
@@ -100,7 +85,6 @@ function [x,y,typ] = RELATIONALOP(job,arg1,arg2)
         end
     case "define" then
         ipar=[2]
-        label="&lt";
         model=scicos_model()
         model.sim=list("relationalop",4)
         model.in=[1;1]
@@ -108,9 +92,9 @@ function [x,y,typ] = RELATIONALOP(job,arg1,arg2)
         model.ipar=ipar
         model.blocktype="c"
         model.dep_ut=[%t %f]
+
         exprs=[string(ipar);string(0)]
         gr_i=[]
-        x=standard_define([2 2],model,exprs,gr_i)
-        x.graphics.style=["fontSize=13;fontStyle=1;displayedLabel="+label];
+        x=standard_define([3 2],model,exprs,gr_i)
     end
 endfunction
index 020458d..5913814 100644 (file)
         <add as="fillColor" value="white"/>
     </add>
     <add as="RELATIONALOP" extend="blockWithLabel">
-        <add as="displayedLabel"/>
-        <!-- value for the label defined in the interface function of block -->  
+        <!-- FIXME : Show parameters over block  -->
+        <add as="displayedLabel" value="Relational&lt;BR&gt;         op : &amp;&lt;"/>
     </add>
     <add as="TEXT_f" extend="Label">
         <!-- <add as="displayedLabel" value="Text"/>  -->
index 623f0ac..42568f0 100644 (file)
Binary files a/scilab/modules/xcos/images/palettes/LOGICAL_OP.png and b/scilab/modules/xcos/images/palettes/LOGICAL_OP.png differ
index 07d64fc..315c7a9 100644 (file)
Binary files a/scilab/modules/xcos/images/palettes/RELATIONALOP.png and b/scilab/modules/xcos/images/palettes/RELATIONALOP.png differ