src/views/trials/trials-panel/reading/dicoms3D/components/PetCtViewport.vue

@@ -691,55 +691,51 @@ export default {
 
     },
     cornerstoneToolsMouseMove(e) {
-      try {
+      const { currentPoints } = e.detail
-        const { currentPoints } = e.detail
+      const worldPoint = currentPoints.world
-        const worldPoint = currentPoints.world
+      const renderingEngine = getRenderingEngine(this.renderingEngineId)
-        const renderingEngine = getRenderingEngine(this.renderingEngineId)
+      const viewport = renderingEngine.getViewport(this.viewportId)
-        const viewport = renderingEngine.getViewport(this.viewportId)
+      let referencedImageId = viewport.getCurrentImageId()
-        let referencedImageId = viewport.getCurrentImageId()
+      const data = viewport.getImageData()
-        const data = viewport.getImageData()
+      if (!data) return
-        if (!data || !referencedImageId) return
+      const { dimensions, imageData, metadata, voxelManager } = data
-        const { dimensions, imageData, metadata, voxelManager } = data
+      const index = imageData.worldToIndex(worldPoint)
-        const index = imageData.worldToIndex(worldPoint)
+      index[0] = Math.floor(index[0])
-        index[0] = Math.floor(index[0])
+      index[1] = Math.floor(index[1])
-        index[1] = Math.floor(index[1])
+      index[2] = Math.floor(index[2])
-        index[2] = Math.floor(index[2])
+      this.mousePosition.index = index
-        this.mousePosition.index = index
+      const modality = metadata.Modality
-        const modality = metadata.Modality
+      let ijk = csUtils.transformWorldToIndex(imageData, worldPoint)
-        let ijk = csUtils.transformWorldToIndex(imageData, worldPoint)
+      ijk = vec3.round(ijk, ijk);
-        ijk = vec3.round(ijk, ijk);
+      if (csUtils.indexWithinDimensions(ijk, dimensions)) {
-        if (csUtils.indexWithinDimensions(ijk, dimensions)) {
+        this.isHandleOutsideImage = false
-          this.isHandleOutsideImage = false
+        let value = voxelManager.getAtIJKPoint(ijk)
-          let value = voxelManager.getAtIJKPoint(ijk)
+        ijk[2] = viewport.getCurrentImageIdIndex()
-          ijk[2] = viewport.getCurrentImageIdIndex()
+        let modalityUnit
-          let modalityUnit
+        if (modality === 'US') {
-          if (modality === 'US') {
+          const calibratedResults = cornerstoneTools.utilities.getCalibratedProbeUnitsAndValue(image, [ijk])
-            const calibratedResults = cornerstoneTools.utilities.getCalibratedProbeUnitsAndValue(image, [ijk])
+          const hasEnhancedRegionValues = calibratedResults.values.every(
-            const hasEnhancedRegionValues = calibratedResults.values.every(
+            (value) => value !== null
-              (value) => value !== null
+          )
-            )
+          value = (hasEnhancedRegionValues ? calibratedResults.values : value)
-            value = (hasEnhancedRegionValues ? calibratedResults.values : value)
+          modalityUnit = hasEnhancedRegionValues
-            modalityUnit = hasEnhancedRegionValues
+            ? calibratedResults.units
-              ? calibratedResults.units
+            : 'raw';
-              : 'raw';
+        } else {
-          } else {
+          const scalingModule = referencedImageId && metaData.get('scalingModule', referencedImageId)
-            const scalingModule = referencedImageId && metaData.get('scalingModule', referencedImageId)
+          const isSuvScaled = typeof scalingModule?.suvbw === 'number'
-            const isSuvScaled = typeof scalingModule?.suvbw === 'number'
+          const pixelUnitsOptions = {
-            const pixelUnitsOptions = {
+            isPreScaled: cornerstoneTools.utilities.viewport.isViewportPreScaled(viewport, referencedImageId),
-              isPreScaled: cornerstoneTools.utilities.viewport.isViewportPreScaled(viewport, referencedImageId),
+            isSuvScaled: isSuvScaled,
-              isSuvScaled: isSuvScaled,
-            }
-            modalityUnit = cornerstoneTools.utilities.getPixelValueUnits(
-              modality,
-              referencedImageId,
-              pixelUnitsOptions
-            );
           }
-          this.mousePosition.value = value
+          modalityUnit = cornerstoneTools.utilities.getPixelValueUnits(
-          this.mousePosition.modalityUnit = modalityUnit
+            modality,
+            referencedImageId,
+            pixelUnitsOptions
+          );
         }
-      } catch(e) {
+        this.mousePosition.value = value
-        console.log(e)
+        this.mousePosition.modalityUnit = modalityUnit
       }
     },
     toggleTask(evt, visitTaskNum, i) {

src/views/trials/trials-panel/reading/dicoms3D/components/colorMap.vue

@@ -71,7 +71,6 @@ export default {
             range: 40,
             upper: 6,
             isSlideMoving: false,
-            req: null
         }
     },
     mounted() {
@@ -138,37 +137,36 @@ export default {
             })
             document.addEventListener('mousemove', (e) => {
                 if (this.isSlideMoving) {
-                    if (this.req) return;
+                    var containerWidth = container.clientWidth
-                    this.req = requestAnimationFrame(() => {
+                    var sliderWidth = sliderBox.clientWidth
-                        this.req = null;
+                    var maxLeft = containerWidth - sliderWidth
-                        var containerWidth = container.clientWidth
+                    if (maxLeft <= 0) return
-                        var sliderWidth = sliderBox.clientWidth
-                        var maxLeft = containerWidth - sliderWidth
-                        if (maxLeft <= 0) return
 
-                        var left = e.clientX - container.getBoundingClientRect().left
+                    var left = e.clientX - container.getBoundingClientRect().left
-                        if (left < 0) {
+                    var position = null
-                            left = 0
+                    position = left
-                        } else if (left > maxLeft) {
+                    if (left < 0) {
-                            left = maxLeft
+                        left = 6
-                        }
+                        position = 0
-                        var position = left
+                    } else if (left > maxLeft) {
+                        left = maxLeft + 6
+                        position = maxLeft
+                    }
 
-                        slider.style.left = (left + 6) + 'px'
+                    slider.style.left = left + 'px'
-                        var positionValue = document.getElementById('slider-position')
+                    var positionValue = document.getElementById('slider-position')
-                        var upper = Number(this.range) || 0
+                    var upper = Number(this.range) || 0
-                        position = parseInt((position / maxLeft) * upper)
+                    position = parseInt((position / maxLeft) * upper)
-                        if (position > upper) position = upper
+                    if (position > upper) position = upper
-                        if (position < 0) position = 0
+                    if (position < 0) position = 0
-                        
+                    
-                        if (this.modality === 'NM') {
+                    if (this.modality === 'NM') {
-                            positionValue.textContent = upper > 0 ? Math.round((position / upper) * 100) + '%' : '0%'
+                        positionValue.textContent = upper > 0 ? Math.round((position / upper) * 100) + '%' : '0%'
-                        } else {
+                    } else {
-                            positionValue.textContent = position
+                        positionValue.textContent = position
-                        }
+                    }
-                        this.upper = position
+                    this.upper = position
-                        this.voiChange(position)
+                    this.voiChange(position)
-                    });
                 }
             })
             document.addEventListener('mouseup', () => {