Changeset 3b69ca6 in sasview

Timestamp:

Apr 23, 2009 10:20: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:

2b63df0

Parents:

8b31780

Message:

hide and show error ,store dxl and dxw value

File:

• guiframe/local_perspectives/plotting/Plotter1D.py (modified) (4 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,Data1D
+from danse.common.plottools.plottables import Graph,Theory1D
+from sans.guiframe import dataFitting 
 from sans.guicomm.events import EVT_NEW_PLOT
 from sans.guicomm.events import StatusEvent ,NewPlotEvent,SlicerEvent,ErrorDataEvent
@@ -279 +280 @@
             
             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 = dataFitting.Data1D( x=selected_plot.x,
+                              y= selected_plot.y,
+                               dx=selected_plot.dx,
+                              dy=dy,
+                              dxl=selected_plot.dxl,
+                              dxw=selected_plot.dxw)
+                            
+            else:
+                 new_plot = Theory1D(x=selected_plot.x,y=selected_plot.y,dy=dy)
             new_plot.interactive = True
             self.errors_hide = True
@@ -335 +339 @@
             length = len(self.plots[self.graph.selected_plottable].x)
             dy = numpy.zeros(length)
+            
             selected_plot= self.plots[self.graph.selected_plottable]
             
@@ -350 +355 @@
             ## Create a new plottable data1D
             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)
+                new_plot = dataFitting.Data1D( x=selected_plot.x,
+                                               y= selected_plot.y,
+                                               dx=selected_plot.dx,
+                                               dy=dy,
+                                               dxl=selected_plot.dxl,
+                                               dxw=selected_plot.dxw)
             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 = Theory1D(x=selected_plot.x,y=selected_plot.y,dy=dy)
+            
             new_plot.interactive = True
-           
             new_plot.name = self.plots[self.graph.selected_plottable].name 
             if hasattr(self.plots[self.graph.selected_plottable], "group_id"):