[med-svn] [SCM] aghermann branch, master, updated. 9c95ea59282c4fc6ef7eb192072500f9d0659fc3
Andrei Zavada
johnhommer at gmail.com
Tue Jan 8 00:24:51 UTC 2013
The following commit has been merged in the master branch:
commit be1bfa12c67053545cd2af09a03ad4ce49871c55
Author: Andrei Zavada <johnhommer at gmail.com>
Date: Sat Jan 5 13:48:28 2013 +0200
SF: only show profile, phasic events submenus where appropriate
diff --git a/data/sf.glade b/data/sf.glade
index 96dfb18..6a29f66 100644
--- a/data/sf.glade
+++ b/data/sf.glade
@@ -298,7 +298,7 @@
</object>
</child>
<child>
- <object class="GtkSeparatorMenuItem" id="iSFPageProfileItemsSeparator">
+ <object class="GtkSeparatorMenuItem" id="iSFPageProfilesSubmenuSeparator">
<property name="visible">True</property>
<property name="can_focus">False</property>
</object>
@@ -346,16 +346,40 @@
</object>
</child>
<child>
- <object class="GtkSeparatorMenuItem" id="menuitem122">
+ <object class="GtkCheckMenuItem" id="iSFPageDrawEMGProfile">
<property name="visible">True</property>
<property name="can_focus">False</property>
+ <property name="label" translatable="yes">E_MG profile</property>
+ <property name="use_underline">True</property>
</object>
</child>
+ </object>
+ </child>
+ </object>
+ </child>
+ <child>
+ <object class="GtkMenuItem" id="iiSFPagePhasicEvents">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">Pha_sic events</property>
+ <property name="use_underline">True</property>
+ <child type="submenu">
+ <object class="GtkMenu" id="menu6">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
<child>
- <object class="GtkCheckMenuItem" id="iSFPageDrawEMGProfile">
+ <object class="GtkCheckMenuItem" id="iSFPageDrawPhasicSpindles">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes">E_MG profile</property>
+ <property name="label" translatable="yes">_Spindles</property>
+ <property name="use_underline">True</property>
+ </object>
+ </child>
+ <child>
+ <object class="GtkCheckMenuItem" id="iSFPageDrawPhasicKComplexes">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">_K-complexes</property>
<property name="use_underline">True</property>
</object>
</child>
@@ -2982,15 +3006,15 @@ on individual parameters: <b>a</b> for <i>Envelope</i>,
</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>
@@ -2999,15 +3023,15 @@ on individual parameters: <b>a</b> for <i>Envelope</i>,
</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>
@@ -3242,17 +3266,18 @@ on individual parameters: <b>a</b> for <i>Envelope</i>,
</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>
@@ -3262,18 +3287,17 @@ on individual parameters: <b>a</b> for <i>Envelope</i>,
</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/sf/sf-channel.cc b/src/ui/sf/sf-channel.cc
index 5e43bc2..dc22c6a 100644
--- a/src/ui/sf/sf-channel.cc
+++ b/src/ui/sf/sf-channel.cc
@@ -82,6 +82,7 @@ SChannel( agh::CRecording& r,
confval::SValidator<double>( string(1, seq) + ".selection_end_time", &selection_end_time),
confval::SValidator<double>( string(1, seq) + ".signal_display_scale", &signal_display_scale, confval::SValidator<double>::SVFRangeIn (DBL_MIN, INFINITY)),
confval::SValidator<double>( string(1, seq) + ".psd_display_scale", &psd.display_scale, confval::SValidator<double>::SVFRangeIn (DBL_MIN, INFINITY)),
+ confval::SValidator<double>( string(1, seq) + ".swu_display_scale", &swu.display_scale, confval::SValidator<double>::SVFRangeIn (DBL_MIN, INFINITY)),
confval::SValidator<double>( string(1, seq) + ".mc_display_scale", &mc.display_scale, confval::SValidator<double>::SVFRangeIn (DBL_MIN, INFINITY)),
confval::SValidator<double>( string(1, seq) + ".emg_display_scale", &emg_display_scale, confval::SValidator<double>::SVFRangeIn (DBL_MIN, INFINITY)),
}),
@@ -387,6 +388,7 @@ detect_artifacts( const metrics::mc::SArtifactDetectionPP& P)
get_psd_course();
get_psd_in_bands();
get_spectrum( _p.cur_page());
+ get_swu_course();
get_mc_course();
// if ( this == channel currently displayed on measurements overview )
@@ -415,6 +417,7 @@ mark_region_as_artifact( bool do_mark)
get_psd_course();
get_psd_in_bands();
get_spectrum( _p.cur_page());
+ get_swu_course();
get_mc_course();
if ( strcmp( name, _p._p.AghH()) == 0 )
@@ -448,44 +451,33 @@ update_channel_check_menu_items()
{
_p.suppress_redraw = true;
- gtk_check_menu_item_set_active( _p.iSFPageShowOriginal,
- (gboolean)draw_original_signal);
- gtk_check_menu_item_set_active( _p.iSFPageShowProcessed,
- (gboolean)draw_filtered_signal);
- gtk_check_menu_item_set_active( _p.iSFPageUseResample,
- (gboolean)resample_signal);
- gtk_check_menu_item_set_active( _p.iSFPageDrawZeroline,
- (gboolean)draw_zeroline);
-
- gtk_check_menu_item_set_active( _p.iSFPageDrawPSDProfile,
- (gboolean)draw_psd);
- gtk_check_menu_item_set_active( _p.iSFPageDrawPSDSpectrum,
- (gboolean)draw_spectrum);
- gtk_check_menu_item_set_active( _p.iSFPageDrawMCProfile,
- (gboolean)draw_mc);
- gtk_check_menu_item_set_active( _p.iSFPageDrawSWUProfile,
- (gboolean)draw_swu);
-
- gtk_check_menu_item_set_active( _p.iSFPageSelectionDrawCourse,
- (gboolean)draw_selection_course);
- gtk_check_menu_item_set_active( _p.iSFPageSelectionDrawEnvelope,
- (gboolean)draw_selection_envelope);
- gtk_check_menu_item_set_active( _p.iSFPageSelectionDrawDzxdf,
- (gboolean)draw_selection_dzcdf);
-
- gtk_widget_set_visible( (GtkWidget*)_p.iSFPageDrawPSDProfile,
- type == sigfile::SChannel::TType::eeg);
- gtk_widget_set_visible( (GtkWidget*)_p.iSFPageDrawPSDSpectrum,
- type == sigfile::SChannel::TType::eeg);
- gtk_widget_set_visible( (GtkWidget*)_p.iSFPageDetectArtifacts,
- type == sigfile::SChannel::TType::eeg);
- gtk_widget_set_visible( (GtkWidget*)_p.iSFPageDrawMCProfile,
- type == sigfile::SChannel::TType::eeg);
- gtk_widget_set_visible( (GtkWidget*)_p.iSFPageDrawEMGProfile,
- type == sigfile::SChannel::TType::emg);
-
- gtk_widget_set_visible( (GtkWidget*)_p.iSFPageProfileItemsSeparator,
- type == sigfile::SChannel::TType::eeg || type == sigfile::SChannel::TType::emg);
+ gtk_check_menu_item_set_active( _p.iSFPageShowOriginal, (gboolean)draw_original_signal);
+ gtk_check_menu_item_set_active( _p.iSFPageShowProcessed, (gboolean)draw_filtered_signal);
+ gtk_check_menu_item_set_active( _p.iSFPageUseResample, (gboolean)resample_signal);
+ gtk_check_menu_item_set_active( _p.iSFPageDrawZeroline, (gboolean)draw_zeroline);
+
+ gtk_check_menu_item_set_active( _p.iSFPageDrawPSDProfile, (gboolean)draw_psd);
+ gtk_check_menu_item_set_active( _p.iSFPageDrawPSDSpectrum, (gboolean)draw_spectrum);
+ gtk_check_menu_item_set_active( _p.iSFPageDrawMCProfile, (gboolean)draw_mc);
+ gtk_check_menu_item_set_active( _p.iSFPageDrawSWUProfile, (gboolean)draw_swu);
+
+ gtk_check_menu_item_set_active( _p.iSFPageSelectionDrawCourse, (gboolean)draw_selection_course);
+ gtk_check_menu_item_set_active( _p.iSFPageSelectionDrawEnvelope, (gboolean)draw_selection_envelope);
+ gtk_check_menu_item_set_active( _p.iSFPageSelectionDrawDzxdf, (gboolean)draw_selection_dzcdf);
+
+ bool is_eeg = (type == sigfile::SChannel::TType::eeg),
+ is_emg = (type == sigfile::SChannel::TType::emg),
+ have_profile = is_eeg or is_emg;
+ gtk_widget_set_visible( (GtkWidget*)_p.iSFPageProfilesSubmenuSeparator, have_profile);
+ gtk_widget_set_visible( (GtkWidget*)_p.iiSFPageProfiles, have_profile);
+ gtk_widget_set_visible( (GtkWidget*)_p.iiSFPagePhasicEvents, have_profile);
+ gtk_widget_set_visible( (GtkWidget*)_p.iSFPageDrawPSDProfile, is_eeg);
+ gtk_widget_set_visible( (GtkWidget*)_p.iSFPageDrawPSDSpectrum, is_eeg);
+ gtk_widget_set_visible( (GtkWidget*)_p.iSFPageDrawSWUProfile, is_eeg);
+
+ gtk_widget_set_visible( (GtkWidget*)_p.iSFPageDetectArtifacts, is_eeg);
+ gtk_widget_set_visible( (GtkWidget*)_p.iSFPageDrawMCProfile, is_eeg);
+ gtk_widget_set_visible( (GtkWidget*)_p.iSFPageDrawEMGProfile, is_emg);
_p.suppress_redraw = false;
}
@@ -495,14 +487,10 @@ aghui::SScoringFacility::SChannel::
update_power_check_menu_items()
{
_p.suppress_redraw = true;
- gtk_check_menu_item_set_active( _p.iSFPageDrawEMGProfile,
- (gboolean)draw_emg);
- gtk_check_menu_item_set_active( _p.iSFPowerDrawBands,
- (gboolean)draw_bands);
- gtk_check_menu_item_set_active( _p.iSFPowerSmooth,
- (gboolean)resample_power);
- gtk_check_menu_item_set_active( _p.iSFPowerAutoscale,
- (gboolean)autoscale_profile);
+ gtk_check_menu_item_set_active( _p.iSFPageDrawEMGProfile, (gboolean)draw_emg);
+ gtk_check_menu_item_set_active( _p.iSFPowerDrawBands, (gboolean)draw_bands);
+ gtk_check_menu_item_set_active( _p.iSFPowerSmooth, (gboolean)resample_power);
+ gtk_check_menu_item_set_active( _p.iSFPowerAutoscale, (gboolean)autoscale_profile);
gtk_widget_set_visible( (GtkWidget*)_p.iSFPowerDrawBands,
(type == sigfile::SChannel::TType::eeg &&
diff --git a/src/ui/sf/sf-construct.cc b/src/ui/sf/sf-construct.cc
index c2224bf..408ca2f 100644
--- a/src/ui/sf/sf-construct.cc
+++ b/src/ui/sf/sf-construct.cc
@@ -203,6 +203,8 @@ SScoringFacilityWidgets (SExpDesignUI& _p)
!(AGH_GBGETOBJ (GtkMenu, iiSFICAPage)) ||
!(AGH_GBGETOBJ (GtkMenu, iiSFPageSelection)) ||
!(AGH_GBGETOBJ (GtkMenu, iiSFPageAnnotation)) ||
+ !(AGH_GBGETOBJ (GtkMenu, iiSFPageProfiles)) ||
+ !(AGH_GBGETOBJ (GtkMenu, iiSFPagePhasicEvents)) ||
!(AGH_GBGETOBJ (GtkMenu, iiSFPageHidden)) ||
!(AGH_GBGETOBJ (GtkMenu, iiSFPower)) ||
!(AGH_GBGETOBJ (GtkMenu, iiSFScore)) ||
@@ -211,7 +213,7 @@ SScoringFacilityWidgets (SExpDesignUI& _p)
!(AGH_GBGETOBJ (GtkCheckMenuItem, iSFPageShowProcessed)) ||
!(AGH_GBGETOBJ (GtkCheckMenuItem, iSFPageUseResample)) ||
!(AGH_GBGETOBJ (GtkCheckMenuItem, iSFPageDrawZeroline)) ||
- !(AGH_GBGETOBJ (GtkSeparatorMenuItem, iSFPageProfileItemsSeparator)) ||
+ !(AGH_GBGETOBJ (GtkSeparatorMenuItem, iSFPageProfilesSubmenuSeparator)) ||
!(AGH_GBGETOBJ (GtkCheckMenuItem, iSFPageDrawPSDProfile)) ||
!(AGH_GBGETOBJ (GtkCheckMenuItem, iSFPageDrawPSDSpectrum)) ||
!(AGH_GBGETOBJ (GtkCheckMenuItem, iSFPageDrawSWUProfile)) ||
diff --git a/src/ui/sf/sf-widgets.hh b/src/ui/sf/sf-widgets.hh
index b6b248d..6852d9b 100644
--- a/src/ui/sf/sf-widgets.hh
+++ b/src/ui/sf/sf-widgets.hh
@@ -132,6 +132,8 @@ struct SScoringFacilityWidgets {
*iiSFPage,
*iiSFPageSelection,
*iiSFPageAnnotation,
+ *iiSFPageProfiles,
+ *iiSFPagePhasicEvents,
*iiSFPageHidden,
*iiSFPower,
*iiSFScore,
@@ -169,7 +171,7 @@ struct SScoringFacilityWidgets {
*iSFScoreAssist, *iSFScoreImport, *iSFScoreExport, *iSFScoreClear,
*iSFAcceptAndTakeNext;
GtkSeparatorMenuItem
- *iSFPageProfileItemsSeparator;
+ *iSFPageProfilesSubmenuSeparator;
// more important dialogs
// find/patterns dialog
--
Sleep experiment manager
More information about the debian-med-commit
mailing list