[med-svn] [aghermann] 66/85: whitespace and trivial ICM
andrei zavada
hmmr-guest at alioth.debian.org
Thu Sep 26 23:46:34 UTC 2013
This is an automated email from the git hooks/post-receive script.
hmmr-guest pushed a commit to branch master
in repository aghermann.
commit cad484b3e09f987e37a76300b5b410353b621bc5
Author: Andrei Zavada <johnhommer at gmail.com>
Date: Sun Sep 22 01:45:36 2013 +0300
whitespace and trivial ICM
---
upstream/src/aghermann/rk1968/rk1968.cc | 2 +-
upstream/src/aghermann/ui/mw/construct.cc | 137 ++++++++++----------
.../src/aghermann/ui/sf/d/rk1968-profiles_cb.cc | 1 -
3 files changed, 69 insertions(+), 71 deletions(-)
diff --git a/upstream/src/aghermann/rk1968/rk1968.cc b/upstream/src/aghermann/rk1968/rk1968.cc
index 12960cc..99e54ef 100644
--- a/upstream/src/aghermann/rk1968/rk1968.cc
+++ b/upstream/src/aghermann/rk1968/rk1968.cc
@@ -27,13 +27,13 @@ using namespace agh::rk1968;
-using agh::confval::SValidator;
CScoreAssistant::
CScoreAssistant (const string& name_,
TExpDirLevel level_, CExpDesign& ED_, const SExpDirLevelId& level_id_)
: CStorablePPack (common_subdir, name_, level_, ED_, level_id_)
{
+ using agh::confval::SValidator;
config_keys_g.assign({
SValidator<double>("nrem3_delta_theta_ratio", &Pp.nrem3_delta_theta_ratio),
});
diff --git a/upstream/src/aghermann/ui/mw/construct.cc b/upstream/src/aghermann/ui/mw/construct.cc
index 3873227..595d28d 100644
--- a/upstream/src/aghermann/ui/mw/construct.cc
+++ b/upstream/src/aghermann/ui/mw/construct.cc
@@ -337,13 +337,13 @@ SExpDesignUIWidgets ()
AGH_GBGETOBJ (eSWUParamMinUpswingDuration);
// ------- custom score codes
- if ( !(eScoreCode[sigfile::SPage::TScore::none] = (GtkEntry*)gtk_builder_get_object( builder, "eScoreCodeUnscored")) ||
- !(eScoreCode[sigfile::SPage::TScore::nrem1] = (GtkEntry*)gtk_builder_get_object( builder, "eScoreCodeNREM1")) ||
- !(eScoreCode[sigfile::SPage::TScore::nrem2] = (GtkEntry*)gtk_builder_get_object( builder, "eScoreCodeNREM2")) ||
- !(eScoreCode[sigfile::SPage::TScore::nrem3] = (GtkEntry*)gtk_builder_get_object( builder, "eScoreCodeNREM3")) ||
- !(eScoreCode[sigfile::SPage::TScore::nrem4] = (GtkEntry*)gtk_builder_get_object( builder, "eScoreCodeNREM4")) ||
- !(eScoreCode[sigfile::SPage::TScore::rem] = (GtkEntry*)gtk_builder_get_object( builder, "eScoreCodeREM")) ||
- !(eScoreCode[sigfile::SPage::TScore::wake] = (GtkEntry*)gtk_builder_get_object( builder, "eScoreCodeWake")))
+ if ( !(eScoreCode[sigfile::SPage::TScore::none] = (GtkEntry*)gtk_builder_get_object( builder, "eScoreCodeUnscored")) ||
+ !(eScoreCode[sigfile::SPage::TScore::nrem1] = (GtkEntry*)gtk_builder_get_object( builder, "eScoreCodeNREM1")) ||
+ !(eScoreCode[sigfile::SPage::TScore::nrem2] = (GtkEntry*)gtk_builder_get_object( builder, "eScoreCodeNREM2")) ||
+ !(eScoreCode[sigfile::SPage::TScore::nrem3] = (GtkEntry*)gtk_builder_get_object( builder, "eScoreCodeNREM3")) ||
+ !(eScoreCode[sigfile::SPage::TScore::nrem4] = (GtkEntry*)gtk_builder_get_object( builder, "eScoreCodeNREM4")) ||
+ !(eScoreCode[sigfile::SPage::TScore::rem] = (GtkEntry*)gtk_builder_get_object( builder, "eScoreCodeREM")) ||
+ !(eScoreCode[sigfile::SPage::TScore::wake] = (GtkEntry*)gtk_builder_get_object( builder, "eScoreCodeWake")))
throw runtime_error ("Failed to construct widgets");
// --------- Bands
@@ -408,15 +408,15 @@ SExpDesignUIWidgets ()
!(eTunable[TTunable::rc][2] = (GtkSpinButton*)gtk_builder_get_object( builder, "eTunable_rc_max")) ||
!(eTunable[TTunable::rc][3] = (GtkSpinButton*)gtk_builder_get_object( builder, "eTunable_rc_step")) ||
- !(eTunable[TTunable::fcR][0] = (GtkSpinButton*)gtk_builder_get_object( builder, "eTunable_fcR")) ||
- !(eTunable[TTunable::fcR][1] = (GtkSpinButton*)gtk_builder_get_object( builder, "eTunable_fcR_min")) ||
- !(eTunable[TTunable::fcR][2] = (GtkSpinButton*)gtk_builder_get_object( builder, "eTunable_fcR_max")) ||
- !(eTunable[TTunable::fcR][3] = (GtkSpinButton*)gtk_builder_get_object( builder, "eTunable_fcR_step")) ||
+ !(eTunable[TTunable::fcR][0] = (GtkSpinButton*)gtk_builder_get_object( builder, "eTunable_fcR")) ||
+ !(eTunable[TTunable::fcR][1] = (GtkSpinButton*)gtk_builder_get_object( builder, "eTunable_fcR_min")) ||
+ !(eTunable[TTunable::fcR][2] = (GtkSpinButton*)gtk_builder_get_object( builder, "eTunable_fcR_max")) ||
+ !(eTunable[TTunable::fcR][3] = (GtkSpinButton*)gtk_builder_get_object( builder, "eTunable_fcR_step")) ||
- !(eTunable[TTunable::fcW][0] = (GtkSpinButton*)gtk_builder_get_object( builder, "eTunable_fcW")) ||
- !(eTunable[TTunable::fcW][1] = (GtkSpinButton*)gtk_builder_get_object( builder, "eTunable_fcW_min")) ||
- !(eTunable[TTunable::fcW][2] = (GtkSpinButton*)gtk_builder_get_object( builder, "eTunable_fcW_max")) ||
- !(eTunable[TTunable::fcW][3] = (GtkSpinButton*)gtk_builder_get_object( builder, "eTunable_fcW_step")) ||
+ !(eTunable[TTunable::fcW][0] = (GtkSpinButton*)gtk_builder_get_object( builder, "eTunable_fcW")) ||
+ !(eTunable[TTunable::fcW][1] = (GtkSpinButton*)gtk_builder_get_object( builder, "eTunable_fcW_min")) ||
+ !(eTunable[TTunable::fcW][2] = (GtkSpinButton*)gtk_builder_get_object( builder, "eTunable_fcW_max")) ||
+ !(eTunable[TTunable::fcW][3] = (GtkSpinButton*)gtk_builder_get_object( builder, "eTunable_fcW_step")) ||
!(eTunable[TTunable::S0][0] = (GtkSpinButton*)gtk_builder_get_object( builder, "eTunable_S0")) ||
!(eTunable[TTunable::S0][1] = (GtkSpinButton*)gtk_builder_get_object( builder, "eTunable_S0_min")) ||
@@ -442,7 +442,7 @@ SExpDesignUIWidgets ()
!(eTunable[TTunable::gc][1] = (GtkSpinButton*)gtk_builder_get_object( builder, "eTunable_gc_min")) ||
!(eTunable[TTunable::gc][2] = (GtkSpinButton*)gtk_builder_get_object( builder, "eTunable_gc_max")) ||
!(eTunable[TTunable::gc][3] = (GtkSpinButton*)gtk_builder_get_object( builder, "eTunable_gc_step")) )
- throw runtime_error ("Failed to construct widgets");
+ throw runtime_error ("Failed to construct tunable widgets");
for ( size_t t = 0; t < (size_t)TTunable::_basic_tunables; ++t )
for ( auto d = 0; d < 4; ++d )
@@ -454,50 +454,49 @@ SExpDesignUIWidgets ()
G_CONNECT_1 (bSimParamRevertTunables, clicked);
// ------ colours
- if ( !(CwB[TColour::mw_night ].btn = (GtkColorButton*)gtk_builder_get_object( builder, "bColourMWNight")) ||
- !(CwB[TColour::mw_day ].btn = (GtkColorButton*)gtk_builder_get_object( builder, "bColourMWDay")) ||
+ if ( !(CwB[TColour::mw_night ].btn = (GtkColorButton*)gtk_builder_get_object( builder, "bColourMWNight")) ||
+ !(CwB[TColour::mw_day ].btn = (GtkColorButton*)gtk_builder_get_object( builder, "bColourMWDay")) ||
!(CwB[TColour::mw_profile ].btn = (GtkColorButton*)gtk_builder_get_object( builder, "bColourMWProfile")) ||
- !(CwB[TColour::mw_ticks ].btn = (GtkColorButton*)gtk_builder_get_object( builder, "bColourMWTicks")) ||
- !(CwB[TColour::mw_labels ].btn = (GtkColorButton*)gtk_builder_get_object( builder, "bColourMWLabels")) ||
-
- !(CwB[TColour::sf_profile_psd ].btn = (GtkColorButton*)gtk_builder_get_object( builder, "bColourSFProfilePSD")) ||
- !(CwB[TColour::sf_profile_mc ].btn = (GtkColorButton*)gtk_builder_get_object( builder, "bColourSFProfileMC")) ||
- !(CwB[TColour::sf_profile_swu ].btn = (GtkColorButton*)gtk_builder_get_object( builder, "bColourSFProfileSWU")) ||
- !(CwB[TColour::sf_phasic_spindle ].btn = (GtkColorButton*)gtk_builder_get_object( builder, "bColourSFPhasicSpindle")) ||
- !(CwB[TColour::sf_phasic_Kcomplex].btn = (GtkColorButton*)gtk_builder_get_object( builder, "bColourSFPhasicKComplex")) ||
- !(CwB[TColour::sf_phasic_eyeblink].btn = (GtkColorButton*)gtk_builder_get_object( builder, "bColourSFPhasicEyeBlink")) ||
- !(CwB[TColour::sf_emg ].btn = (GtkColorButton*)gtk_builder_get_object( builder, "bColourSFEMG")) ||
- !(CwB[TColour::sf_hypnogram ].btn = (GtkColorButton*)gtk_builder_get_object( builder, "bColourSFHypnogram")) ||
- !(CwB[TColour::sf_artifact ].btn = (GtkColorButton*)gtk_builder_get_object( builder, "bColourSFArtifacts")) ||
- !(CwB[TColour::sf_annotations ].btn = (GtkColorButton*)gtk_builder_get_object( builder, "bColourSFAnnotations")) ||
- !(CwB[TColour::sf_embedded_annotations]
- .btn = (GtkColorButton*)gtk_builder_get_object( builder, "bColourSFEmbeddedAnnotations")) ||
- !(CwB[TColour::sf_selection ].btn = (GtkColorButton*)gtk_builder_get_object( builder, "bColourSFSelection")) ||
- !(CwB[TColour::sf_ticks ].btn = (GtkColorButton*)gtk_builder_get_object( builder, "bColourSFTicks")) ||
- !(CwB[TColour::sf_labels ].btn = (GtkColorButton*)gtk_builder_get_object( builder, "bColourSFLabels")) ||
- !(CwB[TColour::sf_cursor ].btn = (GtkColorButton*)gtk_builder_get_object( builder, "bColourSFCursor")) ||
-
- !(CwB[TColour::mf_swa ].btn = (GtkColorButton*)gtk_builder_get_object( builder, "bColourMFSWA")) ||
+ !(CwB[TColour::mw_ticks ].btn = (GtkColorButton*)gtk_builder_get_object( builder, "bColourMWTicks")) ||
+ !(CwB[TColour::mw_labels ].btn = (GtkColorButton*)gtk_builder_get_object( builder, "bColourMWLabels")) ||
+
+ !(CwB[TColour::sf_profile_psd ].btn = (GtkColorButton*)gtk_builder_get_object( builder, "bColourSFProfilePSD")) ||
+ !(CwB[TColour::sf_profile_mc ].btn = (GtkColorButton*)gtk_builder_get_object( builder, "bColourSFProfileMC")) ||
+ !(CwB[TColour::sf_profile_swu ].btn = (GtkColorButton*)gtk_builder_get_object( builder, "bColourSFProfileSWU")) ||
+ !(CwB[TColour::sf_phasic_spindle ].btn = (GtkColorButton*)gtk_builder_get_object( builder, "bColourSFPhasicSpindle")) ||
+ !(CwB[TColour::sf_phasic_Kcomplex ].btn = (GtkColorButton*)gtk_builder_get_object( builder, "bColourSFPhasicKComplex")) ||
+ !(CwB[TColour::sf_phasic_eyeblink ].btn = (GtkColorButton*)gtk_builder_get_object( builder, "bColourSFPhasicEyeBlink")) ||
+ !(CwB[TColour::sf_emg ].btn = (GtkColorButton*)gtk_builder_get_object( builder, "bColourSFEMG")) ||
+ !(CwB[TColour::sf_hypnogram ].btn = (GtkColorButton*)gtk_builder_get_object( builder, "bColourSFHypnogram")) ||
+ !(CwB[TColour::sf_artifact ].btn = (GtkColorButton*)gtk_builder_get_object( builder, "bColourSFArtifacts")) ||
+ !(CwB[TColour::sf_annotations ].btn = (GtkColorButton*)gtk_builder_get_object( builder, "bColourSFAnnotations")) ||
+ !(CwB[TColour::sf_embedded_annotations ].btn = (GtkColorButton*)gtk_builder_get_object( builder, "bColourSFEmbeddedAnnotations")) ||
+ !(CwB[TColour::sf_selection ].btn = (GtkColorButton*)gtk_builder_get_object( builder, "bColourSFSelection")) ||
+ !(CwB[TColour::sf_ticks ].btn = (GtkColorButton*)gtk_builder_get_object( builder, "bColourSFTicks")) ||
+ !(CwB[TColour::sf_labels ].btn = (GtkColorButton*)gtk_builder_get_object( builder, "bColourSFLabels")) ||
+ !(CwB[TColour::sf_cursor ].btn = (GtkColorButton*)gtk_builder_get_object( builder, "bColourSFCursor")) ||
+
+ !(CwB[TColour::mf_swa ].btn = (GtkColorButton*)gtk_builder_get_object( builder, "bColourMFSWA")) ||
!(CwB[TColour::mf_swa_sim ].btn = (GtkColorButton*)gtk_builder_get_object( builder, "bColourMFSWASim")) ||
- !(CwB[TColour::mf_process_s ].btn = (GtkColorButton*)gtk_builder_get_object( builder, "bColourMFProcessS")) ||
- !(CwB[TColour::mf_paper ].btn = (GtkColorButton*)gtk_builder_get_object( builder, "bColourMFPaper")) ||
- !(CwB[TColour::mf_ticks ].btn = (GtkColorButton*)gtk_builder_get_object( builder, "bColourMFTicks")) ||
- !(CwB[TColour::mf_labels ].btn = (GtkColorButton*)gtk_builder_get_object( builder, "bColourMFLabels")) ||
+ !(CwB[TColour::mf_process_s ].btn = (GtkColorButton*)gtk_builder_get_object( builder, "bColourMFProcessS")) ||
+ !(CwB[TColour::mf_paper ].btn = (GtkColorButton*)gtk_builder_get_object( builder, "bColourMFPaper")) ||
+ !(CwB[TColour::mf_ticks ].btn = (GtkColorButton*)gtk_builder_get_object( builder, "bColourMFTicks")) ||
+ !(CwB[TColour::mf_labels ].btn = (GtkColorButton*)gtk_builder_get_object( builder, "bColourMFLabels")) ||
!(CwB[TColour::score_none ].btn = (GtkColorButton*)gtk_builder_get_object( builder, "bColourScoreNONE")) ||
- !(CwB[TColour::score_nrem1 ].btn = (GtkColorButton*)gtk_builder_get_object( builder, "bColourScoreNREM1")) ||
- !(CwB[TColour::score_nrem2 ].btn = (GtkColorButton*)gtk_builder_get_object( builder, "bColourScoreNREM2")) ||
- !(CwB[TColour::score_nrem3 ].btn = (GtkColorButton*)gtk_builder_get_object( builder, "bColourScoreNREM3")) ||
- !(CwB[TColour::score_nrem4 ].btn = (GtkColorButton*)gtk_builder_get_object( builder, "bColourScoreNREM4")) ||
- !(CwB[TColour::score_rem ].btn = (GtkColorButton*)gtk_builder_get_object( builder, "bColourScoreREM")) ||
+ !(CwB[TColour::score_nrem1 ].btn = (GtkColorButton*)gtk_builder_get_object( builder, "bColourScoreNREM1")) ||
+ !(CwB[TColour::score_nrem2 ].btn = (GtkColorButton*)gtk_builder_get_object( builder, "bColourScoreNREM2")) ||
+ !(CwB[TColour::score_nrem3 ].btn = (GtkColorButton*)gtk_builder_get_object( builder, "bColourScoreNREM3")) ||
+ !(CwB[TColour::score_nrem4 ].btn = (GtkColorButton*)gtk_builder_get_object( builder, "bColourScoreNREM4")) ||
+ !(CwB[TColour::score_rem ].btn = (GtkColorButton*)gtk_builder_get_object( builder, "bColourScoreREM")) ||
!(CwB[TColour::score_wake ].btn = (GtkColorButton*)gtk_builder_get_object( builder, "bColourScoreWake")) ||
!(CwB[TColour::band_delta ].btn = (GtkColorButton*)gtk_builder_get_object( builder, "bColourBandDelta")) ||
!(CwB[TColour::band_theta ].btn = (GtkColorButton*)gtk_builder_get_object( builder, "bColourBandTheta")) ||
!(CwB[TColour::band_alpha ].btn = (GtkColorButton*)gtk_builder_get_object( builder, "bColourBandAlpha")) ||
- !(CwB[TColour::band_beta ].btn = (GtkColorButton*)gtk_builder_get_object( builder, "bColourBandBeta")) ||
+ !(CwB[TColour::band_beta ].btn = (GtkColorButton*)gtk_builder_get_object( builder, "bColourBandBeta")) ||
!(CwB[TColour::band_gamma ].btn = (GtkColorButton*)gtk_builder_get_object( builder, "bColourBandGamma")) )
- throw runtime_error ("Failed to construct widgets");
+ throw runtime_error ("Failed to construct colour button widgets");
// scrub colours
for ( auto &C : CwB ) {
@@ -557,15 +556,11 @@ SExpDesignUIWidgets ()
PANGO_TAB_LEFT, 190),
NULL);
- g_signal_connect( eEdfImportGroupEntry,
- "changed", (GCallback)check_gtk_entry_nonempty_cb,
- this);
- g_signal_connect( eEdfImportSessionEntry,
- "changed", (GCallback)check_gtk_entry_nonempty_cb,
- this);
- g_signal_connect( eEdfImportEpisodeEntry,
- "changed", (GCallback)check_gtk_entry_nonempty_cb,
- this);
+ for ( auto W : {eEdfImportGroupEntry, eEdfImportSessionEntry, eEdfImportEpisodeEntry} )
+ g_signal_connect(
+ W,
+ "changed", (GCallback)check_gtk_entry_nonempty_cb,
+ this);
// ------------- wBatchSetup
AGH_GBGETOBJ (wBatchSetup);
@@ -594,15 +589,18 @@ SExpDesignUIWidgets ()
AGH_GBGETOBJ (tvGlobalAnnotations);
AGH_GBGETOBJ (eGlobalAnnotationsShowPhasicEvents);
- gtk_tree_view_set_model( tvGlobalAnnotations,
- (GtkTreeModel*)mGlobalAnnotations);
+ gtk_tree_view_set_model(
+ tvGlobalAnnotations,
+ (GtkTreeModel*)mGlobalAnnotations);
- g_object_set( (GObject*)tvGlobalAnnotations,
- "expander-column", 0,
- NULL);
- g_signal_connect( tvGlobalAnnotations, "map",
- (GCallback)gtk_tree_view_expand_all,
- NULL);
+ g_object_set(
+ (GObject*)tvGlobalAnnotations,
+ "expander-column", 0,
+ NULL);
+ g_signal_connect(
+ tvGlobalAnnotations, "map",
+ (GCallback)gtk_tree_view_expand_all,
+ NULL);
G_CONNECT_2 (tvGlobalAnnotations, row, activated);
int c = 0;
@@ -621,8 +619,9 @@ SExpDesignUIWidgets ()
gtk_tree_view_append_column( tvGlobalAnnotations, col);
++c;
}
- gtk_tree_view_append_column( tvGlobalAnnotations,
- gtk_tree_view_column_new());
+ gtk_tree_view_append_column(
+ tvGlobalAnnotations,
+ gtk_tree_view_column_new());
G_CONNECT_1 (eGlobalAnnotationsShowPhasicEvents, toggled);
diff --git a/upstream/src/aghermann/ui/sf/d/rk1968-profiles_cb.cc b/upstream/src/aghermann/ui/sf/d/rk1968-profiles_cb.cc
index f2eedf3..e7eb240 100644
--- a/upstream/src/aghermann/ui/sf/d/rk1968-profiles_cb.cc
+++ b/upstream/src/aghermann/ui/sf/d/rk1968-profiles_cb.cc
@@ -10,7 +10,6 @@
*/
#include "rk1968.hh"
-#include <cassert>
using namespace std;
using namespace agh::ui;
--
Alioth's /git/debian-med/git-commit-notice on /srv/git.debian.org/git/debian-med/aghermann.git
More information about the debian-med-commit
mailing list