From 6b54118d86ec281fd556610a383b77e7fb4734f5 Mon Sep 17 00:00:00 2001 From: Thiago Franco de Moraes Date: Mon, 4 Jun 2018 16:28:25 -0300 Subject: [PATCH] python3 sys.platform returns linux --- app.py | 4 ++-- invesalius/data/viewer_slice.py | 2 +- invesalius/gui/default_viewers.py | 2 +- invesalius/gui/dialogs.py | 6 +++--- invesalius/gui/widgets/slice_menu.py | 10 +++++----- invesalius/utils.py | 6 +++--- setup.py | 2 +- 7 files changed, 16 insertions(+), 16 deletions(-) diff --git a/app.py b/app.py index f9a1a6b..0699374 100644 --- a/app.py +++ b/app.py @@ -50,7 +50,7 @@ from wx.lib.pubsub import setuparg1# as psv1 from wx.lib.pubsub import pub as Publisher #import wx.lib.agw.advancedsplash as agw -#if sys.platform == 'linux2': +#if sys.platform.startswith('linux'): # _SplashScreen = agw.AdvancedSplash #else: # if sys.platform != 'darwin': @@ -80,7 +80,7 @@ USER_LOG_DIR = os.path.join(USER_INV_DIR, u'logs') # ------------------------------------------------------------------ -if sys.platform in ('linux2', 'win32'): +if sys.platform in ('linux2', 'linux', 'win32'): try: tmp_var = wx.GetXDisplay except AttributeError: diff --git a/invesalius/data/viewer_slice.py b/invesalius/data/viewer_slice.py index 3dba70c..085034e 100755 --- a/invesalius/data/viewer_slice.py +++ b/invesalius/data/viewer_slice.py @@ -1264,7 +1264,7 @@ class Viewer(wx.Panel): self.interactor.SetCursor(wx.StockCursor(wx.CURSOR_SIZEWE)) def SetSizeNWSECursor(self, pubsub_evt): - if sys.platform == 'linux2': + if sys.platform.startswith('linux'): self.interactor.SetCursor(wx.StockCursor(wx.CURSOR_SIZENWSE)) else: self.interactor.SetCursor(wx.StockCursor(wx.CURSOR_SIZING)) diff --git a/invesalius/gui/default_viewers.py b/invesalius/gui/default_viewers.py index a40a8b1..e1c524a 100644 --- a/invesalius/gui/default_viewers.py +++ b/invesalius/gui/default_viewers.py @@ -379,7 +379,7 @@ class VolumeToolPanel(wx.Panel): self.button_view = button_view # VOLUME COLOUR BUTTON - if sys.platform == 'linux2': + if sys.platform.startswith('linux'): size = (32,32) sp = 2 else: diff --git a/invesalius/gui/dialogs.py b/invesalius/gui/dialogs.py index aad1a30..ee098ae 100644 --- a/invesalius/gui/dialogs.py +++ b/invesalius/gui/dialogs.py @@ -292,7 +292,7 @@ def ShowOpenProjectDialog(): def ShowImportDirDialog(self): current_dir = os.path.abspath(".") - if (sys.platform == 'win32') or (sys.platform == 'linux2'): + if sys.platform == 'win32' or sys.platform.startswith('linux'): session = ses.Session() if (session.GetLastDicomFolder()): @@ -333,7 +333,7 @@ def ShowImportDirDialog(self): def ShowImportBitmapDirDialog(self): current_dir = os.path.abspath(".") - if (sys.platform == 'win32') or (sys.platform == 'linux2'): + if sys.platform == 'win32' or sys.platform.startswith('linux'): session = ses.Session() if (session.GetLastDicomFolder()): @@ -1454,7 +1454,7 @@ def ExportPicture(type_=""): project = proj.Project() project_name = "%s_%s" % (project.name, type_) - if not sys.platform in ('win32', 'linux2'): + if not sys.platform in ('win32', 'linux2', 'linux'): project_name += ".jpg" dlg = wx.FileDialog(None, diff --git a/invesalius/gui/widgets/slice_menu.py b/invesalius/gui/widgets/slice_menu.py index b46ba6e..536a783 100644 --- a/invesalius/gui/widgets/slice_menu.py +++ b/invesalius/gui/widgets/slice_menu.py @@ -90,7 +90,7 @@ class SliceMenu(wx.Menu): #------------ Sub menu of the pseudo colors ---------------- - if sys.platform == 'linux2': + if sys.platform.startswith('linux'): mkind = wx.ITEM_CHECK else: mkind = wx.ITEM_RADIO @@ -166,7 +166,7 @@ class SliceMenu(wx.Menu): # 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' or sys.platform == 'darwin': + if sys.platform.startswith('linux') or sys.platform == 'darwin': submenu_wl.Bind(wx.EVT_MENU, self.OnPopup) submenu_pseudo_colours.Bind(wx.EVT_MENU, self.OnPopup) submenu_image_tiling.Bind(wx.EVT_MENU, self.OnPopup) @@ -226,7 +226,7 @@ class SliceMenu(wx.Menu): Publisher.sendMessage('Change colour table from background image', values) Publisher.sendMessage('Update slice viewer') - if sys.platform == 'linux2': + if sys.platform.startswith('linux'): for i in self.pseudo_color_items: it = self.pseudo_color_items[i] if it.IsChecked(): @@ -241,7 +241,7 @@ class SliceMenu(wx.Menu): Publisher.sendMessage('Change colour table from background image from plist', values) Publisher.sendMessage('Update slice viewer') - if sys.platform == 'linux2': + if sys.platform.startswith('linux'): for i in self.pseudo_color_items: it = self.pseudo_color_items[i] if it.IsChecked(): @@ -273,7 +273,7 @@ class SliceMenu(wx.Menu): else: self.cdialog.Show(self._gen_event) - if sys.platform == 'linux2': + if sys.platform.startswith('linux'): for i in self.pseudo_color_items: it = self.pseudo_color_items[i] if it.IsChecked(): diff --git a/invesalius/utils.py b/invesalius/utils.py index a30c99d..9787fbe 100644 --- a/invesalius/utils.py +++ b/invesalius/utils.py @@ -254,7 +254,7 @@ def calculate_resizing_tofitmemory(x_size,y_size,n_slices,byte): if ram_total>1400000000: ram_total=1400000000 - if (sys.platform == 'linux2'): + if sys.platform.startswith('linux'): if (platform.architecture()[0] == '32bit'): if ram_free>3500000000: ram_free=3500000000 @@ -313,7 +313,7 @@ def predict_memory(nfiles, x, y, p): return (x/porcent, y/porcent) - elif(sys.platform == 'linux2'): + elif sys.platform.startswith('linux'): if (platform.architecture()[0] == '32bit'): # 839000000 = 800 MB @@ -461,4 +461,4 @@ def encode(text, encoding, *args): try: return text.encode(encoding, *args) except AttributeError: - return text \ No newline at end of file + return text diff --git a/setup.py b/setup.py index cc05315..b4962e1 100644 --- a/setup.py +++ b/setup.py @@ -8,7 +8,7 @@ import sys import numpy -if sys.platform == 'linux2': +if sys.platform.startswith('linux'): setup( cmdclass = {'build_ext': build_ext}, ext_modules = cythonize([ Extension("invesalius.data.mips", ["invesalius/data/mips.pyx"], -- libgit2 0.21.2