Changeset b9a5f0e in sasview for src/sas/perspectives/fitting/basepage.py

Timestamp:

Feb 13, 2015 2:52:52 AM (9 years ago)

Author:

krzywon

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:

fd5ac0d

Parents:

35ec279

Message:

90% complete with the conversion.

File:

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

src/sas/perspectives/fitting/basepage.py

@@ -2015 +2015 @@
                     temp_smear = self.current_smearer
             # compute weight for the current data
-            from sas import get_weight
+            from sas.perspectives.fitting.utils import get_weight
             flag = self.get_weight_flag()
             weight = get_weight(data=self.data, is2d=self._is_2D(), flag=flag)
@@ -3136 +3136 @@
         """
         from help_panel import  HelpWindow
-import sas.models as models
+        import sas.models as models
         
         # Get models help model_function path
@@ -3173 +3173 @@
         Get the string copies of the param names and values in the tap
         """
-        content = 'sansview_parameter_values:'
+        content = 'sasview_parameter_values:'
         # Do it if params exist
         if  self.parameters != []:
@@ -3402 +3402 @@
         # put the text into dictionary
         lines = text.split(':')
-        if lines[0] != 'sansview_parameter_values':
+        if lines[0] != 'sasview_parameter_values':
             self._copy_info(False)
             return False