diff --git a/qt_apps/XPDPipelineDemo.py b/qt_apps/XPDPipelineDemo.py index 8892244..f179c8a 100644 --- a/qt_apps/XPDPipelineDemo.py +++ b/qt_apps/XPDPipelineDemo.py @@ -14,8 +14,8 @@ import numpy as np from collections import OrderedDict from vistools.qt_widgets.OneDimStack import OneDimStackMainWindow -from nsls2.binary import read_binary from nsls2 import core +from nsls2.io.binary import read_binary class data_gen_2d(object): diff --git a/setup.cfg b/setup.cfg new file mode 100644 index 0000000..700c19b --- /dev/null +++ b/setup.cfg @@ -0,0 +1,2 @@ +[easy_install] + diff --git a/setup.py b/setup.py index 15202ac..28017a7 100644 --- a/setup.py +++ b/setup.py @@ -61,5 +61,7 @@ name='vistools', version=FULLVERSION, author='Brookhaven National Lab', - packages=['vistools', 'vistools.qt_widgets'], + packages=['vistools', 'vistools.qt_widgets', + 'vistools.backend', 'vistools.images', + 'vistools.messenger', 'vistools.qt_widgets'], ) diff --git a/vistools/images/__init__.py b/vistools/images/__init__.py new file mode 100644 index 0000000..d3ba2e9 --- /dev/null +++ b/vistools/images/__init__.py @@ -0,0 +1 @@ +__author__ = 'edill' \ No newline at end of file diff --git a/vistools/qt_widgets/OneDimStack.py b/vistools/qt_widgets/OneDimStack.py index 51e2662..fe35d2a 100644 --- a/vistools/qt_widgets/OneDimStack.py +++ b/vistools/qt_widgets/OneDimStack.py @@ -128,8 +128,8 @@ def replot(self): else: self._data_lines[data_key].set_data( x + counter * self._horz_offset, - y + counter * self._vert_offset, - label=data_key) + y + counter * self._vert_offset) + self._data_lines[data_key].set_label(data_key) # compute the color for the line color = rgba.to_rgba(x=(counter / num_datasets)) # set the color for the line diff --git a/vistools/qt_widgets/stack_scanner.py b/vistools/qt_widgets/stack_scanner.py index bf2cf64..862aac9 100644 --- a/vistools/qt_widgets/stack_scanner.py +++ b/vistools/qt_widgets/stack_scanner.py @@ -2,7 +2,7 @@ unicode_literals) import six -from vistools import images +from ..images import images # grab the version from mpl which has done the work of smoothing over # the differences