[med-svn] [SCM] aghermann branch, master, updated. 4f7a3b774136ffffbaf9b05d90bd568347bc5461

Andrei Zavada johnhommer at gmail.com
Fri Nov 16 00:50:53 UTC 2012


The following commit has been merged in the master branch:
commit f1938bbdf26bff836d81400788703fd8cd3b72c6
Author: Andrei Zavada <johnhommer at gmail.com>
Date:   Sun Nov 11 12:34:02 2012 +0200

    ICM

diff --git a/data/main.glade b/data/main.glade
index 2857274..4cf9721 100644
--- a/data/main.glade
+++ b/data/main.glade
@@ -1497,18 +1497,6 @@ rm */*/*/.*.{psd,mc}</property>
                                   <placeholder/>
                                 </child>
                                 <child>
-                                  <placeholder/>
-                                </child>
-                                <child>
-                                  <placeholder/>
-                                </child>
-                                <child>
-                                  <placeholder/>
-                                </child>
-                                <child>
-                                  <placeholder/>
-                                </child>
-                                <child>
                                   <object class="GtkFrame" id="fFreqConventionalRanges">
                                     <property name="visible">True</property>
                                     <property name="can_focus">False</property>
@@ -3324,7 +3312,7 @@ dragging individual signals with <i>Alt</i>.</small></property
                                                         <property name="visible">True</property>
                                                         <property name="can_focus">False</property>
                                                         <property name="xalign">0</property>
-                                                        <property name="label" translatable="yes">Power</property>
+                                                        <property name="label" translatable="yes">Profile</property>
                                                       </object>
                                                       <packing>
                                                         <property name="left_attach">1</property>
@@ -3767,234 +3755,169 @@ dragging individual signals with <i>Alt</i>.</small></property
                                                   </packing>
                                                 </child>
                                                 <child>
-                                                  <object class="GtkTable" id="table9">
+                                                  <object class="GtkTable" id="table4">
                                                     <property name="visible">True</property>
                                                     <property name="can_focus">False</property>
                                                     <property name="border_width">10</property>
-                                                    <property name="n_rows">7</property>
+                                                    <property name="n_rows">5</property>
                                                     <property name="n_columns">2</property>
                                                     <child>
-                                                      <object class="GtkLabel" id="label98">
+                                                      <object class="GtkColorButton" id="bColourBandDelta">
                                                         <property name="visible">True</property>
-                                                        <property name="can_focus">False</property>
-                                                        <property name="xalign">0</property>
-                                                        <property name="label" translatable="yes">EMG</property>
+                                                        <property name="can_focus">True</property>
+                                                        <property name="receives_default">True</property>
+                                                        <property name="relief">none</property>
+                                                        <property name="title" translatable="yes">Delta band</property>
+                                                        <property name="color">#6a8f76b4ffff</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="x_options">GTK_FILL</property>
                                                         <property name="y_options">GTK_FILL</property>
-                                                        <property name="x_padding">5</property>
                                                       </packing>
                                                     </child>
                                                     <child>
-                                                      <object class="GtkLabel" id="label99">
+                                                      <object class="GtkLabel" id="label65">
                                                         <property name="visible">True</property>
                                                         <property name="can_focus">False</property>
                                                         <property name="xalign">0</property>
-                                                        <property name="label" translatable="yes">Hypnogram</property>
+                                                        <property name="label" translatable="yes"><span face="serif" size="x-large" style="italic">δ</span></property>
+                                                        <property name="use_markup">True</property>
                                                       </object>
                                                       <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="y_options">GTK_FILL</property>
                                                         <property name="x_padding">5</property>
                                                       </packing>
                                                     </child>
                                                     <child>
-                                                      <object class="GtkLabel" id="label100">
+                                                      <object class="GtkLabel" id="label67">
                                                         <property name="visible">True</property>
                                                         <property name="can_focus">False</property>
                                                         <property name="xalign">0</property>
-                                                        <property name="label" translatable="yes">Artifacts</property>
+                                                        <property name="label" translatable="yes"><span face="serif" size="x-large" style="italic">θ</span></property>
+                                                        <property name="use_markup">True</property>
                                                       </object>
                                                       <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">1</property>
