dev

cx1111 · cx1111 · commit 54c386b4e761 · 2017-02-17T19:49:41.000-05:00
diff --git a/devtests.ipynb b/devtests.ipynb
@@ -1776,6 +1776,30 @@
     "5.astype('i1')"
    ]
   },
+  {
+   "cell_type": "code",
+   "execution_count": 49,
+   "metadata": {
+    "collapsed": false
+   },
+   "outputs": [
+    {
+     "data": {
+      "text/plain": [
+       "[65, 101, 101, 102, 97, 101, 102, 97, 101, 102]"
+      ]
+     },
+     "execution_count": 49,
+     "metadata": {},
+     "output_type": "execute_result"
+    }
+   ],
+   "source": [
+    "x='Aeefaefaef'\n",
+    "\n",
+    "[ord(i) for i in x]"
+   ]
+  },
   {
    "cell_type": "code",
    "execution_count": null,
diff --git a/wfdb/annotations.py b/wfdb/annotations.py
@@ -75,7 +75,7 @@ def checkfield(self, field):
             fielditem = getattr(self, field)
 
             # Ensure the field item is a list
-            if type(fielditem) != list
+            if type(fielditem) != list:
                 print('The ', field, ' field must be a list')
                 sys.exit()          
 
@@ -131,7 +131,6 @@ def checkfieldcohesion(self):
 
     def wrannfile(self):
 
-
         # If there is an fs, write it
         if self.fs is not None:
             databytes = insert_fs(self.fs)
@@ -182,9 +181,6 @@ def allfieldbytes(self):
             fieldbytes[field] = self.fieldbytes(field)
 
 
-
-
-
         # Only need to write annsamp and anntype
         #if extrawritefields == []:
          #   for i in range(0, len(self.annsamp)):
@@ -202,10 +198,6 @@ def fieldbytes(self, field):
 
         databytes = []
 
-
-        'num', 'subtype', 'chan', 'aux'
-
-
         # annsamp and anntype bytes come together
         if field == 'annsamp_anntype':
             # Difference values for annotation samples
@@ -230,18 +222,45 @@ def fieldbytes(self, field):
                     
                 databytes.append(indexbytes)
 
+        # All other fields are optional
         elif field == 'num':
             for i in range(0, len(self.num)):
-                # First byte gives 
-                databytes.append([ , + 240])
-
-
+                if self.num[i] is None:
+                    databytes.append(None)
+                else:
+                    # First byte stores num
+                    # second byte stores 60*4 indicator
+                    databytes.append([self.num[i], + 240])
         elif field == 'subtype':
-            print('on it')
+            for i in range(0, len(self.subtype)):
+                if self.subtype[i] is None:
+                    databytes.append(None)
+                else:
+                    # First byte stores subtype
+                    # second byte stores 61*4 indicator
+                    databytes.append([self.subtype[i], + 244])
         elif field == 'chan':
-            print('on it')
+            for i in range(0, len(self.chan)):
+                if self.chan[i] is None:
+                    databytes.append(None)
+                else:
+                    # First byte stores num
+                    # second byte stores 62*4 indicator
+                    databytes.append([self.chan[i], + 248])
         elif field == 'aux':
-            print('on it')
+            for i in range(0, len(self.aux)):
+                if self.aux[i] is None:
+                    databytes.append(None)
+                else:
+                    aux = self.aux[i]
+                    # - First byte stores length of aux field
+                    # - Second byte stores 63*4 indicator
+                    # - Then store the aux string characters
+                    auxbytes = [len(aux), + 252] + [ord(i) for i in x]    
+                    # Zero pad odd length aux strings
+                    if len(aux) % 2: 
+                        auxbytes.append([0])
+                    databytes.append(auxbytes)
 
         return databytes
 
