-                      r0b99881
+                      rfbc3e04
 class ModelPage(wx.ScrolledWindow):
     """
+        ModelPage is a panel that allows the user to view information related to a
+        model.
+        FitPanel class contains fields allowing to display results when
+        fitting  a model and one data
+        @note: For Fit to be performed the user should check at least one parameter
+        on fit Panel window.
     """
 …
     ## Title to appear on top of the window
     window_caption = "Fit Page"
+    # name of the panel directly related to the model name selected
+    name =" "
+    def __init__(self, parent,model=None,name=None,data=None, *args, **kwargs):
+    name=""
+    def __init__(self, parent,model,name, *args, **kwargs):
         wx.ScrolledWindow.__init__(self, parent, *args, **kwargs)
         """
 …
         ## Data member to store the dispersion object created
         self._disp_obj_dict = {}
         #list of dispersion parameters
+        #list of dispersion paramaters
         self.disp_list=[]
         try:
 …
         # this panel does contain data .existing data allow a different drawing
         #on set_model parameters
+        self.data=data
+        # contains link between  model ,all its parameters, and panel organization
+        self.parameters=[]
+        #list of parameters that cannot be fitted and panel object related to this parameters
+        #values
+        self.fixed_param=[]
+        #
+        self.fittable_param=[]
+        self.polydisp= {}
+        #contains link between a model and selected parameters to fit
+        self.param_toFit=[]
+        self.prevmodel_name=name
+        self.draw_panel()
+        #dictionary of model name and model class
+        self.model_list_box={}
+        #Draw initial panel
+        if self.model!=None:
+            self.set_panel(self.model)
+        self.theta_cb=None
+        # flag to allow data2D plot
+        self.enable2D=False
+        self.Centre()
+        self.Layout()
+        self.parent.GetSizer().Layout()
+    def draw_panel(self):
+        self.data=None
         #panel interface
         self.vbox  = wx.BoxSizer(wx.VERTICAL)
 …
         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)
 …
         # plotting range
         self.vbox.Add(self.sizer9)
+        #close layer
+        #self.vbox.Add(wx.StaticLine(self, -1), 0, wx.EXPAND, 0)
+        #self.vbox.Add(self.sizer10)
         #------------------ sizer 4  draw------------------------
         # 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)
 …
         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_Dispers_Param, id=self.disable_disp.GetId())
         self.Bind(wx.EVT_RADIOBUTTON, self.set_Dispers_Param, id=self.enable_disp.GetId())
+        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
 …
         iy+=1
         self.sizer6.Add((20,20),(iy,ix),(1,1),wx.LEFT|wx.EXPAND|wx.ADJUST_MINSIZE, 15)
         #---------sizer 9 draw----------------------------------------
+        ## Q range
+         ## Q range
         self.qmin_x= 0.001
         self.qmax_x= 0.1
 …
         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
+        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=[]
+        self.fittable_param=[]
+        self.polydisp= {}
+        #contains link between a model and selected parameters to fit
+        self.param_toFit=[]
+        #dictionary of model name and model class
+        self.model_list_box={}
+        #Draw initial panel
+         #-----sizer 11--------------------model description------
+        if self.model!=None:
+            self.set_panel(self.model)
+        self.theta_cb=None
         self.vbox.Layout()
         self.vbox.Fit(self)
 …
         self.SetScrollbars(20,20,55,40)
+        self.Centre()
+        self.Layout()
+        self.parent.GetSizer().Layout()
     def set_model_description(self, model):
+        """
+            Set a sizer with model description field
+            @param model: the model select that provides the description
+        """
         if model !=None and str(model.description)!=""and self.data==None:
             self.sizer11.Clear(True)
 …
+    def set_Dispers_Param(self, event):
+        """
+             set a sizer with dispersion parameters
+    def Set_DipersParam(self, event):
+        """
+            This method is called when the user changes the state
+            of the "dispersity" radio buttons.
+            #TODO: correct the spelling mistake in the name of this method, start name with lowercase.
         """
         if self.enable_disp.GetValue():
 …
                 return
             else:
