Changeset 6ffa0dd in sasview for src/sas

Timestamp:

Aug 22, 2016 9:17:33 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:

338d6ff

Parents:

a3ed157

Message:

Plot entire extrapolation

Location:

src/sas/sasgui

Files:

• guiframe/events.py (modified) (1 diff)
• guiframe/local_perspectives/plotting/plotting.py (modified) (4 diffs)
• perspectives/corfunc/corfunc.py (modified) (2 diffs)
• perspectives/corfunc/corfunc_panel.py (modified) (1 diff)

src/sas/sasgui/guiframe/events.py

@@ -8 +8 @@
 # plot Qrange
 (PlotQrangeEvent, EVT_PLOT_QRANGE) = wx.lib.newevent.NewEvent()
+# set plot limits
+(PlotLimitEvent, EVT_PLOT_LIM) = wx.lib.newevent.NewEvent()
 # print the messages on statusbar
 (StatusEvent,  EVT_STATUS)   = wx.lib.newevent.NewEvent()
-#create a panel slicer 
+#create a panel slicer
 (SlicerPanelEvent, EVT_SLICER_PANEL)   = wx.lib.newevent.NewEvent()
-#print update paramaters for panel slicer 
+#print update paramaters for panel slicer
 (SlicerParamUpdateEvent, EVT_SLICER_PARS_UPDATE)   = wx.lib.newevent.NewEvent()
-#update the slicer from the panel 
+#update the slicer from the panel
 (SlicerParameterEvent, EVT_SLICER_PARS)   = wx.lib.newevent.NewEvent()
 #slicer event

src/sas/sasgui/guiframe/local_perspectives/plotting/plotting.py

@@ -16 +16 @@
 from sas.sasgui.guiframe.events import EVT_NEW_PLOT
 from sas.sasgui.guiframe.events import EVT_PLOT_QRANGE
+from sas.sasgui.guiframe.events import EVT_PLOT_LIM
 from sas.sasgui.guiframe.events import DeletePlotPanelEvent
 from sas.sasgui.guiframe.plugin_base import PluginBase
@@ -79 +80 @@
         self.parent.Bind(EVT_NEW_PLOT, self._on_plot_event)
         self.parent.Bind(EVT_PLOT_QRANGE, self._on_plot_qrange)
+        self.parent.Bind(EVT_PLOT_LIM, self._on_plot_lim)
         # We have no initial panels for this plug-in
         return []
@@ -95 +97 @@
             return
         panel.on_plot_qrange(event)
+
+    def _on_plot_lim(self, event=None):
+        if event == None:
+            return
+        if event.id in self.plot_panels.keys():
+            panel = self.plot_panels[event.id]
+        elif event.group_id in self.plot_panels.keys():
+            panel = self.plot_panels[event.group_id]
+        else:
+            return
+        if hasattr(event, 'xlim'):
+            panel.subplot.set_xlim(event.xlim)
+        if hasattr(event, 'ylim'):
+            panel.subplot.set_ylim(event.ylim)
+
 
     def _on_show_panel(self, event):
@@ -312 +329 @@
                 new_panel = self.create_2d_panel(data, group_id)
             self.create_panel_helper(new_panel, data, group_id, title)
+            if hasattr(event, 'xlim'):
+                new_panel.subplot.set_xlim(event.xlim)
+            if hasattr(event, 'ylim'):
+                new_panel.subplot.set_ylim(event.ylim)
         return

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

@@ -10 +10 @@
 from sas.sasgui.guiframe.events import StatusEvent
 from sas.sasgui.guiframe.events import NewPlotEvent
+from sas.sasgui.guiframe.events import PlotLimitEvent
 from sas.sasgui.guiframe.gui_style import GUIFRAME_ID
 from sas.sasgui.perspectives.corfunc.corfunc_panel import CorfuncPanel
@@ -186 +187 @@
             wx.CallAfter(self.corfunc_panel.plot_qrange, active=active_ctrl,
                 leftdown=True)
+        if label == IQ_EXTRAPOLATED_DATA_LABEL:
+            xlim = (min(self.corfunc_panel._extrapolated_data.x), self.corfunc_panel.qmax[1]*1.2)
+            wx.CallAfter(wx.PostEvent, self.parent, PlotLimitEvent(id=IQ_DATA_LABEL, group_id=GROUP_ID_IQ_DATA, xlim=xlim))
 
     def clear_data(self):

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

@@ -217 +217 @@
             self._transform_btn.Disable()
             return
-        # TODO: Find way to set xlim and ylim so full range of data can be
-        # plotted but zoomed in
-        maxq = self._data.x.max()
-        mask = self._extrapolated_data.x <= maxq
-        numpts = len(self._extrapolated_data.x[mask]) + 250
-        plot_x = self._extrapolated_data.x[0:numpts]
-        plot_y = self._extrapolated_data.y[0:numpts]
-        to_plot = Data1D(plot_x, plot_y)
-        self._manager.show_data(to_plot, IQ_EXTRAPOLATED_DATA_LABEL)
+        self._manager.show_data(self._extrapolated_data, IQ_EXTRAPOLATED_DATA_LABEL)
         # Update state of the GUI
         self._transform_btn.Enable()