diff --git a/README.md b/README.md index 7081d87d..d918d81f 100755 --- a/README.md +++ b/README.md @@ -1,13 +1,15 @@ -# Qt-DAB-4.4 [![Build Status](https://travis-ci.com/JvanKatwijk/qt-dab.svg?branch=master)](https://travis-ci.com/JvanKatwijk/qt-dab) +# Qt-DAB-4.4.1 [![Build Status](https://travis-ci.com/JvanKatwijk/qt-dab.svg?branch=master)](https://travis-ci.com/JvanKatwijk/qt-dab) Qt-DAB-4.4 is software for Linux, Windows and Raspberry Pi for listening to terrestrial Digital Audio Broadcasting (DAB and DAB+). Qt-DAB is accompanied by its little sister dabMini, built on the same set of sources. ![4.4](/qt-dab-maps.png?raw=true) ---------------------------------------------------------------- -What is new in Qt-DAB 4.4 +What is new in Qt-DAB 4.4.1 ---------------------------------------------------------------- +The difference between 4.4.1 and 4.4 is is the map handling. + I was completely bored with searching on a map where the transmitter location was that was detected by the Qt-DAB software. So, I modified the http handler and the map from the 1090 software diff --git a/dab-maxi/CMakeLists.txt b/dab-maxi/CMakeLists.txt index c081f396..8760c94f 100755 --- a/dab-maxi/CMakeLists.txt +++ b/dab-maxi/CMakeLists.txt @@ -1,5 +1,5 @@ cmake_minimum_required( VERSION 2.8.11 ) -set (objectName qt-dab-4.4) +set (objectName qt-dab-4.4.1) set (CMAKE_CXX_FLAGS "${CMAKE_XCC_FLAGS} -Wall -std=c++14 -flto") set (CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -flto") diff --git a/dab-maxi/converted_map.h b/dab-maxi/converted_map.h index a49fbf93..8af1c94a 100644 --- a/dab-maxi/converted_map.h +++ b/dab-maxi/converted_map.h @@ -226,186 +226,241 @@ static uint8_t qt_map [] = { 116, 97, 114, 103, 101, 116, 46, 108, 111, 110, 93, 44, 32, 123, 105, 99, 111, 110, 58, 32, 105, 99, 111, 110, 125, 41, 46, 97, 100, 100, 84, 111, 40, 77, 97, 112, 41, 59, 10, 9, 32, 32, 32, 32, 32, - 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 84, 114, 97, 110, 115, - 109, 105, 116, 116, 101, 114, 115, 32, 91, 105, 93, 46, 32, 109, 97, - 114, 107, 101, 114, 32, 61, 32, 116, 97, 114, 103, 101, 116, 77, 97, - 114, 107, 101, 114, 59, 10, 9, 32, 32, 32, 32, 32, 32, 32, 32, - 32, 32, 32, 32, 125, 10, 9, 32, 32, 32, 32, 32, 32, 32, 32, - 32, 125, 10, 9, 32, 32, 32, 32, 32, 32, 32, 32, 32, 101, 108, - 115, 101, 32, 123, 10, 9, 32, 32, 32, 32, 32, 32, 32, 32, 32, - 32, 32, 32, 108, 101, 116, 32, 116, 97, 114, 103, 101, 116, 32, 61, - 32, 100, 97, 116, 97, 32, 91, 116, 93, 59, 10, 9, 32, 32, 32, - 32, 32, 32, 32, 32, 32, 32, 32, 32, 118, 97, 114, 32, 97, 108, - 114, 101, 97, 100, 121, 84, 104, 101, 114, 101, 32, 61, 32, 102, 97, - 108, 115, 101, 59, 10, 9, 32, 32, 32, 32, 32, 32, 32, 32, 32, - 32, 32, 32, 102, 111, 114, 32, 40, 118, 97, 114, 32, 105, 32, 61, - 32, 48, 59, 32, 105, 32, 60, 32, 116, 114, 97, 110, 115, 109, 105, - 116, 116, 101, 114, 73, 110, 100, 101, 120, 59, 32, 105, 32, 43, 43, - 41, 32, 123, 10, 9, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, - 32, 32, 32, 32, 32, 105, 102, 32, 40, 40, 84, 114, 97, 110, 115, - 109, 105, 116, 116, 101, 114, 115, 32, 91, 105, 93, 46, 32, 108, 97, - 116, 32, 61, 61, 32, 116, 97, 114, 103, 101, 116, 46, 32, 108, 97, - 116, 41, 32, 38, 38, 10, 9, 32, 32, 32, 32, 32, 32, 32, 32, - 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 40, 84, 114, 97, - 110, 115, 109, 105, 116, 116, 101, 114, 115, 32, 91, 105, 93, 46, 32, - 108, 111, 110, 32, 61, 61, 32, 116, 97, 114, 103, 101, 116, 46, 32, - 108, 111, 110, 41, 32, 38, 38, 10, 9, 32, 32, 32, 32, 32, 32, - 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 40, 84, - 114, 97, 110, 115, 109, 105, 116, 116, 101, 114, 115, 32, 91, 105, 93, - 46, 32, 99, 104, 97, 110, 110, 101, 108, 32, 61, 61, 32, 116, 97, - 114, 103, 101, 116, 46, 32, 99, 104, 97, 110, 110, 101, 108, 41, 41, - 32, 123, 10, 9, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, - 32, 32, 32, 32, 32, 32, 32, 97, 108, 114, 101, 97, 100, 121, 84, - 104, 101, 114, 101, 32, 61, 32, 116, 114, 117, 101, 59, 10, 9, 32, + 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 116, 97, 114, 103, 101, + 116, 77, 97, 114, 107, 101, 114, 46, 10, 9, 32, 32, 32, 32, 32, + 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, + 97, 100, 100, 69, 118, 101, 110, 116, 76, 105, 115, 116, 101, 110, 101, + 114, 32, 40, 39, 99, 108, 105, 99, 107, 39, 44, 10, 9, 32, 32, + 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, - 32, 32, 98, 114, 101, 97, 107, 59, 10, 9, 32, 32, 32, 32, 32, + 32, 32, 32, 32, 32, 32, 32, 102, 117, 110, 99, 116, 105, 111, 110, + 32, 40, 41, 32, 123, 32, 115, 101, 108, 101, 99, 116, 84, 114, 97, + 110, 115, 109, 105, 116, 116, 101, 114, 67, 97, 108, 108, 98, 97, 99, + 107, 32, 40, 116, 97, 114, 103, 101, 116, 41, 59, 125, 41, 59, 10, + 9, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, + 32, 84, 114, 97, 110, 115, 109, 105, 116, 116, 101, 114, 115, 32, 91, + 105, 93, 46, 32, 109, 97, 114, 107, 101, 114, 32, 61, 32, 116, 97, + 114, 103, 101, 116, 77, 97, 114, 107, 101, 114, 59, 10, 9, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 125, 10, 9, 32, 32, - 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 125, 10, 10, 9, 32, + 32, 32, 32, 32, 32, 32, 32, 125, 10, 9, 32, 32, 32, 32, 32, + 32, 32, 32, 32, 101, 108, 115, 101, 32, 123, 10, 9, 32, 32, 32, + 32, 32, 32, 32, 32, 32, 32, 32, 32, 108, 101, 116, 32, 116, 97, + 114, 103, 101, 116, 32, 61, 32, 100, 97, 116, 97, 32, 91, 116, 93, + 59, 10, 9, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, + 118, 97, 114, 32, 97, 108, 114, 101, 97, 100, 121, 84, 104, 101, 114, + 101, 32, 61, 32, 102, 97, 108, 115, 101, 59, 10, 9, 32, 32, 32, + 32, 32, 32, 32, 32, 32, 32, 32, 32, 102, 111, 114, 32, 40, 118, + 97, 114, 32, 105, 32, 61, 32, 48, 59, 32, 105, 32, 60, 32, 116, + 114, 97, 110, 115, 109, 105, 116, 116, 101, 114, 73, 110, 100, 101, 120, + 59, 32, 105, 32, 43, 43, 41, 32, 123, 10, 9, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 105, 102, 32, 40, - 97, 108, 114, 101, 97, 100, 121, 84, 104, 101, 114, 101, 41, 10, 9, + 40, 84, 114, 97, 110, 115, 109, 105, 116, 116, 101, 114, 115, 32, 91, + 105, 93, 46, 32, 108, 97, 116, 32, 61, 61, 32, 116, 97, 114, 103, + 101, 116, 46, 32, 108, 97, 116, 41, 32, 38, 38, 10, 9, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, - 99, 111, 110, 116, 105, 110, 117, 101, 59, 10, 9, 32, 32, 32, 32, - 32, 32, 32, 32, 32, 32, 32, 32, 108, 101, 116, 32, 105, 99, 111, - 110, 32, 61, 32, 103, 101, 116, 73, 99, 111, 110, 70, 111, 114, 84, - 114, 97, 110, 115, 109, 105, 116, 116, 101, 114, 32, 40, 49, 41, 59, + 32, 32, 40, 84, 114, 97, 110, 115, 109, 105, 116, 116, 101, 114, 115, + 32, 91, 105, 93, 46, 32, 108, 111, 110, 32, 61, 61, 32, 116, 97, + 114, 103, 101, 116, 46, 32, 108, 111, 110, 41, 32, 38, 38, 10, 9, + 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, + 32, 32, 32, 32, 40, 84, 114, 97, 110, 115, 109, 105, 116, 116, 101, + 114, 115, 32, 91, 105, 93, 46, 32, 99, 104, 97, 110, 110, 101, 108, + 32, 61, 61, 32, 116, 97, 114, 103, 101, 116, 46, 32, 99, 104, 97, + 110, 110, 101, 108, 41, 41, 32, 123, 10, 9, 32, 32, 32, 32, 32, + 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 97, 108, + 114, 101, 97, 100, 121, 84, 104, 101, 114, 101, 32, 61, 32, 116, 114, + 117, 101, 59, 10, 9, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, + 32, 32, 32, 32, 32, 32, 32, 32, 98, 114, 101, 97, 107, 59, 10, + 9, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, + 32, 125, 10, 9, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, + 32, 125, 10, 10, 9, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, + 32, 32, 105, 102, 32, 40, 97, 108, 114, 101, 97, 100, 121, 84, 104, + 101, 114, 101, 41, 10, 9, 32, 32, 32, 32, 32, 32, 32, 32, 32, + 32, 32, 32, 32, 32, 32, 99, 111, 110, 116, 105, 110, 117, 101, 59, 10, 9, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 108, - 101, 116, 32, 116, 97, 114, 103, 101, 116, 77, 97, 114, 107, 101, 114, - 32, 61, 32, 76, 46, 109, 97, 114, 107, 101, 114, 40, 91, 116, 97, - 114, 103, 101, 116, 46, 108, 97, 116, 44, 32, 116, 97, 114, 103, 101, - 116, 46, 108, 111, 110, 93, 44, 32, 123, 105, 99, 111, 110, 58, 32, - 105, 99, 111, 110, 125, 41, 46, 97, 100, 100, 84, 111, 40, 77, 97, - 112, 41, 59, 10, 9, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, - 32, 32, 116, 97, 114, 103, 101, 116, 46, 32, 109, 97, 114, 107, 101, - 114, 32, 61, 32, 116, 97, 114, 103, 101, 116, 77, 97, 114, 107, 101, - 114, 59, 10, 9, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, - 32, 84, 114, 97, 110, 115, 109, 105, 116, 116, 101, 114, 115, 32, 91, - 116, 114, 97, 110, 115, 109, 105, 116, 116, 101, 114, 73, 110, 100, 101, - 120, 93, 32, 61, 32, 116, 97, 114, 103, 101, 116, 59, 10, 9, 32, - 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 116, 114, 97, 110, - 115, 109, 105, 116, 116, 101, 114, 73, 110, 100, 101, 120, 32, 43, 43, - 59, 10, 10, 9, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, - 32, 108, 101, 116, 32, 110, 101, 119, 67, 104, 97, 110, 110, 101, 108, - 32, 61, 32, 39, 60, 115, 112, 97, 110, 32, 115, 116, 121, 108, 101, - 61, 92, 34, 102, 111, 110, 116, 45, 119, 101, 105, 103, 104, 116, 58, - 98, 111, 108, 100, 59, 102, 111, 110, 116, 45, 115, 105, 122, 101, 58, - 49, 50, 48, 37, 92, 34, 62, 39, 32, 43, 32, 116, 97, 114, 103, - 101, 116, 46, 32, 99, 104, 97, 110, 110, 101, 108, 32, 43, 32, 39, - 60, 47, 115, 112, 97, 110, 62, 39, 59, 10, 9, 32, 32, 32, 32, - 32, 32, 32, 32, 32, 32, 32, 32, 108, 101, 116, 32, 99, 111, 111, - 114, 100, 115, 32, 61, 32, 39, 60, 115, 112, 97, 110, 32, 115, 116, - 121, 108, 101, 61, 92, 34, 102, 111, 110, 116, 45, 115, 116, 121, 108, - 101, 58, 32, 105, 116, 97, 108, 105, 99, 59, 92, 34, 62, 39, 32, - 43, 10, 9, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, - 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 116, - 97, 114, 103, 101, 116, 46, 32, 108, 97, 116, 32, 43, 32, 39, 45, - 45, 39, 32, 43, 10, 9, 32, 32, 32, 32, 32, 32, 32, 32, 32, + 101, 116, 32, 105, 99, 111, 110, 32, 61, 32, 103, 101, 116, 73, 99, + 111, 110, 70, 111, 114, 84, 114, 97, 110, 115, 109, 105, 116, 116, 101, + 114, 32, 40, 49, 41, 59, 10, 9, 32, 32, 32, 32, 32, 32, 32, + 32, 32, 32, 32, 32, 108, 101, 116, 32, 116, 97, 114, 103, 101, 116, + 77, 97, 114, 107, 101, 114, 32, 61, 32, 76, 46, 109, 97, 114, 107, + 101, 114, 40, 91, 116, 97, 114, 103, 101, 116, 46, 108, 97, 116, 44, + 32, 116, 97, 114, 103, 101, 116, 46, 108, 111, 110, 93, 44, 32, 123, + 105, 99, 111, 110, 58, 32, 105, 99, 111, 110, 125, 41, 46, 97, 100, + 100, 84, 111, 40, 77, 97, 112, 41, 59, 10, 9, 32, 32, 32, 32, + 32, 32, 32, 32, 32, 32, 32, 32, 116, 97, 114, 103, 101, 116, 46, + 32, 109, 97, 114, 107, 101, 114, 32, 61, 32, 116, 97, 114, 103, 101, + 116, 77, 97, 114, 107, 101, 114, 59, 10, 9, 32, 32, 32, 32, 32, + 32, 32, 32, 32, 32, 32, 32, 84, 114, 97, 110, 115, 109, 105, 116, + 116, 101, 114, 115, 32, 91, 116, 114, 97, 110, 115, 109, 105, 116, 116, + 101, 114, 73, 110, 100, 101, 120, 93, 32, 61, 32, 116, 97, 114, 103, + 101, 116, 59, 10, 9, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, + 32, 32, 116, 114, 97, 110, 115, 109, 105, 116, 116, 101, 114, 73, 110, + 100, 101, 120, 32, 43, 43, 59, 10, 9, 32, 32, 32, 32, 32, 32, + 32, 32, 32, 32, 32, 32, 116, 97, 114, 103, 101, 116, 46, 32, 109, + 97, 114, 107, 101, 114, 46, 10, 9, 32, 32, 32, 32, 32, 32, 32, + 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 97, 100, + 100, 69, 118, 101, 110, 116, 76, 105, 115, 116, 101, 110, 101, 114, 32, + 40, 39, 99, 108, 105, 99, 107, 39, 44, 10, 9, 32, 32, 32, 32, + 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, - 32, 32, 116, 97, 114, 103, 101, 116, 46, 32, 108, 111, 110, 32, 43, - 32, 32, 39, 60, 47, 115, 112, 97, 110, 62, 39, 59, 10, 9, 32, + 32, 32, 32, 32, 32, 102, 117, 110, 99, 116, 105, 111, 110, 32, 40, + 41, 32, 123, 32, 115, 101, 108, 101, 99, 116, 84, 114, 97, 110, 115, + 109, 105, 116, 116, 101, 114, 67, 97, 108, 108, 98, 97, 99, 107, 32, + 40, 116, 97, 114, 103, 101, 116, 41, 59, 125, 41, 59, 10, 9, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 108, 101, 116, 32, - 120, 120, 32, 61, 32, 100, 111, 99, 117, 109, 101, 110, 116, 46, 32, - 103, 101, 116, 69, 108, 101, 109, 101, 110, 116, 66, 121, 73, 100, 32, - 40, 39, 115, 101, 108, 105, 110, 102, 111, 39, 41, 59, 10, 9, 32, - 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 120, 120, 46, 32, - 105, 110, 110, 101, 114, 72, 84, 77, 76, 32, 43, 61, 32, 110, 101, - 119, 67, 104, 97, 110, 110, 101, 108, 32, 43, 32, 39, 61, 62, 39, - 32, 43, 10, 9, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, + 110, 101, 119, 67, 104, 97, 110, 110, 101, 108, 32, 61, 32, 39, 60, + 115, 112, 97, 110, 32, 115, 116, 121, 108, 101, 61, 92, 34, 102, 111, + 110, 116, 45, 119, 101, 105, 103, 104, 116, 58, 98, 111, 108, 100, 59, + 102, 111, 110, 116, 45, 115, 105, 122, 101, 58, 49, 50, 48, 37, 92, + 34, 62, 39, 32, 43, 32, 116, 97, 114, 103, 101, 116, 46, 32, 99, + 104, 97, 110, 110, 101, 108, 32, 43, 32, 39, 60, 47, 115, 112, 97, + 110, 62, 39, 59, 10, 9, 32, 32, 32, 32, 32, 32, 32, 32, 32, + 32, 32, 32, 108, 101, 116, 32, 99, 111, 111, 114, 100, 115, 32, 61, + 32, 39, 60, 115, 112, 97, 110, 32, 115, 116, 121, 108, 101, 61, 92, + 34, 102, 111, 110, 116, 45, 115, 116, 121, 108, 101, 58, 32, 105, 116, + 97, 108, 105, 99, 59, 92, 34, 62, 39, 32, 43, 10, 9, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, - 32, 32, 32, 116, 97, 114, 103, 101, 116, 46, 32, 110, 97, 109, 101, - 32, 32, 32, 32, 43, 32, 39, 60, 98, 114, 62, 39, 32, 43, 10, + 32, 32, 32, 32, 32, 32, 32, 32, 32, 116, 97, 114, 103, 101, 116, + 46, 32, 108, 97, 116, 32, 43, 32, 39, 45, 45, 39, 32, 43, 10, 9, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, + 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 116, 97, 114, + 103, 101, 116, 46, 32, 108, 111, 110, 32, 43, 32, 32, 39, 60, 47, + 115, 112, 97, 110, 62, 39, 59, 10, 9, 32, 32, 32, 32, 32, 32, + 32, 32, 32, 32, 32, 32, 108, 101, 116, 32, 120, 120, 32, 61, 32, + 100, 111, 99, 117, 109, 101, 110, 116, 46, 32, 103, 101, 116, 69, 108, + 101, 109, 101, 110, 116, 66, 121, 73, 100, 32, 40, 39, 115, 101, 108, + 105, 110, 102, 111, 39, 41, 59, 10, 9, 32, 32, 32, 32, 32, 32, + 32, 32, 32, 32, 32, 32, 120, 120, 46, 32, 105, 110, 110, 101, 114, + 72, 84, 77, 76, 32, 43, 61, 32, 110, 101, 119, 67, 104, 97, 110, + 110, 101, 108, 32, 43, 32, 39, 61, 62, 39, 32, 43, 10, 9, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, - 99, 111, 111, 114, 100, 115, 32, 43, 32, 39, 60, 98, 114, 62, 39, - 59, 10, 9, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, - 108, 101, 116, 32, 121, 121, 32, 61, 32, 100, 111, 99, 117, 109, 101, - 110, 116, 46, 32, 103, 101, 116, 69, 108, 101, 109, 101, 110, 116, 66, - 121, 73, 100, 32, 40, 39, 115, 101, 108, 67, 111, 117, 110, 116, 39, - 41, 59, 10, 9, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, - 32, 121, 121, 46, 32, 105, 110, 110, 101, 114, 72, 84, 77, 76, 32, - 61, 32, 39, 110, 117, 109, 98, 101, 114, 32, 111, 102, 32, 116, 114, - 97, 110, 115, 109, 105, 116, 116, 101, 114, 115, 32, 39, 32, 43, 32, - 116, 114, 97, 110, 115, 109, 105, 116, 116, 101, 114, 73, 110, 100, 101, - 120, 59, 10, 9, 32, 32, 32, 32, 32, 32, 32, 32, 32, 125, 10, - 9, 32, 32, 32, 32, 32, 32, 125, 10, 9, 32, 32, 32, 125, 41, - 59, 10, 9, 32, 32, 32, 125, 10, 10, 9, 32, 32, 32, 102, 117, - 110, 99, 116, 105, 111, 110, 32, 105, 110, 105, 116, 105, 97, 108, 105, - 122, 101, 32, 40, 41, 32, 123, 10, 9, 32, 32, 32, 32, 32, 32, - 77, 97, 112, 32, 61, 32, 76, 46, 109, 97, 112, 32, 40, 39, 109, - 97, 112, 95, 99, 97, 110, 118, 97, 115, 39, 41, 46, 115, 101, 116, - 86, 105, 101, 119, 40, 91, 104, 111, 109, 101, 76, 97, 116, 105, 116, - 117, 100, 101, 44, 32, 104, 111, 109, 101, 76, 111, 110, 103, 105, 116, - 117, 100, 101, 93, 44, 32, 56, 41, 59, 10, 10, 9, 32, 32, 32, - 32, 32, 32, 76, 46, 116, 105, 108, 101, 76, 97, 121, 101, 114, 32, - 40, 39, 104, 116, 116, 112, 115, 58, 47, 47, 123, 115, 125, 46, 116, - 105, 108, 101, 46, 111, 112, 101, 110, 115, 116, 114, 101, 101, 116, 109, - 97, 112, 46, 111, 114, 103, 47, 123, 122, 125, 47, 123, 120, 125, 47, - 123, 121, 125, 46, 112, 110, 103, 39, 44, 32, 123, 10, 9, 32, 32, - 32, 32, 32, 32, 97, 116, 116, 114, 105, 98, 117, 116, 105, 111, 110, - 58, 32, 39, 77, 97, 112, 32, 100, 97, 116, 97, 32, 38, 99, 111, - 112, 121, 59, 32, 60, 97, 32, 104, 114, 101, 102, 61, 34, 104, 116, - 116, 112, 115, 58, 47, 47, 119, 119, 119, 46, 111, 112, 101, 110, 115, - 116, 114, 101, 101, 116, 109, 97, 112, 46, 111, 114, 103, 47, 34, 62, - 79, 112, 101, 110, 83, 116, 114, 101, 101, 116, 77, 97, 112, 60, 47, - 97, 62, 32, 99, 111, 110, 116, 114, 105, 98, 117, 116, 111, 114, 115, - 44, 32, 60, 97, 32, 104, 114, 101, 102, 61, 34, 104, 116, 116, 112, - 115, 58, 47, 47, 99, 114, 101, 97, 116, 105, 118, 101, 99, 111, 109, - 109, 111, 110, 115, 46, 111, 114, 103, 47, 108, 105, 99, 101, 110, 115, - 101, 115, 47, 98, 121, 45, 115, 97, 47, 50, 46, 48, 47, 34, 62, - 67, 67, 45, 66, 89, 45, 83, 65, 60, 47, 97, 62, 44, 32, 73, - 109, 97, 103, 101, 114, 121, 32, 194, 169, 32, 60, 97, 32, 104, 114, - 101, 102, 61, 34, 104, 116, 116, 112, 115, 58, 47, 47, 119, 119, 119, - 46, 109, 97, 112, 98, 111, 120, 46, 99, 111, 109, 47, 34, 62, 77, - 97, 112, 98, 111, 120, 60, 47, 97, 62, 39, 44, 10, 9, 32, 32, - 32, 32, 32, 32, 32, 109, 97, 120, 90, 111, 111, 109, 58, 32, 49, - 56, 44, 10, 9, 32, 32, 32, 32, 32, 32, 32, 105, 100, 58, 32, - 39, 109, 97, 112, 98, 111, 120, 47, 115, 116, 114, 101, 101, 116, 115, - 45, 118, 49, 49, 39, 44, 10, 9, 32, 32, 32, 32, 32, 32, 32, - 97, 99, 99, 101, 115, 115, 84, 111, 107, 101, 110, 58, 32, 39, 121, - 111, 117, 114, 46, 109, 97, 112, 98, 111, 120, 46, 97, 99, 99, 101, - 115, 115, 46, 116, 111, 107, 101, 110, 39, 10, 9, 32, 32, 32, 125, - 41, 46, 97, 100, 100, 84, 111, 40, 77, 97, 112, 41, 59, 10, 10, - 9, 32, 32, 32, 118, 97, 114, 32, 105, 99, 111, 110, 32, 61, 32, - 103, 101, 116, 73, 99, 111, 110, 70, 111, 114, 72, 111, 109, 101, 32, - 40, 41, 59, 10, 9, 32, 32, 32, 118, 97, 114, 32, 104, 111, 109, - 101, 77, 97, 114, 107, 101, 114, 32, 61, 32, 76, 46, 109, 97, 114, - 107, 101, 114, 40, 91, 104, 111, 109, 101, 76, 97, 116, 105, 116, 117, - 100, 101, 44, 10, 9, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, + 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 116, 97, + 114, 103, 101, 116, 46, 32, 110, 97, 109, 101, 32, 32, 32, 32, 43, + 32, 39, 60, 98, 114, 62, 39, 32, 43, 10, 9, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, - 32, 32, 32, 32, 32, 104, 111, 109, 101, 76, 111, 110, 103, 105, 116, - 117, 100, 101, 93, 44, 32, 123, 105, 99, 111, 110, 58, 32, 105, 99, - 111, 110, 125, 41, 46, 97, 100, 100, 84, 111, 40, 77, 97, 112, 41, - 59, 10, 10, 47, 42, 32, 83, 101, 116, 117, 112, 32, 111, 117, 114, - 32, 116, 105, 109, 101, 114, 32, 116, 111, 32, 112, 111, 108, 108, 32, - 102, 114, 111, 109, 32, 116, 104, 101, 32, 115, 101, 114, 118, 101, 114, - 46, 32, 42, 47, 10, 9, 32, 32, 32, 119, 105, 110, 100, 111, 119, - 46, 115, 101, 116, 73, 110, 116, 101, 114, 118, 97, 108, 40, 102, 117, - 110, 99, 116, 105, 111, 110, 32, 40, 41, 32, 123, 10, 9, 32, 32, - 32, 32, 32, 32, 102, 101, 116, 99, 104, 68, 97, 116, 97, 32, 40, - 41, 59, 10, 9, 32, 32, 32, 125, 44, 32, 50, 48, 48, 48, 41, - 59, 10, 9, 125, 10, 10, 9, 102, 117, 110, 99, 116, 105, 111, 110, - 32, 115, 101, 108, 101, 99, 116, 84, 114, 97, 110, 115, 109, 105, 116, - 116, 101, 114, 67, 97, 108, 108, 98, 97, 99, 107, 32, 40, 110, 97, - 109, 101, 41, 32, 123, 10, 9, 32, 32, 32, 108, 101, 116, 32, 120, - 120, 32, 61, 32, 100, 111, 99, 117, 109, 101, 110, 116, 46, 32, 103, + 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 99, 111, 111, 114, 100, + 115, 32, 43, 32, 39, 60, 98, 114, 62, 39, 59, 10, 9, 32, 32, + 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 108, 101, 116, 32, 121, + 121, 32, 61, 32, 100, 111, 99, 117, 109, 101, 110, 116, 46, 32, 103, 101, 116, 69, 108, 101, 109, 101, 110, 116, 66, 121, 73, 100, 32, 40, - 39, 115, 101, 108, 105, 110, 102, 111, 39, 41, 59, 10, 9, 32, 32, - 32, 120, 120, 46, 32, 105, 110, 110, 101, 114, 72, 84, 77, 76, 32, - 61, 32, 110, 97, 109, 101, 32, 43, 39, 60, 98, 114, 62, 39, 59, - 10, 9, 125, 10, 10, 60, 47, 115, 99, 114, 105, 112, 116, 62, 10, - 60, 47, 104, 101, 97, 100, 62, 10, 9, 60, 98, 111, 100, 121, 32, - 111, 110, 108, 111, 97, 100, 61, 34, 105, 110, 105, 116, 105, 97, 108, - 105, 122, 101, 40, 41, 34, 62, 10, 9, 60, 100, 105, 118, 32, 105, - 100, 61, 34, 109, 97, 112, 95, 99, 97, 110, 118, 97, 115, 34, 32, - 115, 116, 121, 108, 101, 61, 34, 119, 105, 100, 116, 104, 58, 56, 48, - 37, 59, 32, 104, 101, 105, 103, 104, 116, 58, 49, 48, 48, 37, 34, - 62, 60, 47, 100, 105, 118, 62, 10, 9, 60, 100, 105, 118, 32, 105, - 100, 61, 34, 105, 110, 102, 111, 34, 62, 10, 9, 60, 100, 105, 118, - 62, 10, 9, 32, 32, 32, 60, 104, 49, 62, 81, 116, 45, 68, 65, - 66, 60, 47, 104, 49, 62, 10, 9, 32, 32, 32, 60, 112, 32, 105, - 100, 61, 34, 115, 101, 108, 105, 110, 102, 111, 34, 62, 60, 47, 112, - 62, 10, 9, 32, 32, 32, 60, 112, 32, 105, 100, 61, 34, 115, 101, - 108, 67, 111, 117, 110, 116, 34, 62, 60, 47, 112, 62, 10, 9, 60, - 47, 100, 105, 118, 62, 10, 9, 60, 47, 100, 105, 118, 62, 10, 32, - 32, 60, 47, 98, 111, 100, 121, 62, 10, 60, 47, 104, 116, 109, 108, - 62, 10, - 0}; + 39, 115, 101, 108, 67, 111, 117, 110, 116, 39, 41, 59, 10, 9, 32, + 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 121, 121, 46, 32, + 105, 110, 110, 101, 114, 72, 84, 77, 76, 32, 61, 32, 39, 110, 117, + 109, 98, 101, 114, 32, 111, 102, 32, 116, 114, 97, 110, 115, 109, 105, + 116, 116, 101, 114, 115, 32, 39, 32, 43, 32, 116, 114, 97, 110, 115, + 109, 105, 116, 116, 101, 114, 73, 110, 100, 101, 120, 59, 10, 9, 32, + 32, 32, 32, 32, 32, 32, 32, 32, 125, 10, 9, 32, 32, 32, 32, + 32, 32, 125, 10, 9, 32, 32, 32, 125, 41, 59, 10, 9, 32, 32, + 32, 125, 10, 10, 9, 32, 32, 32, 102, 117, 110, 99, 116, 105, 111, + 110, 32, 105, 110, 105, 116, 105, 97, 108, 105, 122, 101, 32, 40, 41, + 32, 123, 10, 9, 32, 32, 32, 32, 32, 32, 77, 97, 112, 32, 61, + 32, 76, 46, 109, 97, 112, 32, 40, 39, 109, 97, 112, 95, 99, 97, + 110, 118, 97, 115, 39, 41, 46, 115, 101, 116, 86, 105, 101, 119, 40, + 91, 104, 111, 109, 101, 76, 97, 116, 105, 116, 117, 100, 101, 44, 32, + 104, 111, 109, 101, 76, 111, 110, 103, 105, 116, 117, 100, 101, 93, 44, + 32, 56, 41, 59, 10, 10, 9, 32, 32, 32, 32, 32, 32, 76, 46, + 116, 105, 108, 101, 76, 97, 121, 101, 114, 32, 40, 39, 104, 116, 116, + 112, 115, 58, 47, 47, 123, 115, 125, 46, 116, 105, 108, 101, 46, 111, + 112, 101, 110, 115, 116, 114, 101, 101, 116, 109, 97, 112, 46, 111, 114, + 103, 47, 123, 122, 125, 47, 123, 120, 125, 47, 123, 121, 125, 46, 112, + 110, 103, 39, 44, 32, 123, 10, 9, 32, 32, 32, 32, 32, 32, 97, + 116, 116, 114, 105, 98, 117, 116, 105, 111, 110, 58, 32, 39, 77, 97, + 112, 32, 100, 97, 116, 97, 32, 38, 99, 111, 112, 121, 59, 32, 60, + 97, 32, 104, 114, 101, 102, 61, 34, 104, 116, 116, 112, 115, 58, 47, + 47, 119, 119, 119, 46, 111, 112, 101, 110, 115, 116, 114, 101, 101, 116, + 109, 97, 112, 46, 111, 114, 103, 47, 34, 62, 79, 112, 101, 110, 83, + 116, 114, 101, 101, 116, 77, 97, 112, 60, 47, 97, 62, 32, 99, 111, + 110, 116, 114, 105, 98, 117, 116, 111, 114, 115, 44, 32, 60, 97, 32, + 104, 114, 101, 102, 61, 34, 104, 116, 116, 112, 115, 58, 47, 47, 99, + 114, 101, 97, 116, 105, 118, 101, 99, 111, 109, 109, 111, 110, 115, 46, + 111, 114, 103, 47, 108, 105, 99, 101, 110, 115, 101, 115, 47, 98, 121, + 45, 115, 97, 47, 50, 46, 48, 47, 34, 62, 67, 67, 45, 66, 89, + 45, 83, 65, 60, 47, 97, 62, 44, 32, 73, 109, 97, 103, 101, 114, + 121, 32, 194, 169, 32, 60, 97, 32, 104, 114, 101, 102, 61, 34, 104, + 116, 116, 112, 115, 58, 47, 47, 119, 119, 119, 46, 109, 97, 112, 98, + 111, 120, 46, 99, 111, 109, 47, 34, 62, 77, 97, 112, 98, 111, 120, + 60, 47, 97, 62, 39, 44, 10, 9, 32, 32, 32, 32, 32, 32, 32, + 109, 97, 120, 90, 111, 111, 109, 58, 32, 49, 56, 44, 10, 9, 32, + 32, 32, 32, 32, 32, 32, 105, 100, 58, 32, 39, 109, 97, 112, 98, + 111, 120, 47, 115, 116, 114, 101, 101, 116, 115, 45, 118, 49, 49, 39, + 44, 10, 9, 32, 32, 32, 32, 32, 32, 32, 97, 99, 99, 101, 115, + 115, 84, 111, 107, 101, 110, 58, 32, 39, 121, 111, 117, 114, 46, 109, + 97, 112, 98, 111, 120, 46, 97, 99, 99, 101, 115, 115, 46, 116, 111, + 107, 101, 110, 39, 10, 9, 32, 32, 32, 125, 41, 46, 97, 100, 100, + 84, 111, 40, 77, 97, 112, 41, 59, 10, 10, 9, 32, 32, 32, 118, + 97, 114, 32, 105, 99, 111, 110, 32, 61, 32, 103, 101, 116, 73, 99, + 111, 110, 70, 111, 114, 72, 111, 109, 101, 32, 40, 41, 59, 10, 9, + 32, 32, 32, 118, 97, 114, 32, 104, 111, 109, 101, 77, 97, 114, 107, + 101, 114, 32, 61, 32, 76, 46, 109, 97, 114, 107, 101, 114, 40, 91, + 104, 111, 109, 101, 76, 97, 116, 105, 116, 117, 100, 101, 44, 10, 9, + 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, + 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, + 104, 111, 109, 101, 76, 111, 110, 103, 105, 116, 117, 100, 101, 93, 44, + 32, 123, 105, 99, 111, 110, 58, 32, 105, 99, 111, 110, 125, 41, 46, + 97, 100, 100, 84, 111, 40, 77, 97, 112, 41, 59, 10, 10, 47, 42, + 32, 83, 101, 116, 117, 112, 32, 111, 117, 114, 32, 116, 105, 109, 101, + 114, 32, 116, 111, 32, 112, 111, 108, 108, 32, 102, 114, 111, 109, 32, + 116, 104, 101, 32, 115, 101, 114, 118, 101, 114, 46, 32, 42, 47, 10, + 9, 32, 32, 32, 119, 105, 110, 100, 111, 119, 46, 115, 101, 116, 73, + 110, 116, 101, 114, 118, 97, 108, 40, 102, 117, 110, 99, 116, 105, 111, + 110, 32, 40, 41, 32, 123, 10, 9, 32, 32, 32, 32, 32, 32, 102, + 101, 116, 99, 104, 68, 97, 116, 97, 32, 40, 41, 59, 10, 9, 32, + 32, 32, 125, 44, 32, 50, 48, 48, 48, 41, 59, 10, 9, 125, 10, + 10, 9, 102, 117, 110, 99, 116, 105, 111, 110, 32, 115, 101, 108, 101, + 99, 116, 84, 114, 97, 110, 115, 109, 105, 116, 116, 101, 114, 67, 97, + 108, 108, 98, 97, 99, 107, 32, 40, 116, 97, 114, 103, 101, 116, 41, + 32, 123, 10, 9, 32, 32, 32, 108, 101, 116, 32, 120, 120, 32, 61, + 32, 100, 111, 99, 117, 109, 101, 110, 116, 46, 32, 103, 101, 116, 69, + 108, 101, 109, 101, 110, 116, 66, 121, 73, 100, 32, 40, 39, 115, 101, + 108, 101, 99, 116, 101, 100, 39, 41, 59, 10, 9, 32, 32, 32, 108, + 101, 116, 32, 110, 101, 119, 67, 104, 97, 110, 110, 101, 108, 32, 61, + 32, 39, 60, 115, 112, 97, 110, 32, 115, 116, 121, 108, 101, 61, 92, + 34, 102, 111, 110, 116, 45, 119, 101, 105, 103, 104, 116, 58, 98, 111, + 108, 100, 59, 102, 111, 110, 116, 45, 115, 105, 122, 101, 58, 49, 50, + 48, 37, 92, 34, 62, 39, 32, 43, 32, 116, 97, 114, 103, 101, 116, + 46, 32, 99, 104, 97, 110, 110, 101, 108, 32, 43, 32, 39, 60, 47, + 115, 112, 97, 110, 62, 39, 59, 10, 9, 32, 32, 32, 108, 101, 116, + 32, 99, 111, 111, 114, 100, 115, 32, 61, 32, 39, 60, 115, 112, 97, + 110, 32, 115, 116, 121, 108, 101, 61, 92, 34, 102, 111, 110, 116, 45, + 115, 116, 121, 108, 101, 58, 32, 105, 116, 97, 108, 105, 99, 59, 92, + 34, 62, 39, 32, 43, 10, 9, 32, 32, 32, 32, 32, 32, 32, 32, + 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, + 32, 32, 32, 116, 97, 114, 103, 101, 116, 46, 32, 108, 97, 116, 32, + 43, 32, 39, 45, 45, 39, 32, 43, 10, 9, 32, 32, 32, 32, 32, + 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, + 32, 32, 32, 32, 32, 32, 116, 97, 114, 103, 101, 116, 46, 32, 108, + 111, 110, 32, 43, 32, 32, 39, 60, 47, 115, 112, 97, 110, 62, 39, + 59, 10, 9, 32, 32, 32, 120, 120, 46, 32, 105, 110, 110, 101, 114, + 72, 84, 77, 76, 32, 61, 32, 39, 83, 101, 108, 101, 99, 116, 101, + 100, 58, 32, 32, 39, 32, 43, 32, 39, 60, 98, 114, 62, 39, 32, + 43, 10, 9, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, + 32, 32, 32, 32, 32, 32, 32, 32, 110, 101, 119, 67, 104, 97, 110, + 110, 101, 108, 32, 43, 32, 39, 61, 62, 39, 32, 43, 10, 9, 32, + 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, + 32, 32, 32, 32, 116, 97, 114, 103, 101, 116, 46, 32, 110, 97, 109, + 101, 32, 32, 32, 32, 43, 32, 39, 60, 98, 114, 62, 39, 32, 43, + 10, 9, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, + 32, 32, 32, 32, 32, 32, 32, 99, 111, 111, 114, 100, 115, 32, 43, + 32, 39, 60, 98, 114, 62, 39, 32, 43, 10, 9, 32, 32, 32, 32, + 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, + 32, 39, 68, 105, 115, 116, 97, 110, 99, 101, 32, 116, 111, 32, 104, + 111, 109, 101, 32, 39, 32, 43, 32, 116, 97, 114, 103, 101, 116, 46, + 32, 100, 105, 115, 116, 32, 43, 32, 39, 107, 109, 60, 98, 114, 62, + 39, 59, 10, 9, 125, 10, 10, 60, 47, 115, 99, 114, 105, 112, 116, + 62, 10, 60, 47, 104, 101, 97, 100, 62, 10, 9, 60, 98, 111, 100, + 121, 32, 111, 110, 108, 111, 97, 100, 61, 34, 105, 110, 105, 116, 105, + 97, 108, 105, 122, 101, 40, 41, 34, 62, 10, 9, 60, 100, 105, 118, + 32, 105, 100, 61, 34, 109, 97, 112, 95, 99, 97, 110, 118, 97, 115, + 34, 32, 115, 116, 121, 108, 101, 61, 34, 119, 105, 100, 116, 104, 58, + 56, 48, 37, 59, 32, 104, 101, 105, 103, 104, 116, 58, 49, 48, 48, + 37, 34, 62, 60, 47, 100, 105, 118, 62, 10, 9, 60, 100, 105, 118, + 32, 105, 100, 61, 34, 105, 110, 102, 111, 34, 62, 10, 9, 60, 100, + 105, 118, 62, 10, 9, 32, 32, 32, 60, 104, 49, 62, 81, 116, 45, + 68, 65, 66, 60, 47, 104, 49, 62, 10, 9, 32, 32, 32, 60, 112, + 32, 105, 100, 61, 34, 115, 101, 108, 105, 110, 102, 111, 34, 62, 60, + 47, 112, 62, 10, 9, 32, 32, 32, 60, 112, 32, 105, 100, 61, 34, + 115, 101, 108, 67, 111, 117, 110, 116, 34, 62, 60, 47, 112, 62, 10, + 9, 32, 32, 32, 60, 112, 32, 105, 100, 61, 34, 115, 101, 108, 101, + 99, 116, 101, 100, 34, 62, 60, 47, 112, 62, 10, 9, 60, 47, 100, + 105, 118, 62, 10, 9, 60, 47, 100, 105, 118, 62, 10, 32, 32, 60, + 47, 98, 111, 100, 121, 62, 10, 60, 47, 104, 116, 109, 108, 62, 10, + 0}; diff --git a/dab-maxi/http-handler.cpp b/dab-maxi/http-handler.cpp index 07051247..44d10d2b 100644 --- a/dab-maxi/http-handler.cpp +++ b/dab-maxi/http-handler.cpp @@ -449,20 +449,22 @@ QString Jsontxt; locker. lock (); // the Target snprintf (buf, 512, - "{\"lat\":%s, \"lon\":%s, \"name\":\"%s\", \"channel\":\"%s\"}", + "{\"lat\":%s, \"lon\":%s, \"name\":\"%s\", \"channel\":\"%s\", \"dist\":%d}", dotNumber (real (t [0]. coords)). c_str (), dotNumber (imag (t [0]. coords)). c_str (), t [0]. transmitterName. toUtf8 (). data (), - t [0]. channelName. toUtf8 (). data ()); + t [0]. channelName. toUtf8 (). data (), + t [0]. distance); Jsontxt += QString (buf); for (int i = 1; i < t. size (); i ++) { snprintf (buf, 512, - ",\n{\"lat\":%s, \"lon\":%s, \"name\":\"%s\", \"channel\":\"%s\"}", + ",\n{\"lat\":%s, \"lon\":%s, \"name\":\"%s\", \"channel\":\"%s\", \"dist\":%d}", dotNumber (real (t [i]. coords)). c_str (), dotNumber (imag (t [i]. coords)). c_str (), t [i]. transmitterName. toUtf8 (). data (), - t [i]. channelName. toUtf8 (). data ()); + t [i]. channelName. toUtf8 (). data (), + t [i]. distance); Jsontxt += QString (buf); } t. resize (0); @@ -474,7 +476,8 @@ QString Jsontxt; void httpHandler::putData (std::complex target, QString transmitterName, - QString channelName) { + QString channelName, + int distance) { for (int i = 0; i < transmitterList. size (); i ++) if (transmitterList [i]. coords == target) return; @@ -483,6 +486,7 @@ void httpHandler::putData (std::complex target, t. coords = target; t. transmitterName = transmitterName; t. channelName = channelName; + t. distance = distance; locker. lock (); transmitterList. push_back (t); locker. unlock (); diff --git a/dab-maxi/http-handler.h b/dab-maxi/http-handler.h index 7f0cc355..85251949 100644 --- a/dab-maxi/http-handler.h +++ b/dab-maxi/http-handler.h @@ -38,6 +38,7 @@ typedef struct { std::complex coords; QString transmitterName; QString channelName; + int distance; } httpData; class httpHandler: public QObject { @@ -54,7 +55,7 @@ Q_OBJECT void run (); void putData (std::complextarget, QString transmittername, - QString channelName); + QString channelName, int distance); private: RadioInterface *parent; int port; diff --git a/dab-maxi/map/qt-map.html b/dab-maxi/map/qt-map.html index 4531af53..789ced59 100644 --- a/dab-maxi/map/qt-map.html +++ b/dab-maxi/map/qt-map.html @@ -98,6 +98,9 @@ let icon = getIconForTransmitter (0); let target = Transmitters [i]; let targetMarker = L.marker([target.lat, target.lon], {icon: icon}).addTo(Map); + targetMarker. + addEventListener ('click', + function () { selectTransmitterCallback (target);}); Transmitters [i]. marker = targetMarker; } } @@ -120,7 +123,9 @@ target. marker = targetMarker; Transmitters [transmitterIndex] = target; transmitterIndex ++; - + target. marker. + addEventListener ('click', + function () { selectTransmitterCallback (target);}); let newChannel = '' + target. channel + ''; let coords = '' + target. lat + '--' + @@ -156,9 +161,17 @@ }, 2000); } - function selectTransmitterCallback (name) { - let xx = document. getElementById ('selinfo'); - xx. innerHTML = name +'
'; + function selectTransmitterCallback (target) { + let xx = document. getElementById ('selected'); + let newChannel = '' + target. channel + ''; + let coords = '' + + target. lat + '--' + + target. lon + ''; + xx. innerHTML = 'Selected: ' + '
' + + newChannel + '=>' + + target. name + '
' + + coords + '
' + + 'Distance to home ' + target. dist + 'km
'; } @@ -170,6 +183,7 @@

Qt-DAB

+

diff --git a/dab-maxi/qt-dab.pro b/dab-maxi/qt-dab.pro index f8175d32..dec98ac7 100755 --- a/dab-maxi/qt-dab.pro +++ b/dab-maxi/qt-dab.pro @@ -298,7 +298,7 @@ SOURCES += ./main.cpp \ # unix { DESTDIR = ./linux-bin -TARGET = qt-dab-4.4 +TARGET = qt-dab-4.4.1 exists ("../.git") { GITHASHSTRING = $$system(git rev-parse --short HEAD) !isEmpty(GITHASHSTRING) { @@ -379,7 +379,7 @@ isEmpty(GITHASHSTRING) { } ##for for 64 bit -# TARGET = qt-dab64-4.4 +# TARGET = qt-dab64-4.4.1 # DEFINES += __BITS64__ # DESTDIR = /usr/shared/w64-programs/windows-dab64-qt # INCLUDEPATH += /usr/x64-w64-mingw32/sys-root/mingw/include @@ -399,7 +399,7 @@ isEmpty(GITHASHSTRING) { # DEFINES += __THREADED_BACKEND # #for win32, comment out the lines above - TARGET = qt-dab32-4.4 + TARGET = qt-dab32-4.4.1 DESTDIR = /usr/shared/w32-programs/windows-dab32-qt INCLUDEPATH += /usr/i686-w64-mingw32/sys-root/mingw/include INCLUDEPATH += /usr/i686-w64-mingw32/sys-root/mingw/include/qt5/qwt diff --git a/dab-maxi/radio.cpp b/dab-maxi/radio.cpp index 15ec3077..3430b21b 100755 --- a/dab-maxi/radio.cpp +++ b/dab-maxi/radio.cpp @@ -309,9 +309,10 @@ uint8_t dabBand; filePath = dabSettings -> value ("filePath", ""). toString (); if ((filePath != "") && (!filePath. endsWith ("/"))) filePath = filePath + "/"; - + setWindowFlags (windowFlags () | Qt::WindowStaysOnTopHint); // The settings are done, now creation of the GUI parts setupUi (this); + QWidget::raise (); // // dataDisplay = new QFrame (nullptr); techData. setupUi (&dataDisplay); @@ -2132,10 +2133,6 @@ bool tiiChange = false; theName); channel. targetPos = std::complex (latitude, longitude); - if (mapHandler != nullptr) - mapHandler -> putData (channel. targetPos, - channel. transmitterName, - channel. channelName); LOG ("transmitter ", channel. transmitterName); LOG ("coordinates ", QString::number (latitude) + " " + @@ -2151,6 +2148,11 @@ bool tiiChange = false; int distance = tiiProcessor. distance (latitude, longitude, ownLatitude, ownLongitude); + if (mapHandler != nullptr) + mapHandler -> putData (channel. targetPos, + channel. transmitterName, + channel. channelName, + distance); int hoek = tiiProcessor. corner (latitude, longitude, ownLatitude, ownLongitude); @@ -3413,10 +3415,10 @@ int tunedFrequency = channel. frequency = tunedFrequency / 1000; channel. targetPos = std::complex (0, 0); if (!transmitterTags_on && (mapHandler != nullptr)) - mapHandler -> putData (std::complex (0, 0), "", ""); + mapHandler -> putData (std::complex (0, 0), "", "", 0); else if (mapHandler != nullptr) - mapHandler -> putData (std::complex(-1, -1), "", ""); + mapHandler -> putData (std::complex(-1, -1), "", "", 0); show_for_safety (); int switchDelay = dabSettings -> value ("switchDelay", 8). toInt (); @@ -3475,7 +3477,7 @@ void RadioInterface::stopChannel () { channel. transmitterName = ""; channel. targetPos = std::complex (0, 0); if (!transmitterTags_on && (mapHandler != nullptr)) - mapHandler -> putData (channel. targetPos, "", ""); + mapHandler -> putData (channel. targetPos, "", "", 0); transmitter_country -> setText (""); transmitter_coordinates -> setText (""); @@ -4678,7 +4680,7 @@ void RadioInterface::handle_transmitterTags () { setText (transmitterTags_on ? "all transm" : "local transm"); dabSettings -> setValue ("transmitterTags", transmitterTags_on ? 1 : 0); channel. targetPos = std::complex (0, 0); - if (!transmitterTags_on) - mapHandler -> putData (channel. targetPos, "", ""); + if ((!transmitterTags_on) && (mapHandler != nullptr)) + mapHandler -> putData (channel. targetPos, "", "", 0); } diff --git a/forms/dabradio.ui b/forms/dabradio.ui index 4e743c66..15b502b2 100755 --- a/forms/dabradio.ui +++ b/forms/dabradio.ui @@ -17,7 +17,7 @@ - Qt-DAB-4.4 + Qt-DAB-4.4.1 diff --git a/includes/dab-constants.h b/includes/dab-constants.h index 2f5a3926..511ba4ce 100755 --- a/includes/dab-constants.h +++ b/includes/dab-constants.h @@ -65,7 +65,7 @@ using namespace std; #define MHz(x) (KHz (x) * 1000) #define mHz(x) (kHz (x) * 1000) -#define CURRENT_VERSION "4.4" +#define CURRENT_VERSION "4.4.1" #define DAB 0100 #define DAB_PLUS 0101