diff options
Diffstat (limited to 'app/bin/ctodesgn.c')
| -rw-r--r-- | app/bin/ctodesgn.c | 2898 |
1 files changed, 1605 insertions, 1293 deletions
diff --git a/app/bin/ctodesgn.c b/app/bin/ctodesgn.c index ea124cf..1b50d91 100644 --- a/app/bin/ctodesgn.c +++ b/app/bin/ctodesgn.c @@ -18,7 +18,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ #include "ccurve.h" @@ -29,13 +29,15 @@ #include "param.h" #include "track.h" +#include "trkendpt.h" #include "ccornu.h" #include "cbezier.h" #include "misc.h" #include "common-ui.h" +static int log_cornuturnoutdesigner; + dynArr_t tempSegs_da; -dynArr_t tempEndPts_da; char tempCustom[4096]; #define TURNOUTDESIGNER "CTURNOUT DESIGNER" @@ -74,35 +76,37 @@ dynArr_t tempSegs_da; typedef struct { - struct { - wWinPix_t x, y; - } pos; - int index; - char * winLabel; - char * printLabel; - enum { Dim_e, Frog_e, Angle_e, Rad_e } mode; - } toDesignFloat_t; + struct { + wWinPix_t x, y; + } pos; + int index; + char * winLabel; + char * printLabel; + enum { Dim_e, Frog_e, Angle_e, Rad_e } mode; +} toDesignFloat_t; typedef struct { - PATHPTR_T paths; - char * segOrder; - } toDesignSchema_t; + PATHPTR_T paths; + char * segOrder; +} toDesignSchema_t; typedef struct { - int type; - char * label; - int strCnt; - int lineCnt; - wLines_t * lines; - int floatCnt; - toDesignFloat_t * floats; - toDesignSchema_t * paths; - int angleModeCnt; - wLine_p lineC; - wBool_t slipmode; - } toDesignDesc_t; + int type; + char * label; + int strCnt; + int lineCnt; + wLines_t * lines; + int floatCnt; + toDesignFloat_t * floats; + toDesignSchema_t * paths; + int angleModeCnt; + wLine_p lineC; + wBool_t slipmode; +} toDesignDesc_t; +#ifndef MKTURNOUT static wWin_p newTurnW; +#endif static FLOAT_T newTurnRad0; static FLOAT_T newTurnAngle0; @@ -135,27 +139,31 @@ static char newTurnManufacturer[STR_SIZE]; static char *newTurnAngleModeLabels[] = { N_("Frog #"), N_("Degrees"), NULL }; static char *newTurnSlipModeLabels[] = { N_("Dual Path"), N_("Quad Path"), NULL }; static DIST_T newTurnRoadbedWidth; -static long newTurnRoadbedLineWidth = 0; -static wDrawColor roadbedColor; +static LWIDTH_T newTurnRoadbedLineWidth = 0; +static wDrawColor newTurnRoadbedColor; static DIST_T newTurnTrackGauge; static char * newTurnScaleName; static paramFloatRange_t r0d001_10000 = { 0.001, 10000, 80 }; static paramFloatRange_t r0d300_10000 = { 0.300, 10000, 80 }; -static paramFloatRange_t r0_10000 = { 0, 10000, 80 }; +//static paramFloatRange_t r0_10000 = { 0, 10000, 80 }; static paramFloatRange_t r_10000_10000 = { -1000, 10000, 80 }; static paramFloatRange_t r0d001_90 = { 0.001, 90, 80 }; -static paramFloatRange_t r_90_90 = { -90, 90, 80 }; static paramFloatRange_t r0_100 = { 0, 100, 80 }; static paramIntegerRange_t i0_100 = { 0, 100, 40 }; static void NewTurnOk( void * context ); +#ifndef MKTURNOUT +static paramFloatRange_t r_90_90 = { -90, 90, 80 }; static void ShowTurnoutDesigner( void * context ); +#endif static coOrd points[20]; +#ifndef MKTURNOUT static coOrd end_points[20]; static coOrd end_centers[20]; static double end_arcs[20]; static double end_angles[20]; +#endif static DIST_T radii[10]; static double angles[10]; @@ -199,23 +207,22 @@ static paramData_t turnDesignPLs[] = { { PD_STRING, &newTurnRightPartno, "partno2", PDO_DLGHORZ | PDO_NOTBLANK, NULL, N_(" #"),0, 0, sizeof(newTurnRightPartno)}, { PD_FLOAT, &newTurnRoadbedWidth, "roadbedWidth", PDO_DIM, &r0_100, N_("Roadbed Width") }, { PD_LONG, &newTurnRoadbedLineWidth, "roadbedLineWidth", PDO_DLGHORZ, &i0_100, N_("Line Width") }, - { PD_COLORLIST, &roadbedColor, "color", PDO_DLGHORZ|PDO_DLGBOXEND, NULL, N_("Color") }, + { PD_COLORLIST, &newTurnRoadbedColor, "color", PDO_DLGHORZ|PDO_DLGBOXEND, NULL, N_("Color") }, { PD_BUTTON, NewTurnOk, "done", PDO_DLGCMDBUTTON, NULL, N_("Ok") }, { PD_BUTTON, wPrintSetup, "printsetup", 0, NULL, N_("Print Setup") }, #define I_TOANGMODE (28) { PD_RADIO, &newTurnAngleMode, "angleMode", 0, newTurnAngleModeLabels }, #define I_TOSLIPMODE (29) { PD_RADIO, &newTurnSlipMode, "slipMode", 0, newTurnSlipModeLabels } - }; +}; #ifndef MKTURNOUT static paramGroup_t turnDesignPG = { "turnoutNew", 0, turnDesignPLs, COUNT( turnDesignPLs ) }; static turnoutInfo_t * customTurnout1, * customTurnout2; static BOOL_T includeNontrackSegments; -#endif -#ifdef MKTURNOUT +#else int doCustomInfoLine = 1; int doRoadBed = 0; char specialLine[256]; @@ -230,531 +237,619 @@ static toDesignDesc_t * curDesign; static wLines_t RegLines[] = { #include "toreg.lin" - }; +}; static toDesignFloat_t RegFloats[] = { -{ { 175, 10 }, I_TOLENGTH+0, N_("Length"), N_("Diverging Length"), Dim_e }, -{ { 400, 28 }, I_TOANGLE+0, N_("Angle"), N_("Diverging Angle"), Frog_e }, -{ { 325, 68 }, I_TOOFFSET+0, N_("Offset"), N_("Diverging Offset"), Dim_e }, -{ { 100, 120 }, I_TOLENGTH+1, N_("Length"), N_("Overall Length"), Dim_e }, - }; + { { 175, 10 }, I_TOLENGTH+0, N_("Length"), N_("Diverging Length"), Dim_e }, + { { 400, 28 }, I_TOANGLE+0, N_("Angle"), N_("Diverging Angle"), Frog_e }, + { { 325, 68 }, I_TOOFFSET+0, N_("Offset"), N_("Diverging Offset"), Dim_e }, + { { 100, 120 }, I_TOLENGTH+1, N_("Length"), N_("Overall Length"), Dim_e }, +}; static signed char RegPaths[] = { - 'N', 'o', 'r', 'm', 'a', 'l', 0, 1, 2, 0, 0, - 'R', 'e', 'v', 'e', 'r', 's', 'e', 0, 1, 3, 4, 0, 0, 0 }; + 'N', 'o', 'r', 'm', 'a', 'l', 0, 1, 2, 0, 0, + 'R', 'e', 'v', 'e', 'r', 's', 'e', 0, 1, 3, 4, 0, 0, 0 +}; static toDesignSchema_t RegSchema = { - RegPaths, - "030" "310" "341" "420" }; + RegPaths, + "030" "310" "341" "420" +}; static toDesignDesc_t RegDesc = { - NTO_REGULAR, - N_("Regular Turnout"), - 2, - COUNT( RegLines ), RegLines, - COUNT( RegFloats ), RegFloats, - &RegSchema, 1 }; + NTO_REGULAR, + N_("Regular Turnout"), + 2, + COUNT( RegLines ), RegLines, + COUNT( RegFloats ), RegFloats, + &RegSchema, 1 +}; static wLines_t CrvLines[] = { #include "tocrv.lin" - }; +}; static toDesignFloat_t CrvFloats[] = { -{ { 175, 10 }, I_TOLENGTH+0, N_("Length"), N_("Inner Length"), Dim_e }, -{ { 375, 12 }, I_TOANGLE+0, N_("Angle"), N_("Inner Angle"), Frog_e }, -{ { 375, 34 }, I_TOOFFSET+0, N_("Offset"), N_("Inner Offset"), Dim_e }, -{ { 400, 62 }, I_TOANGLE+1, N_("Angle"), N_("Outer Angle"), Frog_e }, -{ { 400, 84 }, I_TOOFFSET+1, N_("Offset"), N_("Outer Offset"), Dim_e }, -{ { 175, 120 }, I_TOLENGTH+1, N_("Length"), N_("Outer Length"), Dim_e } }; + { { 175, 10 }, I_TOLENGTH+0, N_("Length"), N_("Inner Length"), Dim_e }, + { { 375, 12 }, I_TOANGLE+0, N_("Angle"), N_("Inner Angle"), Frog_e }, + { { 375, 34 }, I_TOOFFSET+0, N_("Offset"), N_("Inner Offset"), Dim_e }, + { { 400, 62 }, I_TOANGLE+1, N_("Angle"), N_("Outer Angle"), Frog_e }, + { { 400, 84 }, I_TOOFFSET+1, N_("Offset"), N_("Outer Offset"), Dim_e }, + { { 175, 120 }, I_TOLENGTH+1, N_("Length"), N_("Outer Length"), Dim_e } +}; static signed char Crv1Paths[] = { - 'N', 'o', 'r', 'm', 'a', 'l', 0, 1, 4, 5, 0, 0, - 'R', 'e', 'v', 'e', 'r', 's', 'e', 0, 1, 2, 3, 0, 0, 0 }; + 'N', 'o', 'r', 'm', 'a', 'l', 0, 1, 4, 5, 0, 0, + 'R', 'e', 'v', 'e', 'r', 's', 'e', 0, 1, 2, 3, 0, 0, 0 +}; static toDesignSchema_t Crv1Schema = { - Crv1Paths, - "030" "341" "410" "362" "620" }; + Crv1Paths, + "030" "341" "410" "362" "620" +}; static signed char Crv2Paths[] = { - 'N', 'o', 'r', 'm', 'a', 'l', 0, 1, 4, 5, 0, 0, - 'R', 'e', 'v', 'e', 'r', 's', 'e', 0, 1, 6, 2, 3, 0, 0, 0 }; + 'N', 'o', 'r', 'm', 'a', 'l', 0, 1, 4, 5, 0, 0, + 'R', 'e', 'v', 'e', 'r', 's', 'e', 0, 1, 6, 2, 3, 0, 0, 0 +}; static toDesignSchema_t Crv2Schema = { - Crv2Paths, - "050" "341" "410" "562" "620" "530" }; + Crv2Paths, + "050" "341" "410" "562" "620" "530" +}; static signed char Crv3Paths[] = { - 'N', 'o', 'r', 'm', 'a', 'l', 0, 1, 6, 4, 5, 0, 0, - 'R', 'e', 'v', 'e', 'r', 's', 'e', 0, 1, 2, 3, 0, 0, 0 }; + 'N', 'o', 'r', 'm', 'a', 'l', 0, 1, 6, 4, 5, 0, 0, + 'R', 'e', 'v', 'e', 'r', 's', 'e', 0, 1, 2, 3, 0, 0, 0 +}; static toDesignSchema_t Crv3Schema = { - Crv3Paths, - "030" "341" "410" "562" "620" "350" }; + Crv3Paths, + "030" "341" "410" "562" "620" "350" +}; static toDesignDesc_t CrvDesc = { - NTO_CURVED, - N_("Curved Turnout"), - 2, - COUNT( CrvLines ), CrvLines, - COUNT( CrvFloats ), CrvFloats, - &Crv1Schema, 1 }; + NTO_CURVED, + N_("Curved Turnout"), + 2, + COUNT( CrvLines ), CrvLines, + COUNT( CrvFloats ), CrvFloats, + &Crv1Schema, 1 +}; +#ifndef MKTURNOUT static wLines_t CornuLines[] = { #include "tocornu.lin" - }; +}; static toDesignFloat_t CornuFloats[] = { -{ { 175, 10 }, I_TOLENGTH+0, N_("Length"), N_("Inner Length"), Dim_e }, -{ { 375, 0 }, I_TOANGLE+0, N_("Angle"), N_("Inner Angle"), Frog_e }, -{ { 375, 22 }, I_TOOFFSET+0, N_("Offset"), N_("Inner Offset"), Dim_e }, -{ { 375, 44 }, I_TORAD+0, N_("Radius"), N_("Inner Radius"), Dim_e }, -{ { 400, 62 }, I_TOANGLE+1, N_("Angle"), N_("Outer Angle"), Frog_e }, -{ { 400, 84 }, I_TOOFFSET+1, N_("Offset"), N_("Outer Offset"), Dim_e }, -{ { 400, 106 }, I_TORAD+1, N_("Radius"), N_("Outer Radius"), Dim_e }, -{ { 175, 120 }, I_TOLENGTH+1, N_("Length"), N_("Outer Length"), Dim_e }, -{ { 50, 90 }, I_TORAD+2, N_("Radius"), N_("Toe Radius"), Dim_e }, -{ { 50, 40 }, I_TOTOELENGTH+0, N_("Length"), N_("Toe Length"), Dim_e } }; + { { 175, 10 }, I_TOLENGTH+0, N_("Length"), N_("Inner Length"), Dim_e }, + { { 375, 0 }, I_TOANGLE+0, N_("Angle"), N_("Inner Angle"), Frog_e }, + { { 375, 22 }, I_TOOFFSET+0, N_("Offset"), N_("Inner Offset"), Dim_e }, + { { 375, 44 }, I_TORAD+0, N_("Radius"), N_("Inner Radius"), Dim_e }, + { { 400, 62 }, I_TOANGLE+1, N_("Angle"), N_("Outer Angle"), Frog_e }, + { { 400, 84 }, I_TOOFFSET+1, N_("Offset"), N_("Outer Offset"), Dim_e }, + { { 400, 106 }, I_TORAD+1, N_("Radius"), N_("Outer Radius"), Dim_e }, + { { 175, 120 }, I_TOLENGTH+1, N_("Length"), N_("Outer Length"), Dim_e }, + { { 50, 90 }, I_TORAD+2, N_("Radius"), N_("Toe Radius"), Dim_e }, + { { 50, 40 }, I_TOTOELENGTH+0, N_("Length"), N_("Toe Length"), Dim_e } +}; static signed char CornuPaths[] = { - 'N', 'o', 'r', 'm', 'a', 'l', 0, 1, 4, 0, 0, 0, - 'R', 'e', 'v', 'e', 'r', 's', 'e', 0, 1, 2, 0, 0, 0, 0 }; + 'N', 'o', 'r', 'm', 'a', 'l', 0, 1, 4, 0, 0, 0, + 'R', 'e', 'v', 'e', 'r', 's', 'e', 0, 1, 2, 0, 0, 0, 0 +}; static toDesignSchema_t CornuSchema = { - CornuPaths, - "033" "343" "413" }; + CornuPaths, + "033" "343" "413" +}; static toDesignDesc_t CornuDesc = { - NTO_CORNU, - N_("Cornu Curved Turnout"), - 2, - COUNT( CornuLines ), CornuLines, - COUNT( CornuFloats ), CornuFloats, - &CornuSchema, 1 }; + NTO_CORNU, + N_("Cornu Curved Turnout"), + 2, + COUNT( CornuLines ), CornuLines, + COUNT( CornuFloats ), CornuFloats, + &CornuSchema, 1 +}; +#endif static wLines_t WyeLines[] = { #include "towye.lin" - }; +}; static toDesignFloat_t WyeFloats[] = { -{ { 175, 10 }, I_TOLENGTH+0, N_("Length"), N_("Left Length"), Dim_e }, -{ { 400, 28 }, I_TOANGLE+0, N_("Angle"), N_("Left Angle"), Frog_e }, -{ { 325, 68 }, I_TOOFFSET+0, N_("Offset"), N_("Left Offset"), Dim_e }, -{ { 325, 115 }, I_TOOFFSET+1, N_("Offset"), N_("Right Offset"), Dim_e }, -{ { 400, 153 }, I_TOANGLE+1, N_("Angle"), N_("Right Angle"), Frog_e }, -{ { 175, 170 }, I_TOLENGTH+1, N_("Length"), N_("Right Length"), Dim_e }, - }; + { { 175, 10 }, I_TOLENGTH+0, N_("Length"), N_("Left Length"), Dim_e }, + { { 400, 28 }, I_TOANGLE+0, N_("Angle"), N_("Left Angle"), Frog_e }, + { { 325, 68 }, I_TOOFFSET+0, N_("Offset"), N_("Left Offset"), Dim_e }, + { { 325, 115 }, I_TOOFFSET+1, N_("Offset"), N_("Right Offset"), Dim_e }, + { { 400, 153 }, I_TOANGLE+1, N_("Angle"), N_("Right Angle"), Frog_e }, + { { 175, 170 }, I_TOLENGTH+1, N_("Length"), N_("Right Length"), Dim_e }, +}; static signed char Wye1Paths[] = { - 'L', 'e', 'f', 't', 0, 1, 2, 3, 0, 0, - 'R', 'i', 'g', 'h', 't', 0, 1, 4, 5, 0, 0, 0 }; + 'L', 'e', 'f', 't', 0, 1, 2, 3, 0, 0, + 'R', 'i', 'g', 'h', 't', 0, 1, 4, 5, 0, 0, 0 +}; static toDesignSchema_t Wye1Schema = { - Wye1Paths, - "030" "341" "410" "362" "620" }; + Wye1Paths, + "030" "341" "410" "362" "620" +}; static signed char Wye2Paths[] = { - 'L', 'e', 'f', 't', 0, 1, 2, 3, 4, 0, 0, - 'R', 'i', 'g', 'h', 't', 0, 1, 5, 6, 0, 0, 0 }; + 'L', 'e', 'f', 't', 0, 1, 2, 3, 4, 0, 0, + 'R', 'i', 'g', 'h', 't', 0, 1, 5, 6, 0, 0, 0 +}; static toDesignSchema_t Wye2Schema = { - Wye2Paths, - "050" "530" "341" "410" "562" "620" }; + Wye2Paths, + "050" "530" "341" "410" "562" "620" +}; static signed char Wye3Paths[] = { - 'L', 'e', 'f', 't', 0, 1, 2, 3, 0, 0, - 'R', 'i', 'g', 'h', 't', 0, 1, 4, 5, 6, 0, 0, 0 }; + 'L', 'e', 'f', 't', 0, 1, 2, 3, 0, 0, + 'R', 'i', 'g', 'h', 't', 0, 1, 4, 5, 6, 0, 0, 0 +}; static toDesignSchema_t Wye3Schema = { - Wye3Paths, - "030" "341" "410" "350" "562" "620" }; + Wye3Paths, + "030" "341" "410" "350" "562" "620" +}; static toDesignDesc_t WyeDesc = { - NTO_WYE, - N_("Wye Turnout"), - 1, - COUNT( WyeLines ), WyeLines, - COUNT( WyeFloats ), WyeFloats, - NULL, 1 }; + NTO_WYE, + N_("Wye Turnout"), + 1, + COUNT( WyeLines ), WyeLines, + COUNT( WyeFloats ), WyeFloats, + NULL, 1 +}; +#ifndef MKTURNOUT static wLines_t CornuWyeLines[] = { #include "tocornuwye.lin" - }; +}; static toDesignFloat_t CornuWyeFloats[] = { -{ { 175, 10 }, I_TOLENGTH+0, N_("Length"), N_("Left Length"), Dim_e }, -{ { 400, 28 }, I_TOANGLE+0, N_("Angle"), N_("Left Angle"), Frog_e }, -{ { 400, 48 }, I_TOOFFSET+0, N_("Offset"), N_("Left Offset"), Dim_e }, -{ { 400, 68 }, I_TORAD+0, N_("Radius"), N_("Left Radius"), Dim_e }, -{ { 400, 108 }, I_TORAD+1, N_("Radius"), N_("Right Radius"), Dim_e }, -{ { 400, 128 }, I_TOOFFSET+1, N_("Offset"), N_("Right Offset"), Dim_e }, -{ { 400, 148 }, I_TOANGLE+1, N_("Angle"), N_("Right Angle"), Frog_e }, -{ { 175, 170 }, I_TOLENGTH+1, N_("Length"), N_("Right Length"), Dim_e }, -{ { 80, 48 }, I_TOTOELENGTH+0, N_("Length"), N_("Toe Length"), Dim_e }, -{ { 80, 28 }, I_TORAD+2, N_("Radius"), N_("Toe Radius"), Dim_e }, - }; + { { 175, 10 }, I_TOLENGTH+0, N_("Length"), N_("Left Length"), Dim_e }, + { { 400, 28 }, I_TOANGLE+0, N_("Angle"), N_("Left Angle"), Frog_e }, + { { 400, 48 }, I_TOOFFSET+0, N_("Offset"), N_("Left Offset"), Dim_e }, + { { 400, 68 }, I_TORAD+0, N_("Radius"), N_("Left Radius"), Dim_e }, + { { 400, 108 }, I_TORAD+1, N_("Radius"), N_("Right Radius"), Dim_e }, + { { 400, 128 }, I_TOOFFSET+1, N_("Offset"), N_("Right Offset"), Dim_e }, + { { 400, 148 }, I_TOANGLE+1, N_("Angle"), N_("Right Angle"), Frog_e }, + { { 175, 170 }, I_TOLENGTH+1, N_("Length"), N_("Right Length"), Dim_e }, + { { 80, 48 }, I_TOTOELENGTH+0, N_("Length"), N_("Toe Length"), Dim_e }, + { { 80, 28 }, I_TORAD+2, N_("Radius"), N_("Toe Radius"), Dim_e }, +}; static signed char CornuWyePaths[] = { - 'L', 'e', 'f', 't', 0, 1, 2, 3, 0, 0, - 'R', 'i', 'g', 'h', 't', 0, 1, 4, 5, 0, 0, 0 }; /* Not Used */ + 'L', 'e', 'f', 't', 0, 1, 2, 3, 0, 0, + 'R', 'i', 'g', 'h', 't', 0, 1, 4, 5, 0, 0, 0 +}; /* Not Used */ static toDesignSchema_t CornuWyeSchema = { - CornuWyePaths, - "030" "341" "410" "362" "620" }; /* Not Used */ + CornuWyePaths, + "030" "341" "410" "362" "620" +}; /* Not Used */ static toDesignDesc_t CornuWyeDesc = { - NTO_CORNUWYE, - N_("Cornu Wye Turnout"), - 1, - COUNT( CornuWyeLines ), CornuWyeLines, - COUNT( CornuWyeFloats ), CornuWyeFloats, - NULL, 1 }; + NTO_CORNUWYE, + N_("Cornu Wye Turnout"), + 1, + COUNT( CornuWyeLines ), CornuWyeLines, + COUNT( CornuWyeFloats ), CornuWyeFloats, + NULL, 1 +}; +#endif static wLines_t ThreewayLines[] = { #include "to3way.lin" - }; +}; static toDesignFloat_t ThreewayFloats[] = { -{ { 175, 10 }, I_TOLENGTH+0, N_("Length"), N_("Left Length"), Dim_e }, -{ { 400, 28 }, I_TOANGLE+0, N_("Angle"), N_("Left Angle"), Frog_e }, -{ { 325, 68 }, I_TOOFFSET+0, N_("Offset"), N_("Left Offset"), Dim_e }, -{ { 100, 90 }, I_TOLENGTH+2, N_("Length"), N_("Length"), Dim_e }, -{ { 325, 115 }, I_TOOFFSET+1, N_("Offset"), N_("Right Offset"), Dim_e }, -{ { 400, 153 }, I_TOANGLE+1, N_("Angle"), N_("Right Angle"), Frog_e }, -{ { 175, 170 }, I_TOLENGTH+1, N_("Length"), N_("Right Length"), Dim_e }, - }; + { { 175, 10 }, I_TOLENGTH+0, N_("Length"), N_("Left Length"), Dim_e }, + { { 400, 28 }, I_TOANGLE+0, N_("Angle"), N_("Left Angle"), Frog_e }, + { { 325, 68 }, I_TOOFFSET+0, N_("Offset"), N_("Left Offset"), Dim_e }, + { { 100, 90 }, I_TOLENGTH+2, N_("Length"), N_("Length"), Dim_e }, + { { 325, 115 }, I_TOOFFSET+1, N_("Offset"), N_("Right Offset"), Dim_e }, + { { 400, 153 }, I_TOANGLE+1, N_("Angle"), N_("Right Angle"), Frog_e }, + { { 175, 170 }, I_TOLENGTH+1, N_("Length"), N_("Right Length"), Dim_e }, +}; static signed char Tri1Paths[] = { - 'L', 'e', 'f', 't', 0, 1, 2, 3, 0, 0, - 'N', 'o', 'r', 'm', 'a', 'l', 0, 1, 6, 0, 0, - 'R', 'i', 'g', 'h', 't', 0, 1, 4, 5, 0, 0, 0 }; + 'L', 'e', 'f', 't', 0, 1, 2, 3, 0, 0, + 'N', 'o', 'r', 'm', 'a', 'l', 0, 1, 6, 0, 0, + 'R', 'i', 'g', 'h', 't', 0, 1, 4, 5, 0, 0, 0 +}; static toDesignSchema_t Tri1Schema = { - Tri1Paths, - "030" "341" "410" "362" "620" "370" }; + Tri1Paths, + "030" "341" "410" "362" "620" "370" +}; static signed char Tri2Paths[] = { - 'L', 'e', 'f', 't', 0, 1, 2, 3, 4, 0, 0, - 'N', 'o', 'r', 'm', 'a', 'l', 0, 1, 2, 7, 0, 0, - 'R', 'i', 'g', 'h', 't', 0, 1, 5, 6, 0, 0, 0 }; + 'L', 'e', 'f', 't', 0, 1, 2, 3, 4, 0, 0, + 'N', 'o', 'r', 'm', 'a', 'l', 0, 1, 2, 7, 0, 0, + 'R', 'i', 'g', 'h', 't', 0, 1, 5, 6, 0, 0, 0 +}; static toDesignSchema_t Tri2Schema = { - Tri2Paths, - "050" "530" "341" "410" "562" "620" "370" }; + Tri2Paths, + "050" "530" "341" "410" "562" "620" "370" +}; static signed char Tri3Paths[] = { - 'L', 'e', 'f', 't', 0, 1, 2, 3, 0, 0, - 'N', 'o', 'r', 'm', 'a', 'l', 0, 1, 4, 7, 0, 0, - 'R', 'i', 'g', 'h', 't', 0, 1, 4, 5, 6, 0, 0, 0 }; + 'L', 'e', 'f', 't', 0, 1, 2, 3, 0, 0, + 'N', 'o', 'r', 'm', 'a', 'l', 0, 1, 4, 7, 0, 0, + 'R', 'i', 'g', 'h', 't', 0, 1, 4, 5, 6, 0, 0, 0 +}; static toDesignSchema_t Tri3Schema = { - Tri3Paths, - "030" "341" "410" "350" "562" "620" "570" }; + Tri3Paths, + "030" "341" "410" "350" "562" "620" "570" +}; static toDesignDesc_t ThreewayDesc = { - NTO_3WAY, - N_("3-way Turnout"), - 1, - COUNT( ThreewayLines ), ThreewayLines, - COUNT( ThreewayFloats ), ThreewayFloats, - NULL, 1 }; + NTO_3WAY, + N_("3-way Turnout"), + 1, + COUNT( ThreewayLines ), ThreewayLines, + COUNT( ThreewayFloats ), ThreewayFloats, + NULL, 1 +}; +#ifndef MKTURNOUT static wLines_t CornuThreewayLines[] = { #include "tocornu3way.lin" - }; +}; static toDesignFloat_t CornuThreewayFloats[] = { -{ { 175, 10 }, I_TOLENGTH+0, N_("Length"), N_("Left Length"), Dim_e }, -{ { 380, 10 }, I_TOANGLE+0, N_("Angle"), N_("Left Angle"), Frog_e }, -{ { 380, 50 }, I_TOOFFSET+0, N_("Offset"), N_("Left Offset"), Dim_e }, -{ { 380, 30 }, I_TORAD+0, N_("Radius"), N_("Left Radius"), Dim_e }, -{ { 130, 90 }, I_TOLENGTH+3, N_("Length"), N_("Center Length"), Dim_e }, -{ { 400, 70 }, I_TOANGLE+3, N_("Angle"), N_("Center Angle"), Dim_e }, -{ { 400, 90}, I_TOOFFSET+3, N_("Offset"), N_("Center Offset"), Dim_e }, -{ { 400, 110 }, I_TORAD+3, N_("Radius"), N_("Center Radius"), Dim_e }, -{ { 420, 150 }, I_TORAD+1, N_("Radius"), N_("Right Radius"), Dim_e }, -{ { 420, 130 }, I_TOOFFSET+1, N_("Offset"), N_("Right Offset"), Dim_e }, -{ { 420, 170 }, I_TOANGLE+1, N_("Angle"), N_("Right Angle"), Frog_e }, -{ { 175, 170 }, I_TOLENGTH+1, N_("Length"), N_("Right Length"), Dim_e }, -{ { 45, 50 }, I_TOTOELENGTH+0, N_("Length"), N_("Toe Length Left"), Dim_e }, -{ { 55, 140 }, I_TOTOELENGTH+1, N_("Length"), N_("Toe Length Right"), Dim_e }, -{ { 40, 105 }, I_TORAD+2, N_("Radius"), N_("Toe Radius"), Dim_e }, - }; + { { 175, 10 }, I_TOLENGTH+0, N_("Length"), N_("Left Length"), Dim_e }, + { { 380, 10 }, I_TOANGLE+0, N_("Angle"), N_("Left Angle"), Frog_e }, + { { 380, 50 }, I_TOOFFSET+0, N_("Offset"), N_("Left Offset"), Dim_e }, + { { 380, 30 }, I_TORAD+0, N_("Radius"), N_("Left Radius"), Dim_e }, + { { 130, 90 }, I_TOLENGTH+3, N_("Length"), N_("Center Length"), Dim_e }, + { { 400, 70 }, I_TOANGLE+3, N_("Angle"), N_("Center Angle"), Dim_e }, + { { 400, 90}, I_TOOFFSET+3, N_("Offset"), N_("Center Offset"), Dim_e }, + { { 400, 110 }, I_TORAD+3, N_("Radius"), N_("Center Radius"), Dim_e }, + { { 420, 150 }, I_TORAD+1, N_("Radius"), N_("Right Radius"), Dim_e }, + { { 420, 130 }, I_TOOFFSET+1, N_("Offset"), N_("Right Offset"), Dim_e }, + { { 420, 170 }, I_TOANGLE+1, N_("Angle"), N_("Right Angle"), Frog_e }, + { { 175, 170 }, I_TOLENGTH+1, N_("Length"), N_("Right Length"), Dim_e }, + { { 45, 50 }, I_TOTOELENGTH+0, N_("Length"), N_("Toe Length Left"), Dim_e }, + { { 55, 140 }, I_TOTOELENGTH+1, N_("Length"), N_("Toe Length Right"), Dim_e }, + { { 40, 105 }, I_TORAD+2, N_("Radius"), N_("Toe Radius"), Dim_e }, +}; static signed char CornuTriPaths[] = { - 'L', 'e', 'f', 't', 0, 1, 2, 3, 0, 0, - 'N', 'o', 'r', 'm', 'a', 'l', 0, 1, 6, 0, 0, - 'R', 'i', 'g', 'h', 't', 0, 1, 4, 5, 0, 0, 0 }; + 'L', 'e', 'f', 't', 0, 1, 2, 3, 0, 0, + 'N', 'o', 'r', 'm', 'a', 'l', 0, 1, 6, 0, 0, + 'R', 'i', 'g', 'h', 't', 0, 1, 4, 5, 0, 0, 0 +}; static toDesignSchema_t CornuTriSchema = { - CornuTriPaths, - "030" "341" "410" "362" "620" "370" }; + CornuTriPaths, + "030" "341" "410" "362" "620" "370" +}; static toDesignDesc_t CornuThreewayDesc = { - NTO_CORNU3WAY, - N_("Cornu 3-way Turnout"), - 1, - COUNT( CornuThreewayLines ), CornuThreewayLines, - COUNT( CornuThreewayFloats ), CornuThreewayFloats, - NULL, 1 }; + NTO_CORNU3WAY, + N_("Cornu 3-way Turnout"), + 1, + COUNT( CornuThreewayLines ), CornuThreewayLines, + COUNT( CornuThreewayFloats ), CornuThreewayFloats, + NULL, 1 +}; +#endif static wLines_t CrossingLines[] = { #include "toxing.lin" - }; +}; static toDesignFloat_t CrossingFloats[] = { -{ { 329, 30 }, I_TOLENGTH+0, N_("Length"), N_("Length"), Dim_e }, -{ { 370, 90 }, I_TOANGLE+0, N_("Angle"), N_("Angle"), Frog_e }, -{ { 329, 150 }, I_TOLENGTH+1, N_("Length"), N_("Length"), Dim_e } }; + { { 329, 30 }, I_TOLENGTH+0, N_("Length"), N_("Length"), Dim_e }, + { { 370, 90 }, I_TOANGLE+0, N_("Angle"), N_("Angle"), Frog_e }, + { { 329, 150 }, I_TOLENGTH+1, N_("Length"), N_("Length"), Dim_e } +}; static signed char CrossingPaths[] = { - 'N', 'o', 'r', 'm', 'a', 'l', 0, 1, 0, 2, 0, 0, 0 }; + 'N', 'o', 'r', 'm', 'a', 'l', 0, 1, 0, 2, 0, 0, 0 +}; static toDesignSchema_t CrossingSchema = { - CrossingPaths, - "010" "230" }; + CrossingPaths, + "010" "230" +}; static toDesignDesc_t CrossingDesc = { - NTO_CROSSING, - N_("Crossing"), - 1, - COUNT( CrossingLines ), CrossingLines, - COUNT( CrossingFloats ), CrossingFloats, - &CrossingSchema, 1 }; + NTO_CROSSING, + N_("Crossing"), + 1, + COUNT( CrossingLines ), CrossingLines, + COUNT( CrossingFloats ), CrossingFloats, + &CrossingSchema, 1 +}; static wLines_t SingleSlipLines[] = { #include "tosslip.lin" - }; +}; static toDesignFloat_t SingleSlipFloats[] = { -{ { 329, 30 }, I_TOLENGTH+0, N_("Length"), N_("Length"), Dim_e }, -{ { 370, 90 }, I_TOANGLE+0, N_("Angle"), N_("Angle"), Frog_e }, -{ { 329, 155 }, I_TOLENGTH+1, N_("Length"), N_("Length"), Dim_e } }; + { { 329, 30 }, I_TOLENGTH+0, N_("Length"), N_("Length"), Dim_e }, + { { 370, 90 }, I_TOANGLE+0, N_("Angle"), N_("Angle"), Frog_e }, + { { 329, 155 }, I_TOLENGTH+1, N_("Length"), N_("Length"), Dim_e } +}; static signed char SingleSlipPaths[] = { - 'N', 'o', 'r', 'm', 'a', 'l', 0, 1, 2, 0, 3, 4, 0, 0, - 'R', 'e', 'v', 'e', 'r', 's', 'e', 0, 1, 5, 4, 0, 0, 0 }; + 'N', 'o', 'r', 'm', 'a', 'l', 0, 1, 2, 0, 3, 4, 0, 0, + 'R', 'e', 'v', 'e', 'r', 's', 'e', 0, 1, 5, 4, 0, 0, 0 +}; static toDesignSchema_t SingleSlipSchema = { - SingleSlipPaths, - "040" "410" "250" "530" "451" }; + SingleSlipPaths, + "040" "410" "250" "530" "451" +}; static toDesignDesc_t SingleSlipDesc = { - NTO_S_SLIP, - N_("Single Slipswitch"), - 1, - COUNT( SingleSlipLines ), SingleSlipLines, - COUNT( SingleSlipFloats ), SingleSlipFloats, - &SingleSlipSchema, 1 }; + NTO_S_SLIP, + N_("Single Slipswitch"), + 1, + COUNT( SingleSlipLines ), SingleSlipLines, + COUNT( SingleSlipFloats ), SingleSlipFloats, + &SingleSlipSchema, 1 +}; static wLines_t DoubleSlipLines[] = { #include "todslip.lin" - }; +}; static toDesignFloat_t DoubleSlipFloats[] = { -{ { 329, 30 }, I_TOLENGTH+0, N_("Length"), N_("Length"), Dim_e }, -{ { 370, 90 }, I_TOANGLE+0, N_("Angle"), N_("Angle"), Frog_e }, -{ { 329, 155 }, I_TOLENGTH+1, N_("Length"), N_("Length"), Dim_e } }; + { { 329, 30 }, I_TOLENGTH+0, N_("Length"), N_("Length"), Dim_e }, + { { 370, 90 }, I_TOANGLE+0, N_("Angle"), N_("Angle"), Frog_e }, + { { 329, 155 }, I_TOLENGTH+1, N_("Length"), N_("Length"), Dim_e } +}; static signed char DoubleSlipPaths[] = { - 'N', 'o', 'r', 'm', 'a', 'l', 0, 1, 2, 3, 0, 4, 5, 6, 0, 0, - 'R', 'e', 'v', 'e', 'r', 's', 'e', 0, 1, 7, 6, 0, 4, 8, 3, 0, 0, 0 }; + 'N', 'o', 'r', 'm', 'a', 'l', 0, 1, 2, 3, 0, 4, 5, 6, 0, 0, + 'R', 'e', 'v', 'e', 'r', 's', 'e', 0, 1, 7, 6, 0, 4, 8, 3, 0, 0, 0 +}; static signed char DoubleSlipPaths2[] = { - 'C', 'r', 'o', 's', 's', '1', 0, 1, 2, 3, 0, 0, - 'C', 'r', 'o', 's', 's', '2', 0, 4, 5, 6, 0, 0, - 'S', 'l', 'i', 'p', '1', 0, 1, 7, 6, 0, 0, - 'S', 'l', 'i', 'p', '2', 0, 4, 8, 3, 0, 0, 0 }; + 'C', 'r', 'o', 's', 's', '1', 0, 1, 2, 3, 0, 0, + 'C', 'r', 'o', 's', 's', '2', 0, 4, 5, 6, 0, 0, + 'S', 'l', 'i', 'p', '1', 0, 1, 7, 6, 0, 0, + 'S', 'l', 'i', 'p', '2', 0, 4, 8, 3, 0, 0, 0 +}; static toDesignSchema_t DoubleSlipSchema = { - DoubleSlipPaths, - "040" "460" "610" "270" "750" "530" "451" "762" }; + DoubleSlipPaths, + "040" "460" "610" "270" "750" "530" "451" "762" +}; static toDesignSchema_t DoubleSlipSchema2 = { - DoubleSlipPaths2, - "040" "460" "610" "270" "750" "530" "451" "762" }; + DoubleSlipPaths2, + "040" "460" "610" "270" "750" "530" "451" "762" +}; static toDesignDesc_t DoubleSlipDesc = { - NTO_D_SLIP, - N_("Double Slipswitch"), - 1, - COUNT( DoubleSlipLines ), DoubleSlipLines, - COUNT( DoubleSlipFloats ), DoubleSlipFloats, - &DoubleSlipSchema, 1 }; + NTO_D_SLIP, + N_("Double Slipswitch"), + 1, + COUNT( DoubleSlipLines ), DoubleSlipLines, + COUNT( DoubleSlipFloats ), DoubleSlipFloats, + &DoubleSlipSchema, 1 +}; +#ifndef MKTURNOUT static wLines_t RightCrossoverLines[] = { #include "torcross.lin" - }; +}; static toDesignFloat_t RightCrossoverFloats[] = { -{ { 200, 10 }, I_TOLENGTH+0, N_("Length"), N_("Length"), Dim_e }, -{ { 90, 85 }, I_TOOFFSET+0, N_("Separation"), N_("Separation"), Dim_e } }; + { { 200, 10 }, I_TOLENGTH+0, N_("Length"), N_("Length"), Dim_e }, + { { 90, 85 }, I_TOOFFSET+0, N_("Separation"), N_("Separation"), Dim_e } +}; static signed char RightCrossoverPaths[] = { - 'N', 'o', 'r', 'm', 'a', 'l', 0, 1, 2, 0, 3, 4, 0, 0, - 'R', 'e', 'v', 'e', 'r', 's', 'e', 0, 3, 5, 6, 7, 2, 0, 0, 0 }; + 'N', 'o', 'r', 'm', 'a', 'l', 0, 1, 2, 0, 3, 4, 0, 0, + 'R', 'e', 'v', 'e', 'r', 's', 'e', 0, 3, 5, 6, 7, 2, 0, 0, 0 +}; static toDesignSchema_t RightCrossoverSchema = { - RightCrossoverPaths, - "060" "610" "280" "830" "892" "970" "761" }; + RightCrossoverPaths, + "060" "610" "280" "830" "892" "970" "761" +}; static toDesignDesc_t RightCrossoverDesc = { - NTO_R_CROSSOVER, - N_("Right Crossover"), - 1, - COUNT( RightCrossoverLines ), RightCrossoverLines, - COUNT( RightCrossoverFloats ), RightCrossoverFloats, - &RightCrossoverSchema, 0 }; + NTO_R_CROSSOVER, + N_("Right Crossover"), + 1, + COUNT( RightCrossoverLines ), RightCrossoverLines, + COUNT( RightCrossoverFloats ), RightCrossoverFloats, + &RightCrossoverSchema, 0 +}; +#endif +#ifndef MKTURNOUT static wLines_t LeftCrossoverLines[] = { #include "tolcross.lin" - }; +}; static toDesignFloat_t LeftCrossoverFloats[] = { -{ { 200, 10 }, I_TOLENGTH+0, N_("Length"), N_("Length"), Dim_e }, -{ { 90, 85 }, I_TOOFFSET+0, N_("Separation"), N_("Separation"), Dim_e } }; + { { 200, 10 }, I_TOLENGTH+0, N_("Length"), N_("Length"), Dim_e }, + { { 90, 85 }, I_TOOFFSET+0, N_("Separation"), N_("Separation"), Dim_e } +}; static signed char LeftCrossoverPaths[] = { - 'N', 'o', 'r', 'm', 'a', 'l', 0, 1, 2, 0, 3, 4, 0, 0, - 'R', 'e', 'v', 'e', 'r', 's', 'e', 0, 1, 5, 6, 7, 4, 0, 0, 0 }; + 'N', 'o', 'r', 'm', 'a', 'l', 0, 1, 2, 0, 3, 4, 0, 0, + 'R', 'e', 'v', 'e', 'r', 's', 'e', 0, 1, 5, 6, 7, 4, 0, 0, 0 +}; static toDesignSchema_t LeftCrossoverSchema = { - LeftCrossoverPaths, - "040" "410" "2A0" "A30" "451" "5B0" "BA2" }; + LeftCrossoverPaths, + "040" "410" "2A0" "A30" "451" "5B0" "BA2" +}; static toDesignDesc_t LeftCrossoverDesc = { - NTO_L_CROSSOVER, - N_("Left Crossover"), - 1, - COUNT( LeftCrossoverLines ), LeftCrossoverLines, - COUNT( LeftCrossoverFloats ), LeftCrossoverFloats, - &LeftCrossoverSchema, 0 }; + NTO_L_CROSSOVER, + N_("Left Crossover"), + 1, + COUNT( LeftCrossoverLines ), LeftCrossoverLines, + COUNT( LeftCrossoverFloats ), LeftCrossoverFloats, + &LeftCrossoverSchema, 0 +}; +#endif static wLines_t DoubleCrossoverLines[] = { #include "todcross.lin" - }; +}; static toDesignFloat_t DoubleCrossoverFloats[] = { -{ { 200, 10 }, I_TOLENGTH+0, N_("Length"), N_("Length"), Dim_e }, -{ { 90, 85 }, I_TOOFFSET+0, N_("Separation"), N_("Separation"), Dim_e } }; + { { 200, 10 }, I_TOLENGTH+0, N_("Length"), N_("Length"), Dim_e }, + { { 90, 85 }, I_TOOFFSET+0, N_("Separation"), N_("Separation"), Dim_e } +}; static signed char DoubleCrossoverPaths[] = { - 'N', 'o', 'r', 'm', 'a', 'l', 0, 1, 2, 3, 0, 4, 5, 6, 0, 0, - 'R', 'e', 'v', 'e', 'r', 's', 'e', 0, 1, 7, 8, 9, 6, 0, 4, 10, 11, 12, 3, 0, 0, 0 }; + 'N', 'o', 'r', 'm', 'a', 'l', 0, 1, 2, 3, 0, 4, 5, 6, 0, 0, + 'R', 'e', 'v', 'e', 'r', 's', 'e', 0, 1, 7, 8, 9, 6, 0, 4, 10, 11, 12, 3, 0, 0, 0 +}; static toDesignSchema_t DoubleCrossoverSchema = { - DoubleCrossoverPaths, - "040" "460" "610" "280" "8A0" "A30" "451" "5B0" "BA2" "892" "970" "761" }; + DoubleCrossoverPaths, + "040" "460" "610" "280" "8A0" "A30" "451" "5B0" "BA2" "892" "970" "761" +}; static toDesignDesc_t DoubleCrossoverDesc = { - NTO_D_CROSSOVER, - N_("Double Crossover"), - 1, - COUNT( DoubleCrossoverLines ), DoubleCrossoverLines, - COUNT( DoubleCrossoverFloats ), DoubleCrossoverFloats, - &DoubleCrossoverSchema, 0 }; + NTO_D_CROSSOVER, + N_("Double Crossover"), + 1, + COUNT( DoubleCrossoverLines ), DoubleCrossoverLines, + COUNT( DoubleCrossoverFloats ), DoubleCrossoverFloats, + &DoubleCrossoverSchema, 0 +}; static wLines_t StrSectionLines[] = { #include "tostrsct.lin" - }; +}; static toDesignFloat_t StrSectionFloats[] = { -{ { 200, 10 }, I_TOLENGTH+0, N_("Length"), N_("Length"), Dim_e } }; + { { 200, 10 }, I_TOLENGTH+0, N_("Length"), N_("Length"), Dim_e } +}; static signed char StrSectionPaths[] = { - 'N', 'o', 'r', 'm', 'a', 'l', 0, 1, 0, 0, 0 }; + 'N', 'o', 'r', 'm', 'a', 'l', 0, 1, 0, 0, 0 +}; static toDesignSchema_t StrSectionSchema = { - StrSectionPaths, - "010" }; + StrSectionPaths, + "010" +}; static toDesignDesc_t StrSectionDesc = { - NTO_STR_SECTION, - N_("Straight Section"), - 1, - COUNT( StrSectionLines ), StrSectionLines, - COUNT( StrSectionFloats ), StrSectionFloats, - &StrSectionSchema, 0 }; + NTO_STR_SECTION, + N_("Straight Section"), + 1, + COUNT( StrSectionLines ), StrSectionLines, + COUNT( StrSectionFloats ), StrSectionFloats, + &StrSectionSchema, 0 +}; static wLines_t CrvSectionLines[] = { #include "tocrvsct.lin" - }; +}; static toDesignFloat_t CrvSectionFloats[] = { -{ { 225, 90 }, I_TOLENGTH+0, N_("Radius"), N_("Radius"), Dim_e }, -{ { 225, 140}, I_TOANGLE+0, N_("Angle (Degrees)"), N_("Angle"), Angle_e } }; + { { 225, 90 }, I_TOLENGTH+0, N_("Radius"), N_("Radius"), Dim_e }, + { { 225, 140}, I_TOANGLE+0, N_("Angle (Degrees)"), N_("Angle"), Angle_e } +}; static signed char CrvSectionPaths[] = { - 'N', 'o', 'r', 'm', 'a', 'l', 0, 1, 0, 0, 0 }; + 'N', 'o', 'r', 'm', 'a', 'l', 0, 1, 0, 0, 0 +}; static toDesignSchema_t CrvSectionSchema = { - CrvSectionPaths, - "011" }; + CrvSectionPaths, + "011" +}; static toDesignDesc_t CrvSectionDesc = { - NTO_CRV_SECTION, - N_("Curved Section"), - 1, - COUNT( CrvSectionLines ), CrvSectionLines, - COUNT( CrvSectionFloats ), CrvSectionFloats, - &CrvSectionSchema, 0 }; + NTO_CRV_SECTION, + N_("Curved Section"), + 1, + COUNT( CrvSectionLines ), CrvSectionLines, + COUNT( CrvSectionFloats ), CrvSectionFloats, + &CrvSectionSchema, 0 +}; #ifdef LATER static wLines_t BumperLines[] = { #include "tostrsct.lin" - }; +}; static toDesignFloat_t BumperFloats[] = { -{ { 200, 10 }, I_TOLENGTH+0, N_("Length"), N_("Length"), Dim_e } }; + { { 200, 10 }, I_TOLENGTH+0, N_("Length"), N_("Length"), Dim_e } +}; static signed char BumperPaths[] = { - 'N', 'o', 'r', 'm', 'a', 'l', 0, 1, 0, 0, 0 }; + 'N', 'o', 'r', 'm', 'a', 'l', 0, 1, 0, 0, 0 +}; static toDesignSchema_t BumperSchema = { - BumperPaths, - "010" }; + BumperPaths, + "010" +}; static toDesignDesc_t BumperDesc = { - NTO_BUMPER, - N_("Bumper Section"), - 1, - COUNT( BumberLines ), BumperLines, - COUNT( BumperFloats ), BumperFloats, - &BumperSchema, 0 }; + NTO_BUMPER, + N_("Bumper Section"), + 1, + COUNT( BumberLines ), BumperLines, + COUNT( BumperFloats ), BumperFloats, + &BumperSchema, 0 +}; static wLines_t TurntableLines[] = { #include "tostrsct.lin" - }; +}; static toDesignFloat_t TurntableFloats[] = { -{ { 200, 10 }, I_TOOFFSET+0, N_("Offset"), N_("Count"), 0 }, -{ { 200, 10 }, I_TOLENGTH+0, N_("Length"), N_("Radius1"), Dim_e }, -{ { 200, 10 }, I_TOLENGTH+1, N_("Length"), N_("Radius2"), Dim_e } }; + { { 200, 10 }, I_TOOFFSET+0, N_("Offset"), N_("Count"), 0 }, + { { 200, 10 }, I_TOLENGTH+0, N_("Length"), N_("Radius1"), Dim_e }, + { { 200, 10 }, I_TOLENGTH+1, N_("Length"), N_("Radius2"), Dim_e } +}; static signed char TurntablePaths[] = { - '1', 0, 1, 0, 0, - '2', 0, 2, 0, 0, - '3', 0, 3, 0, 0, - '4', 0, 4, 0, 0, - '5', 0, 5, 0, 0, - '6', 0, 6, 0, 0, - '7', 0, 7, 0, 0, - '8', 0, 8, 0, 0, - '9', 0, 9, 0, 0, - '1', '0', 0, 10, 0, 0, - '1', '1', 0, 11, 0, 0, - '1', '2', 0, 12, 0, 0, - '1', '3', 0, 13, 0, 0, - '1', '4', 0, 14, 0, 0, - '1', '5', 0, 15, 0, 0, - '1', '6', 0, 16, 0, 0, - '1', '7', 0, 17, 0, 0, - '1', '8', 0, 18, 0, 0, - '1', '9', 0, 19, 0, 0, - '2', '0', 0, 20, 0, 0, - '2', '1', 0, 21, 0, 0, - '2', '2', 0, 22, 0, 0, - '2', '3', 0, 23, 0, 0, - '2', '4', 0, 24, 0, 0, - '2', '5', 0, 25, 0, 0, - '2', '6', 0, 26, 0, 0, - '2', '7', 0, 27, 0, 0, - '2', '8', 0, 28, 0, 0, - '2', '9', 0, 29, 0, 0, - '3', '0', 0, 30, 0, 0, - '3', '1', 0, 31, 0, 0, - '3', '2', 0, 32, 0, 0, - '3', '3', 0, 33, 0, 0, - '3', '4', 0, 34, 0, 0, - '3', '5', 0, 35, 0, 0, - '3', '6', 0, 36, 0, 0, - '3', '7', 0, 37, 0, 0, - '3', '8', 0, 38, 0, 0, - '3', '9', 0, 39, 0, 0, - '4', '0', 0, 40, 0, 0, - '4', '1', 0, 41, 0, 0, - '4', '2', 0, 42, 0, 0, - '4', '3', 0, 43, 0, 0, - '4', '4', 0, 44, 0, 0, - '4', '5', 0, 45, 0, 0, - '4', '6', 0, 46, 0, 0, - '4', '7', 0, 47, 0, 0, - '4', '8', 0, 48, 0, 0, - '4', '9', 0, 49, 0, 0, - '5', '0', 0, 50, 0, 0, - '5', '1', 0, 51, 0, 0, - '5', '2', 0, 52, 0, 0, - '5', '3', 0, 53, 0, 0, - '5', '4', 0, 54, 0, 0, - '5', '5', 0, 55, 0, 0, - '5', '6', 0, 56, 0, 0, - '5', '7', 0, 57, 0, 0, - '5', '8', 0, 58, 0, 0, - '5', '9', 0, 59, 0, 0, - '6', '0', 0, 60, 0, 0, - '6', '1', 0, 61, 0, 0, - '6', '2', 0, 62, 0, 0, - '6', '3', 0, 63, 0, 0, - '6', '4', 0, 64, 0, 0, - '6', '5', 0, 65, 0, 0, - '6', '6', 0, 66, 0, 0, - '6', '7', 0, 67, 0, 0, - '6', '8', 0, 68, 0, 0, - '6', '9', 0, 69, 0, 0, - '7', '0', 0, 70, 0, 0, - '7', '1', 0, 71, 0, 0, - '7', '2', 0, 72, 0, 0, - 0 }; + '1', 0, 1, 0, 0, + '2', 0, 2, 0, 0, + '3', 0, 3, 0, 0, + '4', 0, 4, 0, 0, + '5', 0, 5, 0, 0, + '6', 0, 6, 0, 0, + '7', 0, 7, 0, 0, + '8', 0, 8, 0, 0, + '9', 0, 9, 0, 0, + '1', '0', 0, 10, 0, 0, + '1', '1', 0, 11, 0, 0, + '1', '2', 0, 12, 0, 0, + '1', '3', 0, 13, 0, 0, + '1', '4', 0, 14, 0, 0, + '1', '5', 0, 15, 0, 0, + '1', '6', 0, 16, 0, 0, + '1', '7', 0, 17, 0, 0, + '1', '8', 0, 18, 0, 0, + '1', '9', 0, 19, 0, 0, + '2', '0', 0, 20, 0, 0, + '2', '1', 0, 21, 0, 0, + '2', '2', 0, 22, 0, 0, + '2', '3', 0, 23, 0, 0, + '2', '4', 0, 24, 0, 0, + '2', '5', 0, 25, 0, 0, + '2', '6', 0, 26, 0, 0, + '2', '7', 0, 27, 0, 0, + '2', '8', 0, 28, 0, 0, + '2', '9', 0, 29, 0, 0, + '3', '0', 0, 30, 0, 0, + '3', '1', 0, 31, 0, 0, + '3', '2', 0, 32, 0, 0, + '3', '3', 0, 33, 0, 0, + '3', '4', 0, 34, 0, 0, + '3', '5', 0, 35, 0, 0, + '3', '6', 0, 36, 0, 0, + '3', '7', 0, 37, 0, 0, + '3', '8', 0, 38, 0, 0, + '3', '9', 0, 39, 0, 0, + '4', '0', 0, 40, 0, 0, + '4', '1', 0, 41, 0, 0, + '4', '2', 0, 42, 0, 0, + '4', '3', 0, 43, 0, 0, + '4', '4', 0, 44, 0, 0, + '4', '5', 0, 45, 0, 0, + '4', '6', 0, 46, 0, 0, + '4', '7', 0, 47, 0, 0, + '4', '8', 0, 48, 0, 0, + '4', '9', 0, 49, 0, 0, + '5', '0', 0, 50, 0, 0, + '5', '1', 0, 51, 0, 0, + '5', '2', 0, 52, 0, 0, + '5', '3', 0, 53, 0, 0, + '5', '4', 0, 54, 0, 0, + '5', '5', 0, 55, 0, 0, + '5', '6', 0, 56, 0, 0, + '5', '7', 0, 57, 0, 0, + '5', '8', 0, 58, 0, 0, + '5', '9', 0, 59, 0, 0, + '6', '0', 0, 60, 0, 0, + '6', '1', 0, 61, 0, 0, + '6', '2', 0, 62, 0, 0, + '6', '3', 0, 63, 0, 0, + '6', '4', 0, 64, 0, 0, + '6', '5', 0, 65, 0, 0, + '6', '6', 0, 66, 0, 0, + '6', '7', 0, 67, 0, 0, + '6', '8', 0, 68, 0, 0, + '6', '9', 0, 69, 0, 0, + '7', '0', 0, 70, 0, 0, + '7', '1', 0, 71, 0, 0, + '7', '2', 0, 72, 0, 0, + 0 +}; static toDesignSchema_t TurntableSchema = { - TurntablePaths, - "010" "020" "030" "040" "050" "060" "070" "080" "090" "0A0" "0B0" }; + TurntablePaths, + "010" "020" "030" "040" "050" "060" "070" "080" "090" "0A0" "0B0" +}; static toDesignDesc_t TurntableDesc = { - NTO_TURNTABLE, - N_("Turntable Section"), - 1, - COUNT( TurntableLines ), TurntableLines, - COUNT( TurntableFloats ), TurntableFLoats, - &TurntableSchema, 0 }; + NTO_TURNTABLE, + N_("Turntable Section"), + 1, + COUNT( TurntableLines ), TurntableLines, + COUNT( TurntableFloats ), TurntableFLoats, + &TurntableSchema, 0 +}; #endif #ifndef MKTURNOUT static toDesignDesc_t * designDescs[] = { - &RegDesc, - &CrvDesc, - &CornuDesc, - &WyeDesc, - &CornuWyeDesc, - &ThreewayDesc, - &CornuThreewayDesc, - &CrossingDesc, - &SingleSlipDesc, - &DoubleSlipDesc, - &RightCrossoverDesc, - &LeftCrossoverDesc, - &DoubleCrossoverDesc, - &StrSectionDesc, - &CrvSectionDesc }; + &RegDesc, + &CrvDesc, + &CornuDesc, + &WyeDesc, + &CornuWyeDesc, + &ThreewayDesc, + &CornuThreewayDesc, + &CrossingDesc, + &SingleSlipDesc, + &DoubleSlipDesc, + &RightCrossoverDesc, + &LeftCrossoverDesc, + &DoubleCrossoverDesc, + &StrSectionDesc, + &CrvSectionDesc +}; #endif /************************************************************************** @@ -766,50 +861,51 @@ static toDesignDesc_t * designDescs[] = { int debugComputeRoadbed = 0; #ifdef LATER typedef struct { - int start; - unsigned long bits; - unsigned long mask; - int width; - } searchTable_t; + int start; + unsigned long bits; + unsigned long mask; + int width; +} searchTable_t; static searchTable_t searchTable[] = { - { 0, 0xFFFF0000, 0xFFFF0000, 32000} , - { 32, 0x0000FFFF, 0x0000FFFF, 32000} , - - { 16, 0x00FFFF00, 0x00FFFF00, 16} , - - { 8, 0x0FF00000, 0x0FF00000, 8} , - { 24, 0x00000FF0, 0x00000FF0, 8} , - - { 4, 0x3C000000, 0x3C000000, 4} , - { 12, 0x003C0000, 0x003C0000, 4} , - { 20, 0x00003C00, 0x00003C00, 4} , - { 28, 0x0000003C, 0x0000003C, 4} , - - { 2, 0x60000000, 0x60000000, 2} , - { 6, 0x06000000, 0x06000000, 2}, - { 10, 0x00600000, 0x00600000, 2}, - { 14, 0x00060000, 0x00060000, 2}, - { 18, 0x00006000, 0x00006000, 2}, - { 22, 0x00000600, 0x00000600, 2}, - { 26, 0x00000060, 0x00000060, 2}, - { 30, 0x00000006, 0x00000006, 2}, - - { 1, 0x40000000, 0x60000000, 1}, - { 3, 0x10000000, 0x30000000, 1}, - { 5, 0x04000000, 0x06000000, 1}, - { 7, 0x01000000, 0x03000000, 1}, - { 9, 0x00400000, 0x00600000, 1}, - { 11, 0x00100000, 0x00300000, 1}, - { 13, 0x00040000, 0x00060000, 1}, - { 15, 0x00010000, 0x00030000, 1}, - { 17, 0x00004000, 0x00006000, 1}, - { 19, 0x00001000, 0x00003000, 1}, - { 21, 0x00000400, 0x00000600, 1}, - { 23, 0x00000100, 0x00000300, 1}, - { 25, 0x00000040, 0x00000060, 1}, - { 27, 0x00000010, 0x00000030, 1}, - { 29, 0x00000004, 0x00000006, 1}, - { 31, 0x00000001, 0x00000003, 1}}; + { 0, 0xFFFF0000, 0xFFFF0000, 32000}, + { 32, 0x0000FFFF, 0x0000FFFF, 32000}, + + { 16, 0x00FFFF00, 0x00FFFF00, 16}, + + { 8, 0x0FF00000, 0x0FF00000, 8}, + { 24, 0x00000FF0, 0x00000FF0, 8}, + + { 4, 0x3C000000, 0x3C000000, 4}, + { 12, 0x003C0000, 0x003C0000, 4}, + { 20, 0x00003C00, 0x00003C00, 4}, + { 28, 0x0000003C, 0x0000003C, 4}, + + { 2, 0x60000000, 0x60000000, 2}, + { 6, 0x06000000, 0x06000000, 2}, + { 10, 0x00600000, 0x00600000, 2}, + { 14, 0x00060000, 0x00060000, 2}, + { 18, 0x00006000, 0x00006000, 2}, + { 22, 0x00000600, 0x00000600, 2}, + { 26, 0x00000060, 0x00000060, 2}, + { 30, 0x00000006, 0x00000006, 2}, + + { 1, 0x40000000, 0x60000000, 1}, + { 3, 0x10000000, 0x30000000, 1}, + { 5, 0x04000000, 0x06000000, 1}, + { 7, 0x01000000, 0x03000000, 1}, + { 9, 0x00400000, 0x00600000, 1}, + { 11, 0x00100000, 0x00300000, 1}, + { 13, 0x00040000, 0x00060000, 1}, + { 15, 0x00010000, 0x00030000, 1}, + { 17, 0x00004000, 0x00006000, 1}, + { 19, 0x00001000, 0x00003000, 1}, + { 21, 0x00000400, 0x00000600, 1}, + { 23, 0x00000100, 0x00000300, 1}, + { 25, 0x00000040, 0x00000060, 1}, + { 27, 0x00000010, 0x00000030, 1}, + { 29, 0x00000004, 0x00000006, 1}, + { 31, 0x00000001, 0x00000003, 1} +}; #endif @@ -851,20 +947,21 @@ double CircleSegDistance( coOrd p, coOrd c, double r, double a0, double a1 ) d0 = FindDistance( p, p1 ); PointOnCircle( &p1, c, r, a0+a1 ); d1 = FindDistance( p, p1 ); - if (d0 < d1) + if (d0 < d1) { return d0; - else + } else { return d1; + } } BOOL_T HittestTurnoutRoadbed( - trkSeg_p segPtr, - int segCnt, - int segInx, - ANGLE_T side, - int fraction, - DIST_T roadbedWidth ) + trkSeg_p segPtr, + int segCnt, + int segInx, + ANGLE_T side, + int fraction, + DIST_T roadbedWidth ) { ANGLE_T a; DIST_T d; @@ -888,10 +985,11 @@ BOOL_T HittestTurnoutRoadbed( fraction = 31-fraction; } a = sp->u.c.a0 + sp->u.c.a1*(fraction*2+1)/64.0; - if (side>0) + if (side>0) { d += roadbedWidth/2.0; - else + } else { d -= roadbedWidth/2.0; + } PointOnCircle( &p0, sp->u.c.center, d, a ); } dd = DIST_INF; @@ -904,33 +1002,36 @@ BOOL_T HittestTurnoutRoadbed( d = LineSegDistance( p1, sp->u.l.pos[0], sp->u.l.pos[1] ); break; case SEG_CRVTRK: - d = CircleSegDistance( p1, sp->u.c.center, fabs(sp->u.c.radius), sp->u.c.a0, sp->u.c.a1 ); + d = CircleSegDistance( p1, sp->u.c.center, fabs(sp->u.c.radius), sp->u.c.a0, + sp->u.c.a1 ); break; default: continue; } #ifdef LATER - if (inx==segInx) + if (inx==segInx) { d *= .999; + } #endif if ( d < dd ) { dd = d; closest = inx; } } - if (closest == segInx) + if (closest == segInx) { return FALSE; - else + } else { return TRUE; + } } #ifdef LATER EXPORT long ComputeTurnoutRoadbedSide( - trkSeg_p segPtr, - int segCnt, - int segInx, - ANGLE_T side, - DIST_T roadbedWidth ) + trkSeg_p segPtr, + int segCnt, + int segInx, + ANGLE_T side, + DIST_T roadbedWidth ) { DIST_T length; int rbw; @@ -940,42 +1041,45 @@ EXPORT long ComputeTurnoutRoadbedSide( trkSeg_p sp; sp = &segPtr[segInx]; - if (sp->type == SEG_STRTRK) + if (sp->type == SEG_STRTRK) { length = FindDistance( sp->u.l.pos[0], sp->u.l.pos[1] ); - else - length = (fabs(sp->u.c.radius) + (side>0?roadbedWidth/2.0:-roadbedWidth/2.0) ) * 2 * M_PI * sp->u.c.a1 / 360.0; + } else { + length = (fabs(sp->u.c.radius) + (side>0?roadbedWidth/2.0:-roadbedWidth/2.0) ) * + 2 * M_PI * sp->u.c.a1 / 360.0; + } rbw = (int)(roadbedWidth/length*32/2); -/*printf( "L=%0.3f G=%0.3f [%0.3f %0.3f] RBW=%d\n", length, gapWidth, first, last, rbw );*/ + /*printf( "L=%0.3f G=%0.3f [%0.3f %0.3f] RBW=%d\n", length, gapWidth, first, last, rbw );*/ res = 0xFF0000FF; for ( p=searchTable; p<&searchTable[COUNT( searchTable )]; p++) { - if ( (p->width < rbw && res==0xFFFFFFFF) || res==0 ) + if ( (p->width < rbw && res==0xFFFFFFFF) || res==0 ) { break; + } res1 = (p->mask & res); where = p->start*length/32.0; if (p->width >= rbw || (res1!=p->mask && res1!=0)) { if (HittestTurnoutRoadbed(segPtr, segCnt, segInx, side, p->start)) { - res &= ~p->bits; -if (debugComputeRoadbed>=1) printf( "res=%08lx *p={%02d %08lx %08lx %02d} res1=%08lx W=%0.3f HIT\n", res, p->start, p->bits, p->mask, p->width, res1, where ); + res &= ~p->bits; + if (debugComputeRoadbed>=1) { printf( "res=%08lx *p={%02d %08lx %08lx %02d} res1=%08lx W=%0.3f HIT\n", res, p->start, p->bits, p->mask, p->width, res1, where ); } } else { - res |= p->bits; -if (debugComputeRoadbed>=1) printf( "res=%08lx *p={%02d %08lx %08lx %02d} res1=%08lx W=%0.3f MISS\n", res, p->start, p->bits, p->mask, p->width, res1, where ); + res |= p->bits; + if (debugComputeRoadbed>=1) { printf( "res=%08lx *p={%02d %08lx %08lx %02d} res1=%08lx W=%0.3f MISS\n", res, p->start, p->bits, p->mask, p->width, res1, where ); } } } else { -if (debugComputeRoadbed>=2) printf( "res=%08lx *p={%02d %08lx %08lx %02d} res1=%08lx W=%0.3f SKIP\n", res, p->start, p->bits, p->mask, p->width, res1, where ); + if (debugComputeRoadbed>=2) { printf( "res=%08lx *p={%02d %08lx %08lx %02d} res1=%08lx W=%0.3f SKIP\n", res, p->start, p->bits, p->mask, p->width, res1, where ); } } } -if (debugComputeRoadbed>=1) printf( "res=%08lx\n", res ); + if (debugComputeRoadbed>=1) { printf( "res=%08lx\n", res ); } return res; } #endif EXPORT long ComputeTurnoutRoadbedSide( - trkSeg_p segPtr, - int segCnt, - int segInx, - ANGLE_T side, - DIST_T roadbedWidth ) + trkSeg_p segPtr, + int segCnt, + int segInx, + ANGLE_T side, + DIST_T roadbedWidth ) { trkSeg_p sp; DIST_T length; @@ -985,37 +1089,43 @@ EXPORT long ComputeTurnoutRoadbedSide( int i, j, k, hitx; sp = &segPtr[segInx]; - if (sp->type == SEG_STRTRK) + if (sp->type == SEG_STRTRK) { length = FindDistance( sp->u.l.pos[0], sp->u.l.pos[1] ); - else - length = (fabs(sp->u.c.radius) + (side>0?roadbedWidth/2.0:-roadbedWidth/2.0) ) * 2 * M_PI * sp->u.c.a1 / 360.0; + } else { + length = (fabs(sp->u.c.radius) + (side>0?roadbedWidth/2.0:-roadbedWidth/2.0) ) * + 2 * M_PI * sp->u.c.a1 / 360.0; + } bitWidth = (int)floor(roadbedWidth*32/length); - if ( bitWidth > 31 ) + if ( bitWidth > 31 ) { bitWidth = 31; - else if ( bitWidth <= 0 ) + } else if ( bitWidth <= 0 ) { bitWidth = 2; + } res = 0; mask = (1<<bitWidth)-1; hit0 = HittestTurnoutRoadbed( segPtr, segCnt, segInx, side, 0, roadbedWidth ); inx0 = 0; inx1 = bitWidth; -if ( debugComputeRoadbed>=3 ) printf( "bW=%d HT[0]=%d\n", bitWidth, hit0 ); + if ( debugComputeRoadbed>=3 ) { printf( "bW=%d HT[0]=%d\n", bitWidth, hit0 ); } while ( 1 ) { - if ( inx1 > 31 ) + if ( inx1 > 31 ) { inx1 = 31; - hit1 = HittestTurnoutRoadbed( segPtr, segCnt, segInx, side, inx1, roadbedWidth ); -if ( debugComputeRoadbed>=3 ) printf( " HT[%d]=%d\n", inx1, hit1 ); + } + hit1 = HittestTurnoutRoadbed( segPtr, segCnt, segInx, side, inx1, + roadbedWidth ); + if ( debugComputeRoadbed>=3 ) { printf( " HT[%d]=%d\n", inx1, hit1 ); } if ( hit0 != hit1 ) { i=inx0; j=inx1; while ( j-i >= 2 ) { k = (i+j)/2; hitx = HittestTurnoutRoadbed( segPtr, segCnt, segInx, side, k, roadbedWidth ); -if ( debugComputeRoadbed>=3 ) printf( " .HT[%d]=%d\n", k, hitx ); - if ( hitx == hit0 ) + if ( debugComputeRoadbed>=3 ) { printf( " .HT[%d]=%d\n", k, hitx ); } + if ( hitx == hit0 ) { i = k; - else + } else { j = k; + } } if ( !hit0 ) { res |= ((1<<(i-inx0+1))-1)<<inx0; @@ -1025,10 +1135,11 @@ if ( debugComputeRoadbed>=3 ) printf( " .HT[%d]=%d\n", k, hitx ); } else if ( !hit1 ) { res |= mask; } -if ( debugComputeRoadbed>=3 ) printf( " res=%lx\n", res ); + if ( debugComputeRoadbed>=3 ) { printf( " res=%lx\n", res ); } if ( inx1 >= 31 ) { - if ( !hit1 ) + if ( !hit1 ) { res |= 0x80000000; + } break; } mask <<= bitWidth; @@ -1036,7 +1147,7 @@ if ( debugComputeRoadbed>=3 ) printf( " res=%lx\n", res ); inx1 += bitWidth; hit0 = hit1; } -if ( debugComputeRoadbed>=2 ) printf( "S%d %c res=%lx\n", segInx, side>0?'+':'-', res ); + if ( debugComputeRoadbed>=2 ) { printf( "S%d %c res=%lx\n", segInx, side>0?'+':'-', res ); } return (0xFFFFFFFF)&res; } @@ -1050,23 +1161,19 @@ static BOOL_T IsNear( coOrd p0, coOrd p1 ) static void AddRoadbedPieces( - int inx, - ANGLE_T side, - int first, - int last ) + int inx, + ANGLE_T side, + int first, + int last ) { DIST_T d0, d1; ANGLE_T a0, a1; coOrd p0, p1; trkSeg_p sp, sq; -#ifdef MKTURNOUT -#define _DPI (76.0) -#else -#define _DPI mainD.dpi -#endif - if (last<=first) + if (last<=first) { return; + } sp = &tempSegs(inx); if ( sp->type == SEG_STRTRK ) { d0 = FindDistance( sp->u.l.pos[0], sp->u.l.pos[1] ); @@ -1084,20 +1191,20 @@ static void AddRoadbedPieces( a1 = NormalizeAngle( a1-a0+0.5 ); if ( first==0 ) { if ( a1 < 1.0 && IsNear( p0, sq->u.l.pos[1] ) ) { - sq->u.l.pos[1] = p1; - return; + sq->u.l.pos[1] = p1; + return; } else if ( a1 > 180.0 && a1 < 181.0 && IsNear( p0, sq->u.l.pos[0] ) ) { - sq->u.l.pos[0] = p1; - return; + sq->u.l.pos[0] = p1; + return; } } if ( last==32 ) { if ( a1 < 1.0 && IsNear( p1, sq->u.l.pos[0] ) ) { - sq->u.l.pos[0] = p0; - return; + sq->u.l.pos[0] = p0; + return; } else if ( a1 > 180.0 && a1 < 181.0 && IsNear( p1, sq->u.l.pos[1] ) ) { - sq->u.l.pos[1] = p0; - return; + sq->u.l.pos[1] = p0; + return; } } } @@ -1107,8 +1214,8 @@ static void AddRoadbedPieces( DYNARR_APPEND( trkSeg_t, tempSegs_da, 10 ); sp = &tempSegs(inx); sq = &tempSegs(tempSegs_da.cnt-1); - sq->width = newTurnRoadbedLineWidth/(_DPI); - sq->color = roadbedColor; + sq->lineWidth = newTurnRoadbedLineWidth; + sq->color = newTurnRoadbedColor; if (sp->type == SEG_STRTRK) { sq->type = SEG_STRLIN; sq->u.l.pos[0] = p0; @@ -1122,10 +1229,11 @@ static void AddRoadbedPieces( a0 = NormalizeAngle( sp->u.c.a0 + sp->u.c.a1*(32-last)/32.0 ); } a1 = sp->u.c.a1*(last-first)/32.0; - if (side>0) + if (side>0) { d0 += newTurnRoadbedWidth/2.0; - else + } else { d0 -= newTurnRoadbedWidth/2.0; + } sq->type = SEG_CRVLIN; sq->u.c.center = sp->u.c.center; sq->u.c.radius = d0; @@ -1136,14 +1244,15 @@ static void AddRoadbedPieces( static void AddRoadbedToOneSide( - int trkCnt, - int inx, - ANGLE_T side ) + int trkCnt, + int inx, + ANGLE_T side ) { unsigned long res, res1; int b0, b1; - res = ComputeTurnoutRoadbedSide( &tempSegs(0), trkCnt, inx, side, newTurnRoadbedWidth ); + res = ComputeTurnoutRoadbedSide( &tempSegs(0), trkCnt, inx, side, + newTurnRoadbedWidth ); if ( res == 0L ) { return; } else if ( res == 0xFFFFFFFF ) { @@ -1161,13 +1270,15 @@ static void AddRoadbed( void ) { int trkCnt, inx; trkSeg_p sp; - if ( newTurnRoadbedWidth < newTurnTrackGauge ) + if ( newTurnRoadbedWidth < newTurnTrackGauge ) { return; + } trkCnt = tempSegs_da.cnt; for ( inx=0; inx<trkCnt; inx++ ) { sp = &tempSegs(inx); - if ( sp->type!=SEG_STRTRK && sp->type!=SEG_CRVTRK ) + if ( sp->type!=SEG_STRTRK && sp->type!=SEG_CRVTRK ) { continue; + } AddRoadbedToOneSide( trkCnt, inx, +90 ); AddRoadbedToOneSide( trkCnt, inx, -90 ); } @@ -1181,8 +1292,8 @@ static void AddRoadbed( void ) */ static BOOL_T ComputeCurve( - coOrd *p0, coOrd *p1, DIST_T *radius, - DIST_T len, DIST_T off, ANGLE_T angle ) + coOrd *p0, coOrd *p1, DIST_T *radius, + DIST_T len, DIST_T off, ANGLE_T angle ) { coOrd Pf; coOrd Px, Pc; @@ -1198,8 +1309,9 @@ static BOOL_T ComputeCurve( NoticeMessage( MSG_TODSGN_NO_CONVERGE, _("Ok"), NULL ); return FALSE; } - if (Px.x-newTurnTrackGauge < d) + if (Px.x-newTurnTrackGauge < d) { d = Px.x-newTurnTrackGauge; + } *radius = d * cos( D2R(angle/2.0) ) / sin( D2R(angle/2.0) ); p0->x = Px.x - *radius * sin( D2R(angle/2.0) ) / cos( D2R(angle/2.0) ); @@ -1211,54 +1323,57 @@ static BOOL_T ComputeCurve( #ifndef MKTURNOUT /* For Bezier Segs we need to duplicate the subSegs Array as well */ -void AppendSegs(dynArr_t * target, dynArr_t * source) { +void AppendSegs(dynArr_t * target, dynArr_t * source) +{ #define sourceSegs(N) DYNARR_N( trkSeg_t, *source, N ) #define targetSegs(N) DYNARR_N( trkSeg_t, *target, N ) trkSeg_p src; - for (int i=0;i<source->cnt; i++) { + for (int i=0; i<source->cnt; i++) { src = &sourceSegs(i); addSegBezier(target, src); } } /* Bezier Segs will have subSegs Array - free it before resetting the array */ -void ClearSegs(dynArr_t * target) { - for (int i=0;i<(*target).cnt;i++) { - if (targetSegs(i).type == SEG_BEZTRK) - if (targetSegs(i).bezSegs.ptr) MyFree(targetSegs(i).bezSegs.ptr); - targetSegs(i).bezSegs.ptr = NULL; - targetSegs(i).bezSegs.cnt = 0; - targetSegs(i).bezSegs.max = 0; +void ClearSegs(dynArr_t * target) +{ + for (int i=0; i<(*target).cnt; i++) { + if (targetSegs(i).type == SEG_BEZTRK) { + // Free DA if a BEZTRK + DYNARR_FREE( trkSeg_t, targetSegs(i).bezSegs ); + } else { + // Otherwise just clear it + DYNARR_INIT( trkSeg_t, targetSegs(i).bezSegs ); + } } DYNARR_RESET( trkSeg_t, *target ); } -BOOL_T CallCornuNoBez(coOrd pos[2], coOrd center[2], ANGLE_T angle[2], DIST_T radius[2], dynArr_t * array_p) { +BOOL_T CallCornuNoBez(coOrd pos[2], coOrd center[2], ANGLE_T angle[2], + DIST_T radius[2], dynArr_t * array_p) +{ dynArr_t temp_array; - DYNARR_RESET(trkSeg_t,temp_array); - temp_array.ptr=0; - temp_array.max=0; - + DYNARR_INIT(trkSeg_t,temp_array); wBool_t rc = CallCornu0(pos,center,angle,radius, &temp_array, FALSE); - if (!rc) return FALSE; + if (!rc) { return FALSE; } - for (int i=0;i<temp_array.cnt;i++) { + for (int i=0; i<temp_array.cnt; i++) { trkSeg_p from_seg = &DYNARR_N(trkSeg_t,temp_array,i); if ((from_seg->type == SEG_BEZTRK) || (from_seg->type == SEG_BEZLIN)) { - for (int j=0;j<from_seg->bezSegs.cnt;j++) { + for (int j=0; j<from_seg->bezSegs.cnt; j++) { trkSeg_p sub_seg = &DYNARR_N(trkSeg_t,from_seg->bezSegs,j); DYNARR_APPEND(trkSeg_t,*array_p,5); trkSeg_p to_seg = &DYNARR_N(trkSeg_t,*array_p,(*array_p).cnt-1); to_seg->u = sub_seg->u; to_seg->type = sub_seg->type; to_seg->color = wDrawColorBlack; - to_seg->width = sub_seg->width; + to_seg->lineWidth = sub_seg->lineWidth; } } else { DYNARR_APPEND(trkSeg_t,*array_p,5); @@ -1266,7 +1381,7 @@ BOOL_T CallCornuNoBez(coOrd pos[2], coOrd center[2], ANGLE_T angle[2], DIST_T ra to_seg->u = from_seg->u; to_seg->type = from_seg->type; to_seg->color = wDrawColorBlack; - to_seg->width = from_seg->width; + to_seg->lineWidth = from_seg->lineWidth; } } @@ -1279,22 +1394,20 @@ BOOL_T CallCornuNoBez(coOrd pos[2], coOrd center[2], ANGLE_T angle[2], DIST_T ra static toDesignSchema_t * LoadSegs( - toDesignDesc_t * dp, - wBool_t loadPoints ) + toDesignDesc_t * dp, + wBool_t loadPoints ) { wIndex_t s; int p, p0, p1; DIST_T d; -#ifndef MKTURNOUT - wIndex_t pathLen; -#endif toDesignSchema_t * pp; char *segOrder; coOrd pos; - wIndex_t segCnt; + wIndex_t segCnt = 0; ANGLE_T angle0, angle1, angle2, angle3; trkSeg_p segPtr; #ifndef MKTURNOUT + wIndex_t pathLen; struct { coOrd pos[10]; coOrd center[10]; @@ -1312,19 +1425,23 @@ static toDesignSchema_t * LoadSegs( if ( newTurnAngleMode == 0 && dp->type != NTO_CRV_SECTION ) { /* convert from Frog Num to degrees */ - if ( angle0 > 0 ) + if ( angle0 > 0 ) { angle0 = R2D(asin(1.0 / angle0)); - if ( angle1 > 0 ) + } + if ( angle1 > 0 ) { angle1 = R2D(asin(1.0 / angle1)); - if ( angle2 > 0 ) + } + if ( angle2 > 0 ) { angle2 = R2D(asin(1.0 / angle2)); - if ( angle3 > 0 ) + } + if ( angle3 > 0 ) { angle3 = R2D(asin(1.0 / angle3)); + } } pp = dp->paths; if (loadPoints) { - DYNARR_RESET( trkEndPt_t, tempEndPts_da ); + TempEndPtsReset(); // for ( i=0; i<dp->floatCnt; i++ ) // if ( *(FLOAT_T*)(turnDesignPLs[dp->floats[i].index].valueP) == 0.0 ) // if (dp->type != NTO_CORNU && @@ -1337,73 +1454,78 @@ static toDesignSchema_t * LoadSegs( switch (dp->type) { case NTO_REGULAR: - DYNARR_SET( trkEndPt_t, tempEndPts_da, 3 ); + TempEndPtsSet( 3 ); if ( !ComputeCurve( &points[3], &points[4], &radii[0], - (newTurnLen0), fabs(newTurnOff0), angle0 ) ) + (newTurnLen0), fabs(newTurnOff0), angle0 ) ) { return NULL; + } radii[0] = - radii[0]; points[0].x = points[0].y = points[1].y = 0.0; points[1].x = (newTurnLen1); points[2].y = fabs(newTurnOff0); points[2].x = (newTurnLen0); - tempEndPts(0).pos = points[0]; tempEndPts(0).angle = 270.0; - tempEndPts(1).pos = points[1]; tempEndPts(1).angle = 90.0; - tempEndPts(2).pos = points[2]; tempEndPts(2).angle = 90.0-angle0; + SetEndPt( TempEndPt(0), points[0], 270.0 ); + SetEndPt( TempEndPt(1), points[1], 90.0 ); + SetEndPt( TempEndPt(2), points[2], 90.0-angle0 ); break; case NTO_CURVED: - DYNARR_SET( trkEndPt_t, tempEndPts_da, 3 ); + TempEndPtsSet( 3 ); if ( !ComputeCurve( &points[3], &points[4], &radii[0], - (newTurnLen0), fabs(newTurnOff0), angle0 ) ) + (newTurnLen0), fabs(newTurnOff0), angle0 ) ) { return NULL; + } if ( !ComputeCurve( &points[5], &points[6], &radii[1], - (newTurnLen1), fabs(newTurnOff1), angle1 ) ) + (newTurnLen1), fabs(newTurnOff1), angle1 ) ) { return NULL; + } d = points[3].x - points[5].x; - if ( d < -MIN_TRACK_LENGTH ) + if ( d < -MIN_TRACK_LENGTH ) { pp = &Crv3Schema; - else if ( d > MIN_TRACK_LENGTH ) + } else if ( d > MIN_TRACK_LENGTH ) { pp = &Crv2Schema; - else + } else { pp = &Crv1Schema; + } radii[0] = - radii[0]; radii[1] = - radii[1]; points[0].x = points[0].y = 0.0; points[1].y = fabs(newTurnOff0); points[1].x = (newTurnLen0); points[2].y = fabs(newTurnOff1); points[2].x = (newTurnLen1); - tempEndPts(0).pos = points[0]; tempEndPts(0).angle = 270.0; - tempEndPts(2).pos = points[1]; tempEndPts(2).angle = 90.0-angle0; - tempEndPts(1).pos = points[2]; tempEndPts(1).angle = 90.0-angle1; + SetEndPt( TempEndPt(0), points[0], 270.0 ); + SetEndPt( TempEndPt(2), points[1], 90.0-angle0 ); + SetEndPt( TempEndPt(1), points[2], 90.0-angle1 ); break; #ifndef MKTURNOUT case NTO_CORNU: - + TempEndPtsSet( 3 ); radii[0] = fabs(newTurnRad2); /*Toe*/ radii[1] = fabs(newTurnRad0); /*Inner*/ radii[2] = fabs(newTurnRad1); /*Outer*/ angles[0] = 0.0; /*Base*/ - angles[1] = newTurnAngle0; /*Inner*/ - angles[2] = newTurnAngle1; /*Outer*/ + angles[1] = angle0; /*Inner*/ + angles[2] = angle1; /*Outer*/ pp = &CornuSchema; points[0].x = points[0].y = 0.0; points[1].y = (newTurnOff0); points[1].x = (newTurnLen0); /*Inner*/ points[2].y = (newTurnOff1); points[2].x = (newTurnLen1); /*Outer*/ - tempEndPts(0).pos = points[0]; tempEndPts(0).angle = 270.0; - tempEndPts(2).pos = points[1]; tempEndPts(2).angle = 90.0-angles[1]; - tempEndPts(1).pos = points[2]; tempEndPts(1).angle = 90.0-angles[2]; - + SetEndPt( TempEndPt(0), points[0], 270.0 ); + SetEndPt( TempEndPt(2), points[1], 90.0-angles[1] ); + SetEndPt( TempEndPt(1), points[2], 90.0-angles[2] ); break; #endif case NTO_WYE: case NTO_3WAY: - DYNARR_SET( trkEndPt_t, tempEndPts_da, (dp->type==NTO_3WAY)?4:3 ); + TempEndPtsSet( (dp->type==NTO_3WAY)?4:3 ); if ( !ComputeCurve( &points[3], &points[4], &radii[0], - (newTurnLen0), fabs(newTurnOff0), angle0 ) ) + (newTurnLen0), fabs(newTurnOff0), angle0 ) ) { return NULL; + } if ( !ComputeCurve( &points[5], &points[6], &radii[1], - (newTurnLen1), fabs(newTurnOff1), angle1 ) ) + (newTurnLen1), fabs(newTurnOff1), angle1 ) ) { return NULL; + } points[5].y = - points[5].y; points[6].y = - points[6].y; radii[0] = - radii[0]; @@ -1422,17 +1544,17 @@ static toDesignSchema_t * LoadSegs( } else { pp = (dp->type==NTO_3WAY ? &Tri1Schema : &Wye1Schema ); } - tempEndPts(0).pos = points[0]; tempEndPts(0).angle = 270.0; - tempEndPts(1).pos = points[1]; tempEndPts(1).angle = 90.0-angle0; - tempEndPts(2).pos = points[2]; tempEndPts(2).angle = 90.0+angle1; + SetEndPt( TempEndPt(0), points[0], 270.0 ); + SetEndPt( TempEndPt(1), points[1], 90.0-angle0 ); + SetEndPt( TempEndPt(2), points[2], 90.0+angle1 ); if (dp->type == NTO_3WAY) { - tempEndPts(3).pos = points[7]; tempEndPts(3).angle = 90.0; + SetEndPt( TempEndPt(3), points[7], 90.0 ); } break; #ifndef MKTURNOUT case NTO_CORNUWYE: case NTO_CORNU3WAY: - DYNARR_SET( trkEndPt_t, tempEndPts_da, (dp->type==NTO_CORNU3WAY)?4:3 ); + TempEndPtsSet( (dp->type==NTO_CORNU3WAY)?4:3 ); /* * Construct Wye and 3 Way Turnouts with Cornu curves @@ -1457,9 +1579,9 @@ static toDesignSchema_t * LoadSegs( radii[2] = (newTurnRad1); /*Right*/ radii[3] = (newTurnRad3); /*Center*/ angles[0] = 0.0; /*Base*/ - angles[1] = newTurnAngle0; /*Left*/ - angles[2] = newTurnAngle1; /*Right*/ - angles[3] = newTurnAngle3; /*Center*/ + angles[1] = angle0; /*Left*/ + angles[2] = angle1; /*Right*/ + angles[3] = angle3; /*Center*/ points[0].x = points[0].y = 0.0; /*Base*/ points[1].y = (newTurnOff0); /* Left */ points[1].x = (newTurnLen0); @@ -1472,63 +1594,71 @@ static toDesignSchema_t * LoadSegs( pp = (dp->type==NTO_CORNU3WAY ? &CornuTriSchema : &CornuWyeSchema ); - tempEndPts(0).pos = points[0]; tempEndPts(0).angle = 270.0; + SetEndPt( TempEndPt(0), points[0], 270.0 ); if (newTurnRad0<0.0) { - tempEndPts(1).pos = points[1]; tempEndPts(1).angle = 90.0+angles[1]; + SetEndPt( TempEndPt(1), points[1], 90.0+angles[1] ); } else { - tempEndPts(1).pos = points[1]; tempEndPts(1).angle = 90.0-angles[1]; + SetEndPt( TempEndPt(1), points[1], 90.0-angles[1] ); } if (newTurnRad1<0.0) { - tempEndPts(2).pos = points[2]; tempEndPts(2).angle = 90.0-angles[2]; + SetEndPt( TempEndPt(2), points[2], 90.0-angles[2] ); } else { - tempEndPts(2).pos = points[2]; tempEndPts(2).angle = 90.0+angles[2]; + SetEndPt( TempEndPt(2), points[2], 90.0+angles[2] ); } if (dp->type == NTO_CORNU3WAY) { if (newTurnRad3<0.0) { - tempEndPts(3).pos = points[3]; tempEndPts(3).angle = 90.0+angles[3]; + SetEndPt( TempEndPt(3), points[3], 90.0+angles[3] ); } else { - tempEndPts(3).pos = points[3]; tempEndPts(3).angle = 90.0-angles[3]; + SetEndPt( TempEndPt(3), points[3], 90.0-angles[3] ); } } DIST_T end_length = MIN_TRACK_LENGTH; - for (int i=0;i<((dp->type==NTO_CORNU3WAY)?4:3);i++) { + for (int i=0; i<((dp->type==NTO_CORNU3WAY)?4:3); i++) { if (radii[i] == 0.0) { - if (i==2) - Translate(&end_points[i], points[i], NormalizeAngle(90.0+angles[i]+180), end_length); - else - Translate(&end_points[i], points[i], NormalizeAngle(90.0-angles[i]+(i==0?0.0:180.0)), end_length); + if (i==2) { + Translate(&end_points[i], points[i], NormalizeAngle(90.0+angles[i]+180), + end_length); + } else { + Translate(&end_points[i], points[i], + NormalizeAngle(90.0-angles[i]+(i==0?0.0:180.0)), end_length); + } end_angles[i] = angles[i]; } else { if (i!=2) { - if (((i==0) && radii[0]>0.0) || ((i==1 || i==3) && radii[i]>0.0)) + if (((i==0) && radii[0]>0.0) || ((i==1 || i==3) && radii[i]>0.0)) { Translate(&end_centers[i], points[i], -angles[i], fabs(radii[i])); - else + } else { Translate(&end_centers[i], points[i], angles[i]+180, fabs(radii[i])); + } end_arcs[i] = (radii[i]>=0?1:-1)*R2D(end_length/fabs(radii[i])); } else { - if (radii[2]>0.0) + if (radii[2]>0.0) { Translate(&end_centers[i], points[i], angles[i]+180, fabs(radii[i])); - else + } else { Translate(&end_centers[i], points[i], -angles[i], fabs(radii[i])); + } end_arcs[i] = (radii[i]>=0?-1:1)*R2D(end_length/fabs(radii[i])); } end_points[i] = points[i]; Rotate(&end_points[i],end_centers[i],end_arcs[i]); end_angles[i] = angles[i]+end_arcs[i]; } -LogPrintf( "ctoDes0-%d: EP(%f,%f) NEP(%f,%f) EA(%f) NEA(%f) R(%f) ARC(%f) EC(%f,%f) \n", - i+1,points[i].x,points[i].y,end_points[i].x,end_points[i].y,angles[i],end_angles[i],radii[i],end_arcs[i], - end_centers[i].x,end_centers[i].y); + LOG( log_cornuturnoutdesigner, 1, + ( "ctoDes0-%d: EP(%f,%f) NEP(%f,%f) EA(%f) NEA(%f) R(%f) ARC(%f) EC(%f,%f) \n", + \ + i+1,points[i].x,points[i].y,end_points[i].x,end_points[i].y,angles[i], + end_angles[i],radii[i],end_arcs[i], \ + end_centers[i].x,end_centers[i].y) ); } wBool_t LH_main = TRUE, LH_first = TRUE; cornuData.pos[0] = end_points[0]; /*Start*/ if (dp->type == NTO_CORNU3WAY) { - if (newTurnToeR < newTurnToeL) LH_first = FALSE; + if (newTurnToeR < newTurnToeL) { LH_first = FALSE; } cornuData.pos[1] = end_points[3]; /*Center for First Time */ cornuData.pos[5] = end_points[3]; /*Center for last time*/ } else if (newTurnRad1>=0.0) { @@ -1546,44 +1676,53 @@ LogPrintf( "ctoDes0-%d: EP(%f,%f) NEP(%f,%f) EA(%f) NEA(%f) R(%f) ARC(%f) EC(%f, cornuData.pos[5] = end_points[3]; /*Center */ } - if (radii[0] == 0.0) /* Base */ + if (radii[0] == 0.0) { /* Base */ cornuData.center[0] = zero; - else { + } else { cornuData.center[0].x = end_points[0].x; cornuData.center[0].y = end_points[0].y + radii[0]; } - if (radii[1] == 0.0) /* Left */ + if (radii[1] == 0.0) { /* Left */ cornuData.center[7] = zero; - else if (radii[1] >0.0) + } else if (radii[1] >0.0) { Translate(&cornuData.center[7], cornuData.pos[7], -end_angles[1], radii[1]); - else - Translate(&cornuData.center[7], cornuData.pos[7], 180.0+end_angles[1], radii[1]); + } else { + Translate(&cornuData.center[7], cornuData.pos[7], 180.0+end_angles[1], + radii[1]); + } - if (radii[2] == 0.0) /* Right */ + if (radii[2] == 0.0) { /* Right */ cornuData.center[9] = zero; - else if (radii[2] >0.0) - Translate(&cornuData.center[9], cornuData.pos[9], 180.0+end_angles[2], radii[2]); - else + } else if (radii[2] >0.0) { + Translate(&cornuData.center[9], cornuData.pos[9], 180.0+end_angles[2], + radii[2]); + } else { Translate(&cornuData.center[9], cornuData.pos[9], -end_angles[2], radii[2]); + } if (dp->type == NTO_CORNU3WAY) { - if (radii[3] == 0.0) /* Center */ + if (radii[3] == 0.0) { /* Center */ cornuData.center[5] = zero; - else if (radii[3] >0.0) + } else if (radii[3] >0.0) { Translate(&cornuData.center[5], cornuData.pos[5], -end_angles[3], radii[3]); - else - Translate(&cornuData.center[5], cornuData.pos[5], 180.0+end_angles[3], radii[3]); + } else { + Translate(&cornuData.center[5], cornuData.pos[5], 180.0+end_angles[3], + radii[3]); + } } /* Set up for calculation of Toe(s) */ if (dp->type == NTO_CORNU3WAY) { - cornuData.center[1] = cornuData.center[5]; /*For Toe1 calc always use center */ - cornuData.center[3] = cornuData.center[5]; /*For Toe2 calc always use center*/ + cornuData.center[1] = + cornuData.center[5]; /*For Toe1 calc always use center */ + cornuData.center[3] = + cornuData.center[5]; /*For Toe2 calc always use center*/ } else if (LH_main) { cornuData.center[1] = cornuData.center[7]; /* Dominant Curve Left */ - } else - cornuData.center[1] = cornuData.center[9]; /* Right */ + } else { + cornuData.center[1] = cornuData.center[9]; /* Right */ + } cornuData.angle[0] = 270.0; /*Always*/ if (dp->type == NTO_CORNU3WAY) { @@ -1614,11 +1753,7 @@ LogPrintf( "ctoDes0-%d: EP(%f,%f) NEP(%f,%f) EA(%f) NEA(%f) R(%f) ARC(%f) EC(%f, /* Ready to find Toe points */ DYNARR_RESET( trkSeg_t, tempSegs_da ); - trkSeg_t * temp_p; - temp_p = &tempSegs(0); - - - DIST_T radius; + DIST_T radius = 0.0; coOrd center; ANGLE_T angle; int inx,subSeg; @@ -1635,12 +1770,14 @@ LogPrintf( "ctoDes0-%d: EP(%f,%f) NEP(%f,%f) EA(%f) NEA(%f) R(%f) ARC(%f) EC(%f, } else { /*Find Toe 1 from curve */ - CallCornu0(&cornuData.pos[0],&cornuData.center[0],&cornuData.angle[0],&cornuData.radius[0],&tempSegs_da, FALSE); + CallCornu0(&cornuData.pos[0],&cornuData.center[0],&cornuData.angle[0], + &cornuData.radius[0],&tempSegs_da, FALSE); /*Get ToeAngle/Radius/Center for first toe */ pos.x = end_points[0].x+(LH_first?newTurnToeL:newTurnToeR); pos.y = end_points[0].y; /* This will be close to but not on the curve */ - angle = GetAngleSegs(tempSegs_da.cnt,(trkSeg_t *)(tempSegs_da.ptr),&pos,&inx,NULL,&back,&subSeg,&neg); + angle = GetAngleSegs(tempSegs_da.cnt,&tempSegs(0),&pos,&inx, + NULL,&back,&subSeg,&neg); segPtr = &DYNARR_N(trkSeg_t, tempSegs_da, inx); if (segPtr->type == SEG_BEZTRK) { @@ -1692,18 +1829,19 @@ LogPrintf( "ctoDes0-%d: EP(%f,%f) NEP(%f,%f) EA(%f) NEA(%f) R(%f) ARC(%f) EC(%f, } if (dp->type == NTO_CORNU3WAY) { - if (newTurnToeR!=newTurnToeL) { + if (newTurnToeR!=newTurnToeL) { /* Second Toe */ - if (cornuData.radius[0] == 0.0) { + if (cornuData.radius[0] == 0.0) { pos.x = end_points[0].x+(LH_first?newTurnToeR:newTurnToeL)-MIN_TRACK_LENGTH; pos.y = 0.0; angle = 90.0; radius = 0.0; center = zero; - } else { + } else { pos.x = end_points[0].x+(LH_first?newTurnToeR:newTurnToeL); pos.y = end_points[0].y; /* This will be close to but not on the curve */ - angle = GetAngleSegs(tempSegs_da.cnt,(trkSeg_t *)(tempSegs_da.ptr),&pos,&inx,NULL,&back,&subSeg,&neg); + angle = GetAngleSegs(tempSegs_da.cnt,&tempSegs(0),&pos,&inx, + NULL,&back,&subSeg,&neg); segPtr = &DYNARR_N(trkSeg_t, tempSegs_da, inx); if (segPtr->type == SEG_BEZTRK) { @@ -1717,7 +1855,7 @@ LogPrintf( "ctoDes0-%d: EP(%f,%f) NEP(%f,%f) EA(%f) NEA(%f) R(%f) ARC(%f) EC(%f, center = segPtr->u.c.center; radius = fabs(segPtr->u.c.radius); } - } + } cornuData.pos[3] = pos; cornuData.center[3] = center; cornuData.angle[3] = angle; @@ -1762,55 +1900,63 @@ LogPrintf( "ctoDes0-%d: EP(%f,%f) NEP(%f,%f) EA(%f) NEA(%f) R(%f) ARC(%f) EC(%f, ClearSegs(&tempSegs_da); ClearSegs(&cornuSegs_da); - int Toe1Seg = 0 , Toe2Seg = 0, CenterEndSeg = 0, LeftEndSeg = 0, RightEndSeg = 0; + int Toe1Seg = 0, Toe2Seg = 0, CenterEndSeg = 0, LeftEndSeg = 0, RightEndSeg = 0; /* Override if at zero radius at base don't compute end */ if (cornuData.radius[0] == 0.0) { DYNARR_APPEND(trkSeg_t,tempSegs_da,1); - temp_p = &DYNARR_LAST(trkSeg_t,tempSegs_da); + trkSeg_p temp_p = &DYNARR_LAST(trkSeg_t,tempSegs_da); temp_p->type = SEG_STRTRK; temp_p->color = wDrawColorBlack; - temp_p->width = 0.0; + temp_p->lineWidth = 0.0; temp_p->u.l.pos[0] = zero; temp_p->u.l.pos[1] = cornuData.pos[0]; -LogPrintf( "ctoDes1: P0(%f,%f) P1(%f,%f) \n", - temp_p->u.l.pos[0].x,temp_p->u.l.pos[0].y,temp_p->u.l.pos[1].x,temp_p->u.l.pos[1].y ); + LOG( log_cornuturnoutdesigner, 1, ( "ctoDes1: P0(%f,%f) P1(%f,%f) \n", \ + temp_p->u.l.pos[0].x,temp_p->u.l.pos[0].y,temp_p->u.l.pos[1].x, + temp_p->u.l.pos[1].y ) ); } else { DYNARR_APPEND(trkSeg_t,tempSegs_da,1); - temp_p = &DYNARR_LAST(trkSeg_t,tempSegs_da); + trkSeg_p temp_p = &DYNARR_LAST(trkSeg_t,tempSegs_da); temp_p->type = SEG_CRVTRK; temp_p->color = wDrawColorBlack; - temp_p->width = 0.0; + temp_p->lineWidth = 0.0; temp_p->u.c.radius = fabs(radii[0]);; - if (radii[0]>0.0) + if (radii[0]>0.0) { temp_p->u.c.a0 = FindAngle(end_centers[0],end_points[0]); - else + } else { temp_p->u.c.a0 = FindAngle(end_centers[0],points[0]); + } temp_p->u.c.a1 = fabs(end_arcs[0]); temp_p->u.c.center = end_centers[0]; coOrd rp0,rp1; Translate(&rp0,temp_p->u.c.center,temp_p->u.c.a0,temp_p->u.c.radius); - Translate(&rp1,temp_p->u.c.center,temp_p->u.c.a0+temp_p->u.c.a1,temp_p->u.c.radius); -LogPrintf( "ctoDes1: R(%f) A0(%f) A1(%f) C(%f,%f) P(%f,%f), EP(%f,%f) RP0(%f,%f) RP1(%f,%f)\n", - temp_p->u.c.radius,temp_p->u.c.a0,temp_p->u.c.a1,temp_p->u.c.center.x,temp_p->u.c.center.y, - points[0].x,points[0].y,end_points[0].x,end_points[0].y, - rp0.x,rp0.y,rp1.x,rp1.y); + Translate(&rp1,temp_p->u.c.center,temp_p->u.c.a0+temp_p->u.c.a1, + temp_p->u.c.radius); + LOG( log_cornuturnoutdesigner, 1, + ( "ctoDes1: R(%f) A0(%f) A1(%f) C(%f,%f) P(%f,%f), EP(%f,%f) RP0(%f,%f) RP1(%f,%f)\n", + \ + temp_p->u.c.radius,temp_p->u.c.a0,temp_p->u.c.a1,temp_p->u.c.center.x, + temp_p->u.c.center.y, \ + points[0].x,points[0].y,end_points[0].x,end_points[0].y, \ + rp0.x,rp0.y,rp1.x,rp1.y) ) ; } //If Radius zero, just a straight to the First Toe if offset if (cornuData.radius[0] == 0.0) { if ((cornuData.pos[0].x != cornuData.pos[1].x) || (cornuData.pos[0].y != cornuData.pos[1].y)) { DYNARR_APPEND(trkSeg_t,tempSegs_da,1); - temp_p = &DYNARR_LAST(trkSeg_t,tempSegs_da); + trkSeg_p temp_p = &DYNARR_LAST(trkSeg_t,tempSegs_da); temp_p->type = SEG_STRTRK; temp_p->color = wDrawColorBlack; - temp_p->width = 0.0; + temp_p->lineWidth = 0.0; temp_p->u.l.pos[0] = cornuData.pos[0]; temp_p->u.l.pos[1] = cornuData.pos[1]; } } else if ((cornuData.pos[0].x != cornuData.pos[1].x) || - (cornuData.pos[0].y != cornuData.pos[1].y) ) - CallCornuNoBez(&cornuData.pos[0],&cornuData.center[0],&cornuData.angle[0],&cornuData.radius[0],&tempSegs_da); + (cornuData.pos[0].y != cornuData.pos[1].y) ) { + CallCornuNoBez(&cornuData.pos[0],&cornuData.center[0],&cornuData.angle[0], + &cornuData.radius[0],&tempSegs_da); + } Toe1Seg = tempSegs_da.cnt; @@ -1819,15 +1965,17 @@ LogPrintf( "ctoDes1: R(%f) A0(%f) A1(%f) C(%f,%f) P(%f,%f), EP(%f,%f) RP0(%f,%f) /* Toe1 to Toe2 in tempSegs array */ if (cornuData.radius[0] == 0.0) { DYNARR_APPEND(trkSeg_t,cornuSegs_da,1); - temp_p = &DYNARR_LAST(trkSeg_t,cornuSegs_da); + trkSeg_p temp_p = &DYNARR_LAST(trkSeg_t,cornuSegs_da); temp_p->type = SEG_STRTRK; temp_p->color = wDrawColorBlack; - temp_p->width = 0.0; + temp_p->lineWidth = 0.0; temp_p->u.l.pos[0] = cornuData.pos[2]; temp_p->u.l.pos[1] = cornuData.pos[3]; } else if ((cornuData.pos[2].x != cornuData.pos[3].x) || - (cornuData.pos[2].y != cornuData.pos[3].y) ) - CallCornuNoBez(&cornuData.pos[2],&cornuData.center[2],&cornuData.angle[2],&cornuData.radius[2],&cornuSegs_da); + (cornuData.pos[2].y != cornuData.pos[3].y) ) { + CallCornuNoBez(&cornuData.pos[2],&cornuData.center[2],&cornuData.angle[2], + &cornuData.radius[2],&cornuSegs_da); + } Toe2Seg = cornuSegs_da.cnt+Toe1Seg; /* Add to second cornu to tempSegs array */ @@ -1838,38 +1986,45 @@ LogPrintf( "ctoDes1: R(%f) A0(%f) A1(%f) C(%f,%f) P(%f,%f), EP(%f,%f) RP0(%f,%f) Toe2Seg = Toe1Seg; //No Toe2 } /* Toe2 to Center in cornuSegs array */ - CallCornuNoBez(&cornuData.pos[4],&cornuData.center[4],&cornuData.angle[4],&cornuData.radius[4],&cornuSegs_da); + CallCornuNoBez(&cornuData.pos[4],&cornuData.center[4],&cornuData.angle[4], + &cornuData.radius[4],&cornuSegs_da); if (cornuData.radius[5] == 0.0) { DYNARR_APPEND(trkSeg_t,cornuSegs_da,1); - temp_p = &DYNARR_LAST(trkSeg_t,cornuSegs_da); + trkSeg_p temp_p = &DYNARR_LAST(trkSeg_t,cornuSegs_da); temp_p->type = SEG_STRTRK; temp_p->color = wDrawColorBlack; - temp_p->width = 0.0; + temp_p->lineWidth = 0.0; temp_p->u.l.pos[0] = cornuData.pos[5]; temp_p->u.l.pos[1] = points[3]; - LogPrintf( "ctoDes2: P0(%f,%f) P1(%f,%f) \n", - temp_p->u.l.pos[0].x,temp_p->u.l.pos[0].y,temp_p->u.l.pos[1].x,temp_p->u.l.pos[1].y ); + LOG( log_cornuturnoutdesigner, 1, ( "ctoDes2: P0(%f,%f) P1(%f,%f) \n", \ + temp_p->u.l.pos[0].x,temp_p->u.l.pos[0].y,temp_p->u.l.pos[1].x, + temp_p->u.l.pos[1].y )) ; } else { DYNARR_APPEND(trkSeg_t,cornuSegs_da,1); - temp_p = &DYNARR_LAST(trkSeg_t,cornuSegs_da); + trkSeg_p temp_p = &DYNARR_LAST(trkSeg_t,cornuSegs_da); temp_p->type = SEG_CRVTRK; temp_p->color = wDrawColorBlack; - temp_p->width = 0.0; + temp_p->lineWidth = 0.0; temp_p->u.c.radius = -radii[3]; //Assumed Left - if (radii[3]>0) + if (radii[3]>0) { temp_p->u.c.a0 = FindAngle(end_centers[3],points[3]); - else + } else { temp_p->u.c.a0 = FindAngle(end_centers[3],end_points[3]); + } temp_p->u.c.a1 = fabs(end_arcs[3]); temp_p->u.c.center = end_centers[3]; coOrd rp0,rp1; Translate(&rp0,temp_p->u.c.center,temp_p->u.c.a0,temp_p->u.c.radius); - Translate(&rp1,temp_p->u.c.center,temp_p->u.c.a0+temp_p->u.c.a1,temp_p->u.c.radius); - LogPrintf( "ctoDes2: R(%f) A0(%f) A1(%f) C(%f,%f) P(%f,%f) EP(%f,%f) RP0(%f,%f) RP1(%f,%f)\n", - temp_p->u.c.radius,temp_p->u.c.a0,temp_p->u.c.a1,temp_p->u.c.center.x,temp_p->u.c.center.y, - points[3].x,points[3].y,end_points[3].x,end_points[3].y, - rp0.x,rp0.y,rp1.x,rp1.y); + Translate(&rp1,temp_p->u.c.center,temp_p->u.c.a0+temp_p->u.c.a1, + temp_p->u.c.radius); + LOG( log_cornuturnoutdesigner, 1, + ( "ctoDes2: R(%f) A0(%f) A1(%f) C(%f,%f) P(%f,%f) EP(%f,%f) RP0(%f,%f) RP1(%f,%f)\n", + \ + temp_p->u.c.radius,temp_p->u.c.a0,temp_p->u.c.a1,temp_p->u.c.center.x, + temp_p->u.c.center.y, \ + points[3].x,points[3].y,end_points[3].x,end_points[3].y, \ + rp0.x,rp0.y,rp1.x,rp1.y) ); } CenterEndSeg = cornuSegs_da.cnt+Toe2Seg; @@ -1882,38 +2037,45 @@ LogPrintf( "ctoDes1: R(%f) A0(%f) A1(%f) C(%f,%f) P(%f,%f), EP(%f,%f) RP0(%f,%f) } /* Left in cornuSegs array*/ - CallCornuNoBez(&cornuData.pos[6],&cornuData.center[6],&cornuData.angle[6],&cornuData.radius[6],&cornuSegs_da); + CallCornuNoBez(&cornuData.pos[6],&cornuData.center[6],&cornuData.angle[6], + &cornuData.radius[6],&cornuSegs_da); if (cornuData.radius[7] == 0.0) { DYNARR_APPEND(trkSeg_t,cornuSegs_da,1); - temp_p = &DYNARR_LAST(trkSeg_t,cornuSegs_da); + trkSeg_p temp_p = &DYNARR_LAST(trkSeg_t,cornuSegs_da); temp_p->type = SEG_STRTRK; temp_p->color = wDrawColorBlack; - temp_p->width = 0.0; + temp_p->lineWidth = 0.0; temp_p->u.l.pos[0] = cornuData.pos[7]; temp_p->u.l.pos[1] = points[1]; -LogPrintf( "ctoDes2: P0(%f,%f) P1(%f,%f) \n", - temp_p->u.l.pos[0].x,temp_p->u.l.pos[0].y,temp_p->u.l.pos[1].x,temp_p->u.l.pos[1].y ); + LOG( log_cornuturnoutdesigner, 1, ( "ctoDes2: P0(%f,%f) P1(%f,%f) \n", \ + temp_p->u.l.pos[0].x,temp_p->u.l.pos[0].y,temp_p->u.l.pos[1].x, + temp_p->u.l.pos[1].y ) ); } else { DYNARR_APPEND(trkSeg_t,cornuSegs_da,1); - temp_p = &DYNARR_LAST(trkSeg_t,cornuSegs_da); + trkSeg_p temp_p = &DYNARR_LAST(trkSeg_t,cornuSegs_da); temp_p->type = SEG_CRVTRK; temp_p->color = wDrawColorBlack; - temp_p->width = 0.0; + temp_p->lineWidth = 0.0; temp_p->u.c.radius = -radii[1]; //Negative relative to left - if (radii[1]>0) + if (radii[1]>0) { temp_p->u.c.a0 = FindAngle(end_centers[1],points[1]); - else + } else { temp_p->u.c.a0 = FindAngle(end_centers[1],end_points[1]); + } temp_p->u.c.a1 = fabs(end_arcs[1]); temp_p->u.c.center = end_centers[1]; coOrd rp0,rp1; Translate(&rp0,temp_p->u.c.center,temp_p->u.c.a0,temp_p->u.c.radius); - Translate(&rp1,temp_p->u.c.center,temp_p->u.c.a0+temp_p->u.c.a1,temp_p->u.c.radius); -LogPrintf( "ctoDes2: R(%f) A0(%f) A1(%f) C(%f,%f) P(%f,%f) EP(%f,%f) RP0(%f,%f) RP1(%f,%f)\n", - temp_p->u.c.radius,temp_p->u.c.a0,temp_p->u.c.a1,temp_p->u.c.center.x,temp_p->u.c.center.y, - points[1].x,points[1].y,end_points[1].x,end_points[1].y, - rp0.x,rp0.y,rp1.x,rp1.y); + Translate(&rp1,temp_p->u.c.center,temp_p->u.c.a0+temp_p->u.c.a1, + temp_p->u.c.radius); + LOG( log_cornuturnoutdesigner, 1, + ( "ctoDes2: R(%f) A0(%f) A1(%f) C(%f,%f) P(%f,%f) EP(%f,%f) RP0(%f,%f) RP1(%f,%f)\n", + \ + temp_p->u.c.radius,temp_p->u.c.a0,temp_p->u.c.a1,temp_p->u.c.center.x, + temp_p->u.c.center.y, \ + points[1].x,points[1].y,end_points[1].x,end_points[1].y, \ + rp0.x,rp0.y,rp1.x,rp1.y) ); } LeftEndSeg = cornuSegs_da.cnt+CenterEndSeg; @@ -1924,38 +2086,45 @@ LogPrintf( "ctoDes2: R(%f) A0(%f) A1(%f) C(%f,%f) P(%f,%f) EP(%f,%f) RP0(%f,%f) ClearSegs(&cornuSegs_da); /* Right in cornuSegs array*/ - CallCornuNoBez(&cornuData.pos[8],&cornuData.center[8],&cornuData.angle[8],&cornuData.radius[8],&cornuSegs_da); + CallCornuNoBez(&cornuData.pos[8],&cornuData.center[8],&cornuData.angle[8], + &cornuData.radius[8],&cornuSegs_da); if (cornuData.radius[9] == 0.0) { DYNARR_APPEND(trkSeg_t,cornuSegs_da,1); - temp_p = &DYNARR_LAST(trkSeg_t,cornuSegs_da); + trkSeg_p temp_p = &DYNARR_LAST(trkSeg_t,cornuSegs_da); temp_p->type = SEG_STRTRK; temp_p->color = wDrawColorBlack; - temp_p->width = 0.0; + temp_p->lineWidth = 0.0; temp_p->u.l.pos[0] = cornuData.pos[9]; temp_p->u.l.pos[1] = points[2]; -LogPrintf( "ctoDes2: P0(%f,%f) P1(%f,%f) \n", - temp_p->u.l.pos[0].x,temp_p->u.l.pos[0].y,temp_p->u.l.pos[1].x,temp_p->u.l.pos[1].y ); + LOG( log_cornuturnoutdesigner, 1, ( "ctoDes2: P0(%f,%f) P1(%f,%f) \n", \ + temp_p->u.l.pos[0].x,temp_p->u.l.pos[0].y,temp_p->u.l.pos[1].x, + temp_p->u.l.pos[1].y ) ); } else { DYNARR_APPEND(trkSeg_t,cornuSegs_da,1); - temp_p = &DYNARR_LAST(trkSeg_t,cornuSegs_da); + trkSeg_p temp_p = &DYNARR_LAST(trkSeg_t,cornuSegs_da); temp_p->type = SEG_CRVTRK; temp_p->color = wDrawColorBlack; - temp_p->width = 0.0; + temp_p->lineWidth = 0.0; temp_p->u.c.radius = radii[2]; - if (radii[2]>0) + if (radii[2]>0) { temp_p->u.c.a0 = FindAngle(end_centers[2],cornuData.pos[9]); - else + } else { temp_p->u.c.a0 = FindAngle(end_centers[2],end_points[2]); + } temp_p->u.c.a1 = fabs(end_arcs[2]); temp_p->u.c.center = end_centers[2]; coOrd rp0,rp1; Translate(&rp0,temp_p->u.c.center,temp_p->u.c.a0,temp_p->u.c.radius); - Translate(&rp1,temp_p->u.c.center,temp_p->u.c.a0+temp_p->u.c.a1,temp_p->u.c.radius); -LogPrintf( "ctoDes2: R(%f) A0(%f) A1(%f) C(%f,%f) P(%f,%f) EP(%f,%f) RP0(%f,%f) RP1(%f,%f)\n", - temp_p->u.c.radius,temp_p->u.c.a0,temp_p->u.c.a1,temp_p->u.c.center.x,temp_p->u.c.center.y, - points[2].x,points[2].y,end_points[2].x,end_points[2].y, - rp0.x,rp0.y,rp1.x,rp1.y); + Translate(&rp1,temp_p->u.c.center,temp_p->u.c.a0+temp_p->u.c.a1, + temp_p->u.c.radius); + LOG( log_cornuturnoutdesigner, 1, + ( "ctoDes2: R(%f) A0(%f) A1(%f) C(%f,%f) P(%f,%f) EP(%f,%f) RP0(%f,%f) RP1(%f,%f)\n", + \ + temp_p->u.c.radius,temp_p->u.c.a0,temp_p->u.c.a1,temp_p->u.c.center.x, + temp_p->u.c.center.y, \ + points[2].x,points[2].y,end_points[2].x,end_points[2].y, \ + rp0.x,rp0.y,rp1.x,rp1.y) ); } RightEndSeg = cornuSegs_da.cnt+LeftEndSeg; @@ -1976,7 +2145,7 @@ LogPrintf( "ctoDes2: R(%f) A0(%f) A1(%f) C(%f,%f) P(%f,%f) EP(%f,%f) RP0(%f,%f) if (dp->type == NTO_CORNU3WAY) { strcpy(pathChar,"Normal"); /* Also resets array */ pathLen = (wIndex_t)strlen(pathChar)+1; - for (uint8_t i=0;i<CenterEndSeg;i++) { + for (uint8_t i=0; i<CenterEndSeg; i++) { pathChar[pathLen] = i+1; pathLen++; } @@ -1990,18 +2159,18 @@ LogPrintf( "ctoDes2: R(%f) A0(%f) A1(%f) C(%f,%f) P(%f,%f) EP(%f,%f) RP0(%f,%f) strcpy(pathChar,"Left"); pathLen = (wIndex_t)strlen(pathChar)+1; } - for (uint8_t i=0;i<Toe1Seg;i++) { + for (uint8_t i=0; i<Toe1Seg; i++) { pathChar[pathLen] = i+1; pathLen++; } if ((dp->type == NTO_CORNU3WAY) && !LH_first && (newTurnToeR != newTurnToeL)) { - for (uint8_t i=Toe1Seg;i<Toe2Seg;i++) { + for (uint8_t i=Toe1Seg; i<Toe2Seg; i++) { pathChar[pathLen] = i+1; pathLen++; } } - for (uint8_t i=CenterEndSeg;i<LeftEndSeg;i++) { + for (uint8_t i=CenterEndSeg; i<LeftEndSeg; i++) { pathChar[pathLen] = i+1; pathLen++; } @@ -2014,17 +2183,17 @@ LogPrintf( "ctoDes2: R(%f) A0(%f) A1(%f) C(%f,%f) P(%f,%f) EP(%f,%f) RP0(%f,%f) sprintf(&pathChar[pathLen],"%s","Right"); pathLen += (wIndex_t)strlen(&pathChar[pathLen])+1; - for (uint8_t i=0;i<Toe1Seg;i++) { + for (uint8_t i=0; i<Toe1Seg; i++) { pathChar[pathLen] = i+1; pathLen++; } if ((dp->type == NTO_CORNU3WAY) && LH_first && (newTurnToeR != newTurnToeL)) { - for (uint8_t i=Toe1Seg;i<Toe2Seg;i++) { + for (uint8_t i=Toe1Seg; i<Toe2Seg; i++) { pathChar[pathLen] = i+1; pathLen++; } } - for (uint8_t i=LeftEndSeg;i<RightEndSeg;i++) { + for (uint8_t i=LeftEndSeg; i<RightEndSeg; i++) { pathChar[pathLen] = i+1; pathLen++; } @@ -2045,12 +2214,13 @@ LogPrintf( "ctoDes2: R(%f) A0(%f) A1(%f) C(%f,%f) P(%f,%f) EP(%f,%f) RP0(%f,%f) case NTO_S_SLIP: case NTO_CROSSING: if (dp->type == NTO_D_SLIP) { - if (newTurnSlipMode == 1) + if (newTurnSlipMode == 1) { pp = &DoubleSlipSchema2; - else + } else { pp = &DoubleSlipSchema; + } } - DYNARR_SET( trkEndPt_t, tempEndPts_da, 4 ); + TempEndPtsSet( 4 ); points[0].x = points[0].y = points[1].y = 0.0; points[1].x = (newTurnLen0); pos.y = 0; pos.x = (newTurnLen0)/2.0; @@ -2061,24 +2231,25 @@ LogPrintf( "ctoDes2: R(%f) A0(%f) A1(%f) C(%f,%f) P(%f,%f) EP(%f,%f) RP0(%f,%f) if (dp->type != NTO_CROSSING) { Translate( &pos, points[3], 90.0+angle0, -newTurnTrackGauge ); if (!ComputeCurve( &points[4], &points[5], &radii[0], - pos.x, fabs(pos.y), angle0 )) /*???*/ + pos.x, fabs(pos.y), angle0 )) { /*???*/ return NULL; + } radii[1] = - radii[0]; points[5].y = - points[5].y; points[6].y = 0; points[6].x = cpos.x-(points[4].x-cpos.x); points[7].y = -points[5].y; points[7].x = cpos.x-(points[5].x-cpos.x); } - tempEndPts(0).pos = points[0]; tempEndPts(0).angle = 270.0; - tempEndPts(1).pos = points[1]; tempEndPts(1).angle = 90.0; - tempEndPts(2).pos = points[2]; tempEndPts(2).angle = 270.0+angle0; - tempEndPts(3).pos = points[3]; tempEndPts(3).angle = 90.0+angle0; + SetEndPt( TempEndPt(0), points[0], 270.0 ); + SetEndPt( TempEndPt(1), points[1], 90.0 ); + SetEndPt( TempEndPt(2), points[2], 270.0+angle0 ); + SetEndPt( TempEndPt(3), points[3], 90.0+angle0 ); break; case NTO_R_CROSSOVER: case NTO_L_CROSSOVER: case NTO_D_CROSSOVER: - DYNARR_SET( trkEndPt_t, tempEndPts_da, 4 ); + TempEndPtsSet( 4 ); d = (newTurnLen0)/2.0 - newTurnTrackGauge; if (d < 0.0) { NoticeMessage( MSG_TODSGN_CROSSOVER_TOO_SHORT, _("Ok"), NULL ); @@ -2090,8 +2261,9 @@ LogPrintf( "ctoDes2: R(%f) A0(%f) A1(%f) C(%f,%f) P(%f,%f) EP(%f,%f) RP0(%f,%f) points[2].y = fabs(newTurnOff0); points[2].x = 0.0; points[3].y = fabs(newTurnOff0); points[3].x = (newTurnLen0); if (!ComputeCurve( &points[4], &points[5], &radii[1], - (newTurnLen0)/2.0, fabs(newTurnOff0)/2.0, angle0 ) ) + (newTurnLen0)/2.0, fabs(newTurnOff0)/2.0, angle0 ) ) { return NULL; + } radii[0] = - radii[1]; points[6].y = 0.0; points[6].x = (newTurnLen0)-points[4].x; points[7].y = points[5].y; points[7].x = (newTurnLen0)-points[5].x; @@ -2099,35 +2271,35 @@ LogPrintf( "ctoDes2: R(%f) A0(%f) A1(%f) C(%f,%f) P(%f,%f) EP(%f,%f) RP0(%f,%f) points[9].y = fabs(newTurnOff0)-points[5].y; points[9].x = points[5].x; points[10].y = fabs(newTurnOff0); points[10].x = points[6].x; points[11].y = points[9].y; points[11].x = points[7].x; - tempEndPts(0).pos = points[0]; tempEndPts(0).angle = 270.0; - tempEndPts(1).pos = points[1]; tempEndPts(1).angle = 90.0; - tempEndPts(2).pos = points[2]; tempEndPts(2).angle = 270.0; - tempEndPts(3).pos = points[3]; tempEndPts(3).angle = 90.0; + SetEndPt( TempEndPt(0), points[0], 270.0 ); + SetEndPt( TempEndPt(1), points[1], 90.0 ); + SetEndPt( TempEndPt(2), points[2], 270.0 ); + SetEndPt( TempEndPt(3), points[3], 90.0 ); break; case NTO_STR_SECTION: - DYNARR_SET( trkEndPt_t, tempEndPts_da, 2 ); + TempEndPtsSet( 2 ); points[0].y = points[0].x = 0; points[1].y = 0/*(newTurnOff1)*/; points[1].x = (newTurnLen0); - tempEndPts(0).pos = points[0]; tempEndPts(0).angle = 270.0; - tempEndPts(1).pos = points[1]; tempEndPts(1).angle = 90.0; + SetEndPt( TempEndPt(0), points[0], 270.0 ); + SetEndPt( TempEndPt(1), points[1], 90.0 ); break; case NTO_CRV_SECTION: - DYNARR_SET( trkEndPt_t, tempEndPts_da, 2 ); + TempEndPtsSet( 2 ); points[0].y = points[0].x = 0; points[1].y = (newTurnLen0) * (1.0 - cos( D2R(angle0) ) ); points[1].x = (newTurnLen0) * sin( D2R(angle0) ); radii[0] = -(newTurnLen0); - tempEndPts(0).pos = points[0]; tempEndPts(0).angle = 270.0; - tempEndPts(1).pos = points[1]; tempEndPts(1).angle = 90.0-angle0; + SetEndPt( TempEndPt(0), points[0], 270.0 ); + SetEndPt( TempEndPt(1), points[1], 90.0-angle0 ); break; case NTO_BUMPER: - DYNARR_SET( trkEndPt_t, tempEndPts_da, 1 ); + TempEndPtsSet( 1 ); points[0].y = points[0].x = 0; points[1].y = 0/*(newTurnOff1)*/; points[1].x = (newTurnLen0); - tempEndPts(0).pos = points[0]; tempEndPts(0).angle = 270.0; + SetEndPt( TempEndPt(0), points[0], 270.0 ); break; default: @@ -2137,310 +2309,334 @@ LogPrintf( "ctoDes2: R(%f) A0(%f) A1(%f) C(%f,%f) P(%f,%f) EP(%f,%f) RP0(%f,%f) switch (dp->type) { case NTO_CURVED: d = points[3].x - points[5].x; - if ( d < -MIN_TRACK_LENGTH ) + if ( d < -MIN_TRACK_LENGTH ) { pp = &Crv3Schema; - else if ( d > MIN_TRACK_LENGTH ) + } else if ( d > MIN_TRACK_LENGTH ) { pp = &Crv2Schema; - else + } else { pp = &Crv1Schema; + } break; } } #ifndef MKTURNOUT if(dp->type == NTO_CORNU) { - DYNARR_SET( trkEndPt_t, tempEndPts_da, 3 ); - - DIST_T end_length = MIN_TRACK_LENGTH; - - // Adjust end_points to impose small fixed end segments - - for (int i=0;i<3;i++) { - if (radii[i] == 0.0) { - Translate(&end_points[i], points[i], 90-angles[i]+(i==0?0:180), end_length); - end_angles[i] = angles[i]; - } else { - Translate(&end_centers[i], points[i], -angles[i], radii[i]); - end_arcs[i] = (radii[i]>=0?1:-1)*R2D(end_length/fabs(radii[i])); - end_points[i] = points[i]; - Rotate(&end_points[i],end_centers[i],(i>0?1:-1)*end_arcs[i]); - end_angles[i] = angles[i]-(i>0?1:-1)*end_arcs[i]; - } -LogPrintf( "ctoDes0-%d: EP(%f,%f) NEP(%f,%f) EA(%f) NEA(%f) R(%f) ARC(%f) EC(%f,%f) \n", - i+1,points[i].x,points[i].y,end_points[i].x,end_points[i].y,angles[i],end_angles[i],radii[i],end_arcs[i], - end_centers[i].x,end_centers[i].y); - } - - cornuData.pos[0] = end_points[0]; /*Start*/ - cornuData.pos[1] = end_points[2]; /*Outer*/ - cornuData.pos[3] = end_points[2]; /*Outer for second time*/ - cornuData.pos[5] = end_points[1]; /*Inner*/ + DIST_T end_length = MIN_TRACK_LENGTH; + // Adjust end_points to impose small fixed end segments - if (radii[0] == 0.0) /* Toe */ - cornuData.center[0] = zero; - else { - cornuData.center[0].x = end_points[0].x; - cornuData.center[0].y = end_points[0].y + radii[0]; + for (int i=0; i<3; i++) { + if (radii[i] == 0.0) { + Translate(&end_points[i], points[i], 90-angles[i]+(i==0?0:180), end_length); + end_angles[i] = angles[i]; + } else { + Translate(&end_centers[i], points[i], -angles[i], radii[i]); + end_arcs[i] = (radii[i]>=0?1:-1)*R2D(end_length/fabs(radii[i])); + end_points[i] = points[i]; + Rotate(&end_points[i],end_centers[i],(i>0?1:-1)*end_arcs[i]); + end_angles[i] = angles[i]-(i>0?1:-1)*end_arcs[i]; } - if (radii[1] == 0.0) /* Inner */ - cornuData.center[5] = zero; - else - Translate(&cornuData.center[5], cornuData.pos[5], -end_angles[1], radii[1]); - - if (radii[2] == 0.0) /* Outer */ - cornuData.center[1] = zero; - else - Translate(&cornuData.center[1], cornuData.pos[1], -end_angles[2], radii[2]); - cornuData.center[3] = cornuData.center[1]; - - cornuData.angle[0] = 270.0; - cornuData.angle[1] = 90.0-end_angles[2]; - cornuData.angle[3] = 90.0-end_angles[2]; - cornuData.angle[5] = 90.0-end_angles[1]; /*Inner*/ - - cornuData.radius[0] = fabs(radii[0]); - cornuData.radius[1] = fabs(radii[2]); - cornuData.radius[3] = fabs(radii[2]); - cornuData.radius[5] = fabs(radii[1]); /*Inner*/ - - DYNARR_RESET( trkSeg_t, tempSegs_da ); - trkSeg_t * temp_p, * cornu_p; - temp_p = &tempSegs(0); + LOG( log_cornuturnoutdesigner, 1, + ( "ctoDes0-%d: EP(%f,%f) NEP(%f,%f) EA(%f) NEA(%f) R(%f) ARC(%f) EC(%f,%f) \n", + \ + i+1,points[i].x,points[i].y,end_points[i].x,end_points[i].y,angles[i], + end_angles[i],radii[i],end_arcs[i], \ + end_centers[i].x,end_centers[i].y) ); + } - /*Map out the full outer curve */ - CallCornu0(&cornuData.pos[0],&cornuData.center[0],&cornuData.angle[0],&cornuData.radius[0],&tempSegs_da, FALSE); + cornuData.pos[0] = end_points[0]; /*Start*/ + cornuData.pos[1] = end_points[2]; /*Outer*/ + cornuData.pos[3] = end_points[2]; /*Outer for second time*/ + cornuData.pos[5] = end_points[1]; /*Inner*/ - /*Get ToeAngle/Radius/Center */ - int inx,subSeg; - wBool_t back, neg; - DIST_T radius; - coOrd center; - pos.x = end_points[0].x+newTurnToeL-MIN_TRACK_LENGTH; - pos.y = end_points[0].y; /* This will be close to but not on the curve */ - ANGLE_T angle = GetAngleSegs(tempSegs_da.cnt,(trkSeg_t *)(tempSegs_da.ptr),&pos,&inx,NULL,&back,&subSeg,&neg); - segPtr = &DYNARR_N(trkSeg_t, tempSegs_da, inx); - - if (segPtr->type == SEG_BEZTRK) { - segPtr = &DYNARR_N(trkSeg_t,segPtr->bezSegs,subSeg); - } - - if (segPtr->type == SEG_STRTRK) { - radius = 0.0; - center = zero; - } else if (segPtr->type == SEG_CRVTRK) { - center = segPtr->u.c.center; - radius = fabs(segPtr->u.c.radius); - } - cornuData.pos[1] = pos; - cornuData.center[1] = center; - cornuData.angle[1] = angle; - cornuData.radius[1] = radius; - cornuData.pos[2] = pos; - cornuData.center[2] = center; - cornuData.angle[2] = NormalizeAngle(180.0+angle); - cornuData.radius[2] = radius; - cornuData.pos[4] = pos; - cornuData.center[4] = center; - cornuData.angle[4] = NormalizeAngle(180.0+angle); - cornuData.radius[4] = radius; - static dynArr_t cornuSegs_da; + if (radii[0] == 0.0) { /* Toe */ + cornuData.center[0] = zero; + } else { + cornuData.center[0].x = end_points[0].x; + cornuData.center[0].y = end_points[0].y + radii[0]; + } + if (radii[1] == 0.0) { /* Inner */ + cornuData.center[5] = zero; + } else { + Translate(&cornuData.center[5], cornuData.pos[5], -end_angles[1], radii[1]); + } - ClearSegs(&tempSegs_da); - ClearSegs(&cornuSegs_da); + if (radii[2] == 0.0) { /* Outer */ + cornuData.center[1] = zero; + } else { + Translate(&cornuData.center[1], cornuData.pos[1], -end_angles[2], radii[2]); + } + cornuData.center[3] = cornuData.center[1]; + + cornuData.angle[0] = 270.0; + cornuData.angle[1] = 90.0-end_angles[2]; + cornuData.angle[3] = 90.0-end_angles[2]; + cornuData.angle[5] = 90.0-end_angles[1]; /*Inner*/ + + cornuData.radius[0] = fabs(radii[0]); + cornuData.radius[1] = fabs(radii[2]); + cornuData.radius[3] = fabs(radii[2]); + cornuData.radius[5] = fabs(radii[1]); /*Inner*/ + + DYNARR_RESET( trkSeg_t, tempSegs_da ); + + /*Map out the full outer curve */ + + CallCornu0(&cornuData.pos[0],&cornuData.center[0],&cornuData.angle[0], + &cornuData.radius[0],&tempSegs_da, FALSE); + + /*Get ToeAngle/Radius/Center */ + int inx,subSeg; + wBool_t back, neg; + DIST_T radius = 0.0; + coOrd center; + pos.x = end_points[0].x+newTurnToeL-MIN_TRACK_LENGTH; + pos.y = end_points[0].y; /* This will be close to but not on the curve */ + ANGLE_T angle = GetAngleSegs(tempSegs_da.cnt,&tempSegs(0),&pos, + &inx,NULL,&back,&subSeg,&neg); + segPtr = &DYNARR_N(trkSeg_t, tempSegs_da, inx); + + if (segPtr->type == SEG_BEZTRK) { + segPtr = &DYNARR_N(trkSeg_t,segPtr->bezSegs,subSeg); + } - /* Override if at zero radius at base don't compute end */ - if (cornuData.radius[0] == 0.0) { - DYNARR_APPEND(trkSeg_t,tempSegs_da,1); - temp_p = &DYNARR_LAST(trkSeg_t,tempSegs_da); - temp_p->type = SEG_STRTRK; - temp_p->color = wDrawColorBlack; - temp_p->width = 0.0; - temp_p->u.l.pos[0] = zero; - temp_p->u.l.pos[1] = cornuData.pos[1]; -LogPrintf( "ctoDes1: P0(%f,%f) P1(%f,%f) \n", - temp_p->u.l.pos[0].x,temp_p->u.l.pos[0].y,temp_p->u.l.pos[1].x,temp_p->u.l.pos[1].y ); + if (segPtr->type == SEG_STRTRK) { + radius = 0.0; + center = zero; + } else if (segPtr->type == SEG_CRVTRK) { + center = segPtr->u.c.center; + radius = fabs(segPtr->u.c.radius); + } + cornuData.pos[1] = pos; + cornuData.center[1] = center; + cornuData.angle[1] = angle; + cornuData.radius[1] = radius; + cornuData.pos[2] = pos; + cornuData.center[2] = center; + cornuData.angle[2] = NormalizeAngle(180.0+angle); + cornuData.radius[2] = radius; + cornuData.pos[4] = pos; + cornuData.center[4] = center; + cornuData.angle[4] = NormalizeAngle(180.0+angle); + cornuData.radius[4] = radius; + + static dynArr_t cornuSegs_da; + + ClearSegs(&tempSegs_da); + ClearSegs(&cornuSegs_da); + + /* Override if at zero radius at base don't compute end */ + if (cornuData.radius[0] == 0.0) { + DYNARR_APPEND(trkSeg_t,tempSegs_da,1); + trkSeg_p temp_p = &DYNARR_LAST(trkSeg_t,tempSegs_da); + temp_p->type = SEG_STRTRK; + temp_p->color = wDrawColorBlack; + temp_p->lineWidth = 0.0; + temp_p->u.l.pos[0] = zero; + temp_p->u.l.pos[1] = cornuData.pos[1]; + LOG( log_cornuturnoutdesigner, 1, ( "ctoDes1: P0(%f,%f) P1(%f,%f) \n", \ + temp_p->u.l.pos[0].x,temp_p->u.l.pos[0].y,temp_p->u.l.pos[1].x, + temp_p->u.l.pos[1].y ) ); + } else { + DYNARR_APPEND(trkSeg_t,tempSegs_da,1); + trkSeg_p temp_p = &DYNARR_LAST(trkSeg_t,tempSegs_da); + temp_p->type = SEG_CRVTRK; + temp_p->color = wDrawColorBlack; + temp_p->lineWidth = 0.0; + temp_p->u.c.radius = -radii[0]; + if (radii[0]>0.0) { + temp_p->u.c.a0 = FindAngle(end_centers[0],end_points[0]); } else { - DYNARR_APPEND(trkSeg_t,tempSegs_da,1); - temp_p = &DYNARR_LAST(trkSeg_t,tempSegs_da); - temp_p->type = SEG_CRVTRK; - temp_p->color = wDrawColorBlack; - temp_p->width = 0.0; - temp_p->u.c.radius = -radii[0]; - if (radii[0]>0.0) - temp_p->u.c.a0 = FindAngle(end_centers[0],end_points[0]); - else - temp_p->u.c.a0 = FindAngle(end_centers[0],points[0]); - temp_p->u.c.a1 = fabs(end_arcs[0]); - temp_p->u.c.center = end_centers[0]; - coOrd rp0,rp1; - Translate(&rp0,temp_p->u.c.center,temp_p->u.c.a0,temp_p->u.c.radius); - Translate(&rp1,temp_p->u.c.center,temp_p->u.c.a0+temp_p->u.c.a1,temp_p->u.c.radius); -LogPrintf( "ctoDes1: R(%f) A0(%f) A1(%f) C(%f,%f) P(%f,%f), EP(%f,%f) RP0(%f,%f) RP1(%f,%f)\n", - temp_p->u.c.radius,temp_p->u.c.a0,temp_p->u.c.a1,temp_p->u.c.center.x,temp_p->u.c.center.y, - points[0].x,points[0].y,end_points[0].x,end_points[0].y, - rp0.x,rp0.y,rp1.x,rp1.y); - - /* Base to Toe in tempSegs array */ - CallCornuNoBez(&cornuData.pos[0],&cornuData.center[0],& cornuData.angle[0],&cornuData.radius[0],&tempSegs_da); + temp_p->u.c.a0 = FindAngle(end_centers[0],points[0]); } + temp_p->u.c.a1 = fabs(end_arcs[0]); + temp_p->u.c.center = end_centers[0]; + coOrd rp0,rp1; + Translate(&rp0,temp_p->u.c.center,temp_p->u.c.a0,temp_p->u.c.radius); + Translate(&rp1,temp_p->u.c.center,temp_p->u.c.a0+temp_p->u.c.a1, + temp_p->u.c.radius); + LOG( log_cornuturnoutdesigner, 1, + ( "ctoDes1: R(%f) A0(%f) A1(%f) C(%f,%f) P(%f,%f), EP(%f,%f) RP0(%f,%f) RP1(%f,%f)\n", + \ + temp_p->u.c.radius,temp_p->u.c.a0,temp_p->u.c.a1,temp_p->u.c.center.x, + temp_p->u.c.center.y, \ + points[0].x,points[0].y,end_points[0].x,end_points[0].y, \ + rp0.x,rp0.y,rp1.x,rp1.y) ); + + /* Base to Toe in tempSegs array */ + CallCornuNoBez(&cornuData.pos[0],&cornuData.center[0],& cornuData.angle[0], + &cornuData.radius[0],&tempSegs_da); + } - int ToeSeg = tempSegs_da.cnt; - - /* Toe to Outer in cornuSegs array */ - CallCornuNoBez(&cornuData.pos[2],&cornuData.center[2],&cornuData.angle[2],&cornuData.radius[2],&cornuSegs_da); - - cornu_p = (trkSeg_p)cornuSegs_da.ptr; - - if (cornuData.radius[3] == 0.0) { - DYNARR_APPEND(trkSeg_t,cornuSegs_da,1); - temp_p = &DYNARR_LAST(trkSeg_t,cornuSegs_da); - temp_p->type = SEG_STRTRK; - temp_p->color = wDrawColorBlack; - temp_p->width = 0.0; - temp_p->u.l.pos[0] = cornuData.pos[3]; - temp_p->u.l.pos[1] = end_points[2]; -LogPrintf( "ctoDes2: P0(%f,%f) P1(%f,%f) \n", - temp_p->u.l.pos[0].x,temp_p->u.l.pos[0].y,temp_p->u.l.pos[1].x,temp_p->u.l.pos[1].y ); + int ToeSeg = tempSegs_da.cnt; + + /* Toe to Outer in cornuSegs array */ + CallCornuNoBez(&cornuData.pos[2],&cornuData.center[2],&cornuData.angle[2], + &cornuData.radius[2],&cornuSegs_da); + if (cornuData.radius[3] == 0.0) { + DYNARR_APPEND(trkSeg_t,cornuSegs_da,1); + trkSeg_p temp_p = &DYNARR_LAST(trkSeg_t,cornuSegs_da); + temp_p->type = SEG_STRTRK; + temp_p->color = wDrawColorBlack; + temp_p->lineWidth = 0.0; + temp_p->u.l.pos[0] = cornuData.pos[3]; + temp_p->u.l.pos[1] = end_points[2]; + LOG( log_cornuturnoutdesigner, 1, ( "ctoDes2: P0(%f,%f) P1(%f,%f) \n", \ + temp_p->u.l.pos[0].x,temp_p->u.l.pos[0].y,temp_p->u.l.pos[1].x, + temp_p->u.l.pos[1].y ) ); + } else { + DYNARR_APPEND(trkSeg_t,cornuSegs_da,1); + trkSeg_p temp_p = &DYNARR_LAST(trkSeg_t,cornuSegs_da); + temp_p->type = SEG_CRVTRK; + temp_p->color = wDrawColorBlack; + temp_p->lineWidth = 0.0; + temp_p->u.c.radius = -radii[2]; + if (radii[2]>0) { + temp_p->u.c.a0 = FindAngle(end_centers[2],points[2]); } else { - DYNARR_APPEND(trkSeg_t,cornuSegs_da,1); - temp_p = &DYNARR_LAST(trkSeg_t,cornuSegs_da); - temp_p->type = SEG_CRVTRK; - temp_p->color = wDrawColorBlack; - temp_p->width = 0.0; - temp_p->u.c.radius = -radii[2]; - if (radii[2]>0) - temp_p->u.c.a0 = FindAngle(end_centers[2],points[2]); - else - temp_p->u.c.a0 = FindAngle(end_centers[2],end_points[2]); - temp_p->u.c.a1 = fabs(end_arcs[2]); - temp_p->u.c.center = end_centers[2]; - coOrd rp0,rp1; - Translate(&rp0,temp_p->u.c.center,temp_p->u.c.a0,temp_p->u.c.radius); - Translate(&rp1,temp_p->u.c.center,temp_p->u.c.a0+temp_p->u.c.a1,temp_p->u.c.radius); -LogPrintf( "ctoDes2: R(%f) A0(%f) A1(%f) C(%f,%f) P(%f,%f) EP(%f,%f) RP0(%f,%f) RP1(%f,%f)\n", - temp_p->u.c.radius,temp_p->u.c.a0,temp_p->u.c.a1,temp_p->u.c.center.x,temp_p->u.c.center.y, - points[2].x,points[2].y,end_points[2].x,end_points[2].y, - rp0.x,rp0.y,rp1.x,rp1.y); + temp_p->u.c.a0 = FindAngle(end_centers[2],end_points[2]); } + temp_p->u.c.a1 = fabs(end_arcs[2]); + temp_p->u.c.center = end_centers[2]; + coOrd rp0,rp1; + Translate(&rp0,temp_p->u.c.center,temp_p->u.c.a0,temp_p->u.c.radius); + Translate(&rp1,temp_p->u.c.center,temp_p->u.c.a0+temp_p->u.c.a1, + temp_p->u.c.radius); + LOG( log_cornuturnoutdesigner, 1, + ( "ctoDes2: R(%f) A0(%f) A1(%f) C(%f,%f) P(%f,%f) EP(%f,%f) RP0(%f,%f) RP1(%f,%f)\n", + \ + temp_p->u.c.radius,temp_p->u.c.a0,temp_p->u.c.a1,temp_p->u.c.center.x, + temp_p->u.c.center.y, \ + points[2].x,points[2].y,end_points[2].x,end_points[2].y, \ + rp0.x,rp0.y,rp1.x,rp1.y) ); + } - int OuterEndSeg = cornuSegs_da.cnt + ToeSeg; - - /* Add to second cornu to tempSegs array */ - AppendSegs(&tempSegs_da,&cornuSegs_da); - - /* Get ready to reuse cornuSegs array*/ - ClearSegs(&cornuSegs_da); - - /* Toe to Inner in cornuSegs array*/ - CallCornuNoBez(&cornuData.pos[4],&cornuData.center[4],&cornuData.angle[4],&cornuData.radius[4],&cornuSegs_da); - - if (cornuData.radius[5] == 0.0) { - DYNARR_APPEND(trkSeg_t,cornuSegs_da,1); - temp_p = &DYNARR_LAST(trkSeg_t,cornuSegs_da); - temp_p->type = SEG_STRTRK; - temp_p->color = wDrawColorBlack; - temp_p->width = 0.0; - temp_p->u.l.pos[0] = cornuData.pos[5]; - temp_p->u.l.pos[1] = points[1]; -LogPrintf( "ctoDes3: P0(%f,%f) P1(%f,%f) \n", - temp_p->u.l.pos[0].x,temp_p->u.l.pos[0].y,temp_p->u.l.pos[1].x,temp_p->u.l.pos[1].y ); + int OuterEndSeg = cornuSegs_da.cnt + ToeSeg; + + /* Add to second cornu to tempSegs array */ + AppendSegs(&tempSegs_da,&cornuSegs_da); + + /* Get ready to reuse cornuSegs array*/ + ClearSegs(&cornuSegs_da); + + /* Toe to Inner in cornuSegs array*/ + CallCornuNoBez(&cornuData.pos[4],&cornuData.center[4],&cornuData.angle[4], + &cornuData.radius[4],&cornuSegs_da); + + if (cornuData.radius[5] == 0.0) { + DYNARR_APPEND(trkSeg_t,cornuSegs_da,1); + trkSeg_p temp_p = &DYNARR_LAST(trkSeg_t,cornuSegs_da); + temp_p->type = SEG_STRTRK; + temp_p->color = wDrawColorBlack; + temp_p->lineWidth = 0.0; + temp_p->u.l.pos[0] = cornuData.pos[5]; + temp_p->u.l.pos[1] = points[1]; + LOG( log_cornuturnoutdesigner, 1, ( "ctoDes3: P0(%f,%f) P1(%f,%f) \n", \ + temp_p->u.l.pos[0].x,temp_p->u.l.pos[0].y,temp_p->u.l.pos[1].x, + temp_p->u.l.pos[1].y ) ); + } else { + DYNARR_APPEND(trkSeg_t,cornuSegs_da,1); + trkSeg_p temp_p = &DYNARR_LAST(trkSeg_t,cornuSegs_da); + temp_p->type = SEG_CRVTRK; + temp_p->color = wDrawColorBlack; + temp_p->lineWidth = 0.0; + temp_p->u.c.radius = -radii[1]; + if (radii[1]>0) { + temp_p->u.c.a0 = FindAngle(end_centers[1],points[1]); } else { - DYNARR_APPEND(trkSeg_t,cornuSegs_da,1); - temp_p = &DYNARR_LAST(trkSeg_t,cornuSegs_da); - temp_p->type = SEG_CRVTRK; - temp_p->color = wDrawColorBlack; - temp_p->width = 0.0; - temp_p->u.c.radius = -radii[1]; - if (radii[1]>0) - temp_p->u.c.a0 = FindAngle(end_centers[1],points[1]); - else - temp_p->u.c.a0 = FindAngle(end_centers[1],end_points[1]); - temp_p->u.c.a1 = fabs(end_arcs[1]); - temp_p->u.c.center = end_centers[1]; - coOrd rp0,rp1; - Translate(&rp0,temp_p->u.c.center,temp_p->u.c.a0,temp_p->u.c.radius); - Translate(&rp1,temp_p->u.c.center,temp_p->u.c.a0+temp_p->u.c.a1,temp_p->u.c.radius); -LogPrintf( "ctoDes3: R(%f) A0(%f) A1(%f) C(%f,%f) P(%f,%f) EP(%f,%f) RP0(%f,%f) RP1(%f,%f)\n", - temp_p->u.c.radius,temp_p->u.c.a0,temp_p->u.c.a1,temp_p->u.c.center.x,temp_p->u.c.center.y, - points[1].x,points[1].y,end_points[1].x,end_points[1].y, - rp0.x,rp0.y,rp1.x,rp1.y); + temp_p->u.c.a0 = FindAngle(end_centers[1],end_points[1]); } + temp_p->u.c.a1 = fabs(end_arcs[1]); + temp_p->u.c.center = end_centers[1]; + coOrd rp0,rp1; + Translate(&rp0,temp_p->u.c.center,temp_p->u.c.a0,temp_p->u.c.radius); + Translate(&rp1,temp_p->u.c.center,temp_p->u.c.a0+temp_p->u.c.a1, + temp_p->u.c.radius); + LOG( log_cornuturnoutdesigner, 1, + ( "ctoDes3: R(%f) A0(%f) A1(%f) C(%f,%f) P(%f,%f) EP(%f,%f) RP0(%f,%f) RP1(%f,%f)\n", + \ + temp_p->u.c.radius,temp_p->u.c.a0,temp_p->u.c.a1,temp_p->u.c.center.x, + temp_p->u.c.center.y, \ + points[1].x,points[1].y,end_points[1].x,end_points[1].y, \ + rp0.x,rp0.y,rp1.x,rp1.y) ); + } - int InnerEndSeg = cornuSegs_da.cnt + OuterEndSeg; + int InnerEndSeg = cornuSegs_da.cnt + OuterEndSeg; - /*Add Third Part to tempSegs Array */ - AppendSegs(&tempSegs_da,&cornuSegs_da); + /*Add Third Part to tempSegs Array */ + AppendSegs(&tempSegs_da,&cornuSegs_da); - /* Safety - clear out cornu Array */ - ClearSegs(&cornuSegs_da); + /* Safety - clear out cornu Array */ + ClearSegs(&cornuSegs_da); - if (tempSegs_da.cnt >128 ) { - NoticeMessage( MSG_TODSGN_CORNU_TOO_COMPLEX, _("Ok"), NULL ); - return NULL; - } + if (tempSegs_da.cnt >128 ) { + NoticeMessage( MSG_TODSGN_CORNU_TOO_COMPLEX, _("Ok"), NULL ); + return NULL; + } - static char pathChar[512]; - strcpy(pathChar,"Normal"); /* Also resets array */ + static char pathChar[512]; + strcpy(pathChar,"Normal"); /* Also resets array */ - pathLen = (wIndex_t)strlen(pathChar)+1; + pathLen = (wIndex_t)strlen(pathChar)+1; - for (uint8_t i=0;i<OuterEndSeg;i++) { - pathChar[pathLen] = i+1; - pathLen++; - } - pathChar[pathLen] = 0; - pathLen++; - pathChar[pathLen] = 0; + for (uint8_t i=0; i<OuterEndSeg; i++) { + pathChar[pathLen] = i+1; pathLen++; + } + pathChar[pathLen] = 0; + pathLen++; + pathChar[pathLen] = 0; + pathLen++; - sprintf(&pathChar[pathLen],"%s","Reverse"); + sprintf(&pathChar[pathLen],"%s","Reverse"); - pathLen += (wIndex_t)strlen(&pathChar[pathLen])+1; - for (uint8_t i=0;i<ToeSeg;i++) { - pathChar[pathLen] = i+1; - pathLen++; - } - for (uint8_t i=OuterEndSeg;i<InnerEndSeg;i++) { - pathChar[pathLen] = i+1; - pathLen++; - } - pathChar[pathLen] = 0; + pathLen += (wIndex_t)strlen(&pathChar[pathLen])+1; + for (uint8_t i=0; i<ToeSeg; i++) { + pathChar[pathLen] = i+1; pathLen++; - pathChar[pathLen] = 0; + } + for (uint8_t i=OuterEndSeg; i<InnerEndSeg; i++) { + pathChar[pathLen] = i+1; pathLen++; - pathChar[pathLen] = 0; - pathLen++; - - pp->paths = (signed char *)pathChar; - segCnt = tempSegs_da.cnt; + } + pathChar[pathLen] = 0; + pathLen++; + pathChar[pathLen] = 0; + pathLen++; + pathChar[pathLen] = 0; + pathLen++; + + pp->paths = (signed char *)pathChar; + segCnt = tempSegs_da.cnt; } #endif - if (!( (dp->type== NTO_CORNU) || (dp->type == NTO_CORNUWYE) || (dp->type == NTO_CORNU3WAY))) { + if (!( (dp->type== NTO_CORNU) || (dp->type == NTO_CORNUWYE) + || (dp->type == NTO_CORNU3WAY))) { segOrder = pp->segOrder; segCnt = (wIndex_t)strlen( segOrder ); - if (segCnt%3 != 0) - AbortProg( dp->label ); + CHECKMSG( segCnt%3 == 0, ( "%s", dp->label ) ); segCnt /= 3; DYNARR_SET( trkSeg_t, tempSegs_da, segCnt ); - tempSegs_da.cnt = segCnt; memset( &tempSegs(0), 0, segCnt * sizeof tempSegs(0) ); for ( s=0; s<segCnt; s++ ) { segPtr = &tempSegs(s); segPtr->color = wDrawColorBlack; - if (*segOrder <= '9') + if (*segOrder <= '9') { p0 = *segOrder++ - '0'; - else + } else { p0 = *segOrder++ - 'A' + 10; - if (*segOrder <= '9') + } + if (*segOrder <= '9') { p1 = *segOrder++ - '0'; - else + } else { p1 = *segOrder++ - 'A' + 10; + } p = *segOrder++ - '0'; if (p == 3) { /* cornu */ @@ -2459,18 +2655,21 @@ LogPrintf( "ctoDes3: R(%f) A0(%f) A1(%f) C(%f,%f) P(%f,%f) EP(%f,%f) RP0(%f,%f) AddRoadbed(); #ifndef MKTURNOUT - if ( CheckPaths( segCnt, &tempSegs(0), pp->paths ) < 0 ) + if ( CheckPaths( segCnt, &tempSegs(0), pp->paths, dp->label ) < 0 ) { return NULL; + } #endif return pp; } +#ifndef MKTURNOUT static void CopyNonTracks( turnoutInfo_t * to ) { trkSeg_p sp0; for ( sp0=to->segs; sp0<&to->segs[to->segCnt]; sp0++ ) { - if ( sp0->type != SEG_STRTRK && sp0->type != SEG_CRVTRK && sp0->type != SEG_BEZTRK ) { + if ( sp0->type != SEG_STRTRK && sp0->type != SEG_CRVTRK + && sp0->type != SEG_BEZTRK ) { DYNARR_APPEND( trkSeg_t, tempSegs_da, 10 ); tempSegs(tempSegs_da.cnt-1) = *sp0; } @@ -2478,9 +2677,8 @@ static void CopyNonTracks( turnoutInfo_t * to ) } -#ifndef MKTURNOUT static void NewTurnPrint( - void * junk ) + void * junk ) { coOrd pos, p0, p1; WDOUBLE_T px, py; @@ -2499,12 +2697,15 @@ static void NewTurnPrint( 0.0, { 0.0, 0.0 }, { 0.0, 0.0 }, - Pix2CoOrd, CoOrd2Pix }; + Pix2CoOrd, CoOrd2Pix + }; - if ((pp=LoadSegs( curDesign, TRUE )) == NULL) + if ((pp=LoadSegs( curDesign, TRUE )) == NULL) { return; - if (includeNontrackSegments && customTurnout1) + } + if (includeNontrackSegments && customTurnout1) { CopyNonTracks( customTurnout1 ); + } GetSegBounds( zero, 0.0, tempSegs_da.cnt, &tempSegs(0), &orig, &size ); tmp = orig.x; orig.x = orig.y; orig.y = tmp; @@ -2522,19 +2723,23 @@ static void NewTurnPrint( case SEG_CRVTRK: case SEG_CRVLIN: PointOnCircle( &pos[0], segPtr->u.c.center, segPtr->u.c.radius, - segPtr->u.c.a0 ); + segPtr->u.c.a0 ); PointOnCircle( &pos[1], segPtr->u.c.center, segPtr->u.c.radius, - segPtr->u.c.a0+segPtr->u.c.a1 ); + segPtr->u.c.a0+segPtr->u.c.a1 ); } for ( ep=0; ep<2; ep++ ) { - if (pos[ep].x < orig.x) + if (pos[ep].x < orig.x) { orig.x = pos[ep].x; - if (pos[ep].x > size.x) + } + if (pos[ep].x > size.x) { size.x = pos[ep].x; - if (pos[ep].y < orig.y) + } + if (pos[ep].y < orig.y) { orig.y = pos[ep].y; - if (pos[ep].y > size.y) + } + if (pos[ep].y > size.y) { size.y = pos[ep].y; + } } } @@ -2548,8 +2753,9 @@ static void NewTurnPrint( newTurnout_d.size.y = py; ii = (int)(size.y/newTurnout_d.size.x)+1; jj = (int)(size.x/newTurnout_d.size.y)+1; - if ( !wPrintDocStart( sTurnoutDesignerW, ii*jj, NULL ) ) + if ( !wPrintDocStart( sTurnoutDesignerW, ii*jj, NULL ) ) { return; + } #ifdef LATER orig.x -= (0.5); orig.y -= (jj*newTurnout_d.size.y-size.y)/2.0; @@ -2558,9 +2764,9 @@ static void NewTurnPrint( orig.y -= (0.5); coOrd strPos; for ( i=0, newTurnout_d.orig.x=orig.x; i<ii; - i++, newTurnout_d.orig.x+=newTurnout_d.size.x ) { + i++, newTurnout_d.orig.x+=newTurnout_d.size.x ) { for ( j=0, newTurnout_d.orig.y=orig.y; j<jj; - j++, newTurnout_d.orig.y+=newTurnout_d.size.y ) { + j++, newTurnout_d.orig.y+=newTurnout_d.size.y ) { newTurnout_d.d = wPrintPageStart(); newTurnout_d.dpi = wDrawGetDPI(newTurnout_d.d); strPos.x = newTurnout_d.orig.x + 3.0; @@ -2578,45 +2784,52 @@ static void NewTurnPrint( for ( p=0; p<curDesign->floatCnt; p++ ) { tmpR = *(FLOAT_T*)(turnDesignPLs[curDesign->floats[p].index].valueP); sprintf( message, "%s: %s", - (curDesign->floats[p].mode!=Frog_e||newTurnAngleMode!=0)?_(curDesign->floats[p].printLabel):_("Frog Number"), - curDesign->floats[p].mode==Dim_e? - FormatDistance(tmpR): - FormatFloat(tmpR) ); + (curDesign->floats[p].mode!=Frog_e + ||newTurnAngleMode!=0)?_(curDesign->floats[p].printLabel):_("Frog Number"), + curDesign->floats[p].mode==Dim_e? + FormatDistance(tmpR): + FormatFloat(tmpR) ); strPos.y -= 0.25; DrawString( &newTurnout_d, strPos, 0.0, message, fp, 16, wDrawColorBlack ); } if (newTurnLeftDesc[0] || newTurnLeftPartno[0]) { - sprintf( message, "%s %s %s", newTurnManufacturer, newTurnLeftPartno, newTurnLeftDesc ); + sprintf( message, "%s %s %s", newTurnManufacturer, newTurnLeftPartno, + newTurnLeftDesc ); strPos.y -= 0.25; DrawString( &newTurnout_d, strPos, 0.0, message, fp, 16, wDrawColorBlack ); } if (newTurnRightDesc[0] || newTurnRightPartno[0]) { - sprintf( message, "%s %s %s", newTurnManufacturer, newTurnRightPartno, newTurnRightDesc ); + sprintf( message, "%s %s %s", newTurnManufacturer, newTurnRightPartno, + newTurnRightDesc ); strPos.y -= 0.25; DrawString( &newTurnout_d, strPos, 0.0, message, fp, 16, wDrawColorBlack ); } - DrawRectangle( &newTurnout_d, newTurnout_d.orig, newTurnout_d.size, wDrawColorBlack, DRAW_CLOSED ); + DrawRectangle( &newTurnout_d, newTurnout_d.orig, newTurnout_d.size, + wDrawColorBlack, DRAW_CLOSED ); - DrawSegs( &newTurnout_d, zero, 270.0, &tempSegs(0), tempSegs_da.cnt, newTurnTrackGauge, wDrawColorBlack ); + DrawSegsDA( &newTurnout_d, NULL, zero, 270.0, &tempSegs_da, newTurnTrackGauge, + wDrawColorBlack, 0 ); - for ( ep=0; ep<tempEndPts_da.cnt; ep++ ) { - pos.x = -tempEndPts(ep).pos.y; - pos.y = tempEndPts(ep).pos.x; - Translate( &p0, pos, tempEndPts(ep).angle+90+270.0, - newTurnTrackGauge ); - Translate( &p1, pos, tempEndPts(ep).angle+270+270.0, - newTurnTrackGauge ); + for ( ep=0; ep<TempEndPtsCount(); ep++ ) { + pos.x = - GetEndPtPos( TempEndPt(ep) ).y; + pos.y = GetEndPtPos( TempEndPt(ep) ).x; + ANGLE_T angle = GetEndPtAngle( TempEndPt(ep) ); + Translate( &p0, pos, angle+90+270.0, + newTurnTrackGauge ); + Translate( &p1, pos, angle+270+270.0, + newTurnTrackGauge ); DrawLine( &newTurnout_d, p0, p1, 0, wDrawColorBlack ); - Translate( &p0, pos, tempEndPts(ep).angle+270.0, - newTurnout_d.size.y/2.0 ); + Translate( &p0, pos, angle+270.0, + newTurnout_d.size.y/2.0 ); DrawStraightTrack( &newTurnout_d, pos, p0, - tempEndPts(ep).angle+270.0, - NULL, wDrawColorBlack, 0 ); + angle+270.0, + NULL, wDrawColorBlack, 0 ); } - if ( !wPrintPageEnd( newTurnout_d.d ) ) + if ( !wPrintPageEnd( newTurnout_d.d ) ) { goto quitPrinting; + } } } quitPrinting: @@ -2624,27 +2837,45 @@ quitPrinting: } #endif + +static char * BuildTrimedTitle( char * cp, const char * sep, const char * mfg, + const char * desc, const char * partno ) +{ + cp = Strcpytrimed( cp, mfg, FALSE ); + strcpy( cp, sep ); + cp += strlen(cp); + cp = Strcpytrimed( cp, desc, FALSE ); + strcpy( cp, sep ); + cp += strlen(cp); + cp = Strcpytrimed( cp, partno, FALSE ); + return cp; +} + static void NewTurnOk( void * context ) { FILE * f; toDesignSchema_t * pp; int i; - BOOL_T foundR=FALSE; char * cp; #ifndef MKTURNOUT + BOOL_T foundR=FALSE; turnoutInfo_t *to; #endif FLOAT_T flt; - wIndex_t segCnt; char * customInfoP; + coOrd pos; + ANGLE_T angle; + #ifndef MKTURNOUT - if ( ! ParamCheckInputs( &turnDesignPG, (wControl_p)turnDesignPG.okB ) ) + if ( ! ParamCheckInputs( &turnDesignPG, (wControl_p)turnDesignPG.okB ) ) { return; + } #endif - if ((pp=LoadSegs( curDesign, TRUE )) == NULL) + if ((pp=LoadSegs( curDesign, TRUE )) == NULL) { return; + } // if ( (curDesign->strCnt >= 1 && newTurnLeftDesc[0] == 0) || // (curDesign->strCnt >= 2 && newTurnRightDesc[0] == 0) ) { @@ -2652,12 +2883,14 @@ static void NewTurnOk( void * context ) // return; // } - BuildTrimedTitle( message, "\t", newTurnManufacturer, newTurnLeftDesc, newTurnLeftPartno ); + BuildTrimedTitle( message, "\t", newTurnManufacturer, newTurnLeftDesc, + newTurnLeftPartno ); #ifndef MKTURNOUT if ( customTurnout1 == NULL && - ( foundR || FindCompound( FIND_TURNOUT, newTurnScaleName, message ) ) ) { - if ( !NoticeMessage( MSG_TODSGN_REPLACE, _("Yes"), _("No") ) ) + ( foundR || FindCompound( FIND_TURNOUT, newTurnScaleName, message ) ) ) { + if ( !NoticeMessage( MSG_TODSGN_REPLACE, _("Yes"), _("No") ) ) { return; + } } SetCLocale(); #endif @@ -2665,7 +2898,7 @@ static void NewTurnOk( void * context ) f = OpenCustom("a"); sprintf( tempCustom, "\"%s\" \"%s\" \"", - curDesign->label, "" ); + curDesign->label, "" ); cp = tempCustom + strlen(tempCustom); cp = Strcpytrimed( cp, newTurnManufacturer, TRUE ); strcpy( cp, "\" \"" ); @@ -2676,7 +2909,8 @@ static void NewTurnOk( void * context ) cp = Strcpytrimed( cp, newTurnLeftPartno, TRUE ); strcpy( cp, "\"" ); cp += 1; - if (curDesign->type == NTO_REGULAR || curDesign->type == NTO_CURVED || curDesign->type == NTO_CORNU ) { + if (curDesign->type == NTO_REGULAR || curDesign->type == NTO_CURVED + || curDesign->type == NTO_CORNU ) { strcpy( cp, " \"" ); cp += 2; cp = Strcpytrimed( cp, newTurnRightDesc, TRUE ); @@ -2686,59 +2920,64 @@ static void NewTurnOk( void * context ) strcpy( cp, "\"" ); cp += 1; } - if ( cp-tempCustom > sizeof tempCustom ) - AbortProg( "Custom line overflow" ); + CHECK( cp-tempCustom <= sizeof tempCustom ); for ( i=0; i<curDesign->floatCnt; i++ ) { flt = *(FLOAT_T*)(turnDesignPLs[curDesign->floats[i].index].valueP); switch( curDesign->floats[i].mode ) { - case Dim_e: - flt = ( flt ); - break; - case Frog_e: - if (newTurnAngleMode == 0 && flt > 0.0) - flt = R2D(asin(1.0/flt)); - break; - case Angle_e: - break; - case Rad_e: - break; + case Dim_e: + flt = ( flt ); + break; + case Frog_e: + if (newTurnAngleMode == 0 && flt > 0.0) { + flt = R2D(asin(1.0/flt)); + } + break; + case Angle_e: + break; + case Rad_e: + break; } sprintf( cp, " %0.6f", flt ); cp += strlen(cp); } - sprintf( cp, " %0.6f %0.6f %ld", newTurnRoadbedWidth, newTurnRoadbedLineWidth/(_DPI), wDrawGetRGB(roadbedColor) ); + sprintf( cp, " %0.6f %0.6f %ld", newTurnRoadbedWidth, + newTurnRoadbedLineWidth, wDrawGetRGB(newTurnRoadbedColor) ); customInfoP = MyStrdup( tempCustom ); strcpy( tempCustom, message ); - segCnt = tempSegs_da.cnt; long options = 0; - if ( curDesign->type == NTO_D_SLIP && newTurnSlipMode == 1) + if ( curDesign->type == NTO_D_SLIP && newTurnSlipMode == 1) { options |= COMPOUND_OPTION_PATH_NOCOMBINE; + } #ifndef MKTURNOUT - if (includeNontrackSegments && customTurnout1) + if (includeNontrackSegments && customTurnout1) { CopyNonTracks( customTurnout1 ); - if ( customTurnout1 ) + } + if ( customTurnout1 ) { customTurnout1->segCnt = 0; + } - DIST_T * radii_ends = NULL; +// DIST_T * radii_ends = NULL; - if ((curDesign->type == NTO_CORNU) || - (curDesign->type == NTO_CORNUWYE) || - (curDesign->type == NTO_CORNU3WAY)) { - radii_ends = &radii[0]; - } - to = CreateNewTurnout( newTurnScaleName, tempCustom, tempSegs_da.cnt, &tempSegs(0), - pp->paths, tempEndPts_da.cnt, &tempEndPts(0), FALSE, options ); + if ((curDesign->type == NTO_CORNU) || + (curDesign->type == NTO_CORNUWYE) || + (curDesign->type == NTO_CORNU3WAY)) { +// radii_ends = &radii[0]; + } + to = CreateNewTurnout( newTurnScaleName, tempCustom, tempSegs_da.cnt, + &tempSegs(0), + pp->paths, TempEndPtsCount(), TempEndPt(0), FALSE, options ); to->customInfo = customInfoP; #endif if (f) { - fprintf( f, "TURNOUT %s \"%s\" %ld\n", newTurnScaleName, PutTitle(tempCustom), options ); + fprintf( f, "TURNOUT %s \"%s\" %ld\n", newTurnScaleName, PutTitle(tempCustom), + options ); #ifdef MKTURNOUT if (doCustomInfoLine) #endif - fprintf( f, "\tU %s\n", customInfoP ); + fprintf( f, "\tU %s\n", customInfoP ); WriteCompoundPathsEndPtsSegs( f, pp->paths, tempSegs_da.cnt, &tempSegs(0), - tempEndPts_da.cnt, &tempEndPts(0) ); + TempEndPtsCount(), TempEndPt(0) ); } switch (curDesign->type) { @@ -2748,26 +2987,34 @@ static void NewTurnOk( void * context ) points[4].y = - points[4].y; radii[0] = - radii[0]; LoadSegs( curDesign, FALSE ); - tempEndPts(2).pos.y = - tempEndPts(2).pos.y; - tempEndPts(2).angle = 180.0 - tempEndPts(2).angle; - BuildTrimedTitle( tempCustom, "\t", newTurnManufacturer, newTurnRightDesc, newTurnRightPartno ); - tempSegs_da.cnt = segCnt; + pos = GetEndPtPos(TempEndPt(2)); + angle = GetEndPtAngle(TempEndPt(2)); + pos.y = - pos.y; + angle = 180.0 - angle; + SetEndPt(TempEndPt(2), pos, angle ); + BuildTrimedTitle( tempCustom, "\t", newTurnManufacturer, newTurnRightDesc, + newTurnRightPartno ); #ifndef MKTURNOUT - if (includeNontrackSegments && customTurnout2) + if (includeNontrackSegments && customTurnout2) { CopyNonTracks( customTurnout2 ); - if ( customTurnout2 ) + } + if ( customTurnout2 ) { customTurnout2->segCnt = 0; - to = CreateNewTurnout( newTurnScaleName, tempCustom, tempSegs_da.cnt, &tempSegs(0), - pp->paths, tempEndPts_da.cnt, &tempEndPts(0), FALSE, options ); + } + to = CreateNewTurnout( newTurnScaleName, tempCustom, tempSegs_da.cnt, + &tempSegs(0), + pp->paths, TempEndPtsCount(), TempEndPt(0), FALSE, options ); to->customInfo = customInfoP; #endif if (f) { - fprintf( f, "TURNOUT %s \"%s\" %ld\n", newTurnScaleName, PutTitle(tempCustom), options ); + fprintf( f, "TURNOUT %s \"%s\" %ld\n", newTurnScaleName, PutTitle(tempCustom), + options ); #ifdef MKTURNOUT if (doCustomInfoLine) #endif - fprintf( f, "\tU %s\n", customInfoP ); - WriteCompoundPathsEndPtsSegs( f, pp->paths, tempSegs_da.cnt, &tempSegs(0), tempEndPts_da.cnt, &tempEndPts(0) ); + fprintf( f, "\tU %s\n", customInfoP ); + WriteCompoundPathsEndPtsSegs( f, pp->paths, tempSegs_da.cnt, &tempSegs(0), + TempEndPtsCount(), TempEndPt(0) ); } break; case NTO_CURVED: @@ -2793,28 +3040,39 @@ static void NewTurnOk( void * context ) angles[5] = -angles[5]; angles[6] = -angles[6]; LoadSegs( curDesign, FALSE ); - tempEndPts(1).pos.y = - tempEndPts(1).pos.y; - tempEndPts(1).angle = 180.0 - tempEndPts(1).angle; - tempEndPts(2).pos.y = - tempEndPts(2).pos.y; - tempEndPts(2).angle = 180.0 - tempEndPts(2).angle; - BuildTrimedTitle( tempCustom, "\t", newTurnManufacturer, newTurnRightDesc, newTurnRightPartno ); - //tempSegs_da.cnt = segCnt; + pos = GetEndPtPos(TempEndPt(1)); + angle = GetEndPtAngle(TempEndPt(1)); + pos.y = - pos.y; + angle = 180.0 - angle; + SetEndPt( TempEndPt(1), pos, angle ); + pos = GetEndPtPos(TempEndPt(2)); + angle = GetEndPtAngle(TempEndPt(2)); + pos.y = - pos.y; + angle = 180.0 - angle; + SetEndPt( TempEndPt(2), pos, angle ); + BuildTrimedTitle( tempCustom, "\t", newTurnManufacturer, newTurnRightDesc, + newTurnRightPartno ); #ifndef MKTURNOUT - if (includeNontrackSegments && customTurnout2) + if (includeNontrackSegments && customTurnout2) { CopyNonTracks( customTurnout2 ); - if ( customTurnout2 ) + } + if ( customTurnout2 ) { customTurnout2->segCnt = 0; - to = CreateNewTurnout( newTurnScaleName, tempCustom, tempSegs_da.cnt, &tempSegs(0), - pp->paths, tempEndPts_da.cnt, &tempEndPts(0), FALSE, options ); + } + to = CreateNewTurnout( newTurnScaleName, tempCustom, tempSegs_da.cnt, + &tempSegs(0), + pp->paths, TempEndPtsCount(), TempEndPt(0), FALSE, options ); to->customInfo = customInfoP; #endif if (f) { - fprintf( f, "TURNOUT %s \"%s\" %ld\n", newTurnScaleName, PutTitle(tempCustom), options ); + fprintf( f, "TURNOUT %s \"%s\" %ld\n", newTurnScaleName, PutTitle(tempCustom), + options ); #ifdef MKTURNOUT if (doCustomInfoLine) #endif - fprintf( f, "\tU %s\n", customInfoP ); - WriteCompoundPathsEndPtsSegs( f, pp->paths, tempSegs_da.cnt, &tempSegs(0), tempEndPts_da.cnt, &tempEndPts(0) ); + fprintf( f, "\tU %s\n", customInfoP ); + WriteCompoundPathsEndPtsSegs( f, pp->paths, tempSegs_da.cnt, &tempSegs(0), + TempEndPtsCount(), TempEndPt(0) ); } break; default: @@ -2823,8 +3081,9 @@ static void NewTurnOk( void * context ) tempCustom[0] = '\0'; #ifndef MKTURNOUT - if (f) + if (f) { fclose(f); + } SetUserLocale(); includeNontrackSegments = TRUE; wHide( newTurnW ); @@ -2848,15 +3107,16 @@ static wWinPix_t turnDesignWidth; static wWinPix_t turnDesignHeight; static void TurnDesignLayout( - paramData_t * pd, - int index, - wWinPix_t colX, - wWinPix_t * w, - wWinPix_t * h ) + paramData_t * pd, + int index, + wWinPix_t colX, + wWinPix_t * w, + wWinPix_t * h ) { wIndex_t inx; - if ( curDesign == NULL ) + if ( curDesign == NULL ) { return; + } if ( index >= I_TO_FIRST_FLOAT && index <= I_TO_LAST_FLOAT ) { for ( inx=0; inx<curDesign->floatCnt; inx++ ) { if ( index == curDesign->floats[inx].index ) { @@ -2865,7 +3125,7 @@ static void TurnDesignLayout( return; } } - AbortProg( "turnDesignLayout: bad index = %d", index ); + CHECKMSG( FALSE, ( "turnDesignLayout: bad index = %d", index ) ); } else if ( index == I_TOMANUF ) { *h = turnDesignHeight + 10; } @@ -2881,18 +3141,21 @@ static void SetupTurnoutDesignerW( toDesignDesc_t * newDesign ) if ( newTurnW == NULL ) { partnoWidth = wLabelWidth( "999-99999-9999" ); turnDesignPLs[I_TOLDESC+1].winData = - turnDesignPLs[I_TORDESC+1].winData = - I2VP(partnoWidth); + turnDesignPLs[I_TORDESC+1].winData = + I2VP(partnoWidth); partnoWidth += wLabelWidth( " # " ); - newTurnW = ParamCreateDialog( &turnDesignPG, _("Turnout Designer"), _("Print"), NewTurnPrint, NewTurnCancel, TRUE, TurnDesignLayout, F_BLOCK, NULL ); + newTurnW = ParamCreateDialog( &turnDesignPG, _("Turnout Designer"), _("Print"), + NewTurnPrint, NewTurnCancel, TRUE, TurnDesignLayout, F_BLOCK, NULL ); for ( inx=0; inx<COUNT( designDescs ); inx++ ) { - designDescs[inx]->lineC = wLineCreate( turnDesignPG.win, NULL, designDescs[inx]->lineCnt, designDescs[inx]->lines ); + designDescs[inx]->lineC = wLineCreate( turnDesignPG.win, NULL, + designDescs[inx]->lineCnt, designDescs[inx]->lines ); wControlShow( (wControl_p)designDescs[inx]->lineC, FALSE ); } } if ( curDesign != newDesign ) { - if ( curDesign ) + if ( curDesign ) { wControlShow( (wControl_p)curDesign->lineC, FALSE ); + } curDesign = newDesign; sprintf( message, _("%s %s Designer"), sProdName, _(curDesign->label) ); wWinSetTitle( newTurnW, message ); @@ -2902,7 +3165,8 @@ static void SetupTurnoutDesignerW( toDesignDesc_t * newDesign ) } for ( inx=0; inx<curDesign->floatCnt; inx++ ) { turnDesignPLs[curDesign->floats[inx].index].option &= ~PDO_DLGIGNORE; - wControlSetLabel( turnDesignPLs[curDesign->floats[inx].index].control, _(curDesign->floats[inx].winLabel) ); + wControlSetLabel( turnDesignPLs[curDesign->floats[inx].index].control, + _(curDesign->floats[inx].winLabel) ); wControlShow( turnDesignPLs[curDesign->floats[inx].index].control, TRUE ); } wControlShow( turnDesignPLs[I_TORDESC+0].control, curDesign->strCnt>1 ); @@ -2910,24 +3174,30 @@ static void SetupTurnoutDesignerW( toDesignDesc_t * newDesign ) wControlShow( (wControl_p)curDesign->lineC, TRUE ); turnDesignWidth = turnDesignHeight = 0; - for (inx=0;inx<curDesign->lineCnt;inx++) { - if (curDesign->lines[inx].x0 > turnDesignWidth) + for (inx=0; inx<curDesign->lineCnt; inx++) { + if (curDesign->lines[inx].x0 > turnDesignWidth) { turnDesignWidth = curDesign->lines[inx].x0; - if (curDesign->lines[inx].x1 > turnDesignWidth) + } + if (curDesign->lines[inx].x1 > turnDesignWidth) { turnDesignWidth = curDesign->lines[inx].x1; - if (curDesign->lines[inx].y0 > turnDesignHeight) + } + if (curDesign->lines[inx].y0 > turnDesignHeight) { turnDesignHeight = curDesign->lines[inx].y0; - if (curDesign->lines[inx].y1 > turnDesignHeight) + } + if (curDesign->lines[inx].y1 > turnDesignHeight) { turnDesignHeight = curDesign->lines[inx].y1; + } } ctlH = wControlGetHeight( turnDesignPLs[I_TO_FIRST_FLOAT].control ); for ( inx=0; inx<curDesign->floatCnt; inx++ ) { w = curDesign->floats[inx].pos.x + 80; h = curDesign->floats[inx].pos.y + ctlH; - if (turnDesignWidth < w) + if (turnDesignWidth < w) { turnDesignWidth = w; - if (turnDesignHeight < h) + } + if (turnDesignHeight < h) { turnDesignHeight = h; + } } if ( curDesign->strCnt > 1 ) { w = wLabelWidth( _("Right Description") ); @@ -2966,22 +3236,22 @@ static void SetupTurnoutDesignerW( toDesignDesc_t * newDesign ) curDesign->type == NTO_CORNUWYE || curDesign->type == NTO_CORNU3WAY ) { turnDesignPLs[I_TOOFFSET+0].winData = - turnDesignPLs[I_TOOFFSET+1].winData = - turnDesignPLs[I_TOOFFSET+2].winData = - turnDesignPLs[I_TOOFFSET+3].winData = &r_10000_10000; + turnDesignPLs[I_TOOFFSET+1].winData = + turnDesignPLs[I_TOOFFSET+2].winData = + turnDesignPLs[I_TOOFFSET+3].winData = &r_10000_10000; turnDesignPLs[I_TOANGLE+0].winData = - turnDesignPLs[I_TOANGLE+1].winData = - turnDesignPLs[I_TOANGLE+2].winData = - turnDesignPLs[I_TOANGLE+3].winData = &r_90_90; + turnDesignPLs[I_TOANGLE+1].winData = + turnDesignPLs[I_TOANGLE+2].winData = + turnDesignPLs[I_TOANGLE+3].winData = &r_90_90; } else { turnDesignPLs[I_TOOFFSET+0].winData = - turnDesignPLs[I_TOOFFSET+1].winData = - turnDesignPLs[I_TOOFFSET+2].winData = - turnDesignPLs[I_TOOFFSET+3].winData = &r0d001_10000; + turnDesignPLs[I_TOOFFSET+1].winData = + turnDesignPLs[I_TOOFFSET+2].winData = + turnDesignPLs[I_TOOFFSET+3].winData = &r0d001_10000; turnDesignPLs[I_TOANGLE+0].winData = - turnDesignPLs[I_TOANGLE+1].winData = - turnDesignPLs[I_TOANGLE+2].winData = - turnDesignPLs[I_TOANGLE+3].winData = &r0d001_90; + turnDesignPLs[I_TOANGLE+1].winData = + turnDesignPLs[I_TOANGLE+2].winData = + turnDesignPLs[I_TOANGLE+3].winData = &r0d001_90; } ParamLayoutDialog( &turnDesignPG ); } @@ -2991,12 +3261,15 @@ static void SetupTurnoutDesignerW( toDesignDesc_t * newDesign ) static void ShowTurnoutDesigner( void * context ) { wBool_t sameTurnout = FALSE; - if (recordF) - fprintf( recordF, TURNOUTDESIGNER " SHOW %s\n", ((toDesignDesc_t*)context)->label ); + if (recordF) { + fprintf( recordF, TURNOUTDESIGNER " SHOW %s\n", + ((toDesignDesc_t*)context)->label ); + } newTurnScaleName = curScaleName; newTurnTrackGauge = trackGauge; - if (context && (curDesign == context)) + if (context && (curDesign == context)) { sameTurnout = TRUE; + } SetupTurnoutDesignerW( (toDesignDesc_t*)context ); if (!sameTurnout) { /* Clear Values unless same as last time */ newTurnRightDesc[0] = '\0'; @@ -3004,10 +3277,10 @@ static void ShowTurnoutDesigner( void * context ) newTurnLeftDesc[0] = '\0'; newTurnLeftPartno[0] = '\0'; newTurnOff0 = newTurnLen0 = newTurnAngle0 = newTurnRad0 = - newTurnOff1 = newTurnLen1 = newTurnAngle1 = newTurnRad1 = - newTurnOff2 = newTurnLen2 = newTurnAngle2 = newTurnRad2 = - newTurnOff3 = newTurnLen3 = newTurnAngle3 = newTurnRad3 = - newTurnToeL = newTurnToeR = 0.0; + newTurnOff1 = newTurnLen1 = newTurnAngle1 = newTurnRad1 = + newTurnOff2 = newTurnLen2 = newTurnAngle2 = newTurnRad2 = + newTurnOff3 = newTurnLen3 = newTurnAngle3 = newTurnRad3 = + newTurnToeL = newTurnToeR = 0.0; } ParamLoadControls( &turnDesignPG ); ParamGroupRecord( &turnDesignPG ); @@ -3031,18 +3304,21 @@ EXPORT void EditCustomTurnout( turnoutInfo_t * to, turnoutInfo_t * to1 ) long rgb; trkSeg_p sp0, sp1; BOOL_T segsDiff; - DIST_T width; + LWIDTH_T lineWidth; - if ( ! GetArgs( to->customInfo, "qqqqqc", &type, &name, &mfg, &descL, &partL, &cp ) ) + if ( ! GetArgs( to->customInfo, "qqqqqc", &type, &name, &mfg, &descL, &partL, + &cp ) ) { return; + } for ( i=0; i<COUNT( designDescs ); i++ ) { dp = designDescs[i]; if ( strcmp( type, dp->label ) == 0 ) { break; } } - if ( i >= COUNT( designDescs ) ) + if ( i >= COUNT( designDescs ) ) { return; + } SetupTurnoutDesignerW(dp); newTurnTrackGauge = GetScaleTrackGauge( to->scaleInx ); @@ -3050,25 +3326,30 @@ EXPORT void EditCustomTurnout( turnoutInfo_t * to, turnoutInfo_t * to1 ) strcpy( newTurnManufacturer, mfg ); strcpy( newTurnLeftDesc, descL ); strcpy( newTurnLeftPartno, partL ); - if (dp->type == NTO_REGULAR || dp->type == NTO_CURVED || dp->type == NTO_CORNU) { - if ( ! GetArgs( cp, "qqc", &descR, &partR, &cp )) + if (dp->type == NTO_REGULAR || dp->type == NTO_CURVED + || dp->type == NTO_CORNU) { + if ( ! GetArgs( cp, "qqc", &descR, &partR, &cp )) { return; + } strcpy( newTurnRightDesc, descR ); strcpy( newTurnRightPartno, partR ); } else { descR = partR = ""; } for ( i=0; i<dp->floatCnt; i++ ) { - if ( ! GetArgs( cp, "fc", turnDesignPLs[dp->floats[i].index].valueP, &cp ) ) + if ( ! GetArgs( cp, "fc", turnDesignPLs[dp->floats[i].index].valueP, &cp ) ) { return; + } switch (dp->floats[i].mode) { case Dim_e: /* *dp->floats[i].valueP = PutDim( *dp->floats[i].valueP ); */ break; case Frog_e: if (newTurnAngleMode == 0) { - if ( *(FLOAT_T*)(turnDesignPLs[dp->floats[i].index].valueP) > 0.0 ) - *(FLOAT_T*)(turnDesignPLs[dp->floats[i].index].valueP) = 1.0/sin(D2R(*(FLOAT_T*)(turnDesignPLs[dp->floats[i].index].valueP))); + if ( *(FLOAT_T*)(turnDesignPLs[dp->floats[i].index].valueP) > 0.0 ) { + *(FLOAT_T*)(turnDesignPLs[dp->floats[i].index].valueP) = 1.0/sin(D2R(* + (FLOAT_T*)(turnDesignPLs[dp->floats[i].index].valueP))); + } } break; case Angle_e: @@ -3078,13 +3359,13 @@ EXPORT void EditCustomTurnout( turnoutInfo_t * to, turnoutInfo_t * to1 ) } } rgb = 0; - if ( cp && GetArgs( cp, "ffl", &newTurnRoadbedWidth, &width, &rgb ) ) { - roadbedColor = wDrawFindColor(rgb); - newTurnRoadbedLineWidth = (long)floor(width*mainD.dpi+0.5); + if ( cp && GetArgs( cp, "ffl", &newTurnRoadbedWidth, &lineWidth, &rgb ) ) { + newTurnRoadbedColor = wDrawFindColor(rgb); + newTurnRoadbedLineWidth = lineWidth; } else { newTurnRoadbedWidth = 0; newTurnRoadbedLineWidth = 0; - roadbedColor = wDrawColorBlack; + newTurnRoadbedColor = wDrawColorBlack; } customTurnout1 = to; @@ -3095,28 +3376,31 @@ EXPORT void EditCustomTurnout( turnoutInfo_t * to, turnoutInfo_t * to1 ) LoadSegs( dp, TRUE ); segsDiff = FALSE; if ( to->segCnt == tempSegs_da.cnt ) { - for ( sp0=to->segs,sp1=&tempSegs(0); (!segsDiff) && sp0<&to->segs[to->segCnt]; sp0++,sp1++ ) { + for ( sp0=to->segs,sp1=&tempSegs(0); (!segsDiff) + && sp0<&to->segs[to->segCnt]; sp0++,sp1++ ) { switch (sp0->type) { case SEG_STRLIN: if (sp0->type != sp1->type || - sp0->color != sp1->color || - NotClose(sp0->width-width) || - NotClose(sp0->u.l.pos[0].x-sp1->u.l.pos[0].x) || - NotClose(sp0->u.l.pos[0].y-sp1->u.l.pos[0].y) || - NotClose(sp0->u.l.pos[1].x-sp1->u.l.pos[1].x) || - NotClose(sp0->u.l.pos[1].y-sp1->u.l.pos[1].y) ) - segsDiff = TRUE; + sp0->color != sp1->color || + NotClose(sp0->lineWidth-lineWidth) || + NotClose(sp0->u.l.pos[0].x-sp1->u.l.pos[0].x) || + NotClose(sp0->u.l.pos[0].y-sp1->u.l.pos[0].y) || + NotClose(sp0->u.l.pos[1].x-sp1->u.l.pos[1].x) || + NotClose(sp0->u.l.pos[1].y-sp1->u.l.pos[1].y) ) { + segsDiff = TRUE; + } break; case SEG_CRVLIN: if (sp0->type != sp1->type || - sp0->color != sp1->color || - NotClose(sp0->width-width) || - NotClose(sp0->u.c.center.x-sp1->u.c.center.x) || - NotClose(sp0->u.c.center.y-sp1->u.c.center.y) || - NotClose(sp0->u.c.radius-sp1->u.c.radius) || - NotClose(sp0->u.c.a0-sp1->u.c.a0) || - NotClose(sp0->u.c.a1-sp1->u.c.a1) ) - segsDiff = TRUE; + sp0->color != sp1->color || + NotClose(sp0->lineWidth-lineWidth) || + NotClose(sp0->u.c.center.x-sp1->u.c.center.x) || + NotClose(sp0->u.c.center.y-sp1->u.c.center.y) || + NotClose(sp0->u.c.radius-sp1->u.c.radius) || + NotClose(sp0->u.c.a0-sp1->u.c.a0) || + NotClose(sp0->u.c.a1-sp1->u.c.a1) ) { + segsDiff = TRUE; + } break; case SEG_STRTRK: case SEG_CRVTRK: @@ -3128,12 +3412,15 @@ EXPORT void EditCustomTurnout( turnoutInfo_t * to, turnoutInfo_t * to1 ) } } else { for ( sp0=to->segs; (!segsDiff) && sp0<&to->segs[to->segCnt]; sp0++ ) { - if ( sp0->type != SEG_STRTRK && sp0->type != SEG_CRVTRK && sp0->type != SEG_BEZTRK) + if ( sp0->type != SEG_STRTRK && sp0->type != SEG_CRVTRK + && sp0->type != SEG_BEZTRK) { segsDiff = TRUE; + } } } } - if ( (!segsDiff) && to1 && (dp->type==NTO_REGULAR||dp->type==NTO_CURVED||dp->type == NTO_CORNU) ) { + if ( (!segsDiff) && to1 && (dp->type==NTO_REGULAR||dp->type==NTO_CURVED + ||dp->type == NTO_CORNU) ) { if ( dp->type==NTO_REGULAR ) { points[2].y = - points[2].y; radii[0] = - radii[0]; @@ -3169,28 +3456,31 @@ EXPORT void EditCustomTurnout( turnoutInfo_t * to, turnoutInfo_t * to1 ) } segsDiff = FALSE; if ( to1->segCnt == tempSegs_da.cnt ) { - for ( sp0=to1->segs,sp1=&tempSegs(0); (!segsDiff) && sp0<&to1->segs[to1->segCnt]; sp0++,sp1++ ) { + for ( sp0=to1->segs,sp1=&tempSegs(0); (!segsDiff) + && sp0<&to1->segs[to1->segCnt]; sp0++,sp1++ ) { switch (sp0->type) { case SEG_STRLIN: if (sp0->type != sp1->type || - sp0->color != sp1->color || - NotClose(sp0->width-width) || - NotClose(sp0->u.l.pos[0].x-sp1->u.l.pos[0].x) || - NotClose(sp0->u.l.pos[0].y-sp1->u.l.pos[0].y) || - NotClose(sp0->u.l.pos[1].x-sp1->u.l.pos[1].x) || - NotClose(sp0->u.l.pos[1].y-sp1->u.l.pos[1].y) ) - segsDiff = TRUE; + sp0->color != sp1->color || + NotClose(sp0->lineWidth-lineWidth) || + NotClose(sp0->u.l.pos[0].x-sp1->u.l.pos[0].x) || + NotClose(sp0->u.l.pos[0].y-sp1->u.l.pos[0].y) || + NotClose(sp0->u.l.pos[1].x-sp1->u.l.pos[1].x) || + NotClose(sp0->u.l.pos[1].y-sp1->u.l.pos[1].y) ) { + segsDiff = TRUE; + } break; case SEG_CRVLIN: if (sp0->type != sp1->type || - sp0->color != sp1->color || - NotClose(sp0->width-width) || - NotClose(sp0->u.c.center.x-sp1->u.c.center.x) || - NotClose(sp0->u.c.center.y-sp1->u.c.center.y) || - NotClose(sp0->u.c.radius-sp1->u.c.radius) || - NotClose(sp0->u.c.a0-sp1->u.c.a0) || - NotClose(sp0->u.c.a1-sp1->u.c.a1) ) - segsDiff = TRUE; + sp0->color != sp1->color || + NotClose(sp0->lineWidth-lineWidth) || + NotClose(sp0->u.c.center.x-sp1->u.c.center.x) || + NotClose(sp0->u.c.center.y-sp1->u.c.center.y) || + NotClose(sp0->u.c.radius-sp1->u.c.radius) || + NotClose(sp0->u.c.a0-sp1->u.c.a0) || + NotClose(sp0->u.c.a1-sp1->u.c.a1) ) { + segsDiff = TRUE; + } break; case SEG_STRTRK: case SEG_CRVTRK: @@ -3202,8 +3492,10 @@ EXPORT void EditCustomTurnout( turnoutInfo_t * to, turnoutInfo_t * to1 ) } } else { for ( sp0=to1->segs; (!segsDiff) && sp0<&to1->segs[to1->segCnt]; sp0++ ) { - if ( sp0->type != SEG_STRTRK && sp0->type != SEG_CRVTRK && sp0->type != SEG_BEZTRK) + if ( sp0->type != SEG_STRTRK && sp0->type != SEG_CRVTRK + && sp0->type != SEG_BEZTRK) { segsDiff = TRUE; + } } } } @@ -3230,12 +3522,13 @@ EXPORT void InitNewTurn( wMenu_p m ) ParamRegister( &turnDesignPG ); for ( i=0; i<COUNT( designDescs ); i++ ) { wMenuPushCreate( m, NULL, _(designDescs[i]->label), 0, - ShowTurnoutDesigner, designDescs[i] ); + ShowTurnoutDesigner, designDescs[i] ); sprintf( message, "%s SHOW %s", TURNOUTDESIGNER, designDescs[i]->label ); AddPlaybackProc( message, (playbackProc_p)ShowTurnoutDesigner, designDescs[i] ); } - roadbedColor = wDrawColorBlack; + newTurnRoadbedColor = wDrawColorBlack; includeNontrackSegments = TRUE; + log_cornuturnoutdesigner = LogFindIndex( "cornuturnoutdesigner" ); } #endif @@ -3247,19 +3540,30 @@ char * curScaleName; double trackGauge; long units = 0; wDrawColor drawColorBlack; -long roadbedColorRGB = 0; +long newTurnRoadbedColorRGB = 0; -EXPORT void AbortProg( - const char * msg, - ... ) +EXPORT const char * AbortMessage( + const char * sFormat, + ... ) { - static BOOL_T abort2 = FALSE; -// int rc; + static char sMessage[STR_SIZE]; + if ( sFormat == NULL ) { + return ""; + } va_list ap; - va_start( ap, msg ); - vsprintf( message, msg, ap ); - va_end( ap ); - fprintf( stderr, "%s", message ); + va_start(ap, sFormat); + vsnprintf(sMessage, sizeof sMessage, sFormat, ap); + va_end(ap); + return sMessage; +} + +EXPORT void AbortProg( + const char * sCond, + const char * sFileName, + int iLineNumber, + const char * sMsg ) +{ + fprintf( stderr, "%s: %s:%d %s", sCond, sFileName, iLineNumber, sMsg ); abort(); } @@ -3276,6 +3580,11 @@ EXPORT char * MyStrdup( const char * str ) return ret; } +EXPORT void LogPrintf( + const char * format, + ... ) +{ +} int NoticeMessage( const char * msg, const char * yes, const char * no, ... ) { @@ -3293,10 +3602,10 @@ void wPrintSetup( wPrintSetupCallBack_p notused ) } EXPORT void ComputeCurvedSeg( - trkSeg_p s, - DIST_T radius, - coOrd p0, - coOrd p1 ) + trkSeg_p s, + DIST_T radius, + coOrd p0, + coOrd p1 ) { DIST_T d; ANGLE_T a, aa, aaa; @@ -3321,14 +3630,16 @@ EXPORT void ComputeCurvedSeg( EXPORT char * Strcpytrimed( char * dst, const char * src, BOOL_T double_quotes ) { const char * cp; - while (*src && isspace((unsigned char)*src) ) src++; - if (!*src) + while (*src && isspace((unsigned char)*src) ) { src++; } + if (!*src) { return dst; + } cp = src+strlen(src)-1; - while ( cp>src && isspace((unsigned char)*cp) ) cp--; + while ( cp>src && isspace((unsigned char)*cp) ) { cp--; } while ( src<=cp ) { - if (*src == '"' && double_quotes) + if (*src == '"' && double_quotes) { *dst++ = '"'; + } *dst++ = *src++; } *dst = '\0'; @@ -3336,17 +3647,6 @@ EXPORT char * Strcpytrimed( char * dst, const char * src, BOOL_T double_quotes ) } -EXPORT char * BuildTrimedTitle( char * cp, const char * sep, const char * mfg, const char * desc, const char * partno ) -{ - cp = Strcpytrimed( cp, mfg, FALSE ); - strcpy( cp, sep ); - cp += strlen(cp); - cp = Strcpytrimed( cp, desc, FALSE ); - strcpy( cp, sep ); - cp += strlen(cp); - cp = Strcpytrimed( cp, partno, FALSE ); - return cp; -} EXPORT char * PutTitle( char * cp ) @@ -3368,15 +3668,15 @@ EXPORT char * PutTitle( char * cp ) long wDrawGetRGB( - wDrawColor color ) + wDrawColor color ) { - return roadbedColorRGB; + return newTurnRoadbedColorRGB; } EXPORT BOOL_T WriteSegs( - FILE * f, - wIndex_t segCnt, - trkSeg_p segs ) + FILE * f, + wIndex_t segCnt, + trkSeg_p segs ) { int i, j; BOOL_T rc = TRUE; @@ -3385,32 +3685,34 @@ EXPORT BOOL_T WriteSegs( case SEG_STRLIN: case SEG_STRTRK: rc &= fprintf( f, "\t%c %ld %0.6f %0.6f %0.6f %0.6f %0.6f\n", - segs[i].type, (segs[i].type==SEG_STRTRK?0:roadbedColorRGB), segs[i].width, - segs[i].u.l.pos[0].x, segs[i].u.l.pos[0].y, - segs[i].u.l.pos[1].x, segs[i].u.l.pos[1].y )>0; + segs[i].type, (segs[i].type==SEG_STRTRK?0:newTurnRoadbedColorRGB), + segs[i].lineWidth, + segs[i].u.l.pos[0].x, segs[i].u.l.pos[0].y, + segs[i].u.l.pos[1].x, segs[i].u.l.pos[1].y )>0; break; case SEG_CRVTRK: case SEG_CRVLIN: rc &= fprintf( f, "\t%c %ld %0.6f %0.6f %0.6f %0.6f %0.6f %0.6f\n", - segs[i].type, (segs[i].type==SEG_CRVTRK?0:roadbedColorRGB), segs[i].width, - fabs(segs[i].u.c.radius), - segs[i].u.c.center.x, segs[i].u.c.center.y, - segs[i].u.c.a0, segs[i].u.c.a1 )>0; + segs[i].type, (segs[i].type==SEG_CRVTRK?0:newTurnRoadbedColorRGB), + segs[i].lineWidth, + fabs(segs[i].u.c.radius), + segs[i].u.c.center.x, segs[i].u.c.center.y, + segs[i].u.c.a0, segs[i].u.c.a1 )>0; break; case SEG_FILCRCL: rc &= fprintf( f, "\t%c %ld %0.6f %0.6f %0.6f %0.6f\n", - segs[i].type, roadbedColorRGB, segs[i].width, - fabs(segs[i].u.c.radius), - segs[i].u.c.center.x, segs[i].u.c.center.y )>0; + segs[i].type, newTurnRoadbedColorRGB, segs[i].lineWidth, + fabs(segs[i].u.c.radius), + segs[i].u.c.center.x, segs[i].u.c.center.y )>0; break; case SEG_POLY: case SEG_FILPOLY: rc &= fprintf( f, "\t%c %ld %0.6f %d\n", - segs[i].type, roadbedColorRGB, segs[i].width, - segs[i].u.p.cnt )>0; + segs[i].type, newTurnRoadbedColorRGB, segs[i].lineWidth, + segs[i].u.p.cnt )>0; for ( j=0; j<segs[i].u.p.cnt; j++ ) rc &= fprintf( f, "\t\t%0.6f %0.6f\n", - segs[i].u.p.pts[j].pt.x, segs[i].u.p.pts[j].pt.y )>0; + segs[i].u.p.pts[j].pt.x, segs[i].u.p.pts[j].pt.y )>0; break; } } @@ -3419,28 +3721,32 @@ EXPORT BOOL_T WriteSegs( } BOOL_T WriteCompoundPathsEndPtsSegs( - FILE * f, - PATHPTR_T paths, - wIndex_t segCnt, - trkSeg_p segs, - EPINX_T endPtCnt, - trkEndPt_t * endPts ) + FILE * f, + PATHPTR_T paths, + wIndex_t segCnt, + trkSeg_p segs, + EPINX_T endPtCnt, + trkEndPt_p endPts ) { int i; PATHPTR_T pp; BOOL_T rc = TRUE; for ( pp=paths; *pp; pp+=2 ) { rc &= fprintf( f, "\tP \"%s\"", (char*)pp )>0; - for ( pp+=strlen((char*)pp)+1; pp[0]!=0||pp[1]!=0; pp++ ) + for ( pp+=strlen((char*)pp)+1; pp[0]!=0||pp[1]!=0; pp++ ) { rc &= fprintf( f, " %d", *pp )>0; + } rc &= fprintf( f, "\n" )>0; } for ( i=0; i<endPtCnt; i++ ) rc &= fprintf( f, "\tE %0.6f %0.6f %0.6f\n", - endPts[i].pos.x, endPts[i].pos.y, endPts[i].angle )>0; + GetEndPtPos(EndPtIndex(endPts,i)).x, + GetEndPtPos(EndPtIndex(endPts,i)).y, + GetEndPtAngle(EndPtIndex(endPts,i)) )>0; #ifdef MKTURNOUT - if ( specialLine[0] ) + if ( specialLine[0] ) { rc &= fprintf( f, "%s\n", specialLine ); + } #endif rc &= WriteSegs( f, segCnt, segs ); return rc; @@ -3450,39 +3756,40 @@ BOOL_T WriteCompoundPathsEndPtsSegs( void Usage( int argc, char **argv ) { int inx; - for (inx=1;inx<argc;inx++) + for (inx=1; inx<argc; inx++) { fprintf( stderr, "%s ", argv[inx] ); + } fprintf( stderr, -"\nUsage: [-m] [-u] [-r#] [-c#] [-l#]\n" -" <SCL> <MNF> B <DSC> <PNO> <LEN> # Create bumper\n" -" <SCL> <MNF> S <DSC> <PNO> <LEN> # Create straight track\n" -" <SCL> <MNF> J <DSC> <PNO> <LEN1> <LEN2> # Create adjustable track\n" -" <SCL> <MNF> C <DSC> <PNO> <RAD> <ANG> # Create curved track\n" -" <SCL> <MNF> R <LDSC> <LPNO> <RDSC> <RPNO> <LEN2> <ANG> <OFF> <LEN1> # Create Regular Turnout\n" -" <SCL> <MNF> Q <LDSC> <LPNO> <RDSC> <RPNO> <RAD> <ANG> <LEN> # Create Radial Turnout\n" -" <SCL> <MNF> V <LDSC> <LPNO> <RDSC> <RPNO> <LEN1> <ANG1> <OFF1> <LEN2> <ANG2> <OFF2> # Create Curved Turnout\n" -" <SCL> <MNF> W <LDSC> <LPNO> <RDSC> <RPNO> <RAD1> <ANG2> <RAD2> <ANG2> # Create Radial Curved Turnout\n" -" <SCL> <MNF> Y <LDSC> <LPNO> <RDSC> <RPNO> <LENL> <ANGL> <OFFL> <LENR> <ANGR> <OFFR> # Create Wye Turnout\n" -" <SCL> <MNF> 3 <DSC> <PNO> <LEN0> <LENL> <ANGL> <OFFL> <LENR> <ANGR> <OFFR> # Create 3-Way Turnout\n" -" <SCL> <MNF> X <DSC> <PNO> <LEN1> <ANG> <LEN2> # Create Crossing\n" -" <SCL> <MNF> 1 <DSC> <PNO> <LEN1> <ANG> <LEN2> # Create Single Slipswitch\n" -" <SCL> <MNF> 2 <DSC> <PNO> <LEN1> <ANG> <LEN2> # Create Double Slipswitch\n" -" <SCL> <MNF> D <DSC> <PNO> <LEN> <OFF> # Create Double Crossover\n" -" <SCL> <MNF> T <DSC> <PNO> <CNT> <IN-DIAM> <OUT-DIAM> # Create TurnTable\n" -); - exit(1); + "\nUsage: [-m] [-u] [-r#] [-c#] [-l#]\n" + " <SCL> <MNF> B <DSC> <PNO> <LEN> # Create bumper\n" + " <SCL> <MNF> S <DSC> <PNO> <LEN> # Create straight track\n" + " <SCL> <MNF> J <DSC> <PNO> <LEN1> <LEN2> # Create adjustable track\n" + " <SCL> <MNF> C <DSC> <PNO> <RAD> <ANG> # Create curved track\n" + " <SCL> <MNF> R <LDSC> <LPNO> <RDSC> <RPNO> <LEN2> <ANG> <OFF> <LEN1> # Create Regular Turnout\n" + " <SCL> <MNF> Q <LDSC> <LPNO> <RDSC> <RPNO> <RAD> <ANG> <LEN> # Create Radial Turnout\n" + " <SCL> <MNF> V <LDSC> <LPNO> <RDSC> <RPNO> <LEN1> <ANG1> <OFF1> <LEN2> <ANG2> <OFF2> # Create Curved Turnout\n" + " <SCL> <MNF> W <LDSC> <LPNO> <RDSC> <RPNO> <RAD1> <ANG2> <RAD2> <ANG2> # Create Radial Curved Turnout\n" + " <SCL> <MNF> Y <LDSC> <LPNO> <RDSC> <RPNO> <LENL> <ANGL> <OFFL> <LENR> <ANGR> <OFFR> # Create Wye Turnout\n" + " <SCL> <MNF> 3 <DSC> <PNO> <LEN0> <LENL> <ANGL> <OFFL> <LENR> <ANGR> <OFFR> # Create 3-Way Turnout\n" + " <SCL> <MNF> X <DSC> <PNO> <LEN1> <ANG> <LEN2> # Create Crossing\n" + " <SCL> <MNF> 1 <DSC> <PNO> <LEN1> <ANG> <LEN2> # Create Single Slipswitch\n" + " <SCL> <MNF> 2 <DSC> <PNO> <LEN1> <ANG> <LEN2> # Create Double Slipswitch\n" + " <SCL> <MNF> D <DSC> <PNO> <LEN> <OFF> # Create Double Crossover\n" + " <SCL> <MNF> T <DSC> <PNO> <CNT> <IN-DIAM> <OUT-DIAM> # Create TurnTable\n" + ); + exit(1); } struct { - char * scale; - double trackGauge; - } scaleMap[] = { - { "N", 0.3531 }, - { "HO", 0.6486 }, - { "O", 1.1770 }, - { "HOm", 0.472440 }, - { "G", 1.770 } - }; + char * scale; + double trackGauge; +} scaleMap[] = { + { "N", 0.3531 }, + { "HO", 0.6486 }, + { "O", 1.1770 }, + { "HOm", 0.472440 }, + { "G", 1.770 } +}; @@ -3514,15 +3821,16 @@ int main ( int argc, char * argv[] ) break; case 'r': doRoadBed = TRUE; - if (argv[0][2] == '\0') + if (argv[0][2] == '\0') { Usage(argc0,argv0); + } newTurnRoadbedWidth = atof(&argv[0][2]); - roadbedColorRGB = 0; - roadbedColor = 0; + newTurnRoadbedColorRGB = 0; + newTurnRoadbedColor = 0; newTurnRoadbedLineWidth = 0; break; case 'c': - roadbedColorRGB = atol(&argv[0][2]); + newTurnRoadbedColorRGB = atol(&argv[0][2]); break; case 'l': newTurnRoadbedLineWidth = atol(&argv[0][2]); @@ -3550,7 +3858,7 @@ int main ( int argc, char * argv[] ) specialLine[0] = '\0'; switch (tolower((unsigned char)(*argv++)[0])) { case 'b': - if (argc != 7) Usage(argc0,argv0); + if (argc != 7) { Usage(argc0,argv0); } strcpy( newTurnLeftDesc, *argv++ ); strcpy( newTurnLeftPartno, *argv++ ); newTurnLen0 = GetDim(atof( *argv++ )); @@ -3558,7 +3866,7 @@ int main ( int argc, char * argv[] ) NewTurnOk( &StrSectionDesc ); break; case 's': - if (argc != 7) Usage(argc0,argv0); + if (argc != 7) { Usage(argc0,argv0); } strcpy( newTurnLeftDesc, *argv++ ); strcpy( newTurnLeftPartno, *argv++ ); newTurnLen0 = GetDim(atof( *argv++ )); @@ -3566,7 +3874,7 @@ int main ( int argc, char * argv[] ) NewTurnOk( &StrSectionDesc ); break; case 'j': - if (argc != 8) Usage(argc0,argv0); + if (argc != 8) { Usage(argc0,argv0); } strcpy( newTurnLeftDesc, *argv++ ); strcpy( newTurnLeftPartno, *argv++ ); newTurnLen0 = GetDim(atof( *argv++ )); @@ -3576,7 +3884,7 @@ int main ( int argc, char * argv[] ) NewTurnOk( &StrSectionDesc ); break; case 'c': - if (argc != 8) Usage(argc0,argv0); + if (argc != 8) { Usage(argc0,argv0); } strcpy( newTurnLeftDesc, *argv++ ); strcpy( newTurnLeftPartno, *argv++ ); newTurnLen0 = GetDim(atof( *argv++ )); @@ -3585,7 +3893,7 @@ int main ( int argc, char * argv[] ) NewTurnOk( &CrvSectionDesc ); break; case 'r': - if (argc != 12) Usage(argc0,argv0); + if (argc != 12) { Usage(argc0,argv0); } strcpy( newTurnLeftDesc, *argv++ ); strcpy( newTurnLeftPartno, *argv++ ); strcpy( newTurnRightDesc, *argv++ ); @@ -3598,7 +3906,7 @@ int main ( int argc, char * argv[] ) NewTurnOk( &RegDesc ); break; case 'q': - if (argc != 11) Usage(argc0,argv0); + if (argc != 11) { Usage(argc0,argv0); } strcpy( newTurnLeftDesc, *argv++ ); strcpy( newTurnLeftPartno, *argv++ ); strcpy( newTurnRightDesc, *argv++ ); @@ -3612,7 +3920,7 @@ int main ( int argc, char * argv[] ) NewTurnOk( &RegDesc ); break; case 'v': - if (argc != 14) Usage(argc0,argv0); + if (argc != 14) { Usage(argc0,argv0); } strcpy( newTurnLeftDesc, *argv++ ); strcpy( newTurnLeftPartno, *argv++ ); strcpy( newTurnRightDesc, *argv++ ); @@ -3627,7 +3935,7 @@ int main ( int argc, char * argv[] ) NewTurnOk( &CrvDesc ); break; case 'w': - if (argc != 12) Usage(argc0,argv0); + if (argc != 12) { Usage(argc0,argv0); } strcpy( newTurnLeftDesc, *argv++ ); strcpy( newTurnLeftPartno, *argv++ ); strcpy( newTurnRightDesc, *argv++ ); @@ -3644,7 +3952,7 @@ int main ( int argc, char * argv[] ) NewTurnOk( &CrvDesc ); break; case 'y': - if (argc != 14) Usage(argc0,argv0); + if (argc != 14) { Usage(argc0,argv0); } strcpy( newTurnLeftDesc, *argv++ ); strcpy( newTurnLeftPartno, *argv++ ); strcpy( newTurnRightDesc, *argv++ ); @@ -3659,7 +3967,7 @@ int main ( int argc, char * argv[] ) NewTurnOk( &WyeDesc ); break; case '3': - if (argc != 13) Usage(argc0,argv0); + if (argc != 13) { Usage(argc0,argv0); } strcpy( newTurnLeftDesc, *argv++ ); strcpy( newTurnLeftPartno, *argv++ ); newTurnLen2 = GetDim(atof( *argv++ )); @@ -3673,7 +3981,7 @@ int main ( int argc, char * argv[] ) NewTurnOk( &ThreewayDesc ); break; case 'x': - if (argc<9) Usage(argc0,argv0); + if (argc<9) { Usage(argc0,argv0); } strcpy( newTurnLeftDesc, *argv++ ); strcpy( newTurnLeftPartno, *argv++ ); newTurnLen0 = GetDim(atof( *argv++ )); @@ -3683,7 +3991,7 @@ int main ( int argc, char * argv[] ) NewTurnOk( &CrossingDesc ); break; case '1': - if (argc<9) Usage(argc0,argv0); + if (argc<9) { Usage(argc0,argv0); } strcpy( newTurnLeftDesc, *argv++ ); strcpy( newTurnLeftPartno, *argv++ ); newTurnLen0 = GetDim(atof( *argv++ )); @@ -3695,7 +4003,7 @@ int main ( int argc, char * argv[] ) case '2': strcpy( newTurnLeftDesc, *argv++ ); strcpy( newTurnLeftPartno, *argv++ ); - if (argc<9) Usage(argc0,argv0); + if (argc<9) { Usage(argc0,argv0); } newTurnLen0 = GetDim(atof( *argv++ )); newTurnAngle0 = atof( *argv++ ); newTurnLen1 = GetDim(atof( *argv++ )); @@ -3705,7 +4013,7 @@ int main ( int argc, char * argv[] ) case 'd': strcpy( newTurnLeftDesc, *argv++ ); strcpy( newTurnLeftPartno, *argv++ ); - if (argc<8) Usage(argc0,argv0); + if (argc<8) { Usage(argc0,argv0); } newTurnLen0 = GetDim(atof( *argv++ )); newTurnOff0 = GetDim(atof( *argv++ )); curDesign = &DoubleCrossoverDesc; @@ -3714,17 +4022,19 @@ int main ( int argc, char * argv[] ) case 't': strcpy( newTurnLeftDesc, *argv++ ); strcpy( newTurnLeftPartno, *argv++ ); - if (argc<9) Usage(argc0,argv0); + if (argc<9) { Usage(argc0,argv0); } cnt = atoi( *argv++ )/2; radius = GetDim(atof( *argv++ ))/2.0; radius2 = GetDim(atof( *argv++ ))/2.0; - BuildTrimedTitle( message, "\t", newTurnManufacturer, newTurnLeftDesc, newTurnLeftPartno ); + BuildTrimedTitle( message, "\t", newTurnManufacturer, newTurnLeftDesc, + newTurnLeftPartno ); fprintf( stdout, "TURNOUT %s \"%s\"\n", curScaleName, PutTitle(message) ); for (inx=0; inx<cnt; inx++) { fprintf( stdout, "\tP \"%d\" %d %d %d\n", inx+1, inx*3+1, inx*3+2, inx*3+3 ); } for (inx=0; inx<cnt; inx++) { - fprintf( stdout, "\tP \"%d\" %d %d %d\n", inx+1+cnt, -(inx*3+3), -(inx*3+2), -(inx*3+1) ); + fprintf( stdout, "\tP \"%d\" %d %d %d\n", inx+1+cnt, -(inx*3+3), -(inx*3+2), + -(inx*3+1) ); } for (inx=0; inx<cnt; inx++) { ang = inx*180.0/cnt; @@ -3743,8 +4053,10 @@ int main ( int argc, char * argv[] ) fprintf( stdout, "\tS 0 0 %0.6f %0.6f %0.6f %0.6f\n", x1, y1, -x1, -y1 ); fprintf( stdout, "\tS 0 0 %0.6f %0.6f %0.6f %0.6f\n", -x1, -y1, -x0, -y0 ); } - fprintf( stdout, "\tA 16711680 0 %0.6f 0.000000 0.000000 0.000000 360.000000\n", radius2 ); - fprintf( stdout, "\tA 16711680 0 %0.6f 0.000000 0.000000 0.000000 360.000000\n", radius ); + fprintf( stdout, "\tA 16711680 0 %0.6f 0.000000 0.000000 0.000000 360.000000\n", + radius2 ); + fprintf( stdout, "\tA 16711680 0 %0.6f 0.000000 0.000000 0.000000 360.000000\n", + radius ); fprintf( stdout, "\t%s\n", END_SEGS ); break; default: |