+                                                        <property name="bottom_attach">2</property>
                                                         <property name="y_options">GTK_FILL</property>
                                                         <property name="x_padding">5</property>
                                                       </packing>
                                                     </child>
                                                     <child>
-                                                      <object class="GtkColorButton" id="bColourEMG">
+                                                      <object class="GtkLabel" id="label74">
                                                         <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">EMG line</property>
-                                                        <property name="color">#108f6e4d178b</property>
+                                                        <property name="can_focus">False</property>
+                                                        <property name="xalign">0</property>
+                                                        <property name="label" translatable="yes"><span face="serif" size="x-large" style="italic">α</span></property>
+                                                        <property name="use_markup">True</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="x_options">GTK_FILL</property>
                                                         <property name="y_options">GTK_FILL</property>
+                                                        <property name="x_padding">5</property>
                                                       </packing>
                                                     </child>
                                                     <child>
-                                                      <object class="GtkColorButton" id="bColourHypnogram">
+                                                      <object class="GtkLabel" id="label77">
                                                         <property name="visible">True</property>
-                                                        <property name="can_focus">True</property>
-                                                        <property name="receives_default">True</property>
-                                                        <property name="relief">none</property>
-                                                        <property name="title" translatable="yes">Hypnogram paper</property>
-                                                        <property name="color">#fdefffffdbfc</property>
+                                                        <property name="can_focus">False</property>
+                                                        <property name="xalign">0</property>
+                                                        <property name="label" translatable="yes"><span face="serif" size="x-large" style="italic">β</span></property>
+                                                        <property name="use_markup">True</property>
                                                       </object>
                                                       <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="x_options">GTK_FILL</property>
                                                         <property name="y_options">GTK_FILL</property>
+                                                        <property name="x_padding">5</property>
                                                       </packing>
                                                     </child>
                                                     <child>
-                                                      <object class="GtkColorButton" id="bColourArtifacts">
+                                                      <object class="GtkLabel" id="label76">
                                                         <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">Artifacts</property>
-                                                        <property name="color">#db3c1ab939cf</property>
+                                                        <property name="can_focus">False</property>
+                                                        <property name="xalign">0</property>
+                                                        <property name="label" translatable="yes"><span face="serif" size="x-large" style="italic">γ</span></property>
+                                                        <property name="use_markup">True</property>
                                                       </object>
                                                       <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="x_options">GTK_FILL</property>
                                                         <property name="y_options">GTK_FILL</property>
+                                                        <property name="x_padding">5</property>
                                                       </packing>
                                                     </child>
                                                     <child>
-                                                      <object class="GtkColorButton" id="bColourAnnotations">
+                                                      <object class="GtkColorButton" id="bColourBandTheta">
                                                         <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">#3da9846af6c2</property>
+                                                        <property name="title" translatable="yes">Theta band</property>
+                                                        <property name="color">#568f5f4bc28f</property>
                                                       </object>
                                                       <packing>
-                                                        <property name="top_attach">5</property>
-                                                        <property name="bottom_attach">6</property>
+                                                        <property name="top_attach">1</property>
+                                                        <property name="bottom_attach">2</property>
                                                         <property name="x_options">GTK_FILL</property>
                                                         <property name="y_options">GTK_FILL</property>
                                                       </packing>
                                                     </child>
                                                     <child>
-                                                      <object class="GtkLabel" id="label86">
-                                                        <property name="visible">True</property>
-                                                        <property name="can_focus">False</property>
-                                                        <property name="xalign">0</property>
-                                                        <property name="label" translatable="yes">Annotations</property>
-                                                      </object>
-                                                      <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="y_options">GTK_FILL</property>
-                                                        <property name="x_padding">5</property>
-                                                      </packing>
-                                                    </child>
-                                                    <child>
-                                                      <object class="GtkColorButton" id="bColourSelection">
+                                                      <object class="GtkColorButton" id="bColourBandAlpha">
                                                         <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">Selection</property>
