Changeset 225

Timestamp:

Jan 6, 2011 1:23:52 PM (13 years ago)

Author:

vondreele

Message:

fixes to window positioning around task bar

Location:

trunk

Files:

• GSASII.py (modified) (3 diffs)
• GSASIIIO.py (modified) (7 diffs)
• GSASIIgrid.py (modified) (2 diffs)
• GSASIIplot.py (modified) (3 diffs)

trunk/GSASII.py

@@ -203 +203 @@
         wx.Frame.__init__(self, name='GSASII', parent=parent,
             size=wx.Size(300, 250),style=wx.DEFAULT_FRAME_STYLE, title='GSAS-II data tree')
-        screenSize = wx.DisplaySize()
+        clientSize = wx.ClientDisplayRect()
         Size = self.GetSize()
-        xPos = screenSize[0]-Size[0]
-        self.SetPosition(wx.Point(xPos,0))
+        xPos = clientSize[2]-Size[0]
+        self.SetPosition(wx.Point(xPos,clientSize[1]))
         self._init_utils()
         self.SetMenuBar(self.GSASIIMenu)
@@ -410 +410 @@
                 imagefiles.sort()
                 for imagefile in imagefiles:
-                    Comments,Data,Size,Image = G2IO.GetImageData(imagefile)
+                    Comments,Data,Size,Image = G2IO.GetImageData(self,imagefile)
                     if Comments:
                         Id = self.PatternTree.AppendItem(parent=self.root,text='IMG '+ospath.basename(imagefile))
@@ -450 +450 @@
                         self.PickId = Id
                         self.Image = Id
-                self.PatternTree.SelectItem(Id)             #show last one
-                self.PatternTree.Expand(Id)
+                self.PatternTree.SelectItem(G2gd.GetPatternTreeItemId(self,Id,'Image Controls'))             #show last one
         finally:
             dlg.Destroy()

trunk/GSASIIIO.py

@@ -406 +406 @@
     return [np.array(x),np.array(y),np.array(w),np.zeros(N),np.zeros(N),np.zeros(N)]
     
-def GetImageData(imagefile,imageOnly=False):
+def CheckImageFile(self,imagefile):
+    if not ospath.exists(imagefile):
+        dlg = wx.FileDialog(self, 'Bad image file name; choose name', '.', '',\
+        'MAR345 (*.mar3450;*.mar2300)|*.mar3450;*.mar2300|ADSC Image (*.img)\
+        |*.img|Detector tif (*.tif;*.tiff)|*.tif;*.tiff|GE Image sum (*.sum)\
+        |*.sum|GE Image avg (*.avg)|*.avg|GE Image raw (*)|*|All files (*.*)|*.*',wx.OPEN)
+        if self.dirname:
+            dlg.SetDirectory(self.dirname)
+        try:
+            dlg.SetFilename(ospath.split(imagefile)[1])
+            if dlg.ShowModal() == wx.ID_OK:
+                self.dirname = dlg.GetDirectory()
+                imagefile = dlg.GetPath()
+            else:
+                imagefile = False
+        finally:
+            dlg.Destroy()
+    return imagefile
+        
+def GetImageData(self,imagefile,imageOnly=False):        
     ext = ospath.splitext(imagefile)[1]
     Comments = []
@@ -575 +594 @@
     
 def GetTifData(filename,imageOnly=False):
-    # only works for APS Perkin-Elmer detector data files in "TIFF" format that are readable by Fit2D
+    # only works for APS Perkin-Elmer or MAR detector data files in "TIFF" format that are readable by Fit2D
     import struct as st
     import array as ar
@@ -595 +614 @@
         lines = ['not a detector tiff file',]
         return lines,0,0
-    size,Ityp = st.unpack('<ii',File.read(8))
+    origSize,Ityp = st.unpack('<ii',File.read(8))
     File.seek(30)
-    size = st.unpack('<i',File.read(4))[0]
+    finalSize = st.unpack('<i',File.read(4))[0]
+    if finalSize:
+        sizeScale = origSize/finalSize
+    else:
+        sizeScale = 1
+        finalSize = origSize
     if Ityp == 0:
         tifType = 'Pilatus'