+                # allow to recognize data panel from model panel
+                if self.data !=None and self.model !=None:
+                    self.cb1.SetValue(False)
+                    self.select_all_param_helper()
+                # Show the default dispersion/averaging sub-panel
                 self.populate_disp_box()
                 self.set_panel_dispers(self.disp_list)
 …
     def populate_disp_box(self):
-        """
-            populate polydispersion combo box
-        """
         self.sizer7.Clear(True)
         if len(self.disp_list)>0:
 …
             for k,v in self.polydisp.iteritems():
                 if str(v)=="MyModel":
                                 # Remove the option until the rest of the code is ready for it
+                    # Remove the option until the rest of the code is ready for it
                     #self.disp_box.Insert("Select customized Model",id)
                     pass
 …
         self.qmax.SetValue(format_number(self.qmax_x))
         self.npts.SetValue(format_number(self.num_points))
     def checkFitRange(self):
         """
 …
             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)):
 …
         return flag
+    def onClose(self,event):
+        """ close the page associated with this panel"""
+        self.parent.onClose()
     def onModel2D(self, event):
 …
         type =event.GetString()
         self.set_panel_dispers( self.disp_list,type )
     def _on_select_model(self,event):
         """
 …
         self.text2_3.Hide()
         ix +=1
         self.text2_4 = wx.StaticText(self, -1, 'Units')
 …
         self.text2_4.Hide()
         disp_list=self.model.getDispParamList()
+        #
         for item in keys:
             if not item in disp_list:
 …
     def _selectDlg(self):
-        """
-            Create a dialog to select files
-        """
         import os
         dlg = wx.FileDialog(self, "Choose a weight file", os.getcwd(), "", "*.*", wx.OPEN)
 …
         dlg.Destroy()
         return path
     def read_file(self, path):
-        """
-            Read a file  of 2 colons
-            @param path: the path to the file
-            @return 2 numpy arrays containing numbers
-        """
         try:
             if path==None:
 …
             return numpy.array(angles), numpy.array(weights)
         except:
+             msg= "Simultaneous Fit completed but Following error occurred: "
+             msg+= "%s"%sys.exc_value
+             wx.PostEvent(self.parent.parent, StatusEvent(status=msg))
+             return
+            raise
 …
             @param event: check box event
         """
         # Go through the list of dispersion check boxes to identify which one has changed
         for p in self.disp_cb_dict:
 …
                     self._draw_model()
         return
     def set_panel_dispers(self, disp_list, type="GaussianModel" ):
         """
-            Fill sizer with disperstion info
         """
 …
             self.parent.GetSizer().Layout()
     def checkFitValues(self,val_min, val_max):
         """
 …
         self.set_model_parameter()
     def set_model_parameter(self):
         """
-            Value Enter by the user on the parameter fields are used to reset the model
-            and model will be drawn again if the user enters different values
         """
         if len(self.parameters) !=0 and self.model !=None:
 …
                 except:
+                    #raise
                     wx.PostEvent(self.parent.parent, StatusEvent(status=\
                             "Model Drawing  Error:wrong value entered : %s"% sys.exc_value))
 …
                 except:
+                    raise
                     wx.PostEvent(self.parent.parent, StatusEvent(status=\
                             "Model Drawing Error:wrong value entered : %s"% sys.exc_value))
+                            "Model Drawing  Error:wrong value entered : %s"% sys.exc_value))
             for item in self.parameters:
 …
                     #raise
                     wx.PostEvent(self.parent.parent, StatusEvent(status=\
                            "Model Drawing Error:wrong value entered : %s"% sys.exc_value))
+                           "Model Drawing  Error:wrong value entered : %s"% sys.exc_value))
                     return
 …
                 self._draw_model()
     def _draw_model(self, name=None):
         """
 …
                                 enable2D=self.enable2D)
     def select_param(self,event):
         """
             Select_parameter is implemented in fitpage.py
         """
         pass
     def select_all_param(self,event):
         """
             Implemented in fitpage.py
         """
         pass
     def select_all_param_helper(self):
         """
              Allows selecting or unselecting  checkbutton
+             Allows selecting or delecting button
         """
         self.param_toFit=[]

Note: See TracChangeset for help on using the changeset viewer.

SasView

Changeset fbc3e04 in sasview for sansview/perspectives/fitting/modelpage.py

Legend:

sansview/perspectives/fitting/modelpage.py

Download in other formats: