Changeset 2297 for trunk/GSASIIplot.py

Timestamp:

May 27, 2016 11:25:21 AM (6 years ago)

Author:

vondreele

Message:

implement creation of summed file from multi-frame ge image files; creates a G2img file which is put on tree in place of multi frame file. Subsequent accesses get teg G2img file.
Insert skipPageChange = True to prevent plot tab change causing tree change from Strain plots & Image plots

File:

• trunk/GSASIIplot.py (modified) (5 diffs)

trunk/GSASIIplot.py

@@ -289 +289 @@
         if pid: self.G2frame.PatternTree.SelectItem(pid)
         self.allowZoomReset = True
- #       print 'invoke',str(self).split('0x')[1]
+#        print 'invoke',str(self).split('0x')[1],str(pid)
             
 class GSASIItoolbar(Toolbar):
@@ -2676 +2676 @@
     Page.Choice = None
     G2frame.G2plotNB.RaisePageNoRefresh(Page)
+    G2frame.G2plotNB.skipPageChange = True      #to keep Stress/Strain data tab visible
     G2frame.G2plotNB.status.DestroyChildren()
     Plot.set_title('Strain')
@@ -3949 +3950 @@
                 ypix = int(ypos*scaley)
                 Int = 0
-                if (0 <= xpix <= sizexy[0]) and (0 <= ypix <= sizexy[1]):
+                if (0 <= xpix < sizexy[0]) and (0 <= ypix < sizexy[1]):
                     Int = G2frame.ImageZ[ypix][xpix]
                 tth,azm,D,dsp = G2img.GetTthAzmDsp(xpos,ypos,Data)
@@ -4111 +4112 @@
             G2frame.StrainKey = ''
             G2imG.UpdateStressStrain(G2frame,StrSta)
-            PlotStrain(G2frame,StrSta)
             wx.CallAfter(PlotImage,G2frame,newPlot=False)            
         else:
@@ -4236 +4236 @@
     if not event:                       #event from GUI TextCtrl - don't want focus to change to plot!!!
         G2frame.G2plotNB.RaisePageNoRefresh(Page)
+    G2frame.G2plotNB.skipPageChange = True
     Title = G2frame.PatternTree.GetItemText(G2frame.Image)[4:]
     G2frame.G2plotNB.status.DestroyChildren()