Changeset 383189f9 in sasview

Timestamp:

May 7, 2008 5:16:37 PM (17 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:

2e07e8f

Parents:

792d7665

Message:

Added plot group ID

Location:

guiframe

Files:

• gui_manager.py (modified) (2 diffs)
• local_perspectives/plotting/plotting.py (modified) (2 diffs)
• release_notes.txt (modified) (1 diff)

guiframe/gui_manager.py

@@ -217 +217 @@
         count = 0
         for item in self.panels:
-            if self.panels[item].window_name == p.window_name:
+            if self.panels[item].window_name.startswith(p.window_name): 
                 count += 1
                 
@@ -349 +349 @@
             if not self._mgr.GetPane(self.panels[ID].window_name).IsShown():
                 self._mgr.GetPane(self.panels[ID].window_name).Show()
+                # Hide default panel
+                self._mgr.GetPane(self.panels["default"].window_name).Hide()
+                
+                
             self._mgr.Update()
         

guiframe/local_perspectives/plotting/plotting.py

@@ -35 +35 @@
     #  tied to any perspective
     ALWAYS_ON = True
+    ## Group ID
+    group_id = None
     
     def __init__(self, parent, id = -1, color = None,\
@@ -216 +218 @@
             if event.plot._xunit == panel.graph.prop["xunit"] \
             and event.plot._yunit == panel.graph.prop["yunit"]:
-                is_available = True
-                panel._onEVT_1DREPLOT(event)
-                self.parent.show_panel(panel.uid)
+                if hasattr(event.plot, "group_id"):
+                    if not event.plot.group_id==None \
+                        and event.plot.group_id==panel.group_id:
+                        is_available = True
+                        panel._onEVT_1DREPLOT(event)
+                        self.parent.show_panel(panel.uid)
+                else:
+                    # Check that the plot panel has no group ID
+                    if panel.group_id==None:
+                        is_available = True
+                        panel._onEVT_1DREPLOT(event)
+                        self.parent.show_panel(panel.uid)
         
         # Create a new plot panel if none was available        
         if not is_available:
             new_panel = View1DPanel(self.parent, -1, style=wx.RAISED_BORDER)
+            # Set group ID if available
+            group_id_str = ''
+            if hasattr(event.plot, "group_id"):
+                if not event.plot.group_id==None:
+                    new_panel.group_id = event.plot.group_id
+                    group_id_str = ' [%s]' % event.plot.group_id
+            
             if hasattr(event, "title"):
                 new_panel.window_caption = event.title
                 new_panel.window_name = event.title
+                #new_panel.window_caption = event.title+group_id_str
+                #new_panel.window_name = event.title+group_id_str
             
             event_id = self.parent.popup_panel(new_panel)

guiframe/release_notes.txt

@@ -16 +16 @@
                 its own plots.
         - Provide a hook for a general file loader for the various data formats
+        - Add group flag to allow groups of plots (and exclude other plots with
+                same units to be plotted in the same Graph.