From 0ea8b16df5cd1057f581115c43bfcae3c12d9da5 Mon Sep 17 00:00:00 2001 From: Nathan Date: Thu, 7 Sep 2017 20:40:12 -0500 Subject: [PATCH] added close plane box Former-commit-id: 5921a6bc3009f4e26a9ce94d32e2b0a78abf64d2 --- dump1090/dump1090.REMOVED.git-id | 2 +- dump1090/interactive.c | 26 +++++++++++++++++++------- dump1090/interactive.o | Bin 24284 -> 24892 bytes dump1090/view1090.REMOVED.git-id | 2 +- 4 files changed, 21 insertions(+), 9 deletions(-) diff --git a/dump1090/dump1090.REMOVED.git-id b/dump1090/dump1090.REMOVED.git-id index 5e56695..349f9ab 100644 --- a/dump1090/dump1090.REMOVED.git-id +++ b/dump1090/dump1090.REMOVED.git-id @@ -1 +1 @@ -f949a3ecfc90cfcc5b1b6fedbb8f447476e22b95 \ No newline at end of file +12cd0ac25a00548b5547e3652a223af0087cb1a6 \ No newline at end of file diff --git a/dump1090/interactive.c b/dump1090/interactive.c index 07f12f6..2dc2b23 100644 --- a/dump1090/interactive.c +++ b/dump1090/interactive.c @@ -496,9 +496,11 @@ void interactiveShowData(void) { char cLat = ' '; char cLon = ' '; + double d; + unsigned char * pSig = a->signalLevel; unsigned int signalAverage = (pSig[0] + pSig[1] + pSig[2] + pSig[3] + - pSig[4] + pSig[5] + pSig[6] + pSig[7] + 3) >> 3; //up to 4 bars + pSig[4] + pSig[5] + pSig[6] + pSig[7] + 3) >> 3; if (a->bFlags & MODES_ACFLAGS_AOG) { snprintf(strFl, 6," grnd"); @@ -525,7 +527,7 @@ void interactiveShowData(void) { double x = dLon * M_PI / 180.0f * cos(((a->lat+41.9809263)/2.0f) * M_PI / 180.0f); double y = dLat * M_PI / 180.0f; - double d = sqrt(x*x + y*y) * 6371.0; + d = sqrt(x*x + y*y) * 6371.0; if(fabs(dLon) < .01 && fabs(dLat) > fabs(dLon)) { cLon = ' '; @@ -563,16 +565,26 @@ void interactiveShowData(void) { //formatted for terminusBold 10x20, no unicode - if(count==3) { - printf("\n%lc%lc%lc%lc",0x250C,0x2500,0x2500,0x2510); + if(d<5) { + printf("%ls",L"\n╔═════════════════════════════╗\n║"); + } else { + printf("\n "); } - printf("\n \x1B[%d;31m%-8s\x1B[%d;32m%5s \x1B[%d;33m%3s \x1B[%d;34m%6s \x1B[%d;36m%c%c \x1B[%d;37m%d", + + printf("\x1B[%d;31m%-8s\x1B[%d;32m%5s \x1B[%d;33m%3s \x1B[%d;34m%6s \x1B[%d;36m%c%c \x1B[%d;37m%d", count%2, a->flight, count%2, strFl, count%2, strGs, count%2, strD, count%2, cLat, cLon, - count%2, (int)(signalAverage/255)); + count%2, (int)((float)signalAverage/25.0f)); + + + if(d<5) { + printf("%ls",L"║\n╚═════════════════════════════╝"); + count+=2; + } + count++; } else { numNoDir++; @@ -587,7 +599,7 @@ void interactiveShowData(void) { count++; } - printf("%c%c%c%c\x1B[30;47m\e[1m\n%+3d %c \x1B[37;40m",192,196,191,179,numNoDir,progress); + printf("\x1B[30;47m\e[1m\n%+3d %c \x1B[37;40m",numNoDir,progress); fflush(stdout); } // diff --git a/dump1090/interactive.o b/dump1090/interactive.o index 65c4b4e14d3706c3ad179fb01eb63a81507e1979..edce3ec41632b7e344aa7ec0cad43d3a5e63bb39 100644 GIT binary patch delta 6799 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 G?LPqtjEW)v delta 6083 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