Changeset a5f6748 in sasview for fittingview/src/sans/perspectives

Timestamp:

Apr 27, 2012 1:22:39 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:

abba643

Parents:

3184d964

Message:

no plot update on batchfit

File:

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

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

@@ -1453 +1453 @@
                 fitproblem = self.page_finder[pid][data.id]
                 qmin, qmax = fitproblem.get_range()
-                plot_result = True
-                if correct_result and plot_result:
+                plot_result = False
+                if correct_result:
                     if not is_data2d:
                         self._complete1D(x=data.x, y=res.theory, page_id=pid, 
@@ -1462 +1462 @@
                                      toggle_mode_on=False, state=None, 
                                      data=data, update_chisqr=False, 
-                                     source='fit')
+                                     source='fit', plot_result = plot_result)
                     else:
                         self._complete2D(image=new_theory, data=data,
@@ -1472 +1472 @@
                                       toggle_mode_on=False, state=None, 
                                      update_chisqr=False, 
-                                     source='fit')
+                                     source='fit', plot_result = plot_result)
                 self.on_set_batch_result(page_id=pid, 
                                          fid=data.id, 
@@ -1770 +1770 @@
                     weight=None, fid=None,
                     toggle_mode_on=False, state=None, 
-                    data=None, update_chisqr=True, source='model'):
+                    data=None, update_chisqr=True, 
+                    source='model', plot_result=True):
         """
         Complete plotting 1D data
@@ -1813 +1814 @@
                 wx.PostEvent(self.parent, NewPlotEvent(plot=new_plot,
                                             title=str(title)))
-            else:
+            elif plot_result:
                 top_data_id = self.fit_panel.get_page_by_id(page_id).data.id
                 if data.id == top_data_id:
@@ -1858 +1859 @@
     def _complete2D(self, image, data, model, page_id,  elapsed, index, qmin,
                 qmax, fid=None, weight=None, toggle_mode_on=False, state=None, 
-                     update_chisqr=True, source='model'):
+                     update_chisqr=True, source='model', plot_result=True):
         """
         Complete get the result of modelthread and create model 2D
@@ -1903 +1904 @@
         title = new_plot.title
         batch_on = self.fit_panel.get_page_by_id(page_id).batch_on
-        if not source == 'fit':
+        if not source == 'fit' and plot_result:
             wx.PostEvent(self.parent, NewPlotEvent(plot=new_plot,
                                                title=title))