Skip to content

Commit

Permalink
ci: use latest version of pyqtgraph
Browse files Browse the repository at this point in the history
  • Loading branch information
paulmueller committed Jul 3, 2019
1 parent 9199817 commit a6b3630
Show file tree
Hide file tree
Showing 5 changed files with 8 additions and 4 deletions.
1 change: 1 addition & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ install:
- travis_retry pip install --upgrade pip
- travis_retry pip install setuptools wheel
- travis_retry pip install git+git://github.com/ZELLMECHANIK-DRESDEN/dclab.git
- travis_retry pip install git+https://github.com/pyqtgraph/pyqtgraph.git@1ec175385e31c4e1e8dbe829b4387e4ac560082c
- travis_retry pip install -e .
# for tests:
- travis_retry pip install codecov coverage flake8
Expand Down
1 change: 1 addition & 0 deletions appveyor.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@ install:
# Install shapeout2 and its dependencies
- "appveyor-retry python -m pip install --upgrade pip"
- "appveyor-retry pip install git+git://github.com/ZELLMECHANIK-DRESDEN/dclab.git"
- "appveyor-retry pip install git+https://github.com/pyqtgraph/pyqtgraph.git@1ec175385e31c4e1e8dbe829b4387e4ac560082c"
- "appveyor-retry pip install -e ."
# Install pyinstaller (includes dependency for pywin32)
- "appveyor-retry pip install pyinstaller==3.4"
Expand Down
5 changes: 3 additions & 2 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,9 @@
"h5py>=2.8.0",
"numpy>=1.9.0",
"pyqt5",
#"pyqtgraph>=0.10.0",
"pyqtgraph @ git+https://github.com/pyqtgraph/pyqtgraph.git@1ec175385e31c4e1e8dbe829b4387e4ac560082c",
"pyqtgraph>=0.10.0",
# using this will make it impossible to upload to PyPI:
#"pyqtgraph @ git+https://github.com/pyqtgraph/pyqtgraph.git@1ec175385e31c4e1e8dbe829b4387e4ac560082c",
"scipy>=0.13.0"],
python_requires='>=3.6, <4',
setup_requires=['pytest-runner'],
Expand Down
1 change: 1 addition & 0 deletions shapeout2/gui/main.py
Original file line number Diff line number Diff line change
Expand Up @@ -98,6 +98,7 @@ def on_quickviewed(self, path, filters):
# update quick view subwindow
self.widget_quick_view.show_rtdc(path, filters)
# show quick view subwindow
self.subwindows["quick_view"].setVisible(True)

def on_splitter(self):
if self.splitter.sizes()[0] == 0:
Expand Down
4 changes: 2 additions & 2 deletions shapeout2/gui/matrix_element.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@

class MatrixElement(QtWidgets.QWidget):
_quick_view_instance = None
quickview_selected = QtCore.pyqtSignal(object)
quickview_selected = QtCore.pyqtSignal()

def __init__(self):
QtWidgets.QWidget.__init__(self)
Expand Down Expand Up @@ -61,7 +61,7 @@ def update_content(self, quickview=False):
if do_quickview:
color = "#F0A1D6"
label += "\n(QV)"
self.quickview_selected.emit("peter")
self.quickview_selected.emit()

self.setStyleSheet("background-color:{}".format(color))
self.label.setStyleSheet("background-color:{}".format(color))
Expand Down

0 comments on commit a6b3630

Please sign in to comment.