diff --git a/InstallECGkit.m b/InstallECGkit.m index 364f6ca..a774530 100644 --- a/InstallECGkit.m +++ b/InstallECGkit.m @@ -28,13 +28,13 @@ function InstallECGkit(bIgnoreUpdate) % MAC compatibility alert - if( ismac() ) - disp_string_framed('*red', 'MAC is not fully supported at the moment'); - fprintf(1, 'If you think you can help, please contact us through the %s at the project %s.\n\n', ... - 'forum', ... - 'ecg-kit web''s page' ); - return - end +% if( ismac() ) +% disp_string_framed('*red', 'MAC is not fully supported at the moment'); +% fprintf(1, 'If you think you can help, please contact us through the %s at the project %s.\n\n', ... +% 'forum', ... +% 'ecg-kit web''s page' ); +% return +% end backup_string = 'ecg-kit_backup'; diff --git a/common/init_WFDB_library.m b/common/init_WFDB_library.m index 3243ce1..fc18b6b 100644 --- a/common/init_WFDB_library.m +++ b/common/init_WFDB_library.m @@ -24,7 +24,7 @@ WFDB_paths = { ... ['wfdb' filesep 'linux-amd64' filesep ] ... - ['wfdb' filesep 'macosx-x86_64' filesep 'bin' ] ... + ['wfdb' filesep 'macosx-x86_64' filesep ] ... ['wfdb' filesep 'windows-amd64' filesep 'bin' ] ... }; WFDB_UNIX_idx = 1; @@ -38,6 +38,13 @@ path_sep = ';'; bin_path = WFDB_paths{WFDB_WIN_idx}; + elseif( ismac() ) + path_OS_var = 'PATH'; + libpath_OS_var = 'DYLD_LIBRARY_PATH'; + path_sep = ':'; + bin_path = [ WFDB_paths{WFDB_MAC_idx} 'bin']; + lib_path = [ WFDB_paths{WFDB_MAC_idx} 'lib']; + elseif( isunix() ) path_OS_var = 'PATH'; libpath_OS_var = 'LD_LIBRARY_PATH'; @@ -45,11 +52,6 @@ bin_path = [ WFDB_paths{WFDB_UNIX_idx} 'bin']; lib_path = [ WFDB_paths{WFDB_UNIX_idx} 'lib64']; - elseif( ismac() ) - path_OS_var = 'PATH'; - path_sep = ':'; - bin_path = WFDB_paths{WFDB_MAC_idx}; - else warning('Unknown system architecture. WFDB library QRS detectors probably won''t work.') path_OS_var = 'PATH'; diff --git a/common/rdsign212.mexmaci64 b/common/rdsign212.mexmaci64 new file mode 100755 index 0000000..6c7b68b Binary files /dev/null and b/common/rdsign212.mexmaci64 differ diff --git a/common/readannot.mexmaci64 b/common/readannot.mexmaci64 new file mode 100755 index 0000000..02ff0d7 Binary files /dev/null and b/common/readannot.mexmaci64 differ diff --git a/common/wfdb/macosx-x86_64/bin/a2m b/common/wfdb/macosx-x86_64/bin/a2m index 72de1eb..f74af81 100755 Binary files a/common/wfdb/macosx-x86_64/bin/a2m and b/common/wfdb/macosx-x86_64/bin/a2m differ diff --git a/common/wfdb/macosx-x86_64/bin/ad2m b/common/wfdb/macosx-x86_64/bin/ad2m index 424bff4..0a7a0ec 100755 Binary files a/common/wfdb/macosx-x86_64/bin/ad2m and b/common/wfdb/macosx-x86_64/bin/ad2m differ diff --git a/common/wfdb/macosx-x86_64/bin/ahaecg2mit b/common/wfdb/macosx-x86_64/bin/ahaecg2mit index 0748451..259fc03 100755 Binary files a/common/wfdb/macosx-x86_64/bin/ahaecg2mit and b/common/wfdb/macosx-x86_64/bin/ahaecg2mit differ diff --git a/common/wfdb/macosx-x86_64/bin/ann2rr b/common/wfdb/macosx-x86_64/bin/ann2rr index b515df5..51f60d3 100755 Binary files a/common/wfdb/macosx-x86_64/bin/ann2rr and b/common/wfdb/macosx-x86_64/bin/ann2rr differ diff --git a/common/wfdb/macosx-x86_64/bin/annxml b/common/wfdb/macosx-x86_64/bin/annxml index 8a432ab..ef2a4a9 100755 Binary files a/common/wfdb/macosx-x86_64/bin/annxml and b/common/wfdb/macosx-x86_64/bin/annxml differ diff --git a/common/wfdb/macosx-x86_64/bin/bxb b/common/wfdb/macosx-x86_64/bin/bxb index 0a76b50..cd065b4 100755 Binary files a/common/wfdb/macosx-x86_64/bin/bxb and b/common/wfdb/macosx-x86_64/bin/bxb differ diff --git a/common/wfdb/macosx-x86_64/bin/calsig b/common/wfdb/macosx-x86_64/bin/calsig index a0a2110..b6f5735 100755 Binary files a/common/wfdb/macosx-x86_64/bin/calsig and b/common/wfdb/macosx-x86_64/bin/calsig differ diff --git a/common/wfdb/macosx-x86_64/bin/coherence b/common/wfdb/macosx-x86_64/bin/coherence index 30fb711..3914edf 100755 Binary files a/common/wfdb/macosx-x86_64/bin/coherence and b/common/wfdb/macosx-x86_64/bin/coherence differ diff --git a/common/wfdb/macosx-x86_64/bin/cshsetwfdb b/common/wfdb/macosx-x86_64/bin/cshsetwfdb index 75dcbc0..0cc4dbf 100755 --- a/common/wfdb/macosx-x86_64/bin/cshsetwfdb +++ b/common/wfdb/macosx-x86_64/bin/cshsetwfdb @@ -1,3 +1,3 @@ -setenv WFDB ". ${HOME}/database /Users/admin/Documents/workspace/wfdb-app-toolbox/mcode/nativelibs/macosx/build//database /cdrom http://www.physionet.org/physiobank/database" +setenv WFDB ". ${HOME}/database /Users/mariano/wfdb//database /cdrom http://www.physionet.org/physiobank/database" # Change www.physionet.org above to your favorite mirror if you wish setenv WFDBCAL wfdbcal diff --git a/common/wfdb/macosx-x86_64/bin/ecgeval b/common/wfdb/macosx-x86_64/bin/ecgeval index 9c99758..65831c6 100755 Binary files a/common/wfdb/macosx-x86_64/bin/ecgeval and b/common/wfdb/macosx-x86_64/bin/ecgeval differ diff --git a/common/wfdb/macosx-x86_64/bin/edf2mit b/common/wfdb/macosx-x86_64/bin/edf2mit index ad59a5f..c4112b1 100755 Binary files a/common/wfdb/macosx-x86_64/bin/edf2mit and b/common/wfdb/macosx-x86_64/bin/edf2mit differ diff --git a/common/wfdb/macosx-x86_64/bin/epicmp b/common/wfdb/macosx-x86_64/bin/epicmp index da8483a..922be0f 100755 Binary files a/common/wfdb/macosx-x86_64/bin/epicmp and b/common/wfdb/macosx-x86_64/bin/epicmp differ diff --git a/common/wfdb/macosx-x86_64/bin/fft b/common/wfdb/macosx-x86_64/bin/fft index c231e6a..351dc19 100755 Binary files a/common/wfdb/macosx-x86_64/bin/fft and b/common/wfdb/macosx-x86_64/bin/fft differ diff --git a/common/wfdb/macosx-x86_64/bin/fir b/common/wfdb/macosx-x86_64/bin/fir index e4806b8..59d4f9d 100755 Binary files a/common/wfdb/macosx-x86_64/bin/fir and b/common/wfdb/macosx-x86_64/bin/fir differ diff --git a/common/wfdb/macosx-x86_64/bin/gqfuse b/common/wfdb/macosx-x86_64/bin/gqfuse index ec4e022..628044c 100755 Binary files a/common/wfdb/macosx-x86_64/bin/gqfuse and b/common/wfdb/macosx-x86_64/bin/gqfuse differ diff --git a/common/wfdb/macosx-x86_64/bin/gqpost b/common/wfdb/macosx-x86_64/bin/gqpost index 41fa4d2..45eae0c 100755 Binary files a/common/wfdb/macosx-x86_64/bin/gqpost and b/common/wfdb/macosx-x86_64/bin/gqpost differ diff --git a/common/wfdb/macosx-x86_64/bin/gqrs b/common/wfdb/macosx-x86_64/bin/gqrs index e793a6b..5b56344 100755 Binary files a/common/wfdb/macosx-x86_64/bin/gqrs and b/common/wfdb/macosx-x86_64/bin/gqrs differ diff --git a/common/wfdb/macosx-x86_64/bin/heaxml b/common/wfdb/macosx-x86_64/bin/heaxml index f127a69..8806623 100755 Binary files a/common/wfdb/macosx-x86_64/bin/heaxml and b/common/wfdb/macosx-x86_64/bin/heaxml differ diff --git a/common/wfdb/macosx-x86_64/bin/hrfft b/common/wfdb/macosx-x86_64/bin/hrfft index 22733fe..f9b4287 100644 --- a/common/wfdb/macosx-x86_64/bin/hrfft +++ b/common/wfdb/macosx-x86_64/bin/hrfft @@ -53,14 +53,14 @@ do done if [ x$PLOT = x ]; then - if [ -x /Users/admin/Documents/workspace/wfdb-app-toolbox/mcode/nativelibs/macosx/build//bin/plt ]; then - PLOT=/Users/admin/Documents/workspace/wfdb-app-toolbox/mcode/nativelibs/macosx/build//bin/plt + if [ -x /Users/mariano/wfdb//bin/plt ]; then + PLOT=/Users/mariano/wfdb//bin/plt elif [ -x /usr/local/bin/plt ]; then PLOT=/usr/local/bin/plt elif [ -x /usr/bin/plt ]; then PLOT=/usr/bin/plt - elif [ -x /Users/admin/Documents/workspace/wfdb-app-toolbox/mcode/nativelibs/macosx/build//bin/plot2d ]; then - PLOT=/Users/admin/Documents/workspace/wfdb-app-toolbox/mcode/nativelibs/macosx/build//bin/plot2d + elif [ -x /Users/mariano/wfdb//bin/plot2d ]; then + PLOT=/Users/mariano/wfdb//bin/plot2d elif [ -x /usr/local/bin/plot2d ]; then PLOT=/usr/local/bin/plot2d elif [ -x /usr/bin/plot2d ]; then diff --git a/common/wfdb/macosx-x86_64/bin/hrlomb b/common/wfdb/macosx-x86_64/bin/hrlomb index e9722ce..e5ca55f 100644 --- a/common/wfdb/macosx-x86_64/bin/hrlomb +++ b/common/wfdb/macosx-x86_64/bin/hrlomb @@ -52,14 +52,14 @@ done if [ x$PLOT = x ]; then - if [ -x /Users/admin/Documents/workspace/wfdb-app-toolbox/mcode/nativelibs/macosx/build//bin/plt ]; then - PLOT=/Users/admin/Documents/workspace/wfdb-app-toolbox/mcode/nativelibs/macosx/build//bin/plt + if [ -x /Users/mariano/wfdb//bin/plt ]; then + PLOT=/Users/mariano/wfdb//bin/plt elif [ -x /usr/local/bin/plt ]; then PLOT=/usr/local/bin/plt elif [ -x /usr/bin/plt ]; then PLOT=/usr/bin/plt - elif [ -x /Users/admin/Documents/workspace/wfdb-app-toolbox/mcode/nativelibs/macosx/build//bin/plot2d ]; then - PLOT=/Users/admin/Documents/workspace/wfdb-app-toolbox/mcode/nativelibs/macosx/build//bin/plot2d + elif [ -x /Users/mariano/wfdb//bin/plot2d ]; then + PLOT=/Users/mariano/wfdb//bin/plot2d elif [ -x /usr/local/bin/plot2d ]; then PLOT=/usr/local/bin/plot2d elif [ -x /usr/bin/plot2d ]; then diff --git a/common/wfdb/macosx-x86_64/bin/hrmem b/common/wfdb/macosx-x86_64/bin/hrmem index 7a5eeae..bb42e14 100644 --- a/common/wfdb/macosx-x86_64/bin/hrmem +++ b/common/wfdb/macosx-x86_64/bin/hrmem @@ -51,14 +51,14 @@ do done if [ x$PLOT = x ]; then - if [ -x /Users/admin/Documents/workspace/wfdb-app-toolbox/mcode/nativelibs/macosx/build//bin/plt ]; then - PLOT=/Users/admin/Documents/workspace/wfdb-app-toolbox/mcode/nativelibs/macosx/build//bin/plt + if [ -x /Users/mariano/wfdb//bin/plt ]; then + PLOT=/Users/mariano/wfdb//bin/plt elif [ -x /usr/local/bin/plt ]; then PLOT=/usr/local/bin/plt elif [ -x /usr/bin/plt ]; then PLOT=/usr/bin/plt - elif [ -x /Users/admin/Documents/workspace/wfdb-app-toolbox/mcode/nativelibs/macosx/build//bin/plot2d ]; then - PLOT=/Users/admin/Documents/workspace/wfdb-app-toolbox/mcode/nativelibs/macosx/build//bin/plot2d + elif [ -x /Users/mariano/wfdb//bin/plot2d ]; then + PLOT=/Users/mariano/wfdb//bin/plot2d elif [ -x /usr/local/bin/plot2d ]; then PLOT=/usr/local/bin/plot2d elif [ -x /usr/bin/plot2d ]; then diff --git a/common/wfdb/macosx-x86_64/bin/hrplot b/common/wfdb/macosx-x86_64/bin/hrplot index 6bc937a..f67c107 100644 --- a/common/wfdb/macosx-x86_64/bin/hrplot +++ b/common/wfdb/macosx-x86_64/bin/hrplot @@ -40,14 +40,14 @@ do done if [ x$PLOT = x ]; then - if [ -x /Users/admin/Documents/workspace/wfdb-app-toolbox/mcode/nativelibs/macosx/build//bin/plt ]; then - PLOT=/Users/admin/Documents/workspace/wfdb-app-toolbox/mcode/nativelibs/macosx/build//bin/plt + if [ -x /Users/mariano/wfdb//bin/plt ]; then + PLOT=/Users/mariano/wfdb//bin/plt elif [ -x /usr/local/bin/plt ]; then PLOT=/usr/local/bin/plt elif [ -x /usr/bin/plt ]; then PLOT=/usr/bin/plt - elif [ -x /Users/admin/Documents/workspace/wfdb-app-toolbox/mcode/nativelibs/macosx/build//bin/plot2d ]; then - PLOT=/Users/admin/Documents/workspace/wfdb-app-toolbox/mcode/nativelibs/macosx/build//bin/plot2d + elif [ -x /Users/mariano/wfdb//bin/plot2d ]; then + PLOT=/Users/mariano/wfdb//bin/plot2d elif [ -x /usr/local/bin/plot2d ]; then PLOT=/usr/local/bin/plot2d elif [ -x /usr/bin/plot2d ]; then diff --git a/common/wfdb/macosx-x86_64/bin/hrstats b/common/wfdb/macosx-x86_64/bin/hrstats index 5224f9e..35ffdbd 100755 Binary files a/common/wfdb/macosx-x86_64/bin/hrstats and b/common/wfdb/macosx-x86_64/bin/hrstats differ diff --git a/common/wfdb/macosx-x86_64/bin/ihr b/common/wfdb/macosx-x86_64/bin/ihr index 37d102a..2197c56 100755 Binary files a/common/wfdb/macosx-x86_64/bin/ihr and b/common/wfdb/macosx-x86_64/bin/ihr differ diff --git a/common/wfdb/macosx-x86_64/bin/libwfdb.10.5.20.dylib b/common/wfdb/macosx-x86_64/bin/libwfdb.10.5.20.dylib deleted file mode 100755 index 09956b4..0000000 Binary files a/common/wfdb/macosx-x86_64/bin/libwfdb.10.5.20.dylib and /dev/null differ diff --git a/common/wfdb/macosx-x86_64/bin/libwfdb.10.5.24.dylib b/common/wfdb/macosx-x86_64/bin/libwfdb.10.5.24.dylib deleted file mode 100644 index 445621e..0000000 Binary files a/common/wfdb/macosx-x86_64/bin/libwfdb.10.5.24.dylib and /dev/null differ diff --git a/common/wfdb/macosx-x86_64/bin/libwfdb.10.dylib b/common/wfdb/macosx-x86_64/bin/libwfdb.10.dylib deleted file mode 100755 index 445621e..0000000 Binary files a/common/wfdb/macosx-x86_64/bin/libwfdb.10.dylib and /dev/null differ diff --git a/common/wfdb/macosx-x86_64/bin/libwfdb.dylib b/common/wfdb/macosx-x86_64/bin/libwfdb.dylib deleted file mode 100755 index 445621e..0000000 Binary files a/common/wfdb/macosx-x86_64/bin/libwfdb.dylib and /dev/null differ diff --git a/common/wfdb/macosx-x86_64/bin/log10 b/common/wfdb/macosx-x86_64/bin/log10 index e8b3e38..b3c1ad6 100755 Binary files a/common/wfdb/macosx-x86_64/bin/log10 and b/common/wfdb/macosx-x86_64/bin/log10 differ diff --git a/common/wfdb/macosx-x86_64/bin/lomb b/common/wfdb/macosx-x86_64/bin/lomb index 906b3f8..f375f3f 100755 Binary files a/common/wfdb/macosx-x86_64/bin/lomb and b/common/wfdb/macosx-x86_64/bin/lomb differ diff --git a/common/wfdb/macosx-x86_64/bin/m2a b/common/wfdb/macosx-x86_64/bin/m2a index c0194ba..2a95d7b 100755 Binary files a/common/wfdb/macosx-x86_64/bin/m2a and b/common/wfdb/macosx-x86_64/bin/m2a differ diff --git a/common/wfdb/macosx-x86_64/bin/makeid b/common/wfdb/macosx-x86_64/bin/makeid index c5f05ba..2afc08d 100755 Binary files a/common/wfdb/macosx-x86_64/bin/makeid and b/common/wfdb/macosx-x86_64/bin/makeid differ diff --git a/common/wfdb/macosx-x86_64/bin/md2a b/common/wfdb/macosx-x86_64/bin/md2a index bfaf41b..5a7560c 100755 Binary files a/common/wfdb/macosx-x86_64/bin/md2a and b/common/wfdb/macosx-x86_64/bin/md2a differ diff --git a/common/wfdb/macosx-x86_64/bin/memse b/common/wfdb/macosx-x86_64/bin/memse index 38a3c58..1c8f82b 100755 Binary files a/common/wfdb/macosx-x86_64/bin/memse and b/common/wfdb/macosx-x86_64/bin/memse differ diff --git a/common/wfdb/macosx-x86_64/bin/mfilt b/common/wfdb/macosx-x86_64/bin/mfilt index 1fdc15e..9b34f18 100755 Binary files a/common/wfdb/macosx-x86_64/bin/mfilt and b/common/wfdb/macosx-x86_64/bin/mfilt differ diff --git a/common/wfdb/macosx-x86_64/bin/mit2edf b/common/wfdb/macosx-x86_64/bin/mit2edf index aabec35..0acf30d 100755 Binary files a/common/wfdb/macosx-x86_64/bin/mit2edf and b/common/wfdb/macosx-x86_64/bin/mit2edf differ diff --git a/common/wfdb/macosx-x86_64/bin/mit2wav b/common/wfdb/macosx-x86_64/bin/mit2wav index 9e600d1..b3c951a 100755 Binary files a/common/wfdb/macosx-x86_64/bin/mit2wav and b/common/wfdb/macosx-x86_64/bin/mit2wav differ diff --git a/common/wfdb/macosx-x86_64/bin/mrgann b/common/wfdb/macosx-x86_64/bin/mrgann index 3e460e4..5984a07 100755 Binary files a/common/wfdb/macosx-x86_64/bin/mrgann and b/common/wfdb/macosx-x86_64/bin/mrgann differ diff --git a/common/wfdb/macosx-x86_64/bin/mxm b/common/wfdb/macosx-x86_64/bin/mxm index 4b5f6bd..6933f65 100755 Binary files a/common/wfdb/macosx-x86_64/bin/mxm and b/common/wfdb/macosx-x86_64/bin/mxm differ diff --git a/common/wfdb/macosx-x86_64/bin/nguess b/common/wfdb/macosx-x86_64/bin/nguess index 2ace765..7f7673e 100755 Binary files a/common/wfdb/macosx-x86_64/bin/nguess and b/common/wfdb/macosx-x86_64/bin/nguess differ diff --git a/common/wfdb/macosx-x86_64/bin/nst b/common/wfdb/macosx-x86_64/bin/nst index 05cd858..d53ba0c 100755 Binary files a/common/wfdb/macosx-x86_64/bin/nst and b/common/wfdb/macosx-x86_64/bin/nst differ diff --git a/common/wfdb/macosx-x86_64/bin/parsescp b/common/wfdb/macosx-x86_64/bin/parsescp index eea89d5..78f05cc 100644 Binary files a/common/wfdb/macosx-x86_64/bin/parsescp and b/common/wfdb/macosx-x86_64/bin/parsescp differ diff --git a/common/wfdb/macosx-x86_64/bin/plotstm b/common/wfdb/macosx-x86_64/bin/plotstm index 6ebc7f8..8570836 100755 Binary files a/common/wfdb/macosx-x86_64/bin/plotstm and b/common/wfdb/macosx-x86_64/bin/plotstm differ diff --git a/common/wfdb/macosx-x86_64/bin/pnwlogin b/common/wfdb/macosx-x86_64/bin/pnwlogin index 102e191..5d0b017 100755 --- a/common/wfdb/macosx-x86_64/bin/pnwlogin +++ b/common/wfdb/macosx-x86_64/bin/pnwlogin @@ -42,7 +42,7 @@ fi rm -f .pnwhome if [ -z "${WFDB+xxx}" ] then - WFDB=". /Users/admin/Documents/workspace/wfdb-app-toolbox/mcode/nativelibs/macosx/build//database http://physionet.org/physiobank/database" + WFDB=". /Users/mariano/wfdb//database http://physionet.org/physiobank/database" fi WFDB="$WFDB https://physionet.org/works/\ https://physionet.org/users/$PNWUSER/works/" diff --git a/common/wfdb/macosx-x86_64/bin/pscgen b/common/wfdb/macosx-x86_64/bin/pscgen index 1140767..df2c135 100755 Binary files a/common/wfdb/macosx-x86_64/bin/pscgen and b/common/wfdb/macosx-x86_64/bin/pscgen differ diff --git a/common/wfdb/macosx-x86_64/bin/pschart b/common/wfdb/macosx-x86_64/bin/pschart index c839120..b6349d0 100755 Binary files a/common/wfdb/macosx-x86_64/bin/pschart and b/common/wfdb/macosx-x86_64/bin/pschart differ diff --git a/common/wfdb/macosx-x86_64/bin/psfd b/common/wfdb/macosx-x86_64/bin/psfd index 2de42ac..fb8188d 100755 Binary files a/common/wfdb/macosx-x86_64/bin/psfd and b/common/wfdb/macosx-x86_64/bin/psfd differ diff --git a/common/wfdb/macosx-x86_64/bin/rdann b/common/wfdb/macosx-x86_64/bin/rdann index fc7438d..b94d6d7 100755 Binary files a/common/wfdb/macosx-x86_64/bin/rdann and b/common/wfdb/macosx-x86_64/bin/rdann differ diff --git a/common/wfdb/macosx-x86_64/bin/rdedfann b/common/wfdb/macosx-x86_64/bin/rdedfann index 29962a5..0c59802 100755 Binary files a/common/wfdb/macosx-x86_64/bin/rdedfann and b/common/wfdb/macosx-x86_64/bin/rdedfann differ diff --git a/common/wfdb/macosx-x86_64/bin/rdsamp b/common/wfdb/macosx-x86_64/bin/rdsamp index 199c0c4..7904ad6 100755 Binary files a/common/wfdb/macosx-x86_64/bin/rdsamp and b/common/wfdb/macosx-x86_64/bin/rdsamp differ diff --git a/common/wfdb/macosx-x86_64/bin/readid b/common/wfdb/macosx-x86_64/bin/readid index 0f74aab..277f938 100755 Binary files a/common/wfdb/macosx-x86_64/bin/readid and b/common/wfdb/macosx-x86_64/bin/readid differ diff --git a/common/wfdb/macosx-x86_64/bin/revise b/common/wfdb/macosx-x86_64/bin/revise index 0296c33..2ecb777 100755 Binary files a/common/wfdb/macosx-x86_64/bin/revise and b/common/wfdb/macosx-x86_64/bin/revise differ diff --git a/common/wfdb/macosx-x86_64/bin/rr2ann b/common/wfdb/macosx-x86_64/bin/rr2ann index 8f94a09..94ec838 100755 Binary files a/common/wfdb/macosx-x86_64/bin/rr2ann and b/common/wfdb/macosx-x86_64/bin/rr2ann differ diff --git a/common/wfdb/macosx-x86_64/bin/rxr b/common/wfdb/macosx-x86_64/bin/rxr index b3fc7d3..982cc49 100755 Binary files a/common/wfdb/macosx-x86_64/bin/rxr and b/common/wfdb/macosx-x86_64/bin/rxr differ diff --git a/common/wfdb/macosx-x86_64/bin/sampfreq b/common/wfdb/macosx-x86_64/bin/sampfreq index bcde426..2b0d7c8 100755 Binary files a/common/wfdb/macosx-x86_64/bin/sampfreq and b/common/wfdb/macosx-x86_64/bin/sampfreq differ diff --git a/common/wfdb/macosx-x86_64/bin/setwfdb b/common/wfdb/macosx-x86_64/bin/setwfdb index a0db1c3..5c1574d 100755 --- a/common/wfdb/macosx-x86_64/bin/setwfdb +++ b/common/wfdb/macosx-x86_64/bin/setwfdb @@ -1,3 +1,3 @@ -WFDB=". ${HOME}/database /Users/admin/Documents/workspace/wfdb-app-toolbox/mcode/nativelibs/macosx/build//database /cdrom http://www.physionet.org/physiobank/database"; export WFDB +WFDB=". ${HOME}/database /Users/mariano/wfdb//database /cdrom http://www.physionet.org/physiobank/database"; export WFDB : Change www.physionet.org above to your favorite mirror if you wish WFDBCAL=wfdbcal; export WFDBCAL diff --git a/common/wfdb/macosx-x86_64/bin/sigamp b/common/wfdb/macosx-x86_64/bin/sigamp index 523519d..512ceb4 100755 Binary files a/common/wfdb/macosx-x86_64/bin/sigamp and b/common/wfdb/macosx-x86_64/bin/sigamp differ diff --git a/common/wfdb/macosx-x86_64/bin/sigavg b/common/wfdb/macosx-x86_64/bin/sigavg index 6134214..78f1a52 100755 Binary files a/common/wfdb/macosx-x86_64/bin/sigavg and b/common/wfdb/macosx-x86_64/bin/sigavg differ diff --git a/common/wfdb/macosx-x86_64/bin/signame b/common/wfdb/macosx-x86_64/bin/signame index 2fd9371..4d03f6a 100755 Binary files a/common/wfdb/macosx-x86_64/bin/signame and b/common/wfdb/macosx-x86_64/bin/signame differ diff --git a/common/wfdb/macosx-x86_64/bin/signum b/common/wfdb/macosx-x86_64/bin/signum index 03e8c61..184d8f8 100755 Binary files a/common/wfdb/macosx-x86_64/bin/signum and b/common/wfdb/macosx-x86_64/bin/signum differ diff --git a/common/wfdb/macosx-x86_64/bin/skewedit b/common/wfdb/macosx-x86_64/bin/skewedit index a1d1841..5bbeb3a 100755 Binary files a/common/wfdb/macosx-x86_64/bin/skewedit and b/common/wfdb/macosx-x86_64/bin/skewedit differ diff --git a/common/wfdb/macosx-x86_64/bin/snip b/common/wfdb/macosx-x86_64/bin/snip index eb1a558..dc1090b 100755 Binary files a/common/wfdb/macosx-x86_64/bin/snip and b/common/wfdb/macosx-x86_64/bin/snip differ diff --git a/common/wfdb/macosx-x86_64/bin/sortann b/common/wfdb/macosx-x86_64/bin/sortann index f24acd9..cc3e12f 100755 Binary files a/common/wfdb/macosx-x86_64/bin/sortann and b/common/wfdb/macosx-x86_64/bin/sortann differ diff --git a/common/wfdb/macosx-x86_64/bin/sqrs b/common/wfdb/macosx-x86_64/bin/sqrs index b3773ac..63a552c 100755 Binary files a/common/wfdb/macosx-x86_64/bin/sqrs and b/common/wfdb/macosx-x86_64/bin/sqrs differ diff --git a/common/wfdb/macosx-x86_64/bin/sqrs125 b/common/wfdb/macosx-x86_64/bin/sqrs125 index 0a75a96..fb67d36 100755 Binary files a/common/wfdb/macosx-x86_64/bin/sqrs125 and b/common/wfdb/macosx-x86_64/bin/sqrs125 differ diff --git a/common/wfdb/macosx-x86_64/bin/stepdet b/common/wfdb/macosx-x86_64/bin/stepdet index 5329358..8b62531 100644 Binary files a/common/wfdb/macosx-x86_64/bin/stepdet and b/common/wfdb/macosx-x86_64/bin/stepdet differ diff --git a/common/wfdb/macosx-x86_64/bin/sumann b/common/wfdb/macosx-x86_64/bin/sumann index 7e0eb46..03de1fb 100755 Binary files a/common/wfdb/macosx-x86_64/bin/sumann and b/common/wfdb/macosx-x86_64/bin/sumann differ diff --git a/common/wfdb/macosx-x86_64/bin/sumstats b/common/wfdb/macosx-x86_64/bin/sumstats index ffd56d4..6d41eb4 100755 Binary files a/common/wfdb/macosx-x86_64/bin/sumstats and b/common/wfdb/macosx-x86_64/bin/sumstats differ diff --git a/common/wfdb/macosx-x86_64/bin/tach b/common/wfdb/macosx-x86_64/bin/tach index 626a5c9..d99291f 100755 Binary files a/common/wfdb/macosx-x86_64/bin/tach and b/common/wfdb/macosx-x86_64/bin/tach differ diff --git a/common/wfdb/macosx-x86_64/bin/time2sec b/common/wfdb/macosx-x86_64/bin/time2sec index f0f6ea0..0fa5fa6 100755 Binary files a/common/wfdb/macosx-x86_64/bin/time2sec and b/common/wfdb/macosx-x86_64/bin/time2sec differ diff --git a/common/wfdb/macosx-x86_64/bin/wabp b/common/wfdb/macosx-x86_64/bin/wabp index 9e4fd61..293f204 100755 Binary files a/common/wfdb/macosx-x86_64/bin/wabp and b/common/wfdb/macosx-x86_64/bin/wabp differ diff --git a/common/wfdb/macosx-x86_64/bin/wav2mit b/common/wfdb/macosx-x86_64/bin/wav2mit index 2d43d92..fc35325 100755 Binary files a/common/wfdb/macosx-x86_64/bin/wav2mit and b/common/wfdb/macosx-x86_64/bin/wav2mit differ diff --git a/common/wfdb/macosx-x86_64/bin/wfdb-config b/common/wfdb/macosx-x86_64/bin/wfdb-config index 41fb74b..1e80ffb 100755 Binary files a/common/wfdb/macosx-x86_64/bin/wfdb-config and b/common/wfdb/macosx-x86_64/bin/wfdb-config differ diff --git a/common/wfdb/macosx-x86_64/bin/wfdb2mat b/common/wfdb/macosx-x86_64/bin/wfdb2mat index 03456cb..c59088f 100755 Binary files a/common/wfdb/macosx-x86_64/bin/wfdb2mat and b/common/wfdb/macosx-x86_64/bin/wfdb2mat differ diff --git a/common/wfdb/macosx-x86_64/bin/wfdbcat b/common/wfdb/macosx-x86_64/bin/wfdbcat index 9db9566..f923e3b 100755 Binary files a/common/wfdb/macosx-x86_64/bin/wfdbcat and b/common/wfdb/macosx-x86_64/bin/wfdbcat differ diff --git a/common/wfdb/macosx-x86_64/bin/wfdbcollate b/common/wfdb/macosx-x86_64/bin/wfdbcollate index 5cff830..1297361 100755 Binary files a/common/wfdb/macosx-x86_64/bin/wfdbcollate and b/common/wfdb/macosx-x86_64/bin/wfdbcollate differ diff --git a/common/wfdb/macosx-x86_64/bin/wfdbdesc b/common/wfdb/macosx-x86_64/bin/wfdbdesc index 405b8a6..66e32f3 100755 Binary files a/common/wfdb/macosx-x86_64/bin/wfdbdesc and b/common/wfdb/macosx-x86_64/bin/wfdbdesc differ diff --git a/common/wfdb/macosx-x86_64/bin/wfdbmap b/common/wfdb/macosx-x86_64/bin/wfdbmap index eaeb534..5bff4a9 100755 Binary files a/common/wfdb/macosx-x86_64/bin/wfdbmap and b/common/wfdb/macosx-x86_64/bin/wfdbmap differ diff --git a/common/wfdb/macosx-x86_64/bin/wfdbsignals b/common/wfdb/macosx-x86_64/bin/wfdbsignals index 3bea38b..3829cc8 100755 Binary files a/common/wfdb/macosx-x86_64/bin/wfdbsignals and b/common/wfdb/macosx-x86_64/bin/wfdbsignals differ diff --git a/common/wfdb/macosx-x86_64/bin/wfdbtime b/common/wfdb/macosx-x86_64/bin/wfdbtime index 156d5f5..5bd6cb3 100755 Binary files a/common/wfdb/macosx-x86_64/bin/wfdbtime and b/common/wfdb/macosx-x86_64/bin/wfdbtime differ diff --git a/common/wfdb/macosx-x86_64/bin/wfdbwhich b/common/wfdb/macosx-x86_64/bin/wfdbwhich index 2b0da12..855a81c 100755 Binary files a/common/wfdb/macosx-x86_64/bin/wfdbwhich and b/common/wfdb/macosx-x86_64/bin/wfdbwhich differ diff --git a/common/wfdb/macosx-x86_64/bin/wqrs b/common/wfdb/macosx-x86_64/bin/wqrs index fa03bd9..7616763 100755 Binary files a/common/wfdb/macosx-x86_64/bin/wqrs and b/common/wfdb/macosx-x86_64/bin/wqrs differ diff --git a/common/wfdb/macosx-x86_64/bin/wrann b/common/wfdb/macosx-x86_64/bin/wrann index e015cce..8ea67d1 100755 Binary files a/common/wfdb/macosx-x86_64/bin/wrann and b/common/wfdb/macosx-x86_64/bin/wrann differ diff --git a/common/wfdb/macosx-x86_64/bin/wrsamp b/common/wfdb/macosx-x86_64/bin/wrsamp index d2f9fa8..087d2f0 100755 Binary files a/common/wfdb/macosx-x86_64/bin/wrsamp and b/common/wfdb/macosx-x86_64/bin/wrsamp differ diff --git a/common/wfdb/macosx-x86_64/bin/xform b/common/wfdb/macosx-x86_64/bin/xform index 3cd43df..0592027 100755 Binary files a/common/wfdb/macosx-x86_64/bin/xform and b/common/wfdb/macosx-x86_64/bin/xform differ diff --git a/common/wfdb/macosx-x86_64/bin/xmlann b/common/wfdb/macosx-x86_64/bin/xmlann index 9872553..c864177 100755 Binary files a/common/wfdb/macosx-x86_64/bin/xmlann and b/common/wfdb/macosx-x86_64/bin/xmlann differ diff --git a/common/wfdb/macosx-x86_64/bin/xmlhea b/common/wfdb/macosx-x86_64/bin/xmlhea index 9d6e1a3..ca64a1b 100755 Binary files a/common/wfdb/macosx-x86_64/bin/xmlhea and b/common/wfdb/macosx-x86_64/bin/xmlhea differ diff --git a/common/wfdb/macosx-x86_64/bin/libcurl.4.dylib b/common/wfdb/macosx-x86_64/lib/libcurl.4.dylib old mode 100755 new mode 100644 similarity index 100% rename from common/wfdb/macosx-x86_64/bin/libcurl.4.dylib rename to common/wfdb/macosx-x86_64/lib/libcurl.4.dylib diff --git a/common/wfdb/macosx-x86_64/bin/libcurl.dylib b/common/wfdb/macosx-x86_64/lib/libcurl.dylib old mode 100755 new mode 100644 similarity index 100% rename from common/wfdb/macosx-x86_64/bin/libcurl.dylib rename to common/wfdb/macosx-x86_64/lib/libcurl.dylib diff --git a/common/wfdb/macosx-x86_64/bin/libcurl.la b/common/wfdb/macosx-x86_64/lib/libcurl.la similarity index 100% rename from common/wfdb/macosx-x86_64/bin/libcurl.la rename to common/wfdb/macosx-x86_64/lib/libcurl.la diff --git a/common/wfdb/macosx-x86_64/bin/libgfortran.3.dylib b/common/wfdb/macosx-x86_64/lib/libgfortran.3.dylib similarity index 100% rename from common/wfdb/macosx-x86_64/bin/libgfortran.3.dylib rename to common/wfdb/macosx-x86_64/lib/libgfortran.3.dylib diff --git a/common/wfdb/macosx-x86_64/bin/libgfortran.dylib b/common/wfdb/macosx-x86_64/lib/libgfortran.dylib similarity index 100% rename from common/wfdb/macosx-x86_64/bin/libgfortran.dylib rename to common/wfdb/macosx-x86_64/lib/libgfortran.dylib diff --git a/common/wfdb/macosx-x86_64/bin/libquadmath.0.dylib b/common/wfdb/macosx-x86_64/lib/libquadmath.0.dylib similarity index 100% rename from common/wfdb/macosx-x86_64/bin/libquadmath.0.dylib rename to common/wfdb/macosx-x86_64/lib/libquadmath.0.dylib diff --git a/common/wfdb/macosx-x86_64/lib/libwfdb.10.5.24.dylib b/common/wfdb/macosx-x86_64/lib/libwfdb.10.5.24.dylib new file mode 100755 index 0000000..7c1a1ff Binary files /dev/null and b/common/wfdb/macosx-x86_64/lib/libwfdb.10.5.24.dylib differ diff --git a/common/wfdb/macosx-x86_64/lib/libwfdb.10.dylib b/common/wfdb/macosx-x86_64/lib/libwfdb.10.dylib new file mode 120000 index 0000000..f037d21 --- /dev/null +++ b/common/wfdb/macosx-x86_64/lib/libwfdb.10.dylib @@ -0,0 +1 @@ +libwfdb.10.5.24.dylib \ No newline at end of file diff --git a/common/wfdb/macosx-x86_64/lib/libwfdb.dylib b/common/wfdb/macosx-x86_64/lib/libwfdb.dylib new file mode 120000 index 0000000..f037d21 --- /dev/null +++ b/common/wfdb/macosx-x86_64/lib/libwfdb.dylib @@ -0,0 +1 @@ +libwfdb.10.5.24.dylib \ No newline at end of file diff --git a/common/wfdb/macosx-x86_64/lib/ps/12lead.pro b/common/wfdb/macosx-x86_64/lib/ps/12lead.pro new file mode 100644 index 0000000..467e00a --- /dev/null +++ b/common/wfdb/macosx-x86_64/lib/ps/12lead.pro @@ -0,0 +1,186 @@ +% file: 12lead.pro G. Moody 20 May 2000 +% Last revised: 7 October 2000 + +% ----------------------------------------------------------------------------- +% prolog for pschart output of 12-lead ECGs (based on pschart.pro) +% Copyright (C) 2000 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 +% Foundation; either version 2 of the License, or (at your option) any later +% version. + +% This program is distributed in the hope that it will be useful, but WITHOUT +% ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +% FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for +% more details. + +% You should have received a copy of the GNU General Public License along with +% this program; if not, write to the Free Software Foundation, Inc., 59 Temple +% Place - Suite 330, Boston, MA 02111-1307, USA. + +% You may contact the author by e-mail (george@mit.edu) or postal mail +% (MIT Room E25-505A, Cambridge, MA 02139 USA). For updates to this software, +% please visit PhysioNet (http://www.physionet.org/). +% _____________________________________________________________________________ + +% Note: lines beginning with `%' and empty lines in this file are stripped by +% `pschart' before printing. Four lines immediately below begin with spaces +% and are not stripped. + + %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% + % If this message appears in your printout, you may be using a buggy version % + % of Adobe TranScript. Try using pschart with the -u option as a workaround. % + %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% + +save 100 dict begin /pschart exch def + +% printer resolution (dots per inch; reset by newpage, see below) +/dpi 300 def + +% basic line width (may be reset by newpage) +/lw 0 def + +% line width in mm for signals, grid lines, marker bars +/lwmm 0 def + +% TM for text +/tm matrix currentmatrix def + +% TM for graphics +/gm matrix currentmatrix def + +% x mm: convert x (in mm) to Postscript points (assuming default scales) +/mm {72 mul 25.4 div}def + +% n I: use italic font, n points +/I {/Times-Italic findfont exch scalefont setfont}def + +% n R: use roman font, n points +/R {/Times-Roman findfont exch scalefont setfont}def + +% n C: use courier (monospaced) font, n points +/C {/Courier findfont exch scalefont setfont}def + +% x0 y0 x1 y1 xtick ytick grid: print a grid with the lower corner at (x0, y0), +% the upper corner at (x1, y1), and ticks at intervals of xtick and ytick (in +% mm); the units of x0, y0, x1, and y1 are printer coordinates. +/grid { newpath 0 setlinecap + /dy1 exch dpi 25.4 div mul def /dy2 dy1 5 mul def + /dx1 exch dpi 25.4 div mul def /dx2 dx1 5 mul def + /y1 exch def /x1 exch def /y0 exch def /x0 exch def + dpi 100 idiv setlinewidth x0 y0 moveto x1 y0 lineto x1 y1 lineto x0 y1 lineto + closepath stroke lw setlinewidth + y0 dy2 add dy2 y1 {newpath dup x0 exch moveto x1 exch lineto stroke}for + x0 dx2 add dx2 x1 {newpath dup y0 moveto y1 lineto stroke }for + [ lw dx1 lw sub lw dx1 2 mul lw sub lw dx1 lw sub lw dx1 lw sub ] dx1 2 mul + setdash + y0 dy1 add dy1 y1 {newpath dup x0 exch moveto x1 exch lineto stroke}for + [] 0 setdash +}bind def + +% alternate grid +% prints a 1 mv (10 yticks) x 200 ms (5 xticks) "calibration pulse" at +% the beginning of each trace, and also prints marker bars at the times when +% the signals change. +/Grid { newpath 0 setlinecap + /dy1 exch dpi 25.4 div mul def /dy2 dy1 5 mul def + /dx1 exch dpi 25.4 div mul def /dx2 dx1 5 mul def + /y1 exch def /x1 exch def /y0 exch def /x0 exch def + /dx3 dx1 5 mul def /dx4 dx2 12.5 mul def + /dy3 y1 y0 sub 8 div def /dy4 dy1 10 mul def + /x2 x0 dx3 sub def /x3 x2 dx1 sub def /x4 x0 dx4 add def + /y2 y0 dy3 add def /y3 y2 dy4 add def + lw 5 mul setlinewidth + newpath x3 y2 moveto x2 y2 lineto x2 y3 lineto x0 y3 lineto x0 y2 lineto + stroke + /y2 y2 dy3 dup add add def /y3 y2 dy4 add def /y4 y2 dy4 sub def + newpath x3 y2 moveto x2 y2 lineto x2 y3 lineto x0 y3 lineto x0 y2 lineto + x4 y3 moveto x4 y4 lineto /x4 x4 dx4 add def + x4 y3 moveto x4 y4 lineto /x4 x4 dx4 add def + x4 y3 moveto x4 y4 lineto /x4 x0 dx4 add def + stroke + /y2 y2 dy3 dup add add def /y3 y2 dy4 add def /y4 y2 dy4 sub def + newpath x3 y2 moveto x2 y2 lineto x2 y3 lineto x0 y3 lineto x0 y2 lineto + x4 y3 moveto x4 y4 lineto /x4 x4 dx4 add def + x4 y3 moveto x4 y4 lineto /x4 x4 dx4 add def + x4 y3 moveto x4 y4 lineto /x4 x0 dx4 add def + stroke + /y2 y2 dy3 dup add add def /y3 y2 dy4 add def /y4 y2 dy4 sub def + newpath x3 y2 moveto x2 y2 lineto x2 y3 lineto x0 y3 lineto x0 y2 lineto + x4 y3 moveto x4 y4 lineto /x4 x4 dx4 add def + x4 y3 moveto x4 y4 lineto /x4 x4 dx4 add def + x4 y3 moveto x4 y4 lineto + stroke + lw 2 mul setlinewidth +}bind def + +% pn x y prpn: print page number, pn, centered on (x, y) (in mm). +/prpn { mm exch mm exch moveto 10 R /pn exch def /str 10 string def + pn str cvs stringwidth exch -.5 mul exch rmoveto + (- ) stringwidth exch neg exch rmoveto + (- ) show +% `str show' should be sufficient, but LaserWriters print extra spaces at end + pn str cvs show + ( -) show } def + +% str x y prco: print copyright message, str, beginning at (x, y) (in mm). +/prco { mm exch mm exch moveto + 6 R (Copyright ) show + /Symbol findfont 6 scalefont setfont (\323) show + 6 R show } def + +% dpi newpage: start page, resolution dpi dots per inch +/newpage {/dpi exch def tm setmatrix newpath [] 0 setdash + 1 setlinecap /lw lwmm mm def mark } def + +% ss: set scales for plotting +/ss {72 dpi div dup scale /gm matrix currentmatrix def lw setlinewidth} def + +% str t: print str starting at current position (label(str)) +/t {tm setmatrix show gm setmatrix}def + +% str b: print str ending at current position (rlabel(str)) +/b {tm setmatrix dup stringwidth exch neg exch rmoveto currentpoint 3 -1 roll + show moveto gm setmatrix}def + +% x y m: set current position to (x,y) (move(x,y)) +/m {newpath moveto}def + +% x y N: draw line segment from current position to (x,y), set current position +% to (x,y) (cont(x,y)) +/N {rlineto currentpoint stroke moveto}bind def + +% str z: decode str and draw connected line segments (see cont() in pschart.c) +/z {{counttomark 2 ge{79 sub rlineto}{126 exch sub}ifelse}forall + currentpoint stroke moveto}bind def + +% default ordinate for annotation plotting +/ay 0 def + +% y Ay: set ay +/Ay {/ay exch def}def + +% ordinates for marker bars +/ya 0 def +/yb 0 def +/yc 0 def +/yd 0 def + +% ya yb yc yd sb: set ordinates for marker bars +/sb {/yd exch def /yc exch def /yb exch def /ya exch def}def + +% ya yb Sb: set ordinates for short marker bars +/Sb {/yb exch def /ya exch def /yc yb def /yd yb def}def + +% x mb: draw marker bars at x +/mb { dup ya newpath moveto dup yb lineto dup yc moveto yd lineto +stroke}bind def + +% str x a: plot str at (x, ay), with marker bars if defined +/a {ya yb ne {dup mb}if ay m t}bind def + +% x A: plot a bullet (normal QRS annotation) at (x, ay) +/A {ya yb ne {dup mb}if ay m (\267) t}bind def + +/endpschart {cleartomark showpage pschart end restore}def diff --git a/common/wfdb/macosx-x86_64/lib/ps/pschart.pro b/common/wfdb/macosx-x86_64/lib/ps/pschart.pro new file mode 100644 index 0000000..e7d95e3 --- /dev/null +++ b/common/wfdb/macosx-x86_64/lib/ps/pschart.pro @@ -0,0 +1,159 @@ +% file: pschart.pro G. Moody 27 May 1988 +% Last revised: 11 August 2005 + +% ----------------------------------------------------------------------------- +% prolog for pschart output +% Copyright (C) 2000 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 +% Foundation; either version 2 of the License, or (at your option) any later +% version. + +% This program is distributed in the hope that it will be useful, but WITHOUT +% ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +% FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for +% more details. + +% You should have received a copy of the GNU General Public License along with +% this program; if not, write to the Free Software Foundation, Inc., 59 Temple +% Place - Suite 330, Boston, MA 02111-1307, USA. + +% You may contact the author by e-mail (george@mit.edu) or postal mail +% (MIT Room E25-505A, Cambridge, MA 02139 USA). For updates to this software, +% please visit PhysioNet (http://www.physionet.org/). +% _____________________________________________________________________________ + +% Note: lines beginning with `%' and empty lines in this file are stripped by +% `pschart' before printing. Four lines immediately below begin with spaces +% and are not stripped. + + %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% + % If this message appears in your printout, you may be using a buggy version % + % of Adobe TranScript. Try using pschart with the -u option as a workaround. % + %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% + +save 100 dict begin /pschart exch def + +% printer resolution (dots per inch; reset by newpage, see below) +/dpi 300 def + +% x mm: convert x (in mm) to PostScript points (assuming default scales) +/mm {72 mul 25.4 div}def + +% line width in mm for signals, grid lines, marker bars +/lwmm 0.2 def + +% line width in PostScript points (reset by newpage) +/lw lwmm mm def + +% TM for text +/tm matrix currentmatrix def + +% TM for graphics +/gm matrix currentmatrix def + +% n I: use italic font, n points +/I {/Times-Italic findfont exch scalefont setfont}def + +% n R: use roman font, n points +/R {/Times-Roman findfont exch scalefont setfont}def + +% n C: use courier (monospaced) font, n points +/C {/Courier findfont exch scalefont setfont}def + +% x0 y0 x1 y1 xtick ytick grid: print a grid with the lower corner at (x0, y0), +% the upper corner at (x1, y1), and ticks at intervals of xtick and ytick (in +% mm); the units of x0, y0, x1, and y1 are printer coordinates. +/grid { newpath 0 setlinecap + /dy1 exch dpi 25.4 div mul lw sub def /dy2 dy1 lw add 5 mul def + /dx1 exch dpi 25.4 div mul lw sub def /dx2 dx1 lw add 5 mul def + /y1 exch def /x1 exch def /y0 exch def /x0 exch def + dpi 100 idiv setlinewidth x0 y0 moveto x1 y0 lineto x1 y1 lineto x0 y1 lineto + closepath stroke lw setlinewidth [lw dx1] 0 setdash + y0 dy2 add dy2 y1 {newpath dup x0 exch moveto x1 exch lineto stroke}for + [lw dy1] 0 setdash + x0 dx2 add dx2 x1 {newpath dup y0 moveto y1 lineto stroke }for + [] 0 setdash +}bind def + +% alternate grid +/Grid { newpath 0 setlinecap + /dy1 exch dpi 25.4 div mul lw sub def /dy2 dy1 lw add 5 mul def + /dx1 exch dpi 25.4 div mul lw sub def /dx2 dx1 lw add 5 mul def + /y1 exch def /x1 exch def /y0 exch def /x0 exch def + dpi 100 idiv setlinewidth x0 y0 moveto x1 y0 lineto x1 y1 lineto x0 y1 lineto + closepath stroke lw setlinewidth + y0 dy2 add dy2 y1 {newpath dup x0 exch moveto x1 exch lineto stroke}for + x0 dx2 add dx2 x1 {newpath dup y0 moveto y1 lineto stroke }for +}bind def + +% pn x y prpn: print page number, pn, centered on (x, y) (in mm). +/prpn { mm exch mm exch moveto 10 R /pn exch def /str 10 string def + pn str cvs stringwidth exch -.5 mul exch rmoveto + (- ) stringwidth exch neg exch rmoveto + (- ) show +% `str show' should be sufficient, but LaserWriters print extra spaces at end + pn str cvs show + ( -) show } def + +% str x y prco: print copyright message, str, beginning at (x, y) (in mm). +/prco { mm exch mm exch moveto + 6 R (Copyright ) show + /Symbol findfont 6 scalefont setfont (\323) show + 6 R show } def + +% dpi newpage: start page, resolution dpi dots per inch +/newpage {/dpi exch def tm setmatrix newpath [] 0 setdash + 1 setlinecap /lw lwmm mm def mark } def + +% ss: set scales for plotting +/ss {72 dpi div dup scale /gm matrix currentmatrix def lw setlinewidth} def + +% str t: print str starting at current position (label(str)) +/t {tm setmatrix show gm setmatrix}def + +% str b: print str ending at current position (rlabel(str)) +/b {tm setmatrix dup stringwidth exch neg exch rmoveto currentpoint 3 -1 roll + show moveto gm setmatrix}def + +% x y m: set current position to (x,y) (move(x,y)) +/m {newpath moveto}def + +% x y N: draw line segment from current position to (x,y), set current position +% to (x,y) (cont(x,y)) +/N {rlineto currentpoint stroke moveto}bind def + +% str z: decode str and draw connected line segments (see cont() in pschart.c) +/z {{counttomark 2 ge{79 sub rlineto}{126 exch sub}ifelse}forall + currentpoint stroke moveto}bind def + +% default ordinate for annotation plotting +/ay 0 def + +% y Ay: set ay +/Ay {/ay exch def}def + +% ordinates for marker bars +/ya 0 def +/yb 0 def +/yc 0 def +/yd 0 def + +% ya yb yc yd sb: set ordinates for marker bars +/sb {/yd exch def /yc exch def /yb exch def /ya exch def}def + +% ya yb Sb: set ordinates for short marker bars +/Sb {/yb exch def /ya exch def /yc yb def /yd yb def}def + +% x mb: draw marker bars at x +/mb { dup ya newpath moveto dup yb lineto dup yc moveto yd lineto +stroke}bind def + +% str x a: plot str at (x, ay), with marker bars if defined +/a {ya yb ne {dup mb}if ay m t}bind def + +% x A: plot a bullet (normal QRS annotation) at (x, ay) +/A {ya yb ne {dup mb}if ay m (\267) t}bind def + +/endpschart {cleartomark showpage pschart end restore}def diff --git a/common/wfdb/macosx-x86_64/lib/ps/psfd.pro b/common/wfdb/macosx-x86_64/lib/ps/psfd.pro new file mode 100644 index 0000000..0389681 --- /dev/null +++ b/common/wfdb/macosx-x86_64/lib/ps/psfd.pro @@ -0,0 +1,153 @@ +% file: psfd.pro G. Moody 10 August 1988 +% Last revised: 11 August 2005 + +% ----------------------------------------------------------------------------- +% prolog for psfd output +% Copyright (C) 1988-2005 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 +% Foundation; either version 2 of the License, or (at your option) any later +% version. + +% This program is distributed in the hope that it will be useful, but WITHOUT +% ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +% FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for +% more details. + +% You should have received a copy of the GNU General Public License along with +% this program; if not, write to the Free Software Foundation, Inc., 59 Temple +% Place - Suite 330, Boston, MA 02111-1307, USA. + +% You may contact the author by e-mail (george@mit.edu) or postal mail +% (MIT Room E25-505A, Cambridge, MA 02139 USA). For updates to this software, +% please visit PhysioNet (http://www.physionet.org/). +% _____________________________________________________________________________ + +% Note: lines beginning with `%' and empty lines in this file are stripped by +% `psfd' before printing. Four lines immediately below begin with spaces and +% are not stripped. + + %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% + % If this message appears in your printout, you may be using a buggy version % + % of Adobe TranScript. Try using psfd with the -u option as a workaround. % + %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% + +save 100 dict begin /psfd exch def + +% printer resolution (dots per inch; reset by newpage, see below) +/dpi 300 def + +% x mm: convert x (in mm) to PostScript points (assuming default scales) +/mm {72 mul 25.4 div}def + +% line width in mm for signals, grid lines, marker bars +/lwmm 0.2 def + +% line width in PostScript points (reset by newpage) +/lw lwmm mm def + +% TM for text +/tm matrix currentmatrix def + +% TM for graphics +/gm matrix currentmatrix def + +% n I: use italic font, n points +/I {/Times-Italic findfont exch scalefont setfont}def + +% n R: use roman font, n points +/R {/Times-Roman findfont exch scalefont setfont}def + +% n S: use sans-serif font, n points +/S {/Helvetica findfont exch scalefont setfont}def + +% x0 y0 x1 y1 nt grid: print a grid with the lower corner at (x0, y0), +% the upper corner at (x1, y1), and nt+1 ticks at equal intervals between x0 +% and y0; the units of x0, y0, x1, and y1 are printer coordinates. +/grid { /nt exch def /y1 exch def /x1 exch def /y0 exch def /x0 exch def +% calculate tick spacing, dx, in printer units + /dx x1 x0 sub nt div def +% calculate tick lengths, dy1 = 2 mm (major ticks), dy2 = 1 mm (minor ticks) + /dy1 dpi 12.7 div def /dy2 dpi 25.4 div def +% draw axes + x0 y0 moveto x1 y0 lineto x0 y1 moveto x1 y1 lineto stroke +% draw ticks. `cvi' below is needed for NeWSprint but not Apple LaserWriter. + 0 1 nt cvi { dup 5 mod 0 eq {/dy dy1 def} {/dy dy2 def} ifelse + dx mul x0 add /xx exch def newpath + xx y0 moveto xx y0 dy sub lineto + xx y1 moveto xx y1 dy add lineto stroke }for +}bind def + +% pn x y prpn: print page number, pn, centered on (x, y) (in mm). +/prpn { mm exch mm exch moveto 10 R /pn exch def /str 10 string def + pn str cvs stringwidth exch -.5 mul exch rmoveto + (- ) stringwidth exch neg exch rmoveto + (- ) show +% `str show' should be sufficient, but LaserWriters print extra spaces at end + pn str cvs show + ( -) show } def + +% str x y prco: print copyright message, str, beginning at (x, y) (in mm). +/prco { mm exch mm exch moveto + 6 R (Copyright ) show + /Symbol findfont 6 scalefont setfont (\323) show + 6 R show } def + +% dpi newpage: start page, resolution dpi dots per inch +/newpage {/dpi exch def tm setmatrix newpath [] 0 setdash 0 setgray + 1 setlinecap /lw lwmm mm def mark } def + +% ss: set scales for plotting +/ss {72 dpi div dup scale /gm matrix currentmatrix def lw setlinewidth} def + +% str t: print str starting at current position (label(str)) +/t {tm setmatrix show gm setmatrix}def + +% str b: print str ending at current position (rlabel(str)) +/b {tm setmatrix dup stringwidth exch neg exch rmoveto currentpoint 3 -1 roll + show moveto gm setmatrix}def + +% x y m: set current position to (x,y) (move(x,y)) +/m {newpath moveto}def + +% x y N: draw line segment from current position to (x,y), set current position +% to (x,y) (cont(x,y)) +/N {rlineto currentpoint stroke moveto}bind def + +% str z: decode str and draw connected line segments (see cont() in psfd.c) +/z {{33 sub dup 1 and exch 2 idiv 23 sub rlineto}forall + currentpoint stroke moveto}bind def + +% default ordinate for annotation plotting +/ay 0 def + +% y Ay: set ay +/Ay {/ay exch def}def + +% ordinates for marker bars +/ya 0 def +/yb 0 def +/yc 0 def +/yd 0 def +/ye 0 def + +% ya yb yc yd sb: set ordinates for marker bars +/sb {/yd exch def /yc exch def /yb exch def /ya exch def + /ye dpi 50.8 div lw sub def}def + +% ya yb Sb: set ordinates for short marker bars +/Sb {/yb exch def /ya exch def /yc yb def /yd yb def + /ye dpi 50.8 div lw sub def}def + +% x mb: draw marker bars at x +/mb { dup ya newpath moveto dup yb lineto dup yc moveto yd lineto + [lw ye] 0 setdash stroke [] 0 setdash}bind def + +% str x a: plot str at (x, ay), with marker bars if defined +/a {ya yb ne {dup mb}if ay m t}bind def + +% x A: plot a bullet (normal QRS annotation) at (x, ay) +/A {ya yb ne {dup mb}if ay m (\267) t}bind def + +/endpsfd {cleartomark showpage psfd end restore}def diff --git a/common/writeannot.c b/common/writeannot.c index 25578a1..46a1975 100644 --- a/common/writeannot.c +++ b/common/writeannot.c @@ -8,6 +8,7 @@ #include "mex.h" #include +#include #define NCODIGOS 41 #define MAXINT10 0x03FF @@ -77,7 +78,7 @@ const mxArray *prhs[] for (i=0;i2) mexErrMsgTxt("Fields should have less than 3 dimensions"); - if (N=mxGetN(mxGetFieldByNumber(prhs[1],0,i))!=1) + if ((N=mxGetN(mxGetFieldByNumber(prhs[1],0,i)))!=1) if (strcmp(mxGetFieldNameByNumber(prhs[1],i),"aux")!=0) mexErrMsgTxt("Only aux field can have more than one column"); M = mxGetM(mxGetFieldByNumber(prhs[1],0,i)); @@ -159,7 +160,7 @@ const mxArray *prhs[] defaultchanfield = '0'; currchanfield = '0'; defaultsubtyp = '0'; - defaultauxfield = &zero; + defaultauxfield = (unsigned char *) &zero; /**************** Writing of first annotation ************************/ for (i=0;i