Sending data to fitting automatically plots the data (#2299)

src/sas/qtgui/MainWindow/DataExplorer.py

@@ -778,8 +778,15 @@ def isItemReady(index):
         try:
             if self.chkSwap.isChecked():
                 self._perspective().swapData(selected_items[0])
+                if self._perspective().name == 'Fitting':
+                    if config.FITTING_PLOT_ON_SEND_DATA:
+                        self.newPlot() #todo sort out where the plot should go.
             else:
                 self._perspective().setData(data_item=selected_items, is_batch=self.chkBatch.isChecked())
+                if self._perspective().name == 'Fitting':
+                    if config.FITTING_PLOT_ON_SEND_DATA:
+                        self.newPlot()
+
         except Exception as ex:
             msg = "%s perspective returned the following message: \n%s\n" % (self._perspective().name, str(ex))
             logging.error(ex, exc_info=True)

src/sas/qtgui/Utilities/Preferences/FittingPreferencesWidget.py

@@ -0,0 +1,11 @@
+from sas.system import config
+
+from .PreferencesWidget import PreferencesWidget, config_value_setter_generator
+
+
+class FittingPreferencesWidget(PreferencesWidget):
+    def __init__(self):
+        super(FittingPreferencesWidget, self).__init__("Fitting Settings")
+        self.addCheckBox(title="Auto-plot data when sent to fitting perspective",
+                         callback=config_value_setter_generator('FITTING_PLOT_ON_SEND_DATA', dtype=bool),
+                         checked=config.FITTING_PLOT_ON_SEND_DATA)

src/sas/qtgui/Utilities/Preferences/PlottingPreferencesWidget.py

@@ -5,7 +5,7 @@
 
 class PlottingPreferencesWidget(PreferencesWidget):
     def __init__(self):
-        super(PlottingPreferencesWidget, self).__init__("Plotting Options")
+        super(PlottingPreferencesWidget, self).__init__("Plotting Settings")
         self.addCheckBox(title="Use full-width plot legends (most compatible)?",
                          callback=config_value_setter_generator('FITTING_PLOT_FULL_WIDTH_LEGENDS', dtype=bool),
                          checked=config.FITTING_PLOT_FULL_WIDTH_LEGENDS)

src/sas/qtgui/Utilities/Preferences/PreferencesPanel.py

@@ -7,17 +7,19 @@
 from sas.qtgui.Utilities.Preferences.UI.PreferencesUI import Ui_preferencesUI
 from sas.qtgui.Utilities.Preferences.PreferencesWidget import PreferencesWidget
 from sas.qtgui.Utilities.Preferences.DisplayPreferencesWidget import DisplayPreferencesWidget
-
+from sas.qtgui.Utilities.Preferences.PlottingPreferencesWidget import PlottingPreferencesWidget
+from sas.qtgui.Utilities.Preferences.FittingPreferencesWidget import FittingPreferencesWidget
 # The PreferencesPanel object will instantiate all widgets during its instantiation.
 #  e.g:
 #  `from foo.bar import BarWidget  # BarWidget is a child of PreferencesWidget`
 #  `BASE_PANELS = {"Bar Widget Options": BarWidget}`
 # PreferenceWidget Imports go here and then are added to the BASE_PANELS, but not instantiated.
-from .PlottingPreferencesWidget import PlottingPreferencesWidget
+
 # Pre-made option widgets
 
 BASE_PANELS = {"Plotting Settings":PlottingPreferencesWidget,
                "Display Settings":DisplayPreferencesWidget,
+               "Fitting Settings":FittingPreferencesWidget,
             }  # Type: Dict[str, Union[Type[PreferencesWidget], Callable[[],QWidget]]
 
 logger = logging.getLogger(__name__)

src/sas/system/config/config.py

@@ -184,6 +184,9 @@ def __init__(self):
         self.QT_SCALE_FACTOR = 1.0
         self.QT_AUTO_SCREEN_SCALE_FACTOR = False
 
+        # Auto-plot when sending data to Fitting
+        self.FITTING_PLOT_ON_SEND_DATA = True
+
         # If True, use an ugly but more robust legend plotting method in Fitting that results in full-
         # width legends.
         self.FITTING_PLOT_FULL_WIDTH_LEGENDS = False