Fix pixelateLine

.gitignore

@@ -1,2 +1,12 @@
+.idea
 .DS_Store
-depthmapX-build
+depthmapX-build
+build
+RegressionTest/rundir
+__pycache__
+depthmapX.pro.user
+*_BACKUP_*
+*_BASE_*
+*_LOCAL_*
+*_REMOTE_*
+

.travis.yml

@@ -1,18 +1,18 @@
 sudo: required
-dist: trusty
+dist: xenial
+language: c++
+services:
+  - docker
 
-before_install:
-  - sudo add-apt-repository --yes ppa:beineri/opt-qt571-trusty
-  - sudo add-apt-repository --yes ppa:fkrull/deadsnakes
-  - sudo apt-get update -qq
+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
 
-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
-  - cd ../RegressionTest && python3.5 test_main.py && python3.5 RegressionTestRunner.py
+  - 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,50 @@
+project(depthmapX)
+cmake_minimum_required(VERSION 3.13.0)
+set(CMAKE_CXX_STANDARD 11)
+
+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)

GuiUnitTest/CMakeLists.txt

@@ -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})
+

GuiUnitTest/testsettings.cpp

@@ -0,0 +1,57 @@
+// Copyright (C) 2017 Christian Sailer
+
+// This program is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+
+// 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 <catch.hpp>
+#include <../cliTest/selfcleaningfile.h>
+#include <../depthmapX/settingsimpl.h>
+
+
+class TestSettingsFactory : public QSettingsFactory
+{
+public:
+    TestSettingsFactory(const QString &filename) : mFilename(filename)
+    {}
+    virtual std::unique_ptr<QSettings> getSettings() const
+    {
+        return std::unique_ptr<QSettings>(new QSettings(mFilename, QSettings::IniFormat));
+    }
+private:
+    QString mFilename;
+};
+
+TEST_CASE("Test simple settings")
+{
+    SelfCleaningFile scf("./test.ini");
+    SettingsImpl settings(new TestSettingsFactory(scf.Filename().c_str()));
+
+    REQUIRE(settings.readSetting("test1", "bar").toString().toStdString() == "bar");
+    settings.writeSetting("test1", "foo");
+    REQUIRE(settings.readSetting("test1", "bar").toString().toStdString() == "foo");
+}
+
+
+TEST_CASE("Test settings transaction")
+{
+    SelfCleaningFile scf("./test.ini");
+    SettingsImpl settings(new TestSettingsFactory(scf.Filename().c_str()));
+
+    REQUIRE(settings.readSetting("test1", "bar").toString() == "bar");
+    {
+        auto transaction = settings.getTransaction();
+        transaction->writeSetting("test1", "foo");
+    }
+    REQUIRE(settings.readSetting("test1", "bar").toString() == "foo");
+
+}

GuiUnitTest/testviewhelpers.cpp

@@ -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>
@@ -22,12 +22,12 @@
 TEST_CASE("Calculating the new center", "[calculateCenter]"){
     auto point = QPoint(100, 100);
     auto oldCenter = QPoint(200,200);
-    auto newCenter = QPoint(150,150);
+    auto newCenter = Point2f(150,150);
 
     REQUIRE(ViewHelpers::calculateCenter(point, oldCenter, 0.5) == newCenter);
 
-    newCenter.rx() = 300;
-    newCenter.ry() = 300;
+    newCenter.x = 300;
+    newCenter.y = 300;
 
     REQUIRE(ViewHelpers::calculateCenter(point, oldCenter, 2.0) == newCenter);
 
@@ -38,9 +38,9 @@ TEST_CASE("Date string format", "[getCurrentDate]"){
     const tm* ltime = localtime(&now);
     std::stringstream sstream;
     sstream << ltime->tm_year + 1900 << "/" <<
-            setfill('0') << setw(2) << ltime->tm_mon + 1 << "/" <<
-            setfill('0') << setw(2) << ltime->tm_mday << std::flush;
+            std::setfill('0') << std::setw(2) << ltime->tm_mon + 1 << "/" <<
+            std::setfill('0') << std::setw(2) << ltime->tm_mday << std::flush;
 
-    REQUIRE(ViewHelpers::getCurrentDate() ==  pstring(sstream.str().c_str()));
+    REQUIRE(ViewHelpers::getCurrentDate() ==  sstream.str().c_str());
 }
 

README.md

@@ -0,0 +1,28 @@
+## depthmapX - multi-platform spatial network analyses software
+
+
+This is the home for the development of depthmapX.
+
+
+Latest releases can be found at the [releases page](https://github.com/SpaceGroupUCL/depthmapX/releases)
+
+
+For any issues/bugs/crashes please create [a new issue](https://github.com/SpaceGroupUCL/depthmapX/issues/new)
+
+
+For more information please check the [documentation](./docs/index.md) and the [wiki](https://github.com/SpaceGroupUCL/depthmapX/wiki)
+
+[About depthmapX](./docs/about.md)
+
+
+##
+
+depthmapX is licensed under the [GPLv3](http://www.gnu.org/licenses/gpl-3.0.html) licence. 
+
+depthmapX uses [Qt5](http://www.qt.io) as UI toolkit and build system, [Catch](https://github.com/philsquared/catch) as unit testing framework and [FakeIt](https://github.com/eranpeer/FakeIt) for test mocks.
+
+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