Changeset 46693050 in sasview for guitools/PlotPanel.py

Timestamp:

Apr 23, 2008 12:36:40 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:

863607a

Parents:

35891ce

Message:

working on fit linear

File:

• guitools/PlotPanel.py (modified) (8 diffs)

guitools/PlotPanel.py

@@ -64 +64 @@
         # keep track if the previous transformation of x and y in Property dialog
         self.prevXtrans =" "
+        
         self.prevYtrans =" "
         
@@ -343 +344 @@
                 
             if (self.xscales=="log10(x)" ):
-                item.transform_x( transform.toX, transform.errToLogX )
+                item.transform_x( transform.toX, transform.errToX )
                 self.set_xscale("log")
                 name, units = item.get_xaxis()
+                item.check_data_Plottable() 
                 self.graph.xaxis("Log10 %s" % name,  "%s^{-1}" % units)
                 
@@ -364 +366 @@
                 self.set_yscale("log")  
                 name, units = item.get_yaxis()
+                #item.check_data_Plottable() 
                 self.graph.yaxis("Log10 %s" % name,  "%s^{-1}" % units)
                 
@@ -392 +395 @@
                 
             if ( self.yscales =="ln(y*x^(2))"):
-                item.transform_y( transform.toYX2 ,transform.errToLogYX2 )
+                item.transform_y( transform.toLogYX2 ,transform.errToLogYX2 )
                 self.set_yscale("linear")
                 yname, yunits = item.get_yaxis()
@@ -415 +418 @@
                 self.set_yscale("linear")
                 name, units = item.get_yaxis()
-                self.graph.yaxis("Log %s" % name,  "%s^{-1}" % units)
+                self.graph.yaxis("$Log %s$" % name,  "%s^{-1}" % units)
         #item.name = self.yscales+" vs " +self.xscales      
         self.prevXtrans = self.xscales 
@@ -422 +425 @@
         self.graph.render(self)
         self.subplot.figure.canvas.draw_idle()
-    def onFitDisplay(self, plottable):
+        
+    def onFitDisplay(self, plottable,xmin,xmax):
         """
             Add a new plottable into the graph .In this case this plottable will be used 
@@ -428 +432 @@
             @param plottable: the plottable to plot
         """
+        list =[]
+        tempx=[]
+        tempy=[]
+        tempdx=[]
+        tempdy=[]
+        #Stored plotted plottable in a new plottable 
+        list = self.graph.returnPlottable()
+        if len(list.keys())>0:
+            for item in list:
+                if self.graph.isPlotted(item)== True:
+                    x,y,dx,dy = item.returnValuesOfView()
+                    if((min(x) < xmin )and( max(x) > xmax ))\
+                        or ((min(x) <= xmin )and( max(x) > xmax ))\
+                        or((min(x) < xmin )and( max(x) >= xmax )):
+                        item.reducedXrange(xmin,xmax)
+                    else:
+                         item.originalXrange()
+            
+        
+        #Add the data to fit 
         plottable.reset_view()
         self.graph.add(plottable)
@@ -434 +458 @@
         self.subplot.figure.canvas.draw_idle()
         self.graph.delete(plottable)
+