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

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.

Location:

src/sas/perspectives/fitting

Files:

• fitpage.py (modified) (3 diffs)
• fitting.py (modified) (3 diffs)

src/sas/perspectives/fitting/fitpage.py

@@ -2236 +2236 @@
         """
         # compute weight for the current data
-        from sas.perspectives.fitting.utils import get_weight
         flag_weight = self.get_weight_flag()
         if is_2D == None:
             is_2D = self._is_2D()
-        weight = get_weight(data=self.data,
-                            is2d=is_2D,
-                            flag=flag_weight)
         self._manager.set_fit_weight(uid=self.uid,
                                      flag=flag_weight,
@@ -2260 +2256 @@
         self._update_paramv_on_fit()
 
-        # msg default
-        msg = None
         if event != None:
             tcrtl = event.GetEventObject()
@@ -2275 +2269 @@
         # if any value is changed
         if is_new_pinhole:
-            msg = self._set_pinhole_smear()
+            self._set_pinhole_smear()
         # hide all silt sizer
         self._hide_all_smear_info()

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)