Migrate to GNU Radio 3.8

Author: noc0lour

CMakeLists.txt

@@ -21,10 +21,12 @@
 ########################################################################
 # Project setup
 ########################################################################
-cmake_minimum_required(VERSION 2.6)
+cmake_minimum_required(VERSION 3.8)
 project(gr-dab CXX C)
 enable_testing()
 
+cmake_policy(SET CMP0011 NEW)
+
 #select the release build type by default to get optimization flags
 if(NOT CMAKE_BUILD_TYPE)
    set(CMAKE_BUILD_TYPE "Release")
@@ -79,32 +81,13 @@ if (NOT LIBTOOLAME-DAB_FOUND )
     message(FATAL_ERROR "please make sure the libtoolame-dab source can be found")
 else()
     message(STATUS "LIBTOOLAME-DAB found: ${LIBTOOLAME-DAB_SOURCE_DIR}")
-endif ()
+  endif ()
+
+find_package(Gnuradio "3.8" REQUIRED COMPONENTS filter fft blocks)
 
 include(GrPython)
 # Find PyQt5
 find_program(PYUIC5_EXECUTABLE pyuic5)
-########################################################################
-# Find boost
-########################################################################
-if(UNIX AND EXISTS "/usr/lib64")
-    list(APPEND BOOST_LIBRARYDIR "/usr/lib64") #fedora 64-bit fix
-endif(UNIX AND EXISTS "/usr/lib64")
-set(Boost_ADDITIONAL_VERSIONS
-    "1.35.0" "1.35" "1.36.0" "1.36" "1.37.0" "1.37" "1.38.0" "1.38" "1.39.0" "1.39"
-    "1.40.0" "1.40" "1.41.0" "1.41" "1.42.0" "1.42" "1.43.0" "1.43" "1.44.0" "1.44"
-    "1.45.0" "1.45" "1.46.0" "1.46" "1.47.0" "1.47" "1.48.0" "1.48" "1.49.0" "1.49"
-    "1.50.0" "1.50" "1.51.0" "1.51" "1.52.0" "1.52" "1.53.0" "1.53" "1.54.0" "1.54"
-    "1.55.0" "1.55" "1.56.0" "1.56" "1.57.0" "1.57" "1.58.0" "1.58" "1.59.0" "1.59"
-    "1.60.0" "1.60" "1.61.0" "1.61" "1.62.0" "1.62" "1.63.0" "1.63" "1.64.0" "1.64"
-    "1.65.0" "1.65" "1.66.0" "1.66" "1.67.0" "1.67" "1.68.0" "1.68" "1.69.0" "1.69"
-)
-find_package(Boost "1.35" COMPONENTS filesystem system)
-
-if(NOT Boost_FOUND)
-    message(FATAL_ERROR "Boost required to compile dab")
-endif()
-
 ########################################################################
 # Install directories
 ########################################################################
@@ -125,19 +108,8 @@ set(GRC_BLOCKS_DIR      ${GR_PKG_DATA_DIR}/grc/blocks)
 ########################################################################
 # Find gnuradio build dependencies
 ########################################################################
-find_package(CppUnit)
 find_package(Doxygen)
 
-# Search for GNU Radio and its components and versions. Add any
-# components required to the list of GR_REQUIRED_COMPONENTS (in all
-# caps such as FILTER or FFT) and change the version to the minimum
-# API compatible version required.
-set(GR_REQUIRED_COMPONENTS RUNTIME FILTER)
-find_package(Gnuradio "3.7.1" REQUIRED)
-
-if(NOT CPPUNIT_FOUND)
-    message(FATAL_ERROR "CppUnit required to compile dab")
-endif()
 
 ########################################################################
 # Setup doxygen option
@@ -148,30 +120,6 @@ else(DOXYGEN_FOUND)
 	option(ENABLE_DOXYGEN "Build docs using Doxygen" OFF)
 endif(DOXYGEN_FOUND)
 
-########################################################################
-# Setup the include and linker paths
-########################################################################
-include_directories(
-    ${CMAKE_SOURCE_DIR}/lib
-    ${CMAKE_SOURCE_DIR}/include
-    ${CMAKE_BINARY_DIR}/lib
-    ${CMAKE_BINARY_DIR}/include
-    ${Boost_INCLUDE_DIRS}
-    ${CPPUNIT_INCLUDE_DIRS}
-    ${GNURADIO_ALL_INCLUDE_DIRS}
-)
-
-link_directories(
-    ${Boost_LIBRARY_DIRS}
-    ${CPPUNIT_LIBRARY_DIRS}
-    ${GNURADIO_RUNTIME_LIBRARY_DIRS}
-    ${GNURADIO_FILTER_LIBRARY_DIRS}
-)
-
-# Set component parameters
-set(GR_DAB_INCLUDE_DIRS ${CMAKE_CURRENT_SOURCE_DIR}/include CACHE INTERNAL "" FORCE)
-set(GR_DAB_SWIG_INCLUDE_DIRS ${CMAKE_CURRENT_SOURCE_DIR}/swig CACHE INTERNAL "" FORCE)
-
 ########################################################################
 # Create uninstall target
 ########################################################################

apps/DABstep

@@ -1,6 +1,6 @@
 #!/usr/bin/env python
 
-from PyQt5 import QtGui
+from PyQt5 import QtGui, QtWidgets
 from PyQt5.QtCore import QTimer
 import sys
 import time
@@ -15,7 +15,7 @@ import sip
 resolution_width = 0
 resolution_height = 0
 
