Changeset 8eea1b1 in sasview

Timestamp:

Sep 26, 2018 2:47:30 AM (6 years ago)

Author:

Laura Forster <Awork@…>

Branches:

ESS_GUI, ESS_GUI_batch_fitting, ESS_GUI_bumps_abstraction, ESS_GUI_iss1116, ESS_GUI_opencl, ESS_GUI_ordering, ESS_GUI_sync_sascalc

Children:

428c3b2, a80e182

Parents:

20f4857 (diff), 6d87082 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'ESS_GUI' of ​https://github.com/SasView/sasview into ESS_GUI

Files:

• build_tools/conda_qt5_min_centos.yml (modified) (1 diff)
• build_tools/conda_qt5_win.yml (modified) (1 diff)
• src/sas/qtgui/MainWindow/GuiManager.py (modified) (2 diffs)
• src/sas/qtgui/MainWindow/UnitTesting/GuiManagerTest.py (modified) (1 diff)
• src/sas/qtgui/MainWindow/UnitTesting/MainWindowTest.py (modified) (1 diff)
• src/sas/qtgui/Perspectives/Fitting/FittingLogic.py (modified) (1 diff)
• src/sas/qtgui/Perspectives/Fitting/FittingWidget.py (modified) (5 diffs)
• src/sas/qtgui/Plotting/Plotter.py (modified) (1 diff)
• src/sas/qtgui/Plotting/Plotter2D.py (modified) (1 diff)
• src/sas/qtgui/Plotting/PlotterBase.py (modified) (4 diffs)
• src/sas/qtgui/Plotting/UnitTesting/Plotter2DTest.py (modified) (2 diffs)
• src/sas/qtgui/Plotting/UnitTesting/PlotterBaseTest.py (modified) (2 diffs)
• src/sas/qtgui/Plotting/UnitTesting/PlotterTest.py (modified) (2 diffs)
• src/sas/qtgui/Utilities/GridPanel.py (modified) (4 diffs)
• src/sas/qtgui/Utilities/GuiUtils.py (modified) (1 diff)
• src/sas/qtgui/Utilities/LocalConfig.py (modified) (1 diff)
• src/sas/sasview/images/utlogo.gif (deleted)
• src/sas/sasview/images/utlogo.png (added)
• src/sas/qtgui/Perspectives/Fitting/FittingPerspective.py (modified) (2 diffs)

build_tools/conda_qt5_min_centos.yml

@@ -3 +3 @@
   - conda-forge
 dependencies:
- - matplotlib=2
+ - matplotlib=2.1.0
  - scipy
  - hdf5

build_tools/conda_qt5_win.yml

@@ -4 +4 @@
 dependencies:
  - python=3
- - matplotlib==2
+ - matplotlib==2.1.0
  - scipy
  - hdf5

src/sas/qtgui/MainWindow/GuiManager.py

@@ -138 +138 @@
         self.categoryManagerWidget = CategoryManager(self._parent, manager=self)
         self.grid_window = None
+        self.grid_window = BatchOutputPanel(parent=self)
+        self.grid_subwindow = self._workspace.workspace.addSubWindow(self.grid_window)
+        self.grid_subwindow.setVisible(False)
+        self.grid_window.windowClosedSignal.connect(lambda: self.grid_subwindow.setVisible(False))
+
         self._workspace.toolBar.setVisible(LocalConfig.TOOLBAR_SHOW)
         self._workspace.actionHide_Toolbar.setText("Show Toolbar")
