Avoid adding same mappings and segments twice

Author: hackermd

package-lock.json

@@ -86,6 +86,7 @@
     "dicomweb-client": "^0.8",
     "image-type": "^4.1",
     "mathjs": "^10.1",
-    "ol": "^6.15"
+    "ol": "^6.15",
+    "uuid": "^8.3.2"
   }
 }

package.json

@@ -75,8 +75,9 @@ class ParameterMapping {
   /**
    * @param {Object} options
    * @param {string} options.uid - Unique tracking identifier
-   * @param {number} options.number - Mapping Number (one-based index value)
-   * @param {string} options.label - Mapping Label
+   * @param {number} options.number - Parameter Number (one-based index value)
+   * @param {string} options.label - Parameter Label
+   * @param {string} options.description - Parameter Description
    * @param {string} options.studyInstanceUID - Study Instance UID of DICOM
    * Parametric Map instances
    * @param {string} options.seriesInstanceUID - Series Instance UID of DICOM
@@ -90,6 +91,7 @@ class ParameterMapping {
     uid,
     number,
     label,
+    description,
     studyInstanceUID,
     seriesInstanceUID,
     sopInstanceUIDs,
@@ -103,15 +105,20 @@ class ParameterMapping {
     }
 
     if (number === undefined) {
-      throw new Error('Mapping Number is required.')
+      throw new Error('Parameter Number is required.')
     }
     this[_attrs].number = number
 
     if (label === undefined) {
-      throw new Error('Mapping Label is required.')
+      throw new Error('Parameter Label is required.')
     }
     this[_attrs].label = label
 
+    if (description === undefined) {
+      throw new Error('Parameter Description is required.')
+    }
+    this[_attrs].description = description
+
     if (studyInstanceUID === undefined) {
       throw new Error('Study Instance UID is required.')
     }
@@ -142,7 +149,7 @@ class ParameterMapping {
   }
 
   /**
-   * Mapping Number.
+   * Parameter Number
    *
    * @type number
    */
@@ -151,14 +158,23 @@ class ParameterMapping {
   }
 
   /**
-   * Mapping Label
+   * Parameter Label
    *
    * @type string
    */
   get label () {
     return this[_attrs].label
   }
 
+  /**
+   * Parameter Description
+   *
+   * @type string
+   */
+  get description () {
+    return this[_attrs].description
+  }
+
   /**
    * Study Instance UID of DICOM Parametric Map instances.
    *

src/mapping.js

@@ -1,5 +1,8 @@
 import { inv, multiply } from 'mathjs'
 import { getPointResolution } from 'ol/proj'
+import { v4 as createUUIDv4, v5 as createUUIDv5 } from 'uuid'
+
+const _UUID_NAMESPACE = 'c4f09b11-bac0-4f3a-8dc1-9f0046637383'
 
 /**
  * Generates a UUID-derived DICOM UID with root `2.25`.
@@ -8,7 +11,7 @@ import { getPointResolution } from 'ol/proj'
  *
  * @private
  */
-function _generateUID () {
+function _generateUID ({ value } = {}) {
   /**
    * A UUID can be represented as a single integer value.
    * http://dicom.nema.org/medical/dicom/current/output/chtml/part05/sect_B.2.html
@@ -20,12 +23,15 @@ function _generateUID () {
    * the least significant bit as the least significant bit (bit 0) of the last
    * of the sixteen octets (octet 0).
    */
-  let uid = '2.25.' + Math.floor(1 + Math.random() * 9)
-  // FIXME: This is not a valid UUID!
-  while (uid.length < 44) {
-    uid += Math.floor(1 + Math.random() * 10)
+  let uuid
+  if (value != null) {
+    uuid = createUUIDv5(value, _UUID_NAMESPACE)
+  } else {
+    uuid = createUUIDv4()
   }
-  return uid
+  const hex = '0x' + uuid.replace(/-/g, '')
+  const decimal = BigInt(hex)
+  return '2.25.' + decimal.toString()
 }
 
 /**

src/utils.js

@@ -3246,8 +3246,10 @@ class VolumeImageViewer {
     refSegmentation.SegmentSequence.forEach((item, index) => {
       const segmentNumber = Number(item.SegmentNumber)
       console.info(`add segment # ${segmentNumber}`)
-      let segmentUID = _generateUID()
-      if (item.TrackingUID) {
+      let segmentUID = _generateUID({
+        value: refSegmentation.SOPInstanceUID + segmentNumber.toString()
+      })
+      if (item.TrackingUID != null) {
         segmentUID = item.TrackingUID
       }
 
@@ -3671,10 +3673,13 @@ class VolumeImageViewer {
 
     let index = 0
     for (const mappingNumber in mappingNumberToDescriptions) {
-      const mappingLabel = `${mappingNumber}`
       const mappingDescriptions = mappingNumberToDescriptions[mappingNumber]
       const refItem = mappingDescriptions[0]
-      let mappingUID = _generateUID()
+      const mappingLabel = refItem.LUTLabel
+      const mappingExplanation = refItem.LUTExplanation
+      let mappingUID = _generateUID({
+        value: refInstance.SOPInstanceUID + mappingLabel
+      })
       if (refItem.TrackingUID != null) {
         mappingUID = refItem.TrackingUID
       }
@@ -3724,7 +3729,7 @@ class VolumeImageViewer {
       }
       if (refInstance.PixelPresentation === 'MONOCHROME') {
         colormap = createColormap({
-          name: ColormapNames.GRAY,
+          name: ColormapNames.MAGMA,
           bins: Math.pow(2, 8)
         })
       } else {
@@ -3770,6 +3775,7 @@ class VolumeImageViewer {
           uid: mappingUID,
           number: mappingNumber,
           label: mappingLabel,
+          description: mappingExplanation,
           studyInstanceUID: refInstance.StudyInstanceUID,
           seriesInstanceUID: refInstance.SeriesInstanceUID,
           sopInstanceUIDs: pyramid.metadata.map(element => {
@@ -3971,7 +3977,6 @@ class VolumeImageViewer {
     }
 
     let title = mapping.mapping.label
-    // FIXME
     const padding = Math.round((16 - title.length) / 2)
     title = title.padStart(title.length + padding)
     title = title.padEnd(title.length + 2 * padding)