[med-svn] [SCM] aghermann branch, master, updated. 06bda7dfaa687aaf0708a024d192024e2cd58421

[Andrei Zavada]

The following commit has been merged in the master branch:
commit d65868a263b7e27b32cf33b5d6936c871e2fed42
Author: Andrei Zavada <johnhommer at gmail.com>
Date:   Sun Jan 20 03:17:04 2013 +0200

    rename some

diff --git a/src/ui/sf/sf-channel.cc b/src/ui/sf/sf-channel.cc
index 9320893..af31fb1 100644
--- a/src/ui/sf/sf-channel.cc
+++ b/src/ui/sf/sf-channel.cc
@@ -51,7 +51,7 @@ SChannel( agh::CRecording& r,
 	draw_swu (false),
 	draw_mc (false),
 	draw_emg (true),
-	draw_bands (true),
+	draw_psd_bands (true),
 	draw_spectrum (true),
 	resample_signal (true),
 	// resample_power (true), // set based on pages-per-pixel
@@ -69,7 +69,7 @@ SChannel( agh::CRecording& r,
 		confval::SValidator<bool>( string(1, seq) + ".draw_emg",		&draw_emg),
 		confval::SValidator<bool>( string(1, seq) + ".draw_psd",		&draw_psd),
 		confval::SValidator<bool>( string(1, seq) + ".draw_swu",		&draw_swu),
-		confval::SValidator<bool>( string(1, seq) + ".draw_bands",		&draw_bands),
+		confval::SValidator<bool>( string(1, seq) + ".draw_psd_bands",		&draw_psd_bands),
 		confval::SValidator<bool>( string(1, seq) + ".draw_spectrum",		&draw_spectrum),
 		confval::SValidator<bool>( string(1, seq) + ".draw_mc",			&draw_mc),
 		confval::SValidator<bool>( string(1, seq) + ".draw_phasic_spindle",	&draw_phasic_spindle),
@@ -310,7 +310,7 @@ update_profile_display_scales()
 {
 	psd.display_scale =
 		agh::alg::calibrate_display_scale(
-			draw_bands ? psd.course_in_bands[psd.focused_band] : psd.course,
+			draw_psd_bands ? psd.course_in_bands[psd.focused_band] : psd.course,
 			psd.course.size(),
 			_p.interchannel_gap/2.);
 
@@ -497,7 +497,7 @@ update_power_check_menu_items()
 {
 	_p.suppress_redraw = true;
 	gtk_check_menu_item_set_active( _p.iSFPageDrawEMGProfile, (gboolean)draw_emg);
-	gtk_check_menu_item_set_active( _p.iSFPowerDrawBands,     (gboolean)draw_bands);
+	gtk_check_menu_item_set_active( _p.iSFPowerDrawBands,     (gboolean)draw_psd_bands);
 	gtk_check_menu_item_set_active( _p.iSFPowerSmooth,        (gboolean)resample_power);
 	gtk_check_menu_item_set_active( _p.iSFPowerAutoscale,     (gboolean)autoscale_profile);
 
diff --git a/src/ui/sf/sf-montage-overlays.cc b/src/ui/sf/sf-montage-overlays.cc
index e03f4c2..a4ccd37 100644
--- a/src/ui/sf/sf-montage-overlays.cc
+++ b/src/ui/sf/sf-montage-overlays.cc
@@ -37,7 +37,7 @@ draw_overlays( cairo_t* cr,
 		cairo_set_font_size( cr, 10);
 		guint i;
 
-		if ( draw_bands ) {
+		if ( draw_psd_bands ) {
 			for ( size_t b = metrics::psd::TBand::delta; b <= psd.uppermost_band; ++b ) {
 				auto& P = psd.course_in_bands[b];
 				_p._p.CwB[SExpDesignUI::band2colour((metrics::psd::TBand)b)].set_source_rgba( cr, .5);
diff --git a/src/ui/sf/sf-montage_cb.cc b/src/ui/sf/sf-montage_cb.cc
index e541533..48a09be 100644
--- a/src/ui/sf/sf-montage_cb.cc
+++ b/src/ui/sf/sf-montage_cb.cc
@@ -117,7 +117,7 @@ daSFMontage_button_press_event_cb( GtkWidget *wid, GdkEventButton *event, gpoint
 			// will eventually call set_cur_vpage(), which will do redraw
 		    break;
 		case 2:
-			Ch->draw_bands = !Ch->draw_bands;
+			Ch->draw_psd_bands = !Ch->draw_psd_bands;
 			gtk_widget_queue_draw( wid);
 		    break;
 		case 3:
@@ -349,7 +349,7 @@ daSFMontage_scroll_event_cb( GtkWidget *wid, GdkEventScroll *event, gpointer use
 		if ( event->state & GDK_SHIFT_MASK && Ch->draw_psd ) {
 			switch ( event->direction ) {
 			case GDK_SCROLL_DOWN:
-				if ( Ch->draw_bands ) {
+				if ( Ch->draw_psd_bands ) {
 					if ( Ch->psd.focused_band > metrics::psd::TBand::delta ) {
 						--Ch->psd.focused_band;
 						if ( Ch->autoscale_profile )
@@ -367,7 +367,7 @@ daSFMontage_scroll_event_cb( GtkWidget *wid, GdkEventScroll *event, gpointer use
 					}
 				break;
 			case GDK_SCROLL_UP:
-				if ( Ch->draw_bands ) {
+				if ( Ch->draw_psd_bands ) {
 					if ( Ch->psd.focused_band < Ch->psd.uppermost_band ) {
 						++Ch->psd.focused_band;
 						if ( Ch->autoscale_profile )
@@ -1017,7 +1017,7 @@ iSFPowerDrawBands_toggled_cb( GtkCheckMenuItem *checkmenuitem, gpointer userdata
 	auto& SF = *(SScoringFacility*)userdata;
 	if ( SF.suppress_redraw )
 		return;
-	SF.using_channel->draw_bands = (bool)gtk_check_menu_item_get_active( checkmenuitem);
+	SF.using_channel->draw_psd_bands = (bool)gtk_check_menu_item_get_active( checkmenuitem);
 	gtk_widget_queue_draw( (GtkWidget*)SF.daSFMontage);
 }
 
diff --git a/src/ui/sf/sf.hh b/src/ui/sf/sf.hh
index 177c8f4..4c68b7d 100644
--- a/src/ui/sf/sf.hh
+++ b/src/ui/sf/sf.hh
@@ -230,7 +230,7 @@ class SScoringFacility
 			draw_swu,
 			draw_mc,
 			draw_emg,
-			draw_bands,
+			draw_psd_bands,
 			autoscale_profile,
 			draw_spectrum,
 			resample_signal,

-- 
Sleep experiment manager