@@ -616 +621 @@
         Display/redisplay the batch fit viewer
         """
-        if self.grid_window is None:
-            self.grid_window = BatchOutputPanel(parent=self, output_data=output_data)
-            subwindow = self._workspace.workspace.addSubWindow(self.grid_window)
-
-            #self.grid_window = BatchOutputPanel(parent=self, output_data=output_data)
-            self.grid_window.show()
-            return
+        self.grid_subwindow.setVisible(True)
         if output_data:
             self.grid_window.addFitResults(output_data)
-        self.grid_window.show()
-        if self.grid_window.windowState() == Qt.WindowMinimized:
-            self.grid_window.setWindowState(Qt.WindowActive)
 
     def actionHide_Toolbar(self):

src/sas/qtgui/MainWindow/UnitTesting/GuiManagerTest.py

@@ -61 +61 @@
         self.assertIsInstance(self.manager.ackWidget, Acknowledgements)
         self.assertIsInstance(self.manager.aboutWidget, AboutBox)
-        self.assertIsInstance(self.manager.welcomePanel, WelcomePanel)
+        #self.assertIsInstance(self.manager.welcomePanel, WelcomePanel)
 
     def skip_testLogging(self):

src/sas/qtgui/MainWindow/UnitTesting/MainWindowTest.py

@@ -47 +47 @@
         tmp_main.showMaximized()
         # See that only one subwindow is up
-        self.assertEqual(len(tmp_main.workspace.subWindowList()), 1)
+        self.assertEqual(len(tmp_main.workspace.subWindowList()), 2)
         # and that the subwindow is the fitting perspective
         self.assertIsInstance(tmp_main.workspace.subWindowList()[0].widget(),

src/sas/qtgui/Perspectives/Fitting/FittingLogic.py

@@ -223 +223 @@
         return plots
 
+    def getScalarIntermediateResults(self, return_data):
+        """
+        Returns a dict of scalar-only intermediate results from the return data.
+        """
+        res = {}
+        for name, int_res in return_data["intermediate_results"].items():
+            if isinstance(int_res, np.ndarray):
+                continue
+            res[name] = int_res
+        return res
+
     def computeDataRange(self):
         """

src/sas/qtgui/Perspectives/Fitting/FittingWidget.py

@@ -321 +321 @@
         self.magneticAnglesWidget = QtWidgets.QWidget()
         labl = QtWidgets.QLabel(self.magneticAnglesWidget)
-        pixmap = QtGui.QPixmap(GuiUtils.IMAGES_DIRECTORY_LOCATION + '/M_angles_pic.bmp')
+        pixmap = QtGui.QPixmap(GuiUtils.IMAGES_DIRECTORY_LOCATION + '/M_angles_pic.png')
         labl.setPixmap(pixmap)
         self.magneticAnglesWidget.setFixedSize(pixmap.width(), pixmap.height())
@@ -2297 +2297 @@
         # TODO: multishell params in self.kernel_module.details[??] = value
 
+        # handle display of effective radius parameter according to radius_effective_mode; pass ER into model if
+        # necessary
+        self.processEffectiveRadius()
+
         # Force the chart update when actual parameters changed
         if model_column == 1:
@@ -2303 +2307 @@
         # Update state stack
         self.updateUndo()
