diff options
Diffstat (limited to 'app/bin/cturnout.c')
| -rw-r--r-- | app/bin/cturnout.c | 3581 |
1 files changed, 865 insertions, 2716 deletions
diff --git a/app/bin/cturnout.c b/app/bin/cturnout.c index 02eadef..9bae6ae 100644 --- a/app/bin/cturnout.c +++ b/app/bin/cturnout.c @@ -1,24 +1,24 @@ /** \file cturnout.c - * Turnout object handling and drawing + * Turnout object handling */ - /* XTrkCad - Model Railroad CAD - * Copyright (C) 2005 Dave Bullis - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * 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. - */ +/* XTrkCad - Model Railroad CAD + * Copyright (C) 2005 Dave Bullis + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * 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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ #include "common.h" #include "ccurve.h" @@ -35,7 +35,7 @@ #include "cselect.h" #include "include/paramfile.h" #include "track.h" -#include "trackx.h" +#include "trkendpt.h" #include "common-ui.h" EXPORT TRKTYP_T T_TURNOUT = -1; @@ -48,7 +48,7 @@ EXPORT dynArr_t turnoutInfo_da; EXPORT turnoutInfo_t* curTurnout = NULL; EXPORT long curTurnoutEp = 0; -static int curTurnoutInx = -1; +//static int curTurnoutInx = -1; /** @logcmd @showrefby turnout=n cturnout.c */ static int log_turnout = 0; @@ -63,18 +63,20 @@ static wMenu_p turnoutPopupM; #ifdef TURNOUTCMD static drawCmd_t turnoutD = { - NULL, - &screenDrawFuncs, - 0, - 1.0, - 0.0, - {0.0,0.0}, {0.0,0.0}, - Pix2CoOrd, CoOrd2Pix }; + NULL, + &screenDrawFuncs, + 0, + 1.0, + 0.0, + {0.0,0.0}, {0.0,0.0}, + Pix2CoOrd, CoOrd2Pix +}; static wIndex_t turnoutHotBarCmdInx; static wIndex_t turnoutInx; static long hideTurnoutWindow; -static void RedrawTurnout( wDraw_p d, void * context, wWinPix_t x, wWinPix_t y ); +static void RedrawTurnout( wDraw_p d, void * context, wWinPix_t x, + wWinPix_t y ); static void SelTurnoutEndPt(wIndex_t, coOrd); static void HilightEndPt(void); @@ -95,76 +97,10 @@ static paramData_t turnoutPLs[] = { { PD_MENU, NULL, "new", PDO_DLGCMDBUTTON, NULL, N_("New") }, #define I_HIDE (3) #define turnoutHideT ((wChoice_p)turnoutPLs[I_HIDE].control) - { PD_TOGGLE, &hideTurnoutWindow, "hide", PDO_DLGCMDBUTTON, hideLabels, NULL, BC_NOBORDER } }; -static paramGroup_t turnoutPG = { "turnout", 0, turnoutPLs, COUNT( turnoutPLs ) }; -#endif - -/* Draw turnout data */ - -/** - * The types of turnouts that get enhanced drawing methods - */ -enum dtoType { - DTO_INVALID, - DTO_NORMAL, - DTO_THREE, - DTO_WYE, - - DTO_CURVED, - - DTO_XING, - DTO_XNG9, - DTO_SSLIP, - DTO_DSLIP, - - DTO_LCROSS, - DTO_RCROSS, - DTO_DCROSS -}; - -// Define to plot control points (DTO_NORMAL, DTO_CURVED, DTO_XING, DTO_LCROSS) -// #define DTO_DEBUG DTO_XING - -#define DTO_DIM 4 // Maximum number of paths -#define DTO_SEGS 24 // Maximum number of control points - -static struct DrawToData_t { - TRKINX_T index; - enum dtoType toType; - track_p trk; - int bridge; - int endCnt; - int pathCnt; - int routeCnt; - int strCnt; - int crvCnt; - int rgtCnt; - int lftCnt; - int strPath; - int str2Path; - int crvPath; - int crv2Path; - int origCnt; - int origins[DTO_DIM]; - coOrd midPt; - struct extraDataCompound_t* xx; -} dtod; - -struct DrawTo_t { - int n; - trkSeg_p trkSeg[DTO_SEGS]; - coOrd base[DTO_SEGS]; - coOrd baseLast; - DIST_T dy[DTO_SEGS]; - ANGLE_T angle; - ANGLE_T crvAngle; - coOrd pts[DTO_SEGS]; - coOrd ptsLast; - char type; + { PD_TOGGLE, &hideTurnoutWindow, "hide", PDO_DLGCMDBUTTON, hideLabels, NULL, BC_NOBORDER } }; - -static struct DrawTo_t dto[DTO_DIM]; - +static paramGroup_t turnoutPG = { "newFixedTrack", 0, turnoutPLs, COUNT( turnoutPLs ) }; +#endif /**************************************** @@ -175,15 +111,15 @@ static struct DrawTo_t dto[DTO_DIM]; EXPORT turnoutInfo_t* CreateNewTurnout( - char* scale, - char* title, - wIndex_t segCnt, - trkSeg_p segData, - PATHPTR_T paths, - EPINX_T endPtCnt, - trkEndPt_t* endPts, - wBool_t updateList, - long options) + char* scale, + char* title, + wIndex_t segCnt, + trkSeg_p segData, + PATHPTR_T paths, + EPINX_T endPtCnt, + trkEndPt_p endPts, + wBool_t updateList, + long options) { turnoutInfo_t* to; long changes = 0; @@ -202,38 +138,42 @@ EXPORT turnoutInfo_t* CreateNewTurnout( to->segs = (trkSeg_p)memdup(segData, (sizeof(*segData) * segCnt)); seg_p = to->segs; for (int i = 0; i < segCnt; i++) { - seg_p[i].bezSegs.ptr = NULL; - seg_p[i].bezSegs.cnt = 0; - seg_p[i].bezSegs.max = 0; + DYNARR_INIT( trackSeg_t, seg_p[i].bezSegs ); } CopyPoly(to->segs, segCnt); FixUpBezierSegs(to->segs, to->segCnt); GetSegBounds(zero, 0.0, segCnt, to->segs, &to->orig, &to->size); to->endCnt = endPtCnt; - to->endPt = (trkEndPt_t*)memdup(endPts, (sizeof * endPts) * to->endCnt); + to->endPt = (trkEndPt_p)memdup(endPts, EndPtSize(to->endCnt)); - if (options & COMPOUND_OPTION_PATH_OVERRIDE) + if (options & COMPOUND_OPTION_PATH_OVERRIDE) { to->pathOverRide = TRUE; - if (options & COMPOUND_OPTION_PATH_NOCOMBINE) + } + if (options & COMPOUND_OPTION_PATH_NOCOMBINE) { to->pathNoCombine = TRUE; + } SetParamPaths( to, paths ); to->paramFileIndex = curParamFileIndex; - if (curParamFileIndex == PARAM_CUSTOM) + if (curParamFileIndex == PARAM_CUSTOM) { to->contentsLabel = MyStrdup("Custom Turnouts"); - else + } else { to->contentsLabel = curSubContents; + } #ifdef TURNOUTCMD if (updateList && turnoutListL != NULL) { - FormatCompoundTitle(LABEL_TABBED | LABEL_MANUF | LABEL_PARTNO | LABEL_DESCR, title); - if (message[0] != '\0') + FormatCompoundTitle(LABEL_TABBED | LABEL_MANUF | LABEL_PARTNO | LABEL_DESCR, + title); + if (message[0] != '\0') { wListAddValue(turnoutListL, message, NULL, to); + } } #endif to->barScale = curBarScale > 0 ? curBarScale : -1; to->special = TOnormal; - if (updateList && changes) + if (updateList && changes) { DoChangeNotification(changes); + } return to; } @@ -281,17 +221,20 @@ DeleteTurnoutParams(int fileIndex) // go to the start of the block while (inx < turnoutInfo_da.cnt && - turnoutInfo(inx)->paramFileIndex != fileIndex) { + turnoutInfo(inx)->paramFileIndex != fileIndex) { startInx = inx++; } // delete them for (; inx < turnoutInfo_da.cnt && - turnoutInfo(inx)->paramFileIndex == fileIndex; inx++) { + turnoutInfo(inx)->paramFileIndex == fileIndex; inx++) { turnoutInfo_t* to = turnoutInfo(inx); if (to->paramFileIndex == fileIndex) { DeleteTurnout(to); cnt++; + if ( to == curTurnout ) { + curTurnout = NULL; + } } } @@ -320,26 +263,26 @@ DeleteTurnoutParams(int fileIndex) */ enum paramFileState - GetTrackCompatibility(int paramFileIndex, SCALEINX_T scaleIndex) -{ +GetTrackCompatibility(int paramFileIndex, SCALEINX_T scaleIndex) { int i; enum paramFileState ret = PARAMFILE_NOTUSABLE; - DIST_T gauge = GetScaleTrackGauge(scaleIndex); +// DIST_T gauge = GetScaleTrackGauge(scaleIndex); - if (!IsParamValid(paramFileIndex)) { + if (!IsParamValid(paramFileIndex)) + { return(PARAMFILE_UNLOADED); } // loop over all parameter entries or until a exact fit is found - for (i = 0; i < turnoutInfo_da.cnt && ret < PARAMFILE_FIT; i++) { + for (i = 0; i < turnoutInfo_da.cnt && ret < PARAMFILE_FIT; i++) + { turnoutInfo_t* to = turnoutInfo(i); if (to->paramFileIndex == paramFileIndex) { SCALE_FIT_T fit = CompatibleScale(FIT_TURNOUT, to->scaleInx, scaleIndex); if (fit == FIT_EXACT) { ret = PARAMFILE_FIT; break; - } - else if (fit == FIT_COMPATIBLE) { + } else if (fit == FIT_COMPATIBLE) { ret = PARAMFILE_COMPATIBLE; } } @@ -358,24 +301,31 @@ enum paramFileState * \returns -1 if a track segment is not on a path */ EXPORT wIndex_t CheckPaths( - wIndex_t segCnt, - trkSeg_p segs, - PATHPTR_T paths) + wIndex_t segCnt, + trkSeg_p segs, + PATHPTR_T paths, + char * sTitle ) { - if ((segCnt == 0) || !segs) return -1; - if (!paths) return -1; + if ((segCnt == 0) || !segs) { return -1; } + if (!paths) { return -1; } int pc, ps; PATHPTR_T pp = 0; int segInx[2], segEp[2]; - int segTrkLast = -1; +// int segTrkLast = -1; // Check that each track segment is on at least one path // Note - In new-P the tracks may be preceded by draws (or interspersed by them) - int suppressCheckPaths = log_suppressCheckPaths > 0 ? logTable(log_suppressCheckPaths).level : 0; + int suppressCheckPaths = log_suppressCheckPaths > 0 ? logTable( + log_suppressCheckPaths).level : 0; if (suppressCheckPaths == 0) { for (int inx = 0; inx < segCnt; inx++) { if (IsSegTrack(&segs[inx])) { + if ( inx > MAX_PATH_SEGS ) { + InputError("Too many segments %d in Turnout definition %s", FALSE, inx + 1, + PutTitle(sTitle)); + return -1; + } PATHPTR_T cp = paths; while (*cp) { // 0-9 are x00 to x09 or the negative equivalent (backwards) @@ -383,19 +333,24 @@ EXPORT wIndex_t CheckPaths( // Path is: NAME01203400 for (; *cp; cp++); //Skip Name cp++; //Skip 0 after name - // check each path component - for (; cp[0] || cp[1]; cp++) { //keeps going even if there are two or more parts - if (!cp[0]) continue; //ignore the 0 between parts of the same PATH!! - GetSegInxEP(cp[0], &segInx[0], &segEp[0]); //GetSegInxEP subtracts one to match inx - if (segInx[0] == inx) break; //Found it! + // check each path component + for (; cp[0] + || cp[1]; cp++) { //keeps going even if there are two or more parts + if (!cp[0]) { continue; } //ignore the 0 between parts of the same PATH!! + GetSegInxEP(cp[0], &segInx[0], + &segEp[0]); //GetSegInxEP subtracts one to match inx + if (segInx[0] == inx) { break; } //Found it! + } + if (*cp) { // we broke early + break; // get out - we found it } - if (*cp) // we broke early - break; // get out - we found it cp++; cp++; // Go to next path - past two 0s } if (!*cp) { // we looked through all the paths and didn't find it - InputError("Track segment %d not on Path", FALSE, inx + 1); +// InputError("Track segment %d not on Path", FALSE, inx + 1); + NoticeMessage(MSG_SEGMENT_NOT_ON_PATH, _("OK"), NULL, inx + 1, + PutTitle(sTitle)); return -1;; } } @@ -403,7 +358,8 @@ EXPORT wIndex_t CheckPaths( } for (pc = 0, pp = paths; *pp; pp += 2, pc++) { - for (ps = 0, pp += strlen((char*)pp) + 1; pp[0] != 0 || pp[1] != 0; pp++, ps++) { + for (ps = 0, pp += strlen((char*)pp) + 1; pp[0] != 0 + || pp[1] != 0; pp++, ps++) { if (pp[0] != 0 && ps == 0) { // First or only one } if (pp[0] != 0 && pp[1] != 0) { @@ -413,20 +369,21 @@ EXPORT wIndex_t CheckPaths( GetSegInxEP(pp[1], &segInx[1], &segEp[1]); if (!IsSegTrack(&segs[segInx[0]])) { InputError(_("CheckPath: Turnout path[%d] %d is not a track segment"), - FALSE, pc, pp[0]); + FALSE, pc, pp[0]); return -1; } if (!IsSegTrack(&segs[segInx[1]])) { InputError(_("CheckPath: Turnout path[%d] %d is not a track segment"), - FALSE, pc, pp[1]); + FALSE, pc, pp[1]); return -1; } coOrd p0 = GetSegEndPt(&segs[segInx[0]], 1 - segEp[0], FALSE, NULL); coOrd p1 = GetSegEndPt(&segs[segInx[1]], segEp[1], FALSE, NULL); d = FindDistance(p0, p1); if (d > MIN_TURNOUT_SEG_CONNECT_DIST) { - InputError(_("CheckPath: Turnout path[%d] %d-%d not connected: %0.3f P0(%f,%f) P1(%f,%f)"), - FALSE, pc, pp[0], pp[1], d, p0.x, p0.y, p1.x, p1.y); + InputError( + _("CheckPath: Turnout path[%d] %d-%d not connected: %0.3f P0(%f,%f) P1(%f,%f)"), + FALSE, pc, pp[0], pp[1], d, p0.x, p0.y, p1.x, p1.y); return -1; } } @@ -438,7 +395,7 @@ EXPORT wIndex_t CheckPaths( static BOOL_T ReadTurnoutParam( - char* firstLine) + char* firstLine) { char scale[10]; char* title; @@ -446,32 +403,37 @@ static BOOL_T ReadTurnoutParam( PATHPTR_T cp; long options = 0; - if (!GetArgs(firstLine + 8, "sqc", scale, &title, &cp)) + if (!GetArgs(firstLine + 8, "sqc", scale, &title, &cp)) { return FALSE; + } if (cp != NULL) - if (!GetArgs((char*)cp, "l", &options)) + if (!GetArgs((char*)cp, "l", &options)) { return FALSE; - DYNARR_RESET(trkEndPt_t, tempEndPts_da); + } + TempEndPtsReset(); pathCnt = 0; - if (!ReadSegs()) + if (!ReadSegs()) { return FALSE; + } PATHPTR_T pPaths = NULL; - if ( pathPtr && pathPtr[0] && pathCnt > 0 ) + if ( pathPtr && pathPtr[0] && pathCnt > 0 ) { pPaths = pathPtr; - CheckPaths( tempSegs_da.cnt, &tempSegs(0), pPaths ); + } + CheckPaths( tempSegs_da.cnt, &tempSegs(0), pPaths, title ); to = CreateNewTurnout(scale, title, tempSegs_da.cnt, &tempSegs(0), - pPaths, tempEndPts_da.cnt, &tempEndPts(0), FALSE, options ); + pPaths, TempEndPtsCount(), TempEndPt(0), FALSE, options ); MyFree(title); - if (to == NULL) + if (to == NULL) { return FALSE; + } if (tempSpecial[0] != '\0') { if (strncmp(tempSpecial, ADJUSTABLE, strlen(ADJUSTABLE)) == 0) { to->special = TOadjustable; if (!GetArgs(tempSpecial + strlen(ADJUSTABLE), "ff", - &to->u.adjustable.minD, &to->u.adjustable.maxD)) + &to->u.adjustable.minD, &to->u.adjustable.maxD)) { return FALSE; - } - else { + } + } else { InputError(_("Unknown special case"), TRUE); return FALSE; } @@ -483,7 +445,8 @@ static BOOL_T ReadTurnoutParam( } -EXPORT turnoutInfo_t* TurnoutAdd(long mode, SCALEINX_T scale, wList_p list, coOrd* maxDim, EPINX_T epCnt) +EXPORT turnoutInfo_t* TurnoutAdd(long mode, SCALEINX_T scale, wList_p list, + coOrd* maxDim, EPINX_T epCnt) { wIndex_t inx; turnoutInfo_t* to, * to1 = NULL; @@ -491,12 +454,13 @@ EXPORT turnoutInfo_t* TurnoutAdd(long mode, SCALEINX_T scale, wList_p list, coOr for (inx = 0; inx < turnoutInfo_da.cnt; inx++) { to = turnoutInfo(inx); if (IsParamValid(to->paramFileIndex) && - to->segCnt > 0 && - (FIT_NONE != CompatibleScale(FIT_TURNOUT, to->scaleInx, scale)) && - /*strcasecmp( to->scale, scaleName ) == 0 && */ - (epCnt <= 0 || epCnt == to->endCnt)) { - if (to1 == NULL) + to->segCnt > 0 && + (FIT_NONE != CompatibleScale(FIT_TURNOUT, to->scaleInx, scale)) && + /*strcasecmp( to->scale, scaleName ) == 0 && */ + (epCnt <= 0 || epCnt == to->endCnt)) { + if (to1 == NULL) { to1 = to; + } if (to == curTurnout) { to1 = to; turnoutInx = wListGetCount(list); @@ -505,10 +469,12 @@ EXPORT turnoutInfo_t* TurnoutAdd(long mode, SCALEINX_T scale, wList_p list, coOr if (message[0] != '\0') { wListAddValue(list, message, NULL, to); if (maxDim) { - if (to->size.x > maxDim->x) + if (to->size.x > maxDim->x) { maxDim->x = to->size.x; - if (to->size.y > maxDim->y) + } + if (to->size.y > maxDim->y) { maxDim->y = to->size.y; + } } } } @@ -524,19 +490,21 @@ EXPORT turnoutInfo_t* TurnoutAdd(long mode, SCALEINX_T scale, wList_p list, coOr static void ChangeAdjustableEndPt( - track_p trk, - EPINX_T ep, - DIST_T d) + track_p trk, + EPINX_T ep, + DIST_T d) { - struct extraDataCompound_t* xx = GET_EXTRA_DATA(trk, T_TURNOUT, extraDataCompound_t); + struct extraDataCompound_t* xx = GET_EXTRA_DATA(trk, T_TURNOUT, + extraDataCompound_t); coOrd pos; trkSeg_p segPtr; ANGLE_T angle = GetTrkEndAngle(trk, ep); Translate(&pos, GetTrkEndPos(trk, 1 - ep), angle, d); UndoModify(trk); SetTrkEndPoint(trk, ep, pos, angle); - if (ep == 0) + if (ep == 0) { xx->orig = pos; + } for (segPtr = xx->segs; segPtr < &xx->segs[xx->segCnt]; segPtr++) { switch (segPtr->type) { case SEG_STRLIN: @@ -553,10 +521,10 @@ static void ChangeAdjustableEndPt( EXPORT BOOL_T ConnectAdjustableTracks( - track_p trk1, - EPINX_T ep1, - track_p trk2, - EPINX_T ep2) + track_p trk1, + EPINX_T ep1, + track_p trk2, + EPINX_T ep2) { struct extraDataCompound_t* xx1; struct extraDataCompound_t* xx2; @@ -568,43 +536,45 @@ EXPORT BOOL_T ConnectAdjustableTracks( coOrd off; DIST_T beyond; - if ((GetTrkType(trk1) != T_TURNOUT) && (GetTrkType(trk2) != T_TURNOUT)) return FALSE; + if ((GetTrkType(trk1) != T_TURNOUT) && (GetTrkType(trk2) != T_TURNOUT)) { return FALSE; } adj1 = adj2 = FALSE; if (GetTrkType(trk1) == T_TURNOUT) { xx1 = GET_EXTRA_DATA(trk1, T_TURNOUT, extraDataCompound_t); - if (xx1->special == TOadjustable) + if (xx1->special == TOadjustable) { adj1 = TRUE; + } } if (GetTrkType(trk2) == T_TURNOUT) { xx2 = GET_EXTRA_DATA(trk2, T_TURNOUT, extraDataCompound_t); - if (xx2->special == TOadjustable) + if (xx2->special == TOadjustable) { adj2 = TRUE; + } } - if (adj1 == FALSE && adj2 == FALSE) + if (adj1 == FALSE && adj2 == FALSE) { return FALSE; + } a1 = GetTrkEndAngle(trk1, ep1); a2 = GetTrkEndAngle(trk2, ep2); a = NormalizeAngle(a1 - a2 + 180.0 + connectAngle / 2.0); - if (a > connectAngle) + if (a > connectAngle) { return FALSE; + } UndoStart(_("Connect Adjustable Tracks"), "changeAdjustableEndPt"); maxD = 0.0; if (adj1) { p1 = GetTrkEndPos(trk1, 1 - ep1); Translate(&p1, p1, a1, xx1->u.adjustable.minD); maxD += xx1->u.adjustable.maxD - xx1->u.adjustable.minD; - } - else { + } else { p1 = GetTrkEndPos(trk1, ep1); } if (adj2) { p2 = GetTrkEndPos(trk2, 1 - ep2); Translate(&p2, p2, a2, xx2->u.adjustable.minD); maxD += xx2->u.adjustable.maxD - xx2->u.adjustable.minD; - } - else { + } else { p2 = GetTrkEndPos(trk2, ep2); } d = FindDistance(p1, p2); @@ -614,16 +584,19 @@ EXPORT BOOL_T ConnectAdjustableTracks( rc = FALSE; } FindPos(&off, &beyond, p1, p2, a1, DIST_INF); - if (fabs(off.y) > connectDistance) + if (fabs(off.y) > connectDistance) { rc = FALSE; + } if (adj1) { UndrawNewTrack(trk1); - d1 = d * (xx1->u.adjustable.maxD - xx1->u.adjustable.minD) / maxD + xx1->u.adjustable.minD; + d1 = d * (xx1->u.adjustable.maxD - xx1->u.adjustable.minD) / maxD + + xx1->u.adjustable.minD; ChangeAdjustableEndPt(trk1, ep1, d1); } if (adj2) { UndrawNewTrack(trk2); - d2 = d * (xx2->u.adjustable.maxD - xx2->u.adjustable.minD) / maxD + xx2->u.adjustable.minD; + d2 = d * (xx2->u.adjustable.maxD - xx2->u.adjustable.minD) / maxD + + xx2->u.adjustable.minD; ChangeAdjustableEndPt(trk2, ep2, d2); } if (rc) { @@ -638,118 +611,27 @@ EXPORT BOOL_T ConnectAdjustableTracks( /**************************************** * - * Draw Turnout Roadbed - * - */ - -int roadbedOnScreen = 0; - - -void DrawTurnoutRoadbedSide(drawCmd_p d, wDrawColor color, coOrd orig, ANGLE_T angle, trkSeg_p sp, ANGLE_T side, int first, int last) -{ - segProcData_t data; - if (last <= first) - return; - data.drawRoadbedSide.first = first; - data.drawRoadbedSide.last = last; - data.drawRoadbedSide.side = side; - data.drawRoadbedSide.roadbedWidth = roadbedWidth; - data.drawRoadbedSide.rbw = (wDrawWidth)floor(roadbedLineWidth * (d->dpi / d->scale) + 0.5); - data.drawRoadbedSide.orig = orig; - data.drawRoadbedSide.angle = angle; - data.drawRoadbedSide.color = color; - data.drawRoadbedSide.d = d; - SegProc(SEGPROC_DRAWROADBEDSIDE, sp, &data); -} - - -static void ComputeAndDrawTurnoutRoadbedSide( - drawCmd_p d, - wDrawColor color, - coOrd orig, - ANGLE_T angle, - trkSeg_p segPtr, - int segCnt, - int segInx, - ANGLE_T side) -{ - unsigned long res, res1; - int b0, b1; - res = ComputeTurnoutRoadbedSide(segPtr, segCnt, segInx, side, roadbedWidth); - if (res == 0L) { - } - else if (res == 0xFFFFFFFF) { - DrawTurnoutRoadbedSide(d, color, orig, angle, &segPtr[segInx], side, 0, 32); - } - else { - for (b0 = 0, res1 = 0x00000001; res1 && (res1 & res); b0++, res1 <<= 1); - for (b1 = 32, res1 = 0x80000000; res1 && (res1 & res); b1--, res1 >>= 1); - DrawTurnoutRoadbedSide(d, color, orig, angle, &segPtr[segInx], side, 0, b0); - DrawTurnoutRoadbedSide(d, color, orig, angle, &segPtr[segInx], side, b1, 32); - } -} - - -static void DrawTurnoutRoadbed( - drawCmd_p d, - wDrawColor color, - coOrd orig, - ANGLE_T angle, - trkSeg_p segPtr, - int segCnt) -{ - int inx, trkCnt = 0, segInx = 0; - for (inx = 0; inx < segCnt; inx++) { - if (IsSegTrack(&segPtr[inx])) { - segInx = inx; - trkCnt++; - if (trkCnt > 1) - break; - } - } - if (trkCnt == 0) - return; - if (trkCnt == 1) { - DrawTurnoutRoadbedSide(d, color, orig, angle, &segPtr[segInx], +90, 0, 32); - DrawTurnoutRoadbedSide(d, color, orig, angle, &segPtr[segInx], -90, 0, 32); - } - else { - for (inx = 0; inx < segCnt; inx++) { - if (IsSegTrack(&segPtr[inx])) { - ComputeAndDrawTurnoutRoadbedSide(d, color, orig, angle, segPtr, segCnt, inx, +90); - ComputeAndDrawTurnoutRoadbedSide(d, color, orig, angle, segPtr, segCnt, inx, -90); - } - } - } -} - -/**************************************** - * * HAND LAID TURNOUTS * */ track_p NewHandLaidTurnout( - coOrd p0, - ANGLE_T a0, - coOrd p1, - ANGLE_T a1, - coOrd p2, - ANGLE_T a2, - ANGLE_T frogA) + coOrd p0, + ANGLE_T a0, + coOrd p1, + ANGLE_T a1, + coOrd p2, + ANGLE_T a2, + ANGLE_T frogA) { track_p trk; struct extraDataCompound_t* xx; trkSeg_t segs[2]; sprintf(message, "\tHand Laid Turnout, Angle=%0.1f\t", frogA); - DYNARR_SET(trkEndPt_t, tempEndPts_da, 2); - memset(&tempEndPts(0), 0, tempEndPts_da.cnt * sizeof tempEndPts(0)); - tempEndPts(0).pos = p0; - tempEndPts(0).angle = a0; - tempEndPts(1).pos = p1; - tempEndPts(1).angle = a1; - tempEndPts(2).pos = p2; - tempEndPts(2).angle = a2; + TempEndPtsSet( 3 ); + SetEndPt( TempEndPt(0), p0, a0 ); + SetEndPt( TempEndPt(1), p1, a1 ); + SetEndPt( TempEndPt(2), p2, a2 ); Rotate(&p1, p0, -a0); p1.x -= p0.x; p1.y -= p0.y; @@ -764,7 +646,8 @@ track_p NewHandLaidTurnout( segs[1].color = wDrawColorBlack; segs[1].u.l.pos[0] = zero; segs[1].u.l.pos[1] = p2; - trk = NewCompound(T_TURNOUT, 0, p0, a0, message, 3, &tempEndPts(0), (PATHPTR_T)"Normal\0\1\0\0Reverse\0\2\0\0\0", 2, segs); + trk = NewCompound(T_TURNOUT, 0, p0, a0, message, 3, TempEndPt(0), + (PATHPTR_T)"Normal\0\1\0\0Reverse\0\2\0\0\0", 2, segs); xx = GET_EXTRA_DATA(trk, T_TURNOUT, extraDataCompound_t); xx->handlaid = TRUE; @@ -778,9 +661,9 @@ track_p NewHandLaidTurnout( */ static coOrd MapPathPos( - struct extraDataCompound_t* xx, - signed char segInx, - EPINX_T ep) + struct extraDataCompound_t* xx, + signed char segInx, + EPINX_T ep) { trkSeg_p segPtr; coOrd pos; @@ -802,8 +685,9 @@ static coOrd MapPathPos( } static trkSeg_p MapPathSeg( - struct extraDataCompound_t* xx, - signed char segInx) { + struct extraDataCompound_t* xx, + signed char segInx) +{ if (segInx < 0) { segInx = -segInx; @@ -812,1897 +696,30 @@ static trkSeg_p MapPathSeg( } -/**************************************** - * - * TURNOUT DRAWING - * - */ - - /** - * Get the paths from the turnout definition. Puts the results into static dto structure. - * Curved segments are broken up into short sections of the lesser of 5 degrees or 5 * tie spacing. - * - * \param trk track_p pointer to a track - * \param xx pointer to the extraDataCompound struct - * - * \returns the number of paths - */ -int GetTurnoutPaths(track_p trk, struct extraDataCompound_t* xx) { - wIndex_t segInx; - wIndex_t segEP; - - SCALEINX_T scaleInx = GetTrkScale(trk); - tieData_p td = GetScaleTieData(scaleInx); - - int i; - ANGLE_T a0, a1, aa0, aa1; - DIST_T r, len; - coOrd p0, p1; - - PATHPTR_T pp; - int pathCnt = 0, routeCnt = 0; - - for (i = 0; i < DTO_DIM; i++) - dto[i].n = 0; - - dtod.trk = trk; - dtod.index = trk->index; - dtod.xx = xx; - - // Validate that the first segment starts at (0, 0) - // and if STR p1.y == 0, if CRV angle == 0 or angle == 180 - GetSegInxEP(1, &segInx, &segEP); - trkSeg_p segPtr = &xx->segs[segInx]; - switch (segPtr->type) { - case SEG_STRTRK: - p0 = segPtr->u.l.pos[0]; - p1 = segPtr->u.l.pos[1]; - if ((FindDistance(p0, zero) > EPSILON) || (fabs(p1.y) > EPSILON)) - return -1; - break; - case SEG_CRVTRK: - r = fabs(segPtr->u.c.radius); - a0 = segPtr->u.c.a0; - a1 = segPtr->u.c.a1; - - if (segPtr->u.c.radius > 0) { - aa0 = a0; - } - else { - aa0 = a0 + a1; - } - PointOnCircle(&p0, segPtr->u.c.center, r, aa0); - if ((FindDistance(p0, zero) > EPSILON) - || ((fabs(aa0 - 180) > EPSILON) && (fabs(aa0) > EPSILON))) - return -1; - break; - } - - pp = GetPaths(trk); - while (pp[0]) { - pp += strlen((char*)pp) + 1; - - ANGLE_T angle = 0; - while (pp[0]) { - if (pathCnt < DTO_DIM) - dto[pathCnt].type = 'S'; - while (pp[0]) { - GetSegInxEP(pp[0], &segInx, &segEP); - // trkSeg_p - segPtr = &xx->segs[segInx]; - switch (segPtr->type) { - case SEG_STRTRK: - p0 = segPtr->u.l.pos[0]; - p1 = segPtr->u.l.pos[1]; - - wIndex_t n = dto[pathCnt].n; - dto[pathCnt].trkSeg[n] = segPtr; - dto[pathCnt].base[n] = p0; - n++; - dto[pathCnt].trkSeg[n] = segPtr; - dto[pathCnt].base[n] = p1; - // n++; - dto[pathCnt].n = n; - - if (n >= DTO_SEGS - 1) return -1; - - break; - case SEG_CRVTRK: - r = fabs(segPtr->u.c.radius); - - dto[pathCnt].type = segPtr->u.c.center.y < 0 ? 'R' : 'L'; - - a0 = segPtr->u.c.a0; - a1 = segPtr->u.c.a1; - - angle += a1; - - len = D2R(a1) * r; - // Every 5 degrees or 5 * tie spacing - int cnt = (int)floor(a1 / 5.0); - int cnt2 = (int)floor(len / 5 / td->spacing); - if (cnt2 > cnt) cnt = cnt2; - if (cnt <= 0) cnt = 1; - - aa1 = a1 / cnt; - if (dto[pathCnt].type == 'R') { - aa0 = a0; - } - else { - aa0 = a0 + a1; - aa1 = -aa1; - } - PointOnCircle(&p0, segPtr->u.c.center, r, aa0); - n = dto[pathCnt].n; - dto[pathCnt].trkSeg[n] = segPtr; - dto[pathCnt].base[n] = p0; - n++; - dto[pathCnt].n = n; - - while (cnt > 0) { - aa0 += aa1; - PointOnCircle(&p0, segPtr->u.c.center, r, aa0); - - // n = dto[pathCnt].n; - dto[pathCnt].trkSeg[n] = segPtr; - dto[pathCnt].base[n] = p0; - n++; - - if (n >= DTO_SEGS - 1) return -1; - - cnt--; - } - n--; // remove that last point count - dto[pathCnt].n = n; - } - pp++; - } - // Include the last point - dto[pathCnt].crvAngle = angle; - dto[pathCnt].n++; - - pathCnt++; - if (pathCnt > DTO_DIM) return -1; - pp++; - } - routeCnt++; - pp++; - } - dtod.pathCnt = pathCnt; - dtod.routeCnt = routeCnt; - dtod.endCnt = trk->endCnt; - - // Guard value: n < DTO_SEGS - 2 - for (i = 0; i < pathCnt; i++) - dto[i].pts[dto[i].n].x = DIST_INF; - - return pathCnt; -} - -/** -* Sets the turnout type if compatible with enhanced drawing methods. The data is -* from the path data saved in dtod and dto by GetTurnoutPaths. The turnout type is -* stored in the dtod.toType. DTO_INVALID (0) if the enhanced methods cannot handle -* it. -*/ -void GetTurnoutType() { - dtod.strPath = -1; - dtod.str2Path = -1; - dtod.crvPath = -1; - dtod.crv2Path = -1; - - dtod.toType = DTO_INVALID; - - int strCnt = 0, crvCnt = 0, lftCnt = 0, rgtCnt = 0; - enum dtoType toType = DTO_INVALID; - int i, j; - - // Count path origins - dtod.origCnt = 1; - dtod.origins[0] = 0; - - for (i = 1; i < dtod.pathCnt; i++) { - int eq = 0; - for (j = 0; j < i; j++) { - if (CoOrdEqual(dto[dtod.origins[j]].base[0], dto[i].base[0])) - eq++; - } - if (eq == 0) { - dtod.origins[dtod.origCnt] = i; - dtod.origCnt++; - } - - if (dtod.origCnt > 4) - return; - } - - // Determine the path type - for (i = 0; i < dtod.pathCnt; i++) { - switch (dto[i].type) { - case 'S': - strCnt++; - if (strCnt == 1) - dtod.strPath = i; - else - dtod.str2Path = i; - break; - case 'L': - lftCnt++; - crvCnt++; - if (crvCnt == 1) - dtod.crvPath = i; - else - dtod.crv2Path = i; - break; - case 'R': - rgtCnt++; - crvCnt++; - if (crvCnt == 1) - dtod.crvPath = i; - else - dtod.crv2Path = i; - break; - } - } - - dtod.strCnt = strCnt; - dtod.crvCnt = crvCnt; - dtod.lftCnt = lftCnt; - dtod.rgtCnt = rgtCnt; - - // Normal two- or three-way turnout, or a curved turnout - if (dtod.origCnt == 1) { - if (dtod.pathCnt == 2) { - if (strCnt == 1 && crvCnt == 1) { - dtod.toType = DTO_NORMAL; - } - else if ((strCnt == 0) && ((lftCnt == 2) || (rgtCnt == 2))) { - // Assumes outer curve is [0] and inner is [1] - if ((dto[0].crvAngle <= 20) && (dto[1].crvAngle - dto[0].crvAngle <= 15)) - dtod.toType = DTO_CURVED; - } - else if (lftCnt == 1 && rgtCnt == 1) { - dtod.toType = DTO_WYE; - } - } - else if ((dtod.pathCnt == 3) && (strCnt == 1) - && (lftCnt == 1) && (rgtCnt == 1)) { - dtod.toType = DTO_THREE; - } - } - else - // Crossing, single- and double-slip - if ((dtod.origCnt == 2) && (dtod.endCnt == 4) - && strCnt == 2) { - - ANGLE_T a0, a1, a2; - a1 = FindAngle(dto[dtod.strPath].base[0], dto[dtod.strPath].base[1]); - a2 = FindAngle(dto[dtod.str2Path].base[0], dto[dtod.str2Path].base[1]); - // Swap the ends of the strPath if large angle - if((a1 > 180.0) && (dto[dtod.strPath].n == 2)) - { - coOrd tmp = dto[dtod.strPath].base[0]; - dto[dtod.strPath].base[0] = dto[dtod.strPath].base[1]; - dto[dtod.strPath].base[1] = tmp; - - i = dto[dtod.strPath].n - 1; - tmp = dto[dtod.strPath].pts[0]; - dto[dtod.strPath].pts[0] = dto[dtod.strPath].pts[i]; - dto[dtod.strPath].pts[i] = tmp; - - a1 = a1 - 180.0; - dto[dtod.strPath].angle = a1; - } - // Swap the ends of the str2Path if large angle - if((a2 > 180.0) && (dto[dtod.str2Path].n == 2)) - { - coOrd tmp = dto[dtod.str2Path].base[0]; - dto[dtod.str2Path].base[0] = dto[dtod.str2Path].base[1]; - dto[dtod.str2Path].base[1] = tmp; - - i = dto[dtod.str2Path].n - 1; - tmp = dto[dtod.str2Path].pts[0]; - dto[dtod.str2Path].pts[0] = dto[dtod.str2Path].pts[i]; - dto[dtod.str2Path].pts[i] = tmp; - - a2 = a2 - 180.0; - dto[dtod.str2Path].angle = a2; - } - a0 = DifferenceBetweenAngles(a1, a2); - if(a0 < 0) - { - int tmp = dtod.strPath; - dtod.strPath = dtod.str2Path; - dtod.str2Path = tmp; - a0 = NormalizeAngle(-a0); - } - if ((a0 > 90.0) || (a0 < 0.0)) - return; - - coOrd p1 = dto[dtod.strPath].base[0]; - coOrd p2 = dto[dtod.str2Path].base[0]; - coOrd pos = zero; - int intersect = FindIntersection(&pos, p1, a1, p2, a2); - - if (intersect) { - if(strCnt == 2 && dtod.pathCnt == 2){ - if((a0 <= 61) && (a0 >= -61)) - dtod.toType = DTO_XING; - else - dtod.toType = DTO_XNG9; - } - else if(dtod.pathCnt == 3 && (lftCnt == 1 || rgtCnt == 1)){ - dtod.toType = DTO_SSLIP; - } - else if(dtod.pathCnt == 4 && lftCnt == 1 && rgtCnt == 1){ - dtod.toType = DTO_DSLIP; - } - } - // No intersect, it could be a crossover - else if (strCnt == 2) { - if (dtod.pathCnt == 4 && lftCnt == 1 && rgtCnt == 1) { - dtod.toType = DTO_DCROSS; - } - else if(dtod.pathCnt == 3){ - // Perverse test because the cross paths go Left then Right, for example - if(lftCnt == 1){ - dtod.toType = DTO_RCROSS; - } - else if(rgtCnt == 1){ - dtod.toType = DTO_LCROSS; - } - else{ - dtod.toType = DTO_INVALID; - } - } - } - } -} - -/** - * Draw Layout lines and points - * - * \param d The drawing object - * \param scaleInx The layout/track scale index - */ -static void DrawDtoLayout( - drawCmd_p d, - SCALEINX_T scaleInx -) -{ - tieData_p td; - td = GetScaleTieData(scaleInx); - - // Draw the points and lines from dto - double r = td->width / 2; - // if (r < 1) r = 1; - - int i, j; - for (i = 0; i < DTO_DIM; i++) { - for (j = 0; j < dto[i].n; j++) { - DrawFillCircle(d, dto[i].pts[j], r, drawColorPurple); - if (j < dto[i].n - 1) - DrawLine(d, dto[i].pts[j], dto[i].pts[j + 1], 0, drawColorPurple); - } - } -} - -/** -* Use the coOrds to build a polygon and draw the bridge fill. Note that the coordinates are -* passed as pairs, and rearranged into a polygon with the 1,2,4,3 order. -* -* \param d The drawing object -* \param b1 The first coordinate -* \param b2 The second coordinate -* \param b3 The third coordinate -* \param b4 The fourth coordinate -*/ -static void DrawBridgeFill( - drawCmd_p d, - coOrd b1, - coOrd b2, - coOrd b3, - coOrd b4 - ) -{ - coOrd p[4] = {b1, b2, b4, b3}; - DrawPoly(d,4,p,NULL,drawColorGrey90,0,DRAW_FILL ); -} - -/** -* Draw Bridge parapets and background for a turnout -* -* \param d The drawing object -* \param path1 The first path -* \param path2 The second path -*/ -static void DrawTurnoutBridge( - drawCmd_p d, - int path1, - int path2 -) -{ - DIST_T trackGauge = GetTrkGauge(dtod.trk); - wDrawWidth width2 = (wDrawWidth)round((2.0 * d->dpi) / BASE_DPI); - if (d->options&DC_PRINT) - width2 = (wDrawWidth)round(d->dpi / BASE_DPI); - - coOrd b1,b2,b3,b4,b5,b6; - ANGLE_T angle = dtod.xx->angle,a = 0.0; - int i,j,i1,i2; - i1 = path1; - i2 = path2; - if(dto[i1].base[dto[i1].n - 1].y < dto[i2].base[dto[i2].n - 1].y) { - i1 = path2; - i2 = path1; - // a = -a; - } - - if(dtod.toType == DTO_THREE) { - i = dtod.strPath; - DIST_T dy = fabs(dto[i].dy[0]) + trackGauge * 1.5; - b1 = dto[i].pts[0]; - Translate(&b3,b1,(angle + a),dy); - b1 = dto[i].pts[dto[i].n - 1]; - Translate(&b4,b1,(angle + a),dy); - b2 = dto[i].pts[0]; - Translate(&b5,b2,(angle + a),-dy); - b2 = dto[i].pts[dto[i].n - 1]; - Translate(&b6,b2,(angle + a),-dy); - - // Draw the bridge background - DrawBridgeFill(d,b3,b4,b5,b6); - } - - for(i = i1; 1; i = i2,a = 180.0) { - DIST_T dy = fabs(dto[i].dy[0]) + trackGauge * 1.5; - b1 = dto[i].pts[0]; - Translate(&b3,b1,(angle + a),dy); - Translate(&b5,b1,(angle + a),-(dy * 0.75)); - for(j = 1; j < dto[i].n; j++) { - dy = fabs(dto[i].dy[j]) + trackGauge * 1.5; - b2 = dto[i].pts[j]; - Translate(&b4,b2,(angle + a),dy); - Translate(&b6,b2,(angle + a),-(dy * 0.75)); - - // Draw the bridge background - DrawBridgeFill(d,b3,b4,b5,b6); - - // Draw the bridge edge - DrawLine(d,b3,b4,width2,drawColorBlack); - - b1 = b2; - b3 = b4; - b5 = b6; - } - - if(i == i2) - break; - } - - EPINX_T ep; - coOrd p; - track_p trk1; - coOrd p0,p1; - - for(ep = 0; ep < 3; ep++) { - trk1 = GetTrkEndTrk(dtod.trk,ep); - - if((trk1) && (!GetTrkBridge(trk1))) { - - p = GetTrkEndPos(dtod.trk,ep); - a = GetTrkEndAngle(dtod.trk,ep) + 90.0; - - int i = (dtod.lftCnt > 0) && (dtod.rgtCnt == 0) ? 2 : 1; - if(ep != i) { - Translate(&p0,p,a,trackGauge * 1.5); - Translate(&p1,p0,a - 45.0,trackGauge * 1.5); - DrawLine(d,p0,p1,width2,drawColorBlack); - } - if(ep != (3 - i)) { - Translate(&p0,p,a,-trackGauge * 1.5); - Translate(&p1,p0,a + 45.0,-trackGauge * 1.5); - DrawLine(d,p0,p1,width2,drawColorBlack); - } - } - } -} - -/** -* Draw Bridge parapets and background for a cross-over -* -* \param d The drawing object -* \param path1 The first path, straight -* \param path2 The second path, straight -*/ -static void DrawCrossBridge( - drawCmd_p d, - int path1, - int path2 -) -{ - DIST_T trackGauge = GetTrkGauge(dtod.trk); - wDrawWidth width2 = (wDrawWidth)round((2.0 * d->dpi)/BASE_DPI); - if (d->options&DC_PRINT) - width2 = (wDrawWidth)round(d->dpi / BASE_DPI); - - coOrd b1, b2, b3, b4, b5, b6; - ANGLE_T angle = dtod.xx->angle, a = 0.0; - int i1, i2; - i1 = path1; - i2 = path2; - if(dto[i1].base[dto[i1].n - 1].y < dto[i2].base[dto[i2].n - 1].y) { - i1 = path2; - i2 = path1; - // a = -a; - } - - DIST_T dy = fabs(dto[i1].dy[0]) + trackGauge * 1.5; - b1 = dto[i1].pts[0]; - Translate(&b3,b1,(angle + a),dy); - b1 = dto[i1].pts[dto[i1].n-1]; - Translate(&b4,b1,(angle + a),dy); - b2 = dto[i2].pts[0]; - Translate(&b5,b2,(angle + a),-dy); - b2 = dto[i2].pts[dto[i2].n-1]; - Translate(&b6,b2,(angle + a),-dy); - - // Draw the bridge background - DrawBridgeFill(d, b3, b4, b5, b6); - - // Draw the bridge edges - DrawLine(d,b3,b4,width2,drawColorBlack); - DrawLine(d,b5,b6,width2,drawColorBlack); - - EPINX_T ep; - coOrd p; - track_p trk1; - coOrd p0,p1; - - for(ep = 0; ep < 4; ep++) { - trk1 = GetTrkEndTrk(dtod.trk,ep); - - if((trk1) && (!GetTrkBridge(trk1))) { - p = GetTrkEndPos(dtod.trk,ep); - a = GetTrkEndAngle(dtod.trk,ep) + 90.0; - - if((ep == 1) || (ep == 2)) { - Translate(&p0,p,a,trackGauge * 1.5); - Translate(&p1,p0,a - 45.0,trackGauge * 1.5); - DrawLine(d,p0,p1,width2,drawColorBlack); - } - if((ep == 0) || (ep == 3)) { - Translate(&p0,p,a,-trackGauge * 1.5); - Translate(&p1,p0,a + 45.0,-trackGauge * 1.5); - DrawLine(d,p0,p1,width2,drawColorBlack); - } - } - } -} - -/** -* Draw Bridge parapets and background for a crossing -* -* \param d The drawing object -* \param path1 The first path -* \param path2 The second path -*/ -static void DrawXingBridge( - drawCmd_p d, - int path1, - int path2 -) -{ - DIST_T trackGauge = GetTrkGauge(dtod.trk); - wDrawWidth width2 = (wDrawWidth)round((2.0 * d->dpi)/BASE_DPI); - if (d->options&DC_PRINT) - width2 = (wDrawWidth)round(d->dpi / BASE_DPI); - - coOrd b0, b1, b2, b3, b4, b5, b6; - int i, j, i1, i2; - i1 = dtod.strPath; - i2 = dtod.str2Path; - - // Bridge fill both straight sections - wDrawWidth width3 = (wDrawWidth)round(trackGauge * 3 * d->dpi/d->scale); - b1 = dto[i1].pts[0]; - b2 = dto[i1].pts[dto[i1].n-1]; - DrawLine(d,b1,b2,width3,wDrawColorGrey90); - b1 = dto[i2].pts[0]; - b2 = dto[i2].pts[dto[i1].n-1]; - DrawLine(d,b1,b2,width3,wDrawColorGrey90); - - i1 = path1; - i2 = path2; - if(dto[i1].base[dto[i1].n - 1].y < dto[i2].base[dto[i2].n - 1].y) { - i1 = path2; - i2 = path1; - } - - // Handle curved sections for slips - BOOL_T hasLeft = 0, hasRgt = 0; - ANGLE_T angle = dtod.xx->angle, a = 0.0; - for(i = i1; 1; i = i2,a = 180.0) { - DIST_T dy = fabs(dto[i].dy[0]) + trackGauge * 1.5; - b1 = dto[i].pts[0]; - Translate(&b3,b1,(angle + a),dy); - Translate(&b5,b1,(angle + a),-(dy * 0.75)); - if(dto[i].type != 'S') { - if(dto[i].type == 'L') - hasLeft = 1; - else if(dto[i].type == 'R') - hasRgt = 1; - for(j = 1; j < dto[i].n; j++) { - dy = fabs(dto[i].dy[j]) + trackGauge * 1.5; - b2 = dto[i].pts[j]; - Translate(&b4,b2,(angle + a),dy); - Translate(&b6,b2,(angle + a),-(dy * 0.75)); - - // Draw the bridge background - DrawBridgeFill(d,b3,b4,b5,b6); - - // Draw the bridge edge - DrawLine(d,b3,b4,width2,drawColorBlack); - b1 = b2; - b3 = b4; - b5 = b6; - } - } - if(i == i2) - break; - } - - if(dtod.strPath >= 0 && dtod.str2Path >= 0) { - i1 = dtod.strPath; - i2 = dtod.str2Path; - if(!hasRgt) { - DIST_T dy = trackGauge * 1.5; - ANGLE_T a1, a2; - b1 = dto[i1].pts[0]; - a1 = dto[i1].angle + 90; - Translate(&b3,b1,a1,dy); - - b2 = dto[i2].pts[dto[i2].n - 1]; - a2 = dto[i2].angle + 90; - Translate(&b4,b2,a2,dy); - - FindIntersection(&b0, b3, a1-90.0, b4, a2-90.0); - - // Draw the bridge edge - DrawLine(d,b3,b0,width2,drawColorBlack); - DrawLine(d,b0,b4,width2,drawColorBlack); - } - - if(!hasLeft) { - DIST_T dy = trackGauge * 1.5; - ANGLE_T a1, a2; - b1 = dto[i2].pts[0]; - a1 = dto[i2].angle - 90; - Translate(&b3,b1,a1,dy); - - b2 = dto[i1].pts[dto[i1].n - 1]; - a2 = dto[i1].angle - 90; - Translate(&b4,b2,a2,dy); - - FindIntersection(&b0, b3, a1+90.0, b4, a2+90.0); - - // Draw the bridge edge - DrawLine(d,b3,b0,width2,drawColorBlack); - DrawLine(d,b0,b4,width2,drawColorBlack); - } - - if(dtod.toType == DTO_XNG9) { - DIST_T dy = trackGauge * 1.5; - ANGLE_T a1, a2; - b1 = dto[i1].pts[dto[i1].n - 1]; - a1 = dto[i1].angle + 90; - Translate(&b3,b1,a1,dy); - - b2 = dto[i2].pts[dto[i2].n - 1]; - a2 = dto[i2].angle - 90; - Translate(&b4,b2,a2,dy); - - FindIntersection(&b0, b3, a1-90.0, b4, a2+90.0); - - // Draw the bridge edge - DrawLine(d,b3,b0,width2,drawColorBlack); - DrawLine(d,b0,b4,width2,drawColorBlack); - - b1 = dto[i1].pts[0]; - a1 = dto[i1].angle - 90; - Translate(&b3,b1,a1,dy); - - b2 = dto[i2].pts[0]; - a2 = dto[i2].angle + 90; - Translate(&b4,b2,a2,dy); - - FindIntersection(&b0, b3, a1+90.0, b4, a2-90.0); - - // Draw the bridge edge - DrawLine(d,b3,b0,width2,drawColorBlack); - DrawLine(d,b0,b4,width2,drawColorBlack); - } - } - - // Bridge wings - EPINX_T ep; - coOrd p; - track_p trk1; - coOrd p0,p1; - - for(ep = 0; ep < 4; ep++) { - trk1 = GetTrkEndTrk(dtod.trk,ep); - - if((trk1) && (!GetTrkBridge(trk1))) { - p = GetTrkEndPos(dtod.trk,ep); - a = GetTrkEndAngle(dtod.trk,ep) + 90.0; - - if((dtod.toType == DTO_XNG9) || (ep == 2) || (ep == 3)) { - Translate(&p0,p,a,trackGauge * 1.5); - Translate(&p1,p0,a - 45.0,trackGauge * 1.5); - DrawLine(d,p0,p1,width2,drawColorBlack); - } - if((dtod.toType == DTO_XNG9) || (ep == 0) || (ep == 1)) { - Translate(&p0,p,a,-trackGauge * 1.5); - Translate(&p1,p0,a + 45.0,-trackGauge * 1.5); - DrawLine(d,p0,p1,width2,drawColorBlack); - } - } - } -} - -/** - * Init Normal Turnout data structure - * Calculates the dy value of each segment - * Sets pts values REORIGIN base to actual position and angle - * Save often used last base and last point coOrd - */ -static void DrawDtoInit() -{ - struct extraDataCompound_t* xx = dtod.xx; - coOrd p1; - int i, j; - - for(i = 0; i < DTO_DIM; i++) { - int n = dto[i].n; - for(j = 0; j < n; j++) { - REORIGIN(p1,dto[i].base[j],xx->angle,xx->orig); - dto[i].pts[j] = p1; - if(j < n - 1) - dto[i].dy[j] = (dto[i].base[j + 1].y - dto[i].base[j].y) / (dto[i].base[j + 1].x - dto[i].base[j].x); - } - dto[i].ptsLast = dto[i].pts[n - 1]; - dto[i].baseLast = dto[i].base[n - 1]; - } -} - -/** - * Draw Normal (Single Origin) Turnout Bridge and Ties. Uses the static dto and dtod structures. - * - * \param d The drawing object - * \param scaleInx The layout/track scale index - * \param color The tie color. If black the color is read from the global tieColor. - */ -static void DrawNormalTurnout( - drawCmd_p d, - SCALEINX_T scaleInx, - BOOL_T omitTies, - wDrawColor color) -{ - tieData_p td; - DIST_T len; - coOrd pos; - int cnt; - ANGLE_T angle; - coOrd s1, s2, p1, p2, q1, q2; - int s0, p0, q0; - ANGLE_T a0; - - if (color == wDrawColorBlack) - color = tieColor; - - DIST_T trackGauge = GetTrkGauge(dtod.trk); - - DrawDtoInit(); - - // draw the points -#ifdef DTO_DEBUG - if (DTO_DEBUG == DTO_NORMAL) DrawDtoLayout(d, scaleInx); -#endif - - int strPath = dtod.strPath, othPath = 0, secPath = 1; - int toType = dtod.toType; - int first = 1; - - switch (toType) { - case DTO_NORMAL: - othPath = 1 - strPath; - secPath = strPath; - break; - case DTO_WYE: - // strPath = 2; - othPath = 0; secPath = 1; - break; - case DTO_THREE: - switch (strPath) { - case 0: - othPath = 1; secPath = 2; - break; - case 1: - othPath = 0; secPath = 2; - break; - case 2: - othPath = 0; secPath = 1; - break; - } - break; - } - - if(dtod.bridge) { - DrawTurnoutBridge(d,othPath,secPath); - } - if (omitTies) - return; - - // Straight vector for tie angle - if (toType == DTO_WYE) { - s1 = dto[othPath].pts[0]; - s2 = MidPtCoOrd(dto[othPath].ptsLast, dto[secPath].ptsLast); - } - else { - s1 = dto[strPath].pts[0]; - s2 = dto[strPath].ptsLast; - } - // Diverging vector(s) - p1 = dto[othPath].pts[0]; - p2 = dto[othPath].ptsLast; - q1 = dto[secPath].pts[0]; - q2 = dto[secPath].ptsLast; - - td = GetScaleTieData(scaleInx); - len = FindDistance(s1, s2); - angle = FindAngle(s1, s2); // The straight segment - - cnt = (int)floor(len / td->spacing + 0.5); - if (cnt > 0) { - int pn = dto[othPath].n; - int qn = dto[secPath].n; - DIST_T dx = len / cnt; - s0 = p0 = q0 = 0; - DIST_T tdlen = td->length; - DIST_T tdmax = (toType == DTO_WYE) ? 2.0 * tdlen : 2.5 * tdlen; - DIST_T px = len, dlenx = dx / 2; - - cnt = cnt > 1 ? cnt - 1 : 1; - for (px = dlenx; cnt; cnt--, px += dx) { - if (px >= dto[othPath].base[p0 + 1].x) p0++; - if (px >= dto[secPath].base[q0 + 1].x) q0++; - if (p0 >= pn || q0 >= qn) - break; - - if ((px + dx >= dto[othPath].baseLast.x) || (px + dx >= dto[secPath].baseLast.x)) { - break; - } - - DIST_T dy1 = dto[othPath].base[p0].y + (px - dto[othPath].base[p0].x) * dto[othPath].dy[p0]; - DIST_T dy2 = dto[secPath].base[q0].y + (px - dto[secPath].base[q0].x) * dto[secPath].dy[q0]; - tdlen = td->length + fabs(dy1) + fabs(dy2); - if (tdlen > tdmax) - break; - - DIST_T dy = dy1 + dy2; - Translate(&pos, s1, angle, px); - Translate(&pos, pos, (angle - 90.0), dy / 2); - - DrawTie(d, pos, angle, tdlen, td->width, color, tieDrawMode == TIEDRAWMODE_SOLID); - } - - // Asymmetric? Use longer ties for remaining two tracks (strPath, othPath) - DIST_T sx = px; // Save these values for second code block - int s0 = p0; - if((dtod.toType == DTO_THREE) && (px + dx >= dto[secPath].baseLast.x)){ - for ( ; cnt; cnt--, px += dx) { - if (px >= dto[othPath].base[p0 + 1].x) p0++; - // if (px >= dto[secPath].base[q0 + 1].x) q0++; - if (p0 >= pn) - break; - - if (px + dx >= dto[othPath].baseLast.x) { - break; - } - - DIST_T dy1 = dto[othPath].base[p0].y + (px - dto[othPath].base[p0].x) * dto[othPath].dy[p0]; - tdlen = td->length + fabs(dy1); - if (tdlen > tdmax) - break; - - DIST_T dy = dy1; - Translate(&pos, s1, angle, px); - Translate(&pos, pos, (angle - 90.0), dy / 2); - - DrawTie(d, pos, angle, tdlen, td->width, color, tieDrawMode == TIEDRAWMODE_SOLID); - } - } - - // Draw remaining ties, if any - if (px + dx < dto[othPath].baseLast.x){ - p1 = dto[othPath].pts[p0]; - p2 = dto[othPath].ptsLast; - angle = FindAngle(p1, p2); - a0 = FindAngle(dto[othPath].base[p0], dto[othPath].baseLast); - DIST_T lenr = (dto[othPath].baseLast.x - px + dlenx) / cos(D2R(90.0 - a0)); - Translate(&p1, p2, angle, -lenr); - DrawStraightTies(d, scaleInx, p1, p2, color); - } - else { - p1 = dto[othPath].pts[pn - 2]; - a0 = FindAngle(p1, p2); - Translate(&pos, p2, a0, -dx / 2); - DrawTie(d, pos, a0, td->length, td->width, color, tieDrawMode == TIEDRAWMODE_SOLID); - } - // Restore saved values - if(dtod.toType == DTO_THREE){ - px = sx; - p0 = s0; - } - - // Asymmetric? Use longer ties for remaining two tracks (strPath, secPath) - if((dtod.toType == DTO_THREE) && (px + dx >= dto[othPath].baseLast.x)){ - for ( ; cnt; cnt--, px += dx) { - // if (px >= dto[othPath].base[p0 + 1].x) p0++; - if (px >= dto[secPath].base[q0 + 1].x) q0++; - if (q0 >= qn) - break; - - if (px + dx >= dto[secPath].baseLast.x) { - break; - } - - DIST_T dy1 = dto[secPath].base[q0].y + (px - dto[secPath].base[q0].x) * dto[secPath].dy[q0]; - tdlen = td->length + fabs(dy1); - if (tdlen > tdmax) - break; - - DIST_T dy = dy1; - Translate(&pos, s1, angle, px); - Translate(&pos, pos, (angle - 90.0), dy / 2); - - DrawTie(d, pos, angle, tdlen, td->width, color, tieDrawMode == TIEDRAWMODE_SOLID); - } - } - if (px + dx < dto[secPath].baseLast.x) { - q1 = dto[secPath].pts[q0]; - q2 = dto[secPath].ptsLast; - angle = FindAngle(q1, q2); - a0 = FindAngle(dto[secPath].base[q0], dto[secPath].baseLast); - DIST_T lenr = (dto[secPath].baseLast.x - px + dlenx) / cos(D2R(90.0 - a0)); - Translate(&q1, q2, angle, -lenr); - DrawStraightTies(d, scaleInx, q1, q2, color); - } - else { - q1 = dto[secPath].pts[qn - 2]; - a0 = FindAngle(q1, q2); - Translate(&pos, q2, a0, -dx / 2); - DrawTie(d, pos, a0, td->length, td->width, color, tieDrawMode == TIEDRAWMODE_SOLID); - } - - // Final ties at end - if (dtod.toType == DTO_THREE) { - - int n = (int)(dto[strPath].baseLast.x); - if (px + dx < len) { - angle = FindAngle(s1, s2); - DIST_T lenr = len - px + dlenx; - Translate(&s1, s2, angle, -lenr); - DrawStraightTies(d, scaleInx, s1, s2, color); - } - else { - n = dto[strPath].n; - s1 = dto[strPath].pts[n - 2]; - a0 = FindAngle(s1, s2); - Translate(&pos, s2, a0, -dx / 2); - DrawTie(d, pos, a0, td->length, td->width, color, tieDrawMode == TIEDRAWMODE_SOLID); - } - } - } -} - -/** - * Draw Curved (Single Origin) Turnout Bridge and Ties. Uses the static dto and dtod structures. - * - * \param d The drawing object - * \param scaleInx The layout/track scale index - * \param color The tie color. If black the color is read from the global tieColor. - */ -static void DrawCurvedTurnout( - drawCmd_p d, - SCALEINX_T scaleInx, - BOOL_T omitTies, - wDrawColor color) -{ - tieData_p td; - DIST_T len, r; - coOrd pos; - int cnt; - ANGLE_T angle, dang; - coOrd center; - coOrd p1, p2, q1, q2; - ANGLE_T a0, a1, a2; - struct extraDataCompound_t* xx = dtod.xx; - - if (color == wDrawColorBlack) - color = tieColor; - - DrawDtoInit(); - - // draw the points -#ifdef DTO_DEBUG - if (DTO_DEBUG == DTO_CURVED) DrawDtoLayout(d, scaleInx); -#endif - - int othPath = 0, secPath = 1; - int toType = dtod.toType; - - if(dtod.bridge) { - DrawTurnoutBridge(d,othPath,secPath); - } - if (omitTies) - return; - - td = GetScaleTieData(scaleInx); - - // Save the ending coordinates - coOrd othEnd = zero, secEnd = zero; - - trkSeg_p trk; - DIST_T tdlen = td->length, tdmax = tdlen * 2.5; - DIST_T tdspc = td->spacing, tdspc2 = tdspc / 2.0; - double rdot = td->width / 2; - - int pn = dto[othPath].n; - int qn = dto[secPath].n; - int p0 = 0, q0 = 0; - DIST_T px = 0, qx = 0, dy = 0, dy1 = 0, dy2 = 0; - - double cosAdj = 1.0; - - angle = 0; - px = tdspc2; - qx = tdspc2; - int segs = max(dto[othPath].n, dto[secPath].n); - for (; segs > 0; segs--) { - - if (px >= dto[othPath].base[p0 + 1].x) - p0++; - if (qx >= dto[secPath].base[q0 + 1].x) - q0++; - if ((p0 >= pn - 1) || (q0 >= qn - 1)) { - break; - } - - trk = dto[othPath].trkSeg[p0]; - if (trk->type == SEG_CRVTRK) { - - center = trk->u.c.center; - r = fabs(trk->u.c.radius); - a0 = NormalizeAngle(trk->u.c.a0 + dtod.xx->angle); - a1 = trk->u.c.a1; - - pos = center; - REORIGIN(center, pos, xx->angle, xx->orig); - - len = r * D2R(a1); - cnt = (int)floor(len / tdspc + 0.5); - if (len - tdspc * cnt >= tdspc2) { - cnt++; - } - DIST_T tdlen = td->length; - DIST_T dx = len / cnt, dx2 = dx / 2; - - if (cnt != 0) { - dang = (len / cnt) * 360 / (2 * M_PI * r); - DIST_T dx = len / cnt, dx2 = dx / 2; - - if (dto[othPath].type == 'R') { - a2 = a0 + dang / 2; - } - else { - a2 = a0 + a1 - dang / 2; - dang = -dang; - } - angle += fabs(dang / 2); - - cosAdj = fabs(cos(D2R(angle))); - px += dx2 * cosAdj; - qx += dx2 * cosAdj; - - for (; cnt; cnt--, a2 += dang, angle += dang) { - if (px >= dto[othPath].base[p0 + 1].x) - p0++; - if (qx >= dto[secPath].base[q0 + 1].x) - q0++; - if ((p0 >= pn - 1) || (q0 >= qn - 1)) { - break; - } - - coOrd e1, e2; - PointOnCircle(&e1, center, r, a2); - - q1 = dto[secPath].pts[q0]; - q2 = dto[secPath].pts[q0 + 1]; - FindIntersection(&e2, e1, a2, q1, FindAngle(q1, q2)); - - dy = FindDistance(e1, e2); - DIST_T tlen = tdlen + dy; - - if (tlen > tdmax) { - break; - } - - Translate(&pos, e1, a2, -dy / 2); - DrawTie(d, pos, angle + xx->angle + 90, tlen, td->width, color, tieDrawMode == TIEDRAWMODE_SOLID); - - // Assures that these ends are the last point drawn before break - othEnd = e1; - secEnd = e2; - - cosAdj = fabs(cos(D2R(angle))); - if (cnt > 1) { - px += dx * cosAdj; - qx += dx * cosAdj; - } - else { - px += dx2 * cosAdj; - qx += dx2 * cosAdj; - } - } - } - } - else { - cosAdj = fabs(cos(D2R(angle))); - - p1 = dto[othPath].base[p0]; - p2 = dto[othPath].base[p0 + 1]; - len = FindDistance(p1, p2); - cnt = (int)floor(len / tdspc + 0.6); - if (cnt > 0) { - DIST_T dx = len / cnt, dx2 = dx / 2; - - for (; cnt; cnt--) { - if (px >= dto[othPath].base[p0 + 1].x) - p0++; - if (qx >= dto[secPath].base[q0 + 1].x) - q0++; - if ((p0 >= pn - 1) || (q0 >= qn - 1)) { - break; - } - - p1 = dto[othPath].base[p0]; - p2 = dto[othPath].base[p0 + 1]; - - if ((px >= dto[othPath].baseLast.x) - || (qx >= dto[secPath].baseLast.x)) { - break; - } - - dy1 = dto[secPath].base[q0].y + (qx - dto[secPath].base[q0].x) * dto[secPath].dy[q0]; - dy2 = dto[othPath].base[p0].y + (px - dto[othPath].base[p0].x) * dto[othPath].dy[p0]; - dy = dy1 - dy2; - DIST_T tlen = tdlen + fabs(cosAdj * dy); - if (tlen > tdmax) { - break; - } - - q1 = dto[secPath].pts[q0]; - q2 = dto[secPath].pts[q0 + 1]; - a1 = FindAngle(q1, q2); - DIST_T xlen = qx - dto[secPath].base[q0].x; - Translate(&pos, q1, a1, xlen); - secEnd = pos; - - q1 = dto[othPath].pts[p0]; - q2 = dto[othPath].pts[p0 + 1]; - a1 = FindAngle(q1, q2); - xlen = px - dto[othPath].base[p0].x; - Translate(&pos, q1, a1, xlen); - othEnd = pos; - - Translate(&pos, pos, (a1 - 90.0), dy / 2); - DrawTie(d, pos, a1, tlen, td->width, color, tieDrawMode == TIEDRAWMODE_SOLID); - - cosAdj = fabs(cos(D2R(angle))); - px += dx * cosAdj; - qx += dx * cosAdj; - } - } - else { - break; - } - } - } - -#ifdef DTO_DEBUG - if (DTO_DEBUG == DTO_CURVED) { - DrawFillCircle(d, othEnd, rdot, drawColorGreen); - DrawFillCircle(d, secEnd, rdot, drawColorGreen); - - DrawFillCircle(d, dto[othPath].pts[p0], rdot, drawColorBlue); - DrawFillCircle(d, dto[secPath].pts[q0], rdot, drawColorBlue); - } -#endif - - // Draw remaining ties, if any - p1 = othEnd; - p2 = dto[othPath].ptsLast; - a0 = FindAngle(p1, p2); - len = FindDistance(p1, p2); - if (len >= 2 * tdspc) { - Translate(&p1, p1, a0, tdspc2); - DrawStraightTies(d, scaleInx, p1, p2, color); - } - else if (len > tdspc2) { - Translate(&p2, p2, a0, -tdspc2); - DrawTie(d, p2, a0, td->length, td->width, color, tieDrawMode == TIEDRAWMODE_SOLID); - } - - q1 = secEnd; - q2 = dto[secPath].ptsLast; - a0 = FindAngle(q1, q2); - len = FindDistance(q1, q2); - if (len >= 2 * tdspc) { - Translate(&q1, q1, a0, tdspc2); - DrawStraightTies(d, scaleInx, q1, q2, color); - } - else if (len > tdspc2) { - Translate(&q2, q2, a0, -tdspc2); - DrawTie(d, q2, a0, td->length, td->width, color, tieDrawMode == TIEDRAWMODE_SOLID); - } -} - -/** - * Draw Crossing and Slip Turnout Bridge and Ties - Uses the static dto and dtod structures. - * - * \param d The drawing object - * \param scaleInx The layout/track scale index - * \param color The tie color. If black the color is read from the global tieColor. - */ -static void DrawXingTurnout( - drawCmd_p d, - SCALEINX_T scaleInx, - BOOL_T omitTies, - wDrawColor color) -{ - tieData_p td; - DIST_T len; - coOrd pos; - int cnt; - ANGLE_T cAngle; - - if (color == wDrawColorBlack) - color = tieColor; - - coOrd c1, c2, s1, s2, p1, p2, q1; - int p0, q0; - ANGLE_T a0, a1, a2; - int strPath = dtod.strPath, str2Path = dtod.str2Path; - - struct extraDataCompound_t* xx = dtod.xx; - - DrawDtoInit(); - - dto[strPath].angle = FindAngle(dto[strPath].pts[0], dto[strPath].ptsLast); - dto[str2Path].angle = FindAngle(dto[str2Path].pts[0], dto[str2Path].ptsLast); - - int othPath = strPath, secPath = str2Path; - int toType = dtod.toType; - - int i, j; - switch (toType) { - case DTO_XING: - case DTO_XNG9: - break; - case DTO_SSLIP: - for (i = 0; i < dtod.pathCnt; i++) { - if (dto[i].type == 'L' || dto[i].type == 'R') { - secPath = i; - break; - } - } - break; - case DTO_DSLIP: - for (i = 0; i < dtod.pathCnt; i++) { - if (dto[i].type == 'L') { - othPath = i; - } - else if (dto[i].type == 'R') { - secPath = i; - } - } - break; - } - - if(dtod.bridge) { - DrawXingBridge(d,othPath,secPath); - } - // draw the points -#ifdef DTO_DEBUG - if (DTO_DEBUG == DTO_XING) DrawDtoLayout(d, scaleInx); -#endif - - if (omitTies) - return; - - td = GetScaleTieData(scaleInx); - DIST_T tdlen = td->length, tdmax = 2.0 * tdlen; - DIST_T tdspc = td->spacing, tdspc2 = tdspc / 2; - - // Midpoint - p1 = dto[strPath].pts[0]; - a1 = dto[strPath].angle; - - q1 = dto[str2Path].pts[0]; - a2 = dto[str2Path].angle; - - FindIntersection(&pos, p1, a1, q1, a2); - dtod.midPt = pos; - -#ifdef DTO_DEBUG - if(DTO_DEBUG == DTO_XING) - { - double r = td->width / 2; - DrawFillCircle(d,p1,r,drawColorPurple); - DrawFillCircle(d,q1,r,drawColorPurple); - DrawFillCircle(d,dtod.midPt,r,drawColorPurple); - } -#endif - - // Tie length adjust - double dAngle = fabs(DifferenceBetweenAngles(a1, a2)); - double magic = 1.0; - - // Short circuit the complex code for this simple case - if (toType == DTO_XNG9) { - p1 = dto[strPath].pts[0]; - p2 = dto[strPath].ptsLast; - DrawStraightTies(d, scaleInx, p1, p2, color); - - p1 = dto[str2Path].pts[0]; - p2 = dto[str2Path].ptsLast; - - // Omit the center ties - magic = 1 / cos(D2R(90 - dAngle)); - DIST_T tdadj = (tdlen / 2) * magic; - DIST_T tdadj2 = tdspc2 * magic; - - dAngle = (dAngle - 90) / 2; - Translate(&pos, dtod.midPt, a2, -tdadj - tdadj2); - DrawTie(d, pos, a2 - dAngle, tdlen, td->width, color, tieDrawMode == TIEDRAWMODE_SOLID); - - Translate(&pos, dtod.midPt, a2, -tdadj - tdspc); - DrawStraightTies(d, scaleInx, p1, pos, color); - - Translate(&pos, dtod.midPt, a2, tdadj + tdadj2); - DrawTie(d, pos, a2 - dAngle, tdlen, td->width, color, tieDrawMode == TIEDRAWMODE_SOLID); - - Translate(&pos, dtod.midPt, a2, tdadj + tdspc); - DrawStraightTies(d, scaleInx, pos, p2, color); - return; - } - - // Straight vector for tie angle - s1 = MidPtCoOrd(dto[strPath].base[0], dto[str2Path].base[0]); - s2 = MidPtCoOrd(dto[strPath].baseLast, dto[str2Path].baseLast); - - // Rotate base coordinates so that the tie line is aligned with x-axis and origin is at zero - cAngle = FindAngle(s1, s2); - for (i = 0; i < DTO_DIM; i++) - for (j = 0; j < dto[i].n; j++) { - dto[i].base[j].x -= s1.x; - dto[i].base[j].y -= s1.y; - Rotate(&dto[i].base[j], zero, (90.0 - cAngle)); - } - - for (i = 0; i < DTO_DIM; i++) { - for (j = 0; j < dto[i].n - 1; j++) { - dto[i].dy[j] = (dto[i].base[j + 1].y - dto[i].base[j].y) / (dto[i].base[j + 1].x - dto[i].base[j].x); - } - if (dto[i].type == 'S') - dto[i].angle = FindAngle(dto[i].pts[0], dto[i].ptsLast); - } - - // Tie center line in drawing coordinates - REORIGIN(c1, s1, xx->angle, xx->orig); - REORIGIN(c2, s2, xx->angle, xx->orig); - cAngle = FindAngle(c1, c2); - - int pn = dto[othPath].n; - int qn = dto[secPath].n; - - // Tie length adjust - magic = 1 / cos(0.5 * D2R(dAngle)); - // Extra ties length adjust - double magic2 = 1.0 / cos(0.5 * D2R(dAngle)); - - // Draw right half - len = FindDistance(dtod.midPt, c2); - cnt = (int)floor(len / td->spacing + 0.5); - if (cnt <= 0) - return; - - DIST_T dx = len / cnt; - p0 = q0 = 0; - DIST_T dx2 = dx / 2; - DIST_T px = len + dx2; - DIST_T lenx = 0; - - while (p0 < pn && px > dto[othPath].base[p0 + 1].x) p0++; - while (q0 < qn && px > dto[secPath].base[q0 + 1].x) q0++; - while (p0 < pn && q0 < qn) { - if (px > dto[othPath].base[p0 + 1].x) p0++; - if (px > dto[secPath].base[q0 + 1].x) q0++; - if (p0 >= pn || q0 >= qn) - break; - // Dont use baseLast, as base coOrds have been rotated - if ((px + dx >= dto[othPath].base[pn - 1].x) - || (px + dx >= dto[secPath].base[qn - 1].x)) { - break; - } - - DIST_T dy1 = dto[othPath].base[p0].y + (px - dto[othPath].base[p0].x) * dto[othPath].dy[p0]; - DIST_T dy2 = dto[secPath].base[q0].y + (px - dto[secPath].base[q0].x) * dto[secPath].dy[q0]; - tdlen = (td->length + fabs(dy1) + fabs(dy2)) * magic; - if(tdlen > tdmax) - { - if(dAngle >= 30) - { - DIST_T dy = (dy1 + dy2) / 2; - Translate(&pos,dtod.midPt,cAngle,px - len); - Translate(&pos,pos,(cAngle - 90.0),dy); - DrawTie(d,pos,cAngle,tdlen - td->length * magic,td->width,color,tieDrawMode == TIEDRAWMODE_SOLID); - lenx += dx2 * magic2; - } - break; - } - - DIST_T dy = (dy1 + dy2) / 2; - Translate(&pos, dtod.midPt, cAngle, px - len); - Translate(&pos, pos, (cAngle - 90.0), dy); - DrawTie(d, pos, cAngle, tdlen, td->width, color, tieDrawMode == TIEDRAWMODE_SOLID); - - px += dx; - lenx += dx; - } - - p1 = dtod.midPt; - p2 = dto[strPath].ptsLast; - DIST_T lenr = FindDistance(p1, p2) - lenx * magic2; - a0 = dto[strPath].angle; - if (lenr > dx) { - Translate(&pos, p2, a0, -lenr); - DrawStraightTies(d, scaleInx, pos, p2, color); - } - else { - Translate(&pos, p2, a0, -dx2); - DrawTie(d, pos, a0, td->length, td->width, color, tieDrawMode == TIEDRAWMODE_SOLID); - } - - // p1 = dtod.midPt; - p2 = dto[str2Path].ptsLast; - lenr = FindDistance(p1, p2) - lenx * magic2; - a0 = dto[str2Path].angle; - if (lenr > dx) { - Translate(&pos, p2, a0, -lenr); - DrawStraightTies(d, scaleInx, pos, p2, color); - } - else { - Translate(&pos, p2, a0, -dx2); - DrawTie(d, pos, a0, td->length, td->width, color, tieDrawMode == TIEDRAWMODE_SOLID); - } - - // Draw left half - // Change the straight path used - if (dtod.toType == DTO_SSLIP) { - othPath = str2Path; - } - - len = FindDistance(c1, dtod.midPt); - cnt = (int)floor(len / td->spacing + 0.5); - if (cnt <= 0) - return; - - p0 = q0 = 0; - tdlen = td->length; - - dx = len / cnt; - dx2 = dx / 2; - px = len - dx2; - lenx = 0; - - while (p0 < pn && px > dto[othPath].base[p0 + 1].x) p0++; - while (q0 < qn && px > dto[secPath].base[q0 + 1].x) q0++; - while (p0 >= 0 && q0 >= 0) { - if (px < dto[othPath].base[p0].x) p0--; - if (px < dto[secPath].base[q0].x) q0--; - if (p0 < 0 || q0 < 0) - break; - - if ((px - dx < dto[othPath].base[0].x) - || (px - dx < dto[secPath].base[0].x)) { - break; - } - - DIST_T dy1 = dto[othPath].base[p0].y + (px - dto[othPath].base[p0].x) * dto[othPath].dy[p0]; - DIST_T dy2 = dto[secPath].base[q0].y + (px - dto[secPath].base[q0].x) * dto[secPath].dy[q0]; - tdlen = (td->length + fabs(dy1) + fabs(dy2)) * magic; - if(tdlen > tdmax) - { - if(dAngle >= 30) - { - DIST_T dy = (dy1 + dy2) / 2; - Translate(&pos,dtod.midPt,cAngle,px - len); - Translate(&pos,pos,(cAngle - 90.0),dy); - DrawTie(d,pos,cAngle,tdlen - td->length * magic,td->width,color,tieDrawMode == TIEDRAWMODE_SOLID); - lenx += dx2 * magic2; - } - break; - } - - DIST_T dy = (dy1 + dy2) / 2; - Translate(&pos, dtod.midPt, cAngle, px - len); - Translate(&pos, pos, (cAngle - 90.0), dy); - DrawTie(d, pos, cAngle, tdlen, td->width, color, tieDrawMode == TIEDRAWMODE_SOLID); - - px -= dx; - lenx += dx; - } - - p1 = dto[strPath].pts[0]; - p2 = dtod.midPt; - a0 = dto[strPath].angle; - lenr = FindDistance(p1, p2) - lenx * magic2; - if (lenr > dx) { - Translate(&pos, p1, a0, lenr); - DrawStraightTies(d, scaleInx, p1, pos, color); - } - else { - Translate(&pos, p1, a0, dx2); - DrawTie(d, pos, a0, td->length, td->width, color, tieDrawMode == TIEDRAWMODE_SOLID); - } - p1 = dto[str2Path].pts[0]; - // p2 = dtod.midPt; - a0 = dto[str2Path].angle; - lenr = FindDistance(p1, p2) - lenx * magic2; - if (lenr > dx) { - Translate(&pos, p1, a0, lenr); - DrawStraightTies(d, scaleInx, p1, pos, color); - } - else { - Translate(&pos, p1, a0, dx2); - DrawTie(d, pos, a0, td->length, td->width, color, tieDrawMode == TIEDRAWMODE_SOLID); - } -} - -/** - * Draw Crossover (Two Origin) Turnout Bridge and Ties. Uses the static dto and dtod structures. - * - * \param d The drawing object - * \param scaleInx The layout/track scale index - * \param color The tie color. If black the color is read from the global tieColor. - */ -static void DrawCrossTurnout( - drawCmd_p d, - SCALEINX_T scaleInx, - BOOL_T omitTies, - wDrawColor color) -{ - tieData_p td; - DIST_T len, dx; - coOrd pos; - int cnt; - ANGLE_T angle; - - if (color == wDrawColorBlack) - color = tieColor; - - struct extraDataCompound_t* xx = dtod.xx; - - DrawDtoInit(); - - // draw the points -#ifdef DTO_DEBUG - if (DTO_DEBUG == DTO_LCROSS) DrawDtoLayout(d, scaleInx); -#endif - - int strPath = dtod.strPath, str2Path = dtod.str2Path; - // Bad assumption - int othPath = 2, secPath = 2; - if (dtod.pathCnt == 4) secPath = 3; - - dto[strPath].angle = FindAngle(dto[strPath].pts[0], dto[strPath].ptsLast); - dto[str2Path].angle = FindAngle(dto[str2Path].pts[0], dto[str2Path].ptsLast); - - if(dtod.bridge) { - DrawCrossBridge(d,strPath,str2Path); - } - if (omitTies) - return; - - td = GetScaleTieData(scaleInx); - - coOrd s1, s2, t1, t2, p1, p2, q1, q2; - int s0, t0, p0, q0; - - int sn = dto[strPath].n; - int tn = dto[str2Path].n; - int pn = dto[othPath].n; - int qn = dto[secPath].n; - - s1 = dto[strPath].pts[0]; - s2 = dto[strPath].ptsLast; - t1 = dto[str2Path].pts[0]; - t2 = dto[str2Path].ptsLast; - angle = dto[strPath].angle; - - p1 = dto[othPath].base[0]; - p2 = dto[othPath].baseLast; - q1 = dto[secPath].base[0]; - q2 = dto[secPath].baseLast; - - td = GetScaleTieData(scaleInx); - len = FindDistance(s1, s2); - angle = dto[strPath].angle; - - cnt = (int)floor(len / td->spacing + 0.5); - if (cnt > 0) { - DIST_T px = 0; - DIST_T dy, dy1, dy2; - int cflag = 0; - dy = dto[str2Path].base[0].y - dto[strPath].base[0].y; - - dx = len / cnt; - s0 = t0 = p0 = q0 = 0; - DIST_T tdlen = td->length; - DIST_T dlenx = dx / 2; - - DIST_T px1 = len / 2 - dlenx * 5, - px2 = len / 2 + dlenx * 4; - - for (px = dlenx; cnt; cnt--, px += dx) { - if (px >= dto[strPath].base[s0 + 1].x) s0++; - if (px >= dto[str2Path].base[t0 + 1].x) t0++; - if (px >= dto[othPath].base[p0 + 1].x) p0++; - if (px >= dto[secPath].base[q0 + 1].x) q0++; - if (s0 >= sn || t0 >= tn || p0 >= pn || q0 >= qn) - break; - - if ((px >= dto[strPath].baseLast.x) - || (px >= dto[str2Path].baseLast.x)) { - break; - } - - dy1 = dy2 = 0; - cflag = 0; - if (px < px1) { - switch (dtod.toType) { - case DTO_DCROSS: - dy1 = dto[othPath].base[p0].y + (px - dto[othPath].base[p0].x) * dto[othPath].dy[p0]; - dy2 = dy - dto[secPath].base[q0].y - (px - dto[secPath].base[q0].x) * dto[secPath].dy[q0]; - break; - case DTO_LCROSS: - dy1 = dto[othPath].base[p0].y + (px - dto[othPath].base[p0].x) * dto[othPath].dy[p0]; - dy2 = 0; - break; - case DTO_RCROSS: - dy1 = 0; - dy2 = dy - dto[secPath].base[q0].y - (px - dto[secPath].base[q0].x) * dto[secPath].dy[q0]; - break; - default: - break; - } - } - else if (px < px2) { - dy1 = (dto[str2Path].base[s0].y - dto[strPath].base[t0].y); - dy2 = 0; - cflag = 1; - } - else { - switch (dtod.toType) { - case DTO_DCROSS: - dy1 = dto[secPath].base[q0].y + (px - dto[secPath].base[q0].x) * dto[secPath].dy[q0]; - dy2 = dy - dto[othPath].base[p0].y - (px - dto[othPath].base[p0].x) * dto[othPath].dy[p0]; - break; - case DTO_LCROSS: - dy1 = 0; - dy2 = dy - dto[secPath].base[q0].y - (px - dto[secPath].base[q0].x) * dto[secPath].dy[q0]; - break; - case DTO_RCROSS: - dy1 = dto[othPath].base[p0].y + (px - dto[othPath].base[p0].x) * dto[othPath].dy[p0]; - dy2 = 0; - break; - default: - break; - } - } - - if (fabs(dy1) + fabs(dy2) >= dy) { - dy1 = (dto[str2Path].base[s0].y - dto[strPath].base[t0].y); - dy2 = 0; - cflag = 1; - } - - tdlen = td->length + fabs(dy1); - Translate(&pos, s1, angle, px); - Translate(&pos, pos, (angle - 90.0), dy1 / 2); - DrawTie(d, pos, angle, tdlen, td->width, color, tieDrawMode == TIEDRAWMODE_SOLID); - - if (!cflag) { - tdlen = td->length + fabs(dy2); - Translate(&pos, t1, angle, px); - Translate(&pos, pos, (angle - 90.0), -dy2 / 2); - DrawTie(d, pos, angle, tdlen, td->width, color, tieDrawMode == TIEDRAWMODE_SOLID); - } - } - return; - - // Draw remaining ties, if any - // Currently by definition, there won't be any - /* - if (px + dx < dto[strPath].baseLast.x) { - p1 = dto[strPath].pts[p0]; - p2 = dto[strPath].ptsLast; - angle = FindAngle(p1, p2); - a0 = FindAngle(dto[strPath].base[p0], dto[strPath].baseLast); - DIST_T lenr = (dto[strPath].baseLast.x - px + dlenx) / cos(D2R(90.0 - a0)); - Translate(&p1, p2, angle, -lenr); - DrawStraightTies(d, scaleInx, p1, p2, color); - } - else { - p1 = dto[strPath].pts[pn - 2]; - a0 = FindAngle(p1, p2); - Translate(&pos, p2, a0, -dx / 2); - DrawTie(d, pos, a0, td->length, td->width, color, tieDrawMode == TIEDRAWMODE_SOLID); - } - - if (px + dx < dto[str2Path].baseLast.x) { - q1 = dto[str2Path].pts[q0]; - q2 = dto[str2Path].ptsLast; - angle = FindAngle(q1, q2); - a0 = FindAngle(dto[str2Path].base[q0], dto[str2Path].baseLast); - DIST_T lenr = (dto[str2Path].baseLast.x - px + dlenx) / cos(D2R(90.0 - a0)); - Translate(&q1, q2, angle, -lenr); - DrawStraightTies(d, scaleInx, q1, q2, color); - } - else { - q1 = dto[str2Path].pts[qn - 2]; - a0 = FindAngle(q1, q2); - Translate(&pos, q2, a0, -dx / 2); - DrawTie(d, pos, a0, td->length, td->width, color, tieDrawMode == TIEDRAWMODE_SOLID); - } - */ - } -} - -/** - * Draw all turnout components: ties, rail, roadbed, etc. The turnout is checked - * to see if the enhanced methods can be used. If so the ties are drawn and the - * TB_NOTIES bit is set so that the rails and such are drawn on top of the ties. - * That bit is restored to its previous state before return. - * - * \param trk Pointer to the track object - * \param d The drawing object - * \param color The turnout color. - */ -static void DrawTurnout( - track_p trk, - drawCmd_p d, - wDrawColor color) -{ - struct extraDataCompound_t* xx = GET_EXTRA_DATA(trk, T_TURNOUT, extraDataCompound_t); - wIndex_t i; - long widthOptions = 0; - SCALEINX_T scaleInx = GetTrkScale(trk); - DIST_T scale2rail = (d->options & DC_PRINT) ? (twoRailScale * 2 + 1) : twoRailScale; - BOOL_T omitTies = !DoDrawTies(d, trk) || (d->scale > scale2rail) || ((d->options & DC_SIMPLE) != 0); // || (scaleInx == 0); - - widthOptions = DTS_LEFT | DTS_RIGHT; - - int noTies = GetTrkNoTies(trk); - int bridge = GetTrkBridge(trk); - - long skip = 0; - /** @prefs [Preference] NormalTurnoutDraw=1 to skip enhanced drawing methods */ - wPrefGetInteger("Preference", "NormalTurnoutDraw", (long *) &skip, 0); - - int pathCnt = (skip == 0 ? GetTurnoutPaths(trk, xx) : 0); - - if ( (pathCnt > 1) && (pathCnt <= DTO_DIM) - && (trk->endCnt <= 4) - && (xx->special == TOnormal) ) - { - - dtod.bridge = bridge; - - int strPath = -1; - GetTurnoutType(); - - if (dtod.toType != DTO_INVALID) { - - switch (dtod.toType) - { - case DTO_NORMAL: - case DTO_THREE: - case DTO_WYE: - DrawNormalTurnout(d, scaleInx, omitTies, color); - break; - case DTO_CURVED: - DrawCurvedTurnout(d, scaleInx, omitTies, color); - break; - case DTO_XING: - case DTO_XNG9: - case DTO_SSLIP: - case DTO_DSLIP: - DrawXingTurnout(d, scaleInx, omitTies, color); - break; - case DTO_LCROSS: - case DTO_RCROSS: - case DTO_DCROSS: - DrawCrossTurnout(d, scaleInx, omitTies, color); - break; - default: - break; - } - SetTrkNoTies(trk, 1); - ClrTrkBits(trk, TB_BRIDGE); - } - } - - // Begin standard DrawTurnout code to draw rails or centerline - DrawSegsO(d, trk, xx->orig, xx->angle, xx->segs, xx->segCnt, GetTrkGauge(trk), color, widthOptions | DTS_NOCENTER); // no curve center for turnouts - - - for (i = 0; i < GetTrkEndPtCnt(trk); i++) { - DrawEndPt(d, trk, i, color); - } - if ((d->options & DC_SIMPLE) == 0 && - (labelWhen == 2 || (labelWhen == 1 && (d->options & DC_PRINT))) && - labelScale >= d->scale && - (GetTrkBits(trk) & TB_HIDEDESC) == 0) { - DrawCompoundDescription(trk, d, color); - if (!xx->handlaid) - LabelLengths(d, trk, color); - } - if (roadbedWidth > GetTrkGauge(trk) && - (((d->options & DC_PRINT) && d->scale <= (twoRailScale * 2 + 1) / 2.0) || - (roadbedOnScreen && d->scale <= twoRailScale))) - DrawTurnoutRoadbed(d, color, xx->orig, xx->angle, xx->segs, xx->segCnt); - - // Restore these settings - if (noTies == 0) ClrTrkBits(trk, TB_NOTIES); - if (bridge) SetTrkBits(trk, TB_BRIDGE); -} - - static BOOL_T ReadTurnout( - char* line) + char* line) { - if (!ReadCompound(line + 8, T_TURNOUT)) + if (!ReadCompound(line + 8, T_TURNOUT)) { return FALSE; + } return TRUE; } static ANGLE_T GetAngleTurnout( - track_p trk, - coOrd pos, - EPINX_T* ep0, - EPINX_T* ep1) + track_p trk, + coOrd pos, + EPINX_T* ep0, + EPINX_T* ep1) { - struct extraDataCompound_t* xx = GET_EXTRA_DATA(trk, T_TURNOUT, extraDataCompound_t); + struct extraDataCompound_t* xx = GET_EXTRA_DATA(trk, T_TURNOUT, + extraDataCompound_t); wIndex_t segCnt, segInx; ANGLE_T angle; - if (ep0 && ep1) + if (ep0 && ep1) { *ep0 = *ep1 = PickEndPoint(pos, trk); + } coOrd pos0 = pos; double dd = DIST_INF; int found = -1; @@ -2721,21 +738,21 @@ static ANGLE_T GetAngleTurnout( pos.x -= xx->orig.x; pos.y -= xx->orig.y; Rotate(&pos, zero, -xx->angle); - angle = GetAngleSegs(1, &xx->segs[found], &pos, &segInx, NULL, NULL, NULL, NULL); + angle = GetAngleSegs(1, &xx->segs[found], &pos, &segInx, NULL, NULL, NULL, + NULL); return NormalizeAngle(angle + xx->angle); - } - else return 0.0; + } else { return 0.0; } } static BOOL_T SplitTurnoutCheckPath( - wIndex_t segInxEnd, - PATHPTR_T pp1, - int dir1, - PATHPTR_T pp2, - int dir2, - trkSeg_p segs, - coOrd epPos) + wIndex_t segInxEnd, + PATHPTR_T pp1, + int dir1, + PATHPTR_T pp2, + int dir2, + trkSeg_p segs, + coOrd epPos) { wIndex_t segInx1, segInx2; EPINX_T segEP; @@ -2743,18 +760,21 @@ static BOOL_T SplitTurnoutCheckPath( DIST_T dist; GetSegInxEP(pp2[0], &segInx2, &segEP); - if (dir2 < 0) segEP = 1 - segEP; + if (dir2 < 0) { segEP = 1 - segEP; } pos = GetSegEndPt(&segs[segInx2], segEP, FALSE, NULL); dist = FindDistance(pos, epPos); - if (dist > connectDistance) + if (dist > connectDistance) { return TRUE; + } while (pp2[0]) { GetSegInxEP(pp1[0], &segInx1, &segEP); GetSegInxEP(pp2[0], &segInx2, &segEP); - if (segInx1 != segInx2) + if (segInx1 != segInx2) { break; - if (segInxEnd == segInx2) + } + if (segInxEnd == segInx2) { return TRUE; + } pp1 += dir1; pp2 += dir2; } @@ -2763,22 +783,25 @@ static BOOL_T SplitTurnoutCheckPath( static BOOL_T SplitTurnoutCheckEP( - wIndex_t segInx0, - coOrd epPos, - PATHPTR_T pp1, - int dir1, - PATHPTR_T pp, - trkSeg_p segs) + wIndex_t segInx0, + coOrd epPos, + PATHPTR_T pp1, + int dir1, + PATHPTR_T pp, + trkSeg_p segs) { while (pp[0]) { pp += strlen((char*)pp) + 1; while (pp[0]) { - if (!SplitTurnoutCheckPath(segInx0, pp1, dir1, pp, 1, segs, epPos)) + if (!SplitTurnoutCheckPath(segInx0, pp1, dir1, pp, 1, segs, epPos)) { return FALSE; - while (pp[0]) + } + while (pp[0]) { pp++; - if (!SplitTurnoutCheckPath(segInx0, pp1, dir1, pp - 1, -1, segs, epPos)) + } + if (!SplitTurnoutCheckPath(segInx0, pp1, dir1, pp - 1, -1, segs, epPos)) { return FALSE; + } pp++; } pp++; @@ -2788,10 +811,11 @@ static BOOL_T SplitTurnoutCheckEP( EXPORT EPINX_T TurnoutPickEndPt( - coOrd epPos, - track_p trk) + coOrd epPos, + track_p trk) { - struct extraDataCompound_t* xx = GET_EXTRA_DATA(trk, T_TURNOUT, extraDataCompound_t); + struct extraDataCompound_t* xx = GET_EXTRA_DATA(trk, T_TURNOUT, + extraDataCompound_t); wIndex_t segInx, segInx0; EPINX_T segEP; PATHPTR_T cp, cq, pps[2]; @@ -2818,7 +842,7 @@ EXPORT EPINX_T TurnoutPickEndPt( for (dir = 0; dir < 2; dir++) { for (cq = cp; cq[dir ? -1 : 1]; cq += (dir ? -1 : 1)); GetSegInxEP(cq[0], &segInx, &segEP); - if (dir == 0) segEP = 1 - segEP; + if (dir == 0) { segEP = 1 - segEP; } pos = GetSegEndPt(&xx->segs[segInx], segEP, FALSE, NULL); dist = FindDistance(pos, epPos); if (eps[dir] < 0 || dist < dists[dir]) { @@ -2827,12 +851,14 @@ EXPORT EPINX_T TurnoutPickEndPt( pos.y += xx->orig.y; Rotate(&pos, xx->orig, xx->angle); for (ep = 0; ep < epCnt; ep++) { - if (FindDistance(pos, GetTrkEndPos(trk, ep)) < connectDistance) + if (FindDistance(pos, GetTrkEndPos(trk, ep)) < connectDistance) { break; + } } if (ep < epCnt) { - if (eps[dir] >= 0 && eps[dir] != ep) + if (eps[dir] >= 0 && eps[dir] != ep) { unique_eps[dir] = FALSE; + } eps[dir] = ep; dists[dir] = dist; pps[dir] = cq; @@ -2850,23 +876,29 @@ EXPORT EPINX_T TurnoutPickEndPt( for (dir = 0; dir < 2; dir++) { if (unique_eps[dir] && eps[dir] >= 0) { GetSegInxEP(pps[dir][0], &segInx, &segEP); - if (dir == 0) segEP = 1 - segEP; + if (dir == 0) { segEP = 1 - segEP; } epPos = GetSegEndPt(&xx->segs[segInx], segEP, FALSE, NULL); - if (!SplitTurnoutCheckEP(segInx0, epPos, pps[dir], dir ? 1 : -1, GetPaths(trk), xx->segs)) + if (!SplitTurnoutCheckEP(segInx0, epPos, pps[dir], dir ? 1 : -1, GetPaths(trk), + xx->segs)) { unique_eps[dir] = FALSE; + } } } if (unique_eps[0] == unique_eps[1]) { - if (eps[0] >= 0 && eps[1] >= 0) + if (eps[0] >= 0 && eps[1] >= 0) { return (dists[0] < dists[1]) ? eps[0] : eps[1]; + } } - if (unique_eps[0] && eps[0] >= 0) + if (unique_eps[0] && eps[0] >= 0) { return eps[0]; - if (unique_eps[1] && eps[1] >= 0) + } + if (unique_eps[1] && eps[1] >= 0) { return eps[1]; - if (eps[0] >= 0 && eps[1] >= 0) + } + if (eps[0] >= 0 && eps[1] >= 0) { return (dists[0] < dists[1]) ? eps[0] : eps[1]; + } return eps[0] >= 0 ? eps[0] : eps[1]; } @@ -2876,11 +908,11 @@ static PATHPTR_T splitTurnoutRoot; static int splitTurnoutDir; static void SplitTurnoutCheckEndPt( - PATHPTR_T path, - int dir, - trkSeg_p segs, - coOrd epPos, - coOrd splitPos) + PATHPTR_T path, + int dir, + trkSeg_p segs, + coOrd epPos, + coOrd splitPos) { PATHPTR_T path0; wIndex_t segInx; @@ -2890,19 +922,23 @@ static void SplitTurnoutCheckEndPt( path0 = path; GetSegInxEP(path[0], &segInx, &segEP); - if (dir < 0) segEP = 1 - segEP; + if (dir < 0) { segEP = 1 - segEP; } pos = GetSegEndPt(&segs[segInx], segEP, FALSE, NULL); dist = FindDistance(pos, epPos); - LOG(log_splitturnout, 1, (" SPTChkEp P%d DIR:%d SegInx:%d SegEP:%d POS[%0.3f %0.3f] DIST:%0.3f\n", *path, dir, segInx, segEP, pos.x, pos.y, dist)); - if (dist > connectDistance) + LOG(log_splitturnout, 1, + (" SPTChkEp P%d DIR:%d SegInx:%d SegEP:%d POS[%0.3f %0.3f] DIST:%0.3f\n", + *path, dir, segInx, segEP, pos.x, pos.y, dist)); + if (dist > connectDistance) { return; + } minDist = trackGauge; while (path[0]) { GetSegInxEP(path[0], &segInx, &segEP); - if (dir < 0) segEP = 1 - segEP; + if (dir < 0) { segEP = 1 - segEP; } pos = splitPos; dist = DistanceSegs(zero, 0.0, 1, &segs[segInx], &pos, NULL); - LOG(log_splitturnout, 1, (" - P:%d SegInx:%d SegEP:%d DIST:%0.3f\n", path[0], segInx, segEP, dist)); + LOG(log_splitturnout, 1, (" - P:%d SegInx:%d SegEP:%d DIST:%0.3f\n", path[0], + segInx, segEP, dist)); if (dist < minDist) { minDist = dist; splitTurnoutPath = path; @@ -2914,23 +950,26 @@ static void SplitTurnoutCheckEndPt( } EXPORT BOOL_T SplitTurnoutCheck( - track_p trk, - coOrd pos, - EPINX_T ep, - track_p* leftover, - EPINX_T* ep0, - EPINX_T* ep1, - BOOL_T check, - coOrd* outPos, - ANGLE_T* outAngle) -{ - struct extraDataCompound_t* xx = GET_EXTRA_DATA(trk, T_TURNOUT, extraDataCompound_t); + track_p trk, + coOrd pos, + EPINX_T ep, + track_p* leftover, + EPINX_T* ep0, + EPINX_T* ep1, + BOOL_T check, + coOrd* outPos, + ANGLE_T* outAngle) +{ + struct extraDataCompound_t* xx = GET_EXTRA_DATA(trk, T_TURNOUT, + extraDataCompound_t); wIndex_t segInx0, segInx, segCnt; - EPINX_T segEP, epCnt, ep2 = 0, epN; + EPINX_T segEP, ep2 = 0, epN; +// EPINX_T epCnt; PATHPTR_T pp, pp1, pp2; unsigned char c; char* cp; - int negCnt, posCnt, pathCnt, dir; + int negCnt, posCnt, dir; +// int pathCnt; segProcData_t segProcDataSplit; segProcData_t segProcDataNewTrack; track_p trk2 = NULL; @@ -2945,17 +984,19 @@ EXPORT BOOL_T SplitTurnoutCheck( trkSeg_t newSeg; if ((MyGetKeyState() & WKEY_SHIFT) == 0) { - if (!check) + if (!check) { ErrorMessage(MSG_CANT_SPLIT_TRK, _("Turnout")); + } return FALSE; } /* * 1. Find segment on path that ends at 'ep' */ - epCnt = GetTrkEndPtCnt(trk); +// epCnt = GetTrkEndPtCnt(trk); epPos = GetTrkEndPos(trk, ep); - for (segCnt = 0; segCnt < xx->segCnt && IsSegTrack(&xx->segs[segCnt]); segCnt++); + for (segCnt = 0; segCnt < xx->segCnt + && IsSegTrack(&xx->segs[segCnt]); segCnt++); Rotate(&pos, xx->orig, -xx->angle); pos.x -= xx->orig.x; pos.y -= xx->orig.y; @@ -2964,24 +1005,30 @@ EXPORT BOOL_T SplitTurnoutCheck( epPos.y -= xx->orig.y; splitTurnoutPath = NULL; pp = GetPaths(trk); - LOG(log_splitturnout, 1, ("SplitTurnoutCheck T%d POS[%0.3f %0.3f] EP:%d CHK:%d EPPOS[%0.3f %0.3f]\n", trk ? trk->index : 0, pos.x, pos.y, ep, check, epPos.x, epPos.y)); + LOG(log_splitturnout, 1, + ("SplitTurnoutCheck T%d POS[%0.3f %0.3f] EP:%d CHK:%d EPPOS[%0.3f %0.3f]\n", + trk ? GetTrkIndex( trk ): 0, pos.x, pos.y, ep, check, epPos.x, epPos.y)); while (pp[0]) { pp += strlen((char*)pp) + 1; while (pp[0]) { SplitTurnoutCheckEndPt(pp, 1, xx->segs, epPos, pos); - if (splitTurnoutPath != NULL) + if (splitTurnoutPath != NULL) { goto foundSeg; - while (pp[0]) + } + while (pp[0]) { pp++; + } SplitTurnoutCheckEndPt(pp - 1, -1, xx->segs, epPos, pos); - if (splitTurnoutPath != NULL) + if (splitTurnoutPath != NULL) { goto foundSeg; + } pp++; } pp++; } - if (!check) + if (!check) { ErrorMessage(_("splitTurnout: can't find segment")); + } return FALSE; foundSeg: @@ -2989,9 +1036,10 @@ foundSeg: * 2a. Check that all other paths thru found segment are the same */ GetSegInxEP(splitTurnoutPath[0], &segInx0, &segEP); - LOG(log_splitturnout, 1, (" Found Seg: %d SEG:%d EP:%d\n", *splitTurnoutPath, segInx0, segEP)); + LOG(log_splitturnout, 1, (" Found Seg: %d SEG:%d EP:%d\n", *splitTurnoutPath, + segInx0, segEP)); pp = GetPaths(trk); - pathCnt = 0; +// pathCnt = 0; while (pp[0]) { pp += strlen((char*)pp) + 1; while (pp[0]) { @@ -3002,14 +1050,16 @@ foundSeg: pp2 = pp; dir = (pp2[0] > 0 ? 1 : -1) * splitTurnoutDir; while (pp1[0] && pp2[0]) { - if (splitTurnoutDir * pp1[0] != dir * pp2[0]) + if (splitTurnoutDir * pp1[0] != dir * pp2[0]) { break; + } pp1 += splitTurnoutDir; pp2 += dir; } if (pp1[0] != '\0' || pp2[0] != '\0') { - if (!check) + if (!check) { ErrorMessage(MSG_SPLIT_POS_BTW_MERGEPTS); + } return FALSE; } } @@ -3023,9 +1073,11 @@ foundSeg: /* * 2b. Check that all paths from ep pass thru segInx0 */ - if (!SplitTurnoutCheckEP(segInx0, epPos, splitTurnoutRoot, -splitTurnoutDir, GetPaths(trk), xx->segs)) { - if (!check) + if (!SplitTurnoutCheckEP(segInx0, epPos, splitTurnoutRoot, -splitTurnoutDir, + GetPaths(trk), xx->segs)) { + if (!check) { ErrorMessage(MSG_SPLIT_PATH_NOT_UNIQUE); + } return FALSE; } @@ -3048,21 +1100,20 @@ foundSeg: s1 = 1 - s0; SegProc(SEGPROC_SPLIT, xx->segs + segInx0, &segProcDataSplit); if (segProcDataSplit.split.length[s1] <= minLength) { - if (splitTurnoutPath[splitTurnoutDir] == '\0') + if (splitTurnoutPath[splitTurnoutDir] == '\0') { return FALSE; + } segProcDataSplit.split.length[s0] += segProcDataSplit.split.length[s1]; segProcDataSplit.split.length[s1] = 0; segProcDataSplit.split.newSeg[s0] = xx->segs[segInx0]; epPos = GetSegEndPt(&segProcDataSplit.split.newSeg[s0], s1, FALSE, &epAngle); - } - else if (segProcDataSplit.split.length[s0] <= minLength) { + } else if (segProcDataSplit.split.length[s0] <= minLength) { segProcDataSplit.split.length[s1] += segProcDataSplit.split.length[s0]; segProcDataSplit.split.length[s0] = 0; segProcDataSplit.split.newSeg[s1] = xx->segs[segInx0]; epPos = GetSegEndPt(&segProcDataSplit.split.newSeg[s1], s0, FALSE, &epAngle); epAngle += 180.0; - } - else { + } else { epPos = GetSegEndPt(&segProcDataSplit.split.newSeg[s1], s0, FALSE, &epAngle); epAngle += 180.0; } @@ -3071,11 +1122,13 @@ foundSeg: * 4. Map the old segments to new */ DYNARR_SET(int, segIndexMap_da, xx->segCnt); - for (segInx = 0; segInx < xx->segCnt; segInx++) + for (segInx = 0; segInx < xx->segCnt; segInx++) { segIndexMap(segInx) = segInx + 1; + } pp = splitTurnoutPath; - if (segProcDataSplit.split.length[s0] > minLength) + if (segProcDataSplit.split.length[s0] > minLength) { pp += splitTurnoutDir; + } negCnt = 0; while (*pp) { GetSegInxEP(*pp, &segInx, &segEP); @@ -3084,16 +1137,16 @@ foundSeg: pp += splitTurnoutDir; } for (segInx = posCnt = 0; segInx < xx->segCnt; segInx++) { - if (segIndexMap(segInx) > 0) + if (segIndexMap(segInx) > 0) { segIndexMap(segInx) = ++posCnt; + } } DYNARR_SET(trkSeg_t, tempSegs_da, posCnt); for (segInx = posCnt = 0; segInx < xx->segCnt; segInx++) { if (segIndexMap(segInx) > 0) { if (segInx == segInx0) { tempSegs(segIndexMap(segInx) - 1) = segProcDataSplit.split.newSeg[s0]; - } - else { + } else { tempSegs(segIndexMap(segInx) - 1) = xx->segs[segInx]; } posCnt++; @@ -3115,8 +1168,9 @@ foundSeg: GetSegInxEP(*pp, &segInx, &segEP); if (segIndexMap(segInx) > 0) { c = segIndexMap(segInx); - if (*pp < 0) + if (*pp < 0) { c = -c; + } *pp1++ = c; } pp++; @@ -3144,12 +1198,10 @@ foundSeg: memcpy(message, xx->title, cp - xx->title + 1); strcpy(message + (cp - xx->title + 1), "Split "); strcat(message, cp + 1); - } - else { + } else { strcpy(message, xx->title); } - } - else { + } else { sprintf(message, "Split %s", xx->title); } @@ -3158,15 +1210,15 @@ foundSeg: */ int trks = 0; path = splitTurnoutPath; - if (segProcDataSplit.split.length[s1] < minLength) + if (segProcDataSplit.split.length[s1] < minLength) { path += splitTurnoutDir; + } while (path[0]) { GetSegInxEP(path[0], &segInx, &segEP); s0 = (path[0] > 0) != (splitTurnoutDir > 0); if (segInx0 != segInx) { newSeg = xx->segs[segInx]; - } - else { + } else { newSeg = segProcDataSplit.split.newSeg[s1]; } MoveSegs(1, &newSeg, xx->orig); @@ -3176,8 +1228,7 @@ foundSeg: *ep0 = segProcDataNewTrack.newTrack.ep[s0]; *leftover = trk2 = segProcDataNewTrack.newTrack.trk; ep2 = 1 - *ep0; - } - else { + } else { epN = segProcDataNewTrack.newTrack.ep[s0]; ConnectTracks(trk2, ep2, segProcDataNewTrack.newTrack.trk, epN); trk2 = segProcDataNewTrack.newTrack.trk; @@ -3209,21 +1260,22 @@ foundSeg: } static BOOL_T SplitTurnout( - track_p trk, - coOrd pos, - EPINX_T ep, - track_p* leftover, - EPINX_T* ep0, - EPINX_T* ep1) + track_p trk, + coOrd pos, + EPINX_T ep, + track_p* leftover, + EPINX_T* ep0, + EPINX_T* ep1) { return SplitTurnoutCheck(trk, pos, ep, leftover, ep0, ep1, FALSE, NULL, NULL); } static BOOL_T CheckTraverseTurnout( - track_p trk, - coOrd pos) + track_p trk, + coOrd pos) { - struct extraDataCompound_t* xx = GET_EXTRA_DATA(trk, T_TURNOUT, extraDataCompound_t); + struct extraDataCompound_t* xx = GET_EXTRA_DATA(trk, T_TURNOUT, + extraDataCompound_t); coOrd pos1; #ifdef LATER int inx, foundInx = 0; @@ -3234,67 +1286,73 @@ static BOOL_T CheckTraverseTurnout( int segInx; EPINX_T segEP; - LOG(log_traverseTurnout, 1, ("CheckTraverseTurnout( T%d, [%0.3f %0.3f])\n", GetTrkIndex(trk), pos.x, pos.y)) - Rotate(&pos, xx->orig, -xx->angle); + LOG(log_traverseTurnout, 1, ("CheckTraverseTurnout( T%d, [%0.3f %0.3f])\n", + GetTrkIndex(trk), pos.x, pos.y)) + Rotate(&pos, xx->orig, -xx->angle); pos.x -= xx->orig.x; pos.y -= xx->orig.y; LOG(log_traverseTurnout, 1, ("After rotation = [%0.3f %0.3f])\n", pos.x, pos.y)) #ifdef LATER - for (inx = 0; inx < xx->segCnt; inx++) { - switch (xx->segs[inx].type) { - case SEG_STRTRK: - case SEG_CRVTRK: - pos1 = GetSegEndPt(&xx->segs[inx], 0, FALSE, NULL); - d = FindDistance(pos, pos1); - if (foundInx == 0 || d < foundD) { - foundInx = inx + 1; - foundD = d; - } - pos1 = GetSegEndPt(&xx->segs[inx], 1, FALSE, NULL); - d = FindDistance(pos, pos1); - if (foundInx == 0 || d < foundD) { - foundInx = -(inx + 1); - foundD = d; - } - break; + for (inx = 0; inx < xx->segCnt; inx++) { + switch (xx->segs[inx].type) { + case SEG_STRTRK: + case SEG_CRVTRK: + pos1 = GetSegEndPt(&xx->segs[inx], 0, FALSE, NULL); + d = FindDistance(pos, pos1); + if (foundInx == 0 || d < foundD) { + foundInx = inx + 1; + foundD = d; } + pos1 = GetSegEndPt(&xx->segs[inx], 1, FALSE, NULL); + d = FindDistance(pos, pos1); + if (foundInx == 0 || d < foundD) { + foundInx = -(inx + 1); + foundD = d; + } + break; } - if (foundInx == 0) + } + if (foundInx == 0) { return FALSE; + } #endif PATHPTR_T pathName = GetCurrPath(trk); for (pathCurr = pathName + strlen((char*)pathName) + 1; - pathCurr[0] || pathCurr[1]; pathCurr++) { - LOG(log_traverseTurnout, 1, ("P[%d] = %d ", pathCurr - GetPaths(trk), pathCurr[0])) - if (pathCurr[-1] == 0) { - GetSegInxEP(pathCurr[0], &segInx, &segEP); - pos1 = GetSegEndPt(&xx->segs[segInx], segEP, FALSE, NULL); - d = FindDistance(pos, pos1); - LOG(log_traverseTurnout, 1, ("d=%0.3f\n", d)) - if (d < connectDistance) - return TRUE; + pathCurr[0] || pathCurr[1]; pathCurr++) { + LOG(log_traverseTurnout, 1, ("P[%d] = %d ", pathCurr - GetPaths(trk), + pathCurr[0])) + if (pathCurr[-1] == 0) { + GetSegInxEP(pathCurr[0], &segInx, &segEP); + pos1 = GetSegEndPt(&xx->segs[segInx], segEP, FALSE, NULL); + d = FindDistance(pos, pos1); + LOG(log_traverseTurnout, 1, ("d=%0.3f\n", d)) + if (d < connectDistance) { + return TRUE; } + } if (pathCurr[1] == 0) { GetSegInxEP(pathCurr[0], &segInx, &segEP); pos1 = GetSegEndPt(&xx->segs[segInx], 1 - segEP, FALSE, NULL); d = FindDistance(pos, pos1); LOG(log_traverseTurnout, 1, ("d=%0.3f\n", d)) - if (d < connectDistance) - return TRUE; + if (d < connectDistance) { + return TRUE; + } } } LOG(log_traverseTurnout, 1, (" not found\n")) - return FALSE; + return FALSE; } static BOOL_T TraverseTurnout( - traverseTrack_p trvTrk, - DIST_T* distR) + traverseTrack_p trvTrk, + DIST_T* distR) { track_p trk = trvTrk->trk; - struct extraDataCompound_t* xx = GET_EXTRA_DATA(trk, T_TURNOUT, extraDataCompound_t); + struct extraDataCompound_t* xx = GET_EXTRA_DATA(trk, T_TURNOUT, + extraDataCompound_t); coOrd pos0, pos1, pos2; DIST_T d, dist; PATHPTR_T path, pathCurr; @@ -3310,12 +1368,16 @@ static BOOL_T TraverseTurnout( pos0.x -= xx->orig.x; pos0.y -= xx->orig.y; dist = *distR; - LOG(log_traverseTurnout, 1, ("TraverseTurnout( T%d, [%0.3f %0.3f] [%0.3f %0.3f], A%0.3f, D%0.3f\n", GetTrkIndex(trk), trvTrk->pos.x, trvTrk->pos.y, pos0.x, pos0.y, trvTrk->angle, *distR)) - pathCurr = 0; + LOG(log_traverseTurnout, 1, + ("TraverseTurnout( T%d, [%0.3f %0.3f] [%0.3f %0.3f], A%0.3f, D%0.3f\n", + GetTrkIndex(trk), trvTrk->pos.x, trvTrk->pos.y, pos0.x, pos0.y, trvTrk->angle, + *distR)) + pathCurr = 0; path = GetCurrPath(trk); for (path += strlen((char*)path) + 1; path[0] || path[1]; path++) { - if (path[0] == 0) + if (path[0] == 0) { continue; + } GetSegInxEP(path[0], &segInx, &segEP); segPtr = xx->segs + segInx; segProcData.distance.pos1 = pos0; @@ -3331,7 +1393,7 @@ static BOOL_T TraverseTurnout( return FALSE; } LOG(log_traverseTurnout, 1, (" PC=%d ", pathCurr[0])) - GetSegInxEP(pathCurr[0], &segInx, &segEP); + GetSegInxEP(pathCurr[0], &segInx, &segEP); segPtr = xx->segs + segInx; segProcData.traverse1.pos = pos2; segProcData.traverse1.angle = -xx->angle + trvTrk->angle; @@ -3348,45 +1410,50 @@ static BOOL_T TraverseTurnout( // a curve that is flipped is negative (the end points are reversed) which Traverse1 handles, // and a path can also be reversed (negative path number) and will have segEP = 1 BOOL_T turnout_backwards = backwards; - if (segEP) turnout_backwards = !turnout_backwards; //direction modified if path reversed + if (segEP) { turnout_backwards = !turnout_backwards; } //direction modified if path reversed - LOG(log_traverseTurnout, 2, (" SI%d TB%d SP%d B%d SB%d N%d BSI%d D%0.3f\n", segInx, turnout_backwards, segEP, backwards, segs_backwards, neg, BezSegInx, dist)) - while (*pathCurr) { - //Set up Traverse2 - GetSegInxEP(pathCurr[0], &segInx, &segEP); - segPtr = xx->segs + segInx; - segProcData.traverse2.segDir = backwards; - segProcData.traverse2.dist = dist; - segProcData.traverse2.BezSegInx = BezSegInx; - segProcData.traverse2.segs_backwards = segs_backwards; - SegProc(SEGPROC_TRAVERSE2, segPtr, &segProcData); - if (segProcData.traverse2.dist <= 0) { - *distR = 0; - REORIGIN(trvTrk->pos, segProcData.traverse2.pos, xx->angle, xx->orig); - trvTrk->angle = NormalizeAngle(xx->angle + segProcData.traverse2.angle); - LOG(log_traverseTurnout, 2, (" -> [%0.3f %0.3f] A%0.3f D%0.3f\n", trvTrk->pos.x, trvTrk->pos.y, trvTrk->angle, *distR)) - return TRUE; - } - dist = segProcData.traverse2.dist; //Remainder after segment - pathCurr += (turnout_backwards ? -1 : 1); //Use master direction for turnout - //Redrive Traverse 1 for each segment for Bezier - to pick up backwards elements - if (pathCurr[0] == '\0') continue; // - //Set up Traverse1 - copy all of Traverse2 values first - GetSegInxEP(pathCurr[0], &segInx, &segEP); - segPtr = xx->segs + segInx; - ANGLE_T angle = segProcData.traverse2.angle; - coOrd pos = segProcData.traverse2.pos; - LOG(log_traverseTurnout, 1, (" Loop2-1 SI%d SP%d [%0.3f %0.3f] A%0.3f D%0.3f\n", segInx, segEP, pos.x, pos.y, angle, dist)) - segProcData.traverse1.pos = pos; - segProcData.traverse1.angle = angle; - SegProc(SEGPROC_TRAVERSE1, segPtr, &segProcData); - // dist += segProcData.traverse1.dist; //Add distance from end to pos (could be zero or whole length if backwards) - backwards = segProcData.traverse1.backwards; - segs_backwards = segProcData.traverse1.segs_backwards; - neg = segProcData.traverse1.negative; - BezSegInx = segProcData.traverse1.BezSegInx; - LOG(log_traverseTurnout, 1, (" Loop1-2 B%d SB%d N%d BSI%d D%0.3f\n", backwards, segs_backwards, neg, BezSegInx, dist)) + LOG(log_traverseTurnout, 2, (" SI%d TB%d SP%d B%d SB%d N%d BSI%d D%0.3f\n", + segInx, turnout_backwards, segEP, backwards, segs_backwards, neg, BezSegInx, + dist)) + while (*pathCurr) { + //Set up Traverse2 + GetSegInxEP(pathCurr[0], &segInx, &segEP); + segPtr = xx->segs + segInx; + segProcData.traverse2.segDir = backwards; + segProcData.traverse2.dist = dist; + segProcData.traverse2.BezSegInx = BezSegInx; + segProcData.traverse2.segs_backwards = segs_backwards; + SegProc(SEGPROC_TRAVERSE2, segPtr, &segProcData); + if (segProcData.traverse2.dist <= 0) { + *distR = 0; + REORIGIN(trvTrk->pos, segProcData.traverse2.pos, xx->angle, xx->orig); + trvTrk->angle = NormalizeAngle(xx->angle + segProcData.traverse2.angle); + LOG(log_traverseTurnout, 2, (" -> [%0.3f %0.3f] A%0.3f D%0.3f\n", + trvTrk->pos.x, trvTrk->pos.y, trvTrk->angle, *distR)) + return TRUE; } + dist = segProcData.traverse2.dist; //Remainder after segment + pathCurr += (turnout_backwards ? -1 : 1); //Use master direction for turnout + //Redrive Traverse 1 for each segment for Bezier - to pick up backwards elements + if (pathCurr[0] == '\0') { continue; } // + //Set up Traverse1 - copy all of Traverse2 values first + GetSegInxEP(pathCurr[0], &segInx, &segEP); + segPtr = xx->segs + segInx; + ANGLE_T angle = segProcData.traverse2.angle; + coOrd pos = segProcData.traverse2.pos; + LOG(log_traverseTurnout, 1, (" Loop2-1 SI%d SP%d [%0.3f %0.3f] A%0.3f D%0.3f\n", + segInx, segEP, pos.x, pos.y, angle, dist)) + segProcData.traverse1.pos = pos; + segProcData.traverse1.angle = angle; + SegProc(SEGPROC_TRAVERSE1, segPtr, &segProcData); + // dist += segProcData.traverse1.dist; //Add distance from end to pos (could be zero or whole length if backwards) + backwards = segProcData.traverse1.backwards; + segs_backwards = segProcData.traverse1.segs_backwards; + neg = segProcData.traverse1.negative; + BezSegInx = segProcData.traverse1.BezSegInx; + LOG(log_traverseTurnout, 1, (" Loop1-2 B%d SB%d N%d BSI%d D%0.3f\n", backwards, + segs_backwards, neg, BezSegInx, dist)) + } pathCurr += (turnout_backwards ? 1 : -1); pos1 = MapPathPos(xx, pathCurr[0], (turnout_backwards ? 0 : 1)); @@ -3404,15 +1471,15 @@ static BOOL_T TraverseTurnout( if (dist > connectDistance) { trk = NULL; trvTrk->pos = pos1; - } - else { + } else { trvTrk->pos = GetTrkEndPos(trk, ep); trvTrk->angle = GetTrkEndAngle(trk, ep); trk = GetTrkEndTrk(trk, ep); } dist = FindDistance(trvTrk->pos, pos1); - LOG(log_traverseTurnout, 1, (" -> [%0.3f %0.3f] A%0.3f D%0.3f\n", trvTrk->pos.x, trvTrk->pos.y, trvTrk->angle, *distR)) - trvTrk->trk = trk; + LOG(log_traverseTurnout, 1, (" -> [%0.3f %0.3f] A%0.3f D%0.3f\n", + trvTrk->pos.x, trvTrk->pos.y, trvTrk->angle, *distR)) + trvTrk->trk = trk; return TRUE; } @@ -3421,7 +1488,7 @@ static STATUS_T ModifyTurnout(track_p trk, wAction_t action, coOrd pos) { struct extraDataCompound_t* xx; static EPINX_T ep; - static wBool_t curved; +// static wBool_t curved; DIST_T d; xx = GET_EXTRA_DATA(trk, T_TURNOUT, extraDataCompound_t); @@ -3429,29 +1496,33 @@ static STATUS_T ModifyTurnout(track_p trk, wAction_t action, coOrd pos) switch (action) { case C_START: ep = -1; - curved = FALSE; +// curved = FALSE; return C_CONTINUE; case C_DOWN: ep = PickUnconnectedEndPoint(pos, trk); - if (ep == -1) + if (ep == -1) { return C_ERROR; + } UndrawNewTrack(trk); + DYNARR_SET( trkSeg_t, tempSegs_da, 1 ); tempSegs(0).type = SEG_STRTRK; - tempSegs(0).width = 0; + tempSegs(0).lineWidth = 0; tempSegs(0).u.l.pos[0] = GetTrkEndPos(trk, 1 - ep); - tempSegs_da.cnt = 1; InfoMessage(_("Drag to change track length")); return C_CONTINUE; case C_MOVE: d = FindDistance(tempSegs(0).u.l.pos[0], pos); - if (d < xx->u.adjustable.minD) + if (d < xx->u.adjustable.minD) { d = xx->u.adjustable.minD; - else if (d > xx->u.adjustable.maxD) + } else if (d > xx->u.adjustable.maxD) { d = xx->u.adjustable.maxD; - Translate(&tempSegs(0).u.l.pos[1], tempSegs(0).u.l.pos[0], GetTrkEndAngle(trk, ep), d); - tempSegs_da.cnt = 1; - if (action == C_MOVE) + } + DYNARR_SET( trkSeg_t, tempSegs_da, 1 ); + Translate(&tempSegs(0).u.l.pos[1], tempSegs(0).u.l.pos[0], GetTrkEndAngle(trk, + ep), d); + if (action == C_MOVE) { InfoMessage(_("Length=%s"), FormatDistance(d)); + } return C_CONTINUE; case C_UP: d = FindDistance(tempSegs(0).u.l.pos[0], tempSegs(0).u.l.pos[1]); @@ -3466,7 +1537,8 @@ static STATUS_T ModifyTurnout(track_p trk, wAction_t action, coOrd pos) } -static BOOL_T GetParamsTurnout(int inx, track_p trk, coOrd pos, trackParams_t* params) +static BOOL_T GetParamsTurnout(int inx, track_p trk, coOrd pos, + trackParams_t* params) { struct extraDataCompound_t* xx; xx = GET_EXTRA_DATA(trk, T_TURNOUT, extraDataCompound_t); @@ -3488,8 +1560,9 @@ static BOOL_T GetParamsTurnout(int inx, track_p trk, coOrd pos, trackParams_t* p path = GetCurrPath(trk); pathCurr = path; for (path += strlen((char*)path) + 1; path[0] || path[1]; path++) { - if (path[0] == 0) + if (path[0] == 0) { continue; + } GetSegInxEP(path[0], &segInx, &segEP); segPtr = xx->segs + segInx; segProcData.distance.pos1 = pos; @@ -3511,12 +1584,14 @@ static BOOL_T GetParamsTurnout(int inx, track_p trk, coOrd pos, trackParams_t* p pathCurr += segEP ? 1 : -1; } params->len = d; - } - else { + } else { // Centroid is middle of bounding box - params->centroid.x = (trk->lo.x + trk->hi.x) / 2.0; - params->centroid.y = (trk->lo.y + trk->hi.y) / 2.0; - params->len = FindDistance(params->centroid, pos) * 2; //Times two because it will be halved by track.c + coOrd lo, hi; + GetBoundingBox( trk, &hi, &lo ); + params->centroid.x = (lo.x + hi.x) / 2.0; + params->centroid.y = (lo.y + hi.y) / 2.0; + params->len = FindDistance(params->centroid, + pos) * 2; //Times two because it will be halved by track.c } return TRUE; } @@ -3529,17 +1604,17 @@ static BOOL_T GetParamsTurnout(int inx, track_p trk, coOrd pos, trackParams_t* p if (params->ep >= 0) { params->angle = GetTrkEndAngle(trk, params->ep); params->track_angle = params->angle + params->ep ? 0 : 180; - } - else { + } else { params->angle = params->track_angle = 0; return FALSE; } /* Find the path we are closest to */ - PATHPTR_T pathCurr = 0; +// PATHPTR_T pathCurr = 0; int segInx, subSegInx; trkSeg_p segPtr; DIST_T d = DIST_INF; - struct extraDataCompound_t* xx = GET_EXTRA_DATA(trk, T_TURNOUT, extraDataCompound_t); + struct extraDataCompound_t* xx = GET_EXTRA_DATA(trk, T_TURNOUT, + extraDataCompound_t); /* Get parms from that seg */ wBool_t back, negative; coOrd segPos = pos; @@ -3548,15 +1623,15 @@ static BOOL_T GetParamsTurnout(int inx, track_p trk, coOrd pos, trackParams_t* p segPos.y -= xx->orig.y; params->track_angle = GetAngleSegs( //Find correct subSegment - xx->segCnt, xx->segs, - &segPos, &segInx, &d, &back, &subSegInx, &negative); - if (segInx == -1) return FALSE; + xx->segCnt, xx->segs, + &segPos, &segInx, &d, &back, &subSegInx, &negative); + if (segInx == -1) { return FALSE; } segPtr = xx->segs + segInx; switch (segPtr->type) { case SEG_BEZTRK: - if (negative != back) params->track_angle = NormalizeAngle(params->track_angle + 180); //Bezier is in reverse + if (negative != back) { params->track_angle = NormalizeAngle(params->track_angle + 180); } //Bezier is in reverse segPtr = xx->segs + segInx; - trkSeg_p subSegPtr = (trkSeg_p)segPtr->bezSegs.ptr + subSegInx; + trkSeg_p subSegPtr = &DYNARR_N(trkSeg_t,segPtr->bezSegs,subSegInx); if (subSegPtr->type == SEG_CRVTRK) { params->type = curveTypeCurve; params->arcR = fabs(subSegPtr->u.c.radius); @@ -3587,19 +1662,20 @@ static BOOL_T GetParamsTurnout(int inx, track_p trk, coOrd pos, trackParams_t* p if (params->ep >= 0) { params->angle = GetTrkEndAngle(trk, params->ep); params->track_angle = params->angle + params->ep ? 0 : 180; - } - else { + } else { params->angle = params->track_angle = 0; return FALSE; } return TRUE; } - if ((inx == PARAMS_1ST_JOIN) || (inx == PARAMS_2ND_JOIN)) + if ((inx == PARAMS_1ST_JOIN) || (inx == PARAMS_2ND_JOIN)) { params->ep = PickEndPoint(pos, trk); - else + } else { params->ep = PickUnconnectedEndPointSilent(pos, trk); - if (params->ep == -1) + } + if (params->ep == -1) { return FALSE; + } params->lineOrig = GetTrkEndPos(trk, params->ep); params->lineEnd = params->lineOrig; params->len = 0.0; @@ -3653,16 +1729,17 @@ static BOOL_T QueryTurnout(track_p trk, int query) case Q_IS_TURNOUT: return TRUE; case Q_CAN_PARALLEL: - if (GetTrkEndPtCnt(trk) == 2 && fabs(GetTrkEndAngle(trk, 0) - GetTrkEndAngle(trk, 1)) == 180.0) + if (GetTrkEndPtCnt(trk) == 2 + && fabs(GetTrkEndAngle(trk, 0) - GetTrkEndAngle(trk, 1)) == 180.0) { return TRUE; - else + } else { return FALSE; - case Q_CAN_NEXT_POSITION: - { - PATHPTR_T path = GetPaths( trk ); // QueryTurnout - for ( path += strlen((char*)path) + 1; path[0] || path[1]; path++ ); - return ( path[2] != 0 ); } + case Q_CAN_NEXT_POSITION: { + PATHPTR_T path = GetPaths( trk ); // QueryTurnout + for ( path += strlen((char*)path) + 1; path[0] || path[1]; path++ ); + return ( path[2] != 0 ); + } case Q_CORNU_CAN_MODIFY: return FALSE; default: @@ -3671,28 +1748,29 @@ static BOOL_T QueryTurnout(track_p trk, int query) } -EXPORT int doDrawTurnoutPosition = 1; static wIndex_t drawTurnoutPositionWidth = 3; static void DrawTurnoutPositionIndicator( - track_p trk, - wDrawColor color) + track_p trk, + wDrawColor color) { - struct extraDataCompound_t* xx = GET_EXTRA_DATA(trk, T_TURNOUT, extraDataCompound_t); + struct extraDataCompound_t* xx = GET_EXTRA_DATA(trk, T_TURNOUT, + extraDataCompound_t); PATHPTR_T path, path1; coOrd pos0 = zero, pos1; trkSeg_p seg; BOOL_T multiPart = FALSE; // Only 1 path? Don't draw - if ( ! QueryTurnout( trk, Q_CAN_NEXT_POSITION ) ) + if ( ! QueryTurnout( trk, Q_CAN_NEXT_POSITION ) ) { return; + } path = GetCurrPath(trk); //Is this a multi-part path? path1 = path; for (path1 += strlen((char*)path1) + 1; path1[0]; path1++); - if (path1[1] != 0) multiPart = TRUE; + if (path1[1] != 0) { multiPart = TRUE; } for (path += strlen((char*)path); path[0] || path[1]; path++) { @@ -3701,52 +1779,55 @@ static void DrawTurnoutPositionIndicator( pos0 = MapPathPos(xx, path[1], 0); if ((tempD.scale <= 10) || !multiPart) { seg = MapPathSeg(xx, path[1]); - DrawSegsO(&tempD, trk, xx->orig, xx->angle, seg, 1, GetTrkGauge(trk), color, DTS_CENTERONLY); + DrawSegsO(&tempD, trk, xx->orig, xx->angle, seg, 1, GetTrkGauge(trk), color, + DTS_CENTERONLY); } - } - else if (path[1] == 0) { + } else if (path[1] == 0) { pos1 = MapPathPos(xx, path[0], 1); - if ((tempD.scale > 10) && multiPart) + if ((tempD.scale > 10) && multiPart) { DrawLine(&tempD, pos0, pos1, drawTurnoutPositionWidth, color); - else { + } else { seg = MapPathSeg(xx, path[0]); - DrawSegsO(&tempD, trk, xx->orig, xx->angle, seg, 1, GetTrkGauge(trk), color, DTS_CENTERONLY); + DrawSegsO(&tempD, trk, xx->orig, xx->angle, seg, 1, GetTrkGauge(trk), color, + DTS_CENTERONLY); } - } - else if ((tempD.scale <= 10) || !multiPart) { + } else if ((tempD.scale <= 10) || !multiPart) { seg = MapPathSeg(xx, path[0]); - DrawSegsO(&tempD, trk, xx->orig, xx->angle, seg, 1, GetTrkGauge(trk), color, DTS_CENTERONLY); + DrawSegsO(&tempD, trk, xx->orig, xx->angle, seg, 1, GetTrkGauge(trk), color, + DTS_CENTERONLY); } } } EXPORT void AdvanceTurnoutPositionIndicator( - track_p trk, - coOrd pos, - coOrd* posR, - ANGLE_T* angleR) + track_p trk, + coOrd pos, + coOrd* posR, + ANGLE_T* angleR) { traverseTrack_t trvtrk; DIST_T dist; - if (GetTrkType(trk) != T_TURNOUT) - AbortProg("nextTurnoutPosition"); + CHECK( GetTrkType(trk) == T_TURNOUT ); SetCurrPathIndex(trk, GetCurrPathIndex(trk) + 1); InfoMessage(_("Turnout %d Path: %s"), GetTrkIndex(trk), GetCurrPath(trk)); - if (angleR == NULL || posR == NULL) + if (angleR == NULL || posR == NULL) { return; + } trvtrk.trk = trk; trvtrk.length = 0; trvtrk.dist = 0; trvtrk.pos = *posR; trvtrk.angle = *angleR; dist = 0; - if (!TraverseTurnout(&trvtrk, &dist)) + if (!TraverseTurnout(&trvtrk, &dist)) { return; - if (NormalizeAngle(trvtrk.angle - *angleR + 90.0) > 180) + } + if (NormalizeAngle(trvtrk.angle - *angleR + 90.0) > 180) { trvtrk.angle = NormalizeAngle(trvtrk.angle + 180.0); + } *posR = trvtrk.pos; *angleR = trvtrk.angle; } @@ -3765,27 +1846,28 @@ EXPORT void AdvanceTurnoutPositionIndicator( */ static BOOL_T MakeParallelTurnout( - track_p trk, - coOrd pos, - DIST_T sep, - DIST_T factor, - track_p* newTrk, - coOrd* p0R, - coOrd* p1R, - BOOL_T track) + track_p trk, + coOrd pos, + DIST_T sep, + DIST_T factor, + track_p* newTrk, + coOrd* p0R, + coOrd* p1R, + BOOL_T track) { ANGLE_T angle = GetTrkEndAngle(trk, 1); struct extraDataCompound_t* xx, * yy; coOrd* endPts; - trkEndPt_p endPt; int i; int option; DIST_T d; - if (NormalizeAngle(FindAngle(GetTrkEndPos(trk, 0), pos) - GetTrkEndAngle(trk, 1)) < 180.0) + if (NormalizeAngle(FindAngle(GetTrkEndPos(trk, 0), pos) - GetTrkEndAngle(trk, + 1)) < 180.0) { angle += 90; - else + } else { angle -= 90; + } /* * get all endpoints of current piece and translate them for the new piece @@ -3801,19 +1883,18 @@ static BOOL_T MakeParallelTurnout( if (newTrk) { if (track) { - endPt = MyMalloc(GetTrkEndPtCnt(trk) * sizeof(trkEndPt_t)); - endPt[0].pos = endPts[0]; - endPt[0].angle = GetTrkEndAngle(trk, 0); - endPt[1].pos = endPts[1]; - endPt[1].angle = GetTrkEndAngle(trk, 1); + TempEndPtsSet(2); + SetEndPt( TempEndPt(0), endPts[0], GetTrkEndAngle(trk,0)); + SetEndPt( TempEndPt(1), endPts[1], GetTrkEndAngle(trk,1)); yy = GET_EXTRA_DATA(trk, T_TURNOUT, extraDataCompound_t); PATHPTR_T paths = GetPaths(trk); // MakeParallelTurnout - *newTrk = NewCompound(T_TURNOUT, 0, endPt[0].pos, endPt[0].angle + 90.0, - yy->title, 2, endPt, paths, - yy->segCnt, yy->segs); + *newTrk = NewCompound(T_TURNOUT, 0, + GetEndPtPos(TempEndPt(0)), GetEndPtAngle(TempEndPt(0)) + 90.0, + yy->title, 2, TempEndPt(0), paths, + yy->segCnt, yy->segs); xx = GET_EXTRA_DATA(*newTrk, T_TURNOUT, extraDataCompound_t); xx->customInfo = yy->customInfo; @@ -3836,31 +1917,27 @@ static BOOL_T MakeParallelTurnout( SetTrkEndElev(*newTrk, 0, option, d, NULL); GetTrkEndElev(trk, 1, &option, &d); SetTrkEndElev(*newTrk, 1, option, d, NULL); - - MyFree(endPt); - } - else { + } else { + DYNARR_SET( trkSeg_t, tempSegs_da, 1 ); tempSegs(0).color = wDrawColorBlack; - tempSegs(0).width = 0; - tempSegs_da.cnt = 1; + tempSegs(0).lineWidth = 0; tempSegs(0).type = track ? SEG_STRTRK : SEG_STRLIN; tempSegs(0).u.l.pos[0] = endPts[0]; tempSegs(0).u.l.pos[1] = endPts[1]; *newTrk = MakeDrawFromSeg(zero, 0.0, &tempSegs(0)); } - } - else { + } else { /* draw some temporary track while command is in process */ + DYNARR_SET( trkSeg_t, tempSegs_da, 1 ); tempSegs(0).color = wDrawColorBlack; - tempSegs(0).width = 0; - tempSegs_da.cnt = 1; + tempSegs(0).lineWidth = 0; tempSegs(0).type = track ? SEG_STRTRK : SEG_STRLIN; tempSegs(0).u.l.pos[0] = endPts[0]; tempSegs(0).u.l.pos[1] = endPts[1]; } - if (p0R) *p0R = endPts[0]; - if (p1R) *p1R = endPts[1]; + if (p0R) { *p0R = endPts[0]; } + if (p1R) { *p1R = endPts[1]; } MyFree(endPts); return TRUE; @@ -3868,58 +1945,61 @@ static BOOL_T MakeParallelTurnout( static wBool_t CompareTurnout(track_cp trk1, track_cp trk2) { - struct extraDataCompound_t* xx1 = GET_EXTRA_DATA(trk1, T_TURNOUT, extraDataCompound_t); - struct extraDataCompound_t* xx2 = GET_EXTRA_DATA(trk2, T_TURNOUT, extraDataCompound_t); + struct extraDataCompound_t* xx1 = GET_EXTRA_DATA(trk1, T_TURNOUT, + extraDataCompound_t); + struct extraDataCompound_t* xx2 = GET_EXTRA_DATA(trk2, T_TURNOUT, + extraDataCompound_t); char* cp = message + strlen(message); REGRESS_CHECK_POS("Orig", xx1, xx2, orig) - REGRESS_CHECK_ANGLE("Angle", xx1, xx2, angle) - REGRESS_CHECK_INT("Handlaid", xx1, xx2, handlaid) - REGRESS_CHECK_INT("Flipped", xx1, xx2, flipped) - REGRESS_CHECK_INT("Ungrouped", xx1, xx2, ungrouped) - REGRESS_CHECK_INT("Split", xx1, xx2, split) - /* desc orig is not stable - REGRESS_CHECK_POS( "DescOrig", xx1, xx2, descriptionOrig ) */ - REGRESS_CHECK_POS("DescOff", xx1, xx2, descriptionOff) - REGRESS_CHECK_POS("DescSize", xx1, xx2, descriptionSize) - return CompareSegs(xx1->segs, xx1->segCnt, xx1->segs, xx1->segCnt); + REGRESS_CHECK_ANGLE("Angle", xx1, xx2, angle) + REGRESS_CHECK_INT("Handlaid", xx1, xx2, handlaid) + REGRESS_CHECK_INT("Flipped", xx1, xx2, flipped) + REGRESS_CHECK_INT("Ungrouped", xx1, xx2, ungrouped) + REGRESS_CHECK_INT("Split", xx1, xx2, split) + /* desc orig is not stable + REGRESS_CHECK_POS( "DescOrig", xx1, xx2, descriptionOrig ) */ + REGRESS_CHECK_POS("DescOff", xx1, xx2, descriptionOff) + REGRESS_CHECK_POS("DescSize", xx1, xx2, descriptionSize) + return CompareSegs(xx1->segs, xx1->segCnt, xx1->segs, xx1->segCnt); } static trackCmd_t turnoutCmds = { - "TURNOUT ", - DrawTurnout, - DistanceCompound, - DescribeCompound, - DeleteCompound, - WriteCompound, - ReadTurnout, - MoveCompound, - RotateCompound, - RescaleCompound, - NULL, - GetAngleTurnout, - SplitTurnout, - TraverseTurnout, - EnumerateCompound, - NULL, /*redraw*/ - NULL, /*trim*/ - NULL, /*merge*/ - ModifyTurnout, - NULL, /* getLength */ - GetParamsTurnout, - MoveEndPtTurnout, - QueryTurnout, - UngroupCompound, - FlipCompound, - DrawTurnoutPositionIndicator, - AdvanceTurnoutPositionIndicator, - CheckTraverseTurnout, - MakeParallelTurnout, - NULL, - NULL, - NULL, - NULL, - NULL, - CompareTurnout }; + "TURNOUT ", + DrawTurnout, + DistanceCompound, + DescribeCompound, + DeleteCompound, + WriteCompound, + ReadTurnout, + MoveCompound, + RotateCompound, + RescaleCompound, + NULL, + GetAngleTurnout, + SplitTurnout, + TraverseTurnout, + EnumerateCompound, + NULL, /*redraw*/ + NULL, /*trim*/ + NULL, /*merge*/ + ModifyTurnout, + NULL, /* getLength */ + GetParamsTurnout, + MoveEndPtTurnout, + QueryTurnout, + UngroupCompound, + FlipCompound, + DrawTurnoutPositionIndicator, + AdvanceTurnoutPositionIndicator, + CheckTraverseTurnout, + MakeParallelTurnout, + NULL, + NULL, + NULL, + NULL, + NULL, + CompareTurnout +}; #ifdef TURNOUTCMD @@ -3942,14 +2022,18 @@ static void RescaleTurnout(void) DIST_T xscale, yscale; wWinPix_t ww, hh; DIST_T w, h; + if ( curTurnout == NULL ) { + return; + } wDrawGetSize(turnoutD.d, &ww, &hh); w = ww / turnoutD.dpi; h = hh / turnoutD.dpi; - xscale = maxTurnoutDim.x / w; - yscale = maxTurnoutDim.y / h; + xscale = (curTurnout->size.x + trackGauge*2) / w; + yscale = (curTurnout->size.y + trackGauge*2) / h; turnoutD.scale = max(xscale, yscale); - if (turnoutD.scale == 0.0) + if (turnoutD.scale == 0.0) { turnoutD.scale = 1.0; + } turnoutD.size.x = w * turnoutD.scale; turnoutD.size.y = h * turnoutD.scale; return; @@ -3959,22 +2043,26 @@ static void RescaleTurnout(void) static void TurnoutChange(long changes) { static char* lastScaleName = NULL; - if (turnoutW == NULL) + if (turnoutW == NULL) { return; + } wListSetIndex(turnoutListL, 0); if ((!wWinIsVisible(turnoutW)) || - (((changes & CHANGE_SCALE) == 0 || lastScaleName == curScaleName) && - (changes & CHANGE_PARAMS) == 0)) + (((changes & CHANGE_SCALE) == 0 || lastScaleName == curScaleName) && + (changes & CHANGE_PARAMS) == 0)) { return; + } lastScaleName = curScaleName; //curTurnout = NULL; curTurnoutEp = 0; wControlShow((wControl_p)turnoutListL, FALSE); wListClear(turnoutListL); maxTurnoutDim.x = maxTurnoutDim.y = 0.0; - if (turnoutInfo_da.cnt <= 0) + if (turnoutInfo_da.cnt <= 0) { return; - curTurnout = TurnoutAdd(LABEL_TABBED | LABEL_MANUF | LABEL_PARTNO | LABEL_DESCR, GetLayoutCurScale(), turnoutListL, &maxTurnoutDim, -1); + } + curTurnout = TurnoutAdd(LABEL_TABBED | LABEL_MANUF | LABEL_PARTNO | LABEL_DESCR, + GetLayoutCurScale(), turnoutListL, &maxTurnoutDim, -1); wListSetIndex(turnoutListL, turnoutInx); wControlShow((wControl_p)turnoutListL, TRUE); if (curTurnout == NULL) { @@ -3993,16 +2081,18 @@ static void TurnoutChange(long changes) static void RedrawTurnout( wDraw_p d, void * context, wWinPix_t x, wWinPix_t y ) { RescaleTurnout(); - LOG(log_turnout, 2, ("SelTurnout(%s)\n", (curTurnout ? curTurnout->title : "<NULL>"))) + LOG(log_turnout, 2, ("SelTurnout(%s)\n", + (curTurnout ? curTurnout->title : "<NULL>"))) - wDrawClear(turnoutD.d); + wDrawClear(turnoutD.d); if (curTurnout == NULL) { return; } turnoutD.orig.x = curTurnout->orig.x - trackGauge; - turnoutD.orig.y = (curTurnout->size.y + curTurnout->orig.y) - turnoutD.size.y + trackGauge; + turnoutD.orig.y = (curTurnout->size.y + curTurnout->orig.y) - turnoutD.size.y + + trackGauge; DrawSegs(&turnoutD, zero, 0.0, curTurnout->segs, curTurnout->segCnt, - trackGauge, wDrawColorBlack); + trackGauge, wDrawColorBlack); curTurnoutEp = 0; HilightEndPt(); } @@ -4016,13 +2106,14 @@ static void TurnoutOk(void) static void TurnoutDlgUpdate( - paramGroup_p pg, - int inx, - void* valueP) + paramGroup_p pg, + int inx, + void* valueP) { turnoutInfo_t* to; - if (inx != I_LIST) return; - to = (turnoutInfo_t*)wListGetItemContext((wList_p)pg->paramPtr[inx].control, (wIndex_t) * (long*)valueP); + if (inx != I_LIST) { return; } + to = (turnoutInfo_t*)wListGetItemContext((wList_p)pg->paramPtr[inx].control, + (wIndex_t) * (long*)valueP); AddTurnout(); curTurnout = to; RedrawTurnout( turnoutD.d, NULL, 0, 0 ); @@ -4031,17 +2122,18 @@ static void TurnoutDlgUpdate( static wIndex_t TOpickEndPoint( - coOrd p, - turnoutInfo_t* to) + coOrd p, + turnoutInfo_t* to) { wIndex_t inx, i; DIST_T d, dd; coOrd posI; - d = FindDistance(p, to->endPt[0].pos); + d = FindDistance(p, GetEndPtPos(to->endPt)); + inx = 0; for (i = 1; i < to->endCnt; i++) { - posI = to->endPt[i].pos; + posI = GetEndPtPos(EndPtIndex(to->endPt, i)); if ((dd = FindDistance(p, posI)) < d) { d = dd; inx = i; @@ -4054,18 +2146,20 @@ static wIndex_t TOpickEndPoint( static void HilightEndPt(void) { coOrd p, s; - p.x = curTurnout->endPt[(int)curTurnoutEp].pos.x - trackGauge; - p.y = curTurnout->endPt[(int)curTurnoutEp].pos.y - trackGauge; + trkEndPt_p epp = EndPtIndex( curTurnout->endPt, (EPINX_T)curTurnoutEp ); + p.x = GetEndPtPos(epp).x - trackGauge; + p.y = GetEndPtPos(epp).y - trackGauge; s.x = s.y = trackGauge * 2.0 /*+ turnoutD.minSize*/; DrawHilight(&turnoutD, p, s, FALSE); } static void SelTurnoutEndPt( - wIndex_t action, - coOrd pos) + wIndex_t action, + coOrd pos) { - if (action != C_DOWN) return; + if (action != C_DOWN) { return; } + if ( curTurnout == NULL ) { return; } curTurnoutEp = TOpickEndPoint(pos, curTurnout); HilightEndPt(); @@ -4079,9 +2173,9 @@ static void SelTurnoutEndPt( * */ - /* - * STATE INFO - */ +/* + * STATE INFO + */ static struct { int state; coOrd pos; @@ -4113,13 +2207,13 @@ typedef struct { * OUT Vector - An array of end points positions and offsets */ static void PlaceTurnoutTrial( - track_p* trkR, - coOrd* posR, - ANGLE_T* angle1R, - ANGLE_T* angle2R, - int* connCntR, - DIST_T* maxDR, - vector_t* v) + track_p* trkR, + coOrd* posR, + ANGLE_T* angle1R, + ANGLE_T* angle2R, + int* connCntR, + DIST_T* maxDR, + vector_t* v) { coOrd pos = *posR; ANGLE_T aa; @@ -4132,65 +2226,68 @@ static void PlaceTurnoutTrial( DIST_T d, maxD = 0; coOrd testP = pos; - if (*trkR && (GetTrkDistance(*trkR, &testP) < trackGauge)) { //Have Track, stick with it unless outside bounds + if (*trkR && (GetTrkDistance(*trkR, + &testP) < trackGauge)) { //Have Track, stick with it unless outside bounds trk = *trkR; pos = testP; - } - else *trkR = trk = OnTrack(&pos, FALSE, TRUE); + } else { *trkR = trk = OnTrack(&pos, FALSE, TRUE); } if ((trk) != NULL && - !QueryTrack(trk, Q_CANNOT_PLACE_TURNOUT) && - (ep0 = PickEndPoint(pos, trk)) >= 0 && - !(GetTrkType(trk) == T_TURNOUT && - (trk1 = GetTrkEndTrk(trk, ep0)) && - GetTrkType(trk1) == T_TURNOUT) && - !GetLayerFrozen(GetTrkLayer(trk)) && - !GetLayerModule(GetTrkLayer(trk))) { + !QueryTrack(trk, Q_CANNOT_PLACE_TURNOUT) && + (ep0 = PickEndPoint(pos, trk)) >= 0 && + !(GetTrkType(trk) == T_TURNOUT && + (trk1 = GetTrkEndTrk(trk, ep0)) && + GetTrkType(trk1) == T_TURNOUT) && + !GetLayerFrozen(GetTrkLayer(trk)) && + !GetLayerModule(GetTrkLayer(trk))) { epPos = GetTrkEndPos(trk, ep0); d = FindDistance(pos, epPos); - if (d <= minLength) + if (d <= minLength) { pos = epPos; + } if (GetTrkType(trk) == T_TURNOUT) { //Only on the end ep0 = ep1 = PickEndPoint(pos, trk); angle = GetTrkEndAngle(trk, ep0); - } - else { + } else { angle = GetAngleAtPoint(trk, pos, &ep0, &ep1); - if (ep0 == 1) angle = NormalizeAngle(angle + 180); //Reverse if curve backwards + if (ep0 == 1) { angle = NormalizeAngle(angle + 180); } //Reverse if curve backwards } angle = NormalizeAngle(angle + 180.0); - if (NormalizeAngle(FindAngle(pos, *posR) - angle) < 180.0 && ep0 != ep1) + if (NormalizeAngle(FindAngle(pos, *posR) - angle) < 180.0 && ep0 != ep1) { angle = NormalizeAngle(angle + 180); + } *angle2R = angle; - epPos = curTurnout->endPt[(int)curTurnoutEp].pos; - *angle1R = angle = NormalizeAngle(angle - curTurnout->endPt[(int)curTurnoutEp].angle); + trkEndPt_p epp = EndPtIndex( curTurnout->endPt, (EPINX_T)curTurnoutEp ); + epPos = GetEndPtPos(epp); + *angle1R = angle = NormalizeAngle(angle - GetEndPtAngle(epp) ); Rotate(&epPos, zero, angle); pos.x -= epPos.x; pos.y -= epPos.y; *posR = pos; //The place the Turnout end sits LOG(log_turnout, 3, ("placeTurnout T%d (%0.3f %0.3f) A%0.3f\n", - GetTrkIndex(trk), pos.x, pos.y, angle)) - /*InfoMessage( "Turnout(%d): Angle=%0.3f", GetTrkIndex(trk), angle );*/ - track_p ctrk = NULL; - int ccnt = 0; - DIST_T clarge = DIST_INF; + GetTrkIndex(trk), pos.x, pos.y, angle)) + /*InfoMessage( "Turnout(%d): Angle=%0.3f", GetTrkIndex(trk), angle );*/ +// track_p ctrk = NULL; +// int ccnt = 0; +// DIST_T clarge = DIST_INF; for (i = 0; i < curTurnout->endCnt; i++) { - posI = curTurnout->endPt[i].pos; + posI = GetEndPtPos(EndPtIndex(curTurnout->endPt,(EPINX_T)i)); epPos = AddCoOrd(pos, posI, angle); - epAngle = NormalizeAngle(curTurnout->endPt[i].angle + angle); + epAngle = NormalizeAngle(GetEndPtAngle(EndPtIndex(curTurnout->endPt, + (EPINX_T)i)) + angle); conPos = epPos; if ((trk = OnTrack(&conPos, FALSE, TRUE)) != NULL && - !GetLayerFrozen(GetTrkLayer(trk)) && - !GetLayerModule(GetTrkLayer(trk))) { + !GetLayerFrozen(GetTrkLayer(trk)) && + !GetLayerModule(GetTrkLayer(trk))) { v->off = FindDistance(epPos, conPos); v->angle = FindAngle(epPos, conPos); if (GetTrkType(trk) == T_TURNOUT) { ep0 = ep1 = PickEndPoint(conPos, trk); aa = GetTrkEndAngle(trk, ep0); - } - else { + } else { aa = GetAngleAtPoint(trk, conPos, &ep0, &ep1); - if (ep0) //Backwards - so reverse + if (ep0) { //Backwards - so reverse aa = NormalizeAngle(aa + 180); + } } v->ep = i; aa = fabs(DifferenceBetweenAngles(aa, epAngle)); @@ -4198,29 +2295,29 @@ static void PlaceTurnoutTrial( int k = 0; v->trk = trk; for (int j = 0; j < i; j++) { - if (vector(j).trk == trk) k++; + if (vector(j).trk == trk) { k++; } } if (k < 2) { //Already two conns to this track connCnt++; - if (v->off > maxD) + if (v->off > maxD) { maxD = v->off; + } v++; } - } - else if ((IsClose(v->off) && (aa < connectAngle || aa>180 - connectAngle) && - !(GetTrkType(trk) == T_TURNOUT && - (trk1 = GetTrkEndTrk(trk, ep0)) && - GetTrkType(trk1) == T_TURNOUT))) { - if (v->off > maxD) + } else if ((IsClose(v->off) && (aa < connectAngle || aa>180 - connectAngle) && + !(GetTrkType(trk) == T_TURNOUT && + (trk1 = GetTrkEndTrk(trk, ep0)) && + GetTrkType(trk1) == T_TURNOUT))) { + if (v->off > maxD) { maxD = v->off; + } connCnt++; v++; } } } - } - else { + } else { trk = NULL; *trkR = NULL; } @@ -4230,7 +2327,7 @@ static void PlaceTurnoutTrial( static void PlaceTurnout( - coOrd pos, track_p trk) + coOrd pos, track_p trk) { coOrd p, pos1, pos2; track_p trk1, trk2; @@ -4243,18 +2340,20 @@ static void PlaceTurnout( pos1 = Dto.place = Dto.pos = pos; LOG(log_turnout, 1, ("Place Turnout @ %0.3fx%0.3f\n", Dto.pos.x, Dto.pos.y)); - if (curTurnoutEp >= (long)curTurnout->endCnt) + if (curTurnoutEp >= (long)curTurnout->endCnt) { curTurnoutEp = 0; + } DYNARR_SET(vector_t, vector_da, curTurnout->endCnt); - if (trk) trk1 = trk; - else trk1 = NULL; + if (trk) { trk1 = trk; } + else { trk1 = NULL; } PlaceTurnoutTrial(&trk1, &pos1, &a1, &a2, &connCnt1, &maxD1, &vector(0)); if (connCnt1 > 0) { Dto.pos = pos1; //First track pos LOG(log_turnout, 1, (" trial 1 @ %0.3fx%0.3f\n", Dto.pos.x, Dto.pos.y)); Dto.trk = trk1; //Track Dto.angle = a1; //Angle of track to put down - if (((MyGetKeyState() & WKEY_SHIFT) == 0) && (connCnt1 > 1) && (maxD1 >= 0.001)) { //Adjust if not Shift + if (((MyGetKeyState() & WKEY_SHIFT) == 0) && (connCnt1 > 1) + && (maxD1 >= 0.001)) { //Adjust if not Shift maxV = &vector(0); for (i = 1; i < connCnt1; i++) { //Ignore first point V = &vector(i); @@ -4262,13 +2361,15 @@ static void PlaceTurnout( maxV = V; } } - a3 = NormalizeAngle(Dto.angle + curTurnout->endPt[maxV->ep].angle); + a3 = NormalizeAngle(Dto.angle + GetEndPtAngle(EndPtIndex(curTurnout->endPt, + maxV->ep))); a = NormalizeAngle(a2 - a3); sina = sin(D2R(a)); if (fabs(sina) > 0.01) { d = maxV->off / sina; - if (NormalizeAngle(maxV->angle - a3) > 180) + if (NormalizeAngle(maxV->angle - a3) > 180) { d = -d; + } Translate(&pos2, pos, a2, d); trk2 = trk1; PlaceTurnoutTrial(&trk2, &pos2, &a2, &a, &connCnt2, &maxD2, &vector(0)); @@ -4286,13 +2387,12 @@ static void PlaceTurnout( if (connCnt1 > 0) { FormatCompoundTitle(listLabels, curTurnout->title); InfoMessage(_("%d connections, max distance %0.3f (%s)"), - connCnt1, PutDim(maxD1), message); - } - else { + connCnt1, PutDim(maxD1), message); + } else { Dto.trk = NULL; FormatCompoundTitle(listLabels, curTurnout->title); InfoMessage(_("0 connections (%s)"), message); - p = curTurnout->endPt[(int)curTurnoutEp].pos; + p = GetEndPtPos(EndPtIndex(curTurnout->endPt,(EPINX_T)curTurnoutEp)); Rotate(&p, zero, Dto.angle); Dto.pos.x = pos.x - p.x; Dto.pos.y = pos.y - p.y; @@ -4323,24 +2423,25 @@ static void AddTurnout(void) BOOL_T noConnections; coOrd p0, p1; - if (Dto.state == 0) + if (Dto.state == 0) { return; - - if (curTurnout->segCnt < 1 || curTurnout->endCnt < 1) { - AbortProg("addTurnout: bad cnt"); } + CHECK( curTurnout->segCnt >= 1 ); + CHECK( curTurnout->endCnt >= 1 ); + UndoStart(_("Place New Turnout"), "addTurnout"); - DYNARR_SET(trkEndPt_t, tempEndPts_da, curTurnout->endCnt); + TempEndPtsSet( curTurnout->endCnt); DYNARR_SET(junk_t, connection_da, curTurnout->endCnt); DYNARR_SET(junk_t, leftover_da, curTurnout->endCnt); for (i = 0; i < curTurnout->endCnt; i++) { coOrd posI; - posI = curTurnout->endPt[i].pos; - tempEndPts(i).pos = AddCoOrd(Dto.pos, posI, Dto.angle); - tempEndPts(i).angle = NormalizeAngle(curTurnout->endPt[i].angle + Dto.angle); + trkEndPt_p epp = EndPtIndex( curTurnout->endPt, i); + posI = GetEndPtPos( epp ); + SetEndPt( TempEndPt(i), AddCoOrd(Dto.pos, posI, Dto.angle), + NormalizeAngle(GetEndPtAngle(epp) + Dto.angle) ); } AuditTracks("addTurnout begin"); @@ -4351,56 +2452,53 @@ static void AddTurnout(void) connection(i).ep = -1; leftover(i).ep = -1; /* connect each endPt ... */ - epPos = tempEndPts(i).pos; - if ((trk = OnTrack(&epPos, FALSE, TRUE)) != NULL && //Adjust epPos onto existing track - (!GetLayerFrozen(GetTrkLayer(trk))) && - (!GetLayerModule(GetTrkLayer(trk))) && - (!QueryTrack(trk, Q_CANNOT_PLACE_TURNOUT))) { + epPos = GetEndPtPos( TempEndPt(i) ); + if ((trk = OnTrack(&epPos, FALSE, TRUE)) != NULL + && //Adjust epPos onto existing track + (!GetLayerFrozen(GetTrkLayer(trk))) && + (!GetLayerModule(GetTrkLayer(trk))) && + (!QueryTrack(trk, Q_CANNOT_PLACE_TURNOUT))) { LOG(log_turnout, 1, ("ep[%d] on T%d @(%0.3f %0.3f)\n", - i, GetTrkIndex(trk), epPos.x, epPos.y)) - DIST_T dd = DIST_INF; + i, GetTrkIndex(trk), epPos.x, epPos.y)) + DIST_T dd = DIST_INF; int nearest = -1; for (int j = 0; j < curTurnout->endCnt; j++) { - if (j < i && (connection(j).trk == trk)) { - nearest = -1; - goto nextEnd; //Track already chosen in use - } - if (dd > FindDistance(epPos, tempEndPts(j).pos)) { - dd = FindDistance(epPos, tempEndPts(j).pos); + DIST_T dd1 = FindDistance( epPos, GetEndPtPos(TempEndPt(j))); + if (dd > dd1) { + dd = dd1; nearest = j; } } - if (nearest != i) continue; //Not this one - d = FindDistance(tempEndPts(i).pos, epPos); + if (nearest != i) { continue; } //Not this one + d = FindDistance(GetEndPtPos(TempEndPt(i)), epPos); if (GetTrkType(trk) == T_TURNOUT) { ep0 = ep1 = PickEndPoint(epPos, trk); a = GetTrkEndAngle(trk, ep0); - } - else { + } else { a = GetAngleAtPoint(trk, epPos, &ep0, &ep1); } - aa = fabs(DifferenceBetweenAngles(a, tempEndPts(i).angle)); + aa = fabs(DifferenceBetweenAngles(a, GetEndPtAngle(TempEndPt(i)))); if ((QueryTrack(trk, Q_IS_CORNU) && (d < trackGauge * 2)) || - ((IsClose(d) && (((ep0 != ep1) && (aa <= connectAngle)) || ((aa <= connectAngle) || (aa > 180 - connectAngle))) && - !(GetTrkType(trk) == T_TURNOUT && - (trk1 = GetTrkEndTrk(trk, ep0)) && - GetTrkType(trk1) == T_TURNOUT)))) { + ((IsClose(d) && (((ep0 != ep1) && (aa <= connectAngle)) + || ((aa <= connectAngle) || (aa > 180 - connectAngle))) && + !(GetTrkType(trk) == T_TURNOUT && + (trk1 = GetTrkEndTrk(trk, ep0)) && + GetTrkType(trk1) == T_TURNOUT)))) { /* ... if they are close enough to a track and line up */ if (aa < 90) { epx = ep1; epy = ep0; - } - else { + } else { epx = ep0; epy = ep1; } LOG(log_turnout, 1, (" Attach! epx=%d\n", epx)) - if ((epx != epy) && - ((d = FindDistance(GetTrkEndPos(trk, epy), epPos)) < minLength) && - ((trk1 = GetTrkEndTrk(trk, epy)) != NULL)) { - epx = GetEndPtConnectedToMe(trk1, trk); - trk = trk1; - } + if ((epx != epy) && + ((d = FindDistance(GetTrkEndPos(trk, epy), epPos)) < minLength) && + ((trk1 = GetTrkEndTrk(trk, epy)) != NULL)) { + epx = GetEndPtConnectedToMe(trk1, trk); + trk = trk1; + } /* split the track at the intersection point */ AuditTracks("addTurnout [%d] before splitTrack", i); if (SplitTrack(trk, epPos, epx, &leftover(i).trk, TRUE)) { @@ -4415,8 +2513,8 @@ static void AddTurnout(void) if (connection(i).trk == leftover(j).trk) { /* yes. Remove the latest leftover piece */ LOG(log_turnout, 1, (" deleting leftover T%d\n", - GetTrkIndex(leftover(i).trk))) - AuditTracks("addTurnout [%d] before delete", i); + GetTrkIndex(leftover(i).trk))) + AuditTracks("addTurnout [%d] before delete", i); UndrawNewTrack(leftover(i).trk); DeleteTrack(leftover(i).trk, FALSE); AuditTracks("addTurnout [%d] before delete", i); @@ -4431,7 +2529,6 @@ static void AddTurnout(void) } } } - nextEnd:; } AuditTracks("addTurnout after loop"); @@ -4439,7 +2536,9 @@ static void AddTurnout(void) /* * copy data */ - newTrk = NewCompound(T_TURNOUT, 0, Dto.pos, Dto.angle, curTurnout->title, tempEndPts_da.cnt, &tempEndPts(0), GetParamPaths(curTurnout), curTurnout->segCnt, curTurnout->segs); + newTrk = NewCompound(T_TURNOUT, 0, Dto.pos, Dto.angle, curTurnout->title, + TempEndPtsCount(), TempEndPt(0), GetParamPaths(curTurnout), curTurnout->segCnt, + curTurnout->segs); xx = GET_EXTRA_DATA(newTrk, T_TURNOUT, extraDataCompound_t); xx->customInfo = curTurnout->customInfo; if (connection((int)curTurnoutEp).trk) { @@ -4459,7 +2558,7 @@ static void AddTurnout(void) AuditTracks("addTurnout T%d before connection", GetTrkIndex(newTrk)); for (i = 0; i < curTurnout->endCnt; i++) { if (connection(i).trk != NULL) { - if (GetTrkEndTrk(connection(i).trk, connection(i).ep)) continue; + if (GetTrkEndTrk(connection(i).trk, connection(i).ep)) { continue; } p0 = GetTrkEndPos(newTrk, i); p1 = GetTrkEndPos(connection(i).trk, connection(i).ep); ANGLE_T a0 = GetTrkEndAngle(newTrk, i); @@ -4471,16 +2570,16 @@ static void AddTurnout(void) if (IsClose(d) || fabs(a) <= 90.0) { trk1 = connection(i).trk; ep0 = connection(i).ep; - if (GetTrkEndTrk(trk1, ep0)) continue; + if (GetTrkEndTrk(trk1, ep0)) { continue; } DrawEndPt(&mainD, trk1, ep0, wDrawColorWhite); trackParams_t params; GetTrackParams(PARAMS_EXTEND, newTrk, GetTrkEndPos(newTrk, i), ¶ms); - SetCornuEndPt(trk1, ep0, GetTrkEndPos(newTrk, i), params.arcP, NormalizeAngle(params.angle + 180.0), params.arcR); + SetCornuEndPt(trk1, ep0, GetTrkEndPos(newTrk, i), params.arcP, + NormalizeAngle(params.angle + 180.0), params.arcR); ConnectTracks(newTrk, i, trk1, ep0); DrawEndPt(&mainD, trk1, ep0, wDrawColorBlack); } - } - else if (d < connectDistance && (a <= connectAngle)) { + } else if (d < connectDistance && (a <= connectAngle)) { noConnections = FALSE; trk1 = connection(i).trk; ep0 = connection(i).ep; @@ -4492,17 +2591,20 @@ static void AddTurnout(void) } } } - if (noConnections) + if (noConnections) { visible = TRUE; + } SetTrkVisible(newTrk, visible); SetTrkNoTies(newTrk, no_ties); SetTrkBridge(newTrk, FALSE); + SetTrkRoadbed(newTrk, FALSE); - AuditTracks("addTurnout T%d before dealing with leftovers", GetTrkIndex(newTrk)); + AuditTracks("addTurnout T%d before dealing with leftovers", + GetTrkIndex(newTrk)); /* deal with the leftovers */ for (i = 0; i < curTurnout->endCnt; i++) { if ((trk = leftover(i).trk) != NULL) { - ASSERT( !IsTrackDeleted(trk) ); + CHECK( !IsTrackDeleted(trk) ); /* move endPt beyond the turnout */ /* it it is short then delete it */ coOrd off; @@ -4524,7 +2626,8 @@ static void AddTurnout(void) DIST_T dd = DIST_INF; a = NormalizeAngle(GetTrkEndAngle(lt, le) + 180.0); for (ep = 0; ep < curTurnout->endCnt; ep++) { - FindPos(&off, NULL, GetTrkEndPos(newTrk, ep), GetTrkEndPos(lt, le), a, DIST_INF); + FindPos(&off, NULL, GetTrkEndPos(newTrk, ep), GetTrkEndPos(lt, le), a, + DIST_INF); pos = GetTrkEndPos(newTrk, ep); DIST_T d = GetTrkDistance(lt, &pos); if ((d < dd) && (d < trackGauge / 2)) { @@ -4542,26 +2645,29 @@ static void AddTurnout(void) dd = d; } } - if (off.x > maxX) + if (off.x > maxX) { maxX = off.x; + } } maxX += trackGauge; pos = Dto.pos; if (QueryTrack(lt, Q_IS_CORNU)) { if (nearest_ep >= 0) { - SetCornuEndPt(lt, le, nearest_pos, nearest_center, nearest_angle, nearest_radius); + SetCornuEndPt(lt, le, nearest_pos, nearest_center, nearest_angle, + nearest_radius); ConnectTracks(newTrk, nearest_ep, lt, le); - } - else { + } else { UndrawNewTrack(lt); DeleteTrack(lt, TRUE); leftover(i).trk = NULL; } - } - else { - AuditTracks("addTurnout T%d[%d] before trimming L%d[%d]", GetTrkIndex(newTrk), i, GetTrkIndex(lt), le); - wBool_t rc = TrimTrack(lt, le, maxX, nearest_pos, nearest_angle, nearest_radius, nearest_center); - AuditTracks("addTurnout T%d[%d] after trimming L%d[%d]", GetTrkIndex(newTrk), i, GetTrkIndex(lt), le); + } else { + AuditTracks("addTurnout T%d[%d] before trimming L%d[%d]", GetTrkIndex(newTrk), + i, GetTrkIndex(lt), le); + TrimTrack(lt, le, maxX, nearest_pos, nearest_angle, nearest_radius, + nearest_center); + AuditTracks("addTurnout T%d[%d] after trimming L%d[%d]", GetTrkIndex(newTrk), i, + GetTrkIndex(lt), le); } } @@ -4583,8 +2689,9 @@ static void AddTurnout(void) static void TurnoutRotate(void* pangle) { - if (Dto.state == 0) + if (Dto.state == 0) { return; + } ANGLE_T angle = (ANGLE_T)VP2L(pangle); angle /= 1000.0; Dto.pos = cmdMenuPos; @@ -4596,29 +2703,31 @@ static void TurnoutRotate(void* pangle) static dynArr_t anchors_da; #define anchors(N) DYNARR_N(trkSeg_t,anchors_da,N) -void static CreateArrowAnchor(coOrd pos, ANGLE_T a, DIST_T len) { +void static CreateArrowAnchor(coOrd pos, ANGLE_T a, DIST_T len) +{ DYNARR_APPEND(trkSeg_t, anchors_da, 1); int i = anchors_da.cnt - 1; anchors(i).type = SEG_STRLIN; - anchors(i).width = 0; + anchors(i).lineWidth = 0; anchors(i).u.l.pos[0] = pos; Translate(&anchors(i).u.l.pos[1], pos, NormalizeAngle(a + 135), len); anchors(i).color = wDrawColorBlue; DYNARR_APPEND(trkSeg_t, anchors_da, 1); i = anchors_da.cnt - 1; anchors(i).type = SEG_STRLIN; - anchors(i).width = 0; + anchors(i).lineWidth = 0; anchors(i).u.l.pos[0] = pos; Translate(&anchors(i).u.l.pos[1], pos, NormalizeAngle(a - 135), len); anchors(i).color = wDrawColorBlue; } -void static CreateRotateAnchor(coOrd pos) { +void static CreateRotateAnchor(coOrd pos) +{ DIST_T d = tempD.scale * 0.15; DYNARR_APPEND(trkSeg_t, anchors_da, 1); int i = anchors_da.cnt - 1; anchors(i).type = SEG_CRVLIN; - anchors(i).width = 0.5; + anchors(i).lineWidth = 0.5; anchors(i).u.c.center = pos; anchors(i).u.c.a0 = 180.0; anchors(i).u.c.a1 = 360.0; @@ -4631,11 +2740,14 @@ void static CreateRotateAnchor(coOrd pos) { } } -void static CreateMoveAnchor(coOrd pos) { +void static CreateMoveAnchor(coOrd pos) +{ DYNARR_SET(trkSeg_t, anchors_da, anchors_da.cnt + 5); - DrawArrowHeads(&DYNARR_N(trkSeg_t, anchors_da, anchors_da.cnt - 5), pos, 0, TRUE, wDrawColorBlue); + DrawArrowHeads(&DYNARR_N(trkSeg_t, anchors_da, anchors_da.cnt - 5), pos, 0, + TRUE, wDrawColorBlue); DYNARR_SET(trkSeg_t, anchors_da, anchors_da.cnt + 5); - DrawArrowHeads(&DYNARR_N(trkSeg_t, anchors_da, anchors_da.cnt - 5), pos, 90, TRUE, wDrawColorBlue); + DrawArrowHeads(&DYNARR_N(trkSeg_t, anchors_da, anchors_da.cnt - 5), pos, 90, + TRUE, wDrawColorBlue); } /** @@ -4647,14 +2759,14 @@ void static CreateMoveAnchor(coOrd pos) { */ EXPORT STATUS_T CmdTurnoutAction( - wAction_t action, - coOrd pos) + wAction_t action, + coOrd pos) { ANGLE_T angle; static BOOL_T validAngle; - static ANGLE_T baseAngle; static coOrd origPos; #ifdef NEWROTATE + static ANGLE_T baseAngle; static ANGLE_T origAngle; #endif @@ -4672,36 +2784,37 @@ EXPORT STATUS_T CmdTurnoutAction( DYNARR_RESET(trkSeg_t, anchors_da); if (Dto.state && (MyGetKeyState() & WKEY_CTRL)) { CreateRotateAnchor(pos); - } - else { + } else { CreateMoveAnchor(pos); } return C_CONTINUE; break; case C_DOWN: DYNARR_RESET(trkSeg_t, anchors_da); - if (curTurnout == NULL) return C_CONTINUE; + if (curTurnout == NULL) { return C_CONTINUE; } PlaceTurnout(pos, NULL); Dto.state = 1; return C_CONTINUE; case C_MOVE: DYNARR_RESET(trkSeg_t, anchors_da); - if (curTurnout == NULL) return C_CONTINUE; - if (curTurnoutEp >= (long)curTurnout->endCnt) + if (curTurnout == NULL) { return C_CONTINUE; } + if (curTurnoutEp >= (long)curTurnout->endCnt) { curTurnoutEp = 0; + } Dto.state = 1; PlaceTurnout(pos, Dto.trk); return C_CONTINUE; case C_UP: DYNARR_RESET(trkSeg_t, anchors_da); - InfoMessage(_("Left-Drag to place, Ctrl+Left-Drag or Right-Drag to Rotate, Space or Enter to accept, Esc to Cancel")); + InfoMessage( + _("Left-Drag to place, Ctrl+Left-Drag or Right-Drag to Rotate, Space or Enter to accept, Esc to Cancel")); return C_CONTINUE; case C_RDOWN: DYNARR_RESET(trkSeg_t, anchors_da); - if (curTurnout == NULL) return C_CONTINUE; + if (curTurnout == NULL) { return C_CONTINUE; } if (Dto.state == 0) { Dto.pos = pos; // If first, use pos, otherwise use current LOG(log_turnout, 1, ("RDOWN @ %0.3fx%0.3f\n", Dto.pos.x, Dto.pos.y)); @@ -4712,19 +2825,23 @@ EXPORT STATUS_T CmdTurnoutAction( #ifdef NEWROTATE origAngle = Dto.angle; #else - Rotate(&origPos, Dto.rot0, -(Dto.angle + curTurnout->endPt[(int)curTurnoutEp].angle)); + Rotate(&origPos, Dto.rot0, + -(Dto.angle + GetEndPtAngle(EndPtIndex(curTurnout->endPt, + (EPINX_T)curTurnoutEp)))); #endif validAngle = FALSE; return C_CONTINUE; case C_RMOVE: DYNARR_RESET(trkSeg_t, anchors_da); - if (curTurnout == NULL) return C_CONTINUE; + if (curTurnout == NULL) { return C_CONTINUE; } Dto.rot1 = pos; if (FindDistance(Dto.rot0, Dto.rot1) > 0.1 * mainD.scale) { angle = FindAngle(Dto.rot0, Dto.rot1); if (!validAngle) { +#ifdef NEWROTATE baseAngle = angle/* - Dto.angle*/; +#endif validAngle = TRUE; } Dto.pos = origPos; @@ -4734,36 +2851,41 @@ EXPORT STATUS_T CmdTurnoutAction( Dto.angle = NormalizeAngle(origAngle + angle); #else angle += 180.0; - Dto.angle = angle - curTurnout->endPt[(int)curTurnoutEp].angle; + Dto.angle = angle - GetEndPtAngle(EndPtIndex(curTurnout->endPt, + (EPINX_T)curTurnoutEp)); #endif Rotate(&Dto.pos, Dto.rot0, angle); LOG(log_turnout, 1, ("RMOVE post @ %0.3fx%0.3f\n", Dto.pos.x, Dto.pos.y)); } FormatCompoundTitle(listLabels, curTurnout->title); - InfoMessage(_("Angle = %0.3f (%s)"), PutAngle(NormalizeAngle(Dto.angle + 90.0)), message); + InfoMessage(_("Angle = %0.3f (%s)"), PutAngle(NormalizeAngle(Dto.angle + 90.0)), + message); Dto.state = 2; return C_CONTINUE; case C_RUP: DYNARR_RESET(trkSeg_t, anchors_da); - if (curTurnout == NULL) return C_CONTINUE; + if (curTurnout == NULL) { return C_CONTINUE; } Dto.state = 1; - InfoMessage(_("Left-Drag to place, Ctrl+Left-Drag or Right-Drag to Rotate, Space or Enter to accept, Esc to Cancel")); + InfoMessage( + _("Left-Drag to place, Ctrl+Left-Drag or Right-Drag to Rotate, Space or Enter to accept, Esc to Cancel")); return C_CONTINUE; case C_LCLICK: DYNARR_RESET(trkSeg_t, anchors_da); - if (curTurnout == NULL) return C_CONTINUE; + if (curTurnout == NULL) { return C_CONTINUE; } if (MyGetKeyState() & WKEY_SHIFT) { - angle = curTurnout->endPt[(int)curTurnoutEp].angle; + angle = GetEndPtAngle( EndPtIndex( curTurnout->endPt, (EPINX_T)curTurnoutEp ) ); curTurnoutEp++; - if (curTurnoutEp >= (long)curTurnout->endCnt) + if (curTurnoutEp >= (long)curTurnout->endCnt) { curTurnoutEp = 0; - if (Dto.trk == NULL) - Dto.angle = NormalizeAngle(Dto.angle + (angle - curTurnout->endPt[(int)curTurnoutEp].angle)); + } + if (Dto.trk == NULL) { + Dto.angle = NormalizeAngle(Dto.angle + (angle - GetEndPtAngle( EndPtIndex( + curTurnout->endPt, (EPINX_T)curTurnoutEp)))); + } PlaceTurnout(Dto.place, Dto.trk); - } - else { + } else { CmdTurnoutAction(C_DOWN, pos); CmdTurnoutAction(C_UP, pos); } @@ -4773,14 +2895,16 @@ EXPORT STATUS_T CmdTurnoutAction( wSetCursor(mainD.d, defaultCursor); if (Dto.state) { DrawSegs(&tempD, Dto.pos, Dto.angle, - curTurnout->segs, curTurnout->segCnt, trackGauge, selectedColor); + curTurnout->segs, curTurnout->segCnt, trackGauge, selectedColor); } + DrawSegsDA(&tempD, NULL, zero, 0.0, &anchors_da, trackGauge, wDrawColorBlack, + 0 ); if (anchors_da.cnt > 0) { - DrawSegs(&tempD, zero, 0.0, &anchors(0), anchors_da.cnt, trackGauge, wDrawColorBlack); wSetCursor(mainD.d, wCursorNone); } - if (Dto.state == 2) + if (Dto.state == 2) { DrawLine(&tempD, Dto.rot0, Dto.rot1, 0, wDrawColorBlue); + } return C_CONTINUE; case C_CANCEL: @@ -4791,9 +2915,10 @@ EXPORT STATUS_T CmdTurnoutAction( return C_TERMINATE; case C_TEXT: - if ((action >> 8) != ' ') + if ((action >> 8) != ' ') { return C_CONTINUE; - /*no break*/ + } + /*no break*/ case C_OK: DYNARR_RESET(trkSeg_t, anchors_da); AddTurnout(); @@ -4803,10 +2928,11 @@ EXPORT STATUS_T CmdTurnoutAction( case C_FINISH: DYNARR_RESET(trkSeg_t, anchors_da); - if (Dto.state != 0 && Dto.trk != NULL) + if (Dto.state != 0 && Dto.trk != NULL) { CmdTurnoutAction(C_OK, pos); - else + } else { CmdTurnoutAction(C_CANCEL, pos); + } return C_TERMINATE; case C_CMDMENU: @@ -4822,8 +2948,8 @@ EXPORT STATUS_T CmdTurnoutAction( #ifdef TURNOUTCMD static STATUS_T CmdTurnout( - wAction_t action, - coOrd pos) + wAction_t action, + coOrd pos) { wIndex_t turnoutIndex; turnoutInfo_t* turnoutPtr; @@ -4832,8 +2958,10 @@ static STATUS_T CmdTurnout( case C_START: if (turnoutW == NULL) { - /* turnoutW = ParamCreateDialog( &turnoutPG, MakeWindowTitle("Turnout"), "Ok", , (paramActionCancelProc)Reset, TRUE, NULL, F_RESIZE|F_RECALLSIZE, TurnoutDlgUpdate ); */ - turnoutW = ParamCreateDialog(&turnoutPG, MakeWindowTitle(_("Turnout")), _("Close"), (paramActionOkProc)TurnoutOk, wHide, TRUE, NULL, F_RESIZE | F_RECALLSIZE | PD_F_ALT_CANCELLABEL, TurnoutDlgUpdate); + /* turnoutW = ParamCreateDialog( &turnoutPG, MakeWindowTitle("Fixed-Track"), "Ok", , (paramActionCancelProc)Reset, TRUE, NULL, F_RESIZE|F_RECALLSIZE, TurnoutDlgUpdate ); */ + turnoutW = ParamCreateDialog(&turnoutPG, MakeWindowTitle(_("Add Fixed-Track")), + _("Close"), (paramActionOkProc)TurnoutOk, wHide, TRUE, NULL, + F_RESIZE | F_RECALLSIZE | PD_F_ALT_CANCELLABEL, TurnoutDlgUpdate); InitNewTurn(turnoutNewM); } /* ParamDialogOkActive( &turnoutPG, FALSE ); */ @@ -4862,26 +2990,32 @@ static STATUS_T CmdTurnout( case C_DOWN: case C_RDOWN: ParamDialogOkActive(&turnoutPG, TRUE); - if (hideTurnoutWindow) + if (hideTurnoutWindow) { wHide(turnoutW); - if (((action & 0xFF) == C_DOWN) && (MyGetKeyState() & WKEY_CTRL)) - return CmdTurnoutAction(C_RDOWN, pos); //Convert CTRL into Right - /*no break*/ + } + if (((action & 0xFF) == C_DOWN) && (MyGetKeyState() & WKEY_CTRL)) { + return CmdTurnoutAction(C_RDOWN, pos); //Convert CTRL into Right + } + /*no break*/ case C_MOVE: - if (MyGetKeyState() & WKEY_CTRL) + if (MyGetKeyState() & WKEY_CTRL) { return CmdTurnoutAction(C_RMOVE, pos); - /*no break*/ + } + /*no break*/ case C_RMOVE: return CmdTurnoutAction(action, pos); case C_UP: case C_RUP: - if (hideTurnoutWindow) + if (hideTurnoutWindow) { wShow(turnoutW); + } - InfoMessage(_("Left-Drag to place, Ctrl+Left-Drag or Right-Drag to Rotate, Space or Enter to accept, Esc to Cancel")); - if (((action & 0xFF) == C_UP) && (MyGetKeyState() & WKEY_CTRL)) + InfoMessage( + _("Left-Drag to place, Ctrl+Left-Drag or Right-Drag to Rotate, Space or Enter to accept, Esc to Cancel")); + if (((action & 0xFF) == C_UP) && (MyGetKeyState() & WKEY_CTRL)) { return CmdTurnoutAction(C_RUP, pos); + } return CmdTurnoutAction(action, pos); case C_LCLICK: @@ -4919,22 +3053,24 @@ static STATUS_T CmdTurnout( */ static char* CmdTurnoutHotBarProc( - hotBarProc_e op, - void* data, - drawCmd_p d, - coOrd* origP) + hotBarProc_e op, + void* data, + drawCmd_p d, + coOrd* origP) { turnoutInfo_t* to = (turnoutInfo_t*)data; switch (op) { case HB_SELECT: /* new element is selected */ CmdTurnoutAction(C_FINISH, zero); /* finish current operation */ curTurnout = to; - DoCommandB(I2VP(turnoutHotBarCmdInx)); /* continue with new turnout / structure */ + DoCommandB(I2VP( + turnoutHotBarCmdInx)); /* continue with new turnout / structure */ return NULL; case HB_LISTTITLE: FormatCompoundTitle(listLabels, to->title); - if (message[0] == '\0') + if (message[0] == '\0') { FormatCompoundTitle(listLabels | LABEL_DESCR, to->title); + } return message; case HB_BARTITLE: FormatCompoundTitle(hotBarLabels << 1, to->title); @@ -4956,10 +3092,13 @@ EXPORT void AddHotBarTurnouts(void) for (inx = 0; inx < turnoutInfo_da.cnt; inx++) { to = turnoutInfo(inx); if (!(IsParamValid(to->paramFileIndex) && - to->segCnt > 0 && - (FIT_NONE != CompatibleScale(FIT_TURNOUT, to->scaleInx, GetLayoutCurScale())))) + to->segCnt > 0 && + (FIT_NONE != CompatibleScale(FIT_TURNOUT, to->scaleInx, + GetLayoutCurScale())))) { continue; - AddHotBarElement(to->contentsLabel, to->size, to->orig, TRUE, FALSE, to->barScale, to, CmdTurnoutHotBarProc); + } + AddHotBarElement(to->contentsLabel, to->size, to->orig, TRUE, FALSE, + to->barScale, to, CmdTurnoutHotBarProc); } } @@ -4972,8 +3111,8 @@ EXPORT void AddHotBarTurnouts(void) */ static STATUS_T CmdTurnoutHotBar( - wAction_t action, - coOrd pos) + wAction_t action, + coOrd pos) { switch (action & 0xFF) { @@ -4987,8 +3126,9 @@ static STATUS_T CmdTurnoutHotBar( FormatCompoundTitle(listLabels | LABEL_DESCR, curTurnout->title); InfoMessage(_("Place %s and draw into position"), message); wIndex_t listIndex = FindListItemByContext(turnoutListL, curTurnout); - if (listIndex >= 0) + if (listIndex >= 0) { turnoutInx = listIndex; + } ParamLoadControls(&turnoutPG); ParamGroupRecord(&turnoutPG); return CmdTurnoutAction(action, pos); @@ -5000,7 +3140,7 @@ static STATUS_T CmdTurnoutHotBar( if (MyGetKeyState() & WKEY_CTRL) { return CmdTurnoutAction(C_RDOWN, pos); } - /*no break*/ + /*no break*/ case C_RDOWN: return CmdTurnoutAction(action, pos); @@ -5008,7 +3148,7 @@ static STATUS_T CmdTurnoutHotBar( if (MyGetKeyState() & WKEY_CTRL) { return CmdTurnoutAction(C_RMOVE, pos); } - /*no break*/ + /*no break*/ case C_RMOVE: return CmdTurnoutAction(action, pos); @@ -5016,37 +3156,44 @@ static STATUS_T CmdTurnoutHotBar( if (MyGetKeyState() & WKEY_CTRL) { return CmdTurnoutAction(C_RUP, pos); } - /*no break*/ + /*no break*/ case C_RUP: - InfoMessage(_("Left-Drag to place, Ctrl+Left-Drag or Right-Drag to Rotate, Space or Enter to accept, Esc to Cancel")); + InfoMessage( + _("Left-Drag to place, Ctrl+Left-Drag or Right-Drag to Rotate, Space or Enter to accept, Esc to Cancel")); return CmdTurnoutAction(action, pos); case C_REDRAW: return CmdTurnoutAction(action, pos); case C_TEXT: - if ((action >> 8) != ' ') + if ((action >> 8) != ' ') { return C_CONTINUE; - /* no break*/ + } + /* no break*/ case C_OK: CmdTurnoutAction(action, pos); return C_CONTINUE; case C_CANCEL: HotBarCancel(); - /*no break*/ + /*no break*/ default: return CmdTurnoutAction(action, pos); } } #ifdef TURNOUTCMD -#include "bitmaps/turnout.xpm" +#include "bitmaps/turnout.xpm3" EXPORT void InitCmdTurnout(wMenu_p menu) { - AddMenuButton(menu, CmdTurnout, "cmdTurnout", _("Predefined Track"), wIconCreatePixMap(turnout_xpm[iconSize]), LEVEL0_50, IC_WANT_MOVE | IC_STICKY | IC_LCLICK | IC_CMDMENU | IC_POPUP2, ACCL_TURNOUT, NULL); - turnoutHotBarCmdInx = AddMenuButton(menu, CmdTurnoutHotBar, "cmdTurnoutHotBar", "", NULL, LEVEL0_50, IC_WANT_MOVE | IC_STICKY | IC_LCLICK | IC_CMDMENU | IC_POPUP2, 0, NULL); + AddMenuButton(menu, CmdTurnout, "cmdNewFixedTrack", _("Fixed-Track"), + wIconCreatePixMap(turnout_xpm3[iconSize]), LEVEL0_50, + IC_WANT_MOVE | IC_STICKY | IC_LCLICK | IC_CMDMENU | IC_POPUP2, ACCL_TURNOUT, + NULL); + turnoutHotBarCmdInx = AddMenuButton(menu, CmdTurnoutHotBar, "cmdTurnoutHotBar", + "", NULL, LEVEL0_50, IC_WANT_MOVE | IC_STICKY | IC_LCLICK | IC_CMDMENU | + IC_POPUP2, 0, NULL); RegisterChangeNotification(TurnoutChange); ParamRegister(&turnoutPG); log_turnout = LogFindIndex("turnout"); @@ -5072,7 +3219,8 @@ EXPORT void InitTrkTurnout(void) wDrawable_t turnoutD; -void wListAddValue(wList_p bl, char* val, wIcon_p, void* listData, void* itemData) +void wListAddValue(wList_p bl, char* val, wIcon_p, void* listData, + void* itemData) { } @@ -5095,7 +3243,8 @@ void GetTrkCurveCenter(track_p t, coOrd* pos, DIST_T* radius) #ifdef NOTRACK_C -track_p NewTrack(wIndex_t index, TRKTYP_T type, EPINX_T endCnt, SIZE_T extraSize) +track_p NewTrack(wIndex_t index, TRKTYP_T type, EPINX_T endCnt, + SIZE_T extraSize) { return NULL; } |