Changeset 3151

Timestamp:

Nov 6, 2017 4:32:17 PM (6 years ago)

Author:

vondreele

Message:

male all default image pixel sizes [200.,200.] so ValidatedTxtCtrl? treats them as floats.
Fix crash when data is deleted from tree.

Location:

trunk

Files:

• GSASIIctrlGUI.py (modified) (1 diff)
• GSASIIdataGUI.py (modified) (2 diffs)
• GSASIIobj.py (modified) (1 diff)
• GSASIIplot.py (modified) (1 diff)
• imports/G2img_1TIF.py (modified) (1 diff)
• imports/G2img_GE.py (modified) (2 diffs)

trunk/GSASIIctrlGUI.py

@@ -4294 +4294 @@
             if var == 'Contour_color':
                 if self.vars[var][1] is None:
-                    self.vars[var][1] = 'paired'
+                    self.vars[var][1] = 'Paired'
                 colorList = sorted([m for m in mpl.cm.datad.keys() ],key=lambda s: s.lower())   #if not m.endswith("_r")
                 self.colSel = wx.ComboBox(self,value=self.vars[var][1],choices=colorList,

trunk/GSASIIdataGUI.py

@@ -7296 +7296 @@
             parentID = G2frame.GPXtree.GetItemParent(item)
             # save name of calling tree item for help. N.B. may want to override this later
-            prfx = G2frame.GPXtree.GetItemText(item).split()[0].upper()
+            prfx = G2frame.GPXtree.GetItemText(item)
+            if prfx:
+                prfx = prfx.split()[0].upper()
+            else:   #just deleted item - escape!!
+                return
             prfx1 = G2frame.GPXtree.GetItemText(parentID).split()[0]
             if prfx in ('IMG','PKS','PWDR','SASD','HKLF','PDF','REFD',):
@@ -7312 +7316 @@
             G2frame.dataWindow.helpKey = ''
             if GSASIIpath.GetConfigValue('debug'):
-                print ('bug: why here?')
+                print ('bug: why here? prfx=%s prfx1=%s'%(prfx,prfx1))
                 G2obj.HowDidIgetHere()
         

trunk/GSASIIobj.py

@@ -2187 +2187 @@
         data items are needed:
 
-         * 'pixelSize': size of each pixel in microns (such as ``[200,200]``.
+         * 'pixelSize': size of each pixel in microns (such as ``[200.,200.]``.
          * 'wavelength': wavelength in Angstoms.
          * 'distance': distance of detector from sample in cm.

trunk/GSASIIplot.py

@@ -5132 +5132 @@
                     ToggleMultiSpotMask(G2frame)
                 else:
+                    #TODO - try a fit of spot to image?
                     spot = [Xpos,Ypos,G2frame.spotSize]
                     Masks['Points'].append(spot)

trunk/imports/G2img_1TIF.py

@@ -74 +74 @@
                 self.SciPy = True
                 self.Comments = ['no metadata']
-                self.Data = {'wavelength': 0.1, 'pixelSize': [200, 200], 'distance': 100.0}
+                self.Data = {'wavelength': 0.1, 'pixelSize': [200., 200.], 'distance': 100.0}
                 self.Data['size'] = list(self.Image.shape)
                 self.Data['center'] = [int(i/2) for i in self.Image.shape]

trunk/imports/G2img_GE.py

@@ -180 +180 @@
             filename = os.path.splitext(filename)[0]+'.G2img'
             File = open(filename,'wb')
-            Data = {'pixelSize':[200,200],'wavelength':0.15,'distance':250.0,'center':[204.8,204.8],'size':sizexy}
+            Data = {'pixelSize':[200.,200.],'wavelength':0.15,'distance':250.0,'center':[204.8,204.8],'size':sizexy}
             image = np.reshape(image,(sizexy[1],sizexy[0]))
             cPickle.dump([head,Data,Npix,image],File,1)
@@ -188 +188 @@
             sum = False
     image = np.reshape(image,(sizexy[1],sizexy[0]))
-    data = {'pixelSize':[200,200],'wavelength':0.15,'distance':250.0,'center':[204.8,204.8],'size':sizexy}
+    data = {'pixelSize':[200.,200.],'wavelength':0.15,'distance':250.0,'center':[204.8,204.8],'size':sizexy}
     File.close()
     print ('Image read time %.2fs'%(time.time()-time0))