[2132] Add new closed arrow with dots to diagram arrow styles

Bug: #2132 Signed-off-by: Axel RICHARD <axel.richard@obeo.fr>
eclipse-sirius · Jun 30, 2023 · 587d2e3 · 587d2e3
1 parent 35cb381
commit 587d2e3
Show file tree

Hide file tree

Showing 12 changed files with 75 additions and 6 deletions.
diff --git a/CHANGELOG.adoc b/CHANGELOG.adoc
@@ -70,17 +70,18 @@ image:doc/images/Widget_Help_Tooltip.png[Example of a help tooltip on a widget]
 - https://github.com/eclipse-sirius/sirius-components/issues/2083[#2083] [diagram] Add support for edge markers
 - https://github.com/eclipse-sirius/sirius-components/issues/2086[#2086] [diagram] Add a panel with the default diagram actions
 - https://github.com/eclipse-sirius/sirius-components/issues/2087[#2087] [diagram] Add support for snap to grid
-<<<<<<< Upstream, based on origin/master
 - https://github.com/eclipse-sirius/sirius-components/issues/2115[#2115] [form] Add the possibility to choose the label position on checkbox widget.
 Note that the default position changes from top to end. +
 before : image:doc/screenshots/checkboxLabelPlacementBefore.png[checkboxLabelPlacementTop] after : image:doc/screenshots/checkboxLabelPlacementAfter.png[checkboxLabelPlacementEnd]
-=======
 - https://github.com/eclipse-sirius/sirius-components/issues/2121[#2121] [diagram] Add new closed arrow with vertical bar to diagram arrow styles
 +
 image:doc/images/Diagram_closed_arrow_with_vertical_bar.png[closed arrow with vertical bar]
 +
+- https://github.com/eclipse-sirius/sirius-components/issues/2132[#2132] [diagram] Add new closed arrow with dots to diagram arrow styles
++
+image:doc/images/Diagram_closed_arrow_with_dots.png[closed arrow with dots]
++
 
->>>>>>> e98d973 [2121] Add new closed arrow with vertical bar to diagram arrow styles
 
 == v2023.6.0
 

