Ignore:
Timestamp:
May 19, 2012 12:17:02 PM (12 years ago)
Author:
Mathieu Doucet <doucetm@…>
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:
baa915c
Parents:
d225e32
Message:

Merge 2.1.1 into trunk

File:
1 edited

Legend:

Unmodified
Added
Removed
  • fittingview/src/sans/perspectives/fitting/batchfitpage.py

    r978feaa r940aca7  
    3838        self.window_caption  = "BatchFit" 
    3939        self._set_save_flag(False) 
     40        self._set_bookmark_flag(False) 
    4041         
    4142    def _fill_range_sizer(self): 
     
    365366            self._set_paste_flag(True) 
    366367            if self.data != None: 
    367                 self._set_bookmark_flag(True) 
    368                 self._keep.Enable(True) 
     368                self._set_bookmark_flag(False) 
     369                self._keep.Enable(False) 
    369370                 
    370371            temp_smear = None 
     
    552553        else: 
    553554            if self.model != None: 
    554                 self._set_bookmark_flag(True) 
    555                 self._keep.Enable(True) 
    556             self._set_save_flag(True) 
     555                self._set_bookmark_flag(False) 
     556                self._keep.Enable(False) 
     557            self._set_save_flag(False) 
    557558            self._set_preview_flag(True) 
    558559            """ 
Note: See TracChangeset for help on using the changeset viewer.