Changeset 3136 for trunk/imports/G2img_MAR.py

Timestamp:

Oct 23, 2017 11:39:16 AM (6 years ago)

Author:

vondreele

Message:

make GSAS-II python 3.6 compliant & preserve python 2.7 use;changes:
do from future import division, print_function for all GSAS-II py sources
all menu items revised to be py 2.7/3.6 compliant
all wx.OPEN --> wx.FD_OPEN in file dialogs
all integer divides (typically for image pixel math) made explicit with ; ambiguous ones made floats as appropriate
all print "stuff" --> print (stuff)
all print >> pFile,'stuff' --> pFile.writeCIFtemplate('stuff')
all read file opens made explicit 'r' or 'rb'
all cPickle imports made for py2.7 or 3.6 as cPickle or _pickle; test for '2' platform.version_tuple[0] for py 2.7
define cPickleload to select load(fp) or load(fp,encoding='latin-1') for loading gpx files; provides cross compatibility between py 2.7/3.6 gpx files
make dict.keys() as explicit list(dict.keys()) as needed (NB: possible source of remaining py3.6 bugs)
make zip(a,b) as explicit list(zip(a,b)) as needed (NB: possible source of remaining py3.6 bugs)
select unichr/chr according test for '2' platform.version_tuple[0] for py 2.7 (G2pwdGUI * G2plot) for special characters
select wg.EVT_GRID_CELL_CHANGE (classic) or wg.EVT_GRID_CELL_CHANGED (phoenix) in grid Bind
maxint --> maxsize; used in random number stuff
raise Exception,"stuff" --> raise Exception("stuff")
wx 'classic' sizer.DeleteWindows?() or 'phoenix' sizer.Clear(True)
wx 'classic' SetToolTipString?(text) or 'phoenix' SetToolTip?(wx.ToolTip?(text)); define SetToolTipString?(self,text) to handle the choice in plots
status.SetFields? --> status.SetStatusText?
'classic' AddSimpleTool? or 'phoenix' self.AddTool? for plot toolbar; Bind different as well
define GetItemPydata? as it doesn't exist in wx 'phoenix'
allow python versions 2.7 & 3.6 to run GSAS-II
Bind override commented out - no logging capability (NB: remove all logging code?)
all import ContentsValidator? open filename & test if valid then close; filepointer removed from Reader
binary importers (mostly images) test for 'byte' type & convert as needed to satisfy py 3.6 str/byte rules

File:

• trunk/imports/G2img_MAR.py (modified) (4 diffs)

trunk/imports/G2img_MAR.py

@@ -12 +12 @@
 '''
 
+from __future__ import division, print_function
+import platform
+import sys
+import struct as st
 import GSASIIobj as G2obj
 import GSASIIpath
@@ -27 +31 @@
             )
 
-    def ContentsValidator(self, filepointer):
+    def ContentsValidator(self, filename):
         '''no test at this time
         '''
         return True
         
-    def Reader(self,filename,filepointer, ParentFrame=None, **unused):
+    def Reader(self,filename, ParentFrame=None, **unused):
         self.Comments,self.Data,self.Npix,self.Image = GetMAR345Data(filename)
         if self.Npix == 0 or not self.Comments:
@@ -44 +48 @@
         import pack_f as pf
     except:
-        print '**** ERROR - Unable to load the GSAS MAR image decompression, pack_f'
+        print ('**** ERROR - Unable to load the GSAS MAR image decompression, pack_f')
         return None,None,None,None
 
     if not imageOnly:
-        print 'Read Mar345 file: ',filename
+        print ('Read Mar345 file: '+filename)
     File = open(filename,'rb')
-    head = File.read(4095)
+    head = File.read(4095).decode(encoding='latin-1')
     lines = head[128:].split('\n')
     head = []
@@ -79 +83 @@
     data['size'] = [sizex,sizey]
     File.seek(pos)
-    line = File.read(8)
+    line = File.read(8).decode(encoding='latin-1')
     while 'CCP4' not in line:       #get past overflow list for now
-        line = File.read(8)
+        line = File.read(8).decode(encoding='latin-1')
         pos += 8
     pos += 37
     File.seek(pos)
-    raw = File.read()
+    if '2' in platform.python_version_tuple()[0]:
+        raw = File.read()
+    else:
+        raw = File.read()
+        print (type(raw),sys.getsizeof(raw),raw[:10])
+    image = np.zeros(shape=(sizex,sizey),dtype=np.int32)    
+    image = np.flipud(pf.pack_f(len(raw),raw,sizex,sizey,image).T)  #transpose to get it right way around & flip
     File.close()
-    image = np.zeros(shape=(sizex,sizey),dtype=np.int32)
-    
-    image = np.flipud(pf.pack_f(len(raw),raw,sizex,sizey,image).T)  #transpose to get it right way around & flip
     if imageOnly:
         return image