Changeset 6b50296 in sasview for src/sas/qtgui/Perspectives/Fitting


Ignore:
Timestamp:
Sep 4, 2018 6:18:49 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:
e3df84e
Parents:
f53bc04
Message:

Added freeze action for inner main model datasets. SASVIEW-1002

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

Legend:

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

    rff3b293 r6b50296  
    430430 
    431431    theory_name = str(current_data.name.split()[0]) 
    432     residuals.name = "Residuals for " + str(theory_name) + "[" + \ 
    433                     str(reference_data.filename) + "]" 
     432    res_name = reference_data.filename if reference_data.filename else reference_data.name 
     433    residuals.name = "Residuals for " + str(theory_name) + "[" + res_name + "]" 
    434434    residuals.title = residuals.name 
    435435    residuals.ytransform = 'y' 
  • src/sas/qtgui/Perspectives/Fitting/FittingWidget.py

    rf53bc04 r6b50296  
    392392        # Tag along functionality 
    393393        self.label.setText("Data loaded from: ") 
    394         self.lblFilename.setText(self.logic.data.filename) 
     394        if self.logic.data.filename: 
     395            self.lblFilename.setText(self.logic.data.filename) 
     396        else: 
     397            self.lblFilename.setText(self.logic.data.name) 
    395398        self.updateQRange() 
    396399        # Switch off Data2D control 
Note: See TracChangeset for help on using the changeset viewer.