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

Drag view and navigation buttons view updated

Browse Source
This commit is contained in:
sakv2e10204
2022-04-08 18:10:37 +05:30
parent bed660d91b
commit 86d2da34f3
12 changed files with 98 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
TelecomInfraProject-V1/.vs/TelecomInfraProject/DesignTimeBuild/.dtbcache.v2
View File

Binary file not shown.

BIN
TelecomInfraProject-V1/.vs/TelecomInfraProject/v16/.suo
View File

Binary file not shown.

BIN
TelecomInfraProject-V1/TelecomInfraProject/obj/Release/netcoreapp2.2/PubTmp/Out/TelecomInfraProject.Views.dll
View File

Binary file not shown.

BIN
TelecomInfraProject-V1/TelecomInfraProject/obj/Release/netcoreapp2.2/PubTmp/Out/TelecomInfraProject.Views.pdb
View File

Binary file not shown.

BIN
TelecomInfraProject-V1/TelecomInfraProject/obj/Release/netcoreapp2.2/PubTmp/Out/wwwroot/Assets/img/minus.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 267 B

BIN
TelecomInfraProject-V1/TelecomInfraProject/obj/Release/netcoreapp2.2/PubTmp/Out/wwwroot/Assets/img/plus.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 301 B

26
TelecomInfraProject-V1/TelecomInfraProject/obj/Release/netcoreapp2.2/PubTmp/Out/wwwroot/css/Style.css
View File

