KingOfDog/fsm-designer
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Connections adjust themselves when they are on the same place

Browse Source
This commit is contained in:
Marcel 2019-04-03 17:53:36 +02:00
parent 23c24ded96
commit 0e2d560b03
2 changed files with 39 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
js/fsm-document.js
View File

@ -86,6 +86,14 @@ class FSMDocument {
} }
} }
getConnectionsOfState(state) {
return this.connections.filter(connection => connection instanceof Connection && (connection.stateA === state || connection.stateB === state));
}
getConnectionsBetweenStates(stateA,stateB) {
return this.getConnectionsOfState(stateA).filter(connection => connection.stateA === stateB || connection.stateB === stateB);
}
addChange(objectType, id, action, fields, oldValues, tryCombiningChanges) { addChange(objectType, id, action, fields, oldValues, tryCombiningChanges) {
if (this.changesIndex < this.changes.length - 1) { if (this.changesIndex < this.changes.length - 1) {
this.changes.splice(this.changesIndex + 1, this.changes.length - this.changesIndex - 1); this.changes.splice(this.changesIndex + 1, this.changes.length - this.changesIndex - 1);

36
js/main.js
View File

@ -334,13 +334,13 @@ canvas.addEventListener('mousemove', (event) => {
if (movingObject) { if (movingObject) {
if (selectedObject instanceof State) { if (selectedObject instanceof State) {
if(ctrlPressed || event.ctrlKey) { if (ctrlPressed || event.ctrlKey) {
const prevX = changedValues[0]; const prevX = changedValues[0];
const prevY = changedValues[1]; const prevY = changedValues[1];
selectedObject.setAnchorPoint(mouse.x, mouse.y); selectedObject.setAnchorPoint(mouse.x, mouse.y);
const deltaX = Math.abs(selectedObject.x - prevX); const deltaX = Math.abs(selectedObject.x - prevX);
const deltaY = Math.abs(selectedObject.y - prevY); const deltaY = Math.abs(selectedObject.y - prevY);
if(deltaX > deltaY) { if (deltaX > deltaY) {
selectedObject.y = prevY; selectedObject.y = prevY;
} else { } else {
selectedObject.x = prevX; selectedObject.x = prevX;
@ -360,12 +360,8 @@ document.addEventListener('mouseup', () => {
movingObject = false; movingObject = false;
if (!!selectedObject && activeDocument !== null) { if (!!selectedObject && activeDocument !== null) {
if (selectedObject instanceof State) {
documents[activeDocument].addChange('state', selectedObject.id, 'edit', changedKeys, changedValues);
} else if (selectedObject instanceof Connection || selectedObject instanceof SelfConnection || selectedObject instanceof StartConnection) {
documents[activeDocument].addChange(selectedObject.constructor.name.toLowerCase(), selectedObject.id, 'edit', changedKeys, changedValues); documents[activeDocument].addChange(selectedObject.constructor.name.toLowerCase(), selectedObject.id, 'edit', changedKeys, changedValues);
} }
}
if (!!currentConnection && activeDocument !== null) { if (!!currentConnection && activeDocument !== null) {
if (!(currentConnection instanceof TemporaryConnection)) { if (!(currentConnection instanceof TemporaryConnection)) {
@ -373,6 +369,34 @@ document.addEventListener('mouseup', () => {
documents[activeDocument].connections.push(currentConnection); documents[activeDocument].connections.push(currentConnection);
resetCaret(); resetCaret();
if (currentConnection instanceof Connection) {
const parallelPart = currentConnection.parallelPart;
const perpendicularPart = currentConnection.perpendicularPart;
const connections = documents[activeDocument].getConnectionsBetweenStates(currentConnection.stateA, currentConnection.stateB).filter(conn => {
return conn.parallelPart === parallelPart && conn.perpendicularPart === perpendicularPart;
});
if (connections.length > 1) {
let cx = (currentConnection.stateB.x + currentConnection.stateA.x) / 2;
let cy = (currentConnection.stateB.y + currentConnection.stateA.y) / 2;
const dx = currentConnection.stateB.x - currentConnection.stateA.x;
const dy = currentConnection.stateB.y - currentConnection.stateA.y;
const factorX = Math.sin(dx);
const factorY = Math.cos(dy);
const step = Math.sqrt(dx ** 2 + dy ** 2) * .25;
cx -= (connections.length / 2 - .5) * step * factorX;
cy -= (connections.length / 2 - .5) * step * factorY;
connections.forEach(connection => {
connection.setAnchorPoint(cx, cy);
cx += step * factorX;
cy += step * factorY;
});
}
}
documents[activeDocument].addChange(selectedObject.constructor.name.toLowerCase(), selectedObject.id, 'add', Object.keys(selectedObject), Object.values(selectedObject)) documents[activeDocument].addChange(selectedObject.constructor.name.toLowerCase(), selectedObject.id, 'add', Object.keys(selectedObject), Object.values(selectedObject))
} }
currentConnection = null; currentConnection = null;