Changeset 3470

Timestamp:

Jul 13, 2018 8:39:37 AM (5 years ago)

Author:

vondreele

Message:

add a comeent/question for OnConstDel? (no effect on processing)
replace ReadMarCCDFrame.py with Steven Weigand's version - fix problem with reading header

Location:

trunk

Files:

• GSASIIconstrGUI.py (modified) (1 diff)
• ReadMarCCDFrame.py (modified) (3 diffs)

trunk/GSASIIconstrGUI.py

@@ -1006 +1006 @@
         Id,name = Indx[Obj.GetId()]
         del data[name][Id]
-        allcons = FindAllCons(data)
+        allcons = FindAllCons(data)     #should I call CheckChangedConstraint() instead?
         if not len(allcons): return
-        errmsg,warnmsg = CheckConstraints(allcons)
+        CheckConstraints(allcons)
         wx.CallAfter(OnPageChanged,None)
         

trunk/ReadMarCCDFrame.py

@@ -288 +288 @@
         File.seek(IFD[34710][2][0])
         self.headerType = st.unpack(byteOrd+'I',File.read(4))[0] #/* flag for header type  (can be used as magic number) */
-        self.headerName = st.unpack(byteOrd+16*'s',File.read(16))[0].replace(b'\x00',b'')
+        self.headerName = b''.join(st.unpack(byteOrd+16*'s',File.read(16))).replace(b'\x00',b'')
         self.headerMajorVersion = st.unpack(byteOrd+'I',File.read(4))[0] #/* header_major_version (n.) */
         self.headerMinorVersion = st.unpack(byteOrd+'I',File.read(4))[0] #/* header_minor_version (.n) */
@@ -361 +361 @@
 
         File.seek(IFD[34710][2][0]+256+128)
-        self.barcode = st.unpack(byteOrd+16*'s',File.read(16))[0].replace(b'\x00',b'')
+        self.barcode = b''.join(st.unpack(byteOrd+16*'s',File.read(16))).replace(b'\x00',b'')
         self.barcodeAngle = st.unpack(byteOrd+'I',File.read(4))[0]
         self.barcodeStatus = st.unpack(byteOrd+'I',File.read(4))[0]
@@ -433 +433 @@
 
         File.seek(IFD[34710][2][0]+256+128+256+128+128+128)
-        self.filetitle = st.unpack(byteOrd+128*'s',File.read(128))[0].replace(b'\x00',b'')
-        self.filepath = st.unpack(byteOrd+'s'*128,File.read(128))[0].replace(b'\x00',b'') #/* path name for data file*/
-        self.filename = st.unpack(byteOrd+'s'*64,File.read(64))[0].replace(b'\x00',b'') #/* name of data file*/
-        self.acquireTimestamp = st.unpack(byteOrd+'s'*32,File.read(32))[0].replace(b'\x00',b'') #/* date and time of acquisition*/
-        self.headerTimestamp = st.unpack(byteOrd+'s'*32,File.read(32))[0].replace(b'\x00',b'') #/* date and time of header update*/
-        self.saveTimestamp = st.unpack(byteOrd+'s'*32,File.read(32))[0].replace(b'\x00',b'') #/* date and time file saved */
-        self.fileComment = st.unpack(byteOrd+'s'*512,File.read(512))[0].replace(b'\x00',b'') #/* comments  - can be used as desired */
-        self.datasetComment = st.unpack(byteOrd+'s'*512,File.read(512))[0].replace(b'\x00',b'') #/* comments  - can be used as desired */
-
-        self.userData = st.unpack(byteOrd+'s'*512,File.read(512))[0].replace(b'\x00',b'')
+        self.filetitle = b''.join(st.unpack(byteOrd+128*'s',File.read(128))).replace(b'\x00',b'')
+        self.filepath = b''.join(st.unpack(byteOrd+'s'*128,File.read(128))).replace(b'\x00',b'') #/* path name for data file*/
+        self.filename = b''.join(st.unpack(byteOrd+'s'*64,File.read(64))).replace(b'\x00',b'') #/* name of data file*/
+        self.acquireTimestamp = b''.join(st.unpack(byteOrd+'s'*32,File.read(32))).replace(b'\x00',b'') #/* date and time of acquisition*/
+        self.headerTimestamp = b''.join(st.unpack(byteOrd+'s'*32,File.read(32))).replace(b'\x00',b'') #/* date and time of header update*/
+        self.saveTimestamp = b''.join(st.unpack(byteOrd+'s'*32,File.read(32))).replace(b'\x00',b'') #/* date and time file saved */
+        self.fileComment = b''.join(st.unpack(byteOrd+'s'*512,File.read(512))).replace(b'\x00',b'') #/* comments  - can be used as desired */
+        self.datasetComment = b''.join(st.unpack(byteOrd+'s'*512,File.read(512))).replace(b'\x00',b'') #/* comments  - can be used as desired */
+
+        self.userData = b''.join(st.unpack(byteOrd+'s'*512,File.read(512))).replace(b'\x00',b'')
 
         File.seek(4096)