dev

cx1111 · cx1111 · commit e32c895787ca · 2017-02-28T09:58:49.000-05:00
diff --git a/wfdb/__init__.py b/wfdb/__init__.py
@@ -2,7 +2,7 @@
 #from ._downloadsamp import downloadsamp
 
 from .records import Record, MultiRecord, rdheader, rdsamp, srdsamp, wrsamp
-from .annotations import Annotation, rdann, showanncodes
+from .annotations import Annotation, rdann, wrann, showanncodes
 
 
 #from ._plot import plotrec
diff --git a/wfdb/annotations.py b/wfdb/annotations.py
@@ -298,6 +298,12 @@ def field2bytes(field, value):
     return databytes
 
 
+# Function for writing annotations
+def wrann(recordname, annotator, annsamp, anntype, num = None, subtype = None, chan = None, aux = None, fs = None):
+        # Create Annotation object
+        annotation = Annotation(recordname, annotator, annsamp, anntype, num, subtype, chan, aux, fs)
+        # Perform field checks and write the annotation file
+        annotation.wrann()
 
 # Display the annotation symbols and the codes they represent
 def showanncodes():
diff --git a/wfdb/records.py b/wfdb/records.py
@@ -607,7 +607,7 @@ def multi_to_single(self):
 #------------------- Reading Records -------------------#
 
 # Read a WFDB single or multi segment record. Return a Record or MultiRecord object
-def rdsamp(recordname, sampfrom=0, sampto=None, channels = None, physical = True, stackmulti = True):  
+def rdsamp(recordname, sampfrom=0, sampto=None, channels = None, physical = True, stackmulti = True, returnobj = True):  
 
     # If the user specifies a sample or signal range, some fields 
     # of the output object will be updated from the fields directly
@@ -762,38 +762,43 @@ def wanted_siginds(wanted_signames, record_signames):
         return [record_signames.index(s) for s in contained_signals]
 
 
-# A simple version of rdsamp for the average user
+# A simple version of rdsamp for ease of use
 # Return the physical signals and a few essential fields
 def srdsamp(recordname, sampfrom=0, sampto=None, channels = None):
 
     record = rdsamp(recordname, sampfrom, sampto, channels, True, True)
 
     signals = record.p_signals
     fields = {}
-    for field in ['fs','units','signame']:
+    for field in ['fs','units','signame', 'comments']:
         fields[field] = getattr(record, field)
 
     return signals, fields
 
 #------------------- /Reading Records -------------------#
 
 
-# Gateway function for single segment wrsamp
-def wrsamp(recordname, p_signals = None, d_signals = None, fs, units, signames, fmt = None, comments=[]):
+# Simple function for single segment wrsamp
+def wrsamp(recordname, fs, units, signames, p_signals = None, d_signals = None,  fmt = None, comments= None):
     
     # Check input field combinations
     if p_signals is not None and d_signals is not None:
         sys.exit('Must only give one of the inputs: p_signals or d_signals')
 
-    
-
     # Create the Record object
     record = Record(recordname = recordname, p_signals = p_signals, fs = fs, fmt = fmt, units = units, signame = signames, comments = comments)
-    # 2. Compute optimal fields to store the digital signal, carry out adc, and set the fields.
-    record.set_d_features(do_adc = 1)
-    # 3. Set default values of any missing field dependencies
+    
+    # Depending on whether d_signals or p_signals was used, set other required features.
+    if p_signals is not none:
+        # Compute optimal fields to store the digital signal, carry out adc, and set the fields.
+        record.set_d_features(do_adc = 1)
+    else:
+        # No need to do adc. Just use d_signals to set the fields
+        record.set_d_features()
+
+    # Set default values of any missing field dependencies
     record.setdefaults()
-    # 4. Write the record files - header and associated dat
+    # Write the record files - header and associated dat
     record.wrsamp()
 
 
