Merge branch 'feature/upstream' into develop

6 files changed, 337 insertions, 17 deletions

diff --git a/app/lib/examples/CMakeFiles/CMakeDirectoryInformation.cmake b/app/lib/examples/CMakeFiles/CMakeDirectoryInformation.cmake
new file mode 100644
index 0000000..2569371
--- /dev/null
+++ b/app/lib/examples/CMakeFiles/CMakeDirectoryInformation.cmake
@@ -0,0 +1,16 @@
+# CMAKE generated file: DO NOT EDIT!
+# Generated by "Unix Makefiles" Generator, CMake Version 3.6
+
+# Relative path conversion top directories.
+set(CMAKE_RELATIVE_PATH_TOP_SOURCE "/home/martin/XTrackCAD/src/work")
+set(CMAKE_RELATIVE_PATH_TOP_BINARY "/home/martin/XTrackCAD/src/work")
+
+# Force unix paths in dependencies.
+set(CMAKE_FORCE_UNIX_PATHS 1)
+
+
+# The C and CXX include file regular expressions for this directory.
+set(CMAKE_C_INCLUDE_REGEX_SCAN "^.*$")
+set(CMAKE_C_INCLUDE_REGEX_COMPLAIN "^$")
+set(CMAKE_CXX_INCLUDE_REGEX_SCAN ${CMAKE_C_INCLUDE_REGEX_SCAN})
+set(CMAKE_CXX_INCLUDE_REGEX_COMPLAIN ${CMAKE_C_INCLUDE_REGEX_COMPLAIN})
diff --git a/app/lib/examples/CMakeFiles/progress.marks b/app/lib/examples/CMakeFiles/progress.marks
new file mode 100644
index 0000000..573541a
--- /dev/null
+++ b/app/lib/examples/CMakeFiles/progress.marks
@@ -0,0 +1 @@
+0
diff --git a/app/lib/examples/CTestTestfile.cmake b/app/lib/examples/CTestTestfile.cmake
new file mode 100644
index 0000000..652b63c
--- /dev/null
+++ b/app/lib/examples/CTestTestfile.cmake
@@ -0,0 +1,6 @@
+# CMake generated Testfile for 
+# Source directory: /home/martin/XTrackCAD/src/work/app/lib/examples
+# Build directory: /home/martin/XTrackCAD/src/work/app/lib/examples
+# 
+# This file includes the relevant testing commands required for 
+# testing this directory and lists subdirectories to be tested as well.
diff --git a/app/lib/examples/DVRR v3.0 E Stroudsburg - Pt Jervis.xtc b/app/lib/examples/DVRR v3.0 E Stroudsburg - Pt Jervis.xtc
index 5465b68..bc2d80f 100644
--- a/app/lib/examples/DVRR v3.0 E Stroudsburg - Pt Jervis.xtc
+++ b/app/lib/examples/DVRR v3.0 E Stroudsburg - Pt Jervis.xtc
@@ -2287,58 +2287,58 @@ TURNOUT  230 1 0 0 0 HO 2 194.697360 124.297621 0 21.843766 "Walthers	90' Turn T
 	P "17" 49 50 51
 	P "18" 52 53 54
 	S 0 0.000000 0.000000 6.875000 0.000000 6.250000
-	S 0 0.000000 0.000000 6.250000 0.000000 -6.250000
+	S 16777215 0.000000 0.000000 6.250000 0.000000 -6.250000
 	S 0 0.000000 0.000000 -6.250000 0.000000 -6.875000
 	S 0 0.000000 1.193831 6.770553 1.085301 6.155048
-	S 0 0.000000 1.085301 6.155048 -1.085301 -6.155048
+	S 16777215 0.000000 1.085301 6.155048 -1.085301 -6.155048
 	S 0 0.000000 -1.085301 -6.155048 -1.193831 -6.770553
 	S 0 0.000000 2.351388 6.460387 2.137626 5.873079
-	S 0 0.000000 2.137626 5.873079 -2.137626 -5.873079
+	S 16777215 0.000000 2.137626 5.873079 -2.137626 -5.873079
 	S 0 0.000000 -2.137626 -5.873079 -2.351388 -6.460387
 	S 0 0.000000 3.437500 5.953925 3.125000 5.412659
-	S 0 0.000000 3.125000 5.412659 -3.125000 -5.412659
+	S 16777215 0.000000 3.125000 5.412659 -3.125000 -5.412659
 	S 0 0.000000 -3.125000 -5.412659 -3.437500 -5.953925
 	S 0 0.000000 4.419165 5.266556 4.017423 4.787778
-	S 0 0.000000 4.017423 4.787778 -4.017423 -4.787778
+	S 16777215 0.000000 4.017423 4.787778 -4.017423 -4.787778
 	S 0 0.000000 -4.017423 -4.787778 -4.419165 -5.266556
 	S 0 0.000000 5.266556 4.419165 4.787778 4.017423
-	S 0 0.000000 4.787778 4.017423 -4.787778 -4.017423
+	S 16777215 0.000000 4.787778 4.017423 -4.787778 -4.017423
 	S 0 0.000000 -4.787778 -4.017423 -5.266556 -4.419165
 	S 0 0.000000 5.953925 3.437500 5.412659 3.125000
-	S 0 0.000000 5.412659 3.125000 -5.412659 -3.125000
+	S 16777215 0.000000 5.412659 3.125000 -5.412659 -3.125000
 	S 0 0.000000 -5.412659 -3.125000 -5.953925 -3.437500
 	S 0 0.000000 6.460387 2.351388 5.873079 2.137626
-	S 0 0.000000 5.873079 2.137626 -5.873079 -2.137626
+	S 16777215 0.000000 5.873079 2.137626 -5.873079 -2.137626
 	S 0 0.000000 -5.873079 -2.137626 -6.460387 -2.351388
 	S 0 0.000000 6.770553 1.193831 6.155048 1.085301
-	S 0 0.000000 6.155048 1.085301 -6.155048 -1.085301
+	S 16777215 0.000000 6.155048 1.085301 -6.155048 -1.085301
 	S 0 0.000000 -6.155048 -1.085301 -6.770553 -1.193831
 	S 0 0.000000 6.875000 0.000000 6.250000 0.000000
 	S 0 0.000000 6.250000 0.000000 -6.875000 0.000000
 	S 0 0.000000 -6.875000 0.000000 -6.250000 0.000000
 	S 0 0.000000 6.770553 -1.193831 6.155048 -1.085301
-	S 0 0.000000 6.155048 -1.085301 -6.155048 1.085301
+	S 16777215 0.000000 6.155048 -1.085301 -6.155048 1.085301
 	S 0 0.000000 -6.155048 1.085301 -6.770553 1.193831
 	S 0 0.000000 6.460387 -2.351388 5.873079 -2.137626
-	S 0 0.000000 5.873079 -2.137626 -5.873079 2.137626
+	S 16777215 0.000000 5.873079 -2.137626 -5.873079 2.137626
 	S 0 0.000000 -5.873079 2.137626 -6.460387 2.351388
 	S 0 0.000000 5.953925 -3.437500 5.412659 -3.125000
-	S 0 0.000000 5.412659 -3.125000 -5.412659 3.125000
+	S 16777215 0.000000 5.412659 -3.125000 -5.412659 3.125000
 	S 0 0.000000 -5.412659 3.125000 -5.953925 3.437500
 	S 0 0.000000 5.266556 -4.419165 4.787778 -4.017423
-	S 0 0.000000 4.787778 -4.017423 -4.787778 4.017423
+	S 16777215 0.000000 4.787778 -4.017423 -4.787778 4.017423
 	S 0 0.000000 -4.787778 4.017423 -5.266556 4.419165
 	S 0 0.000000 4.419165 -5.266556 4.017423 -4.787778
-	S 0 0.000000 4.017423 -4.787778 -4.017423 4.787778
+	S 16777215 0.000000 4.017423 -4.787778 -4.017423 4.787778
 	S 0 0.000000 -4.017423 4.787778 -4.419165 5.266556
 	S 0 0.000000 3.437500 -5.953925 3.125000 -5.412659
-	S 0 0.000000 3.125000 -5.412659 -3.125000 5.412659
+	S 16777215 0.000000 3.125000 -5.412659 -3.125000 5.412659
 	S 0 0.000000 -3.125000 5.412659 -3.437500 5.953925
 	S 0 0.000000 2.351388 -6.460387 2.137626 -5.873079
-	S 0 0.000000 2.137626 -5.873079 -2.137626 5.873079
+	S 16777215 0.000000 2.137626 -5.873079 -2.137626 5.873079
 	S 0 0.000000 -2.137626 5.873079 -2.351388 6.460387
 	S 0 0.000000 1.193831 -6.770553 1.085301 -6.155048
-	S 0 0.000000 1.085301 -6.155048 -1.085301 6.155048
+	S 16777215 0.000000 1.085301 -6.155048 -1.085301 6.155048
 	S 0 0.000000 -1.085301 6.155048 -1.193831 6.770553
 	A3 11579568 0.053333 6.875000 0.000000 0.000000 0 0.000000 360.000000
 	A3 11579568 0.053333 6.250000 0.000000 0.000000 0 0.000000 360.000000
diff --git a/app/lib/examples/Makefile b/app/lib/examples/Makefile
new file mode 100644
index 0000000..3dc18fc
--- /dev/null
+++ b/app/lib/examples/Makefile
@@ -0,0 +1,218 @@
+# CMAKE generated file: DO NOT EDIT!
+# Generated by "Unix Makefiles" Generator, CMake Version 3.6
+
+# Default target executed when no arguments are given to make.
+default_target: all
+
+.PHONY : default_target
+
+# Allow only one "make -f Makefile2" at a time, but pass parallelism.
+.NOTPARALLEL:
+
+
+#=============================================================================
+# Special targets provided by cmake.
+
+# Disable implicit rules so canonical targets will work.
+.SUFFIXES:
+
+
+# Remove some rules from gmake that .SUFFIXES does not remove.
+SUFFIXES =
+
+.SUFFIXES: .hpux_make_needs_suffix_list
+
+
+# Suppress display of executed commands.
+$(VERBOSE).SILENT:
+
+
+# A target that is always out of date.
+cmake_force:
+
+.PHONY : cmake_force
+
+#=============================================================================
+# Set environment variables for the build.
+
+# The shell in which to execute make rules.
+SHELL = /bin/sh
+
+# The CMake executable.
+CMAKE_COMMAND = /usr/bin/cmake
+
+# The command to remove a file.
+RM = /usr/bin/cmake -E remove -f
+
+# Escaping for special characters.
+EQUALS = =
+
+# The top-level source directory on which CMake was run.
+CMAKE_SOURCE_DIR = /home/martin/XTrackCAD/src/work
+
+# The top-level build directory on which CMake was run.
+CMAKE_BINARY_DIR = /home/martin/XTrackCAD/src/work
+
+#=============================================================================
+# Targets provided globally by CMake.
+
+# Special rule for the target edit_cache
+edit_cache:
+	@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Running CMake cache editor..."
+	/usr/bin/ccmake -H$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR)
+.PHONY : edit_cache
+
+# Special rule for the target edit_cache
+edit_cache/fast: edit_cache
+
+.PHONY : edit_cache/fast
+
+# Special rule for the target install/strip
+install/strip: preinstall
+	@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Installing the project stripped..."
+	/usr/bin/cmake -DCMAKE_INSTALL_DO_STRIP=1 -P cmake_install.cmake
+.PHONY : install/strip
+
+# Special rule for the target install/strip
+install/strip/fast: install/strip
+
+.PHONY : install/strip/fast
+
+# Special rule for the target test
+test:
+	@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Running tests..."
+	/usr/bin/ctest --force-new-ctest-process $(ARGS)
+.PHONY : test
+
+# Special rule for the target test
+test/fast: test
+
+.PHONY : test/fast
+
+# Special rule for the target package_source
+package_source:
+	@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Run CPack packaging tool for source..."
+	cd /home/martin/XTrackCAD/src/work && /usr/bin/cpack --config ./CPackSourceConfig.cmake /home/martin/XTrackCAD/src/work/CPackSourceConfig.cmake
+.PHONY : package_source
+
+# Special rule for the target package_source
+package_source/fast: package_source
+
+.PHONY : package_source/fast
+
+# Special rule for the target package
+package: preinstall
+	@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Run CPack packaging tool..."
+	cd /home/martin/XTrackCAD/src/work && /usr/bin/cpack --config ./CPackConfig.cmake
+.PHONY : package
+
+# Special rule for the target package
+package/fast: package
+
+.PHONY : package/fast
+
+# Special rule for the target install/local
+install/local: preinstall
+	@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Installing only the local directory..."
+	/usr/bin/cmake -DCMAKE_INSTALL_LOCAL_ONLY=1 -P cmake_install.cmake
+.PHONY : install/local
+
+# Special rule for the target install/local
+install/local/fast: install/local
+
+.PHONY : install/local/fast
+
+# Special rule for the target install
+install: preinstall
+	@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Install the project..."
+	/usr/bin/cmake -P cmake_install.cmake
+.PHONY : install
+
+# Special rule for the target install
+install/fast: preinstall/fast
+	@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Install the project..."
+	/usr/bin/cmake -P cmake_install.cmake
+.PHONY : install/fast
+
+# Special rule for the target list_install_components
+list_install_components:
+	@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Available install components are: \"Unspecified\""
+.PHONY : list_install_components
+
+# Special rule for the target list_install_components
+list_install_components/fast: list_install_components
+
+.PHONY : list_install_components/fast
+
+# Special rule for the target rebuild_cache
+rebuild_cache:
+	@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Running CMake to regenerate build system..."
+	/usr/bin/cmake -H$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR)
+.PHONY : rebuild_cache
+
+# Special rule for the target rebuild_cache
+rebuild_cache/fast: rebuild_cache
+
+.PHONY : rebuild_cache/fast
+
+# The main all target
+all: cmake_check_build_system
+	cd /home/martin/XTrackCAD/src/work && $(CMAKE_COMMAND) -E cmake_progress_start /home/martin/XTrackCAD/src/work/CMakeFiles /home/martin/XTrackCAD/src/work/app/lib/examples/CMakeFiles/progress.marks
+	cd /home/martin/XTrackCAD/src/work && $(MAKE) -f CMakeFiles/Makefile2 app/lib/examples/all
+	$(CMAKE_COMMAND) -E cmake_progress_start /home/martin/XTrackCAD/src/work/CMakeFiles 0
+.PHONY : all
+
+# The main clean target
+clean:
+	cd /home/martin/XTrackCAD/src/work && $(MAKE) -f CMakeFiles/Makefile2 app/lib/examples/clean
+.PHONY : clean
+
+# The main clean target
+clean/fast: clean
+
+.PHONY : clean/fast
+
+# Prepare targets for installation.
+preinstall: all
+	cd /home/martin/XTrackCAD/src/work && $(MAKE) -f CMakeFiles/Makefile2 app/lib/examples/preinstall
+.PHONY : preinstall
+
+# Prepare targets for installation.
+preinstall/fast:
+	cd /home/martin/XTrackCAD/src/work && $(MAKE) -f CMakeFiles/Makefile2 app/lib/examples/preinstall
+.PHONY : preinstall/fast
+
+# clear depends
+depend:
+	cd /home/martin/XTrackCAD/src/work && $(CMAKE_COMMAND) -H$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR) --check-build-system CMakeFiles/Makefile.cmake 1
+.PHONY : depend
+
+# Help Target
+help:
+	@echo "The following are some of the valid targets for this Makefile:"
+	@echo "... all (the default if no target is provided)"
+	@echo "... clean"
+	@echo "... depend"
+	@echo "... edit_cache"
+	@echo "... install/strip"
+	@echo "... test"
+	@echo "... package_source"
+	@echo "... package"
+	@echo "... install/local"
+	@echo "... install"
+	@echo "... list_install_components"
+	@echo "... rebuild_cache"
+.PHONY : help
+
+
+
+#=============================================================================
+# Special targets to cleanup operation of make.
+
+# Special rule to run CMake to check the build system integrity.
+# No rule that depends on this can have commands that come from listfiles
+# because they might be regenerated.
+cmake_check_build_system:
+	cd /home/martin/XTrackCAD/src/work && $(CMAKE_COMMAND) -H$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR) --check-build-system CMakeFiles/Makefile.cmake 0
+.PHONY : cmake_check_build_system
+
diff --git a/app/lib/examples/cmake_install.cmake b/app/lib/examples/cmake_install.cmake
new file mode 100644
index 0000000..e6a542a
--- /dev/null
+++ b/app/lib/examples/cmake_install.cmake
@@ -0,0 +1,79 @@
+# Install script for directory: /home/martin/XTrackCAD/src/work/app/lib/examples
+
+# Set the install prefix
+if(NOT DEFINED CMAKE_INSTALL_PREFIX)
+  set(CMAKE_INSTALL_PREFIX "/usr/local")
+endif()
+string(REGEX REPLACE "/$" "" CMAKE_INSTALL_PREFIX "${CMAKE_INSTALL_PREFIX}")
+
+# Set the install configuration name.
+if(NOT DEFINED CMAKE_INSTALL_CONFIG_NAME)
+  if(BUILD_TYPE)
+    string(REGEX REPLACE "^[^A-Za-z0-9_]+" ""
+           CMAKE_INSTALL_CONFIG_NAME "${BUILD_TYPE}")
+  else()
+    set(CMAKE_INSTALL_CONFIG_NAME "Debug")
+  endif()
+  message(STATUS "Install configuration: \"${CMAKE_INSTALL_CONFIG_NAME}\"")
+endif()
+
+# Set the component getting installed.
+if(NOT CMAKE_INSTALL_COMPONENT)
+  if(COMPONENT)
+    message(STATUS "Install component: \"${COMPONENT}\"")
+    set(CMAKE_INSTALL_COMPONENT "${COMPONENT}")
+  else()
+    set(CMAKE_INSTALL_COMPONENT)
+  endif()
+endif()
+
+# Install shared libraries without execute permission?
+if(NOT DEFINED CMAKE_INSTALL_SO_NO_EXE)
+  set(CMAKE_INSTALL_SO_NO_EXE "0")
+endif()
+
+if("${CMAKE_INSTALL_COMPONENT}" STREQUAL "Unspecified" OR NOT CMAKE_INSTALL_COMPONENT)
+  file(INSTALL DESTINATION "${CMAKE_INSTALL_PREFIX}/share/xtrkcad/examples" TYPE FILE FILES
+    "/home/martin/XTrackCAD/src/work/app/lib/examples/2_train_round_mrklnhomde_v1_2014_01.xtc"
+    "/home/martin/XTrackCAD/src/work/app/lib/examples/2oval8_mrklnhomde_v1_2013_03.xtc"
+    "/home/martin/XTrackCAD/src/work/app/lib/examples/2way2loop_mrklnhomde_v1_2013_04.xtc"
+    "/home/martin/XTrackCAD/src/work/app/lib/examples/2x8+L+layout+01c.xtc"
+    "/home/martin/XTrackCAD/src/work/app/lib/examples/3_circles_loops_mrklnhomde_2013_06_jruppert.xtc"
+    "/home/martin/XTrackCAD/src/work/app/lib/examples/3oval1circle_mrklnhomde_v1_2013_03.xtc"
+    "/home/martin/XTrackCAD/src/work/app/lib/examples/3oval2loops_mrklnhomde_v1_2013_04.xtc"
+    "/home/martin/XTrackCAD/src/work/app/lib/examples/3oval8_mrklnhomde_v1_2013_03.xtc"
+    "/home/martin/XTrackCAD/src/work/app/lib/examples/3way_track_and_looping_mrklnhomde_2013_02_jruppert.xtc"
+    "/home/martin/XTrackCAD/src/work/app/lib/examples/4_Triangles_mrklnhomde_2012_11_jruppert.xtc"
+    "/home/martin/XTrackCAD/src/work/app/lib/examples/Bridge_over_central_station.xtc"
+    "/home/martin/XTrackCAD/src/work/app/lib/examples/Central_Station_City_mrklnhomde_2013_06_jruppert.xtc"
+    "/home/martin/XTrackCAD/src/work/app/lib/examples/Central_Station_mrklnhomde_2013_04_jruppert.xtc"
+    "/home/martin/XTrackCAD/src/work/app/lib/examples/Control-Panels.xtc"
+    "/home/martin/XTrackCAD/src/work/app/lib/examples/DVRR v3.0 E Stroudsburg - Pt Jervis.xtc"
+    "/home/martin/XTrackCAD/src/work/app/lib/examples/Eishindo T Track Test Layout.xtc"
+    "/home/martin/XTrackCAD/src/work/app/lib/examples/MaerklinLayout_ReverseLoop4.xtc"
+    "/home/martin/XTrackCAD/src/work/app/lib/examples/Station_2ladder_v1_2014_07_jruppert.xtc"
+    "/home/martin/XTrackCAD/src/work/app/lib/examples/Station_and_Circles_mrklnhomde_2013_02_jruppert.xtc"
+    "/home/martin/XTrackCAD/src/work/app/lib/examples/bridge_and_loops_mrklnhomde_v1_2013_03.xtc"
+    "/home/martin/XTrackCAD/src/work/app/lib/examples/cascade.xtc"
+    "/home/martin/XTrackCAD/src/work/app/lib/examples/iota.xtc"
+    "/home/martin/XTrackCAD/src/work/app/lib/examples/katoxing.xtc"
+    "/home/martin/XTrackCAD/src/work/app/lib/examples/laurel_hon3.xtc"
+    "/home/martin/XTrackCAD/src/work/app/lib/examples/mr03.xtc"
+    "/home/martin/XTrackCAD/src/work/app/lib/examples/mrklnhomde_v1_geometry.xtc"
+    "/home/martin/XTrackCAD/src/work/app/lib/examples/ntrak4.xtc"
+    "/home/martin/XTrackCAD/src/work/app/lib/examples/ntrak6.xtc"
+    "/home/martin/XTrackCAD/src/work/app/lib/examples/ntrak8.xtc"
+    "/home/martin/XTrackCAD/src/work/app/lib/examples/pmi.xtc"
+    "/home/martin/XTrackCAD/src/work/app/lib/examples/port_dinllean.xtc"
+    "/home/martin/XTrackCAD/src/work/app/lib/examples/psr.xtc"
+    "/home/martin/XTrackCAD/src/work/app/lib/examples/rack-rail-ski-train-t-trak-triple-double-wide.xtc"
+    "/home/martin/XTrackCAD/src/work/app/lib/examples/spagw1.xtc"
+    "/home/martin/XTrackCAD/src/work/app/lib/examples/spagw2.xtc"
+    "/home/martin/XTrackCAD/src/work/app/lib/examples/spagw3.xtc"
+    "/home/martin/XTrackCAD/src/work/app/lib/examples/spagw4.xtc"
+    "/home/martin/XTrackCAD/src/work/app/lib/examples/spagw5.xtc"
+    "/home/martin/XTrackCAD/src/work/app/lib/examples/stonega.xtc"
+    "/home/martin/XTrackCAD/src/work/app/lib/examples/timesavr.xtc"
+    )
+endif()
+