Changeset 99ea1b0 in sasview for src/sas/qtgui/Calculators/ResolutionCalculatorPanel.py

Timestamp:

Oct 27, 2017 8:49:35 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:

0849aec

Parents:

895e7359

Message:

Update for unit tests and minor functionality quirks

File:

• src/sas/qtgui/Calculators/ResolutionCalculatorPanel.py (modified) (21 diffs, 1 prop)

src/sas/qtgui/Calculators/ResolutionCalculatorPanel.py

@@ -111 +111 @@
         # call compute to calculate with default values
         self.createTemplate2DPlot()
-        self.onCompute()
+        #self.onCompute()
 
     # #################################
@@ -123 +123 @@
         text_edit = self.txtWavelength  # self.sender()
         if text_edit.isModified():
-            text_edit.setStyleSheet(QtCore.QString(BG_WHITE))
+            text_edit.setStyleSheet(BG_WHITE)
             input_string = str(text_edit.text())
             if self.cbWaveColor.currentText() != 'TOF':
                 input_wavelength = re.match('\d+\.?\d*', input_string)
                 if input_wavelength is None:
-                    text_edit.setStyleSheet(QtCore.QString(BG_RED))
+                    text_edit.setStyleSheet(BG_RED)
                     self.cmdCompute.setEnabled(False)
                     logging.info('Wavelength has to be a number.')
                 else:
-                    text_edit.setStyleSheet(QtCore.QString(BG_WHITE))
+                    text_edit.setStyleSheet(BG_WHITE)
                     self.cmdCompute.setEnabled(True)
             else:
@@ -139 +139 @@
 
                 if interval_wavelength is None:
-                    text_edit.setStyleSheet(QtCore.QString(BG_RED))
+                    text_edit.setStyleSheet(BG_RED)
                     self.cmdCompute.setEnabled(False)
                     logging.info("Wavelength's input has to be an interval: "
@@ -149 +149 @@
 
                     if float(wavelength_min) >= float(wavelength_max):
-                        text_edit.setStyleSheet(QtCore.QString(BG_RED))
+                        text_edit.setStyleSheet(BG_RED)
                         self.cmdCompute.setEnabled(False)
                         logging.info("Wavelength: min must be smaller than max.")
 
                     else:
-                        text_edit.setStyleSheet(QtCore.QString(BG_WHITE))
+                        text_edit.setStyleSheet(BG_WHITE)
                         self.cmdCompute.setEnabled(True)
 
@@ -163 +163 @@
 
         if text_edit.isModified():
-            text_edit.setStyleSheet(QtCore.QString(BG_WHITE))
+            text_edit.setStyleSheet(BG_WHITE)
             if self.cbWaveColor.currentText() != 'TOF':
                 pattern = '^\d+\.?\d*(|;\s*\d+)$'
@@ -170 +170 @@
 
                 if wavelength_spread_input is None:
-                    text_edit.setStyleSheet(QtCore.QString(BG_RED))
+                    text_edit.setStyleSheet(BG_RED)
                     self.cmdCompute.setEnabled(False)
                     logging.info('Wavelength spread has to be specified: '
@@ -178 +178 @@
                     split_input = wavelength_spread_input.group().split(';')
                     self.num_wave = split_input[1] if len(split_input) > 1 else 10
-                    text_edit.setStyleSheet(QtCore.QString(BG_WHITE))
+                    text_edit.setStyleSheet(BG_WHITE)
                     self.cmdCompute.setEnabled(True)
             else:
@@ -186 +186 @@
 
                 if wavelength_spread_input is None:
-                    text_edit.setStyleSheet(QtCore.QString(BG_RED))
+                    text_edit.setStyleSheet(BG_RED)
                     self.cmdCompute.setEnabled(False)
                     logging.info("Wavelength spread has to be specified: "
@@ -197 +197 @@
                     self.num_wave = split_input[1] if len(
                         split_input) > 1 else 10
-                    text_edit.setStyleSheet(QtCore.QString(BG_WHITE))
+                    text_edit.setStyleSheet(BG_WHITE)
                     self.cmdCompute.setEnabled(True)
 
@@ -205 +205 @@
 
         if text_edit.isModified():
-            text_edit.setStyleSheet(QtCore.QString(BG_WHITE))
+            text_edit.setStyleSheet(BG_WHITE)
             pattern = '^\d+\.?\d*,\s*\d+\.?\d*$'
             input_string = str(text_edit.text())
@@ -211 +211 @@
 
             if pixels_input is None:
-                text_edit.setStyleSheet(QtCore.QString(BG_RED))
+                text_edit.setStyleSheet(BG_RED)
                 self.cmdCompute.setEnabled(False)
                 logging.info('The input for the detector should contain 2 '
@@ -217 +217 @@
 
             else:
-                text_edit.setStyleSheet(QtCore.QString(BG_WHITE))
+                text_edit.setStyleSheet(BG_WHITE)
                 self.cmdCompute.setEnabled(True)
 
@@ -229 +229 @@
             q_input = re.match(pattern, input_string)
             if q_input is None:
-                text_edit.setStyleSheet(QtCore.QString(BG_RED))
+                text_edit.setStyleSheet(BG_RED)
                 self.cmdCompute.setEnabled(False)
                 logging.info('Qx and Qy should contain one or more comma-separated numbers.')
             else:
-                text_edit.setStyleSheet(QtCore.QString(BG_WHITE))
+                text_edit.setStyleSheet(BG_WHITE)
                 self.cmdCompute.setEnabled(True)
                 qx = str(self.txtQx.text()).split(',')
@@ -247 +247 @@
 
                 elif len(qx) != len(qy):
-                    text_edit.setStyleSheet(QtCore.QString(BG_RED))
+                    text_edit.setStyleSheet(BG_RED)
                     self.cmdCompute.setEnabled(False)
                     logging.info(
@@ -253 +253 @@
 
                 else:
-                    text_edit.setStyleSheet(QtCore.QString(BG_WHITE))
+                    text_edit.setStyleSheet(BG_WHITE)
                     self.cmdCompute.setEnabled(True)
 
@@ -261 +261 @@
 
         if text_edit.isModified():
-            text_edit.setStyleSheet(QtCore.QString(BG_WHITE))
+            text_edit.setStyleSheet(BG_WHITE)
             input_string = str(text_edit.text())
             pattern = '^\d+\.?\d*(|,\s*\d+)$'
@@ -267 +267 @@
 
             if aperture_input is None:
-                text_edit.setStyleSheet(QtCore.QString(BG_RED))
+                text_edit.setStyleSheet(BG_RED)
                 self.cmdCompute.setEnabled(False)
                 logging.info('A circular aperture is defined by a single '
@@ -274 +274 @@
 
             else:
-                text_edit.setStyleSheet(QtCore.QString(BG_WHITE))
+                text_edit.setStyleSheet(BG_WHITE)
                 self.cmdCompute.setEnabled(True)
 
@@ -524 +524 @@
 
             cal_res.addCallback(self.complete)
+            cal_res.addErrback(self.calculateFailed)
 
             # logging.info("Computation is in progress...")
@@ -531 +532 @@
             raise
 
+    def calculateFailed(self, reason):
+        print("calculateFailed Failed with:\n", reason)
+        pass
+
     def complete(self, image):
         """
@@ -562 +567 @@
         : return: image (numpy array)
         """
+        # This fails in py3 with
+        # [Failure instance: Traceback: <class 'TypeError'>: 'map' object is not subscriptable
+        # INVESTIGATE
         image = map(func, qx, qy,
                     qx_min, qx_max,