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

[Andrei Zavada]

The following commit has been merged in the master branch:
commit a1d408fb56bfbd26707c5cad497ca922c22cd91a
Author: Andrei Zavada <johnhommer at gmail.com>
Date:   Tue Jan 15 19:20:51 2013 +0200

    patterns WIP

diff --git a/src/ui/libcommon.cc b/src/ui/libcommon.cc
index 1c0d4e1..e3ae44d 100644
--- a/src/ui/libcommon.cc
+++ b/src/ui/libcommon.cc
@@ -186,7 +186,7 @@ cairo_draw_signal( cairo_t *cr, const valarray<TFloat>& V,
 {
 	switch ( direction ) {
 
-	case TDrawSignalDirection::Forward:
+	case TDrawSignalDirection::forward:
 		if ( unlikely (start < 0) )
 			(continue_path ? cairo_line_to : cairo_move_to)(
 				cr, hoff + ((double)(0 - start))/(end-start) * hspan, 0 + voff);
@@ -199,7 +199,7 @@ cairo_draw_signal( cairo_t *cr, const valarray<TFloat>& V,
 				       voff - V[i] * scale);
 	    break;
 
-	case TDrawSignalDirection::Backward:
+	case TDrawSignalDirection::backward:
 		if ( unlikely (end > (ssize_t)V.size()) )
 			(continue_path ? cairo_line_to : cairo_move_to)(
 				cr, hoff + ((double)(V.size()-1 - start))/(end-start) * hspan, 0 + voff);
diff --git a/src/ui/sf/sf-patterns_cb.cc b/src/ui/sf/sf-patterns_cb.cc
index 4721f4c..0341712 100644
--- a/src/ui/sf/sf-patterns_cb.cc
+++ b/src/ui/sf/sf-patterns_cb.cc
@@ -16,6 +16,8 @@
 using namespace std;
 
 
+#define globally_marker "[G]"
+
 using namespace aghui;
 
 extern "C" {
@@ -151,8 +153,8 @@ bPatternSave_clicked_cb( GtkButton *button, gpointer userdata)
 
 	const char *label = gtk_combo_box_get_active_id( FD._p.ePatternList);
 	if ( label ) {
-		if ( strncmp( label, FD.globally_marker, strlen( FD.globally_marker)) == 0 )
-			label += strlen( FD.globally_marker);
+		if ( strncmp( label, globally_marker, strlen( globally_marker)) == 0 )
+			label += strlen( globally_marker);
 		gtk_entry_set_text( FD._p.ePatternNameName, label);
 	}
 	if ( gtk_dialog_run( FD._p.wPatternName) == GTK_RESPONSE_OK ) {
@@ -182,10 +184,10 @@ bPatternDiscard_clicked_cb( GtkButton *button, gpointer userdata)
 	gtk_tree_model_get( (GtkTreeModel*)FD._p.mPatterns, &iter,
 			    0, &label,
 			    -1);
-	gboolean do_globally = strncmp( label, FD.globally_marker,
-					strlen( FD.globally_marker)) == 0;
+	gboolean do_globally = strncmp( label, globally_marker,
+					strlen( globally_marker)) == 0;
 	char *fname = do_globally
-		? label + strlen( FD.globally_marker)
+		? label + strlen( globally_marker)
 		: label;
 	FD.discard_pattern( fname, do_globally);
 	free( label);
@@ -208,9 +210,9 @@ ePatternList_changed_cb( GtkComboBox *combo, gpointer userdata)
 	gtk_tree_model_get( (GtkTreeModel*)FD._p.mPatterns, &iter,
 			    0, &label,
 			    -1);
-	gboolean do_globally = strncmp( label, FD.globally_marker, strlen( FD.globally_marker)) == 0;
+	gboolean do_globally = strncmp( label, globally_marker, strlen( globally_marker)) == 0;
 	char *fname = do_globally
-		? label + strlen( FD.globally_marker)
+		? label + strlen( globally_marker)
 		: label;
 	FD.load_pattern( fname, do_globally);
 	free( label);

-- 
Sleep experiment manager