diff --git a/invesalius/data/styles.py b/invesalius/data/styles.py index b2a0180..26a6652 100644 --- a/invesalius/data/styles.py +++ b/invesalius/data/styles.py @@ -390,13 +390,14 @@ class LinearMeasureInteractorStyle(DefaultInteractorStyle): if self.selected: self.selected = None + self.viewer.scroll_enabled = True return if self.creating: n, m, mr = self.creating if mr.IsComplete(): - print "COMPLETED" self.creating = None + self.viewer.scroll_enabled = True else: Publisher.sendMessage("Add measurement point", ((x, y, z), self._type, @@ -405,11 +406,13 @@ class LinearMeasureInteractorStyle(DefaultInteractorStyle): n = len(m.points)-1 self.creating = n, m, mr Publisher.sendMessage('Reload actual slice %s' % self.orientation) + self.viewer.scroll_enabled = False return selected = self._verify_clicked_display(mx, my) if selected: self.selected = selected + self.viewer.scroll_enabled = False else: if self.picker.GetViewProp(): renderer = self.viewer.slice_data.renderer @@ -425,6 +428,7 @@ class LinearMeasureInteractorStyle(DefaultInteractorStyle): n, (m, mr) = 1, self.measures.measures[self._ori][slice_number][-1] self.creating = n, m, mr Publisher.sendMessage('Reload actual slice %s' % self.orientation) + self.viewer.scroll_enabled = False def OnReleaseMeasurePoint(self, obj, evt): if self.selected: @@ -434,6 +438,7 @@ class LinearMeasureInteractorStyle(DefaultInteractorStyle): Publisher.sendMessage('Change measurement point position', (idx, n, (x, y, z))) Publisher.sendMessage('Reload actual slice %s' % self.orientation) self.selected = None + self.viewer.scroll_enabled = True def OnMoveMeasurePoint(self, obj, evt): x, y, z = self._get_pos_clicked() @@ -466,6 +471,7 @@ class LinearMeasureInteractorStyle(DefaultInteractorStyle): self.creating = None self.selected = None Publisher.sendMessage('Update slice viewer') + self.viewer.scroll_enabled = True def CleanUp(self): self.picker.PickFromListOff() diff --git a/invesalius/data/viewer_slice.py b/invesalius/data/viewer_slice.py index 2880d9d..9409914 100755 --- a/invesalius/data/viewer_slice.py +++ b/invesalius/data/viewer_slice.py @@ -436,6 +436,7 @@ class Viewer(wx.Panel): self.orientation = orientation self.slice_number = 0 + self.scroll_enabled = True self.__init_gui() @@ -1378,6 +1379,8 @@ class Viewer(wx.Panel): evt.Skip() def OnScrollForward(self, evt=None, obj=None): + if not self.scroll_enabled: + return pos = self.scroll.GetThumbPosition() min = 0 @@ -1389,6 +1392,8 @@ class Viewer(wx.Panel): self.OnScrollBar() def OnScrollBackward(self, evt=None, obj=None): + if not self.scroll_enabled: + return pos = self.scroll.GetThumbPosition() max = self.slice_.GetMaxSliceNumber(self.orientation) -- libgit2 0.21.2