From a81e4af61b1e7b5f35baaf5d573ab959019a2c76 Mon Sep 17 00:00:00 2001 From: tatiana Date: Wed, 3 Feb 2010 19:42:58 +0000 Subject: [PATCH] ENH: Select surface (to be affected by connectivity tools) using data notebook --- invesalius/gui/data_notebook.py | 11 ++++++++++- invesalius/gui/default_tasks.py | 2 +- invesalius/gui/task_slice.py | 1 + invesalius/gui/task_surface.py | 4 ++-- 4 files changed, 14 insertions(+), 4 deletions(-) diff --git a/invesalius/gui/data_notebook.py b/invesalius/gui/data_notebook.py index 593bb16..67a0967 100644 --- a/invesalius/gui/data_notebook.py +++ b/invesalius/gui/data_notebook.py @@ -183,7 +183,7 @@ class MasksListCtrlPanel(wx.ListCtrl, listmix.TextEditMixin): def __bind_events_wx(self): self.Bind(wx.EVT_LIST_ITEM_ACTIVATED, self.OnItemActivated) self.Bind(wx.EVT_LIST_END_LABEL_EDIT, self.OnEditLabel) - + def __bind_events(self): ps.Publisher().subscribe(self.AddMask, 'Add mask') ps.Publisher().subscribe(self.EditMaskThreshold, @@ -194,6 +194,7 @@ class MasksListCtrlPanel(wx.ListCtrl, listmix.TextEditMixin): ps.Publisher().subscribe(self.OnChangeCurrentMask, 'Change mask selected') ps.Publisher().subscribe(self.OnCloseProject, 'Close project data') + def OnCloseProject(self, pubsub_evt): self.DeleteAllItems() self.mask_list_index = {} @@ -245,6 +246,8 @@ class MasksListCtrlPanel(wx.ListCtrl, listmix.TextEditMixin): def OnItemActivated(self, evt): self.ToggleItem(evt.m_itemIndex) + + def OnCheckItem(self, index, flag): if flag: @@ -366,6 +369,12 @@ class SurfacesListCtrlPanel(wx.ListCtrl, listmix.TextEditMixin): def __bind_events_wx(self): self.Bind(wx.EVT_LIST_ITEM_ACTIVATED, self.OnItemActivated) self.Bind(wx.EVT_LIST_END_LABEL_EDIT, self.OnEditLabel) + self.Bind(wx.EVT_LIST_ITEM_SELECTED, self.OnItemSelected) + + def OnItemSelected(self, evt): + last_surface_index = evt.m_itemIndex + ps.Publisher().sendMessage('Change surface selected', + last_surface_index) def __init_columns(self): diff --git a/invesalius/gui/default_tasks.py b/invesalius/gui/default_tasks.py index 2bc8d48..848abbf 100755 --- a/invesalius/gui/default_tasks.py +++ b/invesalius/gui/default_tasks.py @@ -269,7 +269,7 @@ class UpperTaskPanel(wx.Panel): self.fold_panel.Bind(fpb.EVT_CAPTIONBAR, self.OnFoldPressCaption) ps.Publisher().subscribe(self.OnEnableState, "Enable state project") ps.Publisher().subscribe(self.OnOverwrite, 'Create surface from index') - ps.Publisher().subscribe(self.OnFoldSurface, 'Update surface info in GUI') + ps.Publisher().subscribe(self.OnFoldSurface, 'Fold surface task') ps.Publisher().subscribe(self.OnFoldExport, 'Fold export task') def OnOverwrite(self, pubsub_evt): diff --git a/invesalius/gui/task_slice.py b/invesalius/gui/task_slice.py index 0680a43..15b09d9 100644 --- a/invesalius/gui/task_slice.py +++ b/invesalius/gui/task_slice.py @@ -147,6 +147,7 @@ class InnerTaskPanel(wx.Panel): ps.Publisher().sendMessage('Create surface from index', (self.GetMaskSelected(), overwrite)) + ps.Publisher().sendMessage('Fold surface task') else: dlg.InexistentMask() diff --git a/invesalius/gui/task_surface.py b/invesalius/gui/task_surface.py index c403038..e8ff188 100644 --- a/invesalius/gui/task_surface.py +++ b/invesalius/gui/task_surface.py @@ -454,11 +454,11 @@ wx.GROW|wx.EXPAND|wx.LEFT|wx.RIGHT|wx.TOP|wx.BOTTOM, 10) if not overwrite or not self.surface_dict: self.surface_dict[name] = index index = self.combo_surface_name.Append(name) - self.combo_surface_name.SetSelection(index) - + transparency = 100*pubsub_evt.data[4] self.button_colour.SetColour(colour) self.slider_transparency.SetValue(transparency) + self.combo_surface_name.SetSelection(index) def OnComboName(self, evt): surface_name = evt.GetString() -- libgit2 0.21.2