Changeset 2551

Timestamp:

Nov 30, 2016 3:17:17 PM (6 years ago)

Author:

vondreele

Message:

clean up G2imageGUI
Add start on autoSpot mask - not complete
some adjustments of window sizes

Location:

trunk

Files:

• GSASIIconstrGUI.py (modified) (2 diffs)
• GSASIIgrid.py (modified) (2 diffs)
• GSASIIimage.py (modified) (1 diff)
• GSASIIimgGUI.py (modified) (15 diffs)
• GSASIIphsGUI.py (modified) (1 diff)
• GSASIIplot.py (modified) (1 diff)
• GSASIItestplot.py (modified) (1 diff)
• testDeriv.py (modified) (1 diff)

trunk/GSASIIconstrGUI.py

@@ -1800 +1800 @@
         VectorRBDisplay.SetSizer(VectorRBSizer,True)
         Size = VectorRBSizer.GetMinSize()
-        Size[0] += 40
-        Size[1] = max(Size[1],450) + 20
+#        Size[0] += 40
+#        Size[1] = max(Size[1],450) + 20
         VectorRBDisplay.SetSize(Size)
         VectorRB.SetScrollbars(10,10,Size[0]/10-4,Size[1]/10-1)
         VectorRB.Scroll(0,Scroll)
-        Size[1] = min(Size[1],450)
+        Size[1] = min(Size[1],500)
         G2frame.dataFrame.setSizePosLeft(Size)
         
@@ -2085 +2085 @@
         ResidueRBDisplay.SetSizer(ResidueRBSizer,True)
         Size = ResidueRBSizer.GetMinSize()
-        Size[0] += 40
-        Size[1] = max(Size[1],450) + 20
+#        Size[0] += 40
+#        Size[1] = max(Size[1],450) + 20
         ResidueRBDisplay.SetSize(Size)
         ResidueRB.SetScrollbars(10,10,Size[0]/10-4,Size[1]/10-1)
-        Size[1] = min(600,Size[1])
+        Size[1] = min(500,Size[1])
         G2frame.dataFrame.setSizePosLeft(Size)
         

trunk/GSASIIgrid.py

