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

Fixed Zoom positioning on zoom-out and zoom-in

Browse Source
This commit is contained in:
girish
2011-02-25 09:18:39 +00:00
parent d70d3ba0a0
commit 41e44ea6dc
3 changed files with 25 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1789,8 +1789,7 @@ MyWorkflow.prototype.showEventResult = function(btn){
MyWorkflow.prototype.deleteEvent = function(eventObj){
var event_uid = eventObj.id;
if(event_uid != '')
{
if(event_uid != '') {
var urlparams = '?action=deleteEvent&data={"uid":"'+ event_uid +'"}';
Ext.Ajax.request({
url: "processes_Ajax.php"+ urlparams,
@@ -1800,7 +1799,7 @@ MyWorkflow.prototype.deleteEvent = function(eventObj){
Ext.Msg.alert ('Failure');
}
});
}
}
}
MyWorkflow.prototype.getDeleteCriteria = function()
@@ -1821,7 +1820,6 @@ MyWorkflow.prototype.getDeleteCriteria = function()
}
else if(shape.match(/Event/) && shape.match(/End/)){
workflow.currentSelection.actiontype = 'deleteEndEvent';
}
else if(shape.match(/Event/) && shape.match(/Inter/)){
workflow.currentSelection.actiontype = 'deleteInterEvent';
@@ -1855,8 +1853,10 @@ MyWorkflow.prototype.zoom = function(sType)
for(f = 0;f<figures.getSize();f++){
var fig = figures.get(f);
if(typeof fig.limitFlag == 'undefined'){
fig.orgXPos = fig.getX();
fig.orgYPos = fig.getY();
if(typeof fig.orgXPos == 'undefined') {
fig.orgXPos = fig.getX();
fig.orgYPos = fig.getY();
}
fig.orgFontSize =fig.fontSize;
if(fig.boundaryEvent == true){
fig.orgx3Pos = fig.x3;
@@ -1871,7 +1871,6 @@ MyWorkflow.prototype.zoom = function(sType)
fig.limitFlag = true;
}
var width = fig.originalWidth*sType;
var height = fig.originalHeight*sType;
if(fig.boundaryEvent == true) {

10
workflow/engine/templates/bpmn/bpmnShapes.js
View File

@@ -18,6 +18,9 @@ bpmnTask = function (oWorkflow) {
this.originalHeight = 40;
}
this.orgXPos = oWorkflow.orgXPos;
this.orgYPos = oWorkflow.orgYPos;
this.taskName = ''; //It will set the Default Task Name with appropriate count While dragging a task on the canvas
this.html.addClass('x-task');
};
@@ -223,9 +226,10 @@ bpmnTask.prototype.paint = function () {
Figure.prototype.onDragend=function() {
if(typeof workflow.currentSelection != 'undefined' && workflow.currentSelection != null){
var currObj =workflow.currentSelection;
currObj.orgXPos = currObj.getX();
currObj.orgYPos = currObj.getY();
var currObj = workflow.currentSelection;
currObj.orgXPos = eval(currObj.getX()/workflow.zoomfactor);
currObj.orgYPos = eval(currObj.getY()/workflow.zoomfactor);
//setPosition();
if(typeof currObj.id != 'undefined' && currObj.id.length == 32){
switch (currObj.type) {
case 'bpmnTask':

21
workflow/engine/templates/bpmn/designer.js
View File

@@ -870,11 +870,18 @@ Ext.onReady ( function() {
{
var xOffset = workflow.getAbsoluteX();
var yOffset = workflow.getAbsoluteY();
var scrollLeft = workflow.getScrollLeft();
var scrollTop = workflow.getScrollTop();
if(data.name == 'bpmnTask') {
workflow.boundaryEvent = false;
}
if(typeof workflow.zoomfactor == 'undefined') {
workflow.zoomfactor = 1;
}
workflow.task_width='';
workflow.annotationName='Annotation';
workflow.orgXPos = eval(e.xy[0]/workflow.zoomfactor);
workflow.orgYPos = eval(e.xy[1]/workflow.zoomfactor);
NewShape = eval("new "+data.name+"(workflow)");
NewShape.x = e.xy[0];
NewShape.y = e.xy[1];
@@ -896,9 +903,6 @@ Ext.onReady ( function() {
NewShape.mode = 'ddGateway';
workflow.saveShape(NewShape); //Saving Annotations when user drags and drops it
}
var scrollLeft = workflow.getScrollLeft();
var scrollTop = workflow.getScrollTop();
workflow.addFigure(NewShape,e.xy[0]-xOffset+scrollLeft,e.xy[1]-yOffset+scrollTop);
return true;
}
@@ -1015,8 +1019,6 @@ Ext.onReady ( function() {
//Create all shapes
for(var j=0;j< shapeType.length;j++)
{
// _4562.workflow.taskNo=0;
switch(shapeType[j])
{
case 'tasks':
@@ -1044,6 +1046,8 @@ Ext.onReady ( function() {
else {
workflow.task_height = shapes.tasks[k][5];
}
workflow.orgXPos = shapes.tasks[k][2];
workflow.orgYPos = shapes.tasks[k][3];
NewShape = eval("new bpmnTask(workflow)");
NewShape.x = shapes.tasks[k][2];
NewShape.y = shapes.tasks[k][3];
@@ -1069,11 +1073,10 @@ Ext.onReady ( function() {
}
break;
case 'events':
for(var k=0;k<shapes.events.length;k++){
for(var k=0;k<shapes.events.length;k++) {
var srceventtype = shapes.events[k][1];
var tas_uid = shapes.events[k][4];
if(tas_uid != '')
{
if(tas_uid != '') {
NewShape = eval("new "+srceventtype+"(workflow)");
NewShape.x = shapes.events[k][2];
NewShape.y = shapes.events[k][3];
@@ -1083,7 +1086,7 @@ Ext.onReady ( function() {
NewShape.html.id = shapes.events[k][0];
NewShape.id = shapes.events[k][0];
}
else if(tas_uid == ''){
else if(tas_uid == '') {
NewShape = eval("new "+srceventtype+"(workflow)");
NewShape.x = shapes.events[k][2];
NewShape.y = shapes.events[k][3];