This is an automated email from the git hooks/post-receive script. hmmr-guest pushed a commit to branch WIP in repository aghermann.
commit 1f30a0d7d028aa127832e0a740ff8b4a60ae2702 Author: Andrei Zavada <[email protected]> Date: Sat Oct 12 01:23:07 2013 +0300 whitespace --- upstream/src/aghermann/ui/sf/channel.cc | 115 ++++++++++++++++--------------- 1 file changed, 58 insertions(+), 57 deletions(-) diff --git a/upstream/src/aghermann/ui/sf/channel.cc b/upstream/src/aghermann/ui/sf/channel.cc index 78c5976..ed9497f 100644 --- a/upstream/src/aghermann/ui/sf/channel.cc +++ b/upstream/src/aghermann/ui/sf/channel.cc @@ -38,46 +38,46 @@ SChannel (agh::CRecording& r, SScoringFacility& parent, size_t y0, int seq) - : crecording (r), - schannel (crecording.F().channel_by_id( crecording.h())), - filters (r.F().filters(h())), - annotations (r.F().annotations(h())), - artifacts (r.F().artifacts(r.h())), - _p (parent), - signal_lowpass ({signal_filtered, samplerate()}), - signal_bandpass ({signal_filtered, samplerate()}), - signal_envelope ({signal_filtered, samplerate()}), - signal_dzcdf ({signal_filtered, samplerate()}), - zeroy (y0), + : crecording (r), + schannel (crecording.F().channel_by_id( crecording.h())), + filters (r.F().filters(h())), + annotations (r.F().annotations(h())), + artifacts (r.F().artifacts(r.h())), + _p (parent), + signal_lowpass ({signal_filtered, samplerate()}), + signal_bandpass ({signal_filtered, samplerate()}), + signal_envelope ({signal_filtered, samplerate()}), + signal_dzcdf ({signal_filtered, samplerate()}), + zeroy (y0), // let them be read or recalculated - signal_display_scale( NAN), - hidden (false), - draw_zeroline (true), - draw_original_signal (false), - draw_filtered_signal (true), - zeromean_original (true), - draw_psd (true), - draw_swu (false), - draw_mc (false), - draw_emg (true), - draw_psd_bands (true), - draw_spectrum (true), - resample_signal (true), - // resample_power (true), // set based on pages-per-pixel - draw_selection_course (false), + signal_display_scale ( NAN), + hidden (false), + draw_zeroline (true), + draw_original_signal (false), + draw_filtered_signal (true), + zeromean_original (true), + draw_psd (true), + draw_swu (false), + draw_mc (false), + draw_emg (true), + draw_psd_bands (true), + draw_spectrum (true), + resample_signal (true), + // resample_power (true), // set based on pages-per-pixel + draw_selection_course (false), draw_selection_envelope (true), - draw_selection_dzcdf (false), - draw_phasic_spindle (true), - draw_phasic_Kcomplex (true), - draw_phasic_eyeblink (true), - draw_emg_steady_tone (true), - apply_reconstituted (false), - marquee_start (0.), - marquee_end (0.), - selection_start_time (0.), - selection_end_time (0.), - selection_start (0), - selection_end (0) + draw_selection_dzcdf (false), + draw_phasic_spindle (true), + draw_phasic_Kcomplex (true), + draw_phasic_eyeblink (true), + draw_emg_steady_tone (true), + apply_reconstituted (false), + marquee_start (0.), + marquee_end (0.), + selection_start_time (0.), + selection_end_time (0.), + selection_start (0), + selection_end (0) { config ( string("h")+to_string(seq) + ".hidden", &hidden) @@ -100,13 +100,13 @@ SChannel (agh::CRecording& r, ( string("h")+to_string(seq) + ".draw_selection_course", &draw_selection_course) ( string("h")+to_string(seq) + ".draw_selection_envelope", &draw_selection_envelope) ( string("h")+to_string(seq) + ".draw_selection_dzcdf", &draw_selection_dzcdf) - ( string("h")+to_string(seq) + ".zeroy", &zeroy, SValidator<double>::SVFRangeIn (-100., 4000.)) - ( string("h")+to_string(seq) + ".selection_start_time", &selection_start_time) - ( string("h")+to_string(seq) + ".selection_end_time", &selection_end_time) - ( string("h")+to_string(seq) + ".signal_display_scale", &signal_display_scale, SValidator<double>::SVFRangeIn (DBL_MIN, INFINITY)) - ( string("h")+to_string(seq) + ".psd_display_scale", &psd.display_scale, SValidator<double>::SVFRangeIn (DBL_MIN, INFINITY)) - ( string("h")+to_string(seq) + ".swu_display_scale", &swu.display_scale, SValidator<double>::SVFRangeIn (DBL_MIN, INFINITY)) - ( string("h")+to_string(seq) + ".mc_display_scale", &mc.display_scale, SValidator<double>::SVFRangeIn (DBL_MIN, INFINITY)); + ( string("h")+to_string(seq) + ".zeroy", &zeroy, SValidator<double>::SVFRangeIn (-100., 4000.)) + ( string("h")+to_string(seq) + ".selection_start_time", &selection_start_time) + ( string("h")+to_string(seq) + ".selection_end_time", &selection_end_time) + ( string("h")+to_string(seq) + ".signal_display_scale", &signal_display_scale, SValidator<double>::SVFRangeIn (DBL_MIN, INFINITY)) + ( string("h")+to_string(seq) + ".psd_display_scale", &psd.display_scale, SValidator<double>::SVFRangeIn (DBL_MIN, INFINITY)) + ( string("h")+to_string(seq) + ".swu_display_scale", &swu.display_scale, SValidator<double>::SVFRangeIn (DBL_MIN, INFINITY)) + ( string("h")+to_string(seq) + ".mc_display_scale", &mc.display_scale, SValidator<double>::SVFRangeIn (DBL_MIN, INFINITY)); get_signal_original(); @@ -495,12 +495,10 @@ mark_region_as_artifact( const bool do_mark) { if ( do_mark ) artifacts.mark_artifact( - selection_start_time, - selection_end_time); + selection_start_time, selection_end_time); else artifacts.clear_artifact( - selection_start_time, - selection_end_time); + selection_start_time, selection_end_time); calculate_dirty_percent(); @@ -611,9 +609,10 @@ update_power_menu_items() gtk_check_menu_item_set_active( _p.iSFPowerSmooth, (gboolean)resample_power); gtk_check_menu_item_set_active( _p.iSFPowerAutoscale, (gboolean)autoscale_profile); - gtk_widget_set_visible( (GtkWidget*)_p.iSFPowerDrawBands, - (type() == sigfile::SChannel::TType::eeg && - draw_psd)); + gtk_widget_set_visible( + (GtkWidget*)_p.iSFPowerDrawBands, + (type() == sigfile::SChannel::TType::eeg && + draw_psd)); _p.suppress_redraw = false; } @@ -633,9 +632,10 @@ void SScoringFacility::SChannel:: put_selection( const size_t a, const size_t e) { - selection_start = a, selection_end = e; + selection_start = a; + selection_end = e; selection_start_time = (double)a / samplerate(); - selection_end_time = (double)e / samplerate(); + selection_end_time = (double)e / samplerate(); _put_selection(); } @@ -643,9 +643,10 @@ void SScoringFacility::SChannel:: put_selection( const double a, const double e) { - selection_start_time = a, selection_end_time = e; - selection_start = a * samplerate(); - selection_end = e * samplerate(); + selection_start_time = a; + selection_end_time = e; + selection_start = a * samplerate(); + selection_end = e * samplerate(); _put_selection(); } -- Alioth's /git/debian-med/git-commit-notice on /srv/git.debian.org/git/debian-med/aghermann.git _______________________________________________ debian-med-commit mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/debian-med-commit
