Changeset f0bb711 in sasview

Timestamp:

Oct 19, 2017 6:25:24 AM (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:

0c468bf

Parents:

d5c5d3d

Message:

Implemented comments from review for Data Operation Panel (ESS-GUI-SasView?-245)

Location:

src/sas/qtgui

Files:

• Calculators/DataOperationUtilityPanel.py (modified) (20 diffs)
• Calculators/UI/DataOperationUtilityUI.ui (modified) (3 diffs)
• MainWindow/DataExplorer.py (modified) (2 diffs)
• MainWindow/DataManager.py (modified) (1 diff)
• MainWindow/GuiManager.py (modified) (1 diff)
• Plotting/Plotter.py (modified) (2 diffs)
• Utilities/GuiUtils.py (modified) (4 diffs)
• Utilities/UnitTesting/GuiUtilsTest.py (modified) (1 diff)

src/sas/qtgui/Calculators/DataOperationUtilityPanel.py

@@ +1 @@
+import time
+import logging
+import re
+import copy
+
 from PyQt4 import QtGui
 from PyQt4 import QtCore
@@ -6 +11 @@
 from sas.qtgui.Plotting.PlotterData import Data2D
 from sas.qtgui.Plotting.Plotter2D import Plotter2DWidget
-
 import sas.qtgui.Utilities.GuiUtils as GuiUtils
+
 from UI.DataOperationUtilityUI import Ui_DataOperationUtility
-
-import time
-import logging
-import re
 
 BG_WHITE = "background-color: rgb(255, 255, 255);"
 BG_RED = "background-color: rgb(244, 170, 164);"
+
 
 class DataOperationUtilityPanel(QtGui.QDialog, Ui_DataOperationUtility):
@@ -33 +35 @@
 
         # To update content of comboboxes with files loaded in DataExplorer
-        self.communicator.sendDataToPanel.connect(self.updateCombobox)
+        self.communicator.sendDataToPanelSignal.connect(self.updateCombobox)
 
         # change index of comboboxes
@@ -45 +47 @@
 
         # push buttons
-        self.cmdClose.clicked.connect(self.onClose)  # accept)
+        self.cmdClose.clicked.connect(self.onClose)
         self.cmdHelp.clicked.connect(self.onHelp)
         self.cmdCompute.clicked.connect(self.onCompute)
@@ -55 +57 @@
         self.txtNumber.setValidator(QtGui.QDoubleValidator())
 
-        # Add "?" to initial graphs (when they are still empty)
         self.layoutOutput = QtGui.QHBoxLayout()
         self.layoutData1 = QtGui.QHBoxLayout()
         self.layoutData2 = QtGui.QHBoxLayout()
 
+        # Create default layout for initial graphs (when they are still empty)
         self.newPlot(self.graphOutput, self.layoutOutput)
         self.newPlot(self.graphData1, self.layoutData1)
@@ -83 +85 @@
             list_datafiles = []
 
-            for id in filenames.keys():
-                if filenames[id].get_data().title != '':
+            for key_id in filenames.keys():
+                if filenames[key_id].get_data().title:
                     # filenames with titles
-                    new_title = filenames[id].get_data().title
+                    new_title = filenames[key_id].get_data().title
                     list_datafiles.append(new_title)
                     self.list_data_items.append(new_title)
@@ -92 +94 @@
                 else:
                     # filenames without titles by removing time.time()
-                    new_title = re.sub('\d{10}\.\d{2}', '', str(id))
+                    new_title = re.sub('\d{10}\.\d{2}', '', str(key_id))
                     self.list_data_items.append(new_title)
                     list_datafiles.append(new_title)
@@ -161 +163 @@
 
     def onSelectOperator(self):
-        """ Change GUI when operator changed"""
+        """ Change GUI when operator changed """
         self.lblOperatorApplied.setText(self.cbOperator.currentText())
         self.newPlot(self.graphOutput, self.layoutOutput)
@@ -183 +185 @@
         self.data1 = None
         self.data2 = None
+        self.filenames = None
+        self.list_data_items = []
 
         self.data1OK = False
@@ -204 +208 @@
             self.data1OK = False
             self.cmdCompute.setEnabled(False)
-            # logging.info('Choose a file for Data1')
+            self.onCheckChosenData()
             return
 
@@ -211 +215 @@
             self.cmdCompute.setEnabled(self.data2OK)
             self.data1OK = True
+            self.onCheckChosenData()
             # get Data1
-            id1 = self._findId(choice_data1)
-            self.data1 = self._extractData(id1)
+            key_id1 = self._findId(choice_data1)
+            self.data1 = self._extractData(key_id1)
             # plot Data1
             self.updatePlot(self.graphData1, self.layoutData1, self.data1)
@@ -219 +224 @@
             self.newPlot(self.graphOutput, self.layoutOutput)
 
+
     def onSelectData2(self):
         """ Plot for selection of Data2 """
@@ -228 +234 @@
             self.txtNumber.setEnabled(False)
             self.data2OK = False
-            # logging.info('Choose a file or a number for Data2')
+            self.onCheckChosenData()
             return
 
@@ -242 +248 @@
             # plot default for output graph
             self.newPlot(self.graphOutput, self.layoutOutput)
+            self.onCheckChosenData()
 
         else:
@@ -247 +254 @@
             self.data2OK = True
             self.txtNumber.setEnabled(False)
-            id2 = self._findId(choice_data2)
-            self.data2 = self._extractData(id2)
+            key_id2 = self._findId(choice_data2)
+            self.data2 = self._extractData(key_id2)
             # plot Data2
             self.updatePlot(self.graphData2, self.layoutData2, self.data2)
             # plot default for output graph
             self.newPlot(self.graphOutput, self.layoutOutput)
+            self.onCheckChosenData()
 
     def onInputCoefficient(self):
@@ -323 +331 @@
         if name_to_check is None or name_to_check == '':
             self.txtOutputData.setStyleSheet(QtCore.QString(BG_RED))
-            logging.info('no output name')
+            logging.info('No output name')
             return False
 
         elif name_to_check in self.list_data_items:
             self.txtOutputData.setStyleSheet(QtCore.QString(BG_RED))
-            logging.info('The Output Data Name already exists')
+            logging.info('The Output data name already exists')
             return False
 
@@ -342 +350 @@
         isinstance(name, basestring)
 
-        for id in self.filenames.keys():
+        for key_id in self.filenames.keys():
             # data with title
-            if self.filenames[id].get_data().title:
-                input = self.filenames[id].get_data().title
+            if self.filenames[key_id].get_data().title:
+                input = self.filenames[key_id].get_data().title
             # data without title
             else:
-                input = str(id)
+                input = str(key_id)
             if name in input:
-                return id
-
-    def _extractData(self, id):
+                return key_id
+
+    def _extractData(self, key_id):
         """ Extract data from file with id contained in list of filenames """
-        data_complete = self.filenames[id].get_data()
+        data_complete = self.filenames[key_id].get_data()
         dimension = data_complete.__class__.__name__
 
-        if dimension == 'Data1D':
-            data_set = Data1D(x=data_complete.x,
-                              y=data_complete.y,
-                              dx=data_complete.dx,
-                              dy=data_complete.dy)
-
-        elif dimension == 'Data2D':
-            data_set = Data2D(image=data_complete.data,
-                              err_image=data_complete.err_data,
-                              mask=data_complete.mask,
-                              qx_data=data_complete.qx_data,
-                              qy_data=data_complete.qy_data,
-                              dqx_data=data_complete.dqx_data,
-                              dqy_data=data_complete.dqy_data,
-                              q_data=data_complete.q_data,
-                              xmin=data_complete.xmin,
-                              xmax=data_complete.xmax,
-                              ymin=data_complete.ymin,
-                              ymax=data_complete.ymax,
-                              zmin=data_complete.zmin,
-                              zmax=data_complete.zmax)
+        if dimension in ('Data1D', 'Data2D'):
+            return copy.deepcopy(data_complete)
 
         else:
             logging.info('Error with data format')
             return
-
-        return data_set
 
     # ########
@@ -399 +386 @@
 
         layout.setContentsMargins(0, 0, 0, 0)
-
-        # define default content: '?'
-        scene = QtGui.QGraphicsScene()
-        scene.addText("?")
-
-        subgraph = QtGui.QGraphicsView()
-        subgraph.setScene(scene)
-
-        layout.addWidget(subgraph)
+        layout.addWidget(self.prepareSubgraphWithData("?"))
 
         graph.setLayout(layout)
@@ -456 +435 @@
             plotter.ax.tick_params(axis='y', labelsize=8)
 
-            plotter.plot(hide_error=True, marker='.', show_legend=False)
+            plotter.plot(hide_error=True, marker='.')
+            # plotter.legend = None
 
             plotter.show()
@@ -463 +443 @@
             # display value of coefficient (to be applied to Data1)
             # in graphData2
-            scene = QtGui.QGraphicsScene()
-            scene.addText(str(data))
-
-            subgraph = QtGui.QGraphicsView()
-            subgraph.setScene(scene)
-
-            layout.addWidget(subgraph)
+            layout.addWidget(self.prepareSubgraphWithData(data))
 
             graph.setLayout(layout)
+
+    def prepareSubgraphWithData(self, data):
+        """ Create graphics view containing scene with string """
+        scene = QtGui.QGraphicsScene()
+        scene.addText(str(data))
+
+        subgraph = QtGui.QGraphicsView()
+        subgraph.setScene(scene)
+
+        return subgraph

src/sas/qtgui/Calculators/UI/DataOperationUtilityUI.ui

@@ -12 +12 @@
   </property>
   <property name="sizePolicy">
-   <sizepolicy hsizetype="MinimumExpanding" vsizetype="MinimumExpanding">
+   <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
     <horstretch>0</horstretch>
     <verstretch>0</verstretch>
@@ -19 +19 @@
   <property name="minimumSize">
    <size>
-    <width>950</width>
+    <width>951</width>
     <height>425</height>
    </size>
@@ -25 +25 @@
   <property name="maximumSize">
    <size>
-    <width>1000</width>
-    <height>500</height>
+    <width>951</width>
+    <height>425</height>
    </size>
   </property>

src/sas/qtgui/MainWindow/DataExplorer.py

@@ -281 +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(self.model.item(ind).text())
                 deleted_indices.append(item)
+
                 self.model.removeRow(ind)
                 # Decrement index since we just deleted it
@@ -293 +297 @@
         # Let others know we deleted data
         self.communicator.dataDeletedSignal.emit(deleted_indices)
+
+        # update stored_data
+        # self.manager.delete_by_name(deleted_names)
+
 
     def deleteTheory(self, event):

src/sas/qtgui/MainWindow/DataManager.py

@@ -275 +275 @@
                 del self.stored_data[id]
 
-
     def get_by_name(self, name_list=None):
         """

src/sas/qtgui/MainWindow/GuiManager.py

@@ -534 +534 @@
         """
         """
-        self.communicate.sendDataToPanel.emit(self._data_manager.get_all_data())
+        self.communicate.sendDataToPanelSignal.emit(self._data_manager.get_all_data())
 
         self.DataOperation.show()

src/sas/qtgui/Plotting/Plotter.py

@@ -58 +58 @@
         self.title(title=value.name)
 
-    def plot(self, data=None, color=None, marker=None, hide_error=False, show_legend=True):
+    def plot(self, data=None, color=None, marker=None, hide_error=False):
         """
         Add a new plot of self._data to the chart.
@@ -145 +145 @@
 
         # Now add the legend with some customizations.
-        if show_legend:
-            self.legend = ax.legend(loc='upper right', shadow=True)
-            if self.legend:
-                self.legend.set_picker(True)
+
+        self.legend = ax.legend(loc='upper right', shadow=True)
+        if self.legend:
+            self.legend.set_picker(True)
 
         # Current labels for axes

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:
@@ -231 +231 @@
 
     # Send data to Data Operation Utility panel
-    sendDataToPanel = QtCore.pyqtSignal(dict)
+    sendDataToPanelSignal = QtCore.pyqtSignal(dict)
 
     # Send result of Data Operation Utility panel to Data Explorer
@@ -528 +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:
@@ -537 +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',
-            'sendDataToPanel',
+            'sendDataToPanelSignal',
             'updateModelFromDataOperationPanelSignal'
         ]