diff --git a/vviewer/pyqtgraph/exporters/HDF5Exporter.py b/vviewer/pyqtgraph/exporters/HDF5Exporter.py index cc8b5733e7c2490bd66cd2444e296424fd581101..1bb10dc4039faa062698d1deb72d0f687d693d17 100644 --- a/vviewer/pyqtgraph/exporters/HDF5Exporter.py +++ b/vviewer/pyqtgraph/exporters/HDF5Exporter.py @@ -1,58 +1,58 @@ -from ..Qt import QtGui, QtCore -from .Exporter import Exporter -from ..parametertree import Parameter -from .. import PlotItem +# from ..Qt import QtGui, QtCore +# from .Exporter import Exporter +# from ..parametertree import Parameter +# from .. import PlotItem -import numpy -try: - import h5py - HAVE_HDF5 = True -except ImportError: - HAVE_HDF5 = False +# import numpy +# try: +# import h5py +# HAVE_HDF5 = True +# except ImportError: +# HAVE_HDF5 = False -__all__ = ['HDF5Exporter'] +# __all__ = ['HDF5Exporter'] -class HDF5Exporter(Exporter): - Name = "HDF5 Export: plot (x,y)" - windows = [] - allowCopy = False +# class HDF5Exporter(Exporter): +# Name = "HDF5 Export: plot (x,y)" +# windows = [] +# allowCopy = False - def __init__(self, item): - Exporter.__init__(self, item) - self.params = Parameter(name='params', type='group', children=[ - {'name': 'Name', 'type': 'str', 'value': 'Export',}, - {'name': 'columnMode', 'type': 'list', 'values': ['(x,y) per plot', '(x,y,y,y) for all plots']}, - ]) +# def __init__(self, item): +# Exporter.__init__(self, item) +# self.params = Parameter(name='params', type='group', children=[ +# {'name': 'Name', 'type': 'str', 'value': 'Export',}, +# {'name': 'columnMode', 'type': 'list', 'values': ['(x,y) per plot', '(x,y,y,y) for all plots']}, +# ]) - def parameters(self): - return self.params +# def parameters(self): +# return self.params - def export(self, fileName=None): - if not HAVE_HDF5: - raise RuntimeError("This exporter requires the h5py package, " - "but it was not importable.") +# def export(self, fileName=None): +# if not HAVE_HDF5: +# raise RuntimeError("This exporter requires the h5py package, " +# "but it was not importable.") - if not isinstance(self.item, PlotItem): - raise Exception("Must have a PlotItem selected for HDF5 export.") +# if not isinstance(self.item, PlotItem): +# raise Exception("Must have a PlotItem selected for HDF5 export.") - if fileName is None: - self.fileSaveDialog(filter=["*.h5", "*.hdf", "*.hd5"]) - return - dsname = self.params['Name'] - fd = h5py.File(fileName, 'a') # forces append to file... 'w' doesn't seem to "delete/overwrite" - data = [] +# if fileName is None: +# self.fileSaveDialog(filter=["*.h5", "*.hdf", "*.hd5"]) +# return +# dsname = self.params['Name'] +# fd = h5py.File(fileName, 'a') # forces append to file... 'w' doesn't seem to "delete/overwrite" +# data = [] - appendAllX = self.params['columnMode'] == '(x,y) per plot' - for i,c in enumerate(self.item.curves): - d = c.getData() - if appendAllX or i == 0: - data.append(d[0]) - data.append(d[1]) +# appendAllX = self.params['columnMode'] == '(x,y) per plot' +# for i,c in enumerate(self.item.curves): +# d = c.getData() +# if appendAllX or i == 0: +# data.append(d[0]) +# data.append(d[1]) - fdata = numpy.array(data).astype('double') - dset = fd.create_dataset(dsname, data=fdata) - fd.close() +# fdata = numpy.array(data).astype('double') +# dset = fd.create_dataset(dsname, data=fdata) +# fd.close() -if HAVE_HDF5: - HDF5Exporter.register() +# if HAVE_HDF5: +# HDF5Exporter.register() diff --git a/vviewer/pyqtgraph/metaarray/MetaArray.py b/vviewer/pyqtgraph/metaarray/MetaArray.py index 66ecc460414a23ade5c78f07a3975f88fbfb883a..bb63bf4b20d2603ea67838e0faf9043f2129dc29 100644 --- a/vviewer/pyqtgraph/metaarray/MetaArray.py +++ b/vviewer/pyqtgraph/metaarray/MetaArray.py @@ -19,13 +19,13 @@ from ..python2_3 import basestring ## By default, the library will use HDF5 when writing files. ## This can be overridden by setting USE_HDF5 = False -USE_HDF5 = True -try: - import h5py - HAVE_HDF5 = True -except: - USE_HDF5 = False - HAVE_HDF5 = False +USE_HDF5 = False +# try: +# import h5py +# HAVE_HDF5 = True +# except: +# USE_HDF5 = False +# HAVE_HDF5 = False def axis(name=None, cols=None, values=None, units=None): diff --git a/vviewer/vviewer.py b/vviewer/vviewer.py old mode 100644 new mode 100755 index 84625b036f121e8ec6a50061508f26fbdd33ca08..1056f3ed5a7ccc5fc823fe422290b7ffb1091e49 --- a/vviewer/vviewer.py +++ b/vviewer/vviewer.py @@ -1823,7 +1823,7 @@ class vviewer(QtGui.QMainWindow): def updateSlices(self): for img in self.images: - img.slice(self.img_coord.astype(np.int32)) + img.slice(np.asarray(self.img_coord).astype(np.int32)) def updateImageItems(self): for index in range(len(self.images)):