Merge branch 'master' into icp

rmatsuda
2 parents 78c5f802 d498a62e
Showing 113 changed files with 355 additions and 317 deletions Show diff stats
app.py
icons/3D_glasses_original.png
icons/be.bmp
icons/be.png
icons/brush_circle.jpg
icons/brush_circle.png
icons/brush_square.jpg
icons/brush_square.png
icons/ca.bmp
icons/ca.png
icons/cross_original.png
icons/cs.bmp
icons/cs.png
icons/de_DE.bmp
icons/de_DE.png
icons/el_GR.bmp
icons/el_GR.png
icons/en.bmp
icons/en.png
icons/es.bmp
@@ -40,7 +40,11 @@ if sys.platform == &#39;win32&#39;:
         #  #wxversion.ensureMinimal('2.8-unicode', optionsRequired=True)
         #  #wxversion.select('2.8-unicode', optionsRequired=True)
         #  #  wxversion.ensureMinimal('4.0')
-        
+
+# Forcing to use X11, OpenGL in wxPython doesn't work with Wayland.
+if sys.platform not in ("win32", "darwin"):
+    os.environ["GDK_BACKEND"] = "x11"
+
 import wx
 try:
     from wx.adv import SplashScreen
@@ -98,7 +102,7 @@ class InVesalius(wx.App):
         """
         Initialize splash screen and main frame.
         """
-        
+
         from multiprocessing import freeze_support
         freeze_support()
@@ -179,18 +183,18 @@ class Inv3SplashScreen(SplashScreen):
         #  session.SaveConfigFileBackup()
-           
+
         # Only after language was defined, splash screen will be
         # shown
         if lang:
-            
+
             #import locale
             #try:
             #    locale.setlocale(locale.LC_ALL, '')
             #except locale.Error:
             #    pass
-            
-            
+
+
             # For pt_BR, splash_pt.png should be used
             if (lang.startswith('pt')):
                 icon_file = "splash_pt.png"
@@ -202,13 +206,13 @@ class Inv3SplashScreen(SplashScreen):
                 abs_file_path = os.path.abspath(".." + os.sep)
                 path = abs_file_path
                 path = os.path.join(path, 'icons', icon_file)
-            
+
             else:
                 path = os.path.join(".","icons", icon_file)
                 if not os.path.exists(path):
                     path = os.path.join(".", "icons", "splash_en.png")
-				
+
             bmp = wx.Image(path).ConvertToBitmap()
             try:
@@ -232,10 +236,10 @@ class Inv3SplashScreen(SplashScreen):
         from invesalius.gui.frame import Frame
         from invesalius.control import Controller
         from invesalius.project import Project
-        
+
         self.main = Frame(None)
         self.control = Controller(self.main)
-        
+
         self.fc = wx.CallLater(200, self.ShowMain)
         options, args = parse_comand_line()
         wx.CallLater(1, use_cmd_optargs, options, args)
@@ -498,7 +502,7 @@ def main():
 if __name__ == '__main__':
     #Is needed because of pyinstaller
     multiprocessing.freeze_support()
-    
+
     #Needed in win 32 exe
     if hasattr(sys,"frozen") and sys.platform.startswith('win'):
@@ -523,4 +527,3 @@ if __name__ == &#39;__main__&#39;:
     # Init application
     main()
-
@@ -500,34 +500,6 @@ def img2memmap(group):
     return matrix, scalar_range, temp_file
-def imgnormalize(data, srange=(0, 255)):
-    """
-    Normalize image pixel intensity for int16 gray scale values.
-
-    :param data: image matrix
-    :param srange: range for normalization, default is 0 to 255
-    :return: normalized pixel intensity matrix
-    """
-
-    dataf = numpy.asarray(data)
-    rangef = numpy.asarray(srange)
-    faux = numpy.ravel(dataf).astype(float)
-    minimum = numpy.min(faux)
-    maximum = numpy.max(faux)
-    lower = rangef[0]
-    upper = rangef[1]
-
-    if minimum == maximum:
-        datan = numpy.ones(dataf.shape)*(upper + lower) / 2.
-    else:
-        datan = (faux-minimum)*(upper-lower) / (maximum-minimum) + lower
-
-    datan = numpy.reshape(datan, dataf.shape)
-    datan = datan.astype(numpy.int16)
-
-    return datan
-
-
 def get_LUT_value_255(data, window, level):
     shape = data.shape
     data_ = data.ravel()
@@ -539,6 +511,8 @@ def get_LUT_value_255(data, window, level):
     return data
-def image_normalize(image, min_=0.0, max_=1.0):
+def image_normalize(image, min_=0.0, max_=1.0, output_dtype=np.int16):
+    output = np.empty(shape=image.shape, dtype=output_dtype)
     imin, imax = image.min(), image.max()
-    return (image - imin) * ((max_ - min_) / (imax - imin)) + min_
+    output[:] = (image - imin) * ((max_ - min_) / (imax - imin)) + min_
+    return output
@@ -301,7 +301,10 @@ class Slice(metaclass=utils.Singleton):
         for name in self.aux_matrices:
             m = self.aux_matrices[name]
-            f = m.filename
+            try:
+                f = m.filename
+            except AttributeError:
+                continue
             m._mmap.close()
             m = None
             os.remove(f)
@@ -347,6 +350,8 @@ class Slice(metaclass=utils.Singleton):
             self.SetMaskEditionThreshold(index, threshold_range)
     def __set_current_mask_threshold(self, threshold_range):
+        if self.current_mask is None:
+            return
         index = self.current_mask.index
         self.num_gradient += 1
         self.current_mask.matrix[:] = 0
@@ -387,6 +392,8 @@ class Slice(metaclass=utils.Singleton):
             Publisher.sendMessage("Reload actual slice")
     def __set_current_mask_threshold_actual_slice(self, threshold_range):
+        if self.current_mask is None:
+            return
         index = self.current_mask.index
         for orientation in self.buffer_slices:
             self.buffer_slices[orientation].discard_vtk_mask()
@@ -624,7 +631,7 @@ class Slice(metaclass=utils.Singleton):
             self.buffer_slices[orientation].vtk_image = image
             self.buffer_slices[orientation].vtk_mask = mask
