Changes in src/sas/sasgui/perspectives/fitting/basepage.py [d85c194:bac3988] in sasview

File:

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

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

@@ -57 +57 @@
     ## Title to appear on top of the window
     window_caption = "Fit Page "
+
     # These two buttons have specific IDs since they seem to be created more
     # frequently than they need to.  In particular, set_dispers_sizer() is
@@ -1281 +1282 @@
             else:
                 self.model_view.SetLabel("1D Mode")
-        
+
         ## set the select all check box to the a given state
         self.cb1.SetValue(state.cb1)
@@ -1379 +1380 @@
             if disp.__class__.__name__ == 'str':
                 disp_model = None
-                com_str = "from sas.models.dispersion_models "
+                com_str = "from sasmodels.weights "
                 com_str += "import %s as disp_func \ndisp_model = disp_func()"
                 exec com_str % disp
@@ -1903 +1904 @@
                         m_list.append(self.model_dict[model])
                     #else:
-                    #    msg = "This model is disabled by Category Manager." 
+                    #    msg = "This model is disabled by Category Manager."
                     #    wx.PostEvent(self.parent.parent,
                     #                 StatusEvent(status=msg, info="error"))
@@ -1944 +1945 @@
             name = model.__class__.__name__
             if models.__name__ != "NoStructure":
-                if hasattr(model, "name"):
-                    name = model.name
+                name = model.name
                 mlist.append((name, models))
 
@@ -2414 +2414 @@
         self._draw_model()
         ## Need to use FitInside again here to replace the next four lines.
-        ## Otherwised polydispersity off does not resize the scrollwindow. 
+        ## Otherwised polydispersity off does not resize the scrollwindow.
         ## PDB Nov 28, 2015
         self.FitInside()
@@ -2459 +2459 @@
         self.weights = {}
 
-        from sas.models.dispersion_models import GaussianDispersion
+        #from sas.models.dispersion_models import GaussianDispersion
+        from sasmodels.weights import GaussianDispersion
         if len(self.disp_cb_dict) == 0:
             self.save_current_state()
@@ -2966 +2967 @@
         self.Show(False)
         self.set_model_param_sizer(self.model)
-        #self._set_sizer_dispersion() 
+        #self._set_sizer_dispersion()
         self.state.magnetic_on = self.magnetic_on
         self.SetupScrolling()
@@ -3587 +3588 @@
         cat_tip = "Modify model categories \n"
         cat_tip += "(also accessible from the menu bar)."
-        show_cat_button.SetToolTip(wx.ToolTip(cat_tip))
+        show_cat_button.SetToolTip( wx.ToolTip(cat_tip) )
         show_cat_button.Bind(wx.EVT_BUTTON, self._on_modify_cat)
         sizer_cat_box.Add(self.categorybox, 1, wx.RIGHT, 3)
-        sizer_cat_box.Add((10, 10))
+        sizer_cat_box.Add((10,10))
         sizer_cat_box.Add(show_cat_button)
         #self.shape_rbutton.SetValue(True)
@@ -3597 +3598 @@
         #sizer_radiobutton.Add(self.shape_rbutton)
         #sizer_radiobutton.Add(self.shape_indep_rbutton)
-        sizer_radiobutton.Add((5, 5))
+        sizer_radiobutton.Add((5,5))
         sizer_radiobutton.Add(self.model_view, 1, wx.RIGHT, 5)
         #sizer_radiobutton.Add(self.plugin_rbutton)
@@ -3813 +3814 @@
         event.Skip()
         #pass
-