- Timestamp:
- Sep 21, 2010 5:44:24 PM (14 years ago)
- 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:
- db08737
- Parents:
- 60c320b
- Location:
- sansview/perspectives/fitting
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
sansview/perspectives/fitting/basepage.py
re87f9fc ra1b2471 1622 1622 self.text2 = wx.StaticText( self,-1,"P(Q)*S(Q)" ) 1623 1623 self.mutifactor_text = wx.StaticText( self,-1,"No. of Shells: " ) 1624 1624 self.show_sld_button = wx.Button( self,-1,"Show SLD Profile" ) 1625 self.show_sld_button.Bind(wx.EVT_BUTTON,self._on_show_sld) 1626 1625 1627 self.formfactorbox = wx.ComboBox(self, -1,style=wx.CB_READONLY) 1626 1628 if self.model!= None: … … 1650 1652 mutifactor_selection.Add(self.mutifactor_text) 1651 1653 mutifactor_selection.Add(self.multifactorbox) 1652 1654 mutifactor_selection.Add((10,5)) 1655 mutifactor_selection.Add(self.show_sld_button) 1656 1653 1657 boxsizer1.Add( sizer_buttons ) 1654 1658 boxsizer1.Add( (15,15)) … … 1658 1662 1659 1663 self._set_multfactor_combobox() 1660 1664 self.show_sld_button.Hide() 1661 1665 #-------------------------------------------------------- 1662 1666 sizer.Add(boxsizer1,0, wx.EXPAND | wx.ALL, 10) 1663 1667 sizer.Layout() 1664 1668 self.SetScrollbars(20,20,25,65) 1669 1670 1671 def _on_show_sld(self, event=None): 1672 """ 1673 Plot SLD profile 1674 """ 1675 # get profile data 1676 x,y=self.model.getProfile() 1677 1678 from danse.common.plottools import Data1D 1679 from sans.perspectives.theory.profile_dialog import SLDPanel 1680 sld_data = Data1D(x,y) 1681 sld_data.name = 'SLD' 1682 1683 self.panel = SLDPanel(self, data=sld_data,id =-1 ) 1684 self.panel.ShowModal() 1665 1685 1666 1686 def _set_multfactor_combobox(self): … … 1843 1863 if form_factor().__class__ in self.model_list_box["Multi-Functions"]: 1844 1864 self._show_multfactor_combobox() 1865 self.show_sld_button.Show(True) 1845 1866 m_id = self.multifactorbox.GetCurrentSelection() 1846 1867 self.multi_factor = self.multifactorbox.GetClientData(m_id) … … 1849 1870 else: 1850 1871 self._hide_multfactor_combobox() 1872 self.show_sld_button.Hide() 1851 1873 form_factor = form_factor() 1852 1874 self.multi_factor = None 1853 1875 else: 1854 1876 self._hide_multfactor_combobox() 1877 self.show_sld_button.Hide() 1855 1878 self.multi_factor = None 1856 1879 -
sansview/perspectives/fitting/models.py
re87f9fc ra1b2471 193 193 self.shape_list.append(CoreMultiShellModel) 194 194 self.multiplication_factor.append(CoreMultiShellModel) 195 self.multi_func_list.append(CoreMultiShellModel) 195 196 196 197 from sans.models.VesicleModel import VesicleModel
Note: See TracChangeset
for help on using the changeset viewer.