Changeset 26bf293 in sasview

Timestamp:

Feb 2, 2009 7:28: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:

ca88b2e

Parents:

2cf2b87

Message:

redesign the model1D and madel page

Location:

sansview/perspectives/fitting

Files:

• calcthread.py (deleted)
• fit_thread.py (modified) (1 diff)
• fitpage1D.py (modified) (19 diffs)
• fitpage2D.py (modified) (1 diff)
• fitpanel.py (modified) (7 diffs)
• fitting.py (modified) (13 diffs)
• model_thread.py (deleted)
• modelpage.py (modified) (16 diffs)
• old_fitpage1D.py (moved) (moved from sansview/perspectives/fitting/new_fitpage1D.py) (15 diffs)
• old_fitpanel.py (moved) (moved from sansview/perspectives/fitting/new_fitpanel.py) (7 diffs)
• old_fitting.py (moved) (moved from sansview/perspectives/fitting/new_fitting.py) (11 diffs)
• old_modelpage.py (moved) (moved from sansview/perspectives/fitting/new_modelpage.py) (17 diffs)

sansview/perspectives/fitting/fit_thread.py

@@ -170 +170 @@
             raise
         except:
-            wx.PostEvent(self.parent, StatusEvent(status="Fitting error: %s" % sys.exc_value))
+            raise
+            #wx.PostEvent(self.parent, StatusEvent(status="Fitting error: %s" % sys.exc_value))
             return 
     

sansview/perspectives/fitting/fitpage1D.py

@@ -5 +5 @@
 import copy
 import sans.models.dispersion_models 
-from sans.guicomm.events import StatusEvent   
+from sans.guicomm.events import StatusEvent 
+from sans.guiframe.utils import format_number
+from modelpage import ModelPage  
+from modelpage import format_number
 (ModelEventbox, EVT_MODEL_BOX) = wx.lib.newevent.NewEvent()
 _BOX_WIDTH = 80
 
-def format_number(value, high=False):
-    """
-        Return a float in a standardized, human-readable formatted string 
-    """
-    try: 
-        value = float(value)
-    except:
-        print "returning 0"
-        return "0"
-    
-    if high:
-        return "%-6.4g" % value
-    else:
-        return "%-5.3g" % value
 
-from modelpage import format_number
-from modelpage import ModelPage
+
 class FitPage1D(ModelPage):
     """
@@ -45 +33 @@
             Initialization of the Panel
         """
-        #self.scroll = wx.ScrolledWindow(self)
-        
+        self.data = data
+        self.enable2D=False
         self.manager = None
         self.parent  = parent
@@ -52 +40 @@
         #panel interface
         self.vbox  = wx.BoxSizer(wx.VERTICAL)
+        self.sizer10 = wx.GridBagSizer(5,5)
+        self.sizer9 = wx.GridBagSizer(5,5)
+        self.sizer8 = wx.GridBagSizer(5,5)
+        self.sizer7 = wx.GridBagSizer(5,5)
         self.sizer6 = wx.GridBagSizer(5,5)
         self.sizer5 = wx.GridBagSizer(5,5)
@@ -58 +50 @@
         self.sizer2 = wx.GridBagSizer(5,5)
         self.sizer1 = wx.GridBagSizer(5,5)
-        
-        
+        # Add layer
+        #data info layer
+        self.vbox.Add(self.sizer1)
+        #data range 
+        self.vbox.Add(self.sizer2)
+        #instrument smearing selection layer
+        self.vbox.Add(self.sizer3)
+        #model selection
+        self.vbox.Add(wx.StaticLine(self, -1), 0, wx.EXPAND, 0)
+        self.vbox.Add(self.sizer4)
+        #model paramaters layer
+        self.vbox.Add(self.sizer5)
+        #polydispersion selected
+        self.vbox.Add(wx.StaticLine(self, -1), 0, wx.EXPAND, 0)
+        self.vbox.Add(self.sizer6)
+        #combox box for type of dispersion
+        self.vbox.Add(self.sizer7)
+        #dispersion parameters layer
+        self.vbox.Add(self.sizer8)
+        #fit info layer
+        self.vbox.Add(wx.StaticLine(self, -1), 0, wx.EXPAND, 0)
+        self.vbox.Add(self.sizer9)
+        #close layer
+        self.vbox.Add(wx.StaticLine(self, -1), 0, wx.EXPAND, 0)
+        self.vbox.Add(self.sizer10)
+        
+        #---------sizer 1 draw--------------------------------
         self.DataSource  =wx.StaticText(self, -1,str(data.name))
         self.smearer_box = wx.ComboBox(self, -1)
@@ -74 +91 @@
               self.smearer_box.Insert(str(v),i)  
             i+=1
+            
+        # Minimum value of data   
+        self.data_min    = wx.StaticText(self, -1,str(format_number(numpy.min(data.x))))
+        # Maximum value of data  
+        self.data_max    =  wx.StaticText(self, -1,str(format_number(numpy.max(data.x))))
+        #Filing the sizer containing data related fields
+        ix = 0
+        iy = 1
+        self.sizer1.Add(wx.StaticText(self, -1, 'Data Source Name : '),(iy,ix),\
+                 (1,1), wx.LEFT|wx.EXPAND|wx.ADJUST_MINSIZE, 15)
+       
+        ix += 1
+        self.sizer1.Add(self.DataSource,(iy,ix),(1,1), wx.EXPAND|wx.ADJUST_MINSIZE, 0)
+        
+        #---------sizer 2 draw--------------------------------
+        ix = 0
+        iy = 1
+        #set maximum range for x in linear scale
+        self.text4_3 = wx.StaticText(self, -1, 'Maximum Data Range(Linear)', style=wx.ALIGN_LEFT)
+        self.sizer2.Add(self.text4_3,(iy,ix),(1,1),\
+                   wx.LEFT|wx.EXPAND|wx.ADJUST_MINSIZE, 15)
+        ix += 2
+        self.sizer2.Add(wx.StaticText(self, -1, 'Min :'),(iy, ix),(1,1),\
+                            wx.EXPAND|wx.ADJUST_MINSIZE, 0)
+        ix += 1
+        self.sizer2.Add(self.data_min,(iy, ix),(1,1),\
+                            wx.EXPAND|wx.ADJUST_MINSIZE, 0)
+        ix += 1
+        self.sizer2.Add(wx.StaticText(self, -1, 'Max : '),(iy, ix),(1,1),\
+                            wx.EXPAND|wx.ADJUST_MINSIZE, 0)
+        ix += 1
+        self.sizer2.Add(self.data_max,(iy,ix),(1,1), wx.LEFT|wx.EXPAND|wx.ADJUST_MINSIZE, 0)
+        
+        #----sizer 3 draw--------------------------------
+        ix = 0
+        iy = 1
+        self.sizer3.Add(wx.StaticText(self,-1,'Instrument Smearing'),(iy,ix),(1,1)\
+                  , wx.LEFT|wx.EXPAND|wx.ADJUST_MINSIZE, 15)
+        ix += 1
+        self.sizer3.Add(self.smearer_box,(iy,ix),(1,1),  wx.EXPAND|wx.ADJUST_MINSIZE, 0)
+        ix =0
+        iy+=1
+        self.sizer3.Add((20,20),(iy,ix),(1,1),wx.LEFT|wx.EXPAND|wx.ADJUST_MINSIZE, 15)  
+            
+        #------------------ sizer 4  draw------------------------   
         self.modelbox = wx.ComboBox(self, -1)
+        
+        #filling sizer2
+        ix = 0
+        iy = 1
+        self.sizer4.Add(wx.StaticText(self,-1,'Model'),(iy,ix),(1,1)\
+                  , wx.LEFT|wx.EXPAND|wx.ADJUST_MINSIZE, 15)
+        ix += 1
+        self.sizer4.Add(self.modelbox,(iy,ix),(1,1),  wx.EXPAND|wx.ADJUST_MINSIZE, 0)
+        
+        #----------sizer6-------------------------------------------------
+        self.disable_disp = wx.RadioButton(self, -1, 'No', (10, 10), style=wx.RB_GROUP)
+        self.enable_disp = wx.RadioButton(self, -1, 'Yes', (10, 30))
+        self.Bind(wx.EVT_RADIOBUTTON, self.Set_DipersParam, id=self.disable_disp.GetId())
+        self.Bind(wx.EVT_RADIOBUTTON, self.Set_DipersParam, id=self.enable_disp.GetId())
+        ix= 0
+        iy=1
+        self.sizer6.Add(wx.StaticText(self,-1,'Polydispersity: '),(iy,ix),(1,1)\
+                  , wx.LEFT|wx.EXPAND|wx.ADJUST_MINSIZE, 15)
+        ix += 1
+        self.sizer6.Add(self.enable_disp ,(iy,ix),(1,1),  wx.EXPAND|wx.ADJUST_MINSIZE, 0)
+        ix += 1
+        self.sizer6.Add(self.disable_disp ,(iy,ix),(1,1),  wx.EXPAND|wx.ADJUST_MINSIZE, 0)
+        ix =0
+        iy+=1
+        self.sizer6.Add((20,20),(iy,ix),(1,1),wx.LEFT|wx.EXPAND|wx.ADJUST_MINSIZE, 15)  
+
+        
+        #---------sizer 9 draw----------------------------------------
+        self.tcChi    =  wx.StaticText(self, -1, str(0), style=wx.ALIGN_LEFT)
+        self.tcChi.Hide()
+        self.text1_1 = wx.StaticText(self, -1, 'Chi2/dof', style=wx.ALIGN_LEFT)
+        self.text1_1.Hide()
+        
         id = wx.NewId()
         self.btFit =wx.Button(self,id,'Fit')
         self.btFit.Bind(wx.EVT_BUTTON, self.onFit,id=id)
         self.btFit.SetToolTipString("Perform fit.")
-        self.static_line_1 = wx.StaticLine(self, -1)
-       
-        self.vbox.Add(self.sizer3)
-        self.vbox.Add(self.sizer2)
-        self.vbox.Add(self.static_line_1, 0, wx.EXPAND, 0)
-        self.vbox.Add(self.sizer5)
-        self.vbox.Add(self.sizer6)
-        self.vbox.Add(self.sizer4)
-        self.vbox.Add(self.sizer1)
-        
+         ## Q range
+        print "self.data fitpage1D" , self.data,hasattr(self.data,"data")
+        if not hasattr(self.data,"data"):
+            self.qmin_x= numpy.min(self.data.x)
+            self.qmax_x= numpy.max(self.data.x)
+        else:
+            radius1= math.sqrt(math.pow(self.data.xmin, 2)+ math.pow(self.data.ymin, 2))
+            radius2= math.sqrt(math.pow(self.data.xmax, 2)+ math.pow(self.data.ymin, 2))
+            radius3= math.sqrt(math.pow(self.data.xmin, 2)+ math.pow(self.data.ymax, 2))
+            radius4= math.sqrt(math.pow(self.data.xmax, 2)+ math.pow(self.data.ymax, 2))
+            self.qmin_x =0
+            self.qmax_x= max(radius1, radius2, radius3, radius4)
+            print "data2D range",self.qmax_x
+        self.num_points= 100
+         
+        
+        
+        self.qmin    = wx.TextCtrl(self, -1,size=(_BOX_WIDTH,20))
+        self.qmin.SetValue(str(format_number(self.qmin_x)))
+        self.qmin.SetToolTipString("Minimun value of x in linear scale.")
+        self.qmin.Bind(wx.EVT_KILL_FOCUS, self._onparamEnter)
+        self.qmin.Bind(wx.EVT_TEXT_ENTER, self._onparamEnter)
+        self.qmin.Disable()
+        
+        self.qmax    = wx.TextCtrl(self, -1,size=(_BOX_WIDTH,20))
+        self.qmax.SetValue(str(format_number(self.qmax_x)))
+        self.qmax.SetToolTipString("Maximum value of x in linear scale.")
+        self.qmax.Bind(wx.EVT_KILL_FOCUS, self._onparamEnter)
+        self.qmax.Bind(wx.EVT_TEXT_ENTER, self._onparamEnter)
+        self.qmax.Disable()
+
+        self.npts    = wx.TextCtrl(self, -1,size=(_BOX_WIDTH,20))
+        self.npts.SetValue(format_number(self.num_points))
+        self.npts.SetToolTipString("Number of point to plot.")
+        self.npts.Bind(wx.EVT_KILL_FOCUS, self._onparamEnter)
+        self.npts.Bind(wx.EVT_TEXT_ENTER, self._onparamEnter)
+        self.npts.Disable()
+        self.npts.Hide()
+        ix = 0
+        iy = 1 
+        self.sizer9.Add(wx.StaticText(self, -1, 'Fitting Range'),(iy, ix),(1,1),\
+                            wx.LEFT|wx.EXPAND|wx.ADJUST_MINSIZE, 15)
+        ix += 1 
+        self.sizer9.Add(wx.StaticText(self, -1, 'Min'),(iy, ix),(1,1),\
+                            wx.EXPAND|wx.ADJUST_MINSIZE, 0)
+        ix += 1
+        self.sizer9.Add(wx.StaticText(self, -1, 'Max'),(iy, ix),(1,1),\
+                            wx.EXPAND|wx.ADJUST_MINSIZE, 0)
+        #ix += 1
+        #self.sizer9.Add(wx.StaticText(self, -1, 'Npts'),(iy, ix),(1,1),\
+        #                    wx.EXPAND|wx.ADJUST_MINSIZE, 0)
+        ix = 0
+        iy += 1
+        self.sizer9.Add(wx.StaticText(self, -1, 'x range'),(iy, ix),(1,1),\
+                            wx.LEFT|wx.EXPAND|wx.ADJUST_MINSIZE, 15)
+        ix += 1
+        self.sizer9.Add(self.qmin,(iy, ix),(1,1), wx.LEFT|wx.EXPAND|wx.ADJUST_MINSIZE, 0)
+        ix += 1
+        self.sizer9.Add(self.qmax,(iy,ix),(1,1), wx.LEFT|wx.EXPAND|wx.ADJUST_MINSIZE, 0)
+        ix += 1
+        self.sizer9.Add(self.npts,(iy,ix),(1,1), wx.LEFT|wx.EXPAND|wx.ADJUST_MINSIZE, 0)
+        ix = 0
+        iy += 1
+        self.sizer9.Add(self.text1_1,(iy,ix),(1,1),\
+                   wx.LEFT|wx.EXPAND|wx.ADJUST_MINSIZE, 15)
+        ix += 1
+        self.sizer9.Add(self.tcChi,(iy,ix),(1,1), wx.LEFT|wx.EXPAND|wx.ADJUST_MINSIZE, 0)
+        ix +=2
+        self.sizer9.Add(self.btFit,(iy,ix),(1,1), wx.LEFT|wx.EXPAND|wx.ADJUST_MINSIZE, 0)
+        ix =0
+        iy+=1 
+        self.sizer9.Add((20,20),(iy,ix),(1,1), wx.LEFT|wx.EXPAND|wx.ADJUST_MINSIZE, 0)
+        #----------sizer 10 draw------------------------------------------------------
         id = wx.NewId()
         self.btClose =wx.Button(self,id,'Close')
         self.btClose.Bind(wx.EVT_BUTTON, self.onClose,id=id)
         self.btClose.SetToolTipString("Close page.")
-        ix = 0
-        iy = 1
-        self.sizer3.Add(wx.StaticText(self, -1, 'Data Source Name : '),(iy,ix),\
-                 (1,1), wx.LEFT|wx.EXPAND|wx.ADJUST_MINSIZE, 15)
-        ix += 1
-        self.sizer3.Add(self.DataSource,(iy,ix),(1,1), wx.EXPAND|wx.ADJUST_MINSIZE, 0)
-        ix += 1
-        self.sizer3.Add((20,20),(iy,ix),(1,1),wx.RIGHT|wx.EXPAND|wx.ADJUST_MINSIZE,0)
-        ix = 0
-        iy += 1
-        self.sizer3.Add(wx.StaticText(self,-1,'Instrument Smearing'),(iy,ix),(1,1)\
-                  , wx.LEFT|wx.EXPAND|wx.ADJUST_MINSIZE, 15)
-        ix += 1
-        self.sizer3.Add(self.smearer_box,(iy,ix),(1,1),  wx.EXPAND|wx.ADJUST_MINSIZE, 0)
-        
-        ix = 0
-        iy += 1
-        self.sizer3.Add(wx.StaticText(self,-1,'Model'),(iy,ix),(1,1)\
-                  , wx.LEFT|wx.EXPAND|wx.ADJUST_MINSIZE, 15)
-        ix += 1
-        self.sizer3.Add(self.modelbox,(iy,ix),(1,1),  wx.EXPAND|wx.ADJUST_MINSIZE, 0)
-        
-        ix = 0
-        iy = 1
-        #set maximum range for x in linear scale
-        self.text4_3 = wx.StaticText(self, -1, 'Maximum Data Range(Linear)', style=wx.ALIGN_LEFT)
-        self.sizer4.Add(self.text4_3,(iy,ix),(1,1),\
-                   wx.LEFT|wx.EXPAND|wx.ADJUST_MINSIZE, 15)
-        ix += 1
-        self.sizer4.Add(wx.StaticText(self, -1, 'Min'),(iy, ix),(1,1),\
-                            wx.LEFT|wx.EXPAND|wx.ADJUST_MINSIZE, 15)
-        ix += 2
-        self.sizer4.Add(wx.StaticText(self, -1, 'Max'),(iy, ix),(1,1),\
-                            wx.EXPAND|wx.ADJUST_MINSIZE, 0)
-        ix = 0
-        iy += 1
-        self.sizer4.Add(wx.StaticText(self, -1, 'x range'),(iy, ix),(1,1),\
-                            wx.LEFT|wx.EXPAND|wx.ADJUST_MINSIZE, 15)
-        ix += 1
-        self.xmin    = wx.TextCtrl(self, -1,size=(_BOX_WIDTH,20))
-        self.xmin.SetValue(format_number(numpy.min(data.x)))
-        self.xmin.SetToolTipString("Minimun value of x in linear scale.")
-        self.xmin.Bind(wx.EVT_KILL_FOCUS, self._onTextEnter)
-        self.xmin.Bind(wx.EVT_TEXT_ENTER, self._onTextEnter)
-        self.xmin.Disable()
-        self.sizer4.Add(self.xmin,(iy, ix),(1,1), wx.LEFT|wx.EXPAND|wx.ADJUST_MINSIZE, 15)
-        
-       
-        ix += 2
-        self.xmax    = wx.TextCtrl(self, -1,size=(_BOX_WIDTH,20))
-        self.xmax.SetValue(format_number(numpy.max(data.x)))
-        self.xmax.SetToolTipString("Maximum value of x in linear scale.")
-        self.xmax.Bind(wx.EVT_KILL_FOCUS, self._onTextEnter)
-        self.xmax.Bind(wx.EVT_TEXT_ENTER, self._onTextEnter)
-        self.xmax.Disable()
-        self.sizer4.Add(self.xmax,(iy,ix),(1,1), wx.LEFT|wx.EXPAND|wx.ADJUST_MINSIZE, 0)
+        
+        ix= 3
+        iy= 1
+        self.sizer10.Add((20,20),(iy,ix),(1,1),wx.LEFT|wx.EXPAND|wx.ADJUST_MINSIZE, 15)
+        ix +=1
+        self.sizer10.Add( self.btClose,(iy,ix),(1,1), wx.LEFT|wx.EXPAND|wx.ADJUST_MINSIZE, 0)
         ix =0
         iy+=1
