am facut zoom-ul sa mearga

colin-dumitru · Jan 25, 2012 · 88582b5 · 88582b5
1 parent 32279f7
commit 88582b5
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 7 deletions.
diff --git a/WebServer/App_Data/WebServerDatabase.mdf b/WebServer/App_Data/WebServerDatabase.mdf
diff --git a/WebServer/App_Data/WebServerDatabase_log.LDF b/WebServer/App_Data/WebServerDatabase_log.LDF
diff --git a/WebServer/Content/Timeline.css b/WebServer/Content/Timeline.css
@@ -16,7 +16,7 @@ div.tooltip ul li {list-style:none; cursor: pointer; margin:1px; background:#BBD
 h2 {margin-top:30px;}
 div#situation {min-height:400px}
 
-#canvasDiv{background:#DDDDEE;  -moz-border-radius: 14px;border-radius: 14px; }
+#canvasDiv{background:#DDDDEE;  -moz-border-radius: 14px;border-radius: 14px; height: 300px; overflow: auto; }
 a.clustersBtn{display:block; float:right; margin:2px; font-size:16px; cursor:pointer; background:#DDDDDD; width: 22px; height:22px;  -moz-border-radius: 100px; border-radius: 100px; text-align:center;}
 
 /* generat */

diff --git a/WebServer/Scripts/timeline.js b/WebServer/Scripts/timeline.js
@@ -58,13 +58,13 @@ function loaded(xml) {
     var bigger = $("<a class='clustersBtn nosel'>−</span>").click(function () {
         if (clusterIndex + 1 < clusters.length) {
             clusterIndex++;
-            drawSituations(situations, clusters[clusterIndex]);
+            drawSituations(situations, clusters[clusterIndex], clusterIndex);
         }
     });
     var smaller = $("<a class='clustersBtn nosel'>+</span>").click(function () {
         if (clusterIndex - 1 >= 0) {
             clusterIndex--;
-            drawSituations(situations, clusters[clusterIndex]);
+            drawSituations(situations, clusters[clusterIndex], clusterIndex);
         }
     });
     doc.append(bigger);
@@ -91,7 +91,7 @@ function loaded(xml) {
 
     situations.sort(compare);
 
-    drawSituations(situations, clusters[clusterIndex]);
+    drawSituations(situations, clusters[clusterIndex], clusterIndex);
 }
 
 function drawCircle(context, x, y, r) {
@@ -101,15 +101,16 @@ function drawCircle(context, x, y, r) {
     context.fill();
 }
 
-function drawSituations(situations, intervals) {
+function drawSituations(situations, intervals, index) {
     if (toolTip != null)
         toolTip.remove();
 
     var canvasDiv = $("#canvasDiv");
     canvasDiv.empty();
     canvasDiv.css({ padding: "10px" });
-    var canvasWidth = canvasDiv.width();
-    var canvasHeight = Math.ceil(canvasWidth / intervals);
+
+    var canvasHeight = canvasDiv.height() -20 ;
+    var canvasWidth = canvasDiv.width() * (index + 1);
 
     var canvas = $("<canvas></canvas>").attr({ id: "canv", width: canvasWidth, height: canvasHeight });
     canvasDiv.append(canvas);