[Commit-gnuradio] [gnuradio] 01/01: Merge branch 'master' into next

[git]

This is an automated email from the git hooks/post-receive script.

jcorgan pushed a commit to branch next
in repository gnuradio.

commit 58bed0d449c663701a348461d1f9e6b6f4b94c18
Merge: d806c4f 6431a11
Author: Johnathan Corgan <address@hidden>
Date:   Mon Oct 17 07:57:24 2016 -0700

    Merge branch 'master' into next
    
    Conflicts:
        gr-qtgui/python/qtgui/CMakeLists.txt
        gr-qtgui/python/qtgui/range.py.cmakein
        grc/core/generator/flow_graph.tmpl

 gr-dtv/lib/dvbs2/dvbs2_modulator_bc_impl.cc        | 12 ---------
 gr-qtgui/include/gnuradio/qtgui/utils.h            |  3 +++
 gr-qtgui/lib/const_sink_c_impl.cc                  |  6 +----
 gr-qtgui/lib/edit_box_msg_impl.cc                  |  6 +----
 gr-qtgui/lib/freq_sink_c_impl.cc                   |  6 +----
 gr-qtgui/lib/freq_sink_f_impl.cc                   |  6 +----
 gr-qtgui/lib/histogram_sink_f_impl.cc              |  6 +----
 gr-qtgui/lib/qtgui_util.cc                         | 12 +++++++++
 gr-qtgui/lib/sink_c_impl.cc                        |  6 +----
 gr-qtgui/lib/sink_f_impl.cc                        |  6 +----
 gr-qtgui/lib/time_raster_sink_b_impl.cc            |  6 +----
 gr-qtgui/lib/time_raster_sink_f_impl.cc            |  6 +----
 gr-qtgui/lib/time_sink_c_impl.cc                   |  6 +----
 gr-qtgui/lib/time_sink_f_impl.cc                   |  6 +----
 gr-qtgui/lib/vector_sink_f_impl.cc                 |  6 +----
 gr-qtgui/lib/waterfall_sink_c_impl.cc              |  6 +----
 gr-qtgui/lib/waterfall_sink_f_impl.cc              |  6 +----
 gr-qtgui/python/qtgui/CMakeLists.txt               |  2 ++
 gr-qtgui/python/qtgui/__init__.py                  |  1 +
 gr-qtgui/python/qtgui/range.py.cmakein             |  2 ++
 .../python/qtgui/{__init__.py => util.py.cmakein}  | 29 ++++++++++------------
 grc/core/generator/flow_graph.tmpl                 |  3 ++-
 22 files changed, 49 insertions(+), 99 deletions(-)

diff --cc gr-qtgui/python/qtgui/CMakeLists.txt
index 23e75e6,1c20033..5df3a7d
--- a/gr-qtgui/python/qtgui/CMakeLists.txt
+++ b/gr-qtgui/python/qtgui/CMakeLists.txt
@@@ -20,18 -20,12 +20,20 @@@
  ########################################################################
  include(GrPython)
  
 +if (DESIRED_QT_VERSION MATCHES 4)
 +      set(PY_QT_IMPORT "from PyQt4 import Qt, QtCore, QtGui as QtWidgets")
 +else()
 +      set(PY_QT_IMPORT "from PyQt5 import Qt, QtCore, QtWidgets")
 +endif()
 +
 +configure_file(range.py.cmakein "${CMAKE_CURRENT_BINARY_DIR}/range.py" @ONLY)
++configure_file(util.py.cmakein "${CMAKE_CURRENT_BINARY_DIR}/util.py" @ONLY)
 +
  GR_PYTHON_INSTALL(
      FILES __init__.py
 -          range.py
 -          util.py
 +          "${CMAKE_CURRENT_BINARY_DIR}/range.py"
++          "${CMAKE_CURRENT_BINARY_DIR}/util.py"
      DESTINATION ${GR_PYTHON_DIR}/gnuradio/qtgui
 -    COMPONENT "qtgui_python"
  )
  
  ########################################################################
diff --cc gr-qtgui/python/qtgui/range.py.cmakein
index 45aa762,ca42bf7..00db509
--- a/gr-qtgui/python/qtgui/range.py.cmakein
+++ b/gr-qtgui/python/qtgui/range.py.cmakein
@@@ -21,7 -21,8 +21,8 @@@
  # Boston, MA 02110-1301, USA.
  #
  
 -from PyQt4 import Qt, QtCore, QtGui
 address@hidden@
+ import util
  
  class Range(object):
      def __init__(self, minv, maxv, step, default, min_length):
diff --cc gr-qtgui/python/qtgui/util.py.cmakein
index 224bde0,d2e9495..ca2b3b3
--- a/gr-qtgui/python/qtgui/util.py.cmakein
+++ b/gr-qtgui/python/qtgui/util.py.cmakein
@@@ -19,19 -21,15 +21,14 @@@
  # Boston, MA 02110-1301, USA.
  #
  
- '''
- Provides a GUI interface using the QT backend.
- '''
 -from PyQt4 import Qt, QtCore, QtGui
address@hidden@
+ from gnuradio import gr
  
- # The presence of this file turns this directory into a Python package
- import os
- 
- 
- try:
-     from qtgui_swig import *
- except ImportError:
-     dirname, filename = os.path.split(os.path.abspath(__file__))
-     __path__.append(os.path.join(dirname, "..", "..", "swig"))
-     from qtgui_swig import *
- 
- from range import Range, RangeWidget
+ def check_set_qss():
+     app = QtGui.qApp
+     qssfile = gr.prefs().get_string("qtgui","qss","")
+     if(len(qssfile)>0):
+         try:
+             app.setStyleSheet(open(qssfile).read())
+         except:
+             print "WARNING: bad QSS file, %s"%(qssfile)
 -
diff --cc grc/core/generator/flow_graph.tmpl
index 0597033,1ef251c..2adb555
--- a/grc/core/generator/flow_graph.tmpl
+++ b/grc/core/generator/flow_graph.tmpl
@@@ -79,9 -77,23 +79,9 @@@ $im
  ########################################################
  #set $class_name = $flow_graph.get_option('id')
  #set $param_str = ', '.join(['self'] + ['%s=%s'%(param.get_id(), 
param.get_make()) for param in $parameters])
 -#if $generate_options == 'wx_gui'
 -    #import gtk
 -    #set $icon = gtk.IconTheme().lookup_icon('gnuradio-grc', 32, 0)
 -
 -
 -class $(class_name)(grc_wxgui.top_block_gui):
 -
 -    def __init__($param_str):
 -        grc_wxgui.top_block_gui.__init__(self, title="$title")
 -    #if $icon
 -        _icon_path = "$icon.get_filename()"
 -        self.SetIcon(wx.Icon(_icon_path, wx.BITMAP_TYPE_ANY))
 -    #end if
 -#elif $generate_options == 'qt_gui'
 +#if $generate_options == 'qt_gui'
- 
+ from gnuradio import qtgui
  
 -
  class $(class_name)(gr.top_block, Qt.QWidget):
  
      def __init__($param_str):