diff --git a/calipso/Calipso.py b/calipso/Calipso.py index a422358..a9300e2 100644 --- a/calipso/Calipso.py +++ b/calipso/Calipso.py @@ -727,7 +727,7 @@ def load(self): options['defaultextension'] = '.json' options['filetypes'] = [('CALIPSO Data files', '*.json'), ('All files', '*')] f = tkFileDialog.askopenfilename(**options) - if f is '': + if f == '': return self.__shapemanager.read_plot(f) diff --git a/calipso/constants.py b/calipso/constants.py index a70e73c..4c344b1 100644 --- a/calipso/constants.py +++ b/calipso/constants.py @@ -72,11 +72,11 @@ class Plot(object): TIME_VARIANCE = 0.001 ALTITUDE_VARIANCE = 0.3 -PATH = '.' +PATH = os.path.dirname(os.path.realpath(__file__)) HOMEPATH = expanduser('~') # Makes a single persistent instance of the config for VOCAL to grab -CONF = Config(PATH + '/dat/config.json') +CONF = Config(os.path.join(PATH, 'config.json')) ICO = PATH + '/ico/broadcasting.ico' if _platform == 'linux' or _platform == 'linux2': diff --git a/calipso/setup.py b/calipso/setup.py index ca8064e..975e6e2 100644 --- a/calipso/setup.py +++ b/calipso/setup.py @@ -5,43 +5,43 @@ sys.setrecursionlimit(5000) DATA = [ ('dat', - ['C:\Users/cpampalo/PycharmProjects/VOCAL/calipso/dat/CALIPSO.jpg', - 'C:\Users/cpampalo/PycharmProjects/VOCAL/calipso/dat/calipso-aerosol_subtype.cmap', - 'C:\Users/cpampalo/PycharmProjects/VOCAL/calipso/dat/calipso-backscatter.cmap', - 'C:\Users/cpampalo/PycharmProjects/VOCAL/calipso/dat/calipso-depolar.cmap', - 'C:\Users/cpampalo/PycharmProjects/VOCAL/calipso/dat/calipso-horizontalaveraging.cmap', - 'C:\Users/cpampalo/PycharmProjects/VOCAL/calipso/dat/calipso-icewaterphase.cmap', - 'C:\Users/cpampalo/PycharmProjects/VOCAL/calipso/dat/calipso-vfm.cmap', - 'C:\Users/cpampalo/PycharmProjects/VOCAL/calipso/dat/CALIPSO_A_Train.jpg', - 'C:\Users/cpampalo/PycharmProjects/VOCAL/calipso/dat/config.json', - 'C:\Users/cpampalo/PycharmProjects/VOCAL/calipso/dat/depolarization_ratio.png', - 'C:\Users/cpampalo/PycharmProjects/VOCAL/calipso/dat/grey.jpg', - 'C:\Users/cpampalo/PycharmProjects/VOCAL/calipso/dat/lidar_backscatter.png']), + ['C:/Users/cpampalo/PycharmProjects/VOCAL/calipso/dat/CALIPSO.jpg', + 'C:/Users/cpampalo/PycharmProjects/VOCAL/calipso/dat/calipso-aerosol_subtype.cmap', + 'C:/Users/cpampalo/PycharmProjects/VOCAL/calipso/dat/calipso-backscatter.cmap', + 'C:/Users/cpampalo/PycharmProjects/VOCAL/calipso/dat/calipso-depolar.cmap', + 'C:/Users/cpampalo/PycharmProjects/VOCAL/calipso/dat/calipso-horizontalaveraging.cmap', + 'C:/Users/cpampalo/PycharmProjects/VOCAL/calipso/dat/calipso-icewaterphase.cmap', + 'C:/Users/cpampalo/PycharmProjects/VOCAL/calipso/dat/calipso-vfm.cmap', + 'C:/Users/cpampalo/PycharmProjects/VOCAL/calipso/dat/CALIPSO_A_Train.jpg', + 'C:/Users/cpampalo/PycharmProjects/VOCAL/calipso/dat/config.json', + 'C:/Users/cpampalo/PycharmProjects/VOCAL/calipso/dat/depolarization_ratio.png', + 'C:/Users/cpampalo/PycharmProjects/VOCAL/calipso/dat/grey.jpg', + 'C:/Users/cpampalo/PycharmProjects/VOCAL/calipso/dat/lidar_backscatter.png']), ('log', - ['C:\Users/cpampalo/PycharmProjects/VOCAL/calipso/log/trace.log']), + ['C:/Users/cpampalo/PycharmProjects/VOCAL/calipso/log/trace.log']), ('ico', - ['C:\Users/cpampalo/PycharmProjects/VOCAL/calipso/ico/back.png', - 'C:\Users/cpampalo/PycharmProjects/VOCAL/calipso/ico/broadcasting.gif', - 'C:\Users/cpampalo/PycharmProjects/VOCAL/calipso/ico/broadcasting.ico', - 'C:\Users/cpampalo/PycharmProjects/VOCAL/calipso/ico/broadcasting.png', - 'C:\Users/cpampalo/PycharmProjects/VOCAL/calipso/ico/broadcasting.xbm', - 'C:\Users/cpampalo/PycharmProjects/VOCAL/calipso/ico/cog.png', - 'C:\Users/cpampalo/PycharmProjects/VOCAL/calipso/ico/cursorhand.png', - 'C:\Users/cpampalo/PycharmProjects/VOCAL/calipso/ico/cursorhighlight.png', - 'C:\Users/cpampalo/PycharmProjects/VOCAL/calipso/ico/edit.png', - 'C:\Users/cpampalo/PycharmProjects/VOCAL/calipso/ico/eraser.png', - 'C:\Users/cpampalo/PycharmProjects/VOCAL/calipso/ico/extract.png', - 'C:\Users/cpampalo/PycharmProjects/VOCAL/calipso/ico/focus.png', - 'C:\Users/cpampalo/PycharmProjects/VOCAL/calipso/ico/forward.png', - 'C:\Users/cpampalo/PycharmProjects/VOCAL/calipso/ico/freedraw.png', - 'C:\Users/cpampalo/PycharmProjects/VOCAL/calipso/ico/hide.png', - 'C:\Users/cpampalo/PycharmProjects/VOCAL/calipso/ico/home.png', - 'C:\Users/cpampalo/PycharmProjects/VOCAL/calipso/ico/load.png', - 'C:\Users/cpampalo/PycharmProjects/VOCAL/calipso/ico/magnify.png', - 'C:\Users/cpampalo/PycharmProjects/VOCAL/calipso/ico/paint.png', - 'C:\Users/cpampalo/PycharmProjects/VOCAL/calipso/ico/plotcursor.png', - 'C:\Users/cpampalo/PycharmProjects/VOCAL/calipso/ico/polygon.png', - 'C:\Users/cpampalo/PycharmProjects/VOCAL/calipso/ico/save.png']) + ['C:/Users/cpampalo/PycharmProjects/VOCAL/calipso/ico/back.png', + 'C:/Users/cpampalo/PycharmProjects/VOCAL/calipso/ico/broadcasting.gif', + 'C:/Users/cpampalo/PycharmProjects/VOCAL/calipso/ico/broadcasting.ico', + 'C:/Users/cpampalo/PycharmProjects/VOCAL/calipso/ico/broadcasting.png', + 'C:/Users/cpampalo/PycharmProjects/VOCAL/calipso/ico/broadcasting.xbm', + 'C:/Users/cpampalo/PycharmProjects/VOCAL/calipso/ico/cog.png', + 'C:/Users/cpampalo/PycharmProjects/VOCAL/calipso/ico/cursorhand.png', + 'C:/Users/cpampalo/PycharmProjects/VOCAL/calipso/ico/cursorhighlight.png', + 'C:/Users/cpampalo/PycharmProjects/VOCAL/calipso/ico/edit.png', + 'C:/Users/cpampalo/PycharmProjects/VOCAL/calipso/ico/eraser.png', + 'C:/Users/cpampalo/PycharmProjects/VOCAL/calipso/ico/extract.png', + 'C:/Users/cpampalo/PycharmProjects/VOCAL/calipso/ico/focus.png', + 'C:/Users/cpampalo/PycharmProjects/VOCAL/calipso/ico/forward.png', + 'C:/Users/cpampalo/PycharmProjects/VOCAL/calipso/ico/freedraw.png', + 'C:/Users/cpampalo/PycharmProjects/VOCAL/calipso/ico/hide.png', + 'C:/Users/cpampalo/PycharmProjects/VOCAL/calipso/ico/home.png', + 'C:/Users/cpampalo/PycharmProjects/VOCAL/calipso/ico/load.png', + 'C:/Users/cpampalo/PycharmProjects/VOCAL/calipso/ico/magnify.png', + 'C:/Users/cpampalo/PycharmProjects/VOCAL/calipso/ico/paint.png', + 'C:/Users/cpampalo/PycharmProjects/VOCAL/calipso/ico/plotcursor.png', + 'C:/Users/cpampalo/PycharmProjects/VOCAL/calipso/ico/polygon.png', + 'C:/Users/cpampalo/PycharmProjects/VOCAL/calipso/ico/save.png']) ] DATA.extend(matplotlib.get_py2exe_datafiles()) @@ -50,7 +50,7 @@ windows=[{'script': 'Calipso.py'}], options={ "py2exe":{ - "dist_dir": "C:\Users/cpampalo/Desktop/build", + "dist_dir": "C:/Users/cpampalo/Desktop/build", 'excludes': [ 'jinja2.asyncsupport', '_gtkagg',