-                                                        <property name="color">#6b57e4d75206</property>
+                                                        <property name="title" translatable="yes">Alpha band</property>
+                                                        <property name="color">#bb1a2f3d8e13</property>
                                                       </object>
                                                       <packing>
-                                                        <property name="top_attach">6</property>
-                                                        <property name="bottom_attach">7</property>
+                                                        <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="label116">
-                                                        <property name="visible">True</property>
-                                                        <property name="can_focus">False</property>
-                                                        <property name="xalign">0</property>
-                                                        <property name="label" translatable="yes">Selection</property>
-                                                      </object>
-                                                      <packing>
-                                                        <property name="left_attach">1</property>
-                                                        <property name="right_attach">2</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>
-                                                    </child>
-                                                    <child>
-                                                      <object class="GtkColorButton" id="bColourProfilePsdSF">
+                                                      <object class="GtkColorButton" id="bColourBandBeta">
                                                         <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">EEG PSD</property>
-                                                        <property name="color">#0f0f6262a9a9</property>
+                                                        <property name="title" translatable="yes">Beta band</property>
+                                                        <property name="color">#5a72a5f292c0</property>
                                                       </object>
                                                       <packing>
+                                                        <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>
                                                     </child>
                                                     <child>
-                                                      <object class="GtkLabel" id="label97">
-                                                        <property name="visible">True</property>
-                                                        <property name="can_focus">False</property>
-                                                        <property name="xalign">0</property>
-                                                        <property name="label" translatable="yes">PSD</property>
-                                                      </object>
-                                                      <packing>
-                                                        <property name="left_attach">1</property>
-                                                        <property name="right_attach">2</property>
-                                                        <property name="y_options">GTK_FILL</property>
-                                                        <property name="x_padding">5</property>
-                                                      </packing>
-                                                    </child>
-                                                    <child>
-                                                      <object class="GtkLabel" id="label22">
-                                                        <property name="visible">True</property>
-                                                        <property name="can_focus">False</property>
-                                                        <property name="xalign">0</property>
-                                                        <property name="label" translatable="yes">µContinuity</property>
-                                                      </object>
-                                                      <packing>
-                                                        <property name="left_attach">1</property>
-                                                        <property name="right_attach">2</property>
-                                                        <property name="top_attach">1</property>
-                                                        <property name="bottom_attach">2</property>
-                                                        <property name="y_options">GTK_FILL</property>
-                                                        <property name="x_padding">5</property>
-                                                      </packing>
-                                                    </child>
-                                                    <child>
-                                                      <object class="GtkColorButton" id="bColourProfileMcSF">
+                                                      <object class="GtkColorButton" id="bColourBandGamma">
                                                         <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">EEG Microcontinuity</property>
-                                                        <property name="color">#e73f8bfb0315</property>
+                                                        <property name="title" translatable="yes">Gamma band</property>
+                                                        <property name="color">#ffffbb44eff7</property>
                                                       </object>
                                                       <packing>
-                                                        <property name="top_attach">1</property>
-                                                        <property name="bottom_attach">2</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>
@@ -4005,10 +3928,10 @@ dragging individual signals with <i>Alt</i>.</small></property
                                                   </packing>
                                                 </child>
                                                 <child type="tab">
-                                                  <object class="GtkLabel" id="label103">
+                                                  <object class="GtkLabel" id="label38">
                                                     <property name="visible">True</property>
                                                     <property name="can_focus">False</property>
-                                                    <property name="label" translatable="yes">Misc</property>
+                                                    <property name="label" translatable="yes">Bands</property>
                                                   </object>
                                                   <packing>
                                                     <property name="position">1</property>
@@ -4134,169 +4057,234 @@ dragging individual signals with <i>Alt</i>.</small></property
                                                   </packing>
                                                 </child>
                                                 <child>
-                                                  <object class="GtkTable" id="table4">
+                                                  <object class="GtkTable" id="table9">
                                                     <property name="visible">True</property>
                                                     <property name="can_focus">False</property>
                                                     <property name="border_width">10</property>
-                                                    <property name="n_rows">5</property>
+                                                    <property name="n_rows">7</property>
                                                     <property name="n_columns">2</property>
                                                     <child>
