Changeset f331852 in sasview

Timestamp:

Oct 20, 2017 2:45:46 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:

7d9c83c

Parents:

44880ac (diff), 1420066 (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 remote-tracking branch 'origin/ESS_GUI_SasView245' into ESS_GUI

Files:

• src/sas/qtgui/Calculators/DataOperationUtilityPanel.py (added)
• src/sas/qtgui/Calculators/UI/DataOperationUtilityUI.ui (added)
• src/sas/qtgui/Calculators/UnitTesting/DataOperationUtilityTest.py (added)
• src/sas/qtgui/GUITests.py (modified) (2 diffs)
• src/sas/qtgui/MainWindow/DataExplorer.py (modified) (5 diffs)
• src/sas/qtgui/MainWindow/DataManager.py (modified) (2 diffs)
• src/sas/qtgui/MainWindow/GuiManager.py (modified) (7 diffs)
• src/sas/qtgui/Plotting/Plotter.py (modified) (1 diff)
• src/sas/qtgui/Plotting/Plotter2D.py (modified) (4 diffs)
• src/sas/qtgui/Utilities/GuiUtils.py (modified) (6 diffs)
• src/sas/qtgui/Utilities/UnitTesting/GuiUtilsTest.py (modified) (2 diffs)
• sasview/squish_test_suites/suite_sasview_bdd/envvars (added)
• sasview/squish_test_suites/suite_sasview_bdd/objects.map (added)
• sasview/squish_test_suites/suite_sasview_bdd/shared/scripts/bdd_hooks.py (added)
• sasview/squish_test_suites/suite_sasview_bdd/shared/steps/steps.py (added)
• sasview/squish_test_suites/suite_sasview_bdd/suite.conf (added)
• sasview/squish_test_suites/suite_sasview_bdd/tst_case1/test.feature (added)
• sasview/squish_test_suites/suite_sasview_bdd/tst_case1/test.py (added)
• src/sas/qtgui/Perspectives/Fitting/FittingUtilities.py (modified) (4 diffs)
• src/sas/qtgui/Perspectives/Fitting/FittingWidget.py (modified) (2 diffs)
• src/sas/qtgui/Perspectives/Fitting/UnitTesting/FittingWidgetTest.py (modified) (3 diffs)
• src/sas/qtgui/Perspectives/Invariant/InvariantDetails.py (modified) (1 diff)

src/sas/qtgui/GUITests.py

@@ -38 +38 @@
 from Calculators.UnitTesting import SlitSizeCalculatorTest
 from Calculators.UnitTesting import ResolutionCalculatorPanelTest
+from Calculators.UnitTesting import DataOperationUtilityTest
 
 # Utilities
@@ -94 +95 @@
         unittest.makeSuite(SlitSizeCalculatorTest.SlitSizeCalculatorTest, 'test'),
         unittest.makeSuite(ResolutionCalculatorPanelTest.ResolutionCalculatorPanelTest, 'test'),
+        unittest.makeSuite(DataOperationUtilityTest.DataOperationUtilityTest, 'test'),
 
         # Perspectives

src/sas/qtgui/MainWindow/DataExplorer.py

@@ -93 +93 @@
         self.communicator.activeGraphName.connect(self.updatePlotName)
         self.communicator.plotUpdateSignal.connect(self.updatePlot)
+
         self.cbgraph.editTextChanged.connect(self.enableGraphCombo)
         self.cbgraph.currentIndexChanged.connect(self.enableGraphCombo)
@@ -280 +281 @@
         # Use 'while' so the row count is forced at every iteration
         deleted_indices = []
+        deleted_names = []
         while ind < self.model.rowCount():
             ind += 1
             item = self.model.item(ind)
+
             if item and item.isCheckable() and item.checkState() == QtCore.Qt.Checked:
                 # Delete these rows from the model
+                deleted_names.append(str(self.model.item(ind).text()))
                 deleted_indices.append(item)
+
                 self.model.removeRow(ind)
                 # Decrement index since we just deleted it
@@ -292 +297 @@
         # Let others know we deleted data
         self.communicator.dataDeletedSignal.emit(deleted_indices)
+
+        # update stored_data
+        self.manager.update_stored_data(deleted_names)
 
     def deleteTheory(self, event):
@@ -869 +877 @@
         self.txt_widget.setWindowIcon(QtGui.QIcon(":/res/ball.ico"))
         self.txt_widget.setWindowTitle("Data Info: %s" % data.filename)
+        self.txt_widget.clear()
         self.txt_widget.insertPlainText(text_to_show)
 
@@ -1012 +1021 @@
         self.model.appendRow(checkbox_item)
 
-
     def updateModelFromPerspective(self, model_item):
         """

src/sas/qtgui/MainWindow/DataManager.py

@@ -275 +275 @@
                 del self.stored_data[id]
 
-
     def get_by_name(self, name_list=None):
         """
@@ -295 +294 @@
                 if data_state.data.name == selected_name:
                     del self.stored_data[id]
+
+    def update_stored_data(self, name_list=None):
+        """ update stored data after deleting files in Data Explorer """
+        for selected_name in name_list:
+            for idx in self.stored_data.keys():
+                if str(selected_name) in str(idx):
+                    print selected_name, idx
+                    del self.stored_data[idx]
 
     def get_data_state(self, data_id):

src/sas/qtgui/MainWindow/GuiManager.py

@@ -31 +31 @@
 from sas.qtgui.Calculators.GenericScatteringCalculator import GenericScatteringCalculator
 from sas.qtgui.Calculators.ResolutionCalculatorPanel import ResolutionCalculatorPanel
-
+from sas.qtgui.Calculators.DataOperationUtilityPanel import DataOperationUtilityPanel
 
 # Perspectives
@@ -47 +47 @@
     Main SasView window functionality
     """
+
     def __init__(self, parent=None):
         """
@@ -142 +143 @@
         self.GENSASCalculator = GenericScatteringCalculator(self)
         self.ResolutionCalculator = ResolutionCalculatorPanel(self)
+        self.DataOperation = DataOperationUtilityPanel(self)
 
     def statusBarSetup(self):
@@ -337 +339 @@
         self.communicate.updateTheoryFromPerspectiveSignal.connect(self.updateTheoryFromPerspective)
         self.communicate.plotRequestedSignal.connect(self.showPlot)
+        self.communicate.updateModelFromDataOperationPanelSignal.connect(self.updateModelFromDataOperationPanel)
 
     def addTriggers(self):
@@ -531 +534 @@
         """
         """
-        print("actionData_Operation TRIGGERED")
-        pass
+        self.communicate.sendDataToPanelSignal.emit(self._data_manager.get_all_data())
+
+        self.DataOperation.show()
 
     def actionSLD_Calculator(self):
@@ -731 +735 @@
         self.filesWidget.updateTheoryFromPerspective(index)
 
+    def updateModelFromDataOperationPanel(self, new_item, new_datalist_item):
+        """
+        :param new_item: item to be added to list of loaded files
+        :param new_datalist_item:
+        """
+        if not isinstance(new_item, QtGui.QStandardItem) or \
+                not isinstance(new_datalist_item, dict):
+            msg = "Wrong data type returned from calculations."
+            raise AttributeError, msg
+
+        self.filesWidget.model.appendRow(new_item)
+        self._data_manager.add_data(new_datalist_item)
+
     def showPlot(self, plot):
         """
@@ -737 +754 @@
         if hasattr(self, "filesWidget"):
             self.filesWidget.displayData(plot)
-

src/sas/qtgui/Plotting/Plotter.py

@@ -145 +145 @@
 
         # Now add the legend with some customizations.
+
         self.legend = ax.legend(loc='upper right', shadow=True)
         if self.legend:

src/sas/qtgui/Plotting/Plotter2D.py

@@ -87 +87 @@
         self._item = item
 
-    def plot(self, data=None, marker=None):
+    def plot(self, data=None, marker=None, show_colorbar=True):
         """
         Plot 2D self._data
@@ -109 +109 @@
                       ymin=self.ymin, ymax=self.ymax,
                       cmap=self.cmap, zmin=zmin_2D_temp,
-                      zmax=zmax_2D_temp)
+                      zmax=zmax_2D_temp, show_colorbar=show_colorbar)
 
     def calculateDepth(self):
