From 20efd80c01d9d2a7038dad340bd59d089543e14f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Elo=C3=ADzio=20Salgado?= <eloisalgado@gmail.com>
Date: Tue, 7 Feb 2017 18:47:39 -0200
Subject: [PATCH] Overriding getImageId in OHIFInstanceMetadata and fixing
 OHIFViewer to add display sets properly

---
 OHIFViewer/client/components/viewer/viewer.js         |  6 ++++++
 Packages/ohif-metadata/client/OHIFInstanceMetadata.js | 10 ++++++++++
 2 files changed, 16 insertions(+)

diff --git a/OHIFViewer/client/components/viewer/viewer.js b/OHIFViewer/client/components/viewer/viewer.js
index 62499513f..89af53a7e 100644
--- a/OHIFViewer/client/components/viewer/viewer.js
+++ b/OHIFViewer/client/components/viewer/viewer.js
@@ -105,7 +105,13 @@ Template.viewer.onCreated(() => {
 
     ViewerData[contentId].studyInstanceUids = [];
     instance.data.studies.forEach(study => {
+        const studyMetadata = new OHIF.metadata.StudyMetadata(study);
+        const displaySets = OHIF.viewerbase.sortingManager.getDisplaySets(studyMetadata);
+
+        studyMetadata.setDisplaySets(displaySets);
+
         study.selected = true;
+        study.displaySets = displaySets;
         OHIF.viewer.Studies.insert(study);
         OHIF.viewer.StudyMetadataList.insert(studyMetadata);
         ViewerData[contentId].studyInstanceUids.push(study.studyInstanceUid);
diff --git a/Packages/ohif-metadata/client/OHIFInstanceMetadata.js b/Packages/ohif-metadata/client/OHIFInstanceMetadata.js
index 1d5ae9e0b..27f8d83ef 100644
--- a/Packages/ohif-metadata/client/OHIFInstanceMetadata.js
+++ b/Packages/ohif-metadata/client/OHIFInstanceMetadata.js
@@ -49,6 +49,16 @@ export class OHIFInstanceMetadata extends InstanceMetadata {
         return (propertyName in data);
     }
 
+    // Override
+    getImageId() {
+        // If _imageID is not cached, create it
+        if (this._imageId === null) {
+            this._imageId = Viewerbase.getImageId(this.getData());
+        }
+
+        return this._imageId;
+    }
+
     /**
      * Static methods
      */