-                                                      <object class="GtkColorButton" id="bColourBandDelta">
+                                                      <object class="GtkLabel" id="label98">
                                                         <property name="visible">True</property>
-                                                        <property name="can_focus">True</property>
-                                                        <property name="receives_default">True</property>
-                                                        <property name="relief">none</property>
-                                                        <property name="title" translatable="yes">Delta band</property>
-                                                        <property name="color">#6a8f76b4ffff</property>
+                                                        <property name="can_focus">False</property>
+                                                        <property name="xalign">0</property>
+                                                        <property name="label" translatable="yes">EMG</property>
                                                       </object>
                                                       <packing>
-                                                        <property name="x_options">GTK_FILL</property>
+                                                        <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>
                                                     <child>
-                                                      <object class="GtkLabel" id="label65">
+                                                      <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"><span face="serif" size="x-large" style="italic">δ</span></property>
-                                                        <property name="use_markup">True</property>
+                                                        <property name="label" translatable="yes">Hypnogram</property>
                                                       </object>
                                                       <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="y_options">GTK_FILL</property>
                                                         <property name="x_padding">5</property>
                                                       </packing>
                                                     </child>
                                                     <child>
-                                                      <object class="GtkLabel" id="label67">
+                                                      <object class="GtkLabel" id="label100">
                                                         <property name="visible">True</property>
                                                         <property name="can_focus">False</property>
                                                         <property name="xalign">0</property>
-                                                        <property name="label" translatable="yes"><span face="serif" size="x-large" style="italic">θ</span></property>
-                                                        <property name="use_markup">True</property>
+                                                        <property name="label" translatable="yes">Artifacts</property>
                                                       </object>
                                                       <packing>
                                                         <property name="left_attach">1</property>
                                                         <property name="right_attach">2</property>
-                                                        <property name="top_attach">1</property>
-                                                        <property name="bottom_attach">2</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>
                                                     </child>
                                                     <child>
-                                                      <object class="GtkLabel" id="label74">
+                                                      <object class="GtkColorButton" id="bColourEMG">
                                                         <property name="visible">True</property>
-                                                        <property name="can_focus">False</property>
-                                                        <property name="xalign">0</property>
-                                                        <property name="label" translatable="yes"><span face="serif" size="x-large" style="italic">α</span></property>
-                                                        <property name="use_markup">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">EMG line</property>
+                                                        <property name="color">#108f6e4d178b</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="x_options">GTK_FILL</property>
                                                         <property name="y_options">GTK_FILL</property>
-                                                        <property name="x_padding">5</property>
                                                       </packing>
                                                     </child>
                                                     <child>
-                                                      <object class="GtkLabel" id="label77">
+                                                      <object class="GtkColorButton" id="bColourHypnogram">
                                                         <property name="visible">True</property>
-                                                        <property name="can_focus">False</property>
-                                                        <property name="xalign">0</property>
-                                                        <property name="label" translatable="yes"><span face="serif" size="x-large" style="italic">β</span></property>
-                                                        <property name="use_markup">True</property>
+                                                        <property name="can_focus">True</property>
+                                                        <property name="receives_default">True</property>
+                                                        <property name="relief">none</property>
+                                                        <property name="title" translatable="yes">Hypnogram paper</property>
+                                                        <property name="color">#fdefffffdbfc</property>
                                                       </object>
                                                       <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="x_options">GTK_FILL</property>
                                                         <property name="y_options">GTK_FILL</property>
-                                                        <property name="x_padding">5</property>
                                                       </packing>
                                                     </child>
                                                     <child>
-                                                      <object class="GtkLabel" id="label76">
+                                                      <object class="GtkColorButton" id="bColourArtifacts">
                                                         <property name="visible">True</property>
-                                                        <property name="can_focus">False</property>
-                                                        <property name="xalign">0</property>
-                                                        <property name="label" translatable="yes"><span face="serif" size="x-large" style="italic">γ</span></property>
-                                                        <property name="use_markup">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">Artifacts</property>
+                                                        <property name="color">#db3c1ab939cf</property>
                                                       </object>
                                                       <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="x_options">GTK_FILL</property>
                                                         <property name="y_options">GTK_FILL</property>