-        if self.to_show_aux == "watershed" and self.current_mask.is_shown:
+        if self.to_show_aux == "watershed" and self.current_mask is not None and self.current_mask.is_shown:
             m = self.get_aux_slice("watershed", orientation, slice_number)
             tmp_vimage = converters.to_vtk(m, self.spacing, slice_number, orientation)
             cimage = self.do_custom_colour(
@@ -102,13 +102,13 @@ class ContourMIPConfig(wx.Panel):
         self.txt_mip_border = wx.StaticText(self, -1, _("Sharpness"))
         sizer = wx.BoxSizer(wx.HORIZONTAL)
-        sizer.Add(txt_mip_size, 0, wx.EXPAND | wx.ALL, 2)
+        sizer.Add(txt_mip_size, 0, wx.ALIGN_CENTER_VERTICAL | wx.ALL, 2)
         sizer.Add(self.mip_size_spin, 0)
         try:
             sizer.Add(10, 0)
         except TypeError:
             sizer.Add((10, 0))
-        sizer.Add(self.txt_mip_border, 0, wx.EXPAND | wx.ALL, 2)
+        sizer.Add(self.txt_mip_border, 0, wx.ALIGN_CENTER_VERTICAL | wx.ALL, 2)
         sizer.Add(self.border_spin, 0, wx.EXPAND)
         try:
             sizer.Add(10, 0)
@@ -1438,8 +1438,12 @@ class Viewer(wx.Panel):
             index = max_slice_number - 1
         inverted = self.mip_ctrls.inverted.GetValue()
         border_size = self.mip_ctrls.border_spin.GetValue()
-        image = self.slice_.GetSlices(self.orientation, index,
-                                      self.number_slices, inverted, border_size)
+        try:
+            image = self.slice_.GetSlices(self.orientation, index,
+                                          self.number_slices, inverted,
+                                          border_size)
+        except IndexError:
+            return
         self.slice_data.actor.SetInputData(image)
         for actor in self.actors_by_slice_number[self.slice_data.number]:
             self.slice_data.renderer.RemoveActor(actor)
@@ -81,6 +81,8 @@ class BrainSegmenterDialog(wx.Dialog):
         self.txt_threshold.SetMinClientSize((w, -1))
         self.chk_new_mask = wx.CheckBox(self, wx.ID_ANY, _("Create new mask"))
         self.chk_new_mask.SetValue(True)
+        self.chk_apply_wwwl = wx.CheckBox(self, wx.ID_ANY, _("Apply WW&WL"))
+        self.chk_apply_wwwl.SetValue(False)
         self.progress = wx.Gauge(self, -1)
         self.lbl_progress_caption = wx.StaticText(self, -1, _("Elapsed time:"))
         self.lbl_time = wx.StaticText(self, -1, _("00:00:00"))
@@ -115,11 +117,12 @@ class BrainSegmenterDialog(wx.Dialog):
         sizer_3.Add(
             self.sld_threshold,
             1,
-            wx.ALIGN_CENTER | wx.BOTTOM | wx.EXPAND | wx.LEFT | wx.RIGHT,
+            wx.BOTTOM | wx.EXPAND | wx.LEFT | wx.RIGHT,
             5,
         )
         sizer_3.Add(self.txt_threshold, 0, wx.ALL, 5)
         main_sizer.Add(sizer_3, 0, wx.EXPAND, 0)
+        main_sizer.Add(self.chk_apply_wwwl, 0, wx.EXPAND | wx.ALL, 5)
         main_sizer.Add(self.chk_new_mask, 0, wx.EXPAND | wx.ALL, 5)
         main_sizer.Add(self.progress, 0, wx.EXPAND | wx.ALL, 5)
         time_sizer = wx.BoxSizer(wx.HORIZONTAL)
@@ -128,15 +131,15 @@ class BrainSegmenterDialog(wx.Dialog):
         main_sizer.Add(time_sizer, 0, wx.EXPAND | wx.ALL, 5)
         sizer_buttons = wx.BoxSizer(wx.HORIZONTAL)
         sizer_buttons.Add(
-            self.btn_close, 0, wx.ALIGN_BOTTOM | wx.ALIGN_RIGHT | wx.ALL, 5
+            self.btn_close, 0, wx.ALIGN_BOTTOM | wx.ALL, 5
         )
         sizer_buttons.Add(
-            self.btn_stop, 0, wx.ALIGN_BOTTOM | wx.ALIGN_RIGHT | wx.ALL, 5
+            self.btn_stop, 0, wx.ALIGN_BOTTOM | wx.ALL, 5
         )
         sizer_buttons.Add(
-            self.btn_segment, 0, wx.ALIGN_BOTTOM | wx.ALIGN_RIGHT | wx.ALL, 5
+            self.btn_segment, 0, wx.ALIGN_BOTTOM | wx.ALL, 5
         )
-        main_sizer.Add(sizer_buttons, 0, wx.ALIGN_BOTTOM | wx.ALIGN_RIGHT | wx.ALL, 0)
+        main_sizer.Add(sizer_buttons, 0, wx.ALIGN_RIGHT | wx.ALL, 0)
         self.SetSizer(main_sizer)
         main_sizer.Fit(self)
         main_sizer.SetSizeHints(self)
@@ -216,6 +219,7 @@ class BrainSegmenterDialog(wx.Dialog):
             device_id = self.plaidml_devices[self.cb_devices.GetValue()]
         except (KeyError, AttributeError):
             device_id = "llvm_cpu.0"
+        apply_wwwl = self.chk_apply_wwwl.GetValue()
         create_new_mask = self.chk_new_mask.GetValue()
         use_gpu = self.chk_use_gpu.GetValue()
         prob_threshold = self.sld_threshold.GetValue() / 100.0
@@ -224,8 +228,11 @@ class BrainSegmenterDialog(wx.Dialog):
         self.btn_segment.Disable()
         self.chk_new_mask.Disable()
+        window_width = slc.Slice().window_width
+        window_level = slc.Slice().window_level
+
         try:
-            self.ps = segment.SegmentProcess(image, create_new_mask, backend, device_id, use_gpu)
+            self.ps = segment.SegmentProcess(image, create_new_mask, backend, device_id, use_gpu, apply_wwwl, window_width, window_level)
             self.ps.start()
         except (multiprocessing.ProcessError, OSError, ValueError) as err:
             self.OnStop(None)
@@ -351,18 +351,89 @@ class ButtonControlPanel(wx.Panel):
         else:
            dlg.MaskSelectionRequiredForDuplication()
-class MasksListCtrlPanel(wx.ListCtrl, listmix.TextEditMixin, listmix.CheckListCtrlMixin):
+class InvListCtrl(wx.ListCtrl):
     def __init__(self, parent, ID=-1, pos=wx.DefaultPosition,
-                 size=wx.DefaultSize, style=wx.LC_REPORT):
+                 size=wx.DefaultSize, style=wx.LC_REPORT | wx.LC_EDIT_LABELS):
+        wx.ListCtrl.__init__(self, parent, ID, pos, size, style=style)
+        self.__bind_events_wx()
-        # native look and feel for MacOS
-        #if wx.Platform == "__WXMAC__":
-        #    wx.SystemOptions.SetOptionInt("mac.listctrl.always_use_generic", 0)
+    def __bind_events_wx(self):
+        self.Bind(wx.EVT_LEFT_DOWN, self.OnClickItem)
+        self.Bind(wx.EVT_LEFT_DCLICK, self.OnDblClickItem)
+
+    def CreateColourBitmap(self, colour):
+        """
+        Create a wx Image with a mask colour.
+        colour: colour in rgb format(0 - 1)
+        """
+        image = self.image_gray
+        new_image = Image.new("RGB", image.size)
+        for x in range(image.size[0]):
+            for y in range(image.size[1]):
+                pixel_colour = [int(i*image.getpixel((x,y)))
+                                for i in colour]
+                new_image.putpixel((x,y), tuple(pixel_colour))
+
+        wx_image = wx.Image(new_image.size[0],
+                            new_image.size[1])
+        try:
+            wx_image.SetData(new_image.tostring())
+        except Exception:
+            wx_image.SetData(new_image.tobytes())
+        return wx.Bitmap(wx_image.Scale(16, 16))
+
+    def OnClickItem(self, evt):
+        self._click_check = False
+        item_idx, flag = (self.HitTest(evt.GetPosition()))
+        if item_idx > -1:
+            column_clicked = self.get_column_clicked(evt.GetPosition())
+            if column_clicked == 0:
+                self._click_check = True
+                item = self.GetItem(item_idx, 0)
+                flag = not bool(item.GetImage())
+                self.SetItemImage(item_idx, int(flag))
+                self.OnCheckItem(item_idx, flag)
+                return
+        evt.Skip()
-        wx.ListCtrl.__init__(self, parent, ID, pos, size, style=wx.LC_REPORT)
-        listmix.TextEditMixin.__init__(self)
-        listmix.CheckListCtrlMixin.__init__(self)
+    def OnDblClickItem(self, evt):
+        self._click_check = False
+        item_idx, flag = (self.HitTest(evt.GetPosition()))
+        if item_idx > -1:
+            column_clicked = self.get_column_clicked(evt.GetPosition())
+            if column_clicked == 1:
+                item = self.GetItem(item_idx, 1)
+                self.enter_edition(item)
+                return
+        evt.Skip()
+
+    def enter_edition(self, item):
+        ctrl = self.EditLabel(item.GetId())
+        w, h = ctrl.GetClientSize()
+        w = self.GetColumnWidth(1)
+        ctrl.SetClientSize(w, h)
+        ctrl.SetValue(item.GetText())
+        ctrl.SelectAll()
+
+
+    def get_column_clicked(self, position):
+        epx, epy = position
+        wpx, wpy = self.GetPosition()
+        width_sum = 0
+        for i in range(self.GetColumnCount()):
+            width_sum += self.GetColumnWidth(i)
+            if (epx - wpx) <= width_sum:
+                return i
+        return -1
+
+
+
+class MasksListCtrlPanel(InvListCtrl):
+    def __init__(self, parent, ID=-1, pos=wx.DefaultPosition,
+                 size=wx.DefaultSize, style=wx.LC_REPORT | wx.LC_EDIT_LABELS):
+        super().__init__(parent, ID, pos, size, style=style)
+        self._click_check = False
         self.mask_list_index = {}
         self.current_index = 0
         self.__init_columns()
