Changes in / [46d210d:527a190] in sasview

Location:

src/sas/sasgui/perspectives/fitting

Files:

• fitpage.py (modified) (1 diff)
• models.py (modified) (4 diffs)

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

@@ -1236 +1236 @@
             wx.PostEvent(self.parent, new_event)
             # update list of plugins if new plugin is available
+            custom_model = CUSTOM_MODEL
             mod_cat = self.categorybox.GetStringSelection()
-            if mod_cat == CUSTOM_MODEL:
-                temp_id = self.model.id
+            if mod_cat == custom_model:
                 temp = self.parent.update_model_list()
-                for v in self.parent.model_dictionary.values():
-                    if v.id == temp_id:
-                        self.model = v()
-                        break
                 if temp:
                     self.model_list_box = temp

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

@@ -18 +18 @@
 from sas.sasgui.guiframe.CategoryInstaller import CategoryInstaller
 from sasmodels.sasview_model import load_custom_model, load_standard_models
-from sas.sasgui.perspectives.fitting.fitpage import CUSTOM_MODEL
 
 
@@ -261 +260 @@
         temp = {}
         if self.is_changed():
-            temp =  _findModels(dir)
-            self.last_time_dir_modified = time.time()
-            return temp
+            return  _findModels(dir)
         logging.info("plugin model : %s" % str(temp))
         return temp
@@ -310 +307 @@
         if os.path.isdir(plugin_dir):
             temp = os.path.getmtime(plugin_dir)
-            if  self.last_time_dir_modified < temp:
+            if  self.last_time_dir_modified != temp:
                 is_modified = True
                 self.last_time_dir_modified = temp
@@ -321 +318 @@
         new models were added else return empty dictionary
         """
-        self.plugins = []
         new_plugins = self.findModels()
-        if new_plugins:
-            for name, plug in  new_plugins.items():
-                self.stored_plugins[name] = plug
-                self.plugins.append(plug)
-                self.model_dictionary[name] = plug
-            self.model_combobox.set_list(CUSTOM_MODEL, self.plugins)
+        if len(new_plugins) > 0:
+            for name, plug in  new_plugins.iteritems():
+                if name not in self.stored_plugins.keys():
+                    self.stored_plugins[name] = plug
+                    self.plugins.append(plug)
+                    self.model_dictionary[name] = plug
+            self.model_combobox.set_list("Plugin Models", self.plugins)
             return self.model_combobox.get_list()
         else: