diff options
| author | Josh Blum | 2013-02-17 16:46:08 -0800 |
|---|---|---|
| committer | Josh Blum | 2013-02-17 16:46:08 -0800 |
| commit | 7839db580435ad0d39f307bde185dfdcda01ec12 (patch) | |
| tree | 7c15be4cb502d65f808d390abd24e7b388b7c4e0 /grc | |
| parent | bc8bbc71f799ea81e38104ff9d943a5eab1e203c (diff) | |
| parent | 0dcdc099ecbb01e72b0c5935437f154e47763055 (diff) | |
| download | gnuradio-7839db580435ad0d39f307bde185dfdcda01ec12.tar.gz gnuradio-7839db580435ad0d39f307bde185dfdcda01ec12.tar.bz2 gnuradio-7839db580435ad0d39f307bde185dfdcda01ec12.zip | |
Merge branch 'maint' into v3.6.4git_gras_support
Diffstat (limited to 'grc')
| -rw-r--r-- | grc/CMakeLists.txt | 8 | ||||
| -rw-r--r-- | grc/blocks/gr_message_debug.xml | 2 | ||||
| -rw-r--r-- | grc/blocks/gr_pdu_to_tagged_stream.xml | 6 | ||||
| -rw-r--r-- | grc/blocks/gr_tagged_stream_to_pdu.xml | 6 | ||||
| -rw-r--r-- | grc/gui/FlowGraph.py | 5 |
5 files changed, 15 insertions, 12 deletions
diff --git a/grc/CMakeLists.txt b/grc/CMakeLists.txt index 219bbe164..1156f1d76 100644 --- a/grc/CMakeLists.txt +++ b/grc/CMakeLists.txt @@ -1,4 +1,4 @@ -# Copyright 2011 Free Software Foundation, Inc. +# Copyright 2011,2013 Free Software Foundation, Inc. # # This file is part of GNU Radio # @@ -100,13 +100,15 @@ file(TO_NATIVE_PATH ${GR_PYTHON_DIR} GR_PYTHON_POSTFIX) string(REPLACE "\\" "\\\\" GR_PYTHON_POSTFIX ${GR_PYTHON_POSTFIX}) CPACK_SET(CPACK_NSIS_EXTRA_INSTALL_COMMANDS "${CPACK_NSIS_EXTRA_INSTALL_COMMANDS} + #!include \\\"winmessages.nsh\\\" WriteRegStr HKLM ${HLKM_ENV} \\\"GRC_BLOCKS_PATH\\\" \\\"$INSTDIR\\\\${GRC_BLOCKS_PATH}\\\" - WriteRegStr HKLM \\\"SOFTWARE\\\\Python\\\\PythonCore\\\\2.7\\\\PythonPath\\\" \\\"gnuradio\\\" \\\"$INSTDIR\\\\${GR_PYTHON_POSTFIX}\\\" + SendMessage \\\${HWND_BROADCAST} \\\${WM_WININICHANGE} 0 \\\"STR:Environment\\\" /TIMEOUT=5000 ") CPACK_SET(CPACK_NSIS_EXTRA_UNINSTALL_COMMANDS "${CPACK_NSIS_EXTRA_UNINSTALL_COMMANDS} + #!include \\\"winmessages.nsh\\\" DeleteRegValue HKLM ${HLKM_ENV} \\\"GRC_BLOCKS_PATH\\\" - DeleteRegValue HKLM \\\"SOFTWARE\\\\Python\\\\PythonCore\\\\2.7\\\\PythonPath\\\" \\\"gnuradio\\\" + SendMessage \\\${HWND_BROADCAST} \\\${WM_WININICHANGE} 0 \\\"STR:Environment\\\" /TIMEOUT=5000 ") endif(WIN32) diff --git a/grc/blocks/gr_message_debug.xml b/grc/blocks/gr_message_debug.xml index 4d73fbd9c..964f95756 100644 --- a/grc/blocks/gr_message_debug.xml +++ b/grc/blocks/gr_message_debug.xml @@ -20,7 +20,7 @@ <optional>1</optional> </sink> <sink> - <name>print_pdu_verbose</name> + <name>print_pdu</name> <type>message</type> <optional>1</optional> </sink> diff --git a/grc/blocks/gr_pdu_to_tagged_stream.xml b/grc/blocks/gr_pdu_to_tagged_stream.xml index fc1c4d16a..6d2fea97e 100644 --- a/grc/blocks/gr_pdu_to_tagged_stream.xml +++ b/grc/blocks/gr_pdu_to_tagged_stream.xml @@ -16,17 +16,17 @@ <option> <name>Byte</name> <key>byte</key> - <opt>tv:gr.BYTE</opt> + <opt>tv:gr.pdu_byte</opt> </option> <option> <name>Complex</name> <key>complex</key> - <opt>tv:gr.COMPLEX</opt> + <opt>tv:gr.pdu_complex</opt> </option> <option> <name>Float</name> <key>float</key> - <opt>tv:gr.FLOAT</opt> + <opt>tv:gr.pdu_float</opt> </option> </param> <sink> diff --git a/grc/blocks/gr_tagged_stream_to_pdu.xml b/grc/blocks/gr_tagged_stream_to_pdu.xml index e70a01608..e2f754c9e 100644 --- a/grc/blocks/gr_tagged_stream_to_pdu.xml +++ b/grc/blocks/gr_tagged_stream_to_pdu.xml @@ -16,17 +16,17 @@ <option> <name>Byte</name> <key>byte</key> - <opt>tv:gr.BYTE</opt> + <opt>tv:gr.pdu_byte</opt> </option> <option> <name>Complex</name> <key>complex</key> - <opt>tv:gr.COMPLEX</opt> + <opt>tv:gr.pdu_complex</opt> </option> <option> <name>Float</name> <key>float</key> - <opt>tv:gr.FLOAT</opt> + <opt>tv:gr.pdu_float</opt> </option> </param> <sink> diff --git a/grc/gui/FlowGraph.py b/grc/gui/FlowGraph.py index 67e5af97b..6af4bcb62 100644 --- a/grc/gui/FlowGraph.py +++ b/grc/gui/FlowGraph.py @@ -494,8 +494,9 @@ class FlowGraph(Element): Move a selected element to the new coordinate. Auto-scroll the scroll bars at the boundaries. """ - #to perform a movement, the mouse must be pressed, no pending events - if gtk.events_pending() or not self.mouse_pressed: return + #to perform a movement, the mouse must be pressed + # (no longer checking pending events via gtk.events_pending() - always true in Windows) + if not self.mouse_pressed: return #perform autoscrolling width, height = self.get_size() x, y = coordinate |