Download as
Browse Code »

Commit 6cfc8f4e52320c45901a5175c7d2c19859e55253

Authored by Thiago Franco de Moraes
2 parents ce6b7d0e e26297ae
Exists in master and in 38 other branches canvas_reeng, canvas_text, casmoothing_cython, command-line, debian_cython, 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, 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 branch 'fixes_pre_beta5' of github.com:tfmoraes/invesalius3 into fixes_pre_beta5

Showing 3 changed files with 9 additions and 8 deletions   Show diff stats
invesalius/constants.py
  Diff comments   View file @6cfc8f4
@@ -451,8 +451,10 @@ VTK_WARNING = 0 @@ -451,8 +451,10 @@ VTK_WARNING = 0
451 451
452 [ID_DICOM_IMPORT, ID_PROJECT_OPEN, ID_PROJECT_SAVE_AS, ID_PROJECT_SAVE, 452 [ID_DICOM_IMPORT, ID_PROJECT_OPEN, ID_PROJECT_SAVE_AS, ID_PROJECT_SAVE,
453 ID_PROJECT_CLOSE, ID_PROJECT_INFO, ID_SAVE_SCREENSHOT, ID_DICOM_LOAD_NET, 453 ID_PROJECT_CLOSE, ID_PROJECT_INFO, ID_SAVE_SCREENSHOT, ID_DICOM_LOAD_NET,
454 -ID_PRINT_SCREENSHOT, ID_EXIT, ID_IMPORT_OTHERS_FILES, ID_ANALYZE_IMPORT, ID_PREFERENCES,  
455 -ID_DICOM_NETWORK] = [wx.NewId() for number in range(14)] 454 +ID_PRINT_SCREENSHOT, ID_IMPORT_OTHERS_FILES, ID_ANALYZE_IMPORT, ID_PREFERENCES,
  455 +ID_DICOM_NETWORK] = [wx.NewId() for number in range(13)]
  456 +ID_EXIT = wx.ID_EXIT
  457 +ID_ABOUT = wx.ID_ABOUT
456 458
457 459
458 [ID_EDIT_UNDO, ID_EDIT_REDO, ID_EDIT_LIST] =\ 460 [ID_EDIT_UNDO, ID_EDIT_REDO, ID_EDIT_LIST] =\
@@ -464,7 +466,6 @@ ID_DICOM_NETWORK] = [wx.NewId() for number in range(14)] @@ -464,7 +466,6 @@ ID_DICOM_NETWORK] = [wx.NewId() for number in range(14)]
464 [ID_VIEW_FULL, ID_VIEW_TEXT, ID_VIEW_3D_BACKGROUND] =\ 466 [ID_VIEW_FULL, ID_VIEW_TEXT, ID_VIEW_3D_BACKGROUND] =\
465 [wx.NewId() for number in range(3)] 467 [wx.NewId() for number in range(3)]
466 468
467 -ID_ABOUT = wx.NewId()  
468 ID_START = wx.NewId() 469 ID_START = wx.NewId()
469 470
470 ID_FLIP_X = wx.NewId() 471 ID_FLIP_X = wx.NewId()
invesalius/gui/frame.py
  Diff comments   View file @6cfc8f4
@@ -684,9 +684,9 @@ class MenuBar(wx.MenuBar): @@ -684,9 +684,9 @@ class MenuBar(wx.MenuBar):
684 help_menu.Append(const.ID_ABOUT, _("About...")) 684 help_menu.Append(const.ID_ABOUT, _("About..."))
685 #help_menu.Append(107, "Check For Updates Now...") 685 #help_menu.Append(107, "Check For Updates Now...")
686 686
687 - if platform.system() == 'Darwin':  
688 - wx.App.SetMacAboutMenuItemId(const.ID_ABOUT)  
689 - wx.App.SetMacExitMenuItemId(const.ID_EXIT) 687 + #if platform.system() == 'Darwin':
  688 + #wx.App.SetMacAboutMenuItemId(const.ID_ABOUT)
  689 + #wx.App.SetMacExitMenuItemId(const.ID_EXIT)
690 690
691 # Add all menus to menubar 691 # Add all menus to menubar
692 self.Append(file_menu, _("File")) 692 self.Append(file_menu, _("File"))
invesalius/gui/task_surface.py
  Diff comments   View file @6cfc8f4
@@ -405,9 +405,9 @@ class SurfaceProperties(wx.Panel): @@ -405,9 +405,9 @@ class SurfaceProperties(wx.Panel):
405 ## LINE 1 405 ## LINE 1
406 406
407 # Combo related to mask naem 407 # Combo related to mask naem
408 - combo_surface_name = wx.ComboBox(self, -1, "", 408 + combo_surface_name = wx.ComboBox(self, -1,
409 style=wx.CB_DROPDOWN|wx.CB_READONLY) 409 style=wx.CB_DROPDOWN|wx.CB_READONLY)
410 - combo_surface_name.SetSelection(0) 410 + #combo_surface_name.SetSelection(0)
411 if sys.platform != 'win32': 411 if sys.platform != 'win32':
412 combo_surface_name.SetWindowVariant(wx.WINDOW_VARIANT_SMALL) 412 combo_surface_name.SetWindowVariant(wx.WINDOW_VARIANT_SMALL)
413 combo_surface_name.Bind(wx.EVT_COMBOBOX, self.OnComboName) 413 combo_surface_name.Bind(wx.EVT_COMBOBOX, self.OnComboName)