Download as
Browse Code »

Commit 9c8083ac047edfdcc21693e0395b5f18723e28f4

Authored by Paulo Henrique Junqueira Amorim
2 parents ffbeeb94 2b8afeae
Exists in master and in 3 other branches inv3.0.1, usp-navegador, wxgtk3_b5

Merge branch 'master' of github.com:invesalius/invesalius3

Showing 2 changed files with 20 additions and 13 deletions   Show diff stats
invesalius/gui/frame.py
  Diff comments   View file @9c8083a
@@ -532,21 +532,21 @@ class MenuBar(wx.MenuBar): @@ -532,21 +532,21 @@ class MenuBar(wx.MenuBar):
532 532
533 ############################### EDIT############################### 533 ############################### EDIT###############################
534 # Flip 534 # Flip
535 - flip_menu = wx.Menu()  
536 - app = flip_menu.Append  
537 - app(const.ID_FLIP_X, _("R <-> L"))  
538 - app(const.ID_FLIP_Y, _("A <-> P"))  
539 - app(const.ID_FLIP_Z, _("T <-> B"))  
540 -  
541 - swap_axes_menu = wx.Menu()  
542 - app = swap_axes_menu.Append  
543 - app(const.ID_SWAP_XY, _("R-L <-> A-P"))  
544 - app(const.ID_SWAP_XZ, _("R-L <-> T-B"))  
545 - app(const.ID_SWAP_YZ, _("A-P <-> T-B")) 535 + #flip_menu = wx.Menu()
  536 + #app = flip_menu.Append
  537 + #app(const.ID_FLIP_X, _("R <-> L"))
  538 + #app(const.ID_FLIP_Y, _("A <-> P"))
  539 + #app(const.ID_FLIP_Z, _("T <-> B"))
  540 +
  541 + #swap_axes_menu = wx.Menu()
  542 + #app = swap_axes_menu.Append
  543 + #app(const.ID_SWAP_XY, _("R-L <-> A-P"))
  544 + #app(const.ID_SWAP_XZ, _("R-L <-> T-B"))
  545 + #app(const.ID_SWAP_YZ, _("A-P <-> T-B"))
546 546
547 file_edit = wx.Menu() 547 file_edit = wx.Menu()
548 - file_edit.AppendMenu(wx.NewId(), _('Flip'), flip_menu)  
549 - file_edit.AppendMenu(wx.NewId(), _('Swap axes'), swap_axes_menu) 548 + #file_edit.AppendMenu(wx.NewId(), _('Flip'), flip_menu)
  549 + #file_edit.AppendMenu(wx.NewId(), _('Swap axes'), swap_axes_menu)
550 550
551 551
552 d = const.ICON_DIR 552 d = const.ICON_DIR
invesalius/gui/task_slice.py
  Diff comments   View file @9c8083a
@@ -399,6 +399,11 @@ class MaskProperties(wx.Panel): @@ -399,6 +399,11 @@ class MaskProperties(wx.Panel):
399 for i in list_index: 399 for i in list_index:
400 self.combo_mask_name.Delete(i) 400 self.combo_mask_name.Delete(i)
401 401
  402 + if self.combo_mask_name.IsEmpty():
  403 + self.combo_mask_name.SetValue('')
  404 + self.Disable()
  405 +
  406 +
402 def __bind_events_wx(self): 407 def __bind_events_wx(self):
403 self.Bind(grad.EVT_THRESHOLD_CHANGED, self.OnSlideChanged, self.gradient) 408 self.Bind(grad.EVT_THRESHOLD_CHANGED, self.OnSlideChanged, self.gradient)
404 self.Bind(grad.EVT_THRESHOLD_CHANGING, self.OnSlideChanging, self.gradient) 409 self.Bind(grad.EVT_THRESHOLD_CHANGING, self.OnSlideChanging, self.gradient)
@@ -454,6 +459,8 @@ class MaskProperties(wx.Panel): @@ -454,6 +459,8 @@ class MaskProperties(wx.Panel):
454 self.button_colour.SetColour(colour) 459 self.button_colour.SetColour(colour)
455 460
456 def AddMask(self, evt_pubsub): 461 def AddMask(self, evt_pubsub):
  462 + if self.combo_mask_name.IsEmpty():
  463 + self.Enable()
457 mask_name = evt_pubsub.data[1] 464 mask_name = evt_pubsub.data[1]
458 mask_thresh = evt_pubsub.data[2] 465 mask_thresh = evt_pubsub.data[2]
459 mask_colour = [int(c*255) for c in evt_pubsub.data[3]] 466 mask_colour = [int(c*255) for c in evt_pubsub.data[3]]