[med-svn] [SCM] aghermann branch, master, updated. c0bd21ca8eb529ade7e0c7aad22951a308a8dc8f
Andrei Zavada
johnhommer at gmail.com
Wed May 1 00:09:22 UTC 2013
The following commit has been merged in the master branch:
commit 1160837ddab1d287aeef651ed9dba6cc4a756495
Author: Andrei Zavada <johnhommer at gmail.com>
Date: Mon Apr 22 16:53:32 2013 +0300
spray const goodness on function args with mild code preening
diff --git a/src/libsigfile/edf.cc b/src/libsigfile/edf.cc
index f21b164..9f2578d 100644
--- a/src/libsigfile/edf.cc
+++ b/src/libsigfile/edf.cc
@@ -124,7 +124,7 @@ const char* CEDFFile::SSignal::edf_annotations_label =
CEDFFile::
-CEDFFile (const string& fname_, int flags_)
+CEDFFile (const string& fname_, const int flags_)
: CSource (fname_, flags_)
{
{
@@ -259,10 +259,10 @@ CEDFFile (const string& fname_, int flags_)
CEDFFile::
-CEDFFile (const string& fname_, TSubtype subtype_, int flags_,
+CEDFFile (const string& fname_, const TSubtype subtype_, const int flags_,
const list<pair<string, size_t>>& channels_,
- size_t data_record_size_,
- size_t n_data_records_)
+ const size_t data_record_size_,
+ const size_t n_data_records_)
: CSource (fname_, flags_),
data_record_size (data_record_size_),
n_data_records (n_data_records_),
@@ -346,7 +346,7 @@ CEDFFile (const string& fname_, TSubtype subtype_, int flags_,
void
CEDFFile::SSignal::
-set_physical_range( double m, double M)
+set_physical_range( const double m, const double M)
{
strncpy( header.physical_min, pad( to_string( physical_min = m), 8).c_str(), 8);
strncpy( header.physical_max, pad( to_string( physical_max = M), 8).c_str(), 8);
@@ -355,7 +355,7 @@ set_physical_range( double m, double M)
void
CEDFFile::SSignal::
-set_digital_range( int16_t m, int16_t M)
+set_digital_range( const int16_t m, const int16_t M)
{
strncpy( header.digital_min, pad( to_string( digital_min = m), 8).c_str(), 8);
strncpy( header.digital_max, pad( to_string( digital_max = M), 8).c_str(), 8);
@@ -366,7 +366,7 @@ set_digital_range( int16_t m, int16_t M)
size_t
CEDFFile::
-resize( size_t new_records)
+resize( const size_t new_records)
{
size_t total_samples_per_record = 0;
for ( auto& H : channels )
@@ -515,7 +515,7 @@ _lay_out_header()
char*
CEDFFile::
-_get_next_field( char *&field, size_t fld_size) throw (TStatus)
+_get_next_field( char *&field, const size_t fld_size) throw (TStatus)
{
if ( _fld_pos + fld_size > _fsize ) {
_status |= bad_header;
@@ -910,7 +910,7 @@ _extract_embedded_annotations()
string
CEDFFile::
-details( int which) const
+details( const int which) const
{
ostringstream recv;
if ( _status & bad_header )
@@ -1005,7 +1005,7 @@ details( int which) const
string
CEDFFile::
-explain_edf_status( int status)
+explain_edf_status( const int status)
{
list<string> recv;
if ( status & sysfail )
diff --git a/src/libsigfile/edf.ii b/src/libsigfile/edf.ii
index d52b7ec..f547d45 100644
--- a/src/libsigfile/edf.ii
+++ b/src/libsigfile/edf.ii
@@ -23,8 +23,8 @@ extern template int CEDFFile::export_original_( const string&, const string&) co
template <typename A>
valarray<TFloat>
CEDFFile::
-get_region_original_( A h,
- size_t sa, size_t sz) const
+get_region_original_( const A h,
+ const size_t sa, const size_t sz) const
{
if ( unlikely (_status & (TStatus::bad_header | TStatus::bad_version)) )
throw invalid_argument("CEDFFile::get_region_original(): broken source");
@@ -68,8 +68,8 @@ get_region_original_( A h,
template <typename Th>
valarray<TFloat>
CEDFFile::
-get_region_filtered_( Th h,
- size_t smpla, size_t smplz) const
+get_region_filtered_( const Th h,
+ const size_t smpla, const size_t smplz) const
{
valarray<TFloat> recp =
get_region_original( h, smpla, smplz);
@@ -163,9 +163,9 @@ get_region_filtered_( Th h,
template <typename A>
int
CEDFFile::
-put_region_( A h,
+put_region_( const A h,
const valarray<TFloat>& src,
- size_t offset) const
+ const size_t offset) const
{
if ( unlikely (_status & (TStatus::bad_header | TStatus::bad_version)) )
throw invalid_argument("CEDFFile::put_region_(): broken source");
@@ -215,7 +215,7 @@ put_region_( A h,
template <typename Th>
int
CEDFFile::
-put_signal_( Th h,
+put_signal_( const Th h,
const valarray<TFloat>& src) const
{
return put_region_( h, src, (size_t)0);
@@ -225,7 +225,7 @@ put_signal_( Th h,
template <typename Th>
int
CEDFFile::
-export_original_( Th h,
+export_original_( const Th h,
const string& fname) const
{
valarray<TFloat> signal = get_signal_original( h);
@@ -243,7 +243,7 @@ export_original_( Th h,
template <typename Th>
int
CEDFFile::
-export_filtered_( Th h,
+export_filtered_( const Th h,
const string& fname) const
{
valarray<TFloat> signal = get_signal_filtered( h);
diff --git a/src/libsigfile/page.cc b/src/libsigfile/page.cc
index 1c2b286..88d8723 100644
--- a/src/libsigfile/page.cc
+++ b/src/libsigfile/page.cc
@@ -37,7 +37,8 @@ const char* const sigfile::SPage::score_names[TScore::TScore_total] = {
float
-sigfile::CHypnogram::percent_scored( float *nrem_p, float *rem_p, float *wake_p) const
+sigfile::CHypnogram::
+percent_scored( float *nrem_p, float *rem_p, float *wake_p) const
{
if ( nrem_p )
*nrem_p = (float)count_if( _pages.begin(), _pages.end(),
@@ -56,7 +57,8 @@ sigfile::CHypnogram::percent_scored( float *nrem_p, float *rem_p, float *wake_p)
sigfile::CHypnogram::TError
-sigfile::CHypnogram::save( const char* fname) const
+sigfile::CHypnogram::
+save( const char* fname) const
{
ofstream of (fname, ios_base::trunc);
if ( not of.good() )
@@ -71,7 +73,8 @@ sigfile::CHypnogram::save( const char* fname) const
sigfile::CHypnogram::TError
-sigfile::CHypnogram::load( const char* fname)
+sigfile::CHypnogram::
+load( const char* fname)
{
ifstream f (fname);
if ( not f.good() )
@@ -103,7 +106,8 @@ sigfile::CHypnogram::load( const char* fname)
int
-sigfile::CHypnogram::save_canonical( const char *fname) const
+sigfile::CHypnogram::
+save_canonical( const char *fname) const
{
FILE *f = fopen( fname, "w");
if ( !f )
@@ -136,8 +140,9 @@ sigfile::CHypnogram::save_canonical( const char *fname) const
int
-sigfile::CHypnogram::load_canonical( const char *fname,
- const TCustomScoreCodes& custom_score_codes)
+sigfile::CHypnogram::
+load_canonical( const char *fname,
+ const TCustomScoreCodes& custom_score_codes)
{
ifstream f (fname);
if ( !f.good() )
diff --git a/src/libsigfile/source-base.cc b/src/libsigfile/source-base.cc
index dd280d1..b0475fa 100644
--- a/src/libsigfile/source-base.cc
+++ b/src/libsigfile/source-base.cc
@@ -16,7 +16,7 @@ using namespace std;
void
sigfile::SArtifacts::
-mark_artifact( double aa, double az)
+mark_artifact( const double aa, const double az)
{
if ( aa >= az )
return;
@@ -37,7 +37,7 @@ mark_artifact( double aa, double az)
void
sigfile::SArtifacts::
-clear_artifact( double aa, double az)
+clear_artifact( const double aa, const double az)
{
auto A = obj.begin();
while ( A != obj.end() ) {
@@ -65,7 +65,7 @@ clear_artifact( double aa, double az)
float
__attribute__ ((pure))
sigfile::SArtifacts::
-region_dirty_fraction( double ra, double rz) const
+region_dirty_fraction( const double ra, const double rz) const
{
size_t dirty = 0;
for ( auto& A : obj ) {
diff --git a/src/libsigfile/source.cc b/src/libsigfile/source.cc
index e364667..6aa74f0 100644
--- a/src/libsigfile/source.cc
+++ b/src/libsigfile/source.cc
@@ -16,8 +16,8 @@ using namespace std;
sigfile::CTypedSource::
CTypedSource (const string& fname,
- size_t pagesize,
- int flags)
+ const size_t pagesize,
+ const int flags)
: CHypnogram (pagesize)
{
switch ( _type = source_file_type(fname) ) {
@@ -90,7 +90,8 @@ sigfile::CTypedSource::
sigfile::CTypedSource::TType
-sigfile::CTypedSource::source_file_type( const string& fname)
+sigfile::CTypedSource::
+source_file_type( const string& fname)
{
if ( fname.size() > 4 && strcasecmp( &fname[fname.size()-4], ".edf") == 0 )
return TType::edf;
diff --git a/src/ui/libcommon.cc b/src/ui/libcommon.cc
index 459dafd..fb18367 100644
--- a/src/ui/libcommon.cc
+++ b/src/ui/libcommon.cc
@@ -92,7 +92,7 @@ prepare_for_expdesign()
// these are intended for durations, not timestamps
void
aghui::
-snprintf_buf_ts_d( double d_)
+snprintf_buf_ts_d( const double d_)
{
if ( d_ < 1. )
snprintf_buf_ts_h( d_ * 24);
@@ -112,7 +112,7 @@ snprintf_buf_ts_d( double d_)
void
aghui::
-snprintf_buf_ts_h( double h_)
+snprintf_buf_ts_h( const double h_)
{
if ( h_ < 1. )
snprintf_buf_ts_m( h_ * 60);
@@ -131,7 +131,7 @@ snprintf_buf_ts_h( double h_)
void
aghui::
-snprintf_buf_ts_m( double m_)
+snprintf_buf_ts_m( const double m_)
{
if ( m_ < 1. )
snprintf_buf_ts_s( m_ * 60);
@@ -150,13 +150,12 @@ snprintf_buf_ts_m( double m_)
void
aghui::
-snprintf_buf_ts_s( double s_)
+snprintf_buf_ts_s( const double s_)
{
if ( s_ >= 60. )
snprintf_buf_ts_m( s_/60);
- else {
+ else
snprintf_buf( "%.2gs", s_);
- }
}
@@ -165,14 +164,16 @@ snprintf_buf_ts_s( double s_)
+
// cairo
void
aghui::
-cairo_put_banner( cairo_t *cr, float wd, float ht,
+cairo_put_banner( cairo_t *cr, const float wd, const float ht,
const char *text,
- float font_size,
- float r, float g, float b, float a)
+ const float font_size,
+ const float r, const float g, const float b,
+ const float a)
{
cairo_set_font_size( cr, font_size);
cairo_set_source_rgba( cr, r, g, b, a);
@@ -189,11 +190,11 @@ cairo_put_banner( cairo_t *cr, float wd, float ht,
void
aghui::
cairo_draw_signal( cairo_t *cr, const valarray<TFloat>& V,
- ssize_t start, ssize_t end,
- size_t hspan, float hoff, float voff, float scale,
- unsigned short decimate,
- aghui::TDrawSignalDirection direction,
- bool continue_path)
+ const ssize_t start, const ssize_t end,
+ const size_t hspan, const float hoff, const float voff, const float scale,
+ const unsigned short decimate,
+ const aghui::TDrawSignalDirection direction,
+ const bool continue_path)
{
switch ( direction ) {
@@ -233,7 +234,9 @@ void
aghui::
cairo_draw_envelope( cairo_t *cr, const valarray<TFloat>& V,
ssize_t start, ssize_t end,
- size_t hspan, float hoff, float voff, float scale)
+ const size_t hspan,
+ const float hoff, const float voff,
+ const float scale)
{
agh::alg::ensure_within( start, (ssize_t)0, (ssize_t)V.size());
agh::alg::ensure_within( end, (ssize_t)0, (ssize_t)V.size());
diff --git a/src/ui/mf/mf-construct.cc b/src/ui/mf/mf-construct.cc
index 9a5b5b8..8663ec8 100644
--- a/src/ui/mf/mf-construct.cc
+++ b/src/ui/mf/mf-construct.cc
@@ -1,5 +1,5 @@
/*
- * File name: ui/mf/mf-construct.cc
+ * File name: ui/mf/construct.cc
* Project: Aghermann
* Author: Andrei Zavada <johnhommer at gmail.com>
* Initial version: 2011-07-11
diff --git a/src/ui/mf/mf.cc b/src/ui/mf/mf.cc
index 7abf514..37987c4 100644
--- a/src/ui/mf/mf.cc
+++ b/src/ui/mf/mf.cc
@@ -223,9 +223,9 @@ size_t aghui::SModelrunFacility::swa_smoothover = 2;
void
aghui::SModelrunFacility::
draw_episode( cairo_t *cr,
- size_t ep,
- size_t ep_start, size_t ep_end,
- size_t tl_start, size_t tl_end)
+ const size_t ep,
+ const size_t ep_start, const size_t ep_end,
+ const size_t tl_start, const size_t tl_end)
{
if ( zoomed_episode != -1 ) {
_p.CwB[SExpDesignUI::TColour::mf_paper].set_source_rgb( cr);
@@ -345,7 +345,7 @@ draw_episode( cairo_t *cr,
void
aghui::SModelrunFacility::
draw_ticks( cairo_t *cr,
- size_t start, size_t end)
+ size_t start, const size_t end)
{
// ticks
guint pph = 3600/csimulation.pagesize(),
diff --git a/src/ui/mf/mf_cb.cc b/src/ui/mf/mf_cb.cc
index 41c00e3..194874f 100644
--- a/src/ui/mf/mf_cb.cc
+++ b/src/ui/mf/mf_cb.cc
@@ -21,7 +21,10 @@ using namespace aghui;
extern "C" {
gboolean
-daMFProfile_configure_event_cb( GtkWidget*, GdkEventConfigure *event, gpointer userdata)
+daMFProfile_configure_event_cb(
+ GtkWidget*,
+ GdkEventConfigure *event,
+ const gpointer userdata)
{
if ( event->type == GDK_CONFIGURE ) {
auto& MF = *(SModelrunFacility*)userdata;
@@ -33,7 +36,10 @@ daMFProfile_configure_event_cb( GtkWidget*, GdkEventConfigure *event, gpointer u
gboolean
-daMFProfile_draw_cb( GtkWidget*, cairo_t *cr, gpointer userdata)
+daMFProfile_draw_cb(
+ GtkWidget*,
+ cairo_t *cr,
+ const gpointer userdata)
{
auto& MF = *(SModelrunFacility*)userdata;
MF.draw_timeline( cr);
@@ -47,9 +53,10 @@ daMFProfile_draw_cb( GtkWidget*, cairo_t *cr, gpointer userdata)
gboolean
-daMFProfile_button_press_event_cb( GtkWidget *wid,
- GdkEventButton *event,
- gpointer userdata)
+daMFProfile_button_press_event_cb(
+ GtkWidget *wid,
+ GdkEventButton *event,
+ const gpointer userdata)
{
auto& MF = *(SModelrunFacility*)userdata;
@@ -108,7 +115,10 @@ daMFProfile_button_press_event_cb( GtkWidget *wid,
gboolean
-daMFProfile_scroll_event_cb( GtkWidget *wid, GdkEventScroll *event, gpointer userdata)
+daMFProfile_scroll_event_cb(
+ GtkWidget *wid,
+ GdkEventScroll *event,
+ const gpointer userdata)
{
auto& MF = *(SModelrunFacility*)userdata;
@@ -150,7 +160,9 @@ void this_mf_siman_param_printer(void *xp)
}
void
-bMFRun_clicked_cb( GtkButton*, gpointer userdata)
+bMFRun_clicked_cb(
+ GtkButton*,
+ gpointer userdata)
{
auto& MF = *(SModelrunFacility*)userdata;
@@ -210,9 +222,10 @@ bMFRun_clicked_cb( GtkButton*, gpointer userdata)
void
-eMFSmooth_value_changed_cb( GtkScaleButton *b,
- gdouble v,
- gpointer userdata)
+eMFSmooth_value_changed_cb(
+ GtkScaleButton *b,
+ const gdouble v,
+ const gpointer userdata)
{
auto& MF = *(SModelrunFacility*)userdata;
MF.swa_smoothover = v;
@@ -225,7 +238,9 @@ eMFSmooth_value_changed_cb( GtkScaleButton *b,
void
-eMFHighlightNREM_toggled_cb( GtkCheckButton *e, gpointer u)
+eMFHighlightNREM_toggled_cb(
+ GtkCheckButton *e,
+ const gpointer u)
{
auto& MF = *(SModelrunFacility*)u;
MF.highlight_nrem = gtk_toggle_button_get_active( (GtkToggleButton*)e);
@@ -234,7 +249,9 @@ eMFHighlightNREM_toggled_cb( GtkCheckButton *e, gpointer u)
}
void
-eMFHighlightREM_toggled_cb( GtkCheckButton *e, gpointer u)
+eMFHighlightREM_toggled_cb(
+ GtkCheckButton *e,
+ const gpointer u)
{
auto& MF = *(SModelrunFacility*)u;
MF.highlight_rem = gtk_toggle_button_get_active( (GtkToggleButton*)e);
@@ -243,7 +260,9 @@ eMFHighlightREM_toggled_cb( GtkCheckButton *e, gpointer u)
}
void
-eMFHighlightWake_toggled_cb( GtkCheckButton *e, gpointer u)
+eMFHighlightWake_toggled_cb(
+ GtkCheckButton *e,
+ const gpointer u)
{
auto& MF = *(SModelrunFacility*)u;
MF.highlight_wake = gtk_toggle_button_get_active( (GtkToggleButton*)e);
@@ -253,7 +272,9 @@ eMFHighlightWake_toggled_cb( GtkCheckButton *e, gpointer u)
void
-bMFReset_clicked_cb( GtkButton *button, gpointer userdata)
+bMFReset_clicked_cb(
+ GtkButton*,
+ const gpointer userdata)
{
auto& MF = *(SModelrunFacility*)userdata;
@@ -268,7 +289,9 @@ bMFReset_clicked_cb( GtkButton *button, gpointer userdata)
void
-eMFClassicFit_toggled_cb( GtkCheckButton *b, gpointer userdata)
+eMFClassicFit_toggled_cb(
+ GtkCheckButton *b,
+ const gpointer userdata)
{
auto& MF = *(SModelrunFacility*)userdata;
@@ -301,7 +324,9 @@ eMFClassicFit_toggled_cb( GtkCheckButton *b, gpointer userdata)
void
-bMFAccept_clicked_cb( GtkToolButton *button, gpointer userdata)
+bMFAccept_clicked_cb(
+ GtkToolButton*,
+ const gpointer userdata)
{
auto& MF = *(SModelrunFacility*)userdata;
@@ -315,7 +340,9 @@ bMFAccept_clicked_cb( GtkToolButton *button, gpointer userdata)
void
-eMFVx_value_changed_cb( GtkSpinButton* e, gpointer u)
+eMFVx_value_changed_cb(
+ GtkSpinButton* e,
+ const gpointer u)
{
auto& MF = *(SModelrunFacility*)u;
if ( !MF._suppress_Vx_value_changed ) {
@@ -332,7 +359,9 @@ eMFVx_value_changed_cb( GtkSpinButton* e, gpointer u)
void
-eMFDB1_toggled_cb( GtkCheckButton* e, gpointer u)
+eMFDB1_toggled_cb(
+ GtkCheckButton* e,
+ const gpointer u)
{
auto& MF = *(SModelrunFacility*)u;
if ( !MF._suppress_Vx_value_changed ) {
@@ -343,7 +372,9 @@ eMFDB1_toggled_cb( GtkCheckButton* e, gpointer u)
}
}
void
-eMFDB2_toggled_cb( GtkCheckButton* e, gpointer u)
+eMFDB2_toggled_cb(
+ GtkCheckButton* e,
+ const gpointer u)
{
auto& MF = *(SModelrunFacility*)u;
if ( !MF._suppress_Vx_value_changed ) {
@@ -354,7 +385,9 @@ eMFDB2_toggled_cb( GtkCheckButton* e, gpointer u)
}
}
void
-eMFAZ1_toggled_cb( GtkCheckButton* e, gpointer u)
+eMFAZ1_toggled_cb(
+ GtkCheckButton* e,
+ const gpointer u)
{
auto& MF = *(SModelrunFacility*)u;
if ( !MF._suppress_Vx_value_changed ) {
@@ -365,7 +398,9 @@ eMFAZ1_toggled_cb( GtkCheckButton* e, gpointer u)
}
}
void
-eMFAZ2_toggled_cb( GtkCheckButton* e, gpointer u)
+eMFAZ2_toggled_cb(
+ GtkCheckButton* e,
+ const gpointer u)
{
auto& MF = *(SModelrunFacility*)u;
if ( !MF._suppress_Vx_value_changed ) {
@@ -379,7 +414,10 @@ eMFAZ2_toggled_cb( GtkCheckButton* e, gpointer u)
gboolean
-wModelrunFacility_delete_event_cb( GtkWidget *widget, GdkEvent *event, gpointer userdata)
+wModelrunFacility_delete_event_cb(
+ GtkWidget*,
+ GdkEvent*,
+ const gpointer userdata)
{
auto MFp = (SModelrunFacility*)userdata;
delete MFp;
diff --git a/src/ui/mw/admit-one.cc b/src/ui/mw/admit-one.cc
index 1c510fe..1ffcafa 100644
--- a/src/ui/mw/admit-one.cc
+++ b/src/ui/mw/admit-one.cc
@@ -153,9 +153,9 @@ dnd_maybe_admit_one( const char* fname)
extern "C" {
gboolean
-check_gtk_entry_nonempty_cb( GtkEditable *ignored,
+check_gtk_entry_nonempty_cb( GtkEditable*,
// GdkEventKey *event,
- gpointer userdata)
+ const gpointer userdata)
{
auto& ED = *(SExpDesignUI*)userdata;
@@ -194,14 +194,14 @@ check_gtk_entry_nonempty_cb( GtkEditable *ignored,
void
-cMeasurements_drag_data_received_cb( GtkWidget *widget,
+cMeasurements_drag_data_received_cb( const GtkWidget *widget,
GdkDragContext *context,
- gint x,
- gint y,
- GtkSelectionData *selection_data,
- guint info,
- guint time,
- gpointer userdata)
+ const gint x,
+ const gint y,
+ const GtkSelectionData *selection_data,
+ const guint info,
+ const guint time,
+ const gpointer userdata)
{
auto& ED = *(SExpDesignUI*)userdata;
diff --git a/src/ui/mw/construct.cc b/src/ui/mw/construct.cc
index 7f5be1f..e56f4fc 100644
--- a/src/ui/mw/construct.cc
+++ b/src/ui/mw/construct.cc
@@ -708,7 +708,7 @@ aghui::SExpDesignUIWidgets::
void
aghui::SExpDesignUIWidgets::
-set_wMainWindow_interactive( bool indeed, bool flush)
+set_wMainWindow_interactive( const bool indeed, const bool flush)
{
set_cursor_busy( not indeed, (GtkWidget*)wMainWindow);
//gtk_widget_set_sensitive( (GtkWidget*)wMainWindow, indeed);
@@ -733,7 +733,7 @@ set_wMainWindow_interactive( bool indeed, bool flush)
void
aghui::SExpDesignUIWidgets::
-set_controls_for_empty_experiment( bool indeed, bool flush)
+set_controls_for_empty_experiment( bool indeed, const bool flush)
{
indeed = not indeed;
gtk_widget_set_visible( (GtkWidget*)cMsmtMainToolbar, indeed);
diff --git a/src/ui/mw/mainmenu_cb.cc b/src/ui/mw/mainmenu_cb.cc
index 43a7860..d6f6432 100644
--- a/src/ui/mw/mainmenu_cb.cc
+++ b/src/ui/mw/mainmenu_cb.cc
@@ -20,14 +20,18 @@ using namespace aghui;
extern "C" {
void
-iExpRefresh_activate_cb( GtkMenuItem*, gpointer userdata)
+iExpRefresh_activate_cb(
+ GtkMenuItem*,
+ const gpointer userdata)
{
auto& ED = *(SExpDesignUI*)userdata;
ED.do_rescan_tree( true);
}
void
-iExpPurgeComputed_activate_cb( GtkMenuItem*, gpointer userdata)
+iExpPurgeComputed_activate_cb(
+ GtkMenuItem*,
+ const gpointer userdata)
{
auto& ED = *(SExpDesignUI*)userdata;
ED.do_purge_computed();
@@ -36,7 +40,9 @@ iExpPurgeComputed_activate_cb( GtkMenuItem*, gpointer userdata)
void
-iExpSubjectSortAny_toggled_cb( GtkCheckMenuItem* mi, gpointer userdata)
+iExpSubjectSortAny_toggled_cb(
+ GtkCheckMenuItem* mi,
+ const gpointer userdata)
{
auto& ED = *(SExpDesignUI*)userdata;
if ( ED.suppress_redraw )
@@ -60,7 +66,9 @@ iExpSubjectSortAny_toggled_cb( GtkCheckMenuItem* mi, gpointer userdata)
void
-iExpSubjectSortAscending_toggled_cb( GtkCheckMenuItem*, gpointer userdata)
+iExpSubjectSortAscending_toggled_cb(
+ GtkCheckMenuItem*,
+ const gpointer userdata)
{
auto& ED = *(SExpDesignUI*)userdata;
if ( ED.suppress_redraw )
@@ -71,7 +79,9 @@ iExpSubjectSortAscending_toggled_cb( GtkCheckMenuItem*, gpointer userdata)
}
void
-iExpSubjectSortSegregate_toggled_cb( GtkCheckMenuItem*, gpointer userdata)
+iExpSubjectSortSegregate_toggled_cb(
+ GtkCheckMenuItem*,
+ const gpointer userdata)
{
auto& ED = *(SExpDesignUI*)userdata;
if ( ED.suppress_redraw )
@@ -87,7 +97,9 @@ iExpSubjectSortSegregate_toggled_cb( GtkCheckMenuItem*, gpointer userdata)
void
-iExpAnnotations_activate_cb( GtkMenuItem*, gpointer userdata)
+iExpAnnotations_activate_cb(
+ GtkMenuItem*,
+ const gpointer userdata)
{
auto& ED = *(SExpDesignUI*)userdata;
ED.suppress_redraw = true;
@@ -100,10 +112,11 @@ iExpAnnotations_activate_cb( GtkMenuItem*, gpointer userdata)
// annotations dialog
void
-tvGlobalAnnotations_row_activated_cb( GtkTreeView* tree_view,
- GtkTreePath* path,
- GtkTreeViewColumn *column,
- gpointer userdata)
+tvGlobalAnnotations_row_activated_cb(
+ GtkTreeView* tree_view,
+ GtkTreePath* path,
+ GtkTreeViewColumn *column,
+ const gpointer userdata)
{
auto& ED = *(SExpDesignUI*)userdata;
aghui::SExpDesignUI::SAnnotation *ann;
@@ -139,7 +152,9 @@ tvGlobalAnnotations_row_activated_cb( GtkTreeView* tree_view,
void
-eGlobalAnnotationsShowPhasicEvents_toggled_cb( GtkToggleButton* b, gpointer userdata)
+eGlobalAnnotationsShowPhasicEvents_toggled_cb(
+ GtkToggleButton* b,
+ const gpointer userdata)
{
auto& ED = *(SExpDesignUI*)userdata;
if ( ED.suppress_redraw )
@@ -153,7 +168,9 @@ eGlobalAnnotationsShowPhasicEvents_toggled_cb( GtkToggleButton* b, gpointer user
void
-iExpBasicSADetectUltradianCycles_activate_cb( GtkMenuItem*, gpointer userdata)
+iExpBasicSADetectUltradianCycles_activate_cb(
+ GtkMenuItem*,
+ const gpointer userdata)
{
auto& ED = *(SExpDesignUI*)userdata;
@@ -192,7 +209,9 @@ iExpBasicSADetectUltradianCycles_activate_cb( GtkMenuItem*, gpointer userdata)
void
-iExpGloballyDetectArtifacts_activate_cb( GtkMenuItem*, gpointer userdata)
+iExpGloballyDetectArtifacts_activate_cb(
+ GtkMenuItem*,
+ const gpointer userdata)
{
auto& ED = *(SExpDesignUI*)userdata;
@@ -301,7 +320,9 @@ iExpGloballyDetectArtifacts_activate_cb( GtkMenuItem*, gpointer userdata)
}
void
-eGlobalADProfiles_changed_cb( GtkComboBox *b, gpointer userdata)
+eGlobalADProfiles_changed_cb(
+ GtkComboBox *b,
+ const gpointer userdata)
{
auto& ED = *(SExpDesignUI*)userdata;
@@ -314,7 +335,9 @@ eGlobalADProfiles_changed_cb( GtkComboBox *b, gpointer userdata)
void
-iExpGloballySetFilters_activate_cb( GtkMenuItem*, gpointer userdata)
+iExpGloballySetFilters_activate_cb(
+ GtkMenuItem*,
+ const gpointer userdata)
{
auto& ED = *(SExpDesignUI*)userdata;
@@ -361,7 +384,9 @@ iExpGloballySetFilters_activate_cb( GtkMenuItem*, gpointer userdata)
}
void
-bGlobalMontageResetAll_clicked_cb( GtkButton*, gpointer userdata)
+bGlobalMontageResetAll_clicked_cb(
+ GtkButton*,
+ const gpointer userdata)
{
auto& ED = *(SExpDesignUI*)userdata;
@@ -374,7 +399,9 @@ bGlobalMontageResetAll_clicked_cb( GtkButton*, gpointer userdata)
void
-iHelpAbout_activate_cb( GtkMenuItem*, gpointer userdata)
+iHelpAbout_activate_cb(
+ GtkMenuItem*,
+ const gpointer userdata)
{
auto& ED = *(SExpDesignUI*)userdata;
// auto w = gtk_widget_get_window( (GtkWidget*)ED.lAboutVersion);
@@ -384,7 +411,9 @@ iHelpAbout_activate_cb( GtkMenuItem*, gpointer userdata)
}
void
-iHelpUsage_activate_cb( GtkMenuItem*, gpointer)
+iHelpUsage_activate_cb(
+ GtkMenuItem*,
+ const gpointer)
{
gtk_show_uri( NULL,
"http://johnhommer.com/academic/code/aghermann/usage/",
@@ -404,7 +433,9 @@ before_ED_close( SExpDesignUI& ED)
} // namespace
void
-iExpClose_activate_cb( GtkMenuItem*, gpointer userdata)
+iExpClose_activate_cb(
+ GtkMenuItem*,
+ const gpointer userdata)
{
auto& ED = *(SExpDesignUI*)userdata;
@@ -413,7 +444,9 @@ iExpClose_activate_cb( GtkMenuItem*, gpointer userdata)
}
void
-iExpQuit_activate_cb( GtkMenuItem*, gpointer userdata)
+iExpQuit_activate_cb(
+ GtkMenuItem*,
+ const gpointer userdata)
{
auto& ED = *(SExpDesignUI*)userdata;
diff --git a/src/ui/mw/measurements.cc b/src/ui/mw/measurements.cc
index 3bdcaf6..64ae161 100644
--- a/src/ui/mw/measurements.cc
+++ b/src/ui/mw/measurements.cc
@@ -298,7 +298,7 @@ draw_timeline( cairo_t *cr) const
void
aghui::SExpDesignUI::
-modify_profile_scales( GdkScrollDirection d)
+modify_profile_scales( const GdkScrollDirection d)
{
switch ( d ) {
case GDK_SCROLL_DOWN:
diff --git a/src/ui/mw/measurements_cb.cc b/src/ui/mw/measurements_cb.cc
index 91b0be2..ceef0f9 100644
--- a/src/ui/mw/measurements_cb.cc
+++ b/src/ui/mw/measurements_cb.cc
@@ -18,7 +18,9 @@ using namespace aghui;
extern "C" {
void
-cGroupExpander_activate_cb( GtkExpander *w, gpointer userdata)
+cGroupExpander_activate_cb(
+ GtkExpander *w,
+ const gpointer userdata)
{
auto& G = *(SExpDesignUI::SGroupPresentation*)userdata;
G._p.group_unvisibility[G.name()] = gtk_expander_get_expanded(w);
@@ -27,7 +29,10 @@ cGroupExpander_activate_cb( GtkExpander *w, gpointer userdata)
// individual channel callbacks
gboolean
-daSubjectTimeline_draw_cb( GtkWidget *wid, cairo_t *cr, gpointer userdata)
+daSubjectTimeline_draw_cb(
+ GtkWidget*,
+ cairo_t *cr,
+ const gpointer userdata)
{
auto& J = *(SExpDesignUI::SSubjectPresentation*)userdata;
J.draw_timeline( cr);
@@ -36,7 +41,10 @@ daSubjectTimeline_draw_cb( GtkWidget *wid, cairo_t *cr, gpointer userdata)
gboolean
-daSubjectTimeline_motion_notify_event_cb( GtkWidget *wid, GdkEventMotion *event, gpointer userdata)
+daSubjectTimeline_motion_notify_event_cb(
+ GtkWidget *wid,
+ const GdkEventMotion *event,
+ const gpointer userdata)
{
auto& J = *(SExpDesignUI::SSubjectPresentation*)userdata;
auto e_before = J.using_episode;
@@ -45,7 +53,10 @@ daSubjectTimeline_motion_notify_event_cb( GtkWidget *wid, GdkEventMotion *event,
return TRUE;
}
gboolean
-daSubjectTimeline_leave_notify_event_cb( GtkWidget *wid, GdkEventCrossing *event, gpointer userdata)
+daSubjectTimeline_leave_notify_event_cb(
+ GtkWidget *wid,
+ GdkEventCrossing *event,
+ const gpointer userdata)
{
if ( event->mode != GDK_CROSSING_NORMAL )
return TRUE;
@@ -56,7 +67,10 @@ daSubjectTimeline_leave_notify_event_cb( GtkWidget *wid, GdkEventCrossing *event
return TRUE;
}
gboolean
-daSubjectTimeline_enter_notify_event_cb( GtkWidget *wid, GdkEventCrossing *event, gpointer userdata)
+daSubjectTimeline_enter_notify_event_cb(
+ GtkWidget *wid,
+ GdkEventCrossing *event,
+ const gpointer userdata)
{
auto& J = *(SExpDesignUI::SSubjectPresentation*)userdata;
J.is_focused = true;
@@ -68,7 +82,10 @@ daSubjectTimeline_enter_notify_event_cb( GtkWidget *wid, GdkEventCrossing *event
gboolean
-daSubjectTimeline_button_press_event_cb( GtkWidget*, GdkEventButton *event, gpointer userdata)
+daSubjectTimeline_button_press_event_cb(
+ GtkWidget*,
+ GdkEventButton *event,
+ const gpointer userdata)
{
auto& J = *(SExpDesignUI::SSubjectPresentation*)userdata;
auto& ED = J._p._p;
@@ -102,7 +119,10 @@ daSubjectTimeline_button_press_event_cb( GtkWidget*, GdkEventButton *event, gpoi
}
gboolean
-daSubjectTimeline_scroll_event_cb( GtkWidget *wid, GdkEventScroll *event, gpointer userdata)
+daSubjectTimeline_scroll_event_cb(
+ GtkWidget*,
+ GdkEventScroll *event,
+ const gpointer userdata)
{
auto& J = *(SExpDesignUI::SSubjectPresentation*)userdata;
auto& ED = J._p._p;
@@ -120,7 +140,9 @@ daSubjectTimeline_scroll_event_cb( GtkWidget *wid, GdkEventScroll *event, gpoint
// context cMeasurements menus
void
-iiSubjectTimeline_show_cb( GtkWidget *widget, gpointer userdata)
+iiSubjectTimeline_show_cb(
+ GtkWidget*,
+ const gpointer userdata)
{
auto& ED = *(SExpDesignUI*)userdata;
auto J = ED.using_subject;
@@ -131,7 +153,9 @@ iiSubjectTimeline_show_cb( GtkWidget *widget, gpointer userdata)
void
-iSubjectTimelineScore_activate_cb( GtkMenuItem*, gpointer userdata)
+iSubjectTimelineScore_activate_cb(
+ GtkMenuItem*,
+ const gpointer userdata)
{
auto& ED = *(SExpDesignUI*)userdata;
auto J = ED.using_subject;
@@ -140,7 +164,9 @@ iSubjectTimelineScore_activate_cb( GtkMenuItem*, gpointer userdata)
void
-iSubjectTimelineDetectUltradianCycle_activate_cb( GtkMenuItem*, gpointer userdata)
+iSubjectTimelineDetectUltradianCycle_activate_cb(
+ GtkMenuItem*,
+ const gpointer userdata)
{
auto& ED = *(SExpDesignUI*)userdata;
agh::CSubject::SEpisode *Ep;
@@ -154,7 +180,9 @@ iSubjectTimelineDetectUltradianCycle_activate_cb( GtkMenuItem*, gpointer userdat
void
-iSubjectTimelineEDFInfo_activate_cb( GtkMenuItem*, gpointer userdata)
+iSubjectTimelineEDFInfo_activate_cb(
+ GtkMenuItem*,
+ const gpointer userdata)
{
auto& ED = *(SExpDesignUI*)userdata;
auto J = ED.using_subject;
@@ -169,7 +197,9 @@ iSubjectTimelineEDFInfo_activate_cb( GtkMenuItem*, gpointer userdata)
void
-iSubjectTimelineSaveAsSVG_activate_cb( GtkMenuItem *checkmenuitem, gpointer userdata)
+iSubjectTimelineSaveAsSVG_activate_cb(
+ GtkMenuItem*,
+ const gpointer userdata)
{
auto& ED = *(SExpDesignUI*)userdata;
auto J = ED.using_subject;
@@ -187,36 +217,44 @@ iSubjectTimelineSaveAsSVG_activate_cb( GtkMenuItem *checkmenuitem, gpointer user
void
-iSubjectTimelineBrowse_activate_cb( GtkMenuItem *checkmenuitem, gpointer userdata)
+iSubjectTimelineBrowse_activate_cb(
+ GtkMenuItem*,
+ const gpointer userdata)
{
auto& ED = *(SExpDesignUI*)userdata;
auto J = ED.using_subject;
- snprintf_buf( "%s '%s/%s/%s/%s' &",
- ED.browse_command.c_str(),
- ED.ED->session_dir().c_str(), ED.ED->group_of( J->csubject.id), J->csubject.id.c_str(), ED.AghD());
+ snprintf_buf(
+ "%s '%s/%s/%s/%s' &",
+ ED.browse_command.c_str(),
+ ED.ED->session_dir().c_str(), ED.ED->group_of( J->csubject.id), J->csubject.id.c_str(), ED.AghD());
if ( system( __buf__) ) {}
}
void
-iSubjectTimelineResetMontage_activate_cb( GtkMenuItem *checkmenuitem, gpointer userdata)
+iSubjectTimelineResetMontage_activate_cb(
+ GtkMenuItem*,
+ const gpointer userdata)
{
auto& ED = *(SExpDesignUI*)userdata;
auto J = ED.using_subject;
if ( not J->is_episode_focused() )
- snprintf_buf( "find '%s/%s/%s/%s' -name '.*.montage' -delete",
- ED.ED->session_dir().c_str(), ED.ED->group_of( J->csubject.id), J->csubject.id.c_str(), ED.AghD());
+ snprintf_buf(
+ "find '%s/%s/%s/%s' -name '.*.montage' -delete",
+ ED.ED->session_dir().c_str(), ED.ED->group_of( J->csubject.id), J->csubject.id.c_str(), ED.AghD());
else
- snprintf_buf( "rm -f '%s/%s/%s/%s/.%s.montage'",
- ED.ED->session_dir().c_str(), ED.ED->group_of( J->csubject.id), J->csubject.id.c_str(), ED.AghD(), ED.AghE());
+ snprintf_buf(
+ "rm -f '%s/%s/%s/%s/.%s.montage'",
+ ED.ED->session_dir().c_str(), ED.ED->group_of( J->csubject.id), J->csubject.id.c_str(), ED.AghD(), ED.AghE());
if ( system( __buf__) )
- pop_ok_message( ED.wMainWindow, "Wow", "Command '%s' returned a non-zero status. This is weird.", __buf__);
+ pop_ok_message(
+ ED.wMainWindow, "Wow", "Command '%s' returned a non-zero status. This is weird.", __buf__);
}
-}
+} // extern "C"
// Local Variables:
// Mode: c++
diff --git a/src/ui/mw/mw.cc b/src/ui/mw/mw.cc
index 2307625..ceb7ab5 100644
--- a/src/ui/mw/mw.cc
+++ b/src/ui/mw/mw.cc
@@ -427,7 +427,7 @@ aghui::SExpDesignUI::
void
aghui::SExpDesignUI::
-do_rescan_tree( bool with_update)
+do_rescan_tree( const bool with_update)
{
aghui::SBusyBlock bb (wMainWindow);
@@ -578,7 +578,9 @@ sb_clear() const
void
aghui::SExpDesignUI::
-sb_main_progress_indicator( const char* current, size_t n, size_t i, aghui::TGtkRefreshMode mode)
+sb_main_progress_indicator( const char* current,
+ const size_t n, const size_t i,
+ const aghui::TGtkRefreshMode mode)
{
DEF_UNIQUE_CHARP (b);
ASPRINTF( &b, "(%zu of %zu) %s", i, n, current);
diff --git a/src/ui/mw/mw_cb.cc b/src/ui/mw/mw_cb.cc
index 2100ea4..b2964d5 100644
--- a/src/ui/mw/mw_cb.cc
+++ b/src/ui/mw/mw_cb.cc
@@ -21,7 +21,10 @@ using namespace aghui;
extern "C" {
gboolean
-wMainWindow_configure_event_cb( GtkWidget*, GdkEventConfigure *event, gpointer userdata)
+wMainWindow_configure_event_cb(
+ GtkWidget*,
+ GdkEventConfigure *event,
+ const gpointer userdata)
{
auto& ED = *(SExpDesignUI*)userdata;
if ( event->type == GDK_CONFIGURE )
@@ -35,7 +38,10 @@ wMainWindow_configure_event_cb( GtkWidget*, GdkEventConfigure *event, gpointer u
}
gboolean
-wMainWindow_delete_event_cb( GtkWidget*, GdkEvent*, gpointer userdata)
+wMainWindow_delete_event_cb(
+ GtkWidget*,
+ GdkEvent*,
+ const gpointer userdata)
{
auto& ED = *(SExpDesignUI*)userdata;
if ( ED.nodestroy_by_cb )
@@ -55,7 +61,7 @@ wMainWindow_delete_event_cb( GtkWidget*, GdkEvent*, gpointer userdata)
namespace {
inline void
-cycle_combo( GtkComboBox* c, int n, int by)
+cycle_combo( GtkComboBox* c, const int n, const int by)
{
gtk_combo_box_set_active(
c, (gtk_combo_box_get_active( c) + n + by) % n);
@@ -63,7 +69,10 @@ cycle_combo( GtkComboBox* c, int n, int by)
}
gboolean
-wMainWindow_key_press_event_cb( GtkWidget*, GdkEventKey* event, gpointer userdata)
+wMainWindow_key_press_event_cb(
+ GtkWidget*,
+ GdkEventKey* event,
+ const gpointer userdata)
{
auto& ED = *(SExpDesignUI*)userdata;
@@ -93,7 +102,11 @@ wMainWindow_key_press_event_cb( GtkWidget*, GdkEventKey* event, gpointer userdat
// tab switch
void
-tTaskSelector_switch_page_cb( GtkNotebook*, gpointer, guint page_num, gpointer userdata)
+tTaskSelector_switch_page_cb(
+ GtkNotebook*,
+ gpointer,
+ const guint page_num,
+ const gpointer userdata)
{
auto& ED = *(SExpDesignUI*)userdata;
if ( page_num == 1 ) {
@@ -118,7 +131,9 @@ tTaskSelector_switch_page_cb( GtkNotebook*, gpointer, guint page_num, gpointer u
// other main toolbar controls
void
-eMsmtProfileAutoscale_toggled_cb( GtkToggleButton* b, gpointer userdata)
+eMsmtProfileAutoscale_toggled_cb(
+ GtkToggleButton* b,
+ const gpointer userdata)
{
auto& ED = *(SExpDesignUI*)userdata;
if ( (ED.autoscale = (bool)gtk_toggle_button_get_active(b)) ) {
@@ -128,7 +143,10 @@ eMsmtProfileAutoscale_toggled_cb( GtkToggleButton* b, gpointer userdata)
}
void
-eMsmtProfileSmooth_value_changed_cb( GtkScaleButton* b, gdouble v, gpointer userdata)
+eMsmtProfileSmooth_value_changed_cb(
+ GtkScaleButton* b,
+ const gdouble v,
+ const gpointer userdata)
{
auto& ED = *(SExpDesignUI*)userdata;
ED.smooth_profile = v;
@@ -139,7 +157,9 @@ eMsmtProfileSmooth_value_changed_cb( GtkScaleButton* b, gdouble v, gpointer user
void
-eMsmtProfileType_changed_cb( GtkComboBox* b, gpointer userdata)
+eMsmtProfileType_changed_cb(
+ GtkComboBox* b,
+ const gpointer userdata)
{
auto& ED = *(SExpDesignUI*)userdata;
@@ -247,7 +267,9 @@ mike_dewhirst_is_not_real( SExpDesignUI& ED)
}; // namespace
void
-eMsmtProfileParamsPSDFreqFrom_value_changed_cb( GtkSpinButton *spinbutton, gpointer userdata)
+eMsmtProfileParamsPSDFreqFrom_value_changed_cb(
+ GtkSpinButton *spinbutton,
+ const gpointer userdata)
{
auto& ED = *(SExpDesignUI*)userdata;
ED.active_profile_psd_freq_from = gtk_spin_button_get_value( spinbutton);
@@ -260,7 +282,9 @@ eMsmtProfileParamsPSDFreqFrom_value_changed_cb( GtkSpinButton *spinbutton, gpoin
}
void
-eMsmtProfileParamsPSDFreqWidth_value_changed_cb( GtkSpinButton *spinbutton, gpointer userdata)
+eMsmtProfileParamsPSDFreqWidth_value_changed_cb(
+ GtkSpinButton *spinbutton,
+ const gpointer userdata)
{
auto& ED = *(SExpDesignUI*)userdata;
ED.active_profile_psd_freq_upto =
@@ -275,7 +299,9 @@ eMsmtProfileParamsPSDFreqWidth_value_changed_cb( GtkSpinButton *spinbutton, gpoi
void
-eMsmtProfileParamsSWUF0_value_changed_cb( GtkSpinButton *spinbutton, gpointer userdata)
+eMsmtProfileParamsSWUF0_value_changed_cb(
+ GtkSpinButton *spinbutton,
+ const gpointer userdata)
{
auto& ED = *(SExpDesignUI*)userdata;
ED.active_profile_swu_f0 = gtk_spin_button_get_value( spinbutton);
@@ -287,7 +313,9 @@ eMsmtProfileParamsSWUF0_value_changed_cb( GtkSpinButton *spinbutton, gpointer us
void
-eMsmtProfileParamsMCF0_value_changed_cb( GtkSpinButton *spinbutton, gpointer userdata)
+eMsmtProfileParamsMCF0_value_changed_cb(
+ GtkSpinButton *spinbutton,
+ const gpointer userdata)
{
auto& ED = *(SExpDesignUI*)userdata;
ED.active_profile_mc_f0 = gtk_spin_button_get_value( spinbutton);
@@ -304,7 +332,9 @@ eMsmtProfileParamsMCF0_value_changed_cb( GtkSpinButton *spinbutton, gpointer use
// session and channel selection
void
-eMsmtSession_changed_cb( GtkComboBox *combobox, gpointer userdata)
+eMsmtSession_changed_cb(
+ GtkComboBox *combobox,
+ const gpointer userdata)
{
auto& ED = *(SExpDesignUI*)userdata;
auto oldval = ED._AghDi;
@@ -317,7 +347,9 @@ eMsmtSession_changed_cb( GtkComboBox *combobox, gpointer userdata)
}
void
-eMsmtChannel_changed_cb( GtkComboBox *combobox, gpointer userdata)
+eMsmtChannel_changed_cb(
+ GtkComboBox *combobox,
+ const gpointer userdata)
{
auto& ED = *(SExpDesignUI*)userdata;
auto oldval = ED._AghTi;
@@ -337,7 +369,9 @@ eMsmtChannel_changed_cb( GtkComboBox *combobox, gpointer userdata)
void
-bMainCloseThatSF_clicked_cb( GtkButton*, gpointer userdata)
+bMainCloseThatSF_clicked_cb(
+ GtkButton*,
+ const gpointer userdata)
{
auto& ED = *(SExpDesignUI*)userdata;
diff --git a/src/ui/mw/populate.cc b/src/ui/mw/populate.cc
index 2fdca87..aebd8c6 100644
--- a/src/ui/mw/populate.cc
+++ b/src/ui/mw/populate.cc
@@ -258,7 +258,7 @@ __reconnect_sessions_combo()
namespace {
const char*
-annotation_type_s( sigfile::SAnnotation::TType t)
+annotation_type_s( const sigfile::SAnnotation::TType t)
{
static const char* types[] = {"", "S", "K", "E"};
return types[t];
diff --git a/src/ui/mw/settings_cb.cc b/src/ui/mw/settings_cb.cc
index 153892f..4099b53 100644
--- a/src/ui/mw/settings_cb.cc
+++ b/src/ui/mw/settings_cb.cc
@@ -27,7 +27,11 @@ using namespace aghui;
extern "C" {
void
-tDesign_switch_page_cb( GtkNotebook*, gpointer, guint page_num, gpointer userdata)
+tDesign_switch_page_cb(
+ GtkNotebook*,
+ gpointer,
+ const guint page_num,
+ const gpointer userdata)
{
using namespace sigfile;
auto& ED = *(SExpDesignUI*)userdata;
@@ -169,7 +173,11 @@ __adjust_tunables_down( SExpDesignUI& ED)
} // namespace
void
-tSimulations_switch_page_cb( GtkNotebook*, gpointer, guint page_num, gpointer userdata)
+tSimulations_switch_page_cb(
+ GtkNotebook*,
+ gpointer,
+ const guint page_num,
+ const gpointer userdata)
{
auto& ED = *(SExpDesignUI*)userdata;
@@ -212,7 +220,9 @@ tSimulations_switch_page_cb( GtkNotebook*, gpointer, guint page_num, gpointer us
void
-bSimParamRevertTunables_clicked_cb( GtkButton*, gpointer userdata)
+bSimParamRevertTunables_clicked_cb(
+ GtkButton*,
+ const gpointer userdata)
{
auto& ED = *(SExpDesignUI*)userdata;
@@ -227,7 +237,9 @@ bSimParamRevertTunables_clicked_cb( GtkButton*, gpointer userdata)
void
-eCtlParamDBAmendment1_toggled_cb( GtkToggleButton *button, gpointer userdata)
+eCtlParamDBAmendment1_toggled_cb(
+ GtkToggleButton *button,
+ const gpointer userdata)
{
auto& ED = *(SExpDesignUI*)userdata;
gtk_label_set_markup( ED.lCtlParamDBAmendment1,
@@ -237,7 +249,9 @@ eCtlParamDBAmendment1_toggled_cb( GtkToggleButton *button, gpointer userdata)
}
void
-eCtlParamDBAmendment2_toggled_cb( GtkToggleButton *button, gpointer userdata)
+eCtlParamDBAmendment2_toggled_cb(
+ GtkToggleButton *button,
+ const gpointer userdata)
{
auto& ED = *(SExpDesignUI*)userdata;
gtk_label_set_markup( ED.lCtlParamDBAmendment2,
@@ -247,7 +261,9 @@ eCtlParamDBAmendment2_toggled_cb( GtkToggleButton *button, gpointer userdata)
}
void
-eCtlParamAZAmendment1_toggled_cb( GtkToggleButton *button, gpointer userdata)
+eCtlParamAZAmendment1_toggled_cb(
+ GtkToggleButton *button,
+ const gpointer userdata)
{
auto& ED = *(SExpDesignUI*)userdata;
gtk_label_set_markup( ED.lCtlParamAZAmendment1,
@@ -258,8 +274,9 @@ eCtlParamAZAmendment1_toggled_cb( GtkToggleButton *button, gpointer userdata)
// -------- colours
void
-bColourX_color_set_cb( GtkColorButton *widget,
- gpointer userdata)
+bColourX_color_set_cb(
+ GtkColorButton*,
+ const gpointer userdata)
{
auto& mc = *(SManagedColor*)userdata;
mc.acquire();
diff --git a/src/ui/mw/simulations.cc b/src/ui/mw/simulations.cc
index 2f37680..31de88b 100644
--- a/src/ui/mw/simulations.cc
+++ b/src/ui/mw/simulations.cc
@@ -1,6 +1,5 @@
-// ;-*-C++-*-
/*
- * File name: ui/mw/mw-simulations.cc
+ * File name: ui/mw/simulations.cc
* Project: Aghermann
* Author: Andrei Zavada <johnhommer at gmail.com>
* Initial version: 2008-07-01
@@ -129,8 +128,8 @@ cleanup_2()
//populate( false);
}
+// Local Variables:
+// Mode: c++
+// indent-tabs-mode: 8
+// End:
-
-
-
-// EOF
diff --git a/src/ui/mw/simulations_cb.cc b/src/ui/mw/simulations_cb.cc
index 805e996..a9dfe84 100644
--- a/src/ui/mw/simulations_cb.cc
+++ b/src/ui/mw/simulations_cb.cc
@@ -19,13 +19,12 @@ using namespace aghui;
extern "C" {
-
-
void
-tvSimulations_row_activated_cb( GtkTreeView* tree_view,
- GtkTreePath* path,
- GtkTreeViewColumn *column,
- gpointer userdata)
+tvSimulations_row_activated_cb(
+ GtkTreeView*,
+ GtkTreePath* path,
+ GtkTreeViewColumn*,
+ const gpointer userdata)
{
auto& ED = *(SExpDesignUI*)userdata;
agh::ach::CModelRun *modref;
@@ -41,7 +40,9 @@ tvSimulations_row_activated_cb( GtkTreeView* tree_view,
void
-iSimulationsRunBatch_activate_cb( GtkMenuItem*, gpointer userdata)
+iSimulationsRunBatch_activate_cb(
+ GtkMenuItem*,
+ const gpointer userdata)
{
auto& ED = *(SExpDesignUI*)userdata;
@@ -161,7 +162,9 @@ iSimulationsRunBatch_activate_cb( GtkMenuItem*, gpointer userdata)
void
-iSimulationsRunClearAll_activate_cb( GtkMenuItem*, gpointer userdata)
+iSimulationsRunClearAll_activate_cb(
+ GtkMenuItem*,
+ const gpointer userdata)
{
auto& ED = *(SExpDesignUI*)userdata;
ED.ED->remove_all_modruns();
@@ -171,17 +174,20 @@ iSimulationsRunClearAll_activate_cb( GtkMenuItem*, gpointer userdata)
void
-iSimulationsReportGenerate_activate_cb( GtkMenuItem*, gpointer userdata)
+iSimulationsReportGenerate_activate_cb(
+ GtkMenuItem*,
+ const gpointer userdata)
{
auto& ED = *(SExpDesignUI*)userdata;
auto f_chooser =
- (GtkDialog*)gtk_file_chooser_dialog_new( "Export Simulation Details",
- NULL,
- GTK_FILE_CHOOSER_ACTION_SAVE,
- GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
- GTK_STOCK_OPEN, GTK_RESPONSE_ACCEPT,
- NULL);
+ (GtkDialog*)gtk_file_chooser_dialog_new(
+ "Export Simulation Details",
+ NULL,
+ GTK_FILE_CHOOSER_ACTION_SAVE,
+ GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
+ GTK_STOCK_OPEN, GTK_RESPONSE_ACCEPT,
+ NULL);
if ( gtk_dialog_run( f_chooser) == GTK_RESPONSE_ACCEPT ) {
g_string_assign( __ss__, gtk_file_chooser_get_filename( (GtkFileChooser*)f_chooser));
if ( !g_str_has_suffix( __ss__->str, ".tsv") && !g_str_has_suffix( __ss__->str, ".TSV") )
diff --git a/src/ui/mw/splash.cc b/src/ui/mw/splash.cc
index b949420..acfa656 100644
--- a/src/ui/mw/splash.cc
+++ b/src/ui/mw/splash.cc
@@ -26,14 +26,18 @@ namespace {
extern "C" {
void
-bDownload_clicked_cb( GtkButton*, gpointer userdata)
+bDownload_clicked_cb(
+ GtkButton*,
+ const gpointer userdata)
{
auto& ED = *(aghui::SExpDesignUI*)userdata;
ED.try_download();
}
void
-download_process_child_exited_cb( VteTerminal *terminal, gpointer userdata)
+download_process_child_exited_cb(
+ VteTerminal *terminal,
+ const gpointer userdata)
{
auto& ED = *(aghui::SExpDesignUI*)userdata;
ED.set_wMainWindow_interactive( true, true);
diff --git a/src/ui/sf/channel.cc b/src/ui/sf/channel.cc
index 53f1252..e778353 100644
--- a/src/ui/sf/channel.cc
+++ b/src/ui/sf/channel.cc
@@ -190,7 +190,7 @@ get_signal_filtered()
list<sigfile::SAnnotation*>
aghui::SScoringFacility::SChannel::
-in_annotations( double time) const
+in_annotations( const double time) const
{
// select this channel's annotations
auto& annotations = crecording.F().annotations(name);
@@ -295,7 +295,7 @@ get_raw_profile()
tuple<metrics::TType, valarray<TFloat>&>
aghui::SScoringFacility::SChannel::
-which_profile( metrics::TType metric)
+which_profile( const metrics::TType metric)
{
switch ( type ) {
case sigfile::SChannel::TType::eeg:
@@ -321,7 +321,7 @@ which_profile( metrics::TType metric)
void
aghui::SScoringFacility::SChannel::
-get_spectrum( size_t p)
+get_spectrum( const size_t p)
{
spectrum = crecording.psd_profile.spectrum( p);
}
@@ -411,7 +411,7 @@ detect_artifacts( const metrics::mc::SArtifactDetectionPP& P)
pair<double, double>
aghui::SScoringFacility::SChannel::
-mark_flat_regions_as_artifacts( double minsize, double pad)
+mark_flat_regions_as_artifacts( const double minsize, const double pad)
{
size_t total_before = artifacts.total(),
marked_here = 0;
@@ -457,7 +457,7 @@ mark_flat_regions_as_artifacts( double minsize, double pad)
void
aghui::SScoringFacility::SChannel::
-mark_region_as_artifact( bool do_mark)
+mark_region_as_artifact( const bool do_mark)
{
if ( do_mark )
crecording.F().artifacts(_h).mark_artifact(
@@ -468,13 +468,10 @@ mark_region_as_artifact( bool do_mark)
selection_start_time,
selection_end_time);
- FAFA;
calculate_dirty_percent();
- FAFA;
get_signal_filtered();
- FAFA;
if ( type == sigfile::SChannel::TType::eeg ) {
get_psd_course();
get_psd_in_bands();
@@ -485,12 +482,12 @@ mark_region_as_artifact( bool do_mark)
if ( name == _p._p.AghH() )
_p.redraw_ssubject_timeline();
}
- FAFA;
}
void
aghui::SScoringFacility::SChannel::
-mark_region_as_annotation( const string& label, sigfile::SAnnotation::TType type)
+mark_region_as_annotation( const string& label,
+ const sigfile::SAnnotation::TType type)
{
sigfile::mark_annotation(
crecording.F().annotations(_h),
@@ -512,7 +509,7 @@ mark_region_as_pattern()
void
aghui::SScoringFacility::SChannel::
-update_channel_menu_items( double x)
+update_channel_menu_items( const double x)
{
_p.suppress_redraw = true;
@@ -597,7 +594,7 @@ selectively_enable_selection_menu_items()
void
aghui::SScoringFacility::SChannel::
-put_selection( size_t a, size_t e)
+put_selection( const size_t a, const size_t e)
{
selection_start = a, selection_end = e;
selection_start_time = (double)a / samplerate();
@@ -607,7 +604,7 @@ put_selection( size_t a, size_t e)
void
aghui::SScoringFacility::SChannel::
-put_selection( double a, double e)
+put_selection( const double a, const double e)
{
selection_start_time = a, selection_end_time = e;
selection_start = a * samplerate();
diff --git a/src/ui/sf/d/Makefile.am b/src/ui/sf/d/Makefile.am
index 79b9525..9c96ef9 100644
--- a/src/ui/sf/d/Makefile.am
+++ b/src/ui/sf/d/Makefile.am
@@ -15,7 +15,6 @@ liba_a_SOURCES := \
artifacts-simple.hh \
artifacts-simple.cc \
artifacts-simple-construct.cc \
- artifacts-simple_cb.cc \
filters.hh \
filters.cc \
filters-construct.cc \
diff --git a/src/ui/sf/d/artifacts_cb.cc b/src/ui/sf/d/artifacts_cb.cc
index 6b4e867..d94a1da 100644
--- a/src/ui/sf/d/artifacts_cb.cc
+++ b/src/ui/sf/d/artifacts_cb.cc
@@ -18,7 +18,9 @@ using namespace aghui;
void
-eSFADProfiles_changed_cb( GtkComboBox* w, gpointer userdata)
+eSFADProfiles_changed_cb(
+ GtkComboBox* w,
+ const gpointer userdata)
{
auto& AD = *(SScoringFacility::SArtifactsDialog*)userdata;
auto& SF = AD._p;
@@ -33,7 +35,9 @@ eSFADProfiles_changed_cb( GtkComboBox* w, gpointer userdata)
}
void
-bSFADProfileSave_clicked_cb( GtkButton*, gpointer userdata)
+bSFADProfileSave_clicked_cb(
+ GtkButton*,
+ const gpointer userdata)
{
auto& AD = *(SScoringFacility::SArtifactsDialog*)userdata;
auto& SF = AD._p;
@@ -54,7 +58,9 @@ bSFADProfileSave_clicked_cb( GtkButton*, gpointer userdata)
}
void
-bSFADProfileDelete_clicked_cb( GtkButton*, gpointer userdata)
+bSFADProfileDelete_clicked_cb(
+ GtkButton*,
+ const gpointer userdata)
{
auto& AD = *(SScoringFacility::SArtifactsDialog*)userdata;
auto& SF = AD._p;
@@ -75,7 +81,9 @@ bSFADProfileDelete_clicked_cb( GtkButton*, gpointer userdata)
void
-eSFADEstimateE_toggled_cb( GtkToggleButton *b, gpointer userdata)
+eSFADEstimateE_toggled_cb(
+ GtkToggleButton *b,
+ const gpointer userdata)
{
auto& AD = *(SScoringFacility::SArtifactsDialog*)userdata;
@@ -89,7 +97,9 @@ eSFADEstimateE_toggled_cb( GtkToggleButton *b, gpointer userdata)
}
void
-eSFADUseThisRange_toggled_cb( GtkToggleButton *b, gpointer userdata)
+eSFADUseThisRange_toggled_cb(
+ GtkToggleButton *b,
+ const gpointer userdata)
{
auto& AD = *(SScoringFacility::SArtifactsDialog*)userdata;
@@ -110,7 +120,9 @@ eSFADUseThisRange_toggled_cb( GtkToggleButton *b, gpointer userdata)
void
-bSFADApply_clicked_cb( GtkButton*, gpointer userdata)
+bSFADApply_clicked_cb(
+ GtkButton*,
+ const gpointer userdata)
{
auto& AD = *(SScoringFacility::SArtifactsDialog*)userdata;
auto& SF = AD._p;
@@ -127,7 +139,9 @@ bSFADApply_clicked_cb( GtkButton*, gpointer userdata)
}
void
-bSFADCancel_clicked_cb( GtkButton*, gpointer userdata)
+bSFADCancel_clicked_cb(
+ GtkButton*,
+ const gpointer userdata)
{
auto& AD = *(SScoringFacility::SArtifactsDialog*)userdata;
auto& SF = AD._p;
@@ -149,7 +163,9 @@ bSFADCancel_clicked_cb( GtkButton*, gpointer userdata)
}
void
-bSFADPreview_toggled_cb( GtkToggleButton *b, gpointer userdata)
+bSFADPreview_toggled_cb(
+ GtkToggleButton *b,
+ const gpointer userdata)
{
auto& AD = *(SScoringFacility::SArtifactsDialog*)userdata;
auto& SF = AD._p;
@@ -196,7 +212,9 @@ bSFADPreview_toggled_cb( GtkToggleButton *b, gpointer userdata)
void
-wSFAD_show_cb( GtkWidget*, gpointer userdata)
+wSFAD_show_cb(
+ GtkWidget*,
+ const gpointer userdata)
{
auto& AD = *(SScoringFacility::SArtifactsDialog*)userdata;
auto& SF = AD._p;
@@ -223,14 +241,19 @@ wSFAD_show_cb( GtkWidget*, gpointer userdata)
gboolean
-wSFAD_delete_event_cb( GtkWidget*, GdkEvent*, gpointer userdata)
+wSFAD_delete_event_cb(
+ GtkWidget*,
+ GdkEvent*,
+ const gpointer userdata)
{
bSFADCancel_clicked_cb( NULL, userdata);
return TRUE;
}
void
-wSFAD_close_cb( GtkWidget*, gpointer userdata)
+wSFAD_close_cb(
+ GtkWidget*,
+ const gpointer userdata)
{
bSFADCancel_clicked_cb( NULL, userdata);
}
diff --git a/src/ui/sf/d/filters_cb.cc b/src/ui/sf/d/filters_cb.cc
index c60abcb..2e4ad34 100644
--- a/src/ui/sf/d/filters_cb.cc
+++ b/src/ui/sf/d/filters_cb.cc
@@ -20,7 +20,9 @@ using namespace aghui;
extern "C" {
void
-eSFFilterHighPassCutoff_value_changed_cb( GtkSpinButton *spinbutton, gpointer userdata)
+eSFFilterHighPassCutoff_value_changed_cb(
+ GtkSpinButton *spinbutton,
+ const gpointer userdata)
{
auto& FD = *(SScoringFacility::SFiltersDialog*)userdata;
double other_freq = gtk_spin_button_get_value( FD.eSFFilterLowPassCutoff);
@@ -29,7 +31,9 @@ eSFFilterHighPassCutoff_value_changed_cb( GtkSpinButton *spinbutton, gpointer us
}
void
-eSFFilterLowPassCutoff_value_changed_cb( GtkSpinButton *spinbutton, gpointer userdata)
+eSFFilterLowPassCutoff_value_changed_cb(
+ GtkSpinButton *spinbutton,
+ const gpointer userdata)
{
auto& FD = *(SScoringFacility::SFiltersDialog*)userdata;
gdouble other_freq = gtk_spin_button_get_value( FD.eSFFilterHighPassCutoff);
diff --git a/src/ui/sf/d/patterns-draw.cc b/src/ui/sf/d/patterns-draw.cc
index a1e871a..530c483 100644
--- a/src/ui/sf/d/patterns-draw.cc
+++ b/src/ui/sf/d/patterns-draw.cc
@@ -17,7 +17,7 @@ using namespace std;
void
aghui::SScoringFacility::SPatternsDialog::
-set_thing_da_width( int width)
+set_thing_da_width( const int width)
{
static int scrollbar_width = 15;
g_object_set( (GObject*)daSFFDThing,
@@ -28,7 +28,7 @@ set_thing_da_width( int width)
void
aghui::SScoringFacility::SPatternsDialog::
-set_field_da_width( int width)
+set_field_da_width( const int width)
{
static int scrollbar_width = 15;
g_object_set( (GObject*)daSFFDField,
diff --git a/src/ui/sf/d/patterns-profiles.cc b/src/ui/sf/d/patterns-profiles.cc
index b24a5f7..0131e0e 100644
--- a/src/ui/sf/d/patterns-profiles.cc
+++ b/src/ui/sf/d/patterns-profiles.cc
@@ -108,7 +108,7 @@ make_experiment_patterns_location( const agh::CExpDesign& ED)
}
string
-make_subject_patterns_location(const agh::CExpDesign& ED, const agh::CSubject& J)
+make_subject_patterns_location( const agh::CExpDesign& ED, const agh::CSubject& J)
{
DEF_UNIQUE_CHARP (buf);
ASPRINTF( &buf, "%s/.patterns", ED.subject_dir( J).c_str());
diff --git a/src/ui/sf/d/patterns-profiles_cb.cc b/src/ui/sf/d/patterns-profiles_cb.cc
index 7c3b7c2..77d3919 100644
--- a/src/ui/sf/d/patterns-profiles_cb.cc
+++ b/src/ui/sf/d/patterns-profiles_cb.cc
@@ -23,7 +23,9 @@ using namespace aghui;
extern "C" {
void
-eSFFDPatternList_changed_cb( GtkComboBox *combo, gpointer userdata)
+eSFFDPatternList_changed_cb(
+ GtkComboBox *combo,
+ const gpointer userdata)
{
auto& FD = *(SScoringFacility::SPatternsDialog*)userdata;
@@ -51,7 +53,9 @@ eSFFDPatternList_changed_cb( GtkComboBox *combo, gpointer userdata)
void
-bSFFDProfileSave_clicked_cb( GtkButton*, gpointer userdata)
+bSFFDProfileSave_clicked_cb(
+ GtkButton*,
+ const gpointer userdata)
{
auto& FD = *(SScoringFacility::SPatternsDialog*)userdata;
@@ -85,7 +89,7 @@ bSFFDProfileSave_clicked_cb( GtkButton*, gpointer userdata)
namespace {
void
-hildebranden(gpointer userdata)
+hildebranden( const gpointer userdata)
{
auto& FD = *(SScoringFacility::SPatternsDialog*)userdata;
@@ -111,20 +115,26 @@ hildebranden(gpointer userdata)
}
}
-void eSFFDPatternSaveName_changed_cb( GtkEditable*, gpointer userdata)
+void eSFFDPatternSaveName_changed_cb(
+ GtkEditable*,
+ const gpointer userdata)
{
hildebranden(userdata);
}
void
-eSFFD_any_pattern_origin_toggled_cb(GtkRadioButton*, gpointer userdata)
+eSFFD_any_pattern_origin_toggled_cb(
+ GtkRadioButton*,
+ const gpointer userdata)
{
hildebranden(userdata);
}
void
-bSFFDProfileDiscard_clicked_cb( GtkButton*, gpointer userdata)
+bSFFDProfileDiscard_clicked_cb(
+ GtkButton*,
+ const gpointer userdata)
{
auto& FD = *(SScoringFacility::SPatternsDialog*)userdata;
@@ -153,7 +163,9 @@ bSFFDProfileDiscard_clicked_cb( GtkButton*, gpointer userdata)
void
-bSFFDProfileRevert_clicked_cb( GtkButton*, gpointer userdata)
+bSFFDProfileRevert_clicked_cb(
+ GtkButton*,
+ const gpointer userdata)
{
auto& FD = *(SScoringFacility::SPatternsDialog*)userdata;
diff --git a/src/ui/sf/d/patterns.cc b/src/ui/sf/d/patterns.cc
index 01532ea..96965b9 100644
--- a/src/ui/sf/d/patterns.cc
+++ b/src/ui/sf/d/patterns.cc
@@ -236,7 +236,7 @@ set_profile_manage_buttons_visibility()
void
aghui::SScoringFacility::SPatternsDialog::
-preselect_channel( int h) const
+preselect_channel( const int h) const
{
if ( h < 0 ) {
gtk_combo_box_set_active( eSFFDChannel, -1);
@@ -250,7 +250,7 @@ preselect_channel( int h) const
size_t
aghui::SScoringFacility::SPatternsDialog::
-nearest_occurrence( double x) const
+nearest_occurrence( const double x) const
{
double shortest = INFINITY;
size_t found_at = -1;
diff --git a/src/ui/sf/d/patterns_cb.cc b/src/ui/sf/d/patterns_cb.cc
index 354668f..c2821e2 100644
--- a/src/ui/sf/d/patterns_cb.cc
+++ b/src/ui/sf/d/patterns_cb.cc
@@ -21,7 +21,10 @@ using namespace aghui;
extern "C" {
gboolean
-daSFFDThing_draw_cb( GtkWidget *wid, cairo_t *cr, gpointer userdata)
+daSFFDThing_draw_cb(
+ GtkWidget*,
+ cairo_t *cr,
+ const gpointer userdata)
{
auto& FD = *(SScoringFacility::SPatternsDialog*)userdata;
@@ -31,7 +34,10 @@ daSFFDThing_draw_cb( GtkWidget *wid, cairo_t *cr, gpointer userdata)
}
gboolean
-daSFFDField_draw_cb( GtkWidget *wid, cairo_t *cr, gpointer userdata)
+daSFFDField_draw_cb(
+ GtkWidget*,
+ cairo_t *cr,
+ const gpointer userdata)
{
auto& FD = *(SScoringFacility::SPatternsDialog*)userdata;
@@ -44,7 +50,10 @@ daSFFDField_draw_cb( GtkWidget *wid, cairo_t *cr, gpointer userdata)
gboolean
-daSFFDThing_button_press_event_cb( GtkWidget *wid, GdkEventButton *event, gpointer userdata)
+daSFFDThing_button_press_event_cb(
+ GtkWidget *wid,
+ GdkEventButton *event,
+ const gpointer userdata)
{
auto& FD = *(SScoringFacility::SPatternsDialog*)userdata;
@@ -64,7 +73,10 @@ daSFFDThing_button_press_event_cb( GtkWidget *wid, GdkEventButton *event, gpoint
gboolean
-daSFFDThing_scroll_event_cb( GtkWidget *wid, GdkEventScroll *event, gpointer userdata)
+daSFFDThing_scroll_event_cb(
+ GtkWidget *wid,
+ GdkEventScroll *event,
+ const gpointer userdata)
{
auto& FD = *(SScoringFacility::SPatternsDialog*)userdata;
@@ -94,7 +106,10 @@ daSFFDThing_scroll_event_cb( GtkWidget *wid, GdkEventScroll *event, gpointer use
gboolean
-daSFFDField_button_press_event_cb( GtkWidget *wid, GdkEventButton *event, gpointer userdata)
+daSFFDField_button_press_event_cb(
+ GtkWidget *wid,
+ GdkEventButton *event,
+ const gpointer userdata)
{
auto& FD = *(SScoringFacility::SPatternsDialog*)userdata;
auto& SF = FD._p;
@@ -122,7 +137,9 @@ daSFFDField_button_press_event_cb( GtkWidget *wid, GdkEventButton *event, gpoint
}
void
-iSFFDFieldDrawMatchIndex_toggled_cb( GtkCheckMenuItem* mitem, gpointer userdata)
+iSFFDFieldDrawMatchIndex_toggled_cb(
+ GtkCheckMenuItem* mitem,
+ const gpointer userdata)
{
auto& FD = *(SScoringFacility::SPatternsDialog*)userdata;
if ( FD.suppress_redraw )
@@ -133,7 +150,9 @@ iSFFDFieldDrawMatchIndex_toggled_cb( GtkCheckMenuItem* mitem, gpointer userdata)
void
-iSFFD_any_field_profile_type_toggled_cb( GtkRadioMenuItem* ritem, gpointer userdata)
+iSFFD_any_field_profile_type_toggled_cb(
+ GtkRadioMenuItem* ritem,
+ const gpointer userdata)
{
auto& FD = *(SScoringFacility::SPatternsDialog*)userdata;
if ( FD.suppress_redraw )
@@ -166,7 +185,10 @@ iSFFD_any_field_profile_type_toggled_cb( GtkRadioMenuItem* ritem, gpointer userd
gboolean
-daSFFDField_scroll_event_cb( GtkWidget *wid, GdkEventScroll *event, gpointer userdata)
+daSFFDField_scroll_event_cb(
+ GtkWidget *wid,
+ GdkEventScroll *event,
+ const gpointer userdata)
{
auto& FD = *(SScoringFacility::SPatternsDialog*)userdata;
@@ -195,7 +217,10 @@ daSFFDField_scroll_event_cb( GtkWidget *wid, GdkEventScroll *event, gpointer use
gboolean
-daSFFDField_motion_notify_event_cb( GtkWidget *wid, GdkEventMotion *event, gpointer userdata)
+daSFFDField_motion_notify_event_cb(
+ GtkWidget *wid,
+ GdkEventMotion *event,
+ const gpointer userdata)
{
auto& FD = *(SScoringFacility::SPatternsDialog*)userdata;
@@ -212,7 +237,9 @@ daSFFDField_motion_notify_event_cb( GtkWidget *wid, GdkEventMotion *event, gpoin
void
-bSFFDSearch_clicked_cb( GtkButton *button, gpointer userdata)
+bSFFDSearch_clicked_cb(
+ GtkButton*,
+ const gpointer userdata)
{
auto& FD = *(SScoringFacility::SPatternsDialog*)userdata;
auto& SF = FD._p;
@@ -250,7 +277,9 @@ bSFFDSearch_clicked_cb( GtkButton *button, gpointer userdata)
void
-bSFFDAgain_clicked_cb( GtkButton*, gpointer userdata)
+bSFFDAgain_clicked_cb(
+ GtkButton*,
+ const gpointer userdata)
{
auto& FD = *(SScoringFacility::SPatternsDialog*)userdata;
@@ -261,7 +290,9 @@ bSFFDAgain_clicked_cb( GtkButton*, gpointer userdata)
}
void
-iSFFDMarkPhasicEventSpindles_activate_cb( GtkMenuItem*, gpointer userdata)
+iSFFDMarkPhasicEventSpindles_activate_cb(
+ GtkMenuItem*,
+ const gpointer userdata)
{
auto& FD = *(SScoringFacility::SPatternsDialog*)userdata;
@@ -274,7 +305,9 @@ iSFFDMarkPhasicEventSpindles_activate_cb( GtkMenuItem*, gpointer userdata)
}
void
-iSFFDMarkPhasicEventKComplexes_activate_cb( GtkMenuItem*, gpointer userdata)
+iSFFDMarkPhasicEventKComplexes_activate_cb(
+ GtkMenuItem*,
+ const gpointer userdata)
{
auto& FD = *(SScoringFacility::SPatternsDialog*)userdata;
@@ -287,7 +320,9 @@ iSFFDMarkPhasicEventKComplexes_activate_cb( GtkMenuItem*, gpointer userdata)
}
void
-iSFFDMarkPlain_activate_cb( GtkMenuItem*, gpointer userdata)
+iSFFDMarkPlain_activate_cb(
+ GtkMenuItem*,
+ const gpointer userdata)
{
auto& FD = *(SScoringFacility::SPatternsDialog*)userdata;
@@ -308,7 +343,9 @@ iSFFDMarkPlain_activate_cb( GtkMenuItem*, gpointer userdata)
void
-eSFFD_any_pattern_value_changed_cb( GtkSpinButton*, gpointer userdata)
+eSFFD_any_pattern_value_changed_cb(
+ GtkSpinButton*,
+ const gpointer userdata)
{
auto& FD = *(SScoringFacility::SPatternsDialog*)userdata;
@@ -333,7 +370,9 @@ timeval_elapsed( const struct timeval &x, const struct timeval &y)
}
void
-eSFFD_any_criteria_value_changed_cb( GtkSpinButton* button, gpointer userdata)
+eSFFD_any_criteria_value_changed_cb(
+ GtkSpinButton* button,
+ const gpointer userdata)
{
auto& FD = *(SScoringFacility::SPatternsDialog*)userdata;
@@ -371,7 +410,10 @@ eSFFD_any_criteria_value_changed_cb( GtkSpinButton* button, gpointer userdata)
}
gboolean
-eSFFD_any_criteria_focus_in_event_cb( GtkWidget *button, GdkEvent*, gpointer userdata)
+eSFFD_any_criteria_focus_in_event_cb(
+ GtkWidget *button,
+ GdkEvent*,
+ const gpointer userdata)
{
auto& FD = *(SScoringFacility::SPatternsDialog*)userdata;
if ( button == (GtkWidget*)FD.eSFFDParameterA )
@@ -393,7 +435,9 @@ eSFFD_any_criteria_focus_in_event_cb( GtkWidget *button, GdkEvent*, gpointer use
void
-eSFFDChannel_changed_cb( GtkComboBox *combo, gpointer userdata)
+eSFFDChannel_changed_cb(
+ GtkComboBox *combo,
+ const gpointer userdata)
{
auto& FD = *(SScoringFacility::SPatternsDialog*)userdata;
auto& SF = FD._p;
@@ -405,7 +449,9 @@ eSFFDChannel_changed_cb( GtkComboBox *combo, gpointer userdata)
void
-wSFFD_show_cb( GtkWidget *widget, gpointer userdata)
+wSFFD_show_cb(
+ GtkWidget*,
+ const gpointer userdata)
{
auto& FD = *(SScoringFacility::SPatternsDialog*)userdata;
@@ -420,8 +466,12 @@ wSFFD_show_cb( GtkWidget *widget, gpointer userdata)
FD.preselect_channel( FD._p.using_channel_idx());
}
+
+
void
-wSFFD_hide_cb( GtkWidget *widget, gpointer userdata)
+wSFFD_hide_cb(
+ GtkWidget*,
+ gpointer userdata)
{
auto& FD = *(SScoringFacility::SPatternsDialog*)userdata;
auto& SF = FD._p;
@@ -442,9 +492,10 @@ wSFFD_hide_cb( GtkWidget *widget, gpointer userdata)
gboolean
-wSFFD_configure_event_cb( GtkWidget *widget,
- GdkEventConfigure *event,
- gpointer userdata)
+wSFFD_configure_event_cb(
+ GtkWidget*,
+ GdkEventConfigure *event,
+ const gpointer userdata)
{
auto& FD = *(SScoringFacility::SPatternsDialog*)userdata;
diff --git a/src/ui/sf/d/phasediff.cc b/src/ui/sf/d/phasediff.cc
index b401aa4..c31b771 100644
--- a/src/ui/sf/d/phasediff.cc
+++ b/src/ui/sf/d/phasediff.cc
@@ -126,7 +126,7 @@ preselect_channel( GtkComboBox *cbox, const string& ch)
void
aghui::SScoringFacility::SPhasediffDialog::
-draw( cairo_t* cr, int wd, int ht)
+draw( cairo_t* cr, const int wd, const int ht)
{
auto& SF = _p;
auto& ED = SF._p;
diff --git a/src/ui/sf/d/phasediff_cb.cc b/src/ui/sf/d/phasediff_cb.cc
index a67a827..9aea9ae 100644
--- a/src/ui/sf/d/phasediff_cb.cc
+++ b/src/ui/sf/d/phasediff_cb.cc
@@ -19,7 +19,10 @@ using namespace aghui;
extern "C" {
gboolean
-daSFPD_draw_cb( GtkWidget *wid, cairo_t *cr, gpointer userdata)
+daSFPD_draw_cb(
+ GtkWidget *wid,
+ cairo_t *cr,
+ const gpointer userdata)
{
auto& PD = *(SScoringFacility::SPhasediffDialog*)userdata;
@@ -35,7 +38,10 @@ daSFPD_draw_cb( GtkWidget *wid, cairo_t *cr, gpointer userdata)
gboolean
-daSFPD_scroll_event_cb( GtkWidget *wid, GdkEventScroll *event, gpointer userdata)
+daSFPD_scroll_event_cb(
+ GtkWidget *wid,
+ GdkEventScroll *event,
+ const gpointer userdata)
{
auto& PD = *(SScoringFacility::SPhasediffDialog*)userdata;
@@ -58,7 +64,9 @@ daSFPD_scroll_event_cb( GtkWidget *wid, GdkEventScroll *event, gpointer userdata
void
-eSFPDChannelA_changed_cb( GtkComboBox *cbox, gpointer userdata)
+eSFPDChannelA_changed_cb(
+ GtkComboBox *cbox,
+ const gpointer userdata)
{
auto& PD = *(SScoringFacility::SPhasediffDialog*)userdata;
@@ -72,7 +80,9 @@ eSFPDChannelA_changed_cb( GtkComboBox *cbox, gpointer userdata)
}
void
-eSFPDChannelB_changed_cb( GtkComboBox *cbox, gpointer userdata)
+eSFPDChannelB_changed_cb(
+ GtkComboBox *cbox,
+ const gpointer userdata)
{
auto& PD = *(SScoringFacility::SPhasediffDialog*)userdata;
@@ -89,8 +99,9 @@ eSFPDChannelB_changed_cb( GtkComboBox *cbox, gpointer userdata)
void
-eSFPDFreqFrom_value_changed_cb( GtkSpinButton *spinbutton,
- gpointer userdata)
+eSFPDFreqFrom_value_changed_cb(
+ GtkSpinButton *spinbutton,
+ const gpointer userdata)
{
auto& PD = *(SScoringFacility::SPhasediffDialog*)userdata;
@@ -105,8 +116,9 @@ eSFPDFreqFrom_value_changed_cb( GtkSpinButton *spinbutton,
}
void
-eSFPDBandwidth_value_changed_cb( GtkSpinButton *spinbutton,
- gpointer userdata)
+eSFPDBandwidth_value_changed_cb(
+ GtkSpinButton *spinbutton,
+ const gpointer userdata)
{
auto& PD = *(SScoringFacility::SPhasediffDialog*)userdata;
@@ -122,9 +134,10 @@ eSFPDBandwidth_value_changed_cb( GtkSpinButton *spinbutton,
void
-eSFPDSmooth_value_changed_cb( GtkScaleButton *b,
- gdouble v,
- gpointer userdata)
+eSFPDSmooth_value_changed_cb(
+ GtkScaleButton *b,
+ const gdouble v,
+ const gpointer userdata)
{
auto& PD = *(SScoringFacility::SPhasediffDialog*)userdata;
@@ -140,7 +153,9 @@ eSFPDSmooth_value_changed_cb( GtkScaleButton *b,
void
-wSFPD_show_cb( GtkWidget *wid, gpointer userdata)
+wSFPD_show_cb(
+ GtkWidget*,
+ const gpointer userdata)
{
auto& PD = *(SScoringFacility::SPhasediffDialog*)userdata;
auto& SF = PD._p;
@@ -169,7 +184,9 @@ wSFPD_show_cb( GtkWidget *wid, gpointer userdata)
}
void
-wSFPD_hide_cb( GtkWidget *wid, gpointer userdata)
+wSFPD_hide_cb(
+ GtkWidget *wid,
+ const gpointer userdata)
{
auto& PD = *(SScoringFacility::SPhasediffDialog*)userdata;
diff --git a/src/ui/sf/hypnogram_cb.cc b/src/ui/sf/hypnogram_cb.cc
index 88b5acd..ddb1b26 100644
--- a/src/ui/sf/hypnogram_cb.cc
+++ b/src/ui/sf/hypnogram_cb.cc
@@ -21,7 +21,10 @@ using namespace aghui;
extern "C" {
gboolean
-daSFHypnogram_draw_cb( GtkWidget *wid, cairo_t *cr, gpointer userdata)
+daSFHypnogram_draw_cb(
+ GtkWidget*,
+ cairo_t *cr,
+ const gpointer userdata)
{
auto& SF = *(SScoringFacility*)userdata;
@@ -34,7 +37,10 @@ daSFHypnogram_draw_cb( GtkWidget *wid, cairo_t *cr, gpointer userdata)
gboolean
-daSFHypnogram_button_press_event_cb( GtkWidget *wid, GdkEventButton *event, gpointer userdata)
+daSFHypnogram_button_press_event_cb(
+ GtkWidget *wid,
+ GdkEventButton *event,
+ const gpointer userdata)
{
auto& SF = *(SScoringFacility*)userdata;
@@ -46,18 +52,22 @@ daSFHypnogram_button_press_event_cb( GtkWidget *wid, GdkEventButton *event, gpoi
break;
case 2:
SF.alt_hypnogram = !SF.alt_hypnogram;
- gtk_widget_queue_draw( (GtkWidget*)SF.daSFHypnogram);
+ gtk_widget_queue_draw( wid);
break;
case 3:
- gtk_menu_popup( SF.iiSFScore,
- NULL, NULL, NULL, NULL, 3, event->time);
+ gtk_menu_popup(
+ SF.iiSFScore,
+ NULL, NULL, NULL, NULL, 3, event->time);
break;
}
return TRUE;
}
gboolean
-daSFHypnogram_button_release_event_cb( GtkWidget *wid, GdkEventButton *event, gpointer userdata)
+daSFHypnogram_button_release_event_cb(
+ GtkWidget*,
+ GdkEventButton *event,
+ const gpointer userdata)
{
auto& SF = *(SScoringFacility*)userdata;
@@ -75,7 +85,10 @@ daSFHypnogram_button_release_event_cb( GtkWidget *wid, GdkEventButton *event, gp
gboolean
-daSFHypnogram_motion_notify_event_cb( GtkWidget *wid, GdkEventMotion *event, gpointer userdata)
+daSFHypnogram_motion_notify_event_cb(
+ GtkWidget*,
+ GdkEventMotion *event,
+ const gpointer userdata)
{
auto& SF = *(SScoringFacility*)userdata;
if ( SF.hypnogram_button_down ) {
@@ -88,7 +101,9 @@ daSFHypnogram_motion_notify_event_cb( GtkWidget *wid, GdkEventMotion *event, gpo
void
-iSFScoreAssist_activate_cb( GtkMenuItem *menuitem, gpointer userdata)
+iSFScoreAssist_activate_cb(
+ GtkMenuItem*,
+ const gpointer userdata)
{
auto& SF = *(SScoringFacility*)userdata;
@@ -103,7 +118,9 @@ iSFScoreAssist_activate_cb( GtkMenuItem *menuitem, gpointer userdata)
void
-iSFScoreImport_activate_cb( GtkMenuItem *menuitem, gpointer userdata)
+iSFScoreImport_activate_cb(
+ GtkMenuItem*,
+ gpointer userdata)
{
auto& SF = *(SScoringFacility*)userdata;
@@ -145,7 +162,9 @@ iSFScoreImport_activate_cb( GtkMenuItem *menuitem, gpointer userdata)
}
void
-iSFScoreExport_activate_cb( GtkMenuItem *menuitem, gpointer userdata)
+iSFScoreExport_activate_cb(
+ GtkMenuItem*,
+ const gpointer userdata)
{
auto& SF = *(SScoringFacility*)userdata;
@@ -166,7 +185,9 @@ iSFScoreExport_activate_cb( GtkMenuItem *menuitem, gpointer userdata)
void
-iSFScoreClear_activate_cb( GtkMenuItem *menuitem, gpointer userdata)
+iSFScoreClear_activate_cb(
+ GtkMenuItem*,
+ const gpointer userdata)
{
auto& SF = *(SScoringFacility*)userdata;
diff --git a/src/ui/sf/ica.cc b/src/ui/sf/ica.cc
index 5c82fe8..c473cbb 100644
--- a/src/ui/sf/ica.cc
+++ b/src/ui/sf/ica.cc
@@ -133,7 +133,7 @@ int
aghui::SScoringFacility::
run_ica()
{
- if ( ica == NULL )
+ if ( ica == nullptr )
return 1;
aghui::SBusyBlock bb (wSF);
@@ -226,7 +226,7 @@ int
aghui::SScoringFacility::
restore_ics()
{
- if ( ica == NULL )
+ if ( ica == nullptr )
return 1;
switch ( remix_mode ) {
@@ -246,7 +246,7 @@ restore_ics()
int
aghui::SScoringFacility::
-apply_remix( bool do_backup)
+apply_remix( const bool do_backup)
{
if ( ica == nullptr )
return 1;
@@ -294,7 +294,7 @@ apply_remix( bool do_backup)
int
__attribute__ ((pure))
aghui::SScoringFacility::
-ic_near( double y) const
+ic_near( const double y) const
{
int nearest = INT_MAX, thisd;
int nearest_h = 0;
diff --git a/src/ui/sf/ica_cb.cc b/src/ui/sf/ica_cb.cc
index cb8373b..6d7b39c 100644
--- a/src/ui/sf/ica_cb.cc
+++ b/src/ui/sf/ica_cb.cc
@@ -19,7 +19,9 @@ using namespace aghui;
extern "C" {
void
-bSFRunICA_clicked_cb( GtkButton *button, gpointer userdata)
+bSFRunICA_clicked_cb(
+ GtkButton*,
+ gpointer userdata)
{
auto& SF = *(SScoringFacility*)userdata;
if ( SF.setup_ica() == 0 ) {
@@ -41,7 +43,9 @@ bSFRunICA_clicked_cb( GtkButton *button, gpointer userdata)
void
-eSFICANonlinearity_changed_cb( GtkComboBox* w, gpointer u)
+eSFICANonlinearity_changed_cb(
+ GtkComboBox* w,
+ const gpointer u)
{
auto& SF = *(SScoringFacility*)u;
static int vv[] = {
@@ -58,7 +62,9 @@ eSFICANonlinearity_changed_cb( GtkComboBox* w, gpointer u)
}
void
-eSFICAApproach_changed_cb( GtkComboBox* w, gpointer u)
+eSFICAApproach_changed_cb(
+ GtkComboBox* w,
+ const gpointer u)
{
auto& SF = *(SScoringFacility*)u;
static int vv[] = {
@@ -69,56 +75,72 @@ eSFICAApproach_changed_cb( GtkComboBox* w, gpointer u)
}
void
-eSFICAFineTune_toggled_cb( GtkCheckButton* w, gpointer u)
+eSFICAFineTune_toggled_cb(
+ GtkCheckButton* w,
+ const gpointer u)
{
auto& SF = *(SScoringFacility*)u;
SF.ica->obj().set_fine_tune( (bool)gtk_toggle_button_get_active( (GtkToggleButton*)w));
}
void
-eSFICAStabilizationMode_toggled_cb( GtkCheckButton* w, gpointer u)
+eSFICAStabilizationMode_toggled_cb(
+ GtkCheckButton* w,
+ const gpointer u)
{
auto& SF = *(SScoringFacility*)u;
SF.ica->obj().set_stabilization( (bool)gtk_toggle_button_get_active( (GtkToggleButton*)w));
}
void
-eSFICAa1_value_changed_cb( GtkSpinButton* w, gpointer u)
+eSFICAa1_value_changed_cb(
+ GtkSpinButton* w,
+ const gpointer u)
{
auto& SF = *(SScoringFacility*)u;
SF.ica->obj().set_a1( gtk_spin_button_get_value( w));
}
void
-eSFICAa2_value_changed_cb( GtkSpinButton* w, gpointer u)
+eSFICAa2_value_changed_cb(
+ GtkSpinButton* w,
+ const gpointer u)
{
auto& SF = *(SScoringFacility*)u;
SF.ica->obj().set_a2( gtk_spin_button_get_value( w));
}
void
-eSFICAmu_value_changed_cb( GtkSpinButton* w, gpointer u)
+eSFICAmu_value_changed_cb(
+ GtkSpinButton* w,
+ const gpointer u)
{
auto& SF = *(SScoringFacility*)u;
SF.ica->obj().set_mu( gtk_spin_button_get_value( w));
}
void
-eSFICAepsilon_value_changed_cb( GtkSpinButton* w, gpointer u)
+eSFICAepsilon_value_changed_cb(
+ GtkSpinButton* w,
+ const gpointer u)
{
auto& SF = *(SScoringFacility*)u;
SF.ica->obj().set_epsilon( gtk_spin_button_get_value( w));
}
void
-eSFICASampleSizePercent_value_changed_cb( GtkSpinButton* w, gpointer u)
+eSFICASampleSizePercent_value_changed_cb(
+ GtkSpinButton* w,
+ const gpointer u)
{
auto& SF = *(SScoringFacility*)u;
SF.ica->obj().set_sample_size( gtk_spin_button_get_value( w)/100);
}
void
-eSFICANofICs_value_changed_cb( GtkSpinButton* w, gpointer u)
+eSFICANofICs_value_changed_cb(
+ GtkSpinButton* w,
+ const gpointer u)
{
auto& SF = *(SScoringFacility*)u;
int n = (int)roundf( gtk_spin_button_get_value( w));
@@ -129,7 +151,9 @@ eSFICANofICs_value_changed_cb( GtkSpinButton* w, gpointer u)
}
void
-eSFICAEigVecFirst_value_changed_cb( GtkSpinButton* w, gpointer u)
+eSFICAEigVecFirst_value_changed_cb(
+ GtkSpinButton* w,
+ const gpointer u)
{
auto& SF = *(SScoringFacility*)u;
int n = (int)roundf( gtk_spin_button_get_value( w));
@@ -138,7 +162,9 @@ eSFICAEigVecFirst_value_changed_cb( GtkSpinButton* w, gpointer u)
}
void
-eSFICAEigVecLast_value_changed_cb( GtkSpinButton* w, gpointer u)
+eSFICAEigVecLast_value_changed_cb(
+ GtkSpinButton* w,
+ const gpointer u)
{
auto& SF = *(SScoringFacility*)u;
int n = (int)roundf( gtk_spin_button_get_value( w));
@@ -147,14 +173,18 @@ eSFICAEigVecLast_value_changed_cb( GtkSpinButton* w, gpointer u)
}
void
-eSFICAMaxIterations_value_changed_cb( GtkSpinButton* w, gpointer u)
+eSFICAMaxIterations_value_changed_cb(
+ GtkSpinButton* w,
+ const gpointer u)
{
auto& SF = *(SScoringFacility*)u;
SF.ica->obj().set_max_num_iterations( (int)roundf( gtk_spin_button_get_value( w)));
}
void
-eSFICARemixMode_changed_cb( GtkComboBox* w, gpointer u)
+eSFICARemixMode_changed_cb(
+ GtkComboBox* w,
+ const gpointer u)
{
auto& SF = *(SScoringFacility*)u;
static aghui::SScoringFacility::TICARemixMode vv[] = {
@@ -172,7 +202,9 @@ eSFICARemixMode_changed_cb( GtkComboBox* w, gpointer u)
void
-bSFICATry_clicked_cb( GtkButton *button, gpointer userdata)
+bSFICATry_clicked_cb(
+ GtkButton*,
+ gpointer userdata)
{
auto& SF = *(SScoringFacility*)userdata;
@@ -191,7 +223,9 @@ bSFICATry_clicked_cb( GtkButton *button, gpointer userdata)
}
void
-bSFICAPreview_toggled_cb( GtkToggleButton *button, gpointer userdata)
+bSFICAPreview_toggled_cb(
+ GtkToggleButton *button,
+ const gpointer userdata)
{
auto& SF = *(SScoringFacility*)userdata;
if ( SF.suppress_redraw )
@@ -230,7 +264,9 @@ mat2text_buffer( GtkTextBuffer *buffer, const itpp::mat& mx)
} // namespace
void
-bSFICAShowMatrix_toggled_cb( GtkToggleButton *button, gpointer userdata)
+bSFICAShowMatrix_toggled_cb(
+ GtkToggleButton *button,
+ const gpointer userdata)
{
auto& SF = *(SScoringFacility*)userdata;
@@ -245,7 +281,9 @@ bSFICAShowMatrix_toggled_cb( GtkToggleButton *button, gpointer userdata)
}
void
-wSFICAMatrix_hide_cb( GtkWidget *widget, gpointer userdata)
+wSFICAMatrix_hide_cb(
+ GtkWidget*,
+ const gpointer userdata)
{
auto& SF = *(SScoringFacility*)userdata;
gtk_toggle_button_set_active( SF.bSFICAShowMatrix, FALSE);
@@ -253,7 +291,9 @@ wSFICAMatrix_hide_cb( GtkWidget *widget, gpointer userdata)
void
-bSFICAApply_clicked_cb( GtkButton *button, gpointer userdata)
+bSFICAApply_clicked_cb(
+ GtkButton*,
+ const gpointer userdata)
{
auto& SF = *(SScoringFacility*)userdata;
@@ -269,7 +309,9 @@ bSFICAApply_clicked_cb( GtkButton *button, gpointer userdata)
}
void
-bSFICACancel_clicked_cb( GtkButton *button, gpointer userdata)
+bSFICACancel_clicked_cb(
+ GtkButton*,
+ const gpointer userdata)
{
auto& SF = *(SScoringFacility*)userdata;
diff --git a/src/ui/sf/montage-overlays.cc b/src/ui/sf/montage-overlays.cc
index d02a2d6..a860701 100644
--- a/src/ui/sf/montage-overlays.cc
+++ b/src/ui/sf/montage-overlays.cc
@@ -21,7 +21,7 @@ using namespace std;
void
aghui::SScoringFacility::SChannel::
draw_overlays( cairo_t* cr,
- int wd, float zeroy) const
+ const int wd, const float zeroy) const
{
if ( _p.mode != TMode::scoring )
return;
@@ -358,7 +358,9 @@ draw_overlays( cairo_t* cr,
void
aghui::SScoringFacility::
-_draw_hour_ticks( cairo_t *cr, int htop, int hbot, bool with_cursor)
+_draw_hour_ticks( cairo_t *cr,
+ const int htop, const int hbot,
+ const bool with_cursor)
{
cairo_set_line_width( cr, 1);
cairo_set_font_size( cr, 10);
diff --git a/src/ui/sf/montage.cc b/src/ui/sf/montage.cc
index c86b7f9..56943f5 100644
--- a/src/ui/sf/montage.cc
+++ b/src/ui/sf/montage.cc
@@ -157,7 +157,7 @@ space_evenly()
void
aghui::SScoringFacility::
-expand_by_factor( double fac)
+expand_by_factor( const double fac)
{
for ( auto &H : channels ) {
H.signal_display_scale *= fac;
@@ -169,8 +169,9 @@ expand_by_factor( double fac)
interchannel_gap *= fac;
da_ht *= fac;
- gtk_widget_set_size_request( (GtkWidget*)daSFMontage,
- -1, da_ht);
+ gtk_widget_set_size_request(
+ (GtkWidget*)daSFMontage,
+ -1, da_ht);
}
@@ -182,7 +183,8 @@ expand_by_factor( double fac)
void
aghui::SScoringFacility::SChannel::
-draw_for_montage( const string& fname, int width, int height) // to a file
+draw_for_montage( const string& fname,
+ const int width, const int height) // to a file
{
cairo_surface_t *cs = cairo_svg_surface_create( fname.c_str(), width, height);
cairo_t *cr = cairo_create( cs);
@@ -209,7 +211,7 @@ draw_for_montage( cairo_t* cr)
void
aghui::SScoringFacility::SChannel::
draw_page( cairo_t *cr,
- int wd, float y0,
+ const int wd, const float y0,
bool draw_marquee) const
{
int ptop = y0 - _p.interchannel_gap/2,
diff --git a/src/ui/sf/montage_cb.cc b/src/ui/sf/montage_cb.cc
index 683b916..6b3e7c4 100644
--- a/src/ui/sf/montage_cb.cc
+++ b/src/ui/sf/montage_cb.cc
@@ -25,9 +25,10 @@ using namespace aghui;
extern "C" {
gboolean
-daSFMontage_configure_event_cb( GtkWidget *widget,
- GdkEventConfigure *event,
- gpointer userdata)
+daSFMontage_configure_event_cb(
+ GtkWidget*,
+ GdkEventConfigure *event,
+ const gpointer userdata)
{
if ( event->type == GDK_CONFIGURE ) {
auto& SF = *(SScoringFacility*)userdata;
@@ -43,7 +44,10 @@ daSFMontage_configure_event_cb( GtkWidget *widget,
// -------------------- Page
gboolean
-daSFMontage_draw_cb( GtkWidget *wid, cairo_t *cr, gpointer userdata)
+daSFMontage_draw_cb(
+ GtkWidget*,
+ cairo_t *cr,
+ const gpointer userdata)
{
auto& SF = *(SScoringFacility*)userdata;
SF.draw_montage( cr);
@@ -53,7 +57,7 @@ daSFMontage_draw_cb( GtkWidget *wid, cairo_t *cr, gpointer userdata)
namespace {
void
-radio_item_setter( GtkWidget *i, gpointer u)
+radio_item_setter( GtkWidget *i, const gpointer u)
{
const char *label = gtk_menu_item_get_label( (GtkMenuItem*)i);
if ( strcmp(label, (const char*)u) == 0 )
@@ -63,7 +67,10 @@ radio_item_setter( GtkWidget *i, gpointer u)
gboolean
-daSFMontage_button_press_event_cb( GtkWidget *wid, GdkEventButton *event, gpointer userdata)
+daSFMontage_button_press_event_cb(
+ GtkWidget *wid,
+ GdkEventButton *event,
+ const gpointer userdata)
{
auto& SF = *(SScoringFacility*)userdata;
@@ -207,7 +214,10 @@ timeval_elapsed( const struct timeval &x, const struct timeval &y)
}
gboolean
-daSFMontage_motion_notify_event_cb( GtkWidget *wid, GdkEventMotion *event, gpointer userdata)
+daSFMontage_motion_notify_event_cb(
+ GtkWidget *wid,
+ GdkEventMotion *event,
+ const gpointer userdata)
{
auto& SF = *(SScoringFacility*)userdata;
if ( SF.mode == aghui::SScoringFacility::TMode::showing_ics )
@@ -273,7 +283,10 @@ daSFMontage_motion_notify_event_cb( GtkWidget *wid, GdkEventMotion *event, gpoin
gboolean
-daSFMontage_leave_notify_event_cb( GtkWidget *wid, GdkEventMotion *event, gpointer userdata)
+daSFMontage_leave_notify_event_cb(
+ GtkWidget*,
+ GdkEventMotion *event,
+ const gpointer userdata)
{
auto& SF = *(SScoringFacility*)userdata;
gtk_label_set_text( SF.lSFOverChannel, "");
@@ -283,7 +296,10 @@ daSFMontage_leave_notify_event_cb( GtkWidget *wid, GdkEventMotion *event, gpoint
gboolean
-daSFMontage_button_release_event_cb( GtkWidget *wid, GdkEventButton *event, gpointer userdata)
+daSFMontage_button_release_event_cb(
+ GtkWidget *wid,
+ GdkEventButton *event,
+ const gpointer userdata)
{
auto& SF = *(SScoringFacility*)userdata;
if ( SF.mode == aghui::SScoringFacility::TMode::showing_ics ||
@@ -329,7 +345,10 @@ daSFMontage_button_release_event_cb( GtkWidget *wid, GdkEventButton *event, gpoi
#define smoothness 1.05
gboolean
-daSFMontage_scroll_event_cb( GtkWidget *wid, GdkEventScroll *event, gpointer userdata)
+daSFMontage_scroll_event_cb(
+ GtkWidget *wid,
+ GdkEventScroll *event,
+ const gpointer userdata)
{
auto& SF = *(SScoringFacility*)userdata;
auto Ch = SF.using_channel = SF.channel_near( event->y);
@@ -465,7 +484,9 @@ daSFMontage_scroll_event_cb( GtkWidget *wid, GdkEventScroll *event, gpointer use
// -- Page
void
-iSFPageShowOriginal_toggled_cb( GtkCheckMenuItem *checkmenuitem, gpointer userdata)
+iSFPageShowOriginal_toggled_cb(
+ GtkCheckMenuItem *checkmenuitem,
+ const gpointer userdata)
{
auto& SF = *(SScoringFacility*)userdata;
if ( SF.suppress_redraw )
@@ -480,7 +501,9 @@ iSFPageShowOriginal_toggled_cb( GtkCheckMenuItem *checkmenuitem, gpointer userda
void
-iSFPageShowProcessed_toggled_cb( GtkCheckMenuItem *checkmenuitem, gpointer userdata)
+iSFPageShowProcessed_toggled_cb(
+ GtkCheckMenuItem *checkmenuitem,
+ const gpointer userdata)
{
auto& SF = *(SScoringFacility*)userdata;
if ( SF.suppress_redraw )
@@ -494,7 +517,9 @@ iSFPageShowProcessed_toggled_cb( GtkCheckMenuItem *checkmenuitem, gpointer userd
void
-iSFPageUseResample_toggled_cb( GtkCheckMenuItem *checkmenuitem, gpointer userdata)
+iSFPageUseResample_toggled_cb(
+ GtkCheckMenuItem *checkmenuitem,
+ const gpointer userdata)
{
auto& SF = *(SScoringFacility*)userdata;
if ( SF.suppress_redraw )
@@ -505,7 +530,9 @@ iSFPageUseResample_toggled_cb( GtkCheckMenuItem *checkmenuitem, gpointer userdat
void
-iSFPageDrawZeroline_toggled_cb( GtkCheckMenuItem *checkmenuitem, gpointer userdata)
+iSFPageDrawZeroline_toggled_cb(
+ GtkCheckMenuItem *checkmenuitem,
+ const gpointer userdata)
{
auto& SF = *(SScoringFacility*)userdata;
if ( SF.suppress_redraw )
@@ -515,7 +542,9 @@ iSFPageDrawZeroline_toggled_cb( GtkCheckMenuItem *checkmenuitem, gpointer userda
}
void
-iSFPageHide_activate_cb( GtkMenuItem*, gpointer userdata)
+iSFPageHide_activate_cb(
+ GtkMenuItem*,
+ const gpointer userdata)
{
auto& SF = *(SScoringFacility*)userdata;
SF.using_channel->hidden = true;
@@ -536,7 +565,9 @@ iSFPageHide_activate_cb( GtkMenuItem*, gpointer userdata)
void
-iSFPageShowHidden_activate_cb( GtkMenuItem *menuitem, gpointer userdata)
+iSFPageShowHidden_activate_cb(
+ GtkMenuItem *menuitem,
+ const gpointer userdata)
{
auto& SF = *(SScoringFacility*)userdata;
auto Ch = &SF[gtk_menu_item_get_label(menuitem)];
@@ -559,7 +590,9 @@ iSFPageShowHidden_activate_cb( GtkMenuItem *menuitem, gpointer userdata)
}
void
-iSFPageSpaceEvenly_activate_cb( GtkMenuItem *menuitem, gpointer userdata)
+iSFPageSpaceEvenly_activate_cb(
+ GtkMenuItem*,
+ const gpointer userdata)
{
auto& SF = *(SScoringFacility*)userdata;
SF.space_evenly();
@@ -567,7 +600,9 @@ iSFPageSpaceEvenly_activate_cb( GtkMenuItem *menuitem, gpointer userdata)
}
void
-iSFPageLocateSelection_activate_cb( GtkMenuItem*, gpointer userdata)
+iSFPageLocateSelection_activate_cb(
+ GtkMenuItem*,
+ const gpointer userdata)
{
auto& SF = *(SScoringFacility*)userdata;
if ( SF.using_channel->selection_start == SF.using_channel->selection_end ) {
@@ -579,7 +614,9 @@ iSFPageLocateSelection_activate_cb( GtkMenuItem*, gpointer userdata)
void
-iSFPageDrawPSDProfile_toggled_cb( GtkCheckMenuItem *checkmenuitem, gpointer userdata)
+iSFPageDrawPSDProfile_toggled_cb(
+ GtkCheckMenuItem *checkmenuitem,
+ const gpointer userdata)
{
auto& SF = *(SScoringFacility*)userdata;
if ( SF.suppress_redraw )
@@ -589,7 +626,9 @@ iSFPageDrawPSDProfile_toggled_cb( GtkCheckMenuItem *checkmenuitem, gpointer user
}
void
-iSFPageDrawPSDSpectrum_toggled_cb( GtkCheckMenuItem *checkmenuitem, gpointer userdata)
+iSFPageDrawPSDSpectrum_toggled_cb(
+ GtkCheckMenuItem *checkmenuitem,
+ const gpointer userdata)
{
auto& SF = *(SScoringFacility*)userdata;
if ( SF.suppress_redraw )
@@ -599,7 +638,9 @@ iSFPageDrawPSDSpectrum_toggled_cb( GtkCheckMenuItem *checkmenuitem, gpointer use
}
void
-iSFPageDrawMCProfile_toggled_cb( GtkCheckMenuItem *checkmenuitem, gpointer userdata)
+iSFPageDrawMCProfile_toggled_cb(
+ GtkCheckMenuItem *checkmenuitem,
+ const gpointer userdata)
{
auto& SF = *(SScoringFacility*)userdata;
if ( SF.suppress_redraw )
@@ -609,7 +650,9 @@ iSFPageDrawMCProfile_toggled_cb( GtkCheckMenuItem *checkmenuitem, gpointer userd
}
void
-iSFPageDrawSWUProfile_toggled_cb( GtkCheckMenuItem *checkmenuitem, gpointer userdata)
+iSFPageDrawSWUProfile_toggled_cb(
+ GtkCheckMenuItem *checkmenuitem,
+ const gpointer userdata)
{
auto& SF = *(SScoringFacility*)userdata;
if ( SF.suppress_redraw )
@@ -619,7 +662,9 @@ iSFPageDrawSWUProfile_toggled_cb( GtkCheckMenuItem *checkmenuitem, gpointer user
}
void
-iSFPageDrawEMGProfile_toggled_cb( GtkCheckMenuItem *checkmenuitem, gpointer userdata)
+iSFPageDrawEMGProfile_toggled_cb(
+ GtkCheckMenuItem *checkmenuitem,
+ const gpointer userdata)
{
auto& SF = *(SScoringFacility*)userdata;
if ( SF.suppress_redraw )
@@ -629,7 +674,9 @@ iSFPageDrawEMGProfile_toggled_cb( GtkCheckMenuItem *checkmenuitem, gpointer user
}
void
-iSFPageDrawPhasicSpindles_toggled_cb( GtkCheckMenuItem *checkmenuitem, gpointer userdata)
+iSFPageDrawPhasicSpindles_toggled_cb(
+ GtkCheckMenuItem *checkmenuitem,
+ const gpointer userdata)
{
auto& SF = *(SScoringFacility*)userdata;
if ( SF.suppress_redraw )
@@ -639,7 +686,9 @@ iSFPageDrawPhasicSpindles_toggled_cb( GtkCheckMenuItem *checkmenuitem, gpointer
}
void
-iSFPageDrawPhasicKComplexes_toggled_cb( GtkCheckMenuItem *checkmenuitem, gpointer userdata)
+iSFPageDrawPhasicKComplexes_toggled_cb(
+ GtkCheckMenuItem *checkmenuitem,
+ const gpointer userdata)
{
auto& SF = *(SScoringFacility*)userdata;
if ( SF.suppress_redraw )
@@ -649,7 +698,9 @@ iSFPageDrawPhasicKComplexes_toggled_cb( GtkCheckMenuItem *checkmenuitem, gpointe
}
void
-iSFPageDrawPhasicEyeBlinks_toggled_cb( GtkCheckMenuItem *checkmenuitem, gpointer userdata)
+iSFPageDrawPhasicEyeBlinks_toggled_cb(
+ GtkCheckMenuItem *checkmenuitem,
+ const gpointer userdata)
{
auto& SF = *(SScoringFacility*)userdata;
if ( SF.suppress_redraw )
@@ -660,7 +711,9 @@ iSFPageDrawPhasicEyeBlinks_toggled_cb( GtkCheckMenuItem *checkmenuitem, gpointer
void
-iSFPageFilter_activate_cb( GtkMenuItem *menuitem, gpointer userdata)
+iSFPageFilter_activate_cb(
+ GtkMenuItem*,
+ const gpointer userdata)
{
auto& SF = *(SScoringFacility*)userdata;
auto& FD = SF.filters_d();
@@ -692,7 +745,9 @@ iSFPageFilter_activate_cb( GtkMenuItem *menuitem, gpointer userdata)
void
-iSFPageArtifactsDetect_activate_cb( GtkMenuItem*, gpointer userdata)
+iSFPageArtifactsDetect_activate_cb(
+ GtkMenuItem*,
+ const gpointer userdata)
{
auto& SF = *(SScoringFacility*)userdata;
auto& AD = SF.artifacts_d();
@@ -701,7 +756,9 @@ iSFPageArtifactsDetect_activate_cb( GtkMenuItem*, gpointer userdata)
}
void
-iSFPageArtifactsMarkFlat_activate_cb( GtkMenuItem*, gpointer userdata)
+iSFPageArtifactsMarkFlat_activate_cb(
+ GtkMenuItem*,
+ const gpointer userdata)
{
auto& SF = *(SScoringFacility*)userdata;
auto& AS = SF.artifacts_simple_d();
@@ -723,7 +780,9 @@ iSFPageArtifactsMarkFlat_activate_cb( GtkMenuItem*, gpointer userdata)
void
-iSFPageArtifactsClear_activate_cb( GtkMenuItem *menuitem, gpointer userdata)
+iSFPageArtifactsClear_activate_cb(
+ GtkMenuItem*,
+ const gpointer userdata)
{
auto& SF = *(SScoringFacility*)userdata;
@@ -756,7 +815,9 @@ iSFPageArtifactsClear_activate_cb( GtkMenuItem *menuitem, gpointer userdata)
void
-iSFPageSaveChannelAsSVG_activate_cb( GtkMenuItem *menuitem, gpointer userdata)
+iSFPageSaveChannelAsSVG_activate_cb(
+ GtkMenuItem*,
+ const gpointer userdata)
{
auto& SF = *(SScoringFacility*)userdata;
auto& ED = SF._p;
@@ -772,7 +833,9 @@ iSFPageSaveChannelAsSVG_activate_cb( GtkMenuItem *menuitem, gpointer userdata)
void
-iSFPageSaveMontageAsSVG_activate_cb( GtkMenuItem *menuitem, gpointer userdata)
+iSFPageSaveMontageAsSVG_activate_cb(
+ GtkMenuItem*,
+ const gpointer userdata)
{
auto& SF = *(SScoringFacility*)userdata;
auto& ED = SF._p;
@@ -788,7 +851,9 @@ iSFPageSaveMontageAsSVG_activate_cb( GtkMenuItem *menuitem, gpointer userdata)
void
-iSFPageExportSignal_activate_cb( GtkMenuItem *menuitem, gpointer userdata)
+iSFPageExportSignal_activate_cb(
+ GtkMenuItem*,
+ const gpointer userdata)
{
auto& SF = *(SScoringFacility*)userdata;
auto& r = SF.using_channel->crecording;
@@ -805,7 +870,9 @@ iSFPageExportSignal_activate_cb( GtkMenuItem *menuitem, gpointer userdata)
void
-iSFPageUseThisScale_activate_cb( GtkMenuItem *menuitem, gpointer userdata)
+iSFPageUseThisScale_activate_cb(
+ GtkMenuItem*,
+ const gpointer userdata)
{
auto& SF = *(SScoringFacility*)userdata;
auto sane_signal_display_scale = SF.using_channel->signal_display_scale;
@@ -822,7 +889,9 @@ iSFPageUseThisScale_activate_cb( GtkMenuItem *menuitem, gpointer userdata)
void
-iSFPageAnnotationDelete_activate_cb( GtkMenuItem *menuitem, gpointer userdata)
+iSFPageAnnotationDelete_activate_cb(
+ GtkMenuItem*,
+ const gpointer userdata)
{
auto& SF = *(SScoringFacility*)userdata;
if ( SF.over_annotations.size() == 1 ) {
@@ -846,7 +915,9 @@ iSFPageAnnotationDelete_activate_cb( GtkMenuItem *menuitem, gpointer userdata)
void
-iSFPageAnnotationEdit_activate_cb( GtkMenuItem *menuitem, gpointer userdata)
+iSFPageAnnotationEdit_activate_cb(
+ GtkMenuItem*,
+ const gpointer userdata)
{
auto& SF = *(SScoringFacility*)userdata;
sigfile::SAnnotation *which =
@@ -896,15 +967,19 @@ iSFPageAnnotationEdit_activate_cb( GtkMenuItem *menuitem, gpointer userdata)
void
-iSFPageAnnotationClearAll_activate_cb( GtkMenuItem *menuitem, gpointer userdata)
+iSFPageAnnotationClearAll_activate_cb(
+ GtkMenuItem*,
+ const gpointer userdata)
{
auto& SF = *(SScoringFacility*)userdata;
char* chnamee = g_markup_escape_text( SF.using_channel->name.c_str(), -1);
if ( GTK_RESPONSE_YES
- == pop_question( SF.wSF,
- "Sure you want to delete all annotations in channel <b>%s</b>?",
- chnamee) ) {
+ == pop_question(
+ SF.wSF,
+ "Sure you want to delete all annotations in channel <b>%s</b>?",
+ chnamee) ) {
+
SF.using_channel->annotations.clear();
SF._p.populate_mGlobalAnnotations();
@@ -915,7 +990,9 @@ iSFPageAnnotationClearAll_activate_cb( GtkMenuItem *menuitem, gpointer userdata)
void
-iSFPageAnnotationGotoNext_activate_cb( GtkMenuItem*, gpointer userdata)
+iSFPageAnnotationGotoNext_activate_cb(
+ GtkMenuItem*,
+ const gpointer userdata)
{
auto& SF = *(SScoringFacility*)userdata;
@@ -932,7 +1009,9 @@ iSFPageAnnotationGotoNext_activate_cb( GtkMenuItem*, gpointer userdata)
}
void
-iSFPageAnnotationGotoPrev_activate_cb( GtkMenuItem*, gpointer userdata)
+iSFPageAnnotationGotoPrev_activate_cb(
+ GtkMenuItem*,
+ const gpointer userdata)
{
auto& SF = *(SScoringFacility*)userdata;
@@ -954,7 +1033,9 @@ iSFPageAnnotationGotoPrev_activate_cb( GtkMenuItem*, gpointer userdata)
void
-iSFICAPageMapIC_activate_cb( GtkRadioMenuItem* i, gpointer u)
+iSFICAPageMapIC_activate_cb(
+ GtkRadioMenuItem* i,
+ const gpointer u)
{
auto& SF = *(SScoringFacility*)u;
if ( SF.suppress_redraw )
@@ -983,7 +1064,9 @@ iSFICAPageMapIC_activate_cb( GtkRadioMenuItem* i, gpointer u)
// page selection
void
-iSFPageSelectionMarkArtifact_activate_cb( GtkMenuItem *menuitem, gpointer userdata)
+iSFPageSelectionMarkArtifact_activate_cb(
+ GtkMenuItem*,
+ const gpointer userdata)
{
auto& SF = *(SScoringFacility*)userdata;
auto& H = SF.using_channel;
@@ -996,7 +1079,9 @@ iSFPageSelectionMarkArtifact_activate_cb( GtkMenuItem *menuitem, gpointer userda
}
void
-iSFPageSelectionClearArtifact_activate_cb( GtkMenuItem *menuitem, gpointer userdata)
+iSFPageSelectionClearArtifact_activate_cb(
+ GtkMenuItem*,
+ const gpointer userdata)
{
auto& SF = *(SScoringFacility*)userdata;
auto& H = SF.using_channel;
@@ -1009,7 +1094,9 @@ iSFPageSelectionClearArtifact_activate_cb( GtkMenuItem *menuitem, gpointer userd
}
void
-iSFPageSelectionFindPattern_activate_cb( GtkMenuItem *menuitem, gpointer userdata)
+iSFPageSelectionFindPattern_activate_cb(
+ GtkMenuItem*,
+ gpointer userdata)
{
auto& SF = *(SScoringFacility*)userdata;
auto& H = SF.using_channel;
@@ -1017,7 +1104,9 @@ iSFPageSelectionFindPattern_activate_cb( GtkMenuItem *menuitem, gpointer userdat
}
void
-iSFPageSelectionAnnotate_activate_cb( GtkMenuItem *menuitem, gpointer userdata)
+iSFPageSelectionAnnotate_activate_cb(
+ GtkMenuItem*,
+ const gpointer userdata)
{
auto& SF = *(SScoringFacility*)userdata;
@@ -1050,7 +1139,9 @@ iSFPageSelectionAnnotate_activate_cb( GtkMenuItem *menuitem, gpointer userdata)
void
-iSFPageSelectionDrawCourse_toggled_cb( GtkCheckMenuItem *cb, gpointer userdata)
+iSFPageSelectionDrawCourse_toggled_cb(
+ GtkCheckMenuItem *cb,
+ const gpointer userdata)
{
auto& SF = *(SScoringFacility*)userdata;
SF.using_channel->draw_selection_course = gtk_check_menu_item_get_active( cb);
@@ -1060,7 +1151,9 @@ iSFPageSelectionDrawCourse_toggled_cb( GtkCheckMenuItem *cb, gpointer userdata)
}
void
-iSFPageSelectionDrawEnvelope_toggled_cb( GtkCheckMenuItem *cb, gpointer userdata)
+iSFPageSelectionDrawEnvelope_toggled_cb(
+ GtkCheckMenuItem *cb,
+ const gpointer userdata)
{
auto& SF = *(SScoringFacility*)userdata;
SF.using_channel->draw_selection_envelope = gtk_check_menu_item_get_active( cb);
@@ -1070,7 +1163,9 @@ iSFPageSelectionDrawEnvelope_toggled_cb( GtkCheckMenuItem *cb, gpointer userdata
}
void
-iSFPageSelectionDrawDzxdf_toggled_cb( GtkCheckMenuItem *cb, gpointer userdata)
+iSFPageSelectionDrawDzxdf_toggled_cb(
+ GtkCheckMenuItem *cb,
+ const gpointer userdata)
{
auto& SF = *(SScoringFacility*)userdata;
SF.using_channel->draw_selection_dzcdf = gtk_check_menu_item_get_active( cb);
@@ -1084,7 +1179,9 @@ iSFPageSelectionDrawDzxdf_toggled_cb( GtkCheckMenuItem *cb, gpointer userdata)
// power
void
-iSFPowerExportRange_activate_cb( GtkMenuItem *menuitem, gpointer userdata)
+iSFPowerExportRange_activate_cb(
+ GtkMenuItem*,
+ const gpointer userdata)
{
auto& SF = *(SScoringFacility*)userdata;
auto& R = SF.using_channel->crecording;
@@ -1125,7 +1222,9 @@ iSFPowerExportRange_activate_cb( GtkMenuItem *menuitem, gpointer userdata)
}
void
-iSFPowerExportAll_activate_cb( GtkMenuItem *menuitem, gpointer userdata)
+iSFPowerExportAll_activate_cb(
+ GtkMenuItem*,
+ const gpointer userdata)
{
const auto& SF = *(SScoringFacility*)userdata;
auto& R = SF.using_channel->crecording;
@@ -1155,13 +1254,15 @@ iSFPowerExportAll_activate_cb( GtkMenuItem *menuitem, gpointer userdata)
}
void
-iSFPowerSmooth_toggled_cb( GtkCheckMenuItem *checkmenuitem, gpointer userdata)
+iSFPowerSmooth_toggled_cb(
+ GtkCheckMenuItem *menuitem,
+ const gpointer userdata)
{
auto& SF = *(SScoringFacility*)userdata;
if ( SF.suppress_redraw )
return;
if ( likely (SF.using_channel->type == sigfile::SChannel::TType::eeg ) ) {
- SF.using_channel->resample_power = (bool)gtk_check_menu_item_get_active( checkmenuitem);
+ SF.using_channel->resample_power = (bool)gtk_check_menu_item_get_active( menuitem);
SF.using_channel->get_psd_course();
SF.using_channel->get_psd_in_bands();
SF.using_channel->get_swu_course();
@@ -1171,17 +1272,21 @@ iSFPowerSmooth_toggled_cb( GtkCheckMenuItem *checkmenuitem, gpointer userdata)
}
void
-iSFPowerDrawBands_toggled_cb( GtkCheckMenuItem *checkmenuitem, gpointer userdata)
+iSFPowerDrawBands_toggled_cb(
+ GtkCheckMenuItem *menuitem,
+ const gpointer userdata)
{
auto& SF = *(SScoringFacility*)userdata;
if ( SF.suppress_redraw )
return;
- SF.using_channel->draw_psd_bands = (bool)gtk_check_menu_item_get_active( checkmenuitem);
+ SF.using_channel->draw_psd_bands = (bool)gtk_check_menu_item_get_active( menuitem);
gtk_widget_queue_draw( (GtkWidget*)SF.daSFMontage);
}
void
-iSFPowerUseThisScale_activate_cb( GtkMenuItem *menuitem, gpointer userdata)
+iSFPowerUseThisScale_activate_cb(
+ GtkMenuItem*,
+ const gpointer userdata)
{
auto& SF = *(SScoringFacility*)userdata;
@@ -1197,7 +1302,9 @@ iSFPowerUseThisScale_activate_cb( GtkMenuItem *menuitem, gpointer userdata)
}
void
-iSFPowerAutoscale_toggled_cb( GtkCheckMenuItem *menuitem, gpointer userdata)
+iSFPowerAutoscale_toggled_cb(
+ GtkCheckMenuItem *menuitem,
+ const gpointer userdata)
{
auto& SF = *(SScoringFacility*)userdata;
if ( SF.suppress_redraw )
diff --git a/src/ui/sf/sf.cc b/src/ui/sf/sf.cc
index 9b8706e..6e6e2ee 100644
--- a/src/ui/sf/sf.cc
+++ b/src/ui/sf/sf.cc
@@ -38,7 +38,7 @@ const array<unsigned, 9>
size_t
__attribute__ ((pure))
aghui::SScoringFacility::
-figure_display_pagesize_item( size_t seconds)
+figure_display_pagesize_item( const size_t seconds)
{
size_t i = 0;
while ( i < DisplayPageSizeValues.size()-1 && DisplayPageSizeValues[i] < seconds )
@@ -151,9 +151,7 @@ SScoringFacility (agh::CSubject& J,
n_eeg_channels =
count_if( channels.begin(), channels.end(),
[] (const SChannel& h)
- {
- return h.type == sigfile::SChannel::TType::eeg;
- });
+ { return h.type == sigfile::SChannel::TType::eeg; });
// load montage, recalibrate display scales as necessary
load_montage();
@@ -199,11 +197,14 @@ SScoringFacility (agh::CSubject& J,
}
// set up other controls
+ // suppress flicker
+ suppress_redraw = true;
+
// set window title
- snprintf_buf( "Scoring: %s’s %s in %s",
- J.name.c_str(), E.c_str(), D.c_str());
- gtk_window_set_title( (GtkWindow*)wSF,
- __buf__);
+ gtk_window_set_title(
+ (GtkWindow*)wSF,
+ (snprintf_buf( "Scoring: %s’s %s in %s", J.name.c_str(), E.c_str(), D.c_str()),
+ __buf__));
// align empty area next to EMG profile with spectrum panes vertically
// g_object_set( (GObject*)cSFSleepStageStats,
@@ -216,16 +217,24 @@ SScoringFacility (agh::CSubject& J,
"height-request", (int)da_ht,
NULL);
+ // display proper control bar and set tooltip
+ gtk_widget_set_visible( (GtkWidget*)cSFScoringModeContainer, TRUE);
+ gtk_widget_set_visible( (GtkWidget*)cSFICAModeContainer, FALSE);
+ set_tooltip( TTipIdx::scoring_mode);
// grey out phasediff button if there are fewer than 2 EEG channels
- gtk_widget_set_sensitive( (GtkWidget*)bSFShowPhaseDiffDialog, (n_eeg_channels >= 2));
+ gtk_widget_set_sensitive(
+ (GtkWidget*)bSFShowPhaseDiffDialog,
+ (n_eeg_channels >= 2));
// desensitize iSFAcceptAndTakeNext unless there are more episodes
- gtk_widget_set_sensitive( (GtkWidget*)iSFAcceptAndTakeNext,
- J.measurements.at(D).episodes.back().name() != E);
+ gtk_widget_set_sensitive(
+ (GtkWidget*)iSFAcceptAndTakeNext,
+ J.measurements.at(D).episodes.back().name() != E);
// (de)sensitize various toolbar toggle buttons
- gtk_toggle_button_set_active( bSFDrawCrosshair,
- (gboolean)draw_crosshair);
+ gtk_toggle_button_set_active(
+ bSFDrawCrosshair,
+ (gboolean)draw_crosshair);
// add items to iSFPageHidden
for ( auto &H : channels )
@@ -233,19 +242,19 @@ SScoringFacility (agh::CSubject& J,
++n_hidden;
auto item = (GtkWidget*)(H.menu_item_when_hidden =
(GtkMenuItem*)gtk_menu_item_new_with_label( H.name.c_str()));
- g_object_set( (GObject*)item,
- "visible", TRUE,
- NULL);
- g_signal_connect( (GObject*)item,
- "activate", (GCallback)iSFPageShowHidden_activate_cb,
- this);
- gtk_container_add( (GtkContainer*)iiSFPageHidden,
- item);
+ g_object_set(
+ (GObject*)item,
+ "visible", TRUE,
+ NULL);
+ g_signal_connect(
+ (GObject*)item,
+ "activate", (GCallback)iSFPageShowHidden_activate_cb,
+ this);
+ gtk_container_add(
+ (GtkContainer*)iiSFPageHidden,
+ item);
}
- // draw all
- suppress_redraw = true;
-
{
int bar_height;
gtk_widget_get_size_request( (GtkWidget*)cSFControlBar, NULL, &bar_height);
@@ -256,23 +265,20 @@ SScoringFacility (agh::CSubject& J,
gdk_screen_get_width( gdk_screen_get_default()) * .90,
optimal_win_height);
}
+
+ // set current page and page size
set_cur_vpage( _cur_vpage, true);
set_vpagesize_item( pagesize_item, true); // will do set_cur_vpage one more time, but ok
- suppress_redraw = false;
+ suppress_redraw = false;
gtk_widget_show_all( (GtkWidget*)wSF);
- // display proper control bar and set tooltip
- gtk_widget_set_visible( (GtkWidget*)cSFScoringModeContainer, TRUE);
- gtk_widget_set_visible( (GtkWidget*)cSFICAModeContainer, FALSE);
- set_tooltip( TTipIdx::scoring_mode);
-
queue_redraw_all();
// advise parent we are open
_p.open_scoring_facilities.push_front( this);
- gtk_widget_set_visible( (GtkWidget*)_p.iExpRefresh, false);
- gtk_widget_set_visible( (GtkWidget*)_p.iExpClose, false);
- gtk_widget_set_visible( (GtkWidget*)_p.tSettings, false);
+ gtk_widget_set_visible( (GtkWidget*)_p.iExpRefresh, FALSE);
+ gtk_widget_set_visible( (GtkWidget*)_p.iExpClose, FALSE);
+ gtk_widget_set_visible( (GtkWidget*)_p.tSettings, FALSE);
// tell main window we are done (so it can start another instance of scoring facility)
_p.sb_clear();
@@ -351,7 +357,7 @@ channel_by_idx( size_t i)
aghui::SScoringFacility::SChannel*
__attribute__ ((pure))
aghui::SScoringFacility::
-channel_near( int y)
+channel_near( const int y)
{
int nearest = INT_MAX, thisy;
auto nearest_h = &channels.front();
@@ -441,7 +447,7 @@ calculate_scored_percent()
void
aghui::SScoringFacility::
-set_cur_vpage( size_t p, bool touch_self)
+set_cur_vpage( size_t p, const bool touch_self)
{
if ( _cur_vpage == p && !touch_self )
return;
@@ -467,7 +473,7 @@ set_cur_vpage( size_t p, bool touch_self)
void
aghui::SScoringFacility::
-set_vpagesize_item( int item, bool touch_self)
+set_vpagesize_item( int item, const bool touch_self)
{
if ( pagesize_item == item && !touch_self )
return;
@@ -496,7 +502,7 @@ set_vpagesize_item( int item, bool touch_self)
void
aghui::SScoringFacility::
-do_score_forward( char score_ch)
+do_score_forward( const char score_ch)
{
hypnogram[_cur_page] = score_ch;
calculate_scored_percent();
@@ -506,7 +512,7 @@ do_score_forward( char score_ch)
void
aghui::SScoringFacility::
-do_score_back( char score_ch)
+do_score_back( const char score_ch)
{
hypnogram[_cur_page] = score_ch;
calculate_scored_percent();
@@ -544,7 +550,7 @@ marquee_to_selection()
bool
aghui::SScoringFacility::
-page_has_artifacts( size_t p, bool search_all) const
+page_has_artifacts( const size_t p, const bool search_all) const
{
for ( auto &H : channels )
if ( ! search_all && H.hidden )
@@ -560,7 +566,7 @@ page_has_artifacts( size_t p, bool search_all) const
bool
aghui::SScoringFacility::
-page_has_annotations( size_t p, const SChannel& H) const
+page_has_annotations( const size_t p, const SChannel& H) const
{
int half_pad_samples = skirting_run_per1 * vpagesize() * H.samplerate();
int cvpa = p * pagesize() * H.samplerate() - half_pad_samples,
@@ -595,7 +601,7 @@ draw_score_stats() const
void
aghui::SScoringFacility::
-draw_current_pos( double x) const
+draw_current_pos( const double x) const
{
static const time_t epoch_clockhour = 3 * 60 * 60;
if ( isfinite(x) ) {
diff --git a/src/ui/sm/sm.cc b/src/ui/sm/sm.cc
index 91c57e9..2f9b297 100644
--- a/src/ui/sm/sm.cc
+++ b/src/ui/sm/sm.cc
@@ -158,7 +158,7 @@ destruct_widgets()
void
aghui::SSessionChooser::
-buf_on_status_bar( bool ensure)
+buf_on_status_bar( const bool)
{
// gtk_statusbar_pop( sbSessionChooserStatusBar, sbChooserContextIdGeneral);
// gtk_statusbar_push( sbSessionChooserStatusBar, sbChooserContextIdGeneral, __buf__);
@@ -172,7 +172,7 @@ buf_on_status_bar( bool ensure)
void
aghui::SSessionChooser::
-sb_progress_indicator( const char* current, size_t n, size_t i)
+sb_progress_indicator( const char* current, const size_t n, const size_t i)
{
snprintf_buf( "(%zu of %zu) %s", i, n, current);
buf_on_status_bar( true);
@@ -210,7 +210,7 @@ get_selected_dir()
string
aghui::SSessionChooser::
-get_dir( int idx) const
+get_dir( const int idx) const
{
GtkTreeIter iter;
gboolean valid = gtk_tree_model_get_iter_first( (GtkTreeModel*)mSessionChooserList, &iter);
diff --git a/src/ui/sm/sm_cb.cc b/src/ui/sm/sm_cb.cc
index cdde62b..8c8455f 100644
--- a/src/ui/sm/sm_cb.cc
+++ b/src/ui/sm/sm_cb.cc
@@ -24,7 +24,9 @@ using namespace aghui;
extern "C" {
void
-wSessionChooser_show_cb( GtkWidget *wid, gpointer userdata)
+wSessionChooser_show_cb(
+ GtkWidget*,
+ const gpointer userdata)
{
auto& SC = *(SSessionChooser*)userdata;
SC.last_dir_no = -1;
@@ -33,7 +35,9 @@ wSessionChooser_show_cb( GtkWidget *wid, gpointer userdata)
}
void
-wSessionChooser_destroy_cb( GtkWidget *wid, gpointer userdata)
+wSessionChooser_destroy_cb(
+ GtkWidget*,
+ const gpointer userdata)
{
auto& SC = *(SSessionChooser*)userdata;
@@ -43,20 +47,28 @@ wSessionChooser_destroy_cb( GtkWidget *wid, gpointer userdata)
}
void
-tvSessionChooserList_changed_cb( GtkTreeSelection *selection, gpointer userdata)
+tvSessionChooserList_changed_cb(
+ GtkTreeSelection*,
+ const gpointer userdata)
{
auto& SC = *(SSessionChooser*)userdata;
SC.conditionally_enable_buttons();
}
void
-tvSessionChooserList_row_activated_cb( GtkTreeView*, GtkTreePath*, GtkTreeViewColumn*, gpointer userdata)
+tvSessionChooserList_row_activated_cb(
+ GtkTreeView*,
+ GtkTreePath*,
+ GtkTreeViewColumn*,
+ const gpointer userdata)
{
bSessionChooserOpen_clicked_cb( nullptr, userdata);
}
void
-bSessionChooserOpen_clicked_cb( GtkButton*, gpointer userdata)
+bSessionChooserOpen_clicked_cb(
+ GtkButton*,
+ const gpointer userdata)
{
auto& SC = *(SSessionChooser*)userdata;
@@ -73,7 +85,9 @@ bSessionChooserOpen_clicked_cb( GtkButton*, gpointer userdata)
void
-bSessionChooserClose_clicked_cb( GtkButton*, gpointer userdata)
+bSessionChooserClose_clicked_cb(
+ GtkButton*,
+ const gpointer userdata)
{
auto& SC = *(SSessionChooser*)userdata;
@@ -83,7 +97,9 @@ bSessionChooserClose_clicked_cb( GtkButton*, gpointer userdata)
}
void
-bSessionChooserQuit_clicked_cb( GtkButton *button, gpointer userdata)
+bSessionChooserQuit_clicked_cb(
+ GtkButton*,
+ const gpointer userdata)
{
auto& SC = *(SSessionChooser*)userdata;
@@ -112,16 +128,21 @@ bSessionChooserQuit_clicked_cb( GtkButton *button, gpointer userdata)
void
-bSessionChooserCreateNew_clicked_cb( GtkButton *button, gpointer userdata)
+bSessionChooserCreateNew_clicked_cb(
+ GtkButton*,
+ const gpointer userdata)
{
auto& SC = *(SSessionChooser*)userdata;
- GtkWidget *dir_chooser = gtk_file_chooser_dialog_new( "Locate New Experiment Directory",
- NULL,
- GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER,
- GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
- GTK_STOCK_OPEN, GTK_RESPONSE_ACCEPT,
- NULL);
+ GtkWidget *dir_chooser =
+ gtk_file_chooser_dialog_new(
+ "Locate New Experiment Directory",
+ NULL,
+ GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER,
+ GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
+ GTK_STOCK_OPEN, GTK_RESPONSE_ACCEPT,
+ NULL);
+
if ( gtk_dialog_run( (GtkDialog*)dir_chooser) == GTK_RESPONSE_ACCEPT ) {
const char *new_dir = gtk_file_chooser_get_filename( (GtkFileChooser*)dir_chooser);
string new_dir_ {new_dir};
@@ -132,10 +153,14 @@ bSessionChooserCreateNew_clicked_cb( GtkButton *button, gpointer userdata)
GtkTreePath *path;
gtk_tree_view_get_cursor( SC.tvSessionChooserList, &path, NULL);
if ( path ) {
- gtk_tree_model_get_iter( (GtkTreeModel*)SC.mSessionChooserList, &iter_cur, path);
- gtk_list_store_insert_after( SC.mSessionChooserList, &iter, &iter_cur);
+ gtk_tree_model_get_iter(
+ (GtkTreeModel*)SC.mSessionChooserList,
+ &iter_cur, path);
+ gtk_list_store_insert_after(
+ SC.mSessionChooserList, &iter, &iter_cur);
} else
- gtk_list_store_append( SC.mSessionChooserList, &iter);
+ gtk_list_store_append(
+ SC.mSessionChooserList, &iter);
gtk_list_store_set( SC.mSessionChooserList, &iter,
2, new_dir,
@@ -144,9 +169,11 @@ bSessionChooserCreateNew_clicked_cb( GtkButton *button, gpointer userdata)
if ( path )
gtk_tree_path_next( path);
else
- path = gtk_tree_model_get_path( (GtkTreeModel*)SC.mSessionChooserList, &iter);
- gtk_tree_view_set_cursor( SC.tvSessionChooserList,
- path, NULL, TRUE);
+ path = gtk_tree_model_get_path(
+ (GtkTreeModel*)SC.mSessionChooserList, &iter);
+ gtk_tree_view_set_cursor(
+ SC.tvSessionChooserList,
+ path, NULL, TRUE);
SC._sync_model_to_list();
@@ -160,7 +187,9 @@ bSessionChooserCreateNew_clicked_cb( GtkButton *button, gpointer userdata)
void
-bSessionChooserRemove_clicked_cb( GtkButton *button, gpointer userdata)
+bSessionChooserRemove_clicked_cb(
+ GtkButton*,
+ const gpointer userdata)
{
auto& SC = *(SSessionChooser*)userdata;
@@ -192,4 +221,7 @@ bSessionChooserRemove_clicked_cb( GtkButton *button, gpointer userdata)
}
-// eof
+// Local Variables:
+// Mode: c++
+// indent-tabs-mode: nil
+// End:
diff --git a/src/ui/ui.hh b/src/ui/ui.hh
index 02bee43..699d116 100644
--- a/src/ui/ui.hh
+++ b/src/ui/ui.hh
@@ -33,11 +33,11 @@ using namespace std;
namespace aghui {
-inline int operator"" _hmm( long double v)
+inline int operator"" _hmm( const long double v)
{
return v * aghui::__hdpmm__;
}
-inline int operator"" _vmm( long double v)
+inline int operator"" _vmm( const long double v)
{
return v * aghui::__vdpmm__;
}
--
Sleep experiment manager
More information about the debian-med-commit
mailing list