The following commit has been merged in the master branch:
commit 372f8fd136deb9e6e7163644590f321ffd6c43de
Author: Andrei Zavada <[email protected]>
Date: Thu Apr 18 02:13:49 2013 +0300
add and use enum item sigfile::SChannel::TType::embedded_annotation
diff --git a/src/libsigfile/channel.hh b/src/libsigfile/channel.hh
index ae5c046..dca6fc8 100644
--- a/src/libsigfile/channel.hh
+++ b/src/libsigfile/channel.hh
@@ -42,6 +42,7 @@ struct SChannel
// static members
enum TType : int {
+ embedded_annotation,
eeg, eog, emg, ecg, erg,
nc, meg, mcg, ep, temp, resp, sao2, light, sound, event, freq,
other
diff --git a/src/libsigfile/edf.cc b/src/libsigfile/edf.cc
index b4302b1..c99e12c 100644
--- a/src/libsigfile/edf.cc
+++ b/src/libsigfile/edf.cc
@@ -780,7 +780,7 @@ _parse_header()
i = 0;
for ( auto &H : channels ) {
if ( H.label == SSignal::edf_annotations_label )
- ;
+ H.signal_type = SChannel::TType::embedded_annotation;
else {
// try parsing as "type channel" first
string parsable (H.label);
diff --git a/src/ui/sf/sf.cc b/src/ui/sf/sf.cc
index 5a0089a..b11893b 100644
--- a/src/ui/sf/sf.cc
+++ b/src/ui/sf/sf.cc
@@ -126,7 +126,7 @@ SScoringFacility (agh::CSubject& J,
if ( type != sigfile::SChannel::TType::eeg &&
type != sigfile::SChannel::TType::eog &&
type != sigfile::SChannel::TType::emg &&
- H.second.label !=
sigfile::CEDFFile::SSignal::edf_annotations_label ) {
+ type !=
sigfile::SChannel::TType::embedded_annotation ) {
snprintf_buf( "Reading and processing channel
%s ...", H.first.c_str());
_p.sb_message( __buf__);
channels.emplace_back( H.second, *this, y,
seq++);
--
Sleep experiment manager
_______________________________________________
debian-med-commit mailing list
[email protected]
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/debian-med-commit
