Improvements in surface overwritting

Thiago Franco de Moraes
1 parent a27efd65
Showing 3 changed files with 17 additions and 9 deletions Show diff stats
invesalius/control.py
invesalius/data/surface.py
invesalius/reader/dicom.py
@@ -917,6 +917,9 @@ class Controller():
         sop_class_uid = dicom.acquisition.sop_class_uid
         xyspacing = dicom.image.spacing
         orientation = dicom.image.orientation_label
+        samples_per_pixel = dicom.image.samples_per_pixel
+
+        print(f"\n\n\n\n{samples_per_pixel =}\n\n\n")
         wl = float(dicom.image.level)
         ww = float(dicom.image.window)
@@ -424,8 +424,11 @@ class SurfaceManager():
         actor.GetProperty().SetOpacity(1-surface.transparency)
         if overwrite and self.actors_dict.keys():
-            old_actor = self.actors_dict[index]
-            Publisher.sendMessage('Remove surface actor from viewer', actor=old_actor)
+            try:
+                old_actor = self.actors_dict[index]
+                Publisher.sendMessage('Remove surface actor from viewer', actor=old_actor)
+            except KeyError:
+                pass
         self.actors_dict[surface.index] = actor
@@ -955,13 +955,14 @@ class Parser():
         Critical DICOM tag (0x0028,0x0002). Cannot be edited.
         """
-        tag = gdcm.Tag(0x0028, 0x0002)
-        sf = gdcm.StringFilter()
-        sf.SetFile(self.gdcm_reader.GetFile())
-        res = sf.ToStringPair(tag)
-        if (res[1]):
-            return int(res[1])
-        return ""
+        try:
+            data = self.data_image[str(0x0028)][str(0x0002)]
+        except KeyError:
+            data = 1
+
+        if not data:
+            return 1
+        return data
     def GetPhotometricInterpretation(self):
         """
@@ -1967,6 +1968,7 @@ class Image(object):
         self.thumbnail_path = parser.thumbnail_path
         self.number_of_frames = parser.GetNumberOfFrames()
+        self.samples_per_pixel = parser.GetImageSamplesPerPixel()
         if (parser.GetImageThickness()):
             self.spacing.append(parser.GetImageThickness())