diff options
| author | Johnathan Corgan <johnathan@corganlabs.com> | 2015-08-28 11:31:38 -0700 |
|---|---|---|
| committer | Johnathan Corgan <johnathan@corganlabs.com> | 2015-08-28 11:31:38 -0700 |
| commit | d18f20a8ca32f1a3115efadb75a22ac7ff43d0f7 (patch) | |
| tree | 4497ab56047fa1f69aa6f3f8d00f1b4921531d7a | |
| parent | 2579342b379c0e7f5fbe9e8799e0a973cf6971e4 (diff) | |
| parent | 78a05b10430a4907ce060ace32e7b55de07eeb7d (diff) | |
Merge remote-tracking branch 'estatz/qtgui_trigger_callbacks'
| -rw-r--r-- | gr-qtgui/grc/qtgui_const_sink_x.xml | 1 | ||||
| -rw-r--r-- | gr-qtgui/grc/qtgui_freq_sink_x.xml | 1 | ||||
| -rw-r--r-- | gr-qtgui/grc/qtgui_time_sink_x.xml | 1 |
3 files changed, 3 insertions, 0 deletions
diff --git a/gr-qtgui/grc/qtgui_const_sink_x.xml b/gr-qtgui/grc/qtgui_const_sink_x.xml index a7e1ba11c5..c17ceff8cc 100644 --- a/gr-qtgui/grc/qtgui_const_sink_x.xml +++ b/gr-qtgui/grc/qtgui_const_sink_x.xml @@ -55,6 +55,7 @@ $(gui_hint()($win))</make> <callback>set_update_time($update_time)</callback> <callback>set_title($which, $title)</callback> <callback>set_color($which, $color)</callback> + <callback>self.$(id).set_trigger_mode($tr_mode, $tr_slope, $tr_level, $tr_chan, $tr_tag)</callback> <param_tab_order> <tab>General</tab> diff --git a/gr-qtgui/grc/qtgui_freq_sink_x.xml b/gr-qtgui/grc/qtgui_freq_sink_x.xml index 96a9fd053d..67e852ce24 100644 --- a/gr-qtgui/grc/qtgui_freq_sink_x.xml +++ b/gr-qtgui/grc/qtgui_freq_sink_x.xml @@ -58,6 +58,7 @@ $(gui_hint()($win))</make> <callback>set_title($which, $title)</callback> <callback>set_color($which, $color)</callback> <callback>set_y_axis($ymin, $ymax)</callback> + <callback>self.$(id).set_trigger_mode($tr_mode, $tr_level, $tr_chan, $tr_tag)</callback> <param_tab_order> <tab>General</tab> diff --git a/gr-qtgui/grc/qtgui_time_sink_x.xml b/gr-qtgui/grc/qtgui_time_sink_x.xml index 9344ef4de2..0d77c4f7e9 100644 --- a/gr-qtgui/grc/qtgui_time_sink_x.xml +++ b/gr-qtgui/grc/qtgui_time_sink_x.xml @@ -80,6 +80,7 @@ $(gui_hint()($win))</make> <callback>set_color($which, $color)</callback> <callback>set_y_axis($ymin, $ymax)</callback> <callback>set_samp_rate($srate)</callback> + <callback>self.$(id).set_trigger_mode($tr_mode, $tr_slope, $tr_level, $tr_delay, $tr_chan, $tr_tag)</callback> <param_tab_order> <tab>General</tab> |