-                                                        <property name="x_padding">5</property>
                                                       </packing>
                                                     </child>
                                                     <child>
-                                                      <object class="GtkColorButton" id="bColourBandTheta">
+                                                      <object class="GtkColorButton" id="bColourAnnotations">
                                                         <property name="visible">True</property>
                                                         <property name="can_focus">True</property>
                                                         <property name="receives_default">True</property>
                                                         <property name="relief">none</property>
-                                                        <property name="title" translatable="yes">Theta band</property>
-                                                        <property name="color">#568f5f4bc28f</property>
+                                                        <property name="use_alpha">True</property>
+                                                        <property name="title" translatable="yes">Annotations</property>
+                                                        <property name="color">#3da9846af6c2</property>
                                                       </object>
                                                       <packing>
-                                                        <property name="top_attach">1</property>
-                                                        <property name="bottom_attach">2</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>
                                                     </child>
                                                     <child>
-                                                      <object class="GtkColorButton" id="bColourBandAlpha">
+                                                      <object class="GtkLabel" id="label86">
+                                                        <property name="visible">True</property>
+                                                        <property name="can_focus">False</property>
+                                                        <property name="xalign">0</property>
+                                                        <property name="label" translatable="yes">Annotations</property>
+                                                      </object>
+                                                      <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="y_options">GTK_FILL</property>
+                                                        <property name="x_padding">5</property>
+                                                      </packing>
+                                                    </child>
+                                                    <child>
+                                                      <object class="GtkColorButton" id="bColourSelection">
                                                         <property name="visible">True</property>
                                                         <property name="can_focus">True</property>
                                                         <property name="receives_default">True</property>
                                                         <property name="relief">none</property>
-                                                        <property name="title" translatable="yes">Alpha band</property>
-                                                        <property name="color">#bb1a2f3d8e13</property>
+                                                        <property name="use_alpha">True</property>
+                                                        <property name="title" translatable="yes">Selection</property>
+                                                        <property name="color">#6b57e4d75206</property>
                                                       </object>
                                                       <packing>
-                                                        <property name="top_attach">2</property>
-                                                        <property name="bottom_attach">3</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>
                                                     </child>
                                                     <child>
-                                                      <object class="GtkColorButton" id="bColourBandBeta">
+                                                      <object class="GtkLabel" id="label116">
+                                                        <property name="visible">True</property>
+                                                        <property name="can_focus">False</property>
+                                                        <property name="xalign">0</property>
+                                                        <property name="label" translatable="yes">Selection</property>
+                                                      </object>
+                                                      <packing>
+                                                        <property name="left_attach">1</property>
+                                                        <property name="right_attach">2</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>
+                                                    </child>
+                                                    <child>
+                                                      <object class="GtkColorButton" id="bColourProfilePsdSF">
                                                         <property name="visible">True</property>
                                                         <property name="can_focus">True</property>
                                                         <property name="receives_default">True</property>
                                                         <property name="relief">none</property>
-                                                        <property name="title" translatable="yes">Beta band</property>
-                                                        <property name="color">#5a72a5f292c0</property>
+                                                        <property name="use_alpha">True</property>
+                                                        <property name="title" translatable="yes">EEG PSD</property>
+                                                        <property name="color">#0f0f6262a9a9</property>
                                                       </object>
                                                       <packing>
-                                                        <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>
                                                     </child>
                                                     <child>
