The following commit has been merged in the master branch:
commit 8517e15ee8a5dd1b0e43044f1280b9c41f5885a1
Author: Andrei Zavada <[email protected]>
Date: Fri Apr 26 00:26:42 2013 +0300
mention embedded annotations in global annotations dialog
diff --git a/src/expdesign/primaries.cc b/src/expdesign/primaries.cc
index c5e478f..695a110 100644
--- a/src/expdesign/primaries.cc
+++ b/src/expdesign/primaries.cc
@@ -448,6 +448,8 @@ get_annotations() const
for ( auto &A : AA )
ret.emplace_back( F(), h, A);
}
+ for ( auto& A : F().annotations() )
+ ret.emplace_back( F(), -1, A);
}
ret.sort();
return ret;
diff --git a/src/expdesign/primaries.hh b/src/expdesign/primaries.hh
index 12861c9..0e18d99 100644
--- a/src/expdesign/primaries.hh
+++ b/src/expdesign/primaries.hh
@@ -154,9 +154,9 @@ class CSubject : public SSubjectId {
}
const char*
- channel()
+ channel() const
{
- return _source.channel_by_id(_h);
+ return (_h == -1) ? "(embedded)" :
_source.channel_by_id(_h);
}
agh::alg::SSpan<float>
page_span( size_t pagesize) const
--
Sleep experiment manager
_______________________________________________
debian-med-commit mailing list
[email protected]
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/debian-med-commit