@@ -379 +379 @@
 
     def showPlot(self, data, qx_data, qy_data, xmin, xmax, ymin, ymax,
-                 zmin, zmax, label='data2D', cmap=DEFAULT_CMAP):
+                 zmin, zmax, label='data2D', cmap=DEFAULT_CMAP, show_colorbar=True):
         """
         Render and show the current data
@@ -457 +457 @@
             self.vmax = cb.vmax
 
+            if show_colorbar is False:
+                cb.remove()
+
         else:
             # clear the previous 2D from memory

src/sas/qtgui/Utilities/GuiUtils.py

@@ -144 +144 @@
     # custom open_path
     open_folder = custom_config.DEFAULT_OPEN_FOLDER
-    if open_folder != None and os.path.isdir(open_folder):
+    if open_folder is not None and os.path.isdir(open_folder):
         DEFAULT_OPEN_FOLDER = os.path.abspath(open_folder)
     else:
@@ -230 +230 @@
     dataDeletedSignal = QtCore.pyqtSignal(list)
 
+    # Send data to Data Operation Utility panel
+    sendDataToPanelSignal = QtCore.pyqtSignal(dict)
+
+    # Send result of Data Operation Utility panel to Data Explorer
+    updateModelFromDataOperationPanelSignal = QtCore.pyqtSignal(QtGui.QStandardItem, dict)
 
 def updateModelItemWithPlot(item, update_data, name=""):
@@ -430 +435 @@
     text += 'X_min = %s:  X_max = %s\n' % (xmin, max(data.x))
     text += 'Y_min = %s:  Y_max = %s\n' % (ymin, max(data.y))
-    if data.dy != None:
+    if data.dy is not None:
         text += 'dY_min = %s:  dY_max = %s\n' % (min(data.dy), max(data.dy))
     text += '\nData Points:\n'
     x_st = "X"
     for index in range(len(data.x)):
-        if data.dy != None and len(data.dy) > index:
+        if data.dy is not None and len(data.dy) > index:
             dy_val = data.dy[index]
         else:
             dy_val = 0.0
-        if data.dx != None and len(data.dx) > index:
+        if data.dx is not None and len(data.dx) > index:
             dx_val = data.dx[index]
         else:
             dx_val = 0.0
-        if data.dxl != None and len(data.dxl) > index:
+        if data.dxl is not None and len(data.dxl) > index:
             if index == 0:
                 x_st = "Xl"
             dx_val = data.dxl[index]
-        elif data.dxw != None and len(data.dxw) > index:
+        elif data.dxw is not None and len(data.dxw) > index:
             if index == 0:
                 x_st = "Xw"
@@ -486 +491 @@
         y_val = data.qy_data[index]
         i_val = data.data[index]
-        if data.err_data != None:
+        if data.err_data is not None:
             di_val = data.err_data[index]
-        if data.dqx_data != None:
+        if data.dqx_data is not None:
             dx_val = data.dqx_data[index]
-        if data.dqy_data != None:
+        if data.dqy_data is not None:
             dy_val = data.dqy_data[index]
 
@@ -523 +528 @@
                 has_errors = False
         if has_errors:
-            if data.dx != None and data.dx != []:
+            if data.dx is not None and data.dx != []:
                 out.write("<X>   <Y>   <dY>   <dX>\n")
             else:
@@ -532 +537 @@
         for i in range(len(data.x)):
             if has_errors:
-                if data.dx != None and data.dx != []:
+                if data.dx is not None and data.dx != []:
                     if  data.dx[i] != None:
                         out.write("%g  %g  %g  %g\n" % (data.x[i],

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

@@ -69 +69 @@
             'progressBarUpdateSignal',
             'activeGraphName',
+            'sendDataToPanelSignal',
+            'updateModelFromDataOperationPanelSignal'
         ]
 
@@ -412 +414 @@
         self.assertEqual(yscale, "log")
 
+
 class FormulaValidatorTest(unittest.TestCase):
     """ Test the formula validator """

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

@@ -137 +137 @@
     model.setHeaderData(4, QtCore.Qt.Horizontal, QtCore.QVariant("Units"))
 
+    model.header_tooltips = ['Select parameter for fitting',
+                             'Enter parameter value',
+                             'Enter minimum value for parameter',
+                             'Enter maximum value for parameter',
+                             'Unit of the parameter']
 def addErrorHeadersToModel(model):
     """
