glenux-contrib/metamaps--metamaps
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

minor fixes as requested

Browse source
This commit is contained in:
Robert Best 2017-03-10 22:53:14 +00:00
parent 08883e445f
commit 1b3942b2a0
3 changed files with 28 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
frontend/src/Metamaps/Control.js
View file

@ -25,7 +25,7 @@ const Control = {
//For each selected node, select all connected node and the synapses too //For each selected node, select all connected node and the synapses too
Selected.Nodes.forEach((item) => { Selected.Nodes.forEach((item) => {
if (Visualize.mGraph.graph.getNode(item.id).adjacencies) { if (Visualize.mGraph.graph.getNode(item.id).adjacencies) {
for(var adjID in Visualize.mGraph.graph.getNode(item.id).adjacencies){ for (const adjID in Visualize.mGraph.graph.getNode(item.id).adjacencies) {
Control.selectNode(Visualize.mGraph.graph.getNode(adjID)) Control.selectNode(Visualize.mGraph.graph.getNode(adjID))
Control.selectEdge(Visualize.mGraph.graph.getNode(item.id).adjacencies[adjID]) Control.selectEdge(Visualize.mGraph.graph.getNode(item.id).adjacencies[adjID])
} }

4
frontend/src/Metamaps/Listeners.js
View file

@ -32,12 +32,12 @@ const Listeners = {
JIT.escKeyHandler() JIT.escKeyHandler()
break break
case 38: // if UP key is pressed case 38: // if UP key is pressed
if(e.ctrlKey && e.shiftKey){ if ((e.ctrlKey || e.metaKey) && e.shiftKey){
Control.selectNeighbors() Control.selectNeighbors()
} }
break break
case 46: // if DEL is pressed case 46: // if DEL is pressed
if(e.target.tagName !== "INPUT" && e.target.tagName !== "TEXTAREA" && (Selected.Nodes.length + Selected.Edges.length) > 0){ if (e.target.tagName !== 'INPUT' && e.target.tagName !== 'TEXTAREA' && (Selected.Nodes.length + Selected.Edges.length) > 0) {
e.preventDefault() e.preventDefault()
Control.removeSelectedNodes() Control.removeSelectedNodes()
Control.removeSelectedEdges() Control.removeSelectedEdges()

14
frontend/src/Metamaps/Util.js
View file

@ -208,14 +208,14 @@ const Util = {
ox = graph.canvas.translateOffsetX, ox = graph.canvas.translateOffsetX,
oy = graph.canvas.translateOffsetY, oy = graph.canvas.translateOffsetY,
sx = graph.canvas.scaleOffsetX, sx = graph.canvas.scaleOffsetX,
sy = graph.canvas.scaleOffsetY; sy = graph.canvas.scaleOffsetY
var pointerCoordX = (zoomPoint.x - p.x - s.width / 2 - ox) * (1 / sx), var pointerCoordX = (zoomPoint.x - p.x - s.width / 2 - ox) * (1 / sx),
pointerCoordY = (zoomPoint.y - p.y - s.height / 2 - oy) * (1 / sy); pointerCoordY = (zoomPoint.y - p.y - s.height / 2 - oy) * (1 / sy)
// This translates the canvas to be centred over the zoomPoint, then the canvas is zoomed as intended. // This translates the canvas to be centred over the zoomPoint, then the canvas is zoomed as intended.
graph.canvas.translate(-pointerCoordX,-pointerCoordY); graph.canvas.translate(-pointerCoordX, -pointerCoordY)
graph.canvas.scale(ans, ans); graph.canvas.scale(ans, ans)
// Get the canvas attributes again now that is has changed // Get the canvas attributes again now that is has changed
s = graph.canvas.getSize(), s = graph.canvas.getSize(),
@ -223,12 +223,12 @@ const Util = {
ox = graph.canvas.translateOffsetX, ox = graph.canvas.translateOffsetX,
oy = graph.canvas.translateOffsetY, oy = graph.canvas.translateOffsetY,
sx = graph.canvas.scaleOffsetX, sx = graph.canvas.scaleOffsetX,
sy = graph.canvas.scaleOffsetY; sy = graph.canvas.scaleOffsetY
var newX = (zoomPoint.x - p.x - s.width / 2 - ox) * (1 / sx), var newX = (zoomPoint.x - p.x - s.width / 2 - ox) * (1 / sx),
newY = (zoomPoint.y - p.y - s.height / 2 - oy) * (1 / sy); newY = (zoomPoint.y - p.y - s.height / 2 - oy) * (1 / sy)
// Translate the canvas to put the pointer back over top the same coordinate it was over before // Translate the canvas to put the pointer back over top the same coordinate it was over before
graph.canvas.translate(newX-pointerCoordX,newY-pointerCoordY); graph.canvas.translate(newX - pointerCoordX, newY - pointerCoordY)
} }
} }