Changeset 763bec8 in sasview for fittingview/src/sans/perspectives/fitting

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:

• fittingview/src/sans/perspectives/fitting/fitting.py (modified) (2 diffs)

fittingview/src/sans/perspectives/fitting/fitting.py

@@ -1475 +1475 @@
             self.page_finder[page_id].set_fit_tab_caption(caption=caption)
             try:
-                # replace model cal to fit calculation if possible
-                new_plot.y = self.page_finder[page_id].get_result(fid=data.id).theory
+                if batch_on:
+                    # replace model cal to fit calculation if possible
+                    new_plot.y = self.page_finder[page_id].get_result(fid=data.id).theory
             except:
-                pass
+                 pass
 
             self.page_finder[page_id].set_theory_data(data=new_plot, 
@@ -1554 +1555 @@
         current_pg = self.fit_panel.get_page_by_id(page_id)
         title = new_plot.title
-        wx.PostEvent(self.parent, NewPlotEvent(plot=new_plot,
+        batch_on = self.fit_panel.get_page_by_id(page_id).batch_on
+        if not batch_on:
+            wx.PostEvent(self.parent, NewPlotEvent(plot=new_plot,
                                                title=title))
-        try:
-            # replace model cal to fit calculation if possible
-            new_plot.data = self.page_finder[page_id].get_result(fid=data.id).theory
-        except:
-            pass
+        else:
+            try:
+                # replace model cal to fit calculation if possible
+                new_plot.data = self.page_finder[page_id].get_result(fid=data.id).theory
+            except:
+                pass
 
         self.page_finder[page_id].set_theory_data(data=new_plot, fid=data.id)