fernando/luos
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed zoom function

Browse Source
This commit is contained in:
girish
2011-02-24 10:57:36 +00:00
parent 58fd14666f
commit 93ea13a75a
2 changed files with 14 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
workflow/engine/templates/bpmn/EventEmptyStart.js
View File

@@ -9,15 +9,13 @@ this.stroke=2;
if(typeof workflow.zoomfactor == 'undefined') if(typeof workflow.zoomfactor == 'undefined')
workflow.zoomfactor = 1; workflow.zoomfactor = 1;
//Set the Task Limitation //Set the Task Limitation
if(typeof this.limitFlag == 'undefined' || this.limitFlag == false) if(typeof this.limitFlag == 'undefined' || this.limitFlag == false) {
{
this.originalWidth = 30; this.originalWidth = 30;
this.originalHeight = 30; this.originalHeight = 30;
this.orgXPos = this.getX(); this.orgXPos = this.getX();
this.orgYPos = this.getY(); this.orgYPos = this.getY();
this.orgFontSize =this.fontSize; this.orgFontSize =this.fontSize;
} }
this.width = this.originalWidth * workflow.zoomfactor; this.width = this.originalWidth * workflow.zoomfactor;
this.height = this.originalHeight * workflow.zoomfactor; this.height = this.originalHeight * workflow.zoomfactor;

27
workflow/engine/templates/bpmn/MyWorkflow.js
View File

@@ -1854,11 +1854,7 @@ MyWorkflow.prototype.zoom = function(sType)
for(f = 0;f<figures.getSize();f++){ for(f = 0;f<figures.getSize();f++){
var fig = figures.get(f); var fig = figures.get(f);
loadMask.show(); loadMask.show();
if(typeof fig.limitFlag == 'undefined') if(typeof fig.limitFlag == 'undefined'){
fig.limitFlag = true;
if(fig.limitFlag == false){
fig.originalWidth = fig.getWidth();
fig.originalHeight = fig.getHeight();
fig.orgXPos = fig.getX(); fig.orgXPos = fig.getX();
fig.orgYPos = fig.getY(); fig.orgYPos = fig.getY();
fig.orgFontSize =fig.fontSize; fig.orgFontSize =fig.fontSize;
@@ -1869,6 +1865,14 @@ MyWorkflow.prototype.zoom = function(sType)
} }
fig.limitFlag = true; fig.limitFlag = true;
} }
if(fig.limitFlag == false){
fig.originalWidth = fig.getWidth();
fig.originalHeight = fig.getHeight();
fig.limitFlag = true;
}
//If zooming is 100% disable resizing of shapes again //If zooming is 100% disable resizing of shapes again
if(sType == '1'){ if(sType == '1'){
fig.limitFlag = true; fig.limitFlag = true;
@@ -1880,15 +1884,10 @@ MyWorkflow.prototype.zoom = function(sType)
fig.y4 = fig.orgy4Pos *sType; fig.y4 = fig.orgy4Pos *sType;
fig.y5 = fig.orgy5Pos *sType; fig.y5 = fig.orgy5Pos *sType;
} }
if(sType == '1.5' || sType == '2') { var xPos = fig.orgXPos * sType;
var xPos = fig.orgXPos * sType * 0.5; var yPos = fig.orgYPos * sType;
var yPos = fig.orgYPos * sType * 0.5;
}
else {
var xPos = fig.orgXPos * sType;
var yPos = fig.orgYPos * sType;
}
if(fig.type == 'bpmnTask') { if(fig.type == 'bpmnTask') {
fig.fontSize = parseInt(fig.orgFontSize) * sType; fig.fontSize = parseInt(fig.orgFontSize) * sType;
//fig.bpmnText.drawStringRect(fig.taskName, fig.padleft, fig.padtop, fig.rectWidth, fig.rectheight, 'center'); //fig.bpmnText.drawStringRect(fig.taskName, fig.padleft, fig.padtop, fig.rectWidth, fig.rectheight, 'center');