Changeset 75daa79 in sasview for sansview/perspectives/fitting

Timestamp:

Aug 1, 2011 3:55:38 PM (13 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:

4225aed

Parents:

0fd2f27

Message:

refactore compute data range

File:

• sansview/perspectives/fitting/fitpage.py (modified) (3 diffs)

sansview/perspectives/fitting/fitpage.py

@@ -1627 +1627 @@
         return self.enable2D
     
+    def compute_data_range(self, data):
+        """
+        compute the minimum and the maximum range of the data
+        return the npts contains in data
+        :param data:
+        """
+        qmin, qmax, npts = None, None, None
+        if data is not None:
+            if not hasattr(data,"data"):
+                qmin = min(data.x)
+                # Maximum value of data  
+                qmax = max(data.x)
+                npts = len(data.x)
+            else:
+                qmin = 0
+                x = max(math.fabs(data.xmin), math.fabs(data.xmax)) 
+                y = max(math.fabs(data.ymin), math.fabs(data.ymax))
+                ## Maximum value of data  
+                qmax = math.sqrt(x*x + y*y)
+                npts = len(data.data)
+        return qmin, qmax, npts
+            
+    
     def set_data(self, data):
         """
@@ -1670 +1693 @@
             self.structurebox.Enable()
             data_name = self.data.name
+            data_min, data_max, npts = self.compute_data_range(self.data)
             #set maximum range for x in linear scale
             if not hasattr(self.data,"data"): #Display only for 1D data fit
-                # Minimum value of data   
-                data_min = min(self.data.x)
-                # Maximum value of data  
-                data_max = max(self.data.x)
-                #number of total data points
-                self.Npts_total.SetValue(str(len(self.data.x)))
-                #default:number of data points selected to fit
-                self.Npts_fit.SetValue(str(len(self.data.x)))
                 self.btEditMask.Disable()  
                 self.EditMask_title.Disable()
             else:
                 
-                ## Minimum value of data 
-                data_min = 0
-                x = max(math.fabs(self.data.xmin), math.fabs(self.data.xmax)) 
-                y = max(math.fabs(self.data.ymin), math.fabs(self.data.ymax))
-                ## Maximum value of data  
-                data_max = math.sqrt(x*x + y*y)
-                #number of total data points
-                self.Npts_total.SetValue(str(len(self.data.data)))
-                #default:number of data points selected to fit
-                self.Npts_fit.SetValue(str(len(self.data.data)))
                 self.btEditMask.Enable()  
                 self.EditMask_title.Enable() 
+        self.Npts_total.SetValue(str(npts))
+        #default:number of data points selected to fit
+        self.Npts_fit.SetValue(str(npts))
         self.Npts_total.SetEditable(False)
         self.Npts_total.SetBackgroundColour(\
@@ -1707 +1716 @@
         #self.minimum_q.SetValue(str(data_min))
         #self.maximum_q.SetValue(str(data_max))
+        if data_min is None:
+            data_min = ""
+        if data_max is None:
+            data_max = ""
         self.qmin.SetValue(str(data_min))
         self.qmax.SetValue(str(data_max))