Skip to content

Commit f554b2a

Browse files
devhelprdevhelpr
committed
removed unneeded and commented code
1 parent e79e3bc commit f554b2a

File tree

7 files changed

+15
-340
lines changed

7 files changed

+15
-340
lines changed

‎libs/visual-programming-system/src/components/arc-connection.ts‎

Lines changed: 3 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -98,29 +98,10 @@ export class LineConnection<T extends BaseNodeInfo> extends Connection<T> {
9898
}
9999
};
100100

101-
function setPosition(
102-
element: INodeComponent<T>,
103-
x: number,
104-
y: number,
105-
updateConnection = true
106-
) {
101+
function setPosition(element: INodeComponent<T>, x: number, y: number) {
107102
(
108103
element.domElement as unknown as HTMLElement | SVGElement
109104
).style.transform = `translate(${x}px, ${y}px)`;
110-
111-
if (!updateConnection) {
112-
return;
113-
}
114-
115-
// update the connection of this thumb
116-
if (element.parent && element.parent.update) {
117-
element.parent.update(
118-
element.parent,
119-
x + thumbHalfWidth,
120-
y + thumbHalfHeight,
121-
element
122-
);
123-
}
124105
}
125106
const startPointNode = new ThumbConnectionController<T>(
126107
canvas.domElement,
@@ -189,7 +170,7 @@ export class LineConnection<T extends BaseNodeInfo> extends Connection<T> {
189170
// startPointNode.setEnableInteraction();
190171
// }
191172

192-
setPosition(target, x, y, initiator?.nodeType !== NodeType.Connection);
173+
setPosition(target, x, y);
193174
return true;
194175
};
195176
this.svgParent?.domElement.after(startPointNode.nodeComponent.domElement);
@@ -248,13 +229,7 @@ export class LineConnection<T extends BaseNodeInfo> extends Connection<T> {
248229
return false;
249230
}
250231

251-
// if (this.nodeComponent?.endNode && this.nodeComponent?.endNode?.isThumb) {
252-
// endPointNode.setDisableInteraction();
253-
// } else {
254-
// endPointNode.setEnableInteraction();
255-
// }
256-
257-
setPosition(target, x, y, initiator?.nodeType !== NodeType.Connection);
232+
setPosition(target, x, y);
258233
return true;
259234
};
260235
this.svgParent?.domElement.after(endPointNode.nodeComponent.domElement);

‎libs/visual-programming-system/src/components/connection.ts‎

Lines changed: 1 addition & 72 deletions
Original file line numberDiff line numberDiff line change
@@ -396,22 +396,6 @@ export class Connection<T extends BaseNodeInfo> {
396396
elementRect.y - rootY
397397
);
398398

399-
// let parentX = 0;
400-
// let parentY = 0;
401-
// if (this.containerNode) {
402-
// if (this.containerNode && this.containerNode?.getParentedCoordinates) {
403-
// const parentCoordinates =
404-
// this.containerNode?.getParentedCoordinates() ?? {
405-
// x: 0,
406-
// y: 0,
407-
// };
408-
// // parentX = this.containerNode.x ;
409-
// // parentY = this.containerNode.y;
410-
// parentX = parentCoordinates.x;
411-
// parentY = parentCoordinates.y;
412-
// }
413-
// }
414-
415399
const interactionInfoResult = pointerDown<T>(
416400
this.containerNode
417401
? xpos - this.points.beginX
@@ -673,13 +657,6 @@ export class Connection<T extends BaseNodeInfo> {
673657
this.points.cx2 = end.cx;
674658
this.points.cy2 = end.cy;
675659
} else {
676-
// if (initiator.nodeType === NodeType.Connection) {
677-
// if (!connection.startNode && connection.endNode) {
678-
// console.log('CONNECTion without startNode with endNode');
679-
// } else if (connection.startNode && connection.endNode) {
680-
// console.log('CONNECTion with startNode with endNode');
681-
// }
682-
// }
683660
const isStaticStart = connection.startNode?.isStaticPosition ?? false;
684661
const isStaticEnd = connection.endNode?.isStaticPosition ?? false;
685662
const diffC1x = this.points.cx1 - this.points.beginX;
@@ -739,42 +716,12 @@ export class Connection<T extends BaseNodeInfo> {
739716
this.cssClasses.draggingPointerNone
740717
);
741718
}
742-
if (this.nodeComponent?.controlPoints?.length) {
743-
// const { offsetX: startOffsetX, offsetY: startOffsetY } =
744-
// onGetConnectionToThumbOffset(
745-
// ControlAndEndPointNodeType.start,
746-
// this.nodeComponent?.startNodeThumb?.thumbType ??
747-
// (this.nodeComponent.isAnnotationConnection
748-
// ? ThumbType.Center
749-
// : ThumbType.None)
750-
// );
751-
// const { offsetX: endOffsetX, offsetY: endOffsetY } =
752-
// onGetConnectionToThumbOffset(
753-
// ControlAndEndPointNodeType.end,
754-
// this.nodeComponent?.endNodeThumb?.thumbType ??
755-
// (this.nodeComponent.isAnnotationConnection
756-
// ? ThumbType.Center
757-
// : ThumbType.None)
758-
// );
759-
// this.nodeComponent.connectionStartNodeThumb?.update?.(
760-
// this.nodeComponent?.connectionStartNodeThumb,
761-
// this.points.beginX + startOffsetX,
762-
// this.points.beginY + startOffsetY,
763-
// this.nodeComponent
764-
// );
765-
// this.nodeComponent.connectionEndNodeThumb?.update?.(
766-
// this.nodeComponent?.connectionEndNodeThumb,
767-
// this.points.endX + endOffsetX,
768-
// this.points.endY + endOffsetY,
769-
// this.nodeComponent
770-
// );
771-
}
772719
} else if (!skipChecks) {
773720
if (initiator && !initiator.connectionControllerType) {
774721
return false;
775722
}
776723
updateThumbs = true;
777-
// Neem de x en y van de controller-thumb over...
724+
778725
if (initiator && x !== undefined && y !== undefined) {
779726
if (this.nodeComponent?.startNode) {
780727
const start = this.onCalculateControlPoints(
@@ -830,15 +777,6 @@ export class Connection<T extends BaseNodeInfo> {
830777
if (!this.nodeComponent?.startNode) {
831778
this.points.cx1 = this.points.beginX + standardControlPointDistance;
832779
this.points.cy1 = this.points.beginY;
833-
834-
// if (this.nodeComponent) {
835-
// this.nodeComponent.connectionStartNodeThumb?.update?.(
836-
// this.nodeComponent.connectionStartNodeThumb,
837-
// this.points.beginX + startOffsetX,
838-
// this.points.beginY,
839-
// this.nodeComponent
840-
// );
841-
// }
842780
}
843781
} else if (
844782
initiator.connectionControllerType === ConnectionControllerType.c1
@@ -860,15 +798,6 @@ export class Connection<T extends BaseNodeInfo> {
860798
this.points.cx2 = this.points.endX - standardControlPointDistance;
861799
this.points.cy2 = this.points.endY;
862800
}
863-
864-
// if (this.nodeComponent) {
865-
// this.nodeComponent.connectionEndNodeThumb?.update?.(
866-
// this.nodeComponent.connectionEndNodeThumb,
867-
// this.points.endX + (this.nodeComponent?.endNode ? 0 : endOffsetX),
868-
// this.points.endY,
869-
// this.nodeComponent
870-
// );
871-
// }
872801
} else {
873802
return false;
874803
}

‎libs/visual-programming-system/src/components/events/pointer-events.ts‎

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -123,13 +123,7 @@ export const pointerMove = <T extends BaseNodeInfo>(
123123
if (interactionState && element && element.domElement) {
124124
if (element.update) {
125125
if (element.parent && element.parent.nodeType === NodeType.Connection) {
126-
console.log(
127-
'pointermove',
128-
element.nodeType,
129-
element.parent.nodeType,
130-
x,
131-
y
132-
);
126+
// when dragging connection-controller-thumb... pass event through to connection
133127
if (element.parent.update) {
134128
element.parent.update(
135129
element.parent,

‎libs/visual-programming-system/src/components/line-connection.ts‎

Lines changed: 3 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
/* eslint-disable @typescript-eslint/no-unused-vars */
22
import { IBaseFlow } from '../canvas-app/base-flow';
3-
import { thumbHalfWidth, thumbHalfHeight } from '../constants/measures';
43
import { CanvasAction } from '../enums/canvas-action';
54
import { InteractionStateMachine } from '../interaction-state-machine';
65
import {
@@ -90,29 +89,10 @@ export class LineConnection<T extends BaseNodeInfo> extends Connection<T> {
9089
}
9190
};
9291

93-
function setPosition(
94-
element: INodeComponent<T>,
95-
x: number,
96-
y: number,
97-
updateConnection = true
98-
) {
92+
function setPosition(element: INodeComponent<T>, x: number, y: number) {
9993
(
10094
element.domElement as unknown as HTMLElement | SVGElement
10195
).style.transform = `translate(${x}px, ${y}px)`;
102-
103-
if (!updateConnection) {
104-
return;
105-
}
106-
107-
// update the connection of this thumb
108-
if (element.parent && element.parent.update) {
109-
element.parent.update(
110-
element.parent,
111-
x + thumbHalfWidth,
112-
y + thumbHalfHeight,
113-
element
114-
);
115-
}
11696
}
11797
const startPointNode = new ThumbConnectionController<T>(
11898
canvas.domElement,
@@ -173,16 +153,7 @@ export class LineConnection<T extends BaseNodeInfo> extends Connection<T> {
173153
return false;
174154
}
175155

176-
// if (
177-
// this.nodeComponent?.startNode &&
178-
// this.nodeComponent?.startNode?.isThumb
179-
// ) {
180-
// startPointNode.setDisableInteraction();
181-
// } else {
182-
// startPointNode.setEnableInteraction();
183-
// }
184-
185-
setPosition(target, x, y, initiator?.nodeType !== NodeType.Connection);
156+
setPosition(target, x, y);
186157
return true;
187158
};
188159
this.svgParent?.domElement.after(startPointNode.nodeComponent.domElement);
@@ -242,13 +213,7 @@ export class LineConnection<T extends BaseNodeInfo> extends Connection<T> {
242213
return false;
243214
}
244215

245-
// if (this.nodeComponent?.endNode && this.nodeComponent?.endNode?.isThumb) {
246-
// endPointNode.setDisableInteraction();
247-
// } else {
248-
// endPointNode.setEnableInteraction();
249-
// }
250-
251-
setPosition(target, x, y, initiator?.nodeType !== NodeType.Connection);
216+
setPosition(target, x, y);
252217
return true;
253218
};
254219
this.svgParent?.domElement.after(endPointNode.nodeComponent.domElement);

‎libs/visual-programming-system/src/components/quadratic-bezier-connection.ts‎

Lines changed: 4 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
/* eslint-disable @typescript-eslint/no-unused-vars */
2-
import { thumbHalfWidth, thumbHalfHeight } from '../constants/measures';
32
import { CanvasAction } from '../enums/canvas-action';
43
import { InteractionStateMachine } from '../interaction-state-machine';
54
import {
@@ -99,29 +98,10 @@ export class QuadraticBezierConnection<
9998
});
10099
};
101100

102-
function setPosition(
103-
element: INodeComponent<T>,
104-
x: number,
105-
y: number,
106-
updateConnection = true
107-
) {
101+
function setPosition(element: INodeComponent<T>, x: number, y: number) {
108102
(
109103
element.domElement as unknown as HTMLElement | SVGElement
110104
).style.transform = `translate(${x}px, ${y}px)`;
111-
112-
if (!updateConnection) {
113-
return;
114-
}
115-
116-
// update the connection of this thumb
117-
if (element.parent && element.parent.update) {
118-
element.parent.update(
119-
element.parent,
120-
x + thumbHalfWidth,
121-
y + thumbHalfHeight,
122-
element
123-
);
124-
}
125105
}
126106
const startPointNode = new ThumbConnectionController<T>(
127107
canvas.domElement,
@@ -180,11 +160,8 @@ export class QuadraticBezierConnection<
180160
if (!target || x === undefined || y === undefined || !initiator) {
181161
return false;
182162
}
183-
// if (this.nodeComponent?.startNode) {
184-
// startPointNode.setDisableInteraction();
185-
// }
186163

187-
setPosition(target, x, y, initiator?.nodeType !== NodeType.Connection);
164+
setPosition(target, x, y);
188165
return true;
189166
};
190167
this.svgParent?.domElement.after(startPointNode.nodeComponent.domElement);
@@ -239,35 +216,18 @@ export class QuadraticBezierConnection<
239216
y?: number,
240217
initiator?: INodeComponent<T>
241218
) => {
242-
console.log('endPointNode quadratic update', target, x, y, initiator);
243219
if (!target || x === undefined || y === undefined || !initiator) {
244220
return false;
245221
}
246-
//console.log('endPointNode.nodeComponent.update', x, y);
247-
// if (this.nodeComponent?.endNode) {
248-
// endPointNode.setDisableInteraction();
249-
// }
250-
setPosition(target, x, y, initiator?.nodeType !== NodeType.Connection);
222+
223+
setPosition(target, x, y);
251224
return true;
252225
};
253226
this.svgParent?.domElement.after(endPointNode.nodeComponent.domElement);
254227

255228
this.nodeComponent.connectionStartNodeThumb = startPointNode.nodeComponent;
256229
this.nodeComponent.connectionEndNodeThumb = endPointNode.nodeComponent;
257230

258-
// createEffect(() => {
259-
// const visibility = getVisbility(); //&& selectedNode && selectedNode === connection.id;
260-
// if (!startPointNode.nodeComponent || !endPointNode.nodeComponent) {
261-
// return;
262-
// }
263-
// (
264-
// startPointNode.nodeComponent.domElement as unknown as SVGElement
265-
// ).style.display = visibility ? 'block' : 'none';
266-
// (
267-
// endPointNode.nodeComponent.domElement as unknown as SVGElement
268-
// ).style.display = visibility ? 'block' : 'none';
269-
// });
270-
271231
this.startPointElement = startPointNode.nodeComponent;
272232
this.endPointElement = endPointNode.nodeComponent;
273233
}

‎libs/visual-programming-system/src/components/qubic-bezier-connection.ts‎

Lines changed: 3 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
/* eslint-disable @typescript-eslint/no-unused-vars */
22
import { IBaseFlow } from '../canvas-app/base-flow';
3-
import { thumbHalfHeight, thumbHalfWidth } from '../constants/measures';
43
import { CanvasAction } from '../enums/canvas-action';
54
import { InteractionStateMachine } from '../interaction-state-machine';
65
import {
@@ -94,29 +93,10 @@ export class CubicBezierConnection<
9493
}
9594
};
9695

97-
function setPosition(
98-
element: INodeComponent<T>,
99-
x: number,
100-
y: number,
101-
updateConnection = true
102-
) {
96+
function setPosition(element: INodeComponent<T>, x: number, y: number) {
10397
(
10498
element.domElement as unknown as HTMLElement | SVGElement
10599
).style.transform = `translate(${x}px, ${y}px)`;
106-
107-
if (!updateConnection) {
108-
return;
109-
}
110-
111-
// update the connection of this thumb
112-
if (element.parent && element.parent.update) {
113-
element.parent.update(
114-
element.parent,
115-
x + thumbHalfWidth,
116-
y + thumbHalfHeight,
117-
element
118-
);
119-
}
120100
}
121101
const startPointNode = new ThumbConnectionController<T>(
122102
canvas.domElement,
@@ -166,7 +146,7 @@ export class CubicBezierConnection<
166146
if (!target || x === undefined || y === undefined || !initiator) {
167147
return false;
168148
}
169-
setPosition(target, x, y, initiator?.nodeType !== NodeType.Connection);
149+
setPosition(target, x, y);
170150
return true;
171151
};
172152
this.nodeComponent.connectionStartNodeThumb = startPointNode.nodeComponent;
@@ -223,7 +203,7 @@ export class CubicBezierConnection<
223203
if (!target || x === undefined || y === undefined || !initiator) {
224204
return false;
225205
}
226-
setPosition(target, x, y, initiator?.nodeType !== NodeType.Connection);
206+
setPosition(target, x, y);
227207
return true;
228208
};
229209
this.svgParent?.domElement.after(endPointNode.nodeComponent.domElement);

0 commit comments

Comments
 (0)