Tool cleanup

Author: daniel-lundin

index.html

@@ -57,10 +57,22 @@
         $("#test-scroll").click(function() {
             testscroll(0, app.files.length);
         });
+        // Setup cluts
         for(clut in cluts) {
             $("#clut-select optgroup").append($("<option>").val(clut).text(clut));
         }
 
+        // Setup tools
+        for(tool in tools) {
+            var button = $("<div>").addClass("tool-button").text(tool);
+            $("#button-bar-horz").prepend(button);
+            $(button).click(function() {
+                $(this).parent().find("div").removeClass("butt-selected");
+                $(this).addClass("butt-selected");
+                app.activate_tool(tool);
+            });
+        }
+
         $("#slider").slider();
 
         $("button").button();
@@ -141,22 +153,6 @@
         });
  */
 
-        $("#butt-measure").click(function() {
-            //$(this).parent().find("div").removeClass("butt-selected");
-            //$(this).addClass("butt-selected");
-            //app.activate_measure_tool();
-        });
-
-        $("#butt-windowing").click(function() {
-            $(this).parent().find("div").removeClass("butt-selected");
-            $(this).addClass("butt-selected");
-            app.activate_window_level_tool();
-        });
-        $("#butt-zooming").click(function() {
-            $(this).parent().find("div").removeClass("butt-selected");
-            $(this).addClass("butt-selected");
-            app.activate_zoom_pan();
-        });
         $("#butt-reset").click(function() {
             app.reset_levels();
         });
@@ -209,14 +205,8 @@ <h2>Viewer</h2>
                 </optgroup>
             </select>
             <div id="button-bar-horz">
-                <!--<div id="butt-measure" class="tool-button">Measure</div>-->
-                <div id="butt-windowing" class="tool-button butt-selected">Windowing</div>
-                <div id="butt-zooming" class="tool-button">Zoom/Pan</div>
                 <div id="butt-reset" class="tool-button">Reset</div>
             </div>
-            <!--    jj<div id="info" >
-              Density: <div id="density"></div>
-            </div>-->
         </div>
 
         <div class="slider-holder">

js/app.js

@@ -267,25 +267,14 @@ DcmApp.prototype.draw_image = function() {
     this.painter.draw_image();
 }
 
-
 DcmApp.prototype.fill_metadata_table = function() {
     if(this.files.length == 0)
         return;
     fill_metadata_table(this.files[this.curr_file_idx]);
 }
 
-DcmApp.prototype.activate_measure_tool = function() { 
-    this.curr_tool = new MeasureTool(this);
-    this.curr_tool.set_file(this.files[this.curr_file_idx]);
-}
-
-DcmApp.prototype.activate_window_level_tool = function() { 
-    this.curr_tool = new WindowLevelTool(this);
-    this.curr_tool.set_file(this.files[this.curr_file_idx]);
-}
-
-DcmApp.prototype.activate_zoom_pan = function() { 
-    this.curr_tool = new ZoomPanTool(this);
+DcmApp.prototype.activate_tool = function(tool_identifier) { 
+    this.curr_tool = new tools[tool_identifier](this);
     this.curr_tool.set_file(this.files[this.curr_file_idx]);
 }
 

js/glpainter.js

@@ -367,7 +367,6 @@ GLPainter.prototype.draw_image = function() {
 
 
 }
-off = (1 << (15 - 1));
 
 GLPainter.prototype.init = function(canvasid) {
 

js/tools.js

@@ -77,6 +77,7 @@ function MeasureTool(app) {
     this.set_file = function(file) {
         this.file = file;
     }
+    return this;
 }
 
 function WindowLevelTool(app) {
@@ -117,6 +118,7 @@ function WindowLevelTool(app) {
 
     this.set_file = function(file) {
     }
+    return this;
 }
 
 function ZoomPanTool(app) {
@@ -164,4 +166,10 @@ function ZoomPanTool(app) {
 
     this.set_file = function(file) {
     }
+    return this;
+}
+
+tools = {
+    'Windowing': WindowLevelTool,
+    'Zoom/Pan': ZoomPanTool,
 }