Changeset 30e0be0 in sasview

Timestamp:

Sep 25, 2018 6:35:13 AM (6 years ago)

Author:

Piotr Rozyczko <piotr.rozyczko@…>

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:

4e85147

Parents:

6923863

Message:

Updates to the scattering calculator SASVIEW-1147

Location:

src/sas

Files:

• qtgui/Calculators/GenericScatteringCalculator.py (modified) (8 diffs)
• qtgui/Calculators/ResolutionCalculatorPanel.py (modified) (2 diffs)
• qtgui/Calculators/UI/GenericScatteringCalculator.ui (modified) (1 diff)
• qtgui/Calculators/UnitTesting/GenericScatteringCalculatorTest.py (modified) (1 diff)
• sascalc/calculator/resolution_calculator.py (modified) (1 diff)

src/sas/qtgui/Calculators/GenericScatteringCalculator.py

@@ -32 +32 @@
 
     trigger_plot_3d = QtCore.pyqtSignal()
+    calculationFinishedSignal = QtCore.pyqtSignal()
 
     def __init__(self, parent=None):
@@ -100 +101 @@
         # plots - 3D in real space
         self.trigger_plot_3d.connect(lambda: self.plot3d(has_arrow=False))
+
+        # plots - 3D in real space
+        self.calculationFinishedSignal.connect(self.plot_1_2d)
 
         # TODO the option Ellipsoid has not been implemented
@@ -545 +549 @@
             d = threads.deferToThread(self.complete, inputs, self._update)
             # Add deferred callback for call return
-            d.addCallback(self.plot_1_2d)
+            #d.addCallback(self.plot_1_2d)
+            d.addCallback(self.calculateComplete)
             d.addErrback(self.calculateFailed)
         except:
@@ -563 +568 @@
         print("Calculate Failed with:\n", reason)
         pass
+
+    def calculateComplete(self, d):
+        """
+        Notify the main thread
+        """
+        self.calculationFinishedSignal.emit()
 
     def complete(self, input, update=None):
@@ -629 +640 @@
         self.graph_num += 1
 
-    def plot_1_2d(self, d):
+    def plot_1_2d(self):
         """ Generate 1D or 2D plot, called in Compute"""
         if self.is_avg or self.is_avg is None:
@@ -637 +648 @@
             data.xaxis('\\rm{Q_{x}}', '\AA^{-1}')
             data.yaxis('\\rm{Intensity}', 'cm^{-1}')
-            plot1D = Plotter(self)
+            plot1D = Plotter(self, quickplot=True)
             plot1D.plot(data)
             plot1D.show()
@@ -655 +666 @@
             data.title = "GenSAS {}  #{} 2D".format(self.file_name,
                                                     int(self.graph_num))
-            plot2D = Plotter2D(self)
+            plot2D = Plotter2D(self, quickplot=True)
             plot2D.plot(data)
             plot2D.show()
@@ -825 +836 @@
         self.figure.canvas.draw()
 
+    def createContextMenu(self):
+        """
+        Define common context menu and associated actions for the MPL widget
+        """
+        return
+
+    def createContextMenuQuick(self):
+        """
+        Define context menu and associated actions for the quickplot MPL widget
+        """
+        return
+
 
 class Plotter3D(QtWidgets.QDialog, Plotter3DWidget):

src/sas/qtgui/Calculators/ResolutionCalculatorPanel.py

@@ -517 +517 @@
             cal_res.addErrback(self.calculateFailed)
 
-            # logging.info("Computation is in progress...")
             self.cmdCompute.setText('Wait...')
             self.cmdCompute.setEnabled(False)
@@ -524 +523 @@
 
     def calculateFailed(self, reason):
-        print("calculateFailed Failed with:\n", reason)
-        pass
+        self.cmdCompute.setText('Compute')
+        self.cmdCompute.setEnabled(True)
+        logging.error(str(reason))
 
     def complete(self, image):

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

@@ -164 +164 @@
            </property>
           </item>
-          <item>
-           <property name="text">
-            <string>Ellipsoid</string>
-           </property>
-          </item>
          </widget>
         </item>

src/sas/qtgui/Calculators/UnitTesting/GenericScatteringCalculatorTest.py

@@ -91 +91 @@
                              ['Fixed orientation', 'Debye full avg.'])
 
-        self.assertEqual(self.widget.cbShape.count(), 2)
+        self.assertEqual(self.widget.cbShape.count(), 1)
         self.assertEqual(self.widget.cbShape.currentIndex(), 0)
         self.assertListEqual([self.widget.cbShape.itemText(i) for i in
                               range(self.widget.cbShape.count())],
-                             ['Rectangular', 'Ellipsoid'])
+                             ['Rectangular'])
+                             #['Rectangular', 'Ellipsoid'])
         self.assertFalse(self.widget.cbShape.isEditable())
         # disable buttons

src/sas/sascalc/calculator/resolution_calculator.py

@@ -1008 +1008 @@
             detector_offset = self.sample2detector_distance[1]
         except:
-            logger.error(sys.exc_value)
+            logger.error(str(sys.exc_info()[1]))
 
         # detector size in [no of pix_x,no of pix_y]