Changeset 9d130f3 in sasview


Ignore:
Timestamp:
Sep 25, 2018 3:54:04 AM (4 weeks ago)
Author:
Piotr Rozyczko <piotr.rozyczko@…>
Branches:
ESS_GUI, ESS_GUI_image_viewer, ESS_GUI_project_save
Children:
6f6e8e4
Parents:
91f4884
git-author:
Piotr Rozyczko <piotr.rozyczko@…> (09/25/18 03:51:38)
git-committer:
Piotr Rozyczko <piotr.rozyczko@…> (09/25/18 03:54:04)
Message:

Replace method names for C&S fit calls. SASVIEW-1159

Location:
src/sas/qtgui/Perspectives/Fitting
Files:
2 edited

Legend:

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

    rdee9e5f r9d130f3  
    298298            page_name = "Page%s"%tab_object.tab_id 
    299299            if any([page_name in tab for tab in tabs_for_fitting]): 
    300                 tab_object.setFittingStarted() 
     300                tab_object.disableInteractiveElements() 
    301301 
    302302        pass 
     
    315315            page_name = "Page%s"%tab_object.tab_id 
    316316            if any([page_name in tab for tab in tabs_for_fitting]): 
    317                 tab_object.setFittingStopped() 
     317                tab_object.enableInteractiveElements() 
    318318 
    319319        pass 
  • src/sas/qtgui/Perspectives/Fitting/FittingWidget.py

    r91f4884 r9d130f3  
    15381538 
    15391539        elapsed = result[1] 
    1540         if self.calc_fit._interrupting: 
     1540        if self.calc_fit is not None and self.calc_fit._interrupting: 
    15411541            msg = "Fitting cancelled by user after: %s s." % GuiUtils.formatNumber(elapsed) 
    15421542            logger.warning("\n"+msg+"\n") 
Note: See TracChangeset for help on using the changeset viewer.