Changeset 4992ff2 in sasview for src/sas/qtgui/MainWindow/DataExplorer.py

Timestamp:

Nov 9, 2017 8:43:07 AM (6 years ago)

Author:

Piotr Rozyczko <rozyczko@…>

Branches:

ESS_GUI, ESS_GUI_Docs, ESS_GUI_batch_fitting, ESS_GUI_bumps_abstraction, ESS_GUI_iss1116, ESS_GUI_iss879, ESS_GUI_iss959, ESS_GUI_opencl, ESS_GUI_ordering, ESS_GUI_sync_sascalc

Children:

7969b9c

Parents:

7fb471d

git-author:

Piotr Rozyczko <rozyczko@…> (10/30/17 07:50:09)

git-committer:

Piotr Rozyczko <rozyczko@…> (11/09/17 08:43:07)

Message:

Initial, in-progress version. Not really working atm. SASVIEW-787

File:

• src/sas/qtgui/MainWindow/DataExplorer.py (modified) (14 diffs)

src/sas/qtgui/MainWindow/DataExplorer.py

@@ -5 +5 @@
 import logging
 
-from PyQt4 import QtCore
-from PyQt4 import QtGui
-from PyQt4 import QtWebKit
-from PyQt4.Qt import QMutex
+from PyQt5 import QtCore
+from PyQt5 import QtGui
+from PyQt5 import QtWidgets
+from PyQt5 import QtWebKitWidgets
 
 from twisted.internet import threads
@@ -48 +48 @@
         self.loader = Loader()
         self.manager = manager if manager is not None else DataManager()
-        self.txt_widget = QtGui.QTextEdit(None)
+        self.txt_widget = QtWidgets.QTextEdit(None)
 
         # Be careful with twisted threads.
-        self.mutex = QMutex()
+        self.mutex = QtCore.QMutex()
 
         # Active plots
@@ -69 +69 @@
 
         # Display HTML content
-        self._helpView = QtWebKit.QWebView()
+        self._helpView = QtWebKitWidgets.QWebView()
 
         # Fill in the perspectives combo
@@ -98 +98 @@
 
         # Proxy model for showing a subset of Data1D/Data2D content
-        self.data_proxy = QtGui.QSortFilterProxyModel(self)
+        self.data_proxy = QtCore.QSortFilterProxyModel(self)
         self.data_proxy.setSourceModel(self.model)
 
@@ -108 +108 @@
 
         # Proxy model for showing a subset of Theory content
-        self.theory_proxy = QtGui.QSortFilterProxyModel(self)
+        self.theory_proxy = QtCore.QSortFilterProxyModel(self)
         self.theory_proxy.setSourceModel(self.theory_model)
 
@@ -182 +182 @@
         Opens the Qt "Open File..." dialog
         """
+        print("A")
         path_str = self.chooseFiles()
         if not path_str:
@@ -192 +193 @@
         Opens the Qt "Open Folder..." dialog
         """
-        folder = QtGui.QFileDialog.getExistingDirectory(self, "Choose a directory", "",
-              QtGui.QFileDialog.ShowDirsOnly | QtGui.QFileDialog.DontUseNativeDialog)
+        folder = QtWidgets.QFileDialog.getExistingDirectory(self, "Choose a directory", "", None,
+              QtWidgets.QFileDialog.ShowDirsOnly | QtWidgets.QFileDialog.DontUseNativeDialog)
         if folder is None:
             return
@@ -216 +217 @@
             'caption'   : 'Open Project',
             'filter'    : 'Project (*.json);;All files (*.*)',
-            'options'   : QtGui.QFileDialog.DontUseNativeDialog
+            'options'   : QtWidgets.QFileDialog.DontUseNativeDialog
         }
-        filename = str(QtGui.QFileDialog.getOpenFileName(**kwargs))
+        filename = str(QtWidgets.QFileDialog.getOpenFileName(**kwargs))
         if filename:
             load_thread = threads.deferToThread(self.readProject, filename)
             load_thread.addCallback(self.readProjectComplete)
             load_thread.addErrback(self.readProjectFailed)
+
+    def loadFailed(self, reason):
+        """
+        """
+        print("file load FAILED: ", reason)
+        pass
 
     def readProjectFailed(self, reason):
@@ -248 +255 @@
 
         self.manager.assign(manager)
+        self.model.beginResetModel()
         for id, item in self.manager.get_all_data().items():
             self.updateModel(item.data, item.path)
 
-        self.model.reset()
+        self.model.endResetModel()
 
     def saveProject(self):
@@ -261 +269 @@
             'caption'   : 'Save Project',
             'filter'    : 'Project (*.json)',
-            'options'   : QtGui.QFileDialog.DontUseNativeDialog
+            'options'   : QtWidgets.QFileDialog.DontUseNativeDialog
         }
-        filename = str(QtGui.QFileDialog.getSaveFileName(**kwargs))
+        filename = str(QtWidgets.QFileDialog.getSaveFileName(**kwargs))
         if filename:
             self.communicator.statusBarUpdateSignal.emit("Saving Project... %s\n" % os.path.basename(filename))
@@ -617 +625 @@
         # Location is automatically saved - no need to keep track of the last dir
         # But only with Qt built-in dialog (non-platform native)
-        paths = QtGui.QFileDialog.getOpenFileNames(self, "Choose a file", "",
-                wlist, QtGui.QFileDialog.DontUseNativeDialog)
+        paths = QtWidgets.QFileDialog.getOpenFileNames(self, "Choose a file", "",
+                wlist, None, QtWidgets.QFileDialog.DontUseNativeDialog)
         if paths is None:
             return
@@ -835 +843 @@
         """
         # Create a custom menu based on actions defined in the UI file
-        self.context_menu = QtGui.QMenu(self)
+        self.context_menu = QtWidgets.QMenu(self)
         self.context_menu.addAction(self.actionDataInfo)
         self.context_menu.addAction(self.actionSaveAs)
@@ -1071 +1079 @@
         # If so, delete them
         # TODO: fix this to resemble GuiUtils.updateModelItemWithPlot
-        # 
+        #
+        self.model.beginResetModel()
         current_tab_name = model_item.text()[:2]
         for current_index in range(self.theory_model.rowCount()):
@@ -1079 +1088 @@
 
         # Reset the view
-        self.model.reset()
+        self.model.endResetModel()
 
         # Reset the view