From fbdb35a1297c74b360ee4dc1c8858fb703cf7e35 Mon Sep 17 00:00:00 2001 From: tatiana Date: Mon, 20 Jul 2009 20:11:00 +0000 Subject: [PATCH] ADD: Brush change size --- invesalius/data/cursor_actors.py | 3 ++- invesalius/data/viewer_slice.py | 12 ++++++++---- invesalius/gui/default_tasks.py | 4 ++-- invesalius/gui/task_slice.py | 8 +++++--- 4 files changed, 17 insertions(+), 10 deletions(-) diff --git a/invesalius/data/cursor_actors.py b/invesalius/data/cursor_actors.py index 998aba8..dc7a92f 100644 --- a/invesalius/data/cursor_actors.py +++ b/invesalius/data/cursor_actors.py @@ -77,7 +77,8 @@ class CursorCircle: def SetSize(self, radius): self.radius = radius - disk.SetInnerRadius(radius) + self.disk.SetInnerRadius(radius-1) # filled = self.radius + self.disk.SetOuterRadius(radius) # filled = 0x self.__calculate_area_pixels() def SetColour(self, colour): diff --git a/invesalius/data/viewer_slice.py b/invesalius/data/viewer_slice.py index a8088b0..bd50a7b 100755 --- a/invesalius/data/viewer_slice.py +++ b/invesalius/data/viewer_slice.py @@ -129,6 +129,12 @@ class Viewer(wx.Panel): self.cursor = cursor + def ChangeBrushSize(self, pubsub_evt): + print "*****ChangeBrushSize" + size = pubsub_evt.data + self.cursor.SetSize(size) + self.ren.Render() + self.interactor.Render() def OnMouseClick(self, obj, evt_vtk): @@ -258,6 +264,7 @@ class Viewer(wx.Panel): ps.Publisher().subscribe(self.UpdateRender, 'Update slice viewer') ps.Publisher().subscribe(self.ChangeSliceNumber, ('Set scroll position', self.orientation)) + ps.Publisher().subscribe(self.ChangeBrushSize,'Set edition brush size') def __bind_events_wx(self): self.scroll.Bind(wx.EVT_SCROLL, self.OnScrollBar) @@ -269,10 +276,7 @@ class Viewer(wx.Panel): def SetInput(self, imagedata): self.imagedata = imagedata - - print "************************************" - print "spacing:", imagedata.GetSpacing() - print "************************************" + ren = self.ren interactor = self.interactor diff --git a/invesalius/gui/default_tasks.py b/invesalius/gui/default_tasks.py index 75a0c33..f0bb925 100755 --- a/invesalius/gui/default_tasks.py +++ b/invesalius/gui/default_tasks.py @@ -174,7 +174,7 @@ class UpperTaskPanel(wx.Panel): fold_panel.AddFoldPanelWindow(item, importer.TaskPanel(item), Spacing= 0, leftSpacing=0, rightSpacing=0) - fold_panel.Expand(fold_panel.GetFoldPanel(0)) + #fold_panel.Expand(fold_panel.GetFoldPanel(0)) # Fold 2 - Mask for segmentation and edition @@ -185,7 +185,7 @@ class UpperTaskPanel(wx.Panel): fold_panel.AddFoldPanelWindow(item, slice_.TaskPanel(item), Spacing= 0, leftSpacing=0, rightSpacing=0) - #fold_panel.Expand(fold_panel.GetFoldPanel(1)) + fold_panel.Expand(fold_panel.GetFoldPanel(1)) # Fold 3 # select mask - combo diff --git a/invesalius/gui/task_slice.py b/invesalius/gui/task_slice.py index a633a37..325edb3 100644 --- a/invesalius/gui/task_slice.py +++ b/invesalius/gui/task_slice.py @@ -483,16 +483,18 @@ class EditionTools(wx.Panel): self.btn_brush_type.SetBitmap(bitmap[evt.GetId()]) print "TODO: Send Signal - Change brush format to %s"% name[evt.GetId()] + ps.Publisher().sendMessage('Set brush format', name[evt.GetId()]) def OnBrushSize(self, evt): """ """ # FIXME: Using wx.EVT_SPINCTRL in MacOS it doesnt capture changes only # in the text ctrl - so we are capturing only changes on text # Strangelly this is being called twice - print "TODO: Send Signal - Change brush size to %s" % self.spin.GetValue() + print "TODO: Send Signal - Change brush size to %s" %self.spin.GetValue() + ps.Publisher().sendMessage('Set edition brush size',self.spin.GetValue()) def OnComboBrushOp(self, evt): - print "TODO: Send Signal - Change brush operation: %s" % (evt.GetString()) + print "TODO: Send Signal - Change brush operation: %s" %(evt.GetString()) + ps.Publisher().sendMessage('Set edition operation',evt.GetString()) -# TODO: Bind gradient related events -- libgit2 0.21.2