New upstream version 5.2.0Beta2.1upstream/5.2.0Beta2.1

1 files changed, 223 insertions, 2 deletions

diff --git a/app/lib/demos/dmjnss.xtr b/app/lib/demos/dmjnss.xtr
index 451fde4..6343fb8 100644
--- a/app/lib/demos/dmjnss.xtr
+++ b/app/lib/demos/dmjnss.xtr
@@ -12,13 +12,26 @@ STRAIGHT 2 DEMO 1
 REDRAW
 RESET
 MESSAGE
-Two straight tracks are joined by selecting the two End-Points.  The selected End-Points will be those closest to the cursor when the track is selected.
+Two straight tracks can be joined by selecting the two endoints.  The selected endpoints will be those closest to the cursor when the track is selected.
 
+First, we will select Easements None and then select Join
 END
 STEP
-COMMAND Join
+PARAMETER misc cmdEasement
+PARAMETER easement val 0.0
+BIGPAUSE
+PARAMETER easement ok
+COMMAND JoinTrack
+STEP
+MESSAGE
+_____________________________________________________
+
+Now we select two points on the tracks
+END
+MOUSE 1 16.583 10.417
 MOUSE 2 16.583 10.417
 MOUSE 4 16.583 10.417
+MOUSE 1 17.083 4.583
 MOUSE 2 17.083 4.583
 MESSAGE
 _________________________________________
@@ -57,5 +70,213 @@ MOUSE 4 -0.667 2.750
 MESSAGE
 =========================================
 END
+REGRESSION START 11 - join straights - simple
+STRAIGHT 1 0 0 0 0 DEMO 2
+	T4 3 -0.667000 4.466667 270.000000 0 0.0 0.0 0.0 0.0 0 0 0 0.000000 
+	E4 37.133333 4.466667 90.000000 0 0.0 0.0 0.0 0.0 0 0 0 0.000000 
+	END
+STRAIGHT 2 0 0 0 0 DEMO 2
+	T4 3 0.206517 1.112893 240.802413 0 0.0 0.0 0.0 0.0 0 0 0 0.000000 
+	E4 27.383333 16.300000 60.802413 0 0.0 0.0 0.0 0.0 0 0 0 0.000000 
+	END
+CURVE 3 0 0 0 0 DEMO 2 -0.667000 2.676023 0 1.790644 0 0.000000 0.000000
+	T4 2 0.206517 1.112893 60.802413 0 0.0 0.0 0.0 0.0 0 0 0 0.000000 
+	T4 1 -0.667000 4.466667 90.000000 0 0.0 0.0 0.0 0.0 0 0 0 0.000000 
+	END
+REGRESSION END
 STEP
 CLEAR
+PARAMETER misc cmdUndo
+MESSAGE
+Now we will do this with Cornu Easements  
+
+First, we will select Easements Cornu and then select Join
+END
+STEP
+PARAMETER misc cmdEasement
+PARAMETER easement val -1.0
+BIGPAUSE
+PARAMETER easement ok
+COMMAND JoinTrack
+STEP
+MESSAGE
+_____________________________________________________
+
+Now we again select two points on the tracks
+END
+MOUSE 1 16.583 10.417
+MOUSE 2 16.583 10.417
+MOUSE 4 16.583 10.417
+MOUSE 1 17.083 4.583
+MOUSE 2 17.083 4.583
+MESSAGE
+_________________________________________
+
+A connecting cornu is drawn between the two tracks.  Notice how it behaves as the cursor is dragged along the second track.
+END
+STEP
+MOUSE 3 17.167 4.583
+MOUSE 3 21.917 4.583
+BIGPAUSE
+MOUSE 3 21.917 4.583
+MOUSE 3 14.833 4.250
+MESSAGE
+_________________________________________
+
+Note that either tracks can be extended if you move past the end of it.
+END
+STEP
+MOUSE 3 14.750 4.250
+MOUSE 3 9.000 4.000
+MESSAGE
+_________________________________________
+
+Notice this time what happens if you drag past the intersection points of the two tracks.
+END
+STEP
+MOUSE 3 8.833 4.000
+MOUSE 3 -0.667 2.750
+MESSAGE
+_________________________________________
+
+This is more useful because you can move the other end as well.
+END
+STEP
+MOUSE 4 -0.667 2.750
+MOUSE 1 16.583 10.417
+MOUSE 2 16.583 10.417
+MOUSE 3 26.900 15.800
+MOUSE 4 26.900 15.800
+MESSAGE
+_________________________________________
+
+You can add a pin to constrain the Cornu Curve to pass through it.
+END
+STEP
+MOUSE 1 16.400 12.680
+MOUSE 2 16.400 12.680
+MOUSE 3 20.000 10.500
+MOUSE 4 20.000 10.500
+MOUSE 8200 20.000 10.500
+MESSAGE
+=========================================
+END
+REGRESSION START 12  - join straights cornu
+# ../share/xtrkcad/demos/dmjnss.xtr - 151
+STRAIGHT 1 0 0 0 0 DEMO 2
+	T4 5 -0.667000 4.466667 270.000000 0 0.0 0.0 0.0 0.0 0 0 0 0.000000 
+	E4 37.133333 4.466667 90.000000 0 0.0 0.0 0.0 0.0 0 0 0 0.000000 
+	END$SEGS
+STRAIGHT 2 0 0 0 0 DEMO 2
+	T4 4 26.802098 15.975192 240.802413 0 0.0 0.0 0.0 0.0 0 0 0 0.000000 
+	E4 27.383333 16.300000 60.802413 0 0.0 0.0 0.0 0.0 0 0 0 0.000000 
+	END$SEGS
+CORNU 4 0 0 0 0 DEMO 2 26.802098 15.975192 60.802413 0.000000 0.000000 0.000000 20.000000 10.500000 227.332778 50.468495 -14.204474 47.609607 
+	T4 2 26.802098 15.975192 60.802413 0 0.0 0.0 0.0 0.0 0 0 0 0.000000 
+	T4 5 20.000000 10.500000 227.332778 0 0.0 0.0 0.0 0.0 0 0 0 0.000000 
+	W3 0 0.000000 26.802098 15.975192 26.164180 15.618707 25.528914 15.255902 24.922701 14.847824
+	SUBSEGS
+	C 0 0.000000 -26.451833 39.457674 -7.252719 326.668083 4.748448
+	SUBSEND
+	W3 0 0.000000 24.922701 14.847824 24.316487 14.439746 23.739315 13.989295 23.188205 13.509400
+	SUBSEGS
+	C 0 0.000000 -17.691771 34.842861 0.198961 318.794523 7.099752
+	SUBSEND
+	W3 0 0.000000 23.188205 13.509400 22.085986 12.549608 21.074671 11.490540 20.000000 10.500000
+	SUBSEGS
+	C 0 0.000000 -65.215805 66.730294 -35.041479 315.224174 2.888986
+	S 0 0.000000 20.796534 11.253132 20.000000 10.500000
+	SUBSEND
+	END$SEGS
+CORNU 5 0 0 0 0 DEMO 2 20.000000 10.500000 47.332778 50.468495 -14.204474 47.609607 -0.667000 4.466667 90.000000 0.000000 0.000000 0.000000 
+	T4 4 20.000000 10.500000 47.332778 0 0.0 0.0 0.0 0.0 0 0 0 0.000000 
+	T4 1 -0.667000 4.466667 90.000000 0 0.0 0.0 0.0 0.0 0 0 0 0.000000 
+	W3 0 0.000000 20.000000 10.500000 19.318543 9.871891 18.615306 9.263690 17.848611 8.743033
+	SUBSEGS
+	C 0 0.000000 18.778714 7.078653 24.126404 136.521306 8.482677
+	SUBSEND
+	W3 0 0.000000 17.848611 8.743033 17.081916 8.222376 16.252171 7.790276 15.373060 7.496902
+	SUBSEGS
+	C 0 0.000000 10.145390 12.091979 17.097082 145.429938 15.701023
+	SUBSEND
+	W3 0 0.000000 15.373060 7.496902 14.493949 7.203529 13.567965 7.050061 12.641194 7.049336
+	SUBSEGS
+	C 0 0.000000 8.670868 12.623232 15.720186 161.510300 18.371006
+	SUBSEND
+	W3 0 0.000000 12.641194 7.049336 11.714424 7.048612 10.789413 7.199895 9.904422 7.475023
+	SUBSEGS
+	C 0 0.000000 9.217472 12.673408 16.266752 180.200242 17.281760
+	SUBSEND
+	W3 0 0.000000 9.904422 7.475023 9.019431 7.750151 8.175230 8.147494 7.376550 8.617616
+	SUBSEGS
+	C 0 0.000000 12.069936 13.578894 18.972049 197.723979 13.197787
+	SUBSEND
+	W3 0 0.000000 7.376550 8.617616 6.577870 9.087738 5.823862 9.629917 5.087234 10.192309
+	SUBSEGS
+	C 0 0.000000 23.166639 19.337296 28.457820 211.083842 6.876168
+	SUBSEND
+	W3 0 0.000000 5.087234 10.192309 3.613980 11.317093 2.191863 12.536086 0.541165 13.379184
+	SUBSEGS
+	S 0 0.000000 5.087234 10.192309 2.880741 11.891379
+	C 0 0.000000 -16.933355 -7.345233 -1.605583 27.757576 9.391814
+	SUBSEND
+	W3 0 0.000000 0.541165 13.379184 -0.284188 13.800738 -1.164915 14.124119 -2.079569 14.273530
+	SUBSEGS
+	C 0 0.000000 -8.978407 -3.634267 5.430753 9.971577 17.742051
+	SUBSEND
+	W3 0 0.000000 -2.079569 14.273530 -2.536896 14.348235 -3.001703 14.379353 -3.464645 14.358998
+	SUBSEGS
+	C 0 0.000000 -6.758837 -3.186180 7.605900 357.638745 11.784606
+	SUBSEND
+	W3 0 0.000000 -3.464645 14.358998 -3.927586 14.338644 -4.388609 14.266672 -4.833991 14.138748
+	SUBSEGS
+	C 0 0.000000 -5.903451 -3.218328 8.460688 344.116575 13.492114
+	SUBSEND
+	W3 0 0.000000 -4.833991 14.138748 -5.279372 14.010825 -5.708973 13.826821 -6.106104 13.588042
+	SUBSEGS
+	C 0 0.000000 -5.320524 -3.374332 9.022365 329.106732 14.970290
+	SUBSEND
+	W3 0 0.000000 -6.106104 13.588042 -6.503235 13.349262 -6.867684 13.055650 -7.182439 12.715565
+	SUBSEGS
+	C 0 0.000000 -4.925324 -3.573613 9.363671 312.886078 16.171430
+	SUBSEND
+	W3 0 0.000000 -7.182439 12.715565 -7.497194 12.375479 -7.762017 11.988983 -7.963009 11.571453
+	SUBSEGS
+	C 0 0.000000 -4.672075 -3.755935 9.539505 295.779781 17.047949
+	SUBSEND
+	W3 0 0.000000 -7.963009 11.571453 -8.164001 11.153923 -8.300973 10.705552 -8.366415 10.246808
+	SUBSEGS
+	C 0 0.000000 -4.537825 -3.874548 9.602610 278.161379 17.552270
+	SUBSEND
+	W3 0 0.000000 -8.366415 10.246808 -8.431857 9.788063 -8.425704 9.319225 -8.348802 8.862263
+	SUBSEGS
+	C 0 0.000000 -4.516107 -3.895246 9.611300 260.452854 17.636670
+	SUBSEND
+	W3 0 0.000000 -8.348802 8.862263 -8.271900 8.405300 -8.124342 7.960494 -7.915133 7.547020
+	SUBSEGS
+	C 0 0.000000 -4.616507 -3.797243 9.633913 243.124710 17.253123
+	SUBSEND
+	W3 0 0.000000 -7.915133 7.547020 -7.705924 7.133547 -7.435288 6.751601 -7.117962 6.413912
+	SUBSEGS
+	C 0 0.000000 -4.870580 -3.573517 9.754490 226.696048 16.353154
+	SUBSEND
+	W3 0 0.000000 -7.117962 6.413912 -6.800636 6.076224 -6.436897 5.782850 -6.043374 5.538171
+	SUBSEGS
+	C 0 0.000000 -5.350011 -3.229346 10.088321 211.734607 14.887748
+	SUBSEND
+	W3 0 0.000000 -6.043374 5.538171 -5.649850 5.293492 -5.226774 5.097437 -4.788767 4.946181
+	SUBSEGS
+	C 0 0.000000 -6.219072 -2.778742 10.831473 198.856757 12.807357
+	SUBSEND
+	W3 0 0.000000 -4.788767 4.946181 -4.350759 4.794925 -3.897938 4.688337 -3.440233 4.615986
+	SUBSEGS
+	C 0 0.000000 -7.915867 -2.239129 12.440198 188.727410 10.062079
+	SUBSEND
+	W3 0 0.000000 -3.440233 4.615986 -2.524822 4.471284 -1.593777 4.466669 -0.667000 4.466667
+	SUBSEGS
+	C 0 0.000000 -14.358484 -1.395250 18.828097 179.869603 8.318495
+	S 0 0.000000 -1.362572 4.469650 -0.667000 4.466667
+	SUBSEND
+	END$SEGS
+REGRESSION END
+STEP