Download as
Browse Code »

Commit 39bc71f427194047a71e30c0f59a149b43e1b742

Authored by Thiago Franco de Moraes
1 parent 8b6aa2c4
Exists in master and in 55 other branches 3d_inter_style, brush_pix, canvas_reeng, canvas_text, casmoothing_cython, clean, command-line, cython_threshold, debian_cython, editor_improvements, ff_mask, ff_mask_improv, ffill_gui, ffill_segmentation, fill_holes_auto, fixes_pre_beta5, get_pixel, import_mesh, inv3.0.1, mactoolbar, mactoolbar_bkp, manual_v3.1, mask_boolean_op, mask_boolean_op_bkp, mask_copy, mask_greatest_component, measure_canvas, measure_improvements, measure_placement_test, phoenix, region_growing_confidence, remove_local_wxpython, rmatsuda-fix_ref_MTC, rmatsuda-fix_remove_marker_bug, rmatsuda-trigger_bug_fix, rotvol, segmentation_menu, select_part, smoothing_bin, smoothing_bin_pll, surface_area, user_guide_en, usp-navegador, vti, vtk6, watershed, watershed_improvements, watershed_improvements_bkp, watershed_merge, workdir, wx2.9_mac, wxgtk3, wxgtk3_b5, wxgtk3_bkp, xmartlabs-command-line

FIX: edition when the brush is bigger than the slice

Showing 1 changed file with 9 additions and 4 deletions   Show diff stats
invesalius/data/slice_.py
  Diff comments   View file @39bc71f
... ... @@ -419,18 +419,23 @@ class Slice(object):
419 419 xf = image.shape[1]
420 420  
421 421 # Verifying if the points is over the image array.
422   - if (not 0 < xi < image.shape[1] and not 0 < xf < image.shape[1]) or \
423   - (not 0 < yi < image.shape[0] and not 0 < yf < image.shape[0]):
  422 + if (not 0 <= xi <= image.shape[1] and not 0 <= xf <= image.shape[1]) or \
  423 + (not 0 <= yi <= image.shape[0] and not 0 <= yf <= image.shape[0]):
424 424 return
425 425  
  426 +
426 427 roi_m = mask[yi:yf,xi:xf]
427 428 roi_i = image[yi:yf, xi:xf]
428 429  
429 430 if operation == const.BRUSH_THRESH:
430 431 # It's a trick to make points between threshold gets value 254
431 432 # (1 * 253 + 1) and out ones gets value 1 (0 * 253 + 1).
432   - roi_m[index] = (((roi_i[index] >= thresh_min)
433   - & (roi_i[index] <= thresh_max)) * 253) + 1
  433 + try:
  434 + roi_m[index] = (((roi_i[index] >= thresh_min)
  435 + & (roi_i[index] <= thresh_max)) * 253) + 1
  436 + except IndexError:
  437 + # Resolving the problem when roi_i has 0 elements.
  438 + pass
434 439 elif operation == const.BRUSH_DRAW:
435 440 roi_m[index] = 254
436 441 elif operation == const.BRUSH_ERASE:
... ...