Changeset d493f66 in sasview for sansview


Ignore:
Timestamp:
Mar 29, 2010 8:39:13 AM (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:
ba69349
Parents:
e5d76ce
Message:

found and fixed minor bugs: 1)remaining unchanged the smearer option checked if already checked on the empty fit panel before data for fitting selected, 2) Error on resetting the page from bookmark

File:
1 edited

Legend:

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

    r18e6c5e rd493f66  
    193193       
    194194         
    195         sizer_fit.Add((5,5),1, wx.LEFT|wx.EXPAND|wx.ADJUST_MINSIZE, 5)         
    196         sizer_fit.Add(self.btFit,0, wx.LEFT|wx.EXPAND|wx.ADJUST_MINSIZE, 63)  
    197         sizer_fit.Layout() 
     195 
    198196        self.sizer_set_smearer = wx.BoxSizer(wx.VERTICAL) 
    199197        sizer_smearer = wx.BoxSizer(wx.HORIZONTAL) 
     
    306304        sizer_chi2.Add((-1,5)) 
    307305        self.sizer_set_masking.Add((305,-1)) 
    308         self.sizer_set_masking.Add(boxsizer1,0, wx.RIGHT, 10) 
     306        #self.sizer_set_masking.Add(boxsizer1,0, wx.RIGHT, 10) 
    309307        sizer_chi2.Add(self.sizer_set_masking ) 
    310  
     308           
     309        sizer_fit.Add(boxsizer1,0, wx.LEFT|wx.EXPAND|wx.ADJUST_MINSIZE, 63) 
     310        #sizer_fit.Add((-1,1),0, wx.LEFT|wx.EXPAND|wx.ADJUST_MINSIZE, 1)  
     311        sizer_fit.Add(self.btFit,0, wx.LEFT|wx.EXPAND|wx.ADJUST_MINSIZE, 63)  
     312        sizer_fit.Layout() 
    311313        #sizer_smearer_box.Add(sizer_chi2) 
    312314        # hide all smear messages and textctrl 
     
    10971099        else: 
    10981100            self.smearer = smear_selection( self.data ) 
     1101            self.disable_smearer.SetValue(True) 
    10991102            if self.smearer == None: 
    11001103                self.enable_smearer.Disable() 
     
    11081111                self.pinhole_smearer.Disable() 
    11091112                self.slit_smearer.Disable() 
     1113                 
    11101114                 
    11111115            self.formfactorbox.Enable() 
     
    13501354            else: 
    13511355                is_new_pinhole = self._is_changed_pinhole() 
     1356        else: 
     1357            is_new_pinhole = self._is_changed_pinhole() 
    13521358        # if any value is changed 
    13531359        if is_new_pinhole: 
     
    14871493            else: 
    14881494                is_new_slit = self._is_changed_slit() 
     1495        else: 
     1496            is_new_slit = self._is_changed_slit() 
    14891497                 
    14901498        # if any value is changed 
Note: See TracChangeset for help on using the changeset viewer.