Changeset f63f5ff in sasview

Timestamp:

Apr 3, 2008 12:43:04 PM (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:

d490a02

Parents:

f0c09d5

Message:

is working better

Location:

guitools

Files:

• PlotPanel.py (modified) (6 diffs)
• fitDialog.py (modified) (5 diffs)
• plottables.py (modified) (2 diffs)

guitools/PlotPanel.py

@@ -82 +82 @@
         if len(list.keys())>0:
             first_item = list.keys()[0]
-            print first_item, list[first_item].__class__.__name__
+            #print first_item, list[first_item].__class__.__name__
             dlg = LinearFit( None, first_item, self.onFitDisplay, -1, 'Fitting')
             dlg.ShowModal() 
@@ -412 +412 @@
         """
         if dx >=x:
-            return 0.9*x
+            return math.fabs(0.9*x)
         if dx==None:
              return 0
-        return dx
+        return math.fabs(dx)
     def errFuncToX2(self,x,dx=None):
         """
@@ -426 +426 @@
             if err >= x:
                 err = 0.9*x
-            return err
+            return math.fabs(err)
         else:
             return 0.0
@@ -445 +445 @@
             err = 0.9*x
            
-            return err
+            return math.fabs(err)
         
     def errFuncToLogX(self,x,dx=None):
@@ -464 +464 @@
             err = 0.9*x
         
-        return err
+        return math.fabs(err)
         
     def errFuncfromLogXY(self,x,dx=None):
@@ -485 +485 @@
         self.graph.render(self)
         self.subplot.figure.canvas.draw_idle()
-      
+        
     
 class NoRepaintCanvas(FigureCanvasWxAgg):

guitools/fitDialog.py

@@ -26 +26 @@
         vbox.Add(panel, 1, wx.EXPAND | wx.ALL)
  
-        self.tcA = wx.TextCtrl(panel, -1,style=wx.SIMPLE_BORDER)
-        self.tcErrA = wx.TextCtrl(panel, -1,style=wx.SIMPLE_BORDER)
-        self.tcB = wx.TextCtrl(panel, -1,style=wx.SIMPLE_BORDER)
-        self.tcErrB = wx.TextCtrl(panel, -1,style=wx.SIMPLE_BORDER)
-        self.tcChi = wx.TextCtrl(panel, -1,style=wx.SIMPLE_BORDER)
+        self.tcA = wx.TextCtrl(panel, -1,size=(120,20),style=wx.SIMPLE_BORDER)
+        self.tcErrA = wx.TextCtrl(panel, -1,size=(120,20),style=wx.SIMPLE_BORDER)
+        self.tcB = wx.TextCtrl(panel, -1,size=(120,20),style=wx.SIMPLE_BORDER)
+        self.tcErrB = wx.TextCtrl(panel, -1,size=(120,20),style=wx.SIMPLE_BORDER)
+        self.tcChi = wx.TextCtrl(panel, -1,size=(120,20),style=wx.SIMPLE_BORDER)
         self.tcXmin = wx.TextCtrl(panel,-1,style=wx.SIMPLE_BORDER)
         self.tcXmax = wx.TextCtrl(panel,-1,style=wx.SIMPLE_BORDER)
@@ -93 +93 @@
         print "we are on fit"
         temp =[]
-        #tempdx =[]
+        tempdx =[]
         tempdy =[]
         xmin = self._checkVal(self.tcXmin.GetValue())
         xmax = self._checkVal(self.tcXmax.GetValue())
-        x= self.plottable.x
-        if x:
+        #x= self.plottable.view.x
+        x=self.plottable.returnXvalueOfView()
+        print "x value :" ,x
+        if x != []:
             if xmin !=None  and xmax != None:
                 for j in range(len(x)):
@@ -113 +115 @@
                 for y_i in temp:
                     tempdy.append(math.sqrt(y_i))
-                    self.tcXmin.SetValue(str(min(self.plottable.x)))
-                    self.tcXmax.SetValue(str(max(self.plottable.x)))
+                    self.tcXmin.SetValue(str(min(x)))
+                    self.tcXmax.SetValue(str(max(x)))
                     xmin = self._checkVal(self.tcXmin.GetValue())
                     xmax = self._checkVal(self.tcXmax.GetValue())
@@ -132 +134 @@
             cstB  = fittings.Parameter(self.model, 'B', default_B)        
             chisqr, out, cov = fittings.sansfit(self.model, 
-                [cstA, cstB], self.plottable.x, 
-                self.plottable.y, self.plottable.dy,xmin,xmax)
+                [cstA, cstB], self.plottable.view.x, 
+                self.plottable.view.y, self.plottable.view.dy,xmin,xmax)
             # Create new data plottable with result
             
             self.file_data1.y = []
+            #for x_i in self.file_data1.x:
             for x_i in self.file_data1.x:
                 self.file_data1.y.append(self.model.run(x_i))
                 
             self.push_data(self.file_data1)
-            
-            self._onsetValues(str(out[0]),str(out[1]),\
-            str(math.sqrt(cov[0][0])),str(math.sqrt(cov[1][1])),str(chisqr))
+            if cov ==None:
+                errA =str(0.0)
+                errB =str(0.0)
+            else:
+                errA= str(math.sqrt(cov[0][0]))
+                errB= str(math.sqrt(cov[1][1]))
+            if out==None:
+                cstA=str(0.0)
+                cstB=str(0.0)
+            else:
+                cstA=str(out[0])
+                cstB=str(out[1])
+            self._onsetValues(cstA, cstB, errA,errB,str(chisqr))
        
     def _onsetValues(self,cstA,cstB,errA,errB,Chi):
@@ -149 +162 @@
          self.tcA.SetValue(cstA)
          self.tcB.SetValue(cstB)
-         self.tcErrA.SetValue(cstB)
-         self.tcErrB.SetValue(cstA)
+         self.tcErrA.SetValue(errA)
+         self.tcErrB.SetValue(errB)
          self.tcChi.SetValue(Chi)
          

guitools/plottables.py

@@ -378 +378 @@
         """
         self.view.transform_y(func, errfunc, self.y, self.dy)
-    
+        
+    def returnXvalueOfView(self):
+        return self.view.returnXview()
+        
+        
     class View:
         """
@@ -443 +447 @@
                  else:
                      self.dy[i] = errfunc(y[i])
+                     
+        def returnXview(self):
+            return self.x
      
 class Data1D(Plottable):