Changeset e4ebcb9 in sasview for src/sas


Ignore:
Timestamp:
Oct 25, 2017 9:29:44 AM (7 years ago)
Author:
Adam Washington <adam.washington@…>
Children:
dc7eedb1
Parents:
aae5f4c (diff), 02f1d12 (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 github.com:SasView/sasview into ESS_Sesans_Plots

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

Legend:

Unmodified
Added
Removed

  • src/sas/qtgui/Perspectives/Fitting/FittingWidget.py

    rf7d14a1 r02f1d12  
    644644            return 
    645645 
    646         property_index = self._magnet_model.headerData(1, model_column).toInt()[0]-1 # Value, min, max, etc. 
     646        # p_i = self._magnet_model.headerData(0,1,2,3,4,5,6,7,8,9,10) 
     647        property_index = self._magnet_model.headerData(0, 1, model_column).toInt()[0]-1 # Value, min, max, etc. 
    647648 
    648649        # Update the parameter value - note: this supports +/-inf as well 

  • src/sas/qtgui/Perspectives/Fitting/ViewDelegate.py

    r7ffa5ee9 r02f1d12  
    219219 
    220220    def editableParameters(self): 
    221         return [self.mag_min, self.mag_max] 
     221        return [self.mag_value, self.mag_min, self.mag_max] 
    222222 
    223223    def addErrorColumn(self): 
Note: See TracChangeset for help on using the changeset viewer.