diff --git a/web/skins/classic/views/js/montagereview.js b/web/skins/classic/views/js/montagereview.js index 53abf03d3..1e2194ab9 100644 --- a/web/skins/classic/views/js/montagereview.js +++ b/web/skins/classic/views/js/montagereview.js @@ -239,13 +239,18 @@ function drawSliderOnGraph(val) { } } -function drawGraph() -{ - var divWidth=$('timelinediv').clientWidth - canvas.width = cWidth = divWidth; // Let it float and determine width (it should be sized a bit smaller percentage of window) - canvas.height=cHeight = parseInt(window.innerHeight * 0.10); - if(eId.length==0) - { +function drawGraph() { + var divWidth=$('timelinediv').clientWidth + canvas.width = cWidth = divWidth; // Let it float and determine width (it should be sized a bit smaller percentage of window) + cHeight = parseInt(window.innerHeight * 0.10); + if ( cHeight < numMonitors * 20 ) { + cHeight = numMonitors * 20; + console.log( "Timeline height: " + cHeight ); + } + + canvas.height = cHeight; + + if(eId.length==0) { ctx.font="40px Georgia"; ctx.fillStyle="Black"; ctx.globalAlpha=1; @@ -412,15 +417,14 @@ function showScale(newscale) // updates slider only return; } -function setScale(newscale) // makes actual change -{ - showScale(newscale); - for(var i=0; i 1.01 ) // allow for some up/down changes and just treat as 1 of almost 1 + zoomStr += "&z" + monitorPtr[i].toString() + "=" + monitorZoomScale[monitorPtr[i]].toFixed(2); + + var uri = "?view=" + currentView + fitStr + groupStr + minStr + maxStr + liveStr + zoomStr + "&scale=" + $j("#scaleslider")[0].value + "&speed=" + speeds[$j("#speedslider")[0].value]; + alert(uri); + window.location = uri; } // >>>>>>>>> Initialization that runs on window load by being at the bottom @@ -709,8 +725,9 @@ function initPage() { } drawGraph(); setSpeed(speedIndex); - setFit(fitMode); // will redraw - setLive(liveMode); // will redraw + //setFit(fitMode); // will redraw + //setLive(liveMode); // will redraw + redrawScreen(); } window.addEventListener("resize",redrawScreen); // Kick everything off