[med-svn] [SCM] aghermann branch, master, updated. c0bd21ca8eb529ade7e0c7aad22951a308a8dc8f
Andrei Zavada
johnhommer at gmail.com
Wed May 1 00:09:22 UTC 2013
The following commit has been merged in the master branch:
commit b99e718d86139c253534b244d0befe4a62794867
Author: Andrei Zavada <johnhommer at gmail.com>
Date: Mon Apr 22 12:51:52 2013 +0300
add a ColorButton for embedded annotations
diff --git a/data/mw.glade b/data/mw.glade
index 78add16..edd2083 100644
--- a/data/mw.glade
+++ b/data/mw.glade
@@ -4517,7 +4517,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">10</property>
+ <property name="n_rows">11</property>
<property name="n_columns">2</property>
<child>
<object class="GtkLabel" id="label100">
@@ -4598,8 +4598,8 @@ dragging individual signals with <i>Alt</i>.</small></property
<property name="color">#6b57e4d75206</property>
</object>
<packing>
- <property name="top_attach">2</property>
- <property name="bottom_attach">3</property>
+ <property name="top_attach">3</property>
+ <property name="bottom_attach">4</property>
<property name="x_options">GTK_FILL</property>
<property name="y_options">GTK_FILL</property>
</packing>
@@ -4614,8 +4614,8 @@ dragging individual signals with <i>Alt</i>.</small></property
<packing>
<property name="left_attach">1</property>
<property name="right_attach">2</property>
- <property name="top_attach">2</property>
- <property name="bottom_attach">3</property>
+ <property name="top_attach">3</property>
+ <property name="bottom_attach">4</property>
<property name="y_options">GTK_FILL</property>
<property name="x_padding">5</property>
</packing>
@@ -4633,8 +4633,8 @@ dragging individual signals with <i>Alt</i>.</small></property
<property name="color">#3e8effff42d7</property>
</object>
<packing>
- <property name="top_attach">4</property>
- <property name="bottom_attach">5</property>
+ <property name="top_attach">5</property>
+ <property name="bottom_attach">6</property>
<property name="x_options">GTK_FILL</property>
<property name="y_options">GTK_FILL</property>
</packing>
@@ -4649,8 +4649,8 @@ dragging individual signals with <i>Alt</i>.</small></property
<packing>
<property name="left_attach">1</property>
<property name="right_attach">2</property>
- <property name="top_attach">4</property>
- <property name="bottom_attach">5</property>
+ <property name="top_attach">5</property>
+ <property name="bottom_attach">6</property>
<property name="y_options">GTK_FILL</property>
<property name="x_padding">5</property>
</packing>
@@ -4669,8 +4669,8 @@ dragging individual signals with <i>Alt</i>.</small></property
<property name="rgba">rgba(216,13,13,0.80000000000000004)</property>
</object>
<packing>
- <property name="top_attach">3</property>
- <property name="bottom_attach">4</property>
+ <property name="top_attach">4</property>
+ <property name="bottom_attach">5</property>
<property name="x_options">GTK_FILL</property>
<property name="y_options">GTK_FILL</property>
</packing>
@@ -4685,8 +4685,8 @@ dragging individual signals with <i>Alt</i>.</small></property
<packing>
<property name="left_attach">1</property>
<property name="right_attach">2</property>
- <property name="top_attach">3</property>
- <property name="bottom_attach">4</property>
+ <property name="top_attach">4</property>
+ <property name="bottom_attach">5</property>
<property name="y_options">GTK_FILL</property>
<property name="x_padding">5</property>
</packing>
@@ -4704,8 +4704,8 @@ dragging individual signals with <i>Alt</i>.</small></property
<property name="color">#4e4e9a9a0606</property>
</object>
<packing>
- <property name="top_attach">5</property>
- <property name="bottom_attach">6</property>
+ <property name="top_attach">6</property>
+ <property name="bottom_attach">7</property>
<property name="x_options">GTK_FILL</property>
<property name="y_options">GTK_FILL</property>
</packing>
@@ -4720,8 +4720,8 @@ dragging individual signals with <i>Alt</i>.</small></property
<packing>
<property name="left_attach">1</property>
<property name="right_attach">2</property>
- <property name="top_attach">5</property>
- <property name="bottom_attach">6</property>
+ <property name="top_attach">6</property>
+ <property name="bottom_attach">7</property>
<property name="y_options">GTK_FILL</property>
<property name="x_padding">5</property>
</packing>
@@ -4739,8 +4739,8 @@ dragging individual signals with <i>Alt</i>.</small></property
<property name="color">#adad7f7fa8a8</property>
</object>
<packing>
- <property name="top_attach">7</property>
- <property name="bottom_attach">8</property>
+ <property name="top_attach">8</property>
+ <property name="bottom_attach">9</property>
<property name="x_options">GTK_FILL</property>
<property name="y_options">GTK_FILL</property>
</packing>
@@ -4758,8 +4758,8 @@ dragging individual signals with <i>Alt</i>.</small></property
<property name="color">#e9e9b9b96e6e</property>
</object>
<packing>
- <property name="top_attach">8</property>
- <property name="bottom_attach">9</property>
+ <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>
@@ -4774,8 +4774,8 @@ dragging individual signals with <i>Alt</i>.</small></property
<packing>
<property name="left_attach">1</property>
<property name="right_attach">2</property>
- <property name="top_attach">7</property>
- <property name="bottom_attach">8</property>
+ <property name="top_attach">8</property>
+ <property name="bottom_attach">9</property>
<property name="y_options">GTK_FILL</property>
<property name="x_padding">5</property>
</packing>
@@ -4790,8 +4790,8 @@ dragging individual signals with <i>Alt</i>.</small></property
<packing>
<property name="left_attach">1</property>
<property name="right_attach">2</property>
- <property name="top_attach">8</property>
- <property name="bottom_attach">9</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>
@@ -4803,8 +4803,8 @@ dragging individual signals with <i>Alt</i>.</small></property
</object>
<packing>
<property name="right_attach">2</property>
- <property name="top_attach">6</property>
- <property name="bottom_attach">7</property>
+ <property name="top_attach">7</property>
+ <property name="bottom_attach">8</property>
</packing>
</child>
<child>
@@ -4817,31 +4817,62 @@ dragging individual signals with <i>Alt</i>.</small></property
<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="top_attach">10</property>
+ <property name="bottom_attach">11</property>
<property name="y_options">GTK_FILL</property>
<property name="x_padding">5</property>
</packing>
</child>
<child>
<object class="GtkColorButton" id="bColourSFPhasicEyeBlink">
- <property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
- <property name="use_action_appearance">False</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="top_attach">10</property>
+ <property name="bottom_attach">11</property>
<property name="x_options">GTK_FILL</property>
<property name="y_options">GTK_FILL</property>
</packing>
</child>
+ <child>
+ <object class="GtkColorButton" id="bColourSFEmbeddedAnnotations">
+ <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">Annotations</property>
+ <property name="color">#75cf9f9dc7ad</property>
+ </object>
+ <packing>
+ <property name="top_attach">2</property>
+ <property name="bottom_attach">3</property>
+ <property name="x_options">GTK_FILL</property>
+ <property name="y_options">GTK_FILL</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="label99">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">Embedded annotations</property>
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="right_attach">2</property>
+ <property name="top_attach">2</property>
+ <property name="bottom_attach">3</property>
+ <property name="y_options">GTK_FILL</property>
+ <property name="x_padding">5</property>
+ </packing>
+ </child>
</object>
<packing>
<property name="position">3</property>
diff --git a/src/ui/mw/construct.cc b/src/ui/mw/construct.cc
index 24c75a4..7f5be1f 100644
--- a/src/ui/mw/construct.cc
+++ b/src/ui/mw/construct.cc
@@ -481,6 +481,8 @@ SExpDesignUIWidgets ()
!(CwB[TColour::sf_hypnogram ].btn = (GtkColorButton*)gtk_builder_get_object( builder, "bColourSFHypnogram")) ||
!(CwB[TColour::sf_artifact ].btn = (GtkColorButton*)gtk_builder_get_object( builder, "bColourSFArtifacts")) ||
!(CwB[TColour::sf_annotations ].btn = (GtkColorButton*)gtk_builder_get_object( builder, "bColourSFAnnotations")) ||
+ !(CwB[TColour::sf_embedded_annotations]
+ .btn = (GtkColorButton*)gtk_builder_get_object( builder, "bColourSFEmbeddedAnnotations")) ||
!(CwB[TColour::sf_selection ].btn = (GtkColorButton*)gtk_builder_get_object( builder, "bColourSFSelection")) ||
!(CwB[TColour::sf_ticks ].btn = (GtkColorButton*)gtk_builder_get_object( builder, "bColourSFTicks")) ||
!(CwB[TColour::sf_labels ].btn = (GtkColorButton*)gtk_builder_get_object( builder, "bColourSFLabels")) ||
diff --git a/src/ui/mw/loadsave.cc b/src/ui/mw/loadsave.cc
index c940c43..63d4ad1 100644
--- a/src/ui/mw/loadsave.cc
+++ b/src/ui/mw/loadsave.cc
@@ -55,6 +55,7 @@ saving_colors()
{"SFHypnogram", SExpDesignUI::TColour::sf_hypnogram },
{"SFArtifacts", SExpDesignUI::TColour::sf_artifact },
{"SFAnnotations", SExpDesignUI::TColour::sf_annotations},
+ {"SFEmbeddedAnnotations", SExpDesignUI::TColour::sf_embedded_annotations},
{"SFSelection", SExpDesignUI::TColour::sf_selection },
{"SFTicks", SExpDesignUI::TColour::sf_ticks },
{"SFLabels", SExpDesignUI::TColour::sf_labels },
diff --git a/src/ui/mw/widgets.hh b/src/ui/mw/widgets.hh
index 4f1f9ea..3a457bd 100644
--- a/src/ui/mw/widgets.hh
+++ b/src/ui/mw/widgets.hh
@@ -345,6 +345,7 @@ struct SExpDesignUIWidgets {
sf_artifact,
sf_annotations,
+ sf_embedded_annotations,
sf_selection,
sf_profile_psd, sf_profile_mc, sf_profile_swu,
sf_phasic_spindle, sf_phasic_Kcomplex, sf_phasic_eyeblink,
diff --git a/src/ui/sf/montage.cc b/src/ui/sf/montage.cc
index efac522..0714848 100644
--- a/src/ui/sf/montage.cc
+++ b/src/ui/sf/montage.cc
@@ -784,7 +784,7 @@ draw_montage( cairo_t* cr)
: (overlap_count = 0));
last_z = A.span.z;
- _p.CwB[SExpDesignUI::TColour::sf_annotations].set_source_rgba( cr);
+ _p.CwB[SExpDesignUI::TColour::sf_embedded_annotations].set_source_rgba( cr);
cairo_rectangle( cr, wa, 0, ww, da_ht);
cairo_fill( cr);
--
Sleep experiment manager
More information about the debian-med-commit
mailing list