Changeset 6e9150d in sasview


Ignore:
Timestamp:
Sep 24, 2009 11:49:02 AM (15 years ago)
Author:
Gervaise Alina <gervyh@…>
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:
e627f19
Parents:
4bb2917
Message:

separe the 2 radio group of selecting dispersiton type and enable apply dispersion

File:
1 edited

Legend:

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

    r3a37fe0 r6e9150d  
    334334        self.values=[] 
    335335        self.weights=[] 
     336        if event.GetEventObject()==self.noDisper_rbox: 
     337            if self.noDisper_rbox.GetValue(): 
     338                #No array dispersity apply yet 
     339                self._reset_dispersity() 
     340                ## Redraw the model ??? 
     341                self._draw_model() 
    336342        # Go through the list of dispersion check boxes to identify which one has changed  
    337  
    338343        for p in self.disp_cb_dict: 
    339344            self.state.disp_cb_dict[p]=  self.disp_cb_dict[p].GetValue() 
     
    403408                    self._reset_dispersity() 
    404409               
    405                 ## Redraw the model ??? 
     410                ## Redraw the model 
    406411                self._draw_model() 
    407412         
     
    15301535            self._set_sizer_dispersion(dispersity= dispersity) 
    15311536             
    1532              
    15331537        self.state.disp_box= n 
    1534          
     1538        ## Redraw the model 
     1539        self._draw_model()  
    15351540        #self._undo.Enable(True) 
    15361541        event = PageInfoEvent(page = self) 
     
    15721577        # Add a check box for each parameter. 
    15731578        self.disp_cb_dict = {} 
     1579        ix+=1  
     1580        self.noDisper_rbox = wx.RadioButton(self, -1,"None", (10, 10),style= wx.RB_GROUP) 
     1581        self.Bind(wx.EVT_RADIOBUTTON,self.select_disp_angle , id=self.noDisper_rbox.GetId()) 
     1582        self.sizer4_4.Add(self.noDisper_rbox, (iy, ix), 
     1583                           (1,1), wx.EXPAND|wx.ADJUST_MINSIZE, 0) 
    15741584         
    15751585        for p in self.model.dispersion.keys(): 
     
    15811591                #wx.EVT_RADIOBUTTON(self, self.disp_cb_dict[p].GetId(), self.select_disp_angle) 
    15821592                self.sizer4_4.Add(self.disp_cb_dict[p], (iy, ix), (1,1), wx.EXPAND|wx.ADJUST_MINSIZE, 0) 
     1593         
    15831594        for p in self.model.dispersion.keys(): 
    15841595            if p in self.model.orientation_params: 
     
    15861597                self.disp_cb_dict[p] = wx.RadioButton(self, -1, p, (10, 10)) 
    15871598                self.state.disp_cb_dict[p]=  self.disp_cb_dict[p].GetValue() 
    1588                 #print "self.enable2D",self.enable2D 
    15891599                if not (self.enable2D or self.data.__class__.__name__ =="Data2D"): 
    15901600                    self.disp_cb_dict[p].Hide() 
Note: See TracChangeset for help on using the changeset viewer.