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

Timestamp:

Oct 17, 2017 3:25:17 PM (7 years ago)

Author:

celinedurniak <celine.durniak@…>

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:

f0bb711

Parents:

d6e5b31

Message:

Implemented new GUI for data operation panel

Location:

src/sas/qtgui/Utilities

Files:

• GuiUtils.py (modified) (3 diffs)
• UnitTesting/GuiUtilsTest.py (modified) (2 diffs)

src/sas/qtgui/Utilities/GuiUtils.py

@@ -230 +230 @@
     dataDeletedSignal = QtCore.pyqtSignal(list)
 
+    # Send data to Data Operation Utility panel
+    sendDataToPanel = 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]
 

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

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