Changeset 02a8779 in sasview for src/sas/sasgui/perspectives

Timestamp:

Jul 11, 2016 4:17:35 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:

a2db1ab

Parents:

37e7223

Message:

Plot qrange on data load and qrange no longer disappears when background clicked

Location:

src/sas/sasgui/perspectives/corfunc

Files:

• corfunc.py (modified) (2 diffs)
• corfunc_panel.py (modified) (3 diffs)

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

@@ -116 +116 @@
                         info='error'))
 
-    def show_data(self, data, label, reset=False):
+    def show_data(self, data, label, reset=False, active_ctrl=None):
         """
         Show data read from a file
@@ -149 +149 @@
         if label == IQ_EXTRAPOLATED_DATA_LABEL or label == TRANSFORM_LABEL:
             self.parent.update_theory(data_id=label, theory=new_plot)
+        if label == IQ_DATA_LABEL or label == IQ_EXTRAPOLATED_DATA_LABEL:
+            wx.CallAfter(self.corfunc_panel.plot_qrange, active=active_ctrl,
+                leftdown=True)
 
     def clear_data(self):

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

@@ -278 +278 @@
                 self._output_boxes[key].SetValue(value)
 
+    def plot_qrange(self, active=None, leftdown=False):
+        if active is None:
+            active = self._qmin_input
+        wx.PostEvent(self._manager.parent, PlotQrangeEvent(
+            ctrl=[self._qmin_input, self._qmax1_input, self._qmax2_input],
+            active=active, id=IQ_DATA_LABEL, is_corfunc=True,
+            group_id=GROUP_ID_IQ_DATA, leftdown=leftdown))
+
 
     def _compute_background(self, event=None):
@@ -298 +306 @@
             active_ctrl = event.GetEventObject()
             if active_ctrl == self._background_input:
-                from sas.sasgui.perspectives.corfunc.corfunc\
-                    import IQ_DATA_LABEL
-                self._manager.show_data(self._data, IQ_DATA_LABEL, reset=False)
-            wx.PostEvent(self._manager.parent, PlotQrangeEvent(
-                ctrl=[self._qmin_input, self._qmax1_input, self._qmax2_input],
-                active=active_ctrl, id=IQ_DATA_LABEL, is_corfunc=True,
-                group_id=GROUP_ID_IQ_DATA, leftdown=False))
+                self._manager.show_data(self._data, IQ_DATA_LABEL,
+                    reset=False, active_ctrl=active_ctrl)
 
     def _on_click_qrange(self, event=None):
@@ -311 +314 @@
         event.Skip()
         if not self._validate_inputs(): return
-        is_click = event.LeftDown()
-        if is_click:
-            wx.PostEvent(self._manager.parent, PlotQrangeEvent(
-                ctrl=[self._qmin_input, self._qmax1_input, self._qmax2_input],
-                active=event.GetEventObject(), id=IQ_DATA_LABEL,
-                group_id=GROUP_ID_IQ_DATA, leftdown=is_click))
+        self.plot_qrange(active=event.GetEventObject(),
+            leftdown=event.LeftDown())
 
     def _validate_inputs(self):