Changeset 4225aed in sasview

Timestamp:

Aug 2, 2011 4:33:43 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:

67ae937

Parents:

75daa79

Message:

working on batch

Location:

sansview/perspectives/fitting

Files:

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

sansview/perspectives/fitting/basepage.py

@@ -68 +68 @@
         self.mask = None
         self.uid = None
+        #Q range for data set
+        self.qmin_data_set = None
+        self.qmax_data_set = None
         ## Q range
         self.qmin = None

sansview/perspectives/fitting/fitpage.py

@@ -97 +97 @@
         self.data_list = data_list
         self.enable_datasource()
+        if data_list:
+            qmin, qmax, _ = self.compute_data_range(data_list[0])
+            self.qmin_data_set, self.qmax_data_set = qmin, qmax
         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)
+                
+        print "fill_data_combox", self.qmin_data_set, self.qmax_data_set
         self.dataSource.SetSelection(0)
         self.on_select_data(event=None)
@@ -292 +298 @@
         # StaticText for smear
         #self.tcChi    =  wx.StaticText(self, -1, "-", style=wx.ALIGN_LEFT)
-        self.smear_description_none    =  wx.StaticText(self, -1, smear_message_none , style=wx.ALIGN_LEFT)
-        self.smear_description_dqdata    =  wx.StaticText(self, -1, smear_message_dqdata , style=wx.ALIGN_LEFT)
-        self.smear_description_type    =  wx.StaticText(self, -1, "Type:" , style=wx.ALIGN_LEFT)
-        self.smear_description_accuracy_type    =  wx.StaticText(self, -1, "Accuracy:" , style=wx.ALIGN_LEFT)
-        self.smear_description_smear_type    =  BGTextCtrl(self, -1, size=(57,20), style=0)
+        self.smear_description_none =  wx.StaticText(self, -1, 
+                                    smear_message_none , style=wx.ALIGN_LEFT)
+        self.smear_description_dqdata =  wx.StaticText(self, 
+                                -1, smear_message_dqdata , style=wx.ALIGN_LEFT)
+        self.smear_description_type =  wx.StaticText(self,
+                                     -1, "Type:" , style=wx.ALIGN_LEFT)
+        self.smear_description_accuracy_type =  wx.StaticText(self, -1, 
+                                        "Accuracy:" , style=wx.ALIGN_LEFT)
+        self.smear_description_smear_type =  BGTextCtrl(self, -1, 
+                                                        size=(57,20), style=0)
         self.smear_description_smear_type.SetValue(str(self.dq_l))
         self.SetBackgroundColour(self.GetParent().GetBackgroundColour())
-        self.smear_description_2d     =  wx.StaticText(self, -1, smear_message_2d  , style=wx.ALIGN_LEFT)
-        self.smear_message_new_s = wx.StaticText(self, -1, smear_message_new_ssmear  , style=wx.ALIGN_LEFT)
-        self.smear_message_new_p = wx.StaticText(self, -1, smear_message_new_psmear  , style=wx.ALIGN_LEFT)
+        self.smear_description_2d =  wx.StaticText(self, -1, 
+                                    smear_message_2d  , style=wx.ALIGN_LEFT)
+        self.smear_message_new_s = wx.StaticText(self, -1,
+                         smear_message_new_ssmear, style=wx.ALIGN_LEFT)
+        self.smear_message_new_p = wx.StaticText(self, -1,
+                                 smear_message_new_psmear , style=wx.ALIGN_LEFT)
         self.smear_description_2d_x     =  wx.StaticText(self, -1, smear_message_2d_x_title  , style=wx.ALIGN_LEFT)
         self.smear_description_2d_x.SetToolTipString("  dQp(parallel) in q_r direction.")
@@ -464 +478 @@
         self.model_view.SetToolTipString(hint)
       
-        self.shape_rbutton = wx.RadioButton(self, -1, 'Shapes', style=wx.RB_GROUP)
+        self.shape_rbutton = wx.RadioButton(self, -1, 'Shapes',
+                                             style=wx.RB_GROUP)
         self.shape_indep_rbutton = wx.RadioButton(self, -1, "Shape-Independent")
         self.struct_rbutton = wx.RadioButton(self, -1, "Structure Factor ")
@@ -1627 +1642 @@
         return self.enable2D
     
+    def compute_data_set_range(self, data):
+        """
+        find the range that include all data  in the set
+        return the minimum and the maximum values
+        """
+        if data is not None:
+            qmin, qmax, _ = 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)
+        
+        
     def compute_data_range(self, data):
         """
@@ -1647 +1673 @@
                 qmax = math.sqrt(x*x + y*y)
                 npts = len(data.data)
+        print "compute single data range", qmin, qmax
         return qmin, qmax, npts
             

sansview/perspectives/fitting/fitpanel.py

@@ -385 +385 @@
         data_1d_list = []
         data_2d_list = []
+        # separate data into data1d and data2d list
         for data in data_list:
             if data.__class__.__name__ == "Data1D":