Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: m-labs/artiq
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 3a0c2066a987
Choose a base ref
...
head repository: m-labs/artiq
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 5e5f94a0f864
Choose a head ref
  • 2 commits
  • 2 files changed
  • 1 contributor

Commits on Apr 10, 2016

  1. Copy the full SHA
    6c200b1 View commit details
  2. Copy the full SHA
    5e5f94a View commit details
Showing with 37 additions and 10 deletions.
  1. +15 −8 artiq/browser/results.py
  2. +22 −2 artiq/frontend/artiq_browser.py
23 changes: 15 additions & 8 deletions artiq/browser/results.py
Original file line number Diff line number Diff line change
@@ -36,14 +36,21 @@ def hdf5_thumbnail(self, info):
return QtGui.QIcon(pix)


class ResultsBrowser(QtWidgets.QSplitter):
def __init__(self, datasets, root=None):
QtWidgets.QSplitter.__init__(self)
class ResultsDock(QtWidgets.QDockWidget):
def __init__(self, datasets, main_window, root=None):
QtWidgets.QDockWidget.__init__(self, "Results")
self.setObjectName("Results")
self.setFeatures(QtWidgets.QDockWidget.DockWidgetMovable |
QtWidgets.QDockWidget.DockWidgetFloatable)

self.splitter = QtWidgets.QSplitter()
self.setWidget(self.splitter)

if root is None:
root = QtCore.QDir.currentPath()

self.datasets = datasets
self.main_window = main_window

self.rt_model = QtWidgets.QFileSystemModel()
self.rt_model.setFilter(QtCore.QDir.NoDotAndDotDot |
@@ -57,7 +64,7 @@ def __init__(self, datasets, root=None):
self.rt.selectionModel().currentChanged.connect(
self.tree_current_changed)
self.rt.setRootIsDecorated(False)
self.addWidget(self.rt)
self.splitter.addWidget(self.rt)

self.rl = QtWidgets.QListView()
self.rl.setViewMode(QtWidgets.QListView.IconMode)
@@ -66,7 +73,7 @@ def __init__(self, datasets, root=None):
self.rl.setFlow(QtWidgets.QListView.LeftToRight)
self.rl.setWrapping(True)
self.tree_current_changed(self.rt.currentIndex(), None)
self.addWidget(self.rl)
self.splitter.addWidget(self.rl)

def showEvent(self, ev):
self.rt.hideColumn(1)
@@ -75,7 +82,7 @@ def showEvent(self, ev):

def tree_current_changed(self, current, previous):
path = self.rt_model.filePath(current)
# we need to create a new model here. the old one remembers side effect
# create a new model for the ListView here
self.rl_model = QtWidgets.QFileSystemModel()
self.rl_model.setFilter(QtCore.QDir.Files)
self.rl_model.setNameFilters(["*.h5"])
@@ -118,7 +125,7 @@ def save_state(self):
return {
"selected": self.rl_model.filePath(self.rt.currentIndex()),
"header": bytes(self.rt.header().saveState()),
"splitter": bytes(self.saveState()),
"splitter": bytes(self.splitter.saveState()),
}

def restore_state(self, state):
@@ -130,4 +137,4 @@ def restore_state(self, state):
self.rt.header().restoreState(QtCore.QByteArray(header))
splitter = state.get("splitter")
if splitter:
self.restoreState(QtCore.QByteArray(splitter))
self.splitter.restoreState(QtCore.QByteArray(splitter))
24 changes: 22 additions & 2 deletions artiq/frontend/artiq_browser.py
Original file line number Diff line number Diff line change
@@ -51,6 +51,21 @@ def restore_state(self, state):
self.restoreState(QtCore.QByteArray(state["state"]))


class MdiArea(QtWidgets.QMdiArea):
def __init__(self):
QtWidgets.QMdiArea.__init__(self)
self.pixmap = QtGui.QPixmap(os.path.join(artiq_dir, "gui", "logo.svg"))

def paintEvent(self, event):
QtWidgets.QMdiArea.paintEvent(self, event)
painter = QtGui.QPainter(self.viewport())
x = (self.width() - self.pixmap.width())//2
y = (self.height() - self.pixmap.height())//2
painter.setOpacity(0.5)
painter.drawPixmap(x, y, self.pixmap)



def main():
# initialize application
args = get_argparser().parse_args()
@@ -70,7 +85,7 @@ def main():
status_bar = QtWidgets.QStatusBar()
main_window.setStatusBar(status_bar)

d_results = results.ResultsBrowser(datasets_sub)
d_results = results.ResultsDock(datasets_sub, main_window)
smgr.register(d_results)

d_applets = applets.AppletsDock(main_window, datasets_sub)
@@ -80,7 +95,12 @@ def main():
d_datasets = datasets.DatasetsDock(datasets_sub)
smgr.register(d_datasets)

main_window.setCentralWidget(d_results)
mdi_area = MdiArea()
mdi_area.setHorizontalScrollBarPolicy(QtCore.Qt.ScrollBarAsNeeded)
mdi_area.setVerticalScrollBarPolicy(QtCore.Qt.ScrollBarAsNeeded)
main_window.setCentralWidget(mdi_area)

main_window.addDockWidget(QtCore.Qt.LeftDockWidgetArea, d_results)
main_window.addDockWidget(QtCore.Qt.BottomDockWidgetArea, d_applets)
main_window.addDockWidget(QtCore.Qt.RightDockWidgetArea, d_datasets)