The following commit has been merged in the master branch:
commit 551e213a23b59b71cba6a9c3a282d1b60e21b854
Author: Andrei Zavada <[email protected]>
Date: Mon Apr 22 02:17:07 2013 +0300
ICM, update ChangeLog
diff --git a/ChangeLog b/ChangeLog
index bc295e3..776304a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,6 +5,10 @@ v.0.9 (2013-xx-xx)
* Only plot finite profile values on msmt overview.
* Proper file size checks in CEDFFile ctor.
* Don't read last sidecar annotation twice.
+ * Support EDF+, including embedded annotations.
+ * Make all timestamps in sidecar files (a) relative to recording
+ start, (b) expressed in seconds, to be consistent with embedded
+ annotations.
v.0.8.2 (2013-04-07)
* Fix GtkScrolledWindow issue in Annotations dialog.
diff --git a/src/libsigfile/edf.cc b/src/libsigfile/edf.cc
index 6585934..f21b164 100644
--- a/src/libsigfile/edf.cc
+++ b/src/libsigfile/edf.cc
@@ -764,9 +764,7 @@ _parse_header()
// calculate gain
for ( auto &H : channels )
- if ( H.label == SSignal::edf_annotations_label )
- ;
- else
+ if ( H.label != SSignal::edf_annotations_label ) {
if ( H.physical_max <= H.physical_min ||
H.digital_max <= H.digital_min ) {
_status |= nogain;
@@ -776,6 +774,7 @@ _parse_header()
H.scale =
(H.physical_max - H.physical_min) /
(H.digital_max - H.digital_min );
+ }
// determine & validate signal types
@@ -988,7 +987,10 @@ details( int which) const
if ( which & with_annotations ) {
recv << "Embedded annotations (" <<
common_annotations.size() << "):\n";
for ( auto &A : common_annotations )
- recv << ' ' << A.span.a << '\t' << A.span.z <<
'\t' << A.label << endl;
+ recv << ' '
+ << A.span.a << '\t'
+ << A.span.z << '\t'
+ << A.label << endl;
}
}
diff --git a/src/ui/mw/mw.cc b/src/ui/mw/mw.cc
index c84100b..2307625 100644
--- a/src/ui/mw/mw.cc
+++ b/src/ui/mw/mw.cc
@@ -520,7 +520,6 @@ calculate_profile_scale()
auto this_episode_avg =
J.cprofile->metric_avg();
if ( isfinite(this_episode_avg) ) {
avg_profile_height += this_episode_avg;
- printf( "this_episode_avg %g\n",
this_episode_avg);
++valid_episodes;
}
}
--
Sleep experiment manager
_______________________________________________
debian-med-commit mailing list
[email protected]
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/debian-med-commit
