improve(bpmnrenderer): detail adjustments to gateways

This commit is contained in:
jdotzki 2014-04-28 11:48:19 +02:00
parent 21b1ac0ab0
commit 27f9d1c59a
2 changed files with 12 additions and 19 deletions

View File

@ -509,13 +509,13 @@ function BpmnRenderer(events, styles, bpmnRegistry, pathMap) {
var diamond = drawDiamond(p, data.width, data.height); var diamond = drawDiamond(p, data.width, data.height);
var pathData = pathMap.getScaledPath('GATEWAY_EXCLUSIVE', { var pathData = pathMap.getScaledPath('GATEWAY_EXCLUSIVE', {
xScaleFactor: 0.45, xScaleFactor: 0.4,
yScaleFactor: 0.45, yScaleFactor: 0.4,
containerWidth: data.width, containerWidth: data.width,
containerHeight: data.height, containerHeight: data.height,
position: { position: {
mx: 0.3, mx: 0.32,
my: 0.28 my: 0.3
} }
}); });
@ -610,8 +610,8 @@ function BpmnRenderer(events, styles, bpmnRegistry, pathMap) {
containerWidth: data.width, containerWidth: data.width,
containerHeight: data.height, containerHeight: data.height,
position: { position: {
mx: 0.46, mx: 0.474,
my: 0.29 my: 0.296
} }
}); });

View File

@ -38,13 +38,6 @@ function PathMap(Snap) {
* </p> * </p>
*/ */
this.pathMap = { this.pathMap = {
'shape': {
d: 'M{x},{y}h{dim.width}v{dim.height}h{dim["negative width"]}z',
height: 'y',
width: 'x',
heightElements: [],
widthElements: []
},
'EVENT_MESSAGE': { 'EVENT_MESSAGE': {
d: 'M 7.5 10 l 0 15 l 21 0 l 0 -15 z l 10.5 6 l 10.5 -6', d: 'M 7.5 10 l 0 15 l 21 0 l 0 -15 z l 10.5 6 l 10.5 -6',
height: 22, height: 22,
@ -213,12 +206,12 @@ function PathMap(Snap) {
widthElements: [6.5, -6.5, 3, -3, 5, -5] widthElements: [6.5, -6.5, 3, -3, 5, -5]
}, },
'GATEWAY_PARALLEL': { 'GATEWAY_PARALLEL': {
d:'m {mx},{my} {e.x0},0 0,{e.x1} {e.x1},0 0,{e.y0} -{e.x1},0 0,{e.y1} ' + d:'m {mx},{my} 0,{e.y1} -{e.x1},0 0,{e.y0} {e.x1},0 0,{e.y1} {e.x0},0 ' +
'-{e.x0},0 0,-{e.y1} -{e.x1},0 0,-{e.y0} {e.x1},0 z', '0,-{e.y1} {e.x1},0 0,-{e.y0} -{e.x1},0 0,-{e.y1} -{e.x0},0 z',
height: 17.125, height: 30,
width: 16.125, width: 30,
heightElements: [2.5, 7.5], heightElements: [5, 12.5],
widthElements: [2.5, 7.5] widthElements: [5, 12.5]
}, },
'GATEWAY_EVENT_BASED': { 'GATEWAY_EVENT_BASED': {
//d:'m {mx},{my} 9.42149,-6.28099 9.42149,6.28099 -3.1405,12.56199 -12.56198,0 z', //d:'m {mx},{my} 9.42149,-6.28099 9.42149,6.28099 -3.1405,12.56199 -12.56198,0 z',