[med-svn] [SCM] aghermann branch, master, updated. f0d4c0fd35bf09e7dff56ddb9a2d798ae916c2ef
Andrei Zavada
johnhommer at gmail.com
Sun Feb 3 12:53:18 UTC 2013
The following commit has been merged in the master branch:
commit 4d6e47ce226d03553dd8d9126e0cb5d5417cd28b
Author: Andrei Zavada <johnhommer at gmail.com>
Date: Sun Feb 3 13:14:41 2013 +0200
colour choosers for phasic events
diff --git a/data/mw.glade b/data/mw.glade
index a33a960..c470d80 100644
--- a/data/mw.glade
+++ b/data/mw.glade
@@ -4379,7 +4379,7 @@ dragging individual signals with <i>Alt</i>.</small></property
<property name="can_focus">False</property>
<property name="valign">start</property>
<property name="border_width">10</property>
- <property name="n_rows">9</property>
+ <property name="n_rows">10</property>
<property name="n_columns">2</property>
<child>
<object class="GtkLabel" id="label100">
@@ -4583,7 +4583,7 @@ dragging individual signals with <i>Alt</i>.</small></property
<property name="receives_default">True</property>
<property name="relief">none</property>
<property name="use_alpha">True</property>
- <property name="title" translatable="yes">Labels (scoring facility)</property>
+ <property name="title" translatable="yes">Spindle</property>
<property name="color">#adad7f7fa8a8</property>
</object>
<packing>
@@ -4600,7 +4600,7 @@ dragging individual signals with <i>Alt</i>.</small></property
<property name="receives_default">True</property>
<property name="relief">none</property>
<property name="use_alpha">True</property>
- <property name="title" translatable="yes">Labels (scoring facility)</property>
+ <property name="title" translatable="yes">K-complex</property>
<property name="color">#e9e9b9b96e6e</property>
</object>
<packing>
@@ -4653,6 +4653,39 @@ dragging individual signals with <i>Alt</i>.</small></property
<property name="bottom_attach">7</property>
</packing>
</child>
+ <child>
+ <object class="GtkLabel" id="label98">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">Eye blink</property>
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="right_attach">2</property>
+ <property name="top_attach">9</property>
+ <property name="bottom_attach">10</property>
+ <property name="y_options">GTK_FILL</property>
+ <property name="x_padding">5</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkColorButton" id="bColourSFPhasicEyeBlink">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">True</property>
+ <property name="relief">none</property>
+ <property name="use_alpha">True</property>
+ <property name="title" translatable="yes">Eyeblink</property>
+ <property name="color">#fcfce9e94f4f</property>
+ </object>
+ <packing>
+ <property name="top_attach">9</property>
+ <property name="bottom_attach">10</property>
+ <property name="x_options">GTK_FILL</property>
+ <property name="y_options">GTK_FILL</property>
+ </packing>
+ </child>
</object>
<packing>
<property name="position">3</property>
@@ -7201,6 +7234,24 @@ dragging individual signals with <i>Alt</i>.</small></property
<child>
<placeholder/>
</child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
</object>
</child>
<child>
diff --git a/src/ui/mw/loadsave.cc b/src/ui/mw/loadsave.cc
index aaeb631..0bcde6b 100644
--- a/src/ui/mw/loadsave.cc
+++ b/src/ui/mw/loadsave.cc
@@ -49,6 +49,7 @@ saving_colors()
{"SFPhasicSpindle", SExpDesignUI::TColour::sf_phasic_spindle},
{"SFPhasicKComplex", SExpDesignUI::TColour::sf_phasic_Kcomplex},
+ {"SFPhasicEyeBlink", SExpDesignUI::TColour::sf_phasic_eyeblink},
{"SFEMG", SExpDesignUI::TColour::sf_emg },
{"SFHypnogram", SExpDesignUI::TColour::sf_hypnogram },
diff --git a/src/ui/mw/widgets.hh b/src/ui/mw/widgets.hh
index 154a3a0..5d2de3a 100644
--- a/src/ui/mw/widgets.hh
+++ b/src/ui/mw/widgets.hh
@@ -347,7 +347,7 @@ struct SExpDesignUIWidgets {
sf_annotations,
sf_selection,
sf_profile_psd, sf_profile_mc, sf_profile_swu,
- sf_phasic_spindle, sf_phasic_Kcomplex,
+ sf_phasic_spindle, sf_phasic_Kcomplex, sf_phasic_eyeblink,
sf_hypnogram,
sf_cursor,
sf_emg,
--
Sleep experiment manager
More information about the debian-med-commit
mailing list