From e75330fe87afe86e6d7096edee35be94a5df631f Mon Sep 17 00:00:00 2001
From: "Emanuel F. Oliveira" <emfolg@gmail.com>
Date: Thu, 9 Feb 2017 12:13:56 -0200
Subject: [PATCH] Fixing createStacks and imageThumbnail

---
 Packages/ohif-metadata/client/OHIFInstanceMetadata.js     | 4 ++--
 .../studyBrowser/imageThumbnail/imageThumbnail.js         | 2 +-
 .../client/lib/classes/metadata/InstanceMetadata.js       | 2 +-
 Packages/ohif-viewerbase/client/lib/createStacks.js       | 8 ++++----
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/Packages/ohif-metadata/client/OHIFInstanceMetadata.js b/Packages/ohif-metadata/client/OHIFInstanceMetadata.js
index 08578ee7b..d4acf9abc 100644
--- a/Packages/ohif-metadata/client/OHIFInstanceMetadata.js
+++ b/Packages/ohif-metadata/client/OHIFInstanceMetadata.js
@@ -87,10 +87,10 @@ export class OHIFInstanceMetadata extends InstanceMetadata {
     }
 
     // Override
-    getImageId() {
+    getImageId(frame) {
         // If _imageID is not cached, create it
         if (this._imageId === null) {
-            this._imageId = Viewerbase.getImageId(this.getData());
+            this._imageId = Viewerbase.getImageId(this.getData(), frame);
         }
 
         return this._imageId;
diff --git a/Packages/ohif-viewerbase/client/components/studyBrowser/imageThumbnail/imageThumbnail.js b/Packages/ohif-viewerbase/client/components/studyBrowser/imageThumbnail/imageThumbnail.js
index 640039fb5..d58945792 100644
--- a/Packages/ohif-viewerbase/client/components/studyBrowser/imageThumbnail/imageThumbnail.js
+++ b/Packages/ohif-viewerbase/client/components/studyBrowser/imageThumbnail/imageThumbnail.js
@@ -15,7 +15,7 @@ Template.imageThumbnail.onCreated(() => {
         const lastIndex = (stack.images.length || 1) - 1;
         const imageIndex = Math.floor(lastIndex / 2);
         const imageInstance = stack.images[imageIndex];
-        return getImageId(imageInstance.getData());
+        return imageInstance.getImageId();
     };
 });
 
diff --git a/Packages/ohif-viewerbase/client/lib/classes/metadata/InstanceMetadata.js b/Packages/ohif-viewerbase/client/lib/classes/metadata/InstanceMetadata.js
index 86e270d52..86c841083 100644
--- a/Packages/ohif-viewerbase/client/lib/classes/metadata/InstanceMetadata.js
+++ b/Packages/ohif-viewerbase/client/lib/classes/metadata/InstanceMetadata.js
@@ -154,7 +154,7 @@ export class InstanceMetadata extends Metadata {
      * Get custom image id of a sop instance
      * @return {Any}          sop instance image id
      */
-    getImageId() {
+    getImageId(frame) {
         /**
          * Please override this method
          */
diff --git a/Packages/ohif-viewerbase/client/lib/createStacks.js b/Packages/ohif-viewerbase/client/lib/createStacks.js
index 19a3065b3..c97693257 100644
--- a/Packages/ohif-viewerbase/client/lib/createStacks.js
+++ b/Packages/ohif-viewerbase/client/lib/createStacks.js
@@ -15,12 +15,12 @@ const makeDisplaySet = (series, instances) => {
     // set appropriate attributes to image set...
     imageSet.setAttributes({
         displaySetInstanceUid: imageSet.uid, // create a local alias for the imageSet UID
-        seriesInstanceUid: seriesData.seriesInstanceUid,
-        seriesNumber: seriesData.seriesNumber,
-        seriesDescription: seriesData.seriesDescription,
+        seriesInstanceUid: series.getSeriesInstanceUID(),
+        seriesNumber: instance.getRawValue('x00200011'),
+        seriesDescription: instance.getRawValue('x0008103e'),
         numImageFrames: instances.length,
         frameRate: instance.getRawValue('x00181063'),
-        modality: seriesData.modality,
+        modality: instance.getRawValue('x00080060'),
         isMultiFrame: isMultiFrame(instance)
     });