Changeset bac3988 in sasview

Timestamp:

Mar 17, 2016 11:08:10 AM (8 years ago)

Author:

ajj

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:

1c628f0

Parents:

a301204

Message:

Fixing category lists and list of models in GUI

Files:

• sasview/default_categories.json (modified) (1 diff)
• sasview/default_categories.p (deleted)
• src/sas/sasgui/guiframe/default_categories.p (deleted)
• src/sas/sasgui/perspectives/calculator/model_editor.py (modified) (3 diffs)
• src/sas/sasgui/perspectives/fitting/basepage.py (modified) (8 diffs)
• src/sas/sasgui/perspectives/fitting/models.py (modified) (1 diff)

sasview/default_categories.json

@@ -1 @@
-{"Shapes": [["BarBellModel", true], ["PearlNecklaceModel", true], ["HollowCylinderModel", true], ["CoreMultiShellModel", true], ["FCCrystalModel", true], ["ParallelepipedModel", true], ["FuzzySphereModel", true], ["CoreShellEllipsoidXTModel", true], ["LamellarPCrystalModel", true], ["BCCrystalModel", true], ["EllipticalCylinderModel", true], ["RectangularHollowPrismInfThinWallsModel", true], ["CSParallelepipedModel", true], ["OnionExpShellModel", true], ["MultiShellModel", true], ["RaspBerryModel", true], ["CoreShellEllipsoidModel", true], ["CappedCylinderModel", true], ["CylinderModel", true], ["SphericalSLDModel", true], ["SCCrystalModel", true], ["StackedDisksModel", true], ["LamellarPSHGModel", true], ["CoreShellBicelleModel", true], ["RectangularHollowPrismModel", true], ["LamellarPSModel", true], ["EllipsoidModel", true], ["SphereModel", true], ["VesicleModel", true], ["TriaxialEllipsoidModel", true], ["LamellarModel", true], ["PringlesModel", true], ["RectangularPrismModel", true], ["CoreShellCylinderModel", true], ["BinaryHSModel", true], ["FlexibleCylinderModel", true], ["LamellarFFHGModel", true], ["FlexCylEllipXModel", true], ["LinearPearlsModel", true], ["CoreShellModel", true]], "Structure Factor": [["SquareWellStructure", true], ["HayterMSAStructure", true], ["HardsphereStructure", true], ["StickyHSStructure", true]], "Shape-Independent": [["TwoPowerLawModel", true], ["GelFitModel", true], ["DABModel", true], ["PowerLawAbsModel", true], ["PorodModel", true], ["GuinierModel", true], ["RPA10Model", true], ["TeubnerStreyModel", true], ["StarPolymer", true], ["UnifiedPowerRgModel", true], ["MassSurfaceFractal", true], ["Core2ndMomentModel", true], ["TwoLorentzianModel", true], ["DebyeModel", true], ["MassFractalModel", true], ["GuinierPorodModel", true], ["CorrLengthModel", true], ["PolymerExclVolume", true], ["FractalModel", true], ["PeakLorentzModel", true], ["BroadPeakModel", true], ["FractalCoreShellModel", true], ["PeakGaussModel", true], ["BEPolyelectrolyte", true], ["Poly_GaussCoil", true], ["SurfaceFractalModel", true], ["GaussLorentzGelModel", true], ["LorentzModel", true]], "Uncategorized": [["ReflectivityModel", true], ["ReflectivityIIModel", true], ["LineModel", true], ["MicelleSphCoreModel", true]]}
+{"Shapes": [["cylinder", true], ["lamellarPC", true], ["core_shell_cylinder", true], ["barbell", true], ["fuzzy_sphere", true], ["sphere", true], ["triaxial_ellipsoid", true], ["rectangular_prism", true], ["core_shell_bicelle", true], ["flexible_cylinder", true], ["hollow_rectangular_prism", true], ["ellipsoid", true], ["flexible_cylinder_ex", true], ["capped_cylinder", true], ["core_shell_ellipsoid", true], ["core_shell_parallelepiped", true], ["core_shell_ellipsoid_xt", true], ["vesicle", true], ["core_shell_sphere", true], ["parallelepiped", true], ["hollow_cylinder", true], ["linear_pearls", true], ["pearl_necklace", true], ["lamellar", true], ["multi_shell", true], ["hollow_rectangular_prism_infinitely_thin_walls", true], ["sc_crystal", true], ["stacked_disks", true]], "Structure Factor": [["stickyhardsphere", true], ["hayter_msa", true], ["squarewell", true], ["hardsphere", true]], "Shape-Independent": [["guinier", true], ["gel_fit", true], ["teubner_strey", true], ["gaussian_peak", true], ["mono_gauss_coil", true], ["mass_surface_fractal", true], ["adsorbed_layer", true], ["two_lorentzian", true], ["correlation_length", true], ["dab", true], ["poly_gauss_coil", true], ["guinier_porod", true], ["star_polymer", true], ["two_power_law", true], ["power_law", true], ["peak_lorentz", true], ["rpa", true], ["broad_peak", true], ["surface_fractal", true], ["be_polyelectrolyte", true], ["mass_fractal", true], ["polymer_excl_volume", true], ["porod", true], ["gauss_lorentz_gel", true], ["lorentz", true], ["fractal_core_shell", true]], "Uncategorized": [["line", true], ["fcc_paracrystal", true], ["elliptical_cylinder", true], ["lamellarPS", true], ["micelle_spherical_core", true], ["lamellar_FFHG", true], ["bcc_paracrystal", true], ["sphere (python)", true], ["lamellarCailleHG", true]]}

