Commit e2d5f585ac42ef131f543e81762860ef4517328d
1 parent
525d68ff
Exists in
select_part
Strip white spaces and better doc in Mask create_mask class
Showing
1 changed file
with
11 additions
and
6 deletions
Show diff stats
invesalius/data/mask.py
@@ -126,7 +126,7 @@ class EditionHistory(object): | @@ -126,7 +126,7 @@ class EditionHistory(object): | ||
126 | h[self.index].commit_history(mvolume) | 126 | h[self.index].commit_history(mvolume) |
127 | self._reload_slice(self.index) | 127 | self._reload_slice(self.index) |
128 | Publisher.sendMessage("Enable redo", True) | 128 | Publisher.sendMessage("Enable redo", True) |
129 | - | 129 | + |
130 | if self.index == 0: | 130 | if self.index == 0: |
131 | Publisher.sendMessage("Enable undo", False) | 131 | Publisher.sendMessage("Enable undo", False) |
132 | print "AT", self.index, len(self.history), self.history[self.index].filename | 132 | print "AT", self.index, len(self.history), self.history[self.index].filename |
@@ -154,7 +154,7 @@ class EditionHistory(object): | @@ -154,7 +154,7 @@ class EditionHistory(object): | ||
154 | h[self.index].commit_history(mvolume) | 154 | h[self.index].commit_history(mvolume) |
155 | self._reload_slice(self.index) | 155 | self._reload_slice(self.index) |
156 | Publisher.sendMessage("Enable undo", True) | 156 | Publisher.sendMessage("Enable undo", True) |
157 | - | 157 | + |
158 | if self.index == len(h) - 1: | 158 | if self.index == len(h) - 1: |
159 | Publisher.sendMessage("Enable redo", False) | 159 | Publisher.sendMessage("Enable redo", False) |
160 | print "AT", self.index, len(h), h[self.index].filename | 160 | print "AT", self.index, len(h), h[self.index].filename |
@@ -174,7 +174,7 @@ class EditionHistory(object): | @@ -174,7 +174,7 @@ class EditionHistory(object): | ||
174 | v_undo = False | 174 | v_undo = False |
175 | elif self.index == len(self.history) - 1: | 175 | elif self.index == len(self.history) - 1: |
176 | v_redo = False | 176 | v_redo = False |
177 | - | 177 | + |
178 | Publisher.sendMessage("Enable undo", v_undo) | 178 | Publisher.sendMessage("Enable undo", v_undo) |
179 | Publisher.sendMessage("Enable redo", v_redo) | 179 | Publisher.sendMessage("Enable redo", v_redo) |
180 | 180 | ||
@@ -229,7 +229,7 @@ class Mask(): | @@ -229,7 +229,7 @@ class Mask(): | ||
229 | 229 | ||
230 | def SavePlist(self, dir_temp, filelist): | 230 | def SavePlist(self, dir_temp, filelist): |
231 | mask = {} | 231 | mask = {} |
232 | - filename = u'mask_%d' % self.index | 232 | + filename = u'mask_%d' % self.index |
233 | mask_filename = u'%s.dat' % filename | 233 | mask_filename = u'%s.dat' % filename |
234 | mask_filepath = os.path.join(dir_temp, mask_filename) | 234 | mask_filepath = os.path.join(dir_temp, mask_filename) |
235 | filelist[self.temp_file] = mask_filename | 235 | filelist[self.temp_file] = mask_filename |
@@ -304,7 +304,12 @@ class Mask(): | @@ -304,7 +304,12 @@ class Mask(): | ||
304 | Mask.general_index = index | 304 | Mask.general_index = index |
305 | 305 | ||
306 | def create_mask(self, shape): | 306 | def create_mask(self, shape): |
307 | - print "Creating a mask" | 307 | + """ |
308 | + Creates a new mask object. This method do not append this new mask into the project. | ||
309 | + | ||
310 | + Parameters: | ||
311 | + shape(int, int, int): The shape of the new mask. | ||
312 | + """ | ||
308 | self.temp_file = tempfile.mktemp() | 313 | self.temp_file = tempfile.mktemp() |
309 | shape = shape[0] + 1, shape[1] + 1, shape[2] + 1 | 314 | shape = shape[0] + 1, shape[1] + 1, shape[2] + 1 |
310 | self.matrix = numpy.memmap(self.temp_file, mode='w+', dtype='uint8', shape=shape) | 315 | self.matrix = numpy.memmap(self.temp_file, mode='w+', dtype='uint8', shape=shape) |
@@ -329,7 +334,7 @@ class Mask(): | @@ -329,7 +334,7 @@ class Mask(): | ||
329 | new_mask.threshold_range = self.threshold_range | 334 | new_mask.threshold_range = self.threshold_range |
330 | new_mask.edition_threshold_range = self.edition_threshold_range | 335 | new_mask.edition_threshold_range = self.edition_threshold_range |
331 | new_mask.is_shown = self.is_shown | 336 | new_mask.is_shown = self.is_shown |
332 | - | 337 | + |
333 | new_mask.create_mask(shape=[i-1 for i in self.matrix.shape]) | 338 | new_mask.create_mask(shape=[i-1 for i in self.matrix.shape]) |
334 | new_mask.matrix[:] = self.matrix[:] | 339 | new_mask.matrix[:] = self.matrix[:] |
335 | 340 |