diff --git a/CMakeLists.txt b/CMakeLists.txt index 2bb2f10..88db103 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -8,6 +8,7 @@ set(CMAKE_CXX_STANDARD 14) set(CMAKE_INCLUDE_CURRENT_DIR ON) set(CMAKE_AUTOMOC ON) set(CMAKE_AUTOUIC ON) +set(CMAKE_AUTORCC ON) find_package(Qt5 COMPONENTS Core Gui OpenGL Widgets Xml Network REQUIRED) @@ -42,11 +43,11 @@ set(SOURCES src/appconfig.cpp src/glpoint.cpp src/gltrafficsign.cpp - src/qrc_resources.cpp src/osiparser.cpp src/glfieldofview.cpp src/fmureceiver.cpp src/utils.cpp + resources.qrc ) set(HEADERS diff --git a/resources.qrc b/resources.qrc new file mode 100644 index 0000000..a680d0f --- /dev/null +++ b/resources.qrc @@ -0,0 +1,7 @@ + + + resources/Shaders/FragmentShader.frag + resources/Shaders/VertexShader.vert + resources/Images/Grid.png + + diff --git a/src/qrc_resources.cpp b/src/qrc_resources.cpp deleted file mode 100644 index 818bcd6..0000000 --- a/src/qrc_resources.cpp +++ /dev/null @@ -1,190 +0,0 @@ -/**************************************************************************** -** Resource object code -** -** Created by: The Resource Compiler for Qt version 5.7.1 -** -** WARNING! All changes made in this file will be lost! -*****************************************************************************/ - -static const unsigned char qt_resource_data[] = { - // /home/sensorik/Downloads/Visualization/Resources/Images/Grid.png - 0x0,0x0,0x1,0x9, - 0x89, - 0x50,0x4e,0x47,0xd,0xa,0x1a,0xa,0x0,0x0,0x0,0xd,0x49,0x48,0x44,0x52,0x0, - 0x0,0x0,0x40,0x0,0x0,0x0,0x40,0x8,0x6,0x0,0x0,0x0,0xaa,0x69,0x71,0xde, - 0x0,0x0,0x0,0x6,0x62,0x4b,0x47,0x44,0x0,0x0,0x0,0x0,0x0,0x0,0xf9,0x43, - 0xbb,0x7f,0x0,0x0,0x0,0x9,0x70,0x48,0x59,0x73,0x0,0x0,0xb,0x13,0x0,0x0, - 0xb,0x13,0x1,0x0,0x9a,0x9c,0x18,0x0,0x0,0x0,0x7,0x74,0x49,0x4d,0x45,0x7, - 0xe0,0xc,0x14,0xd,0x24,0xd,0x47,0x9a,0x92,0xa3,0x0,0x0,0x0,0x1d,0x69,0x54, - 0x58,0x74,0x43,0x6f,0x6d,0x6d,0x65,0x6e,0x74,0x0,0x0,0x0,0x0,0x0,0x43,0x72, - 0x65,0x61,0x74,0x65,0x64,0x20,0x77,0x69,0x74,0x68,0x20,0x47,0x49,0x4d,0x50,0x64, - 0x2e,0x65,0x7,0x0,0x0,0x0,0x6d,0x49,0x44,0x41,0x54,0x78,0xda,0xed,0xdb,0x41, - 0x1,0x0,0x30,0x8,0xc4,0xb0,0x31,0x75,0x87,0x7f,0x41,0xcc,0xc7,0x48,0x25,0xe4, - 0xdf,0xea,0x64,0xce,0xe6,0x36,0x3,0x74,0x32,0xf7,0x2c,0xf,0x0,0x0,0x0,0x0, - 0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0, - 0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0, - 0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0, - 0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x7f,0x54, - 0xdb,0xf7,0xf9,0x7,0x87,0x16,0x7,0xdd,0x6c,0xfd,0x68,0xfc,0x0,0x0,0x0,0x0, - 0x49,0x45,0x4e,0x44,0xae,0x42,0x60,0x82, - // /home/sensorik/Downloads/Visualization/Resources/Shaders/FragmentShader.frag - 0x0,0x0,0x1,0xfc, - 0x23, - 0x76,0x65,0x72,0x73,0x69,0x6f,0x6e,0x20,0x34,0x33,0x30,0xd,0xa,0xd,0xa,0x6c, - 0x61,0x79,0x6f,0x75,0x74,0x20,0x28,0x6c,0x6f,0x63,0x61,0x74,0x69,0x6f,0x6e,0x20, - 0x3d,0x20,0x30,0x29,0x20,0x69,0x6e,0x20,0x76,0x65,0x63,0x32,0x20,0x74,0x65,0x78, - 0x43,0x6f,0x6f,0x72,0x64,0x3b,0xd,0xa,0x6c,0x61,0x79,0x6f,0x75,0x74,0x20,0x28, - 0x6c,0x6f,0x63,0x61,0x74,0x69,0x6f,0x6e,0x20,0x3d,0x20,0x30,0x29,0x20,0x6f,0x75, - 0x74,0x20,0x76,0x65,0x63,0x34,0x20,0x66,0x72,0x61,0x67,0x43,0x6f,0x6c,0x6f,0x72, - 0x3b,0xd,0xa,0x6c,0x61,0x79,0x6f,0x75,0x74,0x20,0x28,0x62,0x69,0x6e,0x64,0x69, - 0x6e,0x67,0x20,0x3d,0x20,0x30,0x29,0x20,0x75,0x6e,0x69,0x66,0x6f,0x72,0x6d,0x20, - 0x73,0x61,0x6d,0x70,0x6c,0x65,0x72,0x32,0x44,0x20,0x6f,0x62,0x6a,0x65,0x63,0x74, - 0x54,0x65,0x78,0x74,0x75,0x72,0x65,0x3b,0xd,0xa,0xd,0xa,0x75,0x6e,0x69,0x66, - 0x6f,0x72,0x6d,0x20,0x76,0x65,0x63,0x34,0x20,0x63,0x6f,0x6c,0x6f,0x72,0x3b,0xd, - 0xa,0x75,0x6e,0x69,0x66,0x6f,0x72,0x6d,0x20,0x62,0x6f,0x6f,0x6c,0x20,0x75,0x73, - 0x65,0x54,0x65,0x78,0x74,0x75,0x72,0x65,0x3b,0xd,0xa,0xd,0xa,0x76,0x6f,0x69, - 0x64,0x20,0x6d,0x61,0x69,0x6e,0x28,0x76,0x6f,0x69,0x64,0x29,0xd,0xa,0x7b,0xd, - 0xa,0x9,0x66,0x72,0x61,0x67,0x43,0x6f,0x6c,0x6f,0x72,0x20,0x3d,0x20,0x63,0x6f, - 0x6c,0x6f,0x72,0x3b,0xd,0xa,0x9,0xd,0xa,0x9,0x69,0x66,0x20,0x28,0x75,0x73, - 0x65,0x54,0x65,0x78,0x74,0x75,0x72,0x65,0x29,0x20,0x7b,0xd,0xa,0x9,0x9,0x69, - 0x6e,0x74,0x20,0x6d,0x69,0x70,0x4d,0x61,0x70,0x4c,0x65,0x76,0x65,0x6c,0x20,0x3d, - 0x20,0x69,0x6e,0x74,0x28,0x74,0x65,0x78,0x74,0x75,0x72,0x65,0x51,0x75,0x65,0x72, - 0x79,0x4c,0x6f,0x64,0x28,0x6f,0x62,0x6a,0x65,0x63,0x74,0x54,0x65,0x78,0x74,0x75, - 0x72,0x65,0x2c,0x20,0x74,0x65,0x78,0x43,0x6f,0x6f,0x72,0x64,0x29,0x2e,0x78,0x29, - 0x3b,0xd,0xa,0x9,0x9,0x66,0x72,0x61,0x67,0x43,0x6f,0x6c,0x6f,0x72,0x20,0x3d, - 0x20,0x74,0x65,0x78,0x74,0x75,0x72,0x65,0x4c,0x6f,0x64,0x28,0x6f,0x62,0x6a,0x65, - 0x63,0x74,0x54,0x65,0x78,0x74,0x75,0x72,0x65,0x2c,0x20,0x74,0x65,0x78,0x43,0x6f, - 0x6f,0x72,0x64,0x2c,0x20,0x6d,0x69,0x70,0x4d,0x61,0x70,0x4c,0x65,0x76,0x65,0x6c, - 0x29,0x3b,0xd,0xa,0x9,0x9,0x2f,0x2f,0x66,0x72,0x61,0x67,0x43,0x6f,0x6c,0x6f, - 0x72,0x20,0x3d,0x20,0x74,0x65,0x78,0x74,0x75,0x72,0x65,0x28,0x6f,0x62,0x6a,0x65, - 0x63,0x74,0x54,0x65,0x78,0x74,0x75,0x72,0x65,0x2c,0x20,0x74,0x65,0x78,0x43,0x6f, - 0x6f,0x72,0x64,0x29,0x3b,0xd,0xa,0x9,0x7d,0xd,0xa,0x9,0xd,0xa,0x9,0x69, - 0x66,0x20,0x28,0x66,0x72,0x61,0x67,0x43,0x6f,0x6c,0x6f,0x72,0x2e,0x61,0x20,0x3d, - 0x3d,0x20,0x30,0x29,0x20,0x7b,0xd,0xa,0x9,0x9,0x64,0x69,0x73,0x63,0x61,0x72, - 0x64,0x3b,0xd,0xa,0x9,0x7d,0xd,0xa,0x7d,0xd,0xa, - // /home/sensorik/Downloads/Visualization/Resources/Shaders/VertexShader.vert - 0x0,0x0,0x1,0x32, - 0x23, - 0x76,0x65,0x72,0x73,0x69,0x6f,0x6e,0x20,0x34,0x33,0x30,0xd,0xa,0xd,0xa,0x6c, - 0x61,0x79,0x6f,0x75,0x74,0x20,0x28,0x6c,0x6f,0x63,0x61,0x74,0x69,0x6f,0x6e,0x20, - 0x3d,0x20,0x30,0x29,0x20,0x69,0x6e,0x20,0x76,0x65,0x63,0x33,0x20,0x76,0x65,0x72, - 0x74,0x65,0x78,0x3b,0xd,0xa,0x6c,0x61,0x79,0x6f,0x75,0x74,0x20,0x28,0x6c,0x6f, - 0x63,0x61,0x74,0x69,0x6f,0x6e,0x20,0x3d,0x20,0x31,0x29,0x20,0x69,0x6e,0x20,0x76, - 0x65,0x63,0x32,0x20,0x74,0x65,0x78,0x74,0x75,0x72,0x65,0x43,0x6f,0x6f,0x72,0x64, - 0x69,0x6e,0x61,0x74,0x65,0x49,0x6e,0x3b,0xd,0xa,0x6c,0x61,0x79,0x6f,0x75,0x74, - 0x20,0x28,0x6c,0x6f,0x63,0x61,0x74,0x69,0x6f,0x6e,0x20,0x3d,0x20,0x30,0x29,0x20, - 0x6f,0x75,0x74,0x20,0x76,0x65,0x63,0x32,0x20,0x74,0x65,0x78,0x74,0x75,0x72,0x65, - 0x43,0x6f,0x6f,0x72,0x64,0x69,0x6e,0x61,0x74,0x65,0x4f,0x75,0x74,0x3b,0xd,0xa, - 0xd,0xa,0x75,0x6e,0x69,0x66,0x6f,0x72,0x6d,0x20,0x6d,0x61,0x74,0x34,0x20,0x6d, - 0x76,0x70,0x4d,0x61,0x74,0x72,0x69,0x78,0x3b,0xd,0xa,0xd,0xa,0x76,0x6f,0x69, - 0x64,0x20,0x6d,0x61,0x69,0x6e,0x28,0x76,0x6f,0x69,0x64,0x29,0xd,0xa,0x7b,0xd, - 0xa,0x9,0x74,0x65,0x78,0x74,0x75,0x72,0x65,0x43,0x6f,0x6f,0x72,0x64,0x69,0x6e, - 0x61,0x74,0x65,0x4f,0x75,0x74,0x20,0x3d,0x20,0x74,0x65,0x78,0x74,0x75,0x72,0x65, - 0x43,0x6f,0x6f,0x72,0x64,0x69,0x6e,0x61,0x74,0x65,0x49,0x6e,0x3b,0xd,0xa,0x9, - 0x67,0x6c,0x5f,0x50,0x6f,0x73,0x69,0x74,0x69,0x6f,0x6e,0x20,0x3d,0x20,0x6d,0x76, - 0x70,0x4d,0x61,0x74,0x72,0x69,0x78,0x20,0x2a,0x20,0x76,0x65,0x63,0x34,0x28,0x76, - 0x65,0x72,0x74,0x65,0x78,0x2c,0x20,0x31,0x2e,0x30,0x29,0x3b,0xd,0xa,0x7d,0xd, - 0xa, - -}; - -static const unsigned char qt_resource_name[] = { - // Resources - 0x0,0x9, - 0xa,0x6c,0x38,0x43, - 0x0,0x52, - 0x0,0x65,0x0,0x73,0x0,0x6f,0x0,0x75,0x0,0x72,0x0,0x63,0x0,0x65,0x0,0x73, - // Shaders - 0x0,0x7, - 0x9,0xe7,0xac,0x33, - 0x0,0x53, - 0x0,0x68,0x0,0x61,0x0,0x64,0x0,0x65,0x0,0x72,0x0,0x73, - // Images - 0x0,0x6, - 0x5,0x3,0x7d,0xc3, - 0x0,0x49, - 0x0,0x6d,0x0,0x61,0x0,0x67,0x0,0x65,0x0,0x73, - // Grid.png - 0x0,0x8, - 0x8,0xf7,0x5e,0x87, - 0x0,0x47, - 0x0,0x72,0x0,0x69,0x0,0x64,0x0,0x2e,0x0,0x70,0x0,0x6e,0x0,0x67, - // FragmentShader.frag - 0x0,0x13, - 0x1,0x78,0x9a,0x57, - 0x0,0x46, - 0x0,0x72,0x0,0x61,0x0,0x67,0x0,0x6d,0x0,0x65,0x0,0x6e,0x0,0x74,0x0,0x53,0x0,0x68,0x0,0x61,0x0,0x64,0x0,0x65,0x0,0x72,0x0,0x2e,0x0,0x66,0x0,0x72, - 0x0,0x61,0x0,0x67, - // VertexShader.vert - 0x0,0x11, - 0x4,0x95,0x25,0x74, - 0x0,0x56, - 0x0,0x65,0x0,0x72,0x0,0x74,0x0,0x65,0x0,0x78,0x0,0x53,0x0,0x68,0x0,0x61,0x0,0x64,0x0,0x65,0x0,0x72,0x0,0x2e,0x0,0x76,0x0,0x65,0x0,0x72,0x0,0x74, - - -}; - -static const unsigned char qt_resource_struct[] = { - // : - 0x0,0x0,0x0,0x0,0x0,0x2,0x0,0x0,0x0,0x1,0x0,0x0,0x0,0x1, - // :/Resources - 0x0,0x0,0x0,0x0,0x0,0x2,0x0,0x0,0x0,0x2,0x0,0x0,0x0,0x2, - // :/Resources/Images - 0x0,0x0,0x0,0x2c,0x0,0x2,0x0,0x0,0x0,0x1,0x0,0x0,0x0,0x6, - // :/Resources/Shaders - 0x0,0x0,0x0,0x18,0x0,0x2,0x0,0x0,0x0,0x2,0x0,0x0,0x0,0x4, - // :/Resources/Shaders/FragmentShader.frag - 0x0,0x0,0x0,0x54,0x0,0x0,0x0,0x0,0x0,0x1,0x0,0x0,0x1,0xd, - // :/Resources/Shaders/VertexShader.vert - 0x0,0x0,0x0,0x80,0x0,0x0,0x0,0x0,0x0,0x1,0x0,0x0,0x3,0xd, - // :/Resources/Images/Grid.png - 0x0,0x0,0x0,0x3e,0x0,0x0,0x0,0x0,0x0,0x1,0x0,0x0,0x0,0x0, - -}; - -#ifdef QT_NAMESPACE -# define QT_RCC_PREPEND_NAMESPACE(name) ::QT_NAMESPACE::name -# define QT_RCC_MANGLE_NAMESPACE0(x) x -# define QT_RCC_MANGLE_NAMESPACE1(a, b) a##_##b -# define QT_RCC_MANGLE_NAMESPACE2(a, b) QT_RCC_MANGLE_NAMESPACE1(a,b) -# define QT_RCC_MANGLE_NAMESPACE(name) QT_RCC_MANGLE_NAMESPACE2( \ - QT_RCC_MANGLE_NAMESPACE0(name), QT_RCC_MANGLE_NAMESPACE0(QT_NAMESPACE)) -#else -# define QT_RCC_PREPEND_NAMESPACE(name) name -# define QT_RCC_MANGLE_NAMESPACE(name) name -#endif - -#ifdef QT_NAMESPACE -namespace QT_NAMESPACE { -#endif - -bool qRegisterResourceData(int, const unsigned char *, const unsigned char *, const unsigned char *); - -bool qUnregisterResourceData(int, const unsigned char *, const unsigned char *, const unsigned char *); - -#ifdef QT_NAMESPACE -} -#endif - -int QT_RCC_MANGLE_NAMESPACE(qInitResources_resources)(); -int QT_RCC_MANGLE_NAMESPACE(qInitResources_resources)() -{ - QT_RCC_PREPEND_NAMESPACE(qRegisterResourceData) - (0x01, qt_resource_struct, qt_resource_name, qt_resource_data); - return 1; -} - -int QT_RCC_MANGLE_NAMESPACE(qCleanupResources_resources)(); -int QT_RCC_MANGLE_NAMESPACE(qCleanupResources_resources)() -{ - QT_RCC_PREPEND_NAMESPACE(qUnregisterResourceData) - (0x01, qt_resource_struct, qt_resource_name, qt_resource_data); - return 1; -} - -namespace { - struct initializer { - initializer() { QT_RCC_MANGLE_NAMESPACE(qInitResources_resources)(); } - ~initializer() { QT_RCC_MANGLE_NAMESPACE(qCleanupResources_resources)(); } - } dummy; -}