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

[andrei zavada]

The following commit has been merged in the master branch:
commit 94d0e0f5f7e7c36300c0439aa19140e41b3195f6
Author: andrei zavada <jh at johnhommer.com>
Date:   Wed Jan 30 10:00:40 2013 +0000

    also scale emg_display_scale when changing montage scale

diff --git a/src/ui/sf/montage.cc b/src/ui/sf/montage.cc
index 7adc9d2..a4ca92a 100644
--- a/src/ui/sf/montage.cc
+++ b/src/ui/sf/montage.cc
@@ -163,6 +163,7 @@ expand_by_factor( double fac)
 		H.signal_display_scale *= fac;
 		H.psd.display_scale *= fac;
 		H.mc.display_scale *= fac;
+		H.emg_display_scale *= fac;
 		H.zeroy *= fac;
 	}
 	interchannel_gap *= fac;
@@ -497,7 +498,7 @@ draw_page( cairo_t *cr,
 						 (float)(ae - aa) / evpz * wd, ptop+30);
 				cairo_fill( cr);
 				cairo_stroke( cr);
-			} else if ( (int)A.a > cvpe )  // no more artifacts up to and on current page
+			} else if ( (int)A.a > cvpe )  // no more spindles up to and on current page
 				break;
 		}
 		cairo_pattern_destroy( cp);

-- 
Sleep experiment manager