-                                                      <object class="GtkColorButton" id="bColourBandGamma">
+                                                      <object class="GtkLabel" id="label97">
+                                                        <property name="visible">True</property>
+                                                        <property name="can_focus">False</property>
+                                                        <property name="xalign">0</property>
+                                                        <property name="label" translatable="yes">PSD</property>
+                                                      </object>
+                                                      <packing>
+                                                        <property name="left_attach">1</property>
+                                                        <property name="right_attach">2</property>
+                                                        <property name="y_options">GTK_FILL</property>
+                                                        <property name="x_padding">5</property>
+                                                      </packing>
+                                                    </child>
+                                                    <child>
+                                                      <object class="GtkLabel" id="label22">
+                                                        <property name="visible">True</property>
+                                                        <property name="can_focus">False</property>
+                                                        <property name="xalign">0</property>
+                                                        <property name="label" translatable="yes">µContinuity</property>
+                                                      </object>
+                                                      <packing>
+                                                        <property name="left_attach">1</property>
+                                                        <property name="right_attach">2</property>
+                                                        <property name="top_attach">1</property>
+                                                        <property name="bottom_attach">2</property>
+                                                        <property name="y_options">GTK_FILL</property>
+                                                        <property name="x_padding">5</property>
+                                                      </packing>
+                                                    </child>
+                                                    <child>
+                                                      <object class="GtkColorButton" id="bColourProfileMcSF">
                                                         <property name="visible">True</property>
                                                         <property name="can_focus">True</property>
                                                         <property name="receives_default">True</property>
                                                         <property name="relief">none</property>
-                                                        <property name="title" translatable="yes">Gamma band</property>
-                                                        <property name="color">#ffffbb44eff7</property>
+                                                        <property name="use_alpha">True</property>
+                                                        <property name="title" translatable="yes">EEG Microcontinuity</property>
+                                                        <property name="color">#e73f8bfb0315</property>
                                                       </object>
                                                       <packing>
-                                                        <property name="top_attach">4</property>
-                                                        <property name="bottom_attach">5</property>
+                                                        <property name="top_attach">1</property>
+                                                        <property name="bottom_attach">2</property>
                                                         <property name="x_options">GTK_FILL</property>
                                                         <property name="y_options">GTK_FILL</property>
                                                       </packing>
@@ -4307,10 +4295,10 @@ dragging individual signals with <i>Alt</i>.</small></property
                                                   </packing>
                                                 </child>
                                                 <child type="tab">
-                                                  <object class="GtkLabel" id="label38">
+                                                  <object class="GtkLabel" id="label103">
                                                     <property name="visible">True</property>
                                                     <property name="can_focus">False</property>
-                                                    <property name="label" translatable="yes">Bands</property>
+                                                    <property name="label" translatable="yes">Misc</property>
                                                   </object>
                                                   <packing>
                                                     <property name="position">3</property>
@@ -4336,7 +4324,7 @@ dragging individual signals with <i>Alt</i>.</small></property
                                               </packing>
                                             </child>
                                             <child>
-                                              <object class="GtkNotebook" id="nbColoursSF1">
+                                              <object class="GtkNotebook" id="nbColoursMF">
                                                 <property name="width_request">100</property>
                                                 <property name="height_request">80</property>
                                                 <property name="visible">True</property>
@@ -6756,6 +6744,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/data/session-chooser.glade b/data/session-chooser.glade
index 9359e93..4c12e0d 100644
--- a/data/session-chooser.glade
+++ b/data/session-chooser.glade
@@ -2,12 +2,12 @@
 <interface>
   <!-- interface-requires gtk+ 3.0 -->
   <object class="GtkDialog" id="wSessionChooser">
-    <property name="width_request">600</property>
-    <property name="height_request">400</property>
     <property name="can_focus">False</property>
     <property name="border_width">10</property>
     <property name="title" translatable="yes">Select Experiment</property>
     <property name="window_position">center</property>
+    <property name="default_width">577</property>
+    <property name="default_height">180</property>
     <property name="icon">aghermann.png</property>
     <property name="type_hint">normal</property>
     <child internal-child="vbox">
diff --git a/src/ui/forward-decls.hh b/src/ui/forward-decls.hh
index 6bb5bb0..cce018f 100644
--- a/src/ui/forward-decls.hh
+++ b/src/ui/forward-decls.hh
@@ -14,13 +14,12 @@
 #ifndef _AGHUI_FORWARD_DECLS_H
 #define _AGHUI_FORWARD_DECLS_H
 
-
-
 namespace aghui {
 
 class SSessionChooser;
 class SExpDesignUI;
 class SScoringFacility;
+class SModelrunFacility;
 
 } // namespace aghui
 

-- 
Sleep experiment manager



More information about the debian-med-commit mailing list