Use javascript object instead of Map

Author: Alexis Girault

examples/Dicom/src/dicomForm.js

@@ -4,48 +4,63 @@ function setupDicomForm(patientDict, callback) {
   const studySelect = document.getElementById("studySelect")
   const serieSelect = document.getElementById("serieSelect")
 
-  patientSelect.length = 1; // remove all options bar first
-  const patients = Array.from(patientDict.values())
-  patientDict.forEach((patient) => {
+  // Remove options
+  var patients = []
+  var studies = []
+  var series = []
+  patientSelect.length = 1;
+
+  // Add patients
+  for (const key in patientDict) {
+    const patient = patientDict[key]
+    patients.push(patient)
     const value = patient.patientName + " - " + patient.patientDateOfBirth
     patientSelect.options[patientSelect.options.length] = new Option(value, value);
-  })
+  }
 
   patientSelect.onchange = function () {
-    studySelect.length = 1; // remove all options bar first
-    serieSelect.length = 1; // remove all options bar first
+    // Remove options
+    studies = []
+    series = []
+    studySelect.length = 1;
+    serieSelect.length = 1;
+
     if (this.selectedIndex < 1) return; // done
+
+    // Add underneath studies
     const patientId = this.selectedIndex - 1
     const patient = patients[patientId]
-    patient.studyDict.forEach((study) => {
+    for (const key in patient.studyDict) {
+      const study = patient.studyDict[key]
+      studies.push(study)
       const value = study.studyDescription + " - " + study.studyDate
       studySelect.options[studySelect.options.length] = new Option(value, value);
-    })
+    }
   }
   patientSelect.onchange(); // reset in case page is reloaded
 
   studySelect.onchange = function () {
-    serieSelect.length = 1; // remove all options bar first
+    // Remove options
+    series = []
+    serieSelect.length = 1;
+
     if (this.selectedIndex < 1) return; // done
-    const patientId = patientSelect.selectedIndex - 1
-    const patient = patients[patientId]
-    const studies = Array.from(patient.studyDict.values())
+
+    // Add underneath series
     const studyId = this.selectedIndex - 1
     const study = studies[studyId]
-    study.serieDict.forEach((serie) => {
+    for (const key in study.serieDict) {
+      const serie = study.serieDict[key]
+      series.push(serie)
       const value = serie.seriesDescription + " - " + serie.seriesModality
       serieSelect.options[serieSelect.options.length] = new Option(value, value);
-    })
+    }
   }
 
   serieSelect.onchange = function () {
     if (this.selectedIndex < 1) return; // done
-    const patientId = patientSelect.selectedIndex - 1
-    const patient = patients[patientId]
-    const studies = Array.from(patient.studyDict.values())
-    const studyId = studySelect.selectedIndex - 1
-    const study = studies[studyId]
-    const series = Array.from(study.serieDict.values())
+
+    // Return files for serie
     const serieId = this.selectedIndex - 1
     const serie = series[serieId]
     callback(serie.files)

examples/Dicom/src/parseDicomFiles.js

@@ -78,18 +78,18 @@ class DICOMPatient extends DICOMEntity {
 
   constructor() {
     super()
-    this.studyDict = new Map()
+    this.studyDict = {}
   }
 
   parseMetaData(dicomMetaData, file) {
     this.extractTags(dicomMetaData)
 
     const tag = DICOMStudy.primaryTag
     const studyId = dicomMetaData.string(DICOM_DICTIONARY[tag])
-    var study = this.studyDict.get(studyId)
+    var study = this.studyDict[studyId]
     if (study === undefined) {
       study = new DICOMStudy()
-      this.studyDict.set(studyId, study)
+      this.studyDict[studyId] = study
     }
     study.parseMetaData(dicomMetaData, file)
   }
@@ -113,18 +113,18 @@ class DICOMStudy extends DICOMEntity {
 
   constructor() {
     super()
-    this.serieDict = new Map()
+    this.serieDict = {}
   }
 
   parseMetaData(dicomMetaData, file) {
     this.extractTags(dicomMetaData)
 
     const tag = DICOMSerie.primaryTag
     const serieNumber = dicomMetaData.string(DICOM_DICTIONARY[tag])
-    var serie = this.serieDict.get(serieNumber)
+    var serie = this.serieDict[serieNumber]
     if (serie === undefined) {
       serie = new DICOMSerie()
-      this.serieDict.set(serieNumber, serie)
+      this.serieDict[serieNumber] = serie
     }
     serie.parseMetaData(dicomMetaData, file)
   }
@@ -161,7 +161,7 @@ class DICOMSerie extends DICOMEntity {
 }
 
 const parseDicomFiles = async (fileList) => {
-  var patientDict = new Map()
+  var patientDict = {}
 
   const parseFile = async (file) => {
     // Read
@@ -174,10 +174,10 @@ const parseDicomFiles = async (fileList) => {
     // Add to patientDict
     const tag = DICOMPatient.primaryTag
     const patientId = dicomMetaData.string(DICOM_DICTIONARY[tag])
-    var patient = patientDict.get(patientId)
+    var patient = patientDict[patientId]
     if (patient === undefined) {
       patient = new DICOMPatient()
-      patientDict.set(patientId, patient)
+      patientDict[patientId] = patient
     }
     patient.parseMetaData(dicomMetaData, file)
   }