mirror of
https://bitbucket.org/wisemapping/wisemapping-frontend.git
synced 2024-11-10 17:33:24 +01:00
Improve control point code.
This commit is contained in:
parent
5dffa99835
commit
bd9b73048a
@ -38,13 +38,11 @@ class ControlPoint {
|
|||||||
|
|
||||||
private _workspace: Workspace;
|
private _workspace: Workspace;
|
||||||
|
|
||||||
// eslint-disable-next-line no-use-before-define
|
|
||||||
private _endPoint: PositionType[];
|
private _endPoint: PositionType[];
|
||||||
|
|
||||||
// eslint-disable-next-line no-use-before-define
|
|
||||||
private _orignalCtrlPoint: PositionType[];
|
private _orignalCtrlPoint: PositionType[];
|
||||||
|
|
||||||
private _controls: number;
|
private _controls: PositionType[];
|
||||||
|
|
||||||
private _mouseMoveFunction: (e: Event) => void;
|
private _mouseMoveFunction: (e: Event) => void;
|
||||||
|
|
||||||
@ -76,25 +74,24 @@ class ControlPoint {
|
|||||||
];
|
];
|
||||||
|
|
||||||
this._isBinded = false;
|
this._isBinded = false;
|
||||||
const me = this;
|
this._controlPointsController[0].addEvent('mousedown', (event: MouseEvent) => {
|
||||||
this._controlPointsController[0].addEvent('mousedown', (event) => {
|
this._mouseDown(event, ControlPoint.FROM);
|
||||||
me._mouseDown(event, ControlPoint.FROM, me);
|
|
||||||
});
|
});
|
||||||
this._controlPointsController[0].addEvent('click', (event) => {
|
this._controlPointsController[0].addEvent('click', (event: MouseEvent) => {
|
||||||
me._mouseClick(event);
|
this._mouseClick(event);
|
||||||
});
|
});
|
||||||
this._controlPointsController[0].addEvent('dblclick', (event) => {
|
this._controlPointsController[0].addEvent('dblclick', (event: MouseEvent) => {
|
||||||
me._mouseClick(event);
|
this._mouseClick(event);
|
||||||
});
|
});
|
||||||
|
|
||||||
this._controlPointsController[1].addEvent('mousedown', (event) => {
|
this._controlPointsController[1].addEvent('mousedown', (event: MouseEvent) => {
|
||||||
me._mouseDown(event, ControlPoint.TO, me);
|
this._mouseDown(event, ControlPoint.TO);
|
||||||
});
|
});
|
||||||
this._controlPointsController[1].addEvent('click', (event) => {
|
this._controlPointsController[1].addEvent('click', (event: MouseEvent) => {
|
||||||
me._mouseClick(event);
|
this._mouseClick(event);
|
||||||
});
|
});
|
||||||
this._controlPointsController[1].addEvent('dblclick', (event) => {
|
this._controlPointsController[1].addEvent('dblclick', (event: MouseEvent) => {
|
||||||
me._mouseClick(event);
|
this._mouseClick(event);
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -106,10 +103,11 @@ class ControlPoint {
|
|||||||
this._createControlPoint();
|
this._createControlPoint();
|
||||||
this._endPoint = [];
|
this._endPoint = [];
|
||||||
this._orignalCtrlPoint = [];
|
this._orignalCtrlPoint = [];
|
||||||
this._orignalCtrlPoint[0] = { ...this._controls[0] };
|
|
||||||
this._orignalCtrlPoint[1] = { ...this._controls[1] };
|
[this._orignalCtrlPoint[0], this._orignalCtrlPoint[1]] = this._controls;
|
||||||
this._endPoint[0] = { ...this._line.getLine().getFrom() };
|
|
||||||
this._endPoint[1] = { ...this._line.getLine().getTo() };
|
this._endPoint[0] = this._line.getLine().getFrom() as PositionType;
|
||||||
|
this._endPoint[1] = this._line.getLine().getTo() as PositionType;
|
||||||
}
|
}
|
||||||
|
|
||||||
setControlPointTestId(ctrlPoint1, ctrlPoint2) {
|
setControlPointTestId(ctrlPoint1, ctrlPoint2) {
|
||||||
@ -118,7 +116,9 @@ class ControlPoint {
|
|||||||
}
|
}
|
||||||
|
|
||||||
redraw() {
|
redraw() {
|
||||||
if ($defined(this._line)) this._createControlPoint();
|
if (this._line) {
|
||||||
|
this._createControlPoint();
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
private _createControlPoint() {
|
private _createControlPoint() {
|
||||||
@ -152,16 +152,16 @@ class ControlPoint {
|
|||||||
// Overwrite default behaviour ...
|
// Overwrite default behaviour ...
|
||||||
}
|
}
|
||||||
|
|
||||||
private _mouseDown(event: Event, point, me) {
|
private _mouseDown(event: MouseEvent, point: number) {
|
||||||
if (!this._isBinded) {
|
if (!this._isBinded) {
|
||||||
this._isBinded = true;
|
this._isBinded = true;
|
||||||
this._mouseMoveFunction = (e) => {
|
this._mouseMoveFunction = (e: MouseEvent) => {
|
||||||
me._mouseMoveEvent(e, point, me);
|
this._mouseMoveEvent(e, point);
|
||||||
};
|
};
|
||||||
|
|
||||||
this._workspace.getScreenManager().addEvent('mousemove', this._mouseMoveFunction);
|
this._workspace.getScreenManager().addEvent('mousemove', this._mouseMoveFunction);
|
||||||
this._mouseUpFunction = (e: Event) => {
|
this._mouseUpFunction = (e: MouseEvent) => {
|
||||||
me._mouseUp(e, point, me);
|
this._mouseUp(e, point);
|
||||||
};
|
};
|
||||||
this._workspace.getScreenManager().addEvent('mouseup', this._mouseUpFunction);
|
this._workspace.getScreenManager().addEvent('mouseup', this._mouseUpFunction);
|
||||||
}
|
}
|
||||||
@ -170,7 +170,7 @@ class ControlPoint {
|
|||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
private _mouseMoveEvent(event: MouseEvent, point: Point) {
|
private _mouseMoveEvent(event: MouseEvent, point: number) {
|
||||||
const screen = this._workspace.getScreenManager();
|
const screen = this._workspace.getScreenManager();
|
||||||
const pos = screen.getWorkspaceMousePosition(event);
|
const pos = screen.getWorkspaceMousePosition(event);
|
||||||
|
|
||||||
@ -202,7 +202,7 @@ class ControlPoint {
|
|||||||
this._isBinded = false;
|
this._isBinded = false;
|
||||||
}
|
}
|
||||||
|
|
||||||
_mouseClick(event: MouseEvent) {
|
private _mouseClick(event: MouseEvent) {
|
||||||
event.preventDefault();
|
event.preventDefault();
|
||||||
event.stopPropagation();
|
event.stopPropagation();
|
||||||
return false;
|
return false;
|
||||||
@ -237,7 +237,7 @@ class ControlPoint {
|
|||||||
workspace.removeChild(this._controlLines[1]);
|
workspace.removeChild(this._controlLines[1]);
|
||||||
}
|
}
|
||||||
|
|
||||||
getControlPoint(index: number): ControlPoint {
|
getControlPoint(index: number): PositionType {
|
||||||
return this._controls[index];
|
return this._controls[index];
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user