Changeset 5878a9ea in sasview

Timestamp:

Jul 12, 2016 8:34:57 AM (8 years ago)

Author:

lewis

Branches:

master, 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, costrafo411, magnetic_scatt, release-4.1.1, release-4.1.2, release-4.2.2, ticket-1009, ticket-1094-headless, ticket-1242-2d-resolution, ticket-1243, ticket-1249, ticket885, unittest-saveload

Children:

e73e723

Parents:

815f7b8

Message:

Minor tweaks to UI and calculator behaviour

Location:

src/sas

Files:

• sascalc/corfunc/corfunc_calculator.py (modified) (2 diffs)
• sasgui/perspectives/corfunc/corfunc_panel.py (modified) (2 diffs)

src/sas/sascalc/corfunc/corfunc_calculator.py

@@ -67 +67 @@
         self.lowerq = lowerq
         self.upperq = upperq
-        self.background = 0
+        self.background = self.compute_background()
         self._transform_thread = None
 
@@ -99 +99 @@
         if self._data is None: return 0
         elif upperq is None and self.upperq is not None: upperq = self.upperq
-        elif upperq == 0: return 0
+        elif upperq is None and self.upperq is None: return 0
         q = self._data.x
         mask = np.logical_and(q > upperq[0], q < upperq[1])

src/sas/sasgui/perspectives/corfunc/corfunc_panel.py

@@ -194 +194 @@
             return
         # TODO: Find way to set xlim and ylim so full range of data can be
-        # plotted
+        # plotted but zoomed in
         maxq = self._data.x.max()
         mask = self._extrapolated_data.x <= maxq
@@ -202 +202 @@
         to_plot = Data1D(plot_x, plot_y)
         self._manager.show_data(to_plot, IQ_EXTRAPOLATED_DATA_LABEL)
+        # Update state of the GUI
         self._transform_btn.Enable()
+        self._extract_btn.Disable()
+        self.set_extracted_params(reset=True)
 
     def compute_transform(self, event=None):