Changeset 7b1ca97 in sasview for fittingview/src/sans


Ignore:
Timestamp:
Dec 2, 2011 3:39:38 PM (13 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:
bc69dcc
Parents:
a613fe0
Message:

Hope it fix all simul. batch fit problems

File:
1 edited

Legend:

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

    r056b569 r7b1ca97  
    178178        #combined Batch 
    179179        self.id_batchfit = wx.NewId() 
    180         batch_help = "Batch Fit" 
     180        batch_help = "Combined Batch" 
    181181        self.menu1.Append(self.id_batchfit, '&Combine Batch Fit', batch_help) 
    182182        wx.EVT_MENU(owner, self.id_batchfit,  self.on_add_sim_page) 
     
    258258        page = self.sim_page 
    259259        if id == self.id_batchfit: 
    260             caption = "Batch Fit" 
     260            caption = "Combined Batch" 
    261261            page = self.batch_page 
    262262             
     
    903903                #or a self.batch_page 
    904904                if self.sim_page is not None and uid == self.sim_page.uid: 
    905                     batch_on = self.sim_page.uid 
     905                    batch_on = self.sim_page.batch_on 
    906906                if self.batch_page is not None and uid == self.batch_page.uid: 
    907                     batch_on = self.batch_page.uid 
     907                    batch_on = self.batch_page.batch_on 
    908908            except: 
    909                 raise 
    910    
     909                 batch_on = False 
     910                 #raise 
     911         
    911912        # batch fit 
    912913        if batch_on: 
Note: See TracChangeset for help on using the changeset viewer.