Backup_Repos/jsketcher
1
0
Fork 0
mirror of https://github.com/xibyte/jsketcher synced 2025-12-11 02:45:52 +01:00
Code Issues Projects Releases Wiki Activity

fix light checkpoint for dragging

Browse source
This commit is contained in:
Val Erastov 2015-07-15 22:23:38 -07:00
parent 7833d4b827
commit 2949f89c09
1 changed files with 11 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
web/app/sketcher/canvas.js
View file

@ -691,8 +691,8 @@ TCAD.TWO.ToolManager.prototype.getTool = function() {
TCAD.TWO.PanTool = function(viewer) {
this.viewer = viewer;
this.dragging = false;
this.originX = this.x = 0.0;
this.originY = this.y = 0.0;
this.x = 0.0;
this.y = 0.0;
};
TCAD.TWO.PanTool.prototype.keydown = function(e) {};
@ -739,8 +739,8 @@ TCAD.TWO.PanTool.prototype.mousedown = function(e) {
this.dragging = true;
this.deselectOnUp = true;
this.originX = this.x = e.pageX;
this.originY = this.y = e.pageY;
this.x = e.pageX;
this.y = e.pageY;
};
TCAD.TWO.PanTool.prototype.mouseup = function(e) {
@ -750,10 +750,6 @@ TCAD.TWO.PanTool.prototype.mouseup = function(e) {
this.viewer.refresh();
}
this.deselectOnUp = false;
var traveled = TCAD.math.distance(this.originX, this.x, this.originY, this.y);
if (traveled > 10) {
this.viewer.historyManager.lightCheckpoint(10);
}
};
TCAD.TWO.PanTool.prototype.mousewheel = function(e) {
@ -787,6 +783,7 @@ TCAD.TWO.DragTool = function(obj, viewer) {
this.obj = obj;
this.viewer = viewer;
this._point = {x: 0, y: 0};
this.origin = {x: 0, y: 0};
this.ref = this.obj.getReferencePoint();
this.errorX = 0;
this.errorY = 0;
@ -821,6 +818,8 @@ TCAD.TWO.DragTool.prototype.mousemove = function(e) {
};
TCAD.TWO.DragTool.prototype.mousedown = function(e) {
this.origin.x = e.x;
this.origin.y = e.y;
this.viewer.screenToModel2(e.x, e.y, this._point);
this.prepareSolver();
};
@ -829,6 +828,10 @@ TCAD.TWO.DragTool.prototype.mouseup = function(e) {
this.solveRequest(false);
this.viewer.refresh();
this.viewer.toolManager.releaseControl();
var traveled = TCAD.math.distance(this.origin.x, this.origin.y, e.x, e.y);
if (traveled >= 10) {
this.viewer.historyManager.lightCheckpoint(10);
}
};
TCAD.TWO.DragTool.prototype.mousewheel = function(e) {