diff --git a/invesalius/constants.py b/invesalius/constants.py index 299fbc4..27f22b3 100644 --- a/invesalius/constants.py +++ b/invesalius/constants.py @@ -31,23 +31,23 @@ SAGITAL_SLICE_CAM_VIEW_UP = {"AXIAL":(-1, 0, 0), "CORONAL":(0, 1, 0), "SAGITAL" CORONAL_SLICE_CAM_POSITION = {"AXIAL":(0, -1, 0), "CORONAL":(0, 0, 1), "SAGITAL":(1, 0, 0)} CORONAL_SLICE_CAM_VIEW_UP = {"AXIAL":(0, 0, -1), "CORONAL":(0, 1, 0), "SAGITAL":(0, 1, 0)} -SLICE_POSITION = {AXIAL:[AXIAL_SLICE_CAM_VIEW_UP, AXIAL_SLICE_CAM_POSITION], - SAGITAL:[SAGITAL_SLICE_CAM_VIEW_UP, SAGITAL_SLICE_CAM_POSITION], +SLICE_POSITION = {AXIAL:[AXIAL_SLICE_CAM_VIEW_UP, AXIAL_SLICE_CAM_POSITION], + SAGITAL:[SAGITAL_SLICE_CAM_VIEW_UP, SAGITAL_SLICE_CAM_POSITION], CORONAL:[CORONAL_SLICE_CAM_VIEW_UP, CORONAL_SLICE_CAM_POSITION]} #Color Table from Slice #NumberOfColors, SaturationRange, HueRange, ValueRange -SLICE_COLOR_TABLE = {"Default (Gray)":(None,(0,0),(0,0),(0,1)), +SLICE_COLOR_TABLE = {"Default ":(None,(0,0),(0,0),(0,1)), "Hue":(None,(1,1),(0,1),(1,1)), - "Saturation":(None,(0,1),(0.6,0.6),(1,1)), + "Saturation":(None,(0,1),(0.6,0.6),(1,1)), "Desert":(256, (1,1), (0, 0.1), (1,1)), - "Rainbow":(256,(1,1),(0,0.8),(1,1)), + "Rainbow":(256,(1,1),(0,0.8),(1,1)), "Ocen":(256,(1,1),(0.667, 0.5),(1,1)), "Inverse Gray":(256, (0, 0), (0, 0), (1,0)), - } + } # Volume view angle -VOL_FRONT = wx.NewId() +VOL_FRONT = wx.NewId() VOL_BACK = wx.NewId() VOL_RIGHT = wx.NewId() VOL_LEFT = wx.NewId() @@ -159,7 +159,7 @@ WINDOW_LEVEL = {"Abdomen":(350,50), "Sinus":(4000, 400), "Vasculature - Hard":(240,80), "Vasculature - Soft":(650,160)} - + REDUCE_IMAGEDATA_QUALITY = 1 # if 1, use vtkVolumeRaycastMapper, if 0, use vtkFixedPointVolumeRayCastMapper @@ -167,9 +167,9 @@ TYPE_RAYCASTING_MAPPER = 0 folder=RAYCASTING_PRESETS_DIRECTORY= os.path.join("..", "presets", "raycasting") -RAYCASTING_TYPES = [filename.split(".")[0] for filename in +RAYCASTING_TYPES = [filename.split(".")[0] for filename in os.listdir(folder) if - os.path.isfile(os.path.join(folder,filename))] + os.path.isfile(os.path.join(folder,filename))] RAYCASTING_TYPES.append(' Off') RAYCASTING_TYPES.sort() RAYCASTING_OFF_LABEL = ' Off' @@ -225,5 +225,5 @@ IMAGE_TILING = {"1 x 1":(1,1), "1 x 2":(1,2), "4 x 1":(4,1), "4 x 2":(4,2), "4 x 3":(4,3), "4 x 4":(4,4), "4 x 5":(4,5), "5 x 4":(5,4)} - - + + diff --git a/invesalius/gui/widgets/slice_menu.py b/invesalius/gui/widgets/slice_menu.py index 9091890..8453501 100644 --- a/invesalius/gui/widgets/slice_menu.py +++ b/invesalius/gui/widgets/slice_menu.py @@ -29,9 +29,9 @@ class SliceMenu(wx.Menu): def __init__(self): wx.Menu.__init__(self) self.ID_TO_TOOL_ITEM = {} - + #------------ Sub menu of the window and level ---------- - submenu_wl = wx.Menu() + submenu_wl = wx.Menu() new_id = wx.NewId() wl_item = wx.MenuItem(submenu_wl, new_id,\ 'Default', kind=wx.ITEM_RADIO) @@ -46,20 +46,20 @@ class SliceMenu(wx.Menu): self.ID_TO_TOOL_ITEM[new_id] = name #------------ Sub menu of the pseudo colors ------------- - submenu_pseudo_colors = wx.Menu() + submenu_pseudo_colours = wx.Menu() new_id = wx.NewId() - color_item = wx.MenuItem(submenu_pseudo_colors, new_id,\ - 'Default (Gray)', kind=wx.ITEM_RADIO) - submenu_pseudo_colors.AppendItem(color_item) - self.ID_TO_TOOL_ITEM[new_id] = 'Default (Gray)' + color_item = wx.MenuItem(submenu_pseudo_colours, new_id,\ + 'Default ', kind=wx.ITEM_RADIO) + submenu_pseudo_colours.AppendItem(color_item) + self.ID_TO_TOOL_ITEM[new_id] = 'Default ' for name in sorted(const.SLICE_COLOR_TABLE): - if not(name == 'Default (Gray)'): + if not(name == 'Default '): new_id = wx.NewId() color_item = wx.MenuItem(submenu_wl, new_id,\ name, kind=wx.ITEM_RADIO) - submenu_pseudo_colors.AppendItem(color_item) + submenu_pseudo_colours.AppendItem(color_item) self.ID_TO_TOOL_ITEM[new_id] = name - + #------------ Sub menu of the image tiling --------------- submenu_image_tiling = wx.Menu() for name in sorted(const.IMAGE_TILING): @@ -70,23 +70,23 @@ class SliceMenu(wx.Menu): self.ID_TO_TOOL_ITEM[new_id] = name # Add sub itens in the menu - self.AppendMenu(-1, "Window Width & Level", submenu_wl) - self.AppendMenu(-1, "Pseudo Colors", submenu_pseudo_colors) - self.AppendMenu(-1, "Image Tiling", submenu_image_tiling) - + self.AppendMenu(-1, "Window Width and Level", submenu_wl) + self.AppendMenu(-1, "Pseudo Colour", submenu_pseudo_colours) + self.AppendMenu(-1, "Image Tiling", submenu_image_tiling) + # It doesn't work in Linux self.Bind(wx.EVT_MENU, self.OnPopup) # In Linux the bind must be putted in the submenu if sys.platform == 'linux2': submenu_wl.Bind(wx.EVT_MENU, self.OnPopup) - submenu_pseudo_colors.Bind(wx.EVT_MENU, self.OnPopup) + submenu_pseudo_colours.Bind(wx.EVT_MENU, self.OnPopup) submenu_image_tiling.Bind(wx.EVT_MENU, self.OnPopup) - + def OnPopup(self, evt): - + id = evt.GetId() key = self.ID_TO_TOOL_ITEM[evt.GetId()] - + if(key in const.WINDOW_LEVEL.keys()): window, level = const.WINDOW_LEVEL[key] ps.Publisher().sendMessage('Bright and contrast adjustment image', @@ -96,16 +96,16 @@ class SliceMenu(wx.Menu): ps.Publisher().sendMessage('Update window and level text',\ "WL: %d WW: %d"%(level, window)) ps.Publisher().sendMessage('Update slice viewer') - + elif(key in const.SLICE_COLOR_TABLE.keys()): values = const.SLICE_COLOR_TABLE[key] ps.Publisher().sendMessage('Change color table from background image', values) ps.Publisher().sendMessage('Update slice viewer') - + elif(key in const.IMAGE_TILING.keys()): values = const.IMAGE_TILING[key] ps.Publisher().sendMessage('Set slice viewer layout', values) ps.Publisher().sendMessage('Update slice viewer') - + evt.Skip() -- libgit2 0.21.2