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

Merge branch 'develop' of https://github.com/Connoropolous/metamaps_gen002 into new

Browse source
This commit is contained in:
Connor Turland 2014-10-05 09:44:28 -04:00
commit ad2d79a7ea
4 changed files with 187 additions and 194 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
app/assets/javascripts/src/Metamaps.GlobalUI.js
View file

@ -373,29 +373,7 @@ Metamaps.GlobalUI.Search = {
self.close(0, true); self.close(0, true);
} }
break; break;
case 65:
case 97:
if (e.ctrlKey){
Metamaps.Control.deselectAllNodes();
Metamaps.Control.deselectAllEdges();
e.preventDefault();
Metamaps.Visualize.mGraph.graph.eachNode(function (n) {
Metamaps.Control.selectNode(n,e);
});
Metamaps.Visualize.mGraph.plot();
}
break;
case 69:
case 101:
if (e.ctrlKey){
e.preventDefault();
Metamaps.JIT.zoomExtents();
}
break;
default: default:
break; //console.log(e.which); break; //console.log(e.which);
} }

42
app/assets/javascripts/src/Metamaps.JIT.js
View file

@ -1654,6 +1654,11 @@ Metamaps.JIT = {
var ratioX = spanX / width; var ratioX = spanX / width;
var ratioY = spanY / height; var ratioY = spanY / height;
var cogX = (maxX + minX)/2;
var cogY = (maxY + minY)/2;
canvas.translate(-1* cogX, -1* cogY);
var newRatio = Math.max(ratioX,ratioY); var newRatio = Math.max(ratioX,ratioY);
var scaleMultiplier = 1/newRatio*0.9; var scaleMultiplier = 1/newRatio*0.9;
@ -1669,43 +1674,6 @@ Metamaps.JIT = {
canvas.scale(scaleMultiplier,scaleMultiplier); canvas.scale(scaleMultiplier,scaleMultiplier);
} }
counter = 0;
nodes.forEach(function (n) {
var x = n.pos.x,
y = n.pos.y;
if (counter == 0){
maxX = x;
minX = x;
maxY = y;
minY = y;
}
var arrayOfLabelLines = Metamaps.Util.splitLine(n.name, 30).split('\n'),
dim = n.getData('dim'),
ctx = canvas.getCtx();
var height = 25 * arrayOfLabelLines.length;
var index, lineWidths = [];
for (index = 0; index < arrayOfLabelLines.length; ++index) {
lineWidths.push(ctx.measureText(arrayOfLabelLines[index]).width)
}
var width = Math.max.apply(null, lineWidths) + 8;
maxX = Math.max(x + width /2,maxX);
maxY = Math.max(y + n.getData("height") + 5 + height,maxY);
minX = Math.min(x - width /2,minX);
minY = Math.min(y - dim,minY);
counter++;
});
var cogX = (maxX + minX)/2;
var cogY = (maxY + minY)/2;
canvas.translate(-1* cogX, -1* cogY);
$(document).trigger(Metamaps.JIT.events.zoom, [event]); $(document).trigger(Metamaps.JIT.events.zoom, [event]);
} }
else if(nodes.length == 1){ else if(nodes.length == 1){

47
app/assets/javascripts/src/Metamaps.js
View file

@ -2743,6 +2743,53 @@ Metamaps.Listeners = {
case 27: case 27:
if (Metamaps.Active.Map) Metamaps.JIT.escKeyHandler(); if (Metamaps.Active.Map) Metamaps.JIT.escKeyHandler();
break; break;
case 65: //if a or A is pressed
case 97:
if (e.ctrlKey){
Metamaps.Control.deselectAllNodes();
Metamaps.Control.deselectAllEdges();
e.preventDefault();
Metamaps.Visualize.mGraph.graph.eachNode(function (n) {
Metamaps.Control.selectNode(n,e);
});
Metamaps.Visualize.mGraph.plot();
}
break;
case 69: //if e or E is pressed
case 101:
if (e.ctrlKey){
e.preventDefault();
Metamaps.JIT.zoomExtents();
}
break;
case 82: //if r or R is pressed
case 114:
if (e.ctrlKey){
e.preventDefault();
Metamaps.Control.removeSelectedNodes();
console.log('Once function works, selected nodes will be removed');
}
break;
case 68: //if d or D is pressed
case 100:
if (e.ctrlKey){
e.preventDefault();
Metamaps.Control.deleteSelectedNodes();
console.log('Once function works, selected nodes will be deleted');
}
break;
case 72: //if h or H is pressed
case 104:
if (e.ctrlKey){
e.preventDefault();
Metamaps.Control.hideSelectedNodes();
console.log('Once function works, selected nodes will be hidden');
}
break;
default: default:
break; //alert(e.which); break; //alert(e.which);
} }