Changeset 916f5c0 in sasview

Timestamp:

Dec 8, 2011 11:44:28 AM (12 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:

f2b843c

Parents:

d760c0a

Message:

custom model now update as soon as it is compiled

Files:

• calculatorview/src/sans/perspectives/calculator/pyconsole.py (modified) (1 diff)
• fittingview/src/sans/perspectives/fitting/fitpanel.py (modified) (1 diff)
• fittingview/src/sans/perspectives/fitting/models.py (modified) (4 diffs)

calculatorview/src/sans/perspectives/calculator/pyconsole.py

@@ -147 +147 @@
         try:
             page = self.panel.get_current_page()
-            temp = self.panel.update_model_list()
+            temp = self.panel.reset_pmodel_list()
             if temp:
                 page.model_list_box = temp

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

@@ -127 +127 @@
             self.model_list_box = temp
         return temp
-
+    
+    def reset_pmodel_list(self):
+        """
+        """
+        temp = self.menu_mng.pulgins_reset()
+        if len(temp):
+            self.model_list_box = temp
+        return temp
+    
     def get_page_by_id(self, uid):  
         """

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

@@ -175 +175 @@
         """
         if name not in self.mydict.keys():
-            self.mydict[name] = mylist
+            self.reset_list(name, mylist)
             
+    def reset_list(self, name, mylist):
+        """
+        :param name: the type of the list
+        :param mylist: the list to add
+        """
+        self.mydict[name] = mylist         
             
     def get_list(self):
@@ -466 +472 @@
         is_modified = False
         if os.path.isdir(PLUGIN_DIR):
-            # getmtime doesn't seem to work well: use getatime
-            temp =  os.path.getatime(PLUGIN_DIR)
+            temp =  os.path.getmtime(PLUGIN_DIR)
             if  self.last_time_dir_modified != temp:
                 is_modified = True
@@ -490 +495 @@
             return {}
     
-             
+    def pulgins_reset(self):
+        """
+        return a dictionary of model
+        """
+        self.plugins = []
+        new_plugins = _findModels(dir)
+        for name, plug in  new_plugins.iteritems():
+            for stored_name, stored_plug in self.stored_plugins.iteritems():
+                if name == stored_name:
+                    del self.stored_plugins[name]
+                    break
+            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()
+       
     def populate_menu(self, modelmenu, event_owner):
         """
@@ -681 +705 @@
         return self.__modelmanager.update()
     
+    def pulgins_reset(self):
+        return self.__modelmanager.pulgins_reset()
+    
     def populate_menu(self, modelmenu, event_owner):
         return self.__modelmanager.populate_menu(modelmenu, event_owner)