Changeset 0b16ee3 in sasview

Timestamp:

Apr 22, 2009 9:19:43 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:

4b26f8d9

Parents:

7c3aea3

Message:

hide and show error ,fix ,color change and toggle between hide and show

File:

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

guiframe/local_perspectives/plotting/Plotter1D.py

@@ -223 +223 @@
        
         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:
-                
-                id = wx.NewId()
-                slicerpop.Append(id, '&Show errors to data')
-                wx.EVT_MENU(self, id, self._on_add_errors)
-                
-            elif self.plots[self.graph.selected_plottable].__class__.__name__=="Data1D"\
-                and not self.errors_hide:
+            selected_plot= self.plots[self.graph.selected_plottable]
+            #if self.plots[self.graph.selected_plottable].name in self.err_dy.iterkeys()\
+            #    and self.errors_hide:
+            if selected_plot.__class__.__name__=="Data1D":
+                if selected_plot.dy ==None or selected_plot.dy== []:
+                    id = wx.NewId()
+                    slicerpop.Append(id, '&Show errors to data')
+                    wx.EVT_MENU(self, id, self._on_add_errors)
+                elif numpy.all(selected_plot.dy==0):
+                    id = wx.NewId()
+                    slicerpop.Append(id, '&Show errors to data')
+                    wx.EVT_MENU(self, id, self._on_add_errors)
+                else:
                     id = wx.NewId()
                     slicerpop.Append(id, '&Hide Error bars')
@@ -272 +276 @@
             import numpy
             dy= numpy.zeros(len(self.plots[self.graph.selected_plottable].y))
-            new_plot = Data1D(self.plots[self.graph.selected_plottable].x,
+            selected_plot= self.plots[self.graph.selected_plottable]
+            
+            if selected_plot.__class__.__name__=="Data1D":
+                new_plot = Data1D(self.plots[self.graph.selected_plottable].x,
                               self.plots[self.graph.selected_plottable].y,
                               dy=dy)
+            else:
+                 new_plot = Theory1D(self.plots[self.graph.selected_plottable].x,
+                          self.plots[self.graph.selected_plottable].y,
+                          dy=dy)
             new_plot.interactive = True
             self.errors_hide = True
@@ -292 +303 @@
             self.graph.delete(self.plots[self.graph.selected_plottable])
             ## add newly created plottable to the graph with the save color
-            self.graph.color = color
+            self.graph.color += color
             self.graph.add(new_plot,color)
             ## transforming the view of the new data into the same of the previous data
@@ -325 +336 @@
             dy = numpy.zeros(length)
             selected_plot= self.plots[self.graph.selected_plottable]
+            
             try:
                 dy = self.err_dy[selected_plot.name]
+               
             except:
                 #for i in range(length):
                 #dy[i] = math.sqrt(self.plots[self.graph.selected_plottable].y[i])      
-                dy= selected_plot.dy
+                if hasattr(selected_plot,"dy"):
+                    dy= selected_plot.dy
+                else:
+                    dy = numpy.zeros(selected_plot.dy)
+                    
             ## Create a new plottable data1D
-            new_plot = Data1D(self.plots[self.graph.selected_plottable].x,
-                              self.plots[self.graph.selected_plottable].y,
-                              dy=dy)
+            if selected_plot.__class__.__name__=="Data1D":
+                new_plot = Data1D(self.plots[self.graph.selected_plottable].x,
+                          self.plots[self.graph.selected_plottable].y,
+                          dy=dy)
+            else:
+                ## Create a new plottable Theory1D
+                new_plot = Theory1D(self.plots[self.graph.selected_plottable].x,
+                          self.plots[self.graph.selected_plottable].y,
+                          dy=dy)
             new_plot.interactive = True
            
@@ -352 +375 @@
             color=self.graph.plottables[self.plots[self.graph.selected_plottable]]
             self.graph.delete(self.plots[self.graph.selected_plottable])
-            self.graph.color = color
+            self.graph.color += color
             ## add newly created plottable to the graph with the save color
             self.graph.add(new_plot, color)