Changeset 119dc89 in sasview

Timestamp:

Mar 21, 2011 11:02:26 AM (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:

783940c

Parents:

b29e47e

Message:

fix plot behavior for prview

File:

• prview/perspectives/pr/pr.py (modified) (6 diffs)

prview/perspectives/pr/pr.py

@@ -39 +39 @@
 IQ_FIT_LABEL       = r"$I_{fit}(q)$"
 IQ_SMEARED_LABEL   = r"$I_{smeared}(q)$"
+GROUP_ID_IQ_DATA = r"$I_{obs}(q)$"
+GROUP_ID_PR_FIT = r"$P_{fit}(r)$"
+
 
 
@@ -327 +330 @@
         new_plot.id = IQ_FIT_LABEL
         self.parent.update_theory(data_id=self.data_id, theory=new_plot)
+        
         wx.PostEvent(self.parent, NewPlotEvent(plot=new_plot, title=title))
         
@@ -418 +422 @@
         new_plot.xtransform = "x"
         new_plot.ytransform = "y"  
-        new_plot.group_id = "P(r) fit"
+        new_plot.group_id = GROUP_ID_PR_FIT
         self.parent.update_theory(data_id=self.data_id, theory=new_plot)    
         wx.PostEvent(self.parent, NewPlotEvent(plot=new_plot, title="P(r) fit"))
@@ -920 +924 @@
         new_plot.yaxis("\\rm{Intensity} ","cm^{-1}")
         new_plot.interactive = True
-        new_plot.group_id = IQ_DATA_LABEL 
+        new_plot.group_id = GROUP_ID_IQ_DATA
         new_plot.id = self.data_id
-        new_plot.title = "I(q)"    
+        new_plot.title = "I(q)"   
         wx.PostEvent(self.parent, 
                      NewPlotEvent(plot=new_plot, title="I(q)", reset=reset))
@@ -1276 +1280 @@
         if len(panel.plots) > 1 and \
             panel.graph.selected_plottable in panel.plots:
-            dataset = panel.graph.selected_plottable
-        elif len(panel.plots) == 1:
-            dataset = panel.plots.keys()[0]
+            dataset = panel.plots[panel.graph.selected_plottable].name
         else:
             logging.info("Prview Error: No data is available")
@@ -1346 +1348 @@
             if issubclass(data.__class__, Data1D):
                 try:
+                    wx.PostEvent(self.parent, NewPlotEvent(action='remove',
+                                                group_id=GROUP_ID_IQ_DATA, 
+                                                id=self.data_id))
+                                              
                     self.data_id = data.id
                     self.control_panel._change_file(evt=None, data=data)