@@ -147 +152 @@
     model.setHeaderData(4, QtCore.Qt.Horizontal, QtCore.QVariant("Max"))
     model.setHeaderData(5, QtCore.Qt.Horizontal, QtCore.QVariant("Units"))
+
+    model.header_tooltips = ['Select parameter for fitting',
+                             'Enter parameter value',
+                             'Error value for fitted parameter',
+                             'Enter minimum value for parameter',
+                             'Enter maximum value for parameter',
+                             'Unit of the parameter']
 
 def addPolyHeadersToModel(model):
@@ -160 +172 @@
     model.setHeaderData(6, QtCore.Qt.Horizontal, QtCore.QVariant("Function"))
     model.setHeaderData(7, QtCore.Qt.Horizontal, QtCore.QVariant("Filename"))
+
+    model.header_tooltips = ['Select parameter for fitting',
+                             'Enter polydispersity ratio (STD/mean). '
+                             'STD: standard deviation from the mean value',
+                             'Enter minimum value for parameter',
+                             'Enter maximum value for parameter',
+                             'Enter number of points for parameter',
+                             'Enter number of sigmas parameter',
+                             'Select distribution function',
+                             'Select filename with user-definable distribution']
 
 def addErrorPolyHeadersToModel(model):
@@ -174 +196 @@
     model.setHeaderData(7, QtCore.Qt.Horizontal, QtCore.QVariant("Function"))
     model.setHeaderData(8, QtCore.Qt.Horizontal, QtCore.QVariant("Filename"))
+
+    model.header_tooltips = ['Select parameter for fitting',
+                             'Enter polydispersity ratio (STD/mean). '
+                             'STD: standard deviation from the mean value',
+                             'Error value for fitted parameter',
+                             'Enter minimum value for parameter',
+                             'Enter maximum value for parameter',
+                             'Enter number of points for parameter',
+                             'Enter number of sigmas parameter',
+                             'Select distribution function',
+                             'Select filename with user-definable distribution']
 
 def addShellsToModel(parameters, model, index):

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

@@ -50 +50 @@
 
 USING_TWISTED = True
+
+class ToolTippedItemModel(QtGui.QStandardItemModel):
+
+    def __init__(self, parent = None):
+        QtGui.QStandardItemModel.__init__(self,parent)
+
+    def headerData(self, section, orientation, role):
+
+        if role == QtCore.Qt.ToolTipRole:
+            if orientation == QtCore.Qt.Horizontal:
+                return QtCore.QString(str(self.header_tooltips[section]))
+
+        return QtGui.QStandardItemModel.headerData(self, section, orientation, role)
 
 class FittingWidget(QtGui.QWidget, Ui_FittingWidgetUI):
@@ -240 +253 @@
         # We can't use a single model here, due to restrictions on flattening
         # the model tree with subclassed QAbstractProxyModel...
-        self._model_model = QtGui.QStandardItemModel()
-        self._poly_model = QtGui.QStandardItemModel()
-        self._magnet_model = QtGui.QStandardItemModel()
+        self._model_model = ToolTippedItemModel()
+        self._poly_model = ToolTippedItemModel()
+        self._magnet_model = ToolTippedItemModel()
 
         # Param model displayed in param list

src/sas/qtgui/Perspectives/Fitting/UnitTesting/FittingWidgetTest.py

@@ -342 +342 @@
         self.assertEqual(self.widget.lstPoly.horizontalHeader().count(), 8)
         self.assertFalse(self.widget.lstPoly.horizontalHeader().stretchLastSection())
+
+        # Test tooltips
+        self.assertEqual(len(self.widget._poly_model.header_tooltips), 8)
+
+        header_tooltips = ['Select parameter for fitting',
+                             'Enter polydispersity ratio (STD/mean). '
+                             'STD: standard deviation from the mean value',
+                             'Enter minimum value for parameter',
+                             'Enter maximum value for parameter',
+                             'Enter number of points for parameter',
+                             'Enter number of sigmas parameter',
+                             'Select distribution function',
+                             'Select filename with user-definable distribution']
+        for column, tooltip in enumerate(header_tooltips):
+             self.assertEqual(self.widget._poly_model.headerData( column,
+                QtCore.Qt.Horizontal, QtCore.Qt.ToolTipRole),
+                         header_tooltips[column])
 
         # Test presence of comboboxes in last column
@@ -478 +495 @@
         self.assertFalse(self.widget.lstMagnetic.horizontalHeader().stretchLastSection())
 
+        #Test tooltips
+        self.assertEqual(len(self.widget._magnet_model.header_tooltips), 5)
+
+        header_tooltips = ['Select parameter for fitting',
+                             'Enter parameter value',
+                             'Enter minimum value for parameter',
+                             'Enter maximum value for parameter',
+                             'Unit of the parameter']
+        for column, tooltip in enumerate(header_tooltips):
+             self.assertEqual(self.widget._magnet_model.headerData(column,
+                QtCore.Qt.Horizontal, QtCore.Qt.ToolTipRole),
+                         header_tooltips[column])
+
         # Test rows
         for row in xrange(self.widget._magnet_model.rowCount()):
@@ -835 +865 @@
         name_modified_param = str(self.widget._model_model.item(5, 0).text())
 
+         # Check the model
+        self.assertEqual(self.widget._model_model.rowCount(), 6)
+        self.assertEqual(self.widget._model_model.columnCount(), 5)
+
+        # Test the header
+        #self.assertEqual(self.widget.lstParams.horizontalHeader().count(), 5)
+        #self.assertFalse(self.widget.lstParams.horizontalHeader().stretchLastSection())
+
+        self.assertEqual(len(self.widget._model_model.header_tooltips), 5)
+        header_tooltips = ['Select parameter for fitting',
+                             'Enter parameter value',
+                             'Enter minimum value for parameter',
+                             'Enter maximum value for parameter',
+                             'Unit of the parameter']
+        for column, tooltip in enumerate(header_tooltips):
+             self.assertEqual(self.widget._model_model.headerData(column,
+                QtCore.Qt.Horizontal, QtCore.Qt.ToolTipRole),
+                         header_tooltips[column])
+
         # check that the value has been modified in kernel_module
         self.assertEqual(new_value,

src/sas/qtgui/Perspectives/Invariant/InvariantDetails.py

@@ -64 +64 @@
         self.label_3.setStyleSheet(new_font)
         self.label_4.setStyleSheet(new_font)
-        self.label_.setStyleSheet(new_font)
+        self.label_7.setStyleSheet(new_font)
 
         self.show()