+
+    def processEffectiveRadius(self):
+        """
+        Checks the value of radius_effective_mode, if existent, and processes radius_effective as necessary.
+        * mode == 0: This means 'unconstrained'; ensure use can specify ER.
+        * mode > 0: This means it is constrained to a P(Q)-computed value in sasmodels; prevent user from editing ER.
+
+        Note: If ER has been computed, it is passed back to SasView as an intermediate result. That value must be
+        displayed for the user; that is not dealt with here, but in complete1D.
+        """
+        ER_row = self.getRowFromName("radius_effective")
+        if ER_row is None:
+            return
+
+        ER_mode_row = self.getRowFromName("radius_effective_mode")
+        if ER_mode_row is None:
+            return
+
+        try:
+            ER_mode = int(self._model_model.item(ER_mode_row, 1).text())
+        except ValueError:
+            logging.error("radius_effective_mode was set to an invalid value.")
+            return
+
+        if ER_mode == 0:
+            # ensure the ER value can be modified by user
+            self.setParamEditableByRow(ER_row, True)
+        elif ER_mode > 0:
+            # ensure the ER value cannot be modified by user
+            self.setParamEditableByRow(ER_row, False)
+        else:
+            logging.error("radius_effective_mode was set to an invalid value.")
+
+    def setParamEditableByRow(self, row, editable=True):
+        """
+        Sets whether the user can edit a parameter in the table. If they cannot, the parameter name's font is changed,
+        the value itself cannot be edited if clicked on, and the parameter may not be fitted.
+        """
+        item_name = self._model_model.item(row, 0)
+        item_value = self._model_model.item(row, 1)
+
+        item_value.setEditable(editable)
+
+        if editable:
+            # reset font
+            item_name.setFont(QtGui.QFont())
+            # reset colour
+            item_name.setForeground(QtGui.QBrush())
+            # make checkable
+            item_name.setCheckable(True)
+        else:
+            # change font
+            font = QtGui.QFont()
+            font.setItalic(True)
+            item_name.setFont(font)
+            # change colour
+            item_name.setForeground(QtGui.QBrush(QtGui.QColor(50, 50, 50)))
+            # make not checkable (and uncheck)
+            item_name.setCheckState(QtCore.Qt.Unchecked)
+            item_name.setCheckable(False)
 
     def isCheckable(self, row):
@@ -2535 +2599 @@
             self.communicate.plotUpdateSignal.emit([plot])
 
+        # Update radius_effective if relevant
+        self.updateEffectiveRadius(return_data)
+
     def complete2D(self, return_data):
         """
@@ -2561 +2628 @@
         for plot in new_plots:
             self.communicate.plotUpdateSignal.emit([plot])
+
+    def updateEffectiveRadius(self, return_data):
+        """
+        Given return data from sasmodels, update the effective radius parameter in the GUI table with the new
+        calculated value as returned by sasmodels (if the value was returned).
+        """
+        ER_mode_row = self.getRowFromName("radius_effective_mode")
+        if ER_mode_row is None:
+            return
+        try:
+            ER_mode = int(self._model_model.item(ER_mode_row, 1).text())
+        except ValueError:
+            logging.error("radius_effective_mode was set to an invalid value.")
+            return
+        if ER_mode < 1:
+            # does not need updating if it is not being computed
+            return
+
+        ER_row = self.getRowFromName("radius_effective")
+        if ER_row is None:
+            return
+
+        scalar_results = self.logic.getScalarIntermediateResults(return_data)
+        ER_value = scalar_results.get("effective_radius") # note name of key
+        if ER_value is None:
+            return
+        # ensure the model does not recompute when updating the value
+        self._model_model.blockSignals(True)
+        self._model_model.item(ER_row, 1).setText(str(ER_value))
+        self._model_model.blockSignals(False)
+        # ensure the view is updated immediately
+        self._model_model.layoutChanged.emit()
 
     def calculateResiduals(self, fitted_data):

src/sas/qtgui/Plotting/Plotter.py

@@ -75 +75 @@
         if isinstance(data, Data1D):
             self.data = data
-        if not self._data or data is None:
+
+        if not self._data:
             return
 

src/sas/qtgui/Plotting/Plotter2D.py

@@ -95 +95 @@
             self.data = data
 
-        if not self._data or data is None:
+        if not self._data:
             return
 

src/sas/qtgui/Plotting/PlotterBase.py

@@ -114 +114 @@
         if not quickplot:
             # Add the toolbar
-            self.toolbar.show()
+            # self.toolbar.show()
+            self.toolbar.hide() # hide for the time being
             # Notify PlotHelper about the new plot
             self.upatePlotHelper()
@@ -220 +221 @@
         self.actionPrintImage = self.contextMenu.addAction("Print Image")
         self.actionCopyToClipboard = self.contextMenu.addAction("Copy to Clipboard")
-        self.contextMenu.addSeparator()
-        self.actionToggleMenu = self.contextMenu.addAction("Toggle Navigation Menu")
+        #self.contextMenu.addSeparator()
+        #self.actionToggleMenu = self.contextMenu.addAction("Toggle Navigation Menu")
         self.contextMenu.addSeparator()
 
@@ -229 +230 @@
         self.actionPrintImage.triggered.connect(self.onImagePrint)
         self.actionCopyToClipboard.triggered.connect(self.onClipboardCopy)
-        self.actionToggleMenu.triggered.connect(self.onToggleMenu)
+        #self.actionToggleMenu.triggered.connect(self.onToggleMenu)
 
     def createContextMenu(self):
@@ -381 +382 @@
         Toggle navigation menu visibility in the chart
         """
-        if self.toolbar.isVisible():
-            self.toolbar.hide()
-        else:
-            self.toolbar.show()
+        self.toolbar.hide()
+        # Current toolbar menu is too buggy.
+        # Comment out until we support 3.x, then recheck.
+        #if self.toolbar.isVisible():
+        #    self.toolbar.hide()
+        #else:
+        #    self.toolbar.show()
 
     def offset_graph(self):

src/sas/qtgui/Plotting/UnitTesting/Plotter2DTest.py

@@ -146 +146 @@
         self.plotter.createContextMenuQuick()
         actions = self.plotter.contextMenu.actions()
-        self.assertEqual(len(actions), 9)
+        self.assertEqual(len(actions), 7)
 
         # Trigger Print Image and make sure the method is called
@@ -158 +158 @@
 
         # Trigger Toggle Grid and make sure the method is called
-        self.assertEqual(actions[6].text(), "Toggle Grid On/Off")
+        self.assertEqual(actions[4].text(), "Toggle Grid On/Off")
         self.plotter.ax.grid = MagicMock()
+        actions[4].trigger()
+        self.assertTrue(self.plotter.ax.grid.called)
+
+        # Trigger Change Scale and make sure the method is called
+        self.assertEqual(actions[6].text(), "Toggle Linear/Log Scale")
+        FigureCanvas.draw_idle = MagicMock()
         actions[6].trigger()
-        self.assertTrue(self.plotter.ax.grid.called)
-
-        # Trigger Change Scale and make sure the method is called
-        self.assertEqual(actions[8].text(), "Toggle Linear/Log Scale")
-        FigureCanvas.draw_idle = MagicMock()
-        actions[8].trigger()
         self.assertTrue(FigureCanvas.draw_idle.called)
 

src/sas/qtgui/Plotting/UnitTesting/PlotterBaseTest.py

@@ -124 +124 @@
 
         actions = self.plotter.contextMenu.actions()
-        self.assertEqual(len(actions), 6)
+        self.assertEqual(len(actions), 4)
 
         # Trigger Print Image and make sure the method is called
@@ -147 +147 @@
         self.assertTrue(self.clipboard_called)
 
-        # Trigger toggle navigation bar and make sure the method is called
-        self.assertEqual(actions[4].text(), "Toggle Navigation Menu")
-        isShown = self.plotter.toolbar.isVisible()
-        self.assertTrue(isShow)
-        actions[4].trigger()
-        isShown = self.plotter.toolbar.isVisible()
-        self.assertFalse(isShow)
-        actions[4].trigger()
-        isShown = self.plotter.toolbar.isVisible()
-        self.assertTrue(isShow)
+        ## Trigger toggle navigation bar and make sure the method is called
+        #self.assertEqual(actions[4].text(), "Toggle Navigation Menu")
+        #isShown = self.plotter.toolbar.isVisible()
+        #self.assertTrue(isShow)
+        #actions[4].trigger()
+        #isShown = self.plotter.toolbar.isVisible()
+        #self.assertFalse(isShow)
+        #actions[4].trigger()
+        #isShown = self.plotter.toolbar.isVisible()
+        #self.assertTrue(isShow)
 
 

src/sas/qtgui/Plotting/UnitTesting/PlotterTest.py

@@ -103 +103 @@
         self.plotter.createContextMenuQuick()
         actions = self.plotter.contextMenu.actions()
-        self.assertEqual(len(actions), 9)
+        self.assertEqual(len(actions), 7)
 
         # Trigger Print Image and make sure the method is called
@@ -115 +115 @@
 
         # Trigger Toggle Grid and make sure the method is called
-        self.assertEqual(actions[6].text(), "Toggle Grid On/Off")
+        self.assertEqual(actions[4].text(), "Toggle Grid On/Off")
         self.plotter.ax.grid = MagicMock()
+        actions[4].trigger()
+        self.assertTrue(self.plotter.ax.grid.called)
+
+        # Trigger Change Scale and make sure the method is called
+        self.assertEqual(actions[6].text(), "Change Scale")
+        self.plotter.properties.exec_ = MagicMock(return_value=QtWidgets.QDialog.Rejected)
         actions[6].trigger()
-        self.assertTrue(self.plotter.ax.grid.called)
-
-        # Trigger Change Scale and make sure the method is called
-        self.assertEqual(actions[8].text(), "Change Scale")
-        self.plotter.properties.exec_ = MagicMock(return_value=QtWidgets.QDialog.Rejected)
-        actions[8].trigger()
         self.assertTrue(self.plotter.properties.exec_.called)
 

src/sas/qtgui/Utilities/GridPanel.py

@@ -18 +18 @@
     ERROR_COLUMN_CAPTION = " (Err)"
     IS_WIN = (sys.platform == 'win32')
+    windowClosedSignal = QtCore.pyqtSignal()
     def __init__(self, parent = None, output_data=None):
 
@@ -54 +55 @@
         # Fill in the table from input data
         self.setupTable(widget=self.tblParams, data=output_data)
-        #TODO: This is not what was inteded to be.
         if output_data is not None:
             # Set a table tooltip describing the model
@@ -64 +64 @@
         Overwrite QDialog close method to allow for custom widget close
         """
-        # Maybe we should just minimize
-        self.setWindowState(QtCore.Qt.WindowMinimized)
+        # notify the parent so it hides this window
+        self.windowClosedSignal.emit()
         event.ignore()
 
@@ -153 +153 @@
         Create a new tab with batch fitting results
         """
-        self.addTabPage()
+        if self.has_data:
+            self.addTabPage()
         # Update the new widget
         # Fill in the table from input data in the last/newest page

src/sas/qtgui/Utilities/GuiUtils.py

@@ -29 +29 @@
 from sas.qtgui.Utilities import CustomDir
 
-## TODO: CHANGE FOR SHIPPED PATH IN RELEASE
 if os.path.splitext(sys.argv[0])[1].lower() != ".py":
         HELP_DIRECTORY_LOCATION = "doc"

src/sas/qtgui/Utilities/LocalConfig.py

@@ -73 +73 @@
 _nsf_logo = os.path.join(icon_path, "nsf_logo.png")
 _danse_logo = os.path.join(icon_path, "danse_logo.png")
-_inst_logo = os.path.join(icon_path, "utlogo.gif")
+_inst_logo = os.path.join(icon_path, "utlogo.png")
 _nist_url = "http://www.nist.gov/"
 _umd_url = "http://www.umd.edu/"

src/sas/qtgui/Perspectives/Fitting/FittingPerspective.py

@@ -65 +65 @@
         self.communicate.copyFitParamsSignal.connect(self.onParamCopy)
         self.communicate.pasteFitParamsSignal.connect(self.onParamPaste)
+        self.communicate.copyExcelFitParamsSignal.connect(self.onExcelCopy)
+        self.communicate.copyLatexFitParamsSignal.connect(self.onLatexCopy)
+
 
         # Perspective window not allowed to close by default
@@ -103 +106 @@
     def onParamPaste(self):
         self.currentTab.onParameterPaste()
+
+    def onExcelCopy(self):
+        self.currentTab.onParameterCopy("Excel")
+
+    def onLatexCopy(self):
+        self.currentTab.onParameterCopy("Latex")
 
     def closeEvent(self, event):