Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Add flag for enabling node moving in network area diagram viewer #80

Merged
merged 1 commit into from
Jul 19, 2024
Merged

Add flag for enabling node moving in network area diagram viewer #80

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 3 additions & 1 deletion demo/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,12 +22,14 @@
<div id="root"></div>
<div class="break"></div>
<div id="svg-container-nad"></div>
<div id="svg-container-nad-pst-hvdc"></div>
<div id="svg-container-nad-no-moving"></div>
<div class="break"></div>
<div id="svg-container-nad-multibus-vlnodes"></div>
<div id="svg-container-nad-multibus-vlnodes14"></div>
<div class="break"></div>
<div id="svg-container-nad-pst-hvdc"></div>
<div id="svg-container-nad-threewt-dl-ub"></div>
<div class="break"></div>
<div id="svg-container-nad-partial-network"></div>
<div class="break"></div>
<div id="svg-container-sld"></div>
Expand Down
44 changes: 35 additions & 9 deletions demo/src/diagram-viewers/add-diagrams.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,8 @@ export const addNadToDemo = () => {
600,
1000,
1200,
handleNodeMove
handleNodeMove,
true
);

document
Expand All @@ -39,21 +40,22 @@ export const addNadToDemo = () => {
.setAttribute('style', 'border:2px; border-style:solid;');
});

fetch(NadSvgPstHvdcExample)
fetch(NadSvgExample)
.then((response) => response.text())
.then((svgContent) => {
new NetworkAreaDiagramViewer(
document.getElementById('svg-container-nad-pst-hvdc'),
document.getElementById('svg-container-nad-no-moving'),
svgContent,
500,
600,
1000,
1200,
handleNodeMove
handleNodeMove,
false
);

document
.getElementById('svg-container-nad-pst-hvdc')
.getElementById('svg-container-nad-no-moving')
.getElementsByTagName('svg')[0]
.setAttribute('style', 'border:2px; border-style:solid;');
});
Expand All @@ -68,7 +70,8 @@ export const addNadToDemo = () => {
600,
1000,
1200,
handleNodeMove
handleNodeMove,
true
);

document
Expand All @@ -87,7 +90,8 @@ export const addNadToDemo = () => {
600,
1000,
1200,
handleNodeMove
handleNodeMove,
true
);

document
Expand All @@ -96,6 +100,26 @@ export const addNadToDemo = () => {
.setAttribute('style', 'border:2px; border-style:solid;');
});

fetch(NadSvgPstHvdcExample)
.then((response) => response.text())
.then((svgContent) => {
new NetworkAreaDiagramViewer(
document.getElementById('svg-container-nad-pst-hvdc'),
svgContent,
500,
600,
1000,
1200,
handleNodeMove,
true
);

document
.getElementById('svg-container-nad-pst-hvdc')
.getElementsByTagName('svg')[0]
.setAttribute('style', 'border:2px; border-style:solid;');
});

fetch(NadSvgTrheeWTDanglingLineUnknownBusExample)
.then((response) => response.text())
.then((svgContent) => {
Expand All @@ -106,7 +130,8 @@ export const addNadToDemo = () => {
600,
1000,
1200,
handleNodeMove
handleNodeMove,
true
);

document
Expand All @@ -125,7 +150,8 @@ export const addNadToDemo = () => {
600,
1000,
1200,
handleNodeMove
handleNodeMove,
true
);

document
Expand Down
3 changes: 2 additions & 1 deletion src/components/network-area-diagram-viewer/network-area-diagram-viewer.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,8 @@ describe('Test network-area-diagram-viewer.ts', () => {
0,
0,
0,
null
null,
false
);

expect(container.getElementsByTagName('svg').length).toBe(0);
Expand Down
34 changes: 19 additions & 15 deletions src/components/network-area-diagram-viewer/network-area-diagram-viewer.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,15 +46,16 @@ export class NetworkAreaDiagramViewer {
minHeight: number,
maxWidth: number,
maxHeight: number,
onNodeCallback: OnMoveNodeCallbackType | null
onNodeCallback: OnMoveNodeCallbackType | null,
enableNodeMoving: boolean
) {
this.container = container;
this.svgContent = svgContent;
this.width = 0;
this.height = 0;
this.originalWidth = 0;
this.originalHeight = 0;
this.init(minWidth, minHeight, maxWidth, maxHeight);
this.init(minWidth, minHeight, maxWidth, maxHeight, enableNodeMoving);
this.svgParameters = this.getSvgParameters();
this.onNodeCallback = onNodeCallback;
}
Expand Down Expand Up @@ -121,7 +122,8 @@ export class NetworkAreaDiagramViewer {
minWidth: number,
minHeight: number,
maxWidth: number,
maxHeight: number
maxHeight: number,
enableNodeMoving: boolean
): void {
if (!this.container || !this.svgContent) {
return;
Expand Down Expand Up @@ -165,18 +167,20 @@ export class NetworkAreaDiagramViewer {
drawnSvg.style.overflow = 'visible';

// add events
this.svgDraw.on('mousedown', (e: Event) => {
this.startDrag(e);
});
this.svgDraw.on('mousemove', (e: Event) => {
this.drag(e);
});
this.svgDraw.on('mouseup', (e: Event) => {
this.endDrag(e);
});
this.svgDraw.on('mouseleave', (e: Event) => {
this.endDrag(e);
});
if (enableNodeMoving) {
this.svgDraw.on('mousedown', (e: Event) => {
this.startDrag(e);
});
this.svgDraw.on('mousemove', (e: Event) => {
this.drag(e);
});
this.svgDraw.on('mouseup', (e: Event) => {
this.endDrag(e);
});
this.svgDraw.on('mouseleave', (e: Event) => {
this.endDrag(e);
});
}
this.svgDraw.on('panStart', function () {
if (drawnSvg.parentElement != undefined) {
drawnSvg.parentElement.style.cursor = 'move';
Expand Down