Changeset 8dfe0fd in sasview for sansview/perspectives

Timestamp:

Oct 16, 2009 2:42:37 PM (15 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:

17c5868

Parents:

e3a76c8

Message:

Now able to choose parameters (Combobox event) for constrains in the simul. fit panel on MAC.

File:

• sansview/perspectives/fitting/simfitpage.py (modified) (4 diffs)

sansview/perspectives/fitting/simfitpage.py

@@ -318 +318 @@
         param_cbox = wx.ComboBox(self, -1,style=wx.CB_READONLY)
         param_cbox.Hide()
+        
+        #This is for GetCLientData() _on_select_param: Was None return on MAC.
+        self.param_cbox = param_cbox
+        
         wx.EVT_COMBOBOX(param_cbox,-1, self._on_select_param)
         ctl2 = wx.TextCtrl(self, -1)
@@ -331 +335 @@
             model_cbox.Append( str(model.name), model)
             
+        #This is for GetCLientData() passing to self._on_select_param: Was None return on MAC.
+        self.model_cbox = model_cbox
            
         wx.EVT_COMBOBOX(model_cbox,-1, self._on_select_model)
@@ -379 +385 @@
          fill combox box with list of parameters
         """
-        model = event.GetClientData()
+        ##This way PC/MAC both work, instead of using event.GetClientData().
+        n = self.model_cbox.GetCurrentSelection()
+        model = self.model_cbox.GetClientData(n)
+        
         param_list= get_fittableParam(model)
         length = len(self.constraints_list)
@@ -402 +411 @@
             Store the appropriate constraint in the page_finder
         """
-        model = event.GetClientData()
+        ##This way PC/MAC both work, instead of using event.GetClientData().
+        n = self.param_cbox.GetCurrentSelection()
+        model = self.param_cbox.GetClientData(n)
         param = event.GetString()