This commit is contained in:
Garrett K 2021-01-25 04:57:11 +00:00
parent 72325a1aac
commit 4319ae4135
2 changed files with 47 additions and 42 deletions

View File

@ -1,7 +1,7 @@
// ### Cabinet Functions ### // ### Cabinet Functions ###
function drawCabinet(){ function drawCabinet(){
console.log('drawCabinet');
resizeCanvas(); resizeCabinetCanvas();
clearCabinetConnections(); clearCabinetConnections();
crawlCabinet(); crawlCabinet();
drawCabinetConnections(); drawCabinetConnections();
@ -9,7 +9,7 @@ function drawCabinet(){
} }
function crawlCabinet(){ function crawlCabinet(){
console.log('crawlCabinet');
var pathSourceArray = { var pathSourceArray = {
'selected': $(document).data('selectedPort'), 'selected': $(document).data('selectedPort'),
'hovered': $(document).data('hoveredPort') 'hovered': $(document).data('hoveredPort')
@ -36,7 +36,6 @@ function crawlCabinet(){
if($('#'+selectedPartitionPeerID).length) { if($('#'+selectedPartitionPeerID).length) {
var selectedPartitionPeer = $('#'+selectedPartitionPeerID); var selectedPartitionPeer = $('#'+selectedPartitionPeerID);
trunkArray.push([selectedPartition, selectedPartitionPeer]); trunkArray.push([selectedPartition, selectedPartitionPeer]);
//partitionArray.push(selectedPartition, selectedPartitionPeer);
var selectedPartitionPeerIDArray = selectedPartitionPeerID.split('-'); var selectedPartitionPeerIDArray = selectedPartitionPeerID.split('-');
var peerID = selectedPartitionPeerIDArray[2]; var peerID = selectedPartitionPeerIDArray[2];
@ -74,7 +73,6 @@ function crawlCabinet(){
var connectedPartitionPeer = $('#'+connectedPartitionPeerID); var connectedPartitionPeer = $('#'+connectedPartitionPeerID);
trunkArray.push([connectedPartition, connectedPartitionPeer]); trunkArray.push([connectedPartition, connectedPartitionPeer]);
//partitionArray.push(connectedPartition, connectedPartitionPeer);
var connectedPartitionPeerIDArray = connectedPartitionPeerID.split('-'); var connectedPartitionPeerIDArray = connectedPartitionPeerID.split('-');
var peerID = connectedPartitionPeerIDArray[2]; var peerID = connectedPartitionPeerIDArray[2];
@ -111,7 +109,7 @@ function crawlCabinet(){
} }
function drawCabinetConnections(){ function drawCabinetConnections(){
console.log('drawCabinetConnections');
pathDataTypeArray = [ pathDataTypeArray = [
'cabinetSelectedConnections', 'cabinetSelectedConnections',
'cabinetHoveredConnections' 'cabinetHoveredConnections'
@ -204,7 +202,7 @@ function drawCabinetConnections(){
} }
function drawCabinetTrunks(){ function drawCabinetTrunks(){
console.log('drawCabinetTrunks');
pathDataTypeArray = [ pathDataTypeArray = [
'cabinetSelectedTrunks', 'cabinetSelectedTrunks',
'cabinetHoveredTrunks' 'cabinetHoveredTrunks'
@ -270,7 +268,7 @@ function drawCabinetTrunks(){
} }
function clearCabinetConnections(){ function clearCabinetConnections(){
console.log('clearCabinetConnections');
var canvasHeight = $('#canvasCabinet').height(); var canvasHeight = $('#canvasCabinet').height();
var canvasWidth = $('#canvasCabinet').width(); var canvasWidth = $('#canvasCabinet').width();
cabinetCtx.clearRect(0, 0, canvasWidth, canvasHeight); cabinetCtx.clearRect(0, 0, canvasWidth, canvasHeight);
@ -280,8 +278,8 @@ function clearCabinetConnections(){
// ### Path Functions ### // ### Path Functions ###
function drawPath(){ function drawPath(){
console.log('drawPath');
resizeCanvas(); resizePathCanvas();
clearPathConnections(); clearPathConnections();
crawlPathConnections(); crawlPathConnections();
crawlPathTrunks(); crawlPathTrunks();
@ -290,7 +288,7 @@ function drawPath(){
} }
function crawlPathConnections(){ function crawlPathConnections(){
console.log('crawlPathConnections');
var pathConnections = {}; var pathConnections = {};
var connectorElementArray = $('#containerFullPath').find('.port'); var connectorElementArray = $('#containerFullPath').find('.port');
$.each(connectorElementArray, function(index, element){ $.each(connectorElementArray, function(index, element){
@ -306,7 +304,7 @@ function crawlPathConnections(){
} }
function crawlPathTrunks(){ function crawlPathTrunks(){
console.log('crawlPathTrunks');
var pathTrunks = {}; var pathTrunks = {};
var connectorElementArray = $('#containerFullPath').find('.objectBox'); var connectorElementArray = $('#containerFullPath').find('.objectBox');
@ -326,7 +324,7 @@ function crawlPathTrunks(){
} }
function drawPathConnections(){ function drawPathConnections(){
console.log('drawPathConnections');
var pathConnections = $(document).data('pathConnections'); var pathConnections = $(document).data('pathConnections');
pathCtx.strokeStyle = 'LightSkyBlue'; pathCtx.strokeStyle = 'LightSkyBlue';
pathCtx.lineWidth = 3; pathCtx.lineWidth = 3;
@ -342,13 +340,13 @@ function drawPathConnections(){
pathCtx.moveTo(elemADimensions.centerX, elemADimensions.bottom); pathCtx.moveTo(elemADimensions.centerX, elemADimensions.bottom);
pathCtx.bezierCurveTo(elemADimensions.centerX + 20, elemADimensions.bottom, elemBDimensions.centerX + 20, elemBDimensions.top, elemBDimensions.centerX, elemBDimensions.top); pathCtx.bezierCurveTo(elemADimensions.centerX + 20, elemADimensions.bottom, elemBDimensions.centerX + 20, elemBDimensions.top, elemBDimensions.centerX, elemBDimensions.top);
//pathCtx.lineTo(elemBDimensions.centerX, elemBDimensions.centerY);
}); });
pathCtx.stroke(); pathCtx.stroke();
} }
function drawPathTrunks(){ function drawPathTrunks(){
console.log('drawPathTrunks');
var pathTrunks = $(document).data('pathTrunks'); var pathTrunks = $(document).data('pathTrunks');
pathCtx.strokeStyle = 'MidnightBlue'; pathCtx.strokeStyle = 'MidnightBlue';
pathCtx.lineWidth = 3; pathCtx.lineWidth = 3;
@ -392,7 +390,7 @@ function drawPathTrunks(){
} }
function clearPathConnections(){ function clearPathConnections(){
console.log('clearPathConnections');
var canvasHeight = $('#canvasPath').height(); var canvasHeight = $('#canvasPath').height();
var canvasWidth = $('#canvasPath').width(); var canvasWidth = $('#canvasPath').width();
pathCtx.clearRect(0, 0, canvasWidth, canvasHeight); pathCtx.clearRect(0, 0, canvasWidth, canvasHeight);
@ -400,6 +398,16 @@ function clearPathConnections(){
// ### Common Functions ### // ### Common Functions ###
function resetConnectionData(){
$(document).data('selectedPort', false);
$(document).data('cabinetSelectedConnections', []);
$(document).data('cabinetHoveredConnections', []);
$(document).data('cabinetSelectedTrunks', []);
$(document).data('cabinetHoveredTrunks', []);
$(document).data('pathConnections', {});
$(document).data('pathTrunks', {});
}
function getDimensions(elem, canvas=false){ function getDimensions(elem, canvas=false){
if(canvas == false) { if(canvas == false) {
@ -461,10 +469,10 @@ function highlightElement(elemArray, color){
} }
function makePortsHoverable(){ function makePortsHoverable(){
console.log('makePortsHoverable');
//resizeCanvas(); resetConnectionData();
//redraw(); clearPathConnections();
clearCabinetConnections();
$('#buildSpaceContent').find('.port').each(function(){ $('#buildSpaceContent').find('.port').each(function(){
$(this).unbind('mouseenter mouseleave click.drawConnections'); $(this).unbind('mouseenter mouseleave click.drawConnections');
@ -517,7 +525,7 @@ function makeCabArrowsClickable(){
$(cabinet).insertAfter($(cabinet).next()); $(cabinet).insertAfter($(cabinet).next());
} }
drawCabinet(); drawCabinet();
//redraw();
}); });
} }
@ -540,23 +548,27 @@ function makeCabCloseClickable(){
drawCabinet(); drawCabinet();
// Refresh all paths
//refreshPathData();
//redraw();
}); });
} }
function resizeCanvas() { function resizePathCanvas() {
$('#canvasCabinet').attr('width', $(document).width());
$('#canvasCabinet').attr('height', $(document).height());
$('#canvasPath').attr('width', $('#canvasPath').parent().width()); $('#canvasPath').attr('width', $('#canvasPath').parent().width());
$('#canvasPath').attr('height', $('#canvasPath').parent().height()); $('#canvasPath').attr('height', $('#canvasPath').parent().height());
} }
function resizeCabinetCanvas() {
$('#canvasCabinet').attr('width', $(document).width());
$('#canvasCabinet').attr('height', $(document).height());
}
function drawPathAndCabinet() {
drawPath();
drawCabinet();
}
function initializeCanvas() { function initializeCanvas() {
window.addEventListener('resize', resizeCanvas, false); window.addEventListener('resize', drawPathAndCabinet, false);
canvasCabinet = document.getElementById('canvasCabinet'); canvasCabinet = document.getElementById('canvasCabinet');
canvasPath = document.getElementById('canvasPath'); canvasPath = document.getElementById('canvasPath');
var lineWidth = 10; var lineWidth = 10;
@ -569,7 +581,6 @@ function initializeCanvas() {
$(document).data('cabinetSelectedTrunks', []); $(document).data('cabinetSelectedTrunks', []);
$(document).data('cabinetHoveredTrunks', []); $(document).data('cabinetHoveredTrunks', []);
canvasInset = 10; canvasInset = 10;
pathID = 0;
// Path connections // Path connections
pathCtx = canvasPath.getContext('2d'); pathCtx = canvasPath.getContext('2d');

View File

@ -54,7 +54,6 @@ function clearSelectionDetails(){
$('#checkboxPopulated').prop("checked", false); $('#checkboxPopulated').prop("checked", false);
$('#selectPort').empty(); $('#selectPort').empty();
clearCabinetConnections();
} }
function makeRackObjectsClickable(){ function makeRackObjectsClickable(){
@ -292,11 +291,11 @@ function retrievePortOptions(objID, objFace, partitionDepth, portID){
$('#selectPort').prop("disabled", false); $('#selectPort').prop("disabled", false);
$('#selectPort').off('change'); $('#selectPort').off('change');
$('#selectPort').on('change', function(){ $('#selectPort').on('change', function(){
var portID = parseInt($(this).children('option:selected').val(), 10); var objID = $(document).data('clickedObjID');
$(document).data('clickedObjPortID', portID); var objFace = $(document).data('clickedObjFace');
processPortSelection(); var objDepth = $(document).data('clickedObjPartitionDepth');
$(document).data('portClickedFlag', true); var objPort = parseInt($(this).children('option:selected').val(), 10);
handlePathFindButton(); $('#port-4-'+objID+'-'+objFace+'-'+objDepth+'-'+objPort).click();
}); });
} else { } else {
$('#selectPort').prop("disabled", true); $('#selectPort').prop("disabled", true);
@ -393,7 +392,6 @@ function retrieveCabinet(cabinetID, cabinetFace, cabinetView){
setObjectSize($('.rackObj:not(.insert)')); setObjectSize($('.rackObj:not(.insert)'));
makePortsHoverable(); makePortsHoverable();
//makePartitionsHoverable();
if($('#objID').length) { if($('#objID').length) {
selectObject($('#cabinetTable')); selectObject($('#cabinetTable'));
@ -690,8 +688,6 @@ function postProcessCable(){
retrievePortPath(objID, objFace, objDepth, objPort); retrievePortPath(objID, objFace, objDepth, objPort);
retrievePortOptions(objID, objFace, objDepth, objPort); retrievePortOptions(objID, objFace, objDepth, objPort);
drawCabinet(); drawCabinet();
//refreshPathData();
//redraw();
$('#objTree').jstree('deselect_all'); $('#objTree').jstree('deselect_all');
$('#objectTreeModal').modal('hide'); $('#objectTreeModal').modal('hide');
@ -1016,8 +1012,6 @@ $( document ).ready(function() {
retrievePortPath(objID, objFace, objDepth, objPort); retrievePortPath(objID, objFace, objDepth, objPort);
retrievePortOptions(objID, objFace, objDepth, objPort); retrievePortOptions(objID, objFace, objDepth, objPort);
drawCabinet(); drawCabinet();
//refreshPathData();
//redraw();
$('#objTree').jstree('deselect_all'); $('#objTree').jstree('deselect_all');
$('#objectTreeModal').modal('hide'); $('#objectTreeModal').modal('hide');