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

showing zoom factor in processmap title,. loading annotation with dotted line

Browse Source
This commit is contained in:
safan
2011-02-26 13:20:18 +00:00
parent 425f400521
commit d724c9041b
4 changed files with 23 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -44,7 +44,7 @@ ArrowLine.prototype.paint=function(){
this.graphics.drawPolyLine(rotX,rotY);
this.graphics.paint();
};
/*
DottedConnection=function(){
ArrowLine.call(this);
this.sourcePort=null;
@@ -112,7 +112,7 @@ this.setStartPoint(this.sourcePort.getAbsoluteX(),this.sourcePort.getAbsoluteY()
this.setEndPoint(this.targetPort.getAbsoluteX(),this.targetPort.getAbsoluteY());
}
};
*/
bpmnAnnotation = function (oWorkflow) {

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

@@ -1846,11 +1846,11 @@ MyWorkflow.prototype.zoom = function(sType)
var lines=workflow.getLines();
var size=lines.getSize();
sType =sType/100;
workflow.zoomfactor = sType;
var figSize = figures.getSize();
loadMask.show();
// loadMask.show();
for(f = 0;f<figures.getSize();f++){
var fig = figures.get(f);
if(typeof fig.limitFlag == 'undefined'){
@@ -1907,7 +1907,7 @@ MyWorkflow.prototype.zoom = function(sType)
fig.orgy5Pos = fig.y5;
}
}
loadMask.hide();
// loadMask.hide();
}
MyWorkflow.prototype.redrawTaskText = function(fig){

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

@@ -380,7 +380,9 @@ InputPort.prototype.onDrop = function (port) {
workflow.saveEvents(workflow.currentSelection);
}
else if(bpmnType.match(/Annotation/)) { //Routing from task to Annotation
_4070.setConnection(new DottedConnection());
newObj = port.parentNode;
newObj.conn = _4070.connection;
preObj = this.workflow.currentSelection;
newObj.actiontype = 'updateText';
this.workflow.saveShape(newObj);
@@ -450,7 +452,9 @@ OutputPort.prototype.onDrop = function (port) {
this.workflow.saveRoute(newObj,preObj);
}
else if(port.parentNode.type.match(/Annotation/)){ //Routing from task to Annotation
_4070.setConnection(new DottedConnection());
newObj = port.parentNode;
newObj.conn = _4070.connection;
preObj = this.workflow.currentSelection;
newObj.actiontype = 'updateText';
this.workflow.saveShape(newObj);
@@ -1039,7 +1043,12 @@ bpmnTask.prototype.addShapes = function (oStore) {
//Assigning values to newShape Object for Saving Task automatically (Async Ajax Call)
newShape.x = xOffset;
newShape.y = yOffset;
var conn = new DecoratedConnection();
if(shape.match(/Annotation/) || oStore.newShapeName.match(/Annotation/))
var conn = new DottedConnection();
else
conn = new DecoratedConnection();
if (newShape.type.match(/Gateway/)) {
conn.setTarget(newShape.getPort("input2"));
conn.setSource(workflow.currentSelection.getPort("output1"));

9
workflow/engine/templates/bpmn/processmap.js
View File

@@ -470,7 +470,7 @@ Ext.onReady ( function() {
width:100,
height:2000,
xtype : "iframepanel",
title : _('ID_PROCESSMAP_TITLE') + ' - ' + pro_title,
title : _('ID_PROCESSMAP_TITLE') + ' - ' + pro_title+ ' (100%)',
frameConfig:{name:'designerFrame', id:'designerFrame'},
defaultSrc : 'designer?PRO_UID=' + pro_uid,
@@ -520,36 +520,43 @@ Ext.onReady ( function() {
items: [{
text : '25%',
handler: function() {
Ext.getCmp('centerPanel').setTitle(_('ID_PROCESSMAP_TITLE') + ' - ' + pro_title + ' (25%)' );
document.getElementById('designerFrame').contentWindow.workflow.zoom('25');
}
},{
text : '50%',
handler: function() {
Ext.getCmp('centerPanel').setTitle(_('ID_PROCESSMAP_TITLE') + ' - ' + pro_title + ' (50%)' );
document.getElementById('designerFrame').contentWindow.workflow.zoom('50');
}
},{
text : '75%',
handler: function() {
Ext.getCmp('centerPanel').setTitle(_('ID_PROCESSMAP_TITLE') + ' - ' + pro_title + ' (75%)' );
document.getElementById('designerFrame').contentWindow.workflow.zoom('75');
}
},{
text : '100%',
handler: function() {
Ext.getCmp('centerPanel').setTitle(_('ID_PROCESSMAP_TITLE') + ' - ' + pro_title + ' (100%)' );
document.getElementById('designerFrame').contentWindow.workflow.zoom('100');
}
},{
text : '125%',
handler: function() {
Ext.getCmp('centerPanel').setTitle(_('ID_PROCESSMAP_TITLE') + ' - ' + pro_title + ' (125%)' );
document.getElementById('designerFrame').contentWindow.workflow.zoom('125');
}
},{
text : '150%',
handler: function() {
Ext.getCmp('centerPanel').setTitle(_('ID_PROCESSMAP_TITLE') + ' - ' + pro_title + ' (150%)' );
document.getElementById('designerFrame').contentWindow.workflow.zoom('150');
}
},{
text : '200%',
handler: function() {
Ext.getCmp('centerPanel').setTitle(_('ID_PROCESSMAP_TITLE') + ' - ' + pro_title + ' (200%)' );
document.getElementById('designerFrame').contentWindow.workflow.zoom('200');
}
}