sartography
/
bpmn-js
mirror of https://github.com/sartography/bpmn-js.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix(BpmnImporter): Round diagram coordinates on import 

The model coordinates stay intact until shape is changed.
This commit is contained in:
jdotzki 2014-12-22 11:44:44 +01:00
parent 574af0814d
commit fd76cc98dd
3 changed files with 119 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
lib/import/BpmnImporter.js
View File

@ -77,10 +77,10 @@ BpmnImporter.prototype.add = function(semantic, parentElement) {
element = this._elementFactory.createShape(elementData(semantic, {
collapsed: collapsed,
hidden: hidden,
x: bounds.x,
y: bounds.y,
width: bounds.width,
height: bounds.height
x: Math.round(bounds.x),
y: Math.round(bounds.y),
width: Math.round(bounds.width),
height: Math.round(bounds.height)
}));
this._canvas.addShape(element, parentElement);
@ -126,10 +126,10 @@ BpmnImporter.prototype.addLabel = function(semantic, element) {
labelTarget: element,
type: 'label',
hidden: element.hidden,
x: bounds.x,
y: bounds.y,
width: bounds.width,
height: bounds.height
x: Math.round(bounds.x),
y: Math.round(bounds.y),
width: Math.round(bounds.width),
height: Math.round(bounds.height)
}));
return this._canvas.addShape(label, element.parent);
@ -187,4 +187,4 @@ BpmnImporter.prototype._getTarget = function(semantic) {
BpmnImporter.prototype._getElement = function(semantic) {
return this._elementRegistry.get(semantic.id);
};
};

57
test/fixtures/bpmn/import/position/position-testcase.bpmn vendored Normal file
View File

@ -0,0 +1,57 @@
<?xml version="1.0" encoding="UTF-8"?>
<definitions xmlns="http://www.omg.org/spec/BPMN/20100524/MODEL"
xmlns:bpmndi="http://www.omg.org/spec/BPMN/20100524/DI"
xmlns:omgdc="http://www.omg.org/spec/DD/20100524/DC"
xmlns:omgdi="http://www.omg.org/spec/DD/20100524/DI"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
exporter="Signavio Process Editor, http://www.signavio.com"
expressionLanguage="http://www.w3.org/1999/XPath"
typeLanguage="http://www.w3.org/2001/XMLSchema"
xsi:schemaLocation="http://www.omg.org/spec/BPMN/20100524/MODEL http://www.omg.org/spec/BPMN/2.0/20100501/BPMN20.xsd">
<process id="ID_Process" isClosed="false" isExecutable="false" processType="None">
<startEvent id="ID_Start" name="Start">
<outgoing>ID_Flow_1</outgoing>
</startEvent>
<task completionQuantity="1" id="ID_Task" isForCompensation="false" startQuantity="1" name="Task">
<incoming>ID_Flow_1</incoming>
<outgoing>ID_Flow_2</outgoing>
</task>
<endEvent id="ID_End">
<incoming>ID_Flow_2</incoming>
</endEvent>
<sequenceFlow id="ID_Flow_1" sourceRef="ID_Start" targetRef="ID_Task">
</sequenceFlow>
<sequenceFlow id="ID_Flow_2" sourceRef="ID_Task" targetRef="ID_End">
</sequenceFlow>
</process>
<bpmndi:BPMNDiagram id="sid-c84fe9a1-fd97-4781-869b-cf6e0e201897">
<bpmndi:BPMNPlane bpmnElement="ID_Process" id="sid-0876fbd9-fd46-4ba4-b587-3df596a7ba82">
<bpmndi:BPMNShape bpmnElement="ID_Start" id="ID_Start_gui">
<omgdc:Bounds height="30.4" width="30.4" x="120.4" y="135.4"/>
<bpmndi:BPMNLabel labelStyle="sid-794da868-7723-4248-8b91-33757c986477">
<omgdc:Bounds height="12.6" width="28" x="100.4" y="155.4"/>
</bpmndi:BPMNLabel>
</bpmndi:BPMNShape>
<bpmndi:BPMNShape bpmnElement="ID_Task" id="ID_Task_gui">
<omgdc:Bounds height="80.0" width="100.0" x="195.0" y="110.0"/>
<bpmndi:BPMNLabel labelStyle="sid-794da868-7723-4248-8b91-33757c986477">
<omgdc:Bounds height="12.0" width="28" x="230" y="142.0"/>
</bpmndi:BPMNLabel>
</bpmndi:BPMNShape>
<bpmndi:BPMNShape bpmnElement="ID_End" id="ID_End_gui">
<omgdc:Bounds height="28.0" width="28.0" x="340.6" y="136.6"/>
</bpmndi:BPMNShape>
<bpmndi:BPMNEdge bpmnElement="ID_Flow_1" id="ID_Flow_1_gui">
<omgdi:waypoint x="150.0" y="150.0"/>
<omgdi:waypoint x="195.0" y="150.0"/>
</bpmndi:BPMNEdge>
<bpmndi:BPMNEdge bpmnElement="ID_Flow_2" id="ID_Flow_2_gui">
<omgdi:waypoint x="295.0" y="150.0"/>
<omgdi:waypoint x="340.0" y="150.5"/>
</bpmndi:BPMNEdge>
</bpmndi:BPMNPlane>
<bpmndi:BPMNLabelStyle id="sid-794da868-7723-4248-8b91-33757c986477">
<omgdc:Font isBold="false" isItalic="false" isStrikeThrough="false" isUnderline="false" name="Arial" size="12.0"/>
</bpmndi:BPMNLabelStyle>
</bpmndi:BPMNDiagram>
</definitions>

55
test/spec/import/ImporterSpec.js
View File

@ -332,7 +332,58 @@ describe('import - importer', function() {
done(err);
});
});
});
});
describe('position', function() {
var xml1 = fs.readFileSync('test/fixtures/bpmn/import/position/position-testcase.bpmn', 'utf8');
var xml2 = fs.readFileSync('test/fixtures/bpmn/simple.bpmn', 'utf8');
it('should round shape\'s x and y coordinates', function(done) {
// given
var events = {};
// log events
diagram.get('eventBus').on('bpmnElement.added', function(e) {
events[e.element.id] = e.element;
});
runImport(diagram, xml1, function(err, warnings) {
//round up
expect(events.ID_End.x).toBe(Math.round(340.6));
expect(events.ID_End.y).toBe(Math.round(136.6));
//round down
expect(events.ID_Start.x).toBe(Math.round(120.4));
expect(events.ID_Start.y).toBe(Math.round(135.4));
done(err);
});
});
it('should round shape\'s height and width', function(done) {
// given
var events = {};
// log events
diagram.get('eventBus').on('bpmnElement.added', function(e) {
events[e.element.id] = e.element;
});
runImport(diagram, xml1, function(err, warnings) {
//round down
expect(events.ID_Start.height).toBe(Math.round(30.4));
expect(events.ID_Start.width).toBe(Math.round(30.4));
done(err);
});
});
});
});