Changeset a1b2471 in sasview for sansview/perspectives/fitting

Timestamp:

Sep 21, 2010 5:44:24 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:

db08737

Parents:

60c320b

Message:

added sld plot for onion model and etc…

Location:

sansview/perspectives/fitting

Files:

• basepage.py (modified) (5 diffs)
• models.py (modified) (1 diff)

sansview/perspectives/fitting/basepage.py

@@ -1622 +1622 @@
         self.text2 = wx.StaticText( self,-1,"P(Q)*S(Q)" )
         self.mutifactor_text = wx.StaticText( self,-1,"No. of Shells: " )
-        
+        self.show_sld_button = wx.Button( self,-1,"Show SLD Profile" )
+        self.show_sld_button.Bind(wx.EVT_BUTTON,self._on_show_sld)
+
         self.formfactorbox = wx.ComboBox(self, -1,style=wx.CB_READONLY)
         if self.model!= None:
@@ -1650 +1652 @@
         mutifactor_selection.Add(self.mutifactor_text)
         mutifactor_selection.Add(self.multifactorbox)
-        
+        mutifactor_selection.Add((10,5))
+        mutifactor_selection.Add(self.show_sld_button)
+
         boxsizer1.Add( sizer_buttons )
         boxsizer1.Add( (15,15))
@@ -1658 +1662 @@
         
         self._set_multfactor_combobox()
-
+        self.show_sld_button.Hide()
         #--------------------------------------------------------
         sizer.Add(boxsizer1,0, wx.EXPAND | wx.ALL, 10)
         sizer.Layout()
         self.SetScrollbars(20,20,25,65)
+        
+        
+    def _on_show_sld(self, event=None):
+        """
+        Plot SLD profile
+        """
+        # get profile data
+        x,y=self.model.getProfile()
+
+        from danse.common.plottools import Data1D
+        from sans.perspectives.theory.profile_dialog import SLDPanel
+        sld_data = Data1D(x,y)
+        sld_data.name = 'SLD'
+   
+        self.panel = SLDPanel(self, data=sld_data,id =-1 )
+        self.panel.ShowModal()    
         
     def _set_multfactor_combobox(self):   
@@ -1843 +1863 @@
             if form_factor().__class__ in self.model_list_box["Multi-Functions"]:
                 self._show_multfactor_combobox()
+                self.show_sld_button.Show(True)
                 m_id = self.multifactorbox.GetCurrentSelection()
                 self.multi_factor = self.multifactorbox.GetClientData(m_id)
@@ -1849 +1870 @@
             else:
                 self._hide_multfactor_combobox()
+                self.show_sld_button.Hide()
                 form_factor = form_factor()
                 self.multi_factor = None
         else:
             self._hide_multfactor_combobox()
+            self.show_sld_button.Hide()
             self.multi_factor = None  
               

sansview/perspectives/fitting/models.py

@@ -193 +193 @@
         self.shape_list.append(CoreMultiShellModel)
         self.multiplication_factor.append(CoreMultiShellModel)
+        self.multi_func_list.append(CoreMultiShellModel)
         
         from sans.models.VesicleModel import VesicleModel