Skip to content

[FEAT] Render inclusive gateway #246

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
tbouffard merged 6 commits into from
May 13, 2020
Merged

[FEAT] Render inclusive gateway #246

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
1f4414c
Render inclusive gateway
aibcmars May 6, 2020
fe7e1c9
remove the temporary style which is not needed anymore (use shape ins…
tbouffard May 13, 2020
d362c1b
add e2e test for inclusive gateway
tbouffard May 13, 2020
84898c0
size of the icon corrected
aibcmars May 13, 2020
24e829e
merge fix
aibcmars May 13, 2020
508c3f4
avoid hard coded fill color for the inner circle of the inclusive icon
tbouffard May 13, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion src/component/mxgraph/ShapeConfigurator.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ import { MxGraphFactoryService } from '../../service/MxGraphFactoryService';
import { mxgraph } from 'ts-mxgraph';
import { ShapeBpmnElementKind } from '../../model/bpmn/shape/ShapeBpmnElementKind';
import { EndEventShape, StartEventShape, ThrowIntermediateEventShape, CatchIntermediateEventShape } from './shape/event-shapes';
import { ExclusiveGatewayShape, ParallelGatewayShape } from './shape/gateway-shapes';
import { ExclusiveGatewayShape, ParallelGatewayShape, InclusiveGatewayShape } from './shape/gateway-shapes';
import { ServiceTaskShape, TaskShape, UserTaskShape } from './shape/task-shapes';

export default class ShapeConfigurator {
Expand All @@ -38,6 +38,7 @@ export default class ShapeConfigurator {
this.mxCellRenderer.registerShape(ShapeBpmnElementKind.EVENT_INTERMEDIATE_CATCH, CatchIntermediateEventShape);
// gateways
this.mxCellRenderer.registerShape(ShapeBpmnElementKind.GATEWAY_EXCLUSIVE, ExclusiveGatewayShape);
this.mxCellRenderer.registerShape(ShapeBpmnElementKind.GATEWAY_INCLUSIVE, InclusiveGatewayShape);
this.mxCellRenderer.registerShape(ShapeBpmnElementKind.GATEWAY_PARALLEL, ParallelGatewayShape);
// tasks
this.mxCellRenderer.registerShape(ShapeBpmnElementKind.TASK, TaskShape);
Expand Down
13 changes: 0 additions & 13 deletions src/component/mxgraph/StyleConfigurator.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -139,19 +139,6 @@ export default class StyleConfigurator {

this.putCellStyle(kind, style);
});
// TODO: this is temporary rendering - to be removed with proper rendering implementation
const temporaryStyle = this.cloneDefaultVertexStyle();
temporaryStyle[this.mxConstants.STYLE_SHAPE] = this.mxConstants.SHAPE_RHOMBUS;
temporaryStyle[this.mxConstants.STYLE_PERIMETER] = this.mxPerimeter.RhombusPerimeter;
temporaryStyle[this.mxConstants.STYLE_VERTICAL_ALIGN] = 'top';
temporaryStyle[this.mxConstants.STYLE_STROKECOLOR] = '#f00';
temporaryStyle[this.mxConstants.STYLE_STROKEWIDTH] = 2;
temporaryStyle[this.mxConstants.STYLE_FILLCOLOR] = '#f00';
temporaryStyle[this.mxConstants.STYLE_FILL_OPACITY] = 25;

temporaryStyle[this.mxConstants.STYLE_SPACING_TOP] = 55;
temporaryStyle[this.mxConstants.STYLE_SPACING_RIGHT] = 110;
this.putCellStyle(ShapeBpmnElementKind.GATEWAY_INCLUSIVE, temporaryStyle);
}

private configureSequenceFlowsStyle(): void {
Expand Down
28 changes: 28 additions & 0 deletions src/component/mxgraph/shape/gateway-shapes.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,3 +110,31 @@ export class ParallelGatewayShape extends GatewayShape {
canvas.fillAndStroke();
}
}

export class InclusiveGatewayShape extends GatewayShape {
public constructor(bounds: mxgraph.mxRectangle, fill: string, stroke: string, strokewidth: number = StyleConstant.STROKE_WIDTH_THIN) {
super(bounds, fill, stroke, strokewidth);
}

protected paintInnerShape(c: mxgraph.mxXmlCanvas2D, x: number, y: number, w: number, h: number): void {
this.addInclusiveGatewaySymbol(c, x, y, w, h);
}

private addInclusiveGatewaySymbol(c: mxgraph.mxXmlCanvas2D, x: number, y: number, w: number, h: number): void {
const canvas = this.configureCanvasForIcon(c, w, h, 0.5);
this.translateToStartingIconPosition(c, x, y, w, h);
c.setFillColor(this.fill);
c.setStrokeWidth(StyleConstant.STROKE_WIDTH_THICK);

const arcRay = 1 / 6;
const arcX = 1 / 6;
const arcY = 1 / 6;
canvas.begin();
canvas.moveTo(arcX, arcY);
canvas.arcTo(arcRay, arcRay, 0, 0, 0, 5 * arcX, 5 * arcY);
canvas.arcTo(arcRay, arcRay, 0, 0, 0, arcX, arcY);
canvas.close();

canvas.fillAndStroke();
}
}
9 changes: 9 additions & 0 deletions test/e2e/View.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,6 +85,8 @@ describe('BPMN Visualization JS', () => {
<semantic:sequenceFlow sourceRef="noneIntermediateThrowEvent" targetRef="messageIntermediateThrowEvent" name="" id="_8e8fe679-eb3b-4c43-a4d6-891e7087ff22" />
<semantic:sequenceFlow sourceRef="messageIntermediateThrowEvent" targetRef="endEvent_1" name="" id="_8e8fe679-eb3b-4c43-a4d6-891e7087ff33" />
<semantic:sequenceFlow id="Flow_028jkgv" sourceRef="startEvent_2_timer" targetRef="IntermediateCatchEvent_Timer_01" />
<semantic:inclusiveGateway id="inclusiveGateway_1" name="Inclusive Gateway 1">
</semantic:inclusiveGateway>
</semantic:process>
<bpmndi:BPMNDiagram documentation="" id="Trisotech_Visio-_6" name="A.1.0" resolution="96.00000267028808">
<bpmndi:BPMNPlane bpmnElement="WFP-6-">
Expand Down Expand Up @@ -145,6 +147,12 @@ describe('BPMN Visualization JS', () => {
<dc:Bounds x="259" y="336" width="62" height="40" />
</bpmndi:BPMNLabel>
</bpmndi:BPMNShape>
<bpmndi:BPMNShape id="shape_inclusiveGateway_1" bpmnElement="inclusiveGateway_1">
<dc:Bounds x="905" y="265" width="50" height="50" />
<bpmndi:BPMNLabel>
<dc:Bounds x="885" y="322" width="90" height="14" />
</bpmndi:BPMNLabel>
</bpmndi:BPMNShape>
<bpmndi:BPMNEdge bpmnElement="default_sequence_flow_id" id="E1373649849864_default_sequence_flow_id">
<di:waypoint x="342.0" y="351.0"/>
<di:waypoint x="390.0" y="351.0"/>
Expand Down Expand Up @@ -250,6 +258,7 @@ describe('BPMN Visualization JS', () => {
expectModelContainsShape('userTask_3', ShapeBpmnElementKind.TASK_USER);
expectModelContainsEdge('default_sequence_flow_id', SequenceFlowKind.DEFAULT);
expectModelContainsEdge('normal_sequence_flow_id', SequenceFlowKind.NORMAL);
expectModelContainsShape('inclusiveGateway_1', ShapeBpmnElementKind.GATEWAY_INCLUSIVE);
});

function expectModelContainsCellWithGeometry(cellId: string, parentId: string, geometry: mxgraph.mxGeometry): void {
Expand Down