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

Andrei Zavada johnhommer at gmail.com
Sun Feb 3 12:53:23 UTC 2013


The following commit has been merged in the master branch:
commit 484a070aba099f6b4a0c04dec3861ba6c3ca8104
Author: Andrei Zavada <johnhommer at gmail.com>
Date:   Sun Feb 3 13:32:57 2013 +0200

    SF Patterns menu items to mark found matches as phasic events;

diff --git a/data/sf-patterns.glade b/data/sf-patterns.glade
index 6e7d7af..3060cbe 100644
--- a/data/sf-patterns.glade
+++ b/data/sf-patterns.glade
@@ -1,6 +1,72 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
   <!-- interface-requires gtk+ 3.0 -->
+  <object class="GtkAdjustment" id="jSFFDBandPassUpto">
+    <property name="upper">50</property>
+    <property name="value">1.5</property>
+    <property name="step_increment">0.25</property>
+    <property name="page_increment">1</property>
+  </object>
+  <object class="GtkAdjustment" id="jSFFDCriterionA">
+    <property name="lower">0.01</property>
+    <property name="upper">100</property>
+    <property name="value">0.10000000000000001</property>
+    <property name="step_increment">0.01</property>
+    <property name="page_increment">1</property>
+  </object>
+  <object class="GtkAdjustment" id="jSFFDCriterionB">
+    <property name="lower">0.01</property>
+    <property name="upper">100</property>
+    <property name="value">0.10000000000000001</property>
+    <property name="step_increment">0.01</property>
+    <property name="page_increment">1</property>
+  </object>
+  <object class="GtkAdjustment" id="jSFFDCriterionC">
+    <property name="lower">0.01</property>
+    <property name="upper">100</property>
+    <property name="value">0.10000000000000001</property>
+    <property name="step_increment">0.010000003501772881</property>
+    <property name="page_increment">1</property>
+  </object>
+  <object class="GtkAdjustment" id="jSFFDCriterionD">
+    <property name="lower">0.01</property>
+    <property name="upper">2</property>
+    <property name="value">0.10000000000000001</property>
+    <property name="step_increment">0.01</property>
+    <property name="page_increment">0.10000000000000001</property>
+  </object>
+  <object class="GtkAdjustment" id="jSFFDDZCDFSigma">
+    <property name="lower">0.01</property>
+    <property name="upper">10</property>
+    <property name="step_increment">0.01</property>
+    <property name="page_increment">10</property>
+  </object>
+  <object class="GtkAdjustment" id="jSFFDDZCDFSmooth">
+    <property name="upper">12</property>
+    <property name="value">1</property>
+    <property name="step_increment">1</property>
+    <property name="page_increment">3</property>
+  </object>
+  <object class="GtkAdjustment" id="jSFFDDZCDFStep">
+    <property name="lower">0.10000000000000001</property>
+    <property name="upper">5</property>
+    <property name="step_increment">0.10000000000000001</property>
+    <property name="page_increment">10</property>
+  </object>
+  <object class="GtkAdjustment" id="jSFFDEnvTightness">
+    <property name="lower">0.050000000000000003</property>
+    <property name="upper">20</property>
+    <property name="value">0.25</property>
+    <property name="step_increment">0.01</property>
+    <property name="page_increment">5</property>
+  </object>
+  <object class="GtkAdjustment" id="jSFFDIncrement">
+    <property name="lower">0.01</property>
+    <property name="upper">0.5</property>
+    <property name="value">0.050000000000000003</property>
+    <property name="step_increment">0.01</property>
+    <property name="page_increment">0.10000000000000001</property>
+  </object>
   <object class="GtkMenu" id="iiSFFDField">
     <property name="visible">True</property>
     <property name="can_focus">False</property>
@@ -87,71 +153,9 @@
     <property name="step_increment">1</property>
     <property name="page_increment">10</property>
   </object>
-  <object class="GtkAdjustment" id="jSFFDBandPassUpto">
-    <property name="upper">50</property>
-    <property name="value">1.5</property>
-    <property name="step_increment">0.25</property>
-    <property name="page_increment">1</property>
-  </object>
-  <object class="GtkAdjustment" id="jSFFDCriterionA">
-    <property name="lower">0.01</property>
-    <property name="upper">100</property>
-    <property name="value">0.10000000000000001</property>
-    <property name="step_increment">0.01</property>
-    <property name="page_increment">1</property>
-  </object>
-  <object class="GtkAdjustment" id="jSFFDCriterionB">
-    <property name="lower">0.01</property>
-    <property name="upper">100</property>
-    <property name="value">0.10000000000000001</property>
-    <property name="step_increment">0.01</property>
-    <property name="page_increment">1</property>
-  </object>
-  <object class="GtkAdjustment" id="jSFFDCriterionC">
-    <property name="lower">0.01</property>
-    <property name="upper">100</property>
-    <property name="value">0.10000000000000001</property>
-    <property name="step_increment">0.010000003501772881</property>
-    <property name="page_increment">1</property>
-  </object>
-  <object class="GtkAdjustment" id="jSFFDCriterionD">
-    <property name="lower">0.01</property>
-    <property name="upper">2</property>
-    <property name="value">0.10000000000000001</property>
-    <property name="step_increment">0.01</property>
-    <property name="page_increment">0.10000000000000001</property>
-  </object>
-  <object class="GtkAdjustment" id="jSFFDDZCDFSigma">
-    <property name="lower">0.01</property>
-    <property name="upper">10</property>
-    <property name="step_increment">0.01</property>
-    <property name="page_increment">10</property>
-  </object>
-  <object class="GtkAdjustment" id="jSFFDDZCDFSmooth">
-    <property name="upper">12</property>
-    <property name="value">1</property>
-    <property name="step_increment">1</property>
-    <property name="page_increment">3</property>
-  </object>
-  <object class="GtkAdjustment" id="jSFFDDZCDFStep">
-    <property name="lower">0.10000000000000001</property>
-    <property name="upper">5</property>
-    <property name="step_increment">0.10000000000000001</property>
-    <property name="page_increment">10</property>
-  </object>
-  <object class="GtkAdjustment" id="jSFFDEnvTightness">
-    <property name="lower">0.050000000000000003</property>
-    <property name="upper">20</property>
-    <property name="value">0.25</property>
-    <property name="step_increment">0.01</property>
-    <property name="page_increment">5</property>
-  </object>
-  <object class="GtkAdjustment" id="jSFFDIncrement">
-    <property name="lower">0.01</property>
-    <property name="upper">0.5</property>
-    <property name="value">0.050000000000000003</property>
-    <property name="step_increment">0.01</property>
-    <property name="page_increment">0.10000000000000001</property>
+  <object class="GtkMenu" id="menu2">
+    <property name="visible">True</property>
+    <property name="can_focus">False</property>
   </object>
   <object class="GtkDialog" id="wSFFD">
     <property name="can_focus">False</property>
@@ -195,7 +199,60 @@
               </packing>
             </child>
             <child>
-              <placeholder/>
+              <object class="GtkMenuBar" id="iibSFFDMenu">
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <child>
+                  <object class="GtkMenuItem" id="iiSFFDMarkPhasicEvents">
+                    <property name="visible">True</property>
+                    <property name="can_focus">False</property>
+                    <property name="label" translatable="yes">_Mark</property>
+                    <property name="use_underline">True</property>
+                    <child type="submenu">
+                      <object class="GtkMenu" id="menu4">
+                        <property name="visible">True</property>
+                        <property name="can_focus">False</property>
+                        <child>
+                          <object class="GtkMenuItem" id="iSFFDMarkPhasicEventSpindles">
+                            <property name="visible">True</property>
+                            <property name="can_focus">False</property>
+                            <property name="label" translatable="yes">_Spindles</property>
+                            <property name="use_underline">True</property>
+                          </object>
+                        </child>
+                        <child>
+                          <object class="GtkMenuItem" id="iSFFDMarkPhasicEventKComplexes">
+                            <property name="visible">True</property>
+                            <property name="can_focus">False</property>
+                            <property name="label" translatable="yes">_K-complexes</property>
+                            <property name="use_underline">True</property>
+                          </object>
+                        </child>
+                        <child>
+                          <object class="GtkSeparatorMenuItem" id="menuitem1">
+                            <property name="visible">True</property>
+                            <property name="can_focus">False</property>
+                          </object>
+                        </child>
+                        <child>
+                          <object class="GtkMenuItem" id="iSFFDMarkPlain">
+                            <property name="visible">True</property>
+                            <property name="can_focus">False</property>
+                            <property name="label" translatable="yes">_Plain</property>
+                            <property name="use_underline">True</property>
+                          </object>
+                        </child>
+                      </object>
+                    </child>
+                  </object>
+                </child>
+              </object>
+              <packing>
+                <property name="expand">False</property>
+                <property name="fill">True</property>
+                <property name="position">1</property>
+                <property name="secondary">True</property>
+              </packing>
             </child>
             <child>
               <object class="GtkBox" id="box12">