-        self.sizer4.Add((20,20),(iy,ix),(1,1),wx.LEFT|wx.EXPAND|wx.ADJUST_MINSIZE, 15)
-        #Set chisqr  result into TextCtrl
-        ix = 0
-        iy = 1
-        
-        self.text1_1 = wx.StaticText(self, -1, 'Chi2/dof', style=wx.ALIGN_LEFT)
-        #self.sizer1.Add(self.text1_1,1)
-        self.sizer1.Add(self.text1_1,(iy,ix),(1,1),\
-                   wx.LEFT|wx.EXPAND|wx.ADJUST_MINSIZE, 15)
-        ix += 1
-        self.tcChi    = wx.TextCtrl(self, -1,size=(_BOX_WIDTH,20))
-        self.tcChi.SetToolTipString("Chi^2 over degrees of freedom.")
-        #self.sizer1.Add(self.tcChi, 1, wx.R | wx.BOTTOM , 5)
-        self.sizer1.Add(self.tcChi,(iy,ix),(1,1), wx.LEFT|wx.EXPAND|wx.ADJUST_MINSIZE, 0)
-        ix +=2
-        #self.sizer1.Add(self.btFit, 1, wx.LEFT | wx.BOTTOM , 5)
-        self.sizer1.Add(self.btFit,(iy,ix),(1,1), wx.LEFT|wx.EXPAND|wx.ADJUST_MINSIZE, 0)
-        ix+= 2
-        self.sizer1.Add( self.btClose,(iy,ix),(1,1), wx.LEFT|wx.EXPAND|wx.ADJUST_MINSIZE, 0)
-        #self.sizer1.Add( self.btClose,1, wx.LEFT | wx.BOTTOM , 5)
-        self.tcChi.Disable()
-        ix= 0
-        iy+=1
-        self.sizer1.Add((20,20),(iy,ix),(1,1), wx.LEFT|wx.EXPAND|wx.ADJUST_MINSIZE, 0)
-        #self.sizer1.Add((20,20), 0)
+        self.sizer10.Add((20,20),(iy,ix),(1,1),wx.LEFT|wx.EXPAND|wx.ADJUST_MINSIZE, 15)
+       
         # contains link between  model ,all its parameters, and panel organization
         self.parameters=[]
         self.fixed_param=[]
+        #list of dispersion paramaters
+        self.disp_list=None
         #contains link between a model and selected parameters to fit 
         self.param_toFit=[]
@@ -185 +272 @@
         #dictionary of model name and model class
         self.model_list_box={}
-        self.data = data
-        ## Q range
-        self.qmin= 0.001
-        self.qmax= 0.1
+        
+      
        
         self.vbox.Layout()
@@ -198 +283 @@
         self.Layout()
         self.GrandParent.GetSizer().Layout()
-       
-
-  
-  
- 
-        
-    def compute_chisqr(self):
+   
+    def compute_chisqr2D(self):
         """ @param fn: function that return model value
             @return residuals
         """
-        
         flag=self.checkFitRange()
+        res=[]
         if flag== True:
             try:
-                qmin = float(self.xmin.GetValue())
-                qmax = float(self.xmax.GetValue())
-                x,y,dy = [numpy.asarray(v) for v in (self.data.x,self.data.y,self.data.dy)]
-                if qmin==None and qmax==None: 
-                    fx =numpy.asarray([self.model.run(v) for v in x])
-                    res=(y - fx)/dy
-                else:
-                    idx = (x>= qmin) & (x <=qmax)
-                    fx = numpy.asarray([self.model.run(item)for item in x[idx ]])
-                    res= (y[idx] - fx)/dy[idx]  
+                self.qmin_x = float(self.qmin.GetValue())
+                self.qmax_x = float(self.qmax.GetValue())
                 
+                for i in range(len(self.data.x_bins)):
+                    if self.data.x_bins[i]>= self.qmin_x and self.data.x_bins[i]<= self.qmax_x:
+                        for j in range(len(self.data.y_bins)):
+                            if self.data.y_bins[j]>= self.qmin_x and self.data.y_bins[j]<= self.qmax_x:
+                                res.append( (self.data.data[j][i]- self.model.runXY(\
+                                 [self.data.x_bins[i],self.data.y_bins[j]]))\
+                                    /self.data.err_data[j][i] )
+                sum=0
                
-                sum=0
                 for item in res:
                     if numpy.isfinite(item):
                         sum +=item
+                #print "chisqr : sum 2D", xmin, xmax, ymin, ymax,sum
+                #print res
                 self.tcChi.SetValue(format_number(math.fabs(sum)))
             except:
                 wx.PostEvent(self.parent.GrandParent, StatusEvent(status=\
                             "Chisqr cannot be compute: %s"% sys.exc_value))
-            
-            
-    def onFit(self,event):
-        """ signal for fitting"""
-         
+        
+ 
+    def compute_chisqr(self):
+        """ @param fn: function that return model value
+            @return residuals
+        """
+        
         flag=self.checkFitRange()
-        self.set_manager(self.manager)
-     
-        qmin=float(self.xmin.GetValue())
-        qmax =float( self.xmax.GetValue())
-        if len(self.param_toFit) >0 and flag==True:
-            self.manager.schedule_for_fit( value=1,fitproblem =None) 
-            self.manager._on_single_fit(qmin=qmin,qmax=qmax)
-        else:
-              wx.PostEvent(self.parent.GrandParent, StatusEvent(status=\
-                            "Select at least on parameter to fit "))
-  
-    
+        if flag== True:
+            try:
+                if hasattr(self.data,"data"):
+                    self.compute_chisqr2D()
+                    return
+                else:
+                    self.qmin_x = float(self.qmin.GetValue())
+                    self.qmax_x = float(self.qmax.GetValue())
+                    x,y,dy = [numpy.asarray(v) for v in (self.data.x,self.data.y,self.data.dy)]
+                    if self.qmin_x==None and self.qmax_x==None: 
+                        fx =numpy.asarray([self.model.run(v) for v in x])
+                        res=(y - fx)/dy
+                    else:
+                        idx = (x>= self.qmin_x) & (x <=self.qmax_x)
+                        fx = numpy.asarray([self.model.run(item)for item in x[idx ]])
+                        res= (y[idx] - fx)/dy[idx]  
+                    
+                   
+                    sum=0
+                    for item in res:
+                        if numpy.isfinite(item):
+                            sum +=item
+                    self.tcChi.SetLabel(format_number(math.fabs(sum)))
+            except:
+                wx.PostEvent(self.parent.GrandParent, StatusEvent(status=\
+                            "Chisqr cannot be compute: %s"% sys.exc_value))
+            
     def _on_select_model(self,event):
         """
@@ -256 +354 @@
         """
         self.btFit.SetFocus()
+        self.disable_disp.SetValue(True)
+        self.sizer8.Clear(True)
+        self.sizer7.Clear(True)       
+        self.vbox.Layout()
+        self.SetScrollbars(20,20,55,40)
+        self.Layout()
+        self.parent.GetSizer().Layout()
         for item in self.model_list_box.itervalues():
             name = item.__name__
@@ -270 +375 @@
                 except:
                     raise #ValueError,"model.name is not equal to model class name"
-                break
-    
+                break       
+    def onFit(self,event):
+        """ signal for fitting"""
+         
+        flag=self.checkFitRange()
+        self.set_manager(self.manager)
+     
+        self.qmin_x=float(self.qmin.GetValue())
+        self.qmax_x =float( self.qmax.GetValue())
+        if len(self.param_toFit) >0 and flag==True:
+            self.manager.schedule_for_fit( value=1,fitproblem =None) 
+            self.manager._on_single_fit(qmin=self.qmin_x,qmax=self.qmax_x)
+        else:
+              wx.PostEvent(self.parent.GrandParent, StatusEvent(status=\
+                            "Select at least on parameter to fit "))
+  
+   
     def _onTextEnter(self,event):
         """
@@ -288 +408 @@
                             "Drawing  Error:wrong value entered %s"% sys.exc_value))
         
-    def checkFitRange(self):
-        """
-            Check the validity of fitting range
-            @note: xmin should always be less than xmax or else each control box
-            background is colored in pink.
-        """
-       
-        flag = True
-        valueMin = self.xmin.GetValue()
-        valueMax = self.xmax.GetValue()
-        # Check for possible values entered
-        #print "fitpage: checkfitrange:",valueMin,valueMax
-        try:
-            if (float(valueMax)> float(valueMin)):
-                self.xmax.SetBackgroundColour(wx.WHITE)
-                self.xmin.SetBackgroundColour(wx.WHITE)
-            else:
-                flag = False
-                self.xmin.SetBackgroundColour("pink")
-                self.xmax.SetBackgroundColour("pink")      
-        except:
-            flag = False
-            self.xmin.SetBackgroundColour("pink")
-            self.xmax.SetBackgroundColour("pink")
-            
-        self.xmin.Refresh()
-        self.xmax.Refresh()
-        return flag
-    
-
+   
     
     def get_param_list(self):
@@ -331 +422 @@
             raise ValueError,"missing parameter to fit"
         
-        
-    def set_panel(self,model):
+    
+           
+    def old_set_panel(self,model):
         """
             Build the panel from the model content
             @param model: the model selected in combo box for fitting purpose
         """
-        self.sizer2.Clear(True)
         self.sizer5.Clear(True)
-        self.sizer6.Clear(True)
         self.parameters = []
         self.param_toFit=[]
@@ -346 +436 @@
         #print "fitpage1D : dispersion list",self.model.getDispParamList()
         keys.sort()
-        disp_list=self.model.getDispParamList()
-        fixed=self.model.fixed
-        print "fixed",fixed
-        #model.setParam("scale", 2)
-        #print "model sphere scale fixed?", self.model.is_fittable("scale")
-        ip=0
-        iq=1
-        
         ik=0
         im=1
-        if len(disp_list)>0:
-            disp = wx.StaticText(self, -1, 'Dispersion')
-            self.sizer5.Add(disp,( iq, ip),(1,1),  wx.LEFT|wx.EXPAND|wx.ADJUST_MINSIZE, 15)
-            ip += 1 
-            values = wx.StaticText(self, -1, 'Values')
-            self.sizer5.Add(values,( iq, ip),(1,1), wx.EXPAND|wx.ADJUST_MINSIZE, 0)
-            
-        disp_list.sort()
+        
         iy = 1
         ix = 0
         self.cb1 = wx.CheckBox(self, -1,"Select all", (10, 10))
         wx.EVT_CHECKBOX(self, self.cb1.GetId(), self.select_all_param)
-        self.sizer2.Add(self.cb1,(iy, ix),(1,1),\
+        self.sizer5.Add(self.cb1,(iy, ix),(1,1),\
                           wx.LEFT|wx.EXPAND|wx.ADJUST_MINSIZE, 15)
         ix +=1
         self.text2_2 = wx.StaticText(self, -1, 'Values')
-        self.sizer2.Add(self.text2_2,(iy, ix),(1,1),\
+        self.sizer5.Add(self.text2_2,(iy, ix),(1,1),\
                             wx.EXPAND|wx.ADJUST_MINSIZE, 0) 
         ix +=2
         self.text2_3 = wx.StaticText(self, -1, 'Errors')
-        self.sizer2.Add(self.text2_3,(iy, ix),(1,1),\
+        self.sizer5.Add(self.text2_3,(iy, ix),(1,1),\
                             wx.EXPAND|wx.ADJUST_MINSIZE, 0)
         self.text2_3.Hide() 
         ix +=1
         self.text2_4 = wx.StaticText(self, -1, 'Units')
-        self.sizer2.Add(self.text2_4,(iy, ix),(1,1),\
+        self.sizer5.Add(self.text2_4,(iy, ix),(1,1),\
                             wx.EXPAND|wx.ADJUST_MINSIZE, 0) 
         self.text2_4.Hide()
-        #print "keys", keys
-        #print "disp_list", disp_list
-        #print "fix_list",fixed
+        disp_list=self.model.getDispParamList()
         for item in keys:
             if not item in disp_list:
@@ -394 +467 @@
                 cb = wx.CheckBox(self, -1, item, (10, 10))
                 cb.SetValue(False)
-                self.sizer2.Add( cb,( iy, ix),(1,1),  wx.LEFT|wx.EXPAND|wx.ADJUST_MINSIZE, 15)
+                self.sizer5.Add( cb,( iy, ix),(1,1),  wx.LEFT|wx.EXPAND|wx.ADJUST_MINSIZE, 15)
                 wx.EVT_CHECKBOX(self, cb.GetId(), self.select_param)
             
@@ -403 +476 @@
                 ctl1.Bind(wx.EVT_KILL_FOCUS, self._onparamEnter)
                 ctl1.Bind(wx.EVT_TEXT_ENTER,self._onparamEnter)
-                self.sizer2.Add(ctl1, (iy,ix),(1,1), wx.EXPAND)
+                self.sizer5.Add(ctl1, (iy,ix),(1,1), wx.EXPAND)
                 
                 ix += 1
                 text2=wx.StaticText(self, -1, '+/-')
-                self.sizer2.Add(text2,(iy, ix),(1,1),\
+                self.sizer5.Add(text2,(iy, ix),(1,1),\
                                 wx.EXPAND|wx.ADJUST_MINSIZE, 0) 
                 text2.Hide()  
                 ix += 1
                 ctl2 = wx.TextCtrl(self, -1, size=(_BOX_WIDTH,20), style=wx.TE_PROCESS_ENTER)
-                self.sizer2.Add(ctl2, (iy,ix),(1,1), wx.EXPAND|wx.ADJUST_MINSIZE, 0)
+                self.sizer5.Add(ctl2, (iy,ix),(1,1), wx.EXPAND|wx.ADJUST_MINSIZE, 0)
                 ctl2.Hide()
                 ix +=1
@@ -420 +493 @@
                 except:
                     units = wx.StaticText(self, -1, "", style=wx.ALIGN_LEFT)
-                self.sizer2.Add(units, (iy,ix),(1,1),  wx.EXPAND|wx.ADJUST_MINSIZE, 0)
+                self.sizer5.Add(units, (iy,ix),(1,1),  wx.EXPAND|wx.ADJUST_MINSIZE, 0)
+            """
             else:
-                if item in fixed:
+                if not item in fixed:
                     ip = 0
                     iq += 1
@@ -452 +526 @@
                     im += 1
             #save data
-            
+            """
             self.parameters.append([cb,ctl1,text2,ctl2])
                 
         iy+=1
-        self.sizer2.Add((20,20),(iy,ix),(1,1), wx.LEFT|wx.EXPAND|wx.ADJUST_MINSIZE, 15)
+        self.sizer5.Add((20,20),(iy,ix),(1,1), wx.LEFT|wx.EXPAND|wx.ADJUST_MINSIZE, 15)
         
         #Display units text on panel
@@ -499 +573 @@
                     item[3].Hide()
                 except:
-                     wx.PostEvent(self.parent.GrandParent, StatusEvent(status=\
-                            "Drawing  Error:wrong value entered : %s"% sys.exc_value))
+                    #enter dispersion value 
+                    pass
         self.set_model_parameter()
         
-    def set_model_parameter(self):
-        if len(self.parameters) !=0 and self.model !=None:
-            # Flag to register when a parameter has changed.
-            is_modified = False
-            for item in self.fixed_param:
-                
-                try:
-                     name=str(item[0])
-                     value= float(item[1].GetValue())
-#                     print "model para", name,value
-                     # If the value of the parameter has changed,
-                     # update the model and set the is_modified flag
-                     if value != self.model.getParam(name):
-                         self.model.setParam(name,value)
-                         is_modified = True
-                except:
-                     wx.PostEvent(self.parent.GrandParent, StatusEvent(status=\
-                            "Model Drawing  Error:wrong value entered : %s"% sys.exc_value))
-                
-            for item in self.parameters:
-#                print "paramters",str(item[0].GetLabelText())
-                try:
-                     name=str(item[0].GetLabelText())
-                     value= float(item[1].GetValue())
-#                     print "model para", name,value
-                     # If the value of the parameter has changed,
-                     # update the model and set the is_modified flag
-                     if value != self.model.getParam(name):
-                         self.model.setParam(name,value)
-                         is_modified = True
-                except:
-                     wx.PostEvent(self.parent.GrandParent, StatusEvent(status=\
-                            "Model Drawing  Error:wrong value entered : %s"% sys.exc_value))
-            
-            # Here we should check whether the boundaries have been modified.
-            # If qmin and qmax have been modified, update qmin and qmax and 
-            # set the is_modified flag to True
-            if float(self.xmin.GetValue()) != self.qmin:
-                self.qmin = float(self.xmin.GetValue())
-                is_modified = True
-            if float(self.xmax.GetValue()) != self.qmax:
-                self.qmax = float(self.xmax.GetValue())
-                is_modified = True
-            
-            if is_modified:
-                self.manager.redraw_model(qmin=self.qmin, qmax=self.qmax)
-         
+    
     def select_all_param(self,event): 
         """
@@ -597 +625 @@
             
         if not (len(self.param_toFit ) >0):
-            self.xmin.Disable()
-            self.xmax.Disable()
+            self.qmin.Disable()
+            self.qmax.Disable()
         else:
-            self.xmin.Enable()
-            self.xmax.Enable()
+            self.qmin.Enable()
+            self.qmax.Enable()
        
    
@@ -615 +643 @@
         """
         #print "fitting : onsetvalues out",out
-        self.tcChi.Clear()
-        self.tcChi.SetValue(format_number(chisqr))
+        self.tcChi.SetLabel(format_number(chisqr))
         params = {}
         is_modified = False

sansview/perspectives/fitting/fitpage2D.py

@@ -27 +27 @@
     
     def __init__(self, parent,data, *args, **kwargs):
-        wx.ScrolledWindow.__init__(self, parent, *args, **kwargs)
+        FitPage1D.__init__(self, parent, *args, **kwargs)
         """ 
             Initialization of the Panel
         """
-        self.manager = None
-        self.parent  = parent
-        self.event_owner=None
-        #panel interface
-        self.vbox  = wx.BoxSizer(wx.VERTICAL)
-        self.sizer6 = wx.GridBagSizer(5,5)
-        self.sizer5 = wx.GridBagSizer(5,5)
-        self.sizer4 = wx.GridBagSizer(5,5)
-        self.sizer3 = wx.GridBagSizer(5,5)
-        self.sizer2 = wx.GridBagSizer(5,5)
-        self.sizer1 = wx.GridBagSizer(5,5)
-        
-        #self.DataSource      = wx.TextCtrl(self, -1,size=(_BOX_WIDTH,20))
-        #self.DataSource.SetToolTipString("name of data to fit")
-        #self.DataSource.SetValue(str(data.name))
-        #self.DataSource.Disable()
-        self.DataSource  =wx.StaticText(self, -1,str(data.name))
-        self.modelbox = wx.ComboBox(self, -1)
-        id = wx.NewId()
-        self.btFit =wx.Button(self,id,'Fit')
-        self.btFit.Bind(wx.EVT_BUTTON, self.onFit,id=id)
-        self.btFit.SetToolTipString("Perform fit.")
-        self.static_line_1 = wx.StaticLine(self, -1)
-        
-        self.vbox.Add(self.sizer3)
-        self.vbox.Add(self.sizer2)
-        self.vbox.Add(self.static_line_1, 0, wx.EXPAND, 0)
-        self.vbox.Add(self.sizer5)
-        self.vbox.Add(self.sizer6)
-        self.vbox.Add(self.sizer4)
-        self.vbox.Add(self.sizer1)
-        ## Q range
-        self.qmin= 0.001
-        self.qmax= 0.1
-        
-        id = wx.NewId()
-        self.btClose =wx.Button(self,id,'Close')
-        self.btClose.Bind(wx.EVT_BUTTON, self.onClose,id=id)
-        self.btClose.SetToolTipString("Close page.")
-        ix = 0
-        iy = 1
-        self.sizer3.Add(wx.StaticText(self, -1, 'Data Source'),(iy,ix),\
-                 (1,1), wx.LEFT|wx.EXPAND|wx.ADJUST_MINSIZE, 15)
-        ix += 1
-        self.sizer3.Add(self.DataSource,(iy,ix),(1,1), wx.EXPAND|wx.ADJUST_MINSIZE, 0)
-        ix += 1
-        self.sizer3.Add((20,20),(iy,ix),(1,1),wx.RIGHT|wx.EXPAND|wx.ADJUST_MINSIZE,0)
-        ix = 0
-        iy += 1
-        self.sizer3.Add(wx.StaticText(self,-1,'Model'),(iy,ix),(1,1)\
-                  , wx.LEFT|wx.EXPAND|wx.ADJUST_MINSIZE, 15)
-        ix += 1
-        self.sizer3.Add(self.modelbox,(iy,ix),(1,1),  wx.EXPAND|wx.ADJUST_MINSIZE, 0)
-        
-        ix = 0
-        iy = 1
-        #set maximum range for x in linear scale
-        self.text4_3 = wx.StaticText(self, -1, 'Maximum Data\n Range (Linear)', style=wx.ALIGN_LEFT)
-        self.sizer4.Add(self.text4_3,(iy,ix),(1,1),\
-                   wx.LEFT|wx.EXPAND|wx.ADJUST_MINSIZE, 15)
-        ix += 1
-        self.text4_1 = wx.StaticText(self, -1, 'Min')
-        self.sizer4.Add(self.text4_1,(iy, ix),(1,1),\
-                            wx.LEFT|wx.EXPAND|wx.ADJUST_MINSIZE, 15)
-        #self.text4_1.Hide()
-        ix += 2
-        self.text4_2 = wx.StaticText(self, -1, 'Max')
-        self.sizer4.Add(self.text4_2,(iy, ix),(1,1),\
-                            wx.EXPAND|wx.ADJUST_MINSIZE, 0)
-        #self.text4_2.Hide()
        
-        #self.text4_3.Hide()
-        ix = 0
-        iy += 1
-        self.text4_4 = wx.StaticText(self, -1, 'x range')
-        self.sizer4.Add(self.text4_4,(iy, ix),(1,1),\
-                            wx.LEFT|wx.EXPAND|wx.ADJUST_MINSIZE, 15)
-        ix += 1
-        self.xmin    = wx.TextCtrl(self, -1,size=(_BOX_WIDTH,20))
-        self.xmin.SetValue(format_number(data.xmin))
-        self.xmin.SetToolTipString("Minimun value of x in linear scale.")
-        self.sizer4.Add(self.xmin,(iy, ix),(1,1), wx.LEFT|wx.EXPAND|wx.ADJUST_MINSIZE, 0)
-        self.xmin.Bind(wx.EVT_KILL_FOCUS, self._onTextEnter)
-        self.xmin.Bind(wx.EVT_TEXT_ENTER, self._onTextEnter)
-        
-        ix += 2
-        self.xmax    = wx.TextCtrl(self, -1,size=(_BOX_WIDTH,20))
-        self.xmax.SetValue(format_number(data.xmax))
-        self.xmax.SetToolTipString("Maximum value of x in linear scale.")
-        self.sizer4.Add(self.xmax,(iy,ix),(1,1), wx.LEFT|wx.EXPAND|wx.ADJUST_MINSIZE, 0)
-        self.xmax.Bind(wx.EVT_KILL_FOCUS, self._onTextEnter)
-        self.xmax.Bind(wx.EVT_TEXT_ENTER, self._onTextEnter)
-        
-        iy +=1
-        ix = 0
-        self.text4_5 = wx.StaticText(self, -1, 'y range')
-        self.sizer4.Add(self.text4_5,(iy, ix),(1,1),\
-                            wx.LEFT|wx.EXPAND|wx.ADJUST_MINSIZE, 15)
-        ix += 1
-        self.ymin    = wx.TextCtrl(self, -1,size=(_BOX_WIDTH,20))
-        self.ymin.SetValue(format_number(data.ymin))
-        self.ymin.SetToolTipString("Minimun value of y in linear scale.")
-        self.sizer4.Add(self.ymin,(iy, ix),(1,1), wx.LEFT|wx.EXPAND|wx.ADJUST_MINSIZE, 0)
-        self.ymin.Bind(wx.EVT_KILL_FOCUS, self._onTextEnter)
-        self.ymin.Bind(wx.EVT_TEXT_ENTER, self._onTextEnter)
-       
-        ix += 2
-        self.ymax    = wx.TextCtrl(self, -1,size=(_BOX_WIDTH,20))
-        self.ymax.SetValue(format_number(data.ymax))
-        self.ymax.SetToolTipString("Maximum value of y in linear scale.")
-        self.sizer4.Add(self.ymax,(iy,ix),(1,1), wx.LEFT|wx.EXPAND|wx.ADJUST_MINSIZE, 0)
-        self.ymax.Bind(wx.EVT_KILL_FOCUS, self._onTextEnter)
-        self.ymax.Bind(wx.EVT_TEXT_ENTER, self._onTextEnter)
-        
-        #Set chisqr  result into TextCtrl
-        ix = 0
-        iy = 1
-        self.text1_1 = wx.StaticText(self, -1, 'Chi2/dof', style=wx.ALIGN_LEFT)
-        self.sizer1.Add(self.text1_1,(iy,ix),(1,1),\
-                   wx.LEFT|wx.EXPAND|wx.ADJUST_MINSIZE, 15)
-        ix += 1
-        self.tcChi    = wx.TextCtrl(self, -1,size=(_BOX_WIDTH,20))
-        self.tcChi.SetToolTipString("Chi^2 over degrees of freedom.")
-        self.sizer1.Add(self.tcChi,(iy,ix),(1,1), wx.LEFT|wx.EXPAND|wx.ADJUST_MINSIZE, 0)
-        ix +=2
-        self.sizer1.Add(self.btFit,(iy,ix),(1,1), wx.LEFT|wx.EXPAND|wx.ADJUST_MINSIZE, 0)
-        ix+= 1
-        self.sizer1.Add( self.btClose,(iy,ix),(1,1), wx.LEFT|wx.EXPAND|wx.ADJUST_MINSIZE, 0)
-        ix= 1
-        iy+=1
-        self.sizer1.Add((20,20),(iy,ix),(1,1), wx.LEFT|wx.EXPAND|wx.ADJUST_MINSIZE, 0)
-        # contains link between  model ,all its parameters, and panel organization
-        self.parameters=[]
-        self.fixed_param=[]
-        #contains link between a model and selected parameters to fit 
-        self.param_toFit=[]
-        # model on which the fit would be performed
-        self.model=None
-        # preview selected model name
-       
-        
-        #dictionary of model name and model class
-        self.model_list_box={}
-       
-        self.data = data
-        self.vbox.Layout()
-        self.vbox.Fit(self) 
-        self.SetSizer(self.vbox)
-        self.SetScrollbars(20,20,55,40)
-        self.Centre()
-        
-   
         
     def compute_chisqr(self):

sansview/perspectives/fitting/fitpanel.py

@@ -1 +1 @@
 import wx
+import wx.aui
 import wx.lib
 import numpy
@@ -7 +8 @@
 
 
-    
-class FitPanel(wx.Panel):
+class FitPanel(wx.aui.AuiNotebook):    
+#class FitPanel(wx.aui.AuiNotebook,wx.panel):
     """
         FitPanel class contains fields allowing to fit  models and  data
@@ -20 +21 @@
     window_caption = "Fit Panel "
     CENTER_PANE = True
-   
-    
     def __init__(self, parent, *args, **kwargs):
-        wx.Panel.__init__(self, parent, *args, **kwargs)
+        
+        wx.aui.AuiNotebook.__init__(self,parent,-1, style=wx.aui.AUI_NB_SCROLL_BUTTONS )
+        
         self.manager=None
         self.parent=parent
         self.event_owner=None
-        #self.menu_mng = models.ModelManager()
-        self.nb = wx.Notebook(self)
-        self.sizer = wx.BoxSizer()
-        self.sizer.Add(self.nb, 1, wx.EXPAND)
+        
+        pageClosedEvent = wx.aui.EVT_AUINOTEBOOK_PAGE_CLOSE
+        self.Bind(wx.aui.EVT_AUINOTEBOOK_PAGE_CLOSE, self.onClosePage)
+
         #Creating an initial page for simultaneous fitting
         from simfitpage import SimultaneousFitPage
-        self.sim_page = SimultaneousFitPage(self.nb, -1)
-        
-        #self.fit_panel.add_page(self.sim_page,"Simultaneous Fit")
-        self.nb.AddPage(self.sim_page,"Simultaneous Fit")
+        self.sim_page = SimultaneousFitPage(self, -1)
+        self.AddPage(self.sim_page,"Simultaneous Fit")
+        
+
         
         #dictionary of miodel {model class name, model class}
@@ -50 +51 @@
         self.count=0
         #updating the panel
-        self.nb.Update()
-        self.SetSizer(self.sizer)
-        self.sizer.Fit(self)
+        self.Update()
         self.Center()
-        
+    def onClosePage(self, event):
+        self.ToggleWindowStyle(wx.aui.AUI_NB_CLOSE_ON_ACTIVE_TAB)
+        print "went here",self.get_current_page(), self.GetPage(0)
+        #event.Skip()
+        if self.GetPageCount() <= 2:
+            print "wente here"
+            
+            # Prevent last tab from being closed
+            self.ToggleWindowStyle(~wx.aui.AUI_NB_CLOSE_ON_ACTIVE_TAB)
+            
+
+   
+
 
         
@@ -86 +97 @@
         if self.fit_page_name != name:
             self.count +=1
+            
             if data.__class__.__name__=='Data2D':
                  from fitpage2D import FitPage2D
-                 panel = FitPage2D(self.nb,data, -1)
+                 panel = FitPage2D(self,data, -1)
                  
             else:
-                
+           
                 from fitpage1D import FitPage1D
-                panel = FitPage1D(self.nb,data, -1)
+                panel = FitPage1D(self,data, -1)
             m_name= "M"+str(self.count)  
             panel.set_manager(self.manager)
             panel.set_owner(self.event_owner)
             
-            self.nb.AddPage(page=panel,text=name,select=True)
+            self.AddPage(page=panel,caption=name,select=True)
             panel.populate_box( self.model_list_box)
             self.fit_page_name = name
@@ -112 +124 @@
         """
         from modelpage import ModelPage
-        panel = ModelPage(self.nb,model,page_title, -1)
+        print "fitpanel model", model
+        panel = ModelPage(self,model,page_title, -1)
         panel.set_manager(self.manager)
         panel.set_owner(self.event_owner)
-        #self.nb.AddPage(page=panel,text=page_title,select=True)
-        self.nb.AddPage(page=panel,text="Model",select=True)
+        self.AddPage(page=panel,caption="Model",select=True)
         panel.populate_box( self.model_list_box)
         self.draw_model_name=page_title
-        self.model_page_number=self.nb.GetSelection()
-        self.model_page=self.nb.GetPage(self.nb.GetSelection())
+        self.model_page_number=self.GetSelection()
+        self.model_page=self.GetPage(self.GetSelection())
         
         
@@ -150 +162 @@
             self.model_page.select_model(model, page_title)
            
-    def get_notebook(self):
-        """
-            @return self.nb: return its own notebook mostly used by fitting module 
-        """
-        return self.nb
+    def get_current_page(self):
+        """
+            @return the current page selected
+        """
+        #return self.nb.GetCurrentPage()
+        return self.GetPage(self.GetSelection() )
+  
     
-    def get_page(self, n):
-        """
-            @return page at position n
-            @param n: page number
-        """
-        return self.nb.GetPage(n)
-    
-    
-    def get_page_count(self):
-        """ @return  number total of pages contained in notebook"""
-        return self.nb.GetPageCount()
-        
-        
-    def get_current_page(self):
-        """
-            @return the current page selected
-        """
-        return self.nb.GetCurrentPage()
-    
-    
-    def get_selected_page(self):
-        """ @return the page just selected by the user """
-        return self.nb.GetPage(self.nb.GetSelection())
-    
-    
-    def get_page_number(self):
-        return self.nb.GetSelection()
-    
-    def onClose(self, page=None,page_number=None):
+    def old_onClose(self, page=None,page_number=None):
         """
              close the current page except the simpage. remove each check box link to the model

sansview/perspectives/fitting/fitting.py

@@ -286 +286 @@
 #                    print "fitting: single fit", name, result.pvec[i]
                     i += 1
-#            print "fitting result : chisqr",result.fitness
-#            print "fitting result : pvec",result.pvec
-#            print "fitting result : stderr",result.stderr
+            print "fitting result : chisqr",result.fitness
+            print "fitting result : pvec",result.pvec
+            print "fitting result : stderr",result.stderr
+            print "xmin xmax ymin , ymax",qmin, qmax, ymin, ymax
             
             cpage.onsetValues(result.fitness, result.pvec,result.stderr)
@@ -320 +321 @@
                         if model.name == model_name:
                             small_out.append(p.value )
-                            if p.stderr ==None:
-                                small_cov.append(0)
-                            else:
-                                small_cov.append(p.stderr)
+                            small_cov.append(p.stderr)
                             model.setParam(param_name,p.value)  
                     # Display result on each page 
@@ -333 +331 @@
             
   
-    def _on_single_fit(self,id=None,qmin=None,qmax=None,ymin=None,ymax=None):
+    def _on_single_fit(self,id=None,qmin=None,qmax=None):
         """ 
             perform fit for the  current page  and return chisqr,out and cov
@@ -362 +360 @@
                 model=list[0]
                 smearer= value.get_smearer()
+                print "single fit", model, smearer
                 #Create list of parameters for fitting used
                 pars=[]
@@ -381 +380 @@
                     self.schedule_for_fit( 0,value) 
                 except:
-                    #raise 
-                    wx.PostEvent(self.parent, StatusEvent(status="Fitting error: %s" % sys.exc_value))
+                    raise 
+                    #wx.PostEvent(self.parent, StatusEvent(status="Fitting error: %s" % sys.exc_value))
                     return
                 # make sure to keep an alphabetic order 
@@ -397 +396 @@
                                        qmin=qmin,
                                        qmax=qmax,
-                                       ymin= ymin,
-                                       ymax= ymax,
+                                      
                                        completefn=self._single_fit_completed,
                                        updatefn=None)
@@ -409 +407 @@
            
         except:
-            #raise
+            raise
             wx.PostEvent(self.parent, StatusEvent(status="Single Fit error: %s" % sys.exc_value))
             return
@@ -519 +517 @@
         name = evt.name
         
-        sim_page=self.fit_panel.get_page(0)
+        sim_page=self.fit_panel.GetPage(0)
         current_pg = self.fit_panel.get_current_page() 
-        selected_page = self.fit_panel.get_selected_page()
         if current_pg != sim_page:
             current_pg.set_panel(model)
@@ -562 +559 @@
             @param currpage: page in a dictionary referring to some data
         """
-        if self.fit_panel.get_page_count() >1:
+        if self.fit_panel.GetPageCount() >1:
             for page in self.page_finder.iterkeys():
                 if  page==currpage :  
@@ -569 +566 @@
                     model=list[0]
                     break 
-            
+            print "model in fitting",model
             if data!=None and data.__class__.__name__ != 'Data2D':
                 theory = Theory1D(x=[], y=[])
@@ -638 +635 @@
                     
                 theory.data = numpy.zeros((len(data.y_bins),len(data.x_bins)))
-                for i in range(len(data.x_bins)):
-                    if data.x_bins[i]>= qmin and data.x_bins[i]<= qmax:
-                        for j in range(len(data.y_bins)):
-                            if data.y_bins[j]>= ymin and data.y_bins[j]<= ymax:
-                                theory.data[j][i]=model.runXY([data.x_bins[i],data.y_bins[j]])
-
+                for i in range(len(data.y_bins)):
+                    if data.y_bins[i]>= ymin and data.y_bins[i]<= ymax:
+                        for j in range(len(data.x_bins)):
+                            if data.x_bins[i]>= qmin and data.x_bins[i]<= qmax:
+                                theory.data[j][i]=model.runXY([data.x_bins[j],data.y_bins[i]])
+               
                 #print "fitting : plot_helper:", theory.image
                 #print data.image
@@ -676 +673 @@
         self.fit_panel.add_model_page(model,description,name,topmenu=True)
         
