scottk/oopt-gnpy-web-gui
1
0
Fork 0
mirror of https://github.com/Telecominfraproject/oopt-gnpy-web-gui.git synced 2025-10-30 17:47:51 +00:00
Code Issues Packages Projects Releases Wiki Activity

Highlighted color should be uniform and with some glowing effects while selecting multiple fibers

Browse Source
This commit is contained in:
sakv2e10204
2022-06-08 15:16:53 +05:30
parent 7e97b277d0
commit ba11e2f891
3 changed files with 50 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
data/styledata.json
View File

@@ -238,6 +238,13 @@
"fiber_category": "Dual Fiber",
"width": 2,
"options": {
"shadow": {
"enabled": true,
"color": "orange",
"size": 2,
"x": 2,
"y": 2
},
"color": {
"color": "blue",
"highlight": "blue",
@@ -281,6 +288,13 @@
"fiber_category": "Single Fiber",
"width": 2,
"options": {
"shadow": {
"enabled": true,
"color": "orange",
"size": 2,
"x": 2,
"y": 2
},
"w_color": {
"color": "gray",
"highlight": "gray",
@@ -353,6 +367,13 @@
"component_type": "Service",
"width": 2,
"options": {
"shadow": {
"enabled": true,
"color": "orange",
"size": 2,
"x": 2,
"y": 2
},
"color": {
"color": "red",
"highlight": "red",
@@ -398,6 +419,13 @@
"patch_category": "Single Patch",
"width": 2,
"options": {
"shadow": {
"enabled": true,
"color": "orange",
"size": 2,
"x": 2,
"y": 2
},
"color": {
"color": "black",
"highlight": "black",
@@ -442,6 +470,13 @@
"patch_category": "Dual Patch",
"width": 2,
"options": {
"shadow": {
"enabled": true,
"color": "orange",
"size": 2,
"x": 2,
"y": 2
},
"color": {
"color": "black",
"highlight": "black",

10
js/networkgraph/fiber.js
View File

@@ -276,7 +276,7 @@ function addFiberComponent(cmode, cfrom, cto, clabel, ctext, isImport) {
smooth: fiberSmooth,
fiber_type: fiber_Type, span_length: span_Length,
loss_coefficient: loss_Coefficient, connector_in: connector_IN, connector_out: connector_OUT,
span_loss: span_Loss,
span_loss: span_Loss
});
realUpdate();
@@ -865,7 +865,7 @@ function updateSingleFiber(fiberID) {
if (fiberID.length > 1) {
for (var i = 0; i < fiberID.length; i++) {
if (network.body.data.edges.get(fiberID[i].id).color == singleFiberJSON.options.h_color || network.body.data.edges.get(fiberID[i].id).color == singleFiberJSON.options.fh_color) {
if (network.body.data.edges.get(fiberID[i].id).shadow == singleFiberJSON.options.shadow) {
var fiber = network.body.data.edges.get(fiberID[i].id);
preUpdateList.push(fiber);
@@ -940,12 +940,12 @@ function clearSingleFiber() {
function deleteFiber(fiberList) {
removeEdgeList = [];
var h_color;
var shadow;
for (var i = 0; i < fiberList.length; i++) {
if (fiberList.length > 1) {
h_color = network.body.data.edges.get(fiberList[i].id).color;
shadow = network.body.data.edges.get(fiberList[i].id).shadow;
if (h_color == singleFiberJSON.options.h_color || h_color == singleFiberJSON.options.fh_color)
if (shadow == singleFiberJSON.options.shadow)
removeFiber(fiberList[i].id, true);
}

23
js/networkgraph/mynetwork.js
View File

@@ -1058,27 +1058,22 @@ function draw(isImport) {
}
}
if (params.event.srcEvent.ctrlKey) {
var color;
var shadow;
if (edgeDetails.component_type == singleFiberJSON.component_type) {
if (edgeDetails.color == singleFiberJSON.options.h_color || edgeDetails.color == singleFiberJSON.options.fh_color) {
color = edgeDetails.h_color;
var highlight = false;
if (edgeDetails.shadow == singleFiberJSON.options.shadow) {
shadow = [];
}
else {
if (edgeDetails.color == singleFiberJSON.options.w_color)
color = singleFiberJSON.options.h_color;
else if (edgeDetails.color == singleFiberJSON.options.color)
color = singleFiberJSON.options.fh_color;
shadow = singleFiberJSON.options.shadow;
highlight = true;
}
}
if (color) {
var highlight = true;
if (color == singleFiberJSON.options.color || color == singleFiberJSON.options.w_color)
highlight = false;
network.body.data.edges.update({
id: edgeDetails.id, color: color, h_color: edgeDetails.color, is_highlight: highlight
id: edgeDetails.id, shadow: shadow, is_highlight: highlight
});
}
}
}
});
@@ -3418,7 +3413,7 @@ function remove_NodeFiberHighlight() {
});
for (var i = 0; i < hEdges.length; i++) {
network.body.data.edges.update({
id: hEdges[i].id, color: hEdges[i].h_color, h_color: hEdges[i].color, is_highlight: false
id: hEdges[i].id, shadow: [], is_highlight: false
});
}
}