Merge branch 'master' of https://github.com/SpaceGroupUCL/depthmapX into increase_tolerances

Author: pklampros

.gitignore

@@ -4,7 +4,7 @@ depthmapX-build
 build
 RegressionTest/rundir
 __pycache__
-depthmapX.pro.user
+CMakeLists.txt.user
 *_BACKUP_*
 *_BASE_*
 *_LOCAL_*

.mailmap

@@ -0,0 +1,3 @@
+Petros Koutsolampros <[email protected]> <[email protected]>
+Petros Koutsolampros <[email protected]> Petros Koutsolampros <[email protected]>
+Petros Koutsolampros <[email protected]> Petros <[email protected]>

.travis.yml

@@ -1,22 +1,18 @@
 sudo: required
-dist: trusty
+dist: xenial
 language: c++
+services:
+  - docker
+
 notifications:
     slack: depthmapx:B3CKNlNDLrNz1vSOU5yoQQqA
+    webhooks:
+        urls:
+            - "https://scalar.vector.im/api/neb/services/hooks/dHJhdmlzLWNpLyU0MG9yYW5nZS12ZXJ0ZXglM0FtYXRyaXgub3JnLyUyMUVZQUZRaEVrV3lDZm1hcm9QaCUzQW1hdHJpeC5vcmc"
+        on_success: always  # always|never|change
+        on_failure: always
+        on_start: never
 
 
-before_install:
-  - sudo add-apt-repository --yes ppa:beineri/opt-qt571-trusty
-  - sudo add-apt-repository --yes ppa:deadsnakes/ppa
-  - sudo apt-get update -qq
-
-install:
-  - sudo apt-get -y install qt573d qt57tools libgl1-mesa-dev libglu1-mesa-dev python3.5
-
 script:
-  - source /opt/qt57/bin/qt57-env.sh
-  - mkdir build && cd build
-  - /opt/qt57/bin/qmake ../depthmapX.pro
-  - make
-  - ./cliTest/cliTest && ./GuiUnitTest/GuiUnitTest && ./salaTest/salaTest && ./genlibTest/genlibTest
-  - cd ../RegressionTest/test && python3.5 test_main.py && cd .. && python3.5 RegressionTestRunner.py && python3.5 RegressionTestRunner.py regressionconfig_agents.json
+  - docker run --security-opt seccomp:unconfined --user $UID -v $PWD:/mnt/code blackseamonster/depthmapx-buildenv:0.3 bash -c ci/build.sh

CMakeLists.txt

@@ -0,0 +1,51 @@
+set(CMAKE_OSX_DEPLOYMENT_TARGET "10.9" CACHE STRING "Minimum macOS deployment version")
+project(depthmapX)
+cmake_minimum_required(VERSION 3.13.0)
+set(CMAKE_CXX_STANDARD 17)
+
+if ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU" OR
+    "${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang")
+    set(warnings "-Wall -Wextra")
+elseif ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "MSVC")
+    set(warnings "/W4 /EHsc")
+    execute_process(COMMAND make_version_header.bat WORKING_DIRECTORY depthmapX)
+endif()
+
+# policy for target sources - we don't expect any old CMakes
+cmake_policy(SET CMP0076 NEW)
+
+include_directories(".")
+
+# Get the current working branch
+execute_process(
+  COMMAND git rev-parse --abbrev-ref HEAD
+  WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
+  OUTPUT_VARIABLE APP_BRANCH
+  OUTPUT_STRIP_TRAILING_WHITESPACE
+)
+
+# Get the latest abbreviated commit hash of the working branch
+execute_process(
+  COMMAND git log -1 --format=%h
+  WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
+  OUTPUT_VARIABLE APP_COMMIT
+  OUTPUT_STRIP_TRAILING_WHITESPACE
+)
+
+# generate version_defs.h
+include_directories(${CMAKE_BINARY_DIR})
+configure_file("${CMAKE_SOURCE_DIR}/version_defs.h.in" "${CMAKE_BINARY_DIR}/version_defs.h" @ONLY)
+
+string(TIMESTAMP APP_DATE %Y-%m-%d)
+
+add_subdirectory(genlib)
+add_subdirectory(genlibTest)
+add_subdirectory(salalib)
+add_subdirectory(mgraph440)
+add_subdirectory(mgraph440Test)
+add_subdirectory(salaTest)
+add_subdirectory(depthmapXcli)
+add_subdirectory(cliTest)
+add_subdirectory(depthmapXTest)
+add_subdirectory(depthmapX)
+add_subdirectory(GuiUnitTest)

GuiApp/GuiApp.pro

@@ -0,0 +1,22 @@
+set(GuiUnitTest GuiUnitTest)
+
+set(CMAKE_INCLUDE_CURRENT_DIR ON)
+# Find the QtWidgets library
+find_package(Qt5 COMPONENTS Core Widgets Gui OpenGL REQUIRED)
+# Instruct CMake to run moc automatically when needed
+set(CMAKE_AUTOMOC ON)
+
+set(guiUnitTest_SRCS
+    main.cpp 
+    testviewhelpers.cpp 
+    testsettings.cpp 
+    ../depthmapX/settingsimpl.cpp 
+    ../depthmapX/views/viewhelpers.cpp)
+
+include_directories("../ThirdParty/Catch" "../ThirdParty/FakeIt" "../depthmapX")
+
+set(LINK_LIBS salalib genlib mgraph440 Qt5::Core)
+
+add_executable(${GuiUnitTest} ${guiUnitTest_SRCS})
+target_link_libraries(${GuiUnitTest} ${LINK_LIBS})
+

GuiApp/resources/Info.plist

@@ -13,7 +13,7 @@
 // You should have received a copy of the GNU General Public License
 // along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-#include "viewhelpers.h"
+#include "depthmapX/views/viewhelpers.h"
 #include "catch.hpp"
 #include <time.h>
 #include <sstream>

GuiUnitTest/CMakeLists.txt

@@ -23,3 +23,6 @@ depthmapX uses [Qt5](http://www.qt.io) as UI toolkit and build system, [Catch](h
 
 Please join the depthmapX mail distribution list at www.jiscmail.ac.uk/lists/DEPTHMAP.html for updates.
 
+The developers and users of depthmapX can also be found on matrix/riot for more direct and extended discussions in the following channels:
+- [depthmapX-users](https://riot.im/app/#/room/#depthmapX-users:matrix.org) - for general discussion, and questions about using depthmapX
+- [depthmapX-devel](https://riot.im/app/#/room/#depthmapX-devel:matrix.org) - for development discussion

GuiUnitTest/GuiUnitTest.pro

@@ -38,10 +38,13 @@ def run(self):
         return good        
 
 if __name__ == "__main__":
+    print("Starting up RegressionTestRunner")
     configFile = defaultConfigFile
     if len(sys.argv) == 2:
         configFile = sys.argv[1]
+    print("Config file in use is: " + configFile)
     r = RegressionTestRunner(configFile, runhelpers.runExecutable)
+    print("Setup complete, starting run")
     if not r.run():
         exit(-1)