Changeset 31482fc in sasview

Timestamp:

Apr 20, 2009 9:50:58 PM (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:

bf5bfc0

Parents:

6fb01b6

Message:

hide and show error bar previous status remembered

Location:

guiframe/local_perspectives/plotting

Files:

• Plotter1D.py (modified) (9 diffs)
• plotting.py (modified) (1 diff)

guiframe/local_perspectives/plotting/Plotter1D.py

@@ -12 +12 @@
 import wx
 import sys, os
-import pylab, time
+import pylab, time,numpy
 
 import danse.common.plottools
@@ -60 +60 @@
         ## flag to determine if the hide or show context menu item should
         ## be displayed
-        self.errors_hide=0
+        self.errors_hide=False
         ## Unique ID (from gui_manager)
         self.uid = None
@@ -125 +125 @@
             if hasattr(event.plot, 'dx') and hasattr(self.plots[event.plot.name], 'dx'):
                 self.plots[event.plot.name].dx = event.plot.dx    
- 
+          
         #TODO: Should re-factor this
         ## for all added plot the option to hide error show be displayed first
-        self.errors_hide = 0
+        #self.errors_hide = 0
         ## Set axis labels
         self.graph.xaxis(event.plot._xaxis, event.plot._xunit)
@@ -137 +137 @@
         self.graph.render(self)
         self.subplot.figure.canvas.draw_idle()
-        
-        
+        if self.errors_hide:
+            self._on_remove_errors(evt=None)
+        else:
+            self._on_add_errors( evt=None)
+        return
+    
     def onLeftDown(self,event): 
         """ 
@@ -209 +213 @@
             self.action_ids[str(id)] = plot
             wx.EVT_MENU(self, id, self._onSave)
-            #wx.EVT_MENU(self, id, self._onSaveXML)
-           
+          
             id = wx.NewId()
             slicerpop.Append(id, "Remove %s curve" % name)
@@ -221 +224 @@
         if self.graph.selected_plottable in self.plots:
             if self.plots[self.graph.selected_plottable].name in self.err_dy.iterkeys()\
-                and self.errors_hide==1:
+                and self.errors_hide:
                 
                 id = wx.NewId()
@@ -228 +231 @@
                 
             elif self.plots[self.graph.selected_plottable].__class__.__name__=="Data1D"\
-                and self.errors_hide==0:
-                   
+                and not self.errors_hide:
                     id = wx.NewId()
                     slicerpop.Append(id, '&Hide Error bars')
@@ -274 +276 @@
                               dy=dy)
             new_plot.interactive = True
-            self.errors_hide = 1
+            self.errors_hide = True
             new_plot.name = self.plots[self.graph.selected_plottable].name 
             if hasattr(self.plots[self.graph.selected_plottable], "group_id"):
@@ -317 +319 @@
         if not self.graph.selected_plottable == None:
             ##Reset the flag to display the hide option on the context menu
-            self.errors_hide = 0
+            self.errors_hide = False
             ## restore dy 
             length = len(self.plots[self.graph.selected_plottable].x)

guiframe/local_perspectives/plotting/plotting.py

@@ -114 +114 @@
                     # Check that the plot panel has no group ID
                     ## Use a panel with group_id ==None to plot
+                    
                     if panel.group_id==None:
                         is_available = True