Changeset 54492dc in sasview


Ignore:
Timestamp:
Aug 23, 2018 10:09:31 AM (9 months 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:
ff3b293
Parents:
b7f7d3f
Message:

Fixed issue with batch loading
Added log/log to the quick list SASVIEW-990

Location:
src/sas/qtgui
Files:
2 edited

Legend:

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

    r0fe7e5b r54492dc  
    184184        else: 
    185185            # batch datasets 
     186            self._logic = [] 
    186187            for data_item in value: 
    187188                logic = FittingLogic(data=GuiUtils.dataFromItem(data_item)) 
  • src/sas/qtgui/Plotting/ScaleProperties.py

    r4992ff2 r54492dc  
    1212y_values = ["y", "1/y", "ln(y)", "y^(2)", "y*x^(2)", "y*x^(4)", "1/sqrt(y)", 
    1313            "log10(y)", "ln(y*x)", "ln(y*x^(2))", "ln(y*x^(4))", "log10(y*x^(4))"] 
    14 view_values = ["--", "Linear y vs x", "Guinier lny vs x^(2)", 
     14view_values = ["--", "Linear y vs x", "log(y) vs log(x)", "Guinier lny vs x^(2)", 
    1515            "XS Guinier ln(y*x) vs x^(2)", "Porod y*x^(4) vs x^(4)", "Kratky y*x^(2) vs x"] 
    1616view_to_xy = { 
    1717    view_values[0]: [None, None], # custom 
    1818    view_values[1]: [0, 0], # linear 
    19     view_values[2]: [1, 2], # Guinier 
    20     view_values[3]: [1, 8], # XS Guinier 
    21     view_values[4]: [2, 5], # Porod 
    22     view_values[5]: [0, 4], # Kratky 
     19    view_values[2]: [4, 7], # log 
     20    view_values[3]: [1, 2], # Guinier 
     21    view_values[4]: [1, 8], # XS Guinier 
     22    view_values[5]: [2, 5], # Porod 
     23    view_values[6]: [0, 4], # Kratky 
    2324} 
    2425class ScaleProperties(QtWidgets.QDialog, Ui_scalePropertiesUI): 
Note: See TracChangeset for help on using the changeset viewer.