Changeset 239 for trunk/GSASIIplot.py

Timestamp:

Jan 13, 2011 1:34:07 PM (15 years ago)

Author:

vondreele

Message:

add 'any image file' to image file menu
add calibration skip & dmin to image data dictionary
fix to ellipse fitting
fix Pilatus reading - OK for 100K, not sure for 2M
now a image sizexy - 2 items for x & y sizes

File:

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

trunk/GSASIIplot.py ¶

@@ -837 +837 @@
             G2gd.GetPatternTreeItemId(self,self.Image, 'Image Controls'))
         Page.canvas.SetToolTipString('')
-        size = len(self.ImageZ)
+        sizexy = Data['size']
         if event.xdata and event.ydata:                 #avoid out of frame errors
             Page.canvas.SetCursor(wx.CROSS_CURSOR)
@@ -863 +863 @@
                 ypix = ypos*scaley
                 Int = 0
-                if (0 <= xpix <= size) and (0 <= ypix <= size):
+                if (0 <= xpix <= sizexy[0]) and (0 <= ypix <= sizexy[1]):
                     Int = self.ImageZ[ypix][xpix]
                 tth,azm,dsp = G2img.GetTthAzmDsp(xpos,ypos,Data)
@@ -947 +947 @@
         pixLimit = Data['pixLimit']
         if self.itemPicked is None and PickName == 'Image Controls':
-            size = len(self.ImageZ)
+#            sizexy = Data['size']
             Xpos = event.xdata
             if not (Xpos and self.ifGetRing):                   #got point out of frame
@@ -1081 +1081 @@
     if len(self.ImageZ) > 1024:
         imScale = len(self.ImageZ)/1024
+    sizexy = Data['size']
     pixelSize = Data['pixelSize']
+#    print sizexy,pixelSize,len(self.ImageZ),len(self.ImageZ[0])
     scalex = 1000./pixelSize[0]
     scaley = 1000./pixelSize[1]
-    xmax = len(self.ImageZ)
-    Xmax = len(self.ImageZ)*pixelSize[0]/1000.
+    Xmax = sizexy[0]*pixelSize[0]/1000.
+    Ymax = sizexy[1]*pixelSize[1]/1000.
     xlim = (-0.5,Xmax-.5)
-    ylim = (Xmax-.5,-0.5,)
+    ylim = (Ymax-.5,-0.5,)
     Imin,Imax = Data['range'][1]
     acolor = mpl.cm.get_cmap(Data['color'])