Download as
Browse Code »

Commit 3b526c229b4fe68b0a494dc68bc97642cb759852

Authored by Thiago Franco de Moraes
2 parents f68939cd b07a0770
Exists in master and in 37 other branches canvas_reeng, canvas_text, casmoothing_cython, command-line, debian_cython, ff_mask, ff_mask_improv, ffill_gui, ffill_segmentation, fill_holes_auto, get_pixel, import_mesh, inv3.0.1, mactoolbar, mactoolbar_bkp, manual_v3.1, 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, workdir, xmartlabs-command-line

Merge pull request #31 from tfmoraes/fixes_pre_beta5 

Fixes some little issues before new version

Fixes:

    Only accepts boolean operations when there 2 or more masks
    Watershed and Editor new shortcuts
    Better watershed progress dialog
    Added a tool menu
    Icons to MacOSX
    Combobox problems with the surface indexes
    Added an Ok and a Cancel button to the Watershed config dialog
    Only showing editor and watershed brush when enter in the renderviewer
Showing 111 changed files with 371 additions and 251 deletions   Show diff stats

Too many changes.
Reload with full diff Plain diff Email patch

To preserve performance only 100 of 111 files displayed.

icons/3D_glasses.png
View file @3b526c2

3.7 KB | W: | H:

1.16 KB | W: | H:

  • 2-up
  • Swipe
  • Onion skin
icons/3D_glasses_original.png
View file @3b526c2

14.9 KB | W: | H:

12.6 KB | W: | H:

  • 2-up
  • Swipe
  • Onion skin
icons/Floppy.png
View file @3b526c2

3.29 KB | W: | H:

688 Bytes | W: | H:

  • 2-up
  • Swipe
  • Onion skin
icons/annotation.png
View file @3b526c2

43.5 KB | W: | H:

43.6 KB | W: | H:

  • 2-up
  • Swipe
  • Onion skin
icons/bool_difference.png
View file @3b526c2

884 Bytes | W: | H:

739 Bytes | W: | H:

  • 2-up
  • Swipe
  • Onion skin
icons/bool_disjunction.png
View file @3b526c2

840 Bytes | W: | H:

695 Bytes | W: | H:

  • 2-up
  • Swipe
  • Onion skin
icons/bool_intersection.png
View file @3b526c2

820 Bytes | W: | H:

675 Bytes | W: | H:

  • 2-up
  • Swipe
  • Onion skin
icons/bool_union.png
View file @3b526c2

843 Bytes | W: | H:

698 Bytes | W: | H:

  • 2-up
  • Swipe
  • Onion skin
icons/configuration.png
View file @3b526c2

614 Bytes | W: | H:

469 Bytes | W: | H:

  • 2-up
  • Swipe
  • Onion skin
icons/connectivity_largest.png
View file @3b526c2

37.6 KB | W: | H:

37.8 KB | W: | H:

  • 2-up
  • Swipe
  • Onion skin
icons/connectivity_manual.png
View file @3b526c2

36.4 KB | W: | H:

36.6 KB | W: | H:

  • 2-up
  • Swipe
  • Onion skin
icons/connectivity_split_all.png
View file @3b526c2

38.7 KB | W: | H:

38.8 KB | W: | H:

  • 2-up
  • Swipe
  • Onion skin
icons/cross.png
View file @3b526c2

628 Bytes | W: | H:

558 Bytes | W: | H:

  • 2-up
  • Swipe
  • Onion skin
icons/cross_original.png
View file @3b526c2

12.4 KB | W: | H:

1.37 KB | W: | H:

  • 2-up
  • Swipe
  • Onion skin
icons/data_duplicate.png
View file @3b526c2

806 Bytes | W: | H:

840 Bytes | W: | H:

  • 2-up
  • Swipe
  • Onion skin
icons/data_new.png
View file @3b526c2

767 Bytes | W: | H:

893 Bytes | W: | H:

  • 2-up
  • Swipe
  • Onion skin
icons/data_remove.png
View file @3b526c2

643 Bytes | W: | H:

563 Bytes | W: | H:

  • 2-up
  • Swipe
  • Onion skin
icons/file_export.png
View file @3b526c2

20.9 KB | W: | H:

15.8 KB | W: | H:

  • 2-up
  • Swipe
  • Onion skin
icons/file_from_internet.png
View file @3b526c2

1.59 KB | W: | H:

1.62 KB | W: | H:

  • 2-up
  • Swipe
  • Onion skin
icons/file_from_internet_original.png
View file @3b526c2

25.8 KB | W: | H:

3.04 KB | W: | H:

  • 2-up
  • Swipe
  • Onion skin
icons/file_import.png
View file @3b526c2

1.04 KB | W: | H:

1.36 KB | W: | H:

  • 2-up
  • Swipe
  • Onion skin
icons/file_import_original.png
View file @3b526c2

8.54 KB | W: | H:

1.96 KB | W: | H:

  • 2-up
  • Swipe
  • Onion skin
icons/file_open.png
View file @3b526c2

3.78 KB | W: | H:

1.23 KB | W: | H:

  • 2-up
  • Swipe
  • Onion skin
icons/file_open_original.png
View file @3b526c2

11.2 KB | W: | H:

1.93 KB | W: | H:

  • 2-up
  • Swipe
  • Onion skin
icons/file_save.png
View file @3b526c2

993 Bytes | W: | H:

1.22 KB | W: | H:

  • 2-up
  • Swipe
  • Onion skin
icons/file_save_original.png
View file @3b526c2

11.2 KB | W: | H:

1.71 KB | W: | H:

  • 2-up
  • Swipe
  • Onion skin
icons/it_IT.png
View file @3b526c2

144 Bytes | W: | H:

196 Bytes | W: | H:

  • 2-up
  • Swipe
  • Onion skin
icons/layout_data_only.png
View file @3b526c2

1.28 KB | W: | H:

1.43 KB | W: | H:

  • 2-up
  • Swipe
  • Onion skin
icons/layout_data_only_original.gif
View file @3b526c2

1.57 KB | W: | H:

788 Bytes | W: | H:

  • 2-up
  • Swipe
  • Onion skin
icons/layout_data_only_original.png
View file @3b526c2

952 Bytes | W: | H:

1004 Bytes | W: | H:

  • 2-up
  • Swipe
  • Onion skin
icons/layout_full.png
View file @3b526c2

1.3 KB | W: | H:

1.46 KB | W: | H:

  • 2-up
  • Swipe
  • Onion skin
icons/layout_full_original.gif
View file @3b526c2

1.57 KB | W: | H:

804 Bytes | W: | H:

  • 2-up
  • Swipe
  • Onion skin
icons/layout_full_original.png
View file @3b526c2

943 Bytes | W: | H:

996 Bytes | W: | H:

  • 2-up
  • Swipe
  • Onion skin
icons/mask.png
View file @3b526c2

3.75 KB | W: | H:

2.63 KB | W: | H:

  • 2-up
  • Swipe
  • Onion skin
icons/mask_small.png
View file @3b526c2

1.25 KB | W: | H:

791 Bytes | W: | H:

  • 2-up
  • Swipe
  • Onion skin
icons/measure_angle.png
View file @3b526c2

1.76 KB | W: | H:

1.79 KB | W: | H:

  • 2-up
  • Swipe
  • Onion skin
icons/measure_angle_original.png
View file @3b526c2

15.8 KB | W: | H:

2.16 KB | W: | H:

  • 2-up
  • Swipe
  • Onion skin
icons/measure_line.png
View file @3b526c2

1.75 KB | W: | H:

1.79 KB | W: | H:

  • 2-up
  • Swipe
  • Onion skin
icons/measure_line_original.png
View file @3b526c2

14.5 KB | W: | H:

2.09 KB | W: | H:

  • 2-up
  • Swipe
  • Onion skin
icons/object_add.png
View file @3b526c2

1.04 KB | W: | H:

1.23 KB | W: | H:

  • 2-up
  • Swipe
  • Onion skin
icons/object_add_original.png
View file @3b526c2

8.72 KB | W: | H:

9.17 KB | W: | H:

  • 2-up
  • Swipe
  • Onion skin
icons/object_remove.png
View file @3b526c2

1.56 KB | W: | H:

1.61 KB | W: | H:

  • 2-up
  • Swipe
  • Onion skin
icons/object_remove_original.png
View file @3b526c2

9.04 KB | W: | H:

9.47 KB | W: | H:

  • 2-up
  • Swipe
  • Onion skin
icons/print.png
View file @3b526c2

3.8 KB | W: | H:

1.27 KB | W: | H:

  • 2-up
  • Swipe
  • Onion skin
icons/print_original.png
View file @3b526c2

21.8 KB | W: | H:

2.21 KB | W: | H:

  • 2-up
  • Swipe
  • Onion skin
icons/redo_menu.png
View file @3b526c2

3.44 KB | W: | H:

1017 Bytes | W: | H:

  • 2-up
  • Swipe
  • Onion skin
icons/redo_original.png
View file @3b526c2

15.3 KB | W: | H:

1.64 KB | W: | H:

  • 2-up
  • Swipe
  • Onion skin
icons/redo_small.png
View file @3b526c2

4.03 KB | W: | H:

1.49 KB | W: | H:

  • 2-up
  • Swipe
  • Onion skin
icons/show_task.png
View file @3b526c2

4.09 KB | W: | H:

4.31 KB | W: | H:

  • 2-up
  • Swipe
  • Onion skin
icons/show_task_min.png
View file @3b526c2

1.67 KB | W: | H:

1.73 KB | W: | H:

  • 2-up
  • Swipe
  • Onion skin
icons/slice.png
View file @3b526c2

1.31 KB | W: | H:

827 Bytes | W: | H:

  • 2-up
  • Swipe
  • Onion skin
icons/slice_original.png
View file @3b526c2

6.7 KB | W: | H:

828 Bytes | W: | H:

  • 2-up
  • Swipe
  • Onion skin
icons/slice_plane.png
View file @3b526c2

1.05 KB | W: | H:

1.23 KB | W: | H:

  • 2-up
  • Swipe
  • Onion skin
icons/slice_plane_original.png
View file @3b526c2

2.58 KB | W: | H:

2.64 KB | W: | H:

  • 2-up
  • Swipe
  • Onion skin
icons/splash_de.png
View file @3b526c2

217 KB | W: | H:

224 KB | W: | H:

  • 2-up
  • Swipe
  • Onion skin
icons/splash_de_DE.png
View file @3b526c2

217 KB | W: | H:

224 KB | W: | H:

  • 2-up
  • Swipe
  • Onion skin
icons/splash_el_GR.png
View file @3b526c2

217 KB | W: | H:

224 KB | W: | H:

  • 2-up
  • Swipe
  • Onion skin
icons/splash_en.png
View file @3b526c2

217 KB | W: | H:

224 KB | W: | H:

  • 2-up
  • Swipe
  • Onion skin
icons/splash_es.png
View file @3b526c2

218 KB | W: | H:

225 KB | W: | H:

  • 2-up
  • Swipe
  • Onion skin
icons/splash_fr.png
View file @3b526c2

220 KB | W: | H:

226 KB | W: | H:

  • 2-up
  • Swipe
  • Onion skin
icons/splash_it_IT.png
View file @3b526c2

217 KB | W: | H:

224 KB | W: | H:

  • 2-up
  • Swipe
  • Onion skin
icons/splash_ko.png
View file @3b526c2

217 KB | W: | H:

224 KB | W: | H:

  • 2-up
  • Swipe
  • Onion skin
icons/splash_pt.png
View file @3b526c2

220 KB | W: | H:

226 KB | W: | H:

  • 2-up
  • Swipe
  • Onion skin
icons/splash_zh_TW.png
View file @3b526c2

217 KB | W: | H:

224 KB | W: | H:

  • 2-up
  • Swipe
  • Onion skin
icons/surface_export.png
View file @3b526c2

5.04 KB | W: | H:

2.67 KB | W: | H:

  • 2-up
  • Swipe
  • Onion skin
icons/surface_export_original.png
View file @3b526c2

27.2 KB | W: | H:

27.4 KB | W: | H:

  • 2-up
  • Swipe
  • Onion skin
icons/text.png
View file @3b526c2

572 Bytes | W: | H:

477 Bytes | W: | H:

  • 2-up
  • Swipe
  • Onion skin
icons/text_inverted.png
View file @3b526c2

706 Bytes | W: | H:

543 Bytes | W: | H:

  • 2-up
  • Swipe
  • Onion skin
icons/text_inverted_original.png
View file @3b526c2

2.22 KB | W: | H:

541 Bytes | W: | H:

  • 2-up
  • Swipe
  • Onion skin
icons/text_original.png
View file @3b526c2

2.69 KB | W: | H:

567 Bytes | W: | H:

  • 2-up
  • Swipe
  • Onion skin
icons/tool_annotation.png
View file @3b526c2

1.7 KB | W: | H:

1.73 KB | W: | H:

  • 2-up
  • Swipe
  • Onion skin
icons/tool_annotation_original.png
View file @3b526c2

21.2 KB | W: | H:

21.6 KB | W: | H:

  • 2-up
  • Swipe
  • Onion skin
icons/tool_contrast.png
View file @3b526c2

1.01 KB | W: | H:

1.07 KB | W: | H:

  • 2-up
  • Swipe
  • Onion skin
icons/tool_contrast_original.png
View file @3b526c2

1.55 KB | W: | H:

1.65 KB | W: | H:

  • 2-up
  • Swipe
  • Onion skin
icons/tool_photo.png
View file @3b526c2

2.67 KB | W: | H:

2.71 KB | W: | H:

  • 2-up
  • Swipe
  • Onion skin
icons/tool_photo_original.png
View file @3b526c2

25.3 KB | W: | H:

2.87 KB | W: | H:

  • 2-up
  • Swipe
  • Onion skin
icons/tool_rotate.png
View file @3b526c2

4.45 KB | W: | H:

1.91 KB | W: | H:

  • 2-up
  • Swipe
  • Onion skin
icons/tool_rotate_original.png
View file @3b526c2

12.7 KB | W: | H:

2.45 KB | W: | H:

  • 2-up
  • Swipe
  • Onion skin
icons/tool_translate.png
View file @3b526c2

4.02 KB | W: | H:

1.49 KB | W: | H:

  • 2-up
  • Swipe
  • Onion skin
icons/tool_translate_original.png
View file @3b526c2

11.8 KB | W: | H:

2.21 KB | W: | H:

  • 2-up
  • Swipe
  • Onion skin
icons/tool_zoom.png
View file @3b526c2

1.14 KB | W: | H:

1.31 KB | W: | H:

  • 2-up
  • Swipe
  • Onion skin
icons/tool_zoom_in.png
View file @3b526c2

1.28 KB | W: | H:

1.38 KB | W: | H:

  • 2-up
  • Swipe
  • Onion skin
icons/tool_zoom_in_original.png
View file @3b526c2

13.1 KB | W: | H:

13.5 KB | W: | H:

  • 2-up
  • Swipe
  • Onion skin
icons/tool_zoom_original.png
View file @3b526c2

17.1 KB | W: | H:

2.11 KB | W: | H:

  • 2-up
  • Swipe
  • Onion skin
icons/tool_zoom_out.png
View file @3b526c2

1.26 KB | W: | H:

1.35 KB | W: | H:

  • 2-up
  • Swipe
  • Onion skin
icons/tool_zoom_out_original.png
View file @3b526c2

13.2 KB | W: | H:

13.6 KB | W: | H:

  • 2-up
  • Swipe
  • Onion skin
icons/tool_zoom_select.png
View file @3b526c2

1.16 KB | W: | H:

1.33 KB | W: | H:

  • 2-up
  • Swipe
  • Onion skin
icons/tool_zoom_select_original.png
View file @3b526c2

15 KB | W: | H:

2.23 KB | W: | H:

  • 2-up
  • Swipe
  • Onion skin
icons/undo_menu.png
View file @3b526c2

3.46 KB | W: | H:

1.02 KB | W: | H:

  • 2-up
  • Swipe
  • Onion skin
icons/undo_original.png
View file @3b526c2

15.6 KB | W: | H:

1.72 KB | W: | H:

  • 2-up
  • Swipe
  • Onion skin
icons/undo_small.png
View file @3b526c2

3.97 KB | W: | H:

1.42 KB | W: | H:

  • 2-up
  • Swipe
  • Onion skin
icons/view_back.png
View file @3b526c2

3.34 KB | W: | H:

996 Bytes | W: | H:

  • 2-up
  • Swipe
  • Onion skin
icons/view_bottom.png
View file @3b526c2

3.32 KB | W: | H:

938 Bytes | W: | H:

  • 2-up
  • Swipe
  • Onion skin
icons/view_front.png
View file @3b526c2

753 Bytes | W: | H:

912 Bytes | W: | H:

  • 2-up
  • Swipe
  • Onion skin
icons/view_isometric.png
View file @3b526c2

3.5 KB | W: | H:

1010 Bytes | W: | H:

  • 2-up
  • Swipe
  • Onion skin
icons/view_left.png
View file @3b526c2

3.31 KB | W: | H:

929 Bytes | W: | H:

  • 2-up
  • Swipe
  • Onion skin
icons/view_right.png
View file @3b526c2

713 Bytes | W: | H:

920 Bytes | W: | H:

  • 2-up
  • Swipe
  • Onion skin
icons/view_top.png
View file @3b526c2

784 Bytes | W: | H:

1004 Bytes | W: | H:

  • 2-up
  • Swipe
  • Onion skin
icons/volume_raycasting.png
View file @3b526c2

1.23 KB | W: | H:

1.21 KB | W: | H:

  • 2-up
  • Swipe
  • Onion skin
icons/volume_raycasting_original.png
View file @3b526c2

3.04 KB | W: | H:

3.03 KB | W: | H:

  • 2-up
  • Swipe
  • Onion skin