-    def draw_model(self,model,name ,description=None,enable1D=True, enable2D=False,
+    def draw_model(self,model,name ,data=None,description=None,enable1D=True, enable2D=False,
                    qmin=DEFAULT_QMIN, qmax=DEFAULT_QMAX, qstep=DEFAULT_NPTS):
         """
              draw model with default data value
         """
+        if data !=None:
+            print "qmin qmax",qmin, qmax
+            self.redraw_model(qmin,qmax)
+            return 
         self._draw_model2D(model=model,
                            description=model.description,
@@ -741 +742 @@
     
     def complete(self, output, elapsed, model, qmin, qmax,qstep=DEFAULT_NPTS):
-  
+       
         wx.PostEvent(self.parent, StatusEvent(status="Calc \
         complete in %g sec" % elapsed))

sansview/perspectives/fitting/modelpage.py

@@ -5 +5 @@
 import copy
 
+
 from sans.guicomm.events import StatusEvent   
+from sans.guiframe.utils import format_number
 (ModelEventbox, EVT_MODEL_BOX) = wx.lib.newevent.NewEvent()
 _BOX_WIDTH = 80
 
-def format_number(value, high=False):
-    """
-        Return a float in a standardized, human-readable formatted string 
-    """
-    try: 
-        value = float(value)
-    except:
-        print "returning 0"
-        return "0"
-    
-    if high:
-        return "%-6.4g" % value
-    else:
-        return "%-5.3g" % value
-
-    
+
+
+
 class ModelPage(wx.ScrolledWindow):
     """
@@ -44 +33 @@
             Initialization of the Panel
         """
-        #self.scroll = wx.ScrolledWindow(self)
+        # model on which the fit would be performed
+        self.model=model
+        #list of dispersion paramaters
+        self.disp_list=self.model.getDispParamList()
         self.manager = None
         self.parent  = parent
-        self.event_owner=None
+        self.event_owner = None
+        # this panel does contain data .existing data allow a different drawing
+        #on set_model parameters
+        self.data=None
         #panel interface
         self.vbox  = wx.BoxSizer(wx.VERTICAL)
-        self.sizer3 = wx.GridBagSizer(5,5)
-        self.sizer1 = wx.GridBagSizer(5,5)
-        self.sizer2 = wx.GridBagSizer(5,5)
+        self.sizer10 = wx.GridBagSizer(5,5)
+        self.sizer9 = wx.GridBagSizer(5,5)
+        self.sizer8 = wx.GridBagSizer(5,5)
+        self.sizer7 = wx.GridBagSizer(5,5)
+        self.sizer6 = wx.GridBagSizer(5,5)
+        self.sizer5 = wx.GridBagSizer(5,5)
         self.sizer4 = wx.GridBagSizer(5,5)
-        self.sizer5 = wx.GridBagSizer(5,5)
-        self.static_line_1 = wx.StaticLine(self, -1)
+       
+        #model selection
+        self.vbox.Add(wx.StaticLine(self, -1), 0, wx.EXPAND, 0)
+        self.vbox.Add(self.sizer4)
+        #model paramaters layer
+        self.vbox.Add(self.sizer5)
+        #polydispersion selected
+        self.vbox.Add(wx.StaticLine(self, -1), 0, wx.EXPAND, 0)
+        self.vbox.Add(self.sizer6)
+        #combox box for type of dispersion
+        self.vbox.Add(self.sizer7)
+        #dispersion parameters layer
+        self.vbox.Add(self.sizer8)
+        # plotting range
+        self.vbox.Add(self.sizer9)
+        #close layer
+        self.vbox.Add(wx.StaticLine(self, -1), 0, wx.EXPAND, 0)
+        self.vbox.Add(wx.StaticLine(self, -1), 0, wx.EXPAND, 0)
+        self.vbox.Add(self.sizer10)
+        
+      
+        #------------------ sizer 4  draw------------------------  
+        # model on which the fit would be performed
+        self.model=model 
+       
+        # define combox box
         self.modelbox = wx.ComboBox(self, -1)
+         # preview selected model name
+        self.prevmodel_name=name
+        #print "model view prev_model",name
+        self.modelbox.SetValue(self.prevmodel_name)
+        #enable model 2D draw
+        self.enable2D= False
+        #filling sizer2
+        ix = 0
+        iy = 1
+        self.sizer4.Add(wx.StaticText(self,-1,'Model'),(iy,ix),(1,1)\
+                  , wx.LEFT|wx.EXPAND|wx.ADJUST_MINSIZE, 15)
+        ix += 1
+        self.sizer4.Add(self.modelbox,(iy,ix),(1,1),  wx.EXPAND|wx.ADJUST_MINSIZE, 0)
+        ix += 1
         id = wx.NewId()
-        self.vbox.Add(self.sizer3)
-        self.vbox.Add(self.sizer1)
-        self.vbox.Add(self.sizer2)
-        self.vbox.Add(self.static_line_1, 0, wx.EXPAND, 0)
-        self.vbox.Add(self.sizer5)
-        self.vbox.Add(self.sizer4)
-        
-        id = wx.NewId()
-        self.btClose =wx.Button(self,id,'Close')
-        self.btClose.Bind(wx.EVT_BUTTON, self.onClose,id=id)
-        self.btClose.SetToolTipString("Close page.")
-        ix = 1
-        iy = 1 
-        self.sizer4.Add(wx.StaticText(self, -1, 'Min'),(iy, ix),(1,1),\
-                            wx.LEFT|wx.EXPAND|wx.ADJUST_MINSIZE, 15)
-        ix += 1
-        self.sizer4.Add(wx.StaticText(self, -1, 'Max'),(iy, ix),(1,1),\
-                            wx.EXPAND|wx.ADJUST_MINSIZE, 0)
-        ix += 1
-        self.sizer4.Add(wx.StaticText(self, -1, 'Npts'),(iy, ix),(1,1),\
-                            wx.EXPAND|wx.ADJUST_MINSIZE, 0)
-        ix = 0
-        iy += 1
-        self.sizer4.Add(wx.StaticText(self, -1, 'x range'),(iy, ix),(1,1),\
-                            wx.LEFT|wx.EXPAND|wx.ADJUST_MINSIZE, 15)
-        ## Q range
-        self.qmin= 0.001
-        self.qmax= 0.1
+        self.model_view =wx.Button(self,id,'View 2D')
+        self.model_view.Bind(wx.EVT_BUTTON, self.onModel2D,id=id)
+        self.model_view.SetToolTipString("View model in 2D")
+        self.sizer4.Add(self.model_view,(iy,ix),(1,1),\
+                   wx.LEFT|wx.EXPAND|wx.ADJUST_MINSIZE, 15)
+        self.model_view.SetFocus()
+        #----------sizer6-------------------------------------------------
+        self.disable_disp = wx.RadioButton(self, -1, 'No', (10, 10), style=wx.RB_GROUP)
+        self.enable_disp = wx.RadioButton(self, -1, 'Yes', (10, 30))
+        self.Bind(wx.EVT_RADIOBUTTON, self.Set_DipersParam, id=self.disable_disp.GetId())
+        self.Bind(wx.EVT_RADIOBUTTON, self.Set_DipersParam, id=self.enable_disp.GetId())
+        ix= 0
+        iy=1
+        self.sizer6.Add(wx.StaticText(self,-1,'Polydispersity: '),(iy,ix),(1,1)\
+                  , wx.LEFT|wx.EXPAND|wx.ADJUST_MINSIZE, 15)
+        ix += 1
+        self.sizer6.Add(self.enable_disp ,(iy,ix),(1,1),  wx.EXPAND|wx.ADJUST_MINSIZE, 0)
+        ix += 1
+        self.sizer6.Add(self.disable_disp ,(iy,ix),(1,1),  wx.EXPAND|wx.ADJUST_MINSIZE, 0)
+        ix =0
+        iy+=1
+        self.sizer6.Add((20,20),(iy,ix),(1,1),wx.LEFT|wx.EXPAND|wx.ADJUST_MINSIZE, 15)  
+
+        
+        #---------sizer 9 draw----------------------------------------
+       
+         ## Q range
+        self.qmin_x= 0.001
+        self.qmax_x= 0.1
         self.num_points= 100
         
-        ix += 1
-        self.xmin    = wx.TextCtrl(self, -1,size=(_BOX_WIDTH,20))
-        self.xmin.SetValue(format_number(self.qmin))
-        self.xmin.SetToolTipString("Minimun value of x in linear scale.")
-        self.xmin.Bind(wx.EVT_KILL_FOCUS, self._onparamEnter)
-        self.xmin.Bind(wx.EVT_TEXT_ENTER, self._onparamEnter)
-        self.sizer4.Add(self.xmin,(iy, ix),(1,1), wx.LEFT|wx.EXPAND|wx.ADJUST_MINSIZE, 15)
-        
-       
-        ix += 1
-        self.xmax    = wx.TextCtrl(self, -1,size=(_BOX_WIDTH,20))
-        self.xmax.SetValue(format_number(self.qmax))
-        self.xmax.SetToolTipString("Maximum value of x in linear scale.")
-        self.xmax.Bind(wx.EVT_KILL_FOCUS, self._onparamEnter)
-        self.xmax.Bind(wx.EVT_TEXT_ENTER, self._onparamEnter)
-        self.sizer4.Add(self.xmax,(iy,ix),(1,1), wx.LEFT|wx.EXPAND|wx.ADJUST_MINSIZE, 0)
-        ix += 1
+        
+        self.qmin    = wx.TextCtrl(self, -1,size=(_BOX_WIDTH,20))
+        self.qmin.SetValue(format_number(self.qmin_x))
+        self.qmin.SetToolTipString("Minimun value of x in linear scale.")
+        self.qmin.Bind(wx.EVT_KILL_FOCUS, self._onparamEnter)
+        self.qmin.Bind(wx.EVT_TEXT_ENTER, self._onparamEnter)
+     
+        self.qmax    = wx.TextCtrl(self, -1,size=(_BOX_WIDTH,20))
+        self.qmax.SetValue(format_number(self.qmax_x))
+        self.qmax.SetToolTipString("Maximum value of x in linear scale.")
+        self.qmax.Bind(wx.EVT_KILL_FOCUS, self._onparamEnter)
+        self.qmax.Bind(wx.EVT_TEXT_ENTER, self._onparamEnter)
+     
+
         self.npts    = wx.TextCtrl(self, -1,size=(_BOX_WIDTH,20))
         self.npts.SetValue(format_number(self.num_points))
@@ -111 +145 @@
         self.npts.Bind(wx.EVT_TEXT_ENTER, self._onparamEnter)
        
-        self.sizer4.Add(self.npts,(iy,ix),(1,1), wx.LEFT|wx.EXPAND|wx.ADJUST_MINSIZE, 0)
+        ix = 0
+        iy = 1 
+        self.sizer9.Add(wx.StaticText(self, -1, 'Plotting Range'),(iy, ix),(1,1),\
+                            wx.LEFT|wx.EXPAND|wx.ADJUST_MINSIZE, 15)
+        ix += 1 
+        self.sizer9.Add(wx.StaticText(self, -1, 'Min'),(iy, ix),(1,1),\
+                            wx.EXPAND|wx.ADJUST_MINSIZE, 0)
+        ix += 1
+        self.sizer9.Add(wx.StaticText(self, -1, 'Max'),(iy, ix),(1,1),\
+                            wx.EXPAND|wx.ADJUST_MINSIZE, 0)
+        ix += 1
+        self.sizer9.Add(wx.StaticText(self, -1, 'Npts'),(iy, ix),(1,1),\
+                            wx.EXPAND|wx.ADJUST_MINSIZE, 0)
         ix = 0
         iy += 1
-        self.sizer4.Add((20,20),(iy, ix),(1,1), wx.LEFT|wx.EXPAND|wx.ADJUST_MINSIZE, 15)
-        ix +=3
-        self.sizer4.Add( self.btClose,(iy,ix),(1,1), wx.LEFT|wx.EXPAND|wx.ADJUST_MINSIZE, 0)
-        ix = 0
-        iy = 1
-        self.sizer3.Add(wx.StaticText(self,-1,'Model'),(iy,ix),(1,1)\
-                  , wx.LEFT|wx.EXPAND|wx.ADJUST_MINSIZE, 15)
-        ix += 1
-        self.sizer3.Add(self.modelbox,(iy,ix),(1,1),  wx.EXPAND|wx.ADJUST_MINSIZE, 0)
-        #ix = 0
-        #iy += 1
-        ix += 1
+        self.sizer9.Add(wx.StaticText(self, -1, 'x range'),(iy, ix),(1,1),\
+                            wx.LEFT|wx.EXPAND|wx.ADJUST_MINSIZE, 15)
+        ix += 1
+        self.sizer9.Add(self.qmin,(iy, ix),(1,1), wx.LEFT|wx.EXPAND|wx.ADJUST_MINSIZE, 0)
+        ix += 1
+        self.sizer9.Add(self.qmax,(iy,ix),(1,1), wx.LEFT|wx.EXPAND|wx.ADJUST_MINSIZE, 0)
+        ix += 1
+        self.sizer9.Add(self.npts,(iy,ix),(1,1), wx.LEFT|wx.EXPAND|wx.ADJUST_MINSIZE, 0)
+        
+        ix =0
+        iy+=1 
+        self.sizer9.Add((20,20),(iy,ix),(1,1), wx.LEFT|wx.EXPAND|wx.ADJUST_MINSIZE, 0)
+        #----------sizer 10 draw------------------------------------------------------
         id = wx.NewId()
-        self.model_view =wx.Button(self,id,'View 2D')
-        self.model_view.Bind(wx.EVT_BUTTON, self.onModel2D,id=id)
-        self.model_view.SetToolTipString("View model in 2D")
-        self.sizer3.Add(self.model_view,(iy,ix),(1,1),\
-                   wx.LEFT|wx.EXPAND|wx.ADJUST_MINSIZE, 15)
+        self.btClose =wx.Button(self,id,'Close')
+        self.btClose.Bind(wx.EVT_BUTTON, self.onClose,id=id)
+        self.btClose.SetToolTipString("Close page.")
+        
+        ix= 3
+        iy= 1
+        self.sizer10.Add((20,20),(iy,ix),(1,1),wx.LEFT|wx.EXPAND|wx.ADJUST_MINSIZE, 15)
+        ix +=1
+        self.sizer10.Add( self.btClose,(iy,ix),(1,1), wx.LEFT|wx.EXPAND|wx.ADJUST_MINSIZE, 0)
+        ix =0
+        iy+=1
+        self.sizer10.Add((20,20),(iy,ix),(1,1),wx.LEFT|wx.EXPAND|wx.ADJUST_MINSIZE, 15)
+       
         # contains link between  model ,all its parameters, and panel organization
         self.parameters=[]
+        self.fixed_param=[]
         #contains link between a model and selected parameters to fit 
         self.param_toFit=[]
-        # model on which the fit would be performed
-        self.model=model
-        try:
-            #print"init modelpage",model.name
-            self.set_panel(model)
-        except:
-            raise
-        # preview selected model name
-        self.prevmodel_name=name
-        #print "model view prev_model",name
-        self.modelbox.SetValue(self.prevmodel_name)
-        # flag to check if the user has selected a new model in the combox box
-        self.model_hasChanged=False
+        
         #dictionary of model name and model class
         self.model_list_box={}
-       
-        #enable model 2D draw
-        self.enable2D= False
-        # Data1D to make a deep comparison between 2 Data1D for checking data
-        #change
+        #Draw initial panel
+        if self.model!=None:
+            self.set_panel(self.model)
+        
+       
+       
         self.vbox.Layout()
         self.vbox.Fit(self) 
-        
         self.SetSizer(self.vbox)
         self.SetScrollbars(20,20,55,40)
         
         self.Centre()
-       
-    def set_range(self, qmin, qmax, npts):
-        """
-            Set the range for the plotted models
-            @param qmin: minimum Q
-            @param qmax: maximum Q
-            @param npts: number of Q bins
-        """
-        # Set the data members
-        self.qmin = qmin
-        self.qmax = qmax
-        self.num_points = npts
-        
-        # Set the controls
-        self.xmin.SetValue(format_number(self.qmin))
-        self.xmax.SetValue(format_number(self.qmax))
-        self.npts.SetValue(format_number(self.num_points))
-        
-    def onClose(self,event):
-        """ close the page associated with this panel"""
-        self.GrandParent.onClose()
+        self.Layout()
+        self.parent.GetSizer().Layout()
         
     def set_owner(self,owner):
@@ -198 +223 @@
              @param manager: instance of plugin fitting
         """
-        self.manager = manager
-        
-    def onModel2D(self, event):
-        """
-         call manager to plot model in 2D
-        """
-        # If the 2D display is not currently enabled, plot the model in 2D 
-        # and set the enable2D flag.
-        if self.enable2D==False:
-            self.enable2D=True
-            self._draw_model()
-            
-        else:
-            print "enable is true:",self.enable2D
-            #self.manager.parent. show_panel(147)
-            self.manager.show_panel2D( id=None )
-            #self.manager.menu1.Append(event_id, new_panel.window_caption, 
-            #             "Show %s plot panel" % new_panel.window_caption)
-            
+        self.manager = manager  
+        
     def populate_box(self, dict):
         """
@@ -230 +238 @@
                 name = item.name
             list_name.append(name)
-        list_name.sort()   
+        list_name.sort() 
+         
         for name in list_name:
             self.modelbox.Insert(name,int(id))
@@ -236 +245 @@
         wx.EVT_COMBOBOX(self.modelbox,-1, self._on_select_model) 
         return 0
+    
+
+    def Set_DipersParam(self, event):
+        if self.enable_disp.GetValue():
+            if len(self.disp_list)==0:
+                ix=0
+                iy=1
+                self.sizer8.Clear(True)
+                model_disp = wx.StaticText(self, -1, 'No PolyDispersity for this model')
+                self.sizer7.Add(model_disp,( iy, ix),(1,1),  wx.LEFT|wx.EXPAND|wx.ADJUST_MINSIZE, 15)
+                self.vbox.Layout()
+                self.SetScrollbars(20,20,55,40)
+                self.Layout()
+                self.parent.GetSizer().Layout()
+                return 
+            else:
+                self.sizer8.Clear(True)
+                self.populate_disp_box()
+                self.set_panel_dispers(self.disp_list)
+                self.vbox.Layout()
+                self.SetScrollbars(20,20,55,40)
+                self.Layout()
+                self.parent.GetSizer().Layout()   
+        else:
+            self.sizer7.Clear(True)
+            self.sizer8.Clear(True)
+            self.vbox.Layout()
+            self.SetScrollbars(20,20,55,40)
+            self.Layout()
+            self.parent.GetSizer().Layout()
+            
+    def populate_disp_box(self):
+        self.sizer7.Clear(True)
+        if len(self.disp_list)>0:
+            ix=0
+            iy=1
+            model_disp = wx.StaticText(self, -1, 'Model Disp')
+            self.sizer7.Add(model_disp,( iy, ix),(1,1),  wx.LEFT|wx.EXPAND|wx.ADJUST_MINSIZE, 15)
+            ix += 1 
+            # set up the combox box
+            id = 0
+            self.disp_box = wx.ComboBox(self, -1)
+            self.disp_box.SetValue("Gaussian")
+            self.disp_box.Insert("Gaussian",int(id))
+            wx.EVT_COMBOBOX(self.disp_box,-1, self._on_select_Disp) 
+            self.sizer7.Add(self.disp_box,( iy, ix),(1,1), wx.EXPAND|wx.ADJUST_MINSIZE, 0)
+       
+    def set_range(self, qmin_x, qmax_x, npts):
+        """
+            Set the range for the plotted models
+            @param qmin: minimum Q
+            @param qmax: maximum Q
+            @param npts: number of Q bins
+        """
+        # Set the data members
+        self.qmin_x = qmin_x
+        self.qmax_x = qmax_x
+        self.num_points = npts
+        
+        # Set the controls
+        self.qmin.SetValue(format_number(self.qmin_x))
+        self.qmax.SetValue(format_number(self.qmax_x))
+        self.npts.SetValue(format_number(self.num_points))
+    def checkFitRange(self):
+        """
+            Check the validity of fitting range
+            @note: qmin should always be less than qmax or else each control box
+            background is colored in pink.
+        """
+       
+        flag = True
+        valueMin = self.qmin.GetValue()
+        valueMax = self.qmax.GetValue()
+        # Check for possible values entered
+        #print "fitpage: checkfitrange:",valueMin,valueMax
+        try:
+            if (float(valueMax)> float(valueMin)):
+                self.qmax.SetBackgroundColour(wx.WHITE)
+                self.qmin.SetBackgroundColour(wx.WHITE)
+            else:
+                flag = False
+                self.qmin.SetBackgroundColour("pink")
+                self.qmax.SetBackgroundColour("pink")      
+        except:
+            flag = False
+            self.qmin.SetBackgroundColour("pink")
+            self.qmax.SetBackgroundColour("pink")
+            
+        self.qmin.Refresh()
+        self.qmax.Refresh()
+        return flag
+    
+
+        
+    def onClose(self,event):
+        """ close the page associated with this panel"""
+        self.parent.onClose()
+        
+  
+        
+    def onModel2D(self, event):
+        """
+         call manager to plot model in 2D
+        """
+        # If the 2D display is not currently enabled, plot the model in 2D 
+        # and set the enable2D flag.
+        if self.enable2D==False:
+            self.enable2D=True
+            self._draw_model()
+            
+        else:
+            print "enable is true:",self.enable2D
+            #self.manager.parent. show_panel(147)
+            self.manager.show_panel2D( id=None )
+            #self.manager.menu1.Append(event_id, new_panel.window_caption, 
+            #             "Show %s plot panel" % new_panel.window_caption)
+            
     
     def select_model(self, model, name):
@@ -254 +380 @@
             if items[i]==name:
                 self.modelbox.SetSelection(i)
-        
+                
+                
+    def _on_select_Disp(self,event):
+        """
+             allow selecting different dispersion
+             self.disp_list should change type later .now only gaussian
+        """
+        type = "Gaussian" 
+        if type ==event.GetString():
+            self.set_panel_dispers( self.disp_list,type )
+                
     def _on_select_model(self,event):
         """
@@ -260 +396 @@
             post an event to its owner to draw an appropriate theory
         """
-        self.model_view.SetFocus()
+        self.disable_disp.SetValue(True)
+        self.sizer8.Clear(True)
+        self.sizer7.Clear(True)       
+        self.vbox.Layout()
+        self.SetScrollbars(20,20,55,40)
+        self.Layout()
+        self.parent.GetSizer().Layout()
         for item in self.model_list_box.itervalues():
             name = item.__name__
@@ -298 +440 @@
             @param model: the model selected in combo box for fitting purpose
         """
-        
-        self.sizer2.Clear(True)
-        self.sizer1.Clear(True)
+        print "set_panel", model
         self.sizer5.Clear(True)
         self.parameters = []
         self.param_toFit=[]
+        self.fixed_param=[]
         self.model = model
         keys = self.model.getParamList()
+        #list of dispersion paramaters
+        self.disp_list=self.model.getDispParamList()
+       
         keys.sort()
-        description=None
-        if hasattr(self.model,'description'):
-            description =model.description
-        disp_list=self.model.getDispParamList()
-        ip=0
-        iq=1
-        if len(disp_list)>0:
-            disp = wx.StaticText(self, -1, 'Dispersion')
-            self.sizer5.Add(disp,( iq, ip),(1,1),  wx.LEFT|wx.EXPAND|wx.ADJUST_MINSIZE, 15)
-            ip += 1 
-            values = wx.StaticText(self, -1, 'Values')
-            self.sizer5.Add(values,( iq, ip),(1,1), wx.EXPAND|wx.ADJUST_MINSIZE, 0)
-            
-        disp_list.sort()
-        #print "went here",self.model.name,model.description
+        ik=0
+        im=1
+        
         iy = 1
         ix = 0
-        self.cb0 = wx.StaticText(self, -1,'Model Description:')
-        self.sizer1.Add(self.cb0,(iy, ix),(1,1),\
-                          wx.LEFT|wx.EXPAND|wx.ADJUST_MINSIZE, 15)
-        iy += 1
-        
-        self.cb01 = wx.StaticText(self, -1,str(description),style=wx.ALIGN_LEFT)
-        self.cb01.Wrap(400) 
-        #self.cb01 = wx.StaticText(self, -1,str(description),(45, 25),style=wx.ALIGN_LEFT)
-        
-        self.sizer1.Add(self.cb01,(iy, ix),(1,1),\
-                          wx.LEFT|wx.EXPAND|wx.ADJUST_MINSIZE, 15)
-        ix = 0
-        iy = 1
-        self.cb1 = wx.StaticText(self, -1,'Parameters')
-        self.sizer2.Add(self.cb1,(iy, ix),(1,1),\
+        self.cb1 = wx.CheckBox(self, -1,"Select all", (10, 10))
+        if self.data!=None:
+            wx.EVT_CHECKBOX(self, self.cb1.GetId(), self.select_all_param)
+            self.cb1.SetValue(False)
+        else:
+            self.cb1.Disable()
+            self.cb1.Hide()
+       
+        self.sizer5.Add(self.cb1,(iy, ix),(1,1),\
                           wx.LEFT|wx.EXPAND|wx.ADJUST_MINSIZE, 15)
         ix +=1
         self.text2_2 = wx.StaticText(self, -1, 'Values')
-        self.sizer2.Add(self.text2_2,(iy, ix),(1,1),\
+        self.sizer5.Add(self.text2_2,(iy, ix),(1,1),\
                             wx.EXPAND|wx.ADJUST_MINSIZE, 0) 
+        ix +=2
+        self.text2_3 = wx.StaticText(self, -1, 'Errors')
+        self.sizer5.Add(self.text2_3,(iy, ix),(1,1),\
+                            wx.EXPAND|wx.ADJUST_MINSIZE, 0)
+        self.text2_3.Hide() 
         ix +=1
         self.text2_4 = wx.StaticText(self, -1, 'Units')
-        self.sizer2.Add(self.text2_4,(iy, ix),(1,1),\
+        self.sizer5.Add(self.text2_4,(iy, ix),(1,1),\
                             wx.EXPAND|wx.ADJUST_MINSIZE, 0) 
         self.text2_4.Hide()
+        disp_list=self.model.getDispParamList()
         for item in keys:
             if not item in disp_list:
                 iy += 1
                 ix = 0
-                cb=wx.StaticText(self, -1, item)
-                self.sizer2.Add( cb,( iy, ix),(1,1),  wx.LEFT|wx.EXPAND|wx.ADJUST_MINSIZE, 15)
+    
+                cb = wx.CheckBox(self, -1, item, (10, 10))
+                if self.data!=None:
+                    cb.SetValue(False)
+                    wx.EVT_CHECKBOX(self, cb.GetId(), self.select_param)
+                else:
+                    cb.Disable()
+                self.sizer5.Add( cb,( iy, ix),(1,1),  wx.LEFT|wx.EXPAND|wx.ADJUST_MINSIZE, 15)
+               
                 ix += 1
                 value= self.model.getParam(item)
@@ -360 +499 @@
                 ctl1.SetValue(str (format_number(value)))
                 ctl1.Bind(wx.EVT_KILL_FOCUS, self._onparamEnter)
-                ctl1.Bind(wx.EVT_TEXT_ENTER, self._onparamEnter)
-                self.sizer2.Add(ctl1, (iy,ix),(1,1), wx.EXPAND|wx.ADJUST_MINSIZE, 0)
+                ctl1.Bind(wx.EVT_TEXT_ENTER,self._onparamEnter)
+                self.sizer5.Add(ctl1, (iy,ix),(1,1), wx.EXPAND)
+                
+                ix += 1
+                text2=wx.StaticText(self, -1, '+/-')
+                self.sizer5.Add(text2,(iy, ix),(1,1),\
+                                wx.EXPAND|wx.ADJUST_MINSIZE, 0) 
+                text2.Hide()  
+                ix += 1
+                ctl2 = wx.TextCtrl(self, -1, size=(_BOX_WIDTH,20), style=wx.TE_PROCESS_ENTER)
+                self.sizer5.Add(ctl2, (iy,ix),(1,1), wx.EXPAND|wx.ADJUST_MINSIZE, 0)
+                ctl2.Hide()
                 ix +=1
-                
                 # Units
                 try:
@@ -369 +517 @@
                 except:
                     units = wx.StaticText(self, -1, "", style=wx.ALIGN_LEFT)
-                self.sizer2.Add(units, (iy,ix),(1,1),  wx.EXPAND|wx.ADJUST_MINSIZE, 0)
-            else:
-                ip = 0
-                iq += 1
-                cb=wx.StaticText(self, -1, item)
-                self.sizer5.Add( cb,( iq, ip),(1,1),  wx.LEFT|wx.EXPAND|wx.ADJUST_MINSIZE, 15)
-                wx.EVT_CHECKBOX(self, cb.GetId(), self._on_select_model)
+                self.sizer5.Add(units, (iy,ix),(1,1),  wx.EXPAND|wx.ADJUST_MINSIZE, 0)
+           
+            self.parameters.append([cb,ctl1,text2,ctl2])
                 
-                ip += 1
-                value= self.model.getParam(item)
-                ctl1 = wx.TextCtrl(self, -1, size=(_BOX_WIDTH,20), style=wx.TE_PROCESS_ENTER)
-                ctl1.SetValue(str (format_number(value)))
-                ctl1.Bind(wx.EVT_KILL_FOCUS, self._onparamEnter)
-                ctl1.Bind(wx.EVT_TEXT_ENTER,self._onparamEnter)
-                self.sizer5.Add(ctl1, (iq,ip),(1,1), wx.EXPAND|wx.ADJUST_MINSIZE, 0)
-            #save data
-            self.parameters.append([cb,ctl1])
         iy+=1
-        self.sizer2.Add((20,20),(iy,ix),(1,1), wx.LEFT|wx.EXPAND|wx.ADJUST_MINSIZE, 15)
+        self.sizer5.Add((20,20),(iy,ix),(1,1), wx.LEFT|wx.EXPAND|wx.ADJUST_MINSIZE, 15)
         
         #Display units text on panel
@@ -396 +531 @@
             else:
                 self.text2_4.Hide()
+        #Disable or enable fit button
+        """
+        if not (len(self.param_toFit ) >0):
+            self.qmin.Disable()
+            self.qmax.Disable()
+        else:
+            self.qmin.Enable()
+            self.qmax.Enable()
+        """  
         self.vbox.Layout()
         self.SetScrollbars(20,20,55,40)
-        
-        self.GrandParent.GetSizer().Layout()
-       
+        self.Layout()
+        self.parent.GetSizer().Layout()
+        
+       
+    def  set_panel_dispers(self, disp_list, type="Gaussian" ):
+        
+        
+       
+        ix=0
+        iy=1
+        ### this will become a separate method
+        if type== "Gaussian" :
+           
+            disp = wx.StaticText(self, -1, 'Dispersion')
+            self.sizer8.Add(disp,( iy, ix),(1,1),  wx.LEFT|wx.EXPAND|wx.ADJUST_MINSIZE, 15)
+            ix += 1 
+            values = wx.StaticText(self, -1, 'Values')
+            self.sizer8.Add(values,( iy, ix),(1,1), wx.EXPAND|wx.ADJUST_MINSIZE, 0)
+            ix +=2
+            self.text2_3 = wx.StaticText(self, -1, 'Errors')
+            self.sizer8.Add(self.text2_3,(iy, ix),(1,1),\
+                            wx.EXPAND|wx.ADJUST_MINSIZE, 0)
+            self.text2_3.Hide() 
+           
+            ix += 1 
+            npts = wx.StaticText(self, -1, 'Npts')
+            self.sizer8.Add(npts,( iy, ix),(1,1), wx.EXPAND|wx.ADJUST_MINSIZE, 0)
+            ix += 1 
+            nsigmas = wx.StaticText(self, -1, 'Nsigmas')
+            self.sizer8.Add(nsigmas,( iy, ix),(1,1), wx.EXPAND|wx.ADJUST_MINSIZE, 0)
+            
+            disp_list.sort()
+            #print disp_list,self.model.fixed,self.model.dispersion
+            for item in self.model.dispersion.keys():
+                name1=item+".width"
+                name2=item+".npts"
+                name3=item+".nsigmas"
+                iy += 1
+                for p in self.model.dispersion[item].keys():
+                    #print "name 1 2 3", name1, name2, name3
+                    if p=="width":
+                        ix = 0
+                        cb = wx.CheckBox(self, -1, name1, (10, 10))
+                        if self.data !=None:
+                            cb.SetValue(False)
+                            wx.EVT_CHECKBOX(self, cb.GetId(), self.select_param)
+                        else:
+                            cb.Disable()
+                        self.sizer8.Add( cb,( iy, ix),(1,1),  wx.LEFT|wx.EXPAND|wx.ADJUST_MINSIZE, 15)
+                        ix = 1
+                        value= self.model.getParam(name1)
+                        ctl1 = wx.TextCtrl(self, -1, size=(_BOX_WIDTH,20), style=wx.TE_PROCESS_ENTER)
+                        ctl1.SetValue(str (format_number(value)))
+                        ctl1.Bind(wx.EVT_KILL_FOCUS, self._onparamEnter)
+                        ctl1.Bind(wx.EVT_TEXT_ENTER,self._onparamEnter)
+                        self.sizer8.Add(ctl1, (iy,ix),(1,1), wx.EXPAND)
+                        
+                        ix = 2
+                        text2=wx.StaticText(self, -1, '+/-')
+                        self.sizer8.Add(text2,(iy, ix),(1,1),\
+                                        wx.EXPAND|wx.ADJUST_MINSIZE, 0) 
+                        text2.Hide()  
+                        ix = 3
+                        ctl2 = wx.TextCtrl(self, -1, size=(_BOX_WIDTH,20), style=wx.TE_PROCESS_ENTER)
+                        self.sizer8.Add(ctl2, (iy,ix),(1,1), wx.EXPAND|wx.ADJUST_MINSIZE, 0)
+                        ctl2.Hide()
+                       
+                        self.parameters.append([cb,ctl1,text2,ctl2])
+                        
+                    elif p=="npts":
+                            ix =4 
+                            value= self.model.getParam(name2)
+                            Tctl = wx.TextCtrl(self, -1, size=(_BOX_WIDTH/2,20), style=wx.TE_PROCESS_ENTER)
+                            Tctl.SetValue(str (format_number(value)))
+                            Tctl.Bind(wx.EVT_KILL_FOCUS, self._onparamEnter)
+                            Tctl.Bind(wx.EVT_TEXT_ENTER,self._onparamEnter)
+                            self.sizer8.Add(Tctl, (iy,ix),(1,1), wx.EXPAND|wx.ADJUST_MINSIZE, 0)
+                            self.fixed_param.append([name2, Tctl])
+                    elif p=="nsigmas":
+                            ix =5 
+                            value= self.model.getParam(name3)
+                            Tctl = wx.TextCtrl(self, -1, size=(_BOX_WIDTH/2,20), style=wx.TE_PROCESS_ENTER)
+                            Tctl.SetValue(str (format_number(value)))
+                            Tctl.Bind(wx.EVT_KILL_FOCUS, self._onparamEnter)
+                            Tctl.Bind(wx.EVT_TEXT_ENTER,self._onparamEnter)
+                            self.sizer8.Add(Tctl, (iy,ix),(1,1), wx.EXPAND|wx.ADJUST_MINSIZE, 0)
+                            self.fixed_param.append([name3, Tctl])
+                            
+           
+         
+           
         
     def _onparamEnter(self,event):
@@ -412 +644 @@
             # Flag to register when a parameter has changed.
             is_modified = False
+            for item in self.fixed_param:
+                try:
+                     name=str(item[0])
+                     value= float(item[1].GetValue())
+                     #print "model para", name,value,self.model.getParam(name)
+                     # If the value of the parameter has changed,
+                     # update the model and set the is_modified flag
+                     if value != self.model.getParam(name):
+                         #print "went hereee"
+                         self.model.setParam(name,value)
+                         is_modified = True
+                         
+                except:
+                     wx.PostEvent(self.parent.parent, StatusEvent(status=\
+                            "Model Drawing  Error:wrong value entered : %s"% sys.exc_value))
+                
             for item in self.parameters:
                 try:
                      name=str(item[0].GetLabelText())
                      value= float(item[1].GetValue())
+                     #print " fittable model para", name,value
                      # If the value of the parameter has changed,
                      # update the model and set the is_modified flag
                      if value != self.model.getParam(name):
+                         #print "went here", name,value
                          self.model.setParam(name,value)
                          is_modified = True
                 except:
-                     wx.PostEvent(self.parent.GrandParent, StatusEvent(status=\
+                     wx.PostEvent(self.parent.parent, StatusEvent(status=\
                             "Model Drawing  Error:wrong value entered : %s"% sys.exc_value))
             
@@ -428 +678 @@
             # If qmin and qmax have been modified, update qmin and qmax and 
             # set the is_modified flag to True
-            if float(self.xmin.GetValue()) != self.qmin:
-                self.qmin = float(self.xmin.GetValue())
+            if float(self.qmin.GetValue()) != self.qmin_x:
+                self.qmin_x = float(self.qmin.GetValue())
                 is_modified = True
-            if float(self.xmax.GetValue()) != self.qmax:
-                self.qmax = float(self.xmax.GetValue())
+            if float(self.qmax.GetValue()) != self.qmax_x:
+                self.qmax_x = float(self.qmax.GetValue())
                 is_modified = True
             
@@ -450 +700 @@
             [Note to coder: This way future changes will be done in only one place.] 
         """
+        #print "_draw_model",self.model
         if name==None:
             name= self.model.name
-        self.manager.draw_model(self.model, name, 
-                                qmin=self.qmin, qmax=self.qmax,
+       
+        self.manager.draw_model(self.model, name, data=self.data,
+                                qmin=self.qmin_x, qmax=self.qmax_x,
                                 qstep= self.num_points,
                                 enable2D=self.enable2D)
@@ -462 +714 @@
                                     enable2D=self.enable2D)
         """
-   
-        
-              
+    def select_param(self,event):
+        pass
+    def select_all_param(self,event): 
+        pass
+        
+       

sansview/perspectives/fitting/old_fitpage1D.py

@@ -5 +5 @@
 import copy
 import sans.models.dispersion_models 
-from sans.guicomm.events import StatusEvent 
-from modelpage import ModelPage  
-from modelpage import format_number
+from sans.guicomm.events import StatusEvent   
 (ModelEventbox, EVT_MODEL_BOX) = wx.lib.newevent.NewEvent()
 _BOX_WIDTH = 80
 
+def format_number(value, high=False):
+    """
+        Return a float in a standardized, human-readable formatted string 
+    """
+    try: 
+        value = float(value)
+    except:
+        print "returning 0"
+        return "0"
+    
+    if high:
+        return "%-6.4g" % value
+    else:
+        return "%-5.3g" % value
 
-
+from modelpage import format_number
+from modelpage import ModelPage
 class FitPage1D(ModelPage):
     """
@@ -39 +52 @@
         #panel interface
         self.vbox  = wx.BoxSizer(wx.VERTICAL)
-        self.sizer10 = wx.GridBagSizer(5,5)
-        self.sizer9 = wx.GridBagSizer(5,5)
-        self.sizer8 = wx.GridBagSizer(5,5)
-        self.sizer7 = wx.GridBagSizer(5,5)
         self.sizer6 = wx.GridBagSizer(5,5)
         self.sizer5 = wx.GridBagSizer(5,5)
@@ -49 +58 @@
         self.sizer2 = wx.GridBagSizer(5,5)
         self.sizer1 = wx.GridBagSizer(5,5)
-        # Add layer
-        #data info layer
-        self.vbox.Add(self.sizer1)
-        #data range 
-        self.vbox.Add(self.sizer2)
-        #instrument smearing selection layer
-        self.vbox.Add(self.sizer3)
-        #model selection
-        self.vbox.Add(wx.StaticLine(self, -1), 0, wx.EXPAND, 0)
-        self.vbox.Add(self.sizer4)
-        #model paramaters layer
-        self.vbox.Add(self.sizer5)
-        #polydispersion selected
-        self.vbox.Add(wx.StaticLine(self, -1), 0, wx.EXPAND, 0)
-        self.vbox.Add(self.sizer6)
-        #combox box for type of dispersion
-        self.vbox.Add(self.sizer7)
-        #dispersion parameters layer
-        self.vbox.Add(self.sizer8)
-        #fit info layer
-        self.vbox.Add(wx.StaticLine(self, -1), 0, wx.EXPAND, 0)
-        self.vbox.Add(self.sizer9)
-        #close layer
-        self.vbox.Add(wx.StaticLine(self, -1), 0, wx.EXPAND, 0)
-        self.vbox.Add(self.sizer10)
-        
-        #---------sizer 1 draw--------------------------------
+        
+        
         self.DataSource  =wx.StaticText(self, -1,str(data.name))
         self.smearer_box = wx.ComboBox(self, -1)
@@ -90 +74 @@
               self.smearer_box.Insert(str(v),i)  
             i+=1
-            
-        # Minimum value of data   
-        self.data_min    = wx.StaticText(self, -1,str(format_number(numpy.min(data.x))))
-        # Maximum value of data  
-        self.data_max    =  wx.StaticText(self, -1,str(format_number(numpy.max(data.x))))
-        #Filing the sizer containing data related fields
+        self.modelbox = wx.ComboBox(self, -1)
+        id = wx.NewId()
+        self.btFit =wx.Button(self,id,'Fit')
+        self.btFit.Bind(wx.EVT_BUTTON, self.onFit,id=id)
+        self.btFit.SetToolTipString("Perform fit.")
+        self.static_line_1 = wx.StaticLine(self, -1)
+       
+        self.vbox.Add(self.sizer3)
+        self.vbox.Add(self.sizer2)
+        self.vbox.Add(self.static_line_1, 0, wx.EXPAND, 0)
+        self.vbox.Add(self.sizer5)
+        self.vbox.Add(self.sizer6)
+        self.vbox.Add(self.sizer4)
+        self.vbox.Add(self.sizer1)
+        
+        id = wx.NewId()
+        self.btClose =wx.Button(self,id,'Close')
+        self.btClose.Bind(wx.EVT_BUTTON, self.onClose,id=id)
+        self.btClose.SetToolTipString("Close page.")
         ix = 0
         iy = 1
-        self.sizer1.Add(wx.StaticText(self, -1, 'Data Source Name : '),(iy,ix),\
+        self.sizer3.Add(wx.StaticText(self, -1, 'Data Source Name : '),(iy,ix),\
                  (1,1), wx.LEFT|wx.EXPAND|wx.ADJUST_MINSIZE, 15)
-       
         ix += 1
-        self.sizer1.Add(self.DataSource,(iy,ix),(1,1), wx.EXPAND|wx.ADJUST_MINSIZE, 0)
-        
-        #---------sizer 2 draw--------------------------------
+        self.sizer3.Add(self.DataSource,(iy,ix),(1,1), wx.EXPAND|wx.ADJUST_MINSIZE, 0)
+        ix += 1
+        self.sizer3.Add((20,20),(iy,ix),(1,1),wx.RIGHT|wx.EXPAND|wx.ADJUST_MINSIZE,0)
+        ix = 0
+        iy += 1
+        self.sizer3.Add(wx.StaticText(self,-1,'Instrument Smearing'),(iy,ix),(1,1)\
+                  , wx.LEFT|wx.EXPAND|wx.ADJUST_MINSIZE, 15)
+        ix += 1
+        self.sizer3.Add(self.smearer_box,(iy,ix),(1,1),  wx.EXPAND|wx.ADJUST_MINSIZE, 0)
+        
+        ix = 0
+        iy += 1
+        self.sizer3.Add(wx.StaticText(self,-1,'Model'),(iy,ix),(1,1)\
+                  , wx.LEFT|wx.EXPAND|wx.ADJUST_MINSIZE, 15)
+        ix += 1
+        self.sizer3.Add(self.modelbox,(iy,ix),(1,1),  wx.EXPAND|wx.ADJUST_MINSIZE, 0)
+        
         ix = 0
         iy = 1
         #set maximum range for x in linear scale
         self.text4_3 = wx.StaticText(self, -1, 'Maximum Data Range(Linear)', style=wx.ALIGN_LEFT)
-        self.sizer2.Add(self.text4_3,(iy,ix),(1,1),\
+        self.sizer4.Add(self.text4_3,(iy,ix),(1,1),\
                    wx.LEFT|wx.EXPAND|wx.ADJUST_MINSIZE, 15)
+        ix += 1
+        self.sizer4.Add(wx.StaticText(self, -1, 'Min'),(iy, ix),(1,1),\
+                            wx.LEFT|wx.EXPAND|wx.ADJUST_MINSIZE, 15)
         ix += 2
-        self.sizer2.Add(wx.StaticText(self, -1, 'Min :'),(iy, ix),(1,1),\
-                            wx.EXPAND|wx.ADJUST_MINSIZE, 0)
-        ix += 1
-        self.sizer2.Add(self.data_min,(iy, ix),(1,1),\
-                            wx.EXPAND|wx.ADJUST_MINSIZE, 0)
-        ix += 1
-        self.sizer2.Add(wx.StaticText(self, -1, 'Max : '),(iy, ix),(1,1),\
-                            wx.EXPAND|wx.ADJUST_MINSIZE, 0)
-        ix += 1
-        self.sizer2.Add(self.data_max,(iy,ix),(1,1), wx.LEFT|wx.EXPAND|wx.ADJUST_MINSIZE, 0)
-        
-        #----sizer 3 draw--------------------------------
-        ix = 0
-        iy = 1
-        self.sizer3.Add(wx.StaticText(self,-1,'Instrument Smearing'),(iy,ix),(1,1)\
-                  , wx.LEFT|wx.EXPAND|wx.ADJUST_MINSIZE, 15)
-        ix += 1
-        self.sizer3.Add(self.smearer_box,(iy,ix),(1,1),  wx.EXPAND|wx.ADJUST_MINSIZE, 0)
-        ix =0
-        iy+=1
-        self.sizer3.Add((20,20),(iy,ix),(1,1),wx.LEFT|wx.EXPAND|wx.ADJUST_MINSIZE, 15)  
-            
-        #------------------ sizer 4  draw------------------------   
-        self.modelbox = wx.ComboBox(self, -1)
-        
-        #filling sizer2
-        ix = 0
-        iy = 1
-        self.sizer4.Add(wx.StaticText(self,-1,'Model'),(iy,ix),(1,1)\
-                  , wx.LEFT|wx.EXPAND|wx.ADJUST_MINSIZE, 15)
-        ix += 1
-        self.sizer4.Add(self.modelbox,(iy,ix),(1,1),  wx.EXPAND|wx.ADJUST_MINSIZE, 0)
-        
-        #----------sizer6-------------------------------------------------
-        self.disable_disp = wx.RadioButton(self, -1, 'No', (10, 10), style=wx.RB_GROUP)
-        self.enable_disp = wx.RadioButton(self, -1, 'Yes', (10, 30))
-        self.Bind(wx.EVT_RADIOBUTTON, self.Set_DipersParam, id=self.disable_disp.GetId())
-        self.Bind(wx.EVT_RADIOBUTTON, self.Set_DipersParam, id=self.enable_disp.GetId())
-        ix= 0
-        iy=1
-        self.sizer6.Add(wx.StaticText(self,-1,'Polydispersity: '),(iy,ix),(1,1)\
-                  , wx.LEFT|wx.EXPAND|wx.ADJUST_MINSIZE, 15)
-        ix += 1
-        self.sizer6.Add(self.enable_disp ,(iy,ix),(1,1),  wx.EXPAND|wx.ADJUST_MINSIZE, 0)
-        ix += 1
-        self.sizer6.Add(self.disable_disp ,(iy,ix),(1,1),  wx.EXPAND|wx.ADJUST_MINSIZE, 0)
-        ix =0
-        iy+=1
-        self.sizer6.Add((20,20),(iy,ix),(1,1),wx.LEFT|wx.EXPAND|wx.ADJUST_MINSIZE, 15)  
-
-        
-        #---------sizer 9 draw----------------------------------------
-        self.tcChi    =  wx.StaticText(self, -1, str(0), style=wx.ALIGN_LEFT)
-        self.tcChi.Hide()
-        self.text1_1 = wx.StaticText(self, -1, 'Chi2/dof', style=wx.ALIGN_LEFT)
-        self.text1_1.Hide()
-        
-        id = wx.NewId()
-        self.btFit =wx.Button(self,id,'Fit')
-        self.btFit.Bind(wx.EVT_BUTTON, self.onFit,id=id)
-        self.btFit.SetToolTipString("Perform fit.")
-         ## Q range
-        self.qmin= 0.001
-        self.qmax= 0.1
-        self.num_points= 100
-        
-        
-        self.xmin    = wx.TextCtrl(self, -1,size=(_BOX_WIDTH,20))
-        self.xmin.SetValue(format_number(self.qmin))
-        self.xmin.SetToolTipString("Minimun value of x in linear scale.")
-        self.xmin.Bind(wx.EVT_KILL_FOCUS, self._onparamEnter)
-        self.xmin.Bind(wx.EVT_TEXT_ENTER, self._onparamEnter)
-        self.xmin.Disable()
-        
-        self.xmax    = wx.TextCtrl(self, -1,size=(_BOX_WIDTH,20))
-        self.xmax.SetValue(format_number(self.qmax))
-        self.xmax.SetToolTipString("Maximum value of x in linear scale.")
-        self.xmax.Bind(wx.EVT_KILL_FOCUS, self._onparamEnter)
-        self.xmax.Bind(wx.EVT_TEXT_ENTER, self._onparamEnter)
-        self.xmax.Disable()
-
-        self.npts    = wx.TextCtrl(self, -1,size=(_BOX_WIDTH,20))
-        self.npts.SetValue(format_number(self.num_points))
-        self.npts.SetToolTipString("Number of point to plot.")
-        self.npts.Bind(wx.EVT_KILL_FOCUS, self._onparamEnter)
-        self.npts.Bind(wx.EVT_TEXT_ENTER, self._onparamEnter)
-        self.npts.Disable()
-        ix = 0
-        iy = 1 
-        self.sizer9.Add(wx.StaticText(self, -1, 'Fitting Range'),(iy, ix),(1,1),\
-                            wx.LEFT|wx.EXPAND|wx.ADJUST_MINSIZE, 15)
-        ix += 1 
-        self.sizer9.Add(wx.StaticText(self, -1, 'Min'),(iy, ix),(1,1),\
-                            wx.EXPAND|wx.ADJUST_MINSIZE, 0)
-        ix += 1
-        self.sizer9.Add(wx.StaticText(self, -1, 'Max'),(iy, ix),(1,1),\
-                            wx.EXPAND|wx.ADJUST_MINSIZE, 0)
-        ix += 1
-        self.sizer9.Add(wx.StaticText(self, -1, 'Npts'),(iy, ix),(1,1),\
+        self.sizer4.Add(wx.StaticText(self, -1, 'Max'),(iy, ix),(1,1),\
                             wx.EXPAND|wx.ADJUST_MINSIZE, 0)
         ix = 0
         iy += 1
-        self.sizer9.Add(wx.StaticText(self, -1, 'x range'),(iy, ix),(1,1),\
+        self.sizer4.Add(wx.StaticText(self, -1, 'x range'),(iy, ix),(1,1),\
                             wx.LEFT|wx.EXPAND|wx.ADJUST_MINSIZE, 15)
         ix += 1
-        self.sizer9.Add(self.xmin,(iy, ix),(1,1), wx.LEFT|wx.EXPAND|wx.ADJUST_MINSIZE, 0)
-        ix += 1
-        self.sizer9.Add(self.xmax,(iy,ix),(1,1), wx.LEFT|wx.EXPAND|wx.ADJUST_MINSIZE, 0)
-        ix += 1
-        self.sizer9.Add(self.npts,(iy,ix),(1,1), wx.LEFT|wx.EXPAND|wx.ADJUST_MINSIZE, 0)
+        self.xmin    = wx.TextCtrl(self, -1,size=(_BOX_WIDTH,20))
+        self.xmin.SetValue(format_number(numpy.min(data.x)))
+        self.xmin.SetToolTipString("Minimun value of x in linear scale.")
+        self.xmin.Bind(wx.EVT_KILL_FOCUS, self._onTextEnter)
+        self.xmin.Bind(wx.EVT_TEXT_ENTER, self._onTextEnter)
+        self.xmin.Disable()
+        self.sizer4.Add(self.xmin,(iy, ix),(1,1), wx.LEFT|wx.EXPAND|wx.ADJUST_MINSIZE, 15)
+        
+       
+        ix += 2
+        self.xmax    = wx.TextCtrl(self, -1,size=(_BOX_WIDTH,20))
+        self.xmax.SetValue(format_number(numpy.max(data.x)))
+        self.xmax.SetToolTipString("Maximum value of x in linear scale.")
+        self.xmax.Bind(wx.EVT_KILL_FOCUS, self._onTextEnter)
+        self.xmax.Bind(wx.EVT_TEXT_ENTER, self._onTextEnter)
+        self.xmax.Disable()
+        self.sizer4.Add(self.xmax,(iy,ix),(1,1), wx.LEFT|wx.EXPAND|wx.ADJUST_MINSIZE, 0)
+        ix =0
+        iy+=1
+        self.sizer4.Add((20,20),(iy,ix),(1,1),wx.LEFT|wx.EXPAND|wx.ADJUST_MINSIZE, 15)
+        #Set chisqr  result into TextCtrl
         ix = 0
-        iy += 1
-        self.sizer9.Add(self.text1_1,(iy,ix),(1,1),\
+        iy = 1
+        
+        self.text1_1 = wx.StaticText(self, -1, 'Chi2/dof', style=wx.ALIGN_LEFT)
+        #self.sizer1.Add(self.text1_1,1)
+        self.sizer1.Add(self.text1_1,(iy,ix),(1,1),\
                    wx.LEFT|wx.EXPAND|wx.ADJUST_MINSIZE, 15)
         ix += 1
-        self.sizer9.Add(self.tcChi,(iy,ix),(1,1), wx.LEFT|wx.EXPAND|wx.ADJUST_MINSIZE, 0)
+        self.tcChi    = wx.TextCtrl(self, -1,size=(_BOX_WIDTH,20))
+        self.tcChi.SetToolTipString("Chi^2 over degrees of freedom.")
+        #self.sizer1.Add(self.tcChi, 1, wx.R | wx.BOTTOM , 5)
+        self.sizer1.Add(self.tcChi,(iy,ix),(1,1), wx.LEFT|wx.EXPAND|wx.ADJUST_MINSIZE, 0)
         ix +=2
-        self.sizer9.Add(self.btFit,(iy,ix),(1,1), wx.LEFT|wx.EXPAND|wx.ADJUST_MINSIZE, 0)
-        ix =0
-        iy+=1 
-        self.sizer9.Add((20,20),(iy,ix),(1,1), wx.LEFT|wx.EXPAND|wx.ADJUST_MINSIZE, 0)
-        #----------sizer 10 draw------------------------------------------------------
-        id = wx.NewId()
-        self.btClose =wx.Button(self,id,'Close')
-        self.btClose.Bind(wx.EVT_BUTTON, self.onClose,id=id)
-        self.btClose.SetToolTipString("Close page.")
-        
-        ix= 3
-        iy= 1
-        self.sizer10.Add((20,20),(iy,ix),(1,1),wx.LEFT|wx.EXPAND|wx.ADJUST_MINSIZE, 15)
-        ix +=1
-        self.sizer10.Add( self.btClose,(iy,ix),(1,1), wx.LEFT|wx.EXPAND|wx.ADJUST_MINSIZE, 0)
-        ix =0
+        #self.sizer1.Add(self.btFit, 1, wx.LEFT | wx.BOTTOM , 5)
+        self.sizer1.Add(self.btFit,(iy,ix),(1,1), wx.LEFT|wx.EXPAND|wx.ADJUST_MINSIZE, 0)
+        ix+= 2
+        self.sizer1.Add( self.btClose,(iy,ix),(1,1), wx.LEFT|wx.EXPAND|wx.ADJUST_MINSIZE, 0)
+        #self.sizer1.Add( self.btClose,1, wx.LEFT | wx.BOTTOM , 5)
+        self.tcChi.Disable()
+        ix= 0
         iy+=1
-        self.sizer10.Add((20,20),(iy,ix),(1,1),wx.LEFT|wx.EXPAND|wx.ADJUST_MINSIZE, 15)
-       
+        self.sizer1.Add((20,20),(iy,ix),(1,1), wx.LEFT|wx.EXPAND|wx.ADJUST_MINSIZE, 0)
+        #self.sizer1.Add((20,20), 0)
         # contains link between  model ,all its parameters, and panel organization
         self.parameters=[]
@@ -270 +198 @@
         self.Layout()
         self.GrandParent.GetSizer().Layout()
-   
-   
+       
+
+  
+  
+ 
+        
     def compute_chisqr(self):
         """ @param fn: function that return model value
@@ -296 +228 @@
                     if numpy.isfinite(item):
                         sum +=item
-                self.tcChi.SetLabel(format_number(math.fabs(sum)))
+                self.tcChi.SetValue(format_number(math.fabs(sum)))
             except:
                 wx.PostEvent(self.parent.GrandParent, StatusEvent(status=\
                             "Chisqr cannot be compute: %s"% sys.exc_value))
             
+            
+    def onFit(self,event):
+        """ signal for fitting"""
+         
+        flag=self.checkFitRange()
+        self.set_manager(self.manager)
+     
+        qmin=float(self.xmin.GetValue())
+        qmax =float( self.xmax.GetValue())
+        if len(self.param_toFit) >0 and flag==True:
+            self.manager.schedule_for_fit( value=1,fitproblem =None) 
+            self.manager._on_single_fit(qmin=qmin,qmax=qmax)
+        else:
+              wx.PostEvent(self.parent.GrandParent, StatusEvent(status=\
+                            "Select at least on parameter to fit "))
+  
+    
     def _on_select_model(self,event):
         """
@@ -321 +270 @@
                 except:
                     raise #ValueError,"model.name is not equal to model class name"
-                break       
-    def onFit(self,event):
-        """ signal for fitting"""
-         
-        flag=self.checkFitRange()
-        self.set_manager(self.manager)
-     
-        qmin=float(self.xmin.GetValue())
-        qmax =float( self.xmax.GetValue())
-        if len(self.param_toFit) >0 and flag==True:
-            self.manager.schedule_for_fit( value=1,fitproblem =None) 
-            self.manager._on_single_fit(qmin=qmin,qmax=qmax)
-        else:
-              wx.PostEvent(self.parent.GrandParent, StatusEvent(status=\
-                            "Select at least on parameter to fit "))
-  
-   
+                break
+    
     def _onTextEnter(self,event):
         """
@@ -354 +288 @@
                             "Drawing  Error:wrong value entered %s"% sys.exc_value))
         
-   
+    def checkFitRange(self):
+        """
+            Check the validity of fitting range
+            @note: xmin should always be less than xmax or else each control box
+            background is colored in pink.
+        """
+       
+        flag = True
+        valueMin = self.xmin.GetValue()
+        valueMax = self.xmax.GetValue()
+        # Check for possible values entered
+        #print "fitpage: checkfitrange:",valueMin,valueMax
+        try:
+            if (float(valueMax)> float(valueMin)):
+                self.xmax.SetBackgroundColour(wx.WHITE)
+                self.xmin.SetBackgroundColour(wx.WHITE)
+            else:
+                flag = False
+                self.xmin.SetBackgroundColour("pink")
+                self.xmax.SetBackgroundColour("pink")      
+        except:
+            flag = False
+            self.xmin.SetBackgroundColour("pink")
+            self.xmax.SetBackgroundColour("pink")
+            
+        self.xmin.Refresh()
+        self.xmax.Refresh()
+        return flag
+    
+
     
     def get_param_list(self):
@@ -368 +331 @@
             raise ValueError,"missing parameter to fit"
         
-    
-           
-    def old_set_panel(self,model):
+        
+    def set_panel(self,model):
         """
             Build the panel from the model content
             @param model: the model selected in combo box for fitting purpose
         """
+        self.sizer2.Clear(True)
         self.sizer5.Clear(True)
+        self.sizer6.Clear(True)
         self.parameters = []
         self.param_toFit=[]
@@ -382 +346 @@
         #print "fitpage1D : dispersion list",self.model.getDispParamList()
         keys.sort()
+        disp_list=self.model.getDispParamList()
+        fixed=self.model.fixed
+        print "fixed",fixed
+        #model.setParam("scale", 2)
+        #print "model sphere scale fixed?", self.model.is_fittable("scale")
+        ip=0
+        iq=1
+        
         ik=0
         im=1
-        
+        if len(disp_list)>0:
+            disp = wx.StaticText(self, -1, 'Dispersion')
+            self.sizer5.Add(disp,( iq, ip),(1,1),  wx.LEFT|wx.EXPAND|wx.ADJUST_MINSIZE, 15)
+            ip += 1 
+            values = wx.StaticText(self, -1, 'Values')
+            self.sizer5.Add(values,( iq, ip),(1,1), wx.EXPAND|wx.ADJUST_MINSIZE, 0)
+            
+        disp_list.sort()
         iy = 1
         ix = 0
         self.cb1 = wx.CheckBox(self, -1,"Select all", (10, 10))
         wx.EVT_CHECKBOX(self, self.cb1.GetId(), self.select_all_param)
-        self.sizer5.Add(self.cb1,(iy, ix),(1,1),\
+        self.sizer2.Add(self.cb1,(iy, ix),(1,1),\
                           wx.LEFT|wx.EXPAND|wx.ADJUST_MINSIZE, 15)
         ix +=1
         self.text2_2 = wx.StaticText(self, -1, 'Values')
-        self.sizer5.Add(self.text2_2,(iy, ix),(1,1),\
+        self.sizer2.Add(self.text2_2,(iy, ix),(1,1),\
                             wx.EXPAND|wx.ADJUST_MINSIZE, 0) 
         ix +=2
         self.text2_3 = wx.StaticText(self, -1, 'Errors')
-        self.sizer5.Add(self.text2_3,(iy, ix),(1,1),\
+        self.sizer2.Add(self.text2_3,(iy, ix),(1,1),\
                             wx.EXPAND|wx.ADJUST_MINSIZE, 0)
         self.text2_3.Hide() 
         ix +=1
         self.text2_4 = wx.StaticText(self, -1, 'Units')
-        self.sizer5.Add(self.text2_4,(iy, ix),(1,1),\
+        self.sizer2.Add(self.text2_4,(iy, ix),(1,1),\
                             wx.EXPAND|wx.ADJUST_MINSIZE, 0) 
         self.text2_4.Hide()
-        disp_list=self.model.getDispParamList()
+        #print "keys", keys
+        #print "disp_list", disp_list
+        #print "fix_list",fixed
         for item in keys:
             if not item in disp_list:
@@ -413 +394 @@
                 cb = wx.CheckBox(self, -1, item, (10, 10))
                 cb.SetValue(False)
-                self.sizer5.Add( cb,( iy, ix),(1,1),  wx.LEFT|wx.EXPAND|wx.ADJUST_MINSIZE, 15)
+                self.sizer2.Add( cb,( iy, ix),(1,1),  wx.LEFT|wx.EXPAND|wx.ADJUST_MINSIZE, 15)
                 wx.EVT_CHECKBOX(self, cb.GetId(), self.select_param)
             
@@ -422 +403 @@
                 ctl1.Bind(wx.EVT_KILL_FOCUS, self._onparamEnter)
                 ctl1.Bind(wx.EVT_TEXT_ENTER,self._onparamEnter)
-                self.sizer5.Add(ctl1, (iy,ix),(1,1), wx.EXPAND)
+                self.sizer2.Add(ctl1, (iy,ix),(1,1), wx.EXPAND)
                 
                 ix += 1
                 text2=wx.StaticText(self, -1, '+/-')
-                self.sizer5.Add(text2,(iy, ix),(1,1),\
+                self.sizer2.Add(text2,(iy, ix),(1,1),\
                                 wx.EXPAND|wx.ADJUST_MINSIZE, 0) 
                 text2.Hide()  
                 ix += 1
                 ctl2 = wx.TextCtrl(self, -1, size=(_BOX_WIDTH,20), style=wx.TE_PROCESS_ENTER)
-                self.sizer5.Add(ctl2, (iy,ix),(1,1), wx.EXPAND|wx.ADJUST_MINSIZE, 0)
+                self.sizer2.Add(ctl2, (iy,ix),(1,1), wx.EXPAND|wx.ADJUST_MINSIZE, 0)
                 ctl2.Hide()
                 ix +=1
@@ -439 +420 @@
                 except:
                     units = wx.StaticText(self, -1, "", style=wx.ALIGN_LEFT)
-                self.sizer5.Add(units, (iy,ix),(1,1),  wx.EXPAND|wx.ADJUST_MINSIZE, 0)
-            """
+                self.sizer2.Add(units, (iy,ix),(1,1),  wx.EXPAND|wx.ADJUST_MINSIZE, 0)
             else:
-                if not item in fixed:
+                if item in fixed:
                     ip = 0
                     iq += 1
@@ -472 +452 @@
                     im += 1
             #save data
-            """
+            
             self.parameters.append([cb,ctl1,text2,ctl2])
                 
         iy+=1
-        self.sizer5.Add((20,20),(iy,ix),(1,1), wx.LEFT|wx.EXPAND|wx.ADJUST_MINSIZE, 15)
+        self.sizer2.Add((20,20),(iy,ix),(1,1), wx.LEFT|wx.EXPAND|wx.ADJUST_MINSIZE, 15)
         
         #Display units text on panel
@@ -523 +503 @@
         self.set_model_parameter()
         
-    
+    def set_model_parameter(self):
+        if len(self.parameters) !=0 and self.model !=None:
+            # Flag to register when a parameter has changed.
+            is_modified = False
+            for item in self.fixed_param:
+                
+                try:
+                     name=str(item[0])
+                     value= float(item[1].GetValue())
+#                     print "model para", name,value
+                     # If the value of the parameter has changed,
+                     # update the model and set the is_modified flag
+                     if value != self.model.getParam(name):
+                         self.model.setParam(name,value)
+                         is_modified = True
+                except:
+                     wx.PostEvent(self.parent.GrandParent, StatusEvent(status=\
+                            "Model Drawing  Error:wrong value entered : %s"% sys.exc_value))
+                
+            for item in self.parameters:
+#                print "paramters",str(item[0].GetLabelText())
+                try:
+                     name=str(item[0].GetLabelText())
+                     value= float(item[1].GetValue())
+#                     print "model para", name,value
+                     # If the value of the parameter has changed,
+                     # update the model and set the is_modified flag
+                     if value != self.model.getParam(name):
+                         self.model.setParam(name,value)
+                         is_modified = True
+                except:
+                     wx.PostEvent(self.parent.GrandParent, StatusEvent(status=\
+                            "Model Drawing  Error:wrong value entered : %s"% sys.exc_value))
+            
+            # Here we should check whether the boundaries have been modified.
+            # If qmin and qmax have been modified, update qmin and qmax and 
+            # set the is_modified flag to True
+            if float(self.xmin.GetValue()) != self.qmin:
+                self.qmin = float(self.xmin.GetValue())
+                is_modified = True
+            if float(self.xmax.GetValue()) != self.qmax:
+                self.qmax = float(self.xmax.GetValue())
+                is_modified = True
+            
+            if is_modified:
+                self.manager.redraw_model(qmin=self.qmin, qmax=self.qmax)
+         
     def select_all_param(self,event): 
         """

sansview/perspectives/fitting/old_fitpanel.py

@@ -1 +1 @@
 import wx
-import wx.aui
 import wx.lib
 import numpy
@@ -8 +7 @@
 
 
-class FitPanel(wx.aui.AuiNotebook):    
-#class FitPanel(wx.aui.AuiNotebook,wx.panel):
+    
+class FitPanel(wx.Panel):
     """
         FitPanel class contains fields allowing to fit  models and  data
@@ -21 +20 @@
     window_caption = "Fit Panel "
     CENTER_PANE = True
+   
+    
     def __init__(self, parent, *args, **kwargs):
-        
-        wx.aui.AuiNotebook.__init__(self,parent,-1, style=wx.aui.AUI_NB_SCROLL_BUTTONS )
-        
+        wx.Panel.__init__(self, parent, *args, **kwargs)
         self.manager=None
         self.parent=parent
         self.event_owner=None
-        
-        pageClosedEvent = wx.aui.EVT_AUINOTEBOOK_PAGE_CLOSE
-        self.Bind(wx.aui.EVT_AUINOTEBOOK_PAGE_CLOSE, self.onClosePage)
-
+        #self.menu_mng = models.ModelManager()
+        self.nb = wx.Notebook(self)
+        self.sizer = wx.BoxSizer()
+        self.sizer.Add(self.nb, 1, wx.EXPAND)
         #Creating an initial page for simultaneous fitting
         from simfitpage import SimultaneousFitPage
-        self.sim_page = SimultaneousFitPage(self, -1)
-        self.AddPage(self.sim_page,"Simultaneous Fit")
-        
-
+        self.sim_page = SimultaneousFitPage(self.nb, -1)
+        
+        #self.fit_panel.add_page(self.sim_page,"Simultaneous Fit")
+        self.nb.AddPage(self.sim_page,"Simultaneous Fit")
         
         #dictionary of miodel {model class name, model class}
@@ -51 +50 @@
         self.count=0
         #updating the panel
-        self.Update()
+        self.nb.Update()
+        self.SetSizer(self.sizer)
+        self.sizer.Fit(self)
         self.Center()
-    def onClosePage(self, event):
-        self.ToggleWindowStyle(wx.aui.AUI_NB_CLOSE_ON_ACTIVE_TAB)
-        print "went here",self.get_current_page(), self.GetPage(0)
-        #event.Skip()
-        if self.GetPageCount() <= 2:
-            print "wente here"
-            
-            # Prevent last tab from being closed
-            self.ToggleWindowStyle(~wx.aui.AUI_NB_CLOSE_ON_ACTIVE_TAB)
-            
-
-   
-
+        
 
         
@@ -99 +88 @@
             if data.__class__.__name__=='Data2D':
                  from fitpage2D import FitPage2D
-                 panel = FitPage2D(self,data, -1)
+                 panel = FitPage2D(self.nb,data, -1)
                  
             else:
                 
                 from fitpage1D import FitPage1D
-                panel = FitPage1D(self,data, -1)
+                panel = FitPage1D(self.nb,data, -1)
             m_name= "M"+str(self.count)  
             panel.set_manager(self.manager)
             panel.set_owner(self.event_owner)
             
-            self.AddPage(page=panel,caption=name,select=True)
+            self.nb.AddPage(page=panel,text=name,select=True)
             panel.populate_box( self.model_list_box)
             self.fit_page_name = name
@@ -123 +112 @@
         """
         from modelpage import ModelPage
-        panel = ModelPage(self,model,page_title, -1)
+        panel = ModelPage(self.nb,model,page_title, -1)
         panel.set_manager(self.manager)
         panel.set_owner(self.event_owner)
-        self.AddPage(page=panel,caption="Model",select=True)
+        #self.nb.AddPage(page=panel,text=page_title,select=True)
+        self.nb.AddPage(page=panel,text="Model",select=True)
         panel.populate_box( self.model_list_box)
         self.draw_model_name=page_title
-        self.model_page_number=self.GetSelection()
-        self.model_page=self.GetPage(self.GetSelection())
+        self.model_page_number=self.nb.GetSelection()
+        self.model_page=self.nb.GetPage(self.nb.GetSelection())
         
         
@@ -160 +150 @@
             self.model_page.select_model(model, page_title)
            
+    def get_notebook(self):
+        """
+            @return self.nb: return its own notebook mostly used by fitting module 
+        """
+        return self.nb
+    
+    def get_page(self, n):
+        """
+            @return page at position n
+            @param n: page number
+        """
+        return self.nb.GetPage(n)
+    
+    
+    def get_page_count(self):
+        """ @return  number total of pages contained in notebook"""
+        return self.nb.GetPageCount()
+        
+        
     def get_current_page(self):
         """
             @return the current page selected
         """
-        #return self.nb.GetCurrentPage()
-        return self.GetPage(self.GetSelection() )
-  
-    
-    def old_onClose(self, page=None,page_number=None):
+        return self.nb.GetCurrentPage()
+    
+    
+    def get_selected_page(self):
+        """ @return the page just selected by the user """
+        return self.nb.GetPage(self.nb.GetSelection())
+    
+    
+    def get_page_number(self):
+        return self.nb.GetSelection()
+    
+    def onClose(self, page=None,page_number=None):
         """
              close the current page except the simpage. remove each check box link to the model

sansview/perspectives/fitting/old_fitting.py

@@ -8 +8 @@
 from sans.guicomm.events import NewPlotEvent, StatusEvent  
 from sans.guicomm.events import EVT_SLICER_PANEL,EVT_MODEL2D_PANEL
+from sans.guiframe.model_thread import Calc2D
+from sans.guiframe.calcthread import CalcThread
+
 
 from sans.fit.AbstractFitEngine import Model,Data,FitData1D,FitData2D
@@ -320 +323 @@
                         if model.name == model_name:
                             small_out.append(p.value )
-                            small_cov.append(p.stderr)
+                            if p.stderr ==None:
+                                small_cov.append(0)
+                            else:
+                                small_cov.append(p.stderr)
                             model.setParam(param_name,p.value)  
                     # Display result on each page 
@@ -359 +365 @@
                 model=list[0]
                 smearer= value.get_smearer()
-                print "single fit", model, smearer
                 #Create list of parameters for fitting used
                 pars=[]
@@ -379 +384 @@
                     self.schedule_for_fit( 0,value) 
                 except:
-                    raise 
-                    #wx.PostEvent(self.parent, StatusEvent(status="Fitting error: %s" % sys.exc_value))
+                    #raise 
+                    wx.PostEvent(self.parent, StatusEvent(status="Fitting error: %s" % sys.exc_value))
                     return
                 # make sure to keep an alphabetic order 
@@ -407 +412 @@
            
         except:
-            raise
+            #raise
             wx.PostEvent(self.parent, StatusEvent(status="Single Fit error: %s" % sys.exc_value))
             return
@@ -517 +522 @@
         name = evt.name
         
-        sim_page=self.fit_panel.GetPage(0)
+        sim_page=self.fit_panel.get_page(0)
         current_pg = self.fit_panel.get_current_page() 
+        selected_page = self.fit_panel.get_selected_page()
         if current_pg != sim_page:
             current_pg.set_panel(model)
@@ -559 +565 @@
             @param currpage: page in a dictionary referring to some data
         """
-        if self.fit_panel.GetPageCount() >1:
+        if self.fit_panel.get_page_count() >1:
             for page in self.page_finder.iterkeys():
                 if  page==currpage :  
@@ -635 +641 @@
                     
                 theory.data = numpy.zeros((len(data.y_bins),len(data.x_bins)))
-                for i in range(len(data.y_bins)):
-                    if data.y_bins[i]>= ymin and data.y_bins[i]<= ymax:
-                        for j in range(len(data.x_bins)):
-                            if data.x_bins[i]>= qmin and data.x_bins[i]<= qmax:
-                                theory.data[j][i]=model.runXY([data.x_bins[j],data.y_bins[i]])
-               
+                for i in range(len(data.x_bins)):
+                    if data.x_bins[i]>= qmin and data.x_bins[i]<= qmax:
+                        for j in range(len(data.y_bins)):
+                            if data.y_bins[j]>= ymin and data.y_bins[j]<= ymax:
+                                theory.data[j][i]=model.runXY([data.x_bins[i],data.y_bins[j]])
+
                 #print "fitting : plot_helper:", theory.image
                 #print data.image
@@ -673 +679 @@
         self.fit_panel.add_model_page(model,description,name,topmenu=True)
         
-    def draw_model(self,model,name ,data=None,description=None,enable1D=True, enable2D=False,
+    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
         """
-        if data !=None:
-            self.redraw_model(qmin,qmax)
-            return 
         self._draw_model2D(model=model,
                            description=model.description,
@@ -741 +744 @@
     
     def complete(self, output, elapsed, model, qmin, qmax,qstep=DEFAULT_NPTS):
-       
+  
         wx.PostEvent(self.parent, StatusEvent(status="Calc \
         complete in %g sec" % elapsed))
@@ -794 +797 @@
         self.model= model
         if enable2D:
-            from model_thread import Calc2D
+            
             self.calc_thread = Calc2D(parent =self.parent,x=x,
                                        y=y,model= self.model, 

sansview/perspectives/fitting/old_modelpage.py

@@ -4 +4 @@
 import numpy
 import copy
-
 
 from sans.guicomm.events import StatusEvent   
@@ -25 +24 @@
         return "%-5.3g" % value
 
-
+    
 class ModelPage(wx.ScrolledWindow):
     """
@@ -46 +45 @@
         """
         #self.scroll = wx.ScrolledWindow(self)
-        
         self.manager = None
         self.parent  = parent
-        self.event_owner = None
-        # this panel does contain data .existing data allow a different drawing
-        #on set_model parameters
-        self.data=None
+        self.event_owner=None
         #panel interface
         self.vbox  = wx.BoxSizer(wx.VERTICAL)
-        self.sizer10 = wx.GridBagSizer(5,5)
-        self.sizer9 = wx.GridBagSizer(5,5)
-        self.sizer8 = wx.GridBagSizer(5,5)
-        self.sizer7 = wx.GridBagSizer(5,5)
-        self.sizer6 = wx.GridBagSizer(5,5)
+        self.sizer3 = wx.GridBagSizer(5,5)
+        self.sizer1 = wx.GridBagSizer(5,5)
+        self.sizer2 = wx.GridBagSizer(5,5)
+        self.sizer4 = wx.GridBagSizer(5,5)
         self.sizer5 = wx.GridBagSizer(5,5)
-        self.sizer4 = wx.GridBagSizer(5,5)
-       
-        #model selection
-        self.vbox.Add(wx.StaticLine(self, -1), 0, wx.EXPAND, 0)
+        self.static_line_1 = wx.StaticLine(self, -1)
+        self.modelbox = wx.ComboBox(self, -1)
+        id = wx.NewId()
+        self.vbox.Add(self.sizer3)
+        self.vbox.Add(self.sizer1)
+        self.vbox.Add(self.sizer2)
+        self.vbox.Add(self.static_line_1, 0, wx.EXPAND, 0)
+        self.vbox.Add(self.sizer5)
         self.vbox.Add(self.sizer4)
-        #model paramaters layer
-        self.vbox.Add(self.sizer5)
-        #polydispersion selected
-        self.vbox.Add(wx.StaticLine(self, -1), 0, wx.EXPAND, 0)
-        self.vbox.Add(self.sizer6)
-        #combox box for type of dispersion
-        self.vbox.Add(self.sizer7)
-        #dispersion parameters layer
-        self.vbox.Add(self.sizer8)
-        # plotting range
-        self.vbox.Add(self.sizer9)
-        #close layer
-        self.vbox.Add(wx.StaticLine(self, -1), 0, wx.EXPAND, 0)
-        self.vbox.Add(wx.StaticLine(self, -1), 0, wx.EXPAND, 0)
-        self.vbox.Add(self.sizer10)
-        
-      
-        #------------------ sizer 4  draw------------------------   
-        self.modelbox = wx.ComboBox(self, -1)
-         # preview selected model name
-        self.prevmodel_name=name
-        #print "model view prev_model",name
-        self.modelbox.SetValue(self.prevmodel_name)
-        #filling sizer2
+        
+        id = wx.NewId()
+        self.btClose =wx.Button(self,id,'Close')
+        self.btClose.Bind(wx.EVT_BUTTON, self.onClose,id=id)
+        self.btClose.SetToolTipString("Close page.")
+        ix = 1
+        iy = 1 
+        self.sizer4.Add(wx.StaticText(self, -1, 'Min'),(iy, ix),(1,1),\
+                            wx.LEFT|wx.EXPAND|wx.ADJUST_MINSIZE, 15)
+        ix += 1
+        self.sizer4.Add(wx.StaticText(self, -1, 'Max'),(iy, ix),(1,1),\
+                            wx.EXPAND|wx.ADJUST_MINSIZE, 0)
+        ix += 1
+        self.sizer4.Add(wx.StaticText(self, -1, 'Npts'),(iy, ix),(1,1),\
+                            wx.EXPAND|wx.ADJUST_MINSIZE, 0)
         ix = 0
-        iy = 1
-        self.sizer4.Add(wx.StaticText(self,-1,'Model'),(iy,ix),(1,1)\
-                  , wx.LEFT|wx.EXPAND|wx.ADJUST_MINSIZE, 15)
-        ix += 1
-        self.sizer4.Add(self.modelbox,(iy,ix),(1,1),  wx.EXPAND|wx.ADJUST_MINSIZE, 0)
-        ix += 1
-        id = wx.NewId()
-        self.model_view =wx.Button(self,id,'View 2D')
-        self.model_view.Bind(wx.EVT_BUTTON, self.onModel2D,id=id)
-        self.model_view.SetToolTipString("View model in 2D")
-        self.sizer4.Add(self.model_view,(iy,ix),(1,1),\
-                   wx.LEFT|wx.EXPAND|wx.ADJUST_MINSIZE, 15)
-        self.model_view.SetFocus()
-        #----------sizer6-------------------------------------------------
-        self.disable_disp = wx.RadioButton(self, -1, 'No', (10, 10), style=wx.RB_GROUP)
-        self.enable_disp = wx.RadioButton(self, -1, 'Yes', (10, 30))
-        self.Bind(wx.EVT_RADIOBUTTON, self.Set_DipersParam, id=self.disable_disp.GetId())
-        self.Bind(wx.EVT_RADIOBUTTON, self.Set_DipersParam, id=self.enable_disp.GetId())
-        ix= 0
-        iy=1
-        self.sizer6.Add(wx.StaticText(self,-1,'Polydispersity: '),(iy,ix),(1,1)\
-                  , wx.LEFT|wx.EXPAND|wx.ADJUST_MINSIZE, 15)
-        ix += 1
-        self.sizer6.Add(self.enable_disp ,(iy,ix),(1,1),  wx.EXPAND|wx.ADJUST_MINSIZE, 0)
-        ix += 1
-        self.sizer6.Add(self.disable_disp ,(iy,ix),(1,1),  wx.EXPAND|wx.ADJUST_MINSIZE, 0)
-        ix =0
-        iy+=1
-        self.sizer6.Add((20,20),(iy,ix),(1,1),wx.LEFT|wx.EXPAND|wx.ADJUST_MINSIZE, 15)  
-
-        
-        #---------sizer 9 draw----------------------------------------
-       
-         ## Q range
+        iy += 1
+        self.sizer4.Add(wx.StaticText(self, -1, 'x range'),(iy, ix),(1,1),\
+                            wx.LEFT|wx.EXPAND|wx.ADJUST_MINSIZE, 15)
+        ## Q range
         self.qmin= 0.001
         self.qmax= 0.1
         self.num_points= 100
         
-        
+        ix += 1
         self.xmin    = wx.TextCtrl(self, -1,size=(_BOX_WIDTH,20))
         self.xmin.SetValue(format_number(self.qmin))
@@ -135 +94 @@
         self.xmin.Bind(wx.EVT_KILL_FOCUS, self._onparamEnter)
         self.xmin.Bind(wx.EVT_TEXT_ENTER, self._onparamEnter)
-        self.xmin.Disable()
-        
+        self.sizer4.Add(self.xmin,(iy, ix),(1,1), wx.LEFT|wx.EXPAND|wx.ADJUST_MINSIZE, 15)
+        
+       
+        ix += 1
         self.xmax    = wx.TextCtrl(self, -1,size=(_BOX_WIDTH,20))
         self.xmax.SetValue(format_number(self.qmax))
@@ -142 +103 @@
         self.xmax.Bind(wx.EVT_KILL_FOCUS, self._onparamEnter)
         self.xmax.Bind(wx.EVT_TEXT_ENTER, self._onparamEnter)
-        self.xmax.Disable()
-
+        self.sizer4.Add(self.xmax,(iy,ix),(1,1), wx.LEFT|wx.EXPAND|wx.ADJUST_MINSIZE, 0)
+        ix += 1
         self.npts    = wx.TextCtrl(self, -1,size=(_BOX_WIDTH,20))
         self.npts.SetValue(format_number(self.num_points))
@@ -149 +110 @@
         self.npts.Bind(wx.EVT_KILL_FOCUS, self._onparamEnter)
         self.npts.Bind(wx.EVT_TEXT_ENTER, self._onparamEnter)
-        self.npts.Disable()
-        ix = 0
-        iy = 1 
-        self.sizer9.Add(wx.StaticText(self, -1, 'Plotting Range'),(iy, ix),(1,1),\
-                            wx.LEFT|wx.EXPAND|wx.ADJUST_MINSIZE, 15)
-        ix += 1 
-        self.sizer9.Add(wx.StaticText(self, -1, 'Min'),(iy, ix),(1,1),\
-                            wx.EXPAND|wx.ADJUST_MINSIZE, 0)
-        ix += 1
-        self.sizer9.Add(wx.StaticText(self, -1, 'Max'),(iy, ix),(1,1),\
-                            wx.EXPAND|wx.ADJUST_MINSIZE, 0)
-        ix += 1
-        self.sizer9.Add(wx.StaticText(self, -1, 'Npts'),(iy, ix),(1,1),\
-                            wx.EXPAND|wx.ADJUST_MINSIZE, 0)
+       
+        self.sizer4.Add(self.npts,(iy,ix),(1,1), wx.LEFT|wx.EXPAND|wx.ADJUST_MINSIZE, 0)
         ix = 0
         iy += 1
-        self.sizer9.Add(wx.StaticText(self, -1, 'x range'),(iy, ix),(1,1),\
-                            wx.LEFT|wx.EXPAND|wx.ADJUST_MINSIZE, 15)
-        ix += 1
-        self.sizer9.Add(self.xmin,(iy, ix),(1,1), wx.LEFT|wx.EXPAND|wx.ADJUST_MINSIZE, 0)
-        ix += 1
-        self.sizer9.Add(self.xmax,(iy,ix),(1,1), wx.LEFT|wx.EXPAND|wx.ADJUST_MINSIZE, 0)
-        ix += 1
-        self.sizer9.Add(self.npts,(iy,ix),(1,1), wx.LEFT|wx.EXPAND|wx.ADJUST_MINSIZE, 0)
-        
-        ix =0
-        iy+=1 
-        self.sizer9.Add((20,20),(iy,ix),(1,1), wx.LEFT|wx.EXPAND|wx.ADJUST_MINSIZE, 0)
-        #----------sizer 10 draw------------------------------------------------------
+        self.sizer4.Add((20,20),(iy, ix),(1,1), wx.LEFT|wx.EXPAND|wx.ADJUST_MINSIZE, 15)
+        ix +=3
+        self.sizer4.Add( self.btClose,(iy,ix),(1,1), wx.LEFT|wx.EXPAND|wx.ADJUST_MINSIZE, 0)
+        ix = 0
+        iy = 1
+        self.sizer3.Add(wx.StaticText(self,-1,'Model'),(iy,ix),(1,1)\
+                  , wx.LEFT|wx.EXPAND|wx.ADJUST_MINSIZE, 15)
+        ix += 1
+        self.sizer3.Add(self.modelbox,(iy,ix),(1,1),  wx.EXPAND|wx.ADJUST_MINSIZE, 0)
+        #ix = 0
+        #iy += 1
+        ix += 1
         id = wx.NewId()
-        self.btClose =wx.Button(self,id,'Close')
-        self.btClose.Bind(wx.EVT_BUTTON, self.onClose,id=id)
-        self.btClose.SetToolTipString("Close page.")
-        
-        ix= 3
-        iy= 1
-        self.sizer10.Add((20,20),(iy,ix),(1,1),wx.LEFT|wx.EXPAND|wx.ADJUST_MINSIZE, 15)
-        ix +=1
-        self.sizer10.Add( self.btClose,(iy,ix),(1,1), wx.LEFT|wx.EXPAND|wx.ADJUST_MINSIZE, 0)
-        ix =0
-        iy+=1
-        self.sizer10.Add((20,20),(iy,ix),(1,1),wx.LEFT|wx.EXPAND|wx.ADJUST_MINSIZE, 15)
-       
+        self.model_view =wx.Button(self,id,'View 2D')
+        self.model_view.Bind(wx.EVT_BUTTON, self.onModel2D,id=id)
+        self.model_view.SetToolTipString("View model in 2D")
+        self.sizer3.Add(self.model_view,(iy,ix),(1,1),\
+                   wx.LEFT|wx.EXPAND|wx.ADJUST_MINSIZE, 15)
         # contains link between  model ,all its parameters, and panel organization
         self.parameters=[]
-        self.fixed_param=[]
         #contains link between a model and selected parameters to fit 
         self.param_toFit=[]
         # model on which the fit would be performed
-        self.model=None
+        self.model=model
+        try:
+            #print"init modelpage",model.name
+            self.set_panel(model)
+        except:
+            raise
+        # preview selected model name
+        self.prevmodel_name=name
+        #print "model view prev_model",name
+        self.modelbox.SetValue(self.prevmodel_name)
+        # flag to check if the user has selected a new model in the combox box
+        self.model_hasChanged=False
         #dictionary of model name and model class
         self.model_list_box={}
        
-        ## Q range
-        self.qmin= 0.001
-        self.qmax= 0.1
-       
+        #enable model 2D draw
+        self.enable2D= False
+        # Data1D to make a deep comparison between 2 Data1D for checking data
+        #change
         self.vbox.Layout()
         self.vbox.Fit(self) 
+        
         self.SetSizer(self.vbox)
         self.SetScrollbars(20,20,55,40)
         
         self.Centre()
-        self.Layout()
-        self.GrandParent.GetSizer().Layout()
+       
+    def set_range(self, qmin, qmax, npts):
+        """
+            Set the range for the plotted models
+            @param qmin: minimum Q
+            @param qmax: maximum Q
+            @param npts: number of Q bins
+        """
+        # Set the data members
+        self.qmin = qmin
+        self.qmax = qmax
+        self.num_points = npts
+        
+        # Set the controls
+        self.xmin.SetValue(format_number(self.qmin))
+        self.xmax.SetValue(format_number(self.qmax))
+        self.npts.SetValue(format_number(self.num_points))
+        
+    def onClose(self,event):
+        """ close the page associated with this panel"""
+        self.GrandParent.onClose()
         
     def set_owner(self,owner):
@@ -228 +198 @@
              @param manager: instance of plugin fitting
         """
-        self.manager = manager  
-        
+        self.manager = manager
+        
+    def onModel2D(self, event):
+        """
+         call manager to plot model in 2D
+        """
+        # If the 2D display is not currently enabled, plot the model in 2D 
+        # and set the enable2D flag.
+        if self.enable2D==False:
+            self.enable2D=True
+            self._draw_model()
+            
+        else:
+            print "enable is true:",self.enable2D
+            #self.manager.parent. show_panel(147)
+            self.manager.show_panel2D( id=None )
+            #self.manager.menu1.Append(event_id, new_panel.window_caption, 
+            #             "Show %s plot panel" % new_panel.window_caption)
+            
     def populate_box(self, dict):
         """
@@ -243 +230 @@
                 name = item.name
             list_name.append(name)
-        list_name.sort() 
-         
+        list_name.sort()   
         for name in list_name:
             self.modelbox.Insert(name,int(id))
@@ -250 +236 @@
         wx.EVT_COMBOBOX(self.modelbox,-1, self._on_select_model) 
         return 0
-    
-
-    def Set_DipersParam(self, event):
-        if self.enable_disp.GetValue():
-            self.set_panel_dispers()
-        else:
-            self.sizer7.Clear(True)
-            self.sizer8.Clear(True)
-   
-    def set_range(self, qmin, qmax, npts):
-        """
-            Set the range for the plotted models
-            @param qmin: minimum Q
-            @param qmax: maximum Q
-            @param npts: number of Q bins
-        """
-        # Set the data members
-        self.qmin = qmin
-        self.qmax = qmax
-        self.num_points = npts
-        
-        # Set the controls
-        self.xmin.SetValue(format_number(self.qmin))
-        self.xmax.SetValue(format_number(self.qmax))
-        self.npts.SetValue(format_number(self.num_points))
-    def checkFitRange(self):
-        """
-            Check the validity of fitting range
-            @note: xmin should always be less than xmax or else each control box
-            background is colored in pink.
-        """
-       
-        flag = True
-        valueMin = self.xmin.GetValue()
-        valueMax = self.xmax.GetValue()
-        # Check for possible values entered
-        #print "fitpage: checkfitrange:",valueMin,valueMax
-        try:
-            if (float(valueMax)> float(valueMin)):
-                self.xmax.SetBackgroundColour(wx.WHITE)
-                self.xmin.SetBackgroundColour(wx.WHITE)
-            else:
-                flag = False
-                self.xmin.SetBackgroundColour("pink")
-                self.xmax.SetBackgroundColour("pink")      
-        except:
-            flag = False
-            self.xmin.SetBackgroundColour("pink")
-            self.xmax.SetBackgroundColour("pink")
-            
-        self.xmin.Refresh()
-        self.xmax.Refresh()
-        return flag
-    
-
-        
-    def onClose(self,event):
-        """ close the page associated with this panel"""
-        self.GrandParent.onClose()
-        
-  
-        
-    def onModel2D(self, event):
-        """
-         call manager to plot model in 2D
-        """
-        # If the 2D display is not currently enabled, plot the model in 2D 
-        # and set the enable2D flag.
-        if self.enable2D==False:
-            self.enable2D=True
-            self._draw_model()
-            
-        else:
-            print "enable is true:",self.enable2D
-            #self.manager.parent. show_panel(147)
-            self.manager.show_panel2D( id=None )
-            #self.manager.menu1.Append(event_id, new_panel.window_caption, 
-            #             "Show %s plot panel" % new_panel.window_caption)
-            
     
     def select_model(self, model, name):
@@ -353 +260 @@
             post an event to its owner to draw an appropriate theory
         """
-       
+        self.model_view.SetFocus()
         for item in self.model_list_box.itervalues():
             name = item.__name__
@@ -391 +298 @@
             @param model: the model selected in combo box for fitting purpose
         """
+        
+        self.sizer2.Clear(True)
+        self.sizer1.Clear(True)
         self.sizer5.Clear(True)
         self.parameters = []
@@ -396 +306 @@
         self.model = model
         keys = self.model.getParamList()
-        #print "fitpage1D : dispersion list",self.model.getDispParamList()
         keys.sort()
-        ik=0
-        im=1
-        
+        description=None
+        if hasattr(self.model,'description'):
+            description =model.description
+        disp_list=self.model.getDispParamList()
+        ip=0
+        iq=1
+        if len(disp_list)>0:
+            disp = wx.StaticText(self, -1, 'Dispersion')
+            self.sizer5.Add(disp,( iq, ip),(1,1),  wx.LEFT|wx.EXPAND|wx.ADJUST_MINSIZE, 15)
+            ip += 1 
+            values = wx.StaticText(self, -1, 'Values')
+            self.sizer5.Add(values,( iq, ip),(1,1), wx.EXPAND|wx.ADJUST_MINSIZE, 0)
+            
+        disp_list.sort()
+        #print "went here",self.model.name,model.description
         iy = 1
         ix = 0
-        self.cb1 = wx.CheckBox(self, -1,"Select all", (10, 10))
-        if self.data!=None:
-            wx.EVT_CHECKBOX(self, self.cb1.GetId(), self.select_all_param)
-            self.cb1.SetValue(False)
-        else:
-            self.cb1.Disable()
-            self.cb1.Hide()
-       
-        self.sizer5.Add(self.cb1,(iy, ix),(1,1),\
+        self.cb0 = wx.StaticText(self, -1,'Model Description:')
+        self.sizer1.Add(self.cb0,(iy, ix),(1,1),\
+                          wx.LEFT|wx.EXPAND|wx.ADJUST_MINSIZE, 15)
+        iy += 1
+        
+        self.cb01 = wx.StaticText(self, -1,str(description),style=wx.ALIGN_LEFT)
+        self.cb01.Wrap(400) 
+        #self.cb01 = wx.StaticText(self, -1,str(description),(45, 25),style=wx.ALIGN_LEFT)
+        
+        self.sizer1.Add(self.cb01,(iy, ix),(1,1),\
+                          wx.LEFT|wx.EXPAND|wx.ADJUST_MINSIZE, 15)
+        ix = 0
+        iy = 1
+        self.cb1 = wx.StaticText(self, -1,'Parameters')
+        self.sizer2.Add(self.cb1,(iy, ix),(1,1),\
                           wx.LEFT|wx.EXPAND|wx.ADJUST_MINSIZE, 15)
         ix +=1
         self.text2_2 = wx.StaticText(self, -1, 'Values')
-        self.sizer5.Add(self.text2_2,(iy, ix),(1,1),\
+        self.sizer2.Add(self.text2_2,(iy, ix),(1,1),\
                             wx.EXPAND|wx.ADJUST_MINSIZE, 0) 
-        ix +=2
-        self.text2_3 = wx.StaticText(self, -1, 'Errors')
-        self.sizer5.Add(self.text2_3,(iy, ix),(1,1),\
-                            wx.EXPAND|wx.ADJUST_MINSIZE, 0)
-        self.text2_3.Hide() 
         ix +=1
         self.text2_4 = wx.StaticText(self, -1, 'Units')
-        self.sizer5.Add(self.text2_4,(iy, ix),(1,1),\
+        self.sizer2.Add(self.text2_4,(iy, ix),(1,1),\
                             wx.EXPAND|wx.ADJUST_MINSIZE, 0) 
         self.text2_4.Hide()
-        disp_list=self.model.getDispParamList()
         for item in keys:
             if not item in disp_list:
                 iy += 1
                 ix = 0
-    
-                cb = wx.CheckBox(self, -1, item, (10, 10))
-                if self.data!=None:
-                    cb.SetValue(False)
-                    wx.EVT_CHECKBOX(self, cb.GetId(), self.select_param)
-                else:
-                    cb.Disable()
-                self.sizer5.Add( cb,( iy, ix),(1,1),  wx.LEFT|wx.EXPAND|wx.ADJUST_MINSIZE, 15)
-               
+                cb=wx.StaticText(self, -1, item)
+                self.sizer2.Add( cb,( iy, ix),(1,1),  wx.LEFT|wx.EXPAND|wx.ADJUST_MINSIZE, 15)
                 ix += 1
                 value= self.model.getParam(item)
@@ -446 +360 @@
                 ctl1.SetValue(str (format_number(value)))
                 ctl1.Bind(wx.EVT_KILL_FOCUS, self._onparamEnter)
-                ctl1.Bind(wx.EVT_TEXT_ENTER,self._onparamEnter)
-                self.sizer5.Add(ctl1, (iy,ix),(1,1), wx.EXPAND)
+                ctl1.Bind(wx.EVT_TEXT_ENTER, self._onparamEnter)
+                self.sizer2.Add(ctl1, (iy,ix),(1,1), wx.EXPAND|wx.ADJUST_MINSIZE, 0)
+                ix +=1
                 
-                ix += 1
-                text2=wx.StaticText(self, -1, '+/-')
-                self.sizer5.Add(text2,(iy, ix),(1,1),\
-                                wx.EXPAND|wx.ADJUST_MINSIZE, 0) 
-                text2.Hide()  
-                ix += 1
-                ctl2 = wx.TextCtrl(self, -1, size=(_BOX_WIDTH,20), style=wx.TE_PROCESS_ENTER)
-                self.sizer5.Add(ctl2, (iy,ix),(1,1), wx.EXPAND|wx.ADJUST_MINSIZE, 0)
-                ctl2.Hide()
-                ix +=1
                 # Units
                 try:
@@ -464 +369 @@
                 except:
                     units = wx.StaticText(self, -1, "", style=wx.ALIGN_LEFT)
-                self.sizer5.Add(units, (iy,ix),(1,1),  wx.EXPAND|wx.ADJUST_MINSIZE, 0)
-           
-            self.parameters.append([cb,ctl1,text2,ctl2])
+                self.sizer2.Add(units, (iy,ix),(1,1),  wx.EXPAND|wx.ADJUST_MINSIZE, 0)
+            else:
+                ip = 0
+                iq += 1
+                cb=wx.StaticText(self, -1, item)
+                self.sizer5.Add( cb,( iq, ip),(1,1),  wx.LEFT|wx.EXPAND|wx.ADJUST_MINSIZE, 15)
+                wx.EVT_CHECKBOX(self, cb.GetId(), self._on_select_model)
                 
+                ip += 1
+                value= self.model.getParam(item)
+                ctl1 = wx.TextCtrl(self, -1, size=(_BOX_WIDTH,20), style=wx.TE_PROCESS_ENTER)
+                ctl1.SetValue(str (format_number(value)))
+                ctl1.Bind(wx.EVT_KILL_FOCUS, self._onparamEnter)
+                ctl1.Bind(wx.EVT_TEXT_ENTER,self._onparamEnter)
+                self.sizer5.Add(ctl1, (iq,ip),(1,1), wx.EXPAND|wx.ADJUST_MINSIZE, 0)
+            #save data
+            self.parameters.append([cb,ctl1])
         iy+=1
-        self.sizer5.Add((20,20),(iy,ix),(1,1), wx.LEFT|wx.EXPAND|wx.ADJUST_MINSIZE, 15)
+        self.sizer2.Add((20,20),(iy,ix),(1,1), wx.LEFT|wx.EXPAND|wx.ADJUST_MINSIZE, 15)
         
         #Display units text on panel
@@ -478 +396 @@
             else:
                 self.text2_4.Hide()
-        #Disable or enable fit button
-        
-        if not (len(self.param_toFit ) >0):
-            self.xmin.Disable()
-            self.xmax.Disable()
-        else:
-            self.xmin.Enable()
-            self.xmax.Enable()
-            
         self.vbox.Layout()
         self.SetScrollbars(20,20,55,40)
-        self.Layout()
+        
         self.GrandParent.GetSizer().Layout()
-        
        
-    def  set_panel_dispers(self):
-        self.sizer7.Clear(True)
-        self.sizer8.Clear(True)
-        disp_list=self.model.getDispParamList()
-        ix=0
-        iy=1
-        if len(disp_list)>0:
-            model_disp = wx.StaticText(self, -1, 'Model Disp')
-            self.sizer7.Add(model_disp,( iy, ix),(1,1),  wx.LEFT|wx.EXPAND|wx.ADJUST_MINSIZE, 15)
-            ix += 1 
-            self.disp_box = wx.ComboBox(self, -1)
-            self.sizer7.Add(self.disp_box,( iy, ix),(1,1), wx.EXPAND|wx.ADJUST_MINSIZE, 0)
-            ix = 0 
-            iy = 1 
-            disp = wx.StaticText(self, -1, 'Dispersion')
-            self.sizer8.Add(disp,( iy, ix),(1,1),  wx.LEFT|wx.EXPAND|wx.ADJUST_MINSIZE, 15)
-            ix += 1 
-            values = wx.StaticText(self, -1, 'Values')
-            self.sizer8.Add(values,( iy, ix),(1,1), wx.EXPAND|wx.ADJUST_MINSIZE, 0)
-            ix += 1 
-            npts = wx.StaticText(self, -1, 'Npts')
-            self.sizer8.Add(npts,( iy, ix),(1,1), wx.EXPAND|wx.ADJUST_MINSIZE, 0)
-            ix += 1 
-            nsigmas = wx.StaticText(self, -1, 'Nsigmas')
-            self.sizer8.Add(nsigmas,( iy, ix),(1,1), wx.EXPAND|wx.ADJUST_MINSIZE, 0)
-            
-            disp_list.sort()
-            print disp_list,self.model.fixed
-            for item in disp_list:
-                if item in self.model.fixed:
-                    ix = 0
-                    iy += 1
-                    cb = wx.CheckBox(self, -1, item, (10, 10))
-                    if self.data !=None:
-                        cb.SetValue(False)
-                        wx.EVT_CHECKBOX(self, cb.GetId(), self.select_param)
-                    else:
-                        cb.Disable()
-                    self.sizer7.Add( cb,( iy, ix),(1,1),  wx.LEFT|wx.EXPAND|wx.ADJUST_MINSIZE, 15)
-                    
-                   
-                    ix += 1
-                    value= self.model.getParam(item)
-                    ctl1 = wx.TextCtrl(self, -1, size=(_BOX_WIDTH,20), style=wx.TE_PROCESS_ENTER)
-                    ctl1.SetValue(str (format_number(value)))
-                    ctl1.Bind(wx.EVT_KILL_FOCUS, self._onparamEnter)
-                    ctl1.Bind(wx.EVT_TEXT_ENTER,self._onparamEnter)
-                    self.sizer7.Add(ctl1, (iy,ix),(1,1), wx.EXPAND)
-                    
-                    self.parameters.append([cb,ctl1])
-                iy+= 1
-        self.vbox.Layout()
-        self.SetScrollbars(20,20,55,40)
-        self.Layout()
-        self.GrandParent.GetSizer().Layout()
-           
         
     def _onparamEnter(self,event):
@@ -600 +452 @@
         if name==None:
             name= self.model.name
-        self.manager.draw_model(self.model, name, data=self.data,
+        self.manager.draw_model(self.model, name, 
                                 qmin=self.qmin, qmax=self.qmax,
                                 qstep= self.num_points,
@@ -610 +462 @@
                                     enable2D=self.enable2D)
         """
-    def select_param(self,event):
-        pass
-    def select_all_param(self,event): 
-        pass
-        
-       
+   
+        
+