Changeset f3f6746 in sasview for fittingview/src/sans


Ignore:
Timestamp:
Oct 21, 2011 1:23: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:
054f004
Parents:
6dad639
Message:

fixed in batch new 2D set data

Location:
fittingview/src/sans/perspectives/fitting
Files:
2 edited

Legend:

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

    r8c48773 rf3f6746  
    19641964            self.slit_smearer.Enable(False) 
    19651965            self.pinhole_smearer.Enable(False) 
     1966            self.btEditMask.Disable()   
     1967            self.EditMask_title.Disable() 
     1968 
    19661969         
    19671970        self.on_set_focus(None) 
  • fittingview/src/sans/perspectives/fitting/fitpanel.py

    r81a7b6c rf3f6746  
    428428            #check if there is an empty page to fill up  
    429429            if not check_data_validity(p.get_data()) and p.batch_on: 
    430                 page = p 
    431                 #self.batch_page_index += 1 
    432                 break 
     430                 
     431                #make sure data get placed in 1D empty tab if data is 1D 
     432                #else data get place on 2D tab empty tab 
     433                enable2D = p.get_view_mode() 
     434                if (data.__class__.__name__ == "Data2D" and enable2D)\ 
     435                or (data.__class__.__name__ == "Data1D" and not enable2D): 
     436                    page = p 
     437                    break 
    433438        if data_1d_list and data_2d_list: 
    434439            # need to warning the user that this batch is a special case 
     
    459464                 
    460465        pos = self.GetPageIndex(page) 
    461         caption = "BatchPage" + str(self.batch_page_index) 
    462         self.SetPageText(pos, caption) 
    463466        page.batch_on = self.batch_on 
    464467        page._set_save_flag(not page.batch_on) 
    465         page.window_caption = caption 
    466         page.window_name = caption 
    467468        self.SetSelection(pos) 
    468469        self.opened_pages[page.uid] = page 
Note: See TracChangeset for help on using the changeset viewer.