mdf4reader : corrected bug with format for struct in case of invalid …

…bytes
sneusse · May 11, 2015 · c6ac0a6 · c6ac0a6
1 parent 51ec422
commit c6ac0a6
Showing 1 changed file with 8 additions and 4 deletions.
diff --git a/mdf4reader.py b/mdf4reader.py
@@ -991,8 +991,12 @@ def readBitarray(self, bita, channelList=None):
                     byte = 8 * (self[chan].nBytes - nbytes) * bitarray([False])
                     for i in range(self.numberOfRecords):  # extend data of bytes to match numpy requirement
                         temp[i].append(byte)
-                temp = [self[chan].CFormat.unpack(temp[i].tobytes())[0] \
-                        for i in range(self.numberOfRecords)]
+                if 's' not in self[chan].Format:
+                    temp = [self[chan].CFormat.unpack(temp[i].tobytes())[0] \
+                            for i in range(self.numberOfRecords)]
+                else:
+                    temp = [temp[i].tobytes() \
+                            for i in range(self.numberOfRecords)]
                 buf[self[chan].name] = asarray(temp)
         return buf
 
@@ -1342,7 +1346,7 @@ def arrayformat4(signalDataType, numberOfBits):
         elif numberOfBits <= 64:
             dataType = 'u8'
         else:
-            dataType = 'u1'
+            dataType = str(bits_to_bytes(numberOfBits) // 8) + 'V'
 
     elif signalDataType in (2, 3):  # signed int
         if numberOfBits <= 8:
@@ -1412,7 +1416,7 @@ def datatypeformat4(signalDataType, numberOfBits):
         elif numberOfBits <= 64:
             dataType = 'L'
         else:
-            dataType = 'u1'
+            dataType = str(bits_to_bytes(numberOfBits) // 8) + 's'
 
     elif signalDataType in (2, 3):  # signed int
         if numberOfBits <= 8: