Changeset ddff053 in sasview for guitools/PlotPanel.py

Timestamp:

May 1, 2008 6:43:06 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:

90640f2

Parents:

bbec827

Message:

making change on fitdialog ..still some bugs

File:

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

guitools/PlotPanel.py

@@ -108 +108 @@
         #self.fit_result = Data1D(x=[], y=[],dx=None, dy=None)
         self.fit_result.name = "Fit"
-        self.fit_result.ID = "isFit"
-
+        self.xmin=0.0
+        self.xmax=0.0
+        self.xminView=0.0
+        self.xmaxView=0.0
     def onWheel(self, event):
         """
@@ -115 +117 @@
         """
         ax = event.inaxes
-        
         step = event.step
 
@@ -175 +176 @@
             first_item = list.keys()[0]
             dlg = LinearFit( None, first_item, self.onFitDisplay,self.returnTrans, -1, 'Fitting')
+            if (self.xmin !=0.0 )and ( self.xmax !=0.0)\
+                and(self.xminView !=0.0 )and ( self.xmaxView !=0.0):
+                dlg.setFitRange(self.xminView,self.xmaxView,self.xmin,self.xmax)
             dlg.ShowModal() 
 
@@ -524 +528 @@
         self.subplot.figure.canvas.draw_idle()
         
-    def onFitDisplay(self, tempx,tempy,xmin,xmax):
+    def onFitDisplay(self, tempx,tempy,xminView,xmaxView,xmin,xmax):
         """
             Add a new plottable into the graph .In this case this plottable will be used 
@@ -535 +539 @@
         list = self.graph.returnPlottable()
         for item in list:
-            item.onFitRange(xmin,xmax)
+            item.onFitRange(xminView,xmaxView)
+        self.xminView=xminView
+        self.xmaxView=xmaxView
+        self.xmin= xmin
+        self.xmax= xmax
         # Create new data plottable with result
         self.fit_result.x =[]