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

[andrei zavada]

The following commit has been merged in the master branch:
commit 9905e51be8f3de47805d685db90d5284f113b1ea
Author: andrei zavada <jh at johnhommer.com>
Date:   Thu Jan 10 09:49:19 2013 +0000

    patterns refactoring (part 3/3)

diff --git a/src/tools/edfcat.cc b/src/tools/edfcat.cc
index ab01192..1bce261 100644
--- a/src/tools/edfcat.cc
+++ b/src/tools/edfcat.cc
@@ -235,7 +235,7 @@ preprocess( const valarray<TFloat>& x_, size_t samplerate,
 	vector<size_t>
 		mini, maxi;
 	sigproc::envelope(
-		x, samplerate/4, samplerate, .25,
+		{x, samplerate}, samplerate/4, .25,
 		(valarray<TFloat>*)nullptr,  // wow, just wow
 		(valarray<TFloat>*)nullptr,
 		&mini, &maxi);
diff --git a/src/ui/sf/sf-patterns_cb.cc b/src/ui/sf/sf-patterns_cb.cc
index 20f74e6..6506269 100644
--- a/src/ui/sf/sf-patterns_cb.cc
+++ b/src/ui/sf/sf-patterns_cb.cc
@@ -100,8 +100,8 @@ bPatternFind_clicked_cb( GtkButton *button, gpointer userdata)
 		SF.suppress_redraw = false;
 		SF.queue_redraw_all();
 
-		snprintf_buf( "at p. %zu (a = %4.2f, b = %4.2f, c = %4.2f)\n",
-			      SF.cur_vpage()+1, FD.match_a, FD.match_b, FD.match_c);
+		snprintf_buf( "at p. %zu (match: %4.2f, %4.2f, %4.2f, %4.2f)\n",
+			      SF.cur_vpage()+1, FD.match[0], FD.match[1], FD.match[2], FD.match[3]);
 		gtk_label_set_markup( FD._p.lPatternSimilarity, __buf__);
 
 		gtk_widget_queue_draw( (GtkWidget*)FD._p.lPatternSimilarity);

-- 
Sleep experiment manager