[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Commit-gnuradio] [gnuradio] 02/03: grc: assign all in-tree blocks to mo
|
From: |
git |
|
Subject: |
[Commit-gnuradio] [gnuradio] 02/03: grc: assign all in-tree blocks to module 'Core' |
|
Date: |
Fri, 27 May 2016 20:18:57 +0000 (UTC) |
This is an automated email from the git hooks/post-receive script.
jcorgan pushed a commit to branch master
in repository gnuradio.
commit 4565ba90b988f7696026ea7c3822e9ce9776a1f1
Author: Sebastian Koslowski <address@hidden>
Date: Tue Apr 5 22:10:01 2016 +0200
grc: assign all in-tree blocks to module 'Core'
---
gr-analog/grc/analog_block_tree.xml | 2 +-
gr-audio/grc/audio_sink.xml | 2 +-
gr-audio/grc/audio_source.xml | 2 +-
gr-blocks/grc/blks2_error_rate.xml | 2 +-
gr-blocks/grc/blks2_selector.xml | 2 +-
gr-blocks/grc/blks2_tcp_sink.xml | 2 +-
gr-blocks/grc/blks2_tcp_source.xml | 2 +-
gr-blocks/grc/blks2_valve.xml | 2 +-
gr-blocks/grc/blocks_block_tree.xml | 9 +++------
gr-channels/grc/channels_block_tree.xml | 2 +-
gr-digital/grc/blks2_packet_decoder.xml | 2 +-
gr-digital/grc/blks2_packet_encoder.xml | 2 +-
gr-digital/grc/digital_block_tree.xml | 2 +-
gr-digital/grc/digital_burst_shaper.xml | 2 +-
gr-dtv/grc/dtv_block_tree.xml | 2 +-
gr-fcd/grc/fcd_source_c.xml | 2 +-
gr-fec/grc/fec_block_tree.xml | 2 +-
gr-fft/grc/fft_block_tree.xml | 2 +-
gr-filter/grc/filter_block_tree.xml | 2 +-
gr-noaa/grc/noaa_hrpt_decoder.xml | 2 +-
gr-noaa/grc/noaa_hrpt_deframer.xml | 2 +-
gr-noaa/grc/noaa_hrpt_pll_cf.xml | 2 +-
gr-pager/grc/pager_flex_deinterleave.xml | 2 +-
gr-pager/grc/pager_flex_sync.xml | 2 +-
gr-pager/grc/pager_slicer_fb.xml | 2 +-
gr-qtgui/grc/qtgui_block_tree.xml | 2 +-
gr-trellis/grc/trellis_encoder_xx.xml | 2 +-
gr-trellis/grc/trellis_metrics_x.xml | 2 +-
gr-trellis/grc/trellis_pccc_decoder_combined_xx.xml | 2 +-
gr-trellis/grc/trellis_pccc_decoder_x.xml | 2 +-
gr-trellis/grc/trellis_pccc_encoder_xx.xml | 2 +-
gr-trellis/grc/trellis_permutation.xml | 2 +-
gr-trellis/grc/trellis_sccc_decoder_combined_xx.xml | 2 +-
gr-trellis/grc/trellis_sccc_decoder_x.xml | 2 +-
gr-trellis/grc/trellis_sccc_encoder_xx.xml | 2 +-
gr-trellis/grc/trellis_siso_combined_f.xml | 2 +-
gr-trellis/grc/trellis_siso_f.xml | 2 +-
gr-trellis/grc/trellis_viterbi_combined_xx.xml | 2 +-
gr-trellis/grc/trellis_viterbi_x.xml | 2 +-
gr-uhd/grc/uhd_block_tree.xml | 2 +-
gr-video-sdl/grc/video_block_tree.xml | 2 +-
gr-vocoder/grc/vocoder_block_tree.xml | 2 +-
gr-wxgui/grc/notebook.xml | 2 +-
gr-wxgui/grc/variable_check_box.xml | 2 +-
gr-wxgui/grc/variable_chooser.xml | 2 +-
gr-wxgui/grc/variable_slider.xml | 2 +-
gr-wxgui/grc/variable_static_text.xml | 2 +-
gr-wxgui/grc/variable_text_box.xml | 2 +-
gr-wxgui/grc/wxgui_constellationsink2.xml | 2 +-
gr-wxgui/grc/wxgui_fftsink2.xml | 2 +-
gr-wxgui/grc/wxgui_histosink2.xml | 2 +-
gr-wxgui/grc/wxgui_numbersink2.xml | 2 +-
gr-wxgui/grc/wxgui_scopesink2.xml | 2 +-
gr-wxgui/grc/wxgui_termsink.xml | 2 +-
gr-wxgui/grc/wxgui_waterfallsink2.xml | 2 +-
gr-zeromq/grc/zeromq_pub_msg_sink.xml | 2 +-
gr-zeromq/grc/zeromq_pub_sink.xml | 2 +-
gr-zeromq/grc/zeromq_pull_msg_source.xml | 2 +-
gr-zeromq/grc/zeromq_pull_source.xml | 2 +-
gr-zeromq/grc/zeromq_push_msg_sink.xml | 2 +-
gr-zeromq/grc/zeromq_push_sink.xml | 2 +-
gr-zeromq/grc/zeromq_rep_msg_sink.xml | 2 +-
gr-zeromq/grc/zeromq_rep_sink.xml | 2 +-
gr-zeromq/grc/zeromq_req_msg_source.xml | 2 +-
gr-zeromq/grc/zeromq_req_source.xml | 2 +-
gr-zeromq/grc/zeromq_sub_msg_source.xml | 2 +-
gr-zeromq/grc/zeromq_sub_source.xml | 2 +-
grc/blocks/block_tree.xml | 11 +++++------
grc/blocks/epy_block.xml | 1 -
grc/blocks/epy_module.xml | 1 -
grc/blocks/options.xml | 2 +-
grc/blocks/variable_struct.xml.py | 1 -
72 files changed, 75 insertions(+), 82 deletions(-)
diff --git a/gr-analog/grc/analog_block_tree.xml
b/gr-analog/grc/analog_block_tree.xml
index d08e646..64ccbdd 100644
--- a/gr-analog/grc/analog_block_tree.xml
+++ b/gr-analog/grc/analog_block_tree.xml
@@ -27,7 +27,7 @@
###################################################
-->
<cat>
- <name></name> <!-- Blank for Root Name -->
+ <name>[Core]</name>
<cat>
<name>Level Controllers</name>
<block>analog_agc_xx</block>
diff --git a/gr-audio/grc/audio_sink.xml b/gr-audio/grc/audio_sink.xml
index 727767b..9181055 100644
--- a/gr-audio/grc/audio_sink.xml
+++ b/gr-audio/grc/audio_sink.xml
@@ -7,7 +7,7 @@
<block>
<name>Audio Sink</name>
<key>audio_sink</key>
- <category>Audio</category>
+ <category>[Core]/Audio</category>
<flags>throttle</flags>
<import>from gnuradio import audio</import>
<make>audio.sink($samp_rate, $device_name, $ok_to_block)</make>
diff --git a/gr-audio/grc/audio_source.xml b/gr-audio/grc/audio_source.xml
index aaa3225..044b144 100644
--- a/gr-audio/grc/audio_source.xml
+++ b/gr-audio/grc/audio_source.xml
@@ -7,7 +7,7 @@
<block>
<name>Audio Source</name>
<key>audio_source</key>
- <category>Audio</category>
+ <category>[Core]/Audio</category>
<flags>throttle</flags>
<import>from gnuradio import audio</import>
<make>audio.source($samp_rate, $device_name, $ok_to_block)</make>
diff --git a/gr-blocks/grc/blks2_error_rate.xml
b/gr-blocks/grc/blks2_error_rate.xml
index 8be0182..c71739f 100644
--- a/gr-blocks/grc/blks2_error_rate.xml
+++ b/gr-blocks/grc/blks2_error_rate.xml
@@ -8,7 +8,7 @@
<block>
<name>Error Rate</name>
<key>blks2_error_rate</key>
- <category>Deprecated</category>
+ <category>[Core]/Deprecated</category>
<import>from grc_gnuradio import blks2 as grc_blks2</import>
<make>grc_blks2.error_rate(
type=$type,
diff --git a/gr-blocks/grc/blks2_selector.xml b/gr-blocks/grc/blks2_selector.xml
index 580fdd9..3442b2c 100644
--- a/gr-blocks/grc/blks2_selector.xml
+++ b/gr-blocks/grc/blks2_selector.xml
@@ -8,7 +8,7 @@
<block>
<name>Selector</name>
<key>blks2_selector</key>
- <category>Deprecated</category>
+ <category>[Core]/Deprecated</category>
<import>from grc_gnuradio import blks2 as grc_blks2</import>
<make>grc_blks2.selector(
item_size=$type.size*$vlen,
diff --git a/gr-blocks/grc/blks2_tcp_sink.xml b/gr-blocks/grc/blks2_tcp_sink.xml
index 46b10a7..2bff7e6 100644
--- a/gr-blocks/grc/blks2_tcp_sink.xml
+++ b/gr-blocks/grc/blks2_tcp_sink.xml
@@ -7,7 +7,7 @@
<block>
<name>TCP Sink</name>
<key>blks2_tcp_sink</key>
- <category>Deprecated</category>
+ <category>[Core]/Deprecated</category>
<import>from grc_gnuradio import blks2 as grc_blks2</import>
<make>grc_blks2.tcp_sink(
itemsize=$type.size*$vlen,
diff --git a/gr-blocks/grc/blks2_tcp_source.xml
b/gr-blocks/grc/blks2_tcp_source.xml
index 6a59522..f6cc410 100644
--- a/gr-blocks/grc/blks2_tcp_source.xml
+++ b/gr-blocks/grc/blks2_tcp_source.xml
@@ -7,7 +7,7 @@
<block>
<name>TCP Source</name>
<key>blks2_tcp_source</key>
- <category>Deprecated</category>
+ <category>[Core]/Deprecated</category>
<import>from grc_gnuradio import blks2 as grc_blks2</import>
<make>grc_blks2.tcp_source(
itemsize=$type.size*$vlen,
diff --git a/gr-blocks/grc/blks2_valve.xml b/gr-blocks/grc/blks2_valve.xml
index d879ff6..c3f2516 100644
--- a/gr-blocks/grc/blks2_valve.xml
+++ b/gr-blocks/grc/blks2_valve.xml
@@ -8,7 +8,7 @@
<block>
<name>Valve</name>
<key>blks2_valve</key>
- <category>Deprecated</category>
+ <category>[Core]/Deprecated</category>
<import>from grc_gnuradio import blks2 as grc_blks2</import>
<make>grc_blks2.valve(item_size=$type.size*$vlen,
open=bool($open))</make>
<callback>set_open(bool($open))</callback>
diff --git a/gr-blocks/grc/blocks_block_tree.xml
b/gr-blocks/grc/blocks_block_tree.xml
index bfab41a..a9441a9 100644
--- a/gr-blocks/grc/blocks_block_tree.xml
+++ b/gr-blocks/grc/blocks_block_tree.xml
@@ -27,7 +27,7 @@
###################################################
-->
<cat>
- <name></name> <!-- Blank for Root Name -->
+ <name>[Core]</name>
<cat>
<name>Audio</name>
<block>blocks_wavfile_source</block>
@@ -144,6 +144,8 @@
<block>blocks_null_sink</block>
<block>blocks_copy</block>
<block>blocks_nop</block>
+ <block>xmlrpc_server</block>
+ <block>xmlrpc_client</block>
</cat>
<cat>
<name>Modulators</name>
@@ -230,9 +232,4 @@
<name>Variables</name>
<block>variable_tag_object</block>
</cat>
- <cat>
- <name>Misc</name>
- <block>xmlrpc_server</block>
- <block>xmlrpc_client</block>
- </cat>
</cat>
diff --git a/gr-channels/grc/channels_block_tree.xml
b/gr-channels/grc/channels_block_tree.xml
index 383f4b1..00886e8 100644
--- a/gr-channels/grc/channels_block_tree.xml
+++ b/gr-channels/grc/channels_block_tree.xml
@@ -27,7 +27,7 @@
###################################################
-->
<cat>
- <name></name> <!-- Blank for Root Name -->
+ <name>[Core]</name>
<cat>
<name>Channel Models</name>
<block>channels_channel_model</block>
diff --git a/gr-digital/grc/blks2_packet_decoder.xml
b/gr-digital/grc/blks2_packet_decoder.xml
index 3b66f00..fedb2e7 100644
--- a/gr-digital/grc/blks2_packet_decoder.xml
+++ b/gr-digital/grc/blks2_packet_decoder.xml
@@ -7,7 +7,7 @@
<block>
<name>Packet Decoder</name>
<key>blks2_packet_decoder</key>
- <category>Deprecated</category>
+ <category>[Core]/Deprecated</category>
<flags>deprecated</flags>
<import>from grc_gnuradio import blks2 as grc_blks2</import>
<make>grc_blks2.packet_demod_$(type.fcn)(grc_blks2.packet_decoder(
diff --git a/gr-digital/grc/blks2_packet_encoder.xml
b/gr-digital/grc/blks2_packet_encoder.xml
index 75cb5ea..d030f6a 100644
--- a/gr-digital/grc/blks2_packet_encoder.xml
+++ b/gr-digital/grc/blks2_packet_encoder.xml
@@ -7,7 +7,7 @@
<block>
<name>Packet Encoder</name>
<key>blks2_packet_encoder</key>
- <category>Deprecated</category>
+ <category>[Core]/Deprecated</category>
<flags>deprecated</flags>
<import>from grc_gnuradio import blks2 as grc_blks2</import>
<make>grc_blks2.packet_mod_$(type.fcn)(grc_blks2.packet_encoder(
diff --git a/gr-digital/grc/digital_block_tree.xml
b/gr-digital/grc/digital_block_tree.xml
index 6707a8e..9bdf6e9 100644
--- a/gr-digital/grc/digital_block_tree.xml
+++ b/gr-digital/grc/digital_block_tree.xml
@@ -26,7 +26,7 @@
###################################################
-->
<cat>
- <name></name> <!-- Blank for Root Name -->
+ <name>[Core]</name>
<cat>
<name>Coding</name>
<block>digital_additive_scrambler_bb</block>
diff --git a/gr-digital/grc/digital_burst_shaper.xml
b/gr-digital/grc/digital_burst_shaper.xml
index 5c0bc78..95e1bcb 100644
--- a/gr-digital/grc/digital_burst_shaper.xml
+++ b/gr-digital/grc/digital_burst_shaper.xml
@@ -2,7 +2,7 @@
<block>
<name>Burst Shaper</name>
<key>digital_burst_shaper_xx</key>
- <category>Packet Operators</category>
+ <category>[Core]/Packet Operators</category>
<import>from gnuradio import digital</import>
<make>digital.burst_shaper_$(type.fcn)($window, $pre_padding,
$post_padding, $insert_phasing, $length_tag_name)</make>
<param>
diff --git a/gr-dtv/grc/dtv_block_tree.xml b/gr-dtv/grc/dtv_block_tree.xml
index fba3385..8dcbd18 100644
--- a/gr-dtv/grc/dtv_block_tree.xml
+++ b/gr-dtv/grc/dtv_block_tree.xml
@@ -27,7 +27,7 @@
###################################################
-->
<cat>
- <name></name> <!-- Blank for Root Name -->
+ <name>[Core]</name>
<cat>
<name>Digital Television</name>
<cat>
diff --git a/gr-fcd/grc/fcd_source_c.xml b/gr-fcd/grc/fcd_source_c.xml
index 01ea26d..b8975e4 100644
--- a/gr-fcd/grc/fcd_source_c.xml
+++ b/gr-fcd/grc/fcd_source_c.xml
@@ -2,7 +2,7 @@
<block>
<name>Funcube Dongle Source</name>
<key>fcd_source_c</key>
- <category>FCD</category>
+ <category>[Core]/FCD</category>
<flags>throttle</flags>
<import>from gnuradio import fcd</import>
<make>fcd.source_c($device_name)
diff --git a/gr-fec/grc/fec_block_tree.xml b/gr-fec/grc/fec_block_tree.xml
index 5efc144..b1535e3 100644
--- a/gr-fec/grc/fec_block_tree.xml
+++ b/gr-fec/grc/fec_block_tree.xml
@@ -5,7 +5,7 @@
###################################################
-->
<cat>
- <name></name> <!-- Blank for Root Name -->
+ <name>[Core]</name>
<cat>
<name>Error Coding</name>
<cat>
diff --git a/gr-fft/grc/fft_block_tree.xml b/gr-fft/grc/fft_block_tree.xml
index 7028ed1..e844d83 100644
--- a/gr-fft/grc/fft_block_tree.xml
+++ b/gr-fft/grc/fft_block_tree.xml
@@ -27,7 +27,7 @@
###################################################
-->
<cat>
- <name></name> <!-- Blank for Root Name -->
+ <name>[Core]</name> <!-- Blank for Root Name -->
<cat>
<name>Fourier Analysis</name>
<block>fft_vxx</block>
diff --git a/gr-filter/grc/filter_block_tree.xml
b/gr-filter/grc/filter_block_tree.xml
index ea869a7..3613df8 100644
--- a/gr-filter/grc/filter_block_tree.xml
+++ b/gr-filter/grc/filter_block_tree.xml
@@ -27,7 +27,7 @@
###################################################
-->
<cat>
- <name></name> <!-- Blank for Root Name -->
+ <name>[Core]</name>
<cat>
<name>Filters</name>
<!-- FIR filter tap generators -->
diff --git a/gr-noaa/grc/noaa_hrpt_decoder.xml
b/gr-noaa/grc/noaa_hrpt_decoder.xml
index 2d6e98c..c587415 100644
--- a/gr-noaa/grc/noaa_hrpt_decoder.xml
+++ b/gr-noaa/grc/noaa_hrpt_decoder.xml
@@ -2,7 +2,7 @@
<block>
<name>HRPT Decoder</name>
<key>noaa_hrpt_decoder</key>
- <category>NOAA</category>
+ <category>[Core]/NOAA</category>
<import>from gnuradio import noaa</import>
<make>noaa.hrpt_decoder($verbose,$output)</make>
diff --git a/gr-noaa/grc/noaa_hrpt_deframer.xml
b/gr-noaa/grc/noaa_hrpt_deframer.xml
index af36abf..fbb52f4 100644
--- a/gr-noaa/grc/noaa_hrpt_deframer.xml
+++ b/gr-noaa/grc/noaa_hrpt_deframer.xml
@@ -2,7 +2,7 @@
<block>
<name>HRPT Deframer</name>
<key>noaa_hrpt_deframer</key>
- <category>NOAA</category>
+ <category>[Core]/NOAA</category>
<import>from gnuradio import noaa</import>
<make>noaa.hrpt_deframer()</make>
<sink>
diff --git a/gr-noaa/grc/noaa_hrpt_pll_cf.xml b/gr-noaa/grc/noaa_hrpt_pll_cf.xml
index bbe15e8..a57d12e 100644
--- a/gr-noaa/grc/noaa_hrpt_pll_cf.xml
+++ b/gr-noaa/grc/noaa_hrpt_pll_cf.xml
@@ -2,7 +2,7 @@
<block>
<name>HRPT PLL</name>
<key>noaa_hrpt_pll_cf</key>
- <category>NOAA</category>
+ <category>[Core]/NOAA</category>
<import>from gnuradio import noaa</import>
<make>noaa.hrpt_pll_cf($alpha, $beta, $max_offset)</make>
<callback>set_alpha($alpha)</callback>
diff --git a/gr-pager/grc/pager_flex_deinterleave.xml
b/gr-pager/grc/pager_flex_deinterleave.xml
index 14e5782..a006023 100644
--- a/gr-pager/grc/pager_flex_deinterleave.xml
+++ b/gr-pager/grc/pager_flex_deinterleave.xml
@@ -7,7 +7,7 @@
<block>
<name>FLEX Deinterleave</name>
<key>pager_flex_deinterleave</key>
- <category>Pager</category>
+ <category>[Core]/Pager</category>
<import>from gnuradio import pager</import>
<make>pager.flex_deinterleave()</make>
diff --git a/gr-pager/grc/pager_flex_sync.xml b/gr-pager/grc/pager_flex_sync.xml
index ec22321..d37a4fb 100644
--- a/gr-pager/grc/pager_flex_sync.xml
+++ b/gr-pager/grc/pager_flex_sync.xml
@@ -7,7 +7,7 @@
<block>
<name>FLEX Synchronizer</name>
<key>pager_flex_sync</key>
- <category>Pager</category>
+ <category>[Core]/Pager</category>
<import>from gnuradio import pager</import>
<make>pager.flex_sync()</make>
diff --git a/gr-pager/grc/pager_slicer_fb.xml b/gr-pager/grc/pager_slicer_fb.xml
index 25642cb..f3e95e0 100644
--- a/gr-pager/grc/pager_slicer_fb.xml
+++ b/gr-pager/grc/pager_slicer_fb.xml
@@ -7,7 +7,7 @@
<block>
<name>4-Level Slicer/DCR</name>
<key>pager_slicer_fb</key>
- <category>Pager</category>
+ <category>[Core]/Pager</category>
<import>from gnuradio import pager</import>
<make>pager.slicer_fb($alpha)</make>
diff --git a/gr-qtgui/grc/qtgui_block_tree.xml
b/gr-qtgui/grc/qtgui_block_tree.xml
index 300c7a7..33fb12a 100644
--- a/gr-qtgui/grc/qtgui_block_tree.xml
+++ b/gr-qtgui/grc/qtgui_block_tree.xml
@@ -27,7 +27,7 @@
###################################################
-->
<cat>
- <name></name> <!-- Blank for Root Name -->
+ <name>[Core]</name>
<cat>
<name>Instrumentation</name>
<cat>
diff --git a/gr-trellis/grc/trellis_encoder_xx.xml
b/gr-trellis/grc/trellis_encoder_xx.xml
index d59903c..ab7d522 100644
--- a/gr-trellis/grc/trellis_encoder_xx.xml
+++ b/gr-trellis/grc/trellis_encoder_xx.xml
@@ -8,7 +8,7 @@
<block>
<name>Trellis Encoder</name>
<key>trellis_encoder_xx</key>
- <category>Trellis Coding</category>
+ <category>[Core]/Trellis Coding</category>
<import>from gnuradio import trellis</import>
<make> trellis.encoder_$(type)(trellis.fsm($fsm_args), $init_state,
$blocklength) if $blockwise else
trellis.encoder_$(type)(trellis.fsm($fsm_args), $init_state) </make>
<callback>set_FSM(trellis.fsm($fsm_args))</callback>
diff --git a/gr-trellis/grc/trellis_metrics_x.xml
b/gr-trellis/grc/trellis_metrics_x.xml
index 8bb978f..15e7338 100644
--- a/gr-trellis/grc/trellis_metrics_x.xml
+++ b/gr-trellis/grc/trellis_metrics_x.xml
@@ -9,7 +9,7 @@
<block>
<name>Trellis Metrics</name>
<key>trellis_metrics_x</key>
- <category>Trellis Coding</category>
+ <category>[Core]/Trellis Coding</category>
<import>from gnuradio import trellis, digital</import>
<make>trellis.metrics_$(type)($card, $dim, $table, $metric_type)</make>
<callback>set_O($card)</callback>
diff --git a/gr-trellis/grc/trellis_pccc_decoder_combined_xx.xml
b/gr-trellis/grc/trellis_pccc_decoder_combined_xx.xml
index ff727fb..7bb38db 100644
--- a/gr-trellis/grc/trellis_pccc_decoder_combined_xx.xml
+++ b/gr-trellis/grc/trellis_pccc_decoder_combined_xx.xml
@@ -9,7 +9,7 @@
<block>
<name>PCCC Decoder Combo</name>
<key>trellis_pccc_decoder_combined_xx</key>
- <category>Trellis Coding</category>
+ <category>[Core]/Trellis Coding</category>
<import>from gnuradio import trellis, digital</import>
<make>trellis.pccc_decoder_combined_$(type)$(out_type)(
trellis.fsm($o_fsm_args), $o_init_state, $o_final_state,
diff --git a/gr-trellis/grc/trellis_pccc_decoder_x.xml
b/gr-trellis/grc/trellis_pccc_decoder_x.xml
index 81f4282..08d1f52 100644
--- a/gr-trellis/grc/trellis_pccc_decoder_x.xml
+++ b/gr-trellis/grc/trellis_pccc_decoder_x.xml
@@ -9,7 +9,7 @@
<block>
<name>PCCC Decoder</name>
<key>trellis_pccc_decoder_x</key>
- <category>Trellis Coding</category>
+ <category>[Core]/Trellis Coding</category>
<import>from gnuradio import trellis</import>
<make>trellis.pccc_decoder_$(out_type)(
trellis.fsm($o_fsm_args), $o_init_state, $o_final_state,
diff --git a/gr-trellis/grc/trellis_pccc_encoder_xx.xml
b/gr-trellis/grc/trellis_pccc_encoder_xx.xml
index faaa0c1..85348e6 100644
--- a/gr-trellis/grc/trellis_pccc_encoder_xx.xml
+++ b/gr-trellis/grc/trellis_pccc_encoder_xx.xml
@@ -8,7 +8,7 @@
<block>
<name>PCCC Encoder</name>
<key>trellis_pccc_encoder_xx</key>
- <category>Trellis Coding</category>
+ <category>[Core]/Trellis Coding</category>
<import>from gnuradio import trellis</import>
<make>trellis.pccc_encoder_$(type)(trellis.fsm($o_fsm_args), $o_init_state,
trellis.fsm($i_fsm_args), $i_init_state,
trellis.interleaver($interleaver_args), $bl)</make>
<param>
diff --git a/gr-trellis/grc/trellis_permutation.xml
b/gr-trellis/grc/trellis_permutation.xml
index 0f118e8..99eb2d2 100644
--- a/gr-trellis/grc/trellis_permutation.xml
+++ b/gr-trellis/grc/trellis_permutation.xml
@@ -9,7 +9,7 @@
<block>
<name>Trellis Permutation</name>
<key>trellis_permutation</key>
- <category>Trellis Coding</category>
+ <category>[Core]/Trellis Coding</category>
<import>from gnuradio import trellis</import>
<make>trellis.permutation($interleaver_size, $table, $syms_per_block,
$type.size*$vlen)</make>
<callback>set_K($interleaver_size)</callback>
diff --git a/gr-trellis/grc/trellis_sccc_decoder_combined_xx.xml
b/gr-trellis/grc/trellis_sccc_decoder_combined_xx.xml
index 4947376..79be0b8 100644
--- a/gr-trellis/grc/trellis_sccc_decoder_combined_xx.xml
+++ b/gr-trellis/grc/trellis_sccc_decoder_combined_xx.xml
@@ -9,7 +9,7 @@
<block>
<name>SCCC Decoder Combo</name>
<key>trellis_sccc_decoder_combined_xx</key>
- <category>Trellis Coding</category>
+ <category>[Core]/Trellis Coding</category>
<import>from gnuradio import trellis, digital</import>
<make>trellis.sccc_decoder_combined_$(type)$(out_type)(
trellis.fsm($o_fsm_args), $o_init_state, $o_final_state,
diff --git a/gr-trellis/grc/trellis_sccc_decoder_x.xml
b/gr-trellis/grc/trellis_sccc_decoder_x.xml
index 38348cb..584ff0b 100644
--- a/gr-trellis/grc/trellis_sccc_decoder_x.xml
+++ b/gr-trellis/grc/trellis_sccc_decoder_x.xml
@@ -9,7 +9,7 @@
<block>
<name>SCCC Decoder</name>
<key>trellis_sccc_decoder_x</key>
- <category>Trellis Coding</category>
+ <category>[Core]/Trellis Coding</category>
<import>from gnuradio import trellis</import>
<make>trellis.sccc_decoder_$(out_type)(
trellis.fsm($o_fsm_args), $o_init_state, $o_final_state,
diff --git a/gr-trellis/grc/trellis_sccc_encoder_xx.xml
b/gr-trellis/grc/trellis_sccc_encoder_xx.xml
index a87db79..7b4ab30 100644
--- a/gr-trellis/grc/trellis_sccc_encoder_xx.xml
+++ b/gr-trellis/grc/trellis_sccc_encoder_xx.xml
@@ -8,7 +8,7 @@
<block>
<name>SCCC Encoder</name>
<key>trellis_sccc_encoder_xx</key>
- <category>Trellis Coding</category>
+ <category>[Core]/Trellis Coding</category>
<import>from gnuradio import trellis</import>
<make>trellis.sccc_encoder_$(type)(trellis.fsm($o_fsm_args), $o_init_state,
trellis.fsm($i_fsm_args), $i_init_state,
trellis.interleaver($interleaver_args), $bl)</make>
<param>
diff --git a/gr-trellis/grc/trellis_siso_combined_f.xml
b/gr-trellis/grc/trellis_siso_combined_f.xml
index 542bba6..f8ec9c2 100644
--- a/gr-trellis/grc/trellis_siso_combined_f.xml
+++ b/gr-trellis/grc/trellis_siso_combined_f.xml
@@ -9,7 +9,7 @@
<block>
<name>SISO Combo</name>
<key>trellis_siso_combined_f</key>
- <category>Trellis Coding</category>
+ <category>[Core]/Trellis Coding</category>
<import>from gnuradio import trellis</import>
<make>trellis.siso_combined_f(trellis.fsm($fsm_args), $block_size,
$init_state, $final_state, $a_post_in, $a_post_out, $siso_type, $dim, $table,
$metric_type)</make>
<callback>set_FSM(trellis.fsm($fsm_args))</callback>
diff --git a/gr-trellis/grc/trellis_siso_f.xml
b/gr-trellis/grc/trellis_siso_f.xml
index 30849d2..e121643 100644
--- a/gr-trellis/grc/trellis_siso_f.xml
+++ b/gr-trellis/grc/trellis_siso_f.xml
@@ -9,7 +9,7 @@
<block>
<name>SISO</name>
<key>trellis_siso_f</key>
- <category>Trellis Coding</category>
+ <category>[Core]/Trellis Coding</category>
<import>from gnuradio import trellis</import>
<make>trellis.siso_f(trellis.fsm($fsm_args), $block_size, $init_state,
$final_state, $a_post_in, $a_post_out, $siso_type)</make>
<callback>set_FSM(trellis.fsm($fsm_args))</callback>
diff --git a/gr-trellis/grc/trellis_viterbi_combined_xx.xml
b/gr-trellis/grc/trellis_viterbi_combined_xx.xml
index 9c755dc..a52e5ed 100644
--- a/gr-trellis/grc/trellis_viterbi_combined_xx.xml
+++ b/gr-trellis/grc/trellis_viterbi_combined_xx.xml
@@ -9,7 +9,7 @@
<block>
<name>Viterbi Combo</name>
<key>trellis_viterbi_combined_xx</key>
- <category>Trellis Coding</category>
+ <category>[Core]/Trellis Coding</category>
<import>from gnuradio import trellis, digital</import>
<make>trellis.viterbi_combined_$(type)$(out_type)(trellis.fsm($fsm_args),
$block_size, $init_state, $final_state, $dim, $table, $metric_type)</make>
<callback>set_FSM(trellis.fsm($fsm_args))</callback>
diff --git a/gr-trellis/grc/trellis_viterbi_x.xml
b/gr-trellis/grc/trellis_viterbi_x.xml
index 9083061..21611ee 100644
--- a/gr-trellis/grc/trellis_viterbi_x.xml
+++ b/gr-trellis/grc/trellis_viterbi_x.xml
@@ -9,7 +9,7 @@
<block>
<name>Viterbi</name>
<key>trellis_viterbi_x</key>
- <category>Trellis Coding</category>
+ <category>[Core]/Trellis Coding</category>
<import>from gnuradio import trellis</import>
<make>trellis.viterbi_$(type)(trellis.fsm($fsm_args), $block_size,
$init_state, $final_state)</make>
<callback>set_FSM(trellis.fsm($fsm_args))</callback>
diff --git a/gr-uhd/grc/uhd_block_tree.xml b/gr-uhd/grc/uhd_block_tree.xml
index 5d3b493..c598645 100644
--- a/gr-uhd/grc/uhd_block_tree.xml
+++ b/gr-uhd/grc/uhd_block_tree.xml
@@ -5,7 +5,7 @@
###################################################
-->
<cat>
- <name></name> <!-- Blank for Root Name -->
+ <name>[Core]</name> <!-- Blank for Root Name -->
<cat>
<name>UHD</name>
<block>uhd_usrp_source</block>
diff --git a/gr-video-sdl/grc/video_block_tree.xml
b/gr-video-sdl/grc/video_block_tree.xml
index 442c68a..f4f3e41 100644
--- a/gr-video-sdl/grc/video_block_tree.xml
+++ b/gr-video-sdl/grc/video_block_tree.xml
@@ -5,7 +5,7 @@
###################################################
-->
<cat>
- <name></name> <!-- Blank for Root Name -->
+ <name>[Core]</name>
<cat>
<name>Video</name>
<block>video_sdl_sink</block>
diff --git a/gr-vocoder/grc/vocoder_block_tree.xml
b/gr-vocoder/grc/vocoder_block_tree.xml
index c96a5cc..07d8ba8 100644
--- a/gr-vocoder/grc/vocoder_block_tree.xml
+++ b/gr-vocoder/grc/vocoder_block_tree.xml
@@ -27,7 +27,7 @@
###################################################
-->
<cat>
- <name></name> <!-- Blank for Root Name -->
+ <name>[Core]</name>
<cat>
<name>Audio</name>
<block>vocoder_alaw_decode_bs</block>
diff --git a/gr-wxgui/grc/notebook.xml b/gr-wxgui/grc/notebook.xml
index 5f30c06..1e4b0d0 100644
--- a/gr-wxgui/grc/notebook.xml
+++ b/gr-wxgui/grc/notebook.xml
@@ -7,7 +7,7 @@
<block>
<name>WX GUI Notebook</name>
<key>notebook</key>
- <category>GUI Widgets/WX</category>
+ <category>[Core]/GUI Widgets/WX</category>
<import>from grc_gnuradio import wxgui as grc_wxgui</import>
<make>#set $parent = $notebook() and 'self.%s.GetPage(%s)'%$notebook()
or 'self'
self.$(id) = wx.Notebook($(parent).GetWin(), style=$style)
diff --git a/gr-wxgui/grc/variable_check_box.xml
b/gr-wxgui/grc/variable_check_box.xml
index 75dae78..da8bb8b 100644
--- a/gr-wxgui/grc/variable_check_box.xml
+++ b/gr-wxgui/grc/variable_check_box.xml
@@ -8,7 +8,7 @@
<block>
<name>WX GUI Check Box</name>
<key>variable_check_box</key>
- <category>GUI Widgets/WX</category>
+ <category>[Core]/GUI Widgets/WX</category>
<import>from gnuradio.wxgui import forms</import>
<var_make>self.$(id) = $(id) = $value</var_make>
<make>#set $parent = $notebook() and 'self.%s.GetPage(%s)'%$notebook()
or 'self'
diff --git a/gr-wxgui/grc/variable_chooser.xml
b/gr-wxgui/grc/variable_chooser.xml
index ef75a04..216be01 100644
--- a/gr-wxgui/grc/variable_chooser.xml
+++ b/gr-wxgui/grc/variable_chooser.xml
@@ -9,7 +9,7 @@
<block>
<name>WX GUI Chooser</name>
<key>variable_chooser</key>
- <category>GUI Widgets/WX</category>
+ <category>[Core]/GUI Widgets/WX</category>
<import>from gnuradio.wxgui import forms</import>
<var_make>self.$(id) = $(id) = $value</var_make>
<make>#set $parent = $notebook() and 'self.%s.GetPage(%s)'%$notebook()
or 'self'
diff --git a/gr-wxgui/grc/variable_slider.xml b/gr-wxgui/grc/variable_slider.xml
index 96c0b5e..29f3182 100644
--- a/gr-wxgui/grc/variable_slider.xml
+++ b/gr-wxgui/grc/variable_slider.xml
@@ -8,7 +8,7 @@
<block>
<name>WX GUI Slider</name>
<key>variable_slider</key>
- <category>GUI Widgets/WX</category>
+ <category>[Core]/GUI Widgets/WX</category>
<import>from gnuradio.wxgui import forms</import>
<var_make>self.$(id) = $(id) = $value</var_make>
<make>#set $parent = $notebook() and 'self.%s.GetPage(%s)'%$notebook()
or 'self'
diff --git a/gr-wxgui/grc/variable_static_text.xml
b/gr-wxgui/grc/variable_static_text.xml
index d68b00a..e47f5c3 100644
--- a/gr-wxgui/grc/variable_static_text.xml
+++ b/gr-wxgui/grc/variable_static_text.xml
@@ -8,7 +8,7 @@
<block>
<name>WX GUI Static Text</name>
<key>variable_static_text</key>
- <category>GUI Widgets/WX</category>
+ <category>[Core]/GUI Widgets/WX</category>
<import>from gnuradio.wxgui import forms</import>
<var_make>self.$(id) = $(id) = $value</var_make>
<make>#set $parent = $notebook() and 'self.%s.GetPage(%s)'%$notebook()
or 'self'
diff --git a/gr-wxgui/grc/variable_text_box.xml
b/gr-wxgui/grc/variable_text_box.xml
index a2cf1a8..8c81194 100644
--- a/gr-wxgui/grc/variable_text_box.xml
+++ b/gr-wxgui/grc/variable_text_box.xml
@@ -8,7 +8,7 @@
<block>
<name>WX GUI Text Box</name>
<key>variable_text_box</key>
- <category>GUI Widgets/WX</category>
+ <category>[Core]/GUI Widgets/WX</category>
<import>from gnuradio.wxgui import forms</import>
<var_make>self.$(id) = $(id) = $value</var_make>
<make>#set $parent = $notebook() and 'self.%s.GetPage(%s)'%$notebook()
or 'self'
diff --git a/gr-wxgui/grc/wxgui_constellationsink2.xml
b/gr-wxgui/grc/wxgui_constellationsink2.xml
index d0314ca..999ebbe 100644
--- a/gr-wxgui/grc/wxgui_constellationsink2.xml
+++ b/gr-wxgui/grc/wxgui_constellationsink2.xml
@@ -7,7 +7,7 @@
<block>
<name>WX GUI Constellation Sink</name>
<key>wxgui_constellationsink2</key>
- <category>Instrumentation/WX</category>
+ <category>[Core]/Instrumentation/WX</category>
<import>from gnuradio.wxgui import constsink_gl</import>
<import>from gnuradio import wxgui</import>
<make>#set $parent = $notebook() and 'self.%s.GetPage(%s)'%$notebook()
or 'self'
diff --git a/gr-wxgui/grc/wxgui_fftsink2.xml b/gr-wxgui/grc/wxgui_fftsink2.xml
index 5f82670..11e9c72 100644
--- a/gr-wxgui/grc/wxgui_fftsink2.xml
+++ b/gr-wxgui/grc/wxgui_fftsink2.xml
@@ -7,7 +7,7 @@
<block>
<name>WX GUI FFT Sink</name>
<key>wxgui_fftsink2</key>
- <category>Instrumentation/WX</category>
+ <category>[Core]/Instrumentation/WX</category>
<import>from gnuradio.fft import window</import>
<import>from gnuradio.wxgui import fftsink2</import>
<import>from gnuradio import wxgui</import>
diff --git a/gr-wxgui/grc/wxgui_histosink2.xml
b/gr-wxgui/grc/wxgui_histosink2.xml
index 4fc331a..63bfc00 100644
--- a/gr-wxgui/grc/wxgui_histosink2.xml
+++ b/gr-wxgui/grc/wxgui_histosink2.xml
@@ -7,7 +7,7 @@
<block>
<name>WX GUI Histo Sink</name>
<key>wxgui_histosink2</key>
- <category>Instrumentation/WX</category>
+ <category>[Core]/Instrumentation/WX</category>
<import>from gnuradio.wxgui import histosink_gl</import>
<import>from gnuradio import wxgui</import>
<make>#set $parent = $notebook() and 'self.%s.GetPage(%s)'%$notebook()
or 'self'
diff --git a/gr-wxgui/grc/wxgui_numbersink2.xml
b/gr-wxgui/grc/wxgui_numbersink2.xml
index 4697164..6f4d4a5 100644
--- a/gr-wxgui/grc/wxgui_numbersink2.xml
+++ b/gr-wxgui/grc/wxgui_numbersink2.xml
@@ -7,7 +7,7 @@
<block>
<name>WX GUI Number Sink</name>
<key>wxgui_numbersink2</key>
- <category>Instrumentation/WX</category>
+ <category>[Core]/Instrumentation/WX</category>
<import>from gnuradio.wxgui import numbersink2</import>
<import>from gnuradio import wxgui</import>
<make>#set $parent = $notebook() and 'self.%s.GetPage(%s)'%$notebook()
or 'self'
diff --git a/gr-wxgui/grc/wxgui_scopesink2.xml
b/gr-wxgui/grc/wxgui_scopesink2.xml
index ea43d3a..7e89689 100644
--- a/gr-wxgui/grc/wxgui_scopesink2.xml
+++ b/gr-wxgui/grc/wxgui_scopesink2.xml
@@ -7,7 +7,7 @@
<block>
<name>WX GUI Scope Sink</name>
<key>wxgui_scopesink2</key>
- <category>Instrumentation/WX</category>
+ <category>[Core]/Instrumentation/WX</category>
<import>from gnuradio.wxgui import scopesink2</import>
<import>from gnuradio import wxgui</import>
<make>#set $parent = $notebook() and 'self.%s.GetPage(%s)'%$notebook()
or 'self'
diff --git a/gr-wxgui/grc/wxgui_termsink.xml b/gr-wxgui/grc/wxgui_termsink.xml
index 1367f4a..54fedde 100644
--- a/gr-wxgui/grc/wxgui_termsink.xml
+++ b/gr-wxgui/grc/wxgui_termsink.xml
@@ -7,7 +7,7 @@
<block>
<name>WX GUI Terminal Sink</name>
<key>wxgui_termsink</key>
- <category>Instrumentation/WX</category>
+ <category>[Core]/Instrumentation/WX</category>
<import>from gnuradio.wxgui import termsink</import>
<import>from gnuradio import wxgui</import>
diff --git a/gr-wxgui/grc/wxgui_waterfallsink2.xml
b/gr-wxgui/grc/wxgui_waterfallsink2.xml
index bee28f2..5b56f98 100644
--- a/gr-wxgui/grc/wxgui_waterfallsink2.xml
+++ b/gr-wxgui/grc/wxgui_waterfallsink2.xml
@@ -7,7 +7,7 @@
<block>
<name>WX GUI Waterfall Sink</name>
<key>wxgui_waterfallsink2</key>
- <category>Instrumentation/WX</category>
+ <category>[Core]/Instrumentation/WX</category>
<import>from gnuradio.fft import window</import>
<import>from gnuradio.wxgui import waterfallsink2</import>
<import>from gnuradio import wxgui</import>
diff --git a/gr-zeromq/grc/zeromq_pub_msg_sink.xml
b/gr-zeromq/grc/zeromq_pub_msg_sink.xml
index 8f541ce..245ac37 100644
--- a/gr-zeromq/grc/zeromq_pub_msg_sink.xml
+++ b/gr-zeromq/grc/zeromq_pub_msg_sink.xml
@@ -2,7 +2,7 @@
<block>
<name>ZMQ PUB Message Sink</name>
<key>zeromq_pub_msg_sink</key>
- <category>ZeroMQ Interfaces</category>
+ <category>[Core]/ZeroMQ Interfaces</category>
<import>from gnuradio import zeromq</import>
<make>zeromq.pub_msg_sink($address, $timeout)</make>
diff --git a/gr-zeromq/grc/zeromq_pub_sink.xml
b/gr-zeromq/grc/zeromq_pub_sink.xml
index 1b2f9ec..af130ee 100644
--- a/gr-zeromq/grc/zeromq_pub_sink.xml
+++ b/gr-zeromq/grc/zeromq_pub_sink.xml
@@ -2,7 +2,7 @@
<block>
<name>ZMQ PUB Sink</name>
<key>zeromq_pub_sink</key>
- <category>ZeroMQ Interfaces</category>
+ <category>[Core]/ZeroMQ Interfaces</category>
<import>from gnuradio import zeromq</import>
<make>zeromq.pub_sink($type.itemsize, $vlen, $address, $timeout, $pass_tags,
$hwm)</make>
diff --git a/gr-zeromq/grc/zeromq_pull_msg_source.xml
b/gr-zeromq/grc/zeromq_pull_msg_source.xml
index c0a6ca5..c6004d9 100644
--- a/gr-zeromq/grc/zeromq_pull_msg_source.xml
+++ b/gr-zeromq/grc/zeromq_pull_msg_source.xml
@@ -2,7 +2,7 @@
<block>
<name>ZMQ PULL Message Source</name>
<key>zeromq_pull_msg_source</key>
- <category>ZeroMQ Interfaces</category>
+ <category>[Core]/ZeroMQ Interfaces</category>
<import>from gnuradio import zeromq</import>
<make>zeromq.pull_msg_source($address, $timeout)</make>
diff --git a/gr-zeromq/grc/zeromq_pull_source.xml
b/gr-zeromq/grc/zeromq_pull_source.xml
index 8158b47..f2c8b61 100644
--- a/gr-zeromq/grc/zeromq_pull_source.xml
+++ b/gr-zeromq/grc/zeromq_pull_source.xml
@@ -2,7 +2,7 @@
<block>
<name>ZMQ PULL Source</name>
<key>zeromq_pull_source</key>
- <category>ZeroMQ Interfaces</category>
+ <category>[Core]/ZeroMQ Interfaces</category>
<import>from gnuradio import zeromq</import>
<make>zeromq.pull_source($type.itemsize, $vlen, $address, $timeout,
$pass_tags, $hwm)</make>
diff --git a/gr-zeromq/grc/zeromq_push_msg_sink.xml
b/gr-zeromq/grc/zeromq_push_msg_sink.xml
index 65626c0..283a250 100644
--- a/gr-zeromq/grc/zeromq_push_msg_sink.xml
+++ b/gr-zeromq/grc/zeromq_push_msg_sink.xml
@@ -2,7 +2,7 @@
<block>
<name>ZMQ PUSH Message Sink</name>
<key>zeromq_push_msg_sink</key>
- <category>ZeroMQ Interfaces</category>
+ <category>[Core]/ZeroMQ Interfaces</category>
<import>from gnuradio import zeromq</import>
<make>zeromq.push_msg_sink($address, $timeout)</make>
diff --git a/gr-zeromq/grc/zeromq_push_sink.xml
b/gr-zeromq/grc/zeromq_push_sink.xml
index 528da94..8277c02 100644
--- a/gr-zeromq/grc/zeromq_push_sink.xml
+++ b/gr-zeromq/grc/zeromq_push_sink.xml
@@ -2,7 +2,7 @@
<block>
<name>ZMQ PUSH Sink</name>
<key>zeromq_push_sink</key>
- <category>ZeroMQ Interfaces</category>
+ <category>[Core]/ZeroMQ Interfaces</category>
<import>from gnuradio import zeromq</import>
<make>zeromq.push_sink($type.itemsize, $vlen, $address, $timeout,
$pass_tags, $hwm)</make>
diff --git a/gr-zeromq/grc/zeromq_rep_msg_sink.xml
b/gr-zeromq/grc/zeromq_rep_msg_sink.xml
index f978f44..37515b3 100644
--- a/gr-zeromq/grc/zeromq_rep_msg_sink.xml
+++ b/gr-zeromq/grc/zeromq_rep_msg_sink.xml
@@ -2,7 +2,7 @@
<block>
<name>ZMQ REP Message Sink</name>
<key>zeromq_rep_msg_sink</key>
- <category>ZeroMQ Interfaces</category>
+ <category>[Core]/ZeroMQ Interfaces</category>
<import>from gnuradio import zeromq</import>
<make>zeromq.rep_msg_sink($address, $timeout)</make>
diff --git a/gr-zeromq/grc/zeromq_rep_sink.xml
b/gr-zeromq/grc/zeromq_rep_sink.xml
index db735a3..17c8241 100644
--- a/gr-zeromq/grc/zeromq_rep_sink.xml
+++ b/gr-zeromq/grc/zeromq_rep_sink.xml
@@ -2,7 +2,7 @@
<block>
<name>ZMQ REP Sink</name>
<key>zeromq_rep_sink</key>
- <category>ZeroMQ Interfaces</category>
+ <category>[Core]/ZeroMQ Interfaces</category>
<import>from gnuradio import zeromq</import>
<make>zeromq.rep_sink($type.itemsize, $vlen, $address, $timeout, $pass_tags,
$hwm)</make>
diff --git a/gr-zeromq/grc/zeromq_req_msg_source.xml
b/gr-zeromq/grc/zeromq_req_msg_source.xml
index 3ba7488..ae34c30 100644
--- a/gr-zeromq/grc/zeromq_req_msg_source.xml
+++ b/gr-zeromq/grc/zeromq_req_msg_source.xml
@@ -2,7 +2,7 @@
<block>
<name>ZMQ REQ Message Source</name>
<key>zeromq_req_msg_source</key>
- <category>ZeroMQ Interfaces</category>
+ <category>[Core]/ZeroMQ Interfaces</category>
<import>from gnuradio import zeromq</import>
<make>zeromq.req_msg_source($address, $timeout)</make>
diff --git a/gr-zeromq/grc/zeromq_req_source.xml
b/gr-zeromq/grc/zeromq_req_source.xml
index 2ef2243..0fc1aa1 100644
--- a/gr-zeromq/grc/zeromq_req_source.xml
+++ b/gr-zeromq/grc/zeromq_req_source.xml
@@ -2,7 +2,7 @@
<block>
<name>ZMQ REQ Source</name>
<key>zeromq_req_source</key>
- <category>ZeroMQ Interfaces</category>
+ <category>[Core]/ZeroMQ Interfaces</category>
<import>from gnuradio import zeromq</import>
<make>zeromq.req_source($type.itemsize, $vlen, $address, $timeout,
$pass_tags, $hwm)</make>
diff --git a/gr-zeromq/grc/zeromq_sub_msg_source.xml
b/gr-zeromq/grc/zeromq_sub_msg_source.xml
index 32a1c98..475537f 100644
--- a/gr-zeromq/grc/zeromq_sub_msg_source.xml
+++ b/gr-zeromq/grc/zeromq_sub_msg_source.xml
@@ -2,7 +2,7 @@
<block>
<name>ZMQ SUB Message Source</name>
<key>zeromq_sub_msg_source</key>
- <category>ZeroMQ Interfaces</category>
+ <category>[Core]/ZeroMQ Interfaces</category>
<import>from gnuradio import zeromq</import>
<make>zeromq.sub_msg_source($address, $timeout)</make>
diff --git a/gr-zeromq/grc/zeromq_sub_source.xml
b/gr-zeromq/grc/zeromq_sub_source.xml
index 268a893..31e6170 100644
--- a/gr-zeromq/grc/zeromq_sub_source.xml
+++ b/gr-zeromq/grc/zeromq_sub_source.xml
@@ -2,7 +2,7 @@
<block>
<name>ZMQ SUB Source</name>
<key>zeromq_sub_source</key>
- <category>ZeroMQ Interfaces</category>
+ <category>[Core]/ZeroMQ Interfaces</category>
<import>from gnuradio import zeromq</import>
<make>zeromq.sub_source($type.itemsize, $vlen, $address, $timeout,
$pass_tags, $hwm)</make>
diff --git a/grc/blocks/block_tree.xml b/grc/blocks/block_tree.xml
index a8775d6..3125864 100644
--- a/grc/blocks/block_tree.xml
+++ b/grc/blocks/block_tree.xml
@@ -1,11 +1,6 @@
<?xml version="1.0"?>
-<!--
-###################################################
-##Block Tree for platform gnuradio python.
-###################################################
- -->
<cat>
- <name></name> <!-- Blank for Root Name -->
+ <name>[Core]</name>
<cat>
<name>Misc</name>
<block>pad_source</block>
@@ -18,12 +13,16 @@
<block>bus_structure_sink</block>
<block>bus_structure_source</block>
+ <block>epy_block</block>
+ <block>epy_module</block>
+
<block>note</block>
<block>import</block>
</cat>
<cat>
<name>Variables</name>
<block>variable</block>
+ <block>variable_struct</block>
<block>variable_config</block>
<block>variable_function_probe</block>
<block>parameter</block>
diff --git a/grc/blocks/epy_block.xml b/grc/blocks/epy_block.xml
index 3fd5aa8..65e78c4 100644
--- a/grc/blocks/epy_block.xml
+++ b/grc/blocks/epy_block.xml
@@ -2,7 +2,6 @@
<block>
<name>Python Block</name>
<key>epy_block</key>
- <category>Misc</category>
<import></import>
<make></make>
<param><!-- Cache the last working block IO to keep FG sane -->
diff --git a/grc/blocks/epy_module.xml b/grc/blocks/epy_module.xml
index 6d6d718..fa3e5f9 100644
--- a/grc/blocks/epy_module.xml
+++ b/grc/blocks/epy_module.xml
@@ -2,7 +2,6 @@
<block>
<name>Python Module</name>
<key>epy_module</key>
- <category>Misc</category>
<import>import $id # embedded python module</import>
<make></make>
<param>
diff --git a/grc/blocks/options.xml b/grc/blocks/options.xml
index 937cfe8..1dee986 100644
--- a/grc/blocks/options.xml
+++ b/grc/blocks/options.xml
@@ -84,7 +84,7 @@ else: self.stop(); self.wait()</callback>
<param>
<name>Category</name>
<key>category</key>
- <value>Custom</value>
+ <value>[GRC Hier Blocks]</value>
<type>string</type>
<hide>#if $generate_options().startswith('hb') then 'none' else
'all'#</hide>
</param>
diff --git a/grc/blocks/variable_struct.xml.py
b/grc/blocks/variable_struct.xml.py
index e432008..de4411e 100644
--- a/grc/blocks/variable_struct.xml.py
+++ b/grc/blocks/variable_struct.xml.py
@@ -6,7 +6,6 @@ HEADER = """\
<block>
<name>Struct Variable</name>
<key>variable_struct</key>
- <category>Variables</category>
<import>def struct(data): return type('Struct', (object,), data)()</import>
<var_make>self.$id = $id = struct({{#slurp
#for $i in range({0}):