Changeset 2615

Timestamp:

Jan 6, 2017 3:06:23 PM (6 years ago)

Author:

toby

Message:

fix for plots w/o Data Item parent

Location:

trunk

Files:

• GSASII.py (modified) (1 diff)
• GSASIIplot.py (modified) (1 diff)

trunk/GSASII.py

@@ -2806 +2806 @@
             XY.append([Xsum,Ysum])
             self.result = [Xsum,Ysum,Wsum,YCsum,YBsum,YDsum]
+            # N.B. PlotXY expects the first arg to point to G2frame. In this case, we
+            # create a duplicate (temporary) Plot notebook window that is a child of the
+            # modal SumDialog dialog (self). This nicely gets deleted when the dialog is destroyed,
+            # but the plot window is not fully functional, at least on the Mac. 
             G2plt.PlotXY(self,XY,lines=True,Title='Sum:'+self.data[-1],labelY='Intensity',)
             self.plotFrame.Show()
-            
-            
+                        
         def OnOk(self,event):
             if self.dataType == 'PWDR': self.OnTest(event)

trunk/GSASIIplot.py

@@ -251 +251 @@
         self.lastRaisedPlotTab = label
         self.RaisePageNoRefresh(Page)
-        # save in Tabbed page the help name for the DataItem that has created the plot
-        Page.helpKey = self.G2frame.dataFrame.helpKey
+        # Save the help name from the DataItem that has created the plot in Tabbed page object
+        # so we can use it in self.OnHelp(). 
+        # Are there any cases where plot tabs are created that are not tied to Data Tree entries?
+        # One example is GSASII.SumDialog, where a test plot is created. Are there others? 
+        try:
+            Page.helpKey = self.G2frame.dataFrame.helpKey
+        except AttributeError:
+            Page.helpKey = 'Data tree'
         return new,plotNum,Page,Plot,limits