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

Timestamp:

Mar 10, 2011 5:11:55 PM (14 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:

c399004

Parents:

7987962

Message:

working on toggl2 1d/2d

File:

• sansview/perspectives/fitting/basepage.py (modified) (1 diff)

sansview/perspectives/fitting/basepage.py

@@ -1658 +1658 @@
                                     enable2D=self.enable2D)
         
-    def _set_model_sizer(self,sizer, box_sizer, title="", object=None):
-        """
-        Use lists to fill a sizer for model info
-        """
-       
-        sizer.Clear(True)
-        ##For MAC, this should defined here.
-        if box_sizer == None:
-            box_description= wx.StaticBox(self, -1,str(title))
-            boxsizer1 = wx.StaticBoxSizer(box_description, wx.VERTICAL)
-        else:
-            boxsizer1 = box_sizer
-        sizer_buttons = wx.BoxSizer(wx.HORIZONTAL)    
-        #--------------------------------------------------------
-        self.shape_rbutton = wx.RadioButton(self, -1, 'Shapes', style=wx.RB_GROUP)
-        self.shape_indep_rbutton = wx.RadioButton(self, -1, "Shape-Independent")
-        self.struct_rbutton = wx.RadioButton(self, -1, "Structure Factor ")
-        self.plugin_rbutton = wx.RadioButton(self, -1, "Customized Models")
-                
-        self.Bind( wx.EVT_RADIOBUTTON, self._show_combox,
-                            id= self.shape_rbutton.GetId() ) 
-        self.Bind( wx.EVT_RADIOBUTTON, self._show_combox,
-                            id= self.shape_indep_rbutton.GetId() ) 
-        self.Bind( wx.EVT_RADIOBUTTON, self._show_combox,
-                            id= self.struct_rbutton.GetId() ) 
-        self.Bind( wx.EVT_RADIOBUTTON, self._show_combox,
-                            id= self.plugin_rbutton.GetId() )  
-        #MAC needs SetValue
-        self.shape_rbutton.SetValue(True)
-      
-        sizer_radiobutton = wx.GridSizer(2, 2,5, 5)
-        sizer_radiobutton.Add(self.shape_rbutton)
-        sizer_radiobutton.Add(self.shape_indep_rbutton)
-
-        sizer_radiobutton.Add(self.plugin_rbutton)
-        sizer_radiobutton.Add(self.struct_rbutton)
-        sizer_buttons.Add(sizer_radiobutton)
-        # detail button
-        if object !=None:
-            sizer_buttons.Add((50,0))
-            sizer_buttons.Add(object)
-        
-        sizer_selection = wx.BoxSizer(wx.HORIZONTAL)
-        mutifactor_selection = wx.BoxSizer(wx.HORIZONTAL)
-        
-        self.text1 = wx.StaticText( self,-1,"" )
-        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)
-
-        self.formfactorbox = wx.ComboBox(self, -1,style=wx.CB_READONLY)
-        if self.model!= None:
-            self.formfactorbox.SetValue(self.model.name)
-           
-        self.structurebox = wx.ComboBox(self, -1,style=wx.CB_READONLY)
-        self.multifactorbox = wx.ComboBox(self, -1,style=wx.CB_READONLY)
-        self.initialize_combox()
-             
-        wx.EVT_COMBOBOX(self.formfactorbox,-1, self._on_select_model)
-        wx.EVT_COMBOBOX(self.structurebox,-1, self._on_select_model)
-        wx.EVT_COMBOBOX(self.multifactorbox,-1, self._on_select_model)
-        
-        ## check model type to show sizer
-        if self.model !=None:
-            self._set_model_sizer_selection( self.model )
-        
-        sizer_selection.Add(self.text1)
-        sizer_selection.Add((5,5))
-        sizer_selection.Add(self.formfactorbox)
-        sizer_selection.Add((5,5))
-        sizer_selection.Add(self.text2)
-        sizer_selection.Add((5,5))
-        sizer_selection.Add(self.structurebox)
-        #sizer_selection.Add((5,5))
-        mutifactor_selection.Add((10,5))
-        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)
-
-        boxsizer1.Add( sizer_buttons )
-        boxsizer1.Add( (15,15))
-        boxsizer1.Add( sizer_selection )
-        boxsizer1.Add( (10,10))
-        boxsizer1.Add(mutifactor_selection)
-        
-        self._set_multfactor_combobox()
-        self.multifactorbox.SetSelection(1)
-        self.show_sld_button.Hide()
-        #--------------------------------------------------------
-        sizer.Add(boxsizer1,0, wx.EXPAND | wx.ALL, 10)
-        sizer.Layout()
        
     def _on_show_sld(self, event=None):