Changeset 2e10b70 in sasview

Timestamp:

Dec 22, 2008 11:17:54 AM (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:

1c5b068

Parents:

988130c6

Message:

smearing interface started

Location:

sansview/perspectives/fitting

Files:

• fitting.py (modified) (2 diffs)
• modelpage.py (modified) (3 diffs)

sansview/perspectives/fitting/fitting.py

@@ -582 +582 @@
         #print "mon menu",model.name
         description=model.description
-        #self.fit_panel.add_model_page(model,description,name)    
+        #self.fit_panel.add_model_page(model,description,name)  
+        
         self.draw_model(model,self.enable_model2D)
         
@@ -603 +604 @@
                 qstep =0.001
            
-            
+            print "x in data1D",qmin,qmax
             x = numpy.arange(qmin, qmax, qstep)        
             xlen= len(x)

sansview/perspectives/fitting/modelpage.py

@@ -80 +80 @@
         self.sizer4.Add(wx.StaticText(self, -1, 'x range'),(iy, ix),(1,1),\
                             wx.LEFT|wx.EXPAND|wx.ADJUST_MINSIZE, 15)
-        try:
-            if hasattr(model,'x'):
-                qmin= numpy.min(model.x)
-            
-        except:
-            qmin= numpy.min(model.xmin)
+       
+        qmin= 0.001
+        qmax= 1.0
         ix += 1
         self.xmin    = wx.TextCtrl(self, -1,size=(_BOX_WIDTH,20))
-        #self.xmin.SetValue(format_number(numpy.min(model.x)))
+        self.xmin.SetValue(format_number(qmin))
         self.xmin.SetToolTipString("Minimun value of x in linear scale.")
         self.xmin.Bind(wx.EVT_KILL_FOCUS, self._onparamEnter)
@@ -97 +94 @@
         ix += 2
         self.xmax    = wx.TextCtrl(self, -1,size=(_BOX_WIDTH,20))
-        #self.xmax.SetValue(format_number(numpy.max(data.x)))
+        self.xmax.SetValue(format_number(qmax))
         self.xmax.SetToolTipString("Maximum value of x in linear scale.")
         self.xmax.Bind(wx.EVT_KILL_FOCUS, self._onparamEnter)
@@ -380 +377 @@
                      wx.PostEvent(self.parent.GrandParent, StatusEvent(status=\
                             "Model Drawing  Error:wrong value entered : %s"% sys.exc_value))
-            self.manager.draw_model(self.model,enable2D=self.model_view.GetValue())
-            #self.manager.draw_model(self,model,description=None, enable1D=True,qmin=None,qmax=None, qstep=None)
+            self.manager.draw_model(self.model,qmin=float(self.xmin.GetValue()),
+                                    qmax=float(self.xmax.GetValue()),
+                                    enable2D=self.model_view.GetValue())
+            #self.manager.draw_model(self,model,description=None,
+            # enable1D=True,qmin=None,qmax=None, qstep=None)
+            
+            
+            
+            
+