icon MAXMIN block improved 44/19744/4
Samuel GOUGEON [Sun, 11 Feb 2018 14:20:14 +0000 (15:20 +0100)]
 The icon was the same as the static MAX (or MIN)

Change-Id: Ifd3f21f569973cf92ee7c30e223470da31462eb1

scilab/modules/helptools/images/MAXMIN.png
scilab/modules/scicos_blocks/macros/NonLinear/MAXMIN.sci
scilab/modules/xcos/etc/Xcos-style.xml
scilab/modules/xcos/images/palettes/MAXMIN.png

index 9f1d197..191b264 100644 (file)
Binary files a/scilab/modules/helptools/images/MAXMIN.png and b/scilab/modules/helptools/images/MAXMIN.png differ
index fb6db89..690de8a 100644 (file)
@@ -65,11 +65,11 @@ function [x,y,typ]=MAXMIN(job,arg1,arg2)
 
                 // Update the label of the block
                 if mm == 1 then
-                    label="MIN";
+                    label="\,MIN";
                 else
                     label="MAX";
                 end
-                graphics.style="MAXMIN;displayedLabel=" + label;
+                graphics.style = "MAXMIN;displayedLabel=$\mathsf{\tiny MIN|MAX\\\small{"+label+"}}$";
 
                 graphics.exprs=exprs;
                 x.graphics=graphics;
index ca3b1d1..20edcf4 100644 (file)
                -->
     </add>
     <add as="MAXMIN" extend="blockWithLabel">
-        <add as="displayedLabel" value="MIN / MAX"/>
-        
+        <add as="displayedLabel" value="$\mathsf{\tiny MIN|MAX\\\small{MAX}}$"/>
     </add>
     <add as="ABS_VALUE" extend="blockWithLabel">
         <add as="displayedLabel" value="ABS"/>
     </add>
     <add as="BPLATFORM" extend="Icon">
         <add as="image" value="$SCILAB/modules/xcos/images/blocks/BPLATFORM.svg"/>
-        
     </add>
     <add as="AUTOMAT" extend="blockWithLabel">
         <add as="displayedLabel" value="$\mathsf{\substack{\large Automaton\\%s\ modes\ |\ \vphantom{%s}%s\ states}}$"/>
index 9f1d197..191b264 100644 (file)
Binary files a/scilab/modules/xcos/images/palettes/MAXMIN.png and b/scilab/modules/xcos/images/palettes/MAXMIN.png differ