From a14a7a0ccc9de76aeab0b2e4bbf58f1a79deedc2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Wed, 3 Jul 2024 10:19:30 +0200 Subject: New upstream version 5.3.0GA --- app/lib/CHANGELOG.md | 169 + app/lib/CMakeLists.txt | 34 +- app/lib/COPYING | 39 +- app/lib/Readme.md | 47 +- app/lib/demos/CMakeLists.txt | 5 - app/lib/demos/dmadjend.xtr | 20 +- app/lib/demos/dmcancel.xtr | 10 +- app/lib/demos/dmconn1.xtr | 12 +- app/lib/demos/dmconn2.xtr | 24 +- app/lib/demos/dmctlpnl.xtr | 45 +- app/lib/demos/dmdelund.xtr | 2 +- app/lib/demos/dmexcept.xtr | 4 +- app/lib/demos/dmgroup.xtr | 6 +- app/lib/demos/dmhelix.xtr | 8 +- app/lib/demos/dmlines.xtr | 2 +- app/lib/demos/dmlines2.xtr | 4 +- app/lib/demos/dmnotes.xtr | 53 +- app/lib/demos/dmrescal.xtr | 8 +- app/lib/demos/dmrotate.xtr | 6 +- app/lib/demos/dmselect.xtr | 34 +- app/lib/demos/dmtosel.xtr | 66 +- app/lib/demos/dmtoyard.xtr | 53 +- app/lib/examples/CMakeLists.txt | 6 - app/lib/examples/G Scale Folded Dogbone.xtc | 15282 +++++++++++++ app/lib/examples/Mianne Benchwork.xtc | 818 + .../Ondaville Franklin and Carolina RR.xtc | 22474 +++++++++++++++++++ app/lib/examples/PrinterMarginTest-A4.xtc | 207 + app/lib/examples/PrinterMarginTest-Letter.xtc | 167 + app/lib/params/1-mrkln.xtp | 281 + app/lib/params/Any-DCC-Concepts Point Motors.xtp | 115 + app/lib/params/Any-ModelRailroadBenchwork.xtp | 975 + app/lib/params/Any-Sievers-Benchwork.xtp | 539 + app/lib/params/CMakeLists.txt | 116 +- app/lib/params/G-Bachmann.xtp | 113 + app/lib/params/G-Lionel Ready-To-Play Track.xtp | 37 + app/lib/params/G-Piko.xtp | 517 +- app/lib/params/G-Playmobil RC Track.xtp | 2 +- app/lib/params/G-USA.xtp | 74 +- .../HO - Atlas Custom Line Track Assemblies.xtp | 80 + app/lib/params/HO-Atlas Code 100 Track.xtp | 679 + app/lib/params/HO-AtlasTrainKidsTrk.xtp | 99 + app/lib/params/HO-Bachmann EZ.xtp | 1410 +- app/lib/params/HO-Busch.xtp | 10 + app/lib/params/HO-ITLA Modular Building System.xtp | 75 + app/lib/params/HO-Jouef(Hornby)HO.xtp | 242 + app/lib/params/HO-Kato.xtp | 1289 +- app/lib/params/HO-Lionel MagLock FasTrack.xtp | 95 + app/lib/params/HO-Mehano.xtp | 270 +- app/lib/params/HO-Peco-Code100Setrack.xtp | 111 +- app/lib/params/HO-Peco-Code100Streamline.xtp | 163 +- app/lib/params/HO-Peco-Code70USA.xtp | 54 + app/lib/params/HO-Peco70USA.xtp | 32 - app/lib/params/HO-Roco HO Code 83.xtp | 946 +- app/lib/params/HO-WalthCornerstone 1.xtp | 4385 ---- app/lib/params/HO-Walthers Cornerstone 1.xtp | 4455 ++++ app/lib/params/HO-Walthers DCC Code 100.xtp | 297 +- app/lib/params/HO-Walthers DCC Code 70.xtp | 68 + app/lib/params/HO-Walthers DCC Code 83.xtp | 498 +- app/lib/params/HO-Walthers-Power-Loc.xtp | 145 + app/lib/params/HO-Weinert-Code75.xtp | 410 +- app/lib/params/HO-atl100ho.xtp | 676 - app/lib/params/HO-fl-model.xtp | 847 + app/lib/params/HO-fl-profi.xtp | 558 + app/lib/params/HOn30_Minitrains.xtp | 200 +- app/lib/params/JouefHO.xtp | 215 - app/lib/params/Mianne-Bench.xtp | 134 + app/lib/params/N-Atlas Code 80 Track.xtp | 1743 +- app/lib/params/N-Bachmann EZ.xtp | 1266 +- ...eservation Models Modular Custom Structures.xtp | 372 + app/lib/params/N-ITLA Modular Building System.xtp | 62 + app/lib/params/N-Kato Track and Structures.xtp | 3518 +-- app/lib/params/N-Kato-Unitram.xtp | 32 +- .../N-MiniTrix Code 60 Concrete Tie Track.xtp | 256 + app/lib/params/N-MiniTrix Track (De).xtp | 644 +- app/lib/params/N-ModellbahnUnion.xtp | 117 + app/lib/params/N-PecoCode55Finescale.xtp | 354 +- app/lib/params/N-StreetTemplate2LaneCurves.xtp | 1256 ++ .../params/N-StreetTemplate2LaneIntersections.xtp | 693 + app/lib/params/N-StreetTemplate2LaneStraight.xtp | 152 + app/lib/params/N-Tomix Track.xtp | 3539 +-- app/lib/params/N-walth-n.xtp | 3049 --- app/lib/params/N-walthers-n.xtp | 3977 ++++ app/lib/params/NTrak.xtp | 1510 ++ app/lib/params/Newqida.xtp | 4 +- app/lib/params/O-LionelFasTrack.xtp | 573 + app/lib/params/O-Peco-Bullhead.xtp | 117 + app/lib/params/O-Peco-Code 124 Setrack.xtp | 49 + app/lib/params/O-Peco-Code 143 FlatBottom.xtp | 39 + app/lib/params/O-Ross.xtp | 3526 +-- .../OO-DCC Concepts Legacy Realistic Track.xtp | 236 + app/lib/params/OO-HornbyOO.xtp | 526 + app/lib/params/OO-HornbyPlayTrainsTrk.xtp | 95 + app/lib/params/OO-Peco-Code75Bullhead.xtp | 90 + app/lib/params/S_ACG_All Aboard Panels.xtp | 199 + app/lib/params/S_ACG_American Flyer Track.xtp | 150 + app/lib/params/S_ACG_Pike-Master Track.xtp | 88 + app/lib/params/Sn3-Fast Tracks.xtp | 260 + app/lib/params/TT-Berliner.xtp | 456 +- app/lib/params/TT-Hornby.xtp | 256 + app/lib/params/TT-ModellbahnUnion.xtp | 55 + app/lib/params/TT-Peco.xtp | 84 + app/lib/params/TT-Roco.xtp | 215 + app/lib/params/TT-Zeuke.xtp | 288 +- app/lib/params/Z-Micro-Trains.xtp | 266 + app/lib/params/Z-Rokuhan.xtp | 2361 +- app/lib/params/atlaso2rail.xtp | 313 - app/lib/params/fl-model.xtp | 500 - app/lib/params/fl-profi.xtp | 603 - app/lib/params/mkcarpart.c | 12 +- app/lib/params/mkstruct.c | 4 +- app/lib/params/mrkln1.xtp | 82 - app/lib/params/mtl-z.xtp | 253 - app/lib/params/peco-O-Bullhead.xtp | 82 - app/lib/params/proto-ng-3-foot.xtp | 2 +- app/lib/params/protoam.xtp | 3 +- app/lib/params/protosteam.xtp | 8 +- app/lib/xtrkcad-beta.desktop | 9 + app/lib/xtrkcad-setup | 16 +- app/lib/xtrkcad.upd | 27 +- app/lib/xtrkcad.xtq | 4 +- 120 files changed, 73155 insertions(+), 22053 deletions(-) delete mode 100644 app/lib/demos/CMakeLists.txt delete mode 100644 app/lib/examples/CMakeLists.txt create mode 100644 app/lib/examples/G Scale Folded Dogbone.xtc create mode 100644 app/lib/examples/Mianne Benchwork.xtc create mode 100644 app/lib/examples/Ondaville Franklin and Carolina RR.xtc create mode 100644 app/lib/examples/PrinterMarginTest-A4.xtc create mode 100644 app/lib/examples/PrinterMarginTest-Letter.xtc create mode 100644 app/lib/params/1-mrkln.xtp create mode 100644 app/lib/params/Any-DCC-Concepts Point Motors.xtp create mode 100644 app/lib/params/Any-ModelRailroadBenchwork.xtp create mode 100644 app/lib/params/Any-Sievers-Benchwork.xtp create mode 100644 app/lib/params/G-Bachmann.xtp create mode 100644 app/lib/params/G-Lionel Ready-To-Play Track.xtp create mode 100644 app/lib/params/HO - Atlas Custom Line Track Assemblies.xtp create mode 100644 app/lib/params/HO-Atlas Code 100 Track.xtp create mode 100644 app/lib/params/HO-AtlasTrainKidsTrk.xtp create mode 100644 app/lib/params/HO-Busch.xtp create mode 100644 app/lib/params/HO-ITLA Modular Building System.xtp create mode 100644 app/lib/params/HO-Jouef(Hornby)HO.xtp create mode 100644 app/lib/params/HO-Lionel MagLock FasTrack.xtp create mode 100644 app/lib/params/HO-Peco-Code70USA.xtp delete mode 100644 app/lib/params/HO-Peco70USA.xtp delete mode 100644 app/lib/params/HO-WalthCornerstone 1.xtp create mode 100644 app/lib/params/HO-Walthers Cornerstone 1.xtp create mode 100644 app/lib/params/HO-Walthers DCC Code 70.xtp create mode 100644 app/lib/params/HO-Walthers-Power-Loc.xtp delete mode 100644 app/lib/params/HO-atl100ho.xtp create mode 100644 app/lib/params/HO-fl-model.xtp create mode 100644 app/lib/params/HO-fl-profi.xtp delete mode 100644 app/lib/params/JouefHO.xtp create mode 100644 app/lib/params/Mianne-Bench.xtp create mode 100644 app/lib/params/N-Design Preservation Models Modular Custom Structures.xtp create mode 100644 app/lib/params/N-ITLA Modular Building System.xtp create mode 100644 app/lib/params/N-MiniTrix Code 60 Concrete Tie Track.xtp create mode 100644 app/lib/params/N-ModellbahnUnion.xtp create mode 100644 app/lib/params/N-StreetTemplate2LaneCurves.xtp create mode 100644 app/lib/params/N-StreetTemplate2LaneIntersections.xtp create mode 100644 app/lib/params/N-StreetTemplate2LaneStraight.xtp delete mode 100644 app/lib/params/N-walth-n.xtp create mode 100644 app/lib/params/N-walthers-n.xtp create mode 100644 app/lib/params/NTrak.xtp create mode 100644 app/lib/params/O-LionelFasTrack.xtp create mode 100644 app/lib/params/O-Peco-Bullhead.xtp create mode 100644 app/lib/params/O-Peco-Code 124 Setrack.xtp create mode 100644 app/lib/params/O-Peco-Code 143 FlatBottom.xtp create mode 100644 app/lib/params/OO-DCC Concepts Legacy Realistic Track.xtp create mode 100644 app/lib/params/OO-HornbyOO.xtp create mode 100644 app/lib/params/OO-HornbyPlayTrainsTrk.xtp create mode 100644 app/lib/params/OO-Peco-Code75Bullhead.xtp create mode 100644 app/lib/params/S_ACG_All Aboard Panels.xtp create mode 100644 app/lib/params/S_ACG_American Flyer Track.xtp create mode 100644 app/lib/params/S_ACG_Pike-Master Track.xtp create mode 100644 app/lib/params/Sn3-Fast Tracks.xtp create mode 100644 app/lib/params/TT-Hornby.xtp create mode 100644 app/lib/params/TT-ModellbahnUnion.xtp create mode 100644 app/lib/params/TT-Peco.xtp create mode 100644 app/lib/params/TT-Roco.xtp create mode 100644 app/lib/params/Z-Micro-Trains.xtp delete mode 100644 app/lib/params/atlaso2rail.xtp delete mode 100644 app/lib/params/fl-model.xtp delete mode 100644 app/lib/params/fl-profi.xtp delete mode 100644 app/lib/params/mrkln1.xtp delete mode 100644 app/lib/params/mtl-z.xtp delete mode 100644 app/lib/params/peco-O-Bullhead.xtp create mode 100644 app/lib/xtrkcad-beta.desktop (limited to 'app/lib') diff --git a/app/lib/CHANGELOG.md b/app/lib/CHANGELOG.md index 7c46388..3644e99 100644 --- a/app/lib/CHANGELOG.md +++ b/app/lib/CHANGELOG.md @@ -4,6 +4,175 @@ 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/). +## [5.3.0 GA] + +## Bugs ++ BUG 543: Removal of user info from xtrkcad files ++ Bug fix #551 Spliting a bezier line aborts ++ BUG 552 Xtrk/cAD crashes when downsizing layout dimensions#552 Xtrk/cAD crashes when downsizing layout dimensions + +## [5.3.0 Beta 2] + +## Bugs ++ BUG 544 In 'Run Trains' mode, stock summary no longer displayed in Status Bar when left-click on object ++ BUG fix 547 Fleischmann HO turntable error ++ BUG 541 New Car Protoype dialog box has stopped working. ++ Add german translations ++ UTF-8 fixes for main note ++ Initial window size on multi monitor setups spans all monitors, … ++ BUG 535 simple line not visible ++ Improve tooltips for custom management + +## Parameters ++ Any-DCC-Concepts Point Motors.xtp' ++ Any-ModelRailroadBenchwork.xtp ++ 'HO-Atlas Code 100 Track.xtp' ++ 'HO - Atlas Custom Line Track Assemblies.xtp' ++ HO-Busch.xtp ++ HO-fl-model.xtp ++ HO-fl-profi.xtp ++ HO-Peco-Code70USA.xtp ++ 'HO-Walthers Cornerstone 1.xtp' ++ 'HO-Walthers DCC Code 83.xtp' ++ N-walthers-n.xtp ++ params.xtc ++ ProcessXTP.log ++ 'S_ACG_All Aboard Panels.xtp' ++ 'S_ACG_American Flyer Track.xtp' ++ 'S_ACG_Pike-Master Track.xtp' + +## [5.3.0 Beta 1] + +## Bugs + ++ Fixed Layout Background handling in Dialog (if Cancelled) ++ Fixed Fault if Run Trains with no Cars and no Prototype loaded ++ Made sure UTF-8 handled correctly in Windows Macros (demos) ++ Add > Structure dialog caused weird artifact when closed ++ Cornu Turnout Designer misplaces points or fails ++ Add check for max connect angle to Bezier Segment ++ Remember largest font size used so we don't nag the user ++ BUG FIX: saving to xtce without background ++ Add context help text to note ui ++ all wNotice() if pref file can't be opened ++ Re-enable HotBar jumps on numeric keys to match docs ++ FIX #527 No change detection or undo when text changed in Change Object Properties ++ BUG #526 Labels indicating grades and elevations display inconsistently. ++ Cancel Save to file if any step fails so only valid files are created ++ do not store info about user's directory structure in archive file ++ BUG FIX: If deleting all files from Parameter Files dialog list when 'Add Fixed-Track' dialog had been invoked: causes *curTurnout to be overwritten.BUG #525 Save As for xtce fails ++ BUG 515: Error when trying to save as *.xtce file Due to trying to do rename() across devices` ++ BUG 522 Truck Offset is invalid for New Cars ++ BUG #521 Change "Cannot split Turnout track" message to explain Split ++ Removed range checks for comment icons on trackplan … ++ In Train mode, Describe Car, not track it is on. ++ Correctly Suppress ruler numbers for RHS and top of window and all sides of layout in English measurements ++ Fix "Fill/Unfill" in Dsscribe alters a Rectangle into a Polygon. ++ Fix #518.Map Mac KeyPad Enter (and Fn+Return on non-keypad keyboards) to Return. ++ ix #520 - Fix error message when selecting end point in Join for Cornu ++ Changing Units doesn't repopulate the Length Format list ++ BUg 516 Fix Color Draw reverts back to By Object after any change in Display Options ++ Fix #514 Train Mode issues ++ Fix #511 Lost properties window ++ Fix MapW resizing ++ FIX: Trains on the layout jump when layout is loaded ++ Simplify middle button pan (MBP) code ++ #509 Bug: Lower Limit on room size ++ BUG 504, 505 - Scale Unknown ++ Layer Links are accesses by 0-based indices ++ Fix bit-rot in demos. Update some MESSAGEs. Add info about old/new Select behavior. ++ Do not change filled rectangle to filled polygon when reading from file ++ CURRENT LAYER in .xtc files was 1-based, should be 0-based ++ Enable local language in demos ++ Auto connect EPs after move/rotate ++ BUG #501 - Unable to delete car from inventory ++ Restore Ctl-Alt-N for text note ++ Fix BUG #496 Sticky options not saved ++ Fix BUG #343 Error when grouping objects ++ Fix BUG #454 XTrack cursor and System cursor conflict ++ Temp drawing of Curve from Chord when tied to an existing EP is somethings flipped ++ FIX #493 Extending a sectional track with a curved endpt doesn't allow straight ++ Fix #494 Reducing Main window size is jerky ++ FIX #492 Turntable path not Shown in Train Run Mode ++ Fix #479 Problem with N gauge Tomix 1248 and 1249 turnouts. ++ Linux: beta release improvements ++ Improve 'segment not on path' handling ++ BUG #449 Note behavior when canceled ++ FIX #464 Can't group multiline text objects ++ Deleting a CAR in design mode causes GetTrackExtraData() complaints about deleted track ++ BUG 457 Missing main window icon ++ BUG #477 Disregarding print margins ++ Bug Fix #477 Disregarding print margins ++ Fix #480 bad performance with a 'fine' grid ++ Fix Bug #467 Regression failuresm with high DPI ++ Track down source of 'intersectBox bogus' message ++ Fix #463 Layout scale not set correctly when gauge is the same ++ BUG 485-TrackScaleGauge ++ Fix Bug #451 Two-rail scale ++ Partial Fix #343 Error when grouping objects ++ Fix car csv import/export doc for Options and Color ++ Fix #478 Modifying straight line objects ++ Fix BUG 484 train control: map moving bug ++ Dialog sizing: non-resizable dlg are not resizble, enforce minimum size on resizabl dlg ++ Fix HotBar highlighting in Playback mode + +## Added + ++ Layout has additional settings for Tie data: Length, Width, Spacing ++ Layers have additional settings that can override the layout configuration: + Scale, Min Track Radius, Max Track Grade, Tie data: Length, Width, Spacing ++ Enhanced DXF export to include color and DOT line style ++ Bitmap export to JPEG and PNG formats ++ Include background bitmap in bitmap export ++ Improved and Updated Help file ++ Structures snap to grid (if enabled) and respect grid angle ++ Refactored Windows arc drawing ++ Draw centers enabled for sectional curved tracks ++ Roadbed option to track ++ Color selection for Bridge fill and Roadbed ++ Graphics improvements and additions + +## Parameters + ++ Mianne Benchwork components ++ Walthers HO DCC Code 83 Turnouts ++ Walthers HO DCC Code 100 Turnouts ++ HO Piko A Roadbed Track Components ++ HO Piko A Track update ++ Sn3 Fast Tracks Turnouts ++ HO Lionel MagLock FasTrack ++ O LionelFasTrack update ++ HOn30_Minitrains update ++ G Lionel Ready-To-Play Track ++ S Jakks PowerTrains Track (2012) ++ Jouef Points & Track Sections ++ Walthers HO DCC Code 70 Turnouts ++ Design Preservation Models Modular Custom Structures ++ Minitrix N-Scale Code 60 Concrete Tie Track ++ Modellbahn Union N Scale Track ++ Hornby OO Scale Points & Track Sections ++ Hornby PlayTrains Track Components ++ Peco O Scale Bullhead Turnouts ++ Peco O Scale Code 124 Setrack ++ Peco O Scale Code 143 Flatbottom Track ++ Modellbahn Union TT Scale Track ++ Roco TT Track System ++ Micro Trains Z Scale Micro-Track Components + +## Examples + ++ Ondaville Franklin and Carolina RR ++ A Scale Folded Dogbone ++ Mianne Benchwork + + +## [5.2.2 GA] + +## Bugs + ++ Windows circle drawing fix + + ## [5.2.2 Beta 3] ## Bugs diff --git a/app/lib/CMakeLists.txt b/app/lib/CMakeLists.txt index 54c4606..c25c149 100644 --- a/app/lib/CMakeLists.txt +++ b/app/lib/CMakeLists.txt @@ -6,8 +6,6 @@ # project(lib) -add_subdirectory(demos) -add_subdirectory(examples) add_subdirectory(params) install(FILES @@ -17,7 +15,28 @@ install(FILES xtrkcad.upd DESTINATION ${XTRKCAD_SHARE_INSTALL_DIR} ) - + +# install parameter files +install(DIRECTORY params + DESTINATION ${XTRKCAD_SHARE_INSTALL_DIR} + FILES_MATCHING + PATTERN "*.xtp") + +# install demos +install(DIRECTORY demos + DESTINATION ${XTRKCAD_SHARE_INSTALL_DIR} + FILES_MATCHING + PATTERN "*.xtr") + +# install example layouts +install(DIRECTORY examples + DESTINATION ${XTRKCAD_SHARE_INSTALL_DIR} + FILES_MATCHING + PATTERN "*.xtc") + +# install release documentation Readme and CHANGELOG +# depends on pandoc +# set( infile "${CMAKE_CURRENT_SOURCE_DIR}/Readme.md" ) set( outfile "${CMAKE_CURRENT_BINARY_DIR}/Readme.txt" ) set( changelogin "${CMAKE_CURRENT_SOURCE_DIR}/CHANGELOG.md" ) @@ -38,7 +57,7 @@ if(PANDOC_FOUND) DESTINATION ${XTRKCAD_SHARE_INSTALL_DIR} ) else() - message(STATUS "Pandoc is not available on this system, Readme.txt is not generated!") + message(STATUS "Pandoc is not available on this system, Readme.txt and CHANGELOG.txt are not generated!") endif() if(UNIX AND NOT APPLE) @@ -47,7 +66,12 @@ if(UNIX AND NOT APPLE) DESTINATION ${XTRKCAD_SHARE_INSTALL_DIR} ) install(FILES - xtrkcad.desktop xtrkcad.xml + xtrkcad${XTRKCAD_BETA}.desktop + DESTINATION "${XTRKCAD_SHARE_INSTALL_DIR}/applications" + RENAME xtrkcad.desktop + ) + install(FILES + xtrkcad.xml DESTINATION "${XTRKCAD_SHARE_INSTALL_DIR}/applications" ) install(FILES diff --git a/app/lib/COPYING b/app/lib/COPYING index 5b6e7c6..d159169 100644 --- a/app/lib/COPYING +++ b/app/lib/COPYING @@ -1,12 +1,12 @@ - GNU GENERAL PUBLIC LICENSE - Version 2, June 1991 + GNU GENERAL PUBLIC LICENSE + Version 2, June 1991 - Copyright (C) 1989, 1991 Free Software Foundation, Inc. - 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + Copyright (C) 1989, 1991 Free Software Foundation, Inc., + 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA Everyone is permitted to copy and distribute verbatim copies of this license document, but changing it is not allowed. - Preamble + Preamble The licenses for most software are designed to take away your freedom to share and change it. By contrast, the GNU General Public @@ -15,7 +15,7 @@ software--to make sure the software is free for all its users. This General Public License applies to most of the Free Software Foundation's software and to any other program whose authors commit to using it. (Some other Free Software Foundation software is covered by -the GNU Library General Public License instead.) You can apply it to +the GNU Lesser General Public License instead.) You can apply it to your programs, too. When we speak of free software, we are referring to freedom, not @@ -55,8 +55,8 @@ patent must be licensed for everyone's free use or not licensed at all. The precise terms and conditions for copying, distribution and modification follow. - - GNU GENERAL PUBLIC LICENSE + + GNU GENERAL PUBLIC LICENSE TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION 0. This License applies to any program or other work which contains @@ -110,7 +110,7 @@ above, provided that you also meet all of these conditions: License. (Exception: if the Program itself is interactive but does not normally print such an announcement, your work based on the Program is not required to print an announcement.) - + These requirements apply to the modified work as a whole. If identifiable sections of that work are not derived from the Program, and can be reasonably considered independent and separate works in @@ -168,7 +168,7 @@ access to copy from a designated place, then offering equivalent access to copy the source code from the same place counts as distribution of the source code, even though third parties are not compelled to copy the source along with the object code. - + 4. You may not copy, modify, sublicense, or distribute the Program except as expressly provided under this License. Any attempt otherwise to copy, modify, sublicense or distribute the Program is @@ -225,7 +225,7 @@ impose that choice. This section is intended to make thoroughly clear what is believed to be a consequence of the rest of this License. - + 8. If the distribution and/or use of the Program is restricted in certain countries either by patents or by copyrighted interfaces, the original copyright holder who places the Program under this License @@ -255,7 +255,7 @@ make exceptions for this. Our decision will be guided by the two goals of preserving the free status of all derivatives of our free software and of promoting the sharing and reuse of software generally. - NO WARRANTY + NO WARRANTY 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN @@ -277,9 +277,9 @@ YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. - END OF TERMS AND CONDITIONS - - How to Apply These Terms to Your New Programs + END OF TERMS AND CONDITIONS + + How to Apply These Terms to Your New Programs If you develop a new program, and you want it to be of the greatest possible use to the public, the best way to achieve this is to make it @@ -303,10 +303,9 @@ the "copyright" line and a pointer to where the full notice is found. MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - + You should have received a copy of the GNU General Public License along + with this program; if not, write to the Free Software Foundation, Inc., + 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. Also add information on how to contact you by electronic and paper mail. @@ -336,5 +335,5 @@ necessary. Here is a sample; alter the names: This General Public License does not permit incorporating your program into proprietary programs. If your program is a subroutine library, you may consider it more useful to permit linking proprietary applications with the -library. If this is what you want to do, use the GNU Library General +library. If this is what you want to do, use the GNU Lesser General Public License instead of this License. diff --git a/app/lib/Readme.md b/app/lib/Readme.md index ba3819e..b586bc9 100755 --- a/app/lib/Readme.md +++ b/app/lib/Readme.md @@ -1,8 +1,8 @@ -# V5.2.2 GA Release Notes +# XTrackCAD Version 5.3.0 GA Release Notes -Welcome to the XtrackCAD V5.2.2 GA release! +Welcome to the XtrackCAD V5.3.0 GA Release! -V5.2.2 GA contains many bug fixes, new and updated parameter files, new features and enhancements. +V5.3.0 GA contains many bug fixes, new and updated parameter files, new features and enhancements. Enjoy! @@ -18,21 +18,22 @@ To report bugs, please use the SourceForge bugs reporting page https://sourcefor To discuss the Release, please use the user forum https://xtrackcad.groups.io/g/main/topics -# XTrackCAD 5.2.2 GA Notes# +# V5.3.0 GA Notes This file contains installation instructions and up-to-date information regarding XTrackCad. ## Contents ## -* About XTrackCad -* License Information -* Installation -* Upgrading from earlier releases -* Bugs fixed -* Building -* Where to go for support +* [About XTrackCad](#About) +* [License Information](#License) +* [Installation](#Installation) +* [Upgrading from earlier releases](#Upgrading) +* [Building](#Building) +* [Where to go for support](#Support) -## About XTrackCad ## + + +## About XTrackCAD ## XTrackCad is a powerful CAD program for designing Model Railroad layouts. @@ -48,6 +49,9 @@ Availability: XTrkCad Fork is a project for further development of the original XTrkCad software. See the project homepage at for news and current releases. + + + ## License Information ## **Copying:** @@ -57,13 +61,20 @@ free software under the terms of the GNU General Public License v2 which you can find in the file COPYING. + + ## Installation ## -Please see http://xtrkcad-fork.sourceforge.net/Wikka/DownloadInstall. +Please see https://sourceforge.net/p/xtrkcad-fork/wiki/DownloadInstall/ + +**Note:** The Linux version has intrduced changes to make co-existance of Beta and GA releases easier. Please see https://sourceforge.net/p/xtrkcad-fork/wiki/LinuxInstall/ for details. + + + ## Upgrade Information ## -**Note:** The 5.2 version of XTrackCAD comes with the several new features +**Note:** The 5.2 version of XTrackCAD came with the several new features like background images or extensions to notes. In order to support this feature, an additional file format for layout files (.xtce) was added. The old .xtc format is still supported for reading and writing. So @@ -71,9 +82,15 @@ files from earlier versions of XTrackCAD can be read without problems. Layouts that were saved in the new format cannot be read by older versions of XTrackCAD. + + + ## Building ## -Please see http://xtrkcad-fork.sourceforge.net/Wikka/BuildNotes +Please see + + + ## Where to go for support ## diff --git a/app/lib/demos/CMakeLists.txt b/app/lib/demos/CMakeLists.txt deleted file mode 100644 index 712902c..0000000 --- a/app/lib/demos/CMakeLists.txt +++ /dev/null @@ -1,5 +0,0 @@ -FILE(GLOB DEMO_FILES *.xtr) -INSTALL( - FILES ${DEMO_FILES} - DESTINATION ${XTRKCAD_SHARE_INSTALL_DIR}/demos - ) diff --git a/app/lib/demos/dmadjend.xtr b/app/lib/demos/dmadjend.xtr index c74122a..8e3ea40 100644 --- a/app/lib/demos/dmadjend.xtr +++ b/app/lib/demos/dmadjend.xtr @@ -109,15 +109,26 @@ It's possible to almost create a complete circle. If you drag the mouse beyond the start of the curve the track becomes very short. END STEP -MOUSE 4 7.500 3.167 +#MOUSE 4 7.500 3.167 +MOUSE 3 7.500 3.167 MESSAGE _________________________________________ Here you are warned that the track will be too short. END -MOUSE 1 7.60 3.167 -BIGPAUSE +STEP +MOUSE 4 7.500 3.167 +MESSAGE +_________________________________________ + +Because the modified track is too short, the modification is abandoned the original track is restored. +END +STEP MOUSE 2 7.60 3.167 +MOUSE 3 7.60 3.167 +BIGPAUSE +#MOUSE 2 7.60 3.167 +MOUSE 3 7.60 3.167 STEP MOUSE 3 8.417 3.167 PAUSE 60 @@ -172,8 +183,7 @@ END STEP CLEAR MESSAGE -If you adjust the endpoint of a turnout or sectional track the track is extended by a similar track segment. The extension can be -a straight or a curve. +If you adjust the endpoint of a turnout or sectional track the track is extended by a similar track segment. The extension can be a straight or a curve. END STEP MOUSE 1 19.750 10.583 diff --git a/app/lib/demos/dmcancel.xtr b/app/lib/demos/dmcancel.xtr index e4afbf7..f6544dd 100644 --- a/app/lib/demos/dmcancel.xtr +++ b/app/lib/demos/dmcancel.xtr @@ -27,7 +27,7 @@ This is a note about something important but I can't remember what. END DRAW 5 0 0 0 0 4.125000 5.750000 0 0.000000 - Z 0 0.000000 0.000000 0.000000 0 140.000000 "This is some text" + Z 0 0.000000 0.000000 0.000000 0 140.000000 "Hello" END REDRAW RESET @@ -79,8 +79,8 @@ STEP PARAMETER describe S2 Medium Left PARAMETER describe S3 SL-E396F2 STEP -MOUSE 2 11.500 6.625 -MOUSE 4 11.500 6.625 +MOUSE 2 6.000 6.625 +MOUSE 4 6.000 6.625 MESSAGE _________________________________________ @@ -95,7 +95,7 @@ and its size. END STEP #DESCRIBE Font Size 19 -PARAMETER describe LE1 -1 19 +PARAMETER describe LE1 -1 60 STEP MESSAGE _________________________________________ @@ -140,7 +140,7 @@ but I can't remember what. END DRAW 5 0 0 0 0 4.125000 5.750000 0 0.000000 - Z 0 0.000000 0.000000 0.000000 0 19.000000 "This is some text" + Z 0 0.000000 0.000000 0.000000 0 60.000000 "Goodbye" END REGRESSION END CLEAR diff --git a/app/lib/demos/dmconn1.xtr b/app/lib/demos/dmconn1.xtr index 5d5ea12..d793aec 100644 --- a/app/lib/demos/dmconn1.xtr +++ b/app/lib/demos/dmconn1.xtr @@ -62,7 +62,7 @@ TURNOUT 6 0 0 0 0 HO 2 48.889351 1.684210 180.000000 "Kato Unitrack #4-R Turnou L 11579568 0.053333 0.000000 0.723334 7.283465 0.723334 A 11579568 0.053333 20.930666 0.000000 -21.654000 0.000000 19.000000 END -TURNOUT 7 0 0 0 0 HO 2 40.576601 3.256112 15.500000 "Kato Unitrack R550-3.5° (incl w/#4 TO) " +TURNOUT 7 0 0 0 0 HO 2 40.576601 3.256112 15.500000 "Kato Unitrack R550-3.°5° (incl w/#4 TO) " T 8 40.576601 3.256112 285.500000 T 6 41.839647 2.863926 109.000000 D 0.000000 0.000000 @@ -71,7 +71,7 @@ TURNOUT 7 0 0 0 0 HO 2 40.576601 3.256112 15.500000 "Kato Unitrack R550-3.5 A 11579568 0.053333 20.930666 0.000000 -21.654000 0.000000 3.500000 A 11579568 0.053333 22.377334 0.000000 -21.654000 0.000000 3.500000 END -TURNOUT 8 0 0 0 0 HO 2 34.789943 4.043642 0.000000 "Kato Unitrack R550-15.5° (incl w/#4 TO) " +TURNOUT 8 0 0 0 0 HO 2 34.789943 4.043642 0.000000 "Kato Unitrack R550-15.5° (incl w/#4 TO) " T 14 34.789943 4.043642 270.000000 T 7 40.576601 3.256112 105.500000 D 0.000000 0.000000 @@ -80,7 +80,7 @@ TURNOUT 8 0 0 0 0 HO 2 34.789943 4.043642 0.000000 "Kato Unitrack R550-15.5 A 11579568 0.053333 20.930666 0.000000 -21.654000 0.000000 15.500000 A 11579568 0.053333 22.377334 0.000000 -21.654000 0.000000 15.500000 END -TURNOUT 9 0 0 0 0 HO 2 15.302497 3.256113 344.500000 "Kato Unitrack R550-15.5° (incl w/#4 TO) " +TURNOUT 9 0 0 0 0 HO 2 15.302497 3.256113 344.500000 "Kato Unitrack R550-15.5° (incl w/#4 TO) " E 15.302497 3.256113 254.500000 T 15 21.089155 4.043642 90.000000 D 0.000000 0.000000 @@ -89,7 +89,7 @@ TURNOUT 9 0 0 0 0 HO 2 15.302497 3.256113 344.500000 "Kato Unitrack R550-15.5 A 11579568 0.053333 20.930666 0.000000 -21.654000 0.000000 15.500000 A 11579568 0.053333 22.377334 0.000000 -21.654000 0.000000 15.500000 END -TURNOUT 10 0 0 0 0 HO 2 13.891809 2.863926 341.000000 "Kato Unitrack R550-3.5° (incl w/#4 TO) " +TURNOUT 10 0 0 0 0 HO 2 13.891809 2.863926 341.000000 "Kato Unitrack R550-3.5° (incl w/#4 TO) " T 1 13.891809 2.863926 251.000000 E 15.154856 3.256113 74.500000 D 0.000000 0.000000 @@ -504,7 +504,7 @@ TURNOUT 13 0 0 0 0 HO 2 27.865728 1.684210 0 0.000000 "Kato Unitrack Straight 6 END TURNOUT 14 0 0 0 0 HO 2 34.789943 4.043642 0 180.000000 "Kato Unitrack Straight 6 7/8 2-130" T4 8 34.789943 4.043642 90.000000 0 0.0 0.0 0.0 0.0 0 0 0 0.000000 - T4 15 27.939549 4.043642 270.000000 0 0.0 0.0 0.0 0.0 0 0 0 0.000000 + E4 27.939549 4.043642 270.000000 0 0.0 0.0 0.0 0.0 0 0 0 0.000000 D 0.000000 0.000000 P "Normal" 1 S 0 0.000000 0.000000 0.000000 6.850394 0.000000 @@ -512,7 +512,7 @@ TURNOUT 14 0 0 0 0 HO 2 34.789943 4.043642 0 180.000000 "Kato Unitrack Straight L3 11579568 0.053333 0.000000 -0.723334 0 6.850394 -0.723334 0 END TURNOUT 15 0 0 0 0 HO 2 27.791908 4.043642 0 180.000000 "Kato Unitrack Straight 6 7/8 2-130" - T4 14 27.791908 4.043642 90.000000 0 0.0 0.0 0.0 0.0 0 0 0 0.000000 + E4 27.791908 4.043642 90.000000 0 0.0 0.0 0.0 0.0 0 0 0 0.000000 T4 9 20.941514 4.043642 270.000000 0 0.0 0.0 0.0 0.0 0 0 0 0.000000 D 0.000000 0.000000 P "Normal" 1 diff --git a/app/lib/demos/dmconn2.xtr b/app/lib/demos/dmconn2.xtr index 720c677..3cd9837 100644 --- a/app/lib/demos/dmconn2.xtr +++ b/app/lib/demos/dmconn2.xtr @@ -2,7 +2,7 @@ VERSION 7 DEMOINIT ORIG 8.000 5.000 0.000 PARAMETER display description-fontsize 24 -TURNOUT 1 0 0 0 0 N 2 17.157895 20.894737 0.000000 "Kato Unitrack Curve 9.75R 249mm 45° 20-100" +TURNOUT 1 0 0 0 0 N 2 17.157895 20.894737 0.000000 "Kato Unitrack Curve 9.75R 249mm 45° 20-100" T 2 17.157895 20.894737 270.000000 T 8 24.061930 18.034992 135.000000 D 0.000000 0.000000 @@ -11,7 +11,7 @@ TURNOUT 1 0 0 0 0 N 2 17.157895 20.894737 0.000000 "Kato Unitrack Curve 9.75R 2 A 11579568 0.053333 9.290666 0.000000 -9.764000 0.000000 45.000000 A 11579568 0.053333 10.237334 0.000000 -9.764000 0.000000 45.000000 END -TURNOUT 2 0 0 0 0 N 2 10.253860 18.034992 315.000000 "Kato Unitrack Curve 9.75R 249mm 45° 20-100" +TURNOUT 2 0 0 0 0 N 2 10.253860 18.034992 315.000000 "Kato Unitrack Curve 9.75R 249mm 45° 20-100" T 3 10.253860 18.034992 225.000000 T 1 17.157895 20.894737 90.000000 D 0.000000 0.000000 @@ -20,7 +20,7 @@ TURNOUT 2 0 0 0 0 N 2 10.253860 18.034992 315.000000 "Kato Unitrack Curve 9.75R A 11579568 0.053333 9.290666 0.000000 -9.764000 0.000000 45.000000 A 11579568 0.053333 10.237334 0.000000 -9.764000 0.000000 45.000000 END -TURNOUT 3 0 0 0 0 N 2 7.394115 11.130957 270.000000 "Kato Unitrack Curve 9.75R 249mm 45° 20-100" +TURNOUT 3 0 0 0 0 N 2 7.394115 11.130957 270.000000 "Kato Unitrack Curve 9.75R 249mm 45° 20-100" T 4 7.394115 11.130957 180.000000 T 2 10.253860 18.034992 45.000000 D 0.000000 0.000000 @@ -29,7 +29,7 @@ TURNOUT 3 0 0 0 0 N 2 7.394115 11.130957 270.000000 "Kato Unitrack Curve 9.75R A 11579568 0.053333 9.290666 0.000000 -9.764000 0.000000 45.000000 A 11579568 0.053333 10.237334 0.000000 -9.764000 0.000000 45.000000 END -TURNOUT 4 0 0 0 0 N 2 10.253860 4.226922 225.000000 "Kato Unitrack Curve 9.75R 249mm 45° 20-100" +TURNOUT 4 0 0 0 0 N 2 10.253860 4.226922 225.000000 "Kato Unitrack Curve 9.75R 249mm 45° 20-100" T 5 10.253860 4.226922 135.000000 T 3 7.394115 11.130957 0.000000 D 0.000000 0.000000 @@ -38,7 +38,7 @@ TURNOUT 4 0 0 0 0 N 2 10.253860 4.226922 225.000000 "Kato Unitrack Curve 9.75R A 11579568 0.053333 9.290666 0.000000 -9.764000 0.000000 45.000000 A 11579568 0.053333 10.237334 0.000000 -9.764000 0.000000 45.000000 END -TURNOUT 5 0 0 0 0 N 2 17.157895 1.367177 180.000000 "Kato Unitrack Curve 9.75R 249mm 45° 20-100" +TURNOUT 5 0 0 0 0 N 2 17.157895 1.367177 180.000000 "Kato Unitrack Curve 9.75R 249mm 45° 20-100" T 6 17.157895 1.367177 90.000000 T 4 10.253860 4.226922 315.000000 D 0.000000 0.000000 @@ -47,7 +47,7 @@ TURNOUT 5 0 0 0 0 N 2 17.157895 1.367177 180.000000 "Kato Unitrack Curve 9.75R A 11579568 0.053333 9.290666 0.000000 -9.764000 0.000000 45.000000 A 11579568 0.053333 10.237334 0.000000 -9.764000 0.000000 45.000000 END -TURNOUT 6 0 0 0 0 N 2 24.061930 4.226922 135.000000 "Kato Unitrack Curve 9.75R 249mm 45° 20-100" +TURNOUT 6 0 0 0 0 N 2 24.061930 4.226922 135.000000 "Kato Unitrack Curve 9.75R 249mm 45° 20-100" T 7 24.061930 4.226922 45.000000 T 5 17.157895 1.367177 270.000000 D 0.000000 0.000000 @@ -131,7 +131,7 @@ TURNOUT 14 0 0 0 0 N 2 37.310072 3.423450 60.000000 "Kato Unitrack S60L {incl w L 11579568 0.053333 0.000000 0.473340 2.362204 0.473340 L 11579568 0.053333 0.000000 -0.473340 2.362204 -0.473340 END -TURNOUT 15 0 0 0 0 N 2 44.895807 1.245404 180.000000 "Kato Unitrack Curve 9.75R 249mm 45° 20-100" +TURNOUT 15 0 0 0 0 N 2 44.895807 1.245404 180.000000 "Kato Unitrack Curve 9.75R 249mm 45° 20-100" T 16 44.895807 1.245404 90.000000 T 13 37.991772 4.105149 315.000000 D 0.000000 0.000000 @@ -140,7 +140,7 @@ TURNOUT 15 0 0 0 0 N 2 44.895807 1.245404 180.000000 "Kato Unitrack Curve 9.75R A 11579568 0.053333 9.290666 0.000000 -9.764000 0.000000 45.000000 A 11579568 0.053333 10.237334 0.000000 -9.764000 0.000000 45.000000 END -TURNOUT 16 0 0 0 0 N 2 51.799842 4.105149 135.000000 "Kato Unitrack Curve 9.75R 249mm 45° 20-100" +TURNOUT 16 0 0 0 0 N 2 51.799842 4.105149 135.000000 "Kato Unitrack Curve 9.75R 249mm 45° 20-100" T 17 51.799842 4.105149 45.000000 T 15 44.895807 1.245404 270.000000 D 0.000000 0.000000 @@ -149,7 +149,7 @@ TURNOUT 16 0 0 0 0 N 2 51.799842 4.105149 135.000000 "Kato Unitrack Curve 9.75R A 11579568 0.053333 9.290666 0.000000 -9.764000 0.000000 45.000000 A 11579568 0.053333 10.237334 0.000000 -9.764000 0.000000 45.000000 END -TURNOUT 17 0 0 0 0 N 2 54.659587 11.009184 90.000000 "Kato Unitrack Curve 9.75R 249mm 45° 20-100" +TURNOUT 17 0 0 0 0 N 2 54.659587 11.009184 90.000000 "Kato Unitrack Curve 9.75R 249mm 45° 20-100" T 18 54.659587 11.009184 0.000000 T 16 51.799842 4.105149 225.000000 D 0.000000 0.000000 @@ -158,7 +158,7 @@ TURNOUT 17 0 0 0 0 N 2 54.659587 11.009184 90.000000 "Kato Unitrack Curve 9.75R A 11579568 0.053333 9.290666 0.000000 -9.764000 0.000000 45.000000 A 11579568 0.053333 10.237334 0.000000 -9.764000 0.000000 45.000000 END -TURNOUT 18 0 0 0 0 N 2 51.799842 17.913219 45.000000 "Kato Unitrack Curve 9.75R 249mm 45° 20-100" +TURNOUT 18 0 0 0 0 N 2 51.799842 17.913219 45.000000 "Kato Unitrack Curve 9.75R 249mm 45° 20-100" T 19 51.799842 17.913219 315.000000 T 17 54.659587 11.009184 180.000000 D 0.000000 0.000000 @@ -167,7 +167,7 @@ TURNOUT 18 0 0 0 0 N 2 51.799842 17.913219 45.000000 "Kato Unitrack Curve 9.75R A 11579568 0.053333 9.290666 0.000000 -9.764000 0.000000 45.000000 A 11579568 0.053333 10.237334 0.000000 -9.764000 0.000000 45.000000 END -TURNOUT 19 0 0 0 0 N 2 44.895807 20.772964 0.000000 "Kato Unitrack Curve 9.75R 249mm 45° 20-100" +TURNOUT 19 0 0 0 0 N 2 44.895807 20.772964 0.000000 "Kato Unitrack Curve 9.75R 249mm 45° 20-100" T 20 44.895807 20.772964 270.000000 T 18 51.799842 17.913219 135.000000 D 0.000000 0.000000 @@ -176,7 +176,7 @@ TURNOUT 19 0 0 0 0 N 2 44.895807 20.772964 0.000000 "Kato Unitrack Curve 9.75R A 11579568 0.053333 9.290666 0.000000 -9.764000 0.000000 45.000000 A 11579568 0.053333 10.237334 0.000000 -9.764000 0.000000 45.000000 END -TURNOUT 20 0 0 0 0 N 2 37.991772 17.913220 315.000000 "Kato Unitrack Curve 9.75R 249mm 45° 20-100" +TURNOUT 20 0 0 0 0 N 2 37.991772 17.913220 315.000000 "Kato Unitrack Curve 9.75R 249mm 45° 20-100" T 21 37.991772 17.913220 225.000000 T 19 44.895807 20.772964 90.000000 D 0.000000 0.000000 diff --git a/app/lib/demos/dmctlpnl.xtr b/app/lib/demos/dmctlpnl.xtr index c045345..f06f1a3 100644 --- a/app/lib/demos/dmctlpnl.xtr +++ b/app/lib/demos/dmctlpnl.xtr @@ -117,7 +117,7 @@ RESET MESSAGE _________________________________________ -For our control panel we will use ¼" lines. +For our control panel we will use ¼" lines. Also, we will use a 1/8" grid to lay out our controls. First, we will set up the Snap Grid for 1" grid lines and 8 divisions. @@ -147,19 +147,16 @@ PARAMETER misc cmdDelete MESSAGE First step: draw the lines representing the tracks. -We specify the line width in pixels when at 1:1 zoom. +We specify the line width in inches. -To create a 1/4" line, divide the dots-per-inch (DPI) of your display by 4. - -For MS-Windows the DPI is usually 98, so choose: 98/4 = 24 (approximately). -For Linux, the DPI is usually 72, so choose: 72/4 = 18. +To create a 1/4" line, enter 0.250 in the "Straight Line Width" box at the bottom of the window. END STEP COMMAND DrawLine PARAMETER draw linewidth 0 PARAMETER draw linecolor 0 PARAMETER GROUP draw -PARAMETER draw linewidth 24 +PARAMETER draw linewidth 0.250 STEP KEYSTATE 2 MOUSE 2 1.000 6.000 @@ -495,7 +492,7 @@ MOUSE 4 8.000 3.000 MESSAGE _________________________________________ -Notice how the Snap Grid keeps the main line and siding track parallel and the connecting tracks and spur at a 45° angle. +Notice how the Snap Grid keeps the main line and siding track parallel and the connecting tracks and spur at a 45° angle. END STEP RESET @@ -562,7 +559,7 @@ Now we'll add push buttons to control the turnouts. END STEP ORIG 1 0.0000000 4.000000 -HOTBARSELECT Switch ¼" Push Button +HOTBARSELECT Switch ¼" Push Button MOUSE 2 2.750 6.000 MOUSE 4 2.750 6.000 BIGPAUSE @@ -607,7 +604,7 @@ MOUSE 2 2.953 7.344 MOUSE 4 1.625 5.578 MESSAGE -We rotate the signals by Shift-Right-Click and select 90° CW on the popup menu. We can not show the popup menu in demo mode, but will simulate the effect. +We rotate the signals by Shift-Right-Click and select 90° CW on the popup menu. We can not show the popup menu in demo mode, but will simulate the effect. END BIGPAUSE MENU 1.625 5.578 "Structure Rotate" "90 CW" @@ -712,20 +709,20 @@ MESSAGE Now for some touch-ups. Notice when the line meet at an angle there is a gap. -We will fill this gap with the ¼" dot. +We will fill this gap with the ¼" dot. Note: Win95/Win98/WinME does not support drawing lines with flat end-caps, but only with round end-caps. Users on those platforms will not see the gap. END STEP ORIG 1 2.000 4.000 -HOTBARSELECT Symbols ¼" DOT +HOTBARSELECT Symbols ¼" DOT MOUSE 2 3.000 5.000 MOUSE 4 3.000 5.000 BIGPAUSE MOUSE 8200 3.000 5.000 ORIG 1 8.000 4.000 -HOTBARSELECT Symbols ¼" DOT +HOTBARSELECT Symbols ¼" DOT MOUSE 2 9.000 5.000 MOUSE 4 9.000 5.000 BIGPAUSE @@ -736,7 +733,7 @@ _________________________________________ Add an arrow head to indicate the tracks that connect to the rest of the layout. -The second arrow will be flipped 180°" +The second arrow will be flipped 180°" END STEP HOTBARSELECT Symbols Arrow @@ -755,7 +752,7 @@ MOUSE 6920 0.500 6.000 #MESSAGE #_________________________________________ # -#Rotate the arrow head by 180° and move into position. +#Rotate the arrow head by 180° and move into position. #END #MOUSE 2 0.500 6.000 #MOUSE 4 0.500 6.000 @@ -831,7 +828,7 @@ PARAMETER text fontsize -1 24 PARAMETER GROUP text CLEAR MESSAGE -We want to print our control panel onto a 8½x11 page, but the control panel is a bit too wide. +We want to print our control panel onto a 8½x11 page, but the control panel is a bit too wide. Lets tighten it up a bit. @@ -989,7 +986,7 @@ STRUCTURE 28 0 0 0 0 DEMO 2 5.437000 4.750000 0 0.000000 "LED T1 Red LED " L3 0 0.000000 0.059000 0.000000 0 -0.059000 0.000000 0 L3 0 0.000000 0.000000 0.059000 0 0.000000 -0.059000 0 END -STRUCTURE 29 0 0 0 0 DEMO 2 2.750000 6.000000 0 0.000000 "Switch ¼"" Push Button " +STRUCTURE 29 0 0 0 0 DEMO 2 2.750000 6.000000 0 0.000000 "Switch ¼"" Push Button " D 0.000000 0.000000 G3 16448250 0.000000 0.125000 0.000000 0.000000 0 A3 0 0.013889 0.125000 0.000000 0.000000 0 0.000000 360.000000 @@ -997,7 +994,7 @@ STRUCTURE 29 0 0 0 0 DEMO 2 2.750000 6.000000 0 0.000000 "Switch L3 0 0.000000 0.125000 0.000000 0 -0.125000 0.000000 0 L3 0 0.000000 0.000000 0.125000 0 0.000000 -0.125000 0 END -STRUCTURE 30 0 0 0 0 DEMO 2 2.500000 5.500000 0 0.000000 "Switch ¼"" Push Button " +STRUCTURE 30 0 0 0 0 DEMO 2 2.500000 5.500000 0 0.000000 "Switch ¼"" Push Button " D 0.000000 0.000000 G3 16448250 0.000000 0.125000 0.000000 0.000000 0 A3 0 0.013889 0.125000 0.000000 0.000000 0 0.000000 360.000000 @@ -1005,7 +1002,7 @@ STRUCTURE 30 0 0 0 0 DEMO 2 2.500000 5.500000 0 0.000000 "Switch L3 0 0.000000 0.125000 0.000000 0 -0.125000 0.000000 0 L3 0 0.000000 0.000000 0.125000 0 0.000000 -0.125000 0 END -STRUCTURE 31 0 0 0 0 DEMO 2 8.000000 6.000000 0 0.000000 "Switch ¼"" Push Button " +STRUCTURE 31 0 0 0 0 DEMO 2 8.000000 6.000000 0 0.000000 "Switch ¼"" Push Button " D 0.000000 0.000000 G3 16448250 0.000000 0.125000 0.000000 0.000000 0 A3 0 0.013889 0.125000 0.000000 0.000000 0 0.000000 360.000000 @@ -1013,7 +1010,7 @@ STRUCTURE 31 0 0 0 0 DEMO 2 8.000000 6.000000 0 0.000000 "Switch L3 0 0.000000 0.125000 0.000000 0 -0.125000 0.000000 0 L3 0 0.000000 0.000000 0.125000 0 0.000000 -0.125000 0 END -STRUCTURE 32 0 0 0 0 DEMO 2 8.250000 5.500000 0 0.000000 "Switch ¼"" Push Button " +STRUCTURE 32 0 0 0 0 DEMO 2 8.250000 5.500000 0 0.000000 "Switch ¼"" Push Button " D 0.000000 0.000000 G3 16448250 0.000000 0.125000 0.000000 0.000000 0 A3 0 0.013889 0.125000 0.000000 0.000000 0 0.000000 360.000000 @@ -1021,7 +1018,7 @@ STRUCTURE 32 0 0 0 0 DEMO 2 8.250000 5.500000 0 0.000000 "Switch L3 0 0.000000 0.125000 0.000000 0 -0.125000 0.000000 0 L3 0 0.000000 0.000000 0.125000 0 0.000000 -0.125000 0 END -STRUCTURE 33 0 0 0 0 DEMO 2 5.937000 5.000000 0 0.000000 "Switch ¼"" Push Button " +STRUCTURE 33 0 0 0 0 DEMO 2 5.937000 5.000000 0 0.000000 "Switch ¼"" Push Button " D 0.000000 0.000000 G3 16448250 0.000000 0.125000 0.000000 0.000000 0 A3 0 0.013889 0.125000 0.000000 0.000000 0 0.000000 360.000000 @@ -1029,7 +1026,7 @@ STRUCTURE 33 0 0 0 0 DEMO 2 5.937000 5.000000 0 0.000000 "Switch L3 0 0.000000 0.125000 0.000000 0 -0.125000 0.000000 0 L3 0 0.000000 0.000000 0.125000 0 0.000000 -0.125000 0 END -STRUCTURE 34 0 0 0 0 DEMO 2 5.687000 4.500000 0 0.000000 "Switch ¼"" Push Button " +STRUCTURE 34 0 0 0 0 DEMO 2 5.687000 4.500000 0 0.000000 "Switch ¼"" Push Button " D 0.000000 0.000000 G3 16448250 0.000000 0.125000 0.000000 0.000000 0 A3 0 0.013889 0.125000 0.000000 0.000000 0 0.000000 360.000000 @@ -1107,11 +1104,11 @@ STRUCTURE 40 0 0 0 0 DEMO 2 7.500000 4.625000 0 90.000000 "Signals Sgl Signal 1 L3 0 0.027778 0.000000 -0.109375 0 0.000000 -0.600000 0 L3 0 0.027778 -0.100000 -0.600000 0 0.100000 -0.600000 0 END -STRUCTURE 41 0 0 0 0 DEMO 2 3.000000 5.000000 0 0.000000 "Symbols ¼"" DOT " +STRUCTURE 41 0 0 0 0 DEMO 2 3.000000 5.000000 0 0.000000 "Symbols ¼"" DOT " D 0.000000 0.000000 G3 0 0.000000 0.125000 0.000000 0.000000 0 END -STRUCTURE 42 0 0 0 0 DEMO 2 7.750000 5.000000 0 0.000000 "Symbols ¼"" DOT " +STRUCTURE 42 0 0 0 0 DEMO 2 7.750000 5.000000 0 0.000000 "Symbols ¼"" DOT " D 0.000000 0.000000 G3 0 0.000000 0.125000 0.000000 0.000000 0 END diff --git a/app/lib/demos/dmdelund.xtr b/app/lib/demos/dmdelund.xtr index 5215c06..de76430 100644 --- a/app/lib/demos/dmdelund.xtr +++ b/app/lib/demos/dmdelund.xtr @@ -84,7 +84,7 @@ STEP REGRESSION START 10 - delete CURVE 2 0 0 0 0 DEMO 2 21.833333 25.924310 0 24.125000 0 0.000000 0.000000 E4 40.128499 10.198454 40.681260 0 0.0 0.0 0.0 0.0 0 0 0 0.000000 - T4 3 23.852360 1.883945 265.199288 0 0.0 0.0 0.0 0.0 0 0 0 0.000000 + E4 23.852360 1.883945 265.199288 0 0.0 0.0 0.0 0.0 0 0 0 0.000000 END REGRESSION END CLEAR diff --git a/app/lib/demos/dmexcept.xtr b/app/lib/demos/dmexcept.xtr index ae1c8aa..ff98734 100644 --- a/app/lib/demos/dmexcept.xtr +++ b/app/lib/demos/dmexcept.xtr @@ -31,7 +31,7 @@ RESET MESSAGE XTrackCAD can help find tracks that are curved too sharply or are too steep. These tracks are Exception tracks and are drawn in the Exception track color. -In this example we have a curved track with radius of 9" and a straight track with a grade of 3.8%. +In this example we have a curved track with radius of 9 inches and a straight track with a grade of 3.8 percent. END STEP @@ -39,7 +39,7 @@ PARAMETER misc cmdLayout MESSAGE _________________________________________ -The Layout dialog shows the Minimum Track Radius is 9" and the Maximum Track Grade is 5%. +The Layout dialog shows the Minimum Track Radius is 9 inches and the Maximum Track Grade is 5 percent. END STEP PARAMETER layout mintrackradius 9.000000 diff --git a/app/lib/demos/dmgroup.xtr b/app/lib/demos/dmgroup.xtr index 2c7741b..7c6c7cd 100644 --- a/app/lib/demos/dmgroup.xtr +++ b/app/lib/demos/dmgroup.xtr @@ -28,7 +28,7 @@ COMMAND DrawLine PARAMETER draw linewidth 0 PARAMETER draw linecolor 0 PARAMETER GROUP draw -PARAMETER draw linewidth 4 +PARAMETER draw linewidth 0.055555 MOUSE 1 2.500 3.000 COMMAND DrawLine MOUSE 2 2.500 3.000 @@ -256,7 +256,7 @@ MOUSE 4 11.156 4.281 BIGPAUSE COMMAND TurnoutHotBar #PARAMETER turnout list 0 -PARAMETER GROUP turnout +PARAMETER GROUP newFixedTrack HOTBARSELECT Peco-55 Modified Medium Right SL-E395F MOUSE 1 4.750 1.906 MOUSE 2 4.750 1.906 @@ -464,7 +464,7 @@ PARAMETER describe P1 2 MESSAGE _________________________________________ -We want the curve to have a radius of 20" and an angle of 17.5�. +We want the curve to have a radius of 20" and an angle of 17.5°. First change the Radius... END STEP diff --git a/app/lib/demos/dmhelix.xtr b/app/lib/demos/dmhelix.xtr index f02c1d6..88707da 100644 --- a/app/lib/demos/dmhelix.xtr +++ b/app/lib/demos/dmhelix.xtr @@ -28,7 +28,7 @@ PARAMETER helix vertSep 0.0 MESSAGE _________________________________________ -We will be creating a helix with a Elevation Difference of 12", Grade of 1.5% and limit the Vertical Separation to at least 2". +We will be creating a helix with a Elevation Difference of 12 inches, Grade of 1.5 percent and limit the Vertical Separation to at least 2 inches. END STEP MESSAGE @@ -52,7 +52,7 @@ STEP MESSAGE _________________________________________ -Next set the Grade to 1.5% +Next set the Grade to 1.5 percent Notice how this causes the Radius to change. END STEP @@ -85,7 +85,7 @@ BIGPAUSE MESSAGE _________________________________________ -Lastly change the Vertical Separation to 2.5". The number of Turns will change to 4 and the grade increase to almost 3%. +Lastly change the Vertical Separation to 2.5 inches. The number of Turns will change to 4 and the grade increase to almost 3 percent. Note: the Vertical Separation will be increased. This value is the Elevation Difference (12.0) divided by the total number of turns. The total number of turns is 4.25: 4 whole Turns plus a quarter turn for the Angular Separation. END @@ -176,7 +176,7 @@ REDRAW MESSAGE _________________________________________ -We have set the elevations to 1" and 13" to produce a grade of 3.0% with 2.8" between coils. +We have set the elevations to 1 inch and 13 inches to produce a grade of 3.0 percent with 2.8 inches between coils. You can use the command to change the number of Turns or the Elevations at either end of the Helix. This will affect the Grade and Vertical Separation. END diff --git a/app/lib/demos/dmlines.xtr b/app/lib/demos/dmlines.xtr index 082a324..32555fb 100644 --- a/app/lib/demos/dmlines.xtr +++ b/app/lib/demos/dmlines.xtr @@ -94,7 +94,7 @@ _________________________________________ You also draw in various colors and line widths. END PARAMETER draw linecolor 255 -PARAMETER draw linewidth 6 +PARAMETER draw linewidth 0.055555 STEP KEYSTATE A MOUSE 2 0.747 4.693 diff --git a/app/lib/demos/dmlines2.xtr b/app/lib/demos/dmlines2.xtr index 580dafe..f90ba88 100644 --- a/app/lib/demos/dmlines2.xtr +++ b/app/lib/demos/dmlines2.xtr @@ -91,7 +91,7 @@ RESET MESSAGE We also draw Polylines and filled shapes. END -PARAMETER draw linewidth 2 +PARAMETER draw linewidth 0.027777 PARAMETER draw linecolor 11591910 COMMAND DrawPolyline STEP @@ -102,7 +102,7 @@ A Polyline is drawn by dragging to place each of the point in the Polyline. END STEP PARAMETER draw linecolor 0 -PARAMETER draw linewidth 3 +PARAMETER draw linewidth 0.041667 PARAMETER draw linecolor 32768 MOUSE 2 0.64 6.07 MOUSE 4 0.64 6.07 diff --git a/app/lib/demos/dmnotes.xtr b/app/lib/demos/dmnotes.xtr index 6125354..aa1b4cd 100644 --- a/app/lib/demos/dmnotes.xtr +++ b/app/lib/demos/dmnotes.xtr @@ -4,7 +4,7 @@ ORIG 8.000 0.000 0.000 REDRAW RESET MESSAGE -The command lets you attach notes to various spots on the layout. +The command lets you attach notes to various spots on the layout. END STEP COMMAND TextNote @@ -14,22 +14,63 @@ MOUSE 4 9.917 7.167 MESSAGE _________________________________________ -When you place a note, the Note editor window is displayed which lets you enter the note. +When you place a note, the Text Note editor window is displayed which lets you enter the note. END STEP -RESET -MOUSE 6920 9.917 7.167 +#RESET +#MOUSE 6920 9.917 7.167 +#MOUSE 3336 9.917 7.167 +PARAMETER textNote ok MESSAGE _________________________________________ -If you click on a note in mode the Note editor displays the note. +If you click on a note in mode the Text Note editor displays the note allowing you to modify the note.. END STEP COMMAND Describe MOUSE 2 9.917 7.167 MOUSE 4 9.917 7.167 STEP -MOUSE 6920 9.917 7.167 +#MOUSE 6920 9.917 7.167 +PARAMETER textNote ok + +MESSAGE +_________________________________________ + +You can also create a reference to a file or web link. + +Choose the type of link by clicking on the down arrow beside the Note commmand. +END +STEP + +COMMAND FileNote +MOUSE 2 9.917 7.167 +MOUSE 3 7.917 7.167 +MOUSE 4 7.917 7.167 +MESSAGE +_________________________________________ + +This is a File Note. You can specify the Title of the File and its location +END +STEP +PARAMETER fileNote cancel +MOUSE 6920 7.917 7.167 +RESET + +COMMAND LinkNote +MOUSE 2 7.917 7.167 +MOUSE 3 5.917 7.167 +MOUSE 4 5.917 7.167 +MESSAGE +_________________________________________ + +This is a Web Link Note. You can specify the Title of the Link and its URL +END +STEP +PARAMETER linkNote cancel +MOUSE 6920 5.917 7.167 +RESET + REGRESSION START 10 - notes NOTE 1 0 0 0 9.917000 7.167000 0 32 Replace this text with your note diff --git a/app/lib/demos/dmrescal.xtr b/app/lib/demos/dmrescal.xtr index 015a735..c4ac3a6 100644 --- a/app/lib/demos/dmrescal.xtr +++ b/app/lib/demos/dmrescal.xtr @@ -119,6 +119,8 @@ PARAMETER misc cmdRescale MESSAGE The command will change the size of the selected objects. +Note: due to technical reasons, the To Scale drop down list is blank. For this demo it should show 'DEMO'. + First we will try rescaling by ratio. END STEP @@ -126,7 +128,7 @@ PARAMETER rescale toggle 1 MESSAGE _________________________________________ -We are going to make everything 150% bigger. +We are going to make everything 150 percent bigger. END STEP @@ -139,7 +141,6 @@ END STEP PARAMETER misc cmdUndo RESET -PARAMETER misc cmdRescale MESSAGE _________________________________________ @@ -148,9 +149,10 @@ Let's try that again. Now we are going to convert from one scale to another. END STEP +PARAMETER misc cmdSelectAll +PARAMETER misc cmdRescale PARAMETER rescale toggle 0 PARAMETER rescale toS 5 HO -PARAMETER misc cmdSelectAll MESSAGE _________________________________________ diff --git a/app/lib/demos/dmrotate.xtr b/app/lib/demos/dmrotate.xtr index ed04a77..895c5b6 100644 --- a/app/lib/demos/dmrotate.xtr +++ b/app/lib/demos/dmrotate.xtr @@ -135,7 +135,7 @@ MOUSE 4 1.000 10.000 MESSAGE _________________________________________ -The command will restrict the rotation to increments of 15° if you hold down the and keys. +The command will restrict the rotation to increments of 15° if you hold down the and keys. END STEP PARAMETER misc cmdUndo @@ -327,7 +327,7 @@ END #MESSAGE #_________________________________________ # -#Shift-Right-Click will display a popup-menu that you can use to rotate by fixed amount (15°, 30°, 45°, 90° or 180°). +#Shift-Right-Click will display a popup-menu that you can use to rotate by fixed amount (15°, 30°, 45°, 90° or 180°). # #We can not currently show this command. #END @@ -362,7 +362,7 @@ END #MESSAGE #_________________________________________ # -#If we drag the mouse across the track, we can flip the structure by 180°. This is similar to how we place turnouts. +#If we drag the mouse across the track, we can flip the structure by 180°. This is similar to how we place turnouts. #END #STEP #MOUSE 3 6.750 2.750 diff --git a/app/lib/demos/dmselect.xtr b/app/lib/demos/dmselect.xtr index 06bed0c..cff9af7 100644 --- a/app/lib/demos/dmselect.xtr +++ b/app/lib/demos/dmselect.xtr @@ -177,12 +177,36 @@ Selected tracks can be moved or rotated during the