Changeset 940aca7 in sasview for sansguiframe/src/sans/guiframe/local_perspectives/plotting/plotting.py

Timestamp:

May 19, 2012 10:17:02 AM (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:

baa915c

Parents:

d225e32

Message:

Merge 2.1.1 into trunk

File:

• sansguiframe/src/sans/guiframe/local_perspectives/plotting/plotting.py (modified) (2 diffs)

sansguiframe/src/sans/guiframe/local_perspectives/plotting/plotting.py

@@ -276 +276 @@
         
         """
+        action_check = False
         if hasattr(event, 'action'):
-            group_id = event.group_id
-            if group_id in self.plot_panels.keys():
-                #remove data from panel
-                if event.action.lower().strip() == 'remove':
-                    id = event.id
-                    return self.remove_plot(group_id, id)
-                if event.action.lower().strip() == 'hide':
-                    return self.hide_panel(group_id)
-                if event.action.lower().strip() == 'delete':
-                    panel = self.plot_panels[group_id]
-                    uid = panel.uid
-                    return self.parent.delete_panel(uid)
-                if event.action.lower().strip() == "clear":
-                    return self.clear_panel_by_id(group_id)
+            action_string = event.action.lower().strip()
+            if action_string == 'check':
+                action_check = True
+            else:
+                group_id = event.group_id
+                if group_id in self.plot_panels.keys():
+                    #remove data from panel
+                    if action_string == 'remove':
+                        id = event.id
+                        return self.remove_plot(group_id, id)
+                    if action_string == 'hide':
+                        return self.hide_panel(group_id)
+                    if action_string == 'delete':
+                        panel = self.plot_panels[group_id]
+                        uid = panel.uid
+                        return self.parent.delete_panel(uid)
+                    if action_string == "clear":
+                        return self.clear_panel_by_id(group_id)
+                    
         if not hasattr(event, 'plot'):    
             return
         title = None
         if hasattr(event, 'title'):
-            title = 'Graph'#event.title
-                
+            title = 'Graph'#event.title      
         data = event.plot
-        group_id = data.group_id
-            
-        if group_id in self.plot_panels.keys():
+        group_id = data.group_id    
+        if group_id in self.plot_panels.keys():
+            if action_check:
+                # Check if the plot already exist. if it does, do nothing.
+                if data.id in self.plot_panels[group_id].plots.keys():
+                    return 
             #update a panel graph 
             panel = self.plot_panels[group_id]
@@ -309 +317 @@
                 new_panel = self.create_1d_panel(data, group_id)
             else:
+                # Need to make the group_id consistent with 1D thus no if below
+                if len(self.plot_panels.values()) > 0:
+                    for p_group_id in self.plot_panels.keys():
+                        p_plot = self.plot_panels[p_group_id]
+                        if data.id in p_plot.plots.keys():
+                            p_plot.plots[data.id] = data
+                            self.plot_panels[group_id] = p_plot
+                            if group_id != p_group_id:
+                                del self.plot_panels[p_group_id]
+                                if p_group_id in data.list_group_id:
+                                    data.list_group_id.remove(p_group_id)
+                                if group_id not in data.list_group_id:
+                                    data.list_group_id.append(group_id)
+                            p_plot.group_id = group_id
+                            return
+                
                 new_panel = self.create_2d_panel(data, group_id)
-            self.create_panel_helper(new_panel, data, group_id, title)
-            
+            self.create_panel_helper(new_panel, data, group_id, title) 
         return