Changeset 0d8b2db in sasview


Ignore:
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:
2 edited

Legend:

Unmodified
Added
Removed
  • src/sas/qtgui/Perspectives/Fitting/FitThread.py

    r235d766 r28d070a  
    33import copy 
    44import traceback 
     5import logging 
    56 
    67from sas.sascalc.data_util.calcthread import CalcThread 
     8 
     9logger = logging.getLogger(__name__) 
    710 
    811def map_getattr(classInstance, classFunc, *args): 
     
    9396                self.handler.stop(msg=msg) 
    9497        except Exception as ex: 
     98            logger.error("Fitting failed: %s", traceback.format_exc()) 
    9599            # print "ERROR IN FIT THREAD: ", traceback.format_exc() 
    96100            if self.handler is not None: 
  • build_tools/conda_qt5_win.yml

    rc972e3a r4e887d8  
    33  - conda-forge 
    44dependencies: 
    5  - matplotlib 
     5 - matplotlib==2.1.0 
    66 - scipy 
    77 - hdf5 
Note: See TracChangeset for help on using the changeset viewer.