@@ -99 +99 @@
 
 [ wxID_MASKCOPY, wxID_MASKSAVE, wxID_MASKLOAD, wxID_NEWMASKSPOT,wxID_NEWMASKARC,wxID_NEWMASKRING,
-    wxID_NEWMASKFRAME, wxID_NEWMASKPOLY,  wxID_MASKLOADNOT,
-] = [wx.NewId() for item in range(9)]
+    wxID_NEWMASKFRAME, wxID_NEWMASKPOLY,  wxID_MASKLOADNOT,wxID_FINDSPOTS,
+] = [wx.NewId() for item in range(10)]
 
 [ wxID_STRSTACOPY, wxID_STRSTAFIT, wxID_STRSTASAVE, wxID_STRSTALOAD,wxID_STRSTSAMPLE,
@@ -2129 +2129 @@
         self.MaskEdit.Append(help='Load mask from file; ignore threshold', 
             id=wxID_MASKLOADNOT, kind=wx.ITEM_NORMAL,text='Load mask w/o threshold')
+        self.MaskEdit.Append(help='Auto search for spot masks', 
+            id=wxID_FINDSPOTS, kind=wx.ITEM_NORMAL,text='Auto spot masks')
         submenu.Append(help='Create an arc mask with mouse input', 
             id=wxID_NEWMASKARC, kind=wx.ITEM_NORMAL,text='Arc mask')

trunk/GSASIIimage.py

@@ -1122 +1122 @@
     return vals,sig
     
-        
+def AutoSpotMasks(Image,Masks,Controls):
+    rollImage = lambda rho,roll: np.roll(np.roll(rho,roll[0],axis=0),roll[1],axis=1)
+    print 'auto spot search'
+    spotMask = ma.array(Image,mask=(Image<10.*np.mean(Image)))
+    incre = np.array(Image.shape,dtype=np.float)
+    indices = (-1,0,1)
+    rolls = np.array([[ix,iy] for ix in indices for iy in indices])
+    for roll in rolls:
+        if np.any(roll):        #avoid [0,0]
+            spotMask = ma.array(spotMask,mask=(spotMask-rollImage(Image,roll)<=0.))
+    indx = np.transpose(spotMask.nonzero())
+    peaks = indx
+    mags = spotMask[spotMask.nonzero()]
+    print zip(peaks,mags)
+    
+        

trunk/GSASIIimgGUI.py

@@ -19 +19 @@
 import glob
 import re
-import bisect
 import math
-import time
 import sys
 import wx
@@ -640 +638 @@
         calibSizer.Add(wx.StaticText(parent=G2frame.dataDisplay,label=' Calibration coefficients'),0,WACV)    
         calibSizer.Add((5,0),0)
-        cent = data['center']
         Names = ['det-X','det-Y','wave','dist','tilt','phi']
         if 'PWDR' in data['type']:
@@ -1150 +1147 @@
             try:
                 if dlg.ShowModal() == wx.ID_OK:
-                    result = dlg.GetData()
+                    result = dlg.GetData()      #?? what was this for?
                     id, cookie = G2frame.PatternTree.GetFirstChild(G2frame.root)
                     while id:
@@ -1389 +1386 @@
             dlg.Destroy()
             
+    def OnAutoSpotMask(event):
+        'Do auto search for spot masks'
+        Controls = copy.deepcopy(G2frame.PatternTree.GetItemPyData( 
+            G2gd.GetPatternTreeItemId(G2frame,G2frame.PatternId,'Image Controls')))
+        G2img.AutoSpotMasks(G2frame.ImageZ,data,Controls)
+        event.Skip()
+            
     def OnNewSpotMask(event):
         'Start a new spot mask'
@@ -1425 +1429 @@
     G2frame.dataFrame.Bind(wx.EVT_MENU, OnLoadMask, id=G2gd.wxID_MASKLOADNOT)
     G2frame.dataFrame.Bind(wx.EVT_MENU, OnSaveMask, id=G2gd.wxID_MASKSAVE)
+    G2frame.dataFrame.Bind(wx.EVT_MENU, OnAutoSpotMask, id=G2gd.wxID_FINDSPOTS)
     G2frame.dataFrame.Bind(wx.EVT_MENU, OnNewSpotMask, id=G2gd.wxID_NEWMASKSPOT)
     G2frame.dataFrame.Bind(wx.EVT_MENU, OnNewArcMask, id=G2gd.wxID_NEWMASKARC)
@@ -1431 +1436 @@
     G2frame.dataFrame.Bind(wx.EVT_MENU, OnNewFrameMask, id=G2gd.wxID_NEWMASKFRAME)
     if not G2frame.dataFrame.GetStatusBar():
-        Status = G2frame.dataFrame.CreateStatusBar()
+        G2frame.dataFrame.CreateStatusBar()
     if G2frame.MaskKey == 'f':
         G2frame.dataFrame.GetStatusBar().SetStatusText('Frame mask active - LB pick next point, RB close polygon')
@@ -1667 +1672 @@
                 filename = dlg.GetPath()
                 File = open(filename,'w')
-                save = {}
                 keys = ['Type','Sample phi','Sample z','Sample load']
                 keys2 = ['Dset','Dcalc','pixLimit','cutoff','Emat']
@@ -1821 +1825 @@
                     continue
                 goodnames.append(name)
-                id = G2gd.GetPatternTreeItemId(G2frame, G2frame.root, name)
                 Npix,imagefile,imagetag = G2frame.PatternTree.GetImageLoc(Id)
                 image = GetImageZ(G2frame,Controls)
+                sig = []
+                varyList = []
+                variables = []
                 if i and CopyForward:
                     for j,ring in enumerate(StaCtrls['d-zero']):
@@ -1832 +1838 @@
                 parmDict = {'Sample load':StaCtrls['Sample load'],}
                 varyNames = ['e11','e12','e22']
-                sig = []
-                varyList = []
-                variables = []
                 for j,item in enumerate(StaCtrls['d-zero']):
                     variables += item['Emat']
@@ -2037 +2040 @@
     G2frame.dataFrame.Bind(wx.EVT_MENU, OnStrStaSample, id=G2gd.wxID_STRSTSAMPLE)        
     if not G2frame.dataFrame.GetStatusBar():
-        Status = G2frame.dataFrame.CreateStatusBar()
+        G2frame.dataFrame.CreateStatusBar()
     if G2frame.StrainKey == 'a':    #probably doesn't happen
         G2frame.dataFrame.GetStatusBar().SetStatusText('Add strain ring active - LB pick d-zero value')
@@ -2112 +2115 @@
     type conversions
     '''
-    file_opt = options = {}
     save = {'filename':imctrl_file}
     immask_file = os.path.splitext(imctrl_file)[0]+'.immask'
@@ -2309 +2311 @@
         self.imageBase = G2frame.Image
 
-        controlsId = G2frame.PatternTree.GetSelection()
+        G2frame.PatternTree.GetSelection()
         size,imagefile,imagetag = G2frame.PatternTree.GetImageLoc(self.imageBase)        
         self.imagedir,fileroot = os.path.split(imagefile)
@@ -2709 +2711 @@
         x = np.array([float(i) for i in parms[0]])
         closest = abs(x-dist).argmin()
-        closeX = x[closest]
         D = {'distance':dist}
         imctfile = IMfileList[closest]
@@ -2845 +2846 @@
                 try:
                     float(tmpDict[key][0])
-                    parms.append([str(G2py3.FormatSigFigs(val,sigfigs=5)) for val in tmpDict[key]])
+                    parms.append([str(G2py3.FormatSigFigs(val1,sigfigs=5)) for val1 in tmpDict[key]])
                 except ValueError:
                     parms.append(tmpDict[key])
@@ -2876 +2877 @@
         parms = []
         for c in range(cols):
-            lbl = self.ParmList[c]
             parms.append([])
             for r in range(rows):

trunk/GSASIIphsGUI.py

@@ -74 +74 @@
     phasePage.SetSize(Size)
     phasePage.Scroll(0,Scroll)
+    Size[1] = min(500,Size[1])
     mainFrame.setSizePosLeft(Size)
     

trunk/GSASIIplot.py

@@ -1021 +1021 @@
     def SetLights():
         GL.glEnable(GL.GL_DEPTH_TEST)
-        GL.glShadeModel(GL.GL_SMOOTH)
+#        GL.glShadeModel(GL.GL_SMOOTH)
         GL.glEnable(GL.GL_LIGHTING)
         GL.glEnable(GL.GL_LIGHT0)
         GL.glLightModeli(GL.GL_LIGHT_MODEL_TWO_SIDE,0)
-        GL.glLightfv(GL.GL_LIGHT0,GL.GL_AMBIENT,[1,1,1,.8])
+        GL.glLightfv(GL.GL_LIGHT0,GL.GL_AMBIENT,[1,1,1,1])
         GL.glLightfv(GL.GL_LIGHT0,GL.GL_DIFFUSE,[1,1,1,1])
         

trunk/GSASIItestplot.py

@@ -31 +31 @@
     'creates a Wx application and a plotting notebook'
     def __init__(self, id = -1):
-        self.app = wx.PySimpleApp()
+        self.app = wx.App()
         self.frame = wx.Frame(None,-1,'Plotter', size=wx.Size(600,600),
             style=wx.DEFAULT_FRAME_STYLE ^ wx.CLOSE_BOX)

trunk/testDeriv.py

@@ -147 +147 @@
             mainSizer.Add(delVal,0)
         self.testDerivPanel.SetSizer(mainSizer)    
-        Size = mainSizer.Fit(self.testDerivPanel)
-        Size[0] = 800
-        Size[1] = max(Size[1],290) + 35
+        Size = mainSizer.GetMinSize()
         self.testDerivPanel.SetScrollbars(10,10,Size[0]/10-4,Size[1]/10-1)
+        Size[1] = min(200,Size[1])
         self.testDerivPanel.SetSize(Size)