[med-svn] [SCM] aghermann branch, master, updated. 4f7a3b774136ffffbaf9b05d90bd568347bc5461

[Andrei Zavada]

The following commit has been merged in the master branch:
commit 1fbdcc83acd040da4bf60bee23d7f994f5479dd4
Author: Andrei Zavada <johnhommer at gmail.com>
Date:   Thu Oct 4 22:03:58 2012 +0300

    SF: make channel field zeroy double (not float) to ensure it is saved correctly in config validators

diff --git a/src/ui/scoring-facility-channel.cc b/src/ui/scoring-facility-channel.cc
index 1ebda36..3208d59 100644
--- a/src/ui/scoring-facility-channel.cc
+++ b/src/ui/scoring-facility-channel.cc
@@ -71,7 +71,7 @@ SChannel( agh::CRecording& r,
 		confval::SValidator<bool>( string(1, seq) + ".draw_selection_dzcdf",	&draw_selection_dzcdf),
 	}),
 	config_keys_g ({
-		confval::SValidator<double>( string(1, seq) + ".zeroy",			(double*)&zeroy, 	confval::SValidator<double>::SVFRangeIn (-100., 4000.)),
+		confval::SValidator<double>( string(1, seq) + ".zeroy",			&zeroy,			confval::SValidator<double>::SVFRangeIn (-100., 4000.)),
 		confval::SValidator<double>( string(1, seq) + ".selection_start_time",	&selection_start_time),
 		confval::SValidator<double>( string(1, seq) + ".selection_end_time",	&selection_end_time),
 		confval::SValidator<double>( string(1, seq) + ".signal_display_scale",	&signal_display_scale,	confval::SValidator<double>::SVFRangeIn (DBL_MIN, INFINITY)),
diff --git a/src/ui/scoring-facility.hh b/src/ui/scoring-facility.hh
index 509dfd3..c112261 100644
--- a/src/ui/scoring-facility.hh
+++ b/src/ui/scoring-facility.hh
@@ -218,7 +218,7 @@ class SScoringFacility {
 				return _h;
 			}
 
-		float	zeroy;
+		double	zeroy;
 		bool operator<( const SChannel& rv) const;
 
 		double	signal_display_scale;

-- 
Sleep experiment manager