added v offset option to scope

diff --git a/gr-wxgui/src/python/scope_window.py b/gr-wxgui/src/python/scope_window.py
index 9346a73d88c6401841a0cb2f555b0b7376ec23f2..08a025e1ef3cef278a7491dfc0a281abfa738eea 100644 (file)
--- a/gr-wxgui/src/python/scope_window.py
+++ b/gr-wxgui/src/python/scope_window.py
@@ -376,6 +376,7 @@ class scope_window(wx.Panel, pubsub.pubsub):
                sample_rate_key,
                t_scale,
                v_scale,
+               v_offset,
                xy_mode,
                ac_couple_key,
                trigger_level_key,
@@ -415,8 +416,8 @@ class scope_window(wx.Panel, pubsub.pubsub):
                self[X_PER_DIV_KEY] = v_scale
                self[Y_PER_DIV_KEY] = v_scale
                self[T_OFF_KEY] = 0
-               self[X_OFF_KEY] = 0
-               self[Y_OFF_KEY] = 0
+               self[X_OFF_KEY] = v_offset
+               self[Y_OFF_KEY] = v_offset
                self[T_DIVS_KEY] = 8
                self[X_DIVS_KEY] = 8
                self[Y_DIVS_KEY] = 8

diff --git a/gr-wxgui/src/python/scopesink_gl.py b/gr-wxgui/src/python/scopesink_gl.py
index 2882488e3dabcfa341c2eaf165b0b0d3a32bd888..358361de62d6953ee6f969ee1db7dd5e64a17a20 100644 (file)
--- a/gr-wxgui/src/python/scopesink_gl.py
+++ b/gr-wxgui/src/python/scopesink_gl.py
@@ -71,6 +71,7 @@ class _scope_sink_base(gr.hier_block2, common.wxgui_hb):
                size=scope_window.DEFAULT_WIN_SIZE,
                v_scale=0,
                t_scale=0,
+               v_offset=0,
                xy_mode=False,
                ac_couple=False,
                num_inputs=1,
@@ -119,6 +120,7 @@ class _scope_sink_base(gr.hier_block2, common.wxgui_hb):
                        sample_rate_key=SAMPLE_RATE_KEY,
                        t_scale=t_scale,
                        v_scale=v_scale,
+                       v_offset=v_offset,
                        xy_mode=xy_mode,
                        ac_couple_key=AC_COUPLE_KEY,
                        trigger_level_key=TRIGGER_LEVEL_KEY,

diff --git a/grc/blocks/wxgui_scopesink2.xml b/grc/blocks/wxgui_scopesink2.xml
index 07d29ce8fffc0ddeb68ff9b8fa7e7d7717b28a61..eba45f48981af825c5ec658017b3e221b2e00f43 100644 (file)
--- a/grc/blocks/wxgui_scopesink2.xml
+++ b/grc/blocks/wxgui_scopesink2.xml
@@ -15,6 +15,7 @@ scopesink2.$(type.fcn)(
        title=$title,
        sample_rate=$samp_rate,
        v_scale=$v_scale,
+       v_offset=$v_offset,
        t_scale=$t_scale,
        ac_couple=$ac_couple,
        xy_mode=$xy_mode,
@@ -62,19 +63,28 @@ $(parent).GridAdd(self.$(id).win, $(', '.join(map(str, $grid_pos()))))
                <key>v_scale</key>
                <value>0</value>
                <type>real</type>
+               <hide>#if $v_scale() then 'none' else 'part'#</hide>
+       </param>
+       <param>
+               <name>V Offset</name>
+               <key>v_offset</key>
+               <value>0</value>
+               <type>real</type>
+               <hide>#if $v_offset() then 'none' else 'part'#</hide>
        </param>
        <param>
                <name>T Scale</name>
                <key>t_scale</key>
                <value>0</value>
                <type>real</type>
+               <hide>#if $t_scale() then 'none' else 'part'#</hide>
        </param>
        <param>
                <name>AC Couple</name>
                <key>ac_couple</key>
                <value>False</value>
-               <type>enum</type>
-               <hide>#if $ac_couple() == 'True' then 'none' else 'part'#</hide>
+               <type>bool</type>
+               <hide>#if $ac_couple() then 'none' else 'part'#</hide>
                <option>
                        <name>Off</name>
                        <key>False</key>