diff -Naur --exclude Makefile --exclude info wfdb-10.4.23/app/nst.c wfdb-10.4.24/app/nst.c --- wfdb-10.4.23/app/nst.c 2006-02-25 20:35:59.000000000 -0500 +++ wfdb-10.4.24/app/nst.c 2009-10-06 11:39:40.000000000 -0400 @@ -1,8 +1,8 @@ /* file: nst.c G. Moody 8 December 1983 - Last revised: 25 February 2006 + Last revised: 6 October 2009 ------------------------------------------------------------------------------- nst: Noise stress test -Copyright (C) 1983-2006 George B. Moody +Copyright (C) 1983-2009 George B. Moody This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software @@ -53,8 +53,8 @@ int argc; char *argv[]; { - static char answer[10], buf[256], *wfdbp, irec[10], nrec[21], nnrec[20], - orec[10], refaname[10], *protocol, tfname[9], *p, *s; + static char answer[20], buf[256], *wfdbp, irec[10], nrec[21], nnrec[20], + orec[10], refaname[10], *protocol, tfname[20], *p, *s; double *anoise, *asig, *g, nsf = 0.0, nsr, *r, snr = -999999.0, ssf = 0.0; FILE *ifile; int i; @@ -296,7 +296,7 @@ (void)strcpy(answer, "30:0"); } else - (void)strcpy(answer, mstimstr(strtim("e"))); + (void)strncpy(answer, mstimstr(strtim("e")), sizeof(answer)); t0 = strtim("5:0"); dt = strtim("2:0"); tf = strtim(answer); diff -Naur --exclude Makefile --exclude info wfdb-10.4.23/checkpkg/expected/lcheck_cal wfdb-10.4.24/checkpkg/expected/lcheck_cal --- wfdb-10.4.23/checkpkg/expected/lcheck_cal 2008-04-04 13:41:15.000000000 -0400 +++ wfdb-10.4.24/checkpkg/expected/lcheck_cal 2009-10-06 11:44:14.000000000 -0400 @@ -41,6 +41,13 @@ Vtip - - undefined 10 mV Thorax - - undefined 2 mV Abdomen - - undefined 200 uV +F - - undefined 100 uV +C - - undefined 100 uV +A - - undefined 100 uV +T - - undefined 100 uV +P - - undefined 100 uV +O - - undefined 100 uV +I - - undefined 100 uV record - - undefined 1 mV record - - undefined 10 V record - - undefined 100 mmHg diff -Naur --exclude Makefile --exclude info wfdb-10.4.23/conf/version.def wfdb-10.4.24/conf/version.def --- wfdb-10.4.23/conf/version.def 2009-02-15 12:49:16.000000000 -0500 +++ wfdb-10.4.24/conf/version.def 2009-10-28 12:09:31.000000000 -0400 @@ -1,5 +1,5 @@ # file: version.def G. Moody 24 May 2000 -# Last revised: 15 February 2009 +# Last revised: 28 October 2009 # Each release of the WFDB Software Package is identified by a three-part # version number, defined below. Be sure to leave a single space before # and after the "=" in each of the next three lines! @@ -17,6 +17,6 @@ VDEFS = -DWFDB_MAJOR=$(MAJOR) -DWFDB_MINOR=$(MINOR) -DWFDB_RELEASE=$(RELEASE) # WAVEVERSION is the WAVE version number. -WAVEVERSION = 6.9 +WAVEVERSION = 6.10 # _____________________________________________________________________________ diff -Naur --exclude Makefile --exclude info wfdb-10.4.23/data/wfdbcal wfdb-10.4.24/data/wfdbcal --- wfdb-10.4.23/data/wfdbcal 2008-03-14 16:31:33.000000000 -0400 +++ wfdb-10.4.24/data/wfdbcal 2009-09-09 17:58:38.000000000 -0400 @@ -70,6 +70,15 @@ Thorax - - undefined 2 mV Abdomen - - undefined 200 uV +# EEG +F - - undefined 100 uV +C - - undefined 100 uV +A - - undefined 100 uV +T - - undefined 100 uV +P - - undefined 100 uV +O - - undefined 100 uV +I - - undefined 100 uV + # Definitions for nameless signals with defined units record - - undefined 1 mV record - - undefined 1000 uV diff -Naur --exclude Makefile --exclude info wfdb-10.4.23/doc/wag-src/a2m.1 wfdb-10.4.24/doc/wag-src/a2m.1 --- wfdb-10.4.23/doc/wag-src/a2m.1 2009-08-10 09:35:33.000000000 -0400 +++ wfdb-10.4.24/doc/wag-src/a2m.1 2009-10-28 09:31:15.000000000 -0400 @@ -88,22 +88,9 @@ If the .ecg files are not in the current directory, give their full pathnames. The output files are always written to the current directory, so be sure that the current directory is writeable (it -should not be the DVD) and that it has sufficient free space (roughly +should not be the DVD) and that has sufficient free space (roughly 8 Mb per long version record, or 1.6 MB per short version record). -If the DVD is accessible as \fB/media/dvd/\fR, the command -.br - \fBahaecg2mit -s /media/dvd/*.ecg\fR -.br -makes a complete set of short-version records in the current directory. -(Omit the \fB-s\fR to make a set of long-version records instead.) -Under Windows, within a Cygwin window, the DVD is accessible as -\fB/cygdrive/d/\fR (or \fB/cygdrive/e/\fR, etc., depending on the -drive letter that Windows has assigned), so the same task can be done -under Windows by -.br - \fBahaecg2mit -s /cygdrive/d/*.ecg\fR - .SH OLDER FORMATS .SS ahaconvert @@ -137,7 +124,9 @@ contain annotation times in milliseconds, which are converted to sampling intervals based on an assumed sampling frequency of 250 Hz. Default: type 3 is assumed if \fIahafile\fR ends with \fB.ANO\fR or \fB.ano\fR; type -0 is assumed otherwise..SS ad2m +0 is assumed otherwise. + +.SS ad2m .PP Use \fBad2m\fR to convert AHA-format signal files from tapes, floppy disks, or CDs into WFDB format. Options for \fBad2m\fR include: @@ -184,7 +173,18 @@ .SH EXAMPLES .SS "AHA Database DVD" -See \fBahaecg2mit\fR above. +If the DVD is accessible as \fB/media/dvd/\fR, the command +.br + \fBahaecg2mit -s /media/dvd/*.ecg\fR +.br +makes a complete set of short-version records in the current directory. +(Omit the \fB-s\fR to make a set of long-version records instead.) +Under Windows, within a Cygwin window, the DVD is accessible as +\fB/cygdrive/d/\fR (or \fB/cygdrive/e/\fR, etc., depending on the +drive letter that Windows has assigned), so the same task can be done +under Windows by +.br + \fBahaecg2mit -s /cygdrive/d/*.ecg\fR .SS "AHA Database CD" AHA DB CDs contain both long and short versions of each record. In diff -Naur --exclude Makefile --exclude info wfdb-10.4.23/doc/wag-src/ann2rr.1 wfdb-10.4.24/doc/wag-src/ann2rr.1 --- wfdb-10.4.23/doc/wag-src/ann2rr.1 2006-12-12 09:48:58.000000000 -0500 +++ wfdb-10.4.24/doc/wag-src/ann2rr.1 2009-10-28 11:43:43.000000000 -0400 @@ -1,4 +1,4 @@ -.TH ANN2RR 1 "31 December 2003" "WFDB 10.3.12" "WFDB Applications Guide" +.TH ANN2RR 1 "28 October 2009" "WFDB 10.4.24" "WFDB Applications Guide" .SH NAME ann2rr, rr2ann \- convert annotation files to interval lists and vice versa .SH SYNOPSIS @@ -146,6 +146,15 @@ .TP 22 \fIrecord\fR.\fIannotator\fR annotation file + +.SH AVAILABILITY +These programs are provided in the \fIapp\fR directory of the WFDB Software +Package. Run \fBmake\fR in that directory to compile and install them if they +have not been installed already. +.PP +The PhysioNet ATM (http://physionet.org/cgi-bin/ATM) provides web access to +\fBann2rr\fR (select \fBShow RR intervals as text\fR from the Toolbox). + .SH SEE ALSO \fBrdann\fR(1), \fBsampfreq\fR(1), \fBsetwfdb\fR(1), \fBwrann\fR(1) .SH AUTHOR diff -Naur --exclude Makefile --exclude info wfdb-10.4.23/doc/wag-src/edf2mit.1 wfdb-10.4.24/doc/wag-src/edf2mit.1 --- wfdb-10.4.23/doc/wag-src/edf2mit.1 2009-03-07 23:54:15.000000000 -0500 +++ wfdb-10.4.24/doc/wag-src/edf2mit.1 2009-10-28 11:47:10.000000000 -0400 @@ -1,4 +1,4 @@ -.TH EDF2MIT 1 "23 August 2006" "WFDB 10.4.5" "WFDB Applications Guide" +.TH EDF2MIT 1 "28 October 2009" "WFDB 10.4.24" "WFDB Applications Guide" .SH NAME edf2mit, mit2edf \- convert between EDF and WFDB-compatible formats .SH SYNOPSIS @@ -90,6 +90,10 @@ These programs are provided in the \fIconvert\fR directory of the WFDB Software Package. Run \fBmake\fR in that directory to compile and install them if they have not been installed already. +.PP +The PhysioNet ATM (http://physionet.org/cgi-bin/ATM) provides web access to +\fBmit2edf\fR (select \fBExport signals as EDF\fR from the Toolbox). + .SH SEE ALSO \fBa2m\fR(1), \fBrdedfann\fR(1), \fBsnip\fR(1), \fBxform\fR(1), \fBwfdb\fR(3), \fBheader\fR(5) diff -Naur --exclude Makefile --exclude info wfdb-10.4.23/doc/wag-src/eval0.tex wfdb-10.4.24/doc/wag-src/eval0.tex --- wfdb-10.4.23/doc/wag-src/eval0.tex 2008-10-07 20:36:45.000000000 -0400 +++ wfdb-10.4.24/doc/wag-src/eval0.tex 2009-10-28 12:58:00.000000000 -0400 @@ -124,12 +124,10 @@ Standards EC38 and EC57 require the use of the following ECG databases:\footnote{Sources: ECRI, 5200 Butler Pike, Plymouth Meeting, -PA 19462 USA (AHA DB); MIT-BIH Database Distribution, MIT Room -E25-505A, 77 Massachusetts Avenue, Cambridge, MA 02139 USA (MIT, NST, -and CU databases); CNR Institute of Clinical Physiology, Computer -Laboratory, via Trieste, 41, 56100 Pisa, Italy (ESC DB). Except for -the AHA DB, all are available in whole or in part from PhysioNet -({\tt http://www.\-physio\-net.\-org/}).} + PA 19462 USA (AHA DB); PhysioNet (http://physionet.org/) (MIT, NST, + CU DB; and ESC DB for non-commercial use); Alessandro Taddei, CNR + Institute of Clinical Physiology, G. Pasquinucci Heart Hospital, via + Aurelia Sud, 54100 Massa, Italy (ESC DB for commercial use).} \begin{itemize} \item {\bf AHA DB}: The American Heart Association Database for Evaluation of Ventricular Arrhythmia Detectors (80 records, 35 minutes @@ -605,10 +603,10 @@ NOTE} annotation, with the {\tt aux} field indicating the element of the confusion matrix in which the mismatch is tallied (e.g., ``{\tt Vn}'' represents a beat called a VEB by the reference annotator and a normal -beat by the test annotator). Programs such as {\tt view}, -{\tt wave}, and {\tt wview}\footnote{ -{\tt view} (for MS-DOS), {\tt wave} (for Linux, Solaris, and SunOS) and -{\tt wview} (for MS Windows) are included in the WFDB Software Package.} +beat by the test annotator). Programs such as +{\tt wave}\footnote{ +{\tt wave} (for FreeBSD, Linux, Mac OS X, Solaris, SunOS, and Windows) +are included in the WFDB Software Package.} can be used to search for and display the waveforms associated with the mismatches. To generate an output annotation file, add the {\tt -o} option to the {\tt bxb} command line, as in: diff -Naur --exclude Makefile --exclude info wfdb-10.4.23/doc/wag-src/lwcat.1 wfdb-10.4.24/doc/wag-src/lwcat.1 --- wfdb-10.4.23/doc/wag-src/lwcat.1 2006-03-02 12:27:02.000000000 -0500 +++ wfdb-10.4.24/doc/wag-src/lwcat.1 2009-10-28 10:15:08.000000000 -0400 @@ -1,4 +1,4 @@ -.TH LWCAT 1 "1 May 2003" "plt 2.3" "WFDB Applications Guide" +.TH LWCAT 1 "28 October 2009" "plt 2.5" "WFDB Applications Guide" .SH NAME lwcat \- postprocess output of plt to make PostScript, EPS, PDF or PNG .SH SYNOPSIS @@ -97,6 +97,23 @@ left edge and 3.365 inches (85 mm) from the bottom edge of the page (the aspect ratio is approximately the "golden ratio", (1+sqrt(5))/2 = 1.61803 ...). +.TP +\fB-strip\fR +Plot in an 8x0.8 inch (203x20 mm) window. +.TP +\fB-custom\fR \fIwidth height left-margin bottom-margin font_scale\fR +Plot in a custom window. The \fB-custom\fR option reads up to 5 +arguments that follow it. If one of the 5 arguments immediately +following \fB-custom\fR begins with '\fB-\fR', it and any remaining +arguments are treated as ordinary options, and default values are used +for any missing options. The units of width, height, and margins are +inches, and the font scale is a dimensionless factor with a default +value of 1 that can be used to enlarge or shrink any text in the plot. +The defaults for \fIwidth\fR and \fIleft-margin\fR are 5 and 0 respectively, +and the defaults for \fIheight\fR and \fIbottom-margin\fR are the values +assigned to \fIwidth\fR and \fIleft-margin\fR (whether explicitly or +by default). + .PP Other window options can be easily added; see the source for \fBlwcat\fR for details. diff -Naur --exclude Makefile --exclude info wfdb-10.4.23/doc/wag-src/plt.1 wfdb-10.4.24/doc/wag-src/plt.1 --- wfdb-10.4.23/doc/wag-src/plt.1 2003-05-01 14:45:21.000000000 -0400 +++ wfdb-10.4.24/doc/wag-src/plt.1 2009-10-28 10:21:11.000000000 -0400 @@ -387,7 +387,9 @@ \fBimageplt\fR(1), \fBlwcat\fR(1), \fBpltf\fR(1) .PP The \fIplt Tutorial and Cookbook\fR (a book-length introduction to \fBplt\fR, -included in the \fBplt\fR source package) contains many more examples. +included in the \fBplt\fR source package, and also available at +\fBhttp://www.physionet.org/physiotools/plt/plt/doc/book.pdf\fR) contains many +more examples. .SH AVAILABILITY \fBplt\fR is available as part of PhysioToolkit (see \fBSOURCES\fR below) under the GPL. diff -Naur --exclude Makefile --exclude info wfdb-10.4.23/doc/wag-src/pschart.1 wfdb-10.4.24/doc/wag-src/pschart.1 --- wfdb-10.4.23/doc/wag-src/pschart.1 2009-01-07 15:08:07.000000000 -0500 +++ wfdb-10.4.24/doc/wag-src/pschart.1 2009-10-28 11:38:53.000000000 -0400 @@ -1,4 +1,4 @@ -.TH PSCHART 1 "7 January 2009" "WFDB 10.3.12" "WFDB Applications Guide" +.TH PSCHART 1 "28 October 2009" "WFDB 10.4.24" "WFDB Applications Guide" .SH NAME pschart \- produce annotated `chart recordings' on a PostScript device .SH SYNOPSIS @@ -296,6 +296,15 @@ .PP There are too many options. Invoke \fBpschart\fR with no arguments for a brief summary of options. + +.SH AVAILABILITY +This program is provided in the \fIapp\fR directory of the WFDB Software +Package. Run \fBmake\fR in that directory to compile and install it if it +have not been installed already. +.PP +The PhysioNet ATM (http://physionet.org/cgi-bin/ATM) provides web access to +\fBpschart\fR (select \fBPlot waveforms\fR from the Toolbox). + .SH SEE ALSO \fBpsfd\fR(1), \fBsetwfdb\fR(1), \fBwave\fR(1), \fBxform\fR(1) .SH AUTHOR diff -Naur --exclude Makefile --exclude info wfdb-10.4.23/doc/wag-src/rdann.1 wfdb-10.4.24/doc/wag-src/rdann.1 --- wfdb-10.4.23/doc/wag-src/rdann.1 2008-03-27 10:23:12.000000000 -0400 +++ wfdb-10.4.24/doc/wag-src/rdann.1 2009-10-28 11:41:54.000000000 -0400 @@ -1,4 +1,4 @@ -.TH RDANN 1 "28 November 2004" "WFDB 10.3.14" "WFDB Applications Guide" +.TH RDANN 1 "28 October 2009" "WFDB 10.4.24" "WFDB Applications Guide" .SH NAME rdann \- read a WFDB annotation file .SH SYNOPSIS @@ -95,6 +95,15 @@ that use an older command syntax (still supported by the current version but not described here). Refer to \fIbin.doc\fR in the CD-ROM directory that contains \fBrdann\fR for further information. + +.SH AVAILABILITY +This program is provided in the \fIapp\fR directory of the WFDB Software +Package. Run \fBmake\fR in that directory to compile and install it if it +have not been installed already. +.PP +The PhysioNet ATM (http://physionet.org/cgi-bin/ATM) provides web access to +\fBrdsamp\fR (select \fBShow annotations as text\fR from the Toolbox). + .SH SEE ALSO \fBrdsamp\fR(1), \fBsetwfdb\fR(1), \fBwrann\fR(1) .SH AUTHOR diff -Naur --exclude Makefile --exclude info wfdb-10.4.23/doc/wag-src/rdsamp.1 wfdb-10.4.24/doc/wag-src/rdsamp.1 --- wfdb-10.4.23/doc/wag-src/rdsamp.1 2009-04-30 12:55:09.000000000 -0400 +++ wfdb-10.4.24/doc/wag-src/rdsamp.1 2009-10-28 11:40:39.000000000 -0400 @@ -1,4 +1,4 @@ -.TH RDSAMP 1 "30 April 2009" "WFDB 10.4.20" "WFDB Applications Guide" +.TH RDSAMP 1 "28 October 2009" "WFDB 10.4.24" "WFDB Applications Guide" .SH NAME rdsamp \- read WFDB signal files .SH SYNOPSIS @@ -91,6 +91,15 @@ .PP It may be necessary to set and export the shell variable \fBWFDB\fR (see \fBsetwfdb\fR(1)). + +.SH AVAILABILITY +This program is provided in the \fIapp\fR directory of the WFDB Software +Package. Run \fBmake\fR in that directory to compile and install it if it +have not been installed already. +.PP +The PhysioNet ATM (http://physionet.org/cgi-bin/ATM) provides web access to +\fBrdsamp\fR (select \fBShow samples as text\fR from the Toolbox). + .SH SEE ALSO \fBrdann\fR(1), \fBsetwfdb\fR(1), \fBwrsamp\fR(1) .SH AUTHOR diff -Naur --exclude Makefile --exclude info wfdb-10.4.23/doc/wag-src/wave.1 wfdb-10.4.24/doc/wag-src/wave.1 --- wfdb-10.4.23/doc/wag-src/wave.1 2005-09-02 22:03:59.000000000 -0400 +++ wfdb-10.4.24/doc/wag-src/wave.1 2009-10-28 11:05:03.000000000 -0400 @@ -1,5 +1,5 @@ '\" t -.TH WAVE 1 "2 September 2005" "WFDB 10.3.18" "WFDB Applications Guide" +.TH WAVE 1 "28 October 2009" "WFDB 10.4.24" "WFDB Applications Guide" .SH NAME wave \- waveform analyzer, viewer, and editor .SH SYNOPSIS @@ -10,9 +10,9 @@ records on any display controlled by an X11 server. It includes facilities for interactive annotation editing. The keyboard and mouse are used to control the display interactively. -First-time users should read the \fIWAVE User's Guide\fR. (One way to do this -is by pointing your Web browser to \fBfile:///usr/help/html/wug/wug.htm\fR, -or to \fBhttp://www.physionet.org/physiotools/wug/\fR for the latest version.) +First-time users should read the \fIWAVE User's Guide\fR, available at +\fBhttp://physionet.org/physiotools/wug/\fR (or, while \fBwave\fR is running, +choose \fIUser's Guide\fR from the \fIHelp\fR panel). .PP If you specify more than one \fIrecord\fR, a separate \fBwave\fR process is started for each record. Note that all records to be opened must be listed in @@ -22,7 +22,8 @@ .PP Use the left mouse button to make selections, and the right mouse button to open menus (indicated by triangular glyphs at the right end of some buttons). -See the \fIGuide\fR or the on-line manual for notes on annotation editing. +See the \fIGuide\fR or choose \fIAnnotation Editing\fR from the \fIHelp\fR +panel). .PP \fIOptions\fR are: .TP @@ -690,7 +691,16 @@ running on a multi-head display with Xinerama enabled, the user does not have root privileges, a \fB.Xdefaults\fR file exists, and \fBwave\fR or another XView application has run at least once since the X server was started. - +.PP +A more serious incompatibility (which may be related to the subtle +incompatibility noted above) appeared with the release in 2009 of the X.org +version 1.6.3 X server, which freezes when any application that uses the XView +library (such as \fBwave\fR) 'grabs' the mouse pointer. By default, XView +applications do so in response to a left button click on any XView control. +'Grabs' can be disabled, and this behavior avoided, by using the \fB-Wfsdb\fR +option available in \fBwave\fR and in other XView applications. In \fBwave\fR +version 6.10 and later versions, the default behavior of XView has been +changed to disable 'grabs', and this problem does not occur. .SH SEE ALSO \fBpschart\fR(1), \fBxview\fR(7) .br diff -Naur --exclude Makefile --exclude info wfdb-10.4.23/doc/wag-src/wfdb2mat.1 wfdb-10.4.24/doc/wag-src/wfdb2mat.1 --- wfdb-10.4.23/doc/wag-src/wfdb2mat.1 2009-03-26 02:36:35.000000000 -0400 +++ wfdb-10.4.24/doc/wag-src/wfdb2mat.1 2009-10-28 11:26:38.000000000 -0400 @@ -1,4 +1,4 @@ -.TH WFDB2MAT 1 "26 February 2009" "WFDB 10.4.15" "WFDB Applications Guide" +.TH WFDB2MAT 1 "28 October 2009" "WFDB 10.4.24" "WFDB Applications Guide" .SH NAME wfdb2mat \- convert WFDB-compatible signal file to Matlab .mat file .SH SYNOPSIS @@ -31,6 +31,7 @@ after reading it! .PP This program writes version 4 MAT-file format output files (see +.br http://www.mathworks.com/access/helpdesk/help/pdf_doc/matlab/matfile_format.pdf for details). The samples are written as 16-bit signed integers in little-endian format, or @@ -87,7 +88,15 @@ .PP The output files are \fBmitdb/200m.mat\fR and \fBmitdb/200m.hea\fR. Note that if a subdirectory of the current directory named \fBmitdb\fR did not exist -already, it would be created by \fBwfdb2mat\fR. +already, it would be created by \fBwfdb2mat\fR. In addition, if the standard +output of \fBwfdb2mat\fR has been saved in a file named \fBmitdb/200m.info\fR, +then the converted data can be read and plotted in Matlab or Octave from within +the \fBmitdb\fR directory by running the command: +.br + \fBplotATM('200m.mat', '200m.info') +.br +(Download \fBhttp://physionet.org/physiotools/matlab/plotATM.m\fR and install +it in your Matlab or Octave environment first.) .SH ENVIRONMENT .PP It may be necessary to set and export the shell variable \fBWFDB\fR (see @@ -96,9 +105,16 @@ This program is provided in the \fIconvert\fR directory of the WFDB Software Package. Run \fBmake\fR in that directory to compile and install it if it have not been installed already. +.PP +The PhysioNet ATM (http://physionet.org/cgi-bin/ATM) provides web access to +\fBwfdb2mat\fR (select \fBExport signals as .mat\fR from the Toolbox). + .SH SEE ALSO \fBa2m\fR(1), \fBedf2mit\fR, \fBsnip\fR(1), \fBwav2mit\fR(1), \fBxform\fR(1), \fBwfdb\fR(3), \fBheader\fR(5) +.br +\fBhttp://physionet.org/physiotools/matlab/plotATM.m\fR + .SH AUTHOR George B. Moody (george@mit.edu) .SH SOURCES diff -Naur --exclude Makefile --exclude info wfdb-10.4.23/doc/wag-src/wfdb.3 wfdb-10.4.24/doc/wag-src/wfdb.3 --- wfdb-10.4.23/doc/wag-src/wfdb.3 2003-04-07 15:00:48.000000000 -0400 +++ wfdb-10.4.24/doc/wag-src/wfdb.3 2009-10-28 12:07:59.000000000 -0400 @@ -20,6 +20,8 @@ .br char *ecgstr(int \fIannotation_code\fP) .br +int findsig(char *\fIsignal_name\fP) +.br void flushcal(void) .br int getann(WFDB_Annotator \fIa\fP, WFDB_Annotation *\fIannotation\fP) @@ -28,6 +30,8 @@ .br int getcal(char *\fIdescription\fP, char *\fIunits\fP, WFDB_Calinfo *\fIcal\fP) .br +WFDB_Frequency getafreq(void) +.br WFDB_Frequency getcfreq(void) .br WFDB_Frequency getifreq(void) @@ -80,6 +84,8 @@ .br WFDB_Sample sample(WFDB_Signal \fIs\fP, WFDB_Time \fIt\fP) .br +void setafreq(WFDB_Frequency \fIannotation_clock_frequency\fP) +.br int setanndesc(int \fIannotation_code\fP, char *\fIannotation_description\fP) .br int setannstr(int \fIannotation_code\fP, char *\fIannotation_mnemonic_string\fP) @@ -118,6 +124,8 @@ .br char *timstr(WFDB_Time \fIt\fP) .br +WFDB_Time tnextvec(WFDB_Signal \fIs\fP, WFDB_Time \fIt\fP) +.br int ungetann(WFDB_Annotator \fIa\fP, WFDB_Annotation *\fIannotation\fP) .br char *wfdberror(void) @@ -133,6 +141,8 @@ int wfdbinit(char *\fIrecord\fP, WFDB_Anninfo *\fIaiarray\fP, unsigned int \fInann\fP, WFDB_Siginfo *\fIsiarray\fP, unsigned int \fInsig\fP) .br +int wfdbputprolog(char *\fIprolog\fP, long \fIbytes\fP, WFDB_Signal \fIs\fP) +.br void wfdbquiet(void) .br void wfdbquit(void) diff -Naur --exclude Makefile --exclude info wfdb-10.4.23/doc/wag-src/wfdbdesc.1 wfdb-10.4.24/doc/wag-src/wfdbdesc.1 --- wfdb-10.4.23/doc/wag-src/wfdbdesc.1 2002-10-31 11:00:05.000000000 -0500 +++ wfdb-10.4.24/doc/wag-src/wfdbdesc.1 2009-10-28 11:44:59.000000000 -0400 @@ -1,4 +1,4 @@ -.TH WFDBDESC 1 "30 May 2002" "WFDB 10.2.6" "WFDB Applications Guide" +.TH WFDBDESC 1 "28 October 2009" "WFDB 10.4.24" "WFDB Applications Guide" .SH NAME wfdbdesc \- read signal specifications .SH SYNOPSIS @@ -19,6 +19,15 @@ .TP signal files named in \fIrecord\fR.hea + +.SH AVAILABILITY +This program is provided in the \fIapp\fR directory of the WFDB Software +Package. Run \fBmake\fR in that directory to compile and install it if it +have not been installed already. +.PP +The PhysioNet ATM (http://physionet.org/cgi-bin/ATM) provides web access to +\fBwfdbdesc\fR (select \fBDescribe record\fR from the Toolbox). + .SH SEE ALSO \fBsetwfdb\fR(1) .SH AUTHOR diff -Naur --exclude Makefile --exclude info wfdb-10.4.23/doc/wpg-src/README wfdb-10.4.24/doc/wpg-src/README --- wfdb-10.4.23/doc/wpg-src/README 2009-08-10 10:23:02.000000000 -0400 +++ wfdb-10.4.24/doc/wpg-src/README 2002-10-26 04:57:11.000000000 -0400 @@ -11,7 +11,7 @@ WFDB Programmer's Guide printed copy 'make wpg-book'(requires troff, texi2dvi, dvips, and a printer) Windows help 'make wpg.hlp' (requires makertf and hcrtf) - HTML 'make wpg.html'(requires texi2html* and perl) + HTML 'make wpg.html'(requires texi2html and perl) info 'make wpg.info'(requires makeinfo or GNU emacs) PDF 'make wpg.pdf' (requires texi2dvi) PostScript 'make wpg.ps' (requires texi2dvi and dvips) @@ -19,7 +19,6 @@ All of these, with the exception of printed copies, can be downloaded from PhysioNet (look in http://www.physionet.org/physiotools/manuals.shtml). -* texi2html-1.82 (included in Fedora 11) fails; texi2html-1.78 works. The following files will be found in this directory: diff -Naur --exclude Makefile --exclude info wfdb-10.4.23/doc/wpg-src/wpg0.tex wfdb-10.4.24/doc/wpg-src/wpg0.tex --- wfdb-10.4.23/doc/wpg-src/wpg0.tex 2009-08-10 09:33:09.000000000 -0400 +++ wfdb-10.4.24/doc/wpg-src/wpg0.tex 2009-08-07 11:52:52.000000000 -0400 @@ -510,7 +510,7 @@ WFDB Software Package distribution, for information on any more recent changes that may not be described here. -@unnumberedsubsec Changes in version 10.4.23 (10 August 2009) +@unnumberedsubsec Changes in version 10.4.23 (7 August 2009) Several changes in @file{lib/signal.c} eliminate unintended interactions that occurred in previous versions between the input modes that can be @@ -1010,7 +1010,7 @@ (WFDB library version 10.2.8 was identical to 10.2.7.) -@unnumberedsubsec Changes in version 10.2.7 (8 August 2002) +@unnumberedsubsec Changes in version 10.2.7 (14 October 2002) Added a workaround to @code{wfdb_fclose} (in @file{lib/wfdbio.c}) so that closing @code{stdin} after using @code{freopen} doesn't trigger a core dump. diff -Naur --exclude Makefile --exclude info wfdb-10.4.23/lib/wfdb.h wfdb-10.4.24/lib/wfdb.h --- wfdb-10.4.23/lib/wfdb.h 2009-08-10 09:43:10.000000000 -0400 +++ wfdb-10.4.24/lib/wfdb.h 2009-10-28 12:32:03.000000000 -0400 @@ -33,7 +33,7 @@ /* WFDB library version. */ #define WFDB_MAJOR 10 #define WFDB_MINOR 4 -#define WFDB_RELEASE 23 +#define WFDB_RELEASE 24 #define WFDB_NETFILES 1 /* if 1, library includes code for HTTP, FTP clients */ #define WFDB_NETFILES_LIBCURL 1 diff -Naur --exclude Makefile --exclude info wfdb-10.4.23/Makefile.tpl wfdb-10.4.24/Makefile.tpl --- wfdb-10.4.23/Makefile.tpl 2008-11-19 14:08:43.000000000 -0500 +++ wfdb-10.4.24/Makefile.tpl 2009-10-28 13:19:00.000000000 -0400 @@ -162,5 +162,5 @@ mv $(RPMROOT)/SRPMS/$(PACKAGE)-$(RPMRELEASE).src.rpm .. rm -f $(PACKAGE)-$(RPMRELEASE).spec $(HOME)/.rpmmacros cd; if [ -e ..rpmmacros ]; then mv ..rpmmacros .rpmmacros; fi - echo "Remember to sign the RPMs by" - echo " cd ..; rpm --addsign wfdb*$(VERSION)*rpm" + @echo "Remember to sign the RPMs by" + @echo " cd ..; rpm --addsign wfdb*$(VERSION)*rpm" diff -Naur --exclude Makefile --exclude info wfdb-10.4.23/NEWS wfdb-10.4.24/NEWS --- wfdb-10.4.23/NEWS 2009-08-10 10:49:46.000000000 -0400 +++ wfdb-10.4.24/NEWS 2009-10-28 13:35:40.000000000 -0400 @@ -1,9 +1,19 @@ -10.4.23 (10 August 2009): +10.4.24 (28 October 2009): + A possible string overflow in nst.c has been corrected. Thanks to + Virginia Faro-Maza for finding and reporting this problem. + + Recent versions of the Xorg (X11 Window System) server freeze when + applications that use XView (such as WAVE) 'grab' the mouse pointer. + Thanks to Michael Buro, who supplied a run-time workaround for this + problem that can be used with any XView application to disable pointer + grabs. Pointer grabs are now permanently disabled in WAVE. + +10.4.23 (7 August 2009): Several changes in lib/signal.c eliminate unintended interactions that - occurred in previous versions between the input modes that can be - selected using setgvmode(). The effects of these interactions were - first observed in newly written code; existing WFDB applications were - apparently unaffected. + occurred in previous versions between the input modes that can be + selected using setgvmode(). The effects of these interactions were + first observed in newly written code; existing WFDB applications were + apparently unaffected. On Cygwin/Windows, the WFDB library is now installed in both /usr/bin and /usr/lib, to simplify building user applications that use the WFDB @@ -29,20 +39,6 @@ two applications to create a WFDB-compatible annotation file from the annotations in an EDF+ file without manual intervention. - Some recent X servers (including the Xorg 1.6.1 server included in - Fedora 11 and Ubuntu 9.04) are incompatible with the XView toolkit used - by WAVE. The symptom of incompatibility is that the X server freezes - if any XView control is activated by a mouse click. (If this happens to - you, you may be able to regain control of your X session by killing the - XView client, for example by logging in remotely, or by switching to a - text console.) The cause of the problem appears to be a broken - interaction between the X server and the XView Notifier (event - dispatcher). There are no work-arounds available at present; if you - wish to use WAVE, use an older X server. - - Also note that texi2html-1.82 (included in Fedora 11) fails to format - the WFDB Programmer's Guide as HTML; texi2html-1.78 works, however. - 10.4.22 (28 July 2009): When reading multifrequency records in WFDB_LOWRES mode, invalid sample values occurring in signals that need to be decimated were @@ -114,7 +110,7 @@ WFDB applications xform and wfdb2mat now properly handle variable-layout multisegment input records. -10.4.16 (3 March 2009): +10.4.16: WFDB library function strtim() now rounds rather than truncating when the sampling frequency is not an integer. @@ -124,7 +120,7 @@ Bug fixes in convert/wfdb2mat. -10.4.15 (26 February 2009): +10.4.15: WFDB library function mstimstr() now outputs time to the nearest millisecond, rather than truncating its calculation to the nearest lower number of milliseconds. @@ -136,7 +132,7 @@ a WFDB-compatible signal file into a Matlab-compatible .mat file that remains readable by WFDB applications. -10.4.14 (23 February 2009): +10.4.14: WFDB library function setwfdb() now exports the WFDB library environment variables (WFDB, WFDBCAL, WFDBANNSORT, and WFDBGVMODE) on all modern platforms, so that a process started by a WFDB application @@ -151,7 +147,7 @@ A new WFDB application, wfdbtime, is convenient for use in scripts to convert among absolute and elapsed times and times in sample intervals. -10.4.13 (16 February 2009): +10.4.13: A new WFDB library function, tnextvec(), finds the next valid sample from a chosen signal, occurring at or after a specified time. This function is particularly useful when reading variable-layout @@ -177,7 +173,7 @@ tnextvec() function (see above) to search for valid samples of a signal of interest. -10.4.12 (20 January 2009): +10.4.12: The rule for sorting annotations within a file has been changed to allow a much larger number of simultaneous annotations (i.e., annotations in a given annotation file with identical 'time' fields) @@ -219,10 +215,10 @@ corrected in this release; thanks to Thomas Heldt for reporting it and providing a reproducible example of it. -10.4.11 (19 November 2008): +10.4.11: Build process improvements, especially on Cygwin and MinGW targets. -10.4.10 (31 October 2008): +10.4.10: EDF digital maximum and minimum values are now read properly in 64-bit builds; previous versions had a bug in edfparse (an internal WFDB library function defined in lib/signal.c) that did not appear in @@ -237,7 +233,7 @@ The "-f" option now works properly in ann2rr (previous versions worked only if "-t" was also provided). -10.4.9 (10 October 2008): +10.4.9: The "configure" script is now non-interactive by default. A new "-i" option selects interactive mode. @@ -253,7 +249,7 @@ in wfdb_open (an internal WFDB library function defined in lib/wfdbio.c). -10.4.8 (31 July 2008): +10.4.8: New application convert/ahaecg2mit.c converts files from the AHA DB DVD into WFDB records. (ECRI, distributors of the AHA DB, recently began shipping it on DVDs in a format incompatible with its previous @@ -263,7 +259,7 @@ POSIX rand48() and srand48() to generate dither (the POSIX functions are not universally available). -10.4.7 (15 July 2008): +10.4.7: Yinqi Zhang reported and contributed a fix for a memory leak in make_vsd() (an internal WFDB library function defined in signal.c). @@ -273,7 +269,7 @@ Applications wrsamp and xform can now add dithering to their inputs using a new -d option. -10.4.6 (9 April 2008): +10.4.6: The WFDB functions setafreq() and getafreq() (for setting and getting the time resolution of newly-created output annotation files in ticks per second) were new in version 10.4.5, but were undocumented. They @@ -322,7 +318,7 @@ supplied an example that evoked this problem, which has now been corrected. -10.4.5 (6 February 2008): +10.4.5: Bob Farrell and Tony Ricke chased down and provided fixes for memory leaks in several WFDB library functions, and also provided revisions to permit additional type checking and to avoid type mismatch warnings. @@ -374,16 +370,14 @@ in '.hea', it is assumed to be the record name of an EDF file of the same name. -10.4.4 (12 May 2006): - Added 'collect.sh' script to 'conf', and 'collect' target to +10.4.4: Added 'collect.sh' script to 'conf', and 'collect' target to 'make' template files (Makefile.tpl) to simplify creation of binary tarballs and RPMs. -10.4.3 (10 May 2006): - Updated wfdb.spec (used to generate WFDB RPMs) to account for - applications with compiled-in paths. +10.4.3: Updated wfdb.spec (used to generate WFDB RPMs) to account for + applications with compiled-in paths. -10.4.2 (4 May 2006): +10.4.2: Mathias Gruber reported a line in wfdbio.c that used void pointer arithmetic (permitted as an extension by gcc but not allowed by ANSI/ISO C or most other C compilers). This operation has been @@ -399,7 +393,7 @@ Many minor documentation updates. -10.4.1 (6 April 2006): +10.4.1: A bug caused incorrect output from WFDB library function strtim() when called with the argument "i", following use of setifreq() to change the effective sampling frequency, resulting in incorrect output @@ -411,7 +405,7 @@ partially fixed in this version, but the fix introduced another bug, which was corrected in version 10.4.5.] -10.4.0 (2 March 2006): +10.4.0: Version 10.4.0 and later versions of the WFDB library are intended to be compiled using ANSI/ISO C (and C++) compilers only; previous versions also supported the use of traditional (K&R) C compilers. The @@ -480,7 +474,7 @@ Hardware recommendations for WAVE have been updated in the WAVE User's Guide. -10.3.17 (20 August 2005): +10.3.17: The WFDB library now supports reading variable-layout records (multi-segment records in which the number, arrangement, gains, and baselines of the signals may vary from one segment to the next; @@ -541,7 +535,7 @@ and sets up the Makefiles appropriately (unless the '-m32' option is used to force 32-bit mode). -10.3.16 (13 June 2005): +10.3.16: Benjamin Moody has added an interface between the WFDB library and libcurl as an alternative to the existing libwww interface, and has updated 'configure' and conf/*.def to search for and use libcurl if @@ -569,7 +563,7 @@ MS-DOS utilities and makefiles, have been removed from this version of the WFDB Software Package. -10.3.15 (31 January 2005): +10.3.15: Rules for generating the binary tarball for MS-Windows have been fixed so that the Cygwin DLLs are now included with correct permissions. @@ -578,7 +572,7 @@ step if SELinux is enabled (as under Fedora Core 2 and later); this has been incorporated into conf/linux-slib.def. -10.3.14 (29 December 2004): +10.3.14: Use rdann's new -v option to add column headings to its standard output. @@ -604,7 +598,7 @@ related to compiling the WFDB software package and building the WFDB rpms. -10.3.13 (5 May 2004): +10.3.13: Using an indirect WFDB path (i.e., setting the WFDB environment variable to a value such as '@FILE', where FILE contains the desired path) was broken in WFDB library versions 10.3.9 through @@ -618,7 +612,7 @@ inputs. Thanks to Joe Mietus for providing sample inputs that helped in identifying and resolving these problems. -10.3.12 (9 March 2004): +10.3.12: A beta release of the WFDB_tools package is now available for testing. This package allows Matlab R13 users to use the WFDB library to read and write digitized signals and annotations such as those available @@ -688,7 +682,7 @@ The man page for xform (doc/wag-src/xform.1) now documents the -S option (thanks to Lucy Gibson for pointing out the omission). -10.3.11 (17 October 2003): +10.3.11: Isaac Henry provided a fix for 'configure' to avoid a problem that may occur in a non-standard Cygwin installation. @@ -702,7 +696,7 @@ New signal types and units have been added to the WFDB calibration database (data/wfdbcal). -10.3.10 (3 August 2003): +10.3.10: In version 10.3.9, the functions setannstr, setanndesc, and setecgstr (in lib/annot.c) did not contain necessary checks to avoid invoking strcmp with a NULL argument. These checks have been added in version @@ -714,7 +708,7 @@ WAVE now incorporates a simplified method for synchronizing multiple windows. The WAVE version number has been changed from 6.6 to 6.7. -10.3.9 (16 July 2003): +10.3.9: The WFDB library functions setwfdb, setannstr, setanndesc, and setecgstr now copy their input string arguments, so that it is no longer necessary for WFDB applications to keep these strings @@ -729,7 +723,7 @@ corrected, and putinfo output is now flushed before putinfo returns. Thanks to Jonas Carlson for reporting this problem. -10.3.8 (12 July 2003): +10.3.8: The WFDB library function setbasetime (in lib/signal.c) now properly accepts arguments specifying midnight (e.g., "0:0:0"), which previous versions rejected, and the function setheader (also in lib/signal.c) @@ -772,12 +766,12 @@ version 10.0.1 (!); the programs should work properly again, if anyone still needs to use them. -10.3.7 (6 May 2003): +10.3.7: Fixed a bug in xform, introduced in 10.3.4, that prevented xform from reading the output sampling frequency from the standard input. Thanks to Thomas Heldt for the bug report. -10.3.6 (7 April 2003): +10.3.6: The fix applied in isigclose() in 10.3.5 was incomplete but is now (really!) fixed. Applications that use sample() should call wfdbquit() to be certain that sample's buffer is freed before exiting. @@ -792,26 +786,26 @@ within the WFDB NETFILES code has been improved substantially, but there may be further room for improvement. -10.3.5 (31 March 2003): +10.3.5: Fixed a bug in WFDB library function isigclose() (in lib/signal.c) that had caused sample()'s buffer to be freed inappropriately when switching segments in a multi-segment record. Thanks to Dave Schaffer for the bug report and for a test case that illustrated the bug. -10.3.4 (30 March 2003): +10.3.4: xform now handles input and output sampling frequencies that are not exact multiples of 1 Hz. Added SRCDIR definition in configure and conf/cygwin.def. -10.3.3 (20 March 2003): +10.3.3: Fixed man page installation bug; thanks to Joe Mietus for the bug report. Updated INSTALL (installation notes). -10.3.2 (25 February 2003): +10.3.2: New applications wav2mit and mit2wav create WFDB-format records from files in the widely-used .wav audio format and vice versa. @@ -851,7 +845,7 @@ There are now separate wfdb, wfdb-devel, wfdb-app, wfdb-doc, and wfdb-wave RPMs. -10.3.1 (5 December 2002): +10.3.1: Added a -W option to ann2rr to create 2-column output containing intervals in seconds and annotation mnemonics, and modified the interval calculations to avoid accumulated roundoff error. @@ -870,7 +864,7 @@ for continuous ABP signals, which has been added to the package (see wabp). -10.3.0 (26 November 2002): +10.3.0: The WFDB Software Package has been ported to MacOS/X (Darwin), version 10.2 (the port should also work under 10.1 but this has not been tested and will not be supported). @@ -923,7 +917,7 @@ Numerous updates in the WFDB Applications Guide. -10.2.9 (27 October 2002): +10.2.9: Fixed a bug in example 9 in the WFDB Programmer's Guide (introduced in version 10.2.0). @@ -935,11 +929,11 @@ manuals for the desired page size, and added hyperlinks to the PDF version of the WFDB Programmer's Guide. -10.2.8 (14 October 2002): +10.2.8: Fixed a bug in WAVE that occasionally caused a crash when starting up; also repaired a broken link in WAVE's on-line help. -10.2.7 (8 August 2002): +10.2.7: Added a workaround to wfdb_fclose() (in lib/wfdbio.c) so that closing stdin after using freopen doesn't trigger a core dump. @@ -958,7 +952,7 @@ Numerous updates and corrections in the WFDB Applications Guide. -10.2.6 (24 June 2002): +10.2.6: Added setifreq() and getifreq() to the WFDB library. setifreq allows the caller to resample an input record at any convenient sampling frequency, using getvec() to perform xform's resampling @@ -1006,7 +1000,7 @@ with NETFILES and reporting any errors, but was not counting errors in this test. -10.2.5 (10 March 2002): +10.2.5: New output format options in 'ann2rr' and 'ihr'. FreeBSD support in 'configure', new conf/freebsd* (thanks to @@ -1018,11 +1012,11 @@ Removed unneeded references to wfdb/wfdb.h from waverc/wave-remote.c and waverc/wavescript.c (thanks again to Giuseppe Pagnoni). -10.2.4 (20 December 2001): +10.2.4: Bug fixes in 'pschart' and 'psfd' (vbuf was not properly initialized before its first use). -10.2.3 (14 December 2001): +10.2.3: Portability fixes in 'configure', 'install.sh', 'wave/Makefile.tpl', 'psd/hr*', 'doc/*.sh', 'lib/wfdblib.h', and 'checkpkg/*check'. @@ -1044,7 +1038,7 @@ Added rules for creating WFDB source and binary RPMs to the top-level Makefile.tpl. -10.2.2 (29 November 2001): +10.2.2: WAVE can now be used to view and edit annotations for records that have no signals. @@ -1056,7 +1050,7 @@ some non-outlier data in the first few samples to be rejected incorrectly. This has now been fixed. -10.2.1 (16 November 2001): +10.2.1: Most users will no longer need to set the WFDB path explicitly, as a result of several minor changes in the default path and in the installer for the WFDB Software Package. @@ -1066,7 +1060,7 @@ Order' and 'Multi-Frequency Records', in the WFDB Programmer's Guide, for details). -10.2.0 (15 October 2001): +10.2.0: The 10.2 series differs from all earlier releases in that the WFDB library no longer imposes any fixed limits on the numbers of annotators or signals that can be open simultaneously. There is also no diff -Naur --exclude Makefile --exclude info wfdb-10.4.23/wave/xvwave.c wfdb-10.4.24/wave/xvwave.c --- wfdb-10.4.23/wave/xvwave.c 2006-05-12 11:08:20.000000000 -0400 +++ wfdb-10.4.24/wave/xvwave.c 2009-10-28 00:52:42.000000000 -0400 @@ -1,10 +1,10 @@ /* file: xvwave.c G. Moody 27 April 1990 - Last revised: 12 May 2006 + Last revised: 28 October 2009 XView support functions for WAVE ------------------------------------------------------------------------------- WAVE: Waveform analyzer, viewer, and editor -Copyright (C) 1990-2005 George B. Moody +Copyright (C) 1990-2009 George B. Moody This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software @@ -169,7 +169,9 @@ char *argv[]; { char dfname[256], *resdir, *tmp, *getenv(); + extern int fullscreendebug; + fullscreendebug = 1; /* work around bug in Xorg 1.6+ by disabling grabs */ xv_init(XV_INIT_ARGC_PTR_ARGV, pargc, argv, NULL); display = XOpenDisplay(NULL);