@@ -332,6 +389,7 @@
                       <object class="GtkLabel" id="label50">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
+                        <property name="valign">end</property>
                         <property name="xalign">1</property>
                         <property name="label" translatable="yes">Searching …</property>
                         <attributes>
@@ -494,6 +552,7 @@
                       <object class="GtkTable" id="cSFFDParameters">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
+                        <property name="valign">start</property>
                         <property name="n_rows">12</property>
                         <property name="n_columns">3</property>
                         <property name="row_spacing">5</property>
@@ -501,6 +560,24 @@
                           <placeholder/>
                         </child>
                         <child>
+                          <placeholder/>
+                        </child>
+                        <child>
+                          <placeholder/>
+                        </child>
+                        <child>
+                          <placeholder/>
+                        </child>
+                        <child>
+                          <placeholder/>
+                        </child>
+                        <child>
+                          <placeholder/>
+                        </child>
+                        <child>
+                          <placeholder/>
+                        </child>
+                        <child>
                           <object class="GtkSpinButton" id="eSFFDDZCDFSigma">
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
@@ -649,6 +726,8 @@
                           <object class="GtkLabel" id="label181">
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
+                            <property name="margin_top">5</property>
+                            <property name="margin_bottom">5</property>
                             <property name="xalign">0</property>
                             <property name="xpad">5</property>
                             <property name="label" translatable="yes"><b>Derivative ZC density</b></property>
@@ -666,6 +745,8 @@
                           <object class="GtkLabel" id="label182">
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
+                            <property name="margin_top">5</property>
+                            <property name="margin_bottom">5</property>
                             <property name="xalign">0</property>
                             <property name="xpad">5</property>
                             <property name="label" translatable="yes"><b>Target frequency</b></property>
@@ -739,6 +820,8 @@
                           <object class="GtkLabel" id="label185">
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
+                            <property name="margin_top">5</property>
+                            <property name="margin_bottom">5</property>
                             <property name="xalign">0</property>
                             <property name="xpad">5</property>
                             <property name="label" translatable="yes"><b>Envelope</b></property>
@@ -811,34 +894,6 @@
                           </packing>
                         </child>
                         <child>
-                          <object class="GtkHSeparator" id="hseparator8">
-                            <property name="visible">True</property>
-                            <property name="can_focus">False</property>
-                          </object>
-                          <packing>
-                            <property name="right_attach">3</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="y_padding">8</property>
-                          </packing>
-                        </child>
-                        <child>
-                          <object class="GtkHSeparator" id="hseparator9">
-                            <property name="visible">True</property>
-                            <property name="can_focus">False</property>
-                          </object>
-                          <packing>
-                            <property name="right_attach">3</property>
-                            <property name="top_attach">7</property>
-                            <property name="bottom_attach">8</property>
-                            <property name="x_options">GTK_FILL</property>
-                            <property name="y_options">GTK_FILL</property>
-                            <property name="y_padding">8</property>
-                          </packing>
-                        </child>
-                        <child>
                           <object class="GtkLabel" id="label188">
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
@@ -959,6 +1014,7 @@
                       <object class="GtkTable" id="cSFFDCriteria">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
+                        <property name="valign">end</property>
                         <property name="n_rows">6</property>
                         <property name="n_columns">2</property>
                         <property name="row_spacing">5</property>
@@ -1106,6 +1162,8 @@
 on individual parameters</property>
                             <property name="tooltip_text" translatable="yes">Higher values mean looser fit criteria
 on individual parameters</property>
+                            <property name="margin_top">5</property>
+                            <property name="margin_bottom">5</property>
                             <property name="xalign">0</property>
                             <property name="yalign">1</property>
                             <property name="label" translatable="yes"><b>Strictness criteria:</b></property>
@@ -1120,17 +1178,6 @@ on individual parameters</property>
                           </packing>
                         </child>
                         <child>
