Changeset f5dadd5 in sasview for sansview/perspectives/fitting


Ignore:
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:
1 edited

Legend:

Unmodified
Added
Removed
  • sansview/perspectives/fitting/basepage.py

    r08ba57d rf5dadd5  
    7373        self.fitrange= True 
    7474        ## Q range 
    75         self.qmin_x= 0.0001 
     75        self.qmin_x= 0.001 
    7676        self.qmax_x= 0.13 
    7777        self.num_points= 50 
     
    327327        """ 
    328328            Event for when a user select a parameter to average over. 
    329             @param event: check box event 
     329            @param event: radiobutton event 
    330330        """ 
    331331        self.values=[] 
     
    337337            # Catch which one of the box was just checked or unchecked. 
    338338            if event.GetEventObject() == self.disp_cb_dict[p]:               
    339                 
    340339                if self.disp_cb_dict[p].GetValue() == True: 
    341340                     
    342341                    ##Temp. FIX for V1.0 regarding changing checkbox to radiobutton. 
    343                     ##This (self._reset_dispersity) should be removed when the array dispersion is fixed. 
     342                    ##This (self._reset_dispersity) should be removed when the array dispersion is fixed.                 
    344343                    self._reset_dispersity() 
    345                      
     344 
    346345                    # The user wants this parameter to be averaged.  
    347346                    # Pop up the file selection dialog. 
     
    14891488        self.values=[] 
    14901489        self.weights=[] 
    1491         
    14921490       
    14931491        from sans.models.dispersion_models import GaussianDispersion, ArrayDispersion 
     
    15861584                self.disp_cb_dict[p] = wx.RadioButton(self, -1, p, (10, 10)) 
    15871585                self.state.disp_cb_dict[p]=  self.disp_cb_dict[p].GetValue() 
    1588  
    1589                 wx.EVT_RADIOBUTTON(self, self.disp_cb_dict[p].GetId(), self.select_disp_angle) 
     1586                self.Bind(wx.EVT_RADIOBUTTON, self.select_disp_angle, id=self.disp_cb_dict[p].GetId()) 
     1587                #wx.EVT_RADIOBUTTON(self, self.disp_cb_dict[p].GetId(), self.select_disp_angle) 
    15901588                self.sizer4_4.Add(self.disp_cb_dict[p], (iy, ix), (1,1), wx.EXPAND|wx.ADJUST_MINSIZE, 0) 
    15911589        for p in self.model.dispersion.keys(): 
    15921590            if p in self.model.orientation_params: 
    15931591                ix+=1  
    1594                 self.disp_cb_dict[p] = wx.CheckBox(self, -1, p, (10, 10)) 
     1592                self.disp_cb_dict[p] = wx.RadioButton(self, -1, p, (10, 10)) 
    15951593                self.state.disp_cb_dict[p]=  self.disp_cb_dict[p].GetValue() 
    15961594                #print "self.enable2D",self.enable2D 
    15971595                if not (self.enable2D or self.data.__class__.__name__ =="Data2D"): 
    15981596                    self.disp_cb_dict[p].Hide() 
    1599                     self.disp_cb_dict[p].Disable() 
     1597                    #self.disp_cb_dict[p].Disable() 
    16001598                else: 
    16011599                    self.disp_cb_dict[p].Show(True) 
    1602                     self.disp_cb_dict[p].Enable() 
    1603  
    1604                 wx.EVT_CHECKBOX(self, self.disp_cb_dict[p].GetId(), self.select_disp_angle) 
     1600                    #self.disp_cb_dict[p].Enable() 
     1601                self.Bind(wx.EVT_RADIOBUTTON, self.select_disp_angle, id=self.disp_cb_dict[p].GetId()) 
     1602                #wx.EVT_RADIOBUTTON(self, self.disp_cb_dict[p].GetId(), self.select_disp_angle) 
    16051603                self.sizer4_4.Add(self.disp_cb_dict[p], (iy, ix), (1,1), wx.EXPAND|wx.ADJUST_MINSIZE, 0) 
    16061604 
Note: See TracChangeset for help on using the changeset viewer.