FIX: Fixed window and level in 3D slice

Paulo Henrique Junqueira Amorim
1 parent ebda1724
Showing 4 changed files with 32 additions and 25 deletions Show diff stats
invesalius/control.py
invesalius/data/slice_.py
invesalius/data/viewer_slice.py
invesalius/data/viewer_volume.py
@@ -353,7 +353,7 @@ class Controller():
         ps.Publisher().sendMessage('Load slice to viewer',
                         (proj.imagedata,
                         proj.mask_dict))
-        #ps.Publisher().sendMessage('Load slice plane')
+        ps.Publisher().sendMessage('Load slice plane')
         ps.Publisher().sendMessage('Bright and contrast adjustment image',\
                                    (proj.window, proj.level))
         ps.Publisher().sendMessage('Update window level value',\
@@ -675,29 +675,37 @@ class Slice(object):
         cast.ClampOverflowOn()
         cast.Update()
-        flip = vtk.vtkImageFlip()
-        flip.SetInput(cast.GetOutput())
-        flip.SetFilteredAxis(1)
-        flip.FlipAboutOriginOn()
-        flip.Update()
-        widget.SetInput(flip.GetOutput())
+        if (original_orientation == const.AXIAL):
+            flip = vtk.vtkImageFlip()
+            flip.SetInput(cast.GetOutput())
+            flip.SetFilteredAxis(1)
+            flip.FlipAboutOriginOn()
+            flip.Update()
+            widget.SetInput(flip.GetOutput())
+        else:
+            widget.SetInput(cast.GetOutput())
     def UpdateSlice3D(self, pubsub_evt):
         widget, orientation = pubsub_evt.data
         img = self.buffer_slices[orientation].vtk_image
-
+        original_orientation = Project().original_orientation
         cast = vtk.vtkImageCast()
         cast.SetInput(img)
         cast.SetOutputScalarTypeToDouble() 
         cast.ClampOverflowOn()
         cast.Update()
-        flip = vtk.vtkImageFlip()
-        flip.SetInput(cast.GetOutput())
-        flip.SetFilteredAxis(1)
-        flip.FlipAboutOriginOn()
-        flip.Update()
-        widget.SetInput(flip.GetOutput())
+        if (original_orientation == const.AXIAL):
+            flip = vtk.vtkImageFlip()
+            flip.SetInput(cast.GetOutput())
+            flip.SetFilteredAxis(1)
+            flip.FlipAboutOriginOn()
+            flip.Update()
+            widget.SetInput(flip.GetOutput())
+        else:
+            widget.SetInput(cast.GetOutput())
+
+
     def CreateMask(self, imagedata=None, name=None, colour=None,
                     opacity=None, threshold_range=None,
@@ -351,6 +351,8 @@ class Viewer(wx.Panel):
         window, level = pubsub_evt.data
         self.acum_achange_window, self.acum_achange_level = (window, level)
         self.SetWLText(window, level)
+        ps.Publisher().sendMessage('Update all slice')
+
     def OnChangeSliceMove(self, evt, obj):
         if (self.left_pressed):
@@ -821,7 +823,7 @@ class Viewer(wx.Panel):
         ps.Publisher().subscribe(self.RemoveActors, ('Remove actors', ORIENTATIONS[self.orientation]))
         ps.Publisher().subscribe(self.ReloadActualSlice, 'Reload actual slice')
-            
+
     def SetDefaultCursor(self, pusub_evt):
         self.interactor.SetCursor(wx.StockCursor(wx.CURSOR_DEFAULT))
@@ -1150,15 +1152,6 @@ class Viewer(wx.Panel):
     def UpdateSlice3D(self, pos):
         original_orientation = project.Project().original_orientation
         pos = self.scroll.GetThumbPosition()
-        #if (self.orientation == "CORONAL") and \
-        #    (original_orientation == const.AXIAL):
-        #    pos = abs(self.scroll.GetRange() - pos)
-        #elif(self.orientation == "AXIAL") and \
-        #    (original_orientation == const.CORONAL):
-        #        pos = abs(self.scroll.GetRange() - pos)
-        #elif(self.orientation == "AXIAL") and \
-        #    (original_orientation == const.SAGITAL):            
-        #        pos = abs(self.scroll.GetRange() - pos)
         ps.Publisher().sendMessage('Change slice from slice plane',\
                                    (self.orientation, pos))
@@ -1179,7 +1172,6 @@ class Viewer(wx.Panel):
     def OnScrollBarRelease(self, evt):
         pos = self.scroll.GetThumbPosition()
-        #self.UpdateSlice3D(pos)
         evt.Skip()
     def OnKeyDown(self, evt=None, obj=None):
@@ -806,6 +806,7 @@ class SlicePlane:
         ps.Publisher().subscribe(self.Enable, 'Enable plane')
         ps.Publisher().subscribe(self.Disable, 'Disable plane')
         ps.Publisher().subscribe(self.ChangeSlice, 'Change slice from slice plane')
+        ps.Publisher().subscribe(self.UpdateAllSlice, 'Update all slice')
     def Create(self):
         plane_x = self.plane_x = vtk.vtkImagePlaneWidget()
@@ -918,6 +919,12 @@ class SlicePlane:
         self.Render()
+    def UpdateAllSlice(self, pubsub_evt):
+        ps.Publisher().sendMessage('Update slice 3D', (self.plane_y,"CORONAL"))
+        ps.Publisher().sendMessage('Update slice 3D', (self.plane_x,"SAGITAL"))
+        ps.Publisher().sendMessage('Update slice 3D', (self.plane_z,"AXIAL"))
+               
+
     def DeletePlanes(self):
         del self.plane_x
         del self.plane_y
	@@ -353,7 +353,7 @@ class Controller():		@@ -353,7 +353,7 @@ class Controller():
353	ps.Publisher().sendMessage('Load slice to viewer',	353	ps.Publisher().sendMessage('Load slice to viewer',
354	(proj.imagedata,	354	(proj.imagedata,
355	proj.mask_dict))	355	proj.mask_dict))
356	- #ps.Publisher().sendMessage('Load slice plane')	356	+ ps.Publisher().sendMessage('Load slice plane')
357	ps.Publisher().sendMessage('Bright and contrast adjustment image',\	357	ps.Publisher().sendMessage('Bright and contrast adjustment image',\
358	(proj.window, proj.level))	358	(proj.window, proj.level))
359	ps.Publisher().sendMessage('Update window level value',\	359	ps.Publisher().sendMessage('Update window level value',\