fix test

cx1111 · cx1111 · commit c661d9015d17 · 2018-02-04T16:58:39.000-05:00
diff --git a/wfdb/plot/plot.py b/wfdb/plot/plot.py
@@ -334,7 +334,7 @@ def plot_wfdb(record=None, annotation=None, plot_sym=False,
 
     If the annotation object is input, the function will extract from it:
       - sample locations, from the `sample` attribute
-      - symbols, from the `sym` attribute
+      - symbols, from the `symbol` attribute
       - the annotation channels, from the `chan` attribute
       - the sampling frequency, from the `fs` attribute if present, and if fs
         was not already extracted from the `record` argument.
@@ -383,8 +383,9 @@ def plot_wfdb(record=None, annotation=None, plot_sym=False,
     >>> record = wfdb.rdrecord('sample-data/100', sampto=3000)
     >>> annotation = wfdb.rdann('sample-data/100', 'atr', sampto=3000)
 
-    wfdb.plot_wfdb(record=record, annotation=annotation, time_units='seconds',
-                   title='MIT-BIH Record 100', figsize=(10,4), ecg_grids='all')
+    >>> wfdb.plot_wfdb(record=record, annotation=annotation, plot_sym=True
+                       time_units='seconds', title='MIT-BIH Record 100',
+                       figsize=(10,4), ecg_grids='all')
 
     """
     (signal, ann_samp, ann_sym, fs, sig_name,
diff --git a/wfdb/processing/gqrs.py b/wfdb/processing/gqrs.py
@@ -7,8 +7,7 @@ def time_to_sample_number(seconds, frequency):
 
 
 class Conf(object):
-    def __init__(self, freq, gain,
-                 hr=75,
+    def __init__(self, freq, gain, hr=75,
                  RRdelta=0.2, RRmin=0.28, RRmax=2.4,
                  QS=0.07, QT=0.35,
                  RTmin=0.25, RTmax=0.33,
@@ -225,7 +224,7 @@ def sm(self, at_t):
 
         return self.smv_at(at_t)
 
-    def qf(self):  # CHECKED!
+    def qf(self):
         # evaluate the QRS detector filter for the next sample
 
         # do this first, to ensure that all of the other smoothed values needed below are in the buffer
@@ -471,10 +470,12 @@ def gqrs_detect(x, fs, adc_gain, adc_zero, threshold=1.0,
                 QS=0.07, QT=0.35, RTmin=0.25, RTmax=0.33,
                 QRSa=750, QRSamin=130):
     """
-    Detect qrs locations in a single channel ecg.
+    Detect qrs locations in a single channel ecg. Functionally, a direct port
+    of the gqrs algorithm from the original wfdb package. See the notes below
+    for a summary of the program.
 
-    Functionally, a direct port of the gqrs algorithm from the original
-    wfdb package. Therefore written to accept wfdb record fields.
+    This algorithm is not being developed/supported. Use another algorithm
+    such as `xqrs_detect` for a supported qrs detector.
 
     Parameters
     ----------
@@ -518,8 +519,20 @@ def gqrs_detect(x, fs, adc_gain, adc_zero, threshold=1.0,
 
     Notes
     -----
+    The algorithm works as follows:
+    - Apply trapezoid low-pass filtering to the signal
+    - Convolve a QRS matched filter with the filtered signal
+    - Run the learning phase: 
+    - Run the detection:
+      - 
+
     This function should not be used for signals with fs <= 50Hz
 
+    A list of issues from the original c code and hence this python
+    implementationcan be found here: https://github.com/bemoody/wfdb/issues/17
+    
+    gqrs will not be developed in this library.
+
     """
     conf = Conf(freq=fs, gain=adc_gain, hr=hr,
                 RRdelta=RRdelta, RRmin=RRmin, RRmax=RRmax,
diff --git a/wfdb/processing/qrs.py b/wfdb/processing/qrs.py
@@ -108,8 +108,8 @@ def bandpass(self, fc_low=5, fc_high=20):
         self.fc_low = fc_low
         self.fc_high = fc_high
 
-        b, a = signal.butter(2, [fc_low * 2 / self.fs, fc_high * 2 / self.fs],
-                             'pass')
+        b, a = signal.butter(2, [float(fc_low) * 2 / self.fs, 
+                                 float(fc_high) * 2 / self.fs], 'pass')
         self.sig_f = signal.filtfilt(b, a, self.sig[self.sampfrom:self.sampto],
                                      axis=0)
         # Save the passband gain (x2 due to double filtering)