-class DABstep(QtGui.QMainWindow, user_frontend.Ui_MainWindow):
+class DABstep(QtWidgets.QMainWindow, user_frontend.Ui_MainWindow):
     def __init__(self, parent=None):
         super(DABstep, self).__init__(parent)
         self.setupUi(self)
@@ -58,13 +58,13 @@ class DABstep(QtGui.QMainWindow, user_frontend.Ui_MainWindow):
 
         # table preparations
         header = self.table_mci.horizontalHeader()
-        header.setResizeMode(0, QtGui.QHeaderView.ResizeToContents)
-        header.setResizeMode(1, QtGui.QHeaderView.Stretch)
-        header.setResizeMode(2, QtGui.QHeaderView.ResizeToContents)
-        header.setResizeMode(3, QtGui.QHeaderView.ResizeToContents)
+        header.setSectionResizeMode(0, QtWidgets.QHeaderView.ResizeToContents)
+        header.setSectionResizeMode(1, QtWidgets.QHeaderView.Stretch)
+        header.setSectionResizeMode(2, QtWidgets.QHeaderView.ResizeToContents)
+        header.setSectionResizeMode(3, QtWidgets.QHeaderView.ResizeToContents)
         header.setStretchLastSection(False)
         self.table_mci.verticalHeader().hide()
-        self.table_mci.setSelectionBehavior(QtGui.QAbstractItemView.SelectRows)
+        self.table_mci.setSelectionBehavior(QtWidgets.QAbstractItemView.SelectRows)
 
         # timer for update of SNR
         self.snr_timer = QTimer()
@@ -213,13 +213,13 @@ class DABstep(QtGui.QMainWindow, user_frontend.Ui_MainWindow):
     ################################
     def change_tab(self):
         if self.mode_tabs.currentWidget() is self.tab_transmission:
-            print "changed to transmission mode"
+            print("changed to transmission mode")
             self.t_update_service_components()
 
         elif self.mode_tabs.currentWidget() is self.tab_reception:
-            print "changed to reception mode"
+            print("changed to reception mode")
         else:
-            print "changed to unknown tab"
+            print("changed to unknown tab")
 
     ################################
     # Receiver functions
@@ -355,8 +355,8 @@ class DABstep(QtGui.QMainWindow, user_frontend.Ui_MainWindow):
 
         # display ensemble info
         ensemble_data = self.get_ensemble_info()
-        self.label_ensemble.setText(ensemble_data.keys()[0].strip())
-        self.label_country.setText(str(self.table.country_ID_ECC_E0[int(ensemble_data.values()[0]['country_ID'])]))
+        self.label_ensemble.setText(list(ensemble_data.keys())[0].strip())
+        self.label_country.setText(str(self.table.country_ID_ECC_E0[int(list(ensemble_data.values())[0]['country_ID'])]))
         self.lcd_number_num_subch.display(self.num_subch)
         # status bar
         self.statusBar.showMessage("Select a Service Component.")
@@ -508,7 +508,7 @@ class DABstep(QtGui.QMainWindow, user_frontend.Ui_MainWindow):
     def get_ensemble_info(self):
         self.json = self.my_receiver.get_ensemble_info()
         if self.json is "":
-            return {"unknown":{"country_ID":0}}
+            return {"unknown":{"country_ID":0},}
         else:
             # load string (json) with ensemble info and convert it to dictionary
             # string structure example: "{\"SWR_BW_N\":{\"country_ID\":1}}"
@@ -571,19 +571,19 @@ class DABstep(QtGui.QMainWindow, user_frontend.Ui_MainWindow):
     def dev_mode_init(self):
         available_height = self.screen_height-200
         # constellation plot
-        self.constellation = sip.wrapinstance(self.my_receiver.constellation_plot.pyqwidget(), QtGui.QWidget)
+        self.constellation = sip.wrapinstance(self.my_receiver.constellation_plot.pyqwidget(), QtWidgets.QWidget)
         self.vertical_layout_dev_mode_right.addWidget(self.constellation)
         self.constellation.setMaximumHeight(available_height/3)
         self.constellation.setMaximumWidth(available_height/3*2)
         self.constellation.hide()
         # FFT plot
-        self.fft_plot = sip.wrapinstance(self.my_receiver.fft_plot.pyqwidget(), QtGui.QWidget)
+        self.fft_plot = sip.wrapinstance(self.my_receiver.fft_plot.pyqwidget(), QtWidgets.QWidget)
         self.vertical_layout_dev_mode_right.addWidget(self.fft_plot)
         self.fft_plot.setMaximumHeight(available_height/3)
         self.fft_plot.setMaximumWidth(available_height/3*2)
         self.fft_plot.hide()
         # Waterfall plot
-        self.waterfall_plot = sip.wrapinstance(self.my_receiver.waterfall_plot.pyqwidget(), QtGui.QWidget)
+        self.waterfall_plot = sip.wrapinstance(self.my_receiver.waterfall_plot.pyqwidget(), QtWidgets.QWidget)
         self.vertical_layout_dev_mode_right.addWidget(self.waterfall_plot)
         self.waterfall_plot.setMaximumHeight(available_height/3)
         self.waterfall_plot.setMaximumWidth(available_height/3*2)
@@ -1113,7 +1113,7 @@ class lookup_tables:
     ]
 
 def main():
-    app = QtGui.QApplication(sys.argv)
+    app = QtWidgets.QApplication(sys.argv)
     global resolution_width
     resolution_width = app.desktop().screenGeometry().width()
     global resolution_height