diff --git a/doc/images/Diagram_closed_arrow_with_dots.png b/doc/images/Diagram_closed_arrow_with_dots.png
diff --git a/...ckend/sirius-components-collaborative-diagrams/src/main/resources/schema/diagram.graphqls b/...ckend/sirius-components-collaborative-diagrams/src/main/resources/schema/diagram.graphqls
@@ -141,6 +141,7 @@ enum ArrowStyle {
   FillCircle
   CrossedCircle
   ClosedArrowWithVerticalBar
+  ClosedArrowWithDots
 }
 
 type Ratio {

diff --git a/...-components-diagrams/src/main/java/org/eclipse/sirius/components/diagrams/ArrowStyle.java b/...-components-diagrams/src/main/java/org/eclipse/sirius/components/diagrams/ArrowStyle.java
@@ -18,5 +18,5 @@
  * @author hmarchadour
  */
 public enum ArrowStyle {
-    None, OutputArrow, InputArrow, OutputClosedArrow, InputClosedArrow, OutputFillClosedArrow, InputFillClosedArrow, Diamond, FillDiamond, InputArrowWithDiamond, InputArrowWithFillDiamond, Circle, FillCircle, CrossedCircle, ClosedArrowWithVerticalBar
+    None, OutputArrow, InputArrow, OutputClosedArrow, InputClosedArrow, OutputFillClosedArrow, InputFillClosedArrow, Diamond, FillDiamond, InputArrowWithDiamond, InputArrowWithFillDiamond, Circle, FillCircle, CrossedCircle, ClosedArrowWithVerticalBar, ClosedArrowWithDots
 }
diff --git a/...ams/frontend/sirius-components-diagrams/src/representation/DiagramRepresentation.types.ts b/...ams/frontend/sirius-components-diagrams/src/representation/DiagramRepresentation.types.ts
@@ -259,6 +259,7 @@ export enum GQLArrowStyle {
   FillCircle = 'FillCircle',
   CrossedCircle = 'CrossedCircle',
   ClosedArrowWithVerticalBar = 'ClosedArrowWithVerticalBar',
+  ClosedArrowWithDots = 'ClosedArrowWithDots',
 }
 
 export interface GQLDeleteFromDiagramVariables {

diff --git a/packages/diagrams/frontend/sirius-components-diagrams/src/sprotty/Diagram.types.ts b/packages/diagrams/frontend/sirius-components-diagrams/src/sprotty/Diagram.types.ts
@@ -129,6 +129,7 @@ export enum ArrowStyle {
   FillCircle = 'FillCircle',
   CrossedCircle = 'CrossedCircle',
   ClosedArrowWithVerticalBar = 'ClosedArrowWithVerticalBar',
+  ClosedArrowWithDots = 'ClosedArrowWithDots',
 }
 
 /**

diff --git a/packages/diagrams/frontend/sirius-components-diagrams/src/sprotty/views/EdgeView.tsx b/packages/diagrams/frontend/sirius-components-diagrams/src/sprotty/views/EdgeView.tsx
@@ -195,6 +195,8 @@ export class EdgeView extends PolylineEdgeView {
         p2,
         styleObjectCopy
       );
+    } else if (arrowStyle === 'ClosedArrowWithDots') {
+      arrow = this.buildClosedArrowWithDots(basicArrowPath + 'z', p1, p2, styleObjectCopy, strokeWidth);
     }
 
     return [arrow];
@@ -346,6 +348,45 @@ export class EdgeView extends PolylineEdgeView {
     );
   }
 
+  buildClosedArrowWithDots(path: string, p1: Point, p2: Point, styleObject, strokeWidth: number) {
+    const pathStyle = { ...styleObject };
+    pathStyle.fill = '#ffffff';
+    const translateX = p2.x;
+    const translateY = p2.y;
+    const rotationAngle = toDegrees(angle(p1, p2));
+    const rotationX = p2.x;
+    const rotationY = p2.y;
+    let rotation = '';
+    if (rotationAngle !== undefined) {
+      if (rotationX !== undefined && rotationY !== undefined) {
+        rotation = `rotate(${rotationAngle} ${rotationX} ${rotationY})`;
+      } else {
+        rotation = `rotate(${rotationAngle})`;
+      }
+
+      const transform = `${rotation} translate(${translateX} ${translateY})`;
+      return (
+        <g>
+          <path class-edge={true} class-arrow={true} d={path} transform={transform} style={pathStyle} />
+          <circle
+            transform={transform}
+            cx={-7.5 - strokeWidth * 2}
+            cy={-2.5 - strokeWidth}
+            r={strokeWidth * 0.75}
+            style={styleObject}
+          />
+          <circle
+            transform={transform}
+            cx={-7.5 - strokeWidth * 2}
+            cy={2.5 + strokeWidth}
+            r={strokeWidth * 0.75}
+            style={styleObject}
+          />
+        </g>
+      );
+    }
+  }
+
   buildArrowPath(
     path: string,
     translateX: number,

diff --git a/...ges/view/backend/sirius-components-view-diagram-edit/src/main/resources/plugin.properties b/...ges/view/backend/sirius-components-view-diagram-edit/src/main/resources/plugin.properties
@@ -145,6 +145,7 @@ _UI_ArrowStyle_Circle_literal = Circle
 _UI_ArrowStyle_FillCircle_literal = FillCircle
 _UI_ArrowStyle_CrossedCircle_literal = CrossedCircle
 _UI_ArrowStyle_ClosedArrowWithVerticalBar_literal = ClosedArrowWithVerticalBar
+_UI_ArrowStyle_ClosedArrowWithDots_literal = ClosedArrowWithDots
 _UI_LayoutDirection_Column_literal = Column
 _UI_LineStyle_Solid_literal = Solid
 _UI_LineStyle_Dash_literal = Dash

diff --git a/...nts-view-diagram/src/main/java/org/eclipse/sirius/components/view/diagram/ArrowStyle.java b/...nts-view-diagram/src/main/java/org/eclipse/sirius/components/view/diagram/ArrowStyle.java
@@ -160,7 +160,15 @@ public enum ArrowStyle implements Enumerator {
      * @generated
      * @ordered
      */
-    CLOSED_ARROW_WITH_VERTICAL_BAR(14, "ClosedArrowWithVerticalBar", "ClosedArrowWithVerticalBar");
+    CLOSED_ARROW_WITH_VERTICAL_BAR(14, "ClosedArrowWithVerticalBar", "ClosedArrowWithVerticalBar"),
+    /**
+     * The '<em><b>Closed Arrow With Dots</b></em>' literal object. <!-- begin-user-doc --> <!-- end-user-doc -->
+     *
+     * @see #CLOSED_ARROW_WITH_DOTS_VALUE
+     * @generated
+     * @ordered
+     */
+    CLOSED_ARROW_WITH_DOTS(15, "ClosedArrowWithDots", "ClosedArrowWithDots");
 
     /**
      * The '<em><b>None</b></em>' literal value. <!-- begin-user-doc --> <!-- end-user-doc -->
@@ -312,13 +320,23 @@ public enum ArrowStyle implements Enumerator {
      */
     public static final int CLOSED_ARROW_WITH_VERTICAL_BAR_VALUE = 14;
 
+    /**
+     * The '<em><b>Closed Arrow With Dots</b></em>' literal value. <!-- begin-user-doc --> <!-- end-user-doc -->
+     *
+     * @see #CLOSED_ARROW_WITH_DOTS
+     * @model name="ClosedArrowWithDots"
+     * @generated
+     * @ordered
+     */
+    public static final int CLOSED_ARROW_WITH_DOTS_VALUE = 15;
+
     /**
      * An array of all the '<em><b>Arrow Style</b></em>' enumerators. <!-- begin-user-doc --> <!-- end-user-doc -->
      *
      * @generated
      */
     private static final ArrowStyle[] VALUES_ARRAY = new ArrowStyle[] { NONE, OUTPUT_ARROW, INPUT_ARROW, OUTPUT_CLOSED_ARROW, INPUT_CLOSED_ARROW, OUTPUT_FILL_CLOSED_ARROW, INPUT_FILL_CLOSED_ARROW,
-            DIAMOND, FILL_DIAMOND, INPUT_ARROW_WITH_DIAMOND, INPUT_ARROW_WITH_FILL_DIAMOND, CIRCLE, FILL_CIRCLE, CROSSED_CIRCLE, CLOSED_ARROW_WITH_VERTICAL_BAR, };
+            DIAMOND, FILL_DIAMOND, INPUT_ARROW_WITH_DIAMOND, INPUT_ARROW_WITH_FILL_DIAMOND, CIRCLE, FILL_CIRCLE, CROSSED_CIRCLE, CLOSED_ARROW_WITH_VERTICAL_BAR, CLOSED_ARROW_WITH_DOTS, };
 
     /**
      * A public read-only list of all the '<em><b>Arrow Style</b></em>' enumerators. <!-- begin-user-doc --> <!--
@@ -407,6 +425,8 @@ public static ArrowStyle get(int value) {
                 return CROSSED_CIRCLE;
             case CLOSED_ARROW_WITH_VERTICAL_BAR_VALUE:
                 return CLOSED_ARROW_WITH_VERTICAL_BAR;
+            case CLOSED_ARROW_WITH_DOTS_VALUE:
+                return CLOSED_ARROW_WITH_DOTS;
         }
         return null;
     }

diff --git a/...ram/src/main/java/org/eclipse/sirius/components/view/diagram/impl/DiagramPackageImpl.java b/...ram/src/main/java/org/eclipse/sirius/components/view/diagram/impl/DiagramPackageImpl.java
@@ -1914,6 +1914,7 @@ public void initializePackageContents() {
         this.addEEnumLiteral(this.arrowStyleEEnum, ArrowStyle.FILL_CIRCLE);
         this.addEEnumLiteral(this.arrowStyleEEnum, ArrowStyle.CROSSED_CIRCLE);
         this.addEEnumLiteral(this.arrowStyleEEnum, ArrowStyle.CLOSED_ARROW_WITH_VERTICAL_BAR);
+        this.addEEnumLiteral(this.arrowStyleEEnum, ArrowStyle.CLOSED_ARROW_WITH_DOTS);
 
         this.initEEnum(this.layoutDirectionEEnum, LayoutDirection.class, "LayoutDirection");
         this.addEEnumLiteral(this.layoutDirectionEEnum, LayoutDirection.COLUMN);

diff --git a/packages/view/backend/sirius-components-view-diagram/src/main/resources/model/diagram.ecore b/packages/view/backend/sirius-components-view-diagram/src/main/resources/model/diagram.ecore
@@ -17,6 +17,7 @@
     <eLiterals name="FillCircle" value="12" literal="FillCircle"/>
     <eLiterals name="CrossedCircle" value="13" literal="CrossedCircle"/>
     <eLiterals name="ClosedArrowWithVerticalBar" value="14" literal="ClosedArrowWithVerticalBar"/>
+    <eLiterals name="ClosedArrowWithDots" value="15" literal="ClosedArrowWithDots"/>
   </eClassifiers>
   <eClassifiers xsi:type="ecore:EEnum" name="LayoutDirection">
     <eLiterals name="Column" literal="Column"/>

diff --git a/...ges/view/backend/sirius-components-view-diagram/src/main/resources/model/diagram.genmodel b/...ges/view/backend/sirius-components-view-diagram/src/main/resources/model/diagram.genmodel
@@ -30,6 +30,7 @@
       <genEnumLiterals ecoreEnumLiteral="diagram.ecore#//ArrowStyle/FillCircle"/>
       <genEnumLiterals ecoreEnumLiteral="diagram.ecore#//ArrowStyle/CrossedCircle"/>
       <genEnumLiterals ecoreEnumLiteral="diagram.ecore#//ArrowStyle/ClosedArrowWithVerticalBar"/>
+      <genEnumLiterals ecoreEnumLiteral="diagram.ecore#//ArrowStyle/ClosedArrowWithDots"/>
     </genEnums>
     <genEnums typeSafeEnumCompatible="false" ecoreEnum="diagram.ecore#//LayoutDirection">
       <genEnumLiterals ecoreEnumLiteral="diagram.ecore#//LayoutDirection/Column"/>