Changeset cfc68540 in sasview for sansview/perspectives/fitting/fitting.py

Timestamp:

Jan 18, 2009 10:34:20 AM (15 years ago)

Author:

Mathieu Doucet <doucetm@…>

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:

3f1af74

Parents:

c48a26a

Message:

Fixed the Q range selection problem when a model is first plotted.

File:

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

sansview/perspectives/fitting/fitting.py

@@ -17 +17 @@
 import park
 DEFAULT_BEAM = 0.005
+DEFAULT_QMIN = 0.0
+DEFAULT_QMAX = 0.15
+DEFAULT_NPTS = 40
 import time
 import thread
@@ -646 +649 @@
         self.draw_model(model=model,name=name)
         
-    def draw_model(self,model,name ,description=None,enable1D=True, enable2D=False,qmin=None, qmax=None,qstep=None):
+    def draw_model(self,model,name ,description=None,enable1D=True, enable2D=False,
+                   qmin=DEFAULT_QMIN, qmax=DEFAULT_QMAX, qstep=DEFAULT_NPTS):
         """
              draw model with default data value
         """
         
-        self.fit_panel.add_model_page(model=model,description=model.description,page_title=name) 
+        self.fit_panel.add_model_page(model=model,description=model.description,page_title=name,
+                                      qmin=qmin, qmax=qmax, npts=qstep) 
         self._draw_model2D(model=model,
                            description=model.description,
@@ -659 +664 @@
                            qstep=qstep)
         self._draw_model1D(model,name,model.description, enable1D,qmin,qmax, qstep)
-       
-    def _draw_model1D(self,model,name,description=None, enable1D=True,qmin=None,qmax=None, qstep=None):
+              
+    def _draw_model1D(self,model,name,description=None, enable1D=True,
+                      qmin=DEFAULT_QMIN, qmax=DEFAULT_QMAX, qstep=DEFAULT_NPTS):
         
         if enable1D:
-            if qmin==None:
-                qmin= 0.001
-            if qmax==None:
-                qmax= 1.0
-            if qstep ==None:
-                qstep =100
-           
-            #print "x in data1D",qmin,qmax
-            #x = numpy.arange(qmin, qmax, qstep)  
             x=  numpy.linspace(start= qmin,
                                stop= qmax,
@@ -749 +746 @@
         
          
-    def _draw_model2D(self,model,description=None, enable2D=False,qmin=None,qmax=None, qstep=None):
-        if qmin==None:
-            qmin= 0.0
-        if qmax==None:
-            qmax= 0.05
-        if qstep ==None:
-            qstep =100
+    def _draw_model2D(self,model,description=None, enable2D=False,
+                      qmin=DEFAULT_QMIN, qmax=DEFAULT_QMAX, qstep=DEFAULT_NPTS):
        
         x=  numpy.linspace(start= -1*qmax,