marcel/pylot
3
0
Fork 0
Code Issues 7 Pull Requests 1 Releases Wiki Activity

[update] icons will be imported depending on python version

Browse Source
This commit is contained in:
Marcel Paffrath 2017-07-14 09:51:43 +02:00
parent f57aa37d99
commit a560f4140b
4 changed files with 98110 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
QtPyLoT.py
View File

@ -82,7 +82,12 @@ from pylot.core.util.map_projection import map_projection
from pylot.core.util.structure import DATASTRUCTURE from pylot.core.util.structure import DATASTRUCTURE
from pylot.core.util.thread import AutoPickThread, Thread from pylot.core.util.thread import AutoPickThread, Thread
from pylot.core.util.version import get_git_version as _getVersionString from pylot.core.util.version import get_git_version as _getVersionString
import icons_rc if sys.version_info.major == 3:
import icons_rc_3 as icons_rc
elif sys.version_info.major == 2:
import icons_rc_2 as icons_rc
else:
raise ImportError('Could not determine python version.')
locateTool = dict(nll=nll) locateTool = dict(nll=nll)

98097
icons_rc_2.py Normal file
View File

File diff suppressed because it is too large Load Diff

0
icons_rc.py → icons_rc_3.py
View File

8
pylot/core/util/widgets.py
View File

@ -6,6 +6,7 @@ Created on Wed Mar 19 11:27:35 2014
""" """
import os import os
import sys
import getpass import getpass
import warnings import warnings
import copy import copy
@ -47,7 +48,12 @@ from pylot.core.util.utils import prepTimeAxis, full_range, scaleWFData, \
demeanTrace, isSorted, findComboBoxIndex, clims demeanTrace, isSorted, findComboBoxIndex, clims
from autoPyLoT import autoPyLoT from autoPyLoT import autoPyLoT
from pylot.core.util.thread import Thread from pylot.core.util.thread import Thread
import icons_rc if sys.version_info.major == 3:
import icons_rc_3 as icons_rc
elif sys.version_info.major == 2:
import icons_rc_2 as icons_rc
else:
raise ImportError('Could not determine python version.')
if pg: if pg:
pg.setConfigOption('background', 'w') pg.setConfigOption('background', 'w')