Changeset 688d029 in sasview for src/sas/sasgui/perspectives

Timestamp:

Jul 11, 2016 2:36:55 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:

9454a27

Parents:

dc72638

git-author:

Lewis O'Driscoll <lewis.o'driscoll@…> (07/08/16 03:28:25)

git-committer:

Lewis O'Driscoll <lewis.o'driscoll@…> (07/11/16 02:36:55)

Message:

Plot qrange on textbox click

File:

• src/sas/sasgui/perspectives/corfunc/corfunc_panel.py (modified) (2 diffs)

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

@@ -61 +61 @@
         self._qmax1_input.Bind(wx.EVT_TEXT, self._on_enter_input)
         self._qmax2_input.Bind(wx.EVT_TEXT, self._on_enter_input)
+        self._qmin_input.Bind(wx.EVT_MOUSE_EVENTS, self._on_click_qrange)
+        self._qmax1_input.Bind(wx.EVT_MOUSE_EVENTS, self._on_click_qrange)
+        self._qmax2_input.Bind(wx.EVT_MOUSE_EVENTS, self._on_click_qrange)
         self._background_input.Bind(wx.EVT_TEXT, self._on_enter_input)
 
@@ -226 +229 @@
         self.qmax = (new_qmax1, new_qmax2)
         self.background = float(self._background_input.GetValue())
+        self._calculator.background = self.background
         from sas.sasgui.perspectives.corfunc.corfunc import GROUP_ID_IQ_DATA,\
             IQ_DATA_LABEL
-        group_id = GROUP_ID_IQ_DATA
         if event is not None:
-            if self._manager is not None and\
-                event.GetEventObject() == self._background_input:
+            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=True)
+                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,
+                group_id=GROUP_ID_IQ_DATA, leftdown=False))
+
+    def _on_click_qrange(self, event=None):
+        if event is None:
+            return
+        event.Skip()
+        if not self._validate_inputs(): return
+        is_click = event.LeftDown()
+        if is_click:
+            from sas.sasgui.perspectives.corfunc.corfunc import GROUP_ID_IQ_DATA,\
+                IQ_DATA_LABEL
             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, leftdown=False))
+                group_id=GROUP_ID_IQ_DATA, leftdown=is_click))
 
     def _validate_inputs(self):