diff --git a/TelecomInfraProject-V1/.vs/TelecomInfraProject/v16/.suo b/TelecomInfraProject-V1/.vs/TelecomInfraProject/v16/.suo index 3891702..d030339 100644 Binary files a/TelecomInfraProject-V1/.vs/TelecomInfraProject/v16/.suo and b/TelecomInfraProject-V1/.vs/TelecomInfraProject/v16/.suo differ diff --git a/TelecomInfraProject-V1/TelecomInfraProject/Pages/homepage.cshtml b/TelecomInfraProject-V1/TelecomInfraProject/Pages/homepage.cshtml index 986bcee..9b6d0f5 100644 --- a/TelecomInfraProject-V1/TelecomInfraProject/Pages/homepage.cshtml +++ b/TelecomInfraProject-V1/TelecomInfraProject/Pages/homepage.cshtml @@ -413,14 +413,14 @@ -
diff --git a/TelecomInfraProject-V1/TelecomInfraProject/bin/Release/netcoreapp2.2/TelecomInfraProject.Views.dll b/TelecomInfraProject-V1/TelecomInfraProject/bin/Release/netcoreapp2.2/TelecomInfraProject.Views.dll
index 2fd3737..0323feb 100644
Binary files a/TelecomInfraProject-V1/TelecomInfraProject/bin/Release/netcoreapp2.2/TelecomInfraProject.Views.dll and b/TelecomInfraProject-V1/TelecomInfraProject/bin/Release/netcoreapp2.2/TelecomInfraProject.Views.dll differ
diff --git a/TelecomInfraProject-V1/TelecomInfraProject/bin/Release/netcoreapp2.2/TelecomInfraProject.Views.pdb b/TelecomInfraProject-V1/TelecomInfraProject/bin/Release/netcoreapp2.2/TelecomInfraProject.Views.pdb
index b77e331..4cca452 100644
Binary files a/TelecomInfraProject-V1/TelecomInfraProject/bin/Release/netcoreapp2.2/TelecomInfraProject.Views.pdb and b/TelecomInfraProject-V1/TelecomInfraProject/bin/Release/netcoreapp2.2/TelecomInfraProject.Views.pdb differ
diff --git a/TelecomInfraProject-V1/TelecomInfraProject/obj/Release/netcoreapp2.2/PubTmp/Out/TelecomInfraProject.Views.dll b/TelecomInfraProject-V1/TelecomInfraProject/obj/Release/netcoreapp2.2/PubTmp/Out/TelecomInfraProject.Views.dll
index 2fd3737..0323feb 100644
Binary files a/TelecomInfraProject-V1/TelecomInfraProject/obj/Release/netcoreapp2.2/PubTmp/Out/TelecomInfraProject.Views.dll and b/TelecomInfraProject-V1/TelecomInfraProject/obj/Release/netcoreapp2.2/PubTmp/Out/TelecomInfraProject.Views.dll differ
diff --git a/TelecomInfraProject-V1/TelecomInfraProject/obj/Release/netcoreapp2.2/PubTmp/Out/TelecomInfraProject.Views.pdb b/TelecomInfraProject-V1/TelecomInfraProject/obj/Release/netcoreapp2.2/PubTmp/Out/TelecomInfraProject.Views.pdb
index b77e331..4cca452 100644
Binary files a/TelecomInfraProject-V1/TelecomInfraProject/obj/Release/netcoreapp2.2/PubTmp/Out/TelecomInfraProject.Views.pdb and b/TelecomInfraProject-V1/TelecomInfraProject/obj/Release/netcoreapp2.2/PubTmp/Out/TelecomInfraProject.Views.pdb differ
diff --git a/TelecomInfraProject-V1/TelecomInfraProject/obj/Release/netcoreapp2.2/PubTmp/Out/wwwroot/Data/ConfigurationData.json b/TelecomInfraProject-V1/TelecomInfraProject/obj/Release/netcoreapp2.2/PubTmp/Out/wwwroot/Data/ConfigurationData.json
index cad869d..01a5306 100644
--- a/TelecomInfraProject-V1/TelecomInfraProject/obj/Release/netcoreapp2.2/PubTmp/Out/wwwroot/Data/ConfigurationData.json
+++ b/TelecomInfraProject-V1/TelecomInfraProject/obj/Release/netcoreapp2.2/PubTmp/Out/wwwroot/Data/ConfigurationData.json
@@ -140,15 +140,15 @@
},
"default": {
"fiber_type": "",
- "CD_coefficient": 0.0,
- "PMD_coefficient": 0.0,
- "Span_length": "0.0",
- "Loss_coefficient": "0.0",
- "Connector_in": "0.0",
- "Connector_out": "0.0",
- "Ageing_loss": "0.0",
+ "CD_coefficient": "",
+ "PMD_coefficient": "",
+ "Span_length": "",
+ "Loss_coefficient": "",
+ "Connector_in": "",
+ "Connector_out": "",
+ "Ageing_loss": "",
"Length_based_loss": false,
- "Span_loss": "0.0"
+ "Span_loss": ""
}
},
diff --git a/TelecomInfraProject-V1/TelecomInfraProject/obj/Release/netcoreapp2.2/PubTmp/Out/wwwroot/js/Network Graph/stylenetwork.js b/TelecomInfraProject-V1/TelecomInfraProject/obj/Release/netcoreapp2.2/PubTmp/Out/wwwroot/js/Network Graph/stylenetwork.js
index 41fa36f..c7cea46 100644
--- a/TelecomInfraProject-V1/TelecomInfraProject/obj/Release/netcoreapp2.2/PubTmp/Out/wwwroot/js/Network Graph/stylenetwork.js
+++ b/TelecomInfraProject-V1/TelecomInfraProject/obj/Release/netcoreapp2.2/PubTmp/Out/wwwroot/js/Network Graph/stylenetwork.js
@@ -141,7 +141,7 @@ $(document).ready(function () {
console.log("An error has occurred2.");
});
- $.getJSON("/Data/yang.json", function (data) {
+ $.getJSON("/Data/Equipment_JSON_MOD2.json", function (data) {
eqpt_config = data;
load_EqptConfig();
}).fail(function () {
@@ -586,8 +586,8 @@ $(document).ready(function () {
});
$('#btn_CreateNetwork').click(function () {
$('#divSelection').hide();
-
- /////$("#stepGP").click();
+ //$('*.vis-zoomIn, *.vis-zoomOut, *.vis-zoomExtends, *.vis-right, *.vis-left, *.vis-up, *.vis-down').css('position', 'fixed');
+ //$("#stepGP").click();
$("#stepCreateTopology").click();
});
$('#cbxSingleFiber').change(function () {
@@ -595,24 +595,24 @@ $(document).ready(function () {
//alert();
}
});
- $('#txth, #txtw').change(function () {
- changeWorkAreaWH($(this).attr('id'));
- });
+ //$('#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;
- });
+ //$('.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) {
@@ -1216,15 +1216,44 @@ 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());
+ //$('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());
+
+ //if (isImport)
+ // $('*.vis-zoomIn, *.vis-zoomOut, *.vis-zoomExtends, *.vis-right, *.vis-left, *.vis-up, *.vis-down').css('position', 'fixed');
+
+ //container.addEventListener("wheel", function (e) {
+ // if (e.wheelDelta < 0) {
+ // //scroll down
+ // let w, h;
+ // w = $('canvas').width() - 50;
+ // h = $('canvas').height() - 50;
+ // $("canvas").prop('width', w);
+ // $("canvas").prop('height', h);
+ // network.addNodeMode();
+ // } else {
+ // //scroll up
+
+ // let w, h;
+ // w = $('canvas').width() + 50;
+ // h = $('canvas').height() + 50;
+ // $("canvas").prop('width', w);
+ // $("canvas").prop('height', h);
+ // network.addNodeMode();
+ // }
+
+ // //prevent page fom scrolling
+ // return false;
+ //})
network.on("click", function (params) {
//$("#txtx").val(params.pointer.canvas.x);
@@ -1818,8 +1847,8 @@ function displayNodesHover(params) {
function displayFiberHover(params) {
var fiberDetails = network.body.data.edges.get(params.edge);
var fiber_type = "";
- var span_length = "0";
- var span_loss = "0";
+ var span_length = "";
+ var span_loss = "";
if (fiberDetails.component_type == dualPatchJSON.component_type)
return;
if (fiberDetails.component_type == singleFiberJSON.component_type) {
@@ -1905,7 +1934,7 @@ function displayFiberHover(params) {
var spanlen = parseFloat(span_length);
- if (spanlen <= 0)
+ if ( !(spanlen) || spanlen <= 0)
hoverData += "Span length(in km) : " + span_length + "\n";
else
hoverData += "Span length(in km) : " + span_length + "\n";
@@ -2340,7 +2369,7 @@ function exportNetwork(isSaveNetwork) {
"tip-photonic-topology:fiber": {
"type": item.fiber_type,
"length": item.span_length.toString(),
- "attenuation-in": "0.0",
+ "attenuation-in": "",
"conn-att-in": item.connector_in,
"conn-att-out": item.connector_out,
//"loss_coef": item.loss_coefficient,
@@ -5555,7 +5584,7 @@ function singleFiberEdit(fiberID, callback) {
var span_length = $("#txtSpan_Length").val();
var spanlen = parseFloat(span_length);
- if (spanlen <= 0) {
+ if ( !(spanlen) || spanlen <= 0) {
$("#txtSpan_Length").addClass('input_error');
}
else
@@ -5596,7 +5625,7 @@ function updateSingleFiber(fiberID) {
$("#ddlSingleFiberType").removeClass('input_error');
var spanlen = parseFloat(span_length);
- if (spanlen <= 0) {
+ if (!(spanlen) || spanlen <= 0) {
showMessage(alertType.Error, 'Pleae enter valid span length.');
$("#txtSpan_Length").addClass('input_error');
return;
diff --git a/TelecomInfraProject-V1/TelecomInfraProject/obj/Release/netcoreapp2.2/Razor/Pages/homepage.cshtml.g.cs b/TelecomInfraProject-V1/TelecomInfraProject/obj/Release/netcoreapp2.2/Razor/Pages/homepage.cshtml.g.cs
index aeb0085..c7f8661 100644
--- a/TelecomInfraProject-V1/TelecomInfraProject/obj/Release/netcoreapp2.2/Razor/Pages/homepage.cshtml.g.cs
+++ b/TelecomInfraProject-V1/TelecomInfraProject/obj/Release/netcoreapp2.2/Razor/Pages/homepage.cshtml.g.cs
@@ -1,4 +1,4 @@
-#pragma checksum "D:\Git Repository\Main\TelecomInfraProject-V1\TelecomInfraProject\Pages\homepage.cshtml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "40cea54d6a320359e235ea653463ef7058d52755"
+#pragma checksum "D:\Git Repository\Main\TelecomInfraProject-V1\TelecomInfraProject\Pages\homepage.cshtml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "e67f2449b4f76b97db95f036bfbb0ccdbd586b97"
// Insert Node
@@ -2355,8 +2359,8 @@ namespace AspNetCoreInsert Node
@@ -2473,8 +2477,8 @@ namespace AspNetCore