Changeset 9e426c1 in sasview for src/sas/qtgui/DataExplorer.py

Timestamp:

Jun 21, 2016 8:07:33 AM (8 years ago)

Author:

Piotr Rozyczko <piotr.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:

f82ab8c

Parents:

1042dba

Message:

More main window items, system close, update checker, doc viewer etc.

File:

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

src/sas/qtgui/DataExplorer.py

@@ -85 +85 @@
         """
         dir = QtGui.QFileDialog.getExistingDirectory(self, "Choose a directory", "",
-              QtGui.QFileDialog.ShowDirsOnly)
+              QtGui.QFileDialog.ShowDirsOnly | QtGui.QFileDialog.DontUseNativeDialog)
         if dir is None:
             return
@@ -171 +171 @@
         """
         Create a new matplotlib chart from selected data
+
+        TODO: Add 2D-functionality
         """
 
@@ -192 +194 @@
         # 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.getOpenFileName(self, "Choose a file", "",
+        paths = QtGui.QFileDialog.getOpenFileNames(self, "Choose a file", "",
                 wlist, None, QtGui.QFileDialog.DontUseNativeDialog)
         if paths is None:
             return
 
+        if type(paths) == QtCore.QStringList:
+            paths = [str(f) for f in paths]
+
         if paths.__class__.__name__ != "list":
             paths = [paths]
 
-        path_str=[]
-        for path in paths:
-            if str(path):
-                path_str.append(str(path))
-
-        return path_str
+        return paths
 
     def readData(self, path):
@@ -402 +402 @@
         Post message to status bar and update the data manager
         """
+        # Don't show "empty" rows with data objects
+        self.proxy.setFilterRegExp(r"[^()]")
+
+        # Reset the model so the view gets updated.
         self.model.reset()
-        assert(type(output), tuple)
+        assert type(output)== tuple
 
         output_data = output[0]
@@ -433 +437 @@
         checkbox_item.setText(os.path.basename(p_file))
 
-        # Add "Info" item
-        # info_item = QtGui.QStandardItem("Info")
-
         # Add the actual Data1D/Data2D object
         object_item = QtGui.QStandardItem()
@@ -443 +444 @@
 
         # Add rows for display in the view
-        # self.addExtraRows(info_item, data)
         info_item = infoFromData(data)
 
@@ -452 +452 @@
         self.model.appendRow(checkbox_item)
         
-        # Don't show "empty" rows with data objects
-        self.proxy.setFilterRegExp(r"[^()]")
-
     def updateModelFromPerspective(self, model_item):
         """