-        pixy = (172,172)
+        pixy = (172*sizeScale,172*sizeScale)
         pos = 4096
         if not imageOnly:
@@ -606 +630 @@
     elif Ityp == 1:
         tifType = 'PE'
-        pixy = (200,200)
+        pixy = (200*sizeScale,200*sizeScale)
         pos = 8
         if not imageOnly:
@@ -612 +636 @@
     elif Ityp == 3328:
         tifType = 'MAR'
-        pixy = (79,79)
+        pixy = (79*sizeScale,79*sizeScale)
         pos = 4096
         if not imageOnly:
@@ -619 +643 @@
         lines = 'unknown tif type'
         return lines,0,0
-    image = np.zeros(shape=(size,size),dtype=np.int32)
+    image = np.zeros(shape=(finalSize,finalSize),dtype=np.int32)
     row = 0
-    while row < size:
+    while row < finalSize:
         File.seek(pos)
         if 'PE' in tifType: 
             if dataType == 5:
-                line = ar.array('f',File.read(4*size))
+                line = ar.array('f',File.read(4*finalSize))
             else:
-                line = ar.array('l',File.read(4*size))
-            pos += 4*size
+                line = ar.array('l',File.read(4*finalSize))
+            pos += 4*finalSize
         elif 'MAR' in tifType:
-            line = ar.array('H',File.read(2*size))
-            pos += 2*size
+            line = ar.array('H',File.read(2*finalSize))
+            pos += 2*finalSize
         image[row] = np.asarray(line)
         row += 1
@@ -639 +663 @@
         return image
     else:
-        return head,data,size,image
+        return head,data,finalSize,image
     
 def ProjFileOpen(self):

trunk/GSASIIgrid.py

@@ -245 +245 @@
         self._init_ctrls(parent,name,size,pos)
         self.data = data
-        self.screenSize = wx.DisplaySize()
+        clientSize = wx.ClientDisplayRect()
         Size = self.GetSize()
-        xPos = self.screenSize[0]-Size[0]
-        self.SetPosition(wx.Point(xPos,250))
+        xPos = clientSize[2]-Size[0]
+        self.SetPosition(wx.Point(xPos,clientSize[1]+250))
         self.dirname = ''
         self.AtomGrid = []
@@ -254 +254 @@
         
     def setSizePosLeft(self,Width):
-        screenSize = wx.DisplaySize()
-        Width[1] = min(Width[1],screenSize[1]-300)
+        clientSize = wx.ClientDisplayRect()
+        Width[1] = min(Width[1],clientSize[2]-300)
         self.SetSize(Width)
-        self.SetPosition(wx.Point(screenSize[0]-Width[0],250))
+        self.SetPosition(wx.Point(clientSize[2]-Width[0],clientSize[1]+250))
         
     def Clear(self):

trunk/GSASIIplot.py

@@ -1019 +1019 @@
         Page.canvas.mpl_connect('pick_event', OnImPick)
         Page.canvas.mpl_connect('button_release_event', OnImRelease)
+        xylim = []
     if not event:                       #event from GUI TextCtrl - don't want focus to change to plot!!!
         Page.SetFocus()
@@ -1024 +1025 @@
     size,imagefile = self.PatternTree.GetItemPyData(self.Image)
     if imagefile != self.oldImagefile:
-        self.ImageZ = G2IO.GetImageData(imagefile,imageOnly=True)
+        imagefile = G2IO.CheckImageFile(self,imagefile)
+        if not imagefile:
+            self.G2plotNB.Delete('2D Powder Image')
+            return
+        self.PatternTree.SetItemPyData(self.Image,[size,imagefile])
+        self.ImageZ = G2IO.GetImageData(self,imagefile,imageOnly=True)
         self.oldImagefile = imagefile
     Data = self.PatternTree.GetItemPyData(
@@ -1133 +1139 @@
         Plot.set_xlim(xlim)
         Plot.set_ylim(ylim)
-        if not newPlot:
+        if not newPlot and xylim:
             Page.toolbar.push_current()
             Plot.set_xlim(xylim[0])