Changeset 1debb29 in sasview

Timestamp:

May 12, 2009 11:34:27 AM (16 years ago)

Author:

Gervaise Alina <gervyh@…>

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:

63c7d85d

Parents:

12dbb14d

Message:

move code of panel slicer from guiframe to fitting plugin

Location:

guiframe/local_perspectives/plotting

Files:

• Plotter1D.py (modified) (3 diffs)
• Plotter2D.py (modified) (1 diff)

guiframe/local_perspectives/plotting/Plotter1D.py

@@ -20 +20 @@
 from sans.guicomm.events import EVT_NEW_PLOT
 from sans.guicomm.events import StatusEvent ,NewPlotEvent,SlicerEvent,ErrorDataEvent
+from sans.guicomm.events import RemoveDataEvent
 from sans.guiframe.utils import PanelMenu
 
@@ -162 +163 @@
         """
         ## Check if there is a selected graph to remove
-        if not self.graph.selected_plottable == None:
+        if not self.graph.selected_plottable == None and\
+            self.graph.selected_plottable in self.plots.keys():
+            color=self.graph.plottables[self.plots[self.graph.selected_plottable]]
+           
+            event = RemoveDataEvent(data =self.plots[self.graph.selected_plottable])
+            wx.PostEvent(self.parent, event)
             self.graph.delete(self.plots[self.graph.selected_plottable])
             del self.plots[self.graph.selected_plottable]
+            ## increment graph color
+            self.graph.color += color
             self.graph.render(self)
             self.subplot.figure.canvas.draw_idle()    
+           
             
 
@@ -333 +342 @@
         import time
         
-        if not self.graph.selected_plottable == None:
+        if not self.graph.selected_plottable == None \
+            and self.graph.selected_plottable in self.plots.keys():
             ##Reset the flag to display the hide option on the context menu
             self.errors_hide = False

guiframe/local_perspectives/plotting/Plotter2D.py

@@ -464 +464 @@
         ## post slicer panel to guiframe to display it 
         from sans.guicomm.events import SlicerPanelEvent
-        wx.PostEvent(self.parent, SlicerPanelEvent (panel= self.panel_slicer))
+        wx.PostEvent(self.parent, SlicerPanelEvent (panel= self.panel_slicer,
+                                                    main_panel =self))