Changeset 0d8b2db in sasview

Timestamp:

Aug 21, 2018 5:42:18 AM (6 years ago)

Author:

Piotr Rozyczko <rozyczko@…>

Branches:

ESS_GUI, ESS_GUI_batch_fitting, ESS_GUI_bumps_abstraction, ESS_GUI_iss1116, ESS_GUI_iss879, ESS_GUI_opencl, ESS_GUI_ordering, ESS_GUI_sync_sascalc

Children:

30339cc, f7d39c9

Parents:

4e887d8 (diff), 28d070a (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 'ESS_GUI' of ​https://github.com/SasView/sasview into ESS_GUI

Files:

• src/sas/qtgui/Perspectives/Fitting/FitThread.py (modified) (2 diffs)
• build_tools/conda_qt5_win.yml (modified) (1 diff)

src/sas/qtgui/Perspectives/Fitting/FitThread.py

@@ -3 +3 @@
 import copy
 import traceback
+import logging
 
 from sas.sascalc.data_util.calcthread import CalcThread
+
+logger = logging.getLogger(__name__)
 
 def map_getattr(classInstance, classFunc, *args):
@@ -93 +96 @@
                 self.handler.stop(msg=msg)
         except Exception as ex:
+            logger.error("Fitting failed: %s", traceback.format_exc())
             # print "ERROR IN FIT THREAD: ", traceback.format_exc()
             if self.handler is not None:

build_tools/conda_qt5_win.yml

@@ -3 +3 @@
   - conda-forge
 dependencies:
- - matplotlib
+ - matplotlib==2.1.0
  - scipy
  - hdf5