diff options
| author | Mahmoud <[email protected]> | 2018-10-16 17:26:34 -0400 |
|---|---|---|
| committer | Mahmoud <[email protected]> | 2018-10-16 17:26:34 -0400 |
| commit | 7375668786abfa5b0592fca0ce97fb5a8ba512d4 (patch) | |
| tree | 4abf17acab64630f3a099d82e0cd8250c54d7b5f /aerialvision | |
| parent | 802bc9f840aac536330ad93a1cbc2f04ead75106 (diff) | |
| parent | b8db00c3d8cfddb37a96b9cf2f308a67db4d319d (diff) | |
Merge branch 'dev-purdue-integration' into dev
Diffstat (limited to 'aerialvision')
| -rw-r--r-- | aerialvision/guiclasses.py | 2 | ||||
| -rw-r--r-- | aerialvision/organizedata.py | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/aerialvision/guiclasses.py b/aerialvision/guiclasses.py index 0a7013b..45fed26 100644 --- a/aerialvision/guiclasses.py +++ b/aerialvision/guiclasses.py @@ -69,7 +69,7 @@ import matplotlib matplotlib.use('TkAgg') from matplotlib.backends.backend_tkagg import FigureCanvasTkAgg, NavigationToolbar2TkAgg from matplotlib.figure import Figure -from matplotlib import mpl +import matplotlib as mpl from matplotlib.colors import colorConverter from matplotlib import pyplot import Pmw diff --git a/aerialvision/organizedata.py b/aerialvision/organizedata.py index 090b90f..ea947cd 100644 --- a/aerialvision/organizedata.py +++ b/aerialvision/organizedata.py @@ -97,7 +97,7 @@ def organizedata(fileVars): 'sparse':OrganizeSparse, # Vector data with 2D index (used by DRAM access stats) 'custom':0 } - data_type_char = {int:'I', float:'f'} + data_type_char = {int:'L', float:'d'} print "Organizing data into internal format..." |