[dcm4che-commits] SF.net SVN: dcm4che:[18952] oviyam/oviyam/trunk/web

[<yog...@us...>]

Revision: 18952
          http://sourceforge.net/p/dcm4che/svn/18952
Author:   yogapraveen12
Date:     2021-02-19 06:17:41 +0000 (Fri, 19 Feb 2021)
Log Message:
-----------
OV-232 : Applying tools Invert, Zoom..etc after windowing resets image into black - FIXED.
Other minor issues fixed

Modified Paths:
--------------
    oviyam/oviyam/trunk/web/js/features.js
    oviyam/oviyam/trunk/web/js/toolactivator.js
    oviyam/oviyam/trunk/web/viewer_tools.html

Modified: oviyam/oviyam/trunk/web/js/features.js
===================================================================
--- oviyam/oviyam/trunk/web/js/features.js	2021-02-18 07:51:21 UTC (rev 18951)
+++ oviyam/oviyam/trunk/web/js/features.js	2021-02-19 06:17:41 UTC (rev 18952)
@@ -69,6 +69,9 @@
 						cnt+=1;
 						data = seriesData[cnt];
 					}
+					if (!sessionStorage[data['seriesUID']]) {
+						window.parent.getInstances(pat.pat_ID, pat.studyUID, data['seriesUID']);
+					}
            	   		var ser_Info = JSON.parse(sessionStorage[data['seriesUID']]);
            	   		ser_Info = ser_Info[0];
            	   		

Modified: oviyam/oviyam/trunk/web/js/toolactivator.js
===================================================================
--- oviyam/oviyam/trunk/web/js/toolactivator.js	2021-02-18 07:51:21 UTC (rev 18951)
+++ oviyam/oviyam/trunk/web/js/toolactivator.js	2021-02-19 06:17:41 UTC (rev 18952)
@@ -1,6 +1,6 @@
 var firstTry = true;
 var currentEvent, prevEvent;
-var probeEnabled = false, loadingPixelData = false;
+var probeEnabled = false, loadingPixelData = false, windowingChanged = false;
 var huValue;
 var speed;
 
@@ -367,6 +367,7 @@
 			let columns = imageData['nativeColumns'];
 			let index = (y * columns) + x;
 			probe.valid  = false;
+			jQuery('#huVal').hide();
 			if (x >= 0 && x <= columns
 					&& y >= 0 && y <= rows && !loadingPixelData) {
 				probe.valid  = true;
@@ -549,7 +550,10 @@
 		if (firstTry) {
 			firstTry = false;
 			doReset(toolid, tmpWindow);
+		} else {
+			   activateTools("windowing", activateWindowing);
 		}
+		activateTools("windowing", activateWindowing);
 	 } catch (error) {
 		console.error(error);
 		console.log('Dicom Image NOT AVAILABLE');
@@ -579,6 +583,7 @@
     var isMultiframe = inst_text[0].indexOf("Frame") >= 0;
     
     imageData = sessionStorage.getItem(seriesUid);
+    tmpWindow.oneTimeTool();
 
     imageData = JSON.parse(imageData);
     if (isMultiframe) {
@@ -590,7 +595,7 @@
     var stateVal = tmpWindow.state;
     stateVal.invert = stateVal.invert ? false : true;
     
-    if (!imageData['photometric'].indexOf('MONOCHROME') >= 0) {
+    if (!(imageData['photometric'].indexOf('MONOCHROME') >= 0)) {
         invertImage(tmpWindow);
         var tool = jQuery('#tool', tmpWindow.document).text();
 
@@ -636,7 +641,7 @@
 	var canvasLayer2 = document.getElementById('canvasLayer2');
 
 	var startCoords = [];
-
+	oneTimeTool();
 	canvasLayer2.onmousedown = function(e) {
 		if(e.which==1) {
 			state.drag = true;
@@ -1349,6 +1354,7 @@
             }
         }).mousedown(function(evt) {
             this.pixelData = tmpCtx.getImageData(0, 0, tmpCanvas.width, tmpCanvas.height);
+            windowingChanged = true;
             state.drag = true;
             mouseLocX = evt.pageX;
             mouseLocY = evt.pageY;
@@ -1496,6 +1502,7 @@
 			}
 		}).mousedown(function(evt) {
 			if(evt.which==1) {
+				windowingChanged = true;
 //				var isMultiframe = jQuery('#totalImages').html().indexOf('Frame')>=0;
 //				var iNo = isMultiframe ? frameInc : imgInc;
 				var inst_text = jQuery("#totalImages").text().split("/");
@@ -1679,7 +1686,7 @@
 	var canvasLayer2 = document.getElementById('canvasLayer2');
 	var canvas = document.getElementById('imageCanvas');
 	var lastY = 0,mY = 0,zoomInc = 1,scaleFac = 1.01,originX = 0,originY = 0;
-
+	oneTimeTool();
 	jQuery(canvasLayer2).mousedown(function(e) {
 		if(e.which==1) {
 			document.body.style.mozUserSelect = document.body.style.webkitUserSelect = document.body.style.userSelect = 'none';
@@ -1830,7 +1837,8 @@
 	var isMultiframe = (inst_text[0].indexOf("Frame")>=0);
 	var iNo = inst_text[0].split(":")[1];
 	var winPos = jQuery("#wltmpImg").attr("pos");
-	if(state.winPtr>=0 && state.winPtr==iNo && winPos!=iNo) {
+	if((state.winPtr>=0 && state.winPtr==iNo && winPos!=iNo) || !winPos || windowingChanged) {
+		windowingChanged = false;
 		loadImg(isMultiframe,iNo,inst_text[1]);
 	} else {
 		showImg(null,getCurrentImage(),true);

Modified: oviyam/oviyam/trunk/web/viewer_tools.html
===================================================================
--- oviyam/oviyam/trunk/web/viewer_tools.html	2021-02-18 07:51:21 UTC (rev 18951)
+++ oviyam/oviyam/trunk/web/viewer_tools.html	2021-02-19 06:17:41 UTC (rev 18952)
@@ -524,7 +524,7 @@
 
         <div class="toggleButton" align="center" id="measure">
             <img src="images/ruler.png" id="lblLines" class="imgOff" alt="Draw measurement lines" title="Draw Measurements" />
-            <ul id="measureContext" class="contextMenu" style="width:82px; position:fixed; background:#000;">
+            <ul id="measureContext" class="contextMenu" style="position:fixed; background:#000;">
                 <li><a id="line" href="#" class="selectedshape cmenuItem" onclick="jQuery('.selectedshape').removeClass('selectedshape'); jQuery(this).addClass('selectedshape'); doTool('ruler');">Ruler</a></li>
                 <li><a id="rectangle" href="#" class="cmenuItem" onclick="jQuery('.selectedshape').removeClass('selectedshape'); jQuery(this).addClass('selectedshape'); doTool('rectangle');">Rectangle</a></li>
                 <li><a id="oval" href="#" class="cmenuItem" onclick="jQuery('.selectedshape').removeClass('selectedshape'); jQuery(this).addClass('selectedshape'); doTool('oval'); ">Oval</a></li>

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.