Shortcuts added. Hide/show info fixed. Canvas and infos packed in a div.

zzti · Apr 22, 2013 · d1c87a0 · d1c87a0
1 parent dbe4316
commit d1c87a0
Show file tree

Hide file tree

Showing 3 changed files with 41 additions and 10 deletions.
diff --git a/css/main.css b/css/main.css
@@ -5,7 +5,7 @@ html, body {
     height: 100%;
     width: 100%;
     overflow: hidden;
-    font-family: "Helvetica Neue",Helvetica,Arial, sans-serif;
+    font-family: "Helvetica Neue", Helvetica, Arial, sans-serif;
     font-size: 1em;
     color: #333;
     -webkit-user-select: none; 
@@ -49,7 +49,7 @@ html, body {
 }
 #viewerScreen {
     display: table;
-    height: 100%;
+    /*height: 100%;*/
 }
 .viewerRows .viewerCells {
      border-bottom: 1px solid #ddd;
@@ -66,11 +66,15 @@ html, body {
 }
 .viewerCells {
     display: table-cell;
-    position:relative;
+    /*display: block;*/
+    position: relative;
+}
+#viewerScreen .viewerCellContent {
+    display: block;
 }
 canvas {
     cursor:default;
-    display: block;
+    /*display: block;*/
     margin: auto;
 }
 

diff --git a/index.html b/index.html
@@ -127,6 +127,22 @@
                     }
                 });
 
+                // Shortcuts for move, zoom and windowLevel
+                $(window).keydown(function(e) {
+                    // strg/ctrl or Mac cmd key
+                    if(e.ctrlKey || e.keyCode === 91) {
+                        $('#move').click();
+                    }
+                    if(e.altKey) {
+                        $('#windowLevel').click();
+                    }
+                    if(e.shiftKey) {
+                        $('#zoom').click();
+                    }
+
+                    return;
+                });
+
                 $('#buttonSet').buttonset();
                 $('#resetButton').button();
                 $('#metaButton').button();
@@ -169,7 +185,6 @@
     <body>
         <div id="container">
             <aside id="sidebar">
-                <!--<input id="dicomUpload" type="file" accept="application/dicom" multiple />--> 
                 <!--Only Chrome supports webkitdirectory-->
                 <div id="inputContainer" class="ui-toolbar ui-widget-header">
                     <input id="dicomUpload" type="file" value="Upload file" webkitdirectory multiple />

diff --git a/js/DcmViewer.js b/js/DcmViewer.js
@@ -40,7 +40,7 @@ DcmViewer.prototype.showSeries = function(files) {
 };
 
 DcmViewer.prototype.inputHandler = function(e) {
-    
+
 };
 
 DcmViewer.prototype.eventHandler = function(e) {
@@ -94,7 +94,7 @@ DcmViewer.prototype.scrollOne = function(num) {
         this.painters[i].drawImg();
         // Update instance number
         var instanceNum = this.painters[i].currentFile.InstanceNumber ? this.painters[i].currentFile.InstanceNumber : ' - ';
-        $(getSelector(this.painters[i])  + ' #instanceNum').text(instanceNum + ' / ' + this.numFiles);
+        $(getSelector(this.painters[i]) + ' #instanceNum').text(instanceNum + ' / ' + this.numFiles);
     }
 };
 
@@ -117,9 +117,12 @@ DcmViewer.prototype.matrixHandler = function(e) {
             //var newSize = Math.min(cellWidth, cellHeight);
             var tmpId = '#' + rowName + ' #column' + x;
             var newId = 'canvas' + x + '' + y;
-            $(tmpId).append('<canvas id="' + newId + '" width="' + cellWidth + '" height="' + cellHeight + '">Your browser does not support HTML5 canvas</canvas>');
-            $(tmpId).append('<div class="studyInfo"></div>');
-            $(tmpId).append('<div class="patientInfo"></div>');
+            var newId2 = 'content' + x + '' + y;
+            $(tmpId).append('<div id="' + newId2 + '" class="viewerCellContent" style="display:block;"></div>');
+
+            $('#' + newId2).append('<canvas id="' + newId + '" width="' + cellWidth + '" height="' + cellHeight + '">Your browser does not support HTML5 canvas</canvas>');
+            $('#' + newId2).append('<div class="studyInfo"></div>');
+            $('#' + newId2).append('<div class="patientInfo"></div>');
 
             var tmpPainter = new CanvasPainter(newId);
             newPainters.push(tmpPainter);
@@ -133,6 +136,15 @@ DcmViewer.prototype.matrixHandler = function(e) {
             }
         }
     }
+    // Show or hide infos
+    if($('.studyInfo').is(':visible')) {
+        $('.studyInfo').hide();
+        $('.patientInfo').hide();
+    } else {
+        $('.studyInfo').show();
+        $('.patientInfo').show();
+    }
+
     this.painters = newPainters;
 };