Changeset 2610

Timestamp:

Jan 4, 2017 1:31:26 PM (8 years ago)

Author:

toby

Message:

fix bug on change in PDF files; save location when images are moved

Location:

trunk

Files:

• GSASIIIO.py (modified) (5 diffs)
• GSASIIctrls.py (modified) (1 diff)
• GSASIIimgGUI.py (modified) (4 diffs)
• GSASIIpwdGUI.py (modified) (3 diffs)

trunk/GSASIIIO.py ¶

@@ -141 +141 @@
     return Comments,Peaks,limits,wave
 
-def CheckImageFile(G2frame,imagefile):
+def GetCheckImageFile(G2frame,treeId):
     '''Try to locate an image file if the project and image have been moved
     together. If the image file cannot be found, request the location from
@@ -147 +147 @@
 
     :param wx.Frame G2frame: main GSAS-II Frame and data object
-    :param str imagefile: name of image file
-    :returns: imagefile, if it exists, or the name of a file
-      that does exist or False if the user presses Cancel
+    :param wx.Id treeId: Id for the main tree item for the image
+    :returns: Npix,imagefile,imagetag with (Npix) number of pixels,
+       imagefile, if it exists, or the name of a file that does exist or False if the user presses Cancel
+       and (imagetag) an optional image number
 
     '''
+    Npix,imagefile,imagetag = G2frame.PatternTree.GetImageLoc(G2frame.Image)
     if not os.path.exists(imagefile):
         print 'Image file '+imagefile+' not found'
@@ -162 +164 @@
             if os.path.exists(os.path.join(G2frame.dirname,fil)):
                 print 'found image file '+os.path.join(G2frame.dirname,fil)
-                return os.path.join(G2frame.dirname,fil)
+                imagefile = os.path.join(G2frame.dirname,fil)
+                G2frame.PatternTree.UpdateImageLoc(G2frame.Image,imagefile)
+                return Npix,imagefile,imagetag
             pth,enddir = os.path.split(pth)
             fil = os.path.join(enddir,fil)
@@ -184 +188 @@
             if os.path.exists(os.path.join(pth,fil)):
                 print 'found image file '+os.path.join(pth,fil)
-                return os.path.join(pth,fil)
+                imagefile = os.path.join(pth,fil)
+                G2frame.PatternTree.UpdateImageLoc(G2frame.Image,imagefile)
+                return Npix,imagefile,imagetag
             pth,enddir = os.path.split(pth)
         #GSASIIpath.IPyBreak()
@@ -198 +204 @@
             if dlg.ShowModal() == wx.ID_OK:
                 imagefile = dlg.GetPath()
+                G2frame.PatternTree.UpdateImageLoc(G2frame.Image,imagefile)
             else:
                 imagefile = False
         finally:
             dlg.Destroy()
-    return imagefile
+    return Npix,imagefile,imagetag
 
 def EditImageParms(parent,Data,Comments,Image,filename):

trunk/GSASIIctrls.py ¶

@@ -222 +222 @@
             return size,imagefile,None
 
+    def UpdateImageLoc(self,TreeId,imagefile):
+        '''Saves a new imagefile name in the Tree. Handles cases where the
+        image name is specified, as well as where the image file name is
+        a tuple containing the image file and an image number
+        '''
+        
+        idata = self.GetItemPyData(TreeId)
+        if type(idata[1]) is tuple or type(idata[1]) is list:
+            idata[1][0] = [imagefile,idata[1][1]]
+        else:
+            idata[1]  = imagefile
+        
     def SaveExposedItems(self):
         '''Traverse the top level tree items and save names of exposed (expanded) tree items.

trunk/GSASIIimgGUI.py ¶

@@ -56 +56 @@
     '''
     
-    Npix,imagefile,imagetag = G2frame.PatternTree.GetImageLoc(G2frame.Image)
-    imagefile = G2IO.CheckImageFile(G2frame,imagefile)
+    Npix,imagefile,imagetag = G2IO.GetCheckImageFile(G2frame,G2frame.Image)
     formatName = data.get('formatName','')
     sumImg = G2IO.GetImageData(G2frame,imagefile,True,ImageTag=imagetag,FormatName=formatName)
@@ -70 +69 @@
             Ddata = G2frame.PatternTree.GetItemPyData(G2gd.GetPatternTreeItemId(G2frame,Did,'Image Controls'))
             dformatName = Ddata.get('formatName','')
-            Npix,imagefile,imagetag = G2frame.PatternTree.GetImageLoc(Did)
-            imagefile = G2IO.CheckImageFile(G2frame,imagefile)
+            Npix,imagefile,imagetag = G2IO.GetCheckImageFile(G2frame,Did)
             darkImage = G2IO.GetImageData(G2frame,imagefile,True,ImageTag=imagetag,FormatName=dformatName)
             if darkImg is not None:                
@@ -81 +79 @@
         Bid = G2gd.GetPatternTreeItemId(G2frame, G2frame.root, backImg)
         if Bid:
-            Npix,imagefile,imagetag = G2frame.PatternTree.GetImageLoc(Bid)
-            imagefile = G2IO.CheckImageFile(G2frame,imagefile)
+            Npix,imagefile,imagetag = G2IO.GetCheckImageFile(G2frame,Bid)
             Bdata = G2frame.PatternTree.GetItemPyData(G2gd.GetPatternTreeItemId(G2frame,Bid,'Image Controls'))
             bformatName = Bdata.get('formatName','')
@@ -91 +88 @@
                     Ddata = G2frame.PatternTree.GetItemPyData(G2gd.GetPatternTreeItemId(G2frame,Did,'Image Controls'))
                     dformatName = Ddata.get('formatName','')
-                    Npix,imagefile,imagetag = G2frame.PatternTree.GetImageLoc(Did)
-                    imagefile = G2IO.CheckImageFile(G2frame,imagefile)
+                    Npix,imagefile,imagetag = G2IO.GetCheckImageFile(G2frame,Did)
                     darkImage = G2IO.GetImageData(G2frame,imagefile,True,ImageTag=imagetag,FormatName=dformatName)
                     if darkImage is not None:

trunk/GSASIIpwdGUI.py ¶

@@ -4569 +4569 @@
 #####  PDF controls
 ################################################################################           
-       
 def UpdatePDFGrid(G2frame,data):
     '''respond to selection of PWDR PDF data tree item.
-    '''
-    global inst
-    tth2q = lambda t,w:4.0*math.pi*sind(t/2.0)/w
-    tof2q = lambda t,C:2.0*math.pi*C/t
-    dataFile = G2frame.PatternTree.GetItemText(G2frame.PatternId)
-    powName = 'PWDR'+dataFile[4:]
-    powId = G2gd.GetPatternTreeItemId(G2frame,G2frame.root, powName)
-    fullLimits,limits = G2frame.PatternTree.GetItemPyData(G2gd.GetPatternTreeItemId(G2frame,powId, 'Limits'))[:2]
-    inst = G2frame.PatternTree.GetItemPyData(G2gd.GetPatternTreeItemId(G2frame,powId, 'Instrument Parameters'))[0]
-    if 'C' in inst['Type'][0]:
-        wave = G2mth.getWave(inst)
-        keV = 12.397639/wave
-        qLimits = [tth2q(fullLimits[0],wave),tth2q(fullLimits[1],wave)]
-        polariz = inst['Polariz.'][1]
-    else:   #'T'of
-        qLimits = [tof2q(fullLimits[1],inst['difC'][1]),tof2q(fullLimits[0],inst['difC'][1])]
-        polariz = 1.0
-    data['QScaleLim'][1] = min(qLimits[1],data['QScaleLim'][1])
-    if data['QScaleLim'][0]:
-        data['QScaleLim'][0] = max(qLimits[0],data['QScaleLim'][0])
-    else:                                #initial setting at 90% of max Q
-        data['QScaleLim'][0] = 0.90*data['QScaleLim'][1]
-    itemDict = {}
-    #patch
-    if 'BackRatio' not in data:
-        data['BackRatio'] = 0.
-    if 'noRing' not in data:
-        data['noRing'] = False
-    if 'Rmax' not in data:
-        data['Rmax'] = 100.
-    if 'Flat Bkg' not in data:
-        data['Flat Bkg'] = 0.
-    if 'IofQmin' not in data:
-        data['IofQmin'] = 1.0
-    
+    '''    
     def FillFileSizer(fileSizer,key):
         #fileSizer is a FlexGridSizer(3,6)
@@ -4617 +4582 @@
             Obj.SetValue(fmt%(value))
             data[fileKey][itemKey] = value
-            wx.CallAfter(UpdatePDFGrid,G2frame,data)
+            wx.CallLater(100,UpdatePDFGrid,G2frame,data)
+            wx.CallAfter(OnComputePDF,None)
             
         def OnMoveMult(event):
@@ -4896 +4862 @@
             G2plt.PlotISFG(G2frame,newPlot=True,plotType='G(R)')
             print ' Done calculating PDFs:'
-        
+
+    # Routine UpdatePDFGrid starts here
+    global inst
+    tth2q = lambda t,w:4.0*math.pi*sind(t/2.0)/w
+    tof2q = lambda t,C:2.0*math.pi*C/t
+    dataFile = G2frame.PatternTree.GetItemText(G2frame.PatternId)
+    powName = 'PWDR'+dataFile[4:]
+    powId = G2gd.GetPatternTreeItemId(G2frame,G2frame.root, powName)
+    fullLimits,limits = G2frame.PatternTree.GetItemPyData(G2gd.GetPatternTreeItemId(G2frame,powId, 'Limits'))[:2]
+    inst = G2frame.PatternTree.GetItemPyData(G2gd.GetPatternTreeItemId(G2frame,powId, 'Instrument Parameters'))[0]
+    if 'C' in inst['Type'][0]:
+        wave = G2mth.getWave(inst)
+        keV = 12.397639/wave
+        qLimits = [tth2q(fullLimits[0],wave),tth2q(fullLimits[1],wave)]
+        polariz = inst['Polariz.'][1]
+    else:   #'T'of
+        qLimits = [tof2q(fullLimits[1],inst['difC'][1]),tof2q(fullLimits[0],inst['difC'][1])]
+        polariz = 1.0
+    data['QScaleLim'][1] = min(qLimits[1],data['QScaleLim'][1])
+    if data['QScaleLim'][0]:
+        data['QScaleLim'][0] = max(qLimits[0],data['QScaleLim'][0])
+    else:                                #initial setting at 90% of max Q
+        data['QScaleLim'][0] = 0.90*data['QScaleLim'][1]
+    itemDict = {}
+    #patch
+    if 'BackRatio' not in data:
+        data['BackRatio'] = 0.
+    if 'noRing' not in data:
+        data['noRing'] = False
+    if 'Rmax' not in data:
+        data['Rmax'] = 100.
+    if 'Flat Bkg' not in data:
+        data['Flat Bkg'] = 0.
+    if 'IofQmin' not in data:
+        data['IofQmin'] = 1.0        
     if G2frame.dataDisplay:
         G2frame.dataFrame.Clear()