Changeset 318b353e in sasview

Timestamp:

Apr 16, 2018 1:32:25 PM (7 years ago)

Author:

krzywon

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:

98485fe

Parents:

b9e89d5

Message:

Automatically plot P(r) fits when calculated and small tweaks.

Location:

src/sas/qtgui

Files:

• Perspectives/Inversion/InversionLogic.py (modified) (1 diff)
• Perspectives/Inversion/InversionPerspective.py (modified) (3 diffs)
• Utilities/GridPanel.py (modified) (1 diff)

src/sas/qtgui/Perspectives/Inversion/InversionLogic.py

@@ -209 +209 @@
         new_plot.title = "P(r) fit"
         new_plot.id = PR_FIT_LABEL
-        # Make sure that the plot is linear
-        new_plot.xtransform = "x"
-        new_plot.ytransform = "y"
+        new_plot.scale = "linear"
         new_plot.group_id = GROUP_ID_PR_FIT
 

src/sas/qtgui/Perspectives/Inversion/InversionPerspective.py

@@ -282 +282 @@
         Enable buttons when data is present, else disable them
         """
-        self.calculateAllButton.setEnabled(self.logic.data_is_loaded)
+        self.calculateAllButton.setEnabled(len(self._data_list) > 1)
         self.calculateThisButton.setEnabled(self.logic.data_is_loaded)
         self.removeButton.setEnabled(self.logic.data_is_loaded)
@@ -337 +337 @@
             InversionWindow.__init__(self.parent(), list(self._data_list.keys()))
             exit(0)
-        if self.pr_plot is not None:
-            title = self.pr_plot.name
-            GuiUtils.updateModelItemWithPlot(self._data, self.pr_plot, title)
-        if self.data_plot is not None:
-            title = self.data_plot.name
-            GuiUtils.updateModelItemWithPlot(self._data, self.data_plot, title)
         if self.dmaxWindow is not None:
             self.dmaxWindow.nfunc = self.getNFunc()
@@ -689 +683 @@
         self._calculator = pr
 
-        # Create new P(r) and fit plots
-        if self.pr_plot is None:
-            self.pr_plot = self.logic.newPRPlot(out, self._calculator, cov)
-        if self.data_plot is None:
-            self.data_plot = self.logic.new1DPlot(out, self._calculator)
+        # Update P(r) and fit plots
+        self.pr_plot = self.logic.newPRPlot(out, self._calculator, cov)
+        self.pr_plot.filename = self.logic.data.filename
+        title = self.pr_plot.name
+        GuiUtils.updateModelItemWithPlot(self._data, self.pr_plot, title)
+        self.communicate.plotRequestedSignal.emit([self.pr_plot])
+        self.data_plot = self.logic.new1DPlot(out, self._calculator)
+        self.data_plot.filename = self.logic.data.filename
+        title = self.data_plot.name
+        GuiUtils.updateModelItemWithPlot(self._data, self.data_plot, title)
+        self.communicate.plotRequestedSignal.emit([self.data_plot])
+
+        # Udpate internals and GUI
         self.updateDataList(self._data)
         self.updateGuiValues()

src/sas/qtgui/Utilities/GridPanel.py

@@ -343 +343 @@
         Open a local url in the default browser
         """
-        # TODO: Add anchor to batch fitting help when written
         location = GuiUtils.HELP_DIRECTORY_LOCATION
-        url = "/user/sasgui/perspectives/pr/pr_help.html"
+        url = "/user/sasgui/perspectives/pr/pr_help.html#batch-fit-mode"
         try:
             webbrowser.open('file://' + os.path.realpath(location + url))