[med-svn] [aghermann] 50/85: use decltype for good purpose in AGH_GBGETOBJ macro
andrei zavada
hmmr-guest at alioth.debian.org
Thu Sep 26 23:46:30 UTC 2013
This is an automated email from the git hooks/post-receive script.
hmmr-guest pushed a commit to branch master
in repository aghermann.
commit e3e90711c1fbedaad50ca94637111d2dcbacc9a2
Author: Andrei Zavada <johnhommer at gmail.com>
Date: Thu Sep 19 01:20:52 2013 +0300
use decltype for good purpose in AGH_GBGETOBJ macro
---
upstream/src/aghermann/ui/mf/mf-construct.cc | 40 +--
upstream/src/aghermann/ui/mw/construct.cc | 334 ++++++++++----------
upstream/src/aghermann/ui/sf/construct.cc | 298 ++++++++---------
.../src/aghermann/ui/sf/d/artifacts-construct.cc | 60 ++--
.../ui/sf/d/artifacts-simple-construct.cc | 6 +-
.../src/aghermann/ui/sf/d/filters-construct.cc | 18 +-
upstream/src/aghermann/ui/sf/d/patterns.cc | 98 +++---
.../src/aghermann/ui/sf/d/phasediff-construct.cc | 14 +-
upstream/src/aghermann/ui/sf/d/rk1968.cc | 34 +-
upstream/src/aghermann/ui/sm/sm-construct.cc | 16 +-
upstream/src/aghermann/ui/ui.hh | 7 +-
11 files changed, 461 insertions(+), 464 deletions(-)
diff --git a/upstream/src/aghermann/ui/mf/mf-construct.cc b/upstream/src/aghermann/ui/mf/mf-construct.cc
index 9dc9c8d..d4b3a36 100644
--- a/upstream/src/aghermann/ui/mf/mf-construct.cc
+++ b/upstream/src/aghermann/ui/mf/mf-construct.cc
@@ -19,26 +19,26 @@ int
SModelrunFacility::
construct_widgets()
{
- if ( !(AGH_GBGETOBJ3 (builder, GtkWindow, wModelrunFacility)) ||
- !(AGH_GBGETOBJ3 (builder, GtkDrawingArea, daMFProfile)) ||
- !(AGH_GBGETOBJ3 (builder, GtkTextView, lMFLog)) ||
- !(AGH_GBGETOBJ3 (builder, GtkCheckButton, eMFLiveUpdate)) ||
- !(AGH_GBGETOBJ3 (builder, GtkCheckButton, eMFHighlightWake)) ||
- !(AGH_GBGETOBJ3 (builder, GtkCheckButton, eMFHighlightNREM)) ||
- !(AGH_GBGETOBJ3 (builder, GtkCheckButton, eMFHighlightREM)) ||
- !(AGH_GBGETOBJ3 (builder, GtkCheckButton, eMFLiveUpdate)) ||
- !(AGH_GBGETOBJ3 (builder, GtkScaleButton, eMFSmooth)) ||
- !(AGH_GBGETOBJ3 (builder, GtkHBox, cMFControls)) ||
- !(AGH_GBGETOBJ3 (builder, GtkLabel, lMFCostFunction)) ||
- !(AGH_GBGETOBJ3 (builder, GtkCheckButton, eMFClassicFit)) ||
- !(AGH_GBGETOBJ3 (builder, GtkLabel, lMFClassicFit)) ||
- !(AGH_GBGETOBJ3 (builder, GtkButton, bMFRun)) ||
- !(AGH_GBGETOBJ3 (builder, GtkButton, bMFReset)) ||
- !(AGH_GBGETOBJ3 (builder, GtkToolButton, bMFAccept)) ||
- !(AGH_GBGETOBJ3 (builder, GtkCheckButton, eMFDB1)) ||
- !(AGH_GBGETOBJ3 (builder, GtkCheckButton, eMFDB2)) ||
- !(AGH_GBGETOBJ3 (builder, GtkCheckButton, eMFAZ1)) ||
- !(AGH_GBGETOBJ3 (builder, GtkCheckButton, eMFAZ2)) )
+ if ( !(AGH_GBGETOBJ (wModelrunFacility)) ||
+ !(AGH_GBGETOBJ (daMFProfile)) ||
+ !(AGH_GBGETOBJ (lMFLog)) ||
+ !(AGH_GBGETOBJ (eMFLiveUpdate)) ||
+ !(AGH_GBGETOBJ (eMFHighlightWake)) ||
+ !(AGH_GBGETOBJ (eMFHighlightNREM)) ||
+ !(AGH_GBGETOBJ (eMFHighlightREM)) ||
+ !(AGH_GBGETOBJ (eMFLiveUpdate)) ||
+ !(AGH_GBGETOBJ (eMFSmooth)) ||
+ !(AGH_GBGETOBJ (cMFControls)) ||
+ !(AGH_GBGETOBJ (lMFCostFunction)) ||
+ !(AGH_GBGETOBJ (eMFClassicFit)) ||
+ !(AGH_GBGETOBJ (lMFClassicFit)) ||
+ !(AGH_GBGETOBJ (bMFRun)) ||
+ !(AGH_GBGETOBJ (bMFReset)) ||
+ !(AGH_GBGETOBJ (bMFAccept)) ||
+ !(AGH_GBGETOBJ (eMFDB1)) ||
+ !(AGH_GBGETOBJ (eMFDB2)) ||
+ !(AGH_GBGETOBJ (eMFAZ1)) ||
+ !(AGH_GBGETOBJ (eMFAZ2)) )
throw runtime_error ("Failed to construct MF widgets (1)");
G_CONNECT_2 (wModelrunFacility, delete, event);
diff --git a/upstream/src/aghermann/ui/mw/construct.cc b/upstream/src/aghermann/ui/mw/construct.cc
index f4b18a1..3855e96 100644
--- a/upstream/src/aghermann/ui/mw/construct.cc
+++ b/upstream/src/aghermann/ui/mw/construct.cc
@@ -59,10 +59,10 @@ SExpDesignUIWidgets ()
G_TYPE_BOOLEAN,
G_TYPE_POINTER);
// static
- if ( !AGH_GBGETOBJ (GtkListStore, mScoringPageSize) ||
- !AGH_GBGETOBJ (GtkListStore, mFFTParamsPageSize) ||
- !AGH_GBGETOBJ (GtkListStore, mFFTParamsBinSize) ||
- !AGH_GBGETOBJ (GtkListStore, mFFTParamsWindowType) )
+ if ( !AGH_GBGETOBJ (mScoringPageSize) ||
+ !AGH_GBGETOBJ (mFFTParamsPageSize) ||
+ !AGH_GBGETOBJ (mFFTParamsBinSize) ||
+ !AGH_GBGETOBJ (mFFTParamsWindowType) )
throw runtime_error ("Failed to construct widgets");
// (some of) these are directly attached to combo boxes in dauaghter widgets, so ref
g_object_ref( (GObject*)mScoringPageSize);
@@ -77,8 +77,8 @@ SExpDesignUIWidgets ()
// =========== 1. Measurements
// ------------- cMeasurements
- if ( !AGH_GBGETOBJ (GtkWindow, wMainWindow) ||
- !AGH_GBGETOBJ (GtkVBox, cMeasurements) )
+ if ( !AGH_GBGETOBJ (wMainWindow) ||
+ !AGH_GBGETOBJ (cMeasurements) )
throw runtime_error ("Failed to construct widgets");
wMainWindow_delete_event_cb_handler_id =
@@ -93,26 +93,26 @@ SExpDesignUIWidgets ()
NULL, 0, GDK_ACTION_COPY);
gtk_drag_dest_add_uri_targets( (GtkWidget*)(cMeasurements));
- if ( !AGH_GBGETOBJ (GtkMenuItem, iiMainMenu) ||
- !AGH_GBGETOBJ (GtkMenuItem, iExpRefresh) ||
- !AGH_GBGETOBJ (GtkMenuItem, iExpPurgeComputed) ||
- !AGH_GBGETOBJ (GtkMenuItem, iExpAnnotations) ||
- !AGH_GBGETOBJ (GtkRadioMenuItem, iExpSubjectSortName) ||
- !AGH_GBGETOBJ (GtkRadioMenuItem, iExpSubjectSortAge) ||
- !AGH_GBGETOBJ (GtkRadioMenuItem, iExpSubjectSortAdmissionDate) ||
- !AGH_GBGETOBJ (GtkRadioMenuItem, iExpSubjectSortAvgPower) ||
- !AGH_GBGETOBJ (GtkCheckMenuItem, iExpSubjectSortAscending) ||
- !AGH_GBGETOBJ (GtkCheckMenuItem, iExpSubjectSortSegregate) ||
- !AGH_GBGETOBJ (GtkMenuItem, iExpBasicSADetectUltradianCycles) ||
- !AGH_GBGETOBJ (GtkMenuItem, iiExpGlobalOperations) ||
- !AGH_GBGETOBJ (GtkMenuItem, iExpGloballyDetectArtifacts) ||
- !AGH_GBGETOBJ (GtkMenuItem, iExpGloballySetFilters) ||
- !AGH_GBGETOBJ (GtkMenuItem, iiExpSubjectSort) ||
- !AGH_GBGETOBJ (GtkMenuItem, iMontageSetDefaults) ||
- !AGH_GBGETOBJ (GtkMenuItem, iExpClose) ||
- !AGH_GBGETOBJ (GtkMenuItem, iExpQuit) ||
- !AGH_GBGETOBJ (GtkMenuItem, iHelpAbout) ||
- !AGH_GBGETOBJ (GtkMenuItem, iHelpUsage) )
+ if ( !AGH_GBGETOBJ (iiMainMenu) ||
+ !AGH_GBGETOBJ (iExpRefresh) ||
+ !AGH_GBGETOBJ (iExpPurgeComputed) ||
+ !AGH_GBGETOBJ (iExpAnnotations) ||
+ !AGH_GBGETOBJ (iExpSubjectSortName) ||
+ !AGH_GBGETOBJ (iExpSubjectSortAge) ||
+ !AGH_GBGETOBJ (iExpSubjectSortAdmissionDate) ||
+ !AGH_GBGETOBJ (iExpSubjectSortAvgPower) ||
+ !AGH_GBGETOBJ (iExpSubjectSortAscending) ||
+ !AGH_GBGETOBJ (iExpSubjectSortSegregate) ||
+ !AGH_GBGETOBJ (iExpBasicSADetectUltradianCycles) ||
+ !AGH_GBGETOBJ (iiExpGlobalOperations) ||
+ !AGH_GBGETOBJ (iExpGloballyDetectArtifacts) ||
+ !AGH_GBGETOBJ (iExpGloballySetFilters) ||
+ !AGH_GBGETOBJ (iiExpSubjectSort) ||
+ !AGH_GBGETOBJ (iMontageSetDefaults) ||
+ !AGH_GBGETOBJ (iExpClose) ||
+ !AGH_GBGETOBJ (iExpQuit) ||
+ !AGH_GBGETOBJ (iHelpAbout) ||
+ !AGH_GBGETOBJ (iHelpUsage) )
throw runtime_error ("Failed to construct widgets");
G_CONNECT_1 (iExpClose, activate);
@@ -138,13 +138,13 @@ SExpDesignUIWidgets ()
G_CONNECT_1 (iExpSubjectSortSegregate, toggled);
// --------- tabs
- if ( !AGH_GBGETOBJ (GtkNotebook, tTaskSelector) ||
- !AGH_GBGETOBJ (GtkNotebook, tDesign) ||
- !AGH_GBGETOBJ (GtkNotebook, tSimulations) ||
- !AGH_GBGETOBJ (GtkNotebook, tSettings) ||
- !AGH_GBGETOBJ (GtkLabel, lTaskSelector1) ||
- !AGH_GBGETOBJ (GtkLabel, lTaskSelector2) ||
- !AGH_GBGETOBJ (GtkLabel, lSettings) )
+ if ( !AGH_GBGETOBJ (tTaskSelector) ||
+ !AGH_GBGETOBJ (tDesign) ||
+ !AGH_GBGETOBJ (tSimulations) ||
+ !AGH_GBGETOBJ (tSettings) ||
+ !AGH_GBGETOBJ (lTaskSelector1) ||
+ !AGH_GBGETOBJ (lTaskSelector2) ||
+ !AGH_GBGETOBJ (lSettings) )
throw runtime_error ("Failed to construct widgets");
G_CONNECT_2 (tTaskSelector, switch, page);
@@ -153,8 +153,8 @@ SExpDesignUIWidgets ()
// ------------- eMsmtSession, eMsmtChannel
- if ( !AGH_GBGETOBJ (GtkComboBox, eMsmtSession) ||
- !AGH_GBGETOBJ ( GtkComboBox, eMsmtChannel) )
+ if ( !AGH_GBGETOBJ (eMsmtSession) ||
+ !AGH_GBGETOBJ (eMsmtChannel) )
throw runtime_error ("Failed to construct widgets");
gtk_combo_box_set_model_properly(
@@ -168,33 +168,33 @@ SExpDesignUIWidgets ()
G_CONNECT_1 (eMsmtChannel, changed);
// ------------- eMsmtProfile*
- if ( !AGH_GBGETOBJ (GtkToggleButton, eMsmtProfileAutoscale) ||
- !AGH_GBGETOBJ (GtkScaleButton, eMsmtProfileSmooth) ||
+ if ( !AGH_GBGETOBJ (eMsmtProfileAutoscale) ||
+ !AGH_GBGETOBJ (eMsmtProfileSmooth) ||
- !AGH_GBGETOBJ (GtkListStore, mMsmtProfileType) ||
- !AGH_GBGETOBJ (GtkComboBox, eMsmtProfileType) ||
- !AGH_GBGETOBJ (GtkBox, cMsmtProfileParamsContainer) ||
- !AGH_GBGETOBJ (GtkBox, cMsmtProfileParamsPSD) ||
- !AGH_GBGETOBJ (GtkBox, cMsmtProfileParamsSWU) ||
- !AGH_GBGETOBJ (GtkBox, cMsmtProfileParamsMC) ||
+ !AGH_GBGETOBJ (mMsmtProfileType) ||
+ !AGH_GBGETOBJ (eMsmtProfileType) ||
+ !AGH_GBGETOBJ (cMsmtProfileParamsContainer) ||
+ !AGH_GBGETOBJ (cMsmtProfileParamsPSD) ||
+ !AGH_GBGETOBJ (cMsmtProfileParamsSWU) ||
+ !AGH_GBGETOBJ (cMsmtProfileParamsMC) ||
- !AGH_GBGETOBJ (GtkSpinButton, eMsmtProfileParamsPSDFreqFrom) ||
- !AGH_GBGETOBJ (GtkSpinButton, eMsmtProfileParamsPSDFreqWidth) ||
- !AGH_GBGETOBJ (GtkAdjustment, jMsmtProfileParamsPSDFreqFrom) ||
- !AGH_GBGETOBJ (GtkAdjustment, jMsmtProfileParamsPSDFreqWidth) ||
+ !AGH_GBGETOBJ (eMsmtProfileParamsPSDFreqFrom) ||
+ !AGH_GBGETOBJ (eMsmtProfileParamsPSDFreqWidth) ||
+ !AGH_GBGETOBJ (jMsmtProfileParamsPSDFreqFrom) ||
+ !AGH_GBGETOBJ (jMsmtProfileParamsPSDFreqWidth) ||
- !AGH_GBGETOBJ (GtkSpinButton, eMsmtProfileParamsSWUF0) ||
- !AGH_GBGETOBJ (GtkAdjustment, jMsmtProfileParamsSWUF0) ||
+ !AGH_GBGETOBJ (eMsmtProfileParamsSWUF0) ||
+ !AGH_GBGETOBJ (jMsmtProfileParamsSWUF0) ||
- !AGH_GBGETOBJ (GtkSpinButton, eMsmtProfileParamsMCF0) ||
- !AGH_GBGETOBJ (GtkAdjustment, jMsmtProfileParamsMCF0) ||
+ !AGH_GBGETOBJ (eMsmtProfileParamsMCF0) ||
+ !AGH_GBGETOBJ (jMsmtProfileParamsMCF0) ||
- !AGH_GBGETOBJ (GtkLabel, lMsmtProfilePSDExtra) ||
- !AGH_GBGETOBJ (GtkLabel, lMsmtProfileSWUExtra) ||
- !AGH_GBGETOBJ (GtkLabel, lMsmtProfileMCExtra) ||
+ !AGH_GBGETOBJ (lMsmtProfilePSDExtra) ||
+ !AGH_GBGETOBJ (lMsmtProfileSWUExtra) ||
+ !AGH_GBGETOBJ (lMsmtProfileMCExtra) ||
- !AGH_GBGETOBJ (GtkBox, cMsmtMainToolbar) ||
- !AGH_GBGETOBJ (GtkBox, cMsmtTopArea) )
+ !AGH_GBGETOBJ (cMsmtMainToolbar) ||
+ !AGH_GBGETOBJ (cMsmtTopArea) )
throw runtime_error ("Failed to construct widgets");
gtk_cell_layout_set_renderer( eMsmtProfileType);
@@ -210,13 +210,13 @@ SExpDesignUIWidgets ()
G_CONNECT_2 (eMsmtProfileParamsMCF0, value, changed);
// ------------ menus
- if ( !(AGH_GBGETOBJ (GtkMenu, iiSubjectTimeline)) ||
- !(AGH_GBGETOBJ (GtkMenuItem, iSubjectTimelineScore)) ||
- !(AGH_GBGETOBJ (GtkMenuItem, iSubjectTimelineDetectUltradianCycle)) ||
- !(AGH_GBGETOBJ (GtkMenuItem, iSubjectTimelineEDFInfo)) ||
- !(AGH_GBGETOBJ (GtkMenuItem, iSubjectTimelineSaveAsSVG)) ||
- !(AGH_GBGETOBJ (GtkMenuItem, iSubjectTimelineResetMontage)) ||
- !(AGH_GBGETOBJ (GtkMenuItem, iSubjectTimelineBrowse)) )
+ if ( !(AGH_GBGETOBJ (iiSubjectTimeline)) ||
+ !(AGH_GBGETOBJ (iSubjectTimelineScore)) ||
+ !(AGH_GBGETOBJ (iSubjectTimelineDetectUltradianCycle)) ||
+ !(AGH_GBGETOBJ (iSubjectTimelineEDFInfo)) ||
+ !(AGH_GBGETOBJ (iSubjectTimelineSaveAsSVG)) ||
+ !(AGH_GBGETOBJ (iSubjectTimelineResetMontage)) ||
+ !(AGH_GBGETOBJ (iSubjectTimelineBrowse)) )
throw runtime_error ("Failed to construct widgets");
g_object_ref( (GObject*)iiSubjectTimeline);
@@ -235,14 +235,14 @@ SExpDesignUIWidgets ()
G_CONNECT_1 (iSubjectTimelineResetMontage, activate);
// ------------ actions
- if ( !(AGH_GBGETOBJ (GtkButton, bMainCloseThatSF)) )
+ if ( !(AGH_GBGETOBJ (bMainCloseThatSF)) )
throw runtime_error ("Failed to construct widgets");
G_CONNECT_1 (bMainCloseThatSF, clicked);
// ================ 2. Simulations
// ------------- tvSimulations & controls
- if ( !(AGH_GBGETOBJ (GtkTreeView, tvSimulations)) )
+ if ( !(AGH_GBGETOBJ (tvSimulations)) )
throw runtime_error ("Failed to construct widgets");
gtk_tree_view_set_model( tvSimulations,
@@ -288,9 +288,9 @@ SExpDesignUIWidgets ()
gtk_tree_view_column_set_visible( col, FALSE);
// ------------ iSimulations*
- if ( !(AGH_GBGETOBJ (GtkMenuItem, iSimulationsRunBatch)) ||
- !(AGH_GBGETOBJ (GtkMenuItem, iSimulationsRunClearAll)) ||
- !(AGH_GBGETOBJ (GtkMenuItem, iSimulationsReportGenerate)) )
+ if ( !(AGH_GBGETOBJ (iSimulationsRunBatch)) ||
+ !(AGH_GBGETOBJ (iSimulationsRunClearAll)) ||
+ !(AGH_GBGETOBJ (iSimulationsReportGenerate)) )
throw runtime_error ("Failed to construct widgets");
G_CONNECT_1 (iSimulationsRunBatch, activate);
@@ -298,19 +298,19 @@ SExpDesignUIWidgets ()
G_CONNECT_1 (iSimulationsReportGenerate, activate);
// ------------- lSimulations{Session,Channel}
- if ( !AGH_GBGETOBJ (GtkLabel, lSimulationsProfile) ||
- !AGH_GBGETOBJ (GtkLabel, lSimulationsChannel) ||
- !AGH_GBGETOBJ (GtkLabel, lSimulationsSession) )
+ if ( !AGH_GBGETOBJ (lSimulationsProfile) ||
+ !AGH_GBGETOBJ (lSimulationsChannel) ||
+ !AGH_GBGETOBJ (lSimulationsSession) )
throw runtime_error ("Failed to construct widgets");
// ------- statusbar
- if ( !AGH_GBGETOBJ (GtkStatusbar, sbMainStatusBar) )
+ if ( !AGH_GBGETOBJ (sbMainStatusBar) )
throw runtime_error ("Failed to construct widgets");
sbMainContextIdGeneral = gtk_statusbar_get_context_id( sbMainStatusBar, "General context");
- if ( !(AGH_GBGETOBJ (GtkDialog, wScanLog)) ||
- !(AGH_GBGETOBJ (GtkTextView, tScanLog)) )
+ if ( !(AGH_GBGETOBJ (wScanLog)) ||
+ !(AGH_GBGETOBJ (tScanLog)) )
throw runtime_error ("Failed to construct widgets");
gtk_widget_override_font( (GtkWidget*)tScanLog, font_desc);
@@ -328,34 +328,34 @@ SExpDesignUIWidgets ()
// free? unref? leak some?
// ****************** settings
- if ( !AGH_GBGETOBJ (GtkSpinButton, eSMPMaxThreads) )
+ if ( !AGH_GBGETOBJ (eSMPMaxThreads) )
throw runtime_error ("Failed to construct widgets");
// ------------- fFFTParams
- if ( !AGH_GBGETOBJ (GtkSpinButton, eUltradianCycleDetectionAccuracy) ||
- !AGH_GBGETOBJ (GtkComboBox, eFFTParamsBinSize) ||
- !AGH_GBGETOBJ (GtkComboBox, eFFTParamsPageSize) ||
- !AGH_GBGETOBJ (GtkComboBox, eFFTParamsPlanType) ||
- !AGH_GBGETOBJ (GtkComboBox, eFFTParamsWindowType) )
+ if ( !AGH_GBGETOBJ (eUltradianCycleDetectionAccuracy) ||
+ !AGH_GBGETOBJ (eFFTParamsBinSize) ||
+ !AGH_GBGETOBJ (eFFTParamsPageSize) ||
+ !AGH_GBGETOBJ (eFFTParamsPlanType) ||
+ !AGH_GBGETOBJ (eFFTParamsWindowType) )
throw runtime_error ("Failed to construct widgets");
for ( auto& e : {eFFTParamsBinSize, eFFTParamsPageSize, eFFTParamsPlanType, eFFTParamsWindowType} )
gtk_cell_layout_set_renderer( e);
// ------------- fArtifacts
- if ( !AGH_GBGETOBJ (GtkComboBox, eArtifDampenWindowType) ||
- !AGH_GBGETOBJ (GtkSpinButton, eArtifDampenFactor) )
+ if ( !AGH_GBGETOBJ (eArtifDampenWindowType) ||
+ !AGH_GBGETOBJ (eArtifDampenFactor) )
throw runtime_error ("Failed to construct widgets");
gtk_cell_layout_set_renderer( eArtifDampenWindowType);
// ------------- fMicrocontinuity
- if ( !AGH_GBGETOBJ (GtkSpinButton, eMCParamBandWidth) ||
- !AGH_GBGETOBJ (GtkSpinButton, eMCParamIIRBackpolate) ||
- !AGH_GBGETOBJ (GtkSpinButton, eMCParamMCGain) ||
- !AGH_GBGETOBJ (GtkSpinButton, eMCParamFreqInc) ||
- !AGH_GBGETOBJ (GtkSpinButton, eMCParamNBins) ||
- !AGH_GBGETOBJ (GtkSpinButton, eSWUParamMinUpswingDuration) )
+ if ( !AGH_GBGETOBJ (eMCParamBandWidth) ||
+ !AGH_GBGETOBJ (eMCParamIIRBackpolate) ||
+ !AGH_GBGETOBJ (eMCParamMCGain) ||
+ !AGH_GBGETOBJ (eMCParamFreqInc) ||
+ !AGH_GBGETOBJ (eMCParamNBins) ||
+ !AGH_GBGETOBJ (eSWUParamMinUpswingDuration) )
throw runtime_error ("Failed to construct widgets");
// ------- custom score codes
@@ -382,40 +382,40 @@ SExpDesignUIWidgets ()
throw runtime_error ("Failed to construct widgets");
// --------- Misc
- if ( !AGH_GBGETOBJ (GtkSpinButton, eDAMsmtPPH) ||
- !AGH_GBGETOBJ (GtkSpinButton, eDAMsmtTLHeight) ||
- !AGH_GBGETOBJ (GtkSpinButton, eDAPageHeight) ||
- !AGH_GBGETOBJ (GtkSpinButton, eDAHypnogramHeight) ||
- !AGH_GBGETOBJ (GtkSpinButton, eDAEMGHeight) ||
- !AGH_GBGETOBJ (GtkCheckButton, eScanTreeStrict) ||
- !AGH_GBGETOBJ (GtkCheckButton, eScanTreeSuppressReport) )
+ if ( !AGH_GBGETOBJ (eDAMsmtPPH) ||
+ !AGH_GBGETOBJ (eDAMsmtTLHeight) ||
+ !AGH_GBGETOBJ (eDAPageHeight) ||
+ !AGH_GBGETOBJ (eDAHypnogramHeight) ||
+ !AGH_GBGETOBJ (eDAEMGHeight) ||
+ !AGH_GBGETOBJ (eScanTreeStrict) ||
+ !AGH_GBGETOBJ (eScanTreeSuppressReport) )
throw runtime_error ("Failed to construct widgets");
- if ( !AGH_GBGETOBJ (GtkEntry, eBrowseCommand) ||
- !AGH_GBGETOBJ (GtkSpinButton, eScrollSpeedFactor) ||
- !AGH_GBGETOBJ (GtkSpinButton, eDAEMGHeight) )
+ if ( !AGH_GBGETOBJ (eBrowseCommand) ||
+ !AGH_GBGETOBJ (eScrollSpeedFactor) ||
+ !AGH_GBGETOBJ (eDAEMGHeight) )
throw runtime_error ("Failed to construct widgets");
// ------------- eCtrlParam*
- if ( !AGH_GBGETOBJ (GtkSpinButton, eCtlParamAnnlNTries) ||
- !AGH_GBGETOBJ (GtkSpinButton, eCtlParamAnnlItersFixedT) ||
- !AGH_GBGETOBJ (GtkSpinButton, eCtlParamAnnlStepSize) ||
- !AGH_GBGETOBJ (GtkSpinButton, eCtlParamAnnlBoltzmannk) ||
- !AGH_GBGETOBJ (GtkSpinButton, eCtlParamAnnlDampingMu) ||
- !AGH_GBGETOBJ (GtkSpinButton, eCtlParamAnnlTInitialMantissa) ||
- !AGH_GBGETOBJ (GtkSpinButton, eCtlParamAnnlTInitialExponent) ||
- !AGH_GBGETOBJ (GtkSpinButton, eCtlParamAnnlTMinMantissa) ||
- !AGH_GBGETOBJ (GtkSpinButton, eCtlParamAnnlTMinExponent) ||
- !AGH_GBGETOBJ (GtkCheckButton, eCtlParamDBAmendment1) ||
- !AGH_GBGETOBJ (GtkCheckButton, eCtlParamDBAmendment2) ||
- !AGH_GBGETOBJ (GtkCheckButton, eCtlParamAZAmendment1) ||
- !AGH_GBGETOBJ (GtkLabel, lCtlParamDBAmendment1) ||
- !AGH_GBGETOBJ (GtkLabel, lCtlParamDBAmendment2) ||
- !AGH_GBGETOBJ (GtkLabel, lCtlParamAZAmendment1) ||
- !AGH_GBGETOBJ (GtkRadioButton, eCtlParamScoreUnscoredAsWake) ||
- !AGH_GBGETOBJ (GtkSpinButton, eCtlParamNSWAPpBeforeSimStart) ||
- !AGH_GBGETOBJ (GtkSpinButton, eCtlParamReqScoredPercent) )
+ if ( !AGH_GBGETOBJ (eCtlParamAnnlNTries) ||
+ !AGH_GBGETOBJ (eCtlParamAnnlItersFixedT) ||
+ !AGH_GBGETOBJ (eCtlParamAnnlStepSize) ||
+ !AGH_GBGETOBJ (eCtlParamAnnlBoltzmannk) ||
+ !AGH_GBGETOBJ (eCtlParamAnnlDampingMu) ||
+ !AGH_GBGETOBJ (eCtlParamAnnlTInitialMantissa) ||
+ !AGH_GBGETOBJ (eCtlParamAnnlTInitialExponent) ||
+ !AGH_GBGETOBJ (eCtlParamAnnlTMinMantissa) ||
+ !AGH_GBGETOBJ (eCtlParamAnnlTMinExponent) ||
+ !AGH_GBGETOBJ (eCtlParamDBAmendment1) ||
+ !AGH_GBGETOBJ (eCtlParamDBAmendment2) ||
+ !AGH_GBGETOBJ (eCtlParamAZAmendment1) ||
+ !AGH_GBGETOBJ (lCtlParamDBAmendment1) ||
+ !AGH_GBGETOBJ (lCtlParamDBAmendment2) ||
+ !AGH_GBGETOBJ (lCtlParamAZAmendment1) ||
+ !AGH_GBGETOBJ (eCtlParamScoreUnscoredAsWake) ||
+ !AGH_GBGETOBJ (eCtlParamNSWAPpBeforeSimStart) ||
+ !AGH_GBGETOBJ (eCtlParamReqScoredPercent) )
throw runtime_error ("Failed to construct widgets");
G_CONNECT_1 (eCtlParamDBAmendment1, toggled);
@@ -475,7 +475,7 @@ SExpDesignUIWidgets ()
jTunable[t][d] = gtk_spin_button_get_adjustment( eTunable[t][d]);
- if ( !AGH_GBGETOBJ (GtkButton, bSimParamRevertTunables) )
+ if ( !AGH_GBGETOBJ (bSimParamRevertTunables) )
throw runtime_error ("Failed to construct widgets");
G_CONNECT_1 (bSimParamRevertTunables, clicked);
@@ -538,19 +538,19 @@ SExpDesignUIWidgets ()
// ========= child widgets
// ----- wAbout
- if ( !AGH_GBGETOBJ (GtkDialog, wAbout) ||
- !AGH_GBGETOBJ (GtkNotebook, cAboutTabs) ||
- !AGH_GBGETOBJ (GtkLabel, lAboutVersion) )
+ if ( !AGH_GBGETOBJ (wAbout) ||
+ !AGH_GBGETOBJ (cAboutTabs) ||
+ !AGH_GBGETOBJ (lAboutVersion) )
throw runtime_error ("Failed to construct widgets");
// ------- wEDFFileDetails
- if ( !AGH_GBGETOBJ (GtkDialog, wEDFFileDetails) ||
- !AGH_GBGETOBJ (GtkLabel, lEDFFileDetails) ||
- !AGH_GBGETOBJ (GtkTextView, lEDFFileDetailsReport) )
+ if ( !AGH_GBGETOBJ (wEDFFileDetails) ||
+ !AGH_GBGETOBJ (lEDFFileDetails) ||
+ !AGH_GBGETOBJ (lEDFFileDetailsReport) )
throw runtime_error ("Failed to construct widgets");
// used by two GtkTextView's, lEDFFileDetailsReport and lEdfImportFileInfo
- if ( !AGH_GBGETOBJ (GtkTextBuffer, tEDFFileDetailsReport) )
+ if ( !AGH_GBGETOBJ (tEDFFileDetailsReport) )
throw runtime_error ("Failed to construct widgets");
gtk_widget_override_font( (GtkWidget*)lEDFFileDetailsReport, font_desc);
@@ -562,20 +562,20 @@ SExpDesignUIWidgets ()
NULL);
// ------- wEdfImport
- if ( !AGH_GBGETOBJ (GtkDialog, wEdfImport) ||
- !AGH_GBGETOBJ (GtkComboBox, eEdfImportGroup) ||
- !AGH_GBGETOBJ (GtkComboBox, eEdfImportSession) ||
- !AGH_GBGETOBJ (GtkComboBox, eEdfImportEpisode) ||
- !AGH_GBGETOBJ (GtkEntry, eEdfImportGroupEntry) ||
- !AGH_GBGETOBJ (GtkEntry, eEdfImportSessionEntry) ||
- !AGH_GBGETOBJ (GtkEntry, eEdfImportEpisodeEntry) ||
- !AGH_GBGETOBJ (GtkLabel, lEdfImportSubject) ||
- !AGH_GBGETOBJ (GtkLabel, lEdfImportCaption) ||
- !AGH_GBGETOBJ (GtkTextView, lEdfImportFileInfo) ||
- !AGH_GBGETOBJ (GtkButton, bEdfImportAttachCopy) ||
- !AGH_GBGETOBJ (GtkButton, bEdfImportAttachMove) ||
- !AGH_GBGETOBJ (GtkButton, bEdfImportAdmit) ||
- !AGH_GBGETOBJ (GtkButton, bEdfImportEdfhed) )
+ if ( !AGH_GBGETOBJ (wEdfImport) ||
+ !AGH_GBGETOBJ (eEdfImportGroup) ||
+ !AGH_GBGETOBJ (eEdfImportSession) ||
+ !AGH_GBGETOBJ (eEdfImportEpisode) ||
+ !AGH_GBGETOBJ (eEdfImportGroupEntry) ||
+ !AGH_GBGETOBJ (eEdfImportSessionEntry) ||
+ !AGH_GBGETOBJ (eEdfImportEpisodeEntry) ||
+ !AGH_GBGETOBJ (lEdfImportSubject) ||
+ !AGH_GBGETOBJ (lEdfImportCaption) ||
+ !AGH_GBGETOBJ (lEdfImportFileInfo) ||
+ !AGH_GBGETOBJ (bEdfImportAttachCopy) ||
+ !AGH_GBGETOBJ (bEdfImportAttachMove) ||
+ !AGH_GBGETOBJ (bEdfImportAdmit) ||
+ !AGH_GBGETOBJ (bEdfImportEdfhed) )
throw runtime_error ("Failed to construct widgets");
@@ -599,41 +599,41 @@ SExpDesignUIWidgets ()
this);
// ------------- wBatchSetup
- if ( !AGH_GBGETOBJ (GtkDialog, wBatchSetup) ||
- !AGH_GBGETOBJ (GtkEntry, eBatchSetupSubjects) ||
- !AGH_GBGETOBJ (GtkEntry, eBatchSetupSessions) ||
- !AGH_GBGETOBJ (GtkEntry, eBatchSetupChannels) ||
- !AGH_GBGETOBJ (GtkSpinButton, eBatchSetupRangeFrom) ||
- !AGH_GBGETOBJ (GtkSpinButton, eBatchSetupRangeWidth) ||
- !AGH_GBGETOBJ (GtkSpinButton, eBatchSetupRangeInc) ||
- !AGH_GBGETOBJ (GtkSpinButton, eBatchSetupRangeSteps) )
+ if ( !AGH_GBGETOBJ (wBatchSetup) ||
+ !AGH_GBGETOBJ (eBatchSetupSubjects) ||
+ !AGH_GBGETOBJ (eBatchSetupSessions) ||
+ !AGH_GBGETOBJ (eBatchSetupChannels) ||
+ !AGH_GBGETOBJ (eBatchSetupRangeFrom) ||
+ !AGH_GBGETOBJ (eBatchSetupRangeWidth) ||
+ !AGH_GBGETOBJ (eBatchSetupRangeInc) ||
+ !AGH_GBGETOBJ (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) )
+ // if ( !AGH_GBGETOBJ (wMontageDefaults) ||
+ // !AGH_GBGETOBJ (eMontageDefaultsChannelList) ||
+ // !AGH_GBGETOBJ (eMontageDefaultsShowPSD) ||
+ // !AGH_GBGETOBJ (eMontageDefaultsShowPSDSpectrum) ||
+ // !AGH_GBGETOBJ (eMontageDefaultsShowMC) ||
+ // !AGH_GBGETOBJ (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) )
+ if ( !AGH_GBGETOBJ (wGlobalFilters) ||
+ !AGH_GBGETOBJ (eGlobalFiltersLowPassCutoff) ||
+ !AGH_GBGETOBJ (eGlobalFiltersLowPassOrder) ||
+ !AGH_GBGETOBJ (eGlobalFiltersHighPassCutoff) ||
+ !AGH_GBGETOBJ (eGlobalFiltersHighPassOrder) ||
+ !AGH_GBGETOBJ (mGlobalFiltersNotchFilter) ||
+ !AGH_GBGETOBJ (eGlobalFiltersNotchFilter) )
throw runtime_error ("Failed to construct widgets");
gtk_combo_box_set_model_properly(
eGlobalFiltersNotchFilter, mGlobalFiltersNotchFilter);
// ----------- wGlobalAnnotations
- if ( !AGH_GBGETOBJ (GtkDialog, wGlobalAnnotations) ||
- !AGH_GBGETOBJ (GtkTreeView, tvGlobalAnnotations) ||
- !AGH_GBGETOBJ (GtkCheckButton, eGlobalAnnotationsShowPhasicEvents) )
+ if ( !AGH_GBGETOBJ (wGlobalAnnotations) ||
+ !AGH_GBGETOBJ (tvGlobalAnnotations) ||
+ !AGH_GBGETOBJ (eGlobalAnnotationsShowPhasicEvents) )
throw runtime_error ("Failed to construct widgets");
gtk_tree_view_set_model( tvGlobalAnnotations,
@@ -669,11 +669,11 @@ SExpDesignUIWidgets ()
G_CONNECT_1 (eGlobalAnnotationsShowPhasicEvents, toggled);
// ------------- wGlobalArtifactDetection
- if ( !AGH_GBGETOBJ (GtkDialog, wGlobalArtifactDetection) ||
- !AGH_GBGETOBJ (GtkComboBox, eGlobalADProfiles) ||
- !AGH_GBGETOBJ (GtkCheckButton, eGlobalADKeepExisting) ||
- !AGH_GBGETOBJ (GtkButton, bGlobalADOK) ||
- !AGH_GBGETOBJ (GtkLabel, lGlobalADHint) )
+ if ( !AGH_GBGETOBJ (wGlobalArtifactDetection) ||
+ !AGH_GBGETOBJ (eGlobalADProfiles) ||
+ !AGH_GBGETOBJ (eGlobalADKeepExisting) ||
+ !AGH_GBGETOBJ (bGlobalADOK) ||
+ !AGH_GBGETOBJ (lGlobalADHint) )
throw runtime_error ("Failed to construct widgets");
gtk_combo_box_set_model_properly(
diff --git a/upstream/src/aghermann/ui/sf/construct.cc b/upstream/src/aghermann/ui/sf/construct.cc
index d6cdb0b..0022e7f 100644
--- a/upstream/src/aghermann/ui/sf/construct.cc
+++ b/upstream/src/aghermann/ui/sf/construct.cc
@@ -30,42 +30,42 @@ SScoringFacilityWidgets ()
// we do it all mostly ourself, except for some delete-event binding to gtk_true()
// general & montage page navigation
- if ( !AGH_GBGETOBJ (GtkWindow, wSF) ||
- !AGH_GBGETOBJ (GtkLabel, lSFHint) ||
- !AGH_GBGETOBJ (GtkListStore, mSFScoringPageSize) ||
- !AGH_GBGETOBJ (GtkComboBox, eSFPageSize) ||
- !AGH_GBGETOBJ (GtkSpinButton, eSFCurrentPage) ||
- !AGH_GBGETOBJ (GtkAdjustment, jSFPageNo) ||
- !AGH_GBGETOBJ (GtkLabel, lSFTotalPages) ||
- !AGH_GBGETOBJ (GtkButton, eSFCurrentPos) ||
- !AGH_GBGETOBJ (GtkExpander, cSFHypnogram) ||
- !AGH_GBGETOBJ (GtkHBox, cSFControlBar) ||
- !AGH_GBGETOBJ (GtkBox, cSFScoringModeContainer) ||
- !AGH_GBGETOBJ (GtkBox, cSFICAModeContainer) ||
-
- !AGH_GBGETOBJ (GtkButton, bSFBack) ||
- !AGH_GBGETOBJ (GtkButton, bSFForward) ||
- !AGH_GBGETOBJ (GtkButton, bSFGotoPrevUnscored) ||
- !AGH_GBGETOBJ (GtkButton, bSFGotoNextUnscored) ||
- !AGH_GBGETOBJ (GtkButton, bSFGotoPrevArtifact) ||
- !AGH_GBGETOBJ (GtkButton, bSFGotoNextArtifact) ||
- !AGH_GBGETOBJ (GtkToggleButton, bSFDrawCrosshair) ||
-
- !AGH_GBGETOBJ (GtkMenuItem, iSFMontageMenu) ||
- !AGH_GBGETOBJ (GtkCheckMenuItem, iSFMontageDrawOriginalSignal) ||
- !AGH_GBGETOBJ (GtkCheckMenuItem, iSFMontageDrawProcessedSignal) ||
- !AGH_GBGETOBJ (GtkCheckMenuItem, iSFMontageDrawZeroLine) ||
- !AGH_GBGETOBJ (GtkCheckMenuItem, iSFMontageDrawFast) ||
-// !AGH_GBGETOBJ (GtkCheckMenuItem, iSFMontageDraw) ||
- !AGH_GBGETOBJ (GtkMenuItem, iSFMontagePatterns) ||
- !AGH_GBGETOBJ (GtkMenuItem, iSFMontageICA) ||
- !AGH_GBGETOBJ (GtkMenuItem, iSFMontagePhaseDiff) ||
- !AGH_GBGETOBJ (GtkMenuItem, iSFMontageScoreAssist) ||
- !AGH_GBGETOBJ (GtkMenuItem, iSFMontageScoreImport) ||
- !AGH_GBGETOBJ (GtkMenuItem, iSFMontageScoreExport) ||
- !AGH_GBGETOBJ (GtkMenuItem, iSFMontageScoreClear) ||
- !AGH_GBGETOBJ (GtkMenuItem, iSFMontageClose) ||
- !AGH_GBGETOBJ (GtkMenuItem, iSFMontageCloseAndNext) )
+ if ( !AGH_GBGETOBJ (wSF) ||
+ !AGH_GBGETOBJ (lSFHint) ||
+ !AGH_GBGETOBJ (mSFScoringPageSize) ||
+ !AGH_GBGETOBJ (eSFPageSize) ||
+ !AGH_GBGETOBJ (eSFCurrentPage) ||
+ !AGH_GBGETOBJ (jSFPageNo) ||
+ !AGH_GBGETOBJ (lSFTotalPages) ||
+ !AGH_GBGETOBJ (eSFCurrentPos) ||
+ !AGH_GBGETOBJ (cSFHypnogram) ||
+ !AGH_GBGETOBJ (cSFControlBar) ||
+ !AGH_GBGETOBJ (cSFScoringModeContainer) ||
+ !AGH_GBGETOBJ (cSFICAModeContainer) ||
+
+ !AGH_GBGETOBJ (bSFBack) ||
+ !AGH_GBGETOBJ (bSFForward) ||
+ !AGH_GBGETOBJ (bSFGotoPrevUnscored) ||
+ !AGH_GBGETOBJ (bSFGotoNextUnscored) ||
+ !AGH_GBGETOBJ (bSFGotoPrevArtifact) ||
+ !AGH_GBGETOBJ (bSFGotoNextArtifact) ||
+ !AGH_GBGETOBJ (bSFDrawCrosshair) ||
+
+ !AGH_GBGETOBJ (iSFMontageMenu) ||
+ !AGH_GBGETOBJ (iSFMontageDrawOriginalSignal) ||
+ !AGH_GBGETOBJ (iSFMontageDrawProcessedSignal) ||
+ !AGH_GBGETOBJ (iSFMontageDrawZeroLine) ||
+ !AGH_GBGETOBJ (iSFMontageDrawFast) ||
+// !AGH_GBGETOBJ (iSFMontageDraw) ||
+ !AGH_GBGETOBJ (iSFMontagePatterns) ||
+ !AGH_GBGETOBJ (iSFMontageICA) ||
+ !AGH_GBGETOBJ (iSFMontagePhaseDiff) ||
+ !AGH_GBGETOBJ (iSFMontageScoreAssist) ||
+ !AGH_GBGETOBJ (iSFMontageScoreImport) ||
+ !AGH_GBGETOBJ (iSFMontageScoreExport) ||
+ !AGH_GBGETOBJ (iSFMontageScoreClear) ||
+ !AGH_GBGETOBJ (iSFMontageClose) ||
+ !AGH_GBGETOBJ (iSFMontageCloseAndNext) )
throw runtime_error ("Failed to construct SF widgets (1)");
G_CONNECT_1 (iSFMontageMenu, activate);
@@ -105,18 +105,18 @@ SScoringFacilityWidgets ()
G_CONNECT_1 (iSFMontageClose, activate);
G_CONNECT_1 (iSFMontageCloseAndNext, activate);
- if ( !(AGH_GBGETOBJ (GtkButton, bSFScoreClear)) ||
- !(AGH_GBGETOBJ (GtkButton, bSFScoreNREM1)) ||
- !(AGH_GBGETOBJ (GtkButton, bSFScoreNREM2)) ||
- !(AGH_GBGETOBJ (GtkButton, bSFScoreNREM3)) ||
- !(AGH_GBGETOBJ (GtkButton, bSFScoreNREM4)) ||
- !(AGH_GBGETOBJ (GtkButton, bSFScoreREM)) ||
- !(AGH_GBGETOBJ (GtkButton, bSFScoreWake)) ||
- !(AGH_GBGETOBJ (GtkTable, cSFSleepStageStats)) ||
- !(AGH_GBGETOBJ (GtkLabel, lSFPercentScored)) ||
- !(AGH_GBGETOBJ (GtkLabel, lScoreStatsNREMPercent)) ||
- !(AGH_GBGETOBJ (GtkLabel, lScoreStatsREMPercent)) ||
- !(AGH_GBGETOBJ (GtkLabel, lScoreStatsWakePercent)) )
+ if ( !(AGH_GBGETOBJ (bSFScoreClear)) ||
+ !(AGH_GBGETOBJ (bSFScoreNREM1)) ||
+ !(AGH_GBGETOBJ (bSFScoreNREM2)) ||
+ !(AGH_GBGETOBJ (bSFScoreNREM3)) ||
+ !(AGH_GBGETOBJ (bSFScoreNREM4)) ||
+ !(AGH_GBGETOBJ (bSFScoreREM)) ||
+ !(AGH_GBGETOBJ (bSFScoreWake)) ||
+ !(AGH_GBGETOBJ (cSFSleepStageStats)) ||
+ !(AGH_GBGETOBJ (lSFPercentScored)) ||
+ !(AGH_GBGETOBJ (lScoreStatsNREMPercent)) ||
+ !(AGH_GBGETOBJ (lScoreStatsREMPercent)) ||
+ !(AGH_GBGETOBJ (lScoreStatsWakePercent)) )
throw runtime_error ("Failed to construct SF widgets (2)");
G_CONNECT_1 (bSFScoreClear, clicked);
@@ -127,9 +127,9 @@ SScoringFacilityWidgets ()
G_CONNECT_1 (bSFScoreREM, clicked);
G_CONNECT_1 (bSFScoreWake, clicked);
- if ( !(AGH_GBGETOBJ (GtkDrawingArea, daSFMontage)) ||
- !(AGH_GBGETOBJ (GtkDrawingArea, daSFHypnogram)) ||
- !(AGH_GBGETOBJ (GtkStatusbar, sbSF)) )
+ if ( !(AGH_GBGETOBJ (daSFMontage)) ||
+ !(AGH_GBGETOBJ (daSFHypnogram)) ||
+ !(AGH_GBGETOBJ (sbSF)) )
throw runtime_error ("Failed to construct SF widgets (3)");
sbSFContextIdGeneral = gtk_statusbar_get_context_id( sbSF, "General context");
@@ -148,33 +148,33 @@ SScoringFacilityWidgets ()
G_CONNECT_3 (daSFHypnogram, motion, notify, event);
// ICA
- if ( !(AGH_GBGETOBJ (GtkComboBox, eSFICARemixMode)) ||
- !(AGH_GBGETOBJ (GtkComboBox, eSFICANonlinearity)) ||
- !(AGH_GBGETOBJ (GtkComboBox, eSFICAApproach)) ||
- !(AGH_GBGETOBJ (GtkListStore, mSFICARemixMode)) ||
- !(AGH_GBGETOBJ (GtkListStore, mSFICANonlinearity)) ||
- !(AGH_GBGETOBJ (GtkListStore, mSFICAApproach)) ||
- !(AGH_GBGETOBJ (GtkCheckButton, eSFICAFineTune)) ||
- !(AGH_GBGETOBJ (GtkCheckButton, eSFICAStabilizationMode)) ||
- !(AGH_GBGETOBJ (GtkSpinButton, eSFICAa1)) ||
- !(AGH_GBGETOBJ (GtkSpinButton, eSFICAa2)) ||
- !(AGH_GBGETOBJ (GtkSpinButton, eSFICAmu)) ||
- !(AGH_GBGETOBJ (GtkSpinButton, eSFICAepsilon)) ||
- !(AGH_GBGETOBJ (GtkSpinButton, eSFICANofICs)) ||
- !(AGH_GBGETOBJ (GtkAdjustment, jSFICANofICs)) ||
- !(AGH_GBGETOBJ (GtkSpinButton, eSFICAEigVecFirst)) ||
- !(AGH_GBGETOBJ (GtkSpinButton, eSFICAEigVecLast)) ||
- !(AGH_GBGETOBJ (GtkAdjustment, jSFICAEigVecFirst)) ||
- !(AGH_GBGETOBJ (GtkAdjustment, jSFICAEigVecLast)) ||
- !(AGH_GBGETOBJ (GtkSpinButton, eSFICASampleSizePercent)) ||
- !(AGH_GBGETOBJ (GtkSpinButton, eSFICAMaxIterations)) ||
- !(AGH_GBGETOBJ (GtkButton, bSFICATry)) ||
- !(AGH_GBGETOBJ (GtkToggleButton, bSFICAPreview)) ||
- !(AGH_GBGETOBJ (GtkToggleButton, bSFICAShowMatrix)) ||
- !(AGH_GBGETOBJ (GtkButton, bSFICAApply)) ||
- !(AGH_GBGETOBJ (GtkButton, bSFICACancel)) ||
- !(AGH_GBGETOBJ (GtkDialog, wSFICAMatrix)) ||
- !(AGH_GBGETOBJ (GtkTextView, tSFICAMatrix)) )
+ if ( !(AGH_GBGETOBJ (eSFICARemixMode)) ||
+ !(AGH_GBGETOBJ (eSFICANonlinearity)) ||
+ !(AGH_GBGETOBJ (eSFICAApproach)) ||
+ !(AGH_GBGETOBJ (mSFICARemixMode)) ||
+ !(AGH_GBGETOBJ (mSFICANonlinearity)) ||
+ !(AGH_GBGETOBJ (mSFICAApproach)) ||
+ !(AGH_GBGETOBJ (eSFICAFineTune)) ||
+ !(AGH_GBGETOBJ (eSFICAStabilizationMode)) ||
+ !(AGH_GBGETOBJ (eSFICAa1)) ||
+ !(AGH_GBGETOBJ (eSFICAa2)) ||
+ !(AGH_GBGETOBJ (eSFICAmu)) ||
+ !(AGH_GBGETOBJ (eSFICAepsilon)) ||
+ !(AGH_GBGETOBJ (eSFICANofICs)) ||
+ !(AGH_GBGETOBJ (jSFICANofICs)) ||
+ !(AGH_GBGETOBJ (eSFICAEigVecFirst)) ||
+ !(AGH_GBGETOBJ (eSFICAEigVecLast)) ||
+ !(AGH_GBGETOBJ (jSFICAEigVecFirst)) ||
+ !(AGH_GBGETOBJ (jSFICAEigVecLast)) ||
+ !(AGH_GBGETOBJ (eSFICASampleSizePercent)) ||
+ !(AGH_GBGETOBJ (eSFICAMaxIterations)) ||
+ !(AGH_GBGETOBJ (bSFICATry)) ||
+ !(AGH_GBGETOBJ (bSFICAPreview)) ||
+ !(AGH_GBGETOBJ (bSFICAShowMatrix)) ||
+ !(AGH_GBGETOBJ (bSFICAApply)) ||
+ !(AGH_GBGETOBJ (bSFICACancel)) ||
+ !(AGH_GBGETOBJ (wSFICAMatrix)) ||
+ !(AGH_GBGETOBJ (tSFICAMatrix)) )
throw runtime_error ("Failed to construct SF widgets (4)");
gtk_combo_box_set_model_properly( eSFICANonlinearity, mSFICANonlinearity);
@@ -212,69 +212,69 @@ SScoringFacilityWidgets ()
G_CONNECT_1 (bSFICACancel, clicked);
// ------- menus
- if ( !(AGH_GBGETOBJ (GtkLabel, lSFOverChannel)) ||
- !(AGH_GBGETOBJ (GtkMenu, iiSFPage)) ||
- !(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)) ||
-
- !(AGH_GBGETOBJ (GtkCheckMenuItem, iSFPageShowOriginal)) ||
- !(AGH_GBGETOBJ (GtkCheckMenuItem, iSFPageShowProcessed)) ||
- !(AGH_GBGETOBJ (GtkCheckMenuItem, iSFPageUseResample)) ||
- !(AGH_GBGETOBJ (GtkCheckMenuItem, iSFPageDrawZeroline)) ||
- !(AGH_GBGETOBJ (GtkSeparatorMenuItem, iSFPageProfilesSubmenuSeparator)) ||
- !(AGH_GBGETOBJ (GtkCheckMenuItem, iSFPageDrawPSDProfile)) ||
- !(AGH_GBGETOBJ (GtkCheckMenuItem, iSFPageDrawPSDSpectrum)) ||
- !(AGH_GBGETOBJ (GtkCheckMenuItem, iSFPageDrawSWUProfile)) ||
- !(AGH_GBGETOBJ (GtkCheckMenuItem, iSFPageDrawMCProfile)) ||
- !(AGH_GBGETOBJ (GtkCheckMenuItem, iSFPageDrawEMGProfile)) ||
- !(AGH_GBGETOBJ (GtkCheckMenuItem, iSFPageDrawPhasicSpindles)) ||
- !(AGH_GBGETOBJ (GtkCheckMenuItem, iSFPageDrawPhasicKComplexes)) ||
- !(AGH_GBGETOBJ (GtkCheckMenuItem, iSFPageDrawPhasicEyeBlinks)) ||
- !(AGH_GBGETOBJ (GtkMenuItem, iSFPageFilter)) ||
- !(AGH_GBGETOBJ (GtkMenuItem, iSFPageSaveChannelAsSVG)) ||
- !(AGH_GBGETOBJ (GtkMenuItem, iSFPageSaveMontageAsSVG)) ||
- !(AGH_GBGETOBJ (GtkMenuItem, iSFPageExportSignal)) ||
- !(AGH_GBGETOBJ (GtkMenuItem, iSFPageUseThisScale)) ||
- !(AGH_GBGETOBJ (GtkMenuItem, iSFPageArtifactsDetect)) ||
- !(AGH_GBGETOBJ (GtkMenuItem, iSFPageArtifactsClear)) ||
- !(AGH_GBGETOBJ (GtkMenuItem, iSFPageArtifactsMarkFlat)) ||
- !(AGH_GBGETOBJ (GtkMenuItem, iSFPageHide)) ||
- !(AGH_GBGETOBJ (GtkMenuItem, iSFPageHidden)) ||
- !(AGH_GBGETOBJ (GtkMenuItem, iSFPageSpaceEvenly)) ||
- !(AGH_GBGETOBJ (GtkMenuItem, iSFPageLocateSelection)) ||
-
- !(AGH_GBGETOBJ (GtkMenuItem, iSFPageAnnotationSeparator)) ||
- !(AGH_GBGETOBJ (GtkMenuItem, iSFPageAnnotationDelete)) ||
- !(AGH_GBGETOBJ (GtkMenuItem, iSFPageAnnotationEdit)) ||
- !(AGH_GBGETOBJ (GtkMenuItem, iSFPageAnnotationClearAll)) ||
- !(AGH_GBGETOBJ (GtkMenuItem, iSFPageAnnotationGotoNext)) ||
- !(AGH_GBGETOBJ (GtkMenuItem, iSFPageAnnotationGotoPrev)) ||
-
- !(AGH_GBGETOBJ (GtkMenuItem, iSFPageSelectionMarkArtifact)) ||
- !(AGH_GBGETOBJ (GtkMenuItem, iSFPageSelectionClearArtifact)) ||
- !(AGH_GBGETOBJ (GtkMenuItem, iSFPageSelectionFindPattern)) ||
- !(AGH_GBGETOBJ (GtkMenuItem, iSFPageSelectionAnnotate)) ||
- !(AGH_GBGETOBJ (GtkCheckMenuItem, iSFPageSelectionDrawCourse)) ||
- !(AGH_GBGETOBJ (GtkCheckMenuItem, iSFPageSelectionDrawEnvelope)) ||
- !(AGH_GBGETOBJ (GtkCheckMenuItem, iSFPageSelectionDrawDzxdf)) ||
-
- !(AGH_GBGETOBJ (GtkMenuItem, iSFPowerExportRange)) ||
- !(AGH_GBGETOBJ (GtkMenuItem, iSFPowerExportAll)) ||
- !(AGH_GBGETOBJ (GtkCheckMenuItem, iSFPowerSmooth)) ||
- !(AGH_GBGETOBJ (GtkCheckMenuItem, iSFPowerDrawBands)) ||
- !(AGH_GBGETOBJ (GtkMenuItem, iSFPowerUseThisScale)) ||
- !(AGH_GBGETOBJ (GtkCheckMenuItem, iSFPowerAutoscale)) ||
-
- !(AGH_GBGETOBJ (GtkMenuItem, iSFScoreAssist)) ||
- !(AGH_GBGETOBJ (GtkMenuItem, iSFScoreImport)) ||
- !(AGH_GBGETOBJ (GtkMenuItem, iSFScoreExport)) ||
- !(AGH_GBGETOBJ (GtkMenuItem, iSFScoreClear)) )
+ if ( !(AGH_GBGETOBJ (lSFOverChannel)) ||
+ !(AGH_GBGETOBJ (iiSFPage)) ||
+ !(AGH_GBGETOBJ (iiSFICAPage)) ||
+ !(AGH_GBGETOBJ (iiSFPageSelection)) ||
+ !(AGH_GBGETOBJ (iiSFPageAnnotation)) ||
+ !(AGH_GBGETOBJ (iiSFPageProfiles)) ||
+ !(AGH_GBGETOBJ (iiSFPagePhasicEvents)) ||
+ !(AGH_GBGETOBJ (iiSFPageHidden)) ||
+ !(AGH_GBGETOBJ (iiSFPower)) ||
+ !(AGH_GBGETOBJ (iiSFScore)) ||
+
+ !(AGH_GBGETOBJ (iSFPageShowOriginal)) ||
+ !(AGH_GBGETOBJ (iSFPageShowProcessed)) ||
+ !(AGH_GBGETOBJ (iSFPageUseResample)) ||
+ !(AGH_GBGETOBJ (iSFPageDrawZeroline)) ||
+ !(AGH_GBGETOBJ (iSFPageProfilesSubmenuSeparator)) ||
+ !(AGH_GBGETOBJ (iSFPageDrawPSDProfile)) ||
+ !(AGH_GBGETOBJ (iSFPageDrawPSDSpectrum)) ||
+ !(AGH_GBGETOBJ (iSFPageDrawSWUProfile)) ||
+ !(AGH_GBGETOBJ (iSFPageDrawMCProfile)) ||
+ !(AGH_GBGETOBJ (iSFPageDrawEMGProfile)) ||
+ !(AGH_GBGETOBJ (iSFPageDrawPhasicSpindles)) ||
+ !(AGH_GBGETOBJ (iSFPageDrawPhasicKComplexes)) ||
+ !(AGH_GBGETOBJ (iSFPageDrawPhasicEyeBlinks)) ||
+ !(AGH_GBGETOBJ (iSFPageFilter)) ||
+ !(AGH_GBGETOBJ (iSFPageSaveChannelAsSVG)) ||
+ !(AGH_GBGETOBJ (iSFPageSaveMontageAsSVG)) ||
+ !(AGH_GBGETOBJ (iSFPageExportSignal)) ||
+ !(AGH_GBGETOBJ (iSFPageUseThisScale)) ||
+ !(AGH_GBGETOBJ (iSFPageArtifactsDetect)) ||
+ !(AGH_GBGETOBJ (iSFPageArtifactsClear)) ||
+ !(AGH_GBGETOBJ (iSFPageArtifactsMarkFlat)) ||
+ !(AGH_GBGETOBJ (iSFPageHide)) ||
+ !(AGH_GBGETOBJ (iSFPageHidden)) ||
+ !(AGH_GBGETOBJ (iSFPageSpaceEvenly)) ||
+ !(AGH_GBGETOBJ (iSFPageLocateSelection)) ||
+
+ !(AGH_GBGETOBJ (iSFPageAnnotationSeparator)) ||
+ !(AGH_GBGETOBJ (iSFPageAnnotationDelete)) ||
+ !(AGH_GBGETOBJ (iSFPageAnnotationEdit)) ||
+ !(AGH_GBGETOBJ (iSFPageAnnotationClearAll)) ||
+ !(AGH_GBGETOBJ (iSFPageAnnotationGotoNext)) ||
+ !(AGH_GBGETOBJ (iSFPageAnnotationGotoPrev)) ||
+
+ !(AGH_GBGETOBJ (iSFPageSelectionMarkArtifact)) ||
+ !(AGH_GBGETOBJ (iSFPageSelectionClearArtifact)) ||
+ !(AGH_GBGETOBJ (iSFPageSelectionFindPattern)) ||
+ !(AGH_GBGETOBJ (iSFPageSelectionAnnotate)) ||
+ !(AGH_GBGETOBJ (iSFPageSelectionDrawCourse)) ||
+ !(AGH_GBGETOBJ (iSFPageSelectionDrawEnvelope)) ||
+ !(AGH_GBGETOBJ (iSFPageSelectionDrawDzxdf)) ||
+
+ !(AGH_GBGETOBJ (iSFPowerExportRange)) ||
+ !(AGH_GBGETOBJ (iSFPowerExportAll)) ||
+ !(AGH_GBGETOBJ (iSFPowerSmooth)) ||
+ !(AGH_GBGETOBJ (iSFPowerDrawBands)) ||
+ !(AGH_GBGETOBJ (iSFPowerUseThisScale)) ||
+ !(AGH_GBGETOBJ (iSFPowerAutoscale)) ||
+
+ !(AGH_GBGETOBJ (iSFScoreAssist)) ||
+ !(AGH_GBGETOBJ (iSFScoreImport)) ||
+ !(AGH_GBGETOBJ (iSFScoreExport)) ||
+ !(AGH_GBGETOBJ (iSFScoreClear)) )
throw runtime_error ("Failed to construct SF widgets (5)");
gtk_menu_item_set_submenu( iSFPageHidden, (GtkWidget*)iiSFPageHidden);
@@ -335,14 +335,14 @@ SScoringFacilityWidgets ()
// petty dialogs
// annotations
- if ( !AGH_GBGETOBJ (GtkDialog, wSFAnnotationLabel) ||
- !AGH_GBGETOBJ (GtkEntry, eSFAnnotationLabel) ||
- !AGH_GBGETOBJ (GtkRadioButton, eSFAnnotationTypePlain) ||
- !AGH_GBGETOBJ (GtkRadioButton, eSFAnnotationTypeSpindle) ||
- !AGH_GBGETOBJ (GtkRadioButton, eSFAnnotationTypeKComplex) ||
- !AGH_GBGETOBJ (GtkRadioButton, eSFAnnotationTypeBlink) ||
- !AGH_GBGETOBJ (GtkDialog, wSFAnnotationSelector) ||
- !AGH_GBGETOBJ (GtkComboBox, eSFAnnotationSelectorWhich) )
+ if ( !AGH_GBGETOBJ (wSFAnnotationLabel) ||
+ !AGH_GBGETOBJ (eSFAnnotationLabel) ||
+ !AGH_GBGETOBJ (eSFAnnotationTypePlain) ||
+ !AGH_GBGETOBJ (eSFAnnotationTypeSpindle) ||
+ !AGH_GBGETOBJ (eSFAnnotationTypeKComplex) ||
+ !AGH_GBGETOBJ (eSFAnnotationTypeBlink) ||
+ !AGH_GBGETOBJ (wSFAnnotationSelector) ||
+ !AGH_GBGETOBJ (eSFAnnotationSelectorWhich) )
throw runtime_error ("Failed to construct SF widgets (6)");
mSFAnnotationsAtCursor = gtk_list_store_new(1, G_TYPE_STRING);
diff --git a/upstream/src/aghermann/ui/sf/d/artifacts-construct.cc b/upstream/src/aghermann/ui/sf/d/artifacts-construct.cc
index cbf986b..7adb378 100644
--- a/upstream/src/aghermann/ui/sf/d/artifacts-construct.cc
+++ b/upstream/src/aghermann/ui/sf/d/artifacts-construct.cc
@@ -26,36 +26,36 @@ SArtifactsDialogWidgets ()
throw runtime_error( "Failed to load SF::artifacts glade resource");
gtk_builder_connect_signals( builder, NULL);
- if ( !(AGH_GBGETOBJ (GtkDialog, wSFAD)) ||
- !(AGH_GBGETOBJ (GtkComboBox, eSFADProfiles)) ||
- !(AGH_GBGETOBJ (GtkButton, bSFADProfileSave)) ||
- !(AGH_GBGETOBJ (GtkButton, bSFADProfileDelete)) ||
- !(AGH_GBGETOBJ (GtkSpinButton, eSFADScope)) ||
- !(AGH_GBGETOBJ (GtkSpinButton, eSFADUpperThr)) ||
- !(AGH_GBGETOBJ (GtkSpinButton, eSFADLowerThr)) ||
- !(AGH_GBGETOBJ (GtkSpinButton, eSFADF0)) ||
- !(AGH_GBGETOBJ (GtkSpinButton, eSFADFc)) ||
- !(AGH_GBGETOBJ (GtkSpinButton, eSFADBandwidth)) ||
- !(AGH_GBGETOBJ (GtkSpinButton, eSFADMCGain)) ||
- !(AGH_GBGETOBJ (GtkSpinButton, eSFADBackpolate)) ||
- !(AGH_GBGETOBJ (GtkSpinButton, eSFADEValue)) ||
- !(AGH_GBGETOBJ (GtkSpinButton, eSFADHistRangeMin)) ||
- !(AGH_GBGETOBJ (GtkSpinButton, eSFADHistRangeMax)) ||
- !(AGH_GBGETOBJ (GtkSpinButton, eSFADHistBins)) ||
- !(AGH_GBGETOBJ (GtkSpinButton, eSFADSmoothSide)) ||
- !(AGH_GBGETOBJ (GtkCheckButton, eSFADSingleChannelPreview)) ||
- !(AGH_GBGETOBJ (GtkCheckButton, eSFADEstimateE)) ||
- !(AGH_GBGETOBJ (GtkRadioButton, eSFADUseThisRange)) ||
- !(AGH_GBGETOBJ (GtkRadioButton, eSFADUseComputedRange)) ||
- !(AGH_GBGETOBJ (GtkTable, cSFADWhenEstimateEOn)) ||
- !(AGH_GBGETOBJ (GtkTable, cSFADWhenEstimateEOff)) ||
- !(AGH_GBGETOBJ (GtkLabel, lSFADInfo)) ||
- !(AGH_GBGETOBJ (GtkLabel, lSFADDirtyPercent)) ||
- !(AGH_GBGETOBJ (GtkToggleButton, bSFADPreview)) ||
- !(AGH_GBGETOBJ (GtkButton, bSFADApply)) ||
- !(AGH_GBGETOBJ (GtkButton, bSFADCancel)) ||
- !(AGH_GBGETOBJ (GtkDialog, wSFADSaveProfileName)) ||
- !(AGH_GBGETOBJ (GtkEntry, eSFADSaveProfileNameName)) )
+ if ( !(AGH_GBGETOBJ (wSFAD)) ||
+ !(AGH_GBGETOBJ (eSFADProfiles)) ||
+ !(AGH_GBGETOBJ (bSFADProfileSave)) ||
+ !(AGH_GBGETOBJ (bSFADProfileDelete)) ||
+ !(AGH_GBGETOBJ (eSFADScope)) ||
+ !(AGH_GBGETOBJ (eSFADUpperThr)) ||
+ !(AGH_GBGETOBJ (eSFADLowerThr)) ||
+ !(AGH_GBGETOBJ (eSFADF0)) ||
+ !(AGH_GBGETOBJ (eSFADFc)) ||
+ !(AGH_GBGETOBJ (eSFADBandwidth)) ||
+ !(AGH_GBGETOBJ (eSFADMCGain)) ||
+ !(AGH_GBGETOBJ (eSFADBackpolate)) ||
+ !(AGH_GBGETOBJ (eSFADEValue)) ||
+ !(AGH_GBGETOBJ (eSFADHistRangeMin)) ||
+ !(AGH_GBGETOBJ (eSFADHistRangeMax)) ||
+ !(AGH_GBGETOBJ (eSFADHistBins)) ||
+ !(AGH_GBGETOBJ (eSFADSmoothSide)) ||
+ !(AGH_GBGETOBJ (eSFADSingleChannelPreview)) ||
+ !(AGH_GBGETOBJ (eSFADEstimateE)) ||
+ !(AGH_GBGETOBJ (eSFADUseThisRange)) ||
+ !(AGH_GBGETOBJ (eSFADUseComputedRange)) ||
+ !(AGH_GBGETOBJ (cSFADWhenEstimateEOn)) ||
+ !(AGH_GBGETOBJ (cSFADWhenEstimateEOff)) ||
+ !(AGH_GBGETOBJ (lSFADInfo)) ||
+ !(AGH_GBGETOBJ (lSFADDirtyPercent)) ||
+ !(AGH_GBGETOBJ (bSFADPreview)) ||
+ !(AGH_GBGETOBJ (bSFADApply)) ||
+ !(AGH_GBGETOBJ (bSFADCancel)) ||
+ !(AGH_GBGETOBJ (wSFADSaveProfileName)) ||
+ !(AGH_GBGETOBJ (eSFADSaveProfileNameName)) )
throw runtime_error ("Failed to construct SF widgets (7)");
mSFADProfiles = gtk_list_store_new( 1, G_TYPE_STRING);
diff --git a/upstream/src/aghermann/ui/sf/d/artifacts-simple-construct.cc b/upstream/src/aghermann/ui/sf/d/artifacts-simple-construct.cc
index 2b72c74..2c571bd 100644
--- a/upstream/src/aghermann/ui/sf/d/artifacts-simple-construct.cc
+++ b/upstream/src/aghermann/ui/sf/d/artifacts-simple-construct.cc
@@ -26,9 +26,9 @@ SArtifactsSimpleDialogWidgets ()
throw runtime_error( "Failed to load SF::artifacts-simple glade resource");
gtk_builder_connect_signals( builder, NULL);
- if ( !AGH_GBGETOBJ (GtkDialog, wSFADS) ||
- !AGH_GBGETOBJ (GtkSpinButton, eSFADSMinFlatRegionSize) ||
- !AGH_GBGETOBJ (GtkSpinButton, eSFADSPad) )
+ if ( !AGH_GBGETOBJ (wSFADS) ||
+ !AGH_GBGETOBJ (eSFADSMinFlatRegionSize) ||
+ !AGH_GBGETOBJ (eSFADSPad) )
throw runtime_error ("Failed to construct SArtifactsSimpleDialogWidgets");
}
diff --git a/upstream/src/aghermann/ui/sf/d/filters-construct.cc b/upstream/src/aghermann/ui/sf/d/filters-construct.cc
index 05a6ecb..8e3bf55 100644
--- a/upstream/src/aghermann/ui/sf/d/filters-construct.cc
+++ b/upstream/src/aghermann/ui/sf/d/filters-construct.cc
@@ -27,15 +27,15 @@ SFiltersDialogWidgets ()
throw runtime_error( "Failed to load SF::artifacts glade resource");
gtk_builder_connect_signals( builder, NULL);
- if ( !AGH_GBGETOBJ (GtkDialog, wSFFilters) ||
- !AGH_GBGETOBJ (GtkLabel, lSFFilterCaption) ||
- !AGH_GBGETOBJ (GtkSpinButton, eSFFilterLowPassCutoff) ||
- !AGH_GBGETOBJ (GtkSpinButton, eSFFilterLowPassOrder) ||
- !AGH_GBGETOBJ (GtkSpinButton, eSFFilterHighPassCutoff) ||
- !AGH_GBGETOBJ (GtkSpinButton, eSFFilterHighPassOrder) ||
- !AGH_GBGETOBJ (GtkComboBox, eSFFilterNotchFilter) ||
- !AGH_GBGETOBJ (GtkListStore, mSFFilterNotchFilter) ||
- !AGH_GBGETOBJ (GtkButton, bSFFilterOK) )
+ if ( !AGH_GBGETOBJ (wSFFilters) ||
+ !AGH_GBGETOBJ (lSFFilterCaption) ||
+ !AGH_GBGETOBJ (eSFFilterLowPassCutoff) ||
+ !AGH_GBGETOBJ (eSFFilterLowPassOrder) ||
+ !AGH_GBGETOBJ (eSFFilterHighPassCutoff) ||
+ !AGH_GBGETOBJ (eSFFilterHighPassOrder) ||
+ !AGH_GBGETOBJ (eSFFilterNotchFilter) ||
+ !AGH_GBGETOBJ (mSFFilterNotchFilter) ||
+ !AGH_GBGETOBJ (bSFFilterOK) )
throw runtime_error ("Failed to construct SFiltersDialogWidgets");
gtk_combo_box_set_model_properly(
diff --git a/upstream/src/aghermann/ui/sf/d/patterns.cc b/upstream/src/aghermann/ui/sf/d/patterns.cc
index 1f349c1..2911260 100644
--- a/upstream/src/aghermann/ui/sf/d/patterns.cc
+++ b/upstream/src/aghermann/ui/sf/d/patterns.cc
@@ -54,55 +54,55 @@ SPatternsDialog (SScoringFacility& p_)
mSFFDChannels =
gtk_list_store_new( 1, G_TYPE_STRING);
- if ( !AGH_GBGETOBJ (GtkDialog, wSFFD) ||
- !AGH_GBGETOBJ (GtkDrawingArea, daSFFDThing) ||
- !AGH_GBGETOBJ (GtkScrolledWindow, swSFFDThing) ||
- !AGH_GBGETOBJ (GtkDrawingArea, daSFFDField) ||
- !AGH_GBGETOBJ (GtkMenuBar, iibSFFDMenu) ||
- !AGH_GBGETOBJ (GtkMenu, iiSFFDField) ||
- !AGH_GBGETOBJ (GtkMenu, iiSFFDFieldProfileTypes) ||
- !AGH_GBGETOBJ (GtkCheckMenuItem, iSFFDFieldDrawMatchIndex) ||
- !AGH_GBGETOBJ (GtkRadioMenuItem, iSFFDFieldProfileTypeRaw) ||
- !AGH_GBGETOBJ (GtkRadioMenuItem, iSFFDFieldProfileTypePSD) ||
- !AGH_GBGETOBJ (GtkRadioMenuItem, iSFFDFieldProfileTypeMC) ||
- !AGH_GBGETOBJ (GtkRadioMenuItem, iSFFDFieldProfileTypeSWU) ||
- !AGH_GBGETOBJ (GtkMenuItem, iSFFDMarkPhasicEventSpindles) ||
- !AGH_GBGETOBJ (GtkMenuItem, iSFFDMarkPhasicEventKComplexes) ||
- !AGH_GBGETOBJ (GtkMenuItem, iSFFDMarkPlain) ||
- !AGH_GBGETOBJ (GtkScrolledWindow, swSFFDField) ||
- !AGH_GBGETOBJ (GtkTable, cSFFDSearchButton) ||
- !AGH_GBGETOBJ (GtkTable, cSFFDAgainButton) ||
- !AGH_GBGETOBJ (GtkBox, cSFFDSearching) ||
- !AGH_GBGETOBJ (GtkTable, cSFFDParameters) ||
- !AGH_GBGETOBJ (GtkTable, cSFFDCriteria) ||
- !AGH_GBGETOBJ (GtkButton, bSFFDSearch) ||
- !AGH_GBGETOBJ (GtkButton, bSFFDAgain) ||
- !AGH_GBGETOBJ (GtkButton, bSFFDProfileSave) ||
- !AGH_GBGETOBJ (GtkButton, bSFFDProfileDiscard) ||
- !AGH_GBGETOBJ (GtkButton, bSFFDProfileRevert) ||
- !AGH_GBGETOBJ (GtkSpinButton, eSFFDEnvTightness) ||
- !AGH_GBGETOBJ (GtkSpinButton, eSFFDBandPassOrder) ||
- !AGH_GBGETOBJ (GtkSpinButton, eSFFDBandPassFrom) ||
- !AGH_GBGETOBJ (GtkSpinButton, eSFFDBandPassUpto) ||
- !AGH_GBGETOBJ (GtkSpinButton, eSFFDDZCDFStep) ||
- !AGH_GBGETOBJ (GtkSpinButton, eSFFDDZCDFSigma) ||
- !AGH_GBGETOBJ (GtkSpinButton, eSFFDDZCDFSmooth) ||
- !AGH_GBGETOBJ (GtkSpinButton, eSFFDParameterA) ||
- !AGH_GBGETOBJ (GtkSpinButton, eSFFDParameterB) ||
- !AGH_GBGETOBJ (GtkSpinButton, eSFFDParameterC) ||
- !AGH_GBGETOBJ (GtkSpinButton, eSFFDParameterD) ||
- !AGH_GBGETOBJ (GtkSpinButton, eSFFDIncrement) ||
- !AGH_GBGETOBJ (GtkHBox, cSFFDLabelBox) ||
- !AGH_GBGETOBJ (GtkLabel, lSFFDParametersBrief) ||
- !AGH_GBGETOBJ (GtkLabel, lSFFDFoundInfo) ||
- !AGH_GBGETOBJ (GtkComboBox, eSFFDProfileList) ||
- !AGH_GBGETOBJ (GtkComboBox, eSFFDChannel) ||
- !AGH_GBGETOBJ (GtkDialog, wSFFDProfileSave) ||
- !AGH_GBGETOBJ (GtkEntry, eSFFDProfileSaveName) ||
- !AGH_GBGETOBJ (GtkToggleButton, eSFFDProfileSaveOriginSubject) ||
- !AGH_GBGETOBJ (GtkToggleButton, eSFFDProfileSaveOriginExperiment) ||
- !AGH_GBGETOBJ (GtkToggleButton, eSFFDProfileSaveOriginUser) ||
- !AGH_GBGETOBJ (GtkButton, bSFFDProfileSaveOK) )
+ if ( !AGH_GBGETOBJ (wSFFD) ||
+ !AGH_GBGETOBJ (daSFFDThing) ||
+ !AGH_GBGETOBJ (swSFFDThing) ||
+ !AGH_GBGETOBJ (daSFFDField) ||
+ !AGH_GBGETOBJ (iibSFFDMenu) ||
+ !AGH_GBGETOBJ (iiSFFDField) ||
+ !AGH_GBGETOBJ (iiSFFDFieldProfileTypes) ||
+ !AGH_GBGETOBJ (iSFFDFieldDrawMatchIndex) ||
+ !AGH_GBGETOBJ (iSFFDFieldProfileTypeRaw) ||
+ !AGH_GBGETOBJ (iSFFDFieldProfileTypePSD) ||
+ !AGH_GBGETOBJ (iSFFDFieldProfileTypeMC) ||
+ !AGH_GBGETOBJ (iSFFDFieldProfileTypeSWU) ||
+ !AGH_GBGETOBJ (iSFFDMarkPhasicEventSpindles) ||
+ !AGH_GBGETOBJ (iSFFDMarkPhasicEventKComplexes) ||
+ !AGH_GBGETOBJ (iSFFDMarkPlain) ||
+ !AGH_GBGETOBJ (swSFFDField) ||
+ !AGH_GBGETOBJ (cSFFDSearchButton) ||
+ !AGH_GBGETOBJ (cSFFDAgainButton) ||
+ !AGH_GBGETOBJ (cSFFDSearching) ||
+ !AGH_GBGETOBJ (cSFFDParameters) ||
+ !AGH_GBGETOBJ (cSFFDCriteria) ||
+ !AGH_GBGETOBJ (bSFFDSearch) ||
+ !AGH_GBGETOBJ (bSFFDAgain) ||
+ !AGH_GBGETOBJ (bSFFDProfileSave) ||
+ !AGH_GBGETOBJ (bSFFDProfileDiscard) ||
+ !AGH_GBGETOBJ (bSFFDProfileRevert) ||
+ !AGH_GBGETOBJ (eSFFDEnvTightness) ||
+ !AGH_GBGETOBJ (eSFFDBandPassOrder) ||
+ !AGH_GBGETOBJ (eSFFDBandPassFrom) ||
+ !AGH_GBGETOBJ (eSFFDBandPassUpto) ||
+ !AGH_GBGETOBJ (eSFFDDZCDFStep) ||
+ !AGH_GBGETOBJ (eSFFDDZCDFSigma) ||
+ !AGH_GBGETOBJ (eSFFDDZCDFSmooth) ||
+ !AGH_GBGETOBJ (eSFFDParameterA) ||
+ !AGH_GBGETOBJ (eSFFDParameterB) ||
+ !AGH_GBGETOBJ (eSFFDParameterC) ||
+ !AGH_GBGETOBJ (eSFFDParameterD) ||
+ !AGH_GBGETOBJ (eSFFDIncrement) ||
+ !AGH_GBGETOBJ (cSFFDLabelBox) ||
+ !AGH_GBGETOBJ (lSFFDParametersBrief) ||
+ !AGH_GBGETOBJ (lSFFDFoundInfo) ||
+ !AGH_GBGETOBJ (eSFFDProfileList) ||
+ !AGH_GBGETOBJ (eSFFDChannel) ||
+ !AGH_GBGETOBJ (wSFFDProfileSave) ||
+ !AGH_GBGETOBJ (eSFFDProfileSaveName) ||
+ !AGH_GBGETOBJ (eSFFDProfileSaveOriginSubject) ||
+ !AGH_GBGETOBJ (eSFFDProfileSaveOriginExperiment) ||
+ !AGH_GBGETOBJ (eSFFDProfileSaveOriginUser) ||
+ !AGH_GBGETOBJ (bSFFDProfileSaveOK) )
throw runtime_error ("Failed to construct SPatternsDialogWidgets");
gtk_combo_box_set_model_properly( eSFFDProfileList, mSFFDProfiles);
diff --git a/upstream/src/aghermann/ui/sf/d/phasediff-construct.cc b/upstream/src/aghermann/ui/sf/d/phasediff-construct.cc
index 16709fc..04cdab9 100644
--- a/upstream/src/aghermann/ui/sf/d/phasediff-construct.cc
+++ b/upstream/src/aghermann/ui/sf/d/phasediff-construct.cc
@@ -28,13 +28,13 @@ SPhasediffDialogWidgets (SScoringFacility& SF)
mSFPDChannels =
gtk_list_store_new( 1, G_TYPE_STRING);
- if ( !(AGH_GBGETOBJ (GtkDialog, wSFPD)) ||
- !(AGH_GBGETOBJ (GtkDrawingArea, daSFPD)) ||
- !(AGH_GBGETOBJ (GtkComboBox, eSFPDChannelA)) ||
- !(AGH_GBGETOBJ (GtkComboBox, eSFPDChannelB)) ||
- !(AGH_GBGETOBJ (GtkSpinButton, eSFPDFreqFrom)) ||
- !(AGH_GBGETOBJ (GtkSpinButton, eSFPDBandwidth)) ||
- !(AGH_GBGETOBJ (GtkScaleButton, eSFPDSmooth)) )
+ if ( !(AGH_GBGETOBJ (wSFPD)) ||
+ !(AGH_GBGETOBJ (daSFPD)) ||
+ !(AGH_GBGETOBJ (eSFPDChannelA)) ||
+ !(AGH_GBGETOBJ (eSFPDChannelB)) ||
+ !(AGH_GBGETOBJ (eSFPDFreqFrom)) ||
+ !(AGH_GBGETOBJ (eSFPDBandwidth)) ||
+ !(AGH_GBGETOBJ (eSFPDSmooth)) )
throw runtime_error ("Failed to construct SF widgets (11)");
// filter channels we don't have
diff --git a/upstream/src/aghermann/ui/sf/d/rk1968.cc b/upstream/src/aghermann/ui/sf/d/rk1968.cc
index 3602ccb..fd506d0 100644
--- a/upstream/src/aghermann/ui/sf/d/rk1968.cc
+++ b/upstream/src/aghermann/ui/sf/d/rk1968.cc
@@ -41,23 +41,23 @@ SRK1968Dialog (SScoringFacility& p_)
throw runtime_error( "Failed to load SF::rk1968 glade resource");
gtk_builder_connect_signals( builder, NULL);
- if ( !AGH_GBGETOBJ (GtkDialog, wSFRK) ||
- !AGH_GBGETOBJ (GtkButton, bSFRKProfileRevert) ||
- !AGH_GBGETOBJ (GtkButton, bSFRKProfileSave) ||
- !AGH_GBGETOBJ (GtkButton, bSFRKProfileDiscard) ||
- !AGH_GBGETOBJ (GtkComboBox, eSFRKProfileList) ||
-
- !AGH_GBGETOBJ (GtkSpinButton, eSFRKNremThetaDeltaRatio) ||
-
- !AGH_GBGETOBJ (GtkButton, bSFRKTry) ||
- !AGH_GBGETOBJ (GtkButton, bSFRKModify) ||
- !AGH_GBGETOBJ (GtkLabel, lSFRKWorking) ||
- !AGH_GBGETOBJ (GtkDialog, wSFRKProfileSave) ||
- !AGH_GBGETOBJ (GtkEntry, eSFRKProfileSaveName) ||
- !AGH_GBGETOBJ (GtkToggleButton, eSFRKProfileSaveOriginSubject) ||
- !AGH_GBGETOBJ (GtkToggleButton, eSFRKProfileSaveOriginExperiment) ||
- !AGH_GBGETOBJ (GtkToggleButton, eSFRKProfileSaveOriginUser) ||
- !AGH_GBGETOBJ (GtkButton, bSFRKProfileSaveOK) )
+ if ( !AGH_GBGETOBJ (wSFRK) ||
+ !AGH_GBGETOBJ (bSFRKProfileRevert) ||
+ !AGH_GBGETOBJ (bSFRKProfileSave) ||
+ !AGH_GBGETOBJ (bSFRKProfileDiscard) ||
+ !AGH_GBGETOBJ (eSFRKProfileList) ||
+
+ !AGH_GBGETOBJ (eSFRKNremThetaDeltaRatio) ||
+
+ !AGH_GBGETOBJ (bSFRKTry) ||
+ !AGH_GBGETOBJ (bSFRKModify) ||
+ !AGH_GBGETOBJ (lSFRKWorking) ||
+ !AGH_GBGETOBJ (wSFRKProfileSave) ||
+ !AGH_GBGETOBJ (eSFRKProfileSaveName) ||
+ !AGH_GBGETOBJ (eSFRKProfileSaveOriginSubject) ||
+ !AGH_GBGETOBJ (eSFRKProfileSaveOriginExperiment) ||
+ !AGH_GBGETOBJ (eSFRKProfileSaveOriginUser) ||
+ !AGH_GBGETOBJ (bSFRKProfileSaveOK) )
throw runtime_error ("Failed to construct SRK1968DialogWidgets");
mSFRKProfiles =
diff --git a/upstream/src/aghermann/ui/sm/sm-construct.cc b/upstream/src/aghermann/ui/sm/sm-construct.cc
index 429ff0e..70826bb 100644
--- a/upstream/src/aghermann/ui/sm/sm-construct.cc
+++ b/upstream/src/aghermann/ui/sm/sm-construct.cc
@@ -40,14 +40,14 @@ construct_widgets()
mSessionChooserList =
gtk_list_store_new( 3, G_TYPE_STRING, G_TYPE_STRING, G_TYPE_STRING);
- if ( !(AGH_GBGETOBJ (GtkDialog, wSessionChooser)) ||
- !(AGH_GBGETOBJ (GtkTreeView, tvSessionChooserList)) ||
- !(AGH_GBGETOBJ (GtkButton, bSessionChooserOpen)) ||
- !(AGH_GBGETOBJ (GtkButton, bSessionChooserClose)) ||
- !(AGH_GBGETOBJ (GtkButton, bSessionChooserCreateNew)) ||
- !(AGH_GBGETOBJ (GtkButton, bSessionChooserRemove)) ||
- !(AGH_GBGETOBJ (GtkButton, bSessionChooserQuit)) ||
- !(AGH_GBGETOBJ (GtkStatusbar, sbSessionChooserStatusBar)) )
+ if ( !(AGH_GBGETOBJ (wSessionChooser)) ||
+ !(AGH_GBGETOBJ (tvSessionChooserList)) ||
+ !(AGH_GBGETOBJ (bSessionChooserOpen)) ||
+ !(AGH_GBGETOBJ (bSessionChooserClose)) ||
+ !(AGH_GBGETOBJ (bSessionChooserCreateNew)) ||
+ !(AGH_GBGETOBJ (bSessionChooserRemove)) ||
+ !(AGH_GBGETOBJ (bSessionChooserQuit)) ||
+ !(AGH_GBGETOBJ (sbSessionChooserStatusBar)) )
return -1;
G_CONNECT_1 (wSessionChooser, show);
diff --git a/upstream/src/aghermann/ui/ui.hh b/upstream/src/aghermann/ui/ui.hh
index 8f36a70..4b449ba 100644
--- a/upstream/src/aghermann/ui/ui.hh
+++ b/upstream/src/aghermann/ui/ui.hh
@@ -103,11 +103,8 @@ void set_cursor_busy( bool busy, GtkWidget *wid);
-#define AGH_GBGETOBJ(Type, A) \
- (A = (Type*)(gtk_builder_get_object( builder, #A)))
-
-#define AGH_GBGETOBJ3(B, Type, A) \
- (A = (Type*)(gtk_builder_get_object( B, #A)))
+#define AGH_GBGETOBJ(A) \
+ (A = (decltype(A))(gtk_builder_get_object( builder, #A)))
#define G_CONNECT_1(W, A) \
g_signal_connect(W, #A, (GCallback)W ## _ ## A ## _cb, this)
--
Alioth's /git/debian-med/git-commit-notice on /srv/git.debian.org/git/debian-med/aghermann.git
More information about the debian-med-commit
mailing list