Changeset 3aa7074 in sasview

Timestamp:

Apr 16, 2008 10:05:21 AM (17 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:

8e44d51

Parents:

dfca3de

Message:

fix on bug

File:

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

guitools/fitDialog.py

@@ -219 +219 @@
             if self.xtrans == "log10(x)":
                 y_model = self.model.run(math.log10(xmin))
-
+                tempx.append(xmin)
             else:
                 y_model = self.model.run(xminView)
-            tempx.append(xmin)
-            
+                tempx.append(xminView)
+                
             if self.ytrans == "log10(y)":
                 tempy.append(math.pow(10,y_model))
             else:
                 tempy.append(y_model)
-            #Load tempy with the value between xView min and xView max
-            #for j in range(len(x)): 
-            #    if (x[j] > xminView and x[j] < xmaxView):
-            #        if self.xtrans == "log10(x)":
-            #            y_model = self.model.run(math.log10(x[j]))
-            #        else:
-            #            y_model = self.model.run(x[j])
-                        
-                        
-            #        if self.ytrans == "log10(y)":
-            #            tempy.append(math.pow(10,y_model))
-            #        else:
-            #            tempy.append(y_model)
-            #        tempx.append(x[j])
-                    
+                
             # load tempy with the maximum transformation
             if self.xtrans == "log10(x)":
                 y_model = self.model.run(math.log10(xmax))
-               
+                tempx.append(xmax)
             else:
                 y_model = self.model.run(xmaxView)
-            tempx.append(xmax)
+                tempx.append(xmaxView)
                 
             if self.ytrans == "log10(y)":
@@ -255 +241 @@
             else: 
                 tempy.append(y_model)
+                
+            
+            print "this max",xmax
+            print "this view xmax", xmaxView
             # Create new data plottable with result
             self.file_data1.x =[] 
@@ -262 +252 @@
             self.file_data1.dx=None
             self.file_data1.dy=None
-            
+            print "this is the min of data1",min(self.file_data1.x )
+            print "this is the max of data1",max(self.file_data1.x )
             #Load the view with the new values
             self.file_data1.reset_view()