[med-svn] [SCM] aghermann branch, master, updated. 551e213a23b59b71cba6a9c3a282d1b60e21b854

[Andrei Zavada]

The following commit has been merged in the master branch:
commit 91f2c1913f507466424870c09ced48c83ccea439
Author: Andrei Zavada <johnhommer at gmail.com>
Date:   Fri Apr 19 00:38:58 2013 +0300

    ICM

diff --git a/src/ui/sf/montage.cc b/src/ui/sf/montage.cc
index 5f334ea..7410d11 100644
--- a/src/ui/sf/montage.cc
+++ b/src/ui/sf/montage.cc
@@ -448,8 +448,8 @@ draw_page( cairo_t *cr,
 	{
 		auto& Aa = crecording.F().artifacts(name);
 		if ( not Aa.obj.empty() ) {
-			_p._p.CwB[SExpDesignUI::TColour::sf_artifact].set_source_rgba( cr,  // do some gradients perhaps?
-										       .4);
+			_p._p.CwB[SExpDesignUI::TColour::sf_artifact].set_source_rgba(
+				cr, .4); // do some gradients perhaps?
 			for ( auto &A : Aa() ) {
 				if ( agh::alg::overlap(
 					     A.a, A.z,
diff --git a/src/ui/sf/montage_cb.cc b/src/ui/sf/montage_cb.cc
index ef78cdc..683b916 100644
--- a/src/ui/sf/montage_cb.cc
+++ b/src/ui/sf/montage_cb.cc
@@ -1029,14 +1029,15 @@ iSFPageSelectionAnnotate_activate_cb( GtkMenuItem *menuitem, gpointer userdata)
 		if ( strlen( new_ann) == 0 )
 			return;
 
+		using sigfile::SAnnotation;
 		auto type =
 			gtk_toggle_button_get_active( (GtkToggleButton*)SF.eSFAnnotationTypeSpindle)
-			? sigfile::SAnnotation::TType::phasic_event_spindle
+			? SAnnotation::TType::phasic_event_spindle
 			: gtk_toggle_button_get_active( (GtkToggleButton*)SF.eSFAnnotationTypeKComplex)
-			? sigfile::SAnnotation::TType::phasic_event_K_complex
+			? SAnnotation::TType::phasic_event_K_complex
 			: gtk_toggle_button_get_active( (GtkToggleButton*)SF.eSFAnnotationTypeBlink)
-			? sigfile::SAnnotation::TType::eyeblink
-			: sigfile::SAnnotation::TType::plain;
+			? SAnnotation::TType::eyeblink
+			: SAnnotation::TType::plain;
 
 		SF.using_channel->mark_region_as_annotation( new_ann, type);
 

-- 
Sleep experiment manager