Returning true when a hole were filled

Thiago Franco de Moraes
1 parent 932566e7
Showing 3 changed files with 49 additions and 23 deletions Show diff stats
invesalius/data/floodfill.pyx
invesalius/data/mask.py
invesalius/gui/frame.py
@@ -6,6 +6,7 @@ from collections import deque
 from cython.parallel import prange
 from libc.math cimport floor, ceil
+from libcpp cimport bool
 from libcpp.deque cimport deque as cdeque
 from libcpp.vector cimport vector
@@ -237,22 +238,37 @@ def floodfill_auto_threshold(np.ndarray[image_t, ndim=3] data, list seeds, float
 @cython.wraparound(False)
 @cython.nonecheck(False)
 def fill_holes_automatically(np.ndarray[mask_t, ndim=3] mask, np.ndarray[np.uint16_t, ndim=3] labels, unsigned int nlabels, unsigned int max_size):
-        cdef np.ndarray[np.uint32_t, ndim=1] sizes = np.zeros(shape=(nlabels + 1), dtype=np.uint32)
-        cdef int x, y, z
-        cdef int dx, dy, dz
+    """
+    Fill mask holes automatically. The hole must <= max_size. Return True if any hole were filled.
+    """
+    cdef np.ndarray[np.uint32_t, ndim=1] sizes = np.zeros(shape=(nlabels + 1), dtype=np.uint32)
+    cdef int x, y, z
+    cdef int dx, dy, dz
+    cdef int i
+
+    cdef bool modified = False
+
+    dz = mask.shape[0]
+    dy = mask.shape[1]
+    dx = mask.shape[2]
+
+    for z in xrange(dz):
+        for y in xrange(dy):
+            for x in xrange(dx):
+                sizes[labels[z, y, x]] += 1
-        dz = mask.shape[0]
-        dy = mask.shape[1]
-        dx = mask.shape[2]
+    #Checking if any hole will be filled
+    for i in xrange(nlabels + 1):
+        if sizes[i] <= max_size:
+            modified = True
-        for z in xrange(dz):
-            for y in xrange(dy):
-                for x in xrange(dx):
-                    sizes[labels[z, y, x]] += 1
+    if not modified:
+        return 0
+    for z in prange(dz, nogil=True):
+        for y in xrange(dy):
+            for x in xrange(dx):
+                if sizes[labels[z, y, x]] <= max_size:
+                    mask[z, y, x] = 254
-        for z in prange(dz, nogil=True):
-            for y in xrange(dy):
-                for x in xrange(dx):
-                    if sizes[labels[z, y, x]] <= max_size:
-                        mask[z, y, x] = 254
+    return modified
@@ -353,9 +353,13 @@ class Mask():
             imask = (~(matrix > 127))
             labels, nlabels = ndimage.label(imask, bstruct, output=np.uint16)
-            print ">>>>", nlabels
-            floodfill.fill_holes_automatically(matrix, labels, nlabels, size)
-            self.save_history(index, orientation, self.matrix.copy(), cp_mask)
+
+            if nlabels == 0:
+                return
+
+            ret = floodfill.fill_holes_automatically(matrix, labels, nlabels, size)
+            if ret:
+                self.save_history(index, orientation, self.matrix.copy(), cp_mask)
         else:
             bstruct = ndimage.generate_binary_structure(2, CON2D[conn])
@@ -371,11 +375,15 @@ class Mask():
             imask = (~(matrix > 127))
             labels, nlabels = ndimage.label(imask, bstruct, output=np.uint16)
+            if nlabels == 0:
+                return
+
             labels = labels.reshape(1, labels.shape[0], labels.shape[1])
             matrix = matrix.reshape(1, matrix.shape[0], matrix.shape[1])
-            floodfill.fill_holes_automatically(matrix, labels, nlabels, size)
-            self.save_history(index, orientation, matrix.copy(), cp_mask)
+            ret = floodfill.fill_holes_automatically(matrix, labels, nlabels, size)
+            if ret:
+                self.save_history(index, orientation, matrix.copy(), cp_mask)
     def __del__(self):
         if self.is_shown:
@@ -596,7 +596,6 @@ class Frame(wx.Frame):
         Publisher.sendMessage('Enable style', const.SLICE_STATE_MASK_FFILL)
     def OnFillHolesAutomatically(self):
-        #  Publisher.sendMessage('Fill holes automatically')
         fdlg = dlg.FillHolesAutoDialog(_(u"Fill holes automatically"))
         fdlg.Show()
@@ -752,20 +751,23 @@ class MenuBar(wx.MenuBar):
         self.clean_mask_menu.Enable(False)
         mask_menu.AppendSeparator()
+
         self.fill_hole_mask_menu = mask_menu.Append(const.ID_FLOODFILL_MASK, _(u"Fill holes manually"))
         self.fill_hole_mask_menu.Enable(False)
         self.fill_hole_auto_menu = mask_menu.Append(const.ID_FILL_HOLE_AUTO, _(u"Fill holes automatically"))
         self.fill_hole_mask_menu.Enable(False)
+        mask_menu.AppendSeparator()
+
         self.remove_mask_part_menu = mask_menu.Append(const.ID_REMOVE_MASK_PART, _(u"Remove parts"))
         self.remove_mask_part_menu.Enable(False)
         self.select_mask_part_menu = mask_menu.Append(const.ID_SELECT_MASK_PART, _(u"Select parts"))
         self.select_mask_part_menu.Enable(False)
-    
+
         mask_menu.AppendSeparator()
-        
+
         self.crop_mask_menu = mask_menu.Append(const.ID_CROP_MASK, _("Crop"))
         self.crop_mask_menu.Enable(False)
	@@ -6,6 +6,7 @@ from collections import deque		@@ -6,6 +6,7 @@ from collections import deque
6		6
7	from cython.parallel import prange	7	from cython.parallel import prange
8	from libc.math cimport floor, ceil	8	from libc.math cimport floor, ceil
		9	+from libcpp cimport bool
9	from libcpp.deque cimport deque as cdeque	10	from libcpp.deque cimport deque as cdeque
10	from libcpp.vector cimport vector	11	from libcpp.vector cimport vector
11		12
	@@ -237,22 +238,37 @@ def floodfill_auto_threshold(np.ndarray[image_t, ndim=3] data, list seeds, float		@@ -237,22 +238,37 @@ def floodfill_auto_threshold(np.ndarray[image_t, ndim=3] data, list seeds, float
237	@cython.wraparound(False)	238	@cython.wraparound(False)
238	@cython.nonecheck(False)	239	@cython.nonecheck(False)
239	def fill_holes_automatically(np.ndarray[mask_t, ndim=3] mask, np.ndarray[np.uint16_t, ndim=3] labels, unsigned int nlabels, unsigned int max_size):	240	def fill_holes_automatically(np.ndarray[mask_t, ndim=3] mask, np.ndarray[np.uint16_t, ndim=3] labels, unsigned int nlabels, unsigned int max_size):
240	- cdef np.ndarray[np.uint32_t, ndim=1] sizes = np.zeros(shape=(nlabels + 1), dtype=np.uint32)
241	- cdef int x, y, z
242	- cdef int dx, dy, dz	241	+ """
		242	+ Fill mask holes automatically. The hole must <= max_size. Return True if any hole were filled.
		243	+ """
		244	+ cdef np.ndarray[np.uint32_t, ndim=1] sizes = np.zeros(shape=(nlabels + 1), dtype=np.uint32)
		245	+ cdef int x, y, z
		246	+ cdef int dx, dy, dz
		247	+ cdef int i
		248	+
		249	+ cdef bool modified = False
		250	+
		251	+ dz = mask.shape[0]
		252	+ dy = mask.shape[1]
		253	+ dx = mask.shape[2]
		254	+
		255	+ for z in xrange(dz):
		256	+ for y in xrange(dy):
		257	+ for x in xrange(dx):
		258	+ sizes[labels[z, y, x]] += 1
243		259
244	- dz = mask.shape[0]
245	- dy = mask.shape[1]
246	- dx = mask.shape[2]	260	+ #Checking if any hole will be filled
		261	+ for i in xrange(nlabels + 1):
		262	+ if sizes[i] <= max_size:
		263	+ modified = True
247		264
248	- for z in xrange(dz):
249	- for y in xrange(dy):
250	- for x in xrange(dx):
251	- sizes[labels[z, y, x]] += 1	265	+ if not modified:
		266	+ return 0
252		267
		268	+ for z in prange(dz, nogil=True):
		269	+ for y in xrange(dy):
		270	+ for x in xrange(dx):
		271	+ if sizes[labels[z, y, x]] <= max_size:
		272	+ mask[z, y, x] = 254
253		273
254	- for z in prange(dz, nogil=True):
255	- for y in xrange(dy):
256	- for x in xrange(dx):
257	- if sizes[labels[z, y, x]] <= max_size:
258	- mask[z, y, x] = 254	274	+ return modified