srenblad
/
artiq
forked from M-Labs/artiq
1
0
Fork 0
Code Pull Requests Activity

browser: don't open experiments from data list view

This commit is contained in:
Robert Jördens 2016-05-05 00:44:42 +02:00
parent 9f1bef1c81
commit 9ef282636a
2 changed files with 2 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
artiq/browser/files.py
View File

@ -84,7 +84,7 @@ class ZoomIconView(QtWidgets.QListView):
class FilesDock(QtWidgets.QDockWidget): class FilesDock(QtWidgets.QDockWidget):
def __init__(self, datasets, exp_manager, browse_root="", select=None): def __init__(self, datasets, browse_root="", select=None):
QtWidgets.QDockWidget.__init__(self, "Files") QtWidgets.QDockWidget.__init__(self, "Files")
self.setObjectName("Files") self.setObjectName("Files")
self.setFeatures(self.DockWidgetMovable | self.DockWidgetFloatable) self.setFeatures(self.DockWidgetMovable | self.DockWidgetFloatable)
@ -93,7 +93,6 @@ class FilesDock(QtWidgets.QDockWidget):
self.setWidget(self.splitter) self.setWidget(self.splitter)
self.datasets = datasets self.datasets = datasets
self.exp_manager = exp_manager
self.model = QtWidgets.QFileSystemModel() self.model = QtWidgets.QFileSystemModel()
self.model.setFilter(QtCore.QDir.Drives | QtCore.QDir.NoDotAndDotDot | self.model.setFilter(QtCore.QDir.Drives | QtCore.QDir.NoDotAndDotDot |
@ -127,7 +126,6 @@ class FilesDock(QtWidgets.QDockWidget):
self.rl.setModel(self.model) self.rl.setModel(self.model)
self.rl.selectionModel().currentChanged.connect( self.rl.selectionModel().currentChanged.connect(
self.list_current_changed) self.list_current_changed)
self.rl.activated.connect(self.open_experiment)
self.splitter.addWidget(self.rl) self.splitter.addWidget(self.rl)
self.restore_selected = select is None self.restore_selected = select is None
@ -154,26 +152,6 @@ class FilesDock(QtWidgets.QDockWidget):
rd = {k: (True, v.value) for k, v in f["datasets"].items()} rd = {k: (True, v.value) for k, v in f["datasets"].items()}
self.datasets.init(rd) self.datasets.init(rd)
def open_experiment(self, current):
info = self.model.fileInfo(current)
if info.isDir():
self.rl.setRootIndex(current)
idx = self.rt.model().mapFromSource(current)
self.rt.expand(idx)
self.rt.setCurrentIndex(idx)
return
f = open_h5(info)
if not f:
return
logger.info("loading experiment for %s", info.filePath())
with f:
if "expid" not in f:
return
expid = pyon.decode(f["expid"].value)
expurl = "file:{}@{}".format(expid["class_name"],
expid["file"])
self.exp_manager.open_experiment(expurl)
def select_dir(self, path): def select_dir(self, path):
if not os.path.exists(path): if not os.path.exists(path):
return return

2
artiq/frontend/artiq_browser.py
View File

@ -116,7 +116,7 @@ def main():
exp_manager = experiments.SimpleExperimentManager(main_window) exp_manager = experiments.SimpleExperimentManager(main_window)
d_files = files.FilesDock(datasets_sub, exp_manager, args.browse_root, d_files = files.FilesDock(datasets_sub, args.browse_root,
select=args.select) select=args.select)
smgr.register(d_files) smgr.register(d_files)