Changeset 0a9871c in sasview for fittingview/src/sans
- Timestamp:
- Oct 3, 2011 7:11:41 PM (13 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:
- d74fbff
- Parents:
- 0d7426b
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
fittingview/src/sans/perspectives/fitting/simfitpage.py
r77a43fb r0a9871c 269 269 #-------------------------------------------------------- 270 270 boxsizer1.Add(sizer_title, flag= wx.TOP|wx.BOTTOM,border=5) 271 boxsizer1.Add(sizer_couples, flag= wx.TOP|wx.BOTTOM,border=5)271 boxsizer1.Add(sizer_couples, 1, flag= wx.TOP|wx.BOTTOM,border=5) 272 272 273 self.sizer1.Add(boxsizer1, 1, wx.EXPAND | wx.ALL, 10)273 self.sizer1.Add(boxsizer1, 1, wx.EXPAND | wx.ALL, 10) 274 274 self.sizer1.Layout() 275 275 #self.SetScrollbars(20,20,25,65) 276 276 self.AdjustScrollbars() 277 self.Layout() 277 278 278 279 def _store_model(self): … … 762 763 try: 763 764 ix = 0 764 iy += 1765 765 for fitproblem in value.get_fit_problem(): 766 data = fitproblem.get_fit_data() 767 model = fitproblem.get_model() 768 name = '_' 769 if model is not None: 770 name = str(model.name) 771 cb = wx.CheckBox(self, -1, name) 772 cb.SetValue(False) 773 cb.Enable(model is not None and data.is_data) 774 sizer.Add(cb, (iy, ix), (1, 1), 775 wx.LEFT|wx.EXPAND|wx.ADJUST_MINSIZE, 15) 776 wx.EVT_CHECKBOX(self, cb.GetId(), self.check_model_name) 777 ix += 2 778 type = model.__class__.__name__ 779 model_type = wx.StaticText(self, -1, str(type)) 780 sizer.Add(model_type, (iy, ix), (1, 1), 781 wx.EXPAND|wx.ADJUST_MINSIZE, 0) 782 name = '-' 783 if data is not None and data.is_data: 784 name = str(data.name) 785 data_used = wx.StaticText(self, -1, name) 786 ix += 1 787 sizer.Add(data_used, (iy, ix), (1, 1), 788 wx.EXPAND|wx.ADJUST_MINSIZE, 0) 789 ix += 1 790 caption = value.get_fit_tab_caption() 791 tab_caption_used= wx.StaticText(self, -1, str(caption)) 792 sizer.Add(tab_caption_used, (iy, ix), (1, 1), 793 wx.EXPAND|wx.ADJUST_MINSIZE, 0) 766 if not self.parent.get_page_by_id(id).batch_on: 767 iy += 1 768 data = fitproblem.get_fit_data() 769 model = fitproblem.get_model() 770 name = '_' 771 if model is not None: 772 name = str(model.name) 773 cb = wx.CheckBox(self, -1, name) 774 cb.SetValue(False) 775 cb.Enable(model is not None and data.is_data) 776 sizer.Add(cb, (iy, ix), (1, 1), 777 wx.LEFT|wx.EXPAND|wx.ADJUST_MINSIZE, 15) 778 wx.EVT_CHECKBOX(self, cb.GetId(), self.check_model_name) 779 ix += 2 780 type = model.__class__.__name__ 781 model_type = wx.StaticText(self, -1, str(type)) 782 sizer.Add(model_type, (iy, ix), (1, 1), 783 wx.EXPAND|wx.ADJUST_MINSIZE, 0) 784 name = '-' 785 if data is not None and data.is_data: 786 name = str(data.name) 787 data_used = wx.StaticText(self, -1, name) 788 ix += 1 789 sizer.Add(data_used, (iy, ix), (1, 1), 790 wx.EXPAND|wx.ADJUST_MINSIZE, 0) 791 ix += 1 792 caption = value.get_fit_tab_caption() 793 tab_caption_used= wx.StaticText(self, -1, str(caption)) 794 sizer.Add(tab_caption_used, (iy, ix), (1, 1), 795 wx.EXPAND|wx.ADJUST_MINSIZE, 0) 794 796 795 self.model_list.append([cb,value,id,model])797 self.model_list.append([cb,value,id,model]) 796 798 797 799 except: … … 802 804 wx.LEFT|wx.EXPAND|wx.ADJUST_MINSIZE, 15) 803 805 sizer.Layout() 806 804 807 805 808 def on_set_focus(self, event=None):
Note: See TracChangeset
for help on using the changeset viewer.