Changeset 19e614a in sasview for fittingview/src/sans/perspectives/fitting/models.py

Timestamp:

May 2, 2012 9:03:55 AM (13 years ago)

Author:

Jae Cho <jhjcho@…>

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:

3aab96b

Parents:

6246e00

Message:

let users be able to delete default custom models (WIN app only)

File:

• fittingview/src/sans/perspectives/fitting/models.py (modified) (4 diffs)

fittingview/src/sans/perspectives/fitting/models.py

@@ -107 +107 @@
         if not p_dir:
             raise
-
     # Place example user models as needed
-    for file in os.listdir(p_dir):
-        file_path = os.path.join(p_dir, file)
-        if os.path.isfile(file_path):
-            if file.split(".")[-1] == 'py' and\
-                file.split(".")[0] != '__init__':
-                if not os.path.isfile(os.path.join(dir, file)):
-                    shutil.copy(file_path, dir)
+    if os.path.isdir(p_dir):
+        for file in os.listdir(p_dir):
+            file_path = os.path.join(p_dir, file)
+            if os.path.isfile(file_path):
+                if file.split(".")[-1] == 'py' and\
+                    file.split(".")[0] != '__init__':
+                    if not os.path.isfile(os.path.join(dir, file)):
+                        shutil.copy(file_path, dir)
+
     return dir
 
@@ -572 +573 @@
         
         from sans.models.ReflectivityModel import ReflectivityModel
+        self.shape_indep_list.append(ReflectivityModel)
         self.multi_func_list.append(ReflectivityModel)
         
         from sans.models.ReflectivityIIModel import ReflectivityIIModel
+        self.shape_indep_list.append(ReflectivityIIModel)
         self.multi_func_list.append(ReflectivityIIModel)
     
@@ -580 +583 @@
         self.stored_plugins = self.findModels()
         self.plugins = self.stored_plugins.values()
-        self.plugins.append(ReflectivityModel)
-        self.plugins.append(ReflectivityIIModel)
+
         self._get_multifunc_models()
        
@@ -630 +632 @@
             self.stored_plugins[name] = plug
             self.plugins.append(plug)
-        from sans.models.ReflectivityModel import ReflectivityModel
-        from sans.models.ReflectivityIIModel import ReflectivityIIModel
-        self.plugins.append(ReflectivityModel)
-        self.plugins.append(ReflectivityIIModel)
+
         self.model_combobox.reset_list("Customized Models", self.plugins)
         return self.model_combobox.get_list()