Changeset 6e01f06 in sasview for fittingview


Ignore:
Timestamp:
Dec 20, 2011 7:30:27 PM (13 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:
ed8fa6a3
Parents:
b025572
Message:

cjanged defaults for combobox in CUstom Sum editor

Location:
fittingview/src/sans/perspectives/fitting
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • fittingview/src/sans/perspectives/fitting/fitting.py

    r7c8d3093 r6e01f06  
    2323import models 
    2424import fitpage 
    25  
    2625 
    2726from sans.dataloader.loader import Loader 
     
    4342from .pagestate import Reader 
    4443from .fitpage import Chi2UpdateEvent 
     44from .fitting_widgets import TextDialog 
    4545 
    4646MAX_NBR_DATA = 4 
     
    256256        model_list = model_manager.get_model_name_list() 
    257257 
    258         from sans.perspectives.fitting.fitting_widgets import TextDialog 
    259258        textdial = TextDialog(None, -1, 'Easy Custom Sum(p1,p2)', model_list) 
    260259        self.put_icon(textdial) 
     
    278277                    page.formfactorbox.SetSelection(pos) 
    279278                    page.formfactorbox.SetValue(current_val) 
    280                 #wx.CallAfter(textdial.delete_file, fname) 
    281279            except: 
    282280                raise 
  • fittingview/src/sans/perspectives/fitting/fitting_widgets.py

    r7c8d3093 r6e01f06  
    217217        # default 
    218218        self.model_list = model_list 
     219        self.model1_string = "SphereModel" 
     220        self.model2_string = "CylinderModel" 
    219221        self._build_sizer() 
    220222        self.model1_name = str(self.model1.GetValue()) 
     
    243245        self.model2.SetToolTipString("model2") 
    244246        self._set_model_list() 
    245         self.model1.SetSelection(0) 
    246         self.model2.SetSelection(1) 
     247         
    247248         # Buttons on the bottom 
    248249        self.static_line_1 = wx.StaticLine(self, -1) 
     
    294295            self.model1.Append(list[idx],idx)  
    295296            self.model2.Append(list[idx],idx) 
     297        self.model1.SetStringSelection(self.model1_string) 
     298        self.model2.SetStringSelection(self.model2_string) 
    296299            
    297300    def on_model1(self, event): 
     
    301304        event.Skip() 
    302305        self.model1_name = str(self.model1.GetValue()) 
     306        self.model1_string = self.model1_name 
    303307             
    304308    def on_model2(self, event): 
     
    308312        event.Skip() 
    309313        self.model2_name = str(self.model2.GetValue()) 
     314        self.model2_string = self.model2_name 
    310315  
    311316    def getText(self): 
Note: See TracChangeset for help on using the changeset viewer.