Changeset f5dadd5 in sasview

Timestamp:

Sep 15, 2009 2:37:59 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:

c5cd3b9

Parents:

08ba57d

Message:

Fixed one of two bugs from last commit

File:

• sansview/perspectives/fitting/basepage.py (modified) (5 diffs)

sansview/perspectives/fitting/basepage.py

@@ -73 +73 @@
         self.fitrange= True
         ## Q range
-        self.qmin_x= 0.0001
+        self.qmin_x= 0.001
         self.qmax_x= 0.13
         self.num_points= 50
@@ -327 +327 @@
         """
             Event for when a user select a parameter to average over.
-            @param event: check box event
+            @param event: radiobutton event
         """
         self.values=[]
@@ -337 +337 @@
             # Catch which one of the box was just checked or unchecked.
             if event.GetEventObject() == self.disp_cb_dict[p]:              
-               
                 if self.disp_cb_dict[p].GetValue() == True:
                     
                     ##Temp. FIX for V1.0 regarding changing checkbox to radiobutton.
-                    ##This (self._reset_dispersity) should be removed when the array dispersion is fixed.
+                    ##This (self._reset_dispersity) should be removed when the array dispersion is fixed.                
                     self._reset_dispersity()
-                    
+
                     # The user wants this parameter to be averaged. 
                     # Pop up the file selection dialog.
@@ -1489 +1488 @@
         self.values=[]
         self.weights=[]
-       
       
         from sans.models.dispersion_models import GaussianDispersion, ArrayDispersion
@@ -1586 +1584 @@
                 self.disp_cb_dict[p] = wx.RadioButton(self, -1, p, (10, 10))
                 self.state.disp_cb_dict[p]=  self.disp_cb_dict[p].GetValue()
-
-                wx.EVT_RADIOBUTTON(self, self.disp_cb_dict[p].GetId(), self.select_disp_angle)
+                self.Bind(wx.EVT_RADIOBUTTON, self.select_disp_angle, id=self.disp_cb_dict[p].GetId())
+                #wx.EVT_RADIOBUTTON(self, self.disp_cb_dict[p].GetId(), self.select_disp_angle)
                 self.sizer4_4.Add(self.disp_cb_dict[p], (iy, ix), (1,1), wx.EXPAND|wx.ADJUST_MINSIZE, 0)
         for p in self.model.dispersion.keys():
             if p in self.model.orientation_params:
                 ix+=1 
-                self.disp_cb_dict[p] = wx.CheckBox(self, -1, p, (10, 10))
+                self.disp_cb_dict[p] = wx.RadioButton(self, -1, p, (10, 10))
                 self.state.disp_cb_dict[p]=  self.disp_cb_dict[p].GetValue()
                 #print "self.enable2D",self.enable2D
                 if not (self.enable2D or self.data.__class__.__name__ =="Data2D"):
                     self.disp_cb_dict[p].Hide()
-                    self.disp_cb_dict[p].Disable()
+                    #self.disp_cb_dict[p].Disable()
                 else:
                     self.disp_cb_dict[p].Show(True)
-                    self.disp_cb_dict[p].Enable()
-
-                wx.EVT_CHECKBOX(self, self.disp_cb_dict[p].GetId(), self.select_disp_angle)
+                    #self.disp_cb_dict[p].Enable()
+                self.Bind(wx.EVT_RADIOBUTTON, self.select_disp_angle, id=self.disp_cb_dict[p].GetId())
+                #wx.EVT_RADIOBUTTON(self, self.disp_cb_dict[p].GetId(), self.select_disp_angle)
                 self.sizer4_4.Add(self.disp_cb_dict[p], (iy, ix), (1,1), wx.EXPAND|wx.ADJUST_MINSIZE, 0)