Changeset 7949dcf7 in sasview for src/sas/sasgui/perspectives/fitting/basepage.py

Timestamp:

Oct 14, 2016 8:28:47 AM (8 years ago)

Author:

GitHub <noreply@…>

Parents:

9087214 (diff), 8b645cc (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

git-author:

jhbakker <j.h.bakker@…> (10/14/16 08:28:47)

git-committer:

GitHub <noreply@…> (10/14/16 08:28:47)

Message:

Merge 8b645cc3cea24d016ee884edc83b7654f8f0470b into 90872142fe3b2f0510dc9736969ed78e0fcf3218

File:

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

src/sas/sasgui/perspectives/fitting/basepage.py

@@ -2057 +2057 @@
 
         if  struct_factor != None:
-            from sas.sascalc.fit.MultiplicationModel import MultiplicationModel
+            from sasmodels.sasview_model import MultiplicationModel
             self.model = MultiplicationModel(form_factor(self.multi_factor),
                                              struct_factor())
@@ -3344 +3344 @@
                             item[0].SetValue(is_true)
 
+        self.select_param(event=None)
+        self.Refresh()
+
     def _paste_poly_help(self, item, value):
         """