@@ -1932,3 +1932,29 @@ select {
.input_error{
border:solid 1px red;
}
.input_customwidth {
height: 35px;
border: 1px solid #d5ced4aa;
width: 60px;
margin-top: 5px;
}
.minus {
margin-right: 5px;
height: 35px;
margin-top: 5px;
cursor: pointer;
}
.plus {
margin-left: 5px;
height: 35px;
margin-top: 5px;
cursor:pointer;
}
.width_custom {
color: #2b7c80;
margin-top: 10px;
margin-right: 5px;
width: 30px;
cursor:pointer;
}

86
TelecomInfraProject-V1/TelecomInfraProject/obj/Release/netcoreapp2.2/PubTmp/Out/wwwroot/js/Network Graph/stylenetwork.js
View File

@@ -595,7 +595,24 @@ $(document).ready(function () {
//alert();
}
});
$('#txth, #txtw').change(function () {
changeWorkAreaWH($(this).attr('id'));
});
$('.minus').click(function () {
var $input = $(this).parent().find('input');
var count = parseInt($input.val()) - 50;
count = count < 1 ? 1 : count;
$input.val(count);
$input.change();
return false;
});
$('.plus').click(function () {
var $input = $(this).parent().find('input');
$input.val(parseInt($input.val()) + 50);
$input.change();
return false;
});
});
function networkView(view) {
@@ -1062,7 +1079,6 @@ function destroy() {
network = null;
}
}
var options;
function draw(isImport) {
//destroy();
//nodes = [];
@@ -1131,9 +1147,6 @@ function draw(isImport) {
}
}
//var width = window.innerWidth;
//var height = window.innerHeight;
var iteration = data.nodes.length + data.edges.length;
options = {
//width: width,
@@ -1202,9 +1215,21 @@ function draw(isImport) {
},
};
network = new vis.Network(container, data, options);
$('canvas').css('width', '');
$('canvas').css('height', '');
$('canvas').css('border', '1px solid lightgray');
$('*.vis-network').css('overflow', 'auto');
$("canvas").prop('width', $('canvas').width()-2);
$("canvas").prop('height', $('canvas').height()-2);
$("#txtw").val($('canvas').width());
$("#txth").val($('canvas').height());
network.on("click", function (params) {
//$("#txtX").val(params.pointer.canvas.x);
//$("#txtY").val(params.pointer.canvas.y);
//$("#txtx").val(params.pointer.canvas.x);
//$("#txty").val(params.pointer.canvas.y);
//alert(params.pointer.canvas.x+' , '+ params.pointer.canvas.y);
$("#hoverDiv").hide();
//console.log(params.pointer.canvas.x, params.pointer.canvas.y);
});
@@ -4699,7 +4724,7 @@ function singleFiberInsertNode(fiberID, node_type, callback) {
category: nodeDetails.default.category
});
}
data.nodes.off("*", change_history_back);
data.edges.off("*", change_history_back);
@@ -4943,7 +4968,7 @@ function updateRoadm(nodeID) {
$(removeID).remove();
}
else {
if (roadmtype != "")
if (roadmtype)
removeSpanInError(id, true);
}
@@ -5117,13 +5142,16 @@ function updateAmplifier(nodeID) {
toCount++;
}
if (fromCount == 1 && toCount == 1) {
removeID = "#spanTF" + id.replace(/\s/g, '');
$(removeID).remove();
if (amptype != "")
if (amptype) {
removeSpanInError(id, true);
}
}
else {
if (amptype) {
removeID = "#spanTF" + id.replace(/\s/g, '');
$(removeID).remove();
}
}
clearAmplifier();
@@ -5170,7 +5198,7 @@ function updateRamanAmp(nodeID) {
id: id, label: label, amp_type: $("#ddlRamanAmpType").val(), category: $("#ddlRamanAmpCategory").val()
});
var amptype = $("#ddlAmplifierType").val();
var amptype = $("#ddlRamanAmpType").val();
var connectedEdges;
var fromCount;
var toCount;
@@ -5186,11 +5214,16 @@ function updateRamanAmp(nodeID) {
}
if (fromCount == 1 && toCount == 1) {
removeID = "#spanTF" + id.replace(/\s/g, '');
$(removeID).remove();
if (amptype != "")
if (amptype) {
removeSpanInError(id, true);
}
}
else {
if (amptype) {
removeID = "#spanTF" + id.replace(/\s/g, '');
$(removeID).remove();
}
}
clearRamanAmp();
@@ -6623,27 +6656,27 @@ function checkTypeForce() {
$.each(transList, function (index, item) {
if (item.node_type == transceiverJSON.node_type) {
if (item.transceiver_type == "") {
if (!item.transceiver_type) {
msg.push('<p class="focusNode" title="Click here to focus the node" id=\'spanTF' + item.id.replace(/\s/g, '') + '\' onClick="focusNode(\'' + item.id + '\')"><img width="25" src="./Assets/img/error-listing-icon.png"> <b>' + item.label + '</b> - ' + transceiverJSON.node_type + ' type not entered by the user.</p>');
flag = true;
}
}
else if (item.node_type == roadmJSON.node_type) {
if (item.roadm_type == "") {
if (!item.roadm_type) {
msg.push('<p class="focusNode" title="Click here to focus the node" id=\'spanTF' + item.id.replace(/\s/g, '') + '\' onClick="focusNode(\'' + item.id + '\')"><img width="25" src="./Assets/img/error-listing-icon.png"> <b>' + item.label + '</b> - ' + roadmJSON.node_type.toUpperCase() + ' type not entered by the user.</p>');
flag = true;
}
}
else if (item.node_type == amplifierJSON.node_type) {
if (item.amp_category == amplifierJSON.amp_category) {
if (item.amp_type == "") {
if (!item.amp_type) {
msg.push('<p class="focusNode" title="Click here to focus the node" id=\'spanTF' + item.id.replace(/\s/g, '') + '\' onClick="focusNode(\'' + item.id + '\')"><img width="25" src="./Assets/img/error-listing-icon.png"> <b>' + item.label + '</b> - ' + amplifierJSON.amp_category + ' type not entered by the user.</p>');
flag = true;
}
}
else if (item.amp_category == ramanampJSON.amp_category) {
if (item.amp_type == "") {
if (!item.amp_type) {
msg.push('<p class="focusNode" title="Click here to focus the node" id=\'spanTF' + item.id.replace(/\s/g, '') + '\' onClick="focusNode(\'' + item.id + '\')"><img width="25" src="./Assets/img/error-listing-icon.png"> <b>' + item.label + '</b> - ' + ramanampJSON.amp_category + ' type not entered by the user.</p>');
flag = true;
}
@@ -7136,4 +7169,15 @@ function realUpdate() {
if ($("#div_toaster").is(":visible") && !$("#img_src").is(":visible")) {
$("#btnValidation").click();
}
}
function changeWorkAreaWH(eleID) {
width = $("#txtw").val();
height = $("#txth").val();
if (eleID == "txtw")
$("canvas").prop('width', width);
else if (eleID == "txth")
$("canvas").prop('height', height);
network.addNodeMode();
}

2
TelecomInfraProject-V1/TelecomInfraProject/obj/Release/netcoreapp2.2/PublishOutputs.0821e9a4cc.txt
View File

@@ -82,6 +82,7 @@ D:\Git Repository\Main\TelecomInfraProject-V1\TelecomInfraProject\obj\Release\ne
D:\Git Repository\Main\TelecomInfraProject-V1\TelecomInfraProject\obj\Release\netcoreapp2.2\PubTmp\Out\wwwroot\Assets\img\menu icon.svg
D:\Git Repository\Main\TelecomInfraProject-V1\TelecomInfraProject\obj\Release\netcoreapp2.2\PubTmp\Out\wwwroot\Assets\img\menu-icon.png
D:\Git Repository\Main\TelecomInfraProject-V1\TelecomInfraProject\obj\Release\netcoreapp2.2\PubTmp\Out\wwwroot\Assets\img\menu.png
D:\Git Repository\Main\TelecomInfraProject-V1\TelecomInfraProject\obj\Release\netcoreapp2.2\PubTmp\Out\wwwroot\Assets\img\minus.png
D:\Git Repository\Main\TelecomInfraProject-V1\TelecomInfraProject\obj\Release\netcoreapp2.2\PubTmp\Out\wwwroot\Assets\img\Model Icon.svg
D:\Git Repository\Main\TelecomInfraProject-V1\TelecomInfraProject\obj\Release\netcoreapp2.2\PubTmp\Out\wwwroot\Assets\img\multinode.svg
D:\Git Repository\Main\TelecomInfraProject-V1\TelecomInfraProject\obj\Release\netcoreapp2.2\PubTmp\Out\wwwroot\Assets\img\Multiple node icon.png
@@ -97,6 +98,7 @@ D:\Git Repository\Main\TelecomInfraProject-V1\TelecomInfraProject\obj\Release\ne
D:\Git Repository\Main\TelecomInfraProject-V1\TelecomInfraProject\obj\Release\netcoreapp2.2\PubTmp\Out\wwwroot\Assets\img\page.gif
D:\Git Repository\Main\TelecomInfraProject-V1\TelecomInfraProject\obj\Release\netcoreapp2.2\PubTmp\Out\wwwroot\Assets\img\paste icon.svg
D:\Git Repository\Main\TelecomInfraProject-V1\TelecomInfraProject\obj\Release\netcoreapp2.2\PubTmp\Out\wwwroot\Assets\img\paste.svg
D:\Git Repository\Main\TelecomInfraProject-V1\TelecomInfraProject\obj\Release\netcoreapp2.2\PubTmp\Out\wwwroot\Assets\img\plus.png
D:\Git Repository\Main\TelecomInfraProject-V1\TelecomInfraProject\obj\Release\netcoreapp2.2\PubTmp\Out\wwwroot\Assets\img\ramanamp.svg
D:\Git Repository\Main\TelecomInfraProject-V1\TelecomInfraProject\obj\Release\netcoreapp2.2\PubTmp\Out\wwwroot\Assets\img\rednode.svg
D:\Git Repository\Main\TelecomInfraProject-V1\TelecomInfraProject\obj\Release\netcoreapp2.2\PubTmp\Out\wwwroot\Assets\img\redo.png

BIN
TelecomInfraProject-V1/TelecomInfraProject/obj/Release/netcoreapp2.2/TelecomInfraProject.csproj.AssemblyReference.cache
View File

Binary file not shown.

2
TelecomInfraProject-V1/TelecomInfraProject/wwwroot/Data/StyleData.json
View File

@@ -11,7 +11,7 @@
"interaction": {
"navigationButtons": true,
"keyboard": false,
"dragView": true,
"dragView": false,
"multiselect": true,
"hover": true
},

5
TelecomInfraProject-V1/TelecomInfraProject/wwwroot/js/Network Graph/stylenetwork.js
View File

@@ -586,7 +586,7 @@ $(document).ready(function () {
});
$('#btn_CreateNetwork').click(function () {
$('#divSelection').hide();
$('*.vis-zoomIn, *.vis-zoomOut, *.vis-zoomExtends, *.vis-right, *.vis-left, *.vis-up, *.vis-down').css('position', 'fixed');
/////$("#stepGP").click();
$("#stepCreateTopology").click();
});
@@ -1226,6 +1226,9 @@ function draw(isImport) {
$("#txtw").val($('canvas').width());
$("#txth").val($('canvas').height());
if (isImport)
$('*.vis-zoomIn, *.vis-zoomOut, *.vis-zoomExtends, *.vis-right, *.vis-left, *.vis-up, *.vis-down').css('position', 'fixed');
network.on("click", function (params) {
//$("#txtx").val(params.pointer.canvas.x);
//$("#txty").val(params.pointer.canvas.y);