Changeset 9220d255 in sasview for src/sas/qtgui/Perspectives/Fitting/FittingWidget.py

Timestamp:

Oct 24, 2017 3:10:48 AM (7 years ago)

Author:

wojciech

Branches:

ESS_GUI, ESS_GUI_Docs, ESS_GUI_batch_fitting, ESS_GUI_bumps_abstraction, ESS_GUI_iss1116, ESS_GUI_iss879, ESS_GUI_iss959, ESS_GUI_opencl, ESS_GUI_ordering, ESS_GUI_sync_sascalc

Children:

cca56a5

Parents:

4fdb727 (diff), f4a1433 (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_magnetism_bug

File:

• src/sas/qtgui/Perspectives/Fitting/FittingWidget.py (modified) (1 diff)

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

@@ -333 +333 @@
         self.chk2DView.setVisible(False)
         self.chkMagnetism.setEnabled(self.is2D)
+        self.chkMagnetism.setVisible(self.is2D)
+        self.tabFitting.setTabEnabled(TAB_MAGNETISM, self.is2D)
         # Combo box or label for file name"
         if self.is_batch_fitting: