Changeset 8e87ece in sasview

Timestamp:

Apr 8, 2010 6:08:04 PM (14 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:

2fff4db

Parents:

edcbd467

Message:

working on hide and show error

Location:

guiframe

Files:

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

guiframe/dataFitting.py

@@ -2 +2 @@
     Adapters for fitting module
 """
+import copy
+import numpy
+
 from danse.common.plottools.plottables import Data1D as PlotData1D
 from danse.common.plottools.plottables import Data2D as PlotData2D
@@ -9 +12 @@
 from DataLoader.data_info import Data2D as LoadData2D
 
-import copy
-
 class Data1D(PlotData1D, LoadData1D):
     
-    def __init__(self,x=[],y=[],dx=None,dy=None):
+    def __init__(self, x=[], y=[], dx=None, dy=None):
         PlotData1D.__init__(self, x, y, dx, dy)
         LoadData1D.__init__(self, x, y, dx, dy)
@@ -25 +26 @@
         """
         self.x  = copy.deepcopy(data1d.x)
-        self.dx = copy.deepcopy(data1d.dx)
         self.y  = copy.deepcopy(data1d.y)
         self.dy = copy.deepcopy(data1d.dy)
-        self.dxl = copy.deepcopy(data1d.dxl)
-        self.dxw = copy.deepcopy(data1d.dxw)
+        
+        if hasattr(data1d, "dx"):
+            self.dx = copy.deepcopy(data1d.dx)    
+        if hasattr(data1d, "dxl"):
+            self.dxl = copy.deepcopy(data1d.dxl)
+        if hasattr(data1d, "dxw"):
+            self.dxw = copy.deepcopy(data1d.dxw)
     
         self.xaxis(data1d._xaxis,data1d._xunit)
@@ -47 +52 @@
         LoadData1D.__init__(self, x, y, dy)
         self.id= None
-        self.group_id =None
+        self.group_id = None
         self.is_data = True
     
@@ -57 +62 @@
         self.y  = copy.deepcopy(data1d.y)
         self.dy = copy.deepcopy(data1d.dy)
-   
+        if hasattr(data1d, "dx"):
+            self.dx = copy.deepcopy(data1d.dx) 
+        if hasattr(data1d, "dxl"):
+            self.dxl = copy.deepcopy(data1d.dxl)
+        if hasattr(data1d, "dxw"):
+            self.dxw = copy.deepcopy(data1d.dxw)    
         self.xaxis(data1d._xaxis,data1d._xunit)
         self.yaxis(data1d._yaxis,data1d._yunit)
+        
     def __str__(self):
         """

guiframe/local_perspectives/plotting/Plotter1D.py

@@ -18 +18 @@
 import time
 
+from copy import deepcopy
 import danse.common.plottools
 from danse.common.plottools.PlotPanel import PlotPanel
@@ -299 +300 @@
             name =self.plots[self.graph.selected_plottable].name
             dy = self.plots[self.graph.selected_plottable].dy
-            self.err_dy[name]= dy
+            self.err_dy[name]= deepcopy(dy)
             ## Create a new dy for a new plottable
-            import numpy
-            dy= numpy.zeros(len(self.plots[self.graph.selected_plottable].y))
+           
+            dy = numpy.zeros(len(self.plots[self.graph.selected_plottable].y))
             selected_plot= self.plots[self.graph.selected_plottable]
-            
+            #post the removed error to the parent
+            event = ErrorDataEvent(err_dy= deepcopy(self.err_dy))
+            wx.PostEvent(self.parent, event)
             if selected_plot.__class__.__name__=="Data1D":
                 # Make sure that we can pass a basic Data1D
@@ -345 +348 @@
             ## save the plot 
             self.plots[self.graph.selected_plottable]=new_plot
+          
             ## Render the graph
             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):
         """
@@ -361 +361 @@
             @param evt: Menu event
         """
-       
-        
         if not self.graph.selected_plottable == None \
             and self.graph.selected_plottable in self.plots.keys():
@@ -374 +372 @@
             
             try:
-                dy = self.err_dy[selected_plot.name]
+                dy = deepcopy(self.err_dy[selected_plot.name])
                
             except: