From 05c1910f78ab12d4a3bf382691aa6c5630c86247 Mon Sep 17 00:00:00 2001 From: Krafpy Date: Mon, 2 Jan 2023 15:37:39 +0100 Subject: [PATCH] Added UT time in trajectort text. --- dist/main/utilities/trajectory-text.js | 14 ++++++++++---- src/main/utilities/trajectory-text.ts | 14 ++++++++++---- 2 files changed, 20 insertions(+), 8 deletions(-) diff --git a/dist/main/utilities/trajectory-text.js b/dist/main/utilities/trajectory-text.js index caa130a..2f1e84c 100644 --- a/dist/main/utilities/trajectory-text.js +++ b/dist/main/utilities/trajectory-text.js @@ -39,7 +39,9 @@ export function trajectoryToText(traj, seq) { label = `${arrivalBodyName} circularization`; } add(label, "", 1); - add("Date", KSPTime(details.dateMET, config.time).stringYDHMS("hms", "emt") + " MET", 2); + const dateMET = KSPTime(details.dateMET, config.time); + add("Date", dateMET.toUT(depDate).stringYDHMS("hms", "ut") + " UT", 2); + add("", dateMET.stringYDHMS("hms", "emt") + " MET", 2); if (details.ejectAngle !== undefined) { add("Ejection angle", `${details.ejectAngle.toFixed(1)}°`, 2); } @@ -53,9 +55,13 @@ export function trajectoryToText(traj, seq) { space(); const details = traj.flybys[flybyIdx]; const bodyName = system.bodyFromId(details.bodyId).name; + const enterMET = KSPTime(details.soiEnterDateMET, config.time); + const exitMET = KSPTime(details.soiExitDateMET, config.time); add(`Flyby around ${bodyName}`, "", 1); - add("SOI enter date", KSPTime(details.soiEnterDateMET, config.time).stringYDHMS("hms", "emt") + " MET", 2); - add("SOI exit date", KSPTime(details.soiExitDateMET, config.time).stringYDHMS("hms", "emt") + " MET", 2); + add("SOI enter date", enterMET.toUT(depDate).stringYDHMS("hms", "ut") + " UT", 2); + add("", enterMET.stringYDHMS("hms", "emt") + " MET", 2); + add("SOI exit date", exitMET.toUT(depDate).stringYDHMS("hms", "ut") + " UT", 2); + add("", exitMET.stringYDHMS("hms", "emt") + " MET", 2); add("Periapsis altitude", `${details.periAltitude.toFixed(0)} km`, 2); add("Inclination", `${details.inclinationDeg.toFixed(0)}°`, 2); flybyIdx++; @@ -78,7 +84,7 @@ function pairsToString(pairs) { maxLen = Math.max(maxLen, line.length); } for (let i = 0; i < pairs.length; i++) { - if (pairs[i].label == "" || pairs[i].data == "") + if (pairs[i].label == "" && pairs[i].data == "") continue; const spaces = " ".repeat(maxLen - lines[i].length + 1); lines[i] += spaces + pairs[i].data; diff --git a/src/main/utilities/trajectory-text.ts b/src/main/utilities/trajectory-text.ts index a6d3ddd..3f53092 100644 --- a/src/main/utilities/trajectory-text.ts +++ b/src/main/utilities/trajectory-text.ts @@ -49,7 +49,9 @@ export function trajectoryToText(traj: Trajectory, seq: FlybySequence) { label = `${arrivalBodyName} circularization`; } add(label, "", 1); - add("Date", KSPTime(details.dateMET, config.time).stringYDHMS("hms", "emt") + " MET", 2); + const dateMET = KSPTime(details.dateMET, config.time); + add("Date", dateMET.toUT(depDate).stringYDHMS("hms", "ut") + " UT", 2); + add("", dateMET.stringYDHMS("hms", "emt") + " MET", 2); if(details.ejectAngle !== undefined){ add("Ejection angle", `${details.ejectAngle.toFixed(1)}°`, 2); } @@ -64,9 +66,13 @@ export function trajectoryToText(traj: Trajectory, seq: FlybySequence) { space(); const details = traj.flybys[flybyIdx]; const bodyName = system.bodyFromId(details.bodyId).name; + const enterMET = KSPTime(details.soiEnterDateMET, config.time); + const exitMET = KSPTime(details.soiExitDateMET, config.time); add(`Flyby around ${bodyName}`, "", 1); - add("SOI enter date", KSPTime(details.soiEnterDateMET, config.time).stringYDHMS("hms", "emt") + " MET", 2); - add("SOI exit date", KSPTime(details.soiExitDateMET, config.time).stringYDHMS("hms", "emt") + " MET", 2); + add("SOI enter date", enterMET.toUT(depDate).stringYDHMS("hms", "ut") + " UT", 2); + add("", enterMET.stringYDHMS("hms", "emt") + " MET", 2); + add("SOI exit date", exitMET.toUT(depDate).stringYDHMS("hms", "ut") + " UT", 2); + add("", exitMET.stringYDHMS("hms", "emt") + " MET", 2); add("Periapsis altitude", `${details.periAltitude.toFixed(0)} km`, 2); add("Inclination", `${details.inclinationDeg.toFixed(0)}°`, 2); @@ -93,7 +99,7 @@ function pairsToString(pairs: pair[]){ maxLen = Math.max(maxLen, line.length); } for(let i = 0; i < pairs.length; i++){ - if(pairs[i].label == "" || pairs[i].data == "") + if(pairs[i].label == "" && pairs[i].data == "") continue; const spaces = " ".repeat(maxLen - lines[i].length + 1); lines[i] += spaces + pairs[i].data;