Support Line Style on diagram objects

archimatetool · Nov 8, 2024 · 9aa6f6c · 9aa6f6c
1 parent 027e912
commit 9aa6f6c
Show file tree

Hide file tree

Showing 36 changed files with 603 additions and 117 deletions.
diff --git a/com.archimatetool.canvas/src/com/archimatetool/canvas/factory/CanvasStickyUIProvider.java b/com.archimatetool.canvas/src/com/archimatetool/canvas/factory/CanvasStickyUIProvider.java
@@ -62,6 +62,7 @@ public ImageDescriptor getImageDescriptor() {
     public boolean shouldExposeFeature(String featureName) {
         if(featureName == IArchimatePackage.Literals.LINE_OBJECT__LINE_COLOR.getName() ||
                 featureName == IArchimatePackage.Literals.LINE_OBJECT__LINE_WIDTH.getName() ||
+                featureName == IDiagramModelObject.FEATURE_LINE_STYLE ||
                 featureName == IDiagramModelObject.FEATURE_DERIVE_ELEMENT_LINE_COLOR ||
                 featureName == IDiagramModelObject.FEATURE_GRADIENT) {
             return false;

diff --git a/com.archimatetool.canvas/src/com/archimatetool/canvas/figures/CanvasBlockFigure.java b/com.archimatetool.canvas/src/com/archimatetool/canvas/figures/CanvasBlockFigure.java
@@ -162,6 +162,8 @@ private void drawFigure(Graphics graphics, Color background) {
         // Set line width here so that the whole figure is constrained, otherwise SVG graphics will have overspill
         setLineWidth(graphics, bounds);
 
+        setLineStyle(graphics);
+
         graphics.setBackgroundColor(background);
         graphics.fillRectangle(bounds);
 

diff --git a/com.archimatetool.editor/plugin.xml b/com.archimatetool.editor/plugin.xml
@@ -431,13 +431,13 @@
          </propertySection>
          <propertySection
                afterSection="lineSection"
-               class="com.archimatetool.editor.propertysections.LineOpacitySection"
-               filter="com.archimatetool.editor.propertysections.LineOpacitySection$Filter"
-               id="lineOpacitySection"
+               class="com.archimatetool.editor.propertysections.LineSection2"
+               filter="com.archimatetool.editor.propertysections.LineSection2$Filter"
+               id="lineSection2"
                tab="appearance.tab">
          </propertySection>
          <propertySection
-               afterSection="lineOpacitySection"
+               afterSection="lineSection2"
                class="com.archimatetool.editor.propertysections.IconColorSection"
                filter="com.archimatetool.editor.propertysections.IconColorSection$Filter"
                id="iconColorSection"
@@ -451,7 +451,7 @@
                tab="appearance.tab">
          </propertySection>
          <propertySection
-               afterSection="lineOpacitySection"
+               afterSection="lineSection2"
                class="com.archimatetool.editor.propertysections.GroupBorderTypeSection"
                filter="com.archimatetool.editor.propertysections.GroupBorderTypeSection$Filter"
                id="groupBorderTypeSection"
@@ -491,7 +491,7 @@
                tab="appearance.tab">
          </propertySection>
          <propertySection
-               afterSection="lineOpacitySection"
+               afterSection="lineSection2"
                class="com.archimatetool.editor.propertysections.NoteBorderTypeSection"
                filter="com.archimatetool.editor.propertysections.NoteBorderTypeSection$Filter"
                id="noteBorderTypeSection"

diff --git a/...chimatetool.editor/src/com/archimatetool/editor/diagram/ArchimateDiagramModelFactory.java b/...chimatetool.editor/src/com/archimatetool/editor/diagram/ArchimateDiagramModelFactory.java
@@ -47,14 +47,17 @@ public class ArchimateDiagramModelFactory implements ICreationFactory {
     public static IDiagramModelArchimateObject createDiagramModelArchimateObject(IArchimateElement element) {
         IDiagramModelArchimateObject dmo = IArchimateFactory.eINSTANCE.createDiagramModelArchimateObject();
         dmo.setArchimateElement(element);
+
         // Figure Type
         dmo.setType(ArchiPlugin.PREFERENCES.getInt(IPreferenceConstants.DEFAULT_FIGURE_PREFIX + element.eClass().getName()));
 
-        // Add new bounds with a default user size
         IGraphicalObjectUIProvider provider = (IGraphicalObjectUIProvider)ObjectUIFactory.INSTANCE.getProvider(dmo);
+
+        // Add new bounds with a default user size
         Dimension size = provider.getDefaultSize();
         dmo.setBounds(0, 0, size.width, size.height);
 
+        // Text position and alignment
         dmo.setTextPosition(provider.getDefaultTextPosition());
         dmo.setTextAlignment(provider.getDefaultTextAlignment());
 

diff --git a/...tor/src/com/archimatetool/editor/diagram/commands/DiagramModelObjectLineStyleCommand.java b/...tor/src/com/archimatetool/editor/diagram/commands/DiagramModelObjectLineStyleCommand.java
@@ -0,0 +1,23 @@
+/**
+ * This program and the accompanying materials
+ * are made available under the terms of the License
+ * which accompanies this distribution in the file LICENSE.txt
+ */
+package com.archimatetool.editor.diagram.commands;
+
+import com.archimatetool.editor.model.commands.FeatureCommand;
+import com.archimatetool.model.IDiagramModelObject;
+
+
+
+/**
+ * Line Style Command
+ *
+ * @author Phillip Beauvoir
+ */
+public class DiagramModelObjectLineStyleCommand extends FeatureCommand {
+
+    public DiagramModelObjectLineStyleCommand(IDiagramModelObject object, int style, int defaultValue) {
+        super("Change Line Style", object, IDiagramModelObject.FEATURE_LINE_STYLE, style, defaultValue);
+    }
+}
diff --git a/...editor/src/com/archimatetool/editor/diagram/figures/AbstractDiagramModelObjectFigure.java b/...editor/src/com/archimatetool/editor/diagram/figures/AbstractDiagramModelObjectFigure.java
@@ -25,6 +25,7 @@
 import com.archimatetool.editor.ui.FontFactory;
 import com.archimatetool.editor.ui.ImageFactory;
 import com.archimatetool.editor.ui.factory.IGraphicalObjectUIProvider;
+import com.archimatetool.editor.ui.factory.IObjectUIProvider;
 import com.archimatetool.editor.ui.factory.ObjectUIFactory;
 import com.archimatetool.editor.utils.StringUtils;
 import com.archimatetool.model.IArchimateElement;
@@ -142,6 +143,27 @@ protected void setDisabledState(Graphics graphics) {
         //graphics.setLineStyle(SWT.LINE_DASH);
         //graphics.setLineDash(new int[] { 4, 3 });
     }
+
+    /**
+     * Set the line style
+     * @param graphics
+     */
+    protected void setLineStyle(Graphics graphics) {
+        double scale = Math.min(FigureUtils.getFigureScale(this), 1.0); // only scale below 1.0
+
+        switch(getLineStyle()) {
+            case IDiagramModelObject.LINE_STYLE_SOLID:
+            default:
+                graphics.setLineStyle(Graphics.LINE_SOLID);
+                break;
+            case IDiagramModelObject.LINE_STYLE_DASHED:
+                graphics.setLineDash(new float[] { (float)(8 * scale), (float)(4 * scale) });
+                break;
+            case IDiagramModelObject.LINE_STYLE_DOTTED:
+                graphics.setLineDash(new float[] { (float)(2 * scale), (float)(2 * scale) });
+                break;
+        }
+    }
 
     /**
      * Set the UI
@@ -247,6 +269,11 @@ protected int getLineWidth() {
         return fDiagramModelObject.getLineWidth();
     }
 
+    protected int getLineStyle() {
+        IObjectUIProvider provider = ObjectUIFactory.INSTANCE.getProvider(getDiagramModelObject());
+        return provider != null && provider.getFeatureValue(IDiagramModelObject.FEATURE_LINE_STYLE) instanceof Integer val ? val : IDiagramModelObject.LINE_STYLE_SOLID;
+    }
+
     @Override
     public void updateIconImage() {
         if(getIconicDelegate() != null) {

diff --git a/...imatetool.editor/src/com/archimatetool/editor/diagram/figures/AbstractFigureDelegate.java b/...imatetool.editor/src/com/archimatetool/editor/diagram/figures/AbstractFigureDelegate.java
@@ -129,6 +129,14 @@ protected void setLineWidth(Graphics graphics, int lineWidth, Rectangle bounds)
         getOwner().setLineWidth(graphics, lineWidth, bounds);
     }
 
+    /**
+     * Set line style
+     * @param graphics
+     */
+    protected void setLineStyle(Graphics graphics) {
+        getOwner().setLineStyle(graphics);
+    }
+
     /**
      * Apply a gradient to the given Graphics instance and bounds using current fill color, alpha and gradient settings
      */

diff --git a/...himatetool.editor/src/com/archimatetool/editor/diagram/figures/EllipseFigureDelegate.java b/...himatetool.editor/src/com/archimatetool/editor/diagram/figures/EllipseFigureDelegate.java
@@ -34,6 +34,8 @@ public void drawFigure(Graphics graphics) {
         // Line Width
         setLineWidth(graphics, bounds);
 
+        setLineStyle(graphics);
+
         graphics.setAlpha(getAlpha());
 
         if(!isEnabled()) {

diff --git a/...matetool.editor/src/com/archimatetool/editor/diagram/figures/RectangleFigureDelegate.java b/...matetool.editor/src/com/archimatetool/editor/diagram/figures/RectangleFigureDelegate.java
@@ -33,6 +33,8 @@ public void drawFigure(Graphics graphics) {
 
         // Set line width here so that the whole figure is constrained, otherwise SVG graphics will have overspill
         setLineWidth(graphics, bounds);
+
+        setLineStyle(graphics);
 
         graphics.setAlpha(getAlpha());
 

diff --git a/...l.editor/src/com/archimatetool/editor/diagram/figures/RoundedRectangleFigureDelegate.java b/...l.editor/src/com/archimatetool/editor/diagram/figures/RoundedRectangleFigureDelegate.java
@@ -38,6 +38,8 @@ public void drawFigure(Graphics graphics) {
 
         // Set line width here so that the whole figure is constrained, otherwise SVG graphics will have overspill
         setLineWidth(graphics, bounds);
+
+        setLineStyle(graphics);
 
         graphics.setAlpha(getAlpha());
 

diff --git a/...etool.editor/src/com/archimatetool/editor/diagram/figures/diagram/DiagramImageFigure.java b/...etool.editor/src/com/archimatetool/editor/diagram/figures/diagram/DiagramImageFigure.java
@@ -105,6 +105,8 @@ protected void paintFigure(Graphics graphics) {
         // Set line width here so that the whole figure is constrained, otherwise SVG graphics will have overspill
         setLineWidth(graphics, bounds);
 
+        setLineStyle(graphics);
+
         if(fImage != null) {
             // Faster but no transparency
             if(useScaledImage) {

diff --git a/...rchimatetool.editor/src/com/archimatetool/editor/diagram/figures/diagram/GroupFigure.java b/...rchimatetool.editor/src/com/archimatetool/editor/diagram/figures/diagram/GroupFigure.java
@@ -57,6 +57,8 @@ protected void drawFigure(Graphics graphics) {
         // Set line width here so that the whole figure is constrained, otherwise SVG graphics will have overspill
         setLineWidth(graphics, bounds);
 
+        setLineStyle(graphics);
+
         graphics.setAlpha(getAlpha());
 
         if(getDiagramModelObject().getBorderType() == IDiagramModelGroup.BORDER_TABBED) {

diff --git a/...archimatetool.editor/src/com/archimatetool/editor/diagram/figures/diagram/NoteFigure.java b/...archimatetool.editor/src/com/archimatetool/editor/diagram/figures/diagram/NoteFigure.java
@@ -116,6 +116,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, bounds);
+            setLineStyle(graphics);
         }
 
         // Fill

diff --git a/...ditor/src/com/archimatetool/editor/diagram/figures/elements/AbstractMotivationFigure.java b/...ditor/src/com/archimatetool/editor/diagram/figures/elements/AbstractMotivationFigure.java
@@ -44,6 +44,8 @@ protected void drawFigure(Graphics graphics) {
 
         // Set line width here so that the whole figure is constrained, otherwise SVG graphics will have overspill
         setLineWidth(graphics, bounds);
+
+        setLineStyle(graphics);
 
         PointList points = new PointList();
         points.addPoint(bounds.x + FLANGE, bounds.y);

diff --git a/...matetool.editor/src/com/archimatetool/editor/diagram/figures/elements/GroupingFigure.java b/...matetool.editor/src/com/archimatetool/editor/diagram/figures/elements/GroupingFigure.java
@@ -61,10 +61,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, bounds);
 
-        // Scale line dashes below 1.0
-        double scale = Math.min(FigureUtils.getGraphicsScale(graphics), 1.0);
-
-        graphics.setLineDash(new float[] { (float)(8 * scale), (float)(4 * scale) });
+        setLineStyle(graphics);
 
         graphics.setBackgroundColor(getFillColor());
         graphics.setForegroundColor(getLineColor());

diff --git a/...rchimatetool.editor/src/com/archimatetool/editor/diagram/sketch/figures/StickyFigure.java b/...rchimatetool.editor/src/com/archimatetool/editor/diagram/sketch/figures/StickyFigure.java
@@ -50,6 +50,8 @@ protected void drawFigure(Graphics graphics) {
 
         // Set line width here so that the whole figure is constrained, otherwise SVG graphics will have overspill
         setLineWidth(graphics, bounds);
+
+        setLineStyle(graphics);
 
         graphics.setBackgroundColor(getFillColor());
 

diff --git a/com.archimatetool.editor/src/com/archimatetool/editor/diagram/tools/FormatPainterTool.java b/com.archimatetool.editor/src/com/archimatetool/editor/diagram/tools/FormatPainterTool.java
@@ -19,6 +19,7 @@
 import com.archimatetool.editor.diagram.commands.ConnectionLineTypeCommand;
 import com.archimatetool.editor.diagram.commands.ConnectionTextPositionCommand;
 import com.archimatetool.editor.diagram.commands.DiagramModelObjectAlphaCommand;
+import com.archimatetool.editor.diagram.commands.DiagramModelObjectLineStyleCommand;
 import com.archimatetool.editor.diagram.commands.DiagramModelObjectOutlineAlphaCommand;
 import com.archimatetool.editor.diagram.commands.FillColorCommand;
 import com.archimatetool.editor.diagram.commands.FontColorCommand;
@@ -112,6 +113,8 @@ CompoundCommand createCommand(IDiagramModelComponent targetComponent) {
         CompoundCommand result = new CompoundCommand(Messages.FormatPainterTool_0);
 
         IDiagramModelComponent sourceComponent = FormatPainterInfo.INSTANCE.getSourceComponent();
+
+        IObjectUIProvider sourceUIProvider = ObjectUIFactory.INSTANCE.getProvider(sourceComponent);
         IObjectUIProvider targetUIProvider = ObjectUIFactory.INSTANCE.getProvider(targetComponent);
 
         // IFontAttribute
@@ -212,6 +215,15 @@ CompoundCommand createCommand(IDiagramModelComponent targetComponent) {
                 result.add(cmd);
             }
 
+            // Line Style
+            if(targetUIProvider != null && sourceUIProvider != null && targetUIProvider.shouldExposeFeature(IDiagramModelObject.FEATURE_LINE_STYLE)) {
+                cmd = new DiagramModelObjectLineStyleCommand(target, (int)sourceUIProvider.getFeatureValue(IDiagramModelObject.FEATURE_LINE_STYLE),
+                        (int)targetUIProvider.getDefaultFeatureValue(IDiagramModelObject.FEATURE_LINE_STYLE));
+                if(cmd.canExecute()) {
+                    result.add(cmd);
+                }
+            }
+
             // Gradient
             if(targetUIProvider != null && targetUIProvider.shouldExposeFeature(IDiagramModelObject.FEATURE_GRADIENT)) {
                 cmd = new FeatureCommand("", target, IDiagramModelObject.FEATURE_GRADIENT, source.getGradient(), IDiagramModelObject.FEATURE_GRADIENT_DEFAULT); //$NON-NLS-1$

diff --git a/...rchimatetool.editor/src/com/archimatetool/editor/propertysections/LineOpacitySection.java b/...rchimatetool.editor/src/com/archimatetool/editor/propertysections/LineOpacitySection.java