Image bounds needs to be a copy of the bounds after setLineWidth for these figures

- Before this change an image would be drawn outside the effective bounds of the figure

Author: Phillipus

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

@@ -42,11 +42,12 @@ protected void drawFigure(Graphics graphics) {
         // Reduce width and height by 1 pixel
         rect.resize(-1, -1);
 
-        Rectangle imageBounds = rect.getCopy();
-        
         // Set line width here so that the whole figure is constrained, otherwise SVG graphics will have overspill
         setLineWidth(graphics, rect);
 
+        // Get this *after* setLineWidth
+        Rectangle imageBounds = rect.getCopy();
+        
         setFigurePositionFromTextPosition(rect);
 
         if(!isEnabled()) {

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

@@ -48,11 +48,12 @@ protected void drawFigure(Graphics graphics) {
         // Reduce width and height by 1 pixel
         rect.resize(-1, -1);
 
-        Rectangle imageBounds = rect.getCopy();
-        
         // Set line width here so that the whole figure is constrained, otherwise SVG graphics will have overspill
         setLineWidth(graphics, rect);
 
+        // Get this *after* setLineWidth
+        Rectangle imageBounds = rect.getCopy();
+        
         setFigurePositionFromTextPosition(rect, 2/3.0);
 
         if(!isEnabled()) {

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

@@ -48,11 +48,12 @@ protected void drawFigure(Graphics graphics) {
         // Reduce width and height by 1 pixel
         rect.resize(-1, -1);
 
-        Rectangle imageBounds = rect.getCopy();
-        
         // Set line width here so that the whole figure is constrained, otherwise SVG graphics will have overspill
         setLineWidth(graphics, rect);
 
+        // Get this *after* setLineWidth
+        Rectangle imageBounds = rect.getCopy();
+        
         setFigurePositionFromTextPosition(rect);
 
         if(!isEnabled()) {

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

@@ -47,11 +47,12 @@ protected void drawFigure(Graphics graphics) {
         // Reduce width and height by 1 pixel
         rect.resize(-1, -1);
 
-        Rectangle imageBounds = rect.getCopy();
-        
         // Set line width here so that the whole figure is constrained, otherwise SVG graphics will have overspill
         setLineWidth(graphics, rect);
 
+        // Get this *after* setLineWidth
+        Rectangle imageBounds = rect.getCopy();
+        
         setFigurePositionFromTextPosition(rect, 1.5); // Should match 'diameter'
 
         if(!isEnabled()) {

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

@@ -49,11 +49,12 @@ protected void drawFigure(Graphics graphics) {
         // Reduce width and height by 1 pixel
         rect.resize(-1, -1);
 
-        Rectangle imageBounds = rect.getCopy();
-        
         // Set line width here so that the whole figure is constrained, otherwise SVG graphics will have overspill
         setLineWidth(graphics, rect);
 
+        // Get this *after* setLineWidth
+        Rectangle imageBounds = rect.getCopy();
+        
         setFigurePositionFromTextPosition(rect, 1.24); // Should match '3.1 / 2.5' (values used in getRadius() and getCenter())
 
         if(!isEnabled()) {

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

@@ -52,11 +52,12 @@ protected void drawFigure(Graphics graphics) {
         // Reduce width and height by 1 pixel
         rect.resize(-1, -1);
 
-        Rectangle imageBounds = rect.getCopy();
-        
         // Set line width here so that the whole figure is constrained, otherwise SVG graphics will have overspill
         setLineWidth(graphics, rect);
 
+        // Get this *after* setLineWidth
+        Rectangle imageBounds = rect.getCopy();
+        
         setFigurePositionFromTextPosition(rect);
 
         if(!isEnabled()) {

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

@@ -49,11 +49,12 @@ protected void drawFigure(Graphics graphics) {
         // Reduce width and height by 1 pixel
         rect.resize(-1, -1);
 
-        Rectangle imageBounds = rect.getCopy();
-        
         // Set line width here so that the whole figure is constrained, otherwise SVG graphics will have overspill
         setLineWidth(graphics, rect);
 
+        // Get this *after* setLineWidth
+        Rectangle imageBounds = rect.getCopy();
+        
         setFigurePositionFromTextPosition(rect);
 
         if(!isEnabled()) {

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

@@ -48,11 +48,12 @@ protected void drawFigure(Graphics graphics) {
         // Reduce width and height by 1 pixel
         rect.resize(-1, -1);
 
-        Rectangle imageBounds = rect.getCopy();
-        
         // Set line width here so that the whole figure is constrained, otherwise SVG graphics will have overspill
         setLineWidth(graphics, rect);
 
+        // Get this *after* setLineWidth
+        Rectangle imageBounds = rect.getCopy();
+        
         setFigurePositionFromTextPosition(rect, 5/3.0); // Should match 'widthFraction' formula
 
         if(!isEnabled()) {

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

@@ -41,11 +41,12 @@ protected void drawFigure(Graphics graphics) {
         // Reduce width and height by 1 pixel
         rect.resize(-1, -1);
 
-        Rectangle imageBounds = rect.getCopy();
-        
         // Set line width here so that the whole figure is constrained, otherwise SVG graphics will have overspill
         setLineWidth(graphics, rect);
 
+        // Get this *after* setLineWidth
+        Rectangle imageBounds = rect.getCopy();
+        
         setFigurePositionFromTextPosition(rect);
 
         if(!isEnabled()) {

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

@@ -52,11 +52,12 @@ protected void drawFigure(Graphics graphics) {
         // Reduce width and height by 1 pixel
         rect.resize(-1, -1);
 
-        Rectangle imageBounds = rect.getCopy();
-        
         // Set line width here so that the whole figure is constrained, otherwise SVG graphics will have overspill
         setLineWidth(graphics, rect);
 
+        // Get this *after* setLineWidth
+        Rectangle imageBounds = rect.getCopy();
+        
         setFigurePositionFromTextPosition(rect, 1 / 0.86); // Should match 'FRACTION' defined in getFigurePath()
 
         if(!isEnabled()) {