Changeset d4dac80 in sasview for src/sas/qtgui/Utilities

Timestamp:

Apr 25, 2018 6:59:33 AM (7 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:

017b285

Parents:

93c79b5

git-author:

Piotr Rozyczko <rozyczko@…> (03/22/18 16:46:19)

git-committer:

Piotr Rozyczko <rozyczko@…> (04/25/18 06:59:33)

Message:

Merge branch 'ESS_GUI' into ESS_GUI_better_batch

Location:

src/sas/qtgui/Utilities

Files:

• GridPanel.py (modified) (12 diffs)
• GuiUtils.py (modified) (4 diffs)
• LocalConfig.py (modified) (1 diff)
• TabbedModelEditor.py (modified) (2 diffs)
• UI/GridPanelUI.ui (modified) (5 diffs)
• UnitTesting/GridPanelTest.py (modified) (1 diff)

src/sas/qtgui/Utilities/GridPanel.py

@@ -1 +1 @@
 import os
+import sys
 import time
 import logging
 import webbrowser
 
-from PyQt5 import QtCore, QtWidgets
+from PyQt5 import QtCore, QtWidgets, QtGui
 
 import sas.qtgui.Utilities.GuiUtils as GuiUtils
-
+from sas.qtgui.Plotting.PlotterData import Data1D
 from sas.qtgui.Utilities.UI.GridPanelUI import Ui_GridPanelUI
 
@@ -15 +16 @@
     Class for stateless grid-like printout of model parameters for mutiple models
     """
+    ERROR_COLUMN_CAPTION = " (Err)"
+    IS_WIN = (sys.platform == 'win32')
     def __init__(self, parent = None, output_data=None):
 
-        super(BatchOutputPanel, self).__init__()
+        super(BatchOutputPanel, self).__init__(parent._parent)
         self.setupUi(self)
 
-        self.data = output_data
         self.parent = parent
         if hasattr(self.parent, "communicate"):
@@ -30 +32 @@
         self.grid_filename = ""
 
+        self.has_data = False if output_data is None else True
+        # Tab numbering
+        self.tab_number = 1
+
+        # System dependent menu items
+        if not self.IS_WIN:
+            self.actionOpen_with_Excel.setVisible(False)
+
+        # list of QTableWidgets, indexed by tab number
+        self.tables = []
+        self.tables.append(self.tblParams)
+
         # context menu on the table
         self.tblParams.setContextMenuPolicy(QtCore.Qt.CustomContextMenu)
         self.tblParams.customContextMenuRequested.connect(self.showContextMenu)
 
-        # Fill in the table from input data
-        self.setupTable(output_data)
-
         # Command buttons
         self.cmdHelp.clicked.connect(self.onHelp)
+        self.cmdPlot.clicked.connect(self.onPlot)
+
+        # Fill in the table from input data
+        self.setupTable(widget=self.tblParams, data=output_data)
+        if output_data is not None:
+            # Set a table tooltip describing the model
+            model_name = output_data[0][0].model.id
+            self.tabWidget.setTabToolTip(0, model_name)
+
+    def closeEvent(self, event):
+        """
+        Overwrite QDialog close method to allow for custom widget close
+        """
+        # Maybe we should just minimize
+        self.setWindowState(QtCore.Qt.WindowMinimized)
+        event.ignore()
 
     def addToolbarActions(self):
@@ -64 +91 @@
 
         self.setupTableFromCSV(lines)
+        self.has_data = True
+
+    def currentTable(self):
+        """
+        Returns the currently shown QTabWidget
+        """
+        return self.tables[self.tabWidget.currentIndex()]
 
     def showContextMenu(self, position):
@@ -70 +104 @@
         """
         menu = QtWidgets.QMenu()
-        rows = [s.row() for s in self.tblParams.selectionModel().selectedRows()]
+        rows = [s.row() for s in self.currentTable().selectionModel().selectedRows()]
         num_rows = len(rows)
         if num_rows <= 0:
@@ -84 +118 @@
 
         # Define the callbacks
-        self.actionPlotResults.triggered.connect(self.plotFits)
+        self.actionPlotResults.triggered.connect(self.onPlot)
         try:
-            menu.exec_(self.tblParams.viewport().mapToGlobal(position))
+            menu.exec_(self.currentTable().viewport().mapToGlobal(position))
         except AttributeError as ex:
             logging.error("Error generating context menu: %s" % ex)
         return
+
+    def addTabPage(self):
+        """
+        Add new tab page with QTableWidget
+        """
+        layout = QtWidgets.QVBoxLayout()
+        tab_widget = QtWidgets.QTableWidget(parent=self)
+        # Same behaviour as the original tblParams
+        tab_widget.setContextMenuPolicy(QtCore.Qt.CustomContextMenu)
+        tab_widget.setAlternatingRowColors(True)
+        tab_widget.setSelectionBehavior(QtWidgets.QAbstractItemView.SelectRows)
+        tab_widget.setLayout(layout)
+        # Simple naming here.
+        # One would think naming the tab with current model name would be good.
+        # However, some models have LONG names, which doesn't look well on the tab bar.
+        self.tab_number += 1
+        tab_name = "Tab " + str(self.tab_number)
+        # each table needs separate slots.
+        tab_widget.customContextMenuRequested.connect(self.showContextMenu)
+        self.tables.append(tab_widget)
+        self.tabWidget.addTab(tab_widget, tab_name)
+        # Make the new tab active
+        self.tabWidget.setCurrentIndex(self.tab_number-1)
+
+    def addFitResults(self, results):
+        """
+        Create a new tab with batch fitting results
+        """
+        self.addTabPage()
+        # Update the new widget
+        # Fill in the table from input data in the last/newest page
+        assert(self.tables)
+        self.setupTable(widget=self.tables[-1], data=results)
+        self.has_data = True
+
+        # Set a table tooltip describing the model
+        model_name = results[0][0].model.id
+        self.tabWidget.setTabToolTip(self.tabWidget.count()-1, model_name)
+
 
     @classmethod
@@ -103 +176 @@
             logging.warning("Cannot display help. %s" % ex)
 
-    def plotFits(self):
+    def onPlot(self):
         """
         Plot selected fits by sending signal to the parent
         """
-        rows = [s.row() for s in self.tblParams.selectionModel().selectedRows()]
-        data = self.dataFromTable(self.tblParams)
+        rows = [s.row() for s in self.currentTable().selectionModel().selectedRows()]
+        if not rows:
+            msg = "Nothing to plot!"
+            self.parent.communicate.statusBarUpdateSignal.emit(msg)
+            return
+        data = self.dataFromTable(self.currentTable())
         # data['Data'] -> ['filename1', 'filename2', ...]
         # look for the 'Data' column and extract the filename
@@ -141 +218 @@
             tmpfile = tempfile.NamedTemporaryFile(delete=False, mode="w+", suffix=".csv")
             self.grid_filename = tmpfile.name
-            data = self.dataFromTable(self.tblParams)
+            data = self.dataFromTable(self.currentTable())
             t = time.localtime(time.time())
             time_str = time.strftime("%b %d %H:%M of %Y", t)
@@ -181 +258 @@
         if not filename:
             return
-        data = self.dataFromTable(self.tblParams)
+        data = self.dataFromTable(self.currentTable())
         details = "File generated by SasView\n"
         with open(filename, 'w') as csv_file:
@@ -190 +267 @@
         Create tablewidget items and show them, based on params
         """
-        # Clear existing display
-        self.tblParams.clear()
+        # Is this an empty grid?
+        if self.has_data:
+            # Add a new page
+            self.addTabPage()
+            # Access the newly created QTableWidget
+            current_page = self.tables[-1]
+        else:
+            current_page = self.tblParams
         # headers
         param_list = csv_data[1].rstrip().split(',')
+        # need to remove the 2 header rows to get the total data row number
+        rows = len(csv_data) -2
+        assert(rows > -1)
+        columns = len(param_list)
+        current_page.setColumnCount(columns)
+        current_page.setRowCount(rows)
+
         for i, param in enumerate(param_list):
-            self.tblParams.setHorizontalHeaderItem(i, QtWidgets.QTableWidgetItem(param))
+            current_page.setHorizontalHeaderItem(i, QtWidgets.QTableWidgetItem(param))
 
         # first - Chi2 and data filename
         for i_row, row in enumerate(csv_data[2:]):
             for i_col, col in enumerate(row.rstrip().split(',')):
-                self.tblParams.setItem(i_row, i_col, QtWidgets.QTableWidgetItem(col))
-
-        self.tblParams.resizeColumnsToContents()
-
-    def setupTable(self, data):
+                current_page.setItem(i_row, i_col, QtWidgets.QTableWidgetItem(col))
+
+        current_page.resizeColumnsToContents()
+
+    def setupTable(self, widget=None, data=None):
         """
         Create tablewidget items and show them, based on params
         """
-        # headers
+        # quietly leave is nothing to show
+        if data is None or widget is None:
+            return
+
+        # Figure out the headers
         model = data[0][0]
+
+        # TODO: add a conditional for magnetic models
         param_list = [m for m in model.model.params.keys() if ":" not in m]
 
         # Check if 2D model. If not, remove theta/phi
+        if isinstance(model.data.sas_data, Data1D):
+            param_list.remove('theta')
+            param_list.remove('phi')
 
         rows = len(data)
         columns = len(param_list)
-        self.tblParams.setColumnCount(columns+2)
-        self.tblParams.setRowCount(rows)
-
+
+        widget.setColumnCount(columns+2) # add 2 initial columns defined below
+        widget.setRowCount(rows)
+
+        # Insert two additional columns
         param_list.insert(0, "Data")
         param_list.insert(0, "Chi2")
         for i, param in enumerate(param_list):
-            self.tblParams.setHorizontalHeaderItem(i, QtWidgets.QTableWidgetItem(param))
-
+            widget.setHorizontalHeaderItem(i, QtWidgets.QTableWidgetItem(param))
+
+        # dictionary of parameter errors for post-processing
+        # [param_name] = [param_column_nr, error_for_row_1, error_for_row_2,...]
+        error_columns = {}
         # first - Chi2 and data filename
         for i_row, row in enumerate(data):
@@ -231 +335 @@
             if hasattr(row[0].data, "sas_data"):
                 filename = row[0].data.sas_data.filename
-            self.tblParams.setItem(i_row, 0, QtWidgets.QTableWidgetItem(GuiUtils.formatNumber(chi2, high=True)))
-            self.tblParams.setItem(i_row, 1, QtWidgets.QTableWidgetItem(str(filename)))
+            widget.setItem(i_row, 0, QtWidgets.QTableWidgetItem(GuiUtils.formatNumber(chi2, high=True)))
+            widget.setItem(i_row, 1, QtWidgets.QTableWidgetItem(str(filename)))
             # Now, all the parameters
             for i_col, param in enumerate(param_list[2:]):
@@ -238 +342 @@
                     # parameter is on the to-optimize list - get the optimized value
                     par_value = row[0].pvec[row[0].param_list.index(param)]
-                    # should we parse out errors here and store them?
+                    # parse out errors and store them for later use
+                    err_value = row[0].stderr[row[0].param_list.index(param)]
+                    if param in error_columns:
+                        error_columns[param].append(err_value)
+                    else:
+                        error_columns[param] = [i_col, err_value]
                 else:
                     # parameter was not varied
                     par_value = row[0].model.params[param]
-                self.tblParams.setItem(i_row, i_col+2, QtWidgets.QTableWidgetItem(
+
+                widget.setItem(i_row, i_col+2, QtWidgets.QTableWidgetItem(
                     GuiUtils.formatNumber(par_value, high=True)))
 
-        self.tblParams.resizeColumnsToContents()
+        # Add errors
+        error_list = list(error_columns.keys())
+        for error_param in error_list[::-1]: # must be reverse to keep column indices
+            # the offset for the err column: +2 from the first two extra columns, +1 to append this column
+            error_column = error_columns[error_param][0]+3
+            error_values = error_columns[error_param][1:]
+            widget.insertColumn(error_column)
+
+            column_name = error_param + self.ERROR_COLUMN_CAPTION
+            widget.setHorizontalHeaderItem(error_column, QtWidgets.QTableWidgetItem(column_name))
+
+            for i_row, error in enumerate(error_values):
+                item = QtWidgets.QTableWidgetItem(GuiUtils.formatNumber(error, high=True))
+                # Fancy, italic font for errors
+                font = QtGui.QFont()
+                font.setItalic(True)
+                item.setFont(font)
+                widget.setItem(i_row, error_column, item)
+
+        # resize content
+        widget.resizeColumnsToContents()
 
     @classmethod

src/sas/qtgui/Utilities/GuiUtils.py

@@ -245 +245 @@
     customModelDirectoryChanged = QtCore.pyqtSignal()
 
+    # Notify the gui manager about new data to be added to the grid view
+    sendDataToGridSignal = QtCore.pyqtSignal(list)
+
+
 def updateModelItemWithPlot(item, update_data, name=""):
     """
@@ -333 +337 @@
     """
     assert isinstance(item, QtGui.QStandardItem)
-    #assert isinstance(update_data, list)
 
     # Add the actual Data1D/Data2D object
@@ -465 +468 @@
 
     return info_item
+
+def dataFromItem(item):
+    """
+    Retrieve Data1D/2D component from QStandardItem.
+    The assumption - data stored in SasView standard, in child 0
+    """
+    return item.child(0).data()
 
 def openLink(url):
@@ -813 +823 @@
     return (xLabel, yLabel, xscale, yscale)
 
-def dataFromItem(item):
-    """
-    Retrieve Data1D/2D component from QStandardItem.
-    The assumption - data stored in SasView standard, in child 0
-    """
-    return item.child(0).data()
-
 def formatNumber(value, high=False):
     """

src/sas/qtgui/Utilities/LocalConfig.py

@@ -134 +134 @@
 
 # Default threading model
-USING_TWISTED = False
+USING_TWISTED = True
 
 # Logging levels to disable, if any

src/sas/qtgui/Utilities/TabbedModelEditor.py

@@ -35 +35 @@
         self.edit_only = edit_only
         self.is_modified = False
+        self.label = None
 
         self.addWidgets()
@@ -240 +241 @@
         # Run the model test in sasmodels
         try:
-            _ = GuiUtils.checkModel(full_path)
+            model_results = self.checkModel(full_path)
+            logging.info(model_results)
         except Exception as ex:
             msg = "Error building model: "+ str(ex)

src/sas/qtgui/Utilities/UI/GridPanelUI.ui

@@ -8 +8 @@
     <y>0</y>
     <width>939</width>
-    <height>329</height>
+    <height>330</height>
    </rect>
   </property>
@@ -21 +21 @@
   </property>
   <widget class="QWidget" name="centralwidget">
-   <layout class="QGridLayout" name="gridLayout">
+   <layout class="QGridLayout" name="gridLayout_2">
+    <item row="0" column="0">
+     <widget class="QTabWidget" name="tabWidget">
+      <property name="tabPosition">
+       <enum>QTabWidget::South</enum>
+      </property>
+      <property name="currentIndex">
+       <number>0</number>
+      </property>
+      <widget class="QWidget" name="tab">
+       <attribute name="title">
+        <string>Tab 1</string>
+       </attribute>
+       <layout class="QGridLayout" name="gridLayout">
+        <item row="0" column="0">
+         <widget class="QTableWidget" name="tblParams">
+          <property name="contextMenuPolicy">
+           <enum>Qt::CustomContextMenu</enum>
+          </property>
+          <property name="alternatingRowColors">
+           <bool>true</bool>
+          </property>
+          <property name="selectionBehavior">
+           <enum>QAbstractItemView::SelectRows</enum>
+          </property>
+         </widget>
+        </item>
+       </layout>
+      </widget>
+     </widget>
+    </item>
     <item row="1" column="0">
      <layout class="QHBoxLayout" name="horizontalLayout">
@@ -36 +66 @@
         </property>
        </spacer>
+      </item>
+      <item>
+       <widget class="QPushButton" name="cmdPlot">
+        <property name="text">
+         <string>Plot</string>
+        </property>
+       </widget>
       </item>
       <item>
@@ -53 +90 @@
      </layout>
     </item>
-    <item row="0" column="0">
-     <widget class="QTableWidget" name="tblParams">
-      <property name="contextMenuPolicy">
-       <enum>Qt::CustomContextMenu</enum>
-      </property>
-      <property name="alternatingRowColors">
-       <bool>true</bool>
-      </property>
-      <property name="selectionBehavior">
-       <enum>QAbstractItemView::SelectRows</enum>
-      </property>
-     </widget>
-    </item>
    </layout>
   </widget>
@@ -73 +97 @@
      <x>0</x>
      <y>0</y>
-     <width>939</width>
+     <width>510</width>
      <height>26</height>
     </rect>

src/sas/qtgui/Utilities/UnitTesting/GridPanelTest.py

@@ -70 +70 @@
         self.assertIsInstance(self.widget, QtWidgets.QMainWindow)
         # Default title
-        self.assertEqual(self.widget.windowTitle(), "Grid Panel")
+        self.assertEqual(self.widget.windowTitle(), "Batch Fitting Results")
 
         # non-modal window