Changeset fb59ed9 in sasview for sansview/perspectives/fitting/basepage.py

Timestamp:

Oct 20, 2010 6:08:34 PM (14 years ago)

Author:

Jae Cho <jhjcho@…>

Branches:

master, ESS_GUI, ESS_GUI_Docs, ESS_GUI_batch_fitting, ESS_GUI_bumps_abstraction, ESS_GUI_iss1116, ESS_GUI_iss879, ESS_GUI_iss959, ESS_GUI_opencl, ESS_GUI_ordering, ESS_GUI_sync_sascalc, costrafo411, magnetic_scatt, release-4.1.1, release-4.1.2, release-4.2.2, release_4.0.1, ticket-1009, ticket-1094-headless, ticket-1242-2d-resolution, ticket-1243, ticket-1249, ticket885, unittest-saveload

Children:

d2539aa

Parents:

f118fe2f

Message:

added new models

File:

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

sansview/perspectives/fitting/basepage.py

@@ -94 +94 @@
         ##[cb state, name, value, "+/-", error of fit, min, max , units]
         self.parameters=[]
+        # non-fittable parameter whose value is astring
+        self.str_parameters = []
         ## list of parameters to fit , must be like self.parameters
         self.param_toFit=[]
@@ -947 +949 @@
         self._reset_parameters_state(self.orientation_params,
                                      state.orientation_params)
+        self._reset_parameters_state(self.str_parameters,
+                                     state.str_parameters)
         self._reset_parameters_state(self.parameters,state.parameters)    
          ## display dispersion info layer        
@@ -1486 +1490 @@
                 elif k == "Structure Factors":
                      self.struct_rbutton.SetValue(True)
+                elif  k == "Multi-Functions":
+                    continue
                 else:
                     self.plugin_rbutton.SetValue(True)
@@ -1536 +1542 @@
                 elif k == "Structure Factors":
                     self.struct_rbutton.SetValue(True)
+                elif  k == "Multi-Functions":
+                    continue
                 else:
                     self.plugin_rbutton.SetValue(True)
@@ -1622 +1630 @@
         self.text2 = wx.StaticText( self,-1,"P(Q)*S(Q)" )
         self.mutifactor_text = wx.StaticText( self,-1,"No. of Shells: " )
+        self.mutifactor_text1 = wx.StaticText( self,-1,"" )
         self.show_sld_button = wx.Button( self,-1,"Show SLD Profile" )
         self.show_sld_button.Bind(wx.EVT_BUTTON,self._on_show_sld)
@@ -1652 +1661 @@
         mutifactor_selection.Add(self.mutifactor_text)
         mutifactor_selection.Add(self.multifactorbox)
+        mutifactor_selection.Add((5,5))
+        mutifactor_selection.Add(self.mutifactor_text1)
         mutifactor_selection.Add((10,5))
         mutifactor_selection.Add(self.show_sld_button)
@@ -1662 +1673 @@
         
         self._set_multfactor_combobox()
+        self.multifactorbox.SetSelection(1)
         self.show_sld_button.Hide()
         #--------------------------------------------------------
@@ -1680 +1692 @@
         sld_data = Data1D(x,y)
         sld_data.name = 'SLD'
-   
-        self.panel = SLDPanel(self, data=sld_data,id =-1 )
+        sld_data.axes = self.sld_axes
+        self.panel = SLDPanel(self, data=sld_data,axes =self.sld_axes,id =-1 )
         self.panel.ShowModal()    
         
-    def _set_multfactor_combobox(self):   
+    def _set_multfactor_combobox(self, multiplicity=10):   
         """
         Set comboBox for muitfactor of CoreMultiShellModel
-        """
-        for idx in range(0,5):
+        :param multiplicit: no. of multi-functionality
+        """
+        # build content of the combobox
+        for idx in range(0,multiplicity):
             self.multifactorbox.Append(str(idx),int(idx))
-            self.multifactorbox.SetSelection(1) 
+            #self.multifactorbox.SetSelection(1) 
         self._hide_multfactor_combobox()
         
@@ -1699 +1713 @@
         if not self.mutifactor_text.IsShown():
             self.mutifactor_text.Show(True)
+            self.mutifactor_text1.Show(True)
         if not self.multifactorbox.IsShown():
             self.multifactorbox.Show(True)  
@@ -1708 +1723 @@
         if self.mutifactor_text.IsShown():
             self.mutifactor_text.Hide()
+            self.mutifactor_text1.Hide()
         if self.multifactorbox.IsShown():
             self.multifactorbox.Hide()   
@@ -1862 +1878 @@
             # set multifactor for Mutifunctional models    
             if form_factor().__class__ in self.model_list_box["Multi-Functions"]:
+                m_id = self.multifactorbox.GetCurrentSelection()
+                multiplicity = form_factor().multiplicity_info[0]
+                self.multifactorbox.Clear()
+                #self.mutifactor_text.SetLabel(form_factor().details[])
+                self._set_multfactor_combobox(multiplicity)
                 self._show_multfactor_combobox()
-                self.show_sld_button.Show(True)
-                m_id = self.multifactorbox.GetCurrentSelection()
+                #ToDo:  this info should be called directly from the model 
+                text = form_factor().multiplicity_info[1]#'No. of Shells: '
+
+                #self.mutifactor_text.Clear()
+                self.mutifactor_text.SetLabel(text)
+                if m_id > multiplicity -1:
+                    # default value
+                    m_id = 1
+                    
                 self.multi_factor = self.multifactorbox.GetClientData(m_id)
                 if self.multi_factor == None: self.multi_factor =0
                 form_factor = form_factor(int(self.multi_factor))
+                self.multifactorbox.SetSelection(m_id)
+                # Check len of the text1 and max_multiplicity
+                text = ''
+                if form_factor.multiplicity_info[0] == len(form_factor.multiplicity_info[2]):
+                    text = form_factor.multiplicity_info[2][self.multi_factor]
+                self.mutifactor_text1.SetLabel(text)
+                # Check if model has  get sld profile.
+                if len(form_factor.multiplicity_info[3]) > 0:
+                    self.sld_axes = form_factor.multiplicity_info[3]
+                    self.show_sld_button.Show(True)
+                else:
+                    self.sld_axes = ""
+
             else:
                 self._hide_multfactor_combobox()