X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=gr-wxgui%2Fsrc%2Fpython%2Fscopesink_gl.py;h=15be23d5aee8c0f865a7ebb3115fce8857ff7acb;hb=c81312cee781a6912eb87f430096f3757e056b28;hp=a12517883cfe4f4a3f77042c336ed981cb70200d;hpb=331542fc51eb47a65161ab6d41c6dc8fd1dd1f22;p=debian%2Fgnuradio

diff --git a/gr-wxgui/src/python/scopesink_gl.py b/gr-wxgui/src/python/scopesink_gl.py
index a1251788..15be23d5 100644
--- a/gr-wxgui/src/python/scopesink_gl.py
+++ b/gr-wxgui/src/python/scopesink_gl.py
@@ -1,5 +1,5 @@
 #
-# Copyright 2008 Free Software Foundation, Inc.
+# Copyright 2008,2010 Free Software Foundation, Inc.
 #
 # This file is part of GNU Radio
 #
@@ -76,17 +76,18 @@ class _scope_sink_base(gr.hier_block2, common.wxgui_hb):
 		xy_mode=False,
 		ac_couple=False,
 		num_inputs=1,
+		trig_mode=scope_window.DEFAULT_TRIG_MODE,
 		frame_rate=scope_window.DEFAULT_FRAME_RATE,
-                emulate_analog=False,
-                analog_alpha=None,
+                use_persistence=False,
+                persist_alpha=None,
 		**kwargs #do not end with a comma
 	):
                 #ensure analog alpha
-                if analog_alpha is None: 
+                if persist_alpha is None: 
                   actual_frame_rate=float(frame_rate)
                   analog_cutoff_freq=0.5 # Hertz
                   #calculate alpha from wanted cutoff freq
-                  analog_alpha = 1.0 - math.exp(-2.0*math.pi*analog_cutoff_freq/actual_frame_rate)
+                  persist_alpha = 1.0 - math.exp(-2.0*math.pi*analog_cutoff_freq/actual_frame_rate)
 
 		if not t_scale: t_scale = 10.0/sample_rate
 		#init
@@ -132,6 +133,7 @@ class _scope_sink_base(gr.hier_block2, common.wxgui_hb):
 			v_scale=v_scale,
 			v_offset=v_offset,
 			xy_mode=xy_mode,
+			trig_mode=trig_mode,
 			ac_couple_key=AC_COUPLE_KEY,
 			trigger_level_key=TRIGGER_LEVEL_KEY,
 			trigger_mode_key=TRIGGER_MODE_KEY,
@@ -139,8 +141,8 @@ class _scope_sink_base(gr.hier_block2, common.wxgui_hb):
 			trigger_channel_key=TRIGGER_CHANNEL_KEY,
 			decimation_key=DECIMATION_KEY,
 			msg_key=MSG_KEY,
-                        emulate_analog=emulate_analog,
-                        analog_alpha=analog_alpha,
+                        use_persistence=use_persistence,
+                        persist_alpha=persist_alpha,
 		)
 		common.register_access_methods(self, self.win)
 		#connect