Changeset 098f3d2 in sasview for src/sas/perspectives/fitting/fitting.py

Timestamp:

Jul 6, 2015 1:11:55 PM (9 years ago)

Author:

Doucet, Mathieu <doucetm@…>

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:

d3d67f0

Parents:

9989a6a

Message:

Remove print preview menu items. Fix 2D plotting from fit perspective.

File:

• src/sas/perspectives/fitting/fitting.py (modified) (3 diffs)

src/sas/perspectives/fitting/fitting.py

@@ -516 +516 @@
         selected_data_list = []
         if self.batch_on:
-            page = self.add_fit_page(data=data_list)
+            self.add_fit_page(data=data_list)
         else:
             if len(data_list) > MAX_NBR_DATA:
@@ -537 +537 @@
                         if group_id not in data.list_group_id:
                             data.list_group_id.append(group_id)
-                        page = self.add_fit_page(data=[data])
+                        self.add_fit_page(data=[data])
             except:
-                msg = "Fitting Set_data: " + str(sys.exc_value)
+                msg = "Fitting set_data: " + str(sys.exc_value)
                 wx.PostEvent(self.parent, StatusEvent(status=msg, info="error"))
 
@@ -670 +670 @@
         :param weight: current dy data
         """
+        # If we are not dealing with a specific fit problem, then
+        # there is no point setting the weights.
+        if fid is None:
+            return
         if uid in self.page_finder.keys():
             self.page_finder[uid].set_weight(flag=flag, is2d=is2d)