Merge pull request #386 from SCIInstitute/segmentation-data-loading-fix

Fix segmentation data erroniously rendering as image data
MedVIC-Lab · Jul 11, 2024 · fc3a3c6 · fc3a3c6
2 parents 76da0a0 + 47c5a63
commit fc3a3c6
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 8 deletions.
diff --git a/web/shapeworks/src/components/ShapeViewer/methods.js b/web/shapeworks/src/components/ShapeViewer/methods.js
@@ -228,7 +228,7 @@ export default {
                             colorMode: ColorMode.MAP_SCALARS,
                             scalarMode: ScalarMode.USE_POINT_FIELD_DATA,
                         });
-                        if (shapeData.getClassName() == 'vtkImageData') {
+                        if (shapeData.getClassName() == 'vtkImageData' && layerName === 'Original - Image') {
                             this.addImage(shapeData, renderer)
                         } else {
                             if (shapeData.getClassName() == 'vtkPolyData') {

diff --git a/web/shapeworks/src/store/constants.ts b/web/shapeworks/src/store/constants.ts
@@ -59,6 +59,7 @@ export const layers = ref<Record<string, any>[]>([
 
 export const vtkShapesByType = ref<Record<string, any[]>>({
     "Original": [],
+    "Original - Image": [],
     "Groomed": [],
     "Reconstructed": [],
     "Particles": [],

diff --git a/web/shapeworks/src/views/Main.vue b/web/shapeworks/src/views/Main.vue
@@ -435,14 +435,15 @@ export default {
                                 (dataObject) => {
                                     const shapePromises: Promise<vtkPolyData | vtkImageData>[] = [];
                                     if(layersShown.value.includes("Original")){
-                                      shapePromises.push(
-                                        imageReader(
-                                            dataObject.file,
-                                            shortFileName(dataObject.file),
-                                            "Original",
-                                            dataObject.anatomy_type && { domain: dataObject.anatomy_type.replace('anatomy_', '') }
+                                        const layerLabel = dataObject.anatomy_type ? 'Original' : 'Original - Image'
+                                        shapePromises.push(
+                                            imageReader(
+                                                dataObject.file,
+                                                shortFileName(dataObject.file),
+                                                layerLabel,
+                                                dataObject.anatomy_type && { domain: dataObject.anatomy_type.replace('anatomy_', '') }
+                                            )
                                         )
-                                      )
                                     }
                                     if(layersShown.value.includes("Groomed")){
                                         if (