Changeset 93c813f in sasview for src/sas

Timestamp:

Sep 27, 2018 9:28:29 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:

12acdcc

Parents:

bd39d6c

Message:

float→int cast must be made in GUI. SASVIEW-1137

Location:

src/sas

Files:

• qtgui/Calculators/ResolutionCalculatorPanel.py (modified) (1 diff)
• sascalc/calculator/resolution_calculator.py (modified) (2 diffs)

src/sas/qtgui/Calculators/ResolutionCalculatorPanel.py

@@ -464 +464 @@
 
             detector_size = self.txtDetectorSize.text()
-            detector_size = self._string2list(detector_size)
+            det_size = self._string2list(detector_size)
+            # detector sizes must be ints. recast.
+            detector_size = [int(i) for i in det_size]
             self.resolution.set_detector_size(detector_size)
 

src/sas/sascalc/calculator/resolution_calculator.py

@@ -1008 +1008 @@
             detector_offset = self.sample2detector_distance[1]
         except:
-            logger.error(str(sys.exc_info()[1]))
+            # valid path for GUI allowed values - just pass
+            pass
+            #logger.error(str(sys.exc_info()[1]))
 
         # detector size in [no of pix_x,no of pix_y]
@@ -1095 +1097 @@
             output.qy_data = qy_value
         except:
-            logger.error(sys.exc_value)
+            logger.error(sys.exc_info()[1])
 
         return output