Changeset 0b57a57 in sasview for guiframe/local_perspectives

Timestamp:

Apr 23, 2010 1:11:02 PM (15 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:

b9405cd

Parents:

784e2fa

Message:

make sure one can append more than 1 model for fitting

File:

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

guiframe/local_perspectives/plotting/Plotter1D.py

@@ -127 +127 @@
                 for plottable in self.plots.itervalues():
                     if hasattr(event.plot,"id") and hasattr(plottable, "id"):
-                        if event.plot.id==plottable.id :
+                        #remove the existing plot and same id and same name
+                        if event.plot.id==plottable.id and event.plot.name== plottable.name:
                             self.graph.delete(plottable)
                 
@@ -151 +152 @@
         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)
+        #if self.errors_hide:
+        #    self._on_remove_errors(evt=None)
+        #else:
+        #    self._on_add_errors( evt=None)
     
     def onLeftDown(self,event): 
@@ -249 +250 @@
             #if self.plots[self.graph.selected_plottable].name in self.err_dy.iterkeys()\
             #    and self.errors_hide:
+            """
             if selected_plot.__class__.__name__=="Data1D":
                 if numpy.all(selected_plot.dy==0):
@@ -258 +260 @@
                     slicerpop.Append(id, '&Hide Error bars')
                     wx.EVT_MENU(self, id, self._on_remove_errors)
-            
+            """
             id = wx.NewId()
             slicerpop.Append(id, '&Linear fit')