diff --git a/requirements.txt b/requirements.txt index cb70c92..518d0f3 100644 --- a/requirements.txt +++ b/requirements.txt @@ -17,8 +17,8 @@ Pillow==7.0.0 \ --hash=sha256:4d9ed9a64095e031435af120d3c910148067087541131e82b3e8db302f4c8946 python-decouple==3.1 \ --hash=sha256:1317df14b43efee4337a4aa02914bf004f010cd56d6c4bd894e6474ec8c4fe2d -pytz==2018.3 \ - --hash=sha256:07edfc3d4d2705a20a6e99d97f0c4b61c800b8232dc1c04d87e8554f130148dd +pytz==2020.1 \ + --hash=sha256:a494d53b6d39c3c6e44c3bec237336e14305e4f29bbf800b599253057fbb79ed django-crontab==0.7.1 \ --hash=sha256:1201810a212460aaaa48eb6a766738740daf42c1a4f6aafecfb1525036929236 \ --hash=sha256:64e9aa766220173aae5e4f027ed83a834886676004083de10501b4868154c49e @@ -54,45 +54,34 @@ urllib3==1.24.3 \ --hash=sha256:a637e5fae88995b256e3409dc4d52c2e2e0ba32c42a6365fee8bbd2238de3cfb # required for wfdb -wfdb==3.1.0 \ - --hash=sha256:0c28d1be15c6202309ac07ceafe83820ec8fe793d91cef978b6388e8b9a85771 -cycler==0.10.0 \ - --hash=sha256:1d8a5ae1ff6c5cf9b93e8811e581232ad8920aeec647c37316ceac982b08cb2d -joblib==0.16.0 \ - --hash=sha256:d348c5d4ae31496b2aa060d6d9b787864dd204f9480baaa52d18850cb43e9f49 -kiwisolver==1.2.0 \ - --hash=sha256:c31bc3c8e903d60a1ea31a754c72559398d91b5929fcb329b1c3a3d3f6e72113 \ - --hash=sha256:603162139684ee56bcd57acc74035fceed7dd8d732f38c0959c8bd157f913fec -matplotlib==3.3.0 \ - --hash=sha256:ebb6168c9330309b1f3360d36c481d8cd621a490cf2a69c9d6625b2a76777c12 \ - --hash=sha256:19cf4db0272da286863a50406f6430101af129f288c421b1a7f33ddfc8d0180f -mne==0.20.7 \ - --hash=sha256:c6aea11d7b3a37f6ad8ca63c177b311a4eb3f057f995fe0417b8535dadfd35a9 -nose==1.3.7 \ - --hash=sha256:9ff7c6cc443f8c51994b34a667bbcf45afd6d945be7477b52e97516fd17c53ac -numpy==1.19.1 \ - --hash=sha256:e45f8e981a0ab47103181773cc0a54e650b2aef8c7b6cd07405d0fa8d869444a \ - --hash=sha256:ef71a1d4fd4858596ae80ad1ec76404ad29701f8ca7cdcebc50300178db14dfc \ - --hash=sha256:b8456987b637232602ceb4d663cb34106f7eb780e247d51a260b84760fd8f491 -pandas==1.1.0 \ - --hash=sha256:0bc440493cf9dc5b36d5d46bbd5508f6547ba68b02a28234cd8e81fdce42744d \ - --hash=sha256:16504f915f1ae424052f1e9b7cd2d01786f098fbb00fa4e0f69d42b22952d798 \ - --hash=sha256:b39508562ad0bb3f384b0db24da7d68a2608b9ddc85b1d931ccaaa92d5e45273 -pyparsing==2.4.7 \ - --hash=sha256:ef9d7589ef3c200abe66653d3f1ab1033c3c419ae9b9bdb1240a85b024efc88b -python-dateutil==2.8.1 \ - --hash=sha256:75bb3f31ea686f1197762692a9ee6a7550b59fc6ca3a1f4b5d7e32fb98e2da2a -scikit-learn==0.23.1 \ - --hash=sha256:0c3464e46ef8bd4f1bfa5c009648c6449412c8f7e9b3fc0c9e3d800139c48827 \ - --hash=sha256:0e7b55f73b35537ecd0d19df29dd39aa9e076dba78f3507b8136c819d84611fd -scipy==1.5.2 \ - --hash=sha256:fc98f3eac993b9bfdd392e675dfe19850cc8c7246a8fd2b42443e506344be7d9 \ - --hash=sha256:eecf40fa87eeda53e8e11d265ff2254729d04000cd40bae648e76ff268885d66 \ - --hash=sha256:066c513d90eb3fd7567a9e150828d39111ebd88d3e924cdfc9f8ce19ab6f90c9 -sklearn==0.0 \ - --hash=sha256:e23001573aa194b834122d2b9562459bf5ae494a2d59ca6b8aa22c85a44c0e31 -threadpoolctl==2.1.0 \ - --hash=sha256:38b74ca20ff3bb42caca8b00055111d74159ee95c4370882bbff2b93d24da725 +wfdb==4.0.0 \ + --hash=sha256:c2130d8af0601df713b295ae10e00172019951734db590cd9b8ba9023cad15b9 +SoundFile==0.11.0 \ + --hash=sha256:12f66fe9dcddedaa6c808bc3e104fc67fcee59dc64214bf7f43605e69836c497 +numpy==1.23.4 \ + --hash=sha256:7ab46e4e7ec63c8a5e6dbf5c1b9e1c92ba23a7ebecc86c336cb7bf3bd2fb10e5 +matplotlib==3.6.1 \ + --hash=sha256:05e86446562063d6186ff6d700118c0dbd5dccc403a6187351ee526c48878f10 +pandas==1.5.0 \ + --hash=sha256:1b82ccc7b093e0a93f8dffd97a542646a3e026817140e2c01266aaef5fdde11b +scipy==1.9.2 \ + --hash=sha256:b6194da32e0ce9200b2eda4eb4edb89c5cb8b83d6deaf7c35f8ad3d5d7627d5c +cffi==1.15.1 \ + --hash=sha256:320dab6e7cb2eacdf0e658569d2575c4dad258c0fcc794f46215e1e39f90f2c3 +cycler==0.11.0 \ + --hash=sha256:3a27e95f763a428a739d2add979fa7494c912a32c17c4c38c4d5f082cad165a3 +fonttools==4.37.4 \ + --hash=sha256:afae1b39555f9c3f0ad1f0f1daf678e5ad157e38c8842ecb567951bf1a9b9fd7 +pyparsing==3.0.9 \ + --hash=sha256:5026bae9a10eeaefb61dab2f09052b9f4307d44aee4eda64b309723d8d206bbc +kiwisolver==1.4.4 \ + --hash=sha256:f4f270de01dd3e129a72efad823da90cc4d6aafb64c410c9033aba70db9f1ff0 +python-dateutil==2.8.2 \ + --hash=sha256:961d03dc3453ebbc59dbdea9e4e11c5651520a876d0f4db161e8674aae935da9 +contourpy==1.0.5 \ + --hash=sha256:3109fa601d2a448cec4643abd3a31f972bf05b7c2f2e83df9d3429878f8c10ae +pycparser==2.21 \ + --hash=sha256:8ee45429555515e1f6b185e78100aea234072576aa43ab53aefcae078162fca9 # required for data visualization django_plotly_dash==1.6.6 \ diff --git a/waveform-django/waveforms/dash_apps/finished_apps/waveform_vis_tools.py b/waveform-django/waveforms/dash_apps/finished_apps/waveform_vis_tools.py index ea1ba95..98d9320 100644 --- a/waveform-django/waveforms/dash_apps/finished_apps/waveform_vis_tools.py +++ b/waveform-django/waveforms/dash_apps/finished_apps/waveform_vis_tools.py @@ -421,9 +421,9 @@ def format_y_vals(self, sig_order, sig_name, n_ekgs, record, index_start, for i,r in enumerate(sig_order): sig_name_index = sig_name.index(sig_name[r]) if i < n_ekgs: - current_y_vals = record[0][:,sig_name_index][index_start:index_stop:self.DOWN_SAMPLE_EKG] + current_y_vals = record.e_p_signal[sig_name_index][index_start:index_stop:self.DOWN_SAMPLE_EKG] else: - current_y_vals = record[0][:,sig_name_index][index_start:index_stop:self.DOWN_SAMPLE] + current_y_vals = record.e_p_signal[sig_name_index][index_start:index_stop:self.DOWN_SAMPLE] current_y_vals = np.nan_to_num(current_y_vals).astype('float64') all_y_vals.append(current_y_vals) @@ -643,10 +643,10 @@ def prepare_graph(self, dropdown_project, dropdown_record, # Determine the signal information record_path = os.path.join(PROJECT_PATH, dropdown_project, dropdown_record, dropdown_event) - record = wfdb.rdsamp(record_path, return_res=16) - fs = record[1]['fs'] - sig_name = record[1]['sig_name'] - units = record[1]['units'] + record = wfdb.rdrecord(record_path, return_res=16, smooth_frames=False) + fs = record.fs + sig_name = record.sig_name + units = record.units # Set the initial display range of y-values based on values in # initial range of x-values