Changeset 6e01f06 in sasview for fittingview/src

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:

• fitting.py (modified) (4 diffs)
• fitting_widgets.py (modified) (5 diffs)

fittingview/src/sans/perspectives/fitting/fitting.py

@@ -23 +23 @@
 import models
 import fitpage
-
 
 from sans.dataloader.loader import Loader
@@ -43 +42 @@
 from .pagestate import Reader
 from .fitpage import Chi2UpdateEvent
+from .fitting_widgets import TextDialog
 
 MAX_NBR_DATA = 4
@@ -256 +256 @@
         model_list = model_manager.get_model_name_list()
 
-        from sans.perspectives.fitting.fitting_widgets import TextDialog
         textdial = TextDialog(None, -1, 'Easy Custom Sum(p1,p2)', model_list)
         self.put_icon(textdial)
@@ -278 +277 @@
                     page.formfactorbox.SetSelection(pos)
                     page.formfactorbox.SetValue(current_val)
-                #wx.CallAfter(textdial.delete_file, fname)
             except:
                 raise

fittingview/src/sans/perspectives/fitting/fitting_widgets.py

@@ -217 +217 @@
         # default
         self.model_list = model_list
+        self.model1_string = "SphereModel"
+        self.model2_string = "CylinderModel"
         self._build_sizer()
         self.model1_name = str(self.model1.GetValue())
@@ -243 +245 @@
         self.model2.SetToolTipString("model2")
         self._set_model_list()
-        self.model1.SetSelection(0)
-        self.model2.SetSelection(1)
+        
          # Buttons on the bottom
         self.static_line_1 = wx.StaticLine(self, -1)
@@ -294 +295 @@
             self.model1.Append(list[idx],idx) 
             self.model2.Append(list[idx],idx)
+        self.model1.SetStringSelection(self.model1_string)
+        self.model2.SetStringSelection(self.model2_string)
            
     def on_model1(self, event):
@@ -301 +304 @@
         event.Skip()
         self.model1_name = str(self.model1.GetValue())
+        self.model1_string = self.model1_name
             
     def on_model2(self, event):
@@ -308 +312 @@
         event.Skip()
         self.model2_name = str(self.model2.GetValue())
+        self.model2_string = self.model2_name
  
     def getText(self):