This is an automated email from the git hooks/post-receive script. hmmr-guest pushed a commit to branch WIP in repository aghermann.
commit 15d6529467aa3cc6c510aa3ee1f43f908b4827eb Author: Andrei Zavada <[email protected]> Date: Wed Oct 16 01:22:49 2013 +0300 whitespace & ICM --- upstream/src/aghermann/expdesign/subject.hh | 14 ++++---- upstream/src/aghermann/ui/sf/sf.cc | 52 +++++++++++++-------------- upstream/src/libsigfile/channel.hh | 14 ++++---- upstream/src/libsigfile/source-base.cc | 4 +-- upstream/src/libsigfile/source-base.hh | 18 +++++----- 5 files changed, 52 insertions(+), 50 deletions(-) diff --git a/upstream/src/aghermann/expdesign/subject.hh b/upstream/src/aghermann/expdesign/subject.hh index d2cfa41..aec343e 100644 --- a/upstream/src/aghermann/expdesign/subject.hh +++ b/upstream/src/aghermann/expdesign/subject.hh @@ -66,15 +66,17 @@ struct SEpisode { struct SAnnotation : public sigfile::SAnnotation { - SAnnotation (const sigfile::CSource& _si, int _hi, - const sigfile::SAnnotation& _a) - : sigfile::SAnnotation (_a), - _source (_si), _h (_hi) + SAnnotation (const sigfile::CSource& source_, int h_, + const sigfile::SAnnotation& a_) + : sigfile::SAnnotation (a_), + _source (source_), + _h (h_) {} SAnnotation( const SAnnotation&) = default; - const sigfile::CSource& _source; - int _h; + const sigfile::CSource& + _source; + int _h; bool operator<( const SAnnotation& rv) const diff --git a/upstream/src/aghermann/ui/sf/sf.cc b/upstream/src/aghermann/ui/sf/sf.cc index e8c430d..22d9013 100644 --- a/upstream/src/aghermann/ui/sf/sf.cc +++ b/upstream/src/aghermann/ui/sf/sf.cc @@ -63,34 +63,34 @@ SScoringFacility:: SScoringFacility (agh::CSubject& J, const string& D, const string& E, SExpDesignUI& parent) - : _p (parent), - _csubject (J), - _session (D), - _sepisode (J.measurements.at(D)[E]), - hypnogram_button_down (false), - artifacts_dialog_shown (false), - rk1968_dialog_shown (false), - mode (TMode::scoring), - crosshair_at (10), + : _p (parent), + _csubject (J), + _session (D), + _sepisode (J.measurements.at(D)[E]), + hypnogram_button_down (false), + artifacts_dialog_shown (false), + rk1968_dialog_shown (false), + mode (TMode::scoring), + crosshair_at (10), show_cur_pos_time_relative (false), - draw_crosshair (false), - alt_hypnogram (true), - pagesize_item (figure_display_pagesize_item( parent.pagesize())), - _cur_page (0), - _cur_vpage (0), - skirting_run_per1 (.04), - ica (nullptr), - interchannel_gap (IntersignalSpace), - n_hidden (0), - _patterns_d (nullptr), - _filters_d (nullptr), - _phasediff_d (nullptr), - _artifacts_d (nullptr), _artifacts_simple_d (nullptr), - _rk1968_d (nullptr), - using_channel (nullptr), - da_wd (800), // gets properly set in a configure_event cb - da_ht (NAN) // bad value, to be estimated unless previously saved + draw_crosshair (false), + alt_hypnogram (true), + pagesize_item (figure_display_pagesize_item( parent.pagesize())), + _cur_page (0), + _cur_vpage (0), + skirting_run_per1 (.04), + ica (nullptr), + interchannel_gap (IntersignalSpace), + n_hidden (0), + _patterns_d (nullptr), + _filters_d (nullptr), + _phasediff_d (nullptr), + _artifacts_d (nullptr), + _rk1968_d (nullptr), + using_channel (nullptr), + da_wd (800), // gets properly set in a configure_event cb + da_ht (NAN) // bad value, to be estimated unless previously saved { config ("show_cur_pos_time_relative", &show_cur_pos_time_relative) diff --git a/upstream/src/libsigfile/channel.hh b/upstream/src/libsigfile/channel.hh index 5ab0137..19db946 100644 --- a/upstream/src/libsigfile/channel.hh +++ b/upstream/src/libsigfile/channel.hh @@ -9,8 +9,8 @@ * License: GPL */ -#ifndef _SIGFILE_CHANNEL_H -#define _SIGFILE_CHANNEL_H +#ifndef AGH_SIGFILE_CHANNEL_H_ +#define AGH_SIGFILE_CHANNEL_H_ #include <cstring> #include <tuple> @@ -29,7 +29,7 @@ namespace sigfile { // we want scoped enums with basic arith support, so: namespace EEG { -enum E : int { +enum E { invalid = -1, custom = 0, first, @@ -52,7 +52,7 @@ enum E : int { } namespace EOG { -enum E : int { +enum E { invalid = -1, custom = 0, first, @@ -63,7 +63,7 @@ enum E : int { } namespace EMG { -enum E : int { +enum E { invalid = -1, custom = 0, first, @@ -74,7 +74,7 @@ enum E : int { } namespace ECG { -enum E : int { +enum E { invalid = -1, custom = 0, total @@ -82,7 +82,7 @@ enum E : int { } namespace ERG { -enum E : int { +enum E { invalid = -1, custom = 0, total diff --git a/upstream/src/libsigfile/source-base.cc b/upstream/src/libsigfile/source-base.cc index 10d4b82..5a6958b 100644 --- a/upstream/src/libsigfile/source-base.cc +++ b/upstream/src/libsigfile/source-base.cc @@ -108,7 +108,7 @@ __attribute__ ((pure)) SArtifacts:: region_dirty_fraction( const double ra, const double rz) const { - size_t dirty = 0; + size_t dirty = 0; for ( auto& A : obj ) { if ( ra > A.z ) continue; @@ -141,7 +141,7 @@ dirty_signature() const for ( auto &A : obj ) sig += (to_string((long long int)A.a) + ':' + to_string((long long int)A.z)); sig += to_string(factor) + to_string( (long long int)dampen_window_type); - return hash<std::string>() (sig); + return hash<string>() (sig); } diff --git a/upstream/src/libsigfile/source-base.hh b/upstream/src/libsigfile/source-base.hh index 3de382a..5629cf6 100644 --- a/upstream/src/libsigfile/source-base.hh +++ b/upstream/src/libsigfile/source-base.hh @@ -87,7 +87,7 @@ struct SArtifacts { list<agh::alg::SSpan<double>> obj; - float factor; + float factor; sigproc::TWinType dampen_window_type; @@ -170,22 +170,22 @@ mark_annotation( list<SAnnotation>& annotations, struct SFilterPack { - enum TNotchFilter : int { + enum TNotchFilter { none, at50Hz, at60Hz, TNotchFilter_total }; SFilterPack () - : low_pass_cutoff (0.), - low_pass_order (0), + : low_pass_cutoff (0.), + low_pass_order (0 ), high_pass_cutoff (0.), - high_pass_order (0), + high_pass_order (0 ), notch_filter (TNotchFilter::none) {} SFilterPack (double lpo, unsigned lpc, double hpo, unsigned hpc, TNotchFilter nf) - : low_pass_cutoff (lpc), - low_pass_order (lpo), + : low_pass_cutoff (lpc), + low_pass_order (lpo), high_pass_cutoff (hpc), - high_pass_order (hpo), + high_pass_order (hpo), notch_filter (nf) {} @@ -305,7 +305,7 @@ class CSource virtual const char* session() const = 0; // recording time and duration - time_t _start_time, + time_t _start_time, _end_time; virtual time_t start_time() const { return _start_time; } -- 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