src/sas/sasgui/perspectives/calculator/model_editor.py

@@ -574 +574 @@
                     if not self.is_p1_custom:
                         line = line.replace('#', '')
-                        out_f.write(line % (name1, name1) + "\n")
+                        out_f.write(line % (name1) + "\n")
                     else:
                         out_f.write(line + "\n")
@@ -586 +586 @@
                     if not self.is_p2_custom:
                         line = line.replace('#', '')
-                        out_f.write(line % (name2, name2) + "\n")
+                        out_f.write(line % (name2) + "\n")
                     else:
                         out_f.write(line + "\n")
@@ -1265 +1265 @@
 # User can change the name of the model (only with single functional model)
 #P1_model:
-#from sas.models.%s import %s as P1
+#from sasmodels.models import %s as P1
 #from %s import Model as P1
 
 #P2_model:
-#from sas.models.%s import %s as P2
+#from sasmodels.models import %s as P2
 #from %s import Model as P2
 import os

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

@@ -1282 +1282 @@
             else:
                 self.model_view.SetLabel("1D Mode")
-        
+
         ## set the select all check box to the a given state
         self.cb1.SetValue(state.cb1)
@@ -1904 +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"))
@@ -1945 +1945 @@
             name = model.__class__.__name__
             if models.__name__ != "NoStructure":
-                if hasattr(model, "oldname"):
-                    name = model.oldname
-                elif hasattr(model, "name"):
-                    name = model.name
+                name = model.name
                 mlist.append((name, models))
 
@@ -2417 +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()
@@ -2461 +2458 @@
         self.values = {}
         self.weights = {}
-      
+
         #from sas.models.dispersion_models import GaussianDispersion
         from sasmodels.weights import GaussianDispersion
@@ -2970 +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()
@@ -3597 +3594 @@
         sizer_cat_box.Add(show_cat_button)
         #self.shape_rbutton.SetValue(True)
-      
+
         sizer_radiobutton = wx.GridSizer(2, 2, 5, 5)
         #sizer_radiobutton.Add(self.shape_rbutton)
@@ -3817 +3814 @@
         event.Skip()
         #pass
-

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

@@ -303 +303 @@
         for mod_name in sasmodels.core.list_models():
             mod_def = sasmodels.core.load_model_info(mod_name)
-            self.model_dictionary[mod_def['oldname']] = make_class(mod_def,dtype=None,namestyle='oldname')
-            self.model_name_list.append(mod_def['oldname'])
+            self.model_dictionary[mod_def['name']] = make_class(mod_def,dtype=None,namestyle='name')
             if mod_def['structure_factor'] == True:
-                self.struct_list.append(self.model_dictionary[mod_def['oldname']])
+                self.struct_list.append(self.model_dictionary[mod_def['name']])
             if mod_def['variant_info'] is not None:
-                self.multi_func_list.append(self.model_dictionary[mod_def['oldname']])
+                self.multi_func_list.append(self.model_dictionary[mod_def['name']])
+            else:
+                self.model_name_list.append(mod_def['name'])
             if mod_def['ER'] is not None:
-                self.multiplication_factor.append(self.model_dictionary[mod_def['oldname']])
+                self.multiplication_factor.append(self.model_dictionary[mod_def['name']])
 
         #Looking for plugins