Merge branch 'patches/marcus/stripchart'

Conflicts:
	gr-wxgui/src/python/scope_window.py

* Adds new scope window trigger, TRIG_MODE_STRIPCHART
* Allows config file selection of whether background window sinks still run
* Allows config file selection of default trigger mode
* Allows config file selection of default waterfall sink color mode

[wxgui]
#Setting this to true prevents the window sinks from stopping when they
#are not displayed, as when they are in a notebook with a hidden tab.
run_always = False

# Default scope trigger mode.
#
# 0 = Freerun
# 1 = Auto (default)
# 2 = Normal
# 3 = Stripchart
trig_mode = 1

# Default waterfall sink color mode.  Valid choices are 'rgb1', 'rbg2',
# 'rgb3', or 'gray'
waterfall_color = rgb1

4 files changed, 28 insertions, 3 deletions

diff --git a/gr-wxgui/src/python/common.py b/gr-wxgui/src/python/common.py
index 17a7dc0de..3641ae644 100644
--- a/gr-wxgui/src/python/common.py
+++ b/gr-wxgui/src/python/common.py
@@ -25,6 +25,8 @@
 import wx
 from gnuradio import gr
 
+RUN_ALWAYS = gr.prefs().get_bool ('wxgui', 'run_always', False)
+
 class wxgui_hb(object):
 	"""
 	The wxgui hier block helper/wrapper class:
@@ -47,7 +49,10 @@ class wxgui_hb(object):
 			assert points[0] == self or points[0][0] == self
 			copy = gr.copy(self._hb.input_signature().sizeof_stream_item(0))
 			handler = self._handler_factory(copy.set_enabled)
-			handler(False) #initially disable the copy block
+			if RUN_ALWAYS == False:
+				handler(False) #initially disable the copy block
+			else:
+				handler(True) #initially enable the copy block
 			self._bind_to_visible_event(win=self.win, handler=handler)
 			points = list(points)
 			points.insert(1, copy) #insert the copy block into the chain
@@ -67,7 +72,10 @@ class wxgui_hb(object):
 			if cache[0] == visible: return
 			cache[0] = visible
 			#print visible, handler
-			handler(visible)
+			if RUN_ALWAYS == False:
+				handler(visible)
+			else:
+				handler(True)
 		return callback
 
 	@staticmethod
diff --git a/gr-wxgui/src/python/scope_window.py b/gr-wxgui/src/python/scope_window.py
index c03b71f1e..a9917782f 100644
--- a/gr-wxgui/src/python/scope_window.py
+++ b/gr-wxgui/src/python/scope_window.py
@@ -38,6 +38,7 @@ import forms
 DEFAULT_FRAME_RATE = gr.prefs().get_long('wxgui', 'scope_rate', 30)
 PERSIST_ALPHA_MIN_EXP, PERSIST_ALPHA_MAX_EXP = -2, 0
 SLIDER_STEPS = 100
+DEFAULT_TRIG_MODE = gr.prefs().get_long('wxgui', 'trig_mode', gr.gr_TRIG_MODE_AUTO)
 DEFAULT_WIN_SIZE = (600, 300)
 COUPLING_MODES = (
 	('DC', False),
@@ -47,6 +48,7 @@ TRIGGER_MODES = (
 	('Freerun', gr.gr_TRIG_MODE_FREE),
 	('Auto', gr.gr_TRIG_MODE_AUTO),
 	('Normal', gr.gr_TRIG_MODE_NORM),
+	('Stripchart', gr.gr_TRIG_MODE_STRIPCHART),
 )
 TRIGGER_SLOPES = (
 	('Pos +', gr.gr_TRIG_SLOPE_POS),
@@ -432,6 +434,7 @@ class scope_window(wx.Panel, pubsub.pubsub):
 		msg_key,
                 use_persistence,
                 persist_alpha,
+		trig_mode,
 	):
 		pubsub.pubsub.__init__(self)
 		#check num inputs
@@ -471,11 +474,16 @@ class scope_window(wx.Panel, pubsub.pubsub):
 		self[FRAME_RATE_KEY] = frame_rate
 		self[TRIGGER_LEVEL_KEY] = 0
 		self[TRIGGER_CHANNEL_KEY] = 0
-		self[TRIGGER_MODE_KEY] = gr.gr_TRIG_MODE_AUTO
+		self[TRIGGER_MODE_KEY] = trig_mode
+		
 		self[TRIGGER_SLOPE_KEY] = gr.gr_TRIG_SLOPE_POS
 		self[T_FRAC_OFF_KEY] = 0.5
 		self[USE_PERSISTENCE_KEY] = use_persistence
 		self[PERSIST_ALPHA_KEY] = persist_alpha
+		
+		if self[TRIGGER_MODE_KEY] == gr.gr_TRIG_MODE_STRIPCHART:
+			self[T_FRAC_OFF_KEY] = 0.0
+
 		for i in range(num_inputs):
 			self.proxy(common.index_key(AC_COUPLE_KEY, i), controller, common.index_key(ac_couple_key, i))
 		#init panel and plot
diff --git a/gr-wxgui/src/python/scopesink_gl.py b/gr-wxgui/src/python/scopesink_gl.py
index ebf9b2939..15be23d5a 100644
--- a/gr-wxgui/src/python/scopesink_gl.py
+++ b/gr-wxgui/src/python/scopesink_gl.py
@@ -76,6 +76,7 @@ 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,
                 use_persistence=False,
                 persist_alpha=None,
@@ -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,
diff --git a/gr-wxgui/src/python/waterfall_window.py b/gr-wxgui/src/python/waterfall_window.py
index b7904e4d9..6536ada10 100644
--- a/gr-wxgui/src/python/waterfall_window.py
+++ b/gr-wxgui/src/python/waterfall_window.py
@@ -38,6 +38,7 @@ import forms
 SLIDER_STEPS = 100
 AVG_ALPHA_MIN_EXP, AVG_ALPHA_MAX_EXP = -3, 0
 DEFAULT_FRAME_RATE = gr.prefs().get_long('wxgui', 'waterfall_rate', 30)
+DEFAULT_COLOR_MODE = gr.prefs().get_string('wxgui', 'waterfall_color', 'rgb1')
 DEFAULT_WIN_SIZE = (600, 300)
 DIV_LEVELS = (1, 2, 5, 10, 20)
 MIN_DYNAMIC_RANGE, MAX_DYNAMIC_RANGE = 10, 200
@@ -156,6 +157,9 @@ class control_panel(wx.Panel):
 	def _on_incr_time_scale(self, event):
 		old_rate = self.parent[FRAME_RATE_KEY]
 		self.parent[FRAME_RATE_KEY] *= 0.75
+		if self.parent[FRAME_RATE_KEY] < 1.0:
+			self.parent[FRAME_RATE_KEY] = 1.0
+		
 		if self.parent[FRAME_RATE_KEY] == old_rate:
 			self.parent[DECIMATION_KEY] += 1
 	def _on_decr_time_scale(self, event):
@@ -217,6 +221,7 @@ class waterfall_window(wx.Panel, pubsub.pubsub):
 		self[REF_LEVEL_KEY] = ref_level
 		self[BASEBAND_FREQ_KEY] = baseband_freq
 		self[COLOR_MODE_KEY] = COLOR_MODES[0][1]
+		self[COLOR_MODE_KEY] = DEFAULT_COLOR_MODE
 		self[RUNNING_KEY] = True
 		#setup the box with plot and controls
 		self.control_panel = control_panel(self)
@@ -280,6 +285,8 @@ class waterfall_window(wx.Panel, pubsub.pubsub):
 		#grid parameters
 		sample_rate = self[SAMPLE_RATE_KEY]
 		frame_rate = self[FRAME_RATE_KEY]
+		if frame_rate < 1.0 :
+			frame_rate = 1.0
 		baseband_freq = self[BASEBAND_FREQ_KEY]
 		num_lines = self[NUM_LINES_KEY]
 		y_divs = self[Y_DIVS_KEY]