Changeset 904168e1 in sasview

Timestamp:

Sep 17, 2009 2:51:37 PM (15 years ago)

Author:

Jae Cho <jhjcho@…>

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:

6ced1cc

Parents:

c202d03

Message:

Added qrange reset button (and cahnged the default qmin = 0.001)

File:

• sansview/perspectives/fitting/basepage.py (modified) (4 diffs)

sansview/perspectives/fitting/basepage.py

@@ -5 +5 @@
 import time
 import copy 
+import math
 from sans.guiframe.utils import format_number,check_float
 from sans.guicomm.events import StatusEvent   
@@ -72 +73 @@
         ## check that the fit range is correct to plot the model again
         self.fitrange= True
+        ## Q range defaults
+        self.qmin_def = 0.001
+        self.qmax_def = 0.13
+        self.num_points_def = 50
         ## Q range
-        self.qmin_x= 0.001
-        self.qmax_x= 0.13
-        self.num_points= 50
+        self.qmin_x= self.qmin_def
+        self.qmax_x= self.qmax_def
+        self.num_points= self.num_points_def
         
         ## Create memento to save the current state
@@ -1665 +1670 @@
         #self.qmax.Bind(wx.EVT_KILL_FOCUS, self._onparamEnter)
         #self.qmax.Bind(wx.EVT_TEXT_ENTER, self._onparamEnter)
+        
+        id = wx.NewId()
+        self.reset_qrange =wx.Button(self,id,'Reset')
+        self.reset_qrange.Bind(wx.EVT_BUTTON, self.on_reset_clicked,id=id)
+        self.reset_qrange.SetToolTipString("Reset Q range to the default values")
      
         sizer_horizontal=wx.BoxSizer(wx.HORIZONTAL)
-        sizer= wx.GridSizer(3, 3,5, 5)
-        
-        sizer.Add((5,5))
-        sizer.Add(wx.StaticText(self, -1, 'Min'))
-        sizer.Add(wx.StaticText(self, -1, 'Max'))
-        sizer.Add(wx.StaticText(self, -1, 'Q range'))
+        sizer= wx.GridSizer(3, 3,2, 5)
+        
+        sizer.Add(wx.StaticText(self, -1, '    Q range'))     
+        sizer.Add(wx.StaticText(self, -1, ' Min'))
+        sizer.Add(wx.StaticText(self, -1, ' Max'))
+        sizer.Add(self.reset_qrange)   
+        
+        
              
         sizer.Add(self.qmin)
@@ -1719 +1731 @@
         self.sizer6.Layout()
         self.SetScrollbars(20,20,25,65)
-        
+
+    def on_reset_clicked(self,event):
+        """
+        #On 'Reset' button  for Q range clicked
+        """
+        ##For 3 different cases: Data2D, Data1D, and theory
+        if self.data.__class__.__name__ == "Data2D":
+            data_min= 0
+            x= max(math.fabs(self.data.xmin), math.fabs(self.data.xmax)) 
+            y= max(math.fabs(self.data.ymin), math.fabs(self.data.ymax))
+            self.qmin_x = data_min
+            self.qmax_x = math.sqrt(x*x + y*y)
+        elif self.data.__class__.__name__ == "Data1D":
+            self.qmin_x = min(self.data.x)
+            self.qmax_x = max(self.data.x)
+        else:
+            self.qmin_x = self.qmin_def
+            self.qmax_x = self.qmax_def
+            self.num_points = self.num_points_def
+            self.state.npts = self.num_points
+        
+        self.state.qmin = self.qmin_x
+        self.state.qmax = self.qmax_x
+        
+        #reset the q range values
+        self._reset_plotting_range(self.state)
+        #Re draw plot
+        self._draw_model()
+
     def on_model_help_clicked(self,event):
         """