Figure image position needs to be reduced by 1 pixel

- If image is on bottom/right it will over-spill

Author: Phillipus

com.archimatetool.editor/src/com/archimatetool/editor/diagram/figures/elements/CommunicationNetworkFigure.java

@@ -43,7 +43,9 @@ protected void drawFigure(Graphics graphics) {
         graphics.pushState();
 
         Rectangle rect = getBounds().getCopy();
-        Rectangle imageBounds = rect.getCopy();
+
+        // Reduce by one pixel in case of bottom/right postion
+        Rectangle imageBounds = rect.getCopy().resize(-1, -1);
 
         setFigurePositionFromTextPosition(rect);
 

com.archimatetool.editor/src/com/archimatetool/editor/diagram/figures/elements/DistributionNetworkFigure.java

@@ -49,16 +49,19 @@ protected void drawFigure(Graphics graphics) {
         graphics.pushState();
 
         Rectangle rect = getBounds().getCopy();
+
+        // Reduce by one pixel in case of bottom/right postion
+        Rectangle imageBounds = rect.getCopy().resize(-1, -1);
 
         if(!isEnabled()) {
             setDisabledState(graphics);
         }
 
-        setFigurePositionFromTextPosition(rect, 5/3.0);
-        
         // Calculate line width depending on size
         int lineWidth = (int)Math.max(3, Math.sqrt(rect.width * rect.height) / 24);
 
+        setFigurePositionFromTextPosition(rect, 5/3.0);
+        
         // Shrink the arrow size area depending on line width
         Dimension arrowSize = getArrowSize(rect);
         rect.shrink(lineWidth, lineWidth);
@@ -78,7 +81,7 @@ protected void drawFigure(Graphics graphics) {
         drawHorizontalLine(graphics, rect, arrowSize);
 
         // Image Icon
-        drawIconImage(graphics, rect, 0, 0, 0, 0);
+        drawIconImage(graphics, imageBounds, 0, 0, 0, 0);
 
         graphics.popState();
     }

com.archimatetool.editor/src/com/archimatetool/editor/diagram/figures/elements/DriverFigure.java

@@ -42,13 +42,10 @@ protected void drawFigure(Graphics graphics) {
         graphics.pushState();
 
         Rectangle rect = getBounds().getCopy();
-        //rect.width--;
-        //rect.height--;
 
-        Rectangle imageBounds = rect.getCopy();
+        // Reduce by one pixel in case of bottom/right postion
+        Rectangle imageBounds = rect.getCopy().resize(-1, -1);
 
-        // Set line width here so that the whole figure is constrained, otherwise SVG graphics will have overspill
-        //setLineWidth(graphics, 1, rect);
         int lineWidth = (int)(Math.sqrt(rect.width * rect.height) / 20);
         graphics.setLineWidth(lineWidth);
 

com.archimatetool.editor/src/com/archimatetool/editor/diagram/figures/elements/PlateauFigure.java

@@ -43,7 +43,8 @@ protected void drawFigure(Graphics graphics) {
 
         Rectangle rect = getBounds().getCopy();
 
-        Rectangle imageBounds = rect.getCopy();
+        // Reduce by one pixel in case of bottom/right postion
+        Rectangle imageBounds = rect.getCopy().resize(-1, -1);
 
         setFigurePositionFromTextPosition(rect, 5/3.5);
 

com.archimatetool.editor/src/com/archimatetool/editor/diagram/figures/elements/WorkPackageFigure.java

@@ -56,7 +56,8 @@ protected void drawFigure(Graphics graphics) {
 
         Rectangle rect = getBounds().getCopy();
 
-        Rectangle imageBounds = rect.getCopy();
+        // Reduce by one pixel in case of bottom/right postion
+        Rectangle imageBounds = rect.getCopy().resize(-1, -1);
 
         setFigurePositionFromTextPosition(rect, 8/7.0);