diff options
| author | Johnathan Corgan <johnathan@corganlabs.com> | 2017-07-13 11:54:05 -0700 |
|---|---|---|
| committer | Johnathan Corgan <johnathan@corganlabs.com> | 2017-07-13 11:54:05 -0700 |
| commit | 851d7a27f09c27f84ba7f9ad19c3ba835c61af7f (patch) | |
| tree | 67666bbb1914d8ce21f62868947e3f702d744528 | |
| parent | cbf30e9cf8804a0c6c225a821ffa3e935bae299c (diff) | |
| parent | 29b4aa43a5296acf1c8de691f838ecee2597fb32 (diff) | |
Merge branch 'master' into next
Conflicts:
gr-digital/python/grc_gnuradio/blks2/packet.py
gr-uhd/lib/usrp_sink_impl.cc
| -rw-r--r-- | CMakeLists.txt | 4 | ||||
| -rw-r--r-- | gr-fft/lib/fft.cc | 4 | ||||
| -rw-r--r-- | gr-qtgui/doc/qtgui.dox | 23 | ||||
| -rw-r--r-- | gr-uhd/lib/usrp_sink_impl.cc | 3 |
4 files changed, 18 insertions, 16 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index a733a8014f..4d0dc05f3c 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -210,6 +210,10 @@ endif(MSVC) if(WIN32) add_definitions(-D_USE_MATH_DEFINES) + + if (CMAKE_SIZEOF_VOID_P EQUAL 8) + add_definitions(-DMS_WIN64) + endif(CMAKE_SIZEOF_VOID_P EQUAL 8) endif(WIN32) # Record Compiler Info for record diff --git a/gr-fft/lib/fft.cc b/gr-fft/lib/fft.cc index 3b6d05c383..871ad9bcaa 100644 --- a/gr-fft/lib/fft.cc +++ b/gr-fft/lib/fft.cc @@ -26,7 +26,7 @@ #include <volk/volk.h> #include <fftw3.h> -#ifdef _MSC_VER //http://www.fftw.org/install/windows.html#DLLwisdom +#ifdef _WIN32 //http://www.fftw.org/install/windows.html#DLLwisdom static void my_fftw_write_char(char c, void *f) { fputc(c, (FILE *) f); } #define fftw_export_wisdom_to_file(f) fftw_export_wisdom(my_fftw_write_char, (void*) (f)) #define fftwf_export_wisdom_to_file(f) fftwf_export_wisdom(my_fftw_write_char, (void*) (f)) @@ -40,7 +40,7 @@ static int my_fftw_read_char(void *f) { return fgetc((FILE *) f); } #include <io.h> #define O_NOCTTY 0 #define O_NONBLOCK 0 -#endif //_MSC_VER +#endif //_WIN32 #include <stdlib.h> #include <string.h> diff --git a/gr-qtgui/doc/qtgui.dox b/gr-qtgui/doc/qtgui.dox index d0d7345f73..8cbbd7367a 100644 --- a/gr-qtgui/doc/qtgui.dox +++ b/gr-qtgui/doc/qtgui.dox @@ -50,13 +50,12 @@ with complex inputs. The time raster plots accept bits and floats. Because the time raster plots are designed to show structure over time in a signal, frame, packet, etc., they never drop samples. This is a - fairly taxing job and performance can be an issue. Since it is expected that this block will work on a frame or packet structure, we tend to be at the lowest possible rate at this point, so that will help. Expect performance issues at high data rates. -Note: There seem to be extra performance issue with the raster +Note: There seem to be extra performance issues with the raster plotters in QWT version 5 that were fixed with QWT version 6. As such, the time raster plots have incredibly poor performance with QWT5 to the point of almost being unusable. In the future, we may restrict @@ -82,8 +81,8 @@ Each type of graph has a different set of menu items in the context menu. Most have some way to change the appearance of the lines or surfaces, such as changing the line width color, marker, and transparency. Other common features can set the sampling rate, turn a -grid on an off, pause and unpause (stop/start) the display update, and -save the current figure. Specific feature are things like setting the +grid on and off, pause and unpause (stop/start) the display update, and +save the current figure. Specific features are things like setting the number of points to display, setting the FFT size, FFT window, and any FFT averaging. @@ -96,9 +95,9 @@ specific stream tag such that whenever a tag of a given key is found, the scope will trigger. In the signal level mode, the trigger can be either 'auto' or 'normal' -where the latter will only trigger when the even is seen. The 'auto' +where the latter will only trigger when the event is seen. The 'auto' mode will trigger on the event or every so often even if no trigger is -found. The 'free' mode ignores ignores triggering and continuously +found. The 'free' mode ignores triggering and continuously plots. By default, the triggers plot the triggering event at the x=0 (i.e., @@ -135,7 +134,7 @@ The QT GUI blocks require the following dependencies. \section qtgui_usage Usage -To use the qtgui interface, a bit of boiler-plate lines must be +To use the QTGUI interface, a bit of boiler-plate lines must be included. First, the sink is defined, then it must be exposed from C++ into Python using the "sip.wrapinstance" command, and finally, the "show" method is run on the new Python object. This sets up the QT @@ -205,9 +204,8 @@ type interface, GRC will hide certain parameters that are not usable or settable anymore. For example, when plotting a message in the time sink, the number of points shown in the time sink is determined by the length of the vector in the message. Presetting this in the GUI would -have no effect. - -The behavior in GRC is for convenience and to try and reduce confusion +have no effect. +This behavior in GRC is for convenience and to try and reduce confusion about properties and settings in the message mode. However, all of the API hooks are still there, so it is possible to set all of this programmatically. The results would be harmless, however. @@ -240,13 +238,13 @@ widgets. Most of the widgets are implemented directly in Python through PyQT. However, GNU Radio is introducing more widgets, written and therefore available in C++ that also produce messsages. The Python-based widgets only act as variables and so as they are changed, -any block using those widgets to set paramters has the callback (i.e., +any block using those widgets to set parameters has the callback (i.e., set_value()) function's called. \subsection qtgui_widgets_python Python widgets: \li Range: creates a slider and/or combo box to change to set/change -the value of a parameter. This widget can set either float of int +the value of a parameter. This widget can set either float or int values. \li Entry: An edit box that allows a user to directly set a new value for the parameter. @@ -266,7 +264,6 @@ span". Simply using "tab widget name@index" will put that widget into the specific index (starting at 0) of the tab widget while adding the "row, col, row span, col span" will allow the user to place them in the tab grid. -\li \subsection qtgui_widgets_cpp C++ and Message-Passing Widgets diff --git a/gr-uhd/lib/usrp_sink_impl.cc b/gr-uhd/lib/usrp_sink_impl.cc index 4e2e9467dd..ef49c1048e 100644 --- a/gr-uhd/lib/usrp_sink_impl.cc +++ b/gr-uhd/lib/usrp_sink_impl.cc @@ -535,7 +535,8 @@ namespace gr { bool usrp_sink_impl::start(void) { - _tx_stream = _dev->get_tx_stream(_stream_args); + if (not _tx_stream) + _tx_stream = _dev->get_tx_stream(_stream_args); _metadata.start_of_burst = true; _metadata.end_of_burst = false; |