Set line width on figures

com.archimatetool.canvas/src/com/archimatetool/canvas/figures/CanvasBlockFigure.java

@@ -160,7 +160,7 @@ private void drawFigure(Graphics graphics, Color background) {
         bounds.height--;
 
         // Set line width here so that the whole figure is constrained, otherwise SVG graphics will have overspill
-        setLineWidth(graphics, 1, bounds);
+        setLineWidth(graphics, bounds);
 
         graphics.setBackgroundColor(background);
         graphics.fillRectangle(bounds);

com.archimatetool.canvas/src/com/archimatetool/canvas/figures/CanvasStickyFigure.java

@@ -140,8 +140,7 @@ protected void paintFigure(Graphics graphics) {
         bounds.height--;
 
         // Set line width here so that the whole figure is constrained, otherwise SVG graphics will have overspill
-        int lineWidth = 1;
-        setLineWidth(graphics, lineWidth, bounds);
+        setLineWidth(graphics, bounds);
 
         // Bug on Linux hi-res using Graphics.fillGradient()
         // See https://bugs.eclipse.org/bugs/show_bug.cgi?id=568864
@@ -162,7 +161,7 @@ protected void paintFigure(Graphics graphics) {
         if(getBorderColor() != null) {
             graphics.setAlpha(getLineAlpha());
 
-            float lineOffset = (float)lineWidth / 2;
+            float lineOffset = (float)getDiagramModelObject().getLineWidth() / 2;
 
             graphics.setForegroundColor(ColorFactory.getLighterColor(getBorderColor(), 0.82f));
             Path path = new Path(null);

com.archimatetool.editor/plugin.xml

@@ -429,6 +429,13 @@
                id="iconColorSection"
                tab="appearance.tab">
          </propertySection>
+         <propertySection
+               afterSection="lineColorSection"
+               class="com.archimatetool.editor.propertysections.LineWidthSection"
+               filter="com.archimatetool.editor.propertysections.LineWidthSection$Filter"
+               id="lineWidthSection"
+               tab="appearance.tab">
+         </propertySection>
          <propertySection
                afterSection="iconColorSection"
                class="com.archimatetool.editor.propertysections.GradientSection"

com.archimatetool.editor/src/com/archimatetool/editor/diagram/figures/AbstractDiagramModelObjectFigure.java

@@ -96,13 +96,24 @@ protected void drawFigure(Graphics graphics) {
         }
     }
 
+    /**
+     * Set the line width to that in the diagram model and compensate the figure bounds width and height for this line width and translate the graphics instance
+     * @param graphics The graphics instance
+     * @param bounds The bounds of the object
+     */
+    protected void setLineWidth(Graphics graphics, Rectangle bounds) {
+        setLineWidth(graphics, getDiagramModelObject().getLineWidth(), bounds);
+    }
+
     /**
      * Set the line width and compensate the figure bounds width and height for this line width and translate the graphics instance
      * @param graphics The graphics instance
      * @param lineWidth The line width
      * @param bounds The bounds of the object
      */
     protected void setLineWidth(Graphics graphics, int lineWidth, Rectangle bounds) {
+        lineWidth = lineWidth < 1 ? 1 : lineWidth > 4 ? 4 : lineWidth;
+
         graphics.setLineWidth(lineWidth);
 
         final double scale = FigureUtils.getGraphicsScale(graphics);

com.archimatetool.editor/src/com/archimatetool/editor/diagram/figures/AbstractFigureDelegate.java

@@ -103,6 +103,15 @@ protected void setDisabledState(Graphics graphics) {
         getOwner().setDisabledState(graphics);
     }
 
+    /**
+     * Set the line width to that in the diagram model and compensate the figure bounds width and height for this line width and translate the graphics instance
+     * @param graphics The graphics instance
+     * @param bounds The bounds of the object
+     */
+    protected void setLineWidth(Graphics graphics, Rectangle bounds) {
+        getOwner().setLineWidth(graphics, bounds);
+    }
+
     /**
      * Set the line width and compensate the figure bounds width and height for this line width and translate the graphics instance
      * @param graphics The graphics instance

com.archimatetool.editor/src/com/archimatetool/editor/diagram/figures/EllipseFigureDelegate.java

@@ -32,7 +32,7 @@ public void drawFigure(Graphics graphics) {
         bounds.height--;
 
         // Line Width
-        setLineWidth(graphics, 1, bounds);
+        setLineWidth(graphics, bounds);
 
         graphics.setAlpha(getAlpha());
 

com.archimatetool.editor/src/com/archimatetool/editor/diagram/figures/RectangleFigureDelegate.java

@@ -32,7 +32,7 @@ public void drawFigure(Graphics graphics) {
         bounds.height--;
 
         // Set line width here so that the whole figure is constrained, otherwise SVG graphics will have overspill
-        setLineWidth(graphics, 1, bounds);
+        setLineWidth(graphics, bounds);
 
         graphics.setAlpha(getAlpha());
 

com.archimatetool.editor/src/com/archimatetool/editor/diagram/figures/RoundedRectangleFigureDelegate.java

@@ -37,7 +37,7 @@ public void drawFigure(Graphics graphics) {
         bounds.height--;
 
         // Set line width here so that the whole figure is constrained, otherwise SVG graphics will have overspill
-        setLineWidth(graphics, 1, bounds);
+        setLineWidth(graphics, bounds);
 
         graphics.setAlpha(getAlpha());
 

com.archimatetool.editor/src/com/archimatetool/editor/diagram/figures/diagram/DiagramImageFigure.java

@@ -103,7 +103,7 @@ protected void paintFigure(Graphics graphics) {
         bounds.height--;
 
         // Set line width here so that the whole figure is constrained, otherwise SVG graphics will have overspill
-        setLineWidth(graphics, 1, bounds);
+        setLineWidth(graphics, bounds);
 
         if(fImage != null) {
             // Faster but no transparency

com.archimatetool.editor/src/com/archimatetool/editor/diagram/figures/diagram/GroupFigure.java

@@ -55,7 +55,7 @@ protected void drawFigure(Graphics graphics) {
         bounds.height--;
 
         // Set line width here so that the whole figure is constrained, otherwise SVG graphics will have overspill
-        setLineWidth(graphics, 1, bounds);
+        setLineWidth(graphics, bounds);
 
         graphics.setAlpha(getAlpha());
 

com.archimatetool.editor/src/com/archimatetool/editor/diagram/figures/diagram/NoteFigure.java

@@ -115,7 +115,7 @@ protected void paintFigure(Graphics graphics) {
 
         // Set line width here so that the whole figure is constrained, otherwise SVG graphics will have overspill
         if(getDiagramModelObject().getBorderType() != IDiagramModelNote.BORDER_NONE) {
-            setLineWidth(graphics, 1, bounds);
+            setLineWidth(graphics, bounds);
         }
 
         // Fill

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

@@ -43,7 +43,7 @@ protected void drawFigure(Graphics graphics) {
         bounds.height--;
 
         // Set line width here so that the whole figure is constrained, otherwise SVG graphics will have overspill
-        setLineWidth(graphics, 1, bounds);
+        setLineWidth(graphics, bounds);
 
         PointList points = new PointList();
         points.addPoint(bounds.x + FLANGE, bounds.y);

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

@@ -50,7 +50,7 @@ public void drawFigure(Graphics graphics) {
         bounds.height--;
 
         // Set line width here so that the whole figure is constrained, otherwise SVG graphics will have overspill
-        setLineWidth(graphics, 1, bounds);
+        setLineWidth(graphics, bounds);
 
         if(!isEnabled()) {
             setDisabledState(graphics);

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

@@ -51,7 +51,7 @@ public void drawFigure(Graphics graphics) {
         rect.height--;
 
         // Set line width here so that the whole figure is constrained, otherwise SVG graphics will have overspill
-        setLineWidth(graphics, 1, rect);
+        setLineWidth(graphics, rect);
 
         if(!isEnabled()) {
             setDisabledState(graphics);

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

@@ -40,7 +40,7 @@ protected void drawFigure(Graphics graphics) {
         Rectangle imageBounds = rect.getCopy();
 
         // Set line width here so that the whole figure is constrained, otherwise SVG graphics will have overspill
-        setLineWidth(graphics, 1, rect);
+        setLineWidth(graphics, rect);
 
         setFigurePositionFromTextPosition(rect);
 

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

@@ -40,7 +40,7 @@ public void drawFigure(Graphics graphics) {
         bounds.height--;
 
         // Set line width here so that the whole figure is consttained, otherwise SVG graphics will have overspill
-        setLineWidth(graphics, 1, bounds);
+        setLineWidth(graphics, bounds);
 
         graphics.setAlpha(getAlpha());
 

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

@@ -48,7 +48,7 @@ protected void drawFigure(Graphics graphics) {
         Rectangle imageBounds = rect.getCopy();
 
         // Set line width here so that the whole figure is constrained, otherwise SVG graphics will have overspill
-        setLineWidth(graphics, 1, rect);
+        setLineWidth(graphics, rect);
 
         setFigurePositionFromTextPosition(rect, 2/3.0);
 

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

@@ -47,7 +47,7 @@ protected void drawFigure(Graphics graphics) {
         Rectangle imageBounds = rect.getCopy();
 
         // Set line width here so that the whole figure is constrained, otherwise SVG graphics will have overspill
-        setLineWidth(graphics, 1, rect);
+        setLineWidth(graphics, rect);
 
         setFigurePositionFromTextPosition(rect);
 

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

@@ -47,7 +47,7 @@ protected void drawFigure(Graphics graphics) {
         Rectangle imageBounds = rect.getCopy();
 
         // Set line width here so that the whole figure is constrained, otherwise SVG graphics will have overspill
-        setLineWidth(graphics, 1, rect);
+        setLineWidth(graphics, rect);
 
         setFigurePositionFromTextPosition(rect, 1.5); // Should match 'diameter'
 

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

@@ -40,7 +40,7 @@ public void drawFigure(Graphics graphics) {
             bounds.height--;
 
             // Set line width here so that the whole figure is constrained, otherwise SVG graphics will have overspill
-            setLineWidth(graphics, 1, bounds);
+            setLineWidth(graphics, bounds);
 
             graphics.setAlpha(getAlpha());
 

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

@@ -49,7 +49,7 @@ protected void drawFigure(Graphics graphics) {
         Rectangle imageBounds = rect.getCopy();
 
         // Set line width here so that the whole figure is constrained, otherwise SVG graphics will have overspill
-        setLineWidth(graphics, 1, rect);
+        setLineWidth(graphics, rect);
 
         setFigurePositionFromTextPosition(rect, 1.24); // Should match '3.1 / 2.5' (values used in getRadius() and getCenter())
 

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

@@ -37,7 +37,7 @@ public void drawFigure(Graphics graphics) {
         rect.height--;
 
         // Set line width here so that the whole figure is constrained, otherwise SVG graphics will have overspill
-        setLineWidth(graphics, 1, rect);
+        setLineWidth(graphics, rect);
 
         if(!isEnabled()) {
             setDisabledState(graphics);

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

@@ -48,16 +48,15 @@ protected void drawFigure(Graphics graphics) {
         bounds.height--;
 
         // Set line width here so that the whole figure is constrained, otherwise SVG graphics will have overspill
-        int lineWidth = 1;
-        setLineWidth(graphics, lineWidth, bounds);
+        setLineWidth(graphics, bounds);
 
         graphics.setAlpha(getAlpha());
 
         if(!isEnabled()) {
             setDisabledState(graphics);
         }
 
-        Path path = getFigurePath(8, bounds, (float)lineWidth / 2);
+        Path path = getFigurePath(8, bounds, (float)getDiagramModelObject().getLineWidth() / 2);
 
         // Main Fill
         graphics.setBackgroundColor(getFillColor());

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

@@ -49,7 +49,7 @@ public void drawFigure(Graphics graphics) {
         bounds.height--;
 
         // Set line width here so that the whole figure is constrained, otherwise SVG graphics will have overspill
-        setLineWidth(graphics, 1, bounds);
+        setLineWidth(graphics, bounds);
 
         int height_indent = bounds.height / 6;
 

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

@@ -51,7 +51,7 @@ protected void drawFigure(Graphics graphics) {
         Rectangle imageBounds = rect.getCopy();
 
         // Set line width here so that the whole figure is constrained, otherwise SVG graphics will have overspill
-        setLineWidth(graphics, 1, rect);
+        setLineWidth(graphics, rect);
 
         setFigurePositionFromTextPosition(rect);
 

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

@@ -48,7 +48,7 @@ public void drawFigure(Graphics graphics) {
         bounds.height--;
 
         // Set line width here so that the whole figure is constrained, otherwise SVG graphics will have overspill
-        setLineWidth(graphics, 1, bounds);
+        setLineWidth(graphics, bounds);
 
         int indent = Math.min(bounds.height / 3, bounds.width / 3);
         int centre_y = bounds.y + bounds.height / 2 - 1;

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

@@ -48,7 +48,7 @@ protected void drawFigure(Graphics graphics) {
         Rectangle imageBounds = rect.getCopy();
 
         // Set line width here so that the whole figure is constrained, otherwise SVG graphics will have overspill
-        setLineWidth(graphics, 1, rect);
+        setLineWidth(graphics, rect);
 
         setFigurePositionFromTextPosition(rect);
 

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

@@ -54,7 +54,7 @@ protected void drawFigure(Graphics graphics) {
         rect.height--;
 
         // Set line width here so that the whole figure is constrained, otherwise SVG graphics will have overspill
-        setLineWidth(graphics, 1, rect);
+        setLineWidth(graphics, rect);
 
         if(!isEnabled()) {
             setDisabledState(graphics);

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

@@ -47,7 +47,7 @@ protected void drawFigure(Graphics graphics) {
         Rectangle imageBounds = rect.getCopy();
 
         // Set line width here so that the whole figure is constrained, otherwise SVG graphics will have overspill
-        setLineWidth(graphics, 1, rect);
+        setLineWidth(graphics, rect);
 
         setFigurePositionFromTextPosition(rect, 5/3.0); // Should match 'widthFraction' formula
 

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

@@ -39,7 +39,7 @@ protected void drawFigure(Graphics graphics) {
         Rectangle imageBounds = rect.getCopy();
 
         // Set line width here so that the whole figure is constrained, otherwise SVG graphics will have overspill
-        setLineWidth(graphics, 1, rect);
+        setLineWidth(graphics, rect);
 
         setFigurePositionFromTextPosition(rect);
 

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

@@ -59,7 +59,7 @@ protected void drawFigure(Graphics graphics) {
         }
 
         // Set line width here so that the whole figure is constrained, otherwise SVG graphics will have overspill
-        setLineWidth(graphics, 1, bounds);
+        setLineWidth(graphics, bounds);
 
         // Scale line dashes below 1.0
         double scale = Math.min(FigureUtils.getGraphicsScale(graphics), 1.0);

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

@@ -51,7 +51,7 @@ protected void drawFigure(Graphics graphics) {
         Rectangle imageBounds = rect.getCopy();
 
         // Set line width here so that the whole figure is constrained, otherwise SVG graphics will have overspill
-        setLineWidth(graphics, 1, rect);
+        setLineWidth(graphics, rect);
 
         setFigurePositionFromTextPosition(rect, 1 / 0.86); // Should match 'FRACTION' defined in getFigurePath()
 

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

@@ -47,7 +47,7 @@ protected void drawFigure(Graphics graphics) {
         Rectangle imageBounds = rect.getCopy();
 
         // Set line width here so that the whole figure is constrained, otherwise SVG graphics will have overspill
-        setLineWidth(graphics, 1, rect);
+        setLineWidth(graphics, rect);
 
         setFigurePositionFromTextPosition(rect);
 

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

@@ -52,7 +52,7 @@ public void paintFigure(Graphics graphics) {
                 break;
 
             case IJunction.OR_JUNCTION_TYPE:
-                setLineWidth(graphics, 1, bounds);
+                setLineWidth(graphics, bounds);
                 graphics.setForegroundColor(getFillColor());
                 graphics.drawOval(bounds);
                 break;

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

@@ -47,7 +47,7 @@ protected void drawFigure(Graphics graphics) {
         Rectangle imageBounds = rect.getCopy();
 
         // Set line width here so that the whole figure is constrained, otherwise SVG graphics will have overspill
-        setLineWidth(graphics, 1, rect);
+        setLineWidth(graphics, rect);
 
         setFigurePositionFromTextPosition(rect);
 

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

@@ -49,7 +49,7 @@ protected void drawFigure(Graphics graphics) {
         Rectangle imageBounds = rect.getCopy();
 
         // Set line width here so that the whole figure is constrained, otherwise SVG graphics will have overspill
-        setLineWidth(graphics, 1, rect);
+        setLineWidth(graphics, rect);
 
         setFigurePositionFromTextPosition(rect, 10/9.0); // Should match 'figureHeight'
 

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

@@ -37,7 +37,7 @@ public void drawFigure(Graphics graphics) {
         Rectangle bounds = getBounds().getCopy();
 
         // Set line width here so that the whole figure is constrained, otherwise SVG graphics will have overspill
-        setLineWidth(graphics, 1, bounds);
+        setLineWidth(graphics, bounds);
 
         // The following is a not so awful code to draw a cloud...
 

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

@@ -46,7 +46,7 @@ public void drawFigure(Graphics graphics) {
             bounds.height--;
 
             // Set line width here so that the whole figure is constrained, otherwise SVG graphics will have overspill
-            setLineWidth(graphics, 1, bounds);
+            setLineWidth(graphics, bounds);
 
             graphics.setAlpha(getAlpha());
 

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

@@ -40,7 +40,7 @@ protected void drawFigure(Graphics graphics) {
         Rectangle imageBounds = rect.getCopy();
 
         // Set line width here so that the whole figure is constrained, otherwise SVG graphics will have overspill
-        setLineWidth(graphics, 1, rect);
+        setLineWidth(graphics, rect);
 
         setFigurePositionFromTextPosition(rect);