@@ -371,12 +442,9 @@ class MasksListCtrlPanel(wx.ListCtrl, listmix.TextEditMixin, listmix.CheckListCt
         self.__bind_events()
     def __bind_events_wx(self):
-        self.Bind(wx.EVT_LIST_ITEM_ACTIVATED, self.OnItemActivated)
-        self.Bind(wx.EVT_LIST_BEGIN_LABEL_EDIT, self.OnBeginLabelEdit)
         self.Bind(wx.EVT_LIST_END_LABEL_EDIT, self.OnEditLabel)
         self.Bind(wx.EVT_KEY_UP, self.OnKeyEvent)
-
     def __bind_events(self):
         Publisher.subscribe(self.AddMask, 'Add mask')
         Publisher.subscribe(self.EditMaskThreshold,
@@ -438,7 +506,6 @@ class MasksListCtrlPanel(wx.ListCtrl, listmix.TextEditMixin, listmix.CheckListCt
                 self.current_index -= 1
                 self.SetItemImage(self.current_index, 1)
-
     def OnCloseProject(self):
         self.DeleteAllItems()
         self.mask_list_index = {}
@@ -475,13 +542,13 @@ class MasksListCtrlPanel(wx.ListCtrl, listmix.TextEditMixin, listmix.CheckListCt
     def __init_image_list(self):
         self.imagelist = wx.ImageList(16, 16)
-        image = wx.Image(os.path.join(inv_paths.ICON_DIR, "object_invisible.jpg"))
+        image = wx.Image(os.path.join(inv_paths.ICON_DIR, "object_invisible.png"))
         bitmap = wx.Bitmap(image.Scale(16, 16))
         bitmap.SetWidth(16)
         bitmap.SetHeight(16)
         img_null = self.imagelist.Add(bitmap)
-        image = wx.Image(os.path.join(inv_paths.ICON_DIR, "object_visible.jpg"))
+        image = wx.Image(os.path.join(inv_paths.ICON_DIR, "object_visible.png"))
         bitmap = wx.Bitmap(image.Scale(16, 16))
         bitmap.SetWidth(16)
         bitmap.SetHeight(16)
@@ -489,23 +556,16 @@ class MasksListCtrlPanel(wx.ListCtrl, listmix.TextEditMixin, listmix.CheckListCt
         self.SetImageList(self.imagelist,wx.IMAGE_LIST_SMALL)
-        self.image_gray = Image.open(os.path.join(inv_paths.ICON_DIR, "object_colour.jpg"))
-
-    def OnBeginLabelEdit(self, evt):
-        if evt.GetColumn() == 1:
-            evt.Skip()
-        else:
-            evt.Veto()
+        self.image_gray = Image.open(os.path.join(inv_paths.ICON_DIR, "object_colour.png"))
     def OnEditLabel(self, evt):
-        Publisher.sendMessage('Change mask name',
-                              index=evt.GetIndex(), name=evt.GetLabel())
+        if not evt.IsEditCancelled():
+            index = evt.GetIndex()
+            self.SetItem(index, 1, evt.GetLabel())
+            Publisher.sendMessage('Change mask name',
+                                  index=evt.GetIndex(), name=evt.GetLabel())
         evt.Skip()
-    def OnItemActivated(self, evt):
-        self.ToggleItem(evt.Index)
-        #  pass
-
     def OnCheckItem(self, index, flag):
         if flag:
             for key in self.mask_list_index.keys():
@@ -515,26 +575,7 @@ class MasksListCtrlPanel(wx.ListCtrl, listmix.TextEditMixin, listmix.CheckListCt
             self.current_index = index
         Publisher.sendMessage('Show mask', index=index, value=flag)
-    def CreateColourBitmap(self, colour):
-        """
-        Create a wx Image with a mask colour.
-        colour: colour in rgb format(0 - 1)
-        """
-        image = self.image_gray
-        new_image = Image.new("RGB", image.size)
-        for x in range(image.size[0]):
-            for y in range(image.size[1]):
-                pixel_colour = [int(i*image.getpixel((x,y)))
-                                for i in colour]
-                new_image.putpixel((x,y), tuple(pixel_colour))
-        wx_image = wx.Image(new_image.size[0],
-                            new_image.size[1])
-        try:
-            wx_image.SetData(new_image.tostring())
-        except Exception:
-            wx_image.SetData(new_image.tobytes())
-        return wx.Bitmap(wx_image.Scale(16, 16))
     def InsertNewItem(self, index=0, label=_("Mask"), threshold="(1000, 4500)",
                       colour=None):
@@ -718,19 +759,11 @@ class SurfaceButtonControlPanel(wx.Panel):
     def AffineStatus(self, affine, status):
         self.affinestatus = status
-class SurfacesListCtrlPanel(wx.ListCtrl, listmix.TextEditMixin, listmix.CheckListCtrlMixin):
-
+class SurfacesListCtrlPanel(InvListCtrl):
     def __init__(self, parent, ID=-1, pos=wx.DefaultPosition,
-                 size=wx.DefaultSize, style=wx.LC_REPORT):
-
-        # native look and feel for MacOS
-        #if wx.Platform == "__WXMAC__":
-        #    wx.SystemOptions.SetOptionInt("mac.listctrl.always_use_generic", 0)
-
-        wx.ListCtrl.__init__(self, parent, ID, pos, size, style=wx.LC_REPORT)
-        listmix.TextEditMixin.__init__(self)
-        listmix.CheckListCtrlMixin.__init__(self)
-
+                 size=wx.DefaultSize, style=wx.LC_REPORT | wx.LC_EDIT_LABELS):
+        super().__init__(parent, ID, pos, size, style=style)
+        self._click_check = False
         self.__init_columns()
         self.__init_image_list()
         self.__init_evt()
@@ -752,8 +785,6 @@ class SurfacesListCtrlPanel(wx.ListCtrl, listmix.TextEditMixin, listmix.CheckLis
         Publisher.subscribe(self.OnShowMultiple, 'Show multiple surfaces')
     def __bind_events_wx(self):
-        self.Bind(wx.EVT_LIST_ITEM_ACTIVATED, self.OnItemActivated)
-        self.Bind(wx.EVT_LIST_BEGIN_LABEL_EDIT, self.OnBeginLabelEdit)
         self.Bind(wx.EVT_LIST_END_LABEL_EDIT, self.OnEditLabel)
         #self.Bind(wx.EVT_LIST_ITEM_SELECTED, self.OnItemSelected_)
         self.Bind(wx.EVT_KEY_UP, self.OnKeyEvent)
@@ -841,13 +872,13 @@ class SurfacesListCtrlPanel(wx.ListCtrl, listmix.TextEditMixin, listmix.CheckLis
     def __init_image_list(self):
         self.imagelist = wx.ImageList(16, 16)
-        image = wx.Image(os.path.join(inv_paths.ICON_DIR, "object_invisible.jpg"))
+        image = wx.Image(os.path.join(inv_paths.ICON_DIR, "object_invisible.png"))
         bitmap = wx.Bitmap(image.Scale(16, 16))
         bitmap.SetWidth(16)
         bitmap.SetHeight(16)
         img_null = self.imagelist.Add(bitmap)
-        image = wx.Image(os.path.join(inv_paths.ICON_DIR, "object_visible.jpg"))
+        image = wx.Image(os.path.join(inv_paths.ICON_DIR, "object_visible.png"))
         bitmap = wx.Bitmap(image.Scale(16, 16))
         bitmap.SetWidth(16)
         bitmap.SetHeight(16)
@@ -855,7 +886,7 @@ class SurfacesListCtrlPanel(wx.ListCtrl, listmix.TextEditMixin, listmix.CheckLis
         self.SetImageList(self.imagelist,wx.IMAGE_LIST_SMALL)
-        self.image_gray = Image.open(os.path.join(inv_paths.ICON_DIR, "object_colour.jpg"))
+        self.image_gray = Image.open(os.path.join(inv_paths.ICON_DIR, "object_colour.png"))
     def OnBeginLabelEdit(self, evt):
         if evt.GetColumn() == 1:
@@ -864,11 +895,10 @@ class SurfacesListCtrlPanel(wx.ListCtrl, listmix.TextEditMixin, listmix.CheckLis
             evt.Veto()
     def OnEditLabel(self, evt):
-        Publisher.sendMessage('Change surface name', index=evt.GetIndex(), name=evt.GetLabel())
-        evt.Skip()
-
-    def OnItemActivated(self, evt):
-        self.ToggleItem(evt.Index)
+        if not evt.IsEditCancelled():
+            index = evt.GetIndex()
+            self.SetItem(index, 1, evt.GetLabel())
+            Publisher.sendMessage('Change surface name', index=evt.GetIndex(), name=evt.GetLabel())
         evt.Skip()
     def OnCheckItem(self, index, flag):
@@ -944,28 +974,6 @@ class SurfacesListCtrlPanel(wx.ListCtrl, listmix.TextEditMixin, listmix.CheckLis
         self.SetItem(index, 4, transparency)
         self.SetItemImage(index, 1)
-    def CreateColourBitmap(self, colour):
-        """
-        Create a wx Image with a mask colour.
-        colour: colour in rgb format(0 - 1)
-        """
-        image = self.image_gray
-        new_image = Image.new("RGB", image.size)
-        for x in range(image.size[0]):
-            for y in range(image.size[1]):
-                pixel_colour = [int(i*image.getpixel((x,y)))
-                                for i in colour]
-                new_image.putpixel((x,y), tuple(pixel_colour))
-
-        wx_image = wx.Image(new_image.size[0],
-                            new_image.size[1])
-        try:
-            wx_image.SetData(new_image.tostring())
-        except Exception:
-            wx_image.SetData(new_image.tobytes())
-
-        return wx.Bitmap(wx_image.Scale(16, 16))
-
     def EditSurfaceTransparency(self, surface_index, transparency):
         """
         Set actor transparency (oposite to opacity) according to given actor
@@ -985,19 +993,11 @@ class SurfacesListCtrlPanel(wx.ListCtrl, listmix.TextEditMixin, listmix.CheckLis
 #-------------------------------------------------
 #-------------------------------------------------
-class MeasuresListCtrlPanel(wx.ListCtrl, listmix.TextEditMixin, listmix.CheckListCtrlMixin):
-
+class MeasuresListCtrlPanel(InvListCtrl):
     def __init__(self, parent, ID=-1, pos=wx.DefaultPosition,
-                 size=wx.DefaultSize, style=wx.LC_REPORT):
-
-        # native look and feel for MacOS
-        #if wx.Platform == "__WXMAC__":
-        #    wx.SystemOptions.SetOptionInt("mac.listctrl.always_use_generic", 0)
-
-        wx.ListCtrl.__init__(self, parent, ID, pos, size, style=wx.LC_REPORT)
-        listmix.TextEditMixin.__init__(self)
-        listmix.CheckListCtrlMixin.__init__(self)
-
+                 size=wx.DefaultSize, style=wx.LC_REPORT | wx.LC_EDIT_LABELS):
+        super().__init__(parent, ID, pos, size, style=style)
+        self._click_check = False
         self.__init_columns()
         self.__init_image_list()
         self.__init_evt()
@@ -1017,13 +1017,10 @@ class MeasuresListCtrlPanel(wx.ListCtrl, listmix.TextEditMixin, listmix.CheckLis
         Publisher.subscribe(self.OnRemoveGUIMeasure, 'Remove GUI measurement')
     def __bind_events_wx(self):
-        self.Bind(wx.EVT_LIST_ITEM_ACTIVATED, self.OnItemActivated)
-        self.Bind(wx.EVT_LIST_BEGIN_LABEL_EDIT, self.OnBeginLabelEdit)
         self.Bind(wx.EVT_LIST_END_LABEL_EDIT, self.OnEditLabel)
         self.Bind(wx.EVT_LIST_ITEM_SELECTED, self.OnItemSelected_)
         self.Bind(wx.EVT_KEY_UP, self.OnKeyEvent)
-
     def OnKeyEvent(self, event):
         keycode = event.GetKeyCode()
         # Delete key
@@ -1116,13 +1113,13 @@ class MeasuresListCtrlPanel(wx.ListCtrl, listmix.TextEditMixin, listmix.CheckLis
     def __init_image_list(self):
         self.imagelist = wx.ImageList(16, 16)
-        image = wx.Image(os.path.join(inv_paths.ICON_DIR, "object_invisible.jpg"))
+        image = wx.Image(os.path.join(inv_paths.ICON_DIR, "object_invisible.png"))
         bitmap = wx.Bitmap(image.Scale(16, 16))
         bitmap.SetWidth(16)
         bitmap.SetHeight(16)
         img_null = self.imagelist.Add(bitmap)
-        image = wx.Image(os.path.join(inv_paths.ICON_DIR, "object_visible.jpg"))
+        image = wx.Image(os.path.join(inv_paths.ICON_DIR, "object_visible.png"))
         bitmap = wx.Bitmap(image.Scale(16, 16))
         bitmap.SetWidth(16)
         bitmap.SetHeight(16)
@@ -1130,7 +1127,7 @@ class MeasuresListCtrlPanel(wx.ListCtrl, listmix.TextEditMixin, listmix.CheckLis
         self.SetImageList(self.imagelist,wx.IMAGE_LIST_SMALL)
-        self.image_gray = Image.open(os.path.join(inv_paths.ICON_DIR, "object_colour.jpg"))
+        self.image_gray = Image.open(os.path.join(inv_paths.ICON_DIR, "object_colour.png"))
     def OnBeginLabelEdit(self, evt):
         if evt.GetColumn() == 1:
@@ -1139,14 +1136,12 @@ class MeasuresListCtrlPanel(wx.ListCtrl, listmix.TextEditMixin, listmix.CheckLis
             evt.Veto()
     def OnEditLabel(self, evt):
-        Publisher.sendMessage('Change measurement name', index=evt.GetIndex(), name=evt.GetLabel())
+        if not evt.IsEditCancelled():
+            index = evt.GetIndex()
+            self.SetItem(index, 1, evt.GetLabel())
+            Publisher.sendMessage('Change measurement name', index=evt.GetIndex(), name=evt.GetLabel())
         evt.Skip()
-    def OnItemActivated(self, evt):
-        self.ToggleItem(evt.Index)
-        evt.Skip()
-
-
     def OnCheckItem(self, index, flag):
         Publisher.sendMessage('Show measurement', index=index, visibility=flag)
@@ -1238,27 +1233,6 @@ class MeasuresListCtrlPanel(wx.ListCtrl, listmix.TextEditMixin, listmix.CheckLis
         self.SetItemImage(index, 1)
         self.Refresh()
-    def CreateColourBitmap(self, colour):
-        """
-        Create a wx Image with a mask colour.
-        colour: colour in rgb format(0 - 1)
-        """
-        image = self.image_gray
-        new_image = Image.new("RGB", image.size)
-        for x in range(image.size[0]):
-            for y in range(image.size[1]):
-                pixel_colour = [int(i*image.getpixel((x,y)))
-                                for i in colour]
-                new_image.putpixel((x,y), tuple(pixel_colour))
-
-        wx_image = wx.Image(new_image.size[0],
-                            new_image.size[1])
-        try:
-            wx_image.SetData(new_image.tostring())
-        except:
-            wx_image.SetData(new_image.tobytes())
-        return wx.Bitmap(wx_image.Scale(16, 16))
-
     def EditItemColour(self, measure_index, colour):
         """
         """
@@ -1273,19 +1247,12 @@ class MeasuresListCtrlPanel(wx.ListCtrl, listmix.TextEditMixin, listmix.CheckLis
 #*******************************************************************
-class AnnotationsListCtrlPanel(wx.ListCtrl, listmix.TextEditMixin, listmix.CheckListCtrlMixin):
+class AnnotationsListCtrlPanel(wx.ListCtrl):
     # TODO: Remove edimixin, allow only visible and invisible
     def __init__(self, parent, ID=-1, pos=wx.DefaultPosition,
-                 size=wx.DefaultSize, style=wx.LC_REPORT):
-
-        # native look and feel for MacOS
-        #if wx.Platform == "__WXMAC__":
-        #    wx.SystemOptions.SetOptionInt("mac.listctrl.always_use_generic", 0)
-
-        wx.ListCtrl.__init__(self, parent, ID, pos, size, style=wx.LC_REPORT)
-        listmix.TextEditMixin.__init__(self)
-        listmix.CheckListCtrlMixin.__init__(self)
-
+                 size=wx.DefaultSize, style=wx.LC_REPORT | wx.LC_EDIT_LABELS):
+        wx.ListCtrl.__init__(self, parent, ID, pos, size, style=style)
+        self._click_check = False
         self.__init_columns()
         self.__init_image_list()
         self.__init_evt()
@@ -1311,19 +1278,19 @@ class AnnotationsListCtrlPanel(wx.ListCtrl, listmix.TextEditMixin, listmix.Check
     def __init_image_list(self):
         self.imagelist = wx.ImageList(16, 16)
-        image = wx.Image(os.path.join(inv_paths.ICON_DIR, "object_visible.jpg"))
+        image = wx.Image(os.path.join(inv_paths.ICON_DIR, "object_visible.png"))
         bitmap = wx.Bitmap(image.Scale(16, 16))
         bitmap.SetWidth(16)
         bitmap.SetHeight(16)
         img_check = self.imagelist.Add(bitmap)
-        image = wx.Image(os.path.join(inv_paths.ICON_DIR, "object_invisible.jpg"))
+        image = wx.Image(os.path.join(inv_paths.ICON_DIR, "object_invisible.png"))
         bitmap = wx.Bitmap(image.Scale(16, 16))
         bitmap.SetWidth(16)
         bitmap.SetHeight(16)
         img_null = self.imagelist.Add(bitmap)
-        image = wx.Image(os.path.join(inv_paths.ICON_DIR, "object_colour.jpg"))
+        image = wx.Image(os.path.join(inv_paths.ICON_DIR, "object_colour.png"))
         bitmap = wx.Bitmap(image.Scale(16, 16))
         bitmap.SetWidth(16)
         bitmap.SetHeight(16)
@@ -123,6 +123,7 @@ class Panel(wx.Panel):
         #self.SetSizerAndFit(sizer)
         self.SetSizer(sizer)
+        self.Layout()
 # Lower fold panel
@@ -111,7 +111,7 @@ class Panel(wx.Panel):
         p3.SetPopupMenu(menu)
-        if sys.platform == 'win32':
+        if sys.platform == 'win32' or wx.VERSION >= (4, 1):
             self.aui_manager.AddPane(p1, s1)
             self.aui_manager.AddPane(p2, s2)
             self.aui_manager.AddPane(p3, s3)
@@ -604,7 +604,7 @@ class VolumeToolPanel(wx.Panel):
         id = evt.GetId()
         item = ID_TO_ITEMSLICEMENU[id]
         checked = item.IsChecked()
-        label = item.GetLabel()
+        label = item.GetItemLabelText()
         if not (checked):
             Publisher.sendMessage('Disable plane', plane_label=label)
@@ -245,9 +245,7 @@ WILDCARD_OPEN = &quot;InVesalius 3 project (*.inv3)|*.inv3|&quot; \
 WILDCARD_ANALYZE = "Analyze 7.5 (*.hdr)|*.hdr|" \
                    "All files (*.*)|*.*"
-WILDCARD_NIFTI = "NIfTI 1 (*.nii)|*.nii|" \
-                 "Compressed NIfTI (*.nii.gz)|*.nii.gz|" \
-                 "HDR NIfTI (*.hdr)|*.hdr|" \
+WILDCARD_NIFTI = "NIfTI 1 (*.nii;*.nii.gz;*.hdr)|*.nii;*.nii.gz;*.hdr|" \
                  "All files (*.*)|*.*"
 #".[jJ][pP][gG]"
 WILDCARD_PARREC = "PAR/REC (*.par)|*.par|" \
@@ -1950,17 +1948,17 @@ class WatershedOptionsPanel(wx.Panel):
                                          min_value=1, max_value=10)
         box_sizer = wx.StaticBoxSizer(wx.StaticBox(self, -1, "Conectivity"), wx.VERTICAL)
-        box_sizer.Add(self.choice_2dcon, 0, wx.ALIGN_CENTER_VERTICAL,2)
-        box_sizer.Add(self.choice_3dcon, 0, wx.ALIGN_CENTER_VERTICAL,2)
+        box_sizer.Add(self.choice_2dcon, 0, wx.ALL, 5)
+        box_sizer.Add(self.choice_3dcon, 0, wx.ALL, 5)
         g_sizer = wx.BoxSizer(wx.HORIZONTAL)
-        g_sizer.Add(wx.StaticText(self, -1, _("Gaussian sigma")), 0, wx.ALIGN_RIGHT | wx.ALL, 5)
-        g_sizer.Add(self.gaussian_size, 0, wx.ALIGN_LEFT | wx.ALL, 5)
+        g_sizer.Add(wx.StaticText(self, -1, _("Gaussian sigma")), 0, wx.ALIGN_CENTER | wx.ALL, 5)
+        g_sizer.Add(self.gaussian_size, 0, wx.ALL, 5)
         sizer = wx.BoxSizer(wx.VERTICAL)
-        sizer.Add(self.choice_algorithm, 0, wx.ALIGN_CENTER_VERTICAL,2)
-        sizer.Add(box_sizer, 1, wx.EXPAND,2)
-        sizer.Add(g_sizer, 0, wx.ALIGN_LEFT, 2)
+        sizer.Add(self.choice_algorithm, 0, wx.ALL, 5)
+        sizer.Add(box_sizer, 1, wx.EXPAND | wx.ALL, 5)
+        sizer.Add(g_sizer, 0, wx.ALL, 5)
         self.SetSizer(sizer)
         sizer.Fit(self)
@@ -1998,8 +1996,7 @@ class WatershedOptionsDialog(wx.Dialog):
         btnsizer.Realize()
         sizer.Add(wop, 0, wx.EXPAND)
-        sizer.Add(btnsizer, 0, wx.EXPAND)
-        sizer.AddSpacer(5)
+        sizer.Add(btnsizer, 0, wx.ALIGN_RIGHT | wx.BOTTOM, 5)
         self.SetSizer(sizer)
         sizer.Fit(self)
@@ -2060,16 +2057,16 @@ class MaskBooleanDialog(wx.Dialog):
         gsizer = wx.FlexGridSizer(rows=3, cols=2, hgap=5, vgap=5)
-        gsizer.Add(wx.StaticText(self, -1, _(u"Mask 1")))
+        gsizer.Add(wx.StaticText(self, -1, _(u"Mask 1")), 0, wx.ALIGN_CENTER_VERTICAL)
         gsizer.Add(self.mask1, 1, wx.EXPAND)
-        gsizer.Add(wx.StaticText(self, -1, _(u"Operation")))
+        gsizer.Add(wx.StaticText(self, -1, _(u"Operation")), 0, wx.ALIGN_CENTER_VERTICAL)
         gsizer.Add(self.op_boolean, 1, wx.EXPAND)
-        gsizer.Add(wx.StaticText(self, -1, _(u"Mask 2")))
+        gsizer.Add(wx.StaticText(self, -1, _(u"Mask 2")), 0, wx.ALIGN_CENTER_VERTICAL)
         gsizer.Add(self.mask2, 1, wx.EXPAND)
         sizer = wx.BoxSizer(wx.VERTICAL)
-        sizer.Add(gsizer, 0, wx.EXPAND | wx.ALIGN_CENTER | wx.ALL, border=5)
-        sizer.Add(btnsizer, 0, wx.EXPAND | wx.ALIGN_CENTER | wx.ALL, border=5)
+        sizer.Add(gsizer, 0, wx.EXPAND | wx.ALL, border=5)
+        sizer.Add(btnsizer, 0, wx.EXPAND | wx.ALL, border=5)
         self.SetSizer(sizer)
         sizer.Fit(self)
@@ -2798,8 +2795,8 @@ class SelectPartsOptionsDialog(wx.Dialog):
         sizer.AddSpacer(5)
         btn_sizer = wx.BoxSizer(wx.HORIZONTAL)
-        btn_sizer.Add(self.btn_ok, 0, flag=wx.ALIGN_RIGHT, border=5)
-        btn_sizer.Add(self.btn_cancel, 0, flag=wx.LEFT|wx.ALIGN_RIGHT, border=5)
+        btn_sizer.Add(self.btn_ok, 0)# flag=wx.ALIGN_RIGHT, border=5)
+        btn_sizer.Add(self.btn_cancel, 0, flag=wx.LEFT, border=5)
         sizer.Add(btn_sizer, 0, flag=wx.ALIGN_RIGHT|wx.LEFT|wx.RIGHT, border=5)
         sizer.AddSpacer(5)
@@ -3202,8 +3199,8 @@ class FillHolesAutoDialog(wx.Dialog):
         sizer.AddSpacer(5)
         btn_sizer = wx.BoxSizer(wx.HORIZONTAL)
-        btn_sizer.Add(self.apply_btn, 0, flag=wx.ALIGN_RIGHT, border=5)
-        btn_sizer.Add(self.close_btn, 0, flag=wx.LEFT|wx.ALIGN_RIGHT, border=5)
+        btn_sizer.Add(self.apply_btn, 0)# flag=wx.ALIGN_RIGHT, border=5)
+        btn_sizer.Add(self.close_btn, 0, flag=wx.LEFT, border=5)
         sizer.Add(btn_sizer, 0, flag=wx.ALIGN_RIGHT|wx.LEFT|wx.RIGHT, border=5)
@@ -789,8 +789,8 @@ class SingleImagePreview(wx.Panel):
         in_sizer.Add(checkbox, 0)
         sizer = wx.BoxSizer(wx.VERTICAL)
-        sizer.Add(self.panel, 20, wx.GROW|wx.EXPAND)
-        sizer.Add(in_sizer, 1, wx.GROW|wx.EXPAND)
+        sizer.Add(self.panel, 1, wx.GROW|wx.EXPAND)
+        sizer.Add(in_sizer, 0, wx.GROW|wx.EXPAND)
         sizer.Fit(self)
         self.SetSizer(sizer)
@@ -214,7 +214,7 @@ class Frame(wx.Frame):
         # Add toolbars to manager
         # This is pretty tricky -- order on win32 is inverted when
         # compared to linux2 & darwin
-        if sys.platform == 'win32':
+        if sys.platform == 'win32' or wx.VERSION >= (4, 1):
             t1 = ProjectToolBar(self)
             t2 = HistoryToolBar(self)
             t3 = LayoutToolBar(self)
@@ -259,6 +259,8 @@ class Frame(wx.Frame):
         # TODO: Allow saving and restoring perspectives
         self.perspective_all = aui_manager.SavePerspective()
+        self.Layout()
+
     def _BeginBusyCursor(self):
         """
         Start busy cursor.
@@ -1941,11 +1943,11 @@ class LayoutToolBar(AuiToolBar):
         d = inv_paths.ICON_DIR
         if sys.platform == 'darwin':
             # Bitmaps for show/hide task panel item
-            p = os.path.join(d, "layout_data_only_original.gif")
-            self.BMP_WITH_MENU = wx.Bitmap(str(p), wx.BITMAP_TYPE_GIF)
+            p = os.path.join(d, "layout_data_only_original.png")
+            self.BMP_WITH_MENU = wx.Bitmap(str(p), wx.BITMAP_TYPE_PNG)
-            p = os.path.join(d, "layout_full_original.gif")
-            self.BMP_WITHOUT_MENU = wx.Bitmap(str(p), wx.BITMAP_TYPE_GIF)
+            p = os.path.join(d, "layout_full_original.png")
+            self.BMP_WITHOUT_MENU = wx.Bitmap(str(p), wx.BITMAP_TYPE_PNG)
             # Bitmaps for show/hide task item
             p = os.path.join(d, "text_inverted_original.png")
@@ -1956,11 +1958,11 @@ class LayoutToolBar(AuiToolBar):
         else:
             # Bitmaps for show/hide task panel item
-            p = os.path.join(d, "layout_data_only.gif")
-            self.BMP_WITH_MENU = wx.Bitmap(str(p), wx.BITMAP_TYPE_GIF)
+            p = os.path.join(d, "layout_data_only.png")
+            self.BMP_WITH_MENU = wx.Bitmap(str(p), wx.BITMAP_TYPE_PNG)
-            p = os.path.join(d, "layout_full.gif")
-            self.BMP_WITHOUT_MENU = wx.Bitmap(str(p), wx.BITMAP_TYPE_GIF)
+            p = os.path.join(d, "layout_full.png")
+            self.BMP_WITHOUT_MENU = wx.Bitmap(str(p), wx.BITMAP_TYPE_PNG)
             # Bitmaps for show/hide task item
             p = os.path.join(d, "text_inverted.png")
@@ -104,7 +104,7 @@ class InnerPanel(wx.Panel):
         inner_sizer = wx.BoxSizer(wx.HORIZONTAL)
         inner_sizer.Add(btnsizer, 0, wx.LEFT|wx.TOP, 5)
-        inner_sizer.Add(self.combo_interval, 0, wx.LEFT|wx.RIGHT|wx.TOP, 5)
+        inner_sizer.Add(self.combo_interval, 0, wx.ALIGN_CENTER_VERTICAL|wx.LEFT|wx.RIGHT|wx.TOP, 5)
         panel.SetSizer(inner_sizer)
         inner_sizer.Fit(panel)
	@@ -500,34 +500,6 @@ def img2memmap(group):		@@ -500,34 +500,6 @@ def img2memmap(group):
500	return matrix, scalar_range, temp_file	500	return matrix, scalar_range, temp_file
501		501
502		502
503	-def imgnormalize(data, srange=(0, 255)):
504	- """
505	- Normalize image pixel intensity for int16 gray scale values.
506	-
507	- :param data: image matrix
508	- :param srange: range for normalization, default is 0 to 255
509	- :return: normalized pixel intensity matrix
510	- """
511	-
512	- dataf = numpy.asarray(data)
513	- rangef = numpy.asarray(srange)
514	- faux = numpy.ravel(dataf).astype(float)
515	- minimum = numpy.min(faux)
516	- maximum = numpy.max(faux)
517	- lower = rangef[0]
518	- upper = rangef[1]
519	-
520	- if minimum == maximum:
521	- datan = numpy.ones(dataf.shape)*(upper + lower) / 2.
522	- else:
523	- datan = (faux-minimum)*(upper-lower) / (maximum-minimum) + lower
524	-
525	- datan = numpy.reshape(datan, dataf.shape)
526	- datan = datan.astype(numpy.int16)
527	-
528	- return datan
529	-
530	-
531	def get_LUT_value_255(data, window, level):	503	def get_LUT_value_255(data, window, level):
532	shape = data.shape	504	shape = data.shape
533	data_ = data.ravel()	505	data_ = data.ravel()
	@@ -539,6 +511,8 @@ def get_LUT_value_255(data, window, level):		@@ -539,6 +511,8 @@ def get_LUT_value_255(data, window, level):
539	return data	511	return data
540		512
541		513
542	-def image_normalize(image, min_=0.0, max_=1.0):	514	+def image_normalize(image, min_=0.0, max_=1.0, output_dtype=np.int16):
		515	+ output = np.empty(shape=image.shape, dtype=output_dtype)
543	imin, imax = image.min(), image.max()	516	imin, imax = image.min(), image.max()
544	- return (image - imin) * ((max_ - min_) / (imax - imin)) + min_	517	+ output[:] = (image - imin) * ((max_ - min_) / (imax - imin)) + min_
		518	+ return output
	@@ -123,6 +123,7 @@ class Panel(wx.Panel):		@@ -123,6 +123,7 @@ class Panel(wx.Panel):
123		123
124	#self.SetSizerAndFit(sizer)	124	#self.SetSizerAndFit(sizer)
125	self.SetSizer(sizer)	125	self.SetSizer(sizer)
		126	+ self.Layout()
126		127
127		128
128	# Lower fold panel	129	# Lower fold panel
	@@ -111,7 +111,7 @@ class Panel(wx.Panel):		@@ -111,7 +111,7 @@ class Panel(wx.Panel):
111	p3.SetPopupMenu(menu)	111	p3.SetPopupMenu(menu)
112		112
113		113
114	- if sys.platform == 'win32':	114	+ if sys.platform == 'win32' or wx.VERSION >= (4, 1):
115	self.aui_manager.AddPane(p1, s1)	115	self.aui_manager.AddPane(p1, s1)
116	self.aui_manager.AddPane(p2, s2)	116	self.aui_manager.AddPane(p2, s2)
117	self.aui_manager.AddPane(p3, s3)	117	self.aui_manager.AddPane(p3, s3)
	@@ -604,7 +604,7 @@ class VolumeToolPanel(wx.Panel):		@@ -604,7 +604,7 @@ class VolumeToolPanel(wx.Panel):
604	id = evt.GetId()	604	id = evt.GetId()
605	item = ID_TO_ITEMSLICEMENU[id]	605	item = ID_TO_ITEMSLICEMENU[id]
606	checked = item.IsChecked()	606	checked = item.IsChecked()
607	- label = item.GetLabel()	607	+ label = item.GetItemLabelText()
608		608
609	if not (checked):	609	if not (checked):
610	Publisher.sendMessage('Disable plane', plane_label=label)	610	Publisher.sendMessage('Disable plane', plane_label=label)
	@@ -104,7 +104,7 @@ class InnerPanel(wx.Panel):		@@ -104,7 +104,7 @@ class InnerPanel(wx.Panel):
104		104
105	inner_sizer = wx.BoxSizer(wx.HORIZONTAL)	105	inner_sizer = wx.BoxSizer(wx.HORIZONTAL)
106	inner_sizer.Add(btnsizer, 0, wx.LEFT\|wx.TOP, 5)	106	inner_sizer.Add(btnsizer, 0, wx.LEFT\|wx.TOP, 5)
107	- inner_sizer.Add(self.combo_interval, 0, wx.LEFT\|wx.RIGHT\|wx.TOP, 5)	107	+ inner_sizer.Add(self.combo_interval, 0, wx.ALIGN_CENTER_VERTICAL\|wx.LEFT\|wx.RIGHT\|wx.TOP, 5)
108	panel.SetSizer(inner_sizer)	108	panel.SetSizer(inner_sizer)
109	inner_sizer.Fit(panel)	109	inner_sizer.Fit(panel)
110		110