Changeset 758b1e4 in sasview for calculatorview

Timestamp:

Jun 23, 2011 12:25:44 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:

12452ed

Parents:

2e72620

Message:

try to fix mac cb problem

File:

• calculatorview/perspectives/calculator/resolution_calculator_panel.py (modified) (3 diffs)

calculatorview/perspectives/calculator/resolution_calculator_panel.py

@@ -133 +133 @@
         for key, value in self.source_mass.iteritems():
             name_source = str(key)
-            self.source_cb.Append(name_source)
+            self.source_cb.Append(name_source, name_source)
         self.source_cb.SetStringSelection("Neutron") 
         wx.EVT_COMBOBOX(self.source_cb,-1, self._on_source_selection)      
@@ -628 +628 @@
                                     wx.EXPAND|wx.TOP|wx.BOTTOM, 5)])
         self.main_sizer.Add(self.vertical_l_sizer, 0, wx.ALL, 10)
-        # Make sure the default is selected here (MAC).
-        self.source_cb.SetStringSelection("Neutron")
         # Build image plot layout                     
         self._layout_image()
@@ -688 +686 @@
         wavelength = self.wavelength_tcl.GetValue()
         self.resolution.set_wavelength(float(wavelength))
-        source = self.source_cb.GetValue()
+        try:
+            source = self.source_cb.GetValue()
+        except:
+            source = "Neutron"
+            self.source_cb.SetStringSelection(source)
         mass = self.source_mass[str(source)]
         self.resolution.set_neutron_mass(float(mass))