Download as
Browse Code »

Commit bd3009df9b354a5cb0e09962b46c578942868a7e

Authored by Thiago Franco de Moraes
1 parent 5723fa2b
Exists in watershed

Fixed the problem of not deleting watershed interactor style

Showing 1 changed file with 6 additions and 4 deletions   Show diff stats
invesalius/data/styles.py
  Diff comments   View file @bd3009d
... ... @@ -672,6 +672,8 @@ class WaterShedInteractorStyle(DefaultInteractorStyle):
672 672 self.foreground = False
673 673 self.background = False
674 674  
  675 + self.mg_size = 3
  676 +
675 677 self.picker = vtk.vtkWorldPointPicker()
676 678  
677 679 self.AddObserver("EnterEvent", self.OnEnterInteractor)
... ... @@ -699,6 +701,8 @@ class WaterShedInteractorStyle(DefaultInteractorStyle):
699 701 def CleanUp(self):
700 702 #self._remove_mask()
701 703 self.viewer.slice_.qblend[self.orientation] = {}
  704 + Publisher.unsubscribe(self.expand_watershed, 'Expand watershed to 3D ' + self.orientation)
  705 + self.RemoveAllObservers()
702 706  
703 707 def _create_mask(self):
704 708 if self.matrix is None:
... ... @@ -743,7 +747,6 @@ class WaterShedInteractorStyle(DefaultInteractorStyle):
743 747 def WOnScrollForward(self, obj, evt):
744 748 viewer = self.viewer
745 749 iren = viewer.interactor
746   - print "AUIQ"
747 750 if iren.GetControlKey():
748 751 if viewer.slice_.opacity < 1:
749 752 viewer.slice_.opacity += 0.1
... ... @@ -921,8 +924,7 @@ class WaterShedInteractorStyle(DefaultInteractorStyle):
921 924 wl = self.viewer.slice_.window_level
922 925  
923 926 #tmp_image = get_LUT_value(image, ww, wl).astype('uint16')
924   - tmp_image = ndimage.morphological_gradient(get_LUT_value(image, ww, wl).astype('uint16'), 3)
925   - imsave('/tmp/manolo.png', tmp_image)
  927 + tmp_image = ndimage.morphological_gradient(get_LUT_value(image, ww, wl).astype('uint16'), self.mg_size)
926 928 print tmp_image.dtype, tmp_image.min(), tmp_image.max()
927 929 tmp_mask = watershed(tmp_image, markers)
928 930  
... ... @@ -1031,7 +1033,7 @@ class WaterShedInteractorStyle(DefaultInteractorStyle):
1031 1033 mask = self.viewer.slice_.current_mask.matrix[1:, 1:, 1:]
1032 1034 ww = self.viewer.slice_.window_width
1033 1035 wl = self.viewer.slice_.window_level
1034   - tmp_image = ndimage.morphological_gradient(get_LUT_value(image, ww, wl).astype('uint16'), 5)
  1036 + tmp_image = ndimage.morphological_gradient(get_LUT_value(image, ww, wl).astype('uint16'), self.mg_size)
1035 1037 print tmp_image
1036 1038 tmp_mask = watershed(tmp_image, markers)
1037 1039  
... ...