Changeset 1188

Timestamp:

Jan 9, 2014 4:05:59 PM (9 years ago)

Author:

vondreele

Message:

use a key to trigger add of new strain ring
sort by d-zero
deal with bad rings (no points found)

Location:

trunk

Files:

• GSASII.py (modified) (1 diff)
• GSASIIimage.py (modified) (1 diff)
• GSASIIimgGUI.py (modified) (4 diffs)
• GSASIIplot.py (modified) (7 diffs)

trunk/GSASII.py

@@ -1770 +1770 @@
         self.ifGetRing = False
         self.MaskKey = ''           #trigger for making image masks
+        self.StrainKey = ''         #ditto for new strain d-zeros
         arg = sys.argv
         if len(arg) > 1:

trunk/GSASIIimage.py

@@ -868 +868 @@
         return Ring,ring
     else:
+        ring['ImxyObs'] = [[],[]]
+        ring['ImtaObs'] = [[],[]]
+        ring['ImtaCalc'] = [[],[]]
         return [],[]    #bad ring; no points found
     

trunk/GSASIIimgGUI.py

@@ -24 +24 @@
 GSASIIpath.SetVersionNumber("$Revision$")
 import GSASIIimage as G2img
+import GSASIImath as G2mth
 import GSASIIplot as G2plt
 import GSASIIIO as G2IO
@@ -1454 +1455 @@
             Obj.SetValue("%.5f"%(value))
             data['d-zero'][Indx[Obj.GetId()]]['Dset'] = value
+            data['d-zero'] = G2mth.sortArray(data['d-zero'],'Dset',reverse=True)
             Ring,R = G2img.MakeStrStaRing(data['d-zero'][Indx[Obj.GetId()]],G2frame.ImageZ,Controls)
             if len(Ring):
@@ -1459 +1461 @@
             else:
                 G2frame.ErrorDialog('Strain peak selection','WARNING - No points found for this ring selection')
+                
         #sort them on d-spacing?
             UpdateStressStrain(G2frame,data)
@@ -1548 +1551 @@
     if not G2frame.dataFrame.GetStatusBar():
         Status = G2frame.dataFrame.CreateStatusBar()
-        Status.SetStatusText(" test  ")
+    if G2frame.StrainKey == 'a':    #probably doesn't happen
+        G2frame.dataFrame.GetStatusBar().SetStatusText('Add strain ring active - LB pick d-zero value')
+    else:
+        G2frame.dataFrame.GetStatusBar().SetStatusText("To add strain data: On On 2D Powder Image, key a:add ring")
+        
     G2frame.dataDisplay = wx.Panel(G2frame.dataFrame)
     mainSizer = wx.BoxSizer(wx.VERTICAL)

trunk/GSASIIplot.py

@@ -2168 +2168 @@
     G2imG.UpdateMasks(G2frame,Masks)
     PlotImage(G2frame,newImage=True)
+    
+def OnStartNewDzero(G2frame):
+    '''Initiate the start of adding a new d-zero to a strain data set
+
+    :param wx.Frame G2frame: The main GSAS-II tree "window"
+    :param str eventkey: a single letter ('a') that
+      triggers the addition of a d-zero.    
+    '''
+    StrSta = G2frame.PatternTree.GetItemPyData(
+        G2gd.GetPatternTreeItemId(G2frame,G2frame.Image, 'Stress/Strain'))
 
 def PlotImage(G2frame,newPlot=False,event=None,newImage=True):
@@ -2224 +2234 @@
                 tth,azm,D,dsp = G2img.GetTthAzmDsp(xpos,ypos,Data)
                 Q = 2.*math.pi/dsp
+                fields = ['','Detector 2-th =%9.3fdeg, dsp =%9.3fA, Q = %6.5fA-1, azm = %7.2fdeg, I = %6d'%(tth,dsp,Q,azm,Int)]
                 if G2frame.MaskKey in ['p','f']:
-                    G2frame.G2plotNB.status.SetFields(['','Polygon/frame mask pick - LB next point, RB close polygon'])
-                else:
-                    G2frame.G2plotNB.status.SetFields(\
-                        ['','Detector 2-th =%9.3fdeg, dsp =%9.3fA, Q = %6.5fA-1, azm = %7.2fdeg, I = %6d'%(tth,dsp,Q,azm,Int)])
+                    fields[1] = 'Polygon/frame mask pick - LB next point, RB close polygon'
+                elif G2frame.StrainKey:
+                    fields[0] = 'd-zero pick active'
+                G2frame.G2plotNB.status.SetFields(fields)
 
     def OnImPlotKeyPress(event):
@@ -2239 +2250 @@
                 G2frame.MaskKey = event.key
                 OnStartMask(G2frame)
+                
+        elif PickName == 'Stress/Strain':
+            if event.key in ['a',]:
+                G2frame.StrainKey = event.key
+                OnStartNewDzero(G2frame)
+            
                 
         elif PickName == 'Image Controls':
@@ -2270 +2287 @@
                 else:
                     Data['invert_y'] = True
-        PlotImage(G2frame,newPlot=True)
+        PlotImage(G2frame,newPlot=False)
             
     def OnKeyBox(event):
@@ -2365 +2382 @@
             G2imG.UpdateMasks(G2frame,Masks)
             PlotImage(G2frame,newImage=False)
-        elif PickName == 'Stress/Strain':
+        elif PickName == 'Stress/Strain' and G2frame.StrainKey:
             Xpos,Ypos = [event.xdata,event.ydata]
             if not Xpos or not Ypos or Page.toolbar._active:  #got point out of frame or zoom/pan selected
@@ -2376 +2393 @@
                 del StrSta['d-zero'][-1]
                 G2frame.ErrorDialog('Strain peak selection','WARNING - No points found for this ring selection')
+            StrSta['d-zero'] = G2mth.sortArray(StrSta['d-zero'],'Dset',reverse=True)
+            G2frame.StrainKey = ''
             G2imG.UpdateStressStrain(G2frame,StrSta)
             PlotStrain(G2frame,StrSta)
@@ -2502 +2521 @@
             Page.Choice = (' key press','s: spot mask','a: arc mask','r: ring mask',
                 'p: polygon mask','f: frame mask',)
+            Page.keyPress = OnImPlotKeyPress
+        elif G2frame.PatternTree.GetItemText(G2frame.PickId) in ['Stress/Strain',]:
+            Page.Choice = (' key press','a: add new ring',)
             Page.keyPress = OnImPlotKeyPress
     except TypeError: