diff options
author | Jörg Frings-Fürst <debian@jff-webhosting.net> | 2018-07-10 23:05:17 +0200 |
---|---|---|
committer | Jörg Frings-Fürst <debian@jff-webhosting.net> | 2018-07-10 23:05:17 +0200 |
commit | c120c7bcbcf115ecc2a6668f4c7f45b3d4a5bc86 (patch) | |
tree | 5550610553d1b1d7236d052b6e956b22e0bb4883 /app/lib | |
parent | 67d0ce65dc6a1d240e271a7cd479b60aa1dc2967 (diff) | |
parent | 26d299964db18cb71c2c6a5be4864479ba82d54f (diff) |
Merge branch 'release/debian/5.1.1-1'debian/5.1.1-1
Diffstat (limited to 'app/lib')
64 files changed, 2767 insertions, 405 deletions
diff --git a/app/lib/CHANGELOG.md b/app/lib/CHANGELOG.md index 212017a..62d7bb3 100644 --- a/app/lib/CHANGELOG.md +++ b/app/lib/CHANGELOG.md @@ -4,11 +4,43 @@ All notable changes to this project will be documented in this file. The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/). -## [unpublished] +## [5.1.1] ### Added ### Fixed ++ Change gtk print.c to use native dpi for real printers and only up def to 600 dpi for file outputs. ++ Fix runaway storage and long wait for Car Inventory->Add ++ Fix map window not resized for map scale change in GTK ++ Last uintptr_t replaced with uint32_t in param.c ++ Control limiting of entered string length with a special flag in paramData_t ++ Downgrade CMake version requirement to 2.8 for CentOS 6 and Ubuntu 14.04. ++ Update print to reflect that GTK always uses PDF now. ++ Add fix for zoom grid performance from V5.2 to V5.1 ++ Ensure that white (hidden) straight track segments get written out as white ++ Upgrade Map Icon ++ Add variable Print Override environment variables +XTRKCADPRINTSCALE=scale_factor +XTRKCADPRINTTEXTSCALE=text_factor +scale_factor is a floating point number is frequently 1.0 (if needed) +text_factor is a floating point number frequently 0.75 (if needed) +These variables are ignored if the print is to a file. +These seem most likely to result from Pango or other parts of the PDF chain to the printer being given bad DPI information which causes the scaling(s) to be inaccurate. +If there is enough use, we can add to the print dialog itself. ++ Fix crash when changing the layer from the properties dialog of cornus ++ Fix Cornu Describe Abend when altering Layer. ++ Fix odd lost overlaid labels in Describe when lots of Positions are used ++ All: Check string length for all relevant PD_STRING entry fields ++ Windows: Always set color before drawing text ++ Make sure that Text Segs and Poly Segs copy string and Pts when UnGrouping. Stop weird results and Abends. ++ Make Cairo use pure RGB to retrieve the same color it stored for wDrawColor rather than ask for GDK�s version (which might not be exact). ++ Fix Cornu Rate of Change of Curvature. ++ Fix situation where a Bezier or Cornu is modified when the scale or gauge has since been set to a different value than the track to be modified. Remember the old track values. ++ Fix Abend on cornu Join to turntable, also make sure cornu Modify leaves more than minlength on connected tracks ++ Fix Abend on Describe or Delete of Compound with more than 4 end points (like a turntable) ++ Try to stop issues with F3 objects in Compounds. ++ Correctly process F segment records (i.e., no version). ++ Remove automatic word wrap in describe Text object, linefeeds can be edited manually ### Added and changed parameter files @@ -40,7 +72,7 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/). ### Added + Finish the new End Point records which have fixed positions and all fields are output -+ Add Select Track and then Right-Click mode to Connect Tracks to reconnect large numbers ++ Add Select Track and then Right-Click mode to Connect Tracks to reconnect large numbers of tracks in one command (and provide an alternative to accurately selecting two close end-points). + Pan/Zoom button LeftDrag Pan, RightDrag Zoom + Pan/Zoom command adds 0 key to set origin and e key to zoom to extents @@ -67,11 +99,11 @@ of tracks in one command (and provide an alternative to accurately selecting two + Allow Turnout Placement on Bezier Tracks, also improve Bezier splitting logic to be more precise + Ensure Cornu is deleted if connected track is deleted (like Easement) -+ Make an unfilled Box into a Polygon with a RECTANGLE shape. Add special edit ++ Make an unfilled Box into a Polygon with a RECTANGLE shape. Add special edit capability for filled and unfilled Boxes in Modify that preserve their shape and -allow for either editing at the corner or on a side. Add user prompts during +allow for either editing at the corner or on a side. Add user prompts during editing. -+ All: Add multi line text fields in drawing ++ All: Add multi line text fields in drawing + Windows: Select monospaced font for parts list ### Fixed @@ -84,7 +116,7 @@ editing. + Windows: Fix text handling for multi line edit fields, bug #198 + Windows: Fix printing multi page parts lists + All: Fix car part files -+ Windows: Fix parts list ++ Windows: Fix parts list + All: Fix Traverse of rotated turnouts and issues with inaccurate segments in turnouts ### Added and Changed Parameter Files @@ -140,7 +172,7 @@ editing. ###Added + Constrain add to unconnected Cornu end in Modify via right drag to be correct radius -## [4.4.0.beta1] +## [4.4.0.beta1] ### Added + New Cornu track feature for more flexible easements @@ -163,10 +195,10 @@ editing. ### Changed Parameter Files + Fixed three way turnout in Tillig TT Advanced track -+ Clean up CTC-Panel, Peco N Code 80 Streamline, KB Scale and On30 parameters ++ Clean up CTC-Panel, Peco N Code 80 Streamline, KB Scale and On30 parameters + Fix scale definitions and clean up S-Trax, Hubner, Atlas O Scale parameters + Added structures to Walthers Cornerstone in HO and N -+ Extended T-Eishindo ++ Extended T-Eishindo + Renamed rocon.xtp and updated N-fl for new ownership + Cleanup and reorganize Peco N track parameters + Cleanup and create separate files for Peco HO/OO track ranges @@ -187,7 +219,7 @@ editing. + Fix broken DXF export by putting correct version into DXF export + Allow larger number of files to be selected at once for loading + Fix bug #196 wrong layer number in object properties -+ Changing "Layout Options" can be cancelled ++ Changing "Layout Options" can be cancelled + Consistently change "Describe" label to "Properties" + Make Text immediatetly update color as well as size + Fix filename handling bugs diff --git a/app/lib/CMakeFiles/CHANGELOG.dir/DependInfo.cmake b/app/lib/CMakeFiles/CHANGELOG.dir/DependInfo.cmake new file mode 100644 index 0000000..19fab21 --- /dev/null +++ b/app/lib/CMakeFiles/CHANGELOG.dir/DependInfo.cmake @@ -0,0 +1,11 @@ +# The set of languages for which implicit dependencies are needed: +set(CMAKE_DEPENDS_LANGUAGES + ) +# The set of files for implicit dependencies of each language: + +# Targets to which this target links. +set(CMAKE_TARGET_LINKED_INFO_FILES + ) + +# Fortran module output directory. +set(CMAKE_Fortran_TARGET_MODULE_DIR "") diff --git a/app/lib/CMakeFiles/CHANGELOG.dir/build.make b/app/lib/CMakeFiles/CHANGELOG.dir/build.make new file mode 100644 index 0000000..dde179c --- /dev/null +++ b/app/lib/CMakeFiles/CHANGELOG.dir/build.make @@ -0,0 +1,81 @@ +# CMAKE generated file: DO NOT EDIT! +# Generated by "Unix Makefiles" Generator, CMake Version 3.6 + +# Delete rule output on recipe failure. +.DELETE_ON_ERROR: + + +#============================================================================= +# 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 + +# Utility rule file for CHANGELOG. + +# Include the progress variables for this target. +include app/lib/CMakeFiles/CHANGELOG.dir/progress.make + +app/lib/CMakeFiles/CHANGELOG: app/lib/CHANGELOG.txt + + +app/lib/CHANGELOG.txt: app/lib/CHANGELOG.md + @$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --blue --bold --progress-dir=/home/martin/XTrackCAD/src/work/CMakeFiles --progress-num=$(CMAKE_PROGRESS_1) "Generating CHANGELOG.txt" + cd /home/martin/XTrackCAD/src/work/app/lib && /usr/bin/pandoc --from=Markdown --to=plain -o /home/martin/XTrackCAD/src/work/app/lib/CHANGELOG.txt /home/martin/XTrackCAD/src/work/app/lib/CHANGELOG.md + +CHANGELOG: app/lib/CMakeFiles/CHANGELOG +CHANGELOG: app/lib/CHANGELOG.txt +CHANGELOG: app/lib/CMakeFiles/CHANGELOG.dir/build.make + +.PHONY : CHANGELOG + +# Rule to build all files generated by this target. +app/lib/CMakeFiles/CHANGELOG.dir/build: CHANGELOG + +.PHONY : app/lib/CMakeFiles/CHANGELOG.dir/build + +app/lib/CMakeFiles/CHANGELOG.dir/clean: + cd /home/martin/XTrackCAD/src/work/app/lib && $(CMAKE_COMMAND) -P CMakeFiles/CHANGELOG.dir/cmake_clean.cmake +.PHONY : app/lib/CMakeFiles/CHANGELOG.dir/clean + +app/lib/CMakeFiles/CHANGELOG.dir/depend: + cd /home/martin/XTrackCAD/src/work && $(CMAKE_COMMAND) -E cmake_depends "Unix Makefiles" /home/martin/XTrackCAD/src/work /home/martin/XTrackCAD/src/work/app/lib /home/martin/XTrackCAD/src/work /home/martin/XTrackCAD/src/work/app/lib /home/martin/XTrackCAD/src/work/app/lib/CMakeFiles/CHANGELOG.dir/DependInfo.cmake --color=$(COLOR) +.PHONY : app/lib/CMakeFiles/CHANGELOG.dir/depend + diff --git a/app/lib/CMakeFiles/CHANGELOG.dir/cmake_clean.cmake b/app/lib/CMakeFiles/CHANGELOG.dir/cmake_clean.cmake new file mode 100644 index 0000000..3ca44fd --- /dev/null +++ b/app/lib/CMakeFiles/CHANGELOG.dir/cmake_clean.cmake @@ -0,0 +1,9 @@ +file(REMOVE_RECURSE + "CMakeFiles/CHANGELOG" + "CHANGELOG.txt" +) + +# Per-language clean rules from dependency scanning. +foreach(lang ) + include(CMakeFiles/CHANGELOG.dir/cmake_clean_${lang}.cmake OPTIONAL) +endforeach() diff --git a/app/lib/CMakeFiles/CHANGELOG.dir/progress.make b/app/lib/CMakeFiles/CHANGELOG.dir/progress.make new file mode 100644 index 0000000..225de34 --- /dev/null +++ b/app/lib/CMakeFiles/CHANGELOG.dir/progress.make @@ -0,0 +1,2 @@ +CMAKE_PROGRESS_1 = + diff --git a/app/lib/CMakeFiles/CMakeDirectoryInformation.cmake b/app/lib/CMakeFiles/CMakeDirectoryInformation.cmake new file mode 100644 index 0000000..2569371 --- /dev/null +++ b/app/lib/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/CMakeFiles/Readme.dir/DependInfo.cmake b/app/lib/CMakeFiles/Readme.dir/DependInfo.cmake new file mode 100644 index 0000000..19fab21 --- /dev/null +++ b/app/lib/CMakeFiles/Readme.dir/DependInfo.cmake @@ -0,0 +1,11 @@ +# The set of languages for which implicit dependencies are needed: +set(CMAKE_DEPENDS_LANGUAGES + ) +# The set of files for implicit dependencies of each language: + +# Targets to which this target links. +set(CMAKE_TARGET_LINKED_INFO_FILES + ) + +# Fortran module output directory. +set(CMAKE_Fortran_TARGET_MODULE_DIR "") diff --git a/app/lib/CMakeFiles/Readme.dir/build.make b/app/lib/CMakeFiles/Readme.dir/build.make new file mode 100644 index 0000000..b4b9850 --- /dev/null +++ b/app/lib/CMakeFiles/Readme.dir/build.make @@ -0,0 +1,81 @@ +# CMAKE generated file: DO NOT EDIT! +# Generated by "Unix Makefiles" Generator, CMake Version 3.6 + +# Delete rule output on recipe failure. +.DELETE_ON_ERROR: + + +#============================================================================= +# 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 + +# Utility rule file for Readme. + +# Include the progress variables for this target. +include app/lib/CMakeFiles/Readme.dir/progress.make + +app/lib/CMakeFiles/Readme: app/lib/Readme.txt + + +app/lib/Readme.txt: app/lib/Readme.md + @$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --blue --bold --progress-dir=/home/martin/XTrackCAD/src/work/CMakeFiles --progress-num=$(CMAKE_PROGRESS_1) "Generating Readme.txt" + cd /home/martin/XTrackCAD/src/work/app/lib && /usr/bin/pandoc --from=Markdown --to=plain -o /home/martin/XTrackCAD/src/work/app/lib/Readme.txt /home/martin/XTrackCAD/src/work/app/lib/Readme.md + +Readme: app/lib/CMakeFiles/Readme +Readme: app/lib/Readme.txt +Readme: app/lib/CMakeFiles/Readme.dir/build.make + +.PHONY : Readme + +# Rule to build all files generated by this target. +app/lib/CMakeFiles/Readme.dir/build: Readme + +.PHONY : app/lib/CMakeFiles/Readme.dir/build + +app/lib/CMakeFiles/Readme.dir/clean: + cd /home/martin/XTrackCAD/src/work/app/lib && $(CMAKE_COMMAND) -P CMakeFiles/Readme.dir/cmake_clean.cmake +.PHONY : app/lib/CMakeFiles/Readme.dir/clean + +app/lib/CMakeFiles/Readme.dir/depend: + cd /home/martin/XTrackCAD/src/work && $(CMAKE_COMMAND) -E cmake_depends "Unix Makefiles" /home/martin/XTrackCAD/src/work /home/martin/XTrackCAD/src/work/app/lib /home/martin/XTrackCAD/src/work /home/martin/XTrackCAD/src/work/app/lib /home/martin/XTrackCAD/src/work/app/lib/CMakeFiles/Readme.dir/DependInfo.cmake --color=$(COLOR) +.PHONY : app/lib/CMakeFiles/Readme.dir/depend + diff --git a/app/lib/CMakeFiles/Readme.dir/cmake_clean.cmake b/app/lib/CMakeFiles/Readme.dir/cmake_clean.cmake new file mode 100644 index 0000000..24121b8 --- /dev/null +++ b/app/lib/CMakeFiles/Readme.dir/cmake_clean.cmake @@ -0,0 +1,9 @@ +file(REMOVE_RECURSE + "CMakeFiles/Readme" + "Readme.txt" +) + +# Per-language clean rules from dependency scanning. +foreach(lang ) + include(CMakeFiles/Readme.dir/cmake_clean_${lang}.cmake OPTIONAL) +endforeach() diff --git a/app/lib/CMakeFiles/Readme.dir/progress.make b/app/lib/CMakeFiles/Readme.dir/progress.make new file mode 100644 index 0000000..781c7de --- /dev/null +++ b/app/lib/CMakeFiles/Readme.dir/progress.make @@ -0,0 +1,2 @@ +CMAKE_PROGRESS_1 = 1 + diff --git a/app/lib/CMakeFiles/progress.marks b/app/lib/CMakeFiles/progress.marks new file mode 100644 index 0000000..1e8b314 --- /dev/null +++ b/app/lib/CMakeFiles/progress.marks @@ -0,0 +1 @@ +6 diff --git a/app/lib/CTestTestfile.cmake b/app/lib/CTestTestfile.cmake new file mode 100644 index 0000000..9ebcf98 --- /dev/null +++ b/app/lib/CTestTestfile.cmake @@ -0,0 +1,9 @@ +# CMake generated Testfile for +# Source directory: /home/martin/XTrackCAD/src/work/app/lib +# Build directory: /home/martin/XTrackCAD/src/work/app/lib +# +# This file includes the relevant testing commands required for +# testing this directory and lists subdirectories to be tested as well. +subdirs(demos) +subdirs(examples) +subdirs(params) diff --git a/app/lib/Makefile b/app/lib/Makefile new file mode 100644 index 0000000..5628ff6 --- /dev/null +++ b/app/lib/Makefile @@ -0,0 +1,250 @@ +# 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 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 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 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 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 + +# 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 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 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 + +# 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/CMakeFiles/progress.marks + cd /home/martin/XTrackCAD/src/work && $(MAKE) -f CMakeFiles/Makefile2 app/lib/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/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/preinstall +.PHONY : preinstall + +# Prepare targets for installation. +preinstall/fast: + cd /home/martin/XTrackCAD/src/work && $(MAKE) -f CMakeFiles/Makefile2 app/lib/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 + +# Convenience name for target. +app/lib/CMakeFiles/Readme.dir/rule: + cd /home/martin/XTrackCAD/src/work && $(MAKE) -f CMakeFiles/Makefile2 app/lib/CMakeFiles/Readme.dir/rule +.PHONY : app/lib/CMakeFiles/Readme.dir/rule + +# Convenience name for target. +Readme: app/lib/CMakeFiles/Readme.dir/rule + +.PHONY : Readme + +# fast build rule for target. +Readme/fast: + cd /home/martin/XTrackCAD/src/work && $(MAKE) -f app/lib/CMakeFiles/Readme.dir/build.make app/lib/CMakeFiles/Readme.dir/build +.PHONY : Readme/fast + +# Convenience name for target. +app/lib/CMakeFiles/CHANGELOG.dir/rule: + cd /home/martin/XTrackCAD/src/work && $(MAKE) -f CMakeFiles/Makefile2 app/lib/CMakeFiles/CHANGELOG.dir/rule +.PHONY : app/lib/CMakeFiles/CHANGELOG.dir/rule + +# Convenience name for target. +CHANGELOG: app/lib/CMakeFiles/CHANGELOG.dir/rule + +.PHONY : CHANGELOG + +# fast build rule for target. +CHANGELOG/fast: + cd /home/martin/XTrackCAD/src/work && $(MAKE) -f app/lib/CMakeFiles/CHANGELOG.dir/build.make app/lib/CMakeFiles/CHANGELOG.dir/build +.PHONY : CHANGELOG/fast + +# 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 "... install/local" + @echo "... Readme" + @echo "... install" + @echo "... install/strip" + @echo "... edit_cache" + @echo "... CHANGELOG" + @echo "... list_install_components" + @echo "... rebuild_cache" + @echo "... package" + @echo "... package_source" + @echo "... test" +.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/cmake_install.cmake b/app/lib/cmake_install.cmake new file mode 100644 index 0000000..02e4ca6 --- /dev/null +++ b/app/lib/cmake_install.cmake @@ -0,0 +1,85 @@ +# Install script for directory: /home/martin/XTrackCAD/src/work/app/lib + +# 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" TYPE FILE FILES + "/home/martin/XTrackCAD/src/work/app/lib/COPYING" + "/home/martin/XTrackCAD/src/work/app/lib/logo.bmp" + "/home/martin/XTrackCAD/src/work/app/lib/xtrkcad.xtq" + ) +endif() + +if("${CMAKE_INSTALL_COMPONENT}" STREQUAL "Unspecified" OR NOT CMAKE_INSTALL_COMPONENT) + file(INSTALL DESTINATION "${CMAKE_INSTALL_PREFIX}/share/xtrkcad" TYPE FILE FILES + "/home/martin/XTrackCAD/src/work/app/lib/Readme.txt" + "/home/martin/XTrackCAD/src/work/app/lib/CHANGELOG.txt" + ) +endif() + +if("${CMAKE_INSTALL_COMPONENT}" STREQUAL "Unspecified" OR NOT CMAKE_INSTALL_COMPONENT) + file(INSTALL DESTINATION "${CMAKE_INSTALL_PREFIX}/share/xtrkcad" TYPE PROGRAM FILES "/home/martin/XTrackCAD/src/work/app/lib/xdg-open") +endif() + +if("${CMAKE_INSTALL_COMPONENT}" STREQUAL "Unspecified" OR NOT CMAKE_INSTALL_COMPONENT) + list(APPEND CMAKE_ABSOLUTE_DESTINATION_FILES + "/usr/share/applications/xtrkcad.desktop") + if(CMAKE_WARN_ON_ABSOLUTE_INSTALL_DESTINATION) + message(WARNING "ABSOLUTE path INSTALL DESTINATION : ${CMAKE_ABSOLUTE_DESTINATION_FILES}") + endif() + if(CMAKE_ERROR_ON_ABSOLUTE_INSTALL_DESTINATION) + message(FATAL_ERROR "ABSOLUTE path INSTALL DESTINATION forbidden (by caller): ${CMAKE_ABSOLUTE_DESTINATION_FILES}") + endif() +file(INSTALL DESTINATION "/usr/share/applications" TYPE FILE FILES "/home/martin/XTrackCAD/src/work/app/lib/xtrkcad.desktop") +endif() + +if("${CMAKE_INSTALL_COMPONENT}" STREQUAL "Unspecified" OR NOT CMAKE_INSTALL_COMPONENT) + list(APPEND CMAKE_ABSOLUTE_DESTINATION_FILES + "/usr/share/pixmaps/xtrkcad.png") + if(CMAKE_WARN_ON_ABSOLUTE_INSTALL_DESTINATION) + message(WARNING "ABSOLUTE path INSTALL DESTINATION : ${CMAKE_ABSOLUTE_DESTINATION_FILES}") + endif() + if(CMAKE_ERROR_ON_ABSOLUTE_INSTALL_DESTINATION) + message(FATAL_ERROR "ABSOLUTE path INSTALL DESTINATION forbidden (by caller): ${CMAKE_ABSOLUTE_DESTINATION_FILES}") + endif() +file(INSTALL DESTINATION "/usr/share/pixmaps" TYPE FILE FILES "/home/martin/XTrackCAD/src/work/app/lib/xtrkcad.png") +endif() + +if(NOT CMAKE_INSTALL_LOCAL_ONLY) + # Include the install script for each subdirectory. + include("/home/martin/XTrackCAD/src/work/app/lib/demos/cmake_install.cmake") + include("/home/martin/XTrackCAD/src/work/app/lib/examples/cmake_install.cmake") + include("/home/martin/XTrackCAD/src/work/app/lib/params/cmake_install.cmake") + +endif() + diff --git a/app/lib/demos/CMakeFiles/CMakeDirectoryInformation.cmake b/app/lib/demos/CMakeFiles/CMakeDirectoryInformation.cmake new file mode 100644 index 0000000..2569371 --- /dev/null +++ b/app/lib/demos/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/demos/CMakeFiles/progress.marks b/app/lib/demos/CMakeFiles/progress.marks new file mode 100644 index 0000000..573541a --- /dev/null +++ b/app/lib/demos/CMakeFiles/progress.marks @@ -0,0 +1 @@ +0 diff --git a/app/lib/demos/CTestTestfile.cmake b/app/lib/demos/CTestTestfile.cmake new file mode 100644 index 0000000..3643135 --- /dev/null +++ b/app/lib/demos/CTestTestfile.cmake @@ -0,0 +1,6 @@ +# CMake generated Testfile for +# Source directory: /home/martin/XTrackCAD/src/work/app/lib/demos +# Build directory: /home/martin/XTrackCAD/src/work/app/lib/demos +# +# 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/demos/Makefile b/app/lib/demos/Makefile new file mode 100644 index 0000000..6c2ebcf --- /dev/null +++ b/app/lib/demos/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/demos/CMakeFiles/progress.marks + cd /home/martin/XTrackCAD/src/work && $(MAKE) -f CMakeFiles/Makefile2 app/lib/demos/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/demos/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/demos/preinstall +.PHONY : preinstall + +# Prepare targets for installation. +preinstall/fast: + cd /home/martin/XTrackCAD/src/work && $(MAKE) -f CMakeFiles/Makefile2 app/lib/demos/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/demos/cmake_install.cmake b/app/lib/demos/cmake_install.cmake new file mode 100644 index 0000000..1f08d58 --- /dev/null +++ b/app/lib/demos/cmake_install.cmake @@ -0,0 +1,86 @@ +# Install script for directory: /home/martin/XTrackCAD/src/work/app/lib/demos + +# 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/demos" TYPE FILE FILES + "/home/martin/XTrackCAD/src/work/app/lib/demos/dmadjend.xtr" + "/home/martin/XTrackCAD/src/work/app/lib/demos/dmbench.xtr" + "/home/martin/XTrackCAD/src/work/app/lib/demos/dmcancel.xtr" + "/home/martin/XTrackCAD/src/work/app/lib/demos/dmcircle.xtr" + "/home/martin/XTrackCAD/src/work/app/lib/demos/dmconn1.xtr" + "/home/martin/XTrackCAD/src/work/app/lib/demos/dmconn2.xtr" + "/home/martin/XTrackCAD/src/work/app/lib/demos/dmcrvtrk.xtr" + "/home/martin/XTrackCAD/src/work/app/lib/demos/dmctlpnl.xtr" + "/home/martin/XTrackCAD/src/work/app/lib/demos/dmdelund.xtr" + "/home/martin/XTrackCAD/src/work/app/lib/demos/dmdialog.xtr" + "/home/martin/XTrackCAD/src/work/app/lib/demos/dmdimlin.xtr" + "/home/martin/XTrackCAD/src/work/app/lib/demos/dmease.xtr" + "/home/martin/XTrackCAD/src/work/app/lib/demos/dmelev.xtr" + "/home/martin/XTrackCAD/src/work/app/lib/demos/dmexcept.xtr" + "/home/martin/XTrackCAD/src/work/app/lib/demos/dmextend.xtr" + "/home/martin/XTrackCAD/src/work/app/lib/demos/dmflip.xtr" + "/home/martin/XTrackCAD/src/work/app/lib/demos/dmgroup.xtr" + "/home/martin/XTrackCAD/src/work/app/lib/demos/dmhelix.xtr" + "/home/martin/XTrackCAD/src/work/app/lib/demos/dmhndld.xtr" + "/home/martin/XTrackCAD/src/work/app/lib/demos/dmintro.xtr" + "/home/martin/XTrackCAD/src/work/app/lib/demos/dmjcir.xtr" + "/home/martin/XTrackCAD/src/work/app/lib/demos/dmjnabut.xtr" + "/home/martin/XTrackCAD/src/work/app/lib/demos/dmjncs.xtr" + "/home/martin/XTrackCAD/src/work/app/lib/demos/dmjnmove.xtr" + "/home/martin/XTrackCAD/src/work/app/lib/demos/dmjnss.xtr" + "/home/martin/XTrackCAD/src/work/app/lib/demos/dmjntt.xtr" + "/home/martin/XTrackCAD/src/work/app/lib/demos/dmlines.xtr" + "/home/martin/XTrackCAD/src/work/app/lib/demos/dmlines2.xtr" + "/home/martin/XTrackCAD/src/work/app/lib/demos/dmmouse.xtr" + "/home/martin/XTrackCAD/src/work/app/lib/demos/dmmovabt.xtr" + "/home/martin/XTrackCAD/src/work/app/lib/demos/dmnotes.xtr" + "/home/martin/XTrackCAD/src/work/app/lib/demos/dmparall.xtr" + "/home/martin/XTrackCAD/src/work/app/lib/demos/dmplymod.xtr" + "/home/martin/XTrackCAD/src/work/app/lib/demos/dmprof.xtr" + "/home/martin/XTrackCAD/src/work/app/lib/demos/dmrescal.xtr" + "/home/martin/XTrackCAD/src/work/app/lib/demos/dmrotate.xtr" + "/home/martin/XTrackCAD/src/work/app/lib/demos/dmruler.xtr" + "/home/martin/XTrackCAD/src/work/app/lib/demos/dmselect.xtr" + "/home/martin/XTrackCAD/src/work/app/lib/demos/dmsplit.xtr" + "/home/martin/XTrackCAD/src/work/app/lib/demos/dmstrtrk.xtr" + "/home/martin/XTrackCAD/src/work/app/lib/demos/dmtbledg.xtr" + "/home/martin/XTrackCAD/src/work/app/lib/demos/dmtodes.xtr" + "/home/martin/XTrackCAD/src/work/app/lib/demos/dmtosel.xtr" + "/home/martin/XTrackCAD/src/work/app/lib/demos/dmtotrim.xtr" + "/home/martin/XTrackCAD/src/work/app/lib/demos/dmtoyard.xtr" + "/home/martin/XTrackCAD/src/work/app/lib/demos/dmtrkwid.xtr" + "/home/martin/XTrackCAD/src/work/app/lib/demos/dmtrntab.xtr" + ) +endif() + 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() + diff --git a/app/lib/params/Any-CTC_panel.xtp b/app/lib/params/Any-CTC_panel.xtp index ab7dfd7..7c69b77 100644 --- a/app/lib/params/Any-CTC_panel.xtp +++ b/app/lib/params/Any-CTC_panel.xtp @@ -251,14 +251,14 @@ TURNOUT * " 0.5"" Straight (adjustable to 6""" S" E 0.000000 0.000000 270.000000 E 0.500000 0.000000 90.000000 X adjustable 0.500000 6.000000 - S 0 0 0.000000 0.000000 0.500000 0.000000 + S 16777215 0 0.000000 0.000000 0.500000 0.000000 L 0 0.080000 0.000000 0.000000 0.500000 0.000000 END TURNOUT * "Block Gap" BG" P "Normal" 1 E 0.000000 0.000000 270.000000 E 0.500000 0.000000 90.000000 - S 0 0 0.000000 0.000000 0.500000 0.000000 + S 16777215 0 0.000000 0.000000 0.500000 0.000000 L 0 0.080000 0.000000 0.000000 0.200000 0.000000 L 0 0.080000 0.300000 0.000000 0.500000 0.000000 END @@ -269,9 +269,9 @@ TURNOUT * "Turnout LH(GAP)" LHG" E 0.000000 0.000000 270.000000 E 1.000000 0.000000 90.000000 E 1.000000 0.500000 90.000000 - S 0 0 0.000000 0.000000 1.000000 0.000000 - S 0 0 0.300000 0.000000 0.800000 0.500000 - S 0 0 0.800000 0.500000 1.000000 0.500000 + S 16777215 0 0.000000 0.000000 1.000000 0.000000 + S 16777215 0 0.300000 0.000000 0.800000 0.500000 + S 16777215 0 0.800000 0.500000 1.000000 0.500000 L 0 0.080000 0.050000 0.000000 0.950000 0.000000 L 0 0.080000 0.300000 0.000000 0.825000 0.525000 L 0 0.080000 0.800000 0.500000 0.950000 0.500000 @@ -281,9 +281,9 @@ TURNOUT * "Turnout RH(GAP)" RHG" E 0.000000 0.000000 270.000000 E 1.000000 0.000000 90.000000 E 1.000000 -0.500000 90.000000 - S 0 0 0.000000 0.000000 1.000000 0.000000 - S 0 0 0.300000 0.000000 0.800000 -0.500000 - S 0 0 0.800000 -0.500000 1.000000 -0.500000 + S 16777215 0 0.000000 0.000000 1.000000 0.000000 + S 16777215 0 0.300000 0.000000 0.800000 -0.500000 + S 16777215 0 0.800000 -0.500000 1.000000 -0.500000 L 0 0.080000 0.050000 0.000000 0.950000 0.000000 L 0 0.080000 0.300000 0.000000 0.825000 -0.525000 L 0 0.080000 0.800000 -0.500000 0.950000 -0.500000 @@ -293,9 +293,9 @@ TURNOUT * "Turnout LH" LH" E 0.000000 0.000000 270.000000 E 1.000000 0.000000 90.000000 E 1.000000 0.500000 90.000000 - S 0 0 0.000000 0.000000 1.000000 0.000000 - S 0 0 0.300000 0.000000 0.800000 0.500000 - S 0 0 0.800000 0.500000 1.000000 0.500000 + S 16777215 0 0.000000 0.000000 1.000000 0.000000 + S 16777215 0 0.300000 0.000000 0.800000 0.500000 + S 16777215 0 0.800000 0.500000 1.000000 0.500000 L 0 0.080000 0.000000 0.000000 1.000000 0.000000 L 0 0.080000 0.300000 0.000000 0.825000 0.525000 L 0 0.080000 0.800000 0.500000 1.000000 0.500000 @@ -305,9 +305,9 @@ TURNOUT * "Turnout RH" RH" E 0.000000 0.000000 270.000000 E 1.000000 0.000000 90.000000 E 1.000000 -0.500000 90.000000 - S 0 0 0.000000 0.000000 1.000000 0.000000 - S 0 0 0.300000 0.000000 0.800000 -0.500000 - S 0 0 0.800000 -0.500000 1.000000 -0.500000 + S 16777215 0 0.000000 0.000000 1.000000 0.000000 + S 16777215 0 0.300000 0.000000 0.800000 -0.500000 + S 16777215 0 0.800000 -0.500000 1.000000 -0.500000 L 0 0.080000 0.000000 0.000000 1.000000 0.000000 L 0 0.080000 0.300000 0.000000 0.825000 -0.525000 L 0 0.080000 0.800000 -0.500000 1.000000 -0.500000 @@ -320,8 +320,8 @@ TURNOUT * "Crossover LH(GAP)" COLHG" E 0.000000 0.500000 270.000000 E 1.000000 0.000000 90.000000 E 1.000000 0.500000 90.000000 - S 0 0 0.000000 0.000000 1.000000 0.000000 - S 0 0 0.000000 0.500000 1.000000 0.500000 + S 16777215 0 0.000000 0.000000 1.000000 0.000000 + S 16777215 0 0.000000 0.500000 1.000000 0.500000 L 0 0.080000 0.050000 0.000000 0.950000 0.000000 L 0 0.080000 0.250000 0.000000 0.750000 0.500000 L 0 0.080000 0.050000 0.500000 0.950000 0.500000 @@ -332,8 +332,8 @@ TURNOUT * "Crossover RH(GAP)" CORHG" E 0.000000 -0.500000 270.000000 E 1.000000 0.000000 90.000000 E 1.000000 -0.500000 90.000000 - S 0 0 0.000000 0.000000 1.000000 0.000000 - S 0 0 0.000000 -0.500000 1.000000 -0.500000 + S 16777215 0 0.000000 0.000000 1.000000 0.000000 + S 16777215 0 0.000000 -0.500000 1.000000 -0.500000 L 0 0.080000 0.050000 0.000000 0.950000 0.000000 L 0 0.080000 0.250000 0.000000 0.750000 -0.500000 L 0 0.080000 0.050000 -0.500000 0.950000 -0.500000 @@ -344,8 +344,8 @@ TURNOUT * "Crossover LH" COLH" E 0.000000 0.500000 270.000000 E 1.000000 0.000000 90.000000 E 1.000000 0.500000 90.000000 - S 0 0 0.000000 0.000000 1.000000 0.000000 - S 0 0 0.000000 0.500000 1.000000 0.500000 + S 16777215 0 0.000000 0.000000 1.000000 0.000000 + S 16777215 0 0.000000 0.500000 1.000000 0.500000 L 0 0.080000 0.000000 0.000000 1.000000 0.000000 L 0 0.080000 0.250000 0.000000 0.750000 0.500000 L 0 0.080000 0.000000 0.500000 1.000000 0.500000 @@ -356,8 +356,8 @@ TURNOUT * "Crossover RH" CORH" E 0.000000 -0.500000 270.000000 E 1.000000 0.000000 90.000000 E 1.000000 -0.500000 90.000000 - S 0 0 0.000000 0.000000 1.000000 0.000000 - S 0 0 0.000000 -0.500000 1.000000 -0.500000 + S 16777215 0 0.000000 0.000000 1.000000 0.000000 + S 16777215 0 0.000000 -0.500000 1.000000 -0.500000 L 0 0.080000 0.000000 0.000000 1.000000 0.000000 L 0 0.080000 0.250000 0.000000 0.750000 -0.500000 L 0 0.080000 0.000000 -0.500000 1.000000 -0.500000 @@ -368,8 +368,8 @@ TURNOUT * "Dbl.Crossover(GAP)" DBLCOG" E 0.000000 0.500000 270.000000 E 1.000000 0.000000 90.000000 E 1.000000 0.500000 90.000000 - S 0 0 0.000000 0.000000 1.000000 0.000000 - S 0 0 0.000000 0.500000 1.000000 0.500000 + S 16777215 0 0.000000 0.000000 1.000000 0.000000 + S 16777215 0 0.000000 0.500000 1.000000 0.500000 L 0 0.080000 0.050000 0.000000 0.950000 0.000000 L 0 0.080000 0.250000 0.000000 0.750000 0.500000 L 0 0.080000 0.250000 0.500000 0.750000 0.000000 @@ -381,8 +381,8 @@ TURNOUT * "Dbl.Crossover" DBLCO" E 0.000000 0.500000 270.000000 E 1.000000 0.000000 90.000000 E 1.000000 0.500000 90.000000 - S 0 0 0.000000 0.000000 1.000000 0.000000 - S 0 0 0.000000 0.500000 1.000000 0.500000 + S 16777215 0 0.000000 0.000000 1.000000 0.000000 + S 16777215 0 0.000000 0.500000 1.000000 0.500000 L 0 0.080000 0.000000 0.000000 1.000000 0.000000 L 0 0.080000 0.250000 0.000000 0.750000 0.500000 L 0 0.080000 0.250000 0.500000 0.750000 0.000000 @@ -396,8 +396,8 @@ TURNOUT * "90 Crossing" 90C" E 0.500000 0.000000 90.000000 E 0.250000 0.250000 0.000000 E 0.250000 -0.250000 180.000000 - S 0 0 0.000000 0.000000 0.500000 0.000000 - S 0 0 0.250000 0.250000 0.250000 -0.250000 + S 16777215 0 0.000000 0.000000 0.500000 0.000000 + S 16777215 0 0.250000 0.250000 0.250000 -0.250000 L 0 0.080000 0.000000 0.000000 0.500000 0.000000 L 0 0.080000 0.250000 0.250000 0.250000 -0.250000 END @@ -407,8 +407,8 @@ TURNOUT * "45 Crossing" 45C" E 0.500000 0.000000 90.000000 E 0.500000 0.250000 45.000000 E 0.000000 -0.2500000 225.000000 - S 0 0 0.000000 0.000000 0.500000 0.000000 - S 0 0 0.000000 -0.25000 0.500000 0.250000 + S 16777215 0 0.000000 0.000000 0.500000 0.000000 + S 16777215 0 0.000000 -0.25000 0.500000 0.250000 L 0 0.080000 0.000000 0.000000 0.500000 0.000000 L 0 0.080000 0.000000 -0.250000 0.500000 0.250000 END diff --git a/app/lib/params/CMakeFiles/CMakeDirectoryInformation.cmake b/app/lib/params/CMakeFiles/CMakeDirectoryInformation.cmake new file mode 100644 index 0000000..2569371 --- /dev/null +++ b/app/lib/params/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/params/CMakeFiles/mkcarpart.dir/DependInfo.cmake b/app/lib/params/CMakeFiles/mkcarpart.dir/DependInfo.cmake new file mode 100644 index 0000000..0b7b12e --- /dev/null +++ b/app/lib/params/CMakeFiles/mkcarpart.dir/DependInfo.cmake @@ -0,0 +1,29 @@ +# The set of languages for which implicit dependencies are needed: +set(CMAKE_DEPENDS_LANGUAGES + "C" + ) +# The set of files for implicit dependencies of each language: +set(CMAKE_DEPENDS_CHECK_C + "/home/martin/XTrackCAD/src/work/app/lib/params/mkcarpart.c" "/home/martin/XTrackCAD/src/work/app/lib/params/CMakeFiles/mkcarpart.dir/mkcarpart.c.o" + ) +set(CMAKE_C_COMPILER_ID "GNU") + +# Preprocessor definitions for this target. +set(CMAKE_TARGET_DEFINITIONS_C + "XTRKCAD_CMAKE_BUILD" + ) + +# The include file search paths: +set(CMAKE_C_TARGET_INCLUDE_PATH + "/usr/local/include" + "app/bin" + "app/dynstring" + "app/cornu" + ) + +# Targets to which this target links. +set(CMAKE_TARGET_LINKED_INFO_FILES + ) + +# Fortran module output directory. +set(CMAKE_Fortran_TARGET_MODULE_DIR "") diff --git a/app/lib/params/CMakeFiles/mkcarpart.dir/build.make b/app/lib/params/CMakeFiles/mkcarpart.dir/build.make new file mode 100644 index 0000000..2d3e829 --- /dev/null +++ b/app/lib/params/CMakeFiles/mkcarpart.dir/build.make @@ -0,0 +1,113 @@ +# CMAKE generated file: DO NOT EDIT! +# Generated by "Unix Makefiles" Generator, CMake Version 3.6 + +# Delete rule output on recipe failure. +.DELETE_ON_ERROR: + + +#============================================================================= +# 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 + +# Include any dependencies generated for this target. +include app/lib/params/CMakeFiles/mkcarpart.dir/depend.make + +# Include the progress variables for this target. +include app/lib/params/CMakeFiles/mkcarpart.dir/progress.make + +# Include the compile flags for this target's objects. +include app/lib/params/CMakeFiles/mkcarpart.dir/flags.make + +app/lib/params/CMakeFiles/mkcarpart.dir/mkcarpart.c.o: app/lib/params/CMakeFiles/mkcarpart.dir/flags.make +app/lib/params/CMakeFiles/mkcarpart.dir/mkcarpart.c.o: app/lib/params/mkcarpart.c + @$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --green --progress-dir=/home/martin/XTrackCAD/src/work/CMakeFiles --progress-num=$(CMAKE_PROGRESS_1) "Building C object app/lib/params/CMakeFiles/mkcarpart.dir/mkcarpart.c.o" + cd /home/martin/XTrackCAD/src/work/app/lib/params && /usr/bin/gcc $(C_DEFINES) $(C_INCLUDES) $(C_FLAGS) -o CMakeFiles/mkcarpart.dir/mkcarpart.c.o -c /home/martin/XTrackCAD/src/work/app/lib/params/mkcarpart.c + +app/lib/params/CMakeFiles/mkcarpart.dir/mkcarpart.c.i: cmake_force + @$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --green "Preprocessing C source to CMakeFiles/mkcarpart.dir/mkcarpart.c.i" + cd /home/martin/XTrackCAD/src/work/app/lib/params && /usr/bin/gcc $(C_DEFINES) $(C_INCLUDES) $(C_FLAGS) -E /home/martin/XTrackCAD/src/work/app/lib/params/mkcarpart.c > CMakeFiles/mkcarpart.dir/mkcarpart.c.i + +app/lib/params/CMakeFiles/mkcarpart.dir/mkcarpart.c.s: cmake_force + @$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --green "Compiling C source to assembly CMakeFiles/mkcarpart.dir/mkcarpart.c.s" + cd /home/martin/XTrackCAD/src/work/app/lib/params && /usr/bin/gcc $(C_DEFINES) $(C_INCLUDES) $(C_FLAGS) -S /home/martin/XTrackCAD/src/work/app/lib/params/mkcarpart.c -o CMakeFiles/mkcarpart.dir/mkcarpart.c.s + +app/lib/params/CMakeFiles/mkcarpart.dir/mkcarpart.c.o.requires: + +.PHONY : app/lib/params/CMakeFiles/mkcarpart.dir/mkcarpart.c.o.requires + +app/lib/params/CMakeFiles/mkcarpart.dir/mkcarpart.c.o.provides: app/lib/params/CMakeFiles/mkcarpart.dir/mkcarpart.c.o.requires + $(MAKE) -f app/lib/params/CMakeFiles/mkcarpart.dir/build.make app/lib/params/CMakeFiles/mkcarpart.dir/mkcarpart.c.o.provides.build +.PHONY : app/lib/params/CMakeFiles/mkcarpart.dir/mkcarpart.c.o.provides + +app/lib/params/CMakeFiles/mkcarpart.dir/mkcarpart.c.o.provides.build: app/lib/params/CMakeFiles/mkcarpart.dir/mkcarpart.c.o + + +# Object files for target mkcarpart +mkcarpart_OBJECTS = \ +"CMakeFiles/mkcarpart.dir/mkcarpart.c.o" + +# External object files for target mkcarpart +mkcarpart_EXTERNAL_OBJECTS = + +app/lib/params/mkcarpart: app/lib/params/CMakeFiles/mkcarpart.dir/mkcarpart.c.o +app/lib/params/mkcarpart: app/lib/params/CMakeFiles/mkcarpart.dir/build.make +app/lib/params/mkcarpart: app/lib/params/CMakeFiles/mkcarpart.dir/link.txt + @$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --green --bold --progress-dir=/home/martin/XTrackCAD/src/work/CMakeFiles --progress-num=$(CMAKE_PROGRESS_2) "Linking C executable mkcarpart" + cd /home/martin/XTrackCAD/src/work/app/lib/params && $(CMAKE_COMMAND) -E cmake_link_script CMakeFiles/mkcarpart.dir/link.txt --verbose=$(VERBOSE) + +# Rule to build all files generated by this target. +app/lib/params/CMakeFiles/mkcarpart.dir/build: app/lib/params/mkcarpart + +.PHONY : app/lib/params/CMakeFiles/mkcarpart.dir/build + +app/lib/params/CMakeFiles/mkcarpart.dir/requires: app/lib/params/CMakeFiles/mkcarpart.dir/mkcarpart.c.o.requires + +.PHONY : app/lib/params/CMakeFiles/mkcarpart.dir/requires + +app/lib/params/CMakeFiles/mkcarpart.dir/clean: + cd /home/martin/XTrackCAD/src/work/app/lib/params && $(CMAKE_COMMAND) -P CMakeFiles/mkcarpart.dir/cmake_clean.cmake +.PHONY : app/lib/params/CMakeFiles/mkcarpart.dir/clean + +app/lib/params/CMakeFiles/mkcarpart.dir/depend: + cd /home/martin/XTrackCAD/src/work && $(CMAKE_COMMAND) -E cmake_depends "Unix Makefiles" /home/martin/XTrackCAD/src/work /home/martin/XTrackCAD/src/work/app/lib/params /home/martin/XTrackCAD/src/work /home/martin/XTrackCAD/src/work/app/lib/params /home/martin/XTrackCAD/src/work/app/lib/params/CMakeFiles/mkcarpart.dir/DependInfo.cmake --color=$(COLOR) +.PHONY : app/lib/params/CMakeFiles/mkcarpart.dir/depend + diff --git a/app/lib/params/CMakeFiles/mkcarpart.dir/cmake_clean.cmake b/app/lib/params/CMakeFiles/mkcarpart.dir/cmake_clean.cmake new file mode 100644 index 0000000..31d627b --- /dev/null +++ b/app/lib/params/CMakeFiles/mkcarpart.dir/cmake_clean.cmake @@ -0,0 +1,10 @@ +file(REMOVE_RECURSE + "CMakeFiles/mkcarpart.dir/mkcarpart.c.o" + "mkcarpart.pdb" + "mkcarpart" +) + +# Per-language clean rules from dependency scanning. +foreach(lang C) + include(CMakeFiles/mkcarpart.dir/cmake_clean_${lang}.cmake OPTIONAL) +endforeach() diff --git a/app/lib/params/CMakeFiles/mkcarpart.dir/depend.make b/app/lib/params/CMakeFiles/mkcarpart.dir/depend.make new file mode 100644 index 0000000..da9dfcb --- /dev/null +++ b/app/lib/params/CMakeFiles/mkcarpart.dir/depend.make @@ -0,0 +1,2 @@ +# Empty dependencies file for mkcarpart. +# This may be replaced when dependencies are built. diff --git a/app/lib/params/CMakeFiles/mkcarpart.dir/flags.make b/app/lib/params/CMakeFiles/mkcarpart.dir/flags.make new file mode 100644 index 0000000..adbe140 --- /dev/null +++ b/app/lib/params/CMakeFiles/mkcarpart.dir/flags.make @@ -0,0 +1,10 @@ +# CMAKE generated file: DO NOT EDIT! +# Generated by "Unix Makefiles" Generator, CMake Version 3.6 + +# compile C with /usr/bin/gcc +C_FLAGS = -g3 -gdwarf-2 -std=gnu99 + +C_DEFINES = -DXTRKCAD_CMAKE_BUILD + +C_INCLUDES = -I/usr/local/include -I/home/martin/XTrackCAD/src/work/app/bin -I/home/martin/XTrackCAD/src/work/app/dynstring -I/home/martin/XTrackCAD/src/work/app/cornu + diff --git a/app/lib/params/CMakeFiles/mkcarpart.dir/link.txt b/app/lib/params/CMakeFiles/mkcarpart.dir/link.txt new file mode 100644 index 0000000..aa23208 --- /dev/null +++ b/app/lib/params/CMakeFiles/mkcarpart.dir/link.txt @@ -0,0 +1 @@ +/usr/bin/gcc -g3 -gdwarf-2 CMakeFiles/mkcarpart.dir/mkcarpart.c.o -o mkcarpart -rdynamic diff --git a/app/lib/params/CMakeFiles/mkcarpart.dir/progress.make b/app/lib/params/CMakeFiles/mkcarpart.dir/progress.make new file mode 100644 index 0000000..4d2334f --- /dev/null +++ b/app/lib/params/CMakeFiles/mkcarpart.dir/progress.make @@ -0,0 +1,3 @@ +CMAKE_PROGRESS_1 = +CMAKE_PROGRESS_2 = 21 + diff --git a/app/lib/params/CMakeFiles/mkstruct.dir/DependInfo.cmake b/app/lib/params/CMakeFiles/mkstruct.dir/DependInfo.cmake new file mode 100644 index 0000000..dbed4be --- /dev/null +++ b/app/lib/params/CMakeFiles/mkstruct.dir/DependInfo.cmake @@ -0,0 +1,29 @@ +# The set of languages for which implicit dependencies are needed: +set(CMAKE_DEPENDS_LANGUAGES + "C" + ) +# The set of files for implicit dependencies of each language: +set(CMAKE_DEPENDS_CHECK_C + "/home/martin/XTrackCAD/src/work/app/lib/params/mkstruct.c" "/home/martin/XTrackCAD/src/work/app/lib/params/CMakeFiles/mkstruct.dir/mkstruct.c.o" + ) +set(CMAKE_C_COMPILER_ID "GNU") + +# Preprocessor definitions for this target. +set(CMAKE_TARGET_DEFINITIONS_C + "XTRKCAD_CMAKE_BUILD" + ) + +# The include file search paths: +set(CMAKE_C_TARGET_INCLUDE_PATH + "/usr/local/include" + "app/bin" + "app/dynstring" + "app/cornu" + ) + +# Targets to which this target links. +set(CMAKE_TARGET_LINKED_INFO_FILES + ) + +# Fortran module output directory. +set(CMAKE_Fortran_TARGET_MODULE_DIR "") diff --git a/app/lib/params/CMakeFiles/mkstruct.dir/build.make b/app/lib/params/CMakeFiles/mkstruct.dir/build.make new file mode 100644 index 0000000..08c6a6f --- /dev/null +++ b/app/lib/params/CMakeFiles/mkstruct.dir/build.make @@ -0,0 +1,113 @@ +# CMAKE generated file: DO NOT EDIT! +# Generated by "Unix Makefiles" Generator, CMake Version 3.6 + +# Delete rule output on recipe failure. +.DELETE_ON_ERROR: + + +#============================================================================= +# 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 + +# Include any dependencies generated for this target. +include app/lib/params/CMakeFiles/mkstruct.dir/depend.make + +# Include the progress variables for this target. +include app/lib/params/CMakeFiles/mkstruct.dir/progress.make + +# Include the compile flags for this target's objects. +include app/lib/params/CMakeFiles/mkstruct.dir/flags.make + +app/lib/params/CMakeFiles/mkstruct.dir/mkstruct.c.o: app/lib/params/CMakeFiles/mkstruct.dir/flags.make +app/lib/params/CMakeFiles/mkstruct.dir/mkstruct.c.o: app/lib/params/mkstruct.c + @$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --green --progress-dir=/home/martin/XTrackCAD/src/work/CMakeFiles --progress-num=$(CMAKE_PROGRESS_1) "Building C object app/lib/params/CMakeFiles/mkstruct.dir/mkstruct.c.o" + cd /home/martin/XTrackCAD/src/work/app/lib/params && /usr/bin/gcc $(C_DEFINES) $(C_INCLUDES) $(C_FLAGS) -o CMakeFiles/mkstruct.dir/mkstruct.c.o -c /home/martin/XTrackCAD/src/work/app/lib/params/mkstruct.c + +app/lib/params/CMakeFiles/mkstruct.dir/mkstruct.c.i: cmake_force + @$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --green "Preprocessing C source to CMakeFiles/mkstruct.dir/mkstruct.c.i" + cd /home/martin/XTrackCAD/src/work/app/lib/params && /usr/bin/gcc $(C_DEFINES) $(C_INCLUDES) $(C_FLAGS) -E /home/martin/XTrackCAD/src/work/app/lib/params/mkstruct.c > CMakeFiles/mkstruct.dir/mkstruct.c.i + +app/lib/params/CMakeFiles/mkstruct.dir/mkstruct.c.s: cmake_force + @$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --green "Compiling C source to assembly CMakeFiles/mkstruct.dir/mkstruct.c.s" + cd /home/martin/XTrackCAD/src/work/app/lib/params && /usr/bin/gcc $(C_DEFINES) $(C_INCLUDES) $(C_FLAGS) -S /home/martin/XTrackCAD/src/work/app/lib/params/mkstruct.c -o CMakeFiles/mkstruct.dir/mkstruct.c.s + +app/lib/params/CMakeFiles/mkstruct.dir/mkstruct.c.o.requires: + +.PHONY : app/lib/params/CMakeFiles/mkstruct.dir/mkstruct.c.o.requires + +app/lib/params/CMakeFiles/mkstruct.dir/mkstruct.c.o.provides: app/lib/params/CMakeFiles/mkstruct.dir/mkstruct.c.o.requires + $(MAKE) -f app/lib/params/CMakeFiles/mkstruct.dir/build.make app/lib/params/CMakeFiles/mkstruct.dir/mkstruct.c.o.provides.build +.PHONY : app/lib/params/CMakeFiles/mkstruct.dir/mkstruct.c.o.provides + +app/lib/params/CMakeFiles/mkstruct.dir/mkstruct.c.o.provides.build: app/lib/params/CMakeFiles/mkstruct.dir/mkstruct.c.o + + +# Object files for target mkstruct +mkstruct_OBJECTS = \ +"CMakeFiles/mkstruct.dir/mkstruct.c.o" + +# External object files for target mkstruct +mkstruct_EXTERNAL_OBJECTS = + +app/lib/params/mkstruct: app/lib/params/CMakeFiles/mkstruct.dir/mkstruct.c.o +app/lib/params/mkstruct: app/lib/params/CMakeFiles/mkstruct.dir/build.make +app/lib/params/mkstruct: app/lib/params/CMakeFiles/mkstruct.dir/link.txt + @$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --green --bold --progress-dir=/home/martin/XTrackCAD/src/work/CMakeFiles --progress-num=$(CMAKE_PROGRESS_2) "Linking C executable mkstruct" + cd /home/martin/XTrackCAD/src/work/app/lib/params && $(CMAKE_COMMAND) -E cmake_link_script CMakeFiles/mkstruct.dir/link.txt --verbose=$(VERBOSE) + +# Rule to build all files generated by this target. +app/lib/params/CMakeFiles/mkstruct.dir/build: app/lib/params/mkstruct + +.PHONY : app/lib/params/CMakeFiles/mkstruct.dir/build + +app/lib/params/CMakeFiles/mkstruct.dir/requires: app/lib/params/CMakeFiles/mkstruct.dir/mkstruct.c.o.requires + +.PHONY : app/lib/params/CMakeFiles/mkstruct.dir/requires + +app/lib/params/CMakeFiles/mkstruct.dir/clean: + cd /home/martin/XTrackCAD/src/work/app/lib/params && $(CMAKE_COMMAND) -P CMakeFiles/mkstruct.dir/cmake_clean.cmake +.PHONY : app/lib/params/CMakeFiles/mkstruct.dir/clean + +app/lib/params/CMakeFiles/mkstruct.dir/depend: + cd /home/martin/XTrackCAD/src/work && $(CMAKE_COMMAND) -E cmake_depends "Unix Makefiles" /home/martin/XTrackCAD/src/work /home/martin/XTrackCAD/src/work/app/lib/params /home/martin/XTrackCAD/src/work /home/martin/XTrackCAD/src/work/app/lib/params /home/martin/XTrackCAD/src/work/app/lib/params/CMakeFiles/mkstruct.dir/DependInfo.cmake --color=$(COLOR) +.PHONY : app/lib/params/CMakeFiles/mkstruct.dir/depend + diff --git a/app/lib/params/CMakeFiles/mkstruct.dir/cmake_clean.cmake b/app/lib/params/CMakeFiles/mkstruct.dir/cmake_clean.cmake new file mode 100644 index 0000000..7cbddd0 --- /dev/null +++ b/app/lib/params/CMakeFiles/mkstruct.dir/cmake_clean.cmake @@ -0,0 +1,10 @@ +file(REMOVE_RECURSE + "CMakeFiles/mkstruct.dir/mkstruct.c.o" + "mkstruct.pdb" + "mkstruct" +) + +# Per-language clean rules from dependency scanning. +foreach(lang C) + include(CMakeFiles/mkstruct.dir/cmake_clean_${lang}.cmake OPTIONAL) +endforeach() diff --git a/app/lib/params/CMakeFiles/mkstruct.dir/depend.make b/app/lib/params/CMakeFiles/mkstruct.dir/depend.make new file mode 100644 index 0000000..8a948e4 --- /dev/null +++ b/app/lib/params/CMakeFiles/mkstruct.dir/depend.make @@ -0,0 +1,2 @@ +# Empty dependencies file for mkstruct. +# This may be replaced when dependencies are built. diff --git a/app/lib/params/CMakeFiles/mkstruct.dir/flags.make b/app/lib/params/CMakeFiles/mkstruct.dir/flags.make new file mode 100644 index 0000000..adbe140 --- /dev/null +++ b/app/lib/params/CMakeFiles/mkstruct.dir/flags.make @@ -0,0 +1,10 @@ +# CMAKE generated file: DO NOT EDIT! +# Generated by "Unix Makefiles" Generator, CMake Version 3.6 + +# compile C with /usr/bin/gcc +C_FLAGS = -g3 -gdwarf-2 -std=gnu99 + +C_DEFINES = -DXTRKCAD_CMAKE_BUILD + +C_INCLUDES = -I/usr/local/include -I/home/martin/XTrackCAD/src/work/app/bin -I/home/martin/XTrackCAD/src/work/app/dynstring -I/home/martin/XTrackCAD/src/work/app/cornu + diff --git a/app/lib/params/CMakeFiles/mkstruct.dir/link.txt b/app/lib/params/CMakeFiles/mkstruct.dir/link.txt new file mode 100644 index 0000000..0a50a95 --- /dev/null +++ b/app/lib/params/CMakeFiles/mkstruct.dir/link.txt @@ -0,0 +1 @@ +/usr/bin/gcc -g3 -gdwarf-2 CMakeFiles/mkstruct.dir/mkstruct.c.o -o mkstruct -rdynamic diff --git a/app/lib/params/CMakeFiles/mkstruct.dir/progress.make b/app/lib/params/CMakeFiles/mkstruct.dir/progress.make new file mode 100644 index 0000000..5716e39 --- /dev/null +++ b/app/lib/params/CMakeFiles/mkstruct.dir/progress.make @@ -0,0 +1,3 @@ +CMAKE_PROGRESS_1 = +CMAKE_PROGRESS_2 = 22 + diff --git a/app/lib/params/CMakeFiles/progress.marks b/app/lib/params/CMakeFiles/progress.marks new file mode 100644 index 0000000..7ed6ff8 --- /dev/null +++ b/app/lib/params/CMakeFiles/progress.marks @@ -0,0 +1 @@ +5 diff --git a/app/lib/params/CMakeFiles/xtpfiles.dir/DependInfo.cmake b/app/lib/params/CMakeFiles/xtpfiles.dir/DependInfo.cmake new file mode 100644 index 0000000..19fab21 --- /dev/null +++ b/app/lib/params/CMakeFiles/xtpfiles.dir/DependInfo.cmake @@ -0,0 +1,11 @@ +# The set of languages for which implicit dependencies are needed: +set(CMAKE_DEPENDS_LANGUAGES + ) +# The set of files for implicit dependencies of each language: + +# Targets to which this target links. +set(CMAKE_TARGET_LINKED_INFO_FILES + ) + +# Fortran module output directory. +set(CMAKE_Fortran_TARGET_MODULE_DIR "") diff --git a/app/lib/params/CMakeFiles/xtpfiles.dir/build.make b/app/lib/params/CMakeFiles/xtpfiles.dir/build.make new file mode 100644 index 0000000..c66ec07 --- /dev/null +++ b/app/lib/params/CMakeFiles/xtpfiles.dir/build.make @@ -0,0 +1,117 @@ +# CMAKE generated file: DO NOT EDIT! +# Generated by "Unix Makefiles" Generator, CMake Version 3.6 + +# Delete rule output on recipe failure. +.DELETE_ON_ERROR: + + +#============================================================================= +# 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 + +# Utility rule file for xtpfiles. + +# Include the progress variables for this target. +include app/lib/params/CMakeFiles/xtpfiles.dir/progress.make + +app/lib/params/CMakeFiles/xtpfiles: app/lib/params/accurail.xtp +app/lib/params/CMakeFiles/xtpfiles: app/lib/params/atlascho.xtp +app/lib/params/CMakeFiles/xtpfiles: app/lib/params/atlaseho.xtp +app/lib/params/CMakeFiles/xtpfiles: app/lib/params/fallerho.xtp +app/lib/params/CMakeFiles/xtpfiles: app/lib/params/pikestuf.xtp +app/lib/params/CMakeFiles/xtpfiles: app/lib/params/revell.xtp + + +app/lib/params/accurail.xtp: app/lib/params/accurail.cars +app/lib/params/accurail.xtp: app/lib/params/mkcarpart + @$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --blue --bold --progress-dir=/home/martin/XTrackCAD/src/work/CMakeFiles --progress-num=$(CMAKE_PROGRESS_1) "Generating accurail.xtp" + cd /home/martin/XTrackCAD/src/work/app/lib/params && /home/martin/XTrackCAD/src/work/app/lib/params/mkcarpart /home/martin/XTrackCAD/src/work/app/lib/params/accurail.cars /home/martin/XTrackCAD/src/work/app/lib/params/accurail.xtp + +app/lib/params/atlascho.xtp: app/lib/params/atlascho.cars +app/lib/params/atlascho.xtp: app/lib/params/mkcarpart + @$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --blue --bold --progress-dir=/home/martin/XTrackCAD/src/work/CMakeFiles --progress-num=$(CMAKE_PROGRESS_2) "Generating atlascho.xtp" + cd /home/martin/XTrackCAD/src/work/app/lib/params && /home/martin/XTrackCAD/src/work/app/lib/params/mkcarpart /home/martin/XTrackCAD/src/work/app/lib/params/atlascho.cars /home/martin/XTrackCAD/src/work/app/lib/params/atlascho.xtp + +app/lib/params/atlaseho.xtp: app/lib/params/atlaseho.cars +app/lib/params/atlaseho.xtp: app/lib/params/mkcarpart + @$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --blue --bold --progress-dir=/home/martin/XTrackCAD/src/work/CMakeFiles --progress-num=$(CMAKE_PROGRESS_3) "Generating atlaseho.xtp" + cd /home/martin/XTrackCAD/src/work/app/lib/params && /home/martin/XTrackCAD/src/work/app/lib/params/mkcarpart /home/martin/XTrackCAD/src/work/app/lib/params/atlaseho.cars /home/martin/XTrackCAD/src/work/app/lib/params/atlaseho.xtp + +app/lib/params/fallerho.xtp: app/lib/params/fallerho.struct +app/lib/params/fallerho.xtp: app/lib/params/mkstruct + @$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --blue --bold --progress-dir=/home/martin/XTrackCAD/src/work/CMakeFiles --progress-num=$(CMAKE_PROGRESS_4) "Generating fallerho.xtp" + cd /home/martin/XTrackCAD/src/work/app/lib/params && /home/martin/XTrackCAD/src/work/app/lib/params/mkstruct /home/martin/XTrackCAD/src/work/app/lib/params/fallerho.struct /home/martin/XTrackCAD/src/work/app/lib/params/fallerho.xtp + +app/lib/params/pikestuf.xtp: app/lib/params/pikestuf.struct +app/lib/params/pikestuf.xtp: app/lib/params/mkstruct + @$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --blue --bold --progress-dir=/home/martin/XTrackCAD/src/work/CMakeFiles --progress-num=$(CMAKE_PROGRESS_5) "Generating pikestuf.xtp" + cd /home/martin/XTrackCAD/src/work/app/lib/params && /home/martin/XTrackCAD/src/work/app/lib/params/mkstruct /home/martin/XTrackCAD/src/work/app/lib/params/pikestuf.struct /home/martin/XTrackCAD/src/work/app/lib/params/pikestuf.xtp + +app/lib/params/revell.xtp: app/lib/params/revell.struct +app/lib/params/revell.xtp: app/lib/params/mkstruct + @$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --blue --bold --progress-dir=/home/martin/XTrackCAD/src/work/CMakeFiles --progress-num=$(CMAKE_PROGRESS_6) "Generating revell.xtp" + cd /home/martin/XTrackCAD/src/work/app/lib/params && /home/martin/XTrackCAD/src/work/app/lib/params/mkstruct /home/martin/XTrackCAD/src/work/app/lib/params/revell.struct /home/martin/XTrackCAD/src/work/app/lib/params/revell.xtp + +xtpfiles: app/lib/params/CMakeFiles/xtpfiles +xtpfiles: app/lib/params/accurail.xtp +xtpfiles: app/lib/params/atlascho.xtp +xtpfiles: app/lib/params/atlaseho.xtp +xtpfiles: app/lib/params/fallerho.xtp +xtpfiles: app/lib/params/pikestuf.xtp +xtpfiles: app/lib/params/revell.xtp +xtpfiles: app/lib/params/CMakeFiles/xtpfiles.dir/build.make + +.PHONY : xtpfiles + +# Rule to build all files generated by this target. +app/lib/params/CMakeFiles/xtpfiles.dir/build: xtpfiles + +.PHONY : app/lib/params/CMakeFiles/xtpfiles.dir/build + +app/lib/params/CMakeFiles/xtpfiles.dir/clean: + cd /home/martin/XTrackCAD/src/work/app/lib/params && $(CMAKE_COMMAND) -P CMakeFiles/xtpfiles.dir/cmake_clean.cmake +.PHONY : app/lib/params/CMakeFiles/xtpfiles.dir/clean + +app/lib/params/CMakeFiles/xtpfiles.dir/depend: + cd /home/martin/XTrackCAD/src/work && $(CMAKE_COMMAND) -E cmake_depends "Unix Makefiles" /home/martin/XTrackCAD/src/work /home/martin/XTrackCAD/src/work/app/lib/params /home/martin/XTrackCAD/src/work /home/martin/XTrackCAD/src/work/app/lib/params /home/martin/XTrackCAD/src/work/app/lib/params/CMakeFiles/xtpfiles.dir/DependInfo.cmake --color=$(COLOR) +.PHONY : app/lib/params/CMakeFiles/xtpfiles.dir/depend + diff --git a/app/lib/params/CMakeFiles/xtpfiles.dir/cmake_clean.cmake b/app/lib/params/CMakeFiles/xtpfiles.dir/cmake_clean.cmake new file mode 100644 index 0000000..579df32 --- /dev/null +++ b/app/lib/params/CMakeFiles/xtpfiles.dir/cmake_clean.cmake @@ -0,0 +1,14 @@ +file(REMOVE_RECURSE + "CMakeFiles/xtpfiles" + "accurail.xtp" + "atlascho.xtp" + "atlaseho.xtp" + "fallerho.xtp" + "pikestuf.xtp" + "revell.xtp" +) + +# Per-language clean rules from dependency scanning. +foreach(lang ) + include(CMakeFiles/xtpfiles.dir/cmake_clean_${lang}.cmake OPTIONAL) +endforeach() diff --git a/app/lib/params/CMakeFiles/xtpfiles.dir/progress.make b/app/lib/params/CMakeFiles/xtpfiles.dir/progress.make new file mode 100644 index 0000000..58199e2 --- /dev/null +++ b/app/lib/params/CMakeFiles/xtpfiles.dir/progress.make @@ -0,0 +1,7 @@ +CMAKE_PROGRESS_1 = 33 +CMAKE_PROGRESS_2 = +CMAKE_PROGRESS_3 = +CMAKE_PROGRESS_4 = 34 +CMAKE_PROGRESS_5 = +CMAKE_PROGRESS_6 = 35 + diff --git a/app/lib/params/CTestTestfile.cmake b/app/lib/params/CTestTestfile.cmake new file mode 100644 index 0000000..4f4a023 --- /dev/null +++ b/app/lib/params/CTestTestfile.cmake @@ -0,0 +1,6 @@ +# CMake generated Testfile for +# Source directory: /home/martin/XTrackCAD/src/work/app/lib/params +# Build directory: /home/martin/XTrackCAD/src/work/app/lib/params +# +# 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/params/HO-Frateschi.xtp b/app/lib/params/HO-Frateschi.xtp index 6093198..89cb804 100644 --- a/app/lib/params/HO-Frateschi.xtp +++ b/app/lib/params/HO-Frateschi.xtp @@ -180,15 +180,15 @@ TURNOUT HO "Frateschi Turntable 220mm 20d 4500" E -3.750504 2.165354 300.000000 E -2.783726 3.317515 320.000000 E -1.481190 4.069535 340.000000 - S 0 0 0.000000 4.330709 0.000000 -4.330709 - S 0 0 1.481190 4.069535 -1.481190 -4.069535 - S 0 0 2.783726 3.317515 -2.783726 -3.317515 - S 0 0 3.750504 2.165354 -3.750504 -2.165354 - S 0 0 4.264915 0.752020 -4.264915 -0.752020 - S 0 0 4.264915 -0.752020 -4.264915 0.752020 - S 0 0 3.750504 -2.165354 -3.750504 2.165354 - S 0 0 2.783726 -3.317515 -2.783726 3.317515 - S 0 0 1.481190 -4.069535 -1.481190 4.069535 + S 16777215 0 0.000000 4.330709 0.000000 -4.330709 + S 16777215 0 1.481190 4.069535 -1.481190 -4.069535 + S 16777215 0 2.783726 3.317515 -2.783726 -3.317515 + S 16777215 0 3.750504 2.165354 -3.750504 -2.165354 + S 16777215 0 4.264915 0.752020 -4.264915 -0.752020 + S 16777215 0 4.264915 -0.752020 -4.264915 0.752020 + S 16777215 0 3.750504 -2.165354 -3.750504 2.165354 + S 16777215 0 2.783726 -3.317515 -2.783726 3.317515 + S 16777215 0 1.481190 -4.069535 -1.481190 4.069535 A 0 0.031250 4.330709 0.000000 0.000000 0.000000 360.000000 A 0 0.031250 5.080709 0.000000 0.000000 0.000000 360.000000 A 0 0.031250 1.377727 0.000000 0.000000 0.000000 360.000000 diff --git a/app/lib/params/HO-atl100ho.xtp b/app/lib/params/HO-atl100ho.xtp index 2adfbe7..a389571 100644 --- a/app/lib/params/HO-atl100ho.xtp +++ b/app/lib/params/HO-atl100ho.xtp @@ -625,16 +625,16 @@ TURNOUT HO "Atlas Turntable 9"" Dia 15d 21 Positions 305" E 2.250000 3.897114 390.000000
E 3.181981 3.181981 405.000000
E 3.897114 2.250000 420.000000
- S 0 0 3.897114 -2.250000 -3.897114 2.250000
- S 0 0 3.181981 -3.181981 -3.181981 3.181981
- S 0 0 2.250000 -3.897114 -2.250000 3.897114
- S 0 0 1.164686 -4.346666 -1.164686 4.346666
- S 0 0 0.000000 -4.500000 0.000000 4.500000
- S 0 0 -1.164686 -4.346666 1.164686 4.346666
- S 0 0 -2.250000 -3.897114 2.250000 3.897114
- S 0 0 -3.181981 -3.181981 3.181981 3.181981
- S 0 0 -3.897114 -2.250000 3.897114 2.250000
- S 0 0 -4.346666 -1.164686 4.346666 1.164686
- S 0 0 -4.500000 0.000000 4.500000 0.000000
- S 0 0 -4.346666 1.164686 4.346666 -1.164686
+ S 16777215 0 3.897114 -2.250000 -3.897114 2.250000
+ S 16777215 0 3.181981 -3.181981 -3.181981 3.181981
+ S 16777215 0 2.250000 -3.897114 -2.250000 3.897114
+ S 16777215 0 1.164686 -4.346666 -1.164686 4.346666
+ S 16777215 0 0.000000 -4.500000 0.000000 4.500000
+ S 16777215 0 -1.164686 -4.346666 1.164686 4.346666
+ S 16777215 0 -2.250000 -3.897114 2.250000 3.897114
+ S 16777215 0 -3.181981 -3.181981 3.181981 3.181981
+ S 16777215 0 -3.897114 -2.250000 3.897114 2.250000
+ S 16777215 0 -4.346666 -1.164686 4.346666 1.164686
+ S 16777215 0 -4.500000 0.000000 4.500000 0.000000
+ S 16777215 0 -4.346666 1.164686 4.346666 -1.164686
END
diff --git a/app/lib/params/Makefile b/app/lib/params/Makefile new file mode 100644 index 0000000..0bfef8c --- /dev/null +++ b/app/lib/params/Makefile @@ -0,0 +1,326 @@ +# 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 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 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 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 + +# 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 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 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 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 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 + +# 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/params/CMakeFiles/progress.marks + cd /home/martin/XTrackCAD/src/work && $(MAKE) -f CMakeFiles/Makefile2 app/lib/params/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/params/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/params/preinstall +.PHONY : preinstall + +# Prepare targets for installation. +preinstall/fast: + cd /home/martin/XTrackCAD/src/work && $(MAKE) -f CMakeFiles/Makefile2 app/lib/params/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 + +# Convenience name for target. +app/lib/params/CMakeFiles/xtpfiles.dir/rule: + cd /home/martin/XTrackCAD/src/work && $(MAKE) -f CMakeFiles/Makefile2 app/lib/params/CMakeFiles/xtpfiles.dir/rule +.PHONY : app/lib/params/CMakeFiles/xtpfiles.dir/rule + +# Convenience name for target. +xtpfiles: app/lib/params/CMakeFiles/xtpfiles.dir/rule + +.PHONY : xtpfiles + +# fast build rule for target. +xtpfiles/fast: + cd /home/martin/XTrackCAD/src/work && $(MAKE) -f app/lib/params/CMakeFiles/xtpfiles.dir/build.make app/lib/params/CMakeFiles/xtpfiles.dir/build +.PHONY : xtpfiles/fast + +# Convenience name for target. +app/lib/params/CMakeFiles/mkstruct.dir/rule: + cd /home/martin/XTrackCAD/src/work && $(MAKE) -f CMakeFiles/Makefile2 app/lib/params/CMakeFiles/mkstruct.dir/rule +.PHONY : app/lib/params/CMakeFiles/mkstruct.dir/rule + +# Convenience name for target. +mkstruct: app/lib/params/CMakeFiles/mkstruct.dir/rule + +.PHONY : mkstruct + +# fast build rule for target. +mkstruct/fast: + cd /home/martin/XTrackCAD/src/work && $(MAKE) -f app/lib/params/CMakeFiles/mkstruct.dir/build.make app/lib/params/CMakeFiles/mkstruct.dir/build +.PHONY : mkstruct/fast + +# Convenience name for target. +app/lib/params/CMakeFiles/mkcarpart.dir/rule: + cd /home/martin/XTrackCAD/src/work && $(MAKE) -f CMakeFiles/Makefile2 app/lib/params/CMakeFiles/mkcarpart.dir/rule +.PHONY : app/lib/params/CMakeFiles/mkcarpart.dir/rule + +# Convenience name for target. +mkcarpart: app/lib/params/CMakeFiles/mkcarpart.dir/rule + +.PHONY : mkcarpart + +# fast build rule for target. +mkcarpart/fast: + cd /home/martin/XTrackCAD/src/work && $(MAKE) -f app/lib/params/CMakeFiles/mkcarpart.dir/build.make app/lib/params/CMakeFiles/mkcarpart.dir/build +.PHONY : mkcarpart/fast + +mkcarpart.o: mkcarpart.c.o + +.PHONY : mkcarpart.o + +# target to build an object file +mkcarpart.c.o: + cd /home/martin/XTrackCAD/src/work && $(MAKE) -f app/lib/params/CMakeFiles/mkcarpart.dir/build.make app/lib/params/CMakeFiles/mkcarpart.dir/mkcarpart.c.o +.PHONY : mkcarpart.c.o + +mkcarpart.i: mkcarpart.c.i + +.PHONY : mkcarpart.i + +# target to preprocess a source file +mkcarpart.c.i: + cd /home/martin/XTrackCAD/src/work && $(MAKE) -f app/lib/params/CMakeFiles/mkcarpart.dir/build.make app/lib/params/CMakeFiles/mkcarpart.dir/mkcarpart.c.i +.PHONY : mkcarpart.c.i + +mkcarpart.s: mkcarpart.c.s + +.PHONY : mkcarpart.s + +# target to generate assembly for a file +mkcarpart.c.s: + cd /home/martin/XTrackCAD/src/work && $(MAKE) -f app/lib/params/CMakeFiles/mkcarpart.dir/build.make app/lib/params/CMakeFiles/mkcarpart.dir/mkcarpart.c.s +.PHONY : mkcarpart.c.s + +mkstruct.o: mkstruct.c.o + +.PHONY : mkstruct.o + +# target to build an object file +mkstruct.c.o: + cd /home/martin/XTrackCAD/src/work && $(MAKE) -f app/lib/params/CMakeFiles/mkstruct.dir/build.make app/lib/params/CMakeFiles/mkstruct.dir/mkstruct.c.o +.PHONY : mkstruct.c.o + +mkstruct.i: mkstruct.c.i + +.PHONY : mkstruct.i + +# target to preprocess a source file +mkstruct.c.i: + cd /home/martin/XTrackCAD/src/work && $(MAKE) -f app/lib/params/CMakeFiles/mkstruct.dir/build.make app/lib/params/CMakeFiles/mkstruct.dir/mkstruct.c.i +.PHONY : mkstruct.c.i + +mkstruct.s: mkstruct.c.s + +.PHONY : mkstruct.s + +# target to generate assembly for a file +mkstruct.c.s: + cd /home/martin/XTrackCAD/src/work && $(MAKE) -f app/lib/params/CMakeFiles/mkstruct.dir/build.make app/lib/params/CMakeFiles/mkstruct.dir/mkstruct.c.s +.PHONY : mkstruct.c.s + +# 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 "... xtpfiles" + @echo "... list_install_components" + @echo "... install/local" + @echo "... rebuild_cache" + @echo "... install/strip" + @echo "... install" + @echo "... mkstruct" + @echo "... package" + @echo "... package_source" + @echo "... mkcarpart" + @echo "... test" + @echo "... mkcarpart.o" + @echo "... mkcarpart.i" + @echo "... mkcarpart.s" + @echo "... mkstruct.o" + @echo "... mkstruct.i" + @echo "... mkstruct.s" +.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/params/N-PecoCode55Finescale.xtp b/app/lib/params/N-PecoCode55Finescale.xtp index 48a2581..dc57768 100644 --- a/app/lib/params/N-PecoCode55Finescale.xtp +++ b/app/lib/params/N-PecoCode55Finescale.xtp @@ -240,58 +240,58 @@ TURNOUT N "Peco Turn Table NB-55" E -1.100877 3.024636 340.000000 E -0.558930 3.169850 350.000000 S 0 0.000000 0.000000 3.218750 0.000000 3.000000 - S 0 0.000000 0.000000 3.000000 0.000000 -3.000000 + S 16777215 0.000000 0.000000 3.000000 0.000000 -3.000000 S 0 0.000000 0.000000 -3.000000 0.000000 -3.218750 S 0 0.000000 0.558930 3.169850 0.520945 2.954423 - S 0 0.000000 0.520945 2.954423 -0.520945 -2.954423 + S 16777215 0.000000 0.520945 2.954423 -0.520945 -2.954423 S 0 0.000000 -0.520945 -2.954423 -0.558930 -3.169850 S 0 0.000000 1.100877 3.024636 1.026060 2.819078 - S 0 0.000000 1.026060 2.819078 -1.026060 -2.819078 + S 16777215 0.000000 1.026060 2.819078 -1.026060 -2.819078 S 0 0.000000 -1.026060 -2.819078 -1.100877 -3.024636 S 0 0.000000 1.609375 2.787519 1.500000 2.598076 - S 0 0.000000 1.500000 2.598076 -1.500000 -2.598076 + S 16777215 0.000000 1.500000 2.598076 -1.500000 -2.598076 S 0 0.000000 -1.500000 -2.598076 -1.609375 -2.787519 S 0 0.000000 2.068973 2.465706 1.928363 2.298133 - S 0 0.000000 1.928363 2.298133 -1.928363 -2.298133 + S 16777215 0.000000 1.928363 2.298133 -1.928363 -2.298133 S 0 0.000000 -1.928363 -2.298133 -2.068973 -2.465706 S 0 0.000000 2.465706 2.068973 2.298133 1.928363 - S 0 0.000000 2.298133 1.928363 -2.298133 -1.928363 + S 16777215 0.000000 2.298133 1.928363 -2.298133 -1.928363 S 0 0.000000 -2.298133 -1.928363 -2.465706 -2.068973 S 0 0.000000 2.787519 1.609375 2.598076 1.500000 - S 0 0.000000 2.598076 1.500000 -2.598076 -1.500000 + S 16777215 0.000000 2.598076 1.500000 -2.598076 -1.500000 S 0 0.000000 -2.598076 -1.500000 -2.787519 -1.609375 S 0 0.000000 3.024636 1.100877 2.819078 1.026060 - S 0 0.000000 2.819078 1.026060 -2.819078 -1.026060 + S 16777215 0.000000 2.819078 1.026060 -2.819078 -1.026060 S 0 0.000000 -2.819078 -1.026060 -3.024636 -1.100877 S 0 0.000000 3.169850 0.558930 2.954423 0.520945 - S 0 0.000000 2.954423 0.520945 -2.954423 -0.520945 + S 16777215 0.000000 2.954423 0.520945 -2.954423 -0.520945 S 0 0.000000 -2.954423 -0.520945 -3.169850 -0.558930 S 0 0.000000 3.218750 0.000000 3.000000 0.000000 - S 0 0.000000 3.000000 0.000000 -3.000000 0.000000 + S 16777215 0.000000 3.000000 0.000000 -3.000000 0.000000 S 0 0.000000 -3.000000 0.000000 -3.218750 0.000000 S 0 0.000000 3.169850 -0.558930 2.954423 -0.520945 - S 0 0.000000 2.954423 -0.520945 -2.954423 0.520945 + S 16777215 0.000000 2.954423 -0.520945 -2.954423 0.520945 S 0 0.000000 -2.954423 0.520945 -3.169850 0.558930 S 0 0.000000 3.024636 -1.100877 2.819078 -1.026060 - S 0 0.000000 2.819078 -1.026060 -2.819078 1.026060 + S 16777215 0.000000 2.819078 -1.026060 -2.819078 1.026060 S 0 0.000000 -2.819078 1.026060 -3.024636 1.100877 S 0 0.000000 2.787519 -1.609375 2.598076 -1.500000 - S 0 0.000000 2.598076 -1.500000 -2.598076 1.500000 + S 16777215 0.000000 2.598076 -1.500000 -2.598076 1.500000 S 0 0.000000 -2.598076 1.500000 -2.787519 1.609375 S 0 0.000000 2.465706 -2.068973 2.298133 -1.928363 - S 0 0.000000 2.298133 -1.928363 -2.298133 1.928363 + S 16777215 0.000000 2.298133 -1.928363 -2.298133 1.928363 S 0 0.000000 -2.298133 1.928363 -2.465706 2.068973 S 0 0.000000 2.068973 -2.465706 1.928363 -2.298133 - S 0 0.000000 1.928363 -2.298133 -1.928363 2.298133 + S 16777215 0.000000 1.928363 -2.298133 -1.928363 2.298133 S 0 0.000000 -1.928363 2.298133 -2.068973 2.465706 S 0 0.000000 1.609375 -2.787519 1.500000 -2.598076 - S 0 0.000000 1.500000 -2.598076 -1.500000 2.598076 + S 16777215 0.000000 1.500000 -2.598076 -1.500000 2.598076 S 0 0.000000 -1.500000 2.598076 -1.609375 2.787519 S 0 0.000000 1.100877 -3.024636 1.026060 -2.819078 - S 0 0.000000 1.026060 -2.819078 -1.026060 2.819078 + S 16777215 0.000000 1.026060 -2.819078 -1.026060 2.819078 S 0 0.000000 -1.026060 2.819078 -1.100877 3.024636 S 0 0.000000 0.558930 -3.169850 0.520945 -2.954423 - S 0 0.000000 0.520945 -2.954423 -0.520945 2.954423 + S 16777215 0.000000 0.520945 -2.954423 -0.520945 2.954423 S 0 0.000000 -0.520945 2.954423 -0.558930 3.169850 A3 0 0.031250 3.000000 0.000000 0.000000 0 0.000000 360.000000 G3 0 0.000000 0.01 0.000000 0.000000 0 diff --git a/app/lib/params/N-kato-turntable.xtp b/app/lib/params/N-kato-turntable.xtp index 735f5ab..dd2872b 100644 --- a/app/lib/params/N-kato-turntable.xtp +++ b/app/lib/params/N-kato-turntable.xtp @@ -134,58 +134,58 @@ TURNOUT N "Kato Unitrack 160mm Turn Table 20-283" E -1.460992 4.014041 340.000000 E -0.741765 4.206758 350.000000 S 0 0.000000 0.000000 4.271654 0.000000 3.149606 - S 0 0.000000 0.000000 3.149606 0.000000 -3.149606 + S 16777215 0.000000 0.000000 3.149606 0.000000 -3.149606 S 0 0.000000 0.000000 -3.149606 0.000000 -4.271654 S 0 0.000000 0.741765 4.206758 0.546923 3.101757 - S 0 0.000000 0.546923 3.101757 -0.546923 -3.101757 + S 16777215 0.000000 0.546923 3.101757 -0.546923 -3.101757 S 0 0.000000 -0.546923 -3.101757 -0.741765 -4.206758 S 0 0.000000 1.460992 4.014041 1.077229 2.959662 - S 0 0.000000 1.077229 2.959662 -1.077229 -2.959662 + S 16777215 0.000000 1.077229 2.959662 -1.077229 -2.959662 S 0 0.000000 -1.077229 -2.959662 -1.460992 -4.014041 S 0 0.000000 2.135827 3.699360 1.574803 2.727639 - S 0 0.000000 1.574803 2.727639 -1.574803 -2.727639 + S 16777215 0.000000 1.574803 2.727639 -1.574803 -2.727639 S 0 0.000000 -1.574803 -2.727639 -2.135827 -3.699360 S 0 0.000000 2.745766 3.272276 2.024528 2.412738 - S 0 0.000000 2.024528 2.412738 -2.024528 -2.412738 + S 16777215 0.000000 2.024528 2.412738 -2.024528 -2.412738 S 0 0.000000 -2.024528 -2.412738 -2.745766 -3.272276 S 0 0.000000 3.272276 2.745766 2.412738 2.024528 - S 0 0.000000 2.412738 2.024528 -2.412738 -2.024528 + S 16777215 0.000000 2.412738 2.024528 -2.412738 -2.024528 S 0 0.000000 -2.412738 -2.024528 -3.272276 -2.745766 S 0 0.000000 3.699360 2.135827 2.727639 1.574803 - S 0 0.000000 2.727639 1.574803 -2.727639 -1.574803 + S 16777215 0.000000 2.727639 1.574803 -2.727639 -1.574803 S 0 0.000000 -2.727639 -1.574803 -3.699360 -2.135827 S 0 0.000000 4.014041 1.460992 2.959662 1.077229 - S 0 0.000000 2.959662 1.077229 -2.959662 -1.077229 + S 16777215 0.000000 2.959662 1.077229 -2.959662 -1.077229 S 0 0.000000 -2.959662 -1.077229 -4.014041 -1.460992 S 0 0.000000 4.206758 0.741765 3.101757 0.546923 - S 0 0.000000 3.101757 0.546923 -3.101757 -0.546923 + S 16777215 0.000000 3.101757 0.546923 -3.101757 -0.546923 S 0 0.000000 -3.101757 -0.546923 -4.206758 -0.741765 S 0 0.000000 4.271654 0.000000 3.149606 0.000000 - S 0 0.000000 3.149606 0.000000 -3.149606 0.000000 + S 16777215 0.000000 3.149606 0.000000 -3.149606 0.000000 S 0 0.000000 -3.149606 0.000000 -4.271654 0.000000 S 0 0.000000 4.206758 -0.741765 3.101757 -0.546923 - S 0 0.000000 3.101757 -0.546923 -3.101757 0.546923 + S 16777215 0.000000 3.101757 -0.546923 -3.101757 0.546923 S 0 0.000000 -3.101757 0.546923 -4.206758 0.741765 S 0 0.000000 4.014041 -1.460992 2.959662 -1.077229 - S 0 0.000000 2.959662 -1.077229 -2.959662 1.077229 + S 16777215 0.000000 2.959662 -1.077229 -2.959662 1.077229 S 0 0.000000 -2.959662 1.077229 -4.014041 1.460992 S 0 0.000000 3.699360 -2.135827 2.727639 -1.574803 - S 0 0.000000 2.727639 -1.574803 -2.727639 1.574803 + S 16777215 0.000000 2.727639 -1.574803 -2.727639 1.574803 S 0 0.000000 -2.727639 1.574803 -3.699360 2.135827 S 0 0.000000 3.272276 -2.745766 2.412738 -2.024528 - S 0 0.000000 2.412738 -2.024528 -2.412738 2.024528 + S 16777215 0.000000 2.412738 -2.024528 -2.412738 2.024528 S 0 0.000000 -2.412738 2.024528 -3.272276 2.745766 S 0 0.000000 2.745766 -3.272276 2.024528 -2.412738 - S 0 0.000000 2.024528 -2.412738 -2.024528 2.412738 + S 16777215 0.000000 2.024528 -2.412738 -2.024528 2.412738 S 0 0.000000 -2.024528 2.412738 -2.745766 3.272276 S 0 0.000000 2.135827 -3.699360 1.574803 -2.727639 - S 0 0.000000 1.574803 -2.727639 -1.574803 2.727639 + S 16777215 0.000000 1.574803 -2.727639 -1.574803 2.727639 S 0 0.000000 -1.574803 2.727639 -2.135827 3.699360 S 0 0.000000 1.460992 -4.014041 1.077229 -2.959662 - S 0 0.000000 1.077229 -2.959662 -1.077229 2.959662 + S 16777215 0.000000 1.077229 -2.959662 -1.077229 2.959662 S 0 0.000000 -1.077229 2.959662 -1.460992 4.014041 S 0 0.000000 0.741765 -4.206758 0.546923 -3.101757 - S 0 0.000000 0.546923 -3.101757 -0.546923 3.101757 + S 16777215 0.000000 0.546923 -3.101757 -0.546923 3.101757 S 0 0.000000 -0.546923 3.101757 -0.741765 4.206758 A 0 0.031250 3.149606 0.000000 0.000000 0.000000 360.000000 A 11427422 0.250000 3.399606 0.000000 0.000000 0.000000 360.000000 diff --git a/app/lib/params/N-kato.xtp b/app/lib/params/N-kato.xtp index 5c200d9..6982dd0 100644 --- a/app/lib/params/N-kato.xtp +++ b/app/lib/params/N-kato.xtp @@ -1681,24 +1681,24 @@ TURNOUT N "Kato Unitrack 160mm Turn Table 20-283" E -1.574803 2.727639 330.000000 E -1.077229 2.959662 340.000000 E -0.546923 3.101757 350.000000 - S 0 0.000000 0.000000 3.149606 0.000000 -3.149606 - S 0 0.000000 0.546923 3.101757 -0.546923 -3.101757 - S 0 0.000000 1.077229 2.959662 -1.077229 -2.959662 - S 0 0.000000 1.574803 2.727639 -1.574803 -2.727639 - S 0 0.000000 2.024528 2.412738 -2.024528 -2.412738 - S 0 0.000000 2.412738 2.024528 -2.412738 -2.024528 - S 0 0.000000 2.727639 1.574803 -2.727639 -1.574803 - S 0 0.000000 2.959662 1.077229 -2.959662 -1.077229 - S 0 0.000000 3.101757 0.546923 -3.101757 -0.546923 - S 0 0.000000 3.149606 0.000000 -3.149606 0.000000 - S 0 0.000000 3.101757 -0.546923 -3.101757 0.546923 - S 0 0.000000 2.959662 -1.077229 -2.959662 1.077229 - S 0 0.000000 2.727639 -1.574803 -2.727639 1.574803 - S 0 0.000000 2.412738 -2.024528 -2.412738 2.024528 - S 0 0.000000 2.024528 -2.412738 -2.024528 2.412738 - S 0 0.000000 1.574803 -2.727639 -1.574803 2.727639 - S 0 0.000000 1.077229 -2.959662 -1.077229 2.959662 - S 0 0.000000 0.546923 -3.101757 -0.546923 3.101757 + S 16777215 0.000000 0.000000 3.149606 0.000000 -3.149606 + S 16777215 0.000000 0.546923 3.101757 -0.546923 -3.101757 + S 16777215 0.000000 1.077229 2.959662 -1.077229 -2.959662 + S 16777215 0.000000 1.574803 2.727639 -1.574803 -2.727639 + S 16777215 0.000000 2.024528 2.412738 -2.024528 -2.412738 + S 16777215 0.000000 2.412738 2.024528 -2.412738 -2.024528 + S 16777215 0.000000 2.727639 1.574803 -2.727639 -1.574803 + S 16777215 0.000000 2.959662 1.077229 -2.959662 -1.077229 + S 16777215 0.000000 3.101757 0.546923 -3.101757 -0.546923 + S 16777215 0.000000 3.149606 0.000000 -3.149606 0.000000 + S 16777215 0.000000 3.101757 -0.546923 -3.101757 0.546923 + S 16777215 0.000000 2.959662 -1.077229 -2.959662 1.077229 + S 16777215 0.000000 2.727639 -1.574803 -2.727639 1.574803 + S 16777215 0.000000 2.412738 -2.024528 -2.412738 2.024528 + S 16777215 0.000000 2.024528 -2.412738 -2.024528 2.412738 + S 16777215 0.000000 1.574803 -2.727639 -1.574803 2.727639 + S 16777215 0.000000 1.077229 -2.959662 -1.077229 2.959662 + S 16777215 0.000000 0.546923 -3.101757 -0.546923 3.101757 A 11579568 0.031250 3.149606 0.000000 0.000000 0.000000 360.000000 A 11579568 0.031250 4.271654 0.000000 0.000000 0.000000 360.000000 END diff --git a/app/lib/params/O-Ross.xtp b/app/lib/params/O-Ross.xtp index cb72f3e..890c882 100644 --- a/app/lib/params/O-Ross.xtp +++ b/app/lib/params/O-Ross.xtp @@ -809,30 +809,30 @@ TURNOUT O "Ross 18"" 7.5d Turn Table TUTA18M/A" E -3.444151 8.314916 337.500000
E -2.329371 8.693332 345.000000
E -1.174736 8.923004 352.500000
- S 0 0.000000 0.000000 9.000000 0.000000 -9.000000
- S 0 0.000000 1.174736 8.923004 -1.174736 -8.923004
- S 0 0.000000 2.329371 8.693332 -2.329371 -8.693332
- S 0 0.000000 3.444151 8.314916 -3.444151 -8.314916
- S 0 0.000000 4.500000 7.794229 -4.500000 -7.794229
- S 0 0.000000 5.478853 7.140180 -5.478853 -7.140180
- S 0 0.000000 6.363961 6.363961 -6.363961 -6.363961
- S 0 0.000000 7.140180 5.478853 -7.140180 -5.478853
- S 0 0.000000 7.794229 4.500000 -7.794229 -4.500000
- S 0 0.000000 8.314916 3.444151 -8.314916 -3.444151
- S 0 0.000000 8.693332 2.329371 -8.693332 -2.329371
- S 0 0.000000 8.923004 1.174736 -8.923004 -1.174736
+ S 16777215 0.000000 0.000000 9.000000 0.000000 -9.000000
+ S 16777215 0.000000 1.174736 8.923004 -1.174736 -8.923004
+ S 16777215 0.000000 2.329371 8.693332 -2.329371 -8.693332
+ S 16777215 0.000000 3.444151 8.314916 -3.444151 -8.314916
+ S 16777215 0.000000 4.500000 7.794229 -4.500000 -7.794229
+ S 16777215 0.000000 5.478853 7.140180 -5.478853 -7.140180
+ S 16777215 0.000000 6.363961 6.363961 -6.363961 -6.363961
+ S 16777215 0.000000 7.140180 5.478853 -7.140180 -5.478853
+ S 16777215 0.000000 7.794229 4.500000 -7.794229 -4.500000
+ S 16777215 0.000000 8.314916 3.444151 -8.314916 -3.444151
+ S 16777215 0.000000 8.693332 2.329371 -8.693332 -2.329371
+ S 16777215 0.000000 8.923004 1.174736 -8.923004 -1.174736
S 0 0.000000 9.000000 0.000000 -9.000000 0.000000
- S 0 0.000000 8.923004 -1.174736 -8.923004 1.174736
- S 0 0.000000 8.693332 -2.329371 -8.693332 2.329371
- S 0 0.000000 8.314916 -3.444151 -8.314916 3.444151
- S 0 0.000000 7.794229 -4.500000 -7.794229 4.500000
- S 0 0.000000 7.140180 -5.478853 -7.140180 5.478853
- S 0 0.000000 6.363961 -6.363961 -6.363961 6.363961
- S 0 0.000000 5.478853 -7.140180 -5.478853 7.140180
- S 0 0.000000 4.500000 -7.794229 -4.500000 7.794229
- S 0 0.000000 3.444151 -8.314916 -3.444151 8.314916
- S 0 0.000000 2.329371 -8.693332 -2.329371 8.693332
- S 0 0.000000 1.174736 -8.923004 -1.174736 8.923004
+ S 16777215 0.000000 8.923004 -1.174736 -8.923004 1.174736
+ S 16777215 0.000000 8.693332 -2.329371 -8.693332 2.329371
+ S 16777215 0.000000 8.314916 -3.444151 -8.314916 3.444151
+ S 16777215 0.000000 7.794229 -4.500000 -7.794229 4.500000
+ S 16777215 0.000000 7.140180 -5.478853 -7.140180 5.478853
+ S 16777215 0.000000 6.363961 -6.363961 -6.363961 6.363961
+ S 16777215 0.000000 5.478853 -7.140180 -5.478853 7.140180
+ S 16777215 0.000000 4.500000 -7.794229 -4.500000 7.794229
+ S 16777215 0.000000 3.444151 -8.314916 -3.444151 8.314916
+ S 16777215 0.000000 2.329371 -8.693332 -2.329371 8.693332
+ S 16777215 0.000000 1.174736 -8.923004 -1.174736 8.923004
A 11579568 0.046875 9.000000 0.000000 0.000000 0.000000 360.000000
L 11579568 0.046875 -10.000000 10.000000 10.000000 10.000000
L 11579568 0.046875 10.000000 10.000000 10.000000 -10.000000
@@ -912,30 +912,30 @@ TURNOUT O "Ross 24"" 7.5d Turn Table TUTA24M/A" E -4.592201 11.086554 337.500000
E -3.105829 11.591110 345.000000
E -1.566314 11.897338 352.500000
- S 0 0.000000 0.000000 12.000000 0.000000 -12.000000
- S 0 0.000000 1.566314 11.897338 -1.566314 -11.897338
- S 0 0.000000 3.105829 11.591110 -3.105829 -11.591110
- S 0 0.000000 4.592201 11.086554 -4.592201 -11.086554
- S 0 0.000000 6.000000 10.392305 -6.000000 -10.392305
- S 0 0.000000 7.305137 9.520240 -7.305137 -9.520240
- S 0 0.000000 8.485281 8.485281 -8.485281 -8.485281
- S 0 0.000000 9.520240 7.305137 -9.520240 -7.305137
- S 0 0.000000 10.392305 6.000000 -10.392305 -6.000000
- S 0 0.000000 11.086554 4.592201 -11.086554 -4.592201
- S 0 0.000000 11.591110 3.105829 -11.591110 -3.105829
- S 0 0.000000 11.897338 1.566314 -11.897338 -1.566314
+ S 16777215 0.000000 0.000000 12.000000 0.000000 -12.000000
+ S 16777215 0.000000 1.566314 11.897338 -1.566314 -11.897338
+ S 16777215 0.000000 3.105829 11.591110 -3.105829 -11.591110
+ S 16777215 0.000000 4.592201 11.086554 -4.592201 -11.086554
+ S 16777215 0.000000 6.000000 10.392305 -6.000000 -10.392305
+ S 16777215 0.000000 7.305137 9.520240 -7.305137 -9.520240
+ S 16777215 0.000000 8.485281 8.485281 -8.485281 -8.485281
+ S 16777215 0.000000 9.520240 7.305137 -9.520240 -7.305137
+ S 16777215 0.000000 10.392305 6.000000 -10.392305 -6.000000
+ S 16777215 0.000000 11.086554 4.592201 -11.086554 -4.592201
+ S 16777215 0.000000 11.591110 3.105829 -11.591110 -3.105829
+ S 16777215 0.000000 11.897338 1.566314 -11.897338 -1.566314
S 0 0.000000 12.000000 0.000000 -12.000000 0.000000
- S 0 0.000000 11.897338 -1.566314 -11.897338 1.566314
- S 0 0.000000 11.591110 -3.105829 -11.591110 3.105829
- S 0 0.000000 11.086554 -4.592201 -11.086554 4.592201
- S 0 0.000000 10.392305 -6.000000 -10.392305 6.000000
- S 0 0.000000 9.520240 -7.305137 -9.520240 7.305137
- S 0 0.000000 8.485281 -8.485281 -8.485281 8.485281
- S 0 0.000000 7.305137 -9.520240 -7.305137 9.520240
- S 0 0.000000 6.000000 -10.392305 -6.000000 10.392305
- S 0 0.000000 4.592201 -11.086554 -4.592201 11.086554
- S 0 0.000000 3.105829 -11.591110 -3.105829 11.591110
- S 0 0.000000 1.566314 -11.897338 -1.566314 11.897338
+ S 16777215 0.000000 11.897338 -1.566314 -11.897338 1.566314
+ S 16777215 0.000000 11.591110 -3.105829 -11.591110 3.105829
+ S 16777215 0.000000 11.086554 -4.592201 -11.086554 4.592201
+ S 16777215 0.000000 10.392305 -6.000000 -10.392305 6.000000
+ S 16777215 0.000000 9.520240 -7.305137 -9.520240 7.305137
+ S 16777215 0.000000 8.485281 -8.485281 -8.485281 8.485281
+ S 16777215 0.000000 7.305137 -9.520240 -7.305137 9.520240
+ S 16777215 0.000000 6.000000 -10.392305 -6.000000 10.392305
+ S 16777215 0.000000 4.592201 -11.086554 -4.592201 11.086554
+ S 16777215 0.000000 3.105829 -11.591110 -3.105829 11.591110
+ S 16777215 0.000000 1.566314 -11.897338 -1.566314 11.897338
A 11579568 0.046875 12.000000 0.000000 0.000000 0.000000 360.000000
L 11579568 0.046875 -13.000000 13.000000 13.000000 13.000000
L 11579568 0.046875 13.000000 13.000000 13.000000 -13.000000
@@ -1015,30 +1015,30 @@ TURNOUT O "Ross 27"" 7.5d Turn Table TUTA27M/A" E -5.166226 12.472374 337.500000
E -3.494057 13.039999 345.000000
E -1.762104 13.384506 352.500000
- S 0 0.000000 0.000000 13.500000 0.000000 -13.500000
- S 0 0.000000 1.762104 13.384506 -1.762104 -13.384506
- S 0 0.000000 3.494057 13.039999 -3.494057 -13.039999
- S 0 0.000000 5.166226 12.472374 -5.166226 -12.472374
- S 0 0.000000 6.750000 11.691343 -6.750000 -11.691343
- S 0 0.000000 8.218279 10.710270 -8.218279 -10.710270
- S 0 0.000000 9.545942 9.545942 -9.545942 -9.545942
- S 0 0.000000 10.710270 8.218279 -10.710270 -8.218279
- S 0 0.000000 11.691343 6.750000 -11.691343 -6.750000
- S 0 0.000000 12.472374 5.166226 -12.472374 -5.166226
- S 0 0.000000 13.039999 3.494057 -13.039999 -3.494057
- S 0 0.000000 13.384506 1.762104 -13.384506 -1.762104
+ S 16777215 0.000000 0.000000 13.500000 0.000000 -13.500000
+ S 16777215 0.000000 1.762104 13.384506 -1.762104 -13.384506
+ S 16777215 0.000000 3.494057 13.039999 -3.494057 -13.039999
+ S 16777215 0.000000 5.166226 12.472374 -5.166226 -12.472374
+ S 16777215 0.000000 6.750000 11.691343 -6.750000 -11.691343
+ S 16777215 0.000000 8.218279 10.710270 -8.218279 -10.710270
+ S 16777215 0.000000 9.545942 9.545942 -9.545942 -9.545942
+ S 16777215 0.000000 10.710270 8.218279 -10.710270 -8.218279
+ S 16777215 0.000000 11.691343 6.750000 -11.691343 -6.750000
+ S 16777215 0.000000 12.472374 5.166226 -12.472374 -5.166226
+ S 16777215 0.000000 13.039999 3.494057 -13.039999 -3.494057
+ S 16777215 0.000000 13.384506 1.762104 -13.384506 -1.762104
S 0 0.000000 13.500000 0.000000 -13.500000 0.000000
- S 0 0.000000 13.384506 -1.762104 -13.384506 1.762104
- S 0 0.000000 13.039999 -3.494057 -13.039999 3.494057
- S 0 0.000000 12.472374 -5.166226 -12.472374 5.166226
- S 0 0.000000 11.691343 -6.750000 -11.691343 6.750000
- S 0 0.000000 10.710270 -8.218279 -10.710270 8.218279
- S 0 0.000000 9.545942 -9.545942 -9.545942 9.545942
- S 0 0.000000 8.218279 -10.710270 -8.218279 10.710270
- S 0 0.000000 6.750000 -11.691343 -6.750000 11.691343
- S 0 0.000000 5.166226 -12.472374 -5.166226 12.472374
- S 0 0.000000 3.494057 -13.039999 -3.494057 13.039999
- S 0 0.000000 1.762104 -13.384506 -1.762104 13.384506
+ S 16777215 0.000000 13.384506 -1.762104 -13.384506 1.762104
+ S 16777215 0.000000 13.039999 -3.494057 -13.039999 3.494057
+ S 16777215 0.000000 12.472374 -5.166226 -12.472374 5.166226
+ S 16777215 0.000000 11.691343 -6.750000 -11.691343 6.750000
+ S 16777215 0.000000 10.710270 -8.218279 -10.710270 8.218279
+ S 16777215 0.000000 9.545942 -9.545942 -9.545942 9.545942
+ S 16777215 0.000000 8.218279 -10.710270 -8.218279 10.710270
+ S 16777215 0.000000 6.750000 -11.691343 -6.750000 11.691343
+ S 16777215 0.000000 5.166226 -12.472374 -5.166226 12.472374
+ S 16777215 0.000000 3.494057 -13.039999 -3.494057 13.039999
+ S 16777215 0.000000 1.762104 -13.384506 -1.762104 13.384506
A 11579568 0.046875 13.500000 0.000000 0.000000 0.000000 360.000000
L 11579568 0.046875 -14.500000 14.500000 14.500000 14.500000
L 11579568 0.046875 14.500000 14.500000 14.500000 -14.500000
@@ -1118,30 +1118,30 @@ TURNOUT O "Ross 33"" 7.5d Turn Table TUTA33M/A" E -6.314277 15.244012 337.500000
E -4.270514 15.937776 345.000000
E -2.153682 16.358840 352.500000
- S 0 0.000000 0.000000 16.500000 0.000000 -16.500000
- S 0 0.000000 2.153682 16.358840 -2.153682 -16.358840
- S 0 0.000000 4.270514 15.937776 -4.270514 -15.937776
- S 0 0.000000 6.314277 15.244012 -6.314277 -15.244012
- S 0 0.000000 8.250000 14.289419 -8.250000 -14.289419
- S 0 0.000000 10.044564 13.090330 -10.044564 -13.090330
- S 0 0.000000 11.667262 11.667262 -11.667262 -11.667262
- S 0 0.000000 13.090330 10.044564 -13.090330 -10.044564
- S 0 0.000000 14.289419 8.250000 -14.289419 -8.250000
- S 0 0.000000 15.244012 6.314277 -15.244012 -6.314277
- S 0 0.000000 15.937776 4.270514 -15.937776 -4.270514
- S 0 0.000000 16.358840 2.153682 -16.358840 -2.153682
+ S 16777215 0.000000 0.000000 16.500000 0.000000 -16.500000
+ S 16777215 0.000000 2.153682 16.358840 -2.153682 -16.358840
+ S 16777215 0.000000 4.270514 15.937776 -4.270514 -15.937776
+ S 16777215 0.000000 6.314277 15.244012 -6.314277 -15.244012
+ S 16777215 0.000000 8.250000 14.289419 -8.250000 -14.289419
+ S 16777215 0.000000 10.044564 13.090330 -10.044564 -13.090330
+ S 16777215 0.000000 11.667262 11.667262 -11.667262 -11.667262
+ S 16777215 0.000000 13.090330 10.044564 -13.090330 -10.044564
+ S 16777215 0.000000 14.289419 8.250000 -14.289419 -8.250000
+ S 16777215 0.000000 15.244012 6.314277 -15.244012 -6.314277
+ S 16777215 0.000000 15.937776 4.270514 -15.937776 -4.270514
+ S 16777215 0.000000 16.358840 2.153682 -16.358840 -2.153682
S 0 0.000000 16.500000 0.000000 -16.500000 0.000000
- S 0 0.000000 16.358840 -2.153682 -16.358840 2.153682
- S 0 0.000000 15.937776 -4.270514 -15.937776 4.270514
- S 0 0.000000 15.244012 -6.314277 -15.244012 6.314277
- S 0 0.000000 14.289419 -8.250000 -14.289419 8.250000
- S 0 0.000000 13.090330 -10.044564 -13.090330 10.044564
- S 0 0.000000 11.667262 -11.667262 -11.667262 11.667262
- S 0 0.000000 10.044564 -13.090330 -10.044564 13.090330
- S 0 0.000000 8.250000 -14.289419 -8.250000 14.289419
- S 0 0.000000 6.314277 -15.244012 -6.314277 15.244012
- S 0 0.000000 4.270514 -15.937776 -4.270514 15.937776
- S 0 0.000000 2.153682 -16.358840 -2.153682 16.358840
+ S 16777215 0.000000 16.358840 -2.153682 -16.358840 2.153682
+ S 16777215 0.000000 15.937776 -4.270514 -15.937776 4.270514
+ S 16777215 0.000000 15.244012 -6.314277 -15.244012 6.314277
+ S 16777215 0.000000 14.289419 -8.250000 -14.289419 8.250000
+ S 16777215 0.000000 13.090330 -10.044564 -13.090330 10.044564
+ S 16777215 0.000000 11.667262 -11.667262 -11.667262 11.667262
+ S 16777215 0.000000 10.044564 -13.090330 -10.044564 13.090330
+ S 16777215 0.000000 8.250000 -14.289419 -8.250000 14.289419
+ S 16777215 0.000000 6.314277 -15.244012 -6.314277 15.244012
+ S 16777215 0.000000 4.270514 -15.937776 -4.270514 15.937776
+ S 16777215 0.000000 2.153682 -16.358840 -2.153682 16.358840
A 11579568 0.046875 16.500000 0.000000 0.000000 0.000000 360.000000
L 11579568 0.046875 -17.500000 17.500000 17.500000 17.500000
L 11579568 0.046875 17.500000 17.500000 17.500000 -17.500000
@@ -1167,10 +1167,10 @@ TURNOUT O "Ross 18"" 5 Stop Transfer Table (3.5"" Trk Center) TT185" E 0.000000 -14.000000 270.000000
E 18.000000 -14.000000 90.000000
S 0 0.000000 0.000000 0.000000 18.000000 0.000000
- S 0 0.000000 0.000000 -3.500000 18.000000 -3.500000
- S 0 0.000000 0.000000 -7.000000 18.000000 -7.000000
- S 0 0.000000 0.000000 -10.500000 18.000000 -10.500000
- S 0 0.000000 0.000000 -14.000000 18.000000 -14.000000
+ S 16777215 0.000000 0.000000 -3.500000 18.000000 -3.500000
+ S 16777215 0.000000 0.000000 -7.000000 18.000000 -7.000000
+ S 16777215 0.000000 0.000000 -10.500000 18.000000 -10.500000
+ S 16777215 0.000000 0.000000 -14.000000 18.000000 -14.000000
L 11579568 0.750000 -0.375000 3.8750000 18.375000 3.875000
L 11579568 0.750000 18.375000 4.250000 18.375000 -18.250000
L 11579568 0.750000 18.375000 -17.875000 -0.375000 -17.875000
@@ -1216,15 +1216,15 @@ TURNOUT O "Ross 18"" 10 Stop Transfer Table (3.5"" Trk Center) TT1810" E 0.000000 -31.500000 270.000000
E 18.000000 -31.500000 90.000000
S 0 0.000000 0.000000 0.000000 18.000000 0.000000
- S 0 0.000000 0.000000 -3.500000 18.000000 -3.500000
- S 0 0.000000 0.000000 -7.000000 18.000000 -7.000000
- S 0 0.000000 0.000000 -10.500000 18.000000 -10.500000
- S 0 0.000000 0.000000 -14.000000 18.000000 -14.000000
- S 0 0.000000 0.000000 -17.500000 18.000000 -17.500000
- S 0 0.000000 0.000000 -21.000000 18.000000 -21.000000
- S 0 0.000000 0.000000 -24.500000 18.000000 -24.500000
- S 0 0.000000 0.000000 -28.000000 18.000000 -28.000000
- S 0 0.000000 0.000000 -31.500000 18.000000 -31.500000
+ S 16777215 0.000000 0.000000 -3.500000 18.000000 -3.500000
+ S 16777215 0.000000 0.000000 -7.000000 18.000000 -7.000000
+ S 16777215 0.000000 0.000000 -10.500000 18.000000 -10.500000
+ S 16777215 0.000000 0.000000 -14.000000 18.000000 -14.000000
+ S 16777215 0.000000 0.000000 -17.500000 18.000000 -17.500000
+ S 16777215 0.000000 0.000000 -21.000000 18.000000 -21.000000
+ S 16777215 0.000000 0.000000 -24.500000 18.000000 -24.500000
+ S 16777215 0.000000 0.000000 -28.000000 18.000000 -28.000000
+ S 16777215 0.000000 0.000000 -31.500000 18.000000 -31.500000
L 11579568 0.750000 -0.375000 3.8750000 18.375000 3.875000
L 11579568 0.750000 18.375000 4.250000 18.375000 -35.750000
L 11579568 0.750000 18.375000 -35.375000 -0.375000 -35.375000
@@ -1255,10 +1255,10 @@ TURNOUT O "Ross 27"" 5 Stop Transfer Table (3.5"" Trk Center) TT275" E 0.000000 -14.000000 270.000000
E 27.000000 -14.000000 90.000000
S 0 0.000000 0.000000 0.000000 27.000000 0.000000
- S 0 0.000000 0.000000 -3.500000 27.000000 -3.500000
- S 0 0.000000 0.000000 -7.000000 27.000000 -7.000000
- S 0 0.000000 0.000000 -10.500000 27.000000 -10.500000
- S 0 0.000000 0.000000 -14.000000 27.000000 -14.000000
+ S 16777215 0.000000 0.000000 -3.500000 27.000000 -3.500000
+ S 16777215 0.000000 0.000000 -7.000000 27.000000 -7.000000
+ S 16777215 0.000000 0.000000 -10.500000 27.000000 -10.500000
+ S 16777215 0.000000 0.000000 -14.000000 27.000000 -14.000000
L 11579568 0.750000 -0.375000 3.8750000 27.375000 3.875000
L 11579568 0.750000 27.375000 4.250000 27.375000 -18.250000
L 11579568 0.750000 27.375000 -17.875000 -0.375000 -17.875000
@@ -1304,15 +1304,15 @@ TURNOUT O "Ross 27"" 10 Stop Transfer Table (3.5"" Trk Center) TT2710" E 0.000000 -31.500000 270.000000
E 27.000000 -31.500000 90.000000
S 0 0.000000 0.000000 0.000000 27.000000 0.000000
- S 0 0.000000 0.000000 -3.500000 27.000000 -3.500000
- S 0 0.000000 0.000000 -7.000000 27.000000 -7.000000
- S 0 0.000000 0.000000 -10.500000 27.000000 -10.500000
- S 0 0.000000 0.000000 -14.000000 27.000000 -14.000000
- S 0 0.000000 0.000000 -17.500000 27.000000 -17.500000
- S 0 0.000000 0.000000 -21.000000 27.000000 -21.000000
- S 0 0.000000 0.000000 -24.500000 27.000000 -24.500000
- S 0 0.000000 0.000000 -28.000000 27.000000 -28.000000
- S 0 0.000000 0.000000 -31.500000 27.000000 -31.500000
+ S 16777215 0.000000 0.000000 -3.500000 27.000000 -3.500000
+ S 16777215 0.000000 0.000000 -7.000000 27.000000 -7.000000
+ S 16777215 0.000000 0.000000 -10.500000 27.000000 -10.500000
+ S 16777215 0.000000 0.000000 -14.000000 27.000000 -14.000000
+ S 16777215 0.000000 0.000000 -17.500000 27.000000 -17.500000
+ S 16777215 0.000000 0.000000 -21.000000 27.000000 -21.000000
+ S 16777215 0.000000 0.000000 -24.500000 27.000000 -24.500000
+ S 16777215 0.000000 0.000000 -28.000000 27.000000 -28.000000
+ S 16777215 0.000000 0.000000 -31.500000 27.000000 -31.500000
L 11579568 0.750000 -0.375000 3.8750000 27.375000 3.875000
L 11579568 0.750000 27.375000 4.250000 27.375000 -35.750000
L 11579568 0.750000 27.375000 -35.375000 -0.375000 -35.375000
@@ -1343,10 +1343,10 @@ TURNOUT O "Ross 36"" 5 Stop Transfer Table (3.5"" Trk Center) TT365" E 0.000000 -14.000000 270.000000
E 36.000000 -14.000000 90.000000
S 0 0.000000 0.000000 0.000000 36.000000 0.000000
- S 0 0.000000 0.000000 -3.500000 36.000000 -3.500000
- S 0 0.000000 0.000000 -7.000000 36.000000 -7.000000
- S 0 0.000000 0.000000 -10.500000 36.000000 -10.500000
- S 0 0.000000 0.000000 -14.000000 36.000000 -14.000000
+ S 16777215 0.000000 0.000000 -3.500000 36.000000 -3.500000
+ S 16777215 0.000000 0.000000 -7.000000 36.000000 -7.000000
+ S 16777215 0.000000 0.000000 -10.500000 36.000000 -10.500000
+ S 16777215 0.000000 0.000000 -14.000000 36.000000 -14.000000
L 11579568 0.750000 -0.375000 3.8750000 36.375000 3.875000
L 11579568 0.750000 36.375000 4.250000 36.375000 -18.250000
L 11579568 0.750000 36.375000 -17.875000 -0.375000 -17.875000
@@ -1392,15 +1392,15 @@ TURNOUT O "Ross 36"" 10 Stop Transfer Table (3.5"" Trk Center) TT3610" E 0.000000 -31.500000 270.000000
E 36.000000 -31.500000 90.000000
S 0 0.000000 0.000000 0.000000 36.000000 0.000000
- S 0 0.000000 0.000000 -3.500000 36.000000 -3.500000
- S 0 0.000000 0.000000 -7.000000 36.000000 -7.000000
- S 0 0.000000 0.000000 -10.500000 36.000000 -10.500000
- S 0 0.000000 0.000000 -14.000000 36.000000 -14.000000
- S 0 0.000000 0.000000 -17.500000 36.000000 -17.500000
- S 0 0.000000 0.000000 -21.000000 36.000000 -21.000000
- S 0 0.000000 0.000000 -24.500000 36.000000 -24.500000
- S 0 0.000000 0.000000 -28.000000 36.000000 -28.000000
- S 0 0.000000 0.000000 -31.500000 36.000000 -31.500000
+ S 16777215 0.000000 0.000000 -3.500000 36.000000 -3.500000
+ S 16777215 0.000000 0.000000 -7.000000 36.000000 -7.000000
+ S 16777215 0.000000 0.000000 -10.500000 36.000000 -10.500000
+ S 16777215 0.000000 0.000000 -14.000000 36.000000 -14.000000
+ S 16777215 0.000000 0.000000 -17.500000 36.000000 -17.500000
+ S 16777215 0.000000 0.000000 -21.000000 36.000000 -21.000000
+ S 16777215 0.000000 0.000000 -24.500000 36.000000 -24.500000
+ S 16777215 0.000000 0.000000 -28.000000 36.000000 -28.000000
+ S 16777215 0.000000 0.000000 -31.500000 36.000000 -31.500000
L 11579568 0.750000 -0.375000 3.8750000 36.375000 3.875000
L 11579568 0.750000 36.375000 4.250000 36.375000 -35.750000
L 11579568 0.750000 36.375000 -35.375000 -0.375000 -35.375000
diff --git a/app/lib/params/TT-Roco-Turntable.xtp b/app/lib/params/TT-Roco-Turntable.xtp index 12b5427..e4377c7 100644 --- a/app/lib/params/TT-Roco-Turntable.xtp +++ b/app/lib/params/TT-Roco-Turntable.xtp @@ -37,18 +37,18 @@ TURNOUT TT "Roco Turn Table 35900" E -2.547255 2.547255 315.000000
E -1.801181 3.119737 330.000000
E -0.932360 3.479615 345.000000
- S 0 0.000000 0.000000 3.602362 0.000000 -3.602362
- S 0 0.000000 0.932360 3.479615 -0.932360 -3.479615
- S 0 0.000000 1.801181 3.119737 -1.801181 -3.119737
- S 0 0.000000 2.547255 2.547255 -2.547255 -2.547255
- S 0 0.000000 3.119737 1.801181 -3.119737 -1.801181
- S 0 0.000000 3.479615 0.932360 -3.479615 -0.932360
- S 0 0.000000 3.602362 0.000000 -3.602362 0.000000
- S 0 0.000000 3.479615 -0.932360 -3.479615 0.932360
- S 0 0.000000 3.119737 -1.801181 -3.119737 1.801181
- S 0 0.000000 2.547255 -2.547255 -2.547255 2.547255
- S 0 0.000000 1.801181 -3.119737 -1.801181 3.119737
- S 0 0.000000 0.932360 -3.479615 -0.932360 3.479615
+ S 16777215 0.000000 0.000000 3.602362 0.000000 -3.602362
+ S 16777215 0.000000 0.932360 3.479615 -0.932360 -3.479615
+ S 16777215 0.000000 1.801181 3.119737 -1.801181 -3.119737
+ S 16777215 0.000000 2.547255 2.547255 -2.547255 -2.547255
+ S 16777215 0.000000 3.119737 1.801181 -3.119737 -1.801181
+ S 16777215 0.000000 3.479615 0.932360 -3.479615 -0.932360
+ S 16777215 0.000000 3.602362 0.000000 -3.602362 0.000000
+ S 16777215 0.000000 3.479615 -0.932360 -3.479615 0.932360
+ S 16777215 0.000000 3.119737 -1.801181 -3.119737 1.801181
+ S 16777215 0.000000 2.547255 -2.547255 -2.547255 2.547255
+ S 16777215 0.000000 1.801181 -3.119737 -1.801181 3.119737
+ S 16777215 0.000000 0.932360 -3.479615 -0.932360 3.479615
A 11579568 0.000000 3.602362 0.000000 0.000000 0.000000 360.000000
A 11579568 0.000000 5.059000 0.000000 0.000000 0.000000 360.000000
END
diff --git a/app/lib/params/Z-Rokuhan.xtp b/app/lib/params/Z-Rokuhan.xtp index 624d364..6a6d4e8 100644 --- a/app/lib/params/Z-Rokuhan.xtp +++ b/app/lib/params/Z-Rokuhan.xtp @@ -1104,40 +1104,40 @@ TURNOUT Z "Rokuhan Turntable 170mm S037" E -1.673228 2.898117 330.000000 E -0.866127 3.232429 345.000000 S 0 0.031250 0.000000 3.346457 0.000000 2.559055 - S 0 0.031250 0.000000 2.559055 0.000000 -2.559055 + S 16777215 0.031250 0.000000 2.559055 0.000000 -2.559055 S 0 0.031250 0.000000 -2.559055 0.000000 -3.346457 S 0 0.031250 0.866127 3.232429 0.662332 2.471857 - S 0 0.031250 0.662332 2.471857 -0.662332 -2.471857 + S 16777215 0.031250 0.662332 2.471857 -0.662332 -2.471857 S 0 0.031250 -0.662332 -2.471857 -0.866127 -3.232429 S 0 0.031250 1.673228 2.898117 1.279528 2.216207 - S 0 0.031250 1.279528 2.216207 -1.279528 -2.216207 + S 16777215 0.031250 1.279528 2.216207 -1.279528 -2.216207 S 0 0.031250 -1.279528 -2.216207 -1.673228 -2.898117 S 0 0.031250 2.366302 2.366302 1.809525 1.809525 - S 0 0.031250 1.809525 1.809525 -1.809525 -1.809525 + S 16777215 0.031250 1.809525 1.809525 -1.809525 -1.809525 S 0 0.031250 -1.809525 -1.809525 -2.366302 -2.366302 S 0 0.031250 2.898117 1.673228 2.216207 1.279528 - S 0 0.031250 2.216207 1.279528 -2.216207 -1.279528 + S 16777215 0.031250 2.216207 1.279528 -2.216207 -1.279528 S 0 0.031250 -2.216207 -1.279528 -2.898117 -1.673228 S 0 0.031250 3.232429 0.866127 2.471857 0.662332 - S 0 0.031250 2.471857 0.662332 -2.471857 -0.662332 + S 16777215 0.031250 2.471857 0.662332 -2.471857 -0.662332 S 0 0.031250 -2.471857 -0.662332 -3.232429 -0.866127 S 0 0.031250 3.346457 0.000000 2.559055 0.000000 - S 0 0.031250 2.559055 0.000000 -2.559055 0.000000 + S 16777215 0.031250 2.559055 0.000000 -2.559055 0.000000 S 0 0.031250 -2.559055 0.000000 -3.346457 0.000000 S 0 0.031250 3.232429 -0.866127 2.471857 -0.662332 - S 0 0.031250 2.471857 -0.662332 -2.471857 0.662332 + S 16777215 0.031250 2.471857 -0.662332 -2.471857 0.662332 S 0 0.031250 -2.471857 0.662332 -3.232429 0.866127 S 0 0.031250 2.898117 -1.673228 2.216207 -1.279528 - S 0 0.031250 2.216207 -1.279528 -2.216207 1.279528 + S 16777215 0.031250 2.216207 -1.279528 -2.216207 1.279528 S 0 0.031250 -2.216207 1.279528 -2.898117 1.673228 S 0 0.031250 2.366302 -2.366302 1.809525 -1.809525 - S 0 0.031250 1.809525 -2.366302 -1.809525 2.366302 + S 16777215 0.031250 1.809525 -2.366302 -1.809525 2.366302 S 0 0.031250 -1.809525 1.809525 -2.366302 2.366302 S 0 0.031250 1.673228 -2.898117 1.279528 -2.216207 - S 0 0.031250 1.279528 -2.216207 -1.279528 2.216207 + S 16777215 0.031250 1.279528 -2.216207 -1.279528 2.216207 S 0 0.031250 -1.279528 2.216207 -1.673228 2.898117 S 0 0.031250 0.866127 -3.232429 0.662332 -2.471857 - S 0 0.031250 0.662332 -2.471857 -0.662332 2.471857 + S 16777215 0.031250 0.662332 -2.471857 -0.662332 2.471857 S 0 0.031250 -0.662332 2.471857 -0.866127 3.232429 A 0 0.031250 3.346457 0.000000 0.000000 0.000000 360.000000 A 0 0.031250 2.559055 0.000000 0.000000 0.000000 360.000000 diff --git a/app/lib/params/atlaso2rail.xtp b/app/lib/params/atlaso2rail.xtp index 7fdece4..ef1ee88 100644 --- a/app/lib/params/atlaso2rail.xtp +++ b/app/lib/params/atlaso2rail.xtp @@ -282,29 +282,29 @@ TURNOUT O "Atlas O 2 Rail 24"" Turntable AT-6910" E 3.105829 -11.591110 165.000000 E -3.105829 11.591110 345.000000 #0/180 - S 0 0 0.000000 12.000000 0.000000 -12.000000 + S 16777215 0 0.000000 12.000000 0.000000 -12.000000 #15/195 - S 0 0 3.105829 11.591110 -3.105829 -11.591110 + S 16777215 0 3.105829 11.591110 -3.105829 -11.591110 #30/210 - S 0 0 6.000000 10.392305 -6.000000 -10.392305 + S 16777215 0 6.000000 10.392305 -6.000000 -10.392305 #45/225 - S 0 0 8.485281 8.485281 -8.485281 -8.485281 + S 16777215 0 8.485281 8.485281 -8.485281 -8.485281 #60/240 - S 0 0 10.392305 6.000000 -10.392305 -6.000000 + S 16777215 0 10.392305 6.000000 -10.392305 -6.000000 #75/255 - S 0 0 11.591110 3.105829 -11.591110 -3.105829 + S 16777215 0 11.591110 3.105829 -11.591110 -3.105829 #90/270 - S 0 0 -12.000000 0.000000 12.000000 0.000000 + S 16777215 0 -12.000000 0.000000 12.000000 0.000000 #105/285 - S 0 0 11.591110 -3.105829 -11.591110 3.105829 + S 16777215 0 11.591110 -3.105829 -11.591110 3.105829 #120/300 - S 0 0 10.392305 -6.000000 -10.392305 6.000000 + S 16777215 0 10.392305 -6.000000 -10.392305 6.000000 #135/315 - S 0 0 8.485281 -8.485281 -8.485281 8.485281 + S 16777215 0 8.485281 -8.485281 -8.485281 8.485281 #150/330 - S 0 0 6.000000 -10.392305 -6.000000 10.392305 + S 16777215 0 6.000000 -10.392305 -6.000000 10.392305 #165/345 - S 0 0 3.105829 -11.591110 -3.105829 11.591110 + S 16777215 0 3.105829 -11.591110 -3.105829 11.591110 A 11579568 0.053333 12.000000 0.000000 0.000000 0.000000 360.000000 A 11579568 0.053333 13.000000 0.000000 0.000000 0.000000 360.000000 END diff --git a/app/lib/params/cmake_install.cmake b/app/lib/params/cmake_install.cmake new file mode 100644 index 0000000..29f05b8 --- /dev/null +++ b/app/lib/params/cmake_install.cmake @@ -0,0 +1,282 @@ +# Install script for directory: /home/martin/XTrackCAD/src/work/app/lib/params + +# 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/params" TYPE FILE FILES + "/home/martin/XTrackCAD/src/work/app/lib/params/ACG19.350 Track.xtp" + "/home/martin/XTrackCAD/src/work/app/lib/params/ACG20.000 Track.xtp" + "/home/martin/XTrackCAD/src/work/app/lib/params/ACG20.000_Track.xtp" + "/home/martin/XTrackCAD/src/work/app/lib/params/Any-CTC_panel.xtp" + "/home/martin/XTrackCAD/src/work/app/lib/params/Any-CabooseIndustries.xtp" + "/home/martin/XTrackCAD/src/work/app/lib/params/Any-ElecSymbol.xtp" + "/home/martin/XTrackCAD/src/work/app/lib/params/AtlasTrueTrk.xtp" + "/home/martin/XTrackCAD/src/work/app/lib/params/Azatrax.xtp" + "/home/martin/XTrackCAD/src/work/app/lib/params/BachmannEZ-HO.xtp" + "/home/martin/XTrackCAD/src/work/app/lib/params/BachmannEZ-N.xtp" + "/home/martin/XTrackCAD/src/work/app/lib/params/Central Valley turnout kits.xtp" + "/home/martin/XTrackCAD/src/work/app/lib/params/Central Valley turnouts.xtp" + "/home/martin/XTrackCAD/src/work/app/lib/params/Circuits.xtp" + "/home/martin/XTrackCAD/src/work/app/lib/params/DiamondSc.xtp" + "/home/martin/XTrackCAD/src/work/app/lib/params/EM-UK Fine Scale.xtp" + "/home/martin/XTrackCAD/src/work/app/lib/params/F-NMRA-RP12-21.xtp" + "/home/martin/XTrackCAD/src/work/app/lib/params/FastTrack-HO.xtp" + "/home/martin/XTrackCAD/src/work/app/lib/params/FastTrack_n.xtp" + "/home/martin/XTrackCAD/src/work/app/lib/params/G-NMRA-RP12-23.xtp" + "/home/martin/XTrackCAD/src/work/app/lib/params/G-aristo.xtp" + "/home/martin/XTrackCAD/src/work/app/lib/params/Gn15-nmra.xtp" + "/home/martin/XTrackCAD/src/work/app/lib/params/H0_ncb-Roads.xtp" + "/home/martin/XTrackCAD/src/work/app/lib/params/HO-AtlasHOstruct.xtp" + "/home/martin/XTrackCAD/src/work/app/lib/params/HO-DapolHOOO.xtp" + "/home/martin/XTrackCAD/src/work/app/lib/params/HO-Frateschi.xtp" + "/home/martin/XTrackCAD/src/work/app/lib/params/HO-HornbyHO.xtp" + "/home/martin/XTrackCAD/src/work/app/lib/params/HO-LifeLike-Power-Loc.xtp" + "/home/martin/XTrackCAD/src/work/app/lib/params/HO-MetcalfeHOOO.xtp" + "/home/martin/XTrackCAD/src/work/app/lib/params/HO-MicroEngineering.xtp" + "/home/martin/XTrackCAD/src/work/app/lib/params/HO-OldJouefHO100.xtp" + "/home/martin/XTrackCAD/src/work/app/lib/params/HO-Peco-Code100Setrack.xtp" + "/home/martin/XTrackCAD/src/work/app/lib/params/HO-Peco-Code100Streamline.xtp" + "/home/martin/XTrackCAD/src/work/app/lib/params/HO-Peco-Code75Finescale.xtp" + "/home/martin/XTrackCAD/src/work/app/lib/params/HO-Peco-Code83.xtp" + "/home/martin/XTrackCAD/src/work/app/lib/params/HO-RatioHOOO.xtp" + "/home/martin/XTrackCAD/src/work/app/lib/params/HO-Slot-Car-AFX-Track.xtp" + "/home/martin/XTrackCAD/src/work/app/lib/params/HO-Slot-Car-Adapter-Track.xtp" + "/home/martin/XTrackCAD/src/work/app/lib/params/HO-Slot-Car-Aurora-Track-Manually-Modified.xtp" + "/home/martin/XTrackCAD/src/work/app/lib/params/HO-Slot-Car-Aurora-Track.xtp" + "/home/martin/XTrackCAD/src/work/app/lib/params/HO-Slot-Cars.xtp" + "/home/martin/XTrackCAD/src/work/app/lib/params/HO-Superquick.xtp" + "/home/martin/XTrackCAD/src/work/app/lib/params/HO-WalthCornerstone 1.xtp" + "/home/martin/XTrackCAD/src/work/app/lib/params/HO-WillsHOOO.xtp" + "/home/martin/XTrackCAD/src/work/app/lib/params/HO-atl100ho.xtp" + "/home/martin/XTrackCAD/src/work/app/lib/params/HO-cmr-ho.xtp" + "/home/martin/XTrackCAD/src/work/app/lib/params/HO_toolkit-Roads.xtp" + "/home/martin/XTrackCAD/src/work/app/lib/params/HOn3-BlackStoneProTraxx.xtp" + "/home/martin/XTrackCAD/src/work/app/lib/params/HOn3-MicroEngineering.xtp" + "/home/martin/XTrackCAD/src/work/app/lib/params/HOn30_Minitrains.xtp" + "/home/martin/XTrackCAD/src/work/app/lib/params/Hornby Dublo 2 Rail Buildings.xtp" + "/home/martin/XTrackCAD/src/work/app/lib/params/Hornby Dublo 2 Rail.xtp" + "/home/martin/XTrackCAD/src/work/app/lib/params/Hornby Dublo 3 Rail with Turntable.xtp" + "/home/martin/XTrackCAD/src/work/app/lib/params/Hornby Dublo Signals.xtp" + "/home/martin/XTrackCAD/src/work/app/lib/params/Hornby Dublo Wood Buildings.xtp" + "/home/martin/XTrackCAD/src/work/app/lib/params/HornbyOO.xtp" + "/home/martin/XTrackCAD/src/work/app/lib/params/JouefHO.xtp" + "/home/martin/XTrackCAD/src/work/app/lib/params/K-Line O Structures (Kits).xtp" + "/home/martin/XTrackCAD/src/work/app/lib/params/Lego-Track.xtp" + "/home/martin/XTrackCAD/src/work/app/lib/params/LifeLike-N.xtp" + "/home/martin/XTrackCAD/src/work/app/lib/params/LimaHO.xtp" + "/home/martin/XTrackCAD/src/work/app/lib/params/Lionel O Misc.xtp" + "/home/martin/XTrackCAD/src/work/app/lib/params/Lionel O Operating Structures.xtp" + "/home/martin/XTrackCAD/src/work/app/lib/params/Lionel O Structures (Kits).xtp" + "/home/martin/XTrackCAD/src/work/app/lib/params/Lionel-O-O27.xtp" + "/home/martin/XTrackCAD/src/work/app/lib/params/Lionel-O.xtp" + "/home/martin/XTrackCAD/src/work/app/lib/params/Lionel27.xtp" + "/home/martin/XTrackCAD/src/work/app/lib/params/LionelFasttrack.xtp" + "/home/martin/XTrackCAD/src/work/app/lib/params/Lionel_Marx Beacons & Floodlight Towers.xtp" + "/home/martin/XTrackCAD/src/work/app/lib/params/Lionel_Marx Highway Signals & Blocks.xtp" + "/home/martin/XTrackCAD/src/work/app/lib/params/Marx.xtp" + "/home/martin/XTrackCAD/src/work/app/lib/params/N-AtlasTrueTrack.xtp" + "/home/martin/XTrackCAD/src/work/app/lib/params/N-BRIDGES.xtp" + "/home/martin/XTrackCAD/src/work/app/lib/params/N-Bonus Commercial Structures.xtp" + "/home/martin/XTrackCAD/src/work/app/lib/params/N-Bonus Generic Industrial Structures.xtp" + "/home/martin/XTrackCAD/src/work/app/lib/params/N-Bonus Industrial Structures.xtp" + "/home/martin/XTrackCAD/src/work/app/lib/params/N-Bonus Railroad Structures.xtp" + "/home/martin/XTrackCAD/src/work/app/lib/params/N-Bonus Residential Structures.xtp" + "/home/martin/XTrackCAD/src/work/app/lib/params/N-Bonus Structures.xtp" + "/home/martin/XTrackCAD/src/work/app/lib/params/N-BritishFinescaleFineTraxC40.xtp" + "/home/martin/XTrackCAD/src/work/app/lib/params/N-DESIGN-PRESERVATION.xtp" + "/home/martin/XTrackCAD/src/work/app/lib/params/N-GRAIN-ELEVATORS.xtp" + "/home/martin/XTrackCAD/src/work/app/lib/params/N-Greenmax-Engine sheds.xtp" + "/home/martin/XTrackCAD/src/work/app/lib/params/N-Greenmax-Island platform 16.xtp" + "/home/martin/XTrackCAD/src/work/app/lib/params/N-Ibertren.xtp" + "/home/martin/XTrackCAD/src/work/app/lib/params/N-Kato-Unitram.xtp" + "/home/martin/XTrackCAD/src/work/app/lib/params/N-Katocn.xtp" + "/home/martin/XTrackCAD/src/work/app/lib/params/N-LifeLike Power-Loc.xtp" + "/home/martin/XTrackCAD/src/work/app/lib/params/N-ME Structures.xtp" + "/home/martin/XTrackCAD/src/work/app/lib/params/N-MOBILE-HOMES.xtp" + "/home/martin/XTrackCAD/src/work/app/lib/params/N-N- 90ft-ROUNDHOUSE.xtp" + "/home/martin/XTrackCAD/src/work/app/lib/params/N-NScaleArchitect.xtp" + "/home/martin/XTrackCAD/src/work/app/lib/params/N-NULINE.xtp" + "/home/martin/XTrackCAD/src/work/app/lib/params/N-PecoCode55Finescale.xtp" + "/home/martin/XTrackCAD/src/work/app/lib/params/N-PecoCode80Setrack.xtp" + "/home/martin/XTrackCAD/src/work/app/lib/params/N-PecoCode80Streamline.xtp" + "/home/martin/XTrackCAD/src/work/app/lib/params/N-Rix-Pikestuff.xtp" + "/home/martin/XTrackCAD/src/work/app/lib/params/N-Shinohara70.xtp" + "/home/martin/XTrackCAD/src/work/app/lib/params/N-atlasn55.xtp" + "/home/martin/XTrackCAD/src/work/app/lib/params/N-cmr.xtp" + "/home/martin/XTrackCAD/src/work/app/lib/params/N-fl.xtp" + "/home/martin/XTrackCAD/src/work/app/lib/params/N-kato-n-gl-trk.xtp" + "/home/martin/XTrackCAD/src/work/app/lib/params/N-kato-turntable.xtp" + "/home/martin/XTrackCAD/src/work/app/lib/params/N-kato.xtp" + "/home/martin/XTrackCAD/src/work/app/lib/params/N-me.xtp" + "/home/martin/XTrackCAD/src/work/app/lib/params/N-walth-n.xtp" + "/home/martin/XTrackCAD/src/work/app/lib/params/NJI.xtp" + "/home/martin/XTrackCAD/src/work/app/lib/params/NScale_SectorPlate_Traverser_Examples.xtp" + "/home/martin/XTrackCAD/src/work/app/lib/params/Ninco_SCX Slot Car.xtp" + "/home/martin/XTrackCAD/src/work/app/lib/params/Nm-NTram.xtp" + "/home/martin/XTrackCAD/src/work/app/lib/params/O-Bassett-Lowke (discontinued).xtp" + "/home/martin/XTrackCAD/src/work/app/lib/params/O-ETS TramTrack.xtp" + "/home/martin/XTrackCAD/src/work/app/lib/params/O-ETS.xtp" + "/home/martin/XTrackCAD/src/work/app/lib/params/O-Lehnhardt Tramrails.xtp" + "/home/martin/XTrackCAD/src/work/app/lib/params/O-Lenz.xtp" + "/home/martin/XTrackCAD/src/work/app/lib/params/O-RealTrax.xtp" + "/home/martin/XTrackCAD/src/work/app/lib/params/O-Ross.xtp" + "/home/martin/XTrackCAD/src/work/app/lib/params/O-atlaso3rail.xtp" + "/home/martin/XTrackCAD/src/work/app/lib/params/O-nmra-lapped.xtp" + "/home/martin/XTrackCAD/src/work/app/lib/params/On14mm KBScale.xtp" + "/home/martin/XTrackCAD/src/work/app/lib/params/On30-FastTrack.xtp" + "/home/martin/XTrackCAD/src/work/app/lib/params/On30-Guy.xtp" + "/home/martin/XTrackCAD/src/work/app/lib/params/On30-Interfaceplates.xtp" + "/home/martin/XTrackCAD/src/work/app/lib/params/On30.xtp" + "/home/martin/XTrackCAD/src/work/app/lib/params/Peco-On30.xtp" + "/home/martin/XTrackCAD/src/work/app/lib/params/Piko-A.xtp" + "/home/martin/XTrackCAD/src/work/app/lib/params/Piko-g.xtp" + "/home/martin/XTrackCAD/src/work/app/lib/params/ProZ-Track.xtp" + "/home/martin/XTrackCAD/src/work/app/lib/params/Proto-AmSlotCar.xtp" + "/home/martin/XTrackCAD/src/work/app/lib/params/RSLaserKits.xtp" + "/home/martin/XTrackCAD/src/work/app/lib/params/RocoGeoLineHO.xtp" + "/home/martin/XTrackCAD/src/work/app/lib/params/S-AmericanModel.xtp" + "/home/martin/XTrackCAD/src/work/app/lib/params/S-MTH S-Trax.xtp" + "/home/martin/XTrackCAD/src/work/app/lib/params/S-SHelper S-Trax.xtp" + "/home/martin/XTrackCAD/src/work/app/lib/params/S-Trax.xtp" + "/home/martin/XTrackCAD/src/work/app/lib/params/S_ACG_18.824in Radius Track.xtp" + "/home/martin/XTrackCAD/src/work/app/lib/params/S_ACG_20.000 Track.xtp" + "/home/martin/XTrackCAD/src/work/app/lib/params/SideTrk.xtp" + "/home/martin/XTrackCAD/src/work/app/lib/params/T-Eishindo.xtp" + "/home/martin/XTrackCAD/src/work/app/lib/params/TT-Kuehn.xtp" + "/home/martin/XTrackCAD/src/work/app/lib/params/TT-Roco-Turntable.xtp" + "/home/martin/XTrackCAD/src/work/app/lib/params/TT-TilligAdvBeddingTrack.xtp" + "/home/martin/XTrackCAD/src/work/app/lib/params/TT-Trak Modules.xtp" + "/home/martin/XTrackCAD/src/work/app/lib/params/TTi-AuhagenNG.xtp" + "/home/martin/XTrackCAD/src/work/app/lib/params/Tables (all scales).xtp" + "/home/martin/XTrackCAD/src/work/app/lib/params/TilligAdvTT.xtp" + "/home/martin/XTrackCAD/src/work/app/lib/params/TilligH0EliteCode83.xtp" + "/home/martin/XTrackCAD/src/work/app/lib/params/TilligH0e.xtp" + "/home/martin/XTrackCAD/src/work/app/lib/params/TilligH0m.xtp" + "/home/martin/XTrackCAD/src/work/app/lib/params/TilligTTModellGS.xtp" + "/home/martin/XTrackCAD/src/work/app/lib/params/USA-G.xtp" + "/home/martin/XTrackCAD/src/work/app/lib/params/Woodland.xtp" + "/home/martin/XTrackCAD/src/work/app/lib/params/Z-Atlas55.xtp" + "/home/martin/XTrackCAD/src/work/app/lib/params/Z-Fasttrack.xtp" + "/home/martin/XTrackCAD/src/work/app/lib/params/Z-Peco60.xtp" + "/home/martin/XTrackCAD/src/work/app/lib/params/Z-Rokuhan.xtp" + "/home/martin/XTrackCAD/src/work/app/lib/params/Z-T-Trak.xtp" + "/home/martin/XTrackCAD/src/work/app/lib/params/amb-n.xtp" + "/home/martin/XTrackCAD/src/work/app/lib/params/arnold.xtp" + "/home/martin/XTrackCAD/src/work/app/lib/params/atl83ho.xtp" + "/home/martin/XTrackCAD/src/work/app/lib/params/atlascn.xtp" + "/home/martin/XTrackCAD/src/work/app/lib/params/atlasen.xtp" + "/home/martin/XTrackCAD/src/work/app/lib/params/atlasn.xtp" + "/home/martin/XTrackCAD/src/work/app/lib/params/atlaso2rail.xtp" + "/home/martin/XTrackCAD/src/work/app/lib/params/bach-n.xtp" + "/home/martin/XTrackCAD/src/work/app/lib/params/br.xtp" + "/home/martin/XTrackCAD/src/work/app/lib/params/busch-HOf.xtp" + "/home/martin/XTrackCAD/src/work/app/lib/params/ctlpanel.xtp" + "/home/martin/XTrackCAD/src/work/app/lib/params/dpm-ho.xtp" + "/home/martin/XTrackCAD/src/work/app/lib/params/dpm-n.xtp" + "/home/martin/XTrackCAD/src/work/app/lib/params/eu.xtp" + "/home/martin/XTrackCAD/src/work/app/lib/params/fl-model.xtp" + "/home/martin/XTrackCAD/src/work/app/lib/params/fl-profi.xtp" + "/home/martin/XTrackCAD/src/work/app/lib/params/flnpicco.xtp" + "/home/martin/XTrackCAD/src/work/app/lib/params/gargrv-o.xtp" + "/home/martin/XTrackCAD/src/work/app/lib/params/ho-amb.xtp" + "/home/martin/XTrackCAD/src/work/app/lib/params/ho-barm.xtp" + "/home/martin/XTrackCAD/src/work/app/lib/params/ho-blair.xtp" + "/home/martin/XTrackCAD/src/work/app/lib/params/ho-branc.xtp" + "/home/martin/XTrackCAD/src/work/app/lib/params/ho-campb.xtp" + "/home/martin/XTrackCAD/src/work/app/lib/params/ho-craft.xtp" + "/home/martin/XTrackCAD/src/work/app/lib/params/ho-fos.xtp" + "/home/martin/XTrackCAD/src/work/app/lib/params/ho-jlinn.xtp" + "/home/martin/XTrackCAD/src/work/app/lib/params/ho-ncb-roads.xtp" + "/home/martin/XTrackCAD/src/work/app/lib/params/hon3-peco.xtp" + "/home/martin/XTrackCAD/src/work/app/lib/params/hornby3r.xtp" + "/home/martin/XTrackCAD/src/work/app/lib/params/hubner1.xtp" + "/home/martin/XTrackCAD/src/work/app/lib/params/kato-ho.xtp" + "/home/martin/XTrackCAD/src/work/app/lib/params/kato-n-DblTrk.xtp" + "/home/martin/XTrackCAD/src/work/app/lib/params/kato-n.xtp" + "/home/martin/XTrackCAD/src/work/app/lib/params/lgb.xtp" + "/home/martin/XTrackCAD/src/work/app/lib/params/marcway-EM.xtp" + "/home/martin/XTrackCAD/src/work/app/lib/params/me-ho.xtp" + "/home/martin/XTrackCAD/src/work/app/lib/params/minitrix.xtp" + "/home/martin/XTrackCAD/src/work/app/lib/params/mp-n.xtp" + "/home/martin/XTrackCAD/src/work/app/lib/params/mrkholde.xtp" + "/home/martin/XTrackCAD/src/work/app/lib/params/mrkhomde.xtp" + "/home/martin/XTrackCAD/src/work/app/lib/params/mrkln1.xtp" + "/home/martin/XTrackCAD/src/work/app/lib/params/mrklnhoc-de.xtp" + "/home/martin/XTrackCAD/src/work/app/lib/params/mrklnhoc.xtp" + "/home/martin/XTrackCAD/src/work/app/lib/params/mrklnhok.xtp" + "/home/martin/XTrackCAD/src/work/app/lib/params/mrklnhom.xtp" + "/home/martin/XTrackCAD/src/work/app/lib/params/mrklnz.xtp" + "/home/martin/XTrackCAD/src/work/app/lib/params/mtl-z.xtp" + "/home/martin/XTrackCAD/src/work/app/lib/params/nmra-0-lapped.xtp" + "/home/martin/XTrackCAD/src/work/app/lib/params/nmra-ho.xtp" + "/home/martin/XTrackCAD/src/work/app/lib/params/nmra-ho3.xtp" + "/home/martin/XTrackCAD/src/work/app/lib/params/nmra-n.xtp" + "/home/martin/XTrackCAD/src/work/app/lib/params/nmra-o.xtp" + "/home/martin/XTrackCAD/src/work/app/lib/params/nmra-o3.xtp" + "/home/martin/XTrackCAD/src/work/app/lib/params/nmra-s.xtp" + "/home/martin/XTrackCAD/src/work/app/lib/params/nmra-tt.xtp" + "/home/martin/XTrackCAD/src/work/app/lib/params/nmra-z.xtp" + "/home/martin/XTrackCAD/src/work/app/lib/params/p4.xtp" + "/home/martin/XTrackCAD/src/work/app/lib/params/peco turntable wo routes.xtp" + "/home/martin/XTrackCAD/src/work/app/lib/params/peco-O-Bullhead.xtp" + "/home/martin/XTrackCAD/src/work/app/lib/params/pecohom.xtp" + "/home/martin/XTrackCAD/src/work/app/lib/params/pecohon30.xtp" + "/home/martin/XTrackCAD/src/work/app/lib/params/protoam.xtp" + "/home/martin/XTrackCAD/src/work/app/lib/params/protosteam.xtp" + "/home/martin/XTrackCAD/src/work/app/lib/params/prototype-de.xtp" + "/home/martin/XTrackCAD/src/work/app/lib/params/rocho100.xtp" + "/home/martin/XTrackCAD/src/work/app/lib/params/rocho83.xtp" + "/home/martin/XTrackCAD/src/work/app/lib/params/signals_HO.xtp" + "/home/martin/XTrackCAD/src/work/app/lib/params/smltown.xtp" + "/home/martin/XTrackCAD/src/work/app/lib/params/supero.xtp" + "/home/martin/XTrackCAD/src/work/app/lib/params/t-trak.xtp" + "/home/martin/XTrackCAD/src/work/app/lib/params/taylor-ho.xtp" + "/home/martin/XTrackCAD/src/work/app/lib/params/tomix-n.xtp" + "/home/martin/XTrackCAD/src/work/app/lib/params/toolkit-n.xtp" + "/home/martin/XTrackCAD/src/work/app/lib/params/tortoise.xtp" + "/home/martin/XTrackCAD/src/work/app/lib/params/trees.xtp" + "/home/martin/XTrackCAD/src/work/app/lib/params/walth-bkgrd-ho.xtp" + "/home/martin/XTrackCAD/src/work/app/lib/params/walth-ho.xtp" + "/home/martin/XTrackCAD/src/work/app/lib/params/walth-n.xtp" + "/home/martin/XTrackCAD/src/work/app/lib/params/wlthho10.xtp" + "/home/martin/XTrackCAD/src/work/app/lib/params/wlthho83.xtp" + "/home/martin/XTrackCAD/src/work/app/lib/params/t-trak-notes.txt" + "/home/martin/XTrackCAD/src/work/app/lib/params/accurail.xtp" + "/home/martin/XTrackCAD/src/work/app/lib/params/atlascho.xtp" + "/home/martin/XTrackCAD/src/work/app/lib/params/atlaseho.xtp" + "/home/martin/XTrackCAD/src/work/app/lib/params/fallerho.xtp" + "/home/martin/XTrackCAD/src/work/app/lib/params/pikestuf.xtp" + "/home/martin/XTrackCAD/src/work/app/lib/params/revell.xtp" + ) +endif() + diff --git a/app/lib/params/kato-n.xtp b/app/lib/params/kato-n.xtp index d0cd2c7..0ed3155 100644 --- a/app/lib/params/kato-n.xtp +++ b/app/lib/params/kato-n.xtp @@ -1616,24 +1616,24 @@ TURNOUT N "Kato Unitrack 160mm Turn Table 20-283" E -1.574803 2.727639 330.000000 E -1.077229 2.959662 340.000000 E -0.546923 3.101757 350.000000 - S 0 0.000000 0.000000 3.149606 0.000000 -3.149606 - S 0 0.000000 0.546923 3.101757 -0.546923 -3.101757 - S 0 0.000000 1.077229 2.959662 -1.077229 -2.959662 - S 0 0.000000 1.574803 2.727639 -1.574803 -2.727639 - S 0 0.000000 2.024528 2.412738 -2.024528 -2.412738 - S 0 0.000000 2.412738 2.024528 -2.412738 -2.024528 - S 0 0.000000 2.727639 1.574803 -2.727639 -1.574803 - S 0 0.000000 2.959662 1.077229 -2.959662 -1.077229 - S 0 0.000000 3.101757 0.546923 -3.101757 -0.546923 - S 0 0.000000 3.149606 0.000000 -3.149606 0.000000 - S 0 0.000000 3.101757 -0.546923 -3.101757 0.546923 - S 0 0.000000 2.959662 -1.077229 -2.959662 1.077229 - S 0 0.000000 2.727639 -1.574803 -2.727639 1.574803 - S 0 0.000000 2.412738 -2.024528 -2.412738 2.024528 - S 0 0.000000 2.024528 -2.412738 -2.024528 2.412738 - S 0 0.000000 1.574803 -2.727639 -1.574803 2.727639 - S 0 0.000000 1.077229 -2.959662 -1.077229 2.959662 - S 0 0.000000 0.546923 -3.101757 -0.546923 3.101757 + S 16777215 0.000000 0.000000 3.149606 0.000000 -3.149606 + S 16777215 0.000000 0.546923 3.101757 -0.546923 -3.101757 + S 16777215 0.000000 1.077229 2.959662 -1.077229 -2.959662 + S 16777215 0.000000 1.574803 2.727639 -1.574803 -2.727639 + S 16777215 0.000000 2.024528 2.412738 -2.024528 -2.412738 + S 16777215 0.000000 2.412738 2.024528 -2.412738 -2.024528 + S 16777215 0.000000 2.727639 1.574803 -2.727639 -1.574803 + S 16777215 0.000000 2.959662 1.077229 -2.959662 -1.077229 + S 16777215 0.000000 3.101757 0.546923 -3.101757 -0.546923 + S 16777215 0.000000 3.149606 0.000000 -3.149606 0.000000 + S 16777215 0.000000 3.101757 -0.546923 -3.101757 0.546923 + S 16777215 0.000000 2.959662 -1.077229 -2.959662 1.077229 + S 16777215 0.000000 2.727639 -1.574803 -2.727639 1.574803 + S 16777215 0.000000 2.412738 -2.024528 -2.412738 2.024528 + S 16777215 0.000000 2.024528 -2.412738 -2.024528 2.412738 + S 16777215 0.000000 1.574803 -2.727639 -1.574803 2.727639 + S 16777215 0.000000 1.077229 -2.959662 -1.077229 2.959662 + S 16777215 0.000000 0.546923 -3.101757 -0.546923 3.101757 A 11579568 0.031250 3.149606 0.000000 0.000000 0.000000 360.000000 A 11579568 0.031250 4.271654 0.000000 0.000000 0.000000 360.000000 END diff --git a/app/lib/params/lgb.xtp b/app/lib/params/lgb.xtp index 7c00155..d919ef3 100644 --- a/app/lib/params/lgb.xtp +++ b/app/lib/params/lgb.xtp @@ -356,28 +356,28 @@ TURNOUT G "LGB Turntable 14000" E 5.574522 -13.458088 157.500000 E -5.574522 13.458088 337.500000 S 0 0 0.000000 14.566929 0.000000 9.251969 - S 0 0 0.000000 9.251969 -0.000000 -9.251969 + S 16777215 0 0.000000 9.251969 -0.000000 -9.251969 S 0 0 -0.000000 -9.251969 -0.000000 -14.566929 S 0 0 5.574522 13.458088 3.540575 8.547704 - S 0 0 3.540575 8.547704 -3.540575 -8.547704 + S 16777215 0 3.540575 8.547704 -3.540575 -8.547704 S 0 0 -3.540575 -8.547704 -5.574522 -13.458088 S 0 0 10.300374 10.300374 6.542130 6.542130 - S 0 0 6.542130 6.542130 -6.542130 -6.542130 + S 16777215 0 6.542130 6.542130 -6.542130 -6.542130 S 0 0 -6.542130 -6.542130 -10.300374 -10.300374 S 0 0 13.458088 5.574522 8.547704 3.540575 - S 0 0 8.547704 3.540575 -8.547704 -3.540575 + S 16777215 0 8.547704 3.540575 -8.547704 -3.540575 S 0 0 -8.547704 -3.540575 -13.458088 -5.574522 S 0 0 14.566929 0.000000 9.251969 0.000000 - S 0 0 9.251969 0.000000 -9.251969 -0.000000 + S 16777215 0 9.251969 0.000000 -9.251969 -0.000000 S 0 0 -9.251969 -0.000000 -14.566929 -0.000000 S 0 0 13.458088 -5.574522 8.547704 -3.540575 - S 0 0 8.547704 -3.540575 -8.547704 3.540575 + S 16777215 0 8.547704 -3.540575 -8.547704 3.540575 S 0 0 -8.547704 3.540575 -13.458088 5.574522 S 0 0 10.300374 -10.300374 6.542130 -6.542130 - S 0 0 6.542130 -6.542130 -6.542130 6.542130 + S 16777215 0 6.542130 -6.542130 -6.542130 6.542130 S 0 0 -6.542130 6.542130 -10.300374 10.300374 S 0 0 5.574522 -13.458088 3.540575 -8.547704 - S 0 0 3.540575 -8.547704 -3.540575 8.547704 + S 16777215 0 3.540575 -8.547704 -3.540575 8.547704 S 0 0 -3.540575 8.547704 -5.574522 13.458088 A 16711680 0 14.566929 0.000000 0.000000 0.000000 360.000000 A 16711680 0 9.251969 0.000000 0.000000 0.000000 360.000000 diff --git a/app/lib/params/mrklnhom.xtp b/app/lib/params/mrklnhom.xtp index e228811..88f105e 100644 --- a/app/lib/params/mrklnhom.xtp +++ b/app/lib/params/mrklnhom.xtp @@ -776,76 +776,76 @@ TURNOUT HO "Märklin M-Track Turntable 7186" E 0.991794 -7.533420 172.500000 E -0.991794 7.533420 352.500000 S 0 0 0.000000 7.598425 0.000000 6.102362 - S 0 0 0.000000 6.102362 -0.000000 -6.102362 + S 16777215 0 0.000000 6.102362 -0.000000 -6.102362 S 0 0 -0.000000 -6.102362 -0.000000 -7.598425 S 0 0 0.991794 7.533420 0.796518 6.050156 - S 0 0 0.796518 6.050156 -0.796518 -6.050156 + S 16777215 0 0.796518 6.050156 -0.796518 -6.050156 S 0 0 -0.796518 -6.050156 -0.991794 -7.533420 S 0 0 1.966617 7.339515 1.579408 5.894429 - S 0 0 1.579408 5.894429 -1.579408 -5.894429 + S 16777215 0 1.579408 5.894429 -1.579408 -5.894429 S 0 0 -1.579408 -5.894429 -1.966617 -7.339515 S 0 0 2.907791 7.020030 2.335273 5.637848 - S 0 0 2.335273 5.637848 -2.335273 -5.637848 + S 16777215 0 2.335273 5.637848 -2.335273 -5.637848 S 0 0 -2.335273 -5.637848 -2.907791 -7.020030 S 0 0 3.799213 6.580429 3.051181 5.284801 - S 0 0 3.051181 5.284801 -3.051181 -5.284801 + S 16777215 0 3.051181 5.284801 -3.051181 -5.284801 S 0 0 -3.051181 -5.284801 -3.799213 -6.580429 S 0 0 4.625628 6.028236 3.714883 4.841329 - S 0 0 3.714883 4.841329 -3.714883 -4.841329 + S 16777215 0 3.714883 4.841329 -3.714883 -4.841329 S 0 0 -3.714883 -4.841329 -4.625628 -6.028236 S 0 0 5.372898 5.372898 4.315022 4.315022 - S 0 0 4.315022 4.315022 -4.315022 -4.315022 + S 16777215 0 4.315022 4.315022 -4.315022 -4.315022 S 0 0 -4.315022 -4.315022 -5.372898 -5.372898 S 0 0 6.028236 4.625628 4.841329 3.714883 - S 0 0 4.841329 3.714883 -4.841329 -3.714883 + S 16777215 0 4.841329 3.714883 -4.841329 -3.714883 S 0 0 -4.841329 -3.714883 -6.028236 -4.625628 S 0 0 6.580429 3.799213 5.284801 3.051181 - S 0 0 5.284801 3.051181 -5.284801 -3.051181 + S 16777215 0 5.284801 3.051181 -5.284801 -3.051181 S 0 0 -5.284801 -3.051181 -6.580429 -3.799213 S 0 0 7.020030 2.907791 5.637848 2.335273 - S 0 0 5.637848 2.335273 -5.637848 -2.335273 + S 16777215 0 5.637848 2.335273 -5.637848 -2.335273 S 0 0 -5.637848 -2.335273 -7.020030 -2.907791 S 0 0 7.339515 1.966617 5.894429 1.579408 - S 0 0 5.894429 1.579408 -5.894429 -1.579408 + S 16777215 0 5.894429 1.579408 -5.894429 -1.579408 S 0 0 -5.894429 -1.579408 -7.339515 -1.966617 S 0 0 7.533420 0.991794 6.050156 0.796518 - S 0 0 6.050156 0.796518 -6.050156 -0.796518 + S 16777215 0 6.050156 0.796518 -6.050156 -0.796518 S 0 0 -6.050156 -0.796518 -7.533420 -0.991794 S 0 0 7.598425 0.000000 6.102362 0.000000 - S 0 0 6.102362 0.000000 -6.102362 -0.000000 + S 16777215 0 6.102362 0.000000 -6.102362 -0.000000 S 0 0 -6.102362 -0.000000 -7.598425 -0.000000 S 0 0 7.533420 -0.991794 6.050156 -0.796518 - S 0 0 6.050156 -0.796518 -6.050156 0.796518 + S 16777215 0 6.050156 -0.796518 -6.050156 0.796518 S 0 0 -6.050156 0.796518 -7.533420 0.991794 S 0 0 7.339515 -1.966617 5.894429 -1.579408 - S 0 0 5.894429 -1.579408 -5.894429 1.579408 + S 16777215 0 5.894429 -1.579408 -5.894429 1.579408 S 0 0 -5.894429 1.579408 -7.339515 1.966617 S 0 0 7.020030 -2.907791 5.637848 -2.335273 - S 0 0 5.637848 -2.335273 -5.637848 2.335273 + S 16777215 0 5.637848 -2.335273 -5.637848 2.335273 S 0 0 -5.637848 2.335273 -7.020030 2.907791 S 0 0 6.580429 -3.799213 5.284801 -3.051181 - S 0 0 5.284801 -3.051181 -5.284801 3.051181 + S 16777215 0 5.284801 -3.051181 -5.284801 3.051181 S 0 0 -5.284801 3.051181 -6.580429 3.799213 S 0 0 6.028236 -4.625628 4.841329 -3.714883 - S 0 0 4.841329 -3.714883 -4.841329 3.714883 + S 16777215 0 4.841329 -3.714883 -4.841329 3.714883 S 0 0 -4.841329 3.714883 -6.028236 4.625628 S 0 0 5.372898 -5.372898 4.315022 -4.315022 - S 0 0 4.315022 -4.315022 -4.315022 4.315022 + S 16777215 0 4.315022 -4.315022 -4.315022 4.315022 S 0 0 -4.315022 4.315022 -5.372898 5.372898 S 0 0 4.625628 -6.028236 3.714883 -4.841329 - S 0 0 3.714883 -4.841329 -3.714883 4.841329 + S 16777215 0 3.714883 -4.841329 -3.714883 4.841329 S 0 0 -3.714883 4.841329 -4.625628 6.028236 S 0 0 3.799213 -6.580429 3.051181 -5.284801 - S 0 0 3.051181 -5.284801 -3.051181 5.284801 + S 16777215 0 3.051181 -5.284801 -3.051181 5.284801 S 0 0 -3.051181 5.284801 -3.799213 6.580429 S 0 0 2.907791 -7.020030 2.335273 -5.637848 - S 0 0 2.335273 -5.637848 -2.335273 5.637848 + S 16777215 0 2.335273 -5.637848 -2.335273 5.637848 S 0 0 -2.335273 5.637848 -2.907791 7.020030 S 0 0 1.966617 -7.339515 1.579408 -5.894429 - S 0 0 1.579408 -5.894429 -1.579408 5.894429 + S 16777215 0 1.579408 -5.894429 -1.579408 5.894429 S 0 0 -1.579408 5.894429 -1.966617 7.339515 S 0 0 0.991794 -7.533420 0.796518 -6.050156 - S 0 0 0.796518 -6.050156 -0.796518 6.050156 + S 16777215 0 0.796518 -6.050156 -0.796518 6.050156 S 0 0 -0.796518 6.050156 -0.991794 7.533420 A 16711680 0 7.598425 0.000000 0.000000 0.000000 360.000000 A 16711680 0 6.102362 0.000000 0.000000 0.000000 360.000000 @@ -873,24 +873,24 @@ TURNOUT HO "Märklin M-Track Transfer Table 7294" E 0.000000 -6.094488 270.000000 E 0.000000 -3.047244 270.000000 S 0 0.000000 0.000000 -6.094488 0.787402 -6.094488 - S 0 0 0.787402 -6.094488 13.385827 -6.094488 + S 16777215 0 0.787402 -6.094488 13.385827 -6.094488 S 0 0.000000 13.385827 -6.094488 14.173228 -6.094488 S 0 0.000000 0.000000 -3.047244 0.787402 -3.047244 - S 0 0 0.787402 -3.047244 13.385827 -3.047244 + S 16777215 0 0.787402 -3.047244 13.385827 -3.047244 S 0 0.000000 0.000000 0.000000 0.787402 0.000000 - S 0 0 0.787402 0.000000 13.385827 0.000000 + S 16777215 0 0.787402 0.000000 13.385827 0.000000 S 0 0.000000 0.000000 3.047244 0.787402 3.047244 - S 0 0 0.787402 3.047244 13.385827 3.047244 + S 16777215 0 0.787402 3.047244 13.385827 3.047244 S 0 0.000000 0.000000 6.078740 0.787402 6.078740 - S 0 0 0.787402 6.078740 13.385827 6.078740 + S 16777215 0 0.787402 6.078740 13.385827 6.078740 S 0 0.000000 14.173228 -3.551181 13.385827 -3.551181 - S 0 0 13.385827 -3.551181 0.787402 -3.551181 + S 16777215 0 13.385827 -3.551181 0.787402 -3.551181 S 0 0.000000 14.173228 -0.503937 13.385827 -0.503937 - S 0 0 13.385827 -0.503937 0.787402 -0.503937 + S 16777215 0 13.385827 -0.503937 0.787402 -0.503937 S 0 0.000000 14.173228 2.543307 13.385827 2.543307 - S 0 0 13.385827 2.543307 0.787402 2.543307 + S 16777215 0 13.385827 2.543307 0.787402 2.543307 S 0 0.000000 14.173228 5.590551 13.385827 5.590551 - S 0 0 13.385827 5.590551 0.787402 5.590551 + S 16777215 0 13.385827 5.590551 0.787402 5.590551 L3 0 0.052632 0.000000 -8.279528 0 14.173228 -8.279528 0 L3 0 0.052632 14.173228 -8.279528 0 14.173228 8.255906 0 L3 0 0.052632 14.173228 8.255906 0 0.000000 8.255906 0 diff --git a/app/lib/params/mrklnz.xtp b/app/lib/params/mrklnz.xtp index 6e0205c..1a92cd5 100644 --- a/app/lib/params/mrklnz.xtp +++ b/app/lib/params/mrklnz.xtp @@ -371,19 +371,19 @@ TURNOUT Z "Märklin Transfer Table 8994" E 8.681333 6.317333 90.000000 E 8.681333 7.696333 90.000000 S 0 0.000000 0.013333 1.392333 0.801333 1.392333 - S 0 0.00000 0.801333 1.392333 7.893333 1.392333 + S 16777215 0.00000 0.801333 1.392333 7.893333 1.392333 S 0 0.000000 7.893333 1.392333 8.681333 1.392333 S 0 0.000000 0.013333 3.362333 0.801333 3.362333 - S 0 0.00000 0.801333 3.362333 7.893333 3.362333 + S 16777215 0.00000 0.801333 3.362333 7.893333 3.362333 S 0 0.000000 7.893333 3.362333 8.681333 3.362333 S 0 0.000000 0.013333 4.347333 0.801333 4.347333 - S 0 0.00000 0.801333 4.347333 7.893333 4.347333 + S 16777215 0.00000 0.801333 4.347333 7.893333 4.347333 S 0 0.000000 7.893333 4.347333 8.681333 4.347333 S 0 0.000000 0.013333 6.317333 0.801333 6.317333 - S 0 0.00000 0.801333 6.317333 7.893333 6.317333 + S 16777215 0.00000 0.801333 6.317333 7.893333 6.317333 S 0 0.000000 7.893333 6.317333 8.681333 6.317333 S 0 0.000000 0.013333 7.696333 0.801333 7.696333 - S 0 0.00000 0.801333 7.696333 7.893333 7.696333 + S 16777215 0.00000 0.801333 7.696333 7.893333 7.696333 S 0 0.000000 7.893333 7.696333 8.681333 7.696333 L3 0 0.026667 0.013333 0.013333 0 8.681333 0.013333 0 L3 0 0.026667 8.681333 0.013333 0 8.681333 8.681333 0 @@ -448,40 +448,40 @@ TURNOUT Z "Märklin Turntable 8599" E 0.866127 -3.232429 165.000000 E -0.866127 3.232429 345.000000 S 0 0 0.000000 3.346457 0.000000 2.598425 - S 0 0 0.000000 2.598425 -0.000000 -2.598425 + S 16777215 0 0.000000 2.598425 -0.000000 -2.598425 S 0 0 -0.000000 -2.598425 -0.000000 -3.346457 S 0 0 0.866127 3.232429 0.672522 2.509886 - S 0 0 0.672522 2.509886 -0.672522 -2.509886 + S 16777215 0 0.672522 2.509886 -0.672522 -2.509886 S 0 0 -0.672522 -2.509886 -0.866127 -3.232429 S 0 0 1.673228 2.898117 1.299213 2.250302 - S 0 0 1.299213 2.250302 -1.299213 -2.250302 + S 16777215 0 1.299213 2.250302 -1.299213 -2.250302 S 0 0 -1.299213 -2.250302 -1.673228 -2.898117 S 0 0 2.366302 2.366302 1.837364 1.837364 - S 0 0 1.837364 1.837364 -1.837364 -1.837364 + S 16777215 0 1.837364 1.837364 -1.837364 -1.837364 S 0 0 -1.837364 -1.837364 -2.366302 -2.366302 S 0 0 2.898117 1.673228 2.250302 1.299213 - S 0 0 2.250302 1.299213 -2.250302 -1.299213 + S 16777215 0 2.250302 1.299213 -2.250302 -1.299213 S 0 0 -2.250302 -1.299213 -2.898117 -1.673228 S 0 0 3.232429 0.866127 2.509886 0.672522 - S 0 0 2.509886 0.672522 -2.509886 -0.672522 + S 16777215 0 2.509886 0.672522 -2.509886 -0.672522 S 0 0 -2.509886 -0.672522 -3.232429 -0.866127 S 0 0 3.346457 0.000000 2.598425 0.000000 - S 0 0 2.598425 0.000000 -2.598425 -0.000000 + S 16777215 0 2.598425 0.000000 -2.598425 -0.000000 S 0 0 -2.598425 -0.000000 -3.346457 -0.000000 S 0 0 3.232429 -0.866127 2.509886 -0.672522 - S 0 0 2.509886 -0.672522 -2.509886 0.672522 + S 16777215 0 2.509886 -0.672522 -2.509886 0.672522 S 0 0 -2.509886 0.672522 -3.232429 0.866127 S 0 0 2.898117 -1.673228 2.250302 -1.299213 - S 0 0 2.250302 -1.299213 -2.250302 1.299213 + S 16777215 0 2.250302 -1.299213 -2.250302 1.299213 S 0 0 -2.250302 1.299213 -2.898117 1.673228 S 0 0 2.366302 -2.366302 1.837364 -1.837364 - S 0 0 1.837364 -1.837364 -1.837364 1.837364 + S 16777215 0 1.837364 -1.837364 -1.837364 1.837364 S 0 0 -1.837364 1.837364 -2.366302 2.366302 S 0 0 1.673228 -2.898117 1.299213 -2.250302 - S 0 0 1.299213 -2.250302 -1.299213 2.250302 + S 16777215 0 1.299213 -2.250302 -1.299213 2.250302 S 0 0 -1.299213 2.250302 -1.673228 2.898117 S 0 0 0.866127 -3.232429 0.672522 -2.509886 - S 0 0 0.672522 -2.509886 -0.672522 2.509886 + S 16777215 0 0.672522 -2.509886 -0.672522 2.509886 S 0 0 -0.672522 2.509886 -0.866127 3.232429 A 16711680 0 3.346457 0.000000 0.000000 0.000000 360.000000 A 16711680 0 2.598425 0.000000 0.000000 0.000000 360.000000 diff --git a/app/lib/params/peco turntable wo routes.xtp b/app/lib/params/peco turntable wo routes.xtp index 72a9552..798150a 100644 --- a/app/lib/params/peco turntable wo routes.xtp +++ b/app/lib/params/peco turntable wo routes.xtp @@ -19,24 +19,24 @@ TURNOUT N "Peco Turn Table NB-55" P "17" 17 P "18" 18 E 0.000000 0.000000 0.000000 - S 0 0.000000 0.000000 3.000000 0.000000 -3.000000 - S 0 0.000000 0.520945 2.954423 -0.520945 -2.954423 - S 0 0.000000 1.026060 2.819078 -1.026060 -2.819078 - S 0 0.000000 1.500000 2.598076 -1.500000 -2.598076 - S 0 0.000000 1.928363 2.298133 -1.928363 -2.298133 - S 0 0.000000 2.298133 1.928363 -2.298133 -1.928363 - S 0 0.000000 2.598076 1.500000 -2.598076 -1.500000 - S 0 0.000000 2.819078 1.026060 -2.819078 -1.026060 - S 0 0.000000 2.954423 0.520945 -2.954423 -0.520945 - S 0 0.000000 3.000000 0.000000 -3.000000 0.000000 - S 0 0.000000 2.954423 -0.520945 -2.954423 0.520945 - S 0 0.000000 2.819078 -1.026060 -2.819078 1.026060 - S 0 0.000000 2.598076 -1.500000 -2.598076 1.500000 - S 0 0.000000 2.298133 -1.928363 -2.298133 1.928363 - S 0 0.000000 1.928363 -2.298133 -1.928363 2.298133 - S 0 0.000000 1.500000 -2.598076 -1.500000 2.598076 - S 0 0.000000 1.026060 -2.819078 -1.026060 2.819078 - S 0 0.000000 0.520945 -2.954423 -0.520945 2.954423 + S 16777215 0.000000 0.000000 3.000000 0.000000 -3.000000 + S 16777215 0.000000 0.520945 2.954423 -0.520945 -2.954423 + S 16777215 0.000000 1.026060 2.819078 -1.026060 -2.819078 + S 16777215 0.000000 1.500000 2.598076 -1.500000 -2.598076 + S 16777215 0.000000 1.928363 2.298133 -1.928363 -2.298133 + S 16777215 0.000000 2.298133 1.928363 -2.298133 -1.928363 + S 16777215 0.000000 2.598076 1.500000 -2.598076 -1.500000 + S 16777215 0.000000 2.819078 1.026060 -2.819078 -1.026060 + S 16777215 0.000000 2.954423 0.520945 -2.954423 -0.520945 + S 16777215 0.000000 3.000000 0.000000 -3.000000 0.000000 + S 16777215 0.000000 2.954423 -0.520945 -2.954423 0.520945 + S 16777215 0.000000 2.819078 -1.026060 -2.819078 1.026060 + S 16777215 0.000000 2.598076 -1.500000 -2.598076 1.500000 + S 16777215 0.000000 2.298133 -1.928363 -2.298133 1.928363 + S 16777215 0.000000 1.928363 -2.298133 -1.928363 2.298133 + S 16777215 0.000000 1.500000 -2.598076 -1.500000 2.598076 + S 16777215 0.000000 1.026060 -2.819078 -1.026060 2.819078 + S 16777215 0.000000 0.520945 -2.954423 -0.520945 2.954423 A3 0 0.031250 3.000000 0.000000 0.000000 0 0.000000 360.000000 G3 0 0.000000 0.01 0.000000 0.000000 0 A 0 0.000000 3.218750 0.000000 0.000000 0.000000 360.000000 diff --git a/app/lib/params/tomix-n.xtp b/app/lib/params/tomix-n.xtp index bce69a7..7d609e9 100644 --- a/app/lib/params/tomix-n.xtp +++ b/app/lib/params/tomix-n.xtp @@ -1373,51 +1373,51 @@ TURNOUT N "Tomix Fine Track Turn Table 8.34 212mm 1631" E -1.080111 4.031029 345.000000 #0/360 S 0 0 0.000000 4.173228 0.000000 3.676228 - S 0 0 0.000000 3.676228 0.000000 -3.676228 + S 16777215 0 0.000000 3.676228 0.000000 -3.676228 S 0 0 0.000000 -3.676228 0.000000 -4.173228 #15/195 S 0 0 1.080111 4.031029 0.950701 3.548066 - S 0 0 0.950701 3.548066 -0.950701 -3.548066 + S 16777215 0 0.950701 3.548066 -0.950701 -3.548066 S 0 0 -0.950701 -3.548066 -1.080111 -4.031029 #30/210 S 0 0 2.086614 3.614121 1.836614 3.181109 - S 0 0 1.836614 3.181109 -1.836614 -3.181109 + S 16777215 0 1.836614 3.181109 -1.836614 -3.181109 S 0 0 -1.836614 -3.181109 -2.086614 -3.614121 #45/225 S 0 0 2.950918 2.950918 2.597364 2.597364 - S 0 0 2.597364 2.597364 -2.597364 -2.597364 + S 16777215 0 2.597364 2.597364 -2.597364 -2.597364 S 0 0 -2.597364 -2.597364 -2.950918 -2.950918 #60/240 S 0 0 3.614121 2.086614 3.181109 1.836614 - S 0 0 3.181109 1.836614 -3.181109 -1.836614 + S 16777215 0 3.181109 1.836614 -3.181109 -1.836614 S 0 0 -3.181109 -1.836614 -3.614121 -2.086614 #75/255 S 0 0 4.031029 1.080111 3.548066 0.950701 - S 0 0 3.548066 0.950701 -3.548066 -0.950701 + S 16777215 0 3.548066 0.950701 -3.548066 -0.950701 S 0 0 -3.548066 -0.950701 -4.031029 -1.080111 #90/270 S 0 0 4.173228 0.000000 3.676228 0.000000 - S 0 0 3.676228 0.000000 -3.676228 0.000000 + S 16777215 0 3.676228 0.000000 -3.676228 0.000000 S 0 0 -3.676228 0.000000 -4.173228 0.000000 #105/285 S 0 0 4.031029 -1.080111 3.548066 -0.950701 - S 0 0 3.548066 -0.950701 -3.548066 0.950701 + S 16777215 0 3.548066 -0.950701 -3.548066 0.950701 S 0 0 -3.548066 0.950701 -4.031029 1.080111 #120/300 S 0 0 3.614121 -2.086614 3.181109 -1.836614 - S 0 0 3.181109 -1.836614 -3.181109 1.836614 + S 16777215 0 3.181109 -1.836614 -3.181109 1.836614 S 0 0 -3.181109 1.836614 -3.614121 2.086614 #135/315 S 0 0 2.950918 -2.950918 2.597364 -2.597364 - S 0 0 2.597364 -2.597364 -2.597364 2.597364 + S 16777215 0 2.597364 -2.597364 -2.597364 2.597364 S 0 0 -2.597364 2.597364 -2.950918 2.950918 #150/330 S 0 0 2.086614 -3.614121 1.836614 -3.181109 - S 0 0 1.836614 -3.181109 -1.836614 3.181109 + S 16777215 0 1.836614 -3.181109 -1.836614 3.181109 S 0 0 -1.836614 3.181109 -2.086614 3.614121 #165/345 S 0 0 1.080111 -4.031029 0.950701 -3.548066 - S 0 0 0.950701 -3.548066 -0.950701 3.548066 + S 16777215 0 0.950701 -3.548066 -0.950701 3.548066 S 0 0 -0.950701 3.548066 -1.080111 4.031029 A 11579568 0.053333 4.173228 0.000000 0.000000 0.000000 360.000000 |