Added the option to swap axes

tfmoraes
1 parent 91b19b16
Showing 5 changed files with 50 additions and 2 deletions Show diff stats
invesalius/constants.py
invesalius/data/mask.py
invesalius/data/slice_.py
invesalius/data/viewer_slice.py
invesalius/gui/frame.py
@@ -460,6 +460,11 @@ ID_START = wx.NewId()
 ID_FLIP_X = wx.NewId()
 ID_FLIP_Y = wx.NewId()
 ID_FLIP_Z = wx.NewId()
+
+ID_SWAP_XY = wx.NewId()
+ID_SWAP_XZ = wx.NewId()
+ID_SWAP_YZ = wx.NewId()
+
 #---------------------------------------------------------
 STATE_DEFAULT = 1000
 STATE_WL = 1001
@@ -49,6 +49,7 @@ class Mask():
     def __bind_events(self):
         Publisher.subscribe(self.OnFlipVolume, 'Flip volume')
+        Publisher.subscribe(self.OnSwapVolumeAxes, 'Swap volume axes')
     def SavePlist(self, filename):
         mask = {}
@@ -98,6 +99,11 @@ class Mask():
             submatrix[:] = submatrix[:, :, ::-1]
             self.matrix[0, 0, 1::] = self.matrix[0, 0, :0:-1]
+    def OnSwapVolumeAxes(self, pubsub_evt):
+        axis0, axis1 = pubsub_evt.data
+        self.matrix = self.matrix.swapaxes(axis0, axis1)
+        print type(self.matrix)
+
     def _save_mask(self, filename):
         shutil.copyfile(self.temp_file, filename)
@@ -134,6 +134,7 @@ class Slice(object):
         Publisher.subscribe(self.UpdateSlice3D,'Update slice 3D')
         Publisher.subscribe(self.OnFlipVolume, 'Flip volume')
+        Publisher.subscribe(self.OnSwapVolumeAxes, 'Swap volume axes')
     def GetMaxSliceNumber(self, orientation):
         shape = self.matrix.shape
@@ -980,6 +981,21 @@ class Slice(object):
         for buffer_ in self.buffer_slices.values():
             buffer_.discard_buffer()
+    def OnSwapVolumeAxes(self, pubsub_evt):
+        axis0, axis1 = pubsub_evt.data
+        self.matrix = self.matrix.swapaxes(axis0, axis1)
+        if (axis0, axis1) == (2, 1):
+            self.spacing = self.spacing[1], self.spacing[0], self.spacing[2]
+        elif (axis0, axis1) == (2, 0):
+            self.spacing = self.spacing[2], self.spacing[1], self.spacing[0]
+        elif (axis0, axis1) == (1, 0):
+            self.spacing = self.spacing[0], self.spacing[2], self.spacing[1]
+
+        for buffer_ in self.buffer_slices.values():
+            buffer_.discard_buffer()
+
+        print type(self.matrix)
+
     def OnExportMask(self, pubsub_evt):
         #imagedata = self.current_mask.imagedata
         imagedata = self.imagedata
@@ -1002,7 +1002,7 @@ class Viewer(wx.Panel):
         Publisher.subscribe(self.RemoveActors, 'Remove actors ' + str(ORIENTATIONS[self.orientation]))
         Publisher.subscribe(self.ReloadActualSlice, 'Reload actual slice')
-
+        Publisher.subscribe(self.OnUpdateScroll, 'Update scroll')
     def SetDefaultCursor(self, pusub_evt):
         self.interactor.SetCursor(wx.StockCursor(wx.CURSOR_DEFAULT))
@@ -1502,6 +1502,11 @@ class Viewer(wx.Panel):
         self.set_slice_number(pos)
         self.interactor.Render()
+    def OnUpdateScroll(self, pubsub_evt):
+        max_slice_number = sl.Slice().GetNumberOfSlices(self.orientation)
+        self.scroll.SetScrollbar(wx.SB_VERTICAL, 1, max_slice_number,
+                                 max_slice_number)
+
     def AddActors(self, pubsub_evt):
         "Inserting actors"
         actors, n = pubsub_evt.data
@@ -344,7 +344,11 @@ class Frame(wx.Frame):
                     const.ID_FLIP_Y: 1, 
                     const.ID_FLIP_Z: 0}[id]
             self.FlipVolume(axis)