-                          <object class="GtkSeparator" id="separator3">
-                            <property name="visible">True</property>
-                            <property name="can_focus">False</property>
-                            <property name="valign">end</property>
-                          </object>
-                          <packing>
-                            <property name="right_attach">2</property>
-                            <property name="x_options">GTK_FILL</property>
-                          </packing>
-                        </child>
-                        <child>
                           <object class="GtkLabel" id="label49">
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
@@ -1175,6 +1222,24 @@ on individual parameters</property>
                             <property name="y_options">GTK_FILL</property>
                           </packing>
                         </child>
+                        <child>
+                          <placeholder/>
+                        </child>
+                        <child>
+                          <placeholder/>
+                        </child>
+                        <child>
+                          <placeholder/>
+                        </child>
+                        <child>
+                          <placeholder/>
+                        </child>
+                        <child>
+                          <placeholder/>
+                        </child>
+                        <child>
+                          <placeholder/>
+                        </child>
                       </object>
                       <packing>
                         <property name="top_attach">1</property>
@@ -1352,40 +1417,41 @@ on individual parameters</property>
         <property name="margin_top">5</property>
         <property name="margin_bottom">5</property>
         <property name="orientation">vertical</property>
-        <property name="spacing">5</property>
+        <property name="spacing">10</property>
         <child>
-          <object class="GtkLabel" id="label42">
+          <object class="GtkFrame" id="frame2">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
-            <property name="xalign">0</property>
-            <property name="label" translatable="yes">Pattern _name:</property>
-            <property name="use_underline">True</property>
-            <property name="mnemonic_widget">eSFFDPatternSaveName</property>
-          </object>
-          <packing>
-            <property name="expand">False</property>
-            <property name="fill">True</property>
-            <property name="position">0</property>
-          </packing>
-        </child>
-        <child>
-          <object class="GtkEntry" id="eSFFDPatternSaveName">
-            <property name="width_request">130</property>
-            <property name="visible">True</property>
-            <property name="can_focus">True</property>
-            <property name="can_default">True</property>
-            <property name="margin_top">5</property>
-            <property name="margin_bottom">5</property>
-            <property name="invisible_char">•</property>
-            <property name="activates_default">True</property>
-            <property name="invisible_char_set">True</property>
-            <property name="primary_icon_activatable">False</property>
-            <property name="secondary_icon_activatable">False</property>
+            <property name="label_xalign">0</property>
+            <property name="shadow_type">none</property>
+            <child>
+              <object class="GtkEntry" id="eSFFDPatternSaveName">
+                <property name="width_request">130</property>
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="can_default">True</property>
+                <property name="margin_top">5</property>
+                <property name="margin_bottom">5</property>
+                <property name="invisible_char">•</property>
+                <property name="activates_default">True</property>
+                <property name="invisible_char_set">True</property>
+                <property name="primary_icon_activatable">False</property>
+                <property name="secondary_icon_activatable">False</property>
+              </object>
+            </child>
+            <child type="label">
+              <object class="GtkLabel" id="label3">
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <property name="label" translatable="yes"><b>Pattern name</b></property>
+                <property name="use_markup">True</property>
+              </object>
+            </child>
           </object>
           <packing>
             <property name="expand">True</property>
             <property name="fill">True</property>
-            <property name="position">1</property>
+            <property name="position">0</property>
           </packing>
         </child>
         <child>
@@ -1528,12 +1594,12 @@ on individual parameters</property>
   <object class="GtkSizeGroup" id="zButton">
     <property name="mode">both</property>
     <widgets>
-      <widget name="bSFFDSearch"/>
+      <widget name="iiSFFDMarkPhasicEvents"/>
       <widget name="bSFFDAgain"/>
-      <widget name="bSFFDProfileRevert"/>
-      <widget name="bSFFDProfileSave"/>
+      <widget name="bSFFDDismiss"/>
       <widget name="bSFFDProfileDiscard"/>
-      <widget name="eSFFDIncrement"/>
+      <widget name="bSFFDProfileSave"/>
+      <widget name="bSFFDProfileRevert"/>
     </widgets>
   </object>
   <object class="GtkSizeGroup" id="zSFFDControls"/>
diff --git a/src/ui/sf/d/patterns-construct.cc b/src/ui/sf/d/patterns-construct.cc
index 973a66f..eb36516 100644
--- a/src/ui/sf/d/patterns-construct.cc
+++ b/src/ui/sf/d/patterns-construct.cc
@@ -31,6 +31,7 @@ SPatternsDialogWidgets (SScoringFacility& SF)
 	     !AGH_GBGETOBJ (GtkDrawingArea,	daSFFDThing) ||
 	     !AGH_GBGETOBJ (GtkScrolledWindow,	swSFFDThing) ||
 	     !AGH_GBGETOBJ (GtkDrawingArea,	daSFFDField) ||
+	     !AGH_GBGETOBJ (GtkMenuBar,		iibSFFDMenu) ||
 	     !AGH_GBGETOBJ (GtkMenu,		iiSFFDField) ||
 	     !AGH_GBGETOBJ (GtkMenu,		iiSFFDFieldProfileTypes) ||
 	     !AGH_GBGETOBJ (GtkCheckMenuItem,	iSFFDFieldDrawMatchIndex) ||
@@ -38,6 +39,9 @@ SPatternsDialogWidgets (SScoringFacility& SF)
 	     !AGH_GBGETOBJ (GtkRadioMenuItem,	iSFFDFieldProfileTypePSD) ||
 	     !AGH_GBGETOBJ (GtkRadioMenuItem,	iSFFDFieldProfileTypeMC)  ||
 	     !AGH_GBGETOBJ (GtkRadioMenuItem,	iSFFDFieldProfileTypeSWU) ||
+	     !AGH_GBGETOBJ (GtkMenuItem,	iSFFDMarkPhasicEventSpindles) ||
+	     !AGH_GBGETOBJ (GtkMenuItem,	iSFFDMarkPhasicEventKComplexes) ||
+	     !AGH_GBGETOBJ (GtkMenuItem,	iSFFDMarkPlain) ||
 	     !AGH_GBGETOBJ (GtkScrolledWindow,	swSFFDField) ||
 	     !AGH_GBGETOBJ (GtkTable,		cSFFDSearchButton) ||
 	     !AGH_GBGETOBJ (GtkTable,		cSFFDAgainButton) ||
@@ -105,6 +109,9 @@ SPatternsDialogWidgets (SScoringFacility& SF)
 	G_CONNECT_1 (bSFFDAgain, clicked);
 	G_CONNECT_1 (eSFFDPatternSaveName, changed);
 	G_CONNECT_1 (iSFFDFieldDrawMatchIndex, toggled);
+	G_CONNECT_1 (iSFFDMarkPhasicEventSpindles, activate);
+	G_CONNECT_1 (iSFFDMarkPhasicEventKComplexes, activate);
+	G_CONNECT_1 (iSFFDMarkPlain, activate);
 
 	for ( auto& W : {eSFFDEnvTightness,
 			 eSFFDBandPassFrom, eSFFDBandPassUpto, eSFFDBandPassOrder,
@@ -129,7 +136,6 @@ SPatternsDialogWidgets (SScoringFacility& SF)
 				  (GCallback)iSFFD_any_field_profile_type_toggled_cb,
 				  this);
 
-
 	G_CONNECT_1 (wSFFD, show);
 	G_CONNECT_1 (wSFFD, hide);
 }
diff --git a/src/ui/sf/d/patterns.cc b/src/ui/sf/d/patterns.cc
index 052e53d..d4ceb5f 100644
--- a/src/ui/sf/d/patterns.cc
+++ b/src/ui/sf/d/patterns.cc
@@ -177,6 +177,8 @@ setup_controls_for_find()
 
 	gtk_widget_set_sensitive( (GtkWidget*)eSFFDPatternList, TRUE);
 
+	gtk_widget_set_sensitive( (GtkWidget*)iibSFFDMenu, FALSE);
+
 	gtk_label_set_markup( lSFFDFoundInfo, "");
 }
 
@@ -194,6 +196,8 @@ setup_controls_for_wait()
 	gtk_widget_set_visible( (GtkWidget*)cSFFDCriteria, FALSE);
 
 	gtk_widget_set_sensitive( (GtkWidget*)eSFFDPatternList, FALSE);
+
+	gtk_widget_set_sensitive( (GtkWidget*)iibSFFDMenu, FALSE);
 }
 
 void
@@ -210,6 +214,8 @@ setup_controls_for_tune()
 	gtk_widget_set_visible( (GtkWidget*)cSFFDCriteria, TRUE);
 
 	gtk_widget_set_sensitive( (GtkWidget*)eSFFDPatternList, FALSE);
+
+	gtk_widget_set_sensitive( (GtkWidget*)iibSFFDMenu, TRUE);
 }
 
 
diff --git a/src/ui/sf/d/patterns.hh b/src/ui/sf/d/patterns.hh
index aa04cde..d7669bf 100644
--- a/src/ui/sf/d/patterns.hh
+++ b/src/ui/sf/d/patterns.hh
@@ -51,10 +51,16 @@ struct SPatternsDialogWidgets {
 	GtkDrawingArea
 		*daSFFDThing,
 		*daSFFDField;
+	GtkMenuBar
+		*iibSFFDMenu;
 	GtkMenu	*iiSFFDField,
 		*iiSFFDFieldProfileTypes;
 	GtkCheckMenuItem
 		*iSFFDFieldDrawMatchIndex;
+	GtkMenuItem
+		*iSFFDMarkPhasicEventSpindles,
+		*iSFFDMarkPhasicEventKComplexes,
+		*iSFFDMarkPlain;
 	GtkRadioMenuItem
 		*iSFFDFieldProfileTypeRaw,
 		*iSFFDFieldProfileTypePSD,
@@ -206,7 +212,10 @@ gboolean eSFFD_any_criteria_focus_in_event_cb(GtkWidget*, GdkEvent*, gpointer);
 void wSFFD_show_cb( GtkWidget*, gpointer);
 void wSFFD_hide_cb( GtkWidget*, gpointer);
 gboolean wSFFD_configure_event_cb( GtkWidget*, GdkEventConfigure*, gpointer);
-void iSFFDFieldDrawMatchIndex_toggled_cb(GtkCheckMenuItem*, gpointer);
+void iSFFDFieldDrawMatchIndex_toggled_cb( GtkCheckMenuItem*, gpointer);
+void iSFFDMarkPhasicEventSpindles_activate_cb( GtkMenuItem*, gpointer);
+void iSFFDMarkPhasicEventKComplexes_activate_cb( GtkMenuItem*, gpointer);
+void iSFFDMarkPlain_activate_cb( GtkMenuItem*, gpointer);
 void eSFFDPatternSaveName_changed_cb(GtkEditable*, gpointer);
 
 void eSFFD_any_pattern_origin_toggled_cb(GtkRadioButton*, gpointer);
diff --git a/src/ui/sf/d/patterns_cb.cc b/src/ui/sf/d/patterns_cb.cc
index ccbea57..a5fba7c 100644
--- a/src/ui/sf/d/patterns_cb.cc
+++ b/src/ui/sf/d/patterns_cb.cc
@@ -260,6 +260,52 @@ bSFFDAgain_clicked_cb( GtkButton*, gpointer userdata)
 	FD.setup_controls_for_find();
 }
 
+void
+iSFFDMarkPhasicEventSpindles_activate_cb( GtkMenuItem*, gpointer userdata)
+{
+	auto& FD = *(SScoringFacility::SPatternsDialog*)userdata;
+
+	FD.restore_annotations();
+	FD.occurrences_to_annotations( sigfile::SAnnotation::TType::phasic_event_spindle);
+	FD.occurrences.clear();
+	FD._p.queue_redraw_all();
+
+	gtk_widget_hide( (GtkWidget*)FD.wSFFD);
+}
+
+void
+iSFFDMarkPhasicEventKComplexes_activate_cb( GtkMenuItem*, gpointer userdata)
+{
+	auto& FD = *(SScoringFacility::SPatternsDialog*)userdata;
+
+	FD.restore_annotations();
+	FD.occurrences_to_annotations( sigfile::SAnnotation::TType::phasic_event_K_complex);
+	FD.occurrences.clear();
+	FD._p.queue_redraw_all();
+
+	gtk_widget_hide( (GtkWidget*)FD.wSFFD);
+}
+
+void
+iSFFDMarkPlain_activate_cb( GtkMenuItem*, gpointer userdata)
+{
+	auto& FD = *(SScoringFacility::SPatternsDialog*)userdata;
+
+	// FD.restore_annotations();
+	// FD.occurrences_to_annotations( sigfile::SAnnotation::TType::plain);
+	FD.occurrences.clear();
+	// FD._p.queue_redraw_all();
+
+	gtk_widget_hide( (GtkWidget*)FD.wSFFD);
+}
+
+
+
+
+
+
+
+
 
 void
 eSFFD_any_pattern_value_changed_cb( GtkSpinButton*, gpointer userdata)

-- 
Sleep experiment manager



More information about the debian-med-commit mailing list