Merge pull request #370 from hpuhr/devel

Devel

Author: hpuhr

.gitignore

@@ -14,7 +14,12 @@ Testing/
 *.backup
 *.toc
 *.pdf
+*.json
+*.sh
+*.txt
+*.cmake
+*.user
 *.AppImage
-ub14_build/
+*build/
 
 

CMakeLists.txt

@@ -7,7 +7,7 @@ set ( CMAKE_BUILD_TYPE RelWithDebInfo ) #Debug RelWithDebInfo Release
 
 project( COMPASS )
 SET(CPACK_PACKAGE_VERSION_MAJOR "0")
-SET(CPACK_PACKAGE_VERSION_MINOR "8")
+SET(CPACK_PACKAGE_VERSION_MINOR "9")
 SET(CPACK_PACKAGE_VERSION_PATCH "0")
 
 message("  System: ${CMAKE_SYSTEM}")
@@ -17,10 +17,10 @@ set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin)
 
 IF (SOURCE_BRANCH)
 message("  Platform: Linux (inside docker)")
-add_definitions ( -UNDEBUG -Wall -std=c++11 -fext-numeric-literals) # -DQT_NO_KEYWORDS
+add_definitions ( -UNDEBUG -Wall -std=c++14 -fext-numeric-literals) # -DQT_NO_KEYWORDS
 ELSE()
 message("  Platform: Linux (local)")
-add_definitions ( -UNDEBUG -Wall -std=c++14 -fext-numeric-literals) # -DQT_NO_KEYWORDS
+add_definitions ( -UNDEBUG -Wall -std=c++17 -fext-numeric-literals) # -DQT_NO_KEYWORDS
 ENDIF()
 
 set(CMAKE_THREAD_PREFER_PTHREAD TRUE)
@@ -50,6 +50,8 @@ find_package ( Boost 1.73.0 REQUIRED COMPONENTS regex system program_options fil
 message("  Boost_INCLUDE_DIRS: ${Boost_INCLUDE_DIRS}")
 message("  Boost_LIBRARIES: ${Boost_LIBRARIES}")
 
+add_definitions("-DBOOST_ALLOW_DEPRECATED_HEADERS -DBOOST_GEOMETRY_DISABLE_DEPRECATED_03_WARNING") # suppress internal boost deprecated warnings
+
 set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH};${COMPASS_PATH}/cmake_modules)
 message("  CMAKE_MODULE_PATH: ${CMAKE_MODULE_PATH}") 
 set(CMAKE_PREFIX_PATH ${CMAKE_PREFIX_PATH};/usr/local/lib/cmake/;/usr/lib/x86_64-linux-gnu/)
@@ -119,6 +121,9 @@ find_package(GeographicLib REQUIRED)
 message("  GeographicLib_INCLUDE_DIRS:  ${GeographicLib_INCLUDE_DIRS}")
 message("  GeographicLib_LIBRARIES: ${GeographicLib_LIBRARIES}")
 
+#find_package(Arrow REQUIRED)
+#find_package(Parquet REQUIRED)
+find_package(DuckDB REQUIRED)
 
 add_library(compass "")
 
@@ -167,6 +172,9 @@ include_directories (
     ${jASTERIX_INCLUDE_DIR}
     ${PCAP_INCLUDE_DIR}
     ${GeographicLib_INCLUDE_DIRS}
+    #${Arrow_INCLUDE_DIRS}
+    #${Parquet_INCLUDE_DIRS}
+    ${DUCKDB_INCLUDE_DIR}
     )
 
 link_directories(
@@ -197,6 +205,9 @@ target_link_libraries ( compass
     ${OSGQT_LIBRARIES}
     ${OSGEARTH_LIBRARY}
     ${GeographicLib_LIBRARIES}
+    #Arrow::arrow_static 
+    #Parquet::parquet_static
+    ${DUCKDB_LIBRARIES}
     )
 
 # installation stuff

appimage/appdir/ats.png

@@ -0,0 +1 @@
+usr/share/icons/hicolor/512x512/apps/ats.png

appimage/appdir/ats.png

@@ -0,0 +1 @@
+usr/share/applications/compass.desktop

appimage/appdir/compass.desktop

@@ -4,7 +4,7 @@ Type=Application
 Name=COMPASS
 Comment=OpenATS Compliance Assessment
 #TryExec=atsdb-client
-Exec=bin/compass_client -f
+Exec=compass_client -f
 Icon=ats
 Categories=Science;NumericalAnalysis;DataVisualization;
 #MimeType=image/x-foo;
@@ -18,3 +18,4 @@ Categories=Science;NumericalAnalysis;DataVisualization;
 #Exec=fooview --create-new
 #Name=Create a new Foo!
 #Icon=fooview-new
+X-AppImage-Version=5e91f777

appimage/appdir/compass.desktop

@@ -0,0 +1,25 @@
+
+FIND_PATH(DUCKDB_INCLUDE_DIR duckdb.h
+PATHS
+/usr/local/include
+/usr/include
+)
+
+FIND_LIBRARY(DUCKDB_LIBRARIES libduckdb.so
+PATHS
+/usr/local/lib
+/usr/lib
+)
+
+SET(DUCKDB_FOUND 0)
+IF(DUCKDB_INCLUDE_DIR)
+IF(DUCKDB_LIBRARIES)
+SET(DUCKDB_FOUND 1)
+MESSAGE(STATUS "Found DuckDB")
+ENDIF(DUCKDB_LIBRARIES)
+ENDIF(DUCKDB_INCLUDE_DIR)
+
+MARK_AS_ADVANCED(
+DUCKDB_INCLUDE_DIR
+DUCKDB_LIBRARIES
+) 

appimage/compass.desktop

@@ -1,5 +1,5 @@
 {
-    "version":"0.8.0",
+    "version":"0.9.0",
     "log_properties_file":"log4cpp.properties",
     "log_filename":"log.txt",
     "main_configuration_file":"client.json",

cmake_modules/FindDuckDB.cmake

@@ -2,9 +2,9 @@
     "parameters": {
         "db_file_list": [
         ],
-        "hide_evaluation": false,
-        "hide_viewpoints": false,
-        "last_db_filename": "/home/sk/data/austria/live_test/test.db"
+        "last_db_filename": "",
+        "min_app_height": 1080,
+        "min_app_width": 1600
     },
     "sub_config_files": [
         {
@@ -45,11 +45,6 @@
                     "read_chunk_size": 100000
                 },
                 "sub_configs": {
-                    "SQLiteConnection": {
-                        "SQLite Connection": {
-                            "parameters": null
-                        }
-                    }
                 }
             }
         }