-
+        elif id in (const.ID_SWAP_XY, const.ID_SWAP_XZ, const.ID_SWAP_YZ):
+            axes = {const.ID_SWAP_XY: (2, 1),
+                    const.ID_SWAP_XZ: (2, 0),
+                    const.ID_SWAP_YZ: (1, 0)}[id]
+            self.SwapAxes(axes)
     def OnSize(self, evt):
         """
         Refresh GUI when frame is resized.
@@ -418,6 +422,11 @@ class Frame(wx.Frame):
         Publisher.sendMessage('Flip volume', axis)
         Publisher.sendMessage('Reload actual slice') 
+    def SwapAxes(self, axes):
+        Publisher.sendMessage('Swap volume axes', axes)
+        Publisher.sendMessage('Update scroll')
+        Publisher.sendMessage('Reload actual slice') 
+
 # ------------------------------------------------------------------
 # ------------------------------------------------------------------
 # ------------------------------------------------------------------
@@ -492,9 +501,16 @@ class MenuBar(wx.MenuBar):
         app(const.ID_FLIP_Y, _("A <-> P"))
         app(const.ID_FLIP_Z, _("T <-> B"))
+        swap_axes_menu = wx.Menu()
+        app = swap_axes_menu.Append
+        app(const.ID_SWAP_XY, _("R-L <-> A-P"))
+        app(const.ID_SWAP_XZ, _("R-L <-> T-B"))
+        app(const.ID_SWAP_YZ, _("A-P <-> T-B"))
+
         file_edit = wx.Menu()
         app = file_edit.Append
         file_edit.AppendMenu(wx.NewId(), _('Flip'), flip_menu)
+        file_edit.AppendMenu(wx.NewId(), _('Swap axes'), swap_axes_menu)
         #app(wx.ID_UNDO, "Undo\tCtrl+Z")
         #app(wx.ID_REDO, "Redo\tCtrl+Y")
         #app(const.ID_EDIT_LIST, "Show Undo List...")
	@@ -134,6 +134,7 @@ class Slice(object):		@@ -134,6 +134,7 @@ class Slice(object):
134	Publisher.subscribe(self.UpdateSlice3D,'Update slice 3D')	134	Publisher.subscribe(self.UpdateSlice3D,'Update slice 3D')
135		135
136	Publisher.subscribe(self.OnFlipVolume, 'Flip volume')	136	Publisher.subscribe(self.OnFlipVolume, 'Flip volume')
		137	+ Publisher.subscribe(self.OnSwapVolumeAxes, 'Swap volume axes')
137		138
138	def GetMaxSliceNumber(self, orientation):	139	def GetMaxSliceNumber(self, orientation):
139	shape = self.matrix.shape	140	shape = self.matrix.shape
	@@ -980,6 +981,21 @@ class Slice(object):		@@ -980,6 +981,21 @@ class Slice(object):
980	for buffer_ in self.buffer_slices.values():	981	for buffer_ in self.buffer_slices.values():
981	buffer_.discard_buffer()	982	buffer_.discard_buffer()
982		983
		984	+ def OnSwapVolumeAxes(self, pubsub_evt):
		985	+ axis0, axis1 = pubsub_evt.data
		986	+ self.matrix = self.matrix.swapaxes(axis0, axis1)
		987	+ if (axis0, axis1) == (2, 1):
		988	+ self.spacing = self.spacing[1], self.spacing[0], self.spacing[2]
		989	+ elif (axis0, axis1) == (2, 0):
		990	+ self.spacing = self.spacing[2], self.spacing[1], self.spacing[0]
		991	+ elif (axis0, axis1) == (1, 0):
		992	+ self.spacing = self.spacing[0], self.spacing[2], self.spacing[1]
		993	+
		994	+ for buffer_ in self.buffer_slices.values():
		995	+ buffer_.discard_buffer()
		996	+
		997	+ print type(self.matrix)
		998	+
983	def OnExportMask(self, pubsub_evt):	999	def OnExportMask(self, pubsub_evt):
984	#imagedata = self.current_mask.imagedata	1000	#imagedata = self.current_mask.imagedata
985	imagedata = self.imagedata	1001	imagedata = self.imagedata