Changeset df7a7e3 in sasview for sansguiframe

Timestamp:

Sep 17, 2012 7:11:50 PM (12 years ago)

Author:

Mathieu Doucet <doucetm@…>

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:

b71a53b

Parents:

cf7653d3

Message:

merging category branch

Location:

sansguiframe/src/sans/guiframe

Files:

• CategoryInstaller.py (added)
• CategoryManager.py (added)
• __init__.py (modified) (1 diff)
• default_categories.p (added)
• events.py (modified) (1 diff)
• gui_manager.py (modified) (7 diffs)

sansguiframe/src/sans/guiframe/__init__.py

@@ -70 +70 @@
     for f in findall(path):
         data_files.append(('media/guiframe_media', [f]))
+    path = get_media_path(media="catdata")
+    for f in findall(path):
+        data_files.append(('.', [f]))
+
     return data_files

sansguiframe/src/sans/guiframe/events.py

@@ -30 +30 @@
 ##color event
 (NewColorEvent, EVT_NEW_COLOR) = wx.lib.newevent.NewEvent()
+##change category event
+(ChangeCategoryEvent, EVT_CATEGORY) = wx.lib.newevent.NewEvent()

sansguiframe/src/sans/guiframe/gui_manager.py

@@ -25 +25 @@
 import urllib2
 
+from sans.guiframe.events import EVT_CATEGORY
 from sans.guiframe.events import EVT_STATUS
 from sans.guiframe.events import EVT_APPEND_BOOKMARK
@@ -39 +40 @@
 from sans.guiframe.data_processor import GridFrame
 from sans.guiframe.events import EVT_NEW_BATCH
+from sans.guiframe.CategoryManager import CategoryManager
 from sans.dataloader.loader import Loader
 
@@ -211 +213 @@
         Initialize the Frame object
         """
-        
+
         wx.Frame.__init__(self, parent=parent, title=title, pos=pos, size=size)
         # title
@@ -319 +321 @@
         self.Bind(EVT_NEW_BATCH, self.on_batch_selection)
         self.Bind(EVT_NEW_COLOR, self.on_color_selection)
+        self.Bind(EVT_CATEGORY, self.on_change_categories)
         self.setup_custom_conf()
         
@@ -342 +345 @@
                     pass  
         
+    def on_change_categories(self, evt):
+        # ILL
+        fitpanel = None
+        for item in self.plugins:
+            if hasattr(item, "get_panels"):
+                if hasattr(item, "fit_panel"):
+                    fitpanel = item.fit_panel
+
+        if fitpanel != None:
+            for i in range(0,fitpanel.GetPageCount()):
+                fitpanel.GetPage(i)._populate_listbox()
+
+
+
     def on_set_batch_result(self, data_outputs, data_inputs=None,
                              plugin_name=""):
@@ -1385 +1402 @@
             wx.EVT_MENU(self, id, self._on_preference_menu)
             
+        id = wx.NewId()
+        self._view_menu.AppendSeparator()
+        self._view_menu.Append(id, 'Category Manager', 'Edit model categories')
+        wx.EVT_MENU(self, id, self._on_category_manager)
+
         self._menubar.Append(self._view_menu, '&View')   
          
@@ -1395 +1417 @@
         self.batch_frame.Show(True)
         
+    def _on_category_manager(self, event):
+        CategoryManager(self, -1, 'Model Category Manager')
+
     def _on_preference_menu(self, event):     
         """