Changeset 6d55d81 in sasview

Timestamp:

Apr 21, 2010 4:23:01 PM (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:

1c271f2

Parents:

d8731ca

Message:

make sure the data is updated when the scale change

Files:

• Invariant/invariant.py (modified) (2 diffs)
• invariantview/perspectives/invariant/invariant.py (modified) (4 diffs)
• invariantview/perspectives/invariant/invariant_panel.py (modified) (4 diffs)

Invariant/invariant.py

@@ -385 +385 @@
             #Process only data that inherited from DataLoader.Data_info.Data1D
             raise ValueError,"Data must be of type DataLoader.Data1D"
+        #from copy import deepcopy
         new_data = (self._scale * data) - self._background   
         
@@ -517 +518 @@
         return result_data
     
+    def get_data(self):
+        """
+            @return self._data
+        """
+        return self._data
+    
     def get_extrapolation_power(self, range='high'):
         """

invariantview/perspectives/invariant/invariant.py

@@ -9 +9 @@
 """
 import wx
-from copy import deepcopy
+
 from sans.invariant import invariant
 
@@ -163 +163 @@
         id = None
         if hasattr(item,"id"):
-            id = deepcopy(item.id)
+            id = item.id
 
         data = Data1D(x=item.x, y=item.y, dx=None, dy=None)
@@ -171 +171 @@
         data.name = item.name
         ## allow to highlight data when plotted
-        data.interactive = deepcopy(item.interactive)
+        data.interactive = item.interactive
         ## when 2 data have the same id override the 1 st plotted
         data.id = id
@@ -222 +222 @@
         new_plot.id = self.__data.id + name
         wx.PostEvent(self.parent, NewPlotEvent(plot=new_plot, title=self.__data.name))
-
-
-        
+        
+    def plot_data(self, data):
+        """
+            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 = data.dy
+        wx.PostEvent(self.parent, NewPlotEvent(plot=new_plot, title=new_plot.name))
+        

invariantview/perspectives/invariant/invariant_panel.py

@@ -13 +13 @@
 from invariant_details import InvariantDetailsPanel, InvariantContainer
 from invariant_widgets import OutputTextCtrl, InvTextCtrl
+
 # The minimum q-value to be used when extrapolating
 Q_MINIMUM  = 1e-5
@@ -66 +67 @@
         #Data uses for computation
         self._data = data
+        self._scale = SCALE 
+        self._background = BACKGROUND
         #container of invariant value
         self.inv_container = None
@@ -151 +154 @@
             raise ValueError, "Need a background"
         if check_float(self.scale_tcl):
+            if float(scale)<= 0.0:
+                self.scale_tcl.SetBackgroundColour("pink")
+                self.scale_tcl.Refresh()
+                raise ValueError, "Receive invalid value for scale: %s"%(scale)
             return float(scale)
         else:
-            raise ValueError, "Receive invalid value for background : %s"%(scale)
+            raise ValueError, "Receive invalid value for scale : %s"%(scale)
         
     def get_contrast(self):
@@ -392 +399 @@
        
         #Compute invariant
+        bkg_changed = False
+        scale_changed = False
         try:
             self.get_qstar(inv=inv)
+            #if scale_changed or bkg_changed:
+            self._manager.plot_data(data=inv.get_data())
+            
         except:
             msg= "Error occurred computing invariant: %s"%sys.exc_value