Skip to content

Commit

Permalink
minor fixes
Browse files Browse the repository at this point in the history
  • Loading branch information
paulmueller committed Jul 3, 2019
1 parent ef2c891 commit 9199817
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 2 deletions.
3 changes: 2 additions & 1 deletion shapeout2/__main__.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,8 @@ def main(splash=True):
import time

from PyQt5.QtWidgets import QApplication
import pyqtgraph # import before creating application
# import before creating application
import pyqtgraph # noqa: F401

app = QApplication(sys.argv)
imdir = pkg_resources.resource_filename("shapeout2", "img")
Expand Down
8 changes: 7 additions & 1 deletion shapeout2/gui/main.py
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@ def init_quick_view(self):
self.toolButton_quick_view.clicked.connect(sub.setVisible)
self.subwindows["quick_view"] = sub
# signals
self.data_matrix.quickviewed.connect(self.widget_quick_view.show_rtdc)
self.data_matrix.quickviewed.connect(self.on_quickviewed)
sub.setSystemMenu(None)
sub.setWindowFlags(QtCore.Qt.CustomizeWindowHint
| QtCore.Qt.WindowTitleHint
Expand All @@ -93,6 +93,12 @@ def on_data_matrix(self):
else:
self.splitter.setSizes([0, 1])

@QtCore.pyqtSlot(pathlib.Path, list)
def on_quickviewed(self, path, filters):
# update quick view subwindow
self.widget_quick_view.show_rtdc(path, filters)
# show quick view subwindow

def on_splitter(self):
if self.splitter.sizes()[0] == 0:
self.toolButton_dm.setChecked(False)
Expand Down
1 change: 1 addition & 0 deletions shapeout2/gui/matrix_element.py
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,7 @@ def update_content(self, quickview=False):
self.quickview_selected.emit("peter")

self.setStyleSheet("background-color:{}".format(color))
self.label.setStyleSheet("background-color:{}".format(color))
self.label.setText(label)
self.setToolTip(tooltip)
self.label.setToolTip(tooltip)

0 comments on commit 9199817

Please sign in to comment.