Working branch

.gitignore

@@ -38,3 +38,4 @@ log_default.conf
 python/.unittests/
 .idea/
 examples/top_block.py
+python/GUI/user_frontend.py

CMakeLists.txt

@@ -81,7 +81,7 @@ else()
     message(STATUS "LIBTOOLAME-DAB found: ${LIBTOOLAME-DAB_SOURCE_DIR}")
 endif ()
 
-
+find_package(PyQt4 REQUIRED)
 ########################################################################
 # Find boost
 ########################################################################

README.md

@@ -12,9 +12,9 @@ Contents
 
 2: Installation
 
-3: Features
+3: Usage
 
-4: Usage
+4: Features
 
 5: Current Constraints
 
@@ -63,7 +63,6 @@ fulfilled. All my code got merged into the master branch of this repository.
 This fork will serve as upstream repository for further development of the OFDM
 receiver (especially with respect to synchronization), and other improvements.
 
-
 Installation
 ------------
 
@@ -106,6 +105,7 @@ Features
 * Receiving and Transmitting DAB/DAB+ broadcasts with the graphical application "DABstep"
 * Receiving or Transmitting DAB/DAB+ with prepaired GNU Radio Companion flowgraph in examples/
 * Receiving or Transmitting DAB/DAB+ by building your own GNU Radio flowgraph with provided gr-dab blocks
+* USRP and RTL-SDR for reception supported
 
 Usage
 -------
@@ -124,16 +124,18 @@ Current Constraints
 * PAD interpretation and generation not supported so far
 * only EEP with protection profile set A supported so far, no set B and no UEP
 
+
 Ideas
 ----------
 
 * FM simulation, calculating the audio noise out of the SNR and adding it to the audio
 * parallel FM receiver that fills in the audio in case a superframe is broken 
+* include reception and transmission of data channels with packed data, e.g. pictures
 
 Known Bugs
 ----------
 
-* OFDM demodulator gets out of sync sometimes causing burst errors
+* Audio underruns disturb played audio signal without having actual errors. Additional buffer through delay block is a temporary fix that only works until reception errors occur.
 
 Documentation
 --------------

cmake/Modules/FindPyQt4.cmake

@@ -0,0 +1,61 @@
+# Find PyQt4
+# ~~~~~~~~~~
+# Copyright (c) 2007-2008, Simon Edwards <[email protected]>
+# Copyright (c) 2012, Nicholas Corgan <[email protected]>
+# Redistribution and use is allowed according to the terms of the BSD license.
+# For details see the accompanying COPYING-CMAKE-SCRIPTS file.
+#
+# PyQt4 website: http://www.riverbankcomputing.co.uk/pyqt/index.php
+#
+# Find the installed version of PyQt4. FindPyQt4 should only be called after
+# Python has been found.
+#
+# This file defines the following variables:
+#
+# PYQT4_VERSION - The version of PyQt4 found expressed as a 6 digit hex number
+#     suitable for comparision as a string
+#
+# PYQT4_VERSION_STR - The version of PyQt4 as a human readable string.
+#
+# PYQT4_VERSION_TAG - The PyQt version tag using by PyQt's sip files.
+#
+# PYQT4_SIP_DIR - The directory holding the PyQt4 .sip files.
+#
+# PYQT4_SIP_FLAGS - The SIP flags used to build PyQt.
+
+IF(EXISTS PYQT4_VERSION AND EXISTS PYUIC4_EXECUTABLE)
+  # Already in cache, be silent
+  SET(PYQT4_FOUND TRUE)
+  SET(PYUIC4_FOUND TRUE)
+ELSE(EXISTS PYQT4_VERSION AND EXISTS PYUIC4_EXECUTABLE)
+
+  FIND_FILE(_find_pyqt_py FindPyQt.py PATHS ${CMAKE_MODULE_PATH})
+
+  EXECUTE_PROCESS(COMMAND ${PYTHON_EXECUTABLE} ${_find_pyqt_py} OUTPUT_VARIABLE pyqt_config)
+  IF(pyqt_config)
+    STRING(REGEX REPLACE "^pyqt_version:([^\n]+).*$" "\\1" PYQT4_VERSION ${pyqt_config})
+    STRING(REGEX REPLACE ".*\npyqt_version_str:([^\n]+).*$" "\\1" PYQT4_VERSION_STR ${pyqt_config})
+    STRING(REGEX REPLACE ".*\npyqt_version_tag:([^\n]+).*$" "\\1" PYQT4_VERSION_TAG ${pyqt_config})
+    STRING(REGEX REPLACE ".*\npyqt_sip_dir:([^\n]+).*$" "\\1" PYQT4_SIP_DIR ${pyqt_config})
+    STRING(REGEX REPLACE ".*\npyqt_sip_flags:([^\n]+).*$" "\\1" PYQT4_SIP_FLAGS ${pyqt_config})
+
+    SET(PYQT4_FOUND TRUE)
+  ENDIF(pyqt_config)
+
+  FIND_PROGRAM(PYUIC4_EXECUTABLE NAMES pyuic4)
+  IF(PYUIC4_EXECUTABLE)
+    SET(PYUIC4_FOUND TRUE)
+  ENDIF(PYUIC4_EXECUTABLE)
+
+  IF(PYQT4_FOUND AND PYUIC4_FOUND)
+    IF(NOT PYQT4_FIND_QUIETLY)
+      MESSAGE(STATUS "Found PyQt4 version: ${PYQT4_VERSION_STR}")
+      MESSAGE(STATUS "Found pyuic4: ${PYUIC4_EXECUTABLE}")
+    ENDIF(NOT PYQT4_FIND_QUIETLY)
+  ELSE(PYQT4_FOUND AND PYUIC4_FOUND)
+    IF(PYQT4_FIND_REQUIRED)
+      MESSAGE(FATAL_ERROR "Could not find Python")
+    ENDIF(PYQT4_FIND_REQUIRED)
+  ENDIF(PYQT4_FOUND AND PYUIC4_FOUND)
+
+ENDIF(EXISTS PYQT4_VERSION AND EXISTS PYUIC4_EXECUTABLE)