Changeset 18d0bba in sasview for invariantview

Timestamp:

Apr 23, 2010 8:07:49 AM (15 years ago)

Author:

Gervaise Alina <gervyh@…>

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, release_4.0.1, ticket-1009, ticket-1094-headless, ticket-1242-2d-resolution, ticket-1243, ticket-1249, ticket885, unittest-saveload

Children:

0a8759f

Parents:

901142f

Message:

make sure the data is replot correctly with change of background or scale

Location:

invariantview/perspectives/invariant

Files:

• invariant.py (modified) (1 diff)
• invariant_panel.py (modified) (1 diff)

invariantview/perspectives/invariant/invariant.py

@@ -223 +223 @@
         wx.PostEvent(self.parent, NewPlotEvent(plot=new_plot, title=self.__data.name))
         
-    def plot_data(self, data):
+    def plot_data(self, scale, background):
         """
             replot the current data if the user enters a new scale or background
         """
-        new_plot = self.copy_data(item=self.__data, dy=self.__data.dy)
-        new_plot.x = data.x
-        new_plot.y = data.y
-        new_plot.dx = data.dx
-        new_plot.dy = self.__data.dy
+        new_plot = scale * self.__data - background
+        new_plot.name = self.__data.name
+        new_plot.group_id = self.__data.group_id
+        new_plot.id = self.__data.id 
         wx.PostEvent(self.parent, NewPlotEvent(plot=new_plot, title=new_plot.name))
         

invariantview/perspectives/invariant/invariant_panel.py

@@ -407 +407 @@
             self.get_qstar(inv=inv)
             #if scale_changed or bkg_changed:
-            self._manager.plot_data(data=inv.get_data())
+            self._manager.plot_data(scale=scale, background=background)
             
         except: