Changes in src/sas/sasgui/perspectives/fitting/fitpage.py [f27dd1e:cb4ef58] in sasview

File:

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

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

@@ -10 +10 @@
 import math
 import time
+
+from sasmodels.weights import MODELS as POLYDISPERSITY_MODELS
+
 from sas.sasgui.guiframe.events import StatusEvent
 from sas.sasgui.guiframe.events import NewPlotEvent
@@ -621 +624 @@
         model_disp = wx.StaticText(self, wx.ID_ANY, 'Function')
         CHECK_STATE = self.cb1.GetValue()
-        #import sas.models.dispersion_models
-        #self.polydisp = sas.models.dispersion_models.models
-        import sasmodels.weights
-        self.polydisp =  sasmodels.weights.models
 
         ix = 0
@@ -784 +783 @@
                 disp_box = wx.ComboBox(self, wx.ID_ANY, size=(65, -1),
                                        style=wx.CB_READONLY, name='%s' % name1)
-                for key, value in self.polydisp.iteritems():
+                for key, value in POLYDISPERSITY_MODELS.iteritems():
                     name_disp = str(key)
                     disp_box.Append(name_disp, value)
@@ -948 +947 @@
                 disp_box = wx.ComboBox(self, wx.ID_ANY, size=(65, -1),
                                 style=wx.CB_READONLY, name='%s' % name1)
-                for key, value in self.polydisp.iteritems():
+                for key, value in POLYDISPERSITY_MODELS.iteritems():
                     name_disp = str(key)
                     disp_box.Append(name_disp, value)