Changeset 2327399 in sasview for src/sas/qtgui/Perspectives


Ignore:
Timestamp:
Dec 4, 2018 7:22:17 AM (5 years ago)
Author:
wojciech
Branches:
ESS_GUI, ESS_GUI_bumps_abstraction, ESS_GUI_iss1116, ESS_GUI_opencl, ESS_GUI_sync_sascalc
Children:
3801429
Parents:
a8e6394 (diff), 0989bad (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

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

Legend:

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

    rbaeac95 r0989bad  
    533533        # check values - unchanged since the file doesn't exist 
    534534        self.assertTrue(self.widget._poly_model.item(0, 1).isEnabled()) 
    535         with self.assertRaises(AttributeError): 
    536             self.widget.disp_model() 
    537535 
    538536        # good file 
  • src/sas/qtgui/Perspectives/Invariant/InvariantPerspective.py

    r6ae7466 r11a336f  
    348348                extrapolated_data.name = title 
    349349                extrapolated_data.title = title 
    350                 extrapolated_data.style = "Line" 
     350                extrapolated_data.symbol = "Line" 
    351351                extrapolated_data.has_errors = False 
    352                 extrapolated_data.plot_role = Data1D.ROLE_DEFAULT 
    353352 
    354353                # copy labels and units of axes for plotting 
     
    382381                high_out_data.name = title 
    383382                high_out_data.title = title 
    384                 high_out_data.style = "Line" 
     383                high_out_data.symbol = "Line" 
    385384                high_out_data.has_errors = False 
    386                 high_out_data.plot_role = Data1D.ROLE_DEFAULT 
    387385 
    388386                # copy labels and units of axes for plotting 
Note: See TracChangeset for help on using the changeset viewer.