diff --git a/src/main/webapp/common/js/hippo/chart-springy.js b/src/main/webapp/common/js/hippo/chart-springy.js index 333b41350..11cb37903 100644 --- a/src/main/webapp/common/js/hippo/chart-springy.js +++ b/src/main/webapp/common/js/hippo/chart-springy.js @@ -32,6 +32,7 @@ function drawSpringy(graphdata, targetId, width, height) { $('#console').val('Node onMouseOver : ' + this.id + '\r' + $('#console').val()) }, onMouseClick : function(e){ + // TODO 정보 layer가 중복으로 보이지 않도록 함. if ($("DIV.nodeinfo" + i).length == 0 && this.data.hosts.length > 0) { var htOffset = $(targetId).offset(); var box = $('#ServerBox') @@ -56,6 +57,7 @@ function drawSpringy(graphdata, targetId, width, height) { $('#console').val('Edge onMouseOver : ' + this.id + '\r' + $('#console').val()); }, onMouseClick : function(e){ + // TODO 정보 layer가 중복으로 보이지 않도록 함. if ($("DIV.linkinfo" + i).length > 0) { return; } diff --git a/src/main/webapp/common/js/hippo/servermap/hippoServerMap.js b/src/main/webapp/common/js/hippo/servermap/hippoServerMap.js index 0817513c4..40aa8a8b4 100644 --- a/src/main/webapp/common/js/hippo/servermap/hippoServerMap.js +++ b/src/main/webapp/common/js/hippo/servermap/hippoServerMap.js @@ -116,6 +116,9 @@ jQuery.fn.hippoServerMap = function(params) { renderer.startOnce(); }); + // + // TODO double click 할 때 정보를 보여주도록 수정함. + // jQuery(canvas).mousedown(function(e) { e.preventDefault(); var pos = jQuery(this).offset(); @@ -123,19 +126,45 @@ jQuery.fn.hippoServerMap = function(params) { selectedEdge = layout.edgeHover({x: e.pageX - pos.left, y: e.pageY - pos.top}, nEdgeHoverWeight); if(selectedNode.node !== null){ selected = true; +// if(typeof selectedNode.node.data.onMouseClick === 'function'){ +// selectedNode.node.data.onMouseClick.call(selectedNode.node, e); +// } + $(this).css('cursor','pointer'); + }else if(selectedEdge.edge !== null){ +// if(typeof selectedEdge.edge.data.onMouseClick === 'function'){ +// selectedEdge.edge.data.onMouseClick.call(selectedEdge.edge, e); +// } + }else{ + // TODO 공백에서 드래그 했을 때 그래프가 사라지는 현상 방지. + if (selectedNode.node !== null) { + dragged = true; + htLastPos.pageY = e.pageY; + htLastPos.pageX = e.pageX; + } + } + }); + + jQuery(canvas).dblclick(function(e) { + e.preventDefault(); + var pos = jQuery(this).offset(); + selectedNode = layout.selectNode({x: e.pageX - pos.left, y: e.pageY - pos.top}); + selectedEdge = layout.edgeHover({x: e.pageX - pos.left, y: e.pageY - pos.top}, nEdgeHoverWeight); + if(selectedNode.node !== null){ +// selected = true; if(typeof selectedNode.node.data.onMouseClick === 'function'){ selectedNode.node.data.onMouseClick.call(selectedNode.node, e); } - $(this).css('cursor','pointer'); +// $(this).css('cursor','pointer'); }else if(selectedEdge.edge !== null){ if(typeof selectedEdge.edge.data.onMouseClick === 'function'){ selectedEdge.edge.data.onMouseClick.call(selectedEdge.edge, e); } - }else{ - dragged = true; - htLastPos.pageY = e.pageY; - htLastPos.pageX = e.pageX; } +// else{ +// dragged = true; +// htLastPos.pageY = e.pageY; +// htLastPos.pageX = e.pageX; +// } }); var lastSelectedNodeId = null, lastSelectedEdge = {edge : null};