Changeset 763bec8 in sasview for fittingview/src


Ignore:
Timestamp:
Oct 6, 2011 2:25:29 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:
ee53c72
Parents:
e03a14e
Message:

do not use theory to plot if it is not batch

File:
1 edited

Legend:

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

    re68bfef r763bec8  
    14751475            self.page_finder[page_id].set_fit_tab_caption(caption=caption) 
    14761476            try: 
    1477                 # replace model cal to fit calculation if possible 
    1478                 new_plot.y = self.page_finder[page_id].get_result(fid=data.id).theory 
     1477                if batch_on: 
     1478                    # replace model cal to fit calculation if possible 
     1479                    new_plot.y = self.page_finder[page_id].get_result(fid=data.id).theory 
    14791480            except: 
    1480                 pass 
     1481                 pass 
    14811482 
    14821483            self.page_finder[page_id].set_theory_data(data=new_plot,  
     
    15541555        current_pg = self.fit_panel.get_page_by_id(page_id) 
    15551556        title = new_plot.title 
    1556         wx.PostEvent(self.parent, NewPlotEvent(plot=new_plot, 
     1557        batch_on = self.fit_panel.get_page_by_id(page_id).batch_on 
     1558        if not batch_on: 
     1559            wx.PostEvent(self.parent, NewPlotEvent(plot=new_plot, 
    15571560                                               title=title)) 
    1558         try: 
    1559             # replace model cal to fit calculation if possible 
    1560             new_plot.data = self.page_finder[page_id].get_result(fid=data.id).theory 
    1561         except: 
    1562             pass 
     1561        else: 
     1562            try: 
     1563                # replace model cal to fit calculation if possible 
     1564                new_plot.data = self.page_finder[page_id].get_result(fid=data.id).theory 
     1565            except: 
     1566                pass 
    15631567 
    15641568        self.page_finder[page_id].set_theory_data(data=new_plot, fid=data.id) 
Note: See TracChangeset for help on using the changeset viewer.