The following commit has been merged in the master branch: commit f266f70263cdcea44fd0cf12548015075e79c98a Author: Andrei Zavada <johnhom...@gmail.com> Date: Sat Apr 27 12:57:57 2013 +0300
separate sf_cb.hh from sf.hh diff --git a/src/ui/sf/Makefile.am b/src/ui/sf/Makefile.am index 4e40167..298c6e8 100644 --- a/src/ui/sf/Makefile.am +++ b/src/ui/sf/Makefile.am @@ -23,11 +23,13 @@ liba_a_SOURCES := \ widgets.hh \ sf.cc \ sf.hh \ + sf_cb.hh \ sf_cb.cc if DO_PCH BUILT_SOURCES = \ sf.hh.gch \ + sf_cb.hh.gch \ widgets.hh.gch %.hh.gch: %.hh $(CXXCOMPILE) -c $< diff --git a/src/ui/sf/construct.cc b/src/ui/sf/construct.cc index 0480df3..1f61201 100644 --- a/src/ui/sf/construct.cc +++ b/src/ui/sf/construct.cc @@ -15,6 +15,7 @@ #include "ui/mw/mw.hh" #include "ui/ui.hh" #include "sf.hh" +#include "sf_cb.hh" using namespace std; diff --git a/src/ui/sf/ica.cc b/src/ui/sf/ica.cc index c473cbb..8fc87a6 100644 --- a/src/ui/sf/ica.cc +++ b/src/ui/sf/ica.cc @@ -15,6 +15,7 @@ #include "ica/ica.hh" #include "ui/misc.hh" #include "sf.hh" +#include "sf_cb.hh" using namespace std; diff --git a/src/ui/sf/montage_cb.cc b/src/ui/sf/montage_cb.cc index 83da511..feedada 100644 --- a/src/ui/sf/montage_cb.cc +++ b/src/ui/sf/montage_cb.cc @@ -14,6 +14,7 @@ #include "ui/misc.hh" #include "sf.hh" +#include "sf_cb.hh" #include "d/artifacts.hh" #include "d/artifacts-simple.hh" #include "d/filters.hh" diff --git a/src/ui/sf/sf.cc b/src/ui/sf/sf.cc index fe2a7af..b08d5fc 100644 --- a/src/ui/sf/sf.cc +++ b/src/ui/sf/sf.cc @@ -15,6 +15,7 @@ #include "common/fs.hh" #include "ui/misc.hh" #include "sf.hh" +#include "sf_cb.hh" #include "d/artifacts.hh" #include "d/filters.hh" #include "d/phasediff.hh" diff --git a/src/ui/sf/sf.hh b/src/ui/sf/sf.hh index 608b811..80256d5 100644 --- a/src/ui/sf/sf.hh +++ b/src/ui/sf/sf.hh @@ -9,8 +9,8 @@ * License: GPL */ -#ifndef _AGH_UI_SCORING_FACILITY_H -#define _AGH_UI_SCORING_FACILITY_H +#ifndef _AGH_UI_SF_H +#define _AGH_UI_SF_H #include <map> #include <list> @@ -756,136 +756,6 @@ channel_y0( const T& h) const } // namespace aghui -extern "C" { - -//gboolean wScoringFacility_configure_event_cb( GtkWidget*, GdkEventConfigure*, gpointer); -gboolean daSFMontage_configure_event_cb( GtkWidget*, GdkEventConfigure*, gpointer); - -gboolean daSFMontage_draw_cb( GtkWidget*, cairo_t*, gpointer); -gboolean daSFMontage_button_press_event_cb( GtkWidget*, GdkEventButton*, gpointer); -gboolean daSFMontage_button_release_event_cb( GtkWidget*, GdkEventButton*, gpointer); -gboolean daSFMontage_motion_notify_event_cb( GtkWidget*, GdkEventMotion*, gpointer); -gboolean daSFMontage_leave_notify_event_cb( GtkWidget*, GdkEventMotion*, gpointer); -gboolean daSFMontage_scroll_event_cb( GtkWidget*, GdkEventScroll*, gpointer); - -void eSFPageSize_changed_cb( GtkComboBox*, gpointer); -void eSFCurrentPage_value_changed_cb( GtkSpinButton*, gpointer); - -void bSFScoreClear_clicked_cb( GtkButton*, gpointer); -void bSFScoreNREM1_clicked_cb( GtkButton*, gpointer); -void bSFScoreNREM2_clicked_cb( GtkButton*, gpointer); -void bSFScoreNREM3_clicked_cb( GtkButton*, gpointer); -void bSFScoreNREM4_clicked_cb( GtkButton*, gpointer); -void bSFScoreREM_clicked_cb ( GtkButton*, gpointer); -void bSFScoreWake_clicked_cb ( GtkButton*, gpointer); - -void eSFCurrentPos_clicked_cb( GtkButton*, gpointer); -void bSFForward_clicked_cb( GtkButton*, gpointer); -void bSFBack_clicked_cb( GtkButton*, gpointer); -void bSFGotoPrevUnscored_clicked_cb( GtkButton*, gpointer); -void bSFGotoNextUnscored_clicked_cb( GtkButton*, gpointer); -void bSFGotoPrevArtifact_clicked_cb( GtkButton*, gpointer); -void bSFGotoNextArtifact_clicked_cb( GtkButton*, gpointer); -void bSFDrawCrosshair_toggled_cb( GtkToggleButton*, gpointer); -void bSFShowFindDialog_toggled_cb( GtkToggleButton*, gpointer); -void bSFShowPhaseDiffDialog_toggled_cb( GtkToggleButton*, gpointer); -void bSFRunICA_clicked_cb( GtkButton*, gpointer); -//void bSFResetMontage_clicked_cb( GtkButton*, gpointer); - - -void eSFICARemixMode_changed_cb( GtkComboBox*, gpointer); -void eSFICANonlinearity_changed_cb( GtkComboBox*, gpointer); -void eSFICAApproach_changed_cb( GtkComboBox*, gpointer); -void eSFICAFineTune_toggled_cb( GtkCheckButton*, gpointer); -void eSFICAStabilizationMode_toggled_cb( GtkCheckButton*, gpointer); -void eSFICAa1_value_changed_cb( GtkSpinButton*, gpointer); -void eSFICAa2_value_changed_cb( GtkSpinButton*, gpointer); -void eSFICAmu_value_changed_cb( GtkSpinButton*, gpointer); -void eSFICAepsilon_value_changed_cb( GtkSpinButton*, gpointer); -void eSFICASampleSizePercent_value_changed_cb( GtkSpinButton*, gpointer); -void eSFICANofICs_value_changed_cb( GtkSpinButton*, gpointer); -void eSFICAEigVecFirst_value_changed_cb( GtkSpinButton*, gpointer); -void eSFICAEigVecLast_value_changed_cb( GtkSpinButton*, gpointer); -void eSFICAMaxIterations_value_changed_cb( GtkSpinButton*, gpointer); -void bSFICATry_clicked_cb( GtkButton*, gpointer); -void bSFICAPreview_toggled_cb( GtkToggleButton*, gpointer); -void bSFICAShowMatrix_toggled_cb( GtkToggleButton*, gpointer); -void wSFICAMatrix_hide_cb( GtkWidget*, gpointer); -void bSFICAApply_clicked_cb( GtkButton*, gpointer); -void bSFICACancel_clicked_cb( GtkButton*, gpointer); - - -void bSFAccept_clicked_cb( GtkToolButton*, gpointer); -void iSFAcceptAndTakeNext_activate_cb( GtkMenuItem*, gpointer); - -void iSFPageShowOriginal_toggled_cb( GtkCheckMenuItem*, gpointer); -void iSFPageShowProcessed_toggled_cb( GtkCheckMenuItem*, gpointer); -void iSFPageUseResample_toggled_cb( GtkCheckMenuItem*, gpointer); -void iSFPageDrawZeroline_toggled_cb( GtkCheckMenuItem*, gpointer); -void iSFPageArtifactsDetect_activate_cb( GtkMenuItem*, gpointer); -void iSFPageArtifactsMarkFlat_activate_cb( GtkMenuItem*, gpointer); -void iSFPageArtifactsClear_activate_cb( GtkMenuItem*, gpointer); -void iSFPageFilter_activate_cb( GtkMenuItem*, gpointer); -void iSFPageSaveChannelAsSVG_activate_cb( GtkMenuItem*, gpointer); -void iSFPageSaveMontageAsSVG_activate_cb( GtkMenuItem*, gpointer); -void iSFPageExportSignal_activate_cb( GtkMenuItem*, gpointer); -void iSFPageUseThisScale_activate_cb( GtkMenuItem*, gpointer); -void iSFPageClearArtifacts_activate_cb( GtkMenuItem*, gpointer); -void iSFPageHide_activate_cb( GtkMenuItem*, gpointer); -void iSFPageHidden_select_cb( GtkMenuItem*, gpointer); -void iSFPageHidden_deselect_cb( GtkMenuItem*, gpointer); -void iSFPageShowHidden_activate_cb( GtkMenuItem*, gpointer); -void iSFPageSpaceEvenly_activate_cb( GtkMenuItem*, gpointer); -void iSFPageLocateSelection_activate_cb( GtkMenuItem*, gpointer); -void iSFPageDrawPSDProfile_toggled_cb( GtkCheckMenuItem*, gpointer); -void iSFPageDrawPSDSpectrum_toggled_cb( GtkCheckMenuItem*, gpointer); -void iSFPageDrawSWUProfile_toggled_cb( GtkCheckMenuItem*, gpointer); -void iSFPageDrawMCProfile_toggled_cb( GtkCheckMenuItem*, gpointer); -void iSFPageDrawEMGProfile_toggled_cb( GtkCheckMenuItem*, gpointer); -void iSFPageDrawPhasicSpindles_toggled_cb( GtkCheckMenuItem*, gpointer); -void iSFPageDrawPhasicKComplexes_toggled_cb( GtkCheckMenuItem*, gpointer); -void iSFPageDrawPhasicEyeBlinks_toggled_cb( GtkCheckMenuItem*, gpointer); - -void iSFPageSelectionDrawCourse_toggled_cb( GtkCheckMenuItem*, gpointer); -void iSFPageSelectionDrawEnvelope_toggled_cb( GtkCheckMenuItem*, gpointer); -void iSFPageSelectionDrawDzxdf_toggled_cb( GtkCheckMenuItem*, gpointer); - -void iSFICAPageMapIC_activate_cb( GtkRadioMenuItem*, gpointer); - -void iSFPageAnnotationDelete_activate_cb( GtkMenuItem*, gpointer); -void iSFPageAnnotationEdit_activate_cb( GtkMenuItem*, gpointer); -void iSFPageAnnotationClearAll_activate_cb( GtkMenuItem*, gpointer); -void iSFPageAnnotationGotoPrev_activate_cb( GtkMenuItem*, gpointer); -void iSFPageAnnotationGotoNext_activate_cb( GtkMenuItem*, gpointer); - -void iSFPageSelectionMarkArtifact_activate_cb( GtkMenuItem*, gpointer); -void iSFPageSelectionClearArtifact_activate_cb( GtkMenuItem*, gpointer); -void iSFPageSelectionFindPattern_activate_cb( GtkMenuItem*, gpointer); -void iSFPageSelectionAnnotate_activate_cb( GtkMenuItem*, gpointer); - -void iSFPowerExportRange_activate_cb( GtkMenuItem*, gpointer); -void iSFPowerExportAll_activate_cb( GtkMenuItem*, gpointer); -void iSFPowerSmooth_toggled_cb( GtkCheckMenuItem*, gpointer); -void iSFPowerDrawBands_toggled_cb( GtkCheckMenuItem*, gpointer); -void iSFPowerUseThisScale_activate_cb( GtkMenuItem*, gpointer); -void iSFPowerAutoscale_toggled_cb( GtkCheckMenuItem*, gpointer); - -gboolean daSFHypnogram_draw_cb( GtkWidget*, cairo_t*, gpointer); -gboolean daSFHypnogram_button_press_event_cb( GtkWidget*, GdkEventButton*, gpointer); -gboolean daSFHypnogram_button_release_event_cb( GtkWidget*, GdkEventButton*, gpointer); -gboolean daSFHypnogram_motion_notify_event_cb( GtkWidget*, GdkEventMotion*, gpointer); - -void iSFScoreAssist_activate_cb( GtkMenuItem*, gpointer); -void iSFScoreImport_activate_cb( GtkMenuItem*, gpointer); -void iSFScoreExport_activate_cb( GtkMenuItem*, gpointer); -void iSFScoreClear_activate_cb( GtkMenuItem*, gpointer); - -gboolean wSF_delete_event_cb( GtkWidget*, GdkEvent*, gpointer); -gboolean wSF_key_press_event_cb( GtkWidget*, GdkEventKey*, gpointer); - -} // extern "C" - - #endif diff --git a/src/ui/sf/sf_cb.hh b/src/ui/sf/sf_cb.hh new file mode 100644 index 0000000..bd8b59a --- /dev/null +++ b/src/ui/sf/sf_cb.hh @@ -0,0 +1,155 @@ +/* + * File name: ui/sf/sf_cb.hh + * Project: Aghermann + * Author: Andrei Zavada <johnhom...@gmail.com> + * Initial version: 2013-04-27 + * + * Purpose: scoring facility callbacks + * + * License: GPL + */ + +#ifndef _AGH_UI_SF_CB_H +#define _AGH_UI_SF_CB_H + +#include <cairo/cairo.h> +#include <gtk/gtk.h> + + +extern "C" { + +//gboolean wScoringFacility_configure_event_cb( GtkWidget*, GdkEventConfigure*, gpointer); +gboolean daSFMontage_configure_event_cb( GtkWidget*, GdkEventConfigure*, gpointer); + +gboolean daSFMontage_draw_cb( GtkWidget*, cairo_t*, gpointer); +gboolean daSFMontage_button_press_event_cb( GtkWidget*, GdkEventButton*, gpointer); +gboolean daSFMontage_button_release_event_cb( GtkWidget*, GdkEventButton*, gpointer); +gboolean daSFMontage_motion_notify_event_cb( GtkWidget*, GdkEventMotion*, gpointer); +gboolean daSFMontage_leave_notify_event_cb( GtkWidget*, GdkEventMotion*, gpointer); +gboolean daSFMontage_scroll_event_cb( GtkWidget*, GdkEventScroll*, gpointer); + +void eSFPageSize_changed_cb( GtkComboBox*, gpointer); +void eSFCurrentPage_value_changed_cb( GtkSpinButton*, gpointer); + +void bSFScoreClear_clicked_cb( GtkButton*, gpointer); +void bSFScoreNREM1_clicked_cb( GtkButton*, gpointer); +void bSFScoreNREM2_clicked_cb( GtkButton*, gpointer); +void bSFScoreNREM3_clicked_cb( GtkButton*, gpointer); +void bSFScoreNREM4_clicked_cb( GtkButton*, gpointer); +void bSFScoreREM_clicked_cb ( GtkButton*, gpointer); +void bSFScoreWake_clicked_cb ( GtkButton*, gpointer); + +void eSFCurrentPos_clicked_cb( GtkButton*, gpointer); +void bSFForward_clicked_cb( GtkButton*, gpointer); +void bSFBack_clicked_cb( GtkButton*, gpointer); +void bSFGotoPrevUnscored_clicked_cb( GtkButton*, gpointer); +void bSFGotoNextUnscored_clicked_cb( GtkButton*, gpointer); +void bSFGotoPrevArtifact_clicked_cb( GtkButton*, gpointer); +void bSFGotoNextArtifact_clicked_cb( GtkButton*, gpointer); +void bSFDrawCrosshair_toggled_cb( GtkToggleButton*, gpointer); +void bSFShowFindDialog_toggled_cb( GtkToggleButton*, gpointer); +void bSFShowPhaseDiffDialog_toggled_cb( GtkToggleButton*, gpointer); +void bSFRunICA_clicked_cb( GtkButton*, gpointer); +//void bSFResetMontage_clicked_cb( GtkButton*, gpointer); + + +void eSFICARemixMode_changed_cb( GtkComboBox*, gpointer); +void eSFICANonlinearity_changed_cb( GtkComboBox*, gpointer); +void eSFICAApproach_changed_cb( GtkComboBox*, gpointer); +void eSFICAFineTune_toggled_cb( GtkCheckButton*, gpointer); +void eSFICAStabilizationMode_toggled_cb( GtkCheckButton*, gpointer); +void eSFICAa1_value_changed_cb( GtkSpinButton*, gpointer); +void eSFICAa2_value_changed_cb( GtkSpinButton*, gpointer); +void eSFICAmu_value_changed_cb( GtkSpinButton*, gpointer); +void eSFICAepsilon_value_changed_cb( GtkSpinButton*, gpointer); +void eSFICASampleSizePercent_value_changed_cb( GtkSpinButton*, gpointer); +void eSFICANofICs_value_changed_cb( GtkSpinButton*, gpointer); +void eSFICAEigVecFirst_value_changed_cb( GtkSpinButton*, gpointer); +void eSFICAEigVecLast_value_changed_cb( GtkSpinButton*, gpointer); +void eSFICAMaxIterations_value_changed_cb( GtkSpinButton*, gpointer); +void bSFICATry_clicked_cb( GtkButton*, gpointer); +void bSFICAPreview_toggled_cb( GtkToggleButton*, gpointer); +void bSFICAShowMatrix_toggled_cb( GtkToggleButton*, gpointer); +void wSFICAMatrix_hide_cb( GtkWidget*, gpointer); +void bSFICAApply_clicked_cb( GtkButton*, gpointer); +void bSFICACancel_clicked_cb( GtkButton*, gpointer); + + +void bSFAccept_clicked_cb( GtkToolButton*, gpointer); +void iSFAcceptAndTakeNext_activate_cb( GtkMenuItem*, gpointer); + +void iSFPageShowOriginal_toggled_cb( GtkCheckMenuItem*, gpointer); +void iSFPageShowProcessed_toggled_cb( GtkCheckMenuItem*, gpointer); +void iSFPageUseResample_toggled_cb( GtkCheckMenuItem*, gpointer); +void iSFPageDrawZeroline_toggled_cb( GtkCheckMenuItem*, gpointer); +void iSFPageArtifactsDetect_activate_cb( GtkMenuItem*, gpointer); +void iSFPageArtifactsMarkFlat_activate_cb( GtkMenuItem*, gpointer); +void iSFPageArtifactsClear_activate_cb( GtkMenuItem*, gpointer); +void iSFPageFilter_activate_cb( GtkMenuItem*, gpointer); +void iSFPageSaveChannelAsSVG_activate_cb( GtkMenuItem*, gpointer); +void iSFPageSaveMontageAsSVG_activate_cb( GtkMenuItem*, gpointer); +void iSFPageExportSignal_activate_cb( GtkMenuItem*, gpointer); +void iSFPageUseThisScale_activate_cb( GtkMenuItem*, gpointer); +void iSFPageClearArtifacts_activate_cb( GtkMenuItem*, gpointer); +void iSFPageHide_activate_cb( GtkMenuItem*, gpointer); +void iSFPageHidden_select_cb( GtkMenuItem*, gpointer); +void iSFPageHidden_deselect_cb( GtkMenuItem*, gpointer); +void iSFPageShowHidden_activate_cb( GtkMenuItem*, gpointer); +void iSFPageSpaceEvenly_activate_cb( GtkMenuItem*, gpointer); +void iSFPageLocateSelection_activate_cb( GtkMenuItem*, gpointer); +void iSFPageDrawPSDProfile_toggled_cb( GtkCheckMenuItem*, gpointer); +void iSFPageDrawPSDSpectrum_toggled_cb( GtkCheckMenuItem*, gpointer); +void iSFPageDrawSWUProfile_toggled_cb( GtkCheckMenuItem*, gpointer); +void iSFPageDrawMCProfile_toggled_cb( GtkCheckMenuItem*, gpointer); +void iSFPageDrawEMGProfile_toggled_cb( GtkCheckMenuItem*, gpointer); +void iSFPageDrawPhasicSpindles_toggled_cb( GtkCheckMenuItem*, gpointer); +void iSFPageDrawPhasicKComplexes_toggled_cb( GtkCheckMenuItem*, gpointer); +void iSFPageDrawPhasicEyeBlinks_toggled_cb( GtkCheckMenuItem*, gpointer); + +void iSFPageSelectionDrawCourse_toggled_cb( GtkCheckMenuItem*, gpointer); +void iSFPageSelectionDrawEnvelope_toggled_cb( GtkCheckMenuItem*, gpointer); +void iSFPageSelectionDrawDzxdf_toggled_cb( GtkCheckMenuItem*, gpointer); + +void iSFICAPageMapIC_activate_cb( GtkRadioMenuItem*, gpointer); + +void iSFPageAnnotationDelete_activate_cb( GtkMenuItem*, gpointer); +void iSFPageAnnotationEdit_activate_cb( GtkMenuItem*, gpointer); +void iSFPageAnnotationClearAll_activate_cb( GtkMenuItem*, gpointer); +void iSFPageAnnotationGotoPrev_activate_cb( GtkMenuItem*, gpointer); +void iSFPageAnnotationGotoNext_activate_cb( GtkMenuItem*, gpointer); + +void iSFPageSelectionMarkArtifact_activate_cb( GtkMenuItem*, gpointer); +void iSFPageSelectionClearArtifact_activate_cb( GtkMenuItem*, gpointer); +void iSFPageSelectionFindPattern_activate_cb( GtkMenuItem*, gpointer); +void iSFPageSelectionAnnotate_activate_cb( GtkMenuItem*, gpointer); + +void iSFPowerExportRange_activate_cb( GtkMenuItem*, gpointer); +void iSFPowerExportAll_activate_cb( GtkMenuItem*, gpointer); +void iSFPowerSmooth_toggled_cb( GtkCheckMenuItem*, gpointer); +void iSFPowerDrawBands_toggled_cb( GtkCheckMenuItem*, gpointer); +void iSFPowerUseThisScale_activate_cb( GtkMenuItem*, gpointer); +void iSFPowerAutoscale_toggled_cb( GtkCheckMenuItem*, gpointer); + +gboolean daSFHypnogram_draw_cb( GtkWidget*, cairo_t*, gpointer); +gboolean daSFHypnogram_button_press_event_cb( GtkWidget*, GdkEventButton*, gpointer); +gboolean daSFHypnogram_button_release_event_cb( GtkWidget*, GdkEventButton*, gpointer); +gboolean daSFHypnogram_motion_notify_event_cb( GtkWidget*, GdkEventMotion*, gpointer); + +void iSFScoreAssist_activate_cb( GtkMenuItem*, gpointer); +void iSFScoreImport_activate_cb( GtkMenuItem*, gpointer); +void iSFScoreExport_activate_cb( GtkMenuItem*, gpointer); +void iSFScoreClear_activate_cb( GtkMenuItem*, gpointer); + +gboolean wSF_delete_event_cb( GtkWidget*, GdkEvent*, gpointer); +gboolean wSF_key_press_event_cb( GtkWidget*, GdkEventKey*, gpointer); + +} // extern "C" + + +#endif + +// Local Variables: +// Mode: c++ +// indent-tabs-mode: 8 +// End: + -- Sleep experiment manager _______________________________________________ debian-med-commit mailing list debian-med-commit@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/debian-med-commit