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

[Andrei Zavada]

The following commit has been merged in the master branch:
commit 72f5d5f5c3e2c4634b158cc61b5ce64318adb86e
Author: Andrei Zavada <johnhommer at gmail.com>
Date:   Thu Jan 24 10:04:45 2013 +0200

    WIP

diff --git a/data/sf-artifacts.glade b/data/sf-artifacts.glade
index da045b4..53d9bed 100644
--- a/data/sf-artifacts.glade
+++ b/data/sf-artifacts.glade
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
   <!-- interface-requires gtk+ 3.0 -->
-  <object class="GtkAdjustment" id="jSFADLowerThr">
-    <property name="lower">-30</property>
-    <property name="upper">-1</property>
-    <property name="value">-9</property>
+  <object class="GtkAdjustment" id="jSFADUpperThr">
+    <property name="lower">1</property>
+    <property name="upper">30</property>
+    <property name="value">9</property>
     <property name="step_increment">0.5</property>
     <property name="page_increment">2</property>
   </object>
@@ -61,6 +61,13 @@
     <property name="step_increment">1</property>
     <property name="page_increment">10</property>
   </object>
+  <object class="GtkAdjustment" id="jSFADLowerThr">
+    <property name="lower">-30</property>
+    <property name="upper">-1</property>
+    <property name="value">-9</property>
+    <property name="step_increment">0.5</property>
+    <property name="page_increment">2</property>
+  </object>
   <object class="GtkAdjustment" id="jSFADMCGain">
     <property name="lower">1</property>
     <property name="upper">100</property>
@@ -80,13 +87,6 @@
     <property name="step_increment">1</property>
     <property name="page_increment">2</property>
   </object>
-  <object class="GtkAdjustment" id="jSFADUpperThr">
-    <property name="lower">1</property>
-    <property name="upper">30</property>
-    <property name="value">9</property>
-    <property name="step_increment">0.5</property>
-    <property name="page_increment">2</property>
-  </object>
   <object class="GtkAdjustment" id="jSFSimpleArtifactDetectionMinFlatRegionSize">
     <property name="lower">0.01</property>
     <property name="upper">10</property>
@@ -106,7 +106,6 @@
     <property name="title" translatable="yes">Artifact Detection</property>
     <property name="type_hint">dialog</property>
     <signal name="close" handler="gtk_widget_hide_on_delete" swapped="no"/>
-    <signal name="response" handler="gtk_widget_hide_on_delete" swapped="no"/>
     <child internal-child="vbox">
       <object class="GtkBox" id="dialog-vbox9">
         <property name="can_focus">False</property>
@@ -1321,7 +1320,7 @@
                 <property name="invisible_char">•</property>
                 <property name="xalign">1</property>
                 <property name="invisible_char_set">True</property>
-                <property name="adjustment"/>
+                <property name="adjustment">jSFSimpleArtifactDetectionMinFlatRegionSize</property>
                 <property name="digits">2</property>
               </object>
               <packing>
@@ -1366,7 +1365,7 @@
                 <property name="invisible_char">•</property>
                 <property name="xalign">1</property>
                 <property name="invisible_char_set">True</property>
-                <property name="adjustment"/>
+                <property name="adjustment">jSFSimpleArtifactDetectionPad</property>
                 <property name="digits">2</property>
               </object>
               <packing>
diff --git a/src/ui/sf/sf-patterns.cc b/src/ui/sf/sf-patterns.cc
index f789fe6..495d38a 100644
--- a/src/ui/sf/sf-patterns.cc
+++ b/src/ui/sf/sf-patterns.cc
@@ -136,6 +136,7 @@ occurrences_to_annotations()
 			field_channel->annotations,
 			occurrences[o], occurrences[o] + current_pattern->pattern_size_essential(),
 			(snprintf_buf("%s (%zu)", current_pattern->name.c_str(), o), __buf__));
+	_p._p.populate_mGlobalAnnotations();
 }
 
 void
@@ -143,6 +144,7 @@ aghui::SScoringFacility::SFindDialog::
 save_annotations()
 {
 	saved_annotations = field_channel->annotations;
+	_p._p.populate_mGlobalAnnotations();
 }
 
 void
@@ -151,6 +153,7 @@ restore_annotations()
 {
 	field_channel->annotations = saved_annotations;
 	saved_annotations.clear();
+	_p._p.populate_mGlobalAnnotations();
 }
 
 

-- 
Sleep experiment manager