[med-svn] [SCM] aghermann branch, master, updated. 4f7a3b774136ffffbaf9b05d90bd568347bc5461
Andrei Zavada
johnhommer at gmail.com
Fri Nov 16 00:50:16 UTC 2012
The following commit has been merged in the master branch:
commit 9f341fc034e60a237722a5b7a435038673949749
Author: Andrei Zavada <johnhommer at gmail.com>
Date: Sun Oct 14 02:38:07 2012 +0300
skeleton for artifact detection param profiles
diff --git a/data/sf.glade b/data/sf.glade
index 09ff12d..eb07b4c 100644
--- a/data/sf.glade
+++ b/data/sf.glade
@@ -3982,6 +3982,7 @@ skew: 𝑔(𝑢) = 𝑢2</property>
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="border_width">10</property>
+ <property name="orientation">vertical</property>
<property name="row_spacing">5</property>
<child>
<object class="GtkLabel" id="lSFADInfo">
@@ -3998,7 +3999,7 @@ skew: 𝑔(𝑢) = 𝑢2</property>
<packing>
<property name="left_attach">0</property>
<property name="top_attach">0</property>
- <property name="width">7</property>
+ <property name="width">3</property>
<property name="height">1</property>
</packing>
</child>
@@ -4777,6 +4778,62 @@ skew: 𝑔(𝑢) = 𝑢2</property>
</packing>
</child>
<child>
+ <object class="GtkBox" id="box8">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="spacing">3</property>
+ <child>
+ <object class="GtkButton" id="bSFADProfileDelete">
+ <property name="label" translatable="yes">Delete</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">True</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="pack_type">end</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkButton" id="bSFADProfileSave">
+ <property name="label" translatable="yes">Save</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">True</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="pack_type">end</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkComboBox" id="eSFADProfiles">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="pack_type">end</property>
+ <property name="position">2</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="left_attach">4</property>
+ <property name="top_attach">0</property>
+ <property name="width">3</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
<placeholder/>
</child>
<child>
diff --git a/src/ui/scoring-facility-artifacts_cb.cc b/src/ui/scoring-facility-artifacts_cb.cc
index 5a149c1..2797191 100644
--- a/src/ui/scoring-facility-artifacts_cb.cc
+++ b/src/ui/scoring-facility-artifacts_cb.cc
@@ -20,6 +20,34 @@ using namespace aghui;
void
+eSFADProfiles_changed_cb( GtkComboBox* b, gpointer userdata)
+{
+ auto& SF = *(SScoringFacility*)userdata;
+ auto& AD = SF.artifact_detection_dialog;
+
+
+}
+
+void
+bSFADProfileSave_clicked_cb( GtkButton*, gpointer userdata)
+{
+ auto& SF = *(SScoringFacility*)userdata;
+ auto& AD = SF.artifact_detection_dialog;
+
+
+}
+
+void
+bSFADProfileDelete_clicked_cb( GtkButton*, gpointer userdata)
+{
+ auto& SF = *(SScoringFacility*)userdata;
+ auto& AD = SF.artifact_detection_dialog;
+
+
+}
+
+
+void
eSFADEstimateE_toggled_cb( GtkToggleButton *b, gpointer userdata)
{
auto& SF = *(SScoringFacility*)userdata;
diff --git a/src/ui/scoring-facility-construct.cc b/src/ui/scoring-facility-construct.cc
index ad32eb0..73503f6 100644
--- a/src/ui/scoring-facility-construct.cc
+++ b/src/ui/scoring-facility-construct.cc
@@ -231,6 +231,9 @@ SScoringFacilityWidgets (SExpDesignUI& _p)
!(AGH_GBGETOBJ (GtkComboBox, eAnnotationSelectorWhich)) ||
!(AGH_GBGETOBJ (GtkDialog, wSFArtifactDetectionSetup)) ||
+ !(AGH_GBGETOBJ (GtkComboBox, eSFADProfiles)) ||
+ !(AGH_GBGETOBJ (GtkButton, bSFADProfileSave)) ||
+ !(AGH_GBGETOBJ (GtkButton, bSFADProfileDelete)) ||
!(AGH_GBGETOBJ (GtkSpinButton, eSFADScope)) ||
!(AGH_GBGETOBJ (GtkSpinButton, eSFADUpperThr)) ||
!(AGH_GBGETOBJ (GtkSpinButton, eSFADLowerThr)) ||
@@ -267,6 +270,16 @@ SScoringFacilityWidgets (SExpDesignUI& _p)
"text", 0,
NULL);
+ mSFADProfiles = gtk_list_store_new(1, G_TYPE_STRING);
+ gtk_combo_box_set_model( eSFADProfiles,
+ (GtkTreeModel*)mSFADProfiles);
+ gtk_combo_box_set_id_column( eSFADProfiles, 0);
+
+ renderer = gtk_cell_renderer_text_new();
+ gtk_cell_layout_pack_start( (GtkCellLayout*)eSFADProfiles, renderer, FALSE);
+ gtk_cell_layout_set_attributes( (GtkCellLayout*)eSFADProfiles, renderer,
+ "text", 0,
+ NULL);
// orient control widget callbacks
// g_signal_connect( wScoringFacility, "configure-event",
@@ -575,6 +588,15 @@ SScoringFacilityWidgets (SExpDesignUI& _p)
(GCallback)daSFHypnogram_motion_notify_event_cb,
this);
+ g_signal_connect( eSFADProfiles, "changed",
+ (GCallback)eSFADProfiles_changed_cb,
+ this);
+ g_signal_connect( bSFADProfileSave, "clicked",
+ (GCallback)bSFADProfileSave_clicked_cb,
+ this);
+ g_signal_connect( bSFADProfileDelete, "clicked",
+ (GCallback)bSFADProfileDelete_clicked_cb,
+ this);
g_signal_connect( eSFADEstimateE, "toggled",
(GCallback)eSFADEstimateE_toggled_cb,
this);
diff --git a/src/ui/scoring-facility-widgets.hh b/src/ui/scoring-facility-widgets.hh
index 969d20f..9c97a2c 100644
--- a/src/ui/scoring-facility-widgets.hh
+++ b/src/ui/scoring-facility-widgets.hh
@@ -247,6 +247,13 @@ struct SScoringFacilityWidgets {
GtkDialog
*wSFArtifactDetectionSetup;
+ GtkComboBox
+ *eSFADProfiles;
+ GtkListStore
+ *mSFADProfiles;
+ GtkButton
+ *bSFADProfileSave,
+ *bSFADProfileDelete;
GtkSpinButton
*eSFADUpperThr,
*eSFADLowerThr,
diff --git a/src/ui/scoring-facility_cb.hh b/src/ui/scoring-facility_cb.hh
index e76aec3..5789c84 100644
--- a/src/ui/scoring-facility_cb.hh
+++ b/src/ui/scoring-facility_cb.hh
@@ -108,6 +108,10 @@ void iSFPageSelectionDrawCourse_toggled_cb( GtkCheckMenuItem*, gpointer);
void iSFPageSelectionDrawEnvelope_toggled_cb( GtkCheckMenuItem*, gpointer);
void iSFPageSelectionDrawDzxdf_toggled_cb( GtkCheckMenuItem*, gpointer);
+
+void eSFADProfiles_changed_cb( GtkComboBox*, gpointer);
+void bSFADProfileSave_clicked_cb( GtkButton*, gpointer);
+void bSFADProfileDelete_clicked_cb( GtkButton*, gpointer);
void eSFADEstimateE_toggled_cb( GtkToggleButton*, gpointer);
void eSFADUseThisRange_toggled_cb( GtkToggleButton*, gpointer);
void bSFADPreview_toggled_cb( GtkToggleButton*, gpointer);
--
Sleep experiment manager
More information about the debian-med-commit
mailing list