Changeset a6d3553 in sasview

Timestamp:

Sep 29, 2011 12:22:19 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:

63a2371

Parents:

a49a916

Message:

working on fit range

Location:

fittingview/src/sans/perspectives/fitting

Files:

• basepage.py (modified) (1 diff)
• fitpage.py (modified) (5 diffs)

fittingview/src/sans/perspectives/fitting/basepage.py

@@ -77 +77 @@
         self.graph_id = None
         #Q range for data set
-        self.qmin_data_set = None
+        self.qmin_data_set = numpy.inf
         self.qmax_data_set = None
         self.npts_data_set = 0

fittingview/src/sans/perspectives/fitting/fitpage.py

@@ -109 +109 @@
         self.data_list = data_list
         self.enable_datasource()
-        if data_list:
+        if len(data_list) > 0:
             #find the maximum range covering all data
-            qmin, qmax, _ = self.compute_data_range(data_list[0])
-            self.qmin_data_set, self.qmax_data_set = qmin, qmax
-            self.npts_data_set = 0
+            qmin, qmax, npts = self.compute_data_set_range(data_list)
+            self.qmin_data_set = qmin
+            self.qmax_data_set = qmax
+            self.npts_data_set = npts
+
+            self.qmin.SetValue(str(self.qmin_data_set))
+            self.qmax.SetValue(str(self.qmax_data_set))
+            self.qmin.SetBackgroundColour("white")
+            self.qmax.SetBackgroundColour("white")
+            self.qmin_x = self.qmin_data_set
+            self.qmax_x =  self.qmax_data_set
+            self.state.qmin = self.qmin_x
+            self.state.qmax = self.qmax_x
+            
         for data in self.data_list:
             if data is not None:
-                self.compute_data_set_range(data)
                 self.dataSource.Append(str(data.name), clientData=data)
         self.dataSource.SetSelection(0)
@@ -1785 +1795 @@
         return self.enable2D
     
-    def compute_data_set_range(self, data):
+    def compute_data_set_range(self, data_list):
         """
         find the range that include all data  in the set
         return the minimum and the maximum values
         """
-        if data is not None:
-            qmin, qmax, npts = self.compute_data_range(data)
-            self.qmin_data_set = min(self.qmin_data_set, qmin)
-            self.qmax_data_set = max(self.qmax_data_set, qmax)
-            self.npts_data_set += npts
+        if data_list is not None and data_list != []:
+            for data in data_list:
+                qmin, qmax, npts = self.compute_data_range(data)
+                self.qmin_data_set = min(self.qmin_data_set, qmin)
+                self.qmax_data_set = max(self.qmax_data_set, qmax)
+                self.npts_data_set += npts
+        return self.qmin_data_set, self.qmax_data_set, self.npts_data_set
         
     def compute_data_range(self, data):
@@ -1842 +1854 @@
         
         if self.data is None:
-            data_min = ""
-            data_max = ""
             data_name = ""
             self._set_bookmark_flag(False)
@@ -1894 +1904 @@
             self.structurebox.Enable()
             data_name = self.data.name
-            data_min, data_max = self.qmin_data_set, self.qmax_data_set
-            npts =  self.npts_data_set
+            _, _, 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
@@ -1912 +1921 @@
         self.Npts_total.Bind(wx.EVT_MOUSE_EVENTS, self._npts_click)
         self.dataSource.SetValue(data_name)
-        self.qmin_x = data_min
-        self.qmax_x = data_max
-        #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))
-        self.qmin.SetBackgroundColour("white")
-        self.qmax.SetBackgroundColour("white")
         self.state.data = data
-        self.state.qmin = self.qmin_x
-        self.state.qmax = self.qmax_x
         self.enable_fit_button()
         # send graph_id to page_finder