Changeset 90640f2 in sasview

Timestamp:

May 2, 2008 10:27:37 AM (16 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:

2e014bf

Parents:

ddff053

Message:

ore bugs fixed

File:

• guitools/fitDialog.py (modified) (7 diffs)

guitools/fitDialog.py

@@ -13 +13 @@
     #def __init__(self, parent, id, title):
     def __init__(self, parent, plottable, push_data,transform, id, title):
-        wx.Dialog.__init__(self, parent, id, title, size=(450, 500))
+        wx.Dialog.__init__(self, parent, id, title, size=(450, 400))
         """
             for the fit window
@@ -104 +104 @@
         ix += 2
         sizer.Add(self.FXmax, (iy, ix),(1,1), wx.EXPAND|wx.ADJUST_MINSIZE, 0)
-        
-        #iy += 1
-        #ix = 1
-        #sizer.Add(wx.StaticText(panel, -1,"x is: "),(iy, ix),(1,1),\
-        #           wx.LEFT|wx.EXPAND|wx.ADJUST_MINSIZE, 15)
+      
         iy += 1
         ix = 0
@@ -147 +143 @@
         self.tcErrB.SetLabel(str(0.0))
         self.tcChi.SetLabel(str(0.0))
+        
         if self.plottable.x !=[]:
             self.mini =min(self.plottable.x)
             self.maxi =max(self.plottable.x)
+            
             self.FXmin.SetLabel(str(self.mini))
             self.FXmax.SetLabel(str(self.maxi))
-            self.FXminX.SetLabel(str(self.mini))
-            self.FXmaxX.SetLabel(str(self.maxi))
             self.FXmin.Disable()
             self.FXmax.Disable()
+            
             self.PXmin.SetValue(str(self.mini))
             self.PXmax.SetValue(str(self.maxi))
             self.PXmin.Disable()
             self.PXmax.Disable()
-        
-        # new data for the fit 
-        #self.file_data1 = Theory1D(x=[], y=[], dy=None)
-        #self.file_data1.name = "Fit"
-        #self.file_data1.ID = "isFit"
-        # Receive transformations of x and y
-        self.xtrans,self.ytrans= self.transform()
+            
+            self.FXminX.SetLabel(str(self.mini))
+            self.FXmaxX.SetLabel(str(self.maxi))
+            
+      
     def _onFit(self ,event):
         """
@@ -173 +168 @@
             Push a plottable to 
         """
-        
         tempx=[]
         tempy=[]
@@ -180 +174 @@
         #store the values of View in x,y, dx,dy
         x,y,dx,dy=self.plottable.returnValuesOfView()
-        # Receive transformations of x and y
-        self.xtrans,self.ytrans= self.transform()
         
         # Check if View contains a x array .we online fit when x exits
@@ -188 +180 @@
             
                 
-            if(self.checkFitValues(self.FXmin) == True):
+            if(self.checkFitValues(self.FXminX) == True):
                 #Check if the field of Fit Dialog contain values and use the x max and min of the user
                 xmin,xmax = self._checkVal(self.FXminX.GetValue(),self.FXmaxX.GetValue())
@@ -357 +349 @@
        
     def setFitRange(self,xmin,xmax,Reelxmin,Reelxmax):
-       
-        self.FXmin.SetValue(str(math.log10(xmin)))
-        self.FXmax.SetValue(str(math.log10(xmax)))
-        
-        self.FXmin.SetValue(str(xmin))
-        self.FXmax.SetValue(str(xmax))
+        if (self.xtrans=="log10(x)"):
+            self.FXmin.SetValue(str(math.log10(xmin)))
+            self.FXmax.SetValue(str(math.log10(xmax)))
+        else:
+            self.FXmin.SetValue(str(xmin))
+            self.FXmax.SetValue(str(xmax))
         self.FXminX.SetValue(str(Reelxmin))
         self.FXmaxX.SetValue(str(Reelxmax))