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

Timestamp:

Dec 4, 2018 9:22:17 AM (6 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:

• Fitting/UnitTesting/FittingWidgetTest.py (modified) (1 diff)
• Invariant/InvariantPerspective.py (modified) (2 diffs)

src/sas/qtgui/Perspectives/Fitting/UnitTesting/FittingWidgetTest.py

@@ -533 +533 @@
         # check values - unchanged since the file doesn't exist
         self.assertTrue(self.widget._poly_model.item(0, 1).isEnabled())
-        with self.assertRaises(AttributeError):
-            self.widget.disp_model()
 
         # good file

src/sas/qtgui/Perspectives/Invariant/InvariantPerspective.py

@@ -348 +348 @@
                 extrapolated_data.name = title
                 extrapolated_data.title = title
-                extrapolated_data.style = "Line"
+                extrapolated_data.symbol = "Line"
                 extrapolated_data.has_errors = False
-                extrapolated_data.plot_role = Data1D.ROLE_DEFAULT
 
                 # copy labels and units of axes for plotting
@@ -382 +381 @@
                 high_out_data.name = title
                 high_out_data.title = title
-                high_out_data.style = "Line"
+                high_out_data.symbol = "Line"
                 high_out_data.has_errors = False
-                high_out_data.plot_role = Data1D.ROLE_DEFAULT
 
                 # copy labels and units of axes for plotting