Changeset 4cb07c0 in sasview

Timestamp:

Feb 7, 2009 8:40:35 AM (16 years ago)

Author:

Jae Cho <jhjcho@…>

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:

97f0c39b

Parents:

ff7acff

Message:

Fixed the bug not showing the correct qmax value in q range box for 2D fitting.

File:

• sansview/perspectives/fitting/fitpage1D.py (modified) (7 diffs)

sansview/perspectives/fitting/fitpage1D.py

@@ -193 +193 @@
             #self.qmin_x = 0
             #self.qmax_x = max(radius1, radius2, radius3, radius4)
-            self.qmin_x= self.data.xmin
-            self.qmax_x= self.data.xmax           
+            self.qmin_x= 0#self.data.xmin
+            self.qmax_x= math.sqrt(math.pow(max(math.fabs(self.data.xmax),math.fabs(self.data.xmin)),2)
+                            +math.pow(max(math.fabs(self.data.ymax),math.fabs(self.data.ymin)),2))#self.data.xmax           
             print "data2D range",self.qmax_x
         
@@ -206 +207 @@
         self.qmin.Bind(wx.EVT_KILL_FOCUS, self._onparamEnter)
         self.qmin.Bind(wx.EVT_TEXT_ENTER, self._onparamEnter)
-        self.qmin.Disable()
+        self.qmin.Enable()
         
         self.qmax    = wx.TextCtrl(self, -1,size=(_BOX_WIDTH,20))
@@ -213 +214 @@
         self.qmax.Bind(wx.EVT_KILL_FOCUS, self._onparamEnter)
         self.qmax.Bind(wx.EVT_TEXT_ENTER, self._onparamEnter)
-        self.qmax.Disable()
+        self.qmax.Enable()
 
         self.npts    = wx.TextCtrl(self, -1,size=(_BOX_WIDTH,20))
@@ -395 +396 @@
             self.manager.schedule_for_fit( value=1,fitproblem =None) 
             if hasattr(self.data, "data"):
-                self.manager._on_single_fit( qmin=self.qmin_x,qmax=self.qmax_x,
+                self.manager._on_single_fit(qmin=self.qmin_x,qmax=self.qmax_x,
                                             ymin=self.data.ymin, ymax=self.data.ymax,
                                             xmin=self.data.xmin,xmax=self.data.xmax)
@@ -554 +555 @@
             else:
                 self.text2_4.Hide()
-        #Disable or enable fit button
-        
+                
+        #(Disable or )Enable fit button 
+        """       
         if not (len(self.param_toFit ) >0):
-            self.xmin.Disable()
-            self.xmax.Disable()
+            self.xmin.Enable()
+            self.xmax.Enable()
         else:
             self.xmin.Enable()
-            self.xmax.Enable()
-       
+            self.xmax.Enable()  
+        """
+                 
         self.compute_chisqr()
         self.vbox.Layout()
@@ -629 +632 @@
         else:
             self.cb1.SetValue(False)
-            
+        """    
         #qmax, qmin Input enabled all the time   
         self.qmin.Enable()
-        self.qmax.Enable()
-       
-   
-       
+        self.qmax.Enable()      
+        """
   
     def onsetValues(self,chisqr, out,cov):
@@ -662 +663 @@
         else:
             i=0
-            #print "fitpage: list param  model",list
+            #print  "fitpage: list param  model",list
             #for item in self.param_toFit:
             #    print "fitpage: list display",item[0].GetLabelText()