From 876cc5834821c44b66b01f7003e8de6e1b27ff22 Mon Sep 17 00:00:00 2001
From: Danny Brown <danny.ri.brown@gmail.com>
Date: Thu, 17 Sep 2020 16:28:41 -0400
Subject: [PATCH] fix: use instance number instead of index number in stack
 (#2046)

---
 .../PanelMeasurementTableTracking/index.js    | 28 ++-----------------
 1 file changed, 2 insertions(+), 26 deletions(-)

diff --git a/extensions/measurement-tracking/src/panels/PanelMeasurementTableTracking/index.js b/extensions/measurement-tracking/src/panels/PanelMeasurementTableTracking/index.js
index b9e1d2474..a1f7cfbf9 100644
--- a/extensions/measurement-tracking/src/panels/PanelMeasurementTableTracking/index.js
+++ b/extensions/measurement-tracking/src/panels/PanelMeasurementTableTracking/index.js
@@ -317,17 +317,12 @@ function _mapMeasurementToDisplay(measurement, types, DisplaySetService) {
     );
   }
 
-  const oneBasedImageIdIndex = _getOneBasedImageIdIndex(
-    displaySets,
-    SOPInstanceUID
-  );
-  const { PixelSpacing, SeriesNumber } = instance;
-
+  const { PixelSpacing, SeriesNumber, InstanceNumber } = instance;
   const displayText = _getDisplayText(
     measurement,
     PixelSpacing,
     SeriesNumber,
-    oneBasedImageIdIndex,
+    InstanceNumber,
     types
   );
 
@@ -340,25 +335,6 @@ function _mapMeasurementToDisplay(measurement, types, DisplaySetService) {
   };
 }
 
-/**
- *
- * @param {*} displaySets An array of displaySets relating to a given series.
- * @param {*} SOPInstanceUID The SOPInstanceUID to find.
- * @returns {number} The one-based imageIdIndex.
- */
-function _getOneBasedImageIdIndex(displaySets, SOPInstanceUID) {
-  for (let ds = 0; ds < displaySets.length; ds++) {
-    const displaySet = displaySets[0];
-    const { images } = displaySet;
-
-    for (let i = 0; i < images.length; i++) {
-      if (images[i].SOPInstanceUID === SOPInstanceUID) {
-        return i + 1; // We want the instack position 1-based.
-      }
-    }
-  }
-}
-
 /**
  *
  * @param {*} measurement