[med-svn] [SCM] aghermann branch, master, updated. 4f7a3b774136ffffbaf9b05d90bd568347bc5461
Andrei Zavada
johnhommer at gmail.com
Fri Nov 16 00:50:34 UTC 2012
The following commit has been merged in the master branch:
commit 1b7aed0f2edb8ca529be19ff36a0461f55a2b62c
Author: Andrei Zavada <johnhommer at gmail.com>
Date: Sat Oct 27 14:55:18 2012 +0300
comment out Montage Defaults widgets, bring back Global Filters dialog
diff --git a/data/dialogs.glade b/data/dialogs.glade
index 2943130..1310c7d 100644
--- a/data/dialogs.glade
+++ b/data/dialogs.glade
@@ -180,6 +180,23 @@
</row>
</data>
</object>
+ <object class="GtkListStore" id="mGlobalFiltersNotchFilter">
+ <columns>
+ <!-- column-name type -->
+ <column type="gchararray"/>
+ </columns>
+ <data>
+ <row>
+ <col id="0" translatable="yes">none</col>
+ </row>
+ <row>
+ <col id="0" translatable="yes">at 50 Hz</col>
+ </row>
+ <row>
+ <col id="0" translatable="yes">at 60 Hz</col>
+ </row>
+ </data>
+ </object>
<object class="GtkListStore" id="mMsmtProfileType">
<columns>
<!-- column-name type -->
@@ -2030,6 +2047,7 @@ With bug reports, either send yours to <a href="mailto:aghermann-users at lists.
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="valign">center</property>
+ <property name="model">mGlobalFiltersNotchFilter</property>
</object>
<packing>
<property name="left_attach">1</property>
diff --git a/data/sf.glade b/data/sf.glade
index c440609..fc9d4d5 100644
--- a/data/sf.glade
+++ b/data/sf.glade
@@ -1,23 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<interface>
<!-- interface-requires gtk+ 3.0 -->
- <object class="GtkMenu" id="iiSFAccept">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <child>
- <object class="GtkMenuItem" id="iSFAcceptAndTakeNext">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="label" translatable="yes">_Accept and proceed to next episode</property>
- <property name="use_underline">True</property>
- </object>
- </child>
- </object>
- <object class="GtkAdjustment" id="jHighPassCutoff">
- <property name="upper">100</property>
- <property name="step_increment">0.25</property>
- <property name="page_increment">1</property>
- </object>
<object class="GtkAdjustment" id="jHighPassOrder">
<property name="upper">5</property>
<property name="step_increment">1</property>
@@ -39,6 +22,93 @@
<property name="step_increment">1</property>
<property name="page_increment">10</property>
</object>
+ <object class="GtkAdjustment" id="jPatternEnvTightness">
+ <property name="lower">1</property>
+ <property name="upper">20</property>
+ <property name="value">1</property>
+ <property name="step_increment">1</property>
+ <property name="page_increment">5</property>
+ </object>
+ <object class="GtkAdjustment" id="jPatternLPCutoff">
+ <property name="lower">0.25</property>
+ <property name="upper">8</property>
+ <property name="step_increment">0.10000000000000001</property>
+ <property name="page_increment">1</property>
+ </object>
+ <object class="GtkAdjustment" id="jPatternLPDZCDFSigma">
+ <property name="lower">0.01</property>
+ <property name="upper">10</property>
+ <property name="step_increment">0.01</property>
+ <property name="page_increment">10</property>
+ </object>
+ <object class="GtkAdjustment" id="jPatternLPDZCDFSmooth">
+ <property name="upper">12</property>
+ <property name="value">1</property>
+ <property name="step_increment">1</property>
+ <property name="page_increment">3</property>
+ </object>
+ <object class="GtkAdjustment" id="jPatternLPDZCDFStep">
+ <property name="lower">0.10000000000000001</property>
+ <property name="upper">5</property>
+ <property name="step_increment">0.10000000000000001</property>
+ <property name="page_increment">10</property>
+ </object>
+ <object class="GtkAdjustment" id="jPatternLPOrder">
+ <property name="lower">1</property>
+ <property name="upper">5</property>
+ <property name="value">1</property>
+ <property name="step_increment">1</property>
+ <property name="page_increment">10</property>
+ </object>
+ <object class="GtkAdjustment" id="jPatternStrictnessA">
+ <property name="lower">0.01</property>
+ <property name="upper">100</property>
+ <property name="value">0.0099999997764825821</property>
+ <property name="step_increment">0.01</property>
+ <property name="page_increment">1</property>
+ </object>
+ <object class="GtkAdjustment" id="jPatternStrictnessB">
+ <property name="lower">0.01</property>
+ <property name="upper">100</property>
+ <property name="value">0.01</property>
+ <property name="step_increment">0.01</property>
+ <property name="page_increment">1</property>
+ </object>
+ <object class="GtkAdjustment" id="jPatternStrictnessC">
+ <property name="lower">0.10000000000000001</property>
+ <property name="upper">100</property>
+ <property name="value">0.10000000000000001</property>
+ <property name="step_increment">0.10000000000000001</property>
+ <property name="page_increment">1</property>
+ </object>
+ <object class="GtkAdjustment" id="jPhaseDiffBandwidth">
+ <property name="lower">0.25</property>
+ <property name="upper">2</property>
+ <property name="step_increment">0.25</property>
+ <property name="page_increment">1</property>
+ </object>
+ <object class="GtkAdjustment" id="jPhaseDiffFrom">
+ <property name="upper">100</property>
+ <property name="step_increment">0.25</property>
+ <property name="page_increment">1</property>
+ </object>
+ <object class="GtkMenu" id="iiSFAccept">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <child>
+ <object class="GtkMenuItem" id="iSFAcceptAndTakeNext">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">_Accept and proceed to next episode</property>
+ <property name="use_underline">True</property>
+ </object>
+ </child>
+ </object>
+ <object class="GtkAdjustment" id="jHighPassCutoff">
+ <property name="upper">100</property>
+ <property name="step_increment">0.25</property>
+ <property name="page_increment">1</property>
+ </object>
<object class="GtkAdjustment" id="jSFADBackpolate">
<property name="upper">1</property>
<property name="value">0.5</property>
@@ -125,76 +195,6 @@
<property name="step_increment">0.5</property>
<property name="page_increment">2</property>
</object>
- <object class="GtkAdjustment" id="jPatternEnvTightness">
- <property name="lower">1</property>
- <property name="upper">20</property>
- <property name="value">1</property>
- <property name="step_increment">1</property>
- <property name="page_increment">5</property>
- </object>
- <object class="GtkAdjustment" id="jPatternLPCutoff">
- <property name="lower">0.25</property>
- <property name="upper">8</property>
- <property name="step_increment">0.10000000000000001</property>
- <property name="page_increment">1</property>
- </object>
- <object class="GtkAdjustment" id="jPatternLPDZCDFSigma">
- <property name="lower">0.01</property>
- <property name="upper">10</property>
- <property name="step_increment">0.01</property>
- <property name="page_increment">10</property>
- </object>
- <object class="GtkAdjustment" id="jPatternLPDZCDFSmooth">
- <property name="upper">12</property>
- <property name="value">1</property>
- <property name="step_increment">1</property>
- <property name="page_increment">3</property>
- </object>
- <object class="GtkAdjustment" id="jPatternLPDZCDFStep">
- <property name="lower">0.10000000000000001</property>
- <property name="upper">5</property>
- <property name="step_increment">0.10000000000000001</property>
- <property name="page_increment">10</property>
- </object>
- <object class="GtkAdjustment" id="jPatternLPOrder">
- <property name="lower">1</property>
- <property name="upper">5</property>
- <property name="value">1</property>
- <property name="step_increment">1</property>
- <property name="page_increment">10</property>
- </object>
- <object class="GtkAdjustment" id="jPatternStrictnessA">
- <property name="lower">0.01</property>
- <property name="upper">100</property>
- <property name="value">0.0099999997764825821</property>
- <property name="step_increment">0.01</property>
- <property name="page_increment">1</property>
- </object>
- <object class="GtkAdjustment" id="jPatternStrictnessB">
- <property name="lower">0.01</property>
- <property name="upper">100</property>
- <property name="value">0.01</property>
- <property name="step_increment">0.01</property>
- <property name="page_increment">1</property>
- </object>
- <object class="GtkAdjustment" id="jPatternStrictnessC">
- <property name="lower">0.10000000000000001</property>
- <property name="upper">100</property>
- <property name="value">0.10000000000000001</property>
- <property name="step_increment">0.10000000000000001</property>
- <property name="page_increment">1</property>
- </object>
- <object class="GtkAdjustment" id="jPhaseDiffBandwidth">
- <property name="lower">0.25</property>
- <property name="upper">2</property>
- <property name="step_increment">0.25</property>
- <property name="page_increment">1</property>
- </object>
- <object class="GtkAdjustment" id="jPhaseDiffFrom">
- <property name="upper">100</property>
- <property name="step_increment">0.25</property>
- <property name="page_increment">1</property>
- </object>
<object class="GtkAdjustment" id="jSFICAEigVecFirst">
<property name="lower">1</property>
<property name="upper">100</property>
@@ -260,23 +260,6 @@
<property name="step_increment">1</property>
<property name="page_increment">10</property>
</object>
- <object class="GtkListStore" id="mFilteNotchFilter">
- <columns>
- <!-- column-name type -->
- <column type="gchararray"/>
- </columns>
- <data>
- <row>
- <col id="0" translatable="yes">none</col>
- </row>
- <row>
- <col id="0" translatable="yes">at 50 Hz</col>
- </row>
- <row>
- <col id="0" translatable="yes">at 60 Hz</col>
- </row>
- </data>
- </object>
<object class="GtkListStore" id="mFilterNotchFilter">
<columns>
<!-- column-name type -->
@@ -1393,6 +1376,7 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="valign">center</property>
+ <property name="model">mFilterNotchFilter</property>
</object>
<packing>
<property name="left_attach">1</property>
@@ -2939,15 +2923,15 @@ on individual parameters:</property>
</packing>
</child>
<child>
- <object class="GtkButton" id="bScoreWake">
- <property name="label" translatable="yes">☺</property>
+ <object class="GtkButton" id="bScoreClear">
+ <property name="label" translatable="yes">⌫</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
- <property name="tooltip_markup" translatable="yes">Wake (<b>w</b>)</property>
+ <property name="tooltip_markup" translatable="yes">Clear (<b>q</b>)</property>
<property name="valign">center</property>
<property name="focus_on_click">False</property>
- <accelerator key="w" signal="activate"/>
+ <accelerator key="q" signal="activate"/>
</object>
<packing>
<property name="expand">False</property>
@@ -2956,15 +2940,15 @@ on individual parameters:</property>
</packing>
</child>
<child>
- <object class="GtkButton" id="bScoreClear">
- <property name="label" translatable="yes">⌫</property>
+ <object class="GtkButton" id="bScoreWake">
+ <property name="label" translatable="yes">☺</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
- <property name="tooltip_markup" translatable="yes">Clear (<b>q</b>)</property>
+ <property name="tooltip_markup" translatable="yes">Wake (<b>w</b>)</property>
<property name="valign">center</property>
<property name="focus_on_click">False</property>
- <accelerator key="q" signal="activate"/>
+ <accelerator key="w" signal="activate"/>
</object>
<packing>
<property name="expand">False</property>
@@ -3199,17 +3183,18 @@ on individual parameters:</property>
</packing>
</child>
<child>
- <object class="GtkToggleButton" id="bSFShowPhaseDiffDialog">
- <property name="label" translatable="yes">Δφ</property>
+ <object class="GtkToggleButton" id="bSFShowFindDialog">
+ <property name="label" translatable="yes">_Find</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
<property name="has_tooltip">True</property>
- <property name="tooltip_markup" translatable="yes">Interchannel signal shift (<b>F4</b>)</property>
- <property name="tooltip_text" translatable="yes">Interchannel signal shift (F4)</property>
+ <property name="tooltip_markup" translatable="yes">Find/manage patterns (<b>F3</b>)</property>
+ <property name="tooltip_text" translatable="yes">Find/manage patterns (F3)</property>
<property name="valign">center</property>
+ <property name="use_underline">True</property>
<property name="focus_on_click">False</property>
- <accelerator key="F4" signal="activate"/>
+ <accelerator key="F3" signal="activate"/>
</object>
<packing>
<property name="expand">False</property>
@@ -3219,18 +3204,17 @@ on individual parameters:</property>
</packing>
</child>
<child>
- <object class="GtkToggleButton" id="bSFShowFindDialog">
- <property name="label" translatable="yes">_Find</property>
+ <object class="GtkToggleButton" id="bSFShowPhaseDiffDialog">
+ <property name="label" translatable="yes">Δφ</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
<property name="has_tooltip">True</property>
- <property name="tooltip_markup" translatable="yes">Find/manage patterns (<b>F3</b>)</property>
- <property name="tooltip_text" translatable="yes">Find/manage patterns (F3)</property>
+ <property name="tooltip_markup" translatable="yes">Interchannel signal shift (<b>F4</b>)</property>
+ <property name="tooltip_text" translatable="yes">Interchannel signal shift (F4)</property>
<property name="valign">center</property>
- <property name="use_underline">True</property>
<property name="focus_on_click">False</property>
- <accelerator key="F3" signal="activate"/>
+ <accelerator key="F4" signal="activate"/>
</object>
<packing>
<property name="expand">False</property>
diff --git a/src/ui/mw/mw-construct.cc b/src/ui/mw/mw-construct.cc
index 733d85a..dddd2ad 100644
--- a/src/ui/mw/mw-construct.cc
+++ b/src/ui/mw/mw-construct.cc
@@ -117,9 +117,9 @@ SExpDesignUIWidgets ()
g_signal_connect( iExpGloballySetFilters, "activate",
(GCallback)iExpGloballySetFilters_activate_cb,
this);
- g_signal_connect( iMontageSetDefaults, "activate",
- (GCallback)iMontageSetDefaults_activate_cb,
- this);
+ // g_signal_connect( iMontageSetDefaults, "activate",
+ // (GCallback)iMontageSetDefaults_activate_cb,
+ // this);
g_signal_connect( iExpQuit, "activate",
(GCallback)iExpQuit_activate_cb,
this);
@@ -686,16 +686,26 @@ SExpDesignUIWidgets ()
!AGH_GBGETOBJ (GtkSpinButton, eBatchSetupRangeSteps) )
throw runtime_error ("Failed to construct widgets");
- // ------------- wMontageDefaults
- if ( !AGH_GBGETOBJ (GtkDialog, wMontageDefaults) ||
- !AGH_GBGETOBJ (GtkEntry, eMontageDefaultsChannelList) ||
- !AGH_GBGETOBJ (GtkCheckButton, eMontageDefaultsShowPSD) ||
- !AGH_GBGETOBJ (GtkCheckButton, eMontageDefaultsShowPSDSpectrum) ||
- !AGH_GBGETOBJ (GtkCheckButton, eMontageDefaultsShowMC) ||
- !AGH_GBGETOBJ (GtkCheckButton, eMontageDefaultsShowEMG) )
+ // // ------------- wMontageDefaults
+ // if ( !AGH_GBGETOBJ (GtkDialog, wMontageDefaults) ||
+ // !AGH_GBGETOBJ (GtkEntry, eMontageDefaultsChannelList) ||
+ // !AGH_GBGETOBJ (GtkCheckButton, eMontageDefaultsShowPSD) ||
+ // !AGH_GBGETOBJ (GtkCheckButton, eMontageDefaultsShowPSDSpectrum) ||
+ // !AGH_GBGETOBJ (GtkCheckButton, eMontageDefaultsShowMC) ||
+ // !AGH_GBGETOBJ (GtkCheckButton, eMontageDefaultsShowEMG) )
+ // throw runtime_error ("Failed to construct widgets");
+
+ // ----------- wGlobalFilters
+ if ( !AGH_GBGETOBJ (GtkDialog, wGlobalFilters) ||
+ !AGH_GBGETOBJ (GtkSpinButton, eGlobalFiltersLowPassCutoff) ||
+ !AGH_GBGETOBJ (GtkSpinButton, eGlobalFiltersLowPassOrder) ||
+ !AGH_GBGETOBJ (GtkSpinButton, eGlobalFiltersHighPassCutoff) ||
+ !AGH_GBGETOBJ (GtkSpinButton, eGlobalFiltersHighPassOrder) ||
+ !AGH_GBGETOBJ (GtkListStore, mGlobalFiltersNotchFilter) ||
+ !AGH_GBGETOBJ (GtkComboBox, eGlobalFiltersNotchFilter) )
throw runtime_error ("Failed to construct widgets");
- // ----------- annotations
+ // ----------- wGlobalAnnotations
if ( !AGH_GBGETOBJ (GtkDialog, wGlobalAnnotations) ||
!AGH_GBGETOBJ (GtkTreeView, tvGlobalAnnotations) )
throw runtime_error ("Failed to construct widgets");
@@ -729,7 +739,7 @@ SExpDesignUIWidgets ()
gtk_tree_view_append_column( tvGlobalAnnotations,
gtk_tree_view_column_new());
- // ------------- artifact detection profiles
+ // ------------- wGlobalArtifactDetection
if ( !AGH_GBGETOBJ (GtkDialog, wGlobalArtifactDetection) ||
!AGH_GBGETOBJ (GtkComboBox, eGlobalADProfiles) ||
!AGH_GBGETOBJ (GtkCheckButton, eGlobalADKeepExisting) ||
@@ -749,6 +759,7 @@ SExpDesignUIWidgets ()
g_signal_connect( eGlobalADProfiles, "changed",
(GCallback)eGlobalADProfiles_changed_cb,
this);
+
pango_font_description_free( font_desc);
}
@@ -765,6 +776,7 @@ aghui::SExpDesignUIWidgets::
gtk_widget_destroy( (GtkWidget*)wEDFFileDetails);
gtk_widget_destroy( (GtkWidget*)wEdfImport);
gtk_widget_destroy( (GtkWidget*)wGlobalAnnotations);
+ gtk_widget_destroy( (GtkWidget*)wGlobalFilters);
gtk_widget_destroy( (GtkWidget*)wSubjectDetails);
gtk_widget_destroy( (GtkWidget*)wBatchSetup);
// and models, etc
@@ -773,6 +785,7 @@ aghui::SExpDesignUIWidgets::
g_object_unref( (GObject*)mSessions);
g_object_unref( (GObject*)mGlobalAnnotations);
g_object_unref( (GObject*)mGlobalADProfiles);
+ g_object_unref( (GObject*)mGlobalFiltersNotchFilter);
g_object_unref( (GObject*)mSimulations);
g_object_unref( (GObject*)mScoringPageSize);
@@ -787,7 +800,7 @@ aghui::SExpDesignUIWidgets::
g_object_unref( (GObject*)iSubjectTimelineSaveAsSVG);
g_object_unref( (GObject*)iSubjectTimelineResetMontage);
g_object_unref( (GObject*)iSubjectTimelineBrowse);
- // I'm quite possibly missing somthing
+ // I'm quite possibly missing something
}
diff --git a/src/ui/mw/mw-widgets.hh b/src/ui/mw/mw-widgets.hh
index 9b098a0..4801c81 100644
--- a/src/ui/mw/mw-widgets.hh
+++ b/src/ui/mw/mw-widgets.hh
@@ -58,7 +58,7 @@ struct SExpDesignUIWidgets {
*mFFTParamsBinSize,
*mFFTParamsWindowType,
*mMsmtProfileType,
- *mNotchFilter;
+ *mGlobalFiltersNotchFilter;
static const auto
msimulations_visibility_switch_col = 14,
msimulations_modref_col = msimulations_visibility_switch_col + 1;
@@ -289,16 +289,16 @@ struct SExpDesignUIWidgets {
*eBatchSetupRangeInc,
*eBatchSetupRangeSteps;
- // montage defaults
- GtkDialog
- *wMontageDefaults;
- GtkEntry
- *eMontageDefaultsChannelList;
- GtkCheckButton
- *eMontageDefaultsShowPSD,
- *eMontageDefaultsShowPSDSpectrum,
- *eMontageDefaultsShowMC,
- *eMontageDefaultsShowEMG;
+ // // montage defaults
+ // GtkDialog
+ // *wMontageDefaults;
+ // GtkEntry
+ // *eMontageDefaultsChannelList;
+ // GtkCheckButton
+ // *eMontageDefaultsShowPSD,
+ // *eMontageDefaultsShowPSDSpectrum,
+ // *eMontageDefaultsShowMC,
+ // *eMontageDefaultsShowEMG;
// global artifact detection
GtkDialog
diff --git a/src/ui/mw/mw_cb.cc b/src/ui/mw/mw_cb.cc
index 00e5571..26d73e0 100644
--- a/src/ui/mw/mw_cb.cc
+++ b/src/ui/mw/mw_cb.cc
@@ -242,15 +242,15 @@ eGlobalADProfiles_changed_cb( GtkComboBox *b, gpointer userdata)
-void
-iMontageSetDefaults_activate_cb( GtkMenuItem*, gpointer userdata)
-{
- auto& ED = *(SExpDesignUI*)userdata;
-
- if ( GTK_RESPONSE_OK ==
- gtk_dialog_run( ED.wMontageDefaults) )
- FAFA;
-}
+//
+// iMontageSetDefaults_activate_cb( GtkMenuItem*, gpointer userdata)
+// {
+// auto& ED = *(SExpDesignUI*)userdata;
+
+// if ( GTK_RESPONSE_OK ==
+// gtk_dialog_run( ED.wMontageDefaults) )
+// FAFA;
+// }
diff --git a/src/ui/mw/mw_cb.hh b/src/ui/mw/mw_cb.hh
index 5f690ae..0ea9398 100644
--- a/src/ui/mw/mw_cb.hh
+++ b/src/ui/mw/mw_cb.hh
@@ -32,7 +32,7 @@ void iExpGloballyDetectArtifacts_activate_cb( GtkMenuItem*, gpointer);
void iExpGloballySetFilters_activate_cb( GtkMenuItem*, gpointer);
void iExpClose_activate_cb( GtkMenuItem*, gpointer);
void iExpQuit_activate_cb( GtkMenuItem*, gpointer);
-void iMontageSetDefaults_activate_cb( GtkMenuItem*, gpointer);
+// void iMontageSetDefaults_activate_cb( GtkMenuItem*, gpointer);
void iHelpAbout_activate_cb( GtkMenuItem*, gpointer);
void iHelpUsage_activate_cb( GtkMenuItem*, gpointer);
diff --git a/src/ui/sf/sf-montage.cc b/src/ui/sf/sf-montage.cc
index 574edfb..c0c8509 100644
--- a/src/ui/sf/sf-montage.cc
+++ b/src/ui/sf/sf-montage.cc
@@ -920,7 +920,6 @@ _draw_matrix_to_montage( cairo_t *cr, const itpp::Mat<T>& mat)
}
// waveform
- bool our_resample_signal = false;
auto sr = channels.front().samplerate(); // ica wouldn't start if samplerates were different between any two channels
auto our_display_scale = channels.front().signal_display_scale;
diff --git a/src/ui/sf/sf-montage_cb.cc b/src/ui/sf/sf-montage_cb.cc
index 440a8ac..c46ab99 100644
--- a/src/ui/sf/sf-montage_cb.cc
+++ b/src/ui/sf/sf-montage_cb.cc
@@ -153,7 +153,7 @@ daSFMontage_button_press_event_cb( GtkWidget *wid, GdkEventButton *event, gpoint
break;
case 3:
if ( (event->state & GDK_MOD1_MASK && SF.n_hidden > 0) ||
- !(SF.n_hidden < SF.channels.size()) )
+ !(SF.n_hidden < (int)SF.channels.size()) )
gtk_menu_popup( SF.mSFPageHidden,
NULL, NULL, NULL, NULL, 3, event->time);
else {
@@ -388,6 +388,7 @@ daSFMontage_scroll_event_cb( GtkWidget *wid, GdkEventScroll *event, gpointer use
break;
case GDK_SCROLL_LEFT:
case GDK_SCROLL_RIGHT:
+ default:
break;
}
else if ( event->state & GDK_SHIFT_MASK && event->state & GDK_MOD1_MASK && Ch->draw_mc )
@@ -413,6 +414,7 @@ daSFMontage_scroll_event_cb( GtkWidget *wid, GdkEventScroll *event, gpointer use
break;
case GDK_SCROLL_LEFT:
case GDK_SCROLL_RIGHT:
+ default:
break;
}
@@ -436,6 +438,8 @@ daSFMontage_scroll_event_cb( GtkWidget *wid, GdkEventScroll *event, gpointer use
SF.set_cur_vpage( SF.cur_vpage() + 1);
}
break;
+ default:
+ break;
}
if ( event->state & GDK_CONTROL_MASK )
for ( auto& H : SF.channels ) {
--
Sleep experiment manager
More information about the debian-med-commit
mailing list