From 9ef282636a1c784b1ad0e69fd66c39306f9004d7 Mon Sep 17 00:00:00 2001
From: Robert Jordens <rj@m-labs.hk>
Date: Thu, 5 May 2016 00:44:42 +0200
Subject: [PATCH] browser: don't open experiments from data list view

---
 artiq/browser/files.py          | 24 +-----------------------
 artiq/frontend/artiq_browser.py |  2 +-
 2 files changed, 2 insertions(+), 24 deletions(-)

diff --git a/artiq/browser/files.py b/artiq/browser/files.py
index 4eca7ffa4..fbbb3e2fb 100644
--- a/artiq/browser/files.py
+++ b/artiq/browser/files.py
@@ -84,7 +84,7 @@ class ZoomIconView(QtWidgets.QListView):
 
 
 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")
         self.setObjectName("Files")
         self.setFeatures(self.DockWidgetMovable | self.DockWidgetFloatable)
@@ -93,7 +93,6 @@ class FilesDock(QtWidgets.QDockWidget):
         self.setWidget(self.splitter)
 
         self.datasets = datasets
-        self.exp_manager = exp_manager
 
         self.model = QtWidgets.QFileSystemModel()
         self.model.setFilter(QtCore.QDir.Drives | QtCore.QDir.NoDotAndDotDot |
@@ -127,7 +126,6 @@ class FilesDock(QtWidgets.QDockWidget):
         self.rl.setModel(self.model)
         self.rl.selectionModel().currentChanged.connect(
             self.list_current_changed)
-        self.rl.activated.connect(self.open_experiment)
         self.splitter.addWidget(self.rl)
 
         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()}
             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):
         if not os.path.exists(path):
             return
diff --git a/artiq/frontend/artiq_browser.py b/artiq/frontend/artiq_browser.py
index 1f48e44b2..5866475d1 100755
--- a/artiq/frontend/artiq_browser.py
+++ b/artiq/frontend/artiq_browser.py
@@ -116,7 +116,7 @@ def main():
 
     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)
     smgr.register(d_files)