Fix Xcos latex image rendering on doc generation 62/11162/1
Clément DAVID [Fri, 29 Mar 2013 10:30:57 +0000 (11:30 +0100)]
Revert "Help: fix bad xcos image export with Command_bode.xcos"
Revert "Force label from a CLR block not to go out of its block bounds"

This reverts commit c4d623eaf9b469c6848bd98d7010d7ab06d1fdf5.
This reverts commit 019ad2013f745dd1b7cf171ceac5d2bea39552aa.

Change-Id: I1dc4d0f4eff1510a4bd1067b0389598d24b5153d

scilab/modules/graph/src/java/org/scilab/modules/graph/shape/LatexTextShape.java
scilab/modules/helptools/images/Command_bode.xcos.png
scilab/modules/xcos/etc/Xcos-style.xml

index 972c732..c69745c 100644 (file)
@@ -15,7 +15,6 @@ package org.scilab.modules.graph.shape;
 import java.awt.Color;
 import java.awt.Graphics2D;
 import java.awt.Rectangle;
-import java.awt.Shape;
 import java.awt.geom.AffineTransform;
 import java.util.Map;
 
@@ -115,14 +114,12 @@ public class LatexTextShape implements mxITextShape {
                 final double dx = (sw - iw) / 2;
                 final double dy = (sh - ih) / 2;
 
-                Shape oldClip = g.getClip();
-                g.setClip(rect);
                 icon.paintIcon(rendererPane, g, (int) (sx + dx), (int) (sy + dy));
-                g.setClip(oldClip);
 
                 // Restores the previous transformation
                 g.setTransform(at);
             }
         }
     }
+
 }
index 2331c98..7a5d903 100644 (file)
Binary files a/scilab/modules/helptools/images/Command_bode.xcos.png and b/scilab/modules/helptools/images/Command_bode.xcos.png differ
index d97b3ad..9082084 100644 (file)
     <add as="CLSS_f" extend="CLSS"/>
     <add as="CLR" extend="blockWithLabel">
         <add as="displayedLabel" value="$\frac{%s}{%s}$"/>
-        <add as="overflow" value="hidden"/>
     </add>
     <add as="CLR_f" extend="CLR"/>
     <add as="TIME_DELAY" extend="blockWithLabel">
     </add>
     <add as="M_freq" extend="blockWithLabel">
         <add as="displayedLabel" value="Multiple&lt;BR&gt;         frequency"/>
+        
     </add>
     <add as="ANDBLK" extend="Icon">
         <add as="image" value="$SCILAB/modules/xcos/images/blocks/ANDBLK.svg"/>