summaryrefslogtreecommitdiff
path: root/app/bin/cjoin.c
diff options
context:
space:
mode:
Diffstat (limited to 'app/bin/cjoin.c')
-rw-r--r--app/bin/cjoin.c1082
1 files changed, 634 insertions, 448 deletions
diff --git a/app/bin/cjoin.c b/app/bin/cjoin.c
index 71f4dae..cb794bd 100644
--- a/app/bin/cjoin.c
+++ b/app/bin/cjoin.c
@@ -20,7 +20,7 @@
*
* 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.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
@@ -30,42 +30,40 @@
#include "cstraigh.h"
#include "cjoin.h"
#include "ccornu.h"
-#include "i18n.h"
-#include "utility.h"
-#include "math.h"
-#include "messages.h"
#include "param.h"
#include "cundo.h"
#include "cselect.h"
#include "fileio.h"
+#include "common-ui.h"
static BOOL_T debug = 0;
+/** @logcmd @showrefby join=n cjoin.c */
static int log_join = 0;
typedef struct {
- curveType_e type;
- BOOL_T flip;
- coOrd arcP;
- DIST_T arcR;
- ANGLE_T arcA0, arcA1;
- coOrd pos[2];
- } joinRes_t;
+ curveType_e type;
+ BOOL_T flip;
+ coOrd arcP;
+ DIST_T arcR;
+ ANGLE_T arcA0, arcA1;
+ coOrd pos[2];
+} joinRes_t;
static struct {
- STATE_T state;
- int joinMoveState;
- BOOL_T cornuMode;
- struct {
- TRKTYP_T realType;
- track_p trk;
- coOrd pos;
- EPINX_T ep;
- trackParams_t params;
- } inp[2];
- joinRes_t jRes;
- coOrd inp_pos[2];
- easementData_t jointD[2];
- dynArr_t anchors;
- } Dj;
+ STATE_T state;
+ int joinMoveState;
+ BOOL_T cornuMode;
+ struct {
+ TRKTYP_T realType;
+ track_p trk;
+ coOrd pos;
+ EPINX_T ep;
+ trackParams_t params;
+ } inp[2];
+ joinRes_t jRes;
+ coOrd inp_pos[2];
+ easementData_t jointD[2];
+ dynArr_t anchors;
+} Dj;
/*****************************************************************************
@@ -76,11 +74,11 @@ static struct {
static BOOL_T JoinWithStraight(
- coOrd pos0,
- ANGLE_T a0,
- coOrd pos1,
- ANGLE_T a1,
- joinRes_t * res )
+ coOrd pos0,
+ ANGLE_T a0,
+ coOrd pos1,
+ ANGLE_T a1,
+ joinRes_t * res )
/*
* Determine a track from a point and angle (pos1,a1) to
* a straight (given by an origin and angle: pos0, a0)
@@ -94,17 +92,17 @@ static BOOL_T JoinWithStraight(
DOUBLE_T beyond;
b = NormalizeAngle( a0 - a1 );
-LOG( log_join, 2, (
- "JwL: pos0=[%0.3f %0.3f] a0=%0.3f pos1=[%0.3f %0.3f] a1=%0.3f b=%0.3f\n",
- pos0.x, pos0.y, a0, pos1.x, pos1.y, a1, b ) )
+ LOG( log_join, 2, (
+ "JwL: pos0=[%0.3f %0.3f] a0=%0.3f pos1=[%0.3f %0.3f] a1=%0.3f b=%0.3f\n",
+ pos0.x, pos0.y, a0, pos1.x, pos1.y, a1, b ) )
-/* 3 - cases: */
+ /* 3 - cases: */
if (b >= 360.0-connectAngle/2.0 || b <= connectAngle/2.0) {
-/* CASE 1: antiparallel */
- FindPos( &off, NULL, pos1, pos0, a0, 10000.0 );
+ /* CASE 1: antiparallel */
+ FindPos( &off, NULL, pos1, pos0, a0, DIST_INF );
res->arcR = off.y/2.0;
res->arcA1 = 180.0;
-LOG( log_join, 3, ("JwL: parallel: off.y=%0.3f\n", off.y ) )
+ LOG( log_join, 3, ("JwL: parallel: off.y=%0.3f\n", off.y ) )
res->arcA0 = NormalizeAngle( a1 - 90.0 );
Translate( &res->arcP, pos1, res->arcA0, res->arcR );
if (res->arcR > 0.0) {
@@ -114,14 +112,15 @@ LOG( log_join, 3, ("JwL: parallel: off.y=%0.3f\n", off.y ) )
res->flip = 1;
}
} else if (b >= 180.0-connectAngle/2.0 && b <= 180.0+connectAngle/2.0) {
-/* CASE 2: parallel, possibly colinear? */
- FindPos( &off, &beyond, pos0, pos1, a0, 100000.0 );
-LOG( log_join, 3, ("JwL: colinear? off.y=%0.3f\n", off.y ) )
+ /* CASE 2: parallel, possibly colinear? */
+ FindPos( &off, &beyond, pos0, pos1, a0, DIST_INF );
+ LOG( log_join, 3, ("JwL: colinear? off.y=%0.3f\n", off.y ) )
if (off.y > -connectDistance && off.y < connectDistance) {
res->type = curveTypeStraight;
res->pos[0]=pos0;
res->pos[1]=pos1;
-LOG( log_join, 2, (" = STRAIGHT [%0.3f %0.3f] [%0.3f %0.3f]\n", pos0.x, pos0.y, pos1.x, pos1.y ) )
+ LOG( log_join, 2, (" = STRAIGHT [%0.3f %0.3f] [%0.3f %0.3f]\n", pos0.x,
+ pos0.y, pos1.x, pos1.y ) )
return TRUE;
} else {
res->type = curveTypeNone;
@@ -129,7 +128,7 @@ LOG( log_join, 2, (" = STRAIGHT [%0.3f %0.3f] [%0.3f %0.3f]\n", pos0.x, pos0.
return TRUE;
}
} else {
-/* CASE 3: intersecting */
+ /* CASE 3: intersecting */
if (!FindIntersection( &Px, pos0, a0, pos1, a1 )) {
res->type = curveTypeNone;
ErrorMessage( MSG_SELECTED_TRACKS_PARALLEL );
@@ -138,13 +137,16 @@ LOG( log_join, 2, (" = STRAIGHT [%0.3f %0.3f] [%0.3f %0.3f]\n", pos0.x, pos0.
d = FindDistance( pos1, Px );
k = NormalizeAngle( FindAngle(pos1, Px) - a1 );
c = (b > 180.0) ? (360.0-b) : b;
- if (k < 90.0 && k > 270.0)
+ if (k < 90.0 && k > 270.0) {
c += 180.0;
-LOG( log_join, 3, (" Px=[%0.3f %0.3f] b=%0.3f c=%0.3f d=%0.3f k=%0.3f\n", Px.x, Px.y, b, c, d, k ) )
+ }
+ LOG( log_join, 3, (" Px=[%0.3f %0.3f] b=%0.3f c=%0.3f d=%0.3f k=%0.3f\n",
+ Px.x, Px.y, b, c, d, k ) )
res->arcR = d * sin(D2R(c/2.0))/cos(D2R(c/2.0));
res->arcA1 = 180.0-c;
- if (90.0<k && k<270.0)
- res->arcA1 = 360.0 - res->arcA1;
+ if (90.0<k && k<270.0) {
+ res->arcA1 = 360.0 - res->arcA1;
+ }
if ( (res->arcA1>180.0) == (b>180.0) ) {
Translate( &res->arcP, pos1, a1-90.0, res->arcR );
res->arcA0 = NormalizeAngle( a0 - 90.0 );
@@ -155,73 +157,78 @@ LOG( log_join, 3, (" Px=[%0.3f %0.3f] b=%0.3f c=%0.3f d=%0.3f k=%0.3f\n", Px
res->flip = TRUE;
}
}
-LOG( log_join, 2, (" = CURVE @ Pc=[%0.3f %0.3f] R=%0.3f A0=%0.3f A1=%0.3f Flip=%d\n",
- res->arcP.x, res->arcP.y, res->arcR, res->arcA0, res->arcA1, res->flip ) )
- if (res->arcR<0.0) res->arcR = - res->arcR;
+ LOG( log_join, 2,
+ (" = CURVE @ Pc=[%0.3f %0.3f] R=%0.3f A0=%0.3f A1=%0.3f Flip=%d\n",
+ res->arcP.x, res->arcP.y, res->arcR, res->arcA0, res->arcA1, res->flip ) )
+ if (res->arcR<0.0) { res->arcR = - res->arcR; }
res->type = curveTypeCurve;
d = D2R(res->arcA1);
- if (d < 0.0)
+ if (d < 0.0) {
d = 2*M_PI + d;
+ }
if (!debug)
InfoMessage( _("Curved Track: Radius=%s Length=%s"),
- FormatDistance(res->arcR), FormatDistance(res->arcR*d) );
+ FormatDistance(res->arcR), FormatDistance(res->arcR*d) );
return TRUE;
}
static BOOL_T JoinWithCurve(
- coOrd pos0,
- DIST_T r0,
- EPINX_T ep0,
- coOrd pos1,
- ANGLE_T a1, /* Angle perpendicular to track at (pos1) */
- joinRes_t * res )
+ coOrd pos0,
+ DIST_T r0,
+ EPINX_T ep0,
+ coOrd pos1,
+ ANGLE_T a1, /* Angle perpendicular to track at (pos1) */
+ joinRes_t * res )
/*
* Determine a track point and angle (pos1,a1) to
* a curve (given by center and radius (pos0, r0).
* Curve endPt (ep0) determines whether the connection is
* clockwise or counterclockwise.
- */
+ */
{
coOrd p1, pt;
DIST_T d, r;
ANGLE_T a, aa, A0, A1;
-/* Compute angle of line connecting endPoints: */
+ /* Compute angle of line connecting endPoints: */
Translate( &p1, pos1, a1, -r0 );
aa = FindAngle( p1, pos0 );
a = NormalizeAngle( aa - a1 );
-LOG( log_join, 2, ("JwA: pos0=[%0.3f %0.3f] r0=%0.3f ep0=%d pos1=[%0.3f %0.3f] a1=%0.3f\n",
- pos0.x, pos0.y, r0, ep0, pos1.x, pos1.y, a1 ) )
-LOG( log_join, 3, (" p1=[%0.3f %0.3f] aa=%0.3f a=%0.3f\n",
- p1.x, p1.y, aa, a ) )
+ LOG( log_join, 2,
+ ("JwA: pos0=[%0.3f %0.3f] r0=%0.3f ep0=%d pos1=[%0.3f %0.3f] a1=%0.3f\n",
+ pos0.x, pos0.y, r0, ep0, pos1.x, pos1.y, a1 ) )
+ LOG( log_join, 3, (" p1=[%0.3f %0.3f] aa=%0.3f a=%0.3f\n",
+ p1.x, p1.y, aa, a ) )
if ( (ep0==1 && a > 89.5 && a < 90.5) ||
- (ep0==0 && a > 269.5 && a < 270.5) ) {
-/* The long way around! */
+ (ep0==0 && a > 269.5 && a < 270.5) ) {
+ /* The long way around! */
ErrorMessage( MSG_CURVE_TOO_LARGE );
res->type = curveTypeNone;
} else if ( (ep0==0 && a > 89.5 && a < 90.5) ||
- (ep0==1 && a > 269.5 && a < 270.5) ) {
-/* Straight: */
+ (ep0==1 && a > 269.5 && a < 270.5) ) {
+ /* Straight: */
PointOnCircle( &pt, pos0, r0, a1);
-LOG( log_join, 2, (" = STRAIGHT [%0.3f %0.3f] [%0.3f %0.3f]\n", pt.x, pt.y, pos1.x, pos1.y ) )
+ LOG( log_join, 2, (" = STRAIGHT [%0.3f %0.3f] [%0.3f %0.3f]\n", pt.x, pt.y,
+ pos1.x, pos1.y ) )
if (!debug) InfoMessage( _("Straight Track: Length=%s Angle=%0.3f"),
- FormatDistance(FindDistance( pt, pos1 )), PutAngle(FindAngle( pt, pos1 )) );
+ FormatDistance(FindDistance( pt, pos1 )), PutAngle(FindAngle( pt, pos1 )) );
res->type = curveTypeStraight;
res->pos[0]=pt;
res->pos[1]=pos1;
res->flip = FALSE;
} else {
-/* Curve: */
+ /* Curve: */
d = FindDistance( p1, pos0 ) / 2.0;
r = d/cos(D2R(a));
Translate( &res->arcP, p1, a1, r );
res->arcR = r-r0;
-LOG( log_join, 3, (" Curved d=%0.3f C=[%0.3f %0.3f], r=%0.3f a=%0.3f arcR=%0.3f\n",
- d, res->arcP.x, res->arcP.y, r, a, res->arcR ) )
+ LOG( log_join, 3,
+ (" Curved d=%0.3f C=[%0.3f %0.3f], r=%0.3f a=%0.3f arcR=%0.3f\n",
+ d, res->arcP.x, res->arcP.y, r, a, res->arcR ) )
if ( (ep0==0) == (res->arcR<0) ) {
A1 = 180 + 2*a;
A0 = a1;
@@ -245,12 +252,14 @@ LOG( log_join, 3, (" Curved d=%0.3f C=[%0.3f %0.3f], r=%0.3f a=%0.3f arcR=%0
return TRUE;
}
-LOG( log_join, 3, (" A0=%0.3f A1=%0.3f R=%0.3f\n", res->arcA0, res->arcA1, res->arcR ) )
+ LOG( log_join, 3, (" A0=%0.3f A1=%0.3f R=%0.3f\n", res->arcA0, res->arcA1,
+ res->arcR ) )
d = D2R(res->arcA1);
- if (d < 0.0)
+ if (d < 0.0) {
d = 2*M_PI + d;
+ }
if (!debug) InfoMessage( _("Curved Track: Radius=%s Length=%s Angle=%0.3f"),
- FormatDistance(res->arcR), FormatDistance(res->arcR*d), PutAngle(res->arcA1) );
+ FormatDistance(res->arcR), FormatDistance(res->arcR*d), PutAngle(res->arcA1) );
res->type = curveTypeCurve;
}
return TRUE;
@@ -264,10 +273,10 @@ LOG( log_join, 3, (" A0=%0.3f A1=%0.3f R=%0.3f\n", res->arcA0, res->arcA1,
static STATUS_T AdjustJoint(
- BOOL_T adjust,
- ANGLE_T a1,
- DIST_T eR[2],
- ANGLE_T normalAngle )
+ BOOL_T adjust,
+ ANGLE_T a1,
+ DIST_T eR[2],
+ ANGLE_T normalAngle )
/*
* Compute how to join 2 tracks and then compute the transition-curve
* from the 2 tracks to the joint.
@@ -287,38 +296,42 @@ static STATUS_T AdjustJoint(
coOrd pc;
DIST_T eRc;
DIST_T l, d=0;
-
- if (adjust)
+
+ if (adjust) {
Translate( &p1, Dj.inp[1].pos, a1, Dj.jointD[1].x );
- else
+ } else {
p1 = Dj.inp[1].pos;
+ }
switch ( Dj.inp[0].params.type ) {
case curveTypeCurve:
if (adjust) {
a0 = FindAngle( Dj.inp[0].params.arcP, Dj.jRes.pos[0] );
Translate( &pc, Dj.inp[0].params.arcP, a0, Dj.jointD[0].x );
-LOG( log_join, 2, (" Move P0 X%0.3f A%0.3f P1 X%0.3f A%0.3f SC%d FL%d\n",
- Dj.jointD[0].x, a0, Dj.jointD[1].x, a1,
- Dj.jointD[0].Scurve, Dj.jointD[0].flip ) )
+ LOG( log_join, 2, (" Move P0 X%0.3f A%0.3f P1 X%0.3f A%0.3f SC%d FL%d\n",
+ Dj.jointD[0].x, a0, Dj.jointD[1].x, a1,
+ Dj.jointD[0].Scurve, Dj.jointD[0].flip ) )
} else {
pc = Dj.inp[0].params.arcP;
}
if (!JoinWithCurve( pc, Dj.inp[0].params.arcR,
- Dj.inp[0].params.ep, p1, normalAngle, &Dj.jRes ))
+ Dj.inp[0].params.ep, p1, normalAngle, &Dj.jRes )) {
return FALSE;
+ }
break;
case curveTypeStraight:
if (adjust) {
a0 = Dj.inp[0].params.angle + (Dj.jointD[0].negate?-90.0:+90.0);
Translate( &p0, Dj.inp[0].params.lineOrig, a0, Dj.jointD[0].x );
-LOG( log_join, 2, (" Move P0 X%0.3f A%0.3f P1 X%0.3f A%0.3f\n",
- Dj.jointD[0].x, a0, Dj.jointD[1].x, a1 ) )
+ LOG( log_join, 2, (" Move P0 X%0.3f A%0.3f P1 X%0.3f A%0.3f\n",
+ Dj.jointD[0].x, a0, Dj.jointD[1].x, a1 ) )
} else {
p0 = Dj.inp[0].params.lineOrig;
}
- if (!JoinWithStraight( p0, Dj.inp[0].params.angle, p1, Dj.inp[1].params.angle, &Dj.jRes ))
+ if (!JoinWithStraight( p0, Dj.inp[0].params.angle, p1, Dj.inp[1].params.angle,
+ &Dj.jRes )) {
return FALSE;
+ }
break;
default:
break;
@@ -330,13 +343,15 @@ LOG( log_join, 2, (" Move P0 X%0.3f A%0.3f P1 X%0.3f A%0.3f\n",
if (Dj.jRes.type == curveTypeCurve) {
eRc = Dj.jRes.arcR;
- if (Dj.jRes.flip==1)
+ if (Dj.jRes.flip==1) {
eRc = -eRc;
- } else
+ }
+ } else {
eRc = 0.0;
+ }
if ( ComputeJoint( eR[0], eRc, &Dj.jointD[0] ) == E_ERROR ||
- ComputeJoint( -eR[1], -eRc, &Dj.jointD[1] ) == E_ERROR ) {
+ ComputeJoint( -eR[1], -eRc, &Dj.jointD[1] ) == E_ERROR ) {
return FALSE;
}
@@ -345,9 +360,9 @@ LOG( log_join, 2, (" Move P0 X%0.3f A%0.3f P1 X%0.3f A%0.3f\n",
if (Dj.inp[inx].params.type == curveTypeStraight ) {
d = FindDistance( Dj.inp[inx].params.lineOrig, Dj.inp_pos[inx] );
if (d < Dj.jointD[inx].d0) {
- InfoMessage( _("Track (%d) is too short for transition-curve by %0.3f"),
- GetTrkIndex(Dj.inp[inx].trk),
- PutDim(fabs(Dj.jointD[inx].d0-d)) );
+ InfoMessage( _("Track (%d) is too short for transition-curve by %0.3f"),
+ GetTrkIndex(Dj.inp[inx].trk),
+ PutDim(fabs(Dj.jointD[inx].d0-d)) );
return FALSE;
}
}
@@ -362,20 +377,23 @@ LOG( log_join, 2, (" Move P0 X%0.3f A%0.3f P1 X%0.3f A%0.3f\n",
}
d -= l;
if ( d <= minLength ) {
- if (!debug)
- InfoMessage( _("Connecting track is too short by %0.3f"), PutDim(fabs(minLength-d)) );
+ if (!debug) {
+ InfoMessage( _("Connecting track is too short by %0.3f"),
+ PutDim(fabs(minLength-d)) );
+ }
return FALSE;
}
if (Dj.jRes.type == curveTypeCurve) {
PointOnCircle( &Dj.jRes.pos[Dj.jRes.flip], Dj.jRes.arcP,
- Dj.jRes.arcR, Dj.jRes.arcA0 );
+ Dj.jRes.arcR, Dj.jRes.arcA0 );
PointOnCircle( &Dj.jRes.pos[1-Dj.jRes.flip], Dj.jRes.arcP,
- Dj.jRes.arcR, Dj.jRes.arcA0+Dj.jRes.arcA1 );
+ Dj.jRes.arcR, Dj.jRes.arcA0+Dj.jRes.arcA1 );
}
- if (adjust)
+ if (adjust) {
Translate( &Dj.inp_pos[0], Dj.jRes.pos[0], a0+180.0, Dj.jointD[0].x );
+ }
return TRUE;
}
@@ -383,76 +401,83 @@ LOG( log_join, 2, (" Move P0 X%0.3f A%0.3f P1 X%0.3f A%0.3f\n",
static STATUS_T DoMoveToJoin( coOrd pos )
{
- if ( selectedTrackCount <= 0 ) {
- ErrorMessage( MSG_NO_SELECTED_TRK );
- return C_CONTINUE;
- }
- if ( (Dj.inp[Dj.joinMoveState].trk = OnTrack( &pos, TRUE, TRUE )) == NULL )
- return C_CONTINUE;
- if (!CheckTrackLayer( Dj.inp[Dj.joinMoveState].trk ) )
- return C_CONTINUE;
- Dj.inp[Dj.joinMoveState].params.ep = PickUnconnectedEndPoint( pos, Dj.inp[Dj.joinMoveState].trk ); /* CHECKME */
- if ( Dj.inp[Dj.joinMoveState].params.ep == -1 ) {
+ if ( selectedTrackCount <= 0 ) {
+ ErrorMessage( MSG_NO_SELECTED_TRK );
+ return C_CONTINUE;
+ }
+ if ( (Dj.inp[Dj.joinMoveState].trk = OnTrack( &pos, TRUE, TRUE )) == NULL ) {
+ return C_CONTINUE;
+ }
+ // if (Dj.joinMoveState == 0 && !CheckTrackLayerSilent( Dj.inp[Dj.joinMoveState].trk ) )
+ // return C_CONTINUE;
+ Dj.inp[Dj.joinMoveState].params.ep = PickUnconnectedEndPoint( pos,
+ Dj.inp[Dj.joinMoveState].trk ); /* CHECKME */
+ if ( Dj.inp[Dj.joinMoveState].params.ep == -1 ) {
#ifdef LATER
- ErrorMessage( MSG_NO_ENDPTS );
+ ErrorMessage( MSG_NO_ENDPTS );
#endif
- return C_CONTINUE;
- }
+ return C_CONTINUE;
+ }
#ifdef LATER
- if ( GetTrkEndTrk( Dj.inp[Dj.joinMoveState].trk, Dj.inp[Dj.joinMoveState].params.ep ) ) {
- ErrorMessage( MSG_SEL_EP_CONN );
- return C_CONTINUE;
- }
+ if ( GetTrkEndTrk( Dj.inp[Dj.joinMoveState].trk,
+ Dj.inp[Dj.joinMoveState].params.ep ) ) {
+ ErrorMessage( MSG_SEL_EP_CONN );
+ return C_CONTINUE;
+ }
#endif
- if (Dj.joinMoveState == 0) {
- Dj.joinMoveState++;
- InfoMessage( GetTrkSelected(Dj.inp[0].trk)?
- _("Click on an unselected End-Point"):
- _("Click on a selected End-Point") );
- Dj.inp[0].pos = pos;
- return C_CONTINUE;
- }
- if ( GetTrkSelected(Dj.inp[0].trk) == GetTrkSelected(Dj.inp[1].trk) ) {
- ErrorMessage( MSG_2ND_TRK_NOT_SEL_UNSEL, GetTrkSelected(Dj.inp[0].trk)
- ? _("unselected") : _("selected") );
- return C_CONTINUE;
- }
- if (GetTrkSelected(Dj.inp[0].trk))
- MoveToJoin( Dj.inp[0].trk, Dj.inp[0].params.ep, Dj.inp[1].trk, Dj.inp[1].params.ep );
- else
- MoveToJoin( Dj.inp[1].trk, Dj.inp[1].params.ep, Dj.inp[0].trk, Dj.inp[0].params.ep );
- Dj.joinMoveState = 0;
- return C_TERMINATE;
+ if (Dj.joinMoveState == 0) {
+ Dj.joinMoveState++;
+ InfoMessage( GetTrkSelected(Dj.inp[0].trk)?
+ _("Click on an unselected End-Point"):
+ _("Click on a selected End-Point") );
+ Dj.inp[0].pos = pos;
+ return C_CONTINUE;
+ }
+ if ( GetTrkSelected(Dj.inp[0].trk) == GetTrkSelected(Dj.inp[1].trk) ) {
+ ErrorMessage( MSG_2ND_TRK_NOT_SEL_UNSEL, GetTrkSelected(Dj.inp[0].trk)
+ ? _("unselected") : _("selected") );
+ return C_CONTINUE;
+ }
+ if (GetTrkSelected(Dj.inp[0].trk)) {
+ MoveToJoin( Dj.inp[0].trk, Dj.inp[0].params.ep, Dj.inp[1].trk,
+ Dj.inp[1].params.ep );
+ } else {
+ MoveToJoin( Dj.inp[1].trk, Dj.inp[1].params.ep, Dj.inp[0].trk,
+ Dj.inp[0].params.ep );
+ }
+ Dj.joinMoveState = 0;
+ return C_TERMINATE;
}
typedef enum {NO_LINE,FIRST_END,HAVE_LINE,HAVE_SECOND_LINE} LineState_t;
static struct {
- LineState_t line_state;
- int joinMoveState;
- track_p curr_line;
- struct {
- TRKTYP_T realType;
- track_p line;
- coOrd pos;
- coOrd end;
- int cnt;
- } inp[2];
- joinRes_t jRes;
- coOrd inp_pos[2];
- dynArr_t anchors_da;
- trackParams_t params;
- dynArr_t newLine;
- } Dl;
+ LineState_t line_state;
+ int joinMoveState;
+ track_p curr_line;
+ struct {
+ TRKTYP_T realType;
+ track_p line;
+ coOrd pos;
+ coOrd end;
+ int cnt;
+ } inp[2];
+ joinRes_t jRes;
+ coOrd inp_pos[2];
+ dynArr_t anchors_da;
+ trackParams_t params;
+ dynArr_t newLine;
+} Dl;
#define anchors(N) DYNARR_N(trkSeg_t,Dl.anchors_da,N)
-void AddAnchorEnd(coOrd p) {
+void AddAnchorEnd(coOrd p)
+{
DIST_T d = tempD.scale*0.15;
DYNARR_APPEND(trkSeg_t,Dl.anchors_da,1);
trkSeg_p a = &DYNARR_LAST(trkSeg_t,Dl.anchors_da);
a->type = SEG_CRVLIN;
- a->width = 0;
+ a->lineWidth = 0;
a->u.c.a0 = 0.0;
a->u.c.a1 = 360.0;
a->u.c.center = p;
@@ -462,8 +487,8 @@ void AddAnchorEnd(coOrd p) {
static STATUS_T CmdJoinLine(
- wAction_t action,
- coOrd pos )
+ wAction_t action,
+ coOrd pos )
/*
* Join 2 lines.
*/
@@ -474,16 +499,17 @@ static STATUS_T CmdJoinLine(
InfoMessage( _("Left click - Select first draw object end") );
Dl.line_state = NO_LINE;
Dl.joinMoveState = 0;
- tempSegs_da.cnt = 0;
+ DYNARR_RESET( trkSeg_t, tempSegs_da );
DYNARR_RESET(trkSeg_t,Dl.newLine);
Dl.curr_line = NULL;
+ SetAllTrackSelect( FALSE );
return C_CONTINUE;
case wActionMove:
DYNARR_RESET(trkSeg_t,Dl.anchors_da);
Dl.curr_line = NULL;
coOrd pos1= pos;
Dl.curr_line = OnTrack( &pos1, FALSE, FALSE );
- if (!Dl.curr_line) return C_CONTINUE;
+ if (!Dl.curr_line) { return C_CONTINUE; }
if (IsTrack(Dl.curr_line)) {
Dl.curr_line = NULL;
return C_CONTINUE;
@@ -497,8 +523,8 @@ static STATUS_T CmdJoinLine(
return C_CONTINUE;
}
if ( (Dl.line_state != NO_LINE) &&
- (Dl.inp[0].line == Dl.curr_line) &&
- (IsClose(FindDistance(Dl.inp[0].pos,Dl.params.lineOrig)) ) ) {
+ (Dl.inp[0].line == Dl.curr_line) &&
+ (IsClose(FindDistance(Dl.inp[0].pos,Dl.params.lineOrig)) ) ) {
Dl.curr_line = NULL;
} else {
AddAnchorEnd(Dl.params.lineOrig);
@@ -513,8 +539,8 @@ static STATUS_T CmdJoinLine(
InfoMessage( _("Not a line - Try again") );
return C_CONTINUE;
}
- if (!QueryTrack(Dl.curr_line,Q_GET_NODES)) return C_CONTINUE;
- if (!GetTrackParams(PARAMS_NODES,Dl.curr_line,pos,&Dl.params)) return C_CONTINUE;
+ if (!QueryTrack(Dl.curr_line,Q_GET_NODES)) { return C_CONTINUE; }
+ if (!GetTrackParams(PARAMS_NODES,Dl.curr_line,pos,&Dl.params)) { return C_CONTINUE; }
Dl.line_state = HAVE_LINE;
Dl.inp[0].line = Dl.curr_line;
Dl.inp[0].pos = Dl.params.lineOrig;
@@ -523,14 +549,25 @@ static STATUS_T CmdJoinLine(
DYNARR_LAST(trkSeg_t,Dl.newLine).type = SEG_POLY;
DYNARR_LAST(trkSeg_t,Dl.newLine).color = wDrawColorBlack;
- DYNARR_LAST(trkSeg_t,Dl.newLine).width = 0;
+ DYNARR_LAST(trkSeg_t,Dl.newLine).lineWidth = 0;
DYNARR_LAST(trkSeg_t,Dl.newLine).u.p.polyType = POLYLINE;
- DYNARR_LAST(trkSeg_t,Dl.newLine).u.p.pts = MyMalloc(sizeof(pts_t)*Dl.params.nodes.cnt);
+ DYNARR_LAST(trkSeg_t,Dl.newLine).u.p.pts = MyMalloc(sizeof(
+ pts_t)*Dl.params.nodes.cnt);
DYNARR_LAST(trkSeg_t,Dl.newLine).u.p.cnt = Dl.params.nodes.cnt;
- //Copy in reverse as we want this point to be last
- for (int i=0;i<Dl.params.nodes.cnt;i++) {
- DYNARR_LAST(trkSeg_t,Dl.newLine).u.p.pts[i].pt = DYNARR_N(coOrd,Dl.params.nodes,Dl.params.nodes.cnt-1-i);
- DYNARR_LAST(trkSeg_t,Dl.newLine).u.p.pts[i].pt_type = wPolyLineStraight;
+ if (Dl.params.ep) {
+ //Copy in reverse as we want this point to be last
+ for (int i=Dl.params.nodes.cnt-1,j=0; i>=0; i--,j++) {
+ DYNARR_LAST(trkSeg_t,Dl.newLine).u.p.pts[j].pt = DYNARR_N(coOrd,Dl.params.nodes,
+ i);
+ DYNARR_LAST(trkSeg_t,Dl.newLine).u.p.pts[j].pt_type = wPolyLineStraight;
+ }
+ } else {
+ //Copy forwards to end up with this point last
+ for (int i=0; i<Dl.params.nodes.cnt; i++) {
+ DYNARR_LAST(trkSeg_t,Dl.newLine).u.p.pts[i].pt = DYNARR_N(coOrd,Dl.params.nodes,
+ i);
+ DYNARR_LAST(trkSeg_t,Dl.newLine).u.p.pts[i].pt_type = wPolyLineStraight;
+ }
}
InfoMessage( _("Left click - Select second object end") );
} else {
@@ -539,11 +576,11 @@ static STATUS_T CmdJoinLine(
InfoMessage( _("Not a line - Try again") );
return C_CONTINUE;
}
- if (!QueryTrack(Dl.curr_line,Q_GET_NODES)) return C_CONTINUE;
- if (!GetTrackParams(PARAMS_NODES,Dl.curr_line,pos,&Dl.params)) return C_CONTINUE;
+ if (!QueryTrack(Dl.curr_line,Q_GET_NODES)) { return C_CONTINUE; }
+ if (!GetTrackParams(PARAMS_NODES,Dl.curr_line,pos,&Dl.params)) { return C_CONTINUE; }
if (Dl.curr_line == Dl.inp[0].line) {
if ((Dl.params.lineOrig.x == Dl.inp[0].pos.x) &&
- (Dl.params.lineOrig.y == Dl.inp[0].pos.y)) {
+ (Dl.params.lineOrig.y == Dl.inp[0].pos.y)) {
InfoMessage( _("Same draw object and same endpoint - Try again") );
return C_CONTINUE;
}
@@ -555,17 +592,31 @@ static STATUS_T CmdJoinLine(
int old_cnt = DYNARR_LAST(trkSeg_t,Dl.newLine).u.p.cnt;
BOOL_T join_near = FALSE;
if (Dl.inp[1].line == Dl.inp[0].line) {
- DYNARR_LAST(trkSeg_t,Dl.newLine).u.p.pts = MyRealloc(DYNARR_LAST(trkSeg_t,Dl.newLine).u.p.pts,sizeof(pts_t)*(old_cnt+1));
- DYNARR_LAST(trkSeg_t,Dl.newLine).u.p.pts[old_cnt] = DYNARR_LAST(trkSeg_t,Dl.newLine).u.p.pts[0]; // Joined up Polygon
+ DYNARR_LAST(trkSeg_t,Dl.newLine).u.p.pts = MyRealloc(DYNARR_LAST(trkSeg_t,
+ Dl.newLine).u.p.pts,sizeof(pts_t)*(old_cnt+1));
+ DYNARR_LAST(trkSeg_t,Dl.newLine).u.p.pts[old_cnt] = DYNARR_LAST(trkSeg_t,
+ Dl.newLine).u.p.pts[0]; // Joined up Polygon
DYNARR_LAST(trkSeg_t,Dl.newLine).u.p.cnt += 1;
} else {
- if (IsClose(FindDistance(Dl.inp[0].pos,Dl.inp[1].pos)))
+ if (IsClose(FindDistance(Dl.inp[0].pos,Dl.inp[1].pos))) {
join_near = TRUE;
- DYNARR_LAST(trkSeg_t,Dl.newLine).u.p.pts = MyRealloc(DYNARR_LAST(trkSeg_t,Dl.newLine).u.p.pts,sizeof(pts_t)*(old_cnt+Dl.params.nodes.cnt-join_near));
- //Copy forwards as this point is first
- for (int i=join_near;i<Dl.params.nodes.cnt;i++) {
- DYNARR_LAST(trkSeg_t,Dl.newLine).u.p.pts[i-join_near+old_cnt].pt = DYNARR_N(coOrd,Dl.params.nodes,i);
- DYNARR_LAST(trkSeg_t,Dl.newLine).u.p.pts[i-join_near+old_cnt].pt_type = wPolyLineStraight;
+ }
+ DYNARR_LAST(trkSeg_t,Dl.newLine).u.p.pts = MyRealloc(DYNARR_LAST(trkSeg_t,
+ Dl.newLine).u.p.pts,sizeof(pts_t)*(old_cnt+Dl.params.nodes.cnt-join_near));
+ if (Dl.params.ep) {
+ //Copy forwards as this point is first
+ for (int i=join_near,j=old_cnt; i<Dl.params.nodes.cnt; i++,j++) {
+ DYNARR_LAST(trkSeg_t,Dl.newLine).u.p.pts[j].pt = DYNARR_N(coOrd,Dl.params.nodes,
+ i);
+ DYNARR_LAST(trkSeg_t,Dl.newLine).u.p.pts[j].pt_type = wPolyLineStraight;
+ }
+ } else {
+ //Copy backwards as this point is last
+ for (int i=Dl.params.nodes.cnt-join_near-1,j=old_cnt; i>=0; i--,j++) {
+ DYNARR_LAST(trkSeg_t,Dl.newLine).u.p.pts[j].pt = DYNARR_N(coOrd,Dl.params.nodes,
+ i);
+ DYNARR_LAST(trkSeg_t,Dl.newLine).u.p.pts[j].pt_type = wPolyLineStraight;
+ }
}
DYNARR_LAST(trkSeg_t,Dl.newLine).u.p.cnt += Dl.params.nodes.cnt-join_near;
}
@@ -576,13 +627,14 @@ static STATUS_T CmdJoinLine(
case C_MOVE:
break;
case C_UP:
- if (Dl.line_state != HAVE_SECOND_LINE) return C_CONTINUE;
+ if (Dl.line_state != HAVE_SECOND_LINE) { return C_CONTINUE; }
Dl.line_state = NO_LINE;
UndoStart(_("Create PolyLine"), "newPolyLine");
track_p newTrack = MakePolyLineFromSegs( zero, 0.0, &Dl.newLine );
DeleteTrack(Dl.inp[0].line,FALSE);
- if (Dl.inp[0].line != Dl.inp[1].line)
+ if (Dl.inp[0].line != Dl.inp[1].line) {
DeleteTrack(Dl.inp[1].line,FALSE);
+ }
UndoEnd();
DrawNewTrack(newTrack);
CleanSegs(&Dl.newLine);
@@ -595,10 +647,15 @@ static STATUS_T CmdJoinLine(
Dl.curr_line = NULL;
break;
case C_REDRAW:
- if (Dl.line_state != NO_LINE) DrawSegs(&tempD,zero,0.0,((trkSeg_t*)Dl.newLine.ptr), Dl.newLine.cnt, trackGauge, wDrawColorPreviewSelected);
- if (Dl.curr_line) DrawTrack(Dl.curr_line,&tempD,wDrawColorPreviewSelected);
- if (Dl.anchors_da.cnt>0)
- DrawSegs( &tempD, zero, 0.0, &anchors(0), Dl.anchors_da.cnt, trackGauge, wDrawColorPreviewSelected );
+ if (Dl.line_state != NO_LINE) {
+ DrawSegsDA(&tempD,NULL,zero,0.0,&Dl.newLine, trackGauge,
+ wDrawColorPreviewSelected,0);
+ }
+ if (Dl.curr_line) {
+ DrawTrack(Dl.curr_line,&tempD,wDrawColorPreviewSelected);
+ }
+ DrawSegsDA( &tempD, NULL, zero, 0.0, &Dl.anchors_da, trackGauge,
+ wDrawColorPreviewSelected, 0 );
break;
case C_TEXT:
case C_OK:
@@ -611,34 +668,37 @@ static STATUS_T CmdJoinLine(
}
-void AnchorTempLine(coOrd p0, coOrd p1) {
+void AnchorTempLine(coOrd p0, coOrd p1)
+{
DYNARR_APPEND(trkSeg_t,Dj.anchors,1);
trkSeg_p p = &DYNARR_LAST(trkSeg_t,Dj.anchors);
p->type = SEG_STRLIN;
p->color = wDrawColorBlue;
- p->width = 0.0;
+ p->lineWidth = 0.0;
p->u.l.pos[0] = p0;
p->u.l.pos[1] = p1;
}
-void AnchorTempCircle(coOrd center,DIST_T radius, ANGLE_T a0, ANGLE_T a1) {
+void AnchorTempCircle(coOrd center,DIST_T radius, ANGLE_T a0, ANGLE_T a1)
+{
DYNARR_APPEND(trkSeg_t,Dj.anchors,1);
trkSeg_p p = &DYNARR_LAST(trkSeg_t,Dj.anchors);
p->type = SEG_CRVLIN;
p->color = wDrawColorBlue;
- p->width = 0.0;
+ p->lineWidth = 0.0;
p->u.c.a0 =a0;
p->u.c.a1 = a1;
p->u.c.radius = radius;
p->u.c.center = center;
}
-void AnchorPoint(coOrd center) {
+void AnchorPoint(coOrd center)
+{
DYNARR_APPEND(trkSeg_t,Dj.anchors,1);
trkSeg_p p = &DYNARR_LAST(trkSeg_t,Dj.anchors);
p->type = SEG_CRVLIN;
p->color = wDrawColorAqua;
- p->width = 0.0;
+ p->lineWidth = 0.0;
p->u.c.a0 =0.0;
p->u.c.a1 = 360.0;
p->u.c.radius = mainD.scale/4;
@@ -653,104 +713,130 @@ static paramData_t joinPLs[] = {
#define joinRadI 0
{ PD_FLOAT, &desired_radius, "radius", PDO_DIM, &r_0_10000, N_("Desired Radius") }
};
-static paramGroup_t joinPG = { "join-fixed", 0, joinPLs, sizeof joinPLs/sizeof joinPLs[0] };
+static paramGroup_t joinPG = { "joinfixed", 0, joinPLs, COUNT( joinPLs ) };
-BOOL_T AdjustPosToRadius(coOrd *pos, DIST_T desired_radius, ANGLE_T an0, ANGLE_T an1) {
+BOOL_T AdjustPosToRadius(coOrd *pos, DIST_T desired_radius, ANGLE_T an0,
+ ANGLE_T an1)
+{
coOrd point1,point2;
switch ( Dj.inp[1].params.type ) {
- case curveTypeCurve:
- if (Dj.inp[0].params.type == curveTypeStraight) {
- coOrd newP, newP1;
- //Offset curve by desired_radius
- DIST_T newR1;
- newR1 = Dj.inp[1].params.arcR + desired_radius*((fabs(an1-Dj.inp[1].params.arcA0)<1.0)?1:-1);
- if (newR1<=0.0) {
- if (debug) InfoMessage("Zero Radius C1");
- return FALSE;
- }
- //Offset line by desired_radius
- Translate(&newP,Dj.inp[0].params.lineEnd,an0,desired_radius);
- Translate(&newP1,Dj.inp[0].params.lineOrig,an0,desired_radius);
- if (debug)
- AnchorTempLine(newP,newP1);
- //Intersect - this is the joining curve center
- if (debug)
- AnchorTempCircle(Dj.inp[1].params.arcP,newR1,Dj.inp[1].params.arcA0,Dj.inp[1].params.arcA1);
- if (!FindArcAndLineIntersections(&point1,&point2,Dj.inp[1].params.arcP,newR1,newP,newP1))
- return FALSE;
- } else if (Dj.inp[0].params.type == curveTypeCurve) {
- //Offset curve by desired_radius
- DIST_T newR0;
- newR0 = Dj.inp[0].params.arcR + desired_radius*((fabs(an0-Dj.inp[0].params.arcA0)<1.0)?1:-1);
- if (newR0<=0.0) {
- if (debug) InfoMessage("Zero Radius C0");
- return FALSE;
- }
- //Offset curve by desired_radius
- if (debug)
- AnchorTempCircle(Dj.inp[0].params.arcP,newR0,Dj.inp[0].params.arcA0,Dj.inp[0].params.arcA1);
- DIST_T newR1;
- newR1 = Dj.inp[1].params.arcR + desired_radius*((fabs(an1-Dj.inp[1].params.arcA0)<1.0)?1:-1);
- if (newR1<=0.0) {
- if (debug) InfoMessage("Zero Radius C1");
- return FALSE;
- }
- //Intersect - this is the joining curve center
- if (debug)
- AnchorTempCircle(Dj.inp[1].params.arcP,newR1,Dj.inp[1].params.arcA0,Dj.inp[1].params.arcA1);
- if (!FindArcIntersections(&point1,&point2,Dj.inp[0].params.arcP,newR0,Dj.inp[1].params.arcP,newR1))
- return FALSE;
+ case curveTypeCurve:
+ if (Dj.inp[0].params.type == curveTypeStraight) {
+ coOrd newP, newP1;
+ //Offset curve by desired_radius
+ DIST_T newR1;
+ newR1 = Dj.inp[1].params.arcR + desired_radius*((fabs(an1
+ -Dj.inp[1].params.arcA0)<1.0)?1:-1);
+ if (newR1<=0.0) {
+ if (debug) { InfoMessage("Zero Radius C1"); }
+ return FALSE;
}
+ //Offset line by desired_radius
+ Translate(&newP,Dj.inp[0].params.lineEnd,an0,desired_radius);
+ Translate(&newP1,Dj.inp[0].params.lineOrig,an0,desired_radius);
if (debug) {
- AnchorPoint(point1);
- AnchorPoint(point2);
+ AnchorTempLine(newP,newP1);
}
- break;
- case curveTypeStraight:
- if (Dj.inp[0].params.type == curveTypeStraight) {
- coOrd newI,newP0,newP01, newP1, newP11;
- //Offset line1 by desired_radius
- Translate(&newP0,Dj.inp[0].params.lineEnd,an0,desired_radius);
- Translate(&newP01,Dj.inp[0].params.lineOrig,an0,desired_radius);
- if (debug)
- AnchorTempLine(newP0,newP01);
- //Offset line2 by desired_radius
- Translate(&newP1,Dj.inp[1].params.lineEnd,an1,desired_radius);
- Translate(&newP11,Dj.inp[1].params.lineOrig,an1,desired_radius);
- if (debug)
- AnchorTempLine(newP1,newP11);
- if (!FindIntersection(&newI,newP0,Dj.inp[0].params.angle,newP1,Dj.inp[1].params.angle))
- return FALSE;
- point1 = point2 = newI;
- } else if (Dj.inp[0].params.type == curveTypeCurve) {
- coOrd newP, newP1;
- //Offset curve by desired_radius
- DIST_T newR0;
- newR0 = Dj.inp[0].params.arcR + desired_radius*((fabs(an0-Dj.inp[0].params.arcA0)<1.0)?1:-1);
- if (newR0<=0.0) {
- if (debug) InfoMessage("Zero Radius C0");
- return FALSE;
- }
- if (debug)
- AnchorTempCircle(Dj.inp[0].params.arcP,newR0,Dj.inp[0].params.arcA0,Dj.inp[0].params.arcA1);
- //Offset line by desired_radius
- Translate(&newP,Dj.inp[1].params.lineEnd,an1,desired_radius);
- Translate(&newP1,Dj.inp[1].params.lineOrig,an1,desired_radius);
- if (debug)
- AnchorTempLine(newP,newP1);
- //Intersect - this is the joining curve center
- if (!FindArcAndLineIntersections(&point1,&point2,Dj.inp[0].params.arcP,newR0,newP,newP1))
- return FALSE;
+ //Intersect - this is the joining curve center
+ if (debug) {
+ AnchorTempCircle(Dj.inp[1].params.arcP,newR1,Dj.inp[1].params.arcA0,
+ Dj.inp[1].params.arcA1);
}
+ if (!FindArcAndLineIntersections(&point1,&point2,Dj.inp[1].params.arcP,newR1,
+ newP,newP1)) {
+ return FALSE;
+ }
+ } else if (Dj.inp[0].params.type == curveTypeCurve) {
+ //Offset curve by desired_radius
+ DIST_T newR0;
+ newR0 = Dj.inp[0].params.arcR + desired_radius*((fabs(an0
+ -Dj.inp[0].params.arcA0)<1.0)?1:-1);
+ if (newR0<=0.0) {
+ if (debug) { InfoMessage("Zero Radius C0"); }
+ return FALSE;
+ }
+ //Offset curve by desired_radius
if (debug) {
- AnchorPoint(point1);
- AnchorPoint(point2);
+ AnchorTempCircle(Dj.inp[0].params.arcP,newR0,Dj.inp[0].params.arcA0,
+ Dj.inp[0].params.arcA1);
}
- break;
- default:
- return FALSE;
+ DIST_T newR1;
+ newR1 = Dj.inp[1].params.arcR + desired_radius*((fabs(an1
+ -Dj.inp[1].params.arcA0)<1.0)?1:-1);
+ if (newR1<=0.0) {
+ if (debug) { InfoMessage("Zero Radius C1"); }
+ return FALSE;
+ }
+ //Intersect - this is the joining curve center
+ if (debug) {
+ AnchorTempCircle(Dj.inp[1].params.arcP,newR1,Dj.inp[1].params.arcA0,
+ Dj.inp[1].params.arcA1);
+ }
+ if (!FindArcIntersections(&point1,&point2,Dj.inp[0].params.arcP,newR0,
+ Dj.inp[1].params.arcP,newR1)) {
+ return FALSE;
+ }
+ }
+ if (debug) {
+ AnchorPoint(point1);
+ AnchorPoint(point2);
+ }
+ break;
+ case curveTypeStraight:
+ if (Dj.inp[0].params.type == curveTypeStraight) {
+ coOrd newI,newP0,newP01, newP1, newP11;
+ //Offset line1 by desired_radius
+ Translate(&newP0,Dj.inp[0].params.lineEnd,an0,desired_radius);
+ Translate(&newP01,Dj.inp[0].params.lineOrig,an0,desired_radius);
+ if (debug) {
+ AnchorTempLine(newP0,newP01);
+ }
+ //Offset line2 by desired_radius
+ Translate(&newP1,Dj.inp[1].params.lineEnd,an1,desired_radius);
+ Translate(&newP11,Dj.inp[1].params.lineOrig,an1,desired_radius);
+ if (debug) {
+ AnchorTempLine(newP1,newP11);
+ }
+ if (!FindIntersection(&newI,newP0,Dj.inp[0].params.angle,newP1,
+ Dj.inp[1].params.angle)) {
+ return FALSE;
+ }
+ point1 = point2 = newI;
+ } else if (Dj.inp[0].params.type == curveTypeCurve) {
+ coOrd newP, newP1;
+ //Offset curve by desired_radius
+ DIST_T newR0;
+ newR0 = Dj.inp[0].params.arcR + desired_radius*((fabs(an0
+ -Dj.inp[0].params.arcA0)<1.0)?1:-1);
+ if (newR0<=0.0) {
+ if (debug) { InfoMessage("Zero Radius C0"); }
+ return FALSE;
+ }
+ if (debug) {
+ AnchorTempCircle(Dj.inp[0].params.arcP,newR0,Dj.inp[0].params.arcA0,
+ Dj.inp[0].params.arcA1);
+ }
+ //Offset line by desired_radius
+ Translate(&newP,Dj.inp[1].params.lineEnd,an1,desired_radius);
+ Translate(&newP1,Dj.inp[1].params.lineOrig,an1,desired_radius);
+ if (debug) {
+ AnchorTempLine(newP,newP1);
+ }
+ //Intersect - this is the joining curve center
+ if (!FindArcAndLineIntersections(&point1,&point2,Dj.inp[0].params.arcP,newR0,
+ newP,newP1)) {
+ return FALSE;
+ }
+ }
+ if (debug) {
+ AnchorPoint(point1);
+ AnchorPoint(point2);
+ }
+ break;
+ default:
+ return FALSE;
}
if (FindDistance(*pos,point1)<=FindDistance(*pos,point2)) {
if (Dj.inp[1].params.type == curveTypeCurve) {
@@ -763,27 +849,30 @@ BOOL_T AdjustPosToRadius(coOrd *pos, DIST_T desired_radius, ANGLE_T an0, ANGLE_T
if (Dj.inp[1].params.type == curveTypeCurve) {
ANGLE_T a = FindAngle(Dj.inp[1].params.arcP,point2);
Translate(pos,Dj.inp[1].params.arcP,a,Dj.inp[1].params.arcR);
- } else
+ } else {
Translate(pos,point2,NormalizeAngle(an1+180),desired_radius);
+ }
}
return TRUE;
}
-void AddAnchorJoin(coOrd pos, ANGLE_T angle) {
+void AddAnchorJoin(coOrd pos, ANGLE_T angle)
+{
DIST_T d = tempD.scale*0.15;
DYNARR_APPEND(trkSeg_t,Dj.anchors,1);
trkSeg_p a = &DYNARR_LAST(trkSeg_t,Dj.anchors);
a->type = SEG_CRVLIN;
- a->width = 0;
+ a->lineWidth = 0;
a->u.c.a0 = 0.0;
a->u.c.a1 = 360.0;
a->u.c.center = pos;
a->u.c.radius = d/2;
a->color = wDrawColorBlue;
DYNARR_SET(trkSeg_t,Dj.anchors,Dj.anchors.cnt+5);
- DrawArrowHeads(&DYNARR_N(trkSeg_t,Dj.anchors,Dj.anchors.cnt-5),pos,angle,FALSE,wDrawColorBlue);
+ DrawArrowHeads(&DYNARR_N(trkSeg_t,Dj.anchors,Dj.anchors.cnt-5),pos,angle,FALSE,
+ wDrawColorBlue);
}
@@ -793,8 +882,8 @@ static coOrd anchor_pos;
static ANGLE_T anchor_angle = 0.0;
static STATUS_T CmdJoin(
- wAction_t action,
- coOrd pos )
+ wAction_t action,
+ coOrd pos )
/*
* Join 2 tracks.
*/
@@ -812,17 +901,20 @@ static STATUS_T CmdJoin(
BOOL_T ok;
wControl_p controls[2];
char * labels[1];
+ trkSeg_p p;
switch (action&0xFF) {
case C_START:
if (joinPLs[0].control==NULL) {
- ParamCreateControls(&joinPG, NULL);
+ ParamCreateControls(&joinPG, NULL);
}
- if (selectedTrackCount==0)
+ if (selectedTrackCount==0) {
InfoMessage( _("Left click - join with track") );
- else
- InfoMessage( _("Left click - join with track, Shift Left click - move to join") );
+ } else {
+ InfoMessage(
+ _("Left click - join with track, Shift Left click - move to join") );
+ }
DYNARR_RESET(trkSeg_t,Dj.anchors);
Dj.state = 0;
Dj.joinMoveState = 0;
@@ -830,68 +922,96 @@ static STATUS_T CmdJoin(
/*ParamGroupRecord( &easementPG );*/
infoSubst = FALSE;
anchor_trk = NULL;
- if (easementVal < 0.0)
+ if (easementVal < 0.0) {
+ commandContext = I2VP(cornuJoinTrack);
return CmdCornu(action, pos);
+ }
return C_CONTINUE;
case wActionMove:
anchor_trk = NULL;
DYNARR_RESET(rkSeg_t,Dj.anchors);
- if ((easementVal < 0) && Dj.joinMoveState == 0 )
+ if ((easementVal < 0) && Dj.joinMoveState == 0 ) {
+ commandContext = I2VP(cornuJoinTrack);
return CmdCornu(action, pos);
- if ( Dj.state >= 2) return C_CONTINUE;
- if ( (trk = OnTrack( &pos, FALSE, TRUE )) == NULL)
+ }
+ if ( Dj.state >= 2) { return C_CONTINUE; }
+ if ( (trk = OnTrack( &pos, FALSE, TRUE )) == NULL) {
return C_CONTINUE;
- if (!CheckTrackLayer( trk ) )
+ }
+ if (!CheckTrackLayer( trk ) ) {
return C_CONTINUE;
- if ((Dj.state > 0) && (trk == Dj.inp[0].trk))
+ }
+ if ((Dj.state > 0) && (trk == Dj.inp[0].trk)) {
return C_CONTINUE;
+ }
trackParams_t moveParams;
- if (!GetTrackParams( PARAMS_1ST_JOIN, trk, pos, &moveParams ))
+ if (!GetTrackParams( PARAMS_1ST_JOIN, trk, pos, &moveParams )) {
return C_CONTINUE;
+ }
+ if (moveParams.type == curveTypeBezier || moveParams.type == curveTypeCornu) {
+ if (!(easementVal<0)) {
+ return C_CONTINUE;
+ }
+ }
ep = PickUnconnectedEndPointSilent(pos,trk);
- if (ep <0) return C_CONTINUE;
- if (IsClose(FindDistance(GetTrkEndPos(trk,ep),pos)))
+ if (ep <0) { return C_CONTINUE; }
+ if (IsClose(FindDistance(GetTrkEndPos(trk,ep),pos))) {
anchor_angle = GetTrkEndAngle(trk,ep);
- else
+ } else {
anchor_angle = FindAngle(pos,GetTrkEndPos(trk,ep));
+ }
anchor_trk = trk;
anchor_pos = pos;
AddAnchorJoin(pos,anchor_angle);
break;
-
+
case C_DOWN:
- if ( !Dj.cornuMode && ((Dj.state == 0 && (MyGetKeyState() & WKEY_SHIFT) != 0) || Dj.joinMoveState != 0) )
+ if ( !Dj.cornuMode && ((Dj.state == 0 && (MyGetKeyState() & WKEY_SHIFT) != 0)
+ || Dj.joinMoveState != 0) ) {
return DoMoveToJoin( pos );
+ }
if (easementVal < 0.0 && Dj.joinMoveState == 0) {
Dj.cornuMode = TRUE;
+ commandContext = I2VP(cornuJoinTrack);
return CmdCornu(action, pos);
}
DYNARR_SET( trkSeg_t, tempSegs_da, 3 );
tempSegs(0).color = drawColorBlack;
- tempSegs(0).width = 0;
+ tempSegs(0).lineWidth = 0;
tempSegs(1).color = drawColorBlack;
- tempSegs(1).width = 0;
+ tempSegs(1).lineWidth = 0;
tempSegs(2).color = drawColorBlack;
- tempSegs(2).width = 0;
- tempSegs_da.cnt = 0;
+ tempSegs(2).lineWidth = 0;
+ DYNARR_RESET( trkSeg_t, tempSegs_da );
Dj.joinMoveState = 0;
-/* Populate (Dj.inp[0]) and check for connecting abutting tracks */
+ /* Populate (Dj.inp[0]) and check for connecting abutting tracks */
if (Dj.state == 0) {
- if ( (Dj.inp[0].trk = OnTrack( &pos, TRUE, TRUE )) == NULL)
+ if ( (Dj.inp[0].trk = OnTrack( &pos, TRUE, TRUE )) == NULL) {
return C_CONTINUE;
- if (!CheckTrackLayer( Dj.inp[0].trk ) )
+ }
+ if (!CheckTrackLayer( Dj.inp[0].trk ) ) {
return C_CONTINUE;
+ }
Dj.inp[0].pos = pos;
-LOG( log_join, 1, ("JOIN: 1st track %d @[%0.3f %0.3f]\n",
- GetTrkIndex(Dj.inp[0].trk), Dj.inp[0].pos.x, Dj.inp[1].pos.y ) )
- if (!GetTrackParams( PARAMS_1ST_JOIN, Dj.inp[0].trk, pos, &Dj.inp[0].params ))
+ LOG( log_join, 1, ("JOIN: 1st track %d @[%0.3f %0.3f]\n",
+ GetTrkIndex(Dj.inp[0].trk), Dj.inp[0].pos.x, Dj.inp[1].pos.y ) )
+ if (!GetTrackParams( PARAMS_1ST_JOIN, Dj.inp[0].trk, pos, &Dj.inp[0].params )) {
return C_CONTINUE;
+ }
+ if (Dj.inp[0].params.type == curveTypeBezier
+ || Dj.inp[0].params.type == curveTypeCornu) {
+ if (!(easementVal<0 && Dj.cornuMode)) {
+ ErrorMessage( MSG_JOIN_NOTBEZIERORCORNU);
+ return C_CONTINUE;
+ }
+ }
Dj.inp[0].realType = GetTrkType(Dj.inp[0].trk);
InfoMessage( _("Select 2nd track") );
Dj.state = 1;
- wPrefGetFloat("misc", "desired_radius", &desired_radius, desired_radius);
+ sprintf(message, "desired_radius-%s", curScaleName);
+ wPrefGetFloat("misc", message, &desired_radius, desired_radius);
controls[0] = joinRadPD.control;
controls[1] = NULL;
labels[0] = N_("Desired Radius");
@@ -902,34 +1022,42 @@ LOG( log_join, 1, ("JOIN: 1st track %d @[%0.3f %0.3f]\n",
ParamGroupRecord(&joinPG);
return C_CONTINUE;
} else {
- if ( (Dj.inp[1].trk = OnTrack( &pos, FALSE, TRUE )) == NULL)
+ if ( (Dj.inp[1].trk = OnTrack( &pos, FALSE, TRUE )) == NULL) {
return C_CONTINUE;
- if (!CheckTrackLayer( Dj.inp[1].trk ) )
+ }
+ if (!CheckTrackLayer( Dj.inp[1].trk ) ) {
return C_CONTINUE;
+ }
Dj.inp[1].pos = pos;
- if (!GetTrackParams( PARAMS_2ND_JOIN, Dj.inp[1].trk, pos, &Dj.inp[1].params ))
+ if (!GetTrackParams( PARAMS_2ND_JOIN, Dj.inp[1].trk, pos, &Dj.inp[1].params )) {
return C_CONTINUE;
+ }
if ( Dj.inp[0].trk == Dj.inp[1].trk ) {
ErrorMessage( MSG_JOIN_SAME );
return C_CONTINUE;
}
- if (infoSubst)
+ if (infoSubst) {
InfoSubstituteControls(NULL, NULL);
+ }
infoSubst = FALSE;
Dj.inp[1].realType = GetTrkType(Dj.inp[1].trk);
- if ( IsCurveCircle( Dj.inp[0].trk ) )
- Dj.inp[0].params.ep = PickArcEndPt( Dj.inp[0].params.arcP, Dj.inp[0].pos, pos );
- if ( IsCurveCircle( Dj.inp[1].trk ) )
- Dj.inp[1].params.ep = PickArcEndPt( Dj.inp[1].params.arcP, pos, Dj.inp[0].pos );
-
-LOG( log_join, 1, (" 2nd track %d, @[%0.3f %0.3f] EP0=%d EP1=%d\n",
- GetTrkIndex(Dj.inp[1].trk), Dj.inp[1].pos.x, Dj.inp[1].pos.y,
- Dj.inp[0].params.ep, Dj.inp[1].params.ep ) )
-LOG( log_join, 1, ("P1=[%0.3f %0.3f]\n", pos.x, pos.y ) )
+ if ( IsCurveCircle( Dj.inp[0].trk ) ) {
+ Dj.inp[0].params.ep = PickArcEndPt( Dj.inp[0].params.arcP, Dj.inp[0].pos,
+ pos );
+ }
+ if ( IsCurveCircle( Dj.inp[1].trk ) ) {
+ Dj.inp[1].params.ep = PickArcEndPt( Dj.inp[1].params.arcP, pos,
+ Dj.inp[0].pos );
+ }
+
+ LOG( log_join, 1, (" 2nd track %d, @[%0.3f %0.3f] EP0=%d EP1=%d\n",
+ GetTrkIndex(Dj.inp[1].trk), Dj.inp[1].pos.x, Dj.inp[1].pos.y,
+ Dj.inp[0].params.ep, Dj.inp[1].params.ep ) )
+ LOG( log_join, 1, ("P1=[%0.3f %0.3f]\n", pos.x, pos.y ) )
BOOL_T only_merge = FALSE;
if ( (Dj.inp[0].params.ep >=0) &&
- (GetTrkEndTrk(Dj.inp[0].trk,Dj.inp[0].params.ep) != NULL)) {
+ (GetTrkEndTrk(Dj.inp[0].trk,Dj.inp[0].params.ep) != NULL)) {
if (GetTrkEndTrk(Dj.inp[0].trk,Dj.inp[0].params.ep) != Dj.inp[1].trk) {
only_merge = TRUE;
ErrorMessage( MSG_TRK_ALREADY_CONN, _("First") );
@@ -937,34 +1065,43 @@ LOG( log_join, 1, ("P1=[%0.3f %0.3f]\n", pos.x, pos.y ) )
}
}
if ( (Dj.inp[1].params.ep >= 0) &&
- (GetTrkEndTrk(Dj.inp[1].trk,Dj.inp[1].params.ep) != NULL)) {
+ (GetTrkEndTrk(Dj.inp[1].trk,Dj.inp[1].params.ep) != NULL)) {
if (GetTrkEndTrk(Dj.inp[1].trk,Dj.inp[1].params.ep) != Dj.inp[0].trk) {
only_merge = TRUE;
ErrorMessage( MSG_TRK_ALREADY_CONN, _("Second") );
return C_CONTINUE;
}
}
+ if (Dj.inp[1].params.type == curveTypeBezier
+ || Dj.inp[1].params.type == curveTypeCornu) {
+ if (!(easementVal<0 && Dj.cornuMode)) {
+ ErrorMessage( MSG_JOIN_NOTBEZIERORCORNU);
+ return C_CONTINUE;
+ }
+ }
rc = C_CONTINUE;
if ( MergeTracks( Dj.inp[0].trk, Dj.inp[0].params.ep,
- Dj.inp[1].trk, Dj.inp[1].params.ep ) ) {
+ Dj.inp[1].trk, Dj.inp[1].params.ep ) ) {
rc = C_TERMINATE;
} else if (only_merge) {
rc = C_TERMINATE;
} else if ( Dj.inp[0].params.ep >= 0 && Dj.inp[1].params.ep >= 0 ) {
if ( Dj.inp[0].params.type == curveTypeStraight &&
- Dj.inp[1].params.type == curveTypeStraight &&
- ExtendStraightToJoin( Dj.inp[0].trk, Dj.inp[0].params.ep,
- Dj.inp[1].trk, Dj.inp[1].params.ep ) )
+ Dj.inp[1].params.type == curveTypeStraight &&
+ ExtendStraightToJoin( Dj.inp[0].trk, Dj.inp[0].params.ep,
+ Dj.inp[1].trk, Dj.inp[1].params.ep ) ) {
rc = C_TERMINATE;
+ }
if ( ConnectAbuttingTracks( Dj.inp[0].trk, Dj.inp[0].params.ep,
- Dj.inp[1].trk, Dj.inp[1].params.ep ) )
+ Dj.inp[1].trk, Dj.inp[1].params.ep ) ) {
rc = C_TERMINATE;
+ }
}
if ( rc == C_TERMINATE ) {
return rc;
}
if ( QueryTrack( Dj.inp[0].trk, Q_CANNOT_BE_ON_END ) ||
- QueryTrack( Dj.inp[1].trk, Q_CANNOT_BE_ON_END ) ) {
+ QueryTrack( Dj.inp[1].trk, Q_CANNOT_BE_ON_END ) ) {
ErrorMessage( MSG_JOIN_EASEMENTS );
return C_CONTINUE;
}
@@ -972,23 +1109,27 @@ LOG( log_join, 1, ("P1=[%0.3f %0.3f]\n", pos.x, pos.y ) )
Dj.state = 2;
Dj.jRes.flip = FALSE;
}
- tempSegs_da.cnt = 0;
/* no break */
-
+
case C_MOVE:
- if (easementVal < 0 && Dj.cornuMode)
+ DYNARR_RESET( trkSeg_t, tempSegs_da );
+ if (easementVal < 0 && Dj.cornuMode) {
+ commandContext = I2VP(cornuJoinTrack);
return CmdCornu(action, pos);
+ }
-LOG( log_join, 3, ("P1=[%0.3f %0.3f]\n", pos.x, pos.y ) )
- if (Dj.state != 2)
+ LOG( log_join, 3, ("P1=[%0.3f %0.3f]\n", pos.x, pos.y ) )
+ if (Dj.state != 2) {
return C_CONTINUE;
+ }
DYNARR_RESET(trkSeg_t,Dj.anchors);
//Fix Pos onto the line of the second track
if (Dj.inp[1].params.type == curveTypeStraight) {
- ANGLE_T a = NormalizeAngle(FindAngle(Dj.inp[1].params.lineOrig,pos)-Dj.inp[1].params.angle);
+ ANGLE_T a = NormalizeAngle(FindAngle(Dj.inp[1].params.lineOrig,
+ pos)-Dj.inp[1].params.angle);
DIST_T d = FindDistance(Dj.inp[1].params.lineOrig,pos);
Translate(&pos,Dj.inp[1].params.lineOrig,Dj.inp[1].params.angle,d*cos(D2R(a)));
} else {
@@ -997,42 +1138,51 @@ LOG( log_join, 3, ("P1=[%0.3f %0.3f]\n", pos.x, pos.y ) )
}
if ((desired_radius != 0.0) &&
- ((Dj.inp[0].params.type == curveTypeStraight) || (Dj.inp[0].params.type == curveTypeCurve)) &&
- ((Dj.inp[1].params.type == curveTypeStraight) || (Dj.inp[1].params.type == curveTypeCurve)) &&
- Dj.jRes.type==curveTypeCurve
- ) {
+ ((Dj.inp[0].params.type == curveTypeStraight)
+ || (Dj.inp[0].params.type == curveTypeCurve)) &&
+ ((Dj.inp[1].params.type == curveTypeStraight)
+ || (Dj.inp[1].params.type == curveTypeCurve)) &&
+ Dj.jRes.type==curveTypeCurve
+ ) {
ANGLE_T na0=0.0,na1=0.0;
- coOrd end0, end1;
+// coOrd end0, end1;
ANGLE_T a0,a1;
- end0 = GetTrkEndPos(Dj.inp[0].trk,Dj.inp[0].params.ep);
- end1 = GetTrkEndPos(Dj.inp[1].trk,Dj.inp[1].params.ep);
+// end0 = GetTrkEndPos(Dj.inp[0].trk,Dj.inp[0].params.ep);
+// end1 = GetTrkEndPos(Dj.inp[1].trk,Dj.inp[1].params.ep);
if (Dj.inp[0].params.type == curveTypeStraight) {
- a0 = DifferenceBetweenAngles(Dj.inp[0].params.angle,FindAngle(Dj.jRes.pos[0], pos));
+ a0 = DifferenceBetweenAngles(Dj.inp[0].params.angle,FindAngle(Dj.jRes.pos[0],
+ pos));
na0 = NormalizeAngle( Dj.inp[0].params.angle +
- ((a0>0.0)?90.0:-90.0));
+ ((a0>0.0)?90.0:-90.0));
} else {
na0 = Dj.inp[0].params.arcA0;
- if (FindDistance(Dj.inp[0].params.arcP,pos)<Dj.inp[0].params.arcR)
+ if (FindDistance(Dj.inp[0].params.arcP,pos)<Dj.inp[0].params.arcR) {
na0 = NormalizeAngle(na0+180.0);
+ }
}
//Now Second Line offset
if (Dj.inp[1].params.type == curveTypeStraight) {
- a1 = DifferenceBetweenAngles(Dj.inp[1].params.angle,FindAngle(pos, Dj.jRes.pos[0]));
+ a1 = DifferenceBetweenAngles(Dj.inp[1].params.angle,FindAngle(pos,
+ Dj.jRes.pos[0]));
na1 = NormalizeAngle( Dj.inp[1].params.angle +
- ((a1>0.0)?90.0:-90.0));
+ ((a1>0.0)?90.0:-90.0));
} else {
na1 = Dj.inp[1].params.arcA0;
- if (FindDistance(Dj.inp[1].params.arcP,Dj.jRes.pos[0])<Dj.inp[1].params.arcR)
+ if (FindDistance(Dj.inp[1].params.arcP,Dj.jRes.pos[0])<Dj.inp[1].params.arcR) {
na1 = NormalizeAngle(na1+180.0);
+ }
}
coOrd pos1 = pos;
if (AdjustPosToRadius(&pos1,desired_radius+(Dj.jointD[0].x), na0, na1)) {
+ // Make sure this is initialized
+ beyond = 1.0;
if (Dj.inp[1].params.type == curveTypeStraight) {
FindPos( &off, &beyond, pos1, Dj.inp[1].params.lineOrig, Dj.inp[1].params.angle,
- FindDistance(Dj.inp[1].params.lineOrig,Dj.inp[1].params.lineEnd) );
+ FindDistance(Dj.inp[1].params.lineOrig,Dj.inp[1].params.lineEnd) );
} else if (Dj.inp[1].params.type == curveTypeCurve) {
ANGLE_T a = FindAngle(Dj.inp[1].params.arcP,pos1);
- if ((a>Dj.inp[1].params.arcA0+Dj.inp[1].params.arcA1) || (a< Dj.inp[1].params.arcA0)) {
+ if ((a>Dj.inp[1].params.arcA0+Dj.inp[1].params.arcA1)
+ || (a< Dj.inp[1].params.arcA0)) {
beyond = 1.0;
}
}
@@ -1040,9 +1190,9 @@ LOG( log_join, 3, ("P1=[%0.3f %0.3f]\n", pos.x, pos.y ) )
if (beyond>-0.01 && IsClose(FindDistance(pos,pos1))) {
pos = pos1;
DYNARR_APPEND(trkSeg_t,Dj.anchors,1);
- trkSeg_p p = &DYNARR_LAST(trkSeg_t,Dj.anchors);
+ p = &DYNARR_LAST(trkSeg_t,Dj.anchors);
p->type= SEG_CRVLIN;
- p->width = 0;
+ p->lineWidth = 0;
p->color = wDrawColorBlue;
p->u.c.center = pos;
p->u.c.a1= 360.0;
@@ -1053,16 +1203,15 @@ LOG( log_join, 3, ("P1=[%0.3f %0.3f]\n", pos.x, pos.y ) )
}
-
- tempSegs_da.cnt = 0;
- tempSegs(0).color = drawColorBlack;
ok = FALSE;
-/* Populate (Dj.inp[1]) */
+ /* Populate (Dj.inp[1]) */
if ( QueryTrack(Dj.inp[1].trk,Q_REFRESH_JOIN_PARAMS_ON_MOVE) ) {
- if ( !GetTrackParams( PARAMS_2ND_JOIN, Dj.inp[1].trk, pos, &Dj.inp[1].params ) )
+ if ( !GetTrackParams( PARAMS_2ND_JOIN, Dj.inp[1].trk, pos,
+ &Dj.inp[1].params ) ) {
return C_CONTINUE;
+ }
}
@@ -1071,19 +1220,20 @@ LOG( log_join, 3, ("P1=[%0.3f %0.3f]\n", pos.x, pos.y ) )
case curveTypeCurve:
normalAngle = FindAngle( Dj.inp[1].params.arcP, pos );
Dj.inp[1].params.angle = NormalizeAngle( normalAngle +
- ((Dj.inp[1].params.ep==0)?-90.0:90.0));
+ ((Dj.inp[1].params.ep==0)?-90.0:90.0));
PointOnCircle( &Dj.inp[1].pos, Dj.inp[1].params.arcP,
- Dj.inp[1].params.arcR, normalAngle );
- if (Dj.inp[0].params.ep == Dj.inp[1].params.ep)
+ Dj.inp[1].params.arcR, normalAngle );
+ if (Dj.inp[0].params.ep == Dj.inp[1].params.ep) {
normalAngle = NormalizeAngle( normalAngle + 180.0 );
+ }
break;
case curveTypeStraight:
FindPos( &off, &beyond, pos, Dj.inp[1].params.lineOrig, Dj.inp[1].params.angle,
- 100000 );
+ DIST_INF );
Translate( &Dj.inp[1].pos, Dj.inp[1].params.lineOrig, Dj.inp[1].params.angle,
- off.x );
+ off.x );
normalAngle = NormalizeAngle( Dj.inp[1].params.angle +
- ((Dj.inp[0].params.ep==0)?-90.0:90.0) );
+ ((Dj.inp[0].params.ep==0)?-90.0:90.0) );
break;
case curveTypeNone:
case curveTypeBezier:
@@ -1091,23 +1241,27 @@ LOG( log_join, 3, ("P1=[%0.3f %0.3f]\n", pos.x, pos.y ) )
break;
}
-/* Compute the radius of the 2 tracks, for ComputeE() */
- for (inx=0;inx<2;inx++)
+ /* Compute the radius of the 2 tracks, for ComputeE() */
+ for (inx=0; inx<2; inx++)
if (Dj.inp[inx].params.type == curveTypeCurve) {
eR[inx] = Dj.inp[inx].params.arcR;
- if (Dj.inp[inx].params.ep == inx)
+ if (Dj.inp[inx].params.ep == inx) {
eR[inx] = - eR[inx];
- } else
+ }
+ } else {
eR[inx] = 0.0;
+ }
- if (!AdjustJoint( FALSE, 0.0, eR, normalAngle ))
+ if (!AdjustJoint( FALSE, 0.0, eR, normalAngle )) {
goto errorReturn;
- /*return C_CONTINUE;*/
+ }
+ /*return C_CONTINUE;*/
if (beyond < -0.000001) {
#ifdef VERBOSE
-printf("pos=[%0.3f,%0.3f] lineOrig=[%0.3f,%0.3f], angle=%0.3f = off=[%0.3f,%0.3f], beyond=%0.3f\n",
-pos.x, pos.y, Dj.inp[1].params.lineOrig.x, Dj.inp[1].params.lineOrig.y, Dj.inp[1].params.angle, off.x, off.y, beyond );
+ printf("pos=[%0.3f,%0.3f] lineOrig=[%0.3f,%0.3f], angle=%0.3f = off=[%0.3f,%0.3f], beyond=%0.3f\n",
+ pos.x, pos.y, Dj.inp[1].params.lineOrig.x, Dj.inp[1].params.lineOrig.y,
+ Dj.inp[1].params.angle, off.x, off.y, beyond );
#endif
InfoMessage( _("Beyond end of 2nd track") );
goto errorReturn;
@@ -1115,34 +1269,35 @@ pos.x, pos.y, Dj.inp[1].params.lineOrig.x, Dj.inp[1].params.lineOrig.y, Dj.inp[1
Dj.inp_pos[0] = Dj.jRes.pos[0];
Dj.inp_pos[1] = Dj.jRes.pos[1];
-LOG( log_join, 3, (" -E POS0=[%0.3f %0.3f] POS1=[%0.3f %0.3f]\n",
- Dj.jRes.pos[0].x, Dj.jRes.pos[0].y,
- Dj.jRes.pos[1].x, Dj.jRes.pos[1].y ) )
+ LOG( log_join, 3, (" -E POS0=[%0.3f %0.3f] POS1=[%0.3f %0.3f]\n",
+ Dj.jRes.pos[0].x, Dj.jRes.pos[0].y,
+ Dj.jRes.pos[1].x, Dj.jRes.pos[1].y ) )
if ( Dj.jointD[0].x!=0.0 || Dj.jointD[1].x!=0.0 ) {
-/* Compute the transition-curve, hopefully twice is enough */
+ /* Compute the transition-curve, hopefully twice is enough */
a1 = Dj.inp[1].params.angle + (Dj.jointD[1].negate?-90.0:+90.0);
if ((!AdjustJoint( TRUE, a1, eR, normalAngle )) ||
- (!AdjustJoint( TRUE, a1, eR, normalAngle )) )
+ (!AdjustJoint( TRUE, a1, eR, normalAngle )) ) {
goto errorReturn;
- /*return C_CONTINUE;*/
+ }
+ /*return C_CONTINUE;*/
if (logTable(log_join).level >= 3) {
Translate( &p1, Dj.jRes.pos[1], a1+180.0, Dj.jointD[1].x );
LogPrintf(" X0=%0.3f, P1=[%0.3f %0.3f]\n",
- FindDistance( Dj.inp_pos[0], Dj.jRes.pos[0] ), p1.x, p1.y );
+ FindDistance( Dj.inp_pos[0], Dj.jRes.pos[0] ), p1.x, p1.y );
LogPrintf(" E+ POS0=[%0.3f %0.3f]..[%0.3f %0.3f] POS1=[%0.3f %0.3f]..[%0.3f %0.3f]\n",
- Dj.inp_pos[0].x, Dj.inp_pos[0].y,
- Dj.jRes.pos[0].x, Dj.jRes.pos[0].y,
- p1.x, p1.y, Dj.jRes.pos[1].x, Dj.jRes.pos[1].y );
+ Dj.inp_pos[0].x, Dj.inp_pos[0].y,
+ Dj.jRes.pos[0].x, Dj.jRes.pos[0].y,
+ p1.x, p1.y, Dj.jRes.pos[1].x, Dj.jRes.pos[1].y );
}
}
switch ( Dj.inp[0].params.type ) {
case curveTypeStraight:
FindPos( &off, &beyond, Dj.inp_pos[0], Dj.inp[0].params.lineOrig,
- Dj.inp[0].params.angle, 100000.0 );
+ Dj.inp[0].params.angle, DIST_INF );
if (beyond < 0.0) {
InfoMessage(_("Beyond end of 1st track"));
goto errorReturn;
@@ -1153,13 +1308,14 @@ LOG( log_join, 3, (" -E POS0=[%0.3f %0.3f] POS1=[%0.3f %0.3f]\n",
break;
case curveTypeCurve:
if (IsCurveCircle(Dj.inp[0].trk)) {
- d = 10000.0;
+ d = DIST_INF;
} else {
a = FindAngle( Dj.inp[0].params.arcP, Dj.inp_pos[0] );
- if (Dj.inp[0].params.ep == 0)
+ if (Dj.inp[0].params.ep == 0) {
a1 = NormalizeAngle( Dj.inp[0].params.arcA0+Dj.inp[0].params.arcA1-a );
- else
+ } else {
a1 = NormalizeAngle( a-Dj.inp[0].params.arcA0 );
+ }
d = Dj.inp[0].params.arcR * a1 * 2.0*M_PI/360.0;
}
break;
@@ -1169,7 +1325,8 @@ LOG( log_join, 3, (" -E POS0=[%0.3f %0.3f] POS1=[%0.3f %0.3f]\n",
InfoMessage( _("First Track Type not supported for non-Cornu Join") );
goto errorReturn;
default:
- AbortProg( "cmdJoin - unknown type[0]" );
+ CHECKMSG( FALSE, ( "cmdJoin - unknown type[0] %d",
+ (int)(Dj.inp[0].params.type) ) );
}
d -= Dj.jointD[0].d0;
if ( d <= minLength ) {
@@ -1185,13 +1342,14 @@ LOG( log_join, 3, (" -E POS0=[%0.3f %0.3f] POS1=[%0.3f %0.3f]\n",
break;
case curveTypeCurve:
if (IsCurveCircle(Dj.inp[1].trk)) {
- d = 10000.0;
+ d = DIST_INF;
} else {
a = FindAngle( Dj.inp[1].params.arcP, Dj.inp_pos[1] );
- if (Dj.inp[1].params.ep == 0)
+ if (Dj.inp[1].params.ep == 0) {
a1 = NormalizeAngle( Dj.inp[1].params.arcA0+Dj.inp[1].params.arcA1-a );
- else
+ } else {
a1 = NormalizeAngle( a-Dj.inp[1].params.arcA0 );
+ }
d = Dj.inp[1].params.arcR * a1 * 2.0*M_PI/360.0;
}
break;
@@ -1201,7 +1359,7 @@ LOG( log_join, 3, (" -E POS0=[%0.3f %0.3f] POS1=[%0.3f %0.3f]\n",
InfoMessage( _("Second Track Type not supported for non-Cornu Join") );
goto errorReturn;
default:
- AbortProg( "cmdJoin - unknown type[1]" );
+ CHECKMSG( FALSE, ( "cmdJoin - unknown type[1]", Dj.inp[1].params.type ) );
}
d -= Dj.jointD[1].d0;
if ( d <= minLength ) {
@@ -1226,35 +1384,42 @@ LOG( log_join, 3, (" -E POS0=[%0.3f %0.3f] POS1=[%0.3f %0.3f]\n",
}
}
-/* Setup temp track */
+ /* Setup temp track */
for ( ep=0; ep<2; ep++ ) {
switch( Dj.inp[ep].params.type ) {
case curveTypeCurve:
- tempSegs(tempSegs_da.cnt).type = SEG_CRVTRK;
- tempSegs(tempSegs_da.cnt).u.c.center = Dj.inp[ep].params.arcP;
- tempSegs(tempSegs_da.cnt).u.c.radius = Dj.inp[ep].params.arcR;
- if (IsCurveCircle( Dj.inp[ep].trk ))
+ DYNARR_APPEND( trkSeg_t, tempSegs_da, 1 );
+ p = &DYNARR_LAST( trkSeg_t, tempSegs_da );
+ p->type = SEG_CRVTRK;
+ p->color = drawColorBlack;
+ p->u.c.center = Dj.inp[ep].params.arcP;
+ p->u.c.radius = Dj.inp[ep].params.arcR;
+ if (IsCurveCircle( Dj.inp[ep].trk )) {
break;
+ }
a = FindAngle( Dj.inp[ep].params.arcP, Dj.inp_pos[ep] );
a1 = NormalizeAngle( a-Dj.inp[ep].params.arcA0 );
- if (a1 <= Dj.inp[ep].params.arcA1)
+ if (a1 <= Dj.inp[ep].params.arcA1) {
break;
+ }
if (Dj.inp[ep].params.ep == 0) {
- tempSegs(tempSegs_da.cnt).u.c.a0 = a;
- tempSegs(tempSegs_da.cnt).u.c.a1 = NormalizeAngle(Dj.inp[ep].params.arcA0-a);
+ p->u.c.a0 = a;
+ p->u.c.a1 = NormalizeAngle(Dj.inp[ep].params.arcA0-a);
} else {
- tempSegs(tempSegs_da.cnt).u.c.a0 = Dj.inp[ep].params.arcA0+Dj.inp[ep].params.arcA1;
- tempSegs(tempSegs_da.cnt).u.c.a1 = a1-Dj.inp[ep].params.arcA1;
+ p->u.c.a0 = Dj.inp[ep].params.arcA0
+ +Dj.inp[ep].params.arcA1;
+ p->u.c.a1 = a1-Dj.inp[ep].params.arcA1;
}
- tempSegs_da.cnt++;
break;
case curveTypeStraight:
if ( FindDistance( Dj.inp[ep].params.lineOrig, Dj.inp[ep].params.lineEnd ) <
- FindDistance( Dj.inp[ep].params.lineOrig, Dj.inp_pos[ep] ) ) {
- tempSegs(tempSegs_da.cnt).type = SEG_STRTRK;
- tempSegs(tempSegs_da.cnt).u.l.pos[0] = Dj.inp[ep].params.lineEnd;
- tempSegs(tempSegs_da.cnt).u.l.pos[1] = Dj.inp_pos[ep];
- tempSegs_da.cnt++;
+ FindDistance( Dj.inp[ep].params.lineOrig, Dj.inp_pos[ep] ) ) {
+ DYNARR_APPEND( trkSeg_t, tempSegs_da, 1 );
+ p = &DYNARR_LAST( trkSeg_t, tempSegs_da );
+ p->type = SEG_STRTRK;
+ p->color = drawColorBlack;
+ p->u.l.pos[0] = Dj.inp[ep].params.lineEnd;
+ p->u.l.pos[1] = Dj.inp_pos[ep];
}
break;
default:
@@ -1264,46 +1429,48 @@ LOG( log_join, 3, (" -E POS0=[%0.3f %0.3f] POS1=[%0.3f %0.3f]\n",
ok = TRUE;
errorReturn:
- if (!ok)
- tempSegs(tempSegs_da.cnt).color = drawColorRed;
+ DYNARR_APPEND( trkSeg_t, tempSegs_da, 1 );
+ p = &DYNARR_LAST( trkSeg_t, tempSegs_da );
+ p->color = ok ? drawColorBlack : drawColorRed;
switch( Dj.jRes.type ) {
case curveTypeCurve:
- tempSegs(tempSegs_da.cnt).type = SEG_CRVTRK;
- tempSegs(tempSegs_da.cnt).u.c.center = Dj.jRes.arcP;
- tempSegs(tempSegs_da.cnt).u.c.radius = Dj.jRes.arcR;
- tempSegs(tempSegs_da.cnt).u.c.a0 = Dj.jRes.arcA0;
- tempSegs(tempSegs_da.cnt).u.c.a1 = Dj.jRes.arcA1;
- tempSegs_da.cnt++;
+ p->type = SEG_CRVTRK;
+ p->u.c.center = Dj.jRes.arcP;
+ p->u.c.radius = Dj.jRes.arcR;
+ p->u.c.a0 = Dj.jRes.arcA0;
+ p->u.c.a1 = Dj.jRes.arcA1;
break;
case curveTypeStraight:
- tempSegs(tempSegs_da.cnt).type = SEG_STRTRK;
- tempSegs(tempSegs_da.cnt).u.l.pos[0] = Dj.jRes.pos[0];
- tempSegs(tempSegs_da.cnt).u.l.pos[1] = Dj.jRes.pos[1];
- tempSegs_da.cnt++;
+ p->type = SEG_STRTRK;
+ p->u.l.pos[0] = Dj.jRes.pos[0];
+ p->u.l.pos[1] = Dj.jRes.pos[1];
break;
case curveTypeNone:
- tempSegs_da.cnt = 0;
+ DYNARR_RESET( trkSeg_t, tempSegs_da );
break;
default:
- AbortProg( "Bad track type %d", Dj.jRes.type );
+ CHECKMSG( FALSE, ( "Bad track type %d", Dj.jRes.type ) );
}
- if (!ok)
+ if (!ok) {
Dj.jRes.type = curveTypeNone;
+ }
return C_CONTINUE;
-
+
case C_UP:
if (Dj.state == 0) {
- if (easementVal<0 && Dj.cornuMode)
+ if (easementVal<0 && Dj.cornuMode) {
+ commandContext = I2VP(cornuJoinTrack);
return CmdCornu(action, pos);
- else
+ } else {
return C_CONTINUE;
+ }
}
if (Dj.state == 1) {
InfoMessage( _("Select 2nd track") );
return C_CONTINUE;
}
tempSegs(0).color = drawColorBlack;
- tempSegs_da.cnt = 0;
+ DYNARR_RESET( trkSeg_t, tempSegs_da );
if (Dj.jRes.type == curveTypeNone) {
Dj.state = 1;
InfoMessage( _("Select 2nd track") );
@@ -1317,7 +1484,7 @@ errorReturn:
break;
case curveTypeCurve:
trk = NewCurvedTrack( Dj.jRes.arcP, Dj.jRes.arcR,
- Dj.jRes.arcA0, Dj.jRes.arcA1, 0 );
+ Dj.jRes.arcA0, Dj.jRes.arcA1, 0 );
break;
case curveTypeNone:
case curveTypeBezier:
@@ -1332,45 +1499,59 @@ errorReturn:
Dj.state = 0;
DYNARR_RESET(trkSeg_t,Dj.anchors);
rc = C_TERMINATE;
- if (easementVal == 0.0)
- wPrefSetFloat("misc", "desired_radius", desired_radius);
+ if (easementVal == 0.0) {
+ sprintf(message, "desired_radius-%s", curScaleName);
+ wPrefSetFloat("misc", message, desired_radius);
+ }
if ( (!JoinTracks( Dj.inp[0].trk, Dj.inp[0].params.ep, Dj.inp_pos[0],
- trk, ep, Dj.jRes.pos[0], &Dj.jointD[0] ) ) ||
- (!JoinTracks( Dj.inp[1].trk, Dj.inp[1].params.ep, Dj.inp_pos[1],
- trk, 1-ep, Dj.jRes.pos[1], &Dj.jointD[1] ) ) )
+ trk, ep, Dj.jRes.pos[0], &Dj.jointD[0] ) ) ||
+ (!JoinTracks( Dj.inp[1].trk, Dj.inp[1].params.ep, Dj.inp_pos[1],
+ trk, 1-ep, Dj.jRes.pos[1], &Dj.jointD[1] ) ) ) {
rc = C_ERROR;
+ }
UndoEnd();
DrawNewTrack( Dj.inp[0].trk );
DrawNewTrack( Dj.inp[1].trk );
DrawNewTrack( trk );
- if (infoSubst)
+ if (infoSubst) {
InfoSubstituteControls(NULL, NULL);
+ }
infoSubst = FALSE;
return rc;
case C_CANCEL:
- if (infoSubst)
+ SetAllTrackSelect( FALSE );
+ if (infoSubst) {
InfoSubstituteControls(NULL, NULL);
+ }
infoSubst = FALSE;
break;
case C_REDRAW:
+ DrawHighlightBoxes(FALSE,FALSE,NULL);
+ HighlightSelectedTracks(NULL, TRUE, TRUE);
if ( Dj.joinMoveState == 1 || Dj.state == 1 ) {
DrawFillCircle( &tempD, Dj.inp[0].pos, 0.10*mainD.scale, selectedColor );
- } else if (easementVal<0 && Dj.joinMoveState == 0)
+ } else if (easementVal<0 && Dj.joinMoveState == 0) {
+ commandContext = I2VP(cornuJoinTrack);
return CmdCornu(action,pos);
- if (Dj.anchors.cnt)
- DrawSegs(&tempD, zero, 0.0, &(((trkSeg_t *)Dj.anchors.ptr)[0]), Dj.anchors.cnt,trackGauge,wDrawColorBlack);
- DrawSegs( &tempD, zero, 0.0, &tempSegs(0), tempSegs_da.cnt, trackGauge, wDrawColorBlack );
+ }
+ DrawSegsDA(&tempD, NULL, zero, 0.0, &Dj.anchors, trackGauge, wDrawColorBlack,
+ 0);
+ DrawSegsDA( &tempD, NULL, zero, 0.0, &tempSegs_da, trackGauge, wDrawColorBlack,
+ 0 );
break;
case C_TEXT:
case C_OK:
- if (easementVal<0 && Dj.cornuMode)
+ SetAllTrackSelect( FALSE );
+ if (easementVal<0 && Dj.cornuMode) {
return CmdCornu(action,pos);
- if (infoSubst)
+ }
+ if (infoSubst) {
InfoSubstituteControls(NULL, NULL);
+ }
infoSubst = FALSE;
}
@@ -1386,15 +1567,20 @@ errorReturn:
*
*/
-#include "bitmaps/join.xpm"
-#include "bitmaps/joinline.xpm"
+#include "bitmaps/join.xpm3"
+#include "bitmaps/join-line.xpm3"
void InitCmdJoin( wMenu_p menu )
{
ButtonGroupBegin( _("Join"), "cmdJoinSetCmd", _("Join") );
- joinCmdInx = AddMenuButton( menu, CmdJoin, "cmdJoinTrack", _("Join Track"), wIconCreatePixMap(join_xpm), LEVEL0_50, IC_STICKY|IC_POPUP|IC_WANT_MOVE, ACCL_JOIN, NULL );
- AddMenuButton( menu, CmdJoinLine, "cmdJoinLine", _("Join Lines"), wIconCreatePixMap(joinline_xpm), LEVEL0_50, IC_STICKY|IC_POPUP|IC_WANT_MOVE, ACCL_JOIN, NULL );
+ AddMenuButton( menu, CmdJoin, "cmdJoinTrack", _("Join Track"),
+ wIconCreatePixMap(join_xpm3[iconSize]), LEVEL0_50,
+ IC_STICKY|IC_POPUP|IC_WANT_MOVE, ACCL_JOIN, NULL );
+ AddMenuButton( menu, CmdJoinLine, "cmdJoinLine", _("Join Lines"),
+ wIconCreatePixMap(join_line_xpm3[iconSize]), LEVEL0_50,
+ IC_STICKY|IC_POPUP|IC_WANT_MOVE, ACCL_JOIN, NULL );
ButtonGroupEnd();
+ /** @logcmd @showrefby join=n cjoin.c Log Join Lines and Tracks command */
log_join = LogFindIndex( "join" );
}
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-16 09:48:33 +0000