Changeset f4a1433 in sasview for src/sas/qtgui/Calculators/SlitSizeCalculator.py

Timestamp:

Oct 24, 2017 12:44:26 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:

fca1f50, d6b234b

Parents:

16afe01 (diff), 5582b078 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'master' into ESS_GUI

File:

• src/sas/qtgui/Calculators/SlitSizeCalculator.py (modified) (2 diffs)

src/sas/qtgui/Calculators/SlitSizeCalculator.py

@@ -63 +63 @@
             return
         loader = Loader()
-        data = loader.load(path_str)
+        data = loader.load(path_str)[0]
 
         self.data_file.setText(os.path.basename(path_str))
@@ -104 +104 @@
         Computes slit lenght from given 1D data
         """
-
         if data is None:
             self.clearResults()