The following commit has been merged in the master branch:
commit 7d227527e5b93304125c9f4a98619eed9a3bc337
Author: Andrei Zavada <[email protected]>
Date: Thu Apr 25 01:49:50 2013 +0300
expose a double scroll_factor and bool suppress_scan_report
diff --git a/data/mw-dialogs.glade b/data/mw-dialogs.glade
index 6d38469..01db660 100644
--- a/data/mw-dialogs.glade
+++ b/data/mw-dialogs.glade
@@ -2486,7 +2486,7 @@ With bug reports, either send yours to <a
href="mailto:aghermann-users@lists.
<property name="can_focus">False</property>
<property name="xalign">0</property>
<property name="ypad">8</property>
- <property name="label"
translatable="yes"><b><big>Recordings not
included</big></b></property>
+ <property name="label" translatable="yes"><b><big>Tree
scan report</big></b></property>
<property name="use_markup">True</property>
</object>
<packing>
diff --git a/data/mw.glade b/data/mw.glade
index 3fdfc20..3e904f8 100644
--- a/data/mw.glade
+++ b/data/mw.glade
@@ -397,6 +397,12 @@
<property name="step_increment">0.01</property>
<property name="page_increment">0.10000000000000001</property>
</object>
+ <object class="GtkAdjustment" id="jScrollSpeedFactor">
+ <property name="lower">1.0009999999999999</property>
+ <property name="upper">2</property>
+ <property name="step_increment">0.01</property>
+ <property name="page_increment">0.10000000000000001</property>
+ </object>
<object class="GtkAdjustment" id="jUltradianCycleDetectionAccuracy">
<property name="lower">0.5</property>
<property name="upper">20</property>
@@ -1507,20 +1513,11 @@ rm */*/*/.*.{psd,mc,swu}</property>
<property name="halign">start</property>
<property name="valign">start</property>
<property name="border_width">20</property>
- <property name="n_rows">3</property>
+ <property name="n_rows">2</property>
<property name="n_columns">3</property>
<property name="column_spacing">40</property>
<property name="row_spacing">40</property>
<child>
- <placeholder/>
- </child>
- <child>
- <placeholder/>
- </child>
- <child>
- <placeholder/>
- </child>
- <child>
<object class="GtkFrame" id="fScoreCodes">
<property name="visible">True</property>
<property name="can_focus">False</property>
@@ -1811,8 +1808,8 @@ rm */*/*/.*.{psd,mc,swu}</property>
</child>
</object>
<packing>
- <property name="left_attach">1</property>
- <property name="right_attach">2</property>
+ <property name="left_attach">2</property>
+ <property name="right_attach">3</property>
<property
name="x_options">GTK_FILL</property>
<property
name="y_options">GTK_FILL</property>
</packing>
@@ -1832,16 +1829,13 @@ rm */*/*/.*.{psd,mc,swu}</property>
<property
name="can_focus">False</property>
<property
name="border_width">10</property>
<property name="n_rows">3</property>
- <property name="n_columns">3</property>
+ <property name="n_columns">2</property>
<property
name="column_spacing">10</property>
<property
name="row_spacing">10</property>
<child>
<placeholder/>
</child>
<child>
- <placeholder/>
- </child>
- <child>
<object class="GtkLabel" id="label2">
<property
name="visible">True</property>
<property
name="can_focus">False</property>
@@ -1881,15 +1875,12 @@ rm */*/*/.*.{psd,mc,swu}</property>
</attributes>
</object>
<packing>
- <property
name="right_attach">3</property>
+ <property
name="right_attach">2</property>
<property
name="top_attach">1</property>
<property
name="bottom_attach">2</property>
</packing>
</child>
<child>
- <placeholder/>
- </child>
- <child>
<object class="GtkImage" id="image3">
<property
name="visible">True</property>
<property
name="can_focus">False</property>
@@ -1918,89 +1909,6 @@ rm */*/*/.*.{psd,mc,swu}</property>
</packing>
</child>
<child>
- <object class="GtkFrame" id="fSMP">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="halign">start</property>
- <property name="valign">start</property>
- <property name="border_width">5</property>
- <property name="label_xalign">0</property>
- <property
name="shadow_type">none</property>
- <child>
- <object class="GtkTable" id="table29">
- <property
name="visible">True</property>
- <property
name="can_focus">False</property>
- <property
name="border_width">10</property>
- <property name="n_rows">2</property>
- <property name="n_columns">3</property>
- <property
name="column_spacing">10</property>
- <property
name="row_spacing">10</property>
- <child>
- <placeholder/>
- </child>
- <child>
- <object class="GtkLabel" id="label6">
- <property
name="visible">True</property>
- <property
name="can_focus">False</property>
- <property
name="xalign">1</property>
- <property name="label"
translatable="yes">_Max threads to use: </property>
- <property
name="use_underline">True</property>
- <property
name="mnemonic_widget">eSMPMaxThreads</property>
- </object>
- </child>
- <child>
- <object class="GtkSpinButton"
id="eSMPMaxThreads">
- <property
name="visible">True</property>
- <property
name="can_focus">True</property>
- <property
name="has_frame">False</property>
- <property
name="invisible_char">•</property>
- <property
name="xalign">1</property>
- <property
name="shadow_type">none</property>
- <property
name="invisible_char_set">True</property>
- <property
name="adjustment">jSMPMaxThreads</property>
- <property
name="numeric">True</property>
- </object>
- <packing>
- <property
name="left_attach">1</property>
- <property
name="right_attach">2</property>
- </packing>
- </child>
- <child>
- <object class="GtkLabel" id="label5">
- <property
name="visible">True</property>
- <property
name="can_focus">False</property>
- <property name="label"
translatable="yes">(0 = # CPU cores)</property>
- <attributes>
- <attribute name="scale"
value="0.80000000000000004"/>
- </attributes>
- </object>
- <packing>
- <property
name="left_attach">1</property>
- <property
name="right_attach">3</property>
- <property
name="top_attach">1</property>
- <property
name="bottom_attach">2</property>
- </packing>
- </child>
- <child>
- <placeholder/>
- </child>
- </object>
- </child>
- <child type="label">
- <object class="GtkLabel" id="label7">
- <property
name="visible">True</property>
- <property
name="can_focus">False</property>
- <property name="label"
translatable="yes"><b><big>SMP</big></b></property>
- <property
name="use_markup">True</property>
- </object>
- </child>
- </object>
- <packing>
- <property name="left_attach">2</property>
- <property name="right_attach">3</property>
- </packing>
- </child>
- <child>
<object class="GtkFrame"
id="fFreqConventionalRanges">
<property name="visible">True</property>
<property name="can_focus">False</property>
@@ -2378,60 +2286,164 @@ rm */*/*/.*.{psd,mc,swu}</property>
</packing>
</child>
<child>
- <object class="GtkFrame" id="fSMP1">
+ <placeholder/>
+ </child>
+ <child>
+ <object class="GtkBox" id="box1">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="halign">start</property>
- <property name="valign">start</property>
- <property name="border_width">5</property>
- <property name="label_xalign">0</property>
- <property
name="shadow_type">none</property>
+ <property
name="orientation">vertical</property>
+ <property name="spacing">10</property>
<child>
- <object class="GtkTable" id="table10">
+ <object class="GtkFrame" id="fSMP">
<property
name="visible">True</property>
<property
name="can_focus">False</property>
- <property
name="border_width">10</property>
- <property name="n_columns">3</property>
- <property
name="column_spacing">10</property>
- <property
name="row_spacing">10</property>
- <child>
- <placeholder/>
- </child>
- <child>
- <placeholder/>
- </child>
- <child>
- <placeholder/>
- </child>
+ <property
name="halign">start</property>
+ <property
name="valign">start</property>
+ <property
name="border_width">5</property>
+ <property
name="label_xalign">0</property>
+ <property
name="shadow_type">none</property>
<child>
- <placeholder/>
+ <object class="GtkTable"
id="table29">
+ <property
name="visible">True</property>
+ <property
name="can_focus">False</property>
+ <property
name="border_width">10</property>
+ <property
name="n_rows">2</property>
+ <property
name="n_columns">3</property>
+ <property
name="column_spacing">10</property>
+ <property
name="row_spacing">10</property>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <object class="GtkLabel"
id="label6">
+ <property
name="visible">True</property>
+ <property
name="can_focus">False</property>
+ <property
name="xalign">1</property>
+ <property name="label"
translatable="yes">_Max threads to use: </property>
+ <property
name="use_underline">True</property>
+ <property
name="mnemonic_widget">eSMPMaxThreads</property>
+ </object>
+ </child>
+ <child>
+ <object class="GtkSpinButton"
id="eSMPMaxThreads">
+ <property
name="visible">True</property>
+ <property
name="can_focus">True</property>
+ <property
name="has_frame">False</property>
+ <property
name="invisible_char">•</property>
+ <property
name="xalign">1</property>
+ <property
name="shadow_type">none</property>
+ <property
name="invisible_char_set">True</property>
+ <property
name="adjustment">jSMPMaxThreads</property>
+ <property
name="numeric">True</property>
+ </object>
+ <packing>
+ <property
name="left_attach">1</property>
+ <property
name="right_attach">2</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel"
id="label5">
+ <property
name="visible">True</property>
+ <property
name="can_focus">False</property>
+ <property name="label"
translatable="yes">(0 = # CPU cores)</property>
+ <attributes>
+ <attribute name="scale"
value="0.80000000000000004"/>
+ </attributes>
+ </object>
+ <packing>
+ <property
name="left_attach">1</property>
+ <property
name="right_attach">3</property>
+ <property
name="top_attach">1</property>
+ <property
name="bottom_attach">2</property>
+ </packing>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ </object>
</child>
- <child>
- <object class="GtkCheckButton"
id="eScanTreeStrict">
- <property name="label"
translatable="yes">Strict EDF header check</property>
+ <child type="label">
+ <object class="GtkLabel" id="label7">
<property
name="visible">True</property>
- <property
name="can_focus">True</property>
- <property
name="receives_default">False</property>
- <property name="tooltip_text"
translatable="yes">Accept or reject EDF sources with inaccurate DOB or
gender</property>
- <property
name="xalign">0</property>
- <property
name="draw_indicator">True</property>
+ <property
name="can_focus">False</property>
+ <property name="label"
translatable="yes"><b><big>SMP</big></b></property>
+ <property
name="use_markup">True</property>
</object>
</child>
</object>
+ <packing>
+ <property
name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
</child>
- <child type="label">
- <object class="GtkLabel" id="label111">
+ <child>
+ <object class="GtkFrame" id="fSMP1">
<property
name="visible">True</property>
<property
name="can_focus">False</property>
- <property name="label"
translatable="yes"><b><big>Tree
scanning</big></b></property>
- <property
name="use_markup">True</property>
+ <property
name="halign">start</property>
+ <property
name="valign">start</property>
+ <property
name="border_width">5</property>
+ <property
name="label_xalign">0</property>
+ <property
name="shadow_type">none</property>
+ <child>
+ <object class="GtkTable"
id="table10">
+ <property
name="visible">True</property>
+ <property
name="can_focus">False</property>
+ <property
name="border_width">10</property>
+ <property
name="n_rows">2</property>
+ <property
name="column_spacing">10</property>
+ <property
name="row_spacing">10</property>
+ <child>
+ <object class="GtkCheckButton"
id="eScanTreeStrict">
+ <property name="label"
translatable="yes">Strict EDF header check</property>
+ <property
name="visible">True</property>
+ <property
name="can_focus">True</property>
+ <property
name="receives_default">False</property>
+ <property
name="has_tooltip">True</property>
+ <property
name="tooltip_markup" translatable="yes">Accept or reject EDF sources with
inaccurate DOB or gender</property>
+ <property name="tooltip_text"
translatable="yes">Accept or reject EDF sources with inaccurate DOB or
gender</property>
+ <property
name="xalign">0</property>
+ <property
name="draw_indicator">True</property>
+ </object>
+ </child>
+ <child>
+ <object class="GtkCheckButton"
id="eScanTreeSuppressReport">
+ <property name="label"
translatable="yes">Suppress scan report</property>
+ <property
name="visible">True</property>
+ <property
name="can_focus">True</property>
+ <property
name="receives_default">False</property>
+ <property
name="has_tooltip">True</property>
+ <property
name="xalign">0</property>
+ <property
name="draw_indicator">True</property>
+ </object>
+ <packing>
+ <property
name="top_attach">1</property>
+ <property
name="bottom_attach">2</property>
+ </packing>
+ </child>
+ </object>
+ </child>
+ <child type="label">
+ <object class="GtkLabel"
id="label111">
+ <property
name="visible">True</property>
+ <property
name="can_focus">False</property>
+ <property name="label"
translatable="yes"><b><big>Tree
scanning</big></b></property>
+ <property
name="use_markup">True</property>
+ </object>
+ </child>
</object>
+ <packing>
+ <property
name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
+ </packing>
</child>
</object>
<packing>
- <property name="left_attach">2</property>
- <property name="right_attach">3</property>
- <property name="top_attach">1</property>
+ <property name="left_attach">1</property>
+ <property name="right_attach">2</property>
<property name="bottom_attach">2</property>
</packing>
</child>
@@ -3235,20 +3247,10 @@ Read more <a
href="http://johnhommer.com/academic/code/aghermann/swu/">her
<property name="halign">start</property>
<property name="valign">start</property>
<property name="border_width">20</property>
- <property name="n_rows">3</property>
+ <property name="n_rows">2</property>
<property name="n_columns">3</property>
- <child>
- <placeholder/>
- </child>
- <child>
- <placeholder/>
- </child>
- <child>
- <placeholder/>
- </child>
- <child>
- <placeholder/>
- </child>
+ <property name="column_spacing">40</property>
+ <property name="row_spacing">40</property>
<child>
<object class="GtkFrame" id="fDAHeights">
<property
name="width_request">100</property>
@@ -5088,7 +5090,7 @@ dragging individual signals with
<i>Alt</i>.</small></property
<packing>
<property name="left_attach">1</property>
<property name="right_attach">2</property>
- <property name="bottom_attach">3</property>
+ <property name="bottom_attach">2</property>
<property
name="x_options">GTK_FILL</property>
<property
name="y_options">GTK_FILL</property>
</packing>
@@ -5151,6 +5153,73 @@ dragging individual signals with
<i>Alt</i>.</small></property
<property
name="y_options">GTK_FILL</property>
</packing>
</child>
+ <child>
+ <object class="GtkFrame" id="fSMP2">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="halign">start</property>
+ <property name="valign">start</property>
+ <property name="border_width">5</property>
+ <property name="label_xalign">0</property>
+ <property
name="shadow_type">none</property>
+ <child>
+ <object class="GtkTable" id="table32">
+ <property
name="visible">True</property>
+ <property
name="can_focus">False</property>
+ <property
name="border_width">10</property>
+ <property name="n_columns">3</property>
+ <property
name="column_spacing">10</property>
+ <property
name="row_spacing">10</property>
+ <child>
+ <object class="GtkLabel"
id="label108">
+ <property
name="visible">True</property>
+ <property
name="can_focus">False</property>
+ <property
name="xalign">1</property>
+ <property name="label"
translatable="yes">Factor: </property>
+ <property
name="use_underline">True</property>
+ <property
name="mnemonic_widget">eScrollSpeedFactor</property>
+ </object>
+ </child>
+ <child>
+ <object class="GtkSpinButton"
id="eScrollSpeedFactor">
+ <property
name="visible">True</property>
+ <property
name="can_focus">True</property>
+ <property
name="has_frame">False</property>
+ <property
name="invisible_char">•</property>
+ <property
name="xalign">1</property>
+ <property
name="shadow_type">none</property>
+ <property
name="invisible_char_set">True</property>
+ <property
name="adjustment">jScrollSpeedFactor</property>
+ <property
name="digits">3</property>
+ <property
name="numeric">True</property>
+ </object>
+ <packing>
+ <property
name="left_attach">1</property>
+ <property
name="right_attach">2</property>
+ </packing>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ </object>
+ </child>
+ <child type="label">
+ <object class="GtkLabel" id="label164">
+ <property
name="visible">True</property>
+ <property
name="can_focus">False</property>
+ <property name="label"
translatable="yes"><b><big>Scroll
speed</big></b></property>
+ <property
name="use_markup">True</property>
+ </object>
+ </child>
+ </object>
+ <packing>
+ <property name="top_attach">1</property>
+ <property name="bottom_attach">2</property>
+ </packing>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
</object>
</child>
</object>
@@ -7380,6 +7449,12 @@ dragging individual signals with
<i>Alt</i>.</small></property
<child>
<placeholder/>
</child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
</object>
</child>
<child>
diff --git a/src/ui/mw/construct.cc b/src/ui/mw/construct.cc
index e56f4fc..2e5fd80 100644
--- a/src/ui/mw/construct.cc
+++ b/src/ui/mw/construct.cc
@@ -375,10 +375,13 @@ SExpDesignUIWidgets ()
!AGH_GBGETOBJ (GtkSpinButton, eDAPageHeight) ||
!AGH_GBGETOBJ (GtkSpinButton, eDAHypnogramHeight) ||
!AGH_GBGETOBJ (GtkSpinButton, eDAEMGHeight) ||
- !AGH_GBGETOBJ (GtkCheckButton, eScanTreeStrict) )
+ !AGH_GBGETOBJ (GtkCheckButton, eScanTreeStrict) ||
+ !AGH_GBGETOBJ (GtkCheckButton, eScanTreeSuppressReport) )
throw runtime_error ("Failed to construct widgets");
- if ( !AGH_GBGETOBJ (GtkEntry, eBrowseCommand) )
+ if ( !AGH_GBGETOBJ (GtkEntry, eBrowseCommand) ||
+ !AGH_GBGETOBJ (GtkSpinButton, eScrollSpeedFactor) ||
+ !AGH_GBGETOBJ (GtkSpinButton, eDAEMGHeight) )
throw runtime_error ("Failed to construct widgets");
diff --git a/src/ui/mw/loadsave.cc b/src/ui/mw/loadsave.cc
index 63d4ad1..dc01488 100644
--- a/src/ui/mw/loadsave.cc
+++ b/src/ui/mw/loadsave.cc
@@ -86,6 +86,7 @@ load_settings()
try {
conf.readFile( CONF_FILE);
confval::get( config_keys_s, conf);
+ confval::get( config_keys_b, conf);
confval::get( config_keys_d, conf);
confval::get( config_keys_g, conf);
@@ -178,6 +179,7 @@ save_settings()
_aghdd_placeholder = AghD();
confval::put( config_keys_s, conf);
+ confval::put( config_keys_b, conf);
confval::put( config_keys_d, conf);
confval::put( config_keys_g, conf);
diff --git a/src/ui/mw/mw.cc b/src/ui/mw/mw.cc
index 35b4399..1e16ddf 100644
--- a/src/ui/mw/mw.cc
+++ b/src/ui/mw/mw.cc
@@ -148,6 +148,7 @@ SExpDesignUI (aghui::SSessionChooser *parent,
active_profile_mc_f0 (.5),
only_plain_global_annotations (true),
strict_subject_id_checks (false),
+ suppress_scan_report (false),
uc_accuracy_factor (1.),
pagesize_item (2),
binsize_item (1),
@@ -178,8 +179,12 @@ SExpDesignUI (aghui::SSessionChooser *parent,
SValidator<string>("Common.CurrentChannel",
&_aghtt_placeholder),
SValidator<string>("Measurements.BrowseCommand",
&browse_command),
}),
+ config_keys_b ({
+ SValidator<bool>("Common.OnlyPlainAnnotations",
&only_plain_global_annotations),
+ SValidator<bool>("ScanTree.StrictSubjectIdCheck",
&strict_subject_id_checks),
+ SValidator<bool>("ScanTree.SuppressScanReport",
&suppress_scan_report),
+ }),
config_keys_d ({
- SValidator<int>("Common.OnlyPlainAnnotations",
(int*)&only_plain_global_annotations, SValidator<int>::SVFRangeIn (
0, 1)),
SValidator<int>("Common.Sort.By",
(int*)&sort_by, SValidator<int>::SVFRangeIn (
0, 3)),
SValidator<int>("Common.Sort.Ascending",
(int*)&sort_ascending, SValidator<int>::SVFRangeIn (
0, 1)),
SValidator<int>("Common.Sort.Segregate",
(int*)&sort_segregate, SValidator<int>::SVFRangeIn (
0, 1)),
@@ -234,7 +239,7 @@ SExpDesignUI (aghui::SSessionChooser *parent,
// bind fields to widgets
// tab 1
- W_V1.reg( eSMPMaxThreads, &ED->num_threads);
+ W_V1.reg( eSMPMaxThreads, &ED->num_threads);
W_V1.reg( eScanTreeStrict, &ED->strict_subject_id_checks);
W_V1.reg( eArtifDampenWindowType, (int*)&ED->af_dampen_window_type);
W_V1.reg( eArtifDampenFactor, &ED->af_dampen_factor);
@@ -246,9 +251,10 @@ SExpDesignUI (aghui::SSessionChooser *parent,
W_V1.reg( eMCParamNBins, &ED->mc_params.n_bins);
W_V1.reg( eSWUParamMinUpswingDuration,
&ED->swu_params.min_upswing_duration);
- W_V1.reg( eFFTParamsPageSize, &pagesize_item);
- W_V1.reg( eFFTParamsBinSize, &binsize_item);
- W_V1.reg( eFFTParamsPlanType, (int*)&ED->fft_params.plan_type);
+ W_V1.reg( eScanTreeSuppressReport, &suppress_scan_report);
+ W_V1.reg( eFFTParamsPageSize, &pagesize_item);
+ W_V1.reg( eFFTParamsBinSize, &binsize_item);
+ W_V1.reg( eFFTParamsPlanType, (int*)&ED->fft_params.plan_type);
W_V1.reg( eUltradianCycleDetectionAccuracy, &uc_accuracy_factor);
for ( size_t i = 0; i < sigfile::SPage::TScore::TScore_total; ++i )
W_V1.reg( eScoreCode[i], &ext_score_codes[i]);
@@ -262,6 +268,7 @@ SExpDesignUI (aghui::SSessionChooser *parent,
W_V1.reg( eDAHypnogramHeight, (int*)&SScoringFacility::HypnogramHeight);
W_V1.reg( eDAEMGHeight, (int*)&SScoringFacility::EMGProfileHeight);
W_V1.reg( eBrowseCommand, &browse_command);
+ W_V1.reg( eScrollSpeedFactor, &scroll_factor);
// set _saved, too
fft_params_welch_window_type_saved =
ED->fft_params.welch_window_type;
diff --git a/src/ui/mw/mw.hh b/src/ui/mw/mw.hh
index 84f1c02..d5ad5de 100644
--- a/src/ui/mw/mw.hh
+++ b/src/ui/mw/mw.hh
@@ -235,7 +235,8 @@ class SExpDesignUI
// own variables aka saved settings
bool only_plain_global_annotations,
- strict_subject_id_checks;
+ strict_subject_id_checks,
+ suppress_scan_report;
double uc_accuracy_factor;
int pagesize_item,
@@ -351,6 +352,7 @@ class SExpDesignUI
geometry;
forward_list<confval::SValidator<string>> config_keys_s;
+ forward_list<confval::SValidator<bool>> config_keys_b;
forward_list<confval::SValidator<int>> config_keys_d;
forward_list<confval::SValidator<double>> config_keys_g;
int load_settings();
diff --git a/src/ui/mw/populate.cc b/src/ui/mw/populate.cc
index e61de85..60b055b 100644
--- a/src/ui/mw/populate.cc
+++ b/src/ui/mw/populate.cc
@@ -125,9 +125,12 @@ populate( bool do_load)
}
if ( not ED->error_log().empty() ) {
- gtk_text_buffer_set_text( gtk_text_view_get_buffer( tScanLog),
- ED->error_log().c_str(), -1);
- gtk_widget_show_all( (GtkWidget*)wScanLog);
+ if ( not suppress_scan_report ) {
+ gtk_text_buffer_set_text( gtk_text_view_get_buffer(
tScanLog),
+ ED->error_log().c_str(), -1);
+ gtk_widget_show_all( (GtkWidget*)wScanLog);
+ } else
+ gdk_window_beep( gtk_widget_get_window(
(GtkWidget*)wMainWindow));
}
return 0;
diff --git a/src/ui/mw/widgets.hh b/src/ui/mw/widgets.hh
index 3a457bd..aaebd26 100644
--- a/src/ui/mw/widgets.hh
+++ b/src/ui/mw/widgets.hh
@@ -168,6 +168,9 @@ struct SExpDesignUIWidgets {
*eSMPMaxThreads;
GtkSpinButton
*eUltradianCycleDetectionAccuracy;
+ GtkCheckButton
+ *eScanTreeStrict,
+ *eScanTreeSuppressReport;
GtkComboBox
*eFFTParamsWindowType,
*eFFTParamsPageSize,
@@ -188,7 +191,8 @@ struct SExpDesignUIWidgets {
*eDAMsmtTLHeight,
*eDAPageHeight,
*eDAHypnogramHeight,
- *eDAEMGHeight;
+ *eDAEMGHeight,
+ *eScrollSpeedFactor;
GtkAdjustment
*jFreqFrom,
*jFreqWidth;
@@ -229,8 +233,6 @@ struct SExpDesignUIWidgets {
GtkRadioButton
*eCtlParamScoreUnscoredAsWake;
- GtkCheckButton
- *eScanTreeStrict;
GtkSpinButton
*eTunable[agh::ach::TTunable::_basic_tunables][4];
--
Sleep experiment manager
_______________________________________________
debian-med-commit mailing list
[email protected]
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/debian-med-commit
