Changeset 18eba35 in sasview for guiframe/local_perspectives/plotting/Plotter1D.py

Timestamp:

Feb 24, 2009 11:46:12 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:

cce33b3

Parents:

2a8fac1

Message:

small bugs fixed: clearing slicer improved

File:

• guiframe/local_perspectives/plotting/Plotter1D.py (modified) (10 diffs)

guiframe/local_perspectives/plotting/Plotter1D.py

@@ -16 +16 @@
 import danse.common.plottools
 from danse.common.plottools.PlotPanel import PlotPanel
-from danse.common.plottools.plottables import Graph,Data1D,Theory1D
+from danse.common.plottools.plottables import Graph,Data1D,Theory1D,Data1D
 from sans.guicomm.events import EVT_NEW_PLOT
-from sans.guicomm.events import StatusEvent ,NewPlotEvent,SlicerEvent
+from sans.guicomm.events import StatusEvent ,NewPlotEvent,SlicerEvent,ErrorDataEvent
 from sans.guiframe.utils import PanelMenu
 
@@ -58 +58 @@
         ## save errors dy  for each data plotted
         self.err_dy={}
+        self.errors_hide=0
         
         ## Unique ID (from gui_manager)
@@ -184 +185 @@
         id = wx.NewId()
         slicerpop.Append(id,'&Print image', 'Print image ')
-        wx.EVT_MENU(self, id, self.onPrint)  
+        wx.EVT_MENU(self, id, self.onPrint)
+          
+        id = wx.NewId()
+        slicerpop.Append(id,'&Print Preview', 'image preview for print')
+        wx.EVT_MENU(self, id, self.onPrinterPreview)
            
         slicerpop.AppendSeparator()
@@ -220 +225 @@
        
         if self.graph.selected_plottable in self.plots:
-            if self.plots[self.graph.selected_plottable].__class__.__name__=="Theory1D":
+            if self.plots[self.graph.selected_plottable].name in self.err_dy.iterkeys()\
+                and self.errors_hide==1:
+                 
+                #if self.plots[self.graph.selected_plottable].__class__.__name__=="Theory1D":
                 id = wx.NewId()
-                slicerpop.Append(id, '&Add errors to data')
+                slicerpop.Append(id, '&Show errors to data')
                 #print "panel scale before  ",self.xLabel, self.yLabel
                 #print "cyllinder before adding error", self.plots[self.graph.selected_plottable].x
                 wx.EVT_MENU(self, id, self._on_add_errors)
-                """
-                elif self.plots[self.graph.selected_plottable].__class__.__name__=="Data1D":
+                
+               
+            elif self.plots[self.graph.selected_plottable].__class__.__name__=="Data1D"\
+                and self.errors_hide==0:
                     id = wx.NewId()
-                    slicerpop.Append(id, '&Remove errors From data')
+                    slicerpop.Append(id, '&Hide Error bars')
                     #print "panel scale before  ",self.xLabel, self.yLabel
                     #print "cyllinder before adding error", self.plots[self.graph.selected_plottable].x
                     wx.EVT_MENU(self, id, self._on_remove_errors)
-                """
+                    
+             
             else:
                 id = wx.NewId()
@@ -262 +273 @@
         pos = self.ScreenToClient(pos)
         self.PopupMenu(slicerpop, pos)
+        
+        
     def _on_remove_errors(self, evt):
         if not self.graph.selected_plottable == None:
@@ -267 +280 @@
             dy = self.plots[self.graph.selected_plottable].dy
             self.err_dy[name]= dy
-            new_plot = Theory1D(self.plots[self.graph.selected_plottable].x,
+            import numpy
+            dy= numpy.zeros(len(self.plots[self.graph.selected_plottable].y))
+            new_plot = Data1D(self.plots[self.graph.selected_plottable].x,
                               self.plots[self.graph.selected_plottable].y,
-                              dy=None)
+                              dy=dy)
             new_plot.interactive = True
+            self.errors_hide=1
             new_plot.name = self.plots[self.graph.selected_plottable].name 
             if hasattr(self.plots[self.graph.selected_plottable], "group_id"):
@@ -283 +299 @@
             new_plot.yaxis(label, unit)
             #print "panel scale ",self.xLabel, self.yLabel
-            print "color",self.graph.plottables[self.plots[self.graph.selected_plottable]]
+            #print "color",self.graph.plottables[self.plots[self.graph.selected_plottable]]
             color=self.graph.plottables[self.plots[self.graph.selected_plottable]]
-            self.graph.delete_plottable(self.plots[self.graph.selected_plottable])
+            self.graph.delete(self.plots[self.graph.selected_plottable])
             
             self.graph.add(new_plot,color)
@@ -295 +311 @@
             self.graph.render(self)
             self.subplot.figure.canvas.draw_idle() 
+            
+            event = ErrorDataEvent(err_dy=self.err_dy)
+            wx.PostEvent(self.parent, event)
     
     def _on_add_errors(self, evt):
@@ -321 +340 @@
                               dy=dy)
             new_plot.interactive = True
+            self.errors_hide=0
             new_plot.name = self.plots[self.graph.selected_plottable].name 
             if hasattr(self.plots[self.graph.selected_plottable], "group_id"):
@@ -334 +354 @@
             new_plot.yaxis(label, unit)
             #print "panel scale ",self.xLabel, self.yLabel
-            #color=self.graph.plottables[self.plots[self.graph.selected_plottable]]
-            self.graph.delete_plottable(self.plots[self.graph.selected_plottable])
-            #self.graph.add_plottable(new_plot, color)
-            self.graph.add(new_plot)
+            color=self.graph.plottables[self.plots[self.graph.selected_plottable]]
+            self.graph.delete(self.plots[self.graph.selected_plottable])
+            self.graph.add(new_plot, color)
+            
             # transforming the view of the new data into the same of the previous data
             self._onEVT_FUNC_PROPERTY()