dev

cx1111 · cx1111 · commit ba7e7f9a6879 · 2017-02-17T14:46:56.000-05:00
diff --git a/devtests.ipynb b/devtests.ipynb
@@ -1321,27 +1321,88 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 3,
+   "execution_count": 4,
    "metadata": {
     "collapsed": false
    },
    "outputs": [
     {
      "data": {
       "text/plain": [
-       "array([    18,     77,    370, ..., 647414, 647672, 647934])"
+       "{'annsamp': array([647672, 647934, 648203, 648477, 648733, 648978, 649232, 649484,\n",
+       "        649734]),\n",
+       " 'anntype': ['#', 'N', 'N', 'N', 'N', 'N', 'N', 'N', 'N'],\n",
+       " 'aux': ['', '', '', '', '', '', '', '', ''],\n",
+       " 'chan': array([0, 0, 0, 0, 0, 0, 0, 0, 0]),\n",
+       " 'fs': None,\n",
+       " 'num': array([0, 0, 0, 0, 0, 0, 0, 0, 0]),\n",
+       " 'subtype': array([0, 0, 0, 0, 0, 0, 0, 0, 0])}"
       ]
      },
-     "execution_count": 3,
+     "execution_count": 4,
      "metadata": {},
      "output_type": "execute_result"
     }
    ],
    "source": [
     "import wfdb\n",
+    "import numpy as np\n",
+    "a = wfdb.rdann('/home/chen/Projects/wfdb-python/sampledata/100', 'atr', sampfrom =647672, sampto = 649734 )\n",
+    "a.anntype[0] = '#'\n",
+    "a.__dict__\n"
+   ]
+  },
+  {
+   "cell_type": "code",
+   "execution_count": 6,
+   "metadata": {
+    "collapsed": false
+   },
+   "outputs": [
+    {
+     "data": {
+      "text/plain": [
+       "['#', 'N', 'N', 'N', 'N', 'N', 'N', 'N', 'N']"
+      ]
+     },
+     "execution_count": 6,
+     "metadata": {},
+     "output_type": "execute_result"
+    }
+   ],
+   "source": [
+    "z = a.anntype\n",
     "\n",
-    "a = wfdb.rdann('/home/chen/Projects/wfdb-python/sampledata/100', 'atr', sampto = 647934)\n",
-    "a.annsamp\n"
+    "z\n",
+    "\n",
+    "\n",
+    "#a.type2aux()\n",
+    "#a.__dict__\n",
+    "\n",
+    "\n",
+    "#a.wrann()"
+   ]
+  },
+  {
+   "cell_type": "code",
+   "execution_count": 7,
+   "metadata": {
+    "collapsed": false
+   },
+   "outputs": [
+    {
+     "data": {
+      "text/plain": [
+       "(array([], dtype=int64),)"
+      ]
+     },
+     "execution_count": 7,
+     "metadata": {},
+     "output_type": "execute_result"
+    }
+   ],
+   "source": [
+    "np.where(z == 'N')"
    ]
   },
   {
diff --git a/setup.py b/setup.py
@@ -55,7 +55,8 @@
         'nose>=1.3.7',
         'numpy>=1.11.0',
         'matplotlib>=1.5.1',
-        'requests>=2.10.0'
+        'requests>=2.10.0',
+	'pandas>=0.19.1'
         ],
 
     # List additional groups of dependencies here (e.g. development
diff --git a/wfdb/annotations.py b/wfdb/annotations.py
@@ -1,5 +1,6 @@
 import numpy as np
 import pandas as pd
+import sys
 from IPython.display import display
 from . import _headers
 
@@ -32,7 +33,7 @@ def wrann(self):
     def checkfields(self):
         # Enforce mandatory write fields
         for field in ['annsamp', 'anntype']:
-            if not getattr(self, field):
+            if getattr(self, field) is None:
                 print('The ', field, ' field is mandatory for writing annotation files')
                 sys.exit()
 
@@ -82,8 +83,8 @@ def checkfield(self, field):
                 # Ensure all fields lie in standard WFDB annotation codes
                 if set(self.anntype) - set(annsyms.values()) != set():
                     print('The anntype field contains items not encoded in the WFDB annotation library.')
-                    print('To see the valid annotation codes, call: showanncodes()')
-                    print('To transfer non-encoded anntype items into the aux field, call: self.type2aux')
+                    print('To see the valid annotation codes call: showanncodes()')
+                    print('To transfer non-encoded anntype items into the aux field call: self.type2aux')
                     sys.exit()
             elif field == 'num':
                 if min(self.num) < 0 :
@@ -129,8 +130,13 @@ def type2aux(self):
             self.aux = [None]*len(self.annsamp)
 
         # Move the anntype fields
+        print(external_anntypes)
+
         for ext in external_anntypes:
+            print(ext)
+            print(np.where(self.anntype == ext))
             for i in np.where(self.anntype == ext):
+                print('i: ',i)
                 if self.aux[i] == None:
                     self.aux[i] = self.anntype[i]
                     self.anntype[i] = ''
@@ -509,7 +515,7 @@ def format_anntype(anndisp,anntype):
 
 annfields = ['annsamp', 'anntype', 'num', 'subtype', 'chan', 'aux', 'fs']
 
-annfieldtypes = {'annsamp': _headers.inttypes, 'anntypes': [str], 
+annfieldtypes = {'annsamp': _headers.inttypes, 'anntype': [str], 
               'num':_headers.inttypes, 'subtype': _headers.inttypes, 
               'chan': _headers.inttypes, 'aux': [str], 
               'fs': _headers.floattypes}
