From 1223881b4b0ec27513ffdc1a11a6771b26a20cf4 Mon Sep 17 00:00:00 2001 From: nathan Date: Mon, 17 Feb 2020 18:11:05 -0800 Subject: [PATCH] added touch to center and track planes Former-commit-id: 72763a5ba7497b5d6383df53959180dda571e94a [formerly b8d2b83f47121d34ad0c9cfbdd7c8f71bd90b679] [formerly 86d982e51aef694aa509793340d5596eeba59ef4] Former-commit-id: 61c938afcd00704d5a02d607225f2a6ee2feaa5b Former-commit-id: fb78d6786a438c2016b8b92758b61b6419f8577a --- draw.c | 70 +++++++++++++++++++++++++++++--------- draw.o.REMOVED.git-id | 2 +- font.o | Bin 37624 -> 37744 bytes init.o | Bin 48136 -> 48256 bytes input.c | 11 ++---- input.o.REMOVED.git-id | 2 +- list.o | Bin 48128 -> 48248 bytes monokai.o | Bin 27624 -> 27744 bytes planeObj.o | Bin 44176 -> 44288 bytes status.o.REMOVED.git-id | 2 +- structs.h | 3 ++ view1090.REMOVED.git-id | 2 +- view1090.o.REMOVED.git-id | 2 +- 13 files changed, 63 insertions(+), 31 deletions(-) diff --git a/draw.c b/draw.c index d0cd543..19e78dc 100644 --- a/draw.c +++ b/draw.c @@ -48,6 +48,23 @@ SDL_Color signalToColor(int signal) { return planeColor; } +SDL_Color lerpColor(SDL_Color aColor, SDL_Color bColor, float factor) { + if(factor > 1.0f) { + factor = 1.0f; + } + + if(factor < 0.0f) { + factor = 0.0f; + } + + SDL_Color out; + out.r = (1.0f - factor) * aColor.r + factor * bColor.r; + out.g = (1.0f - factor) * aColor.g + factor * bColor.g; + out.b = (1.0f - factor) * aColor.b + factor * bColor.b; + + return out; +} + SDL_Color hsv2SDLColor(double h, double s, double v) { double hh, p, q, t, ff; @@ -519,9 +536,11 @@ void drawPolys(QuadTree *tree, double screen_lat_min, double screen_lat_max, dou double d2 = dx* dx + dy * dy; - double alpha = 1.0 - (d1+d2) / (3* appData.maxDist * appData.maxDist); + double factor = 1.0 - (d1+d2) / (3* appData.maxDist * appData.maxDist); - lineRGBA(appData.renderer, x1, y1, x2, y2, alpha * purple.r + (1.0-alpha) * blue.r, alpha * purple.g + (1.0-alpha) * blue.g, alpha * purple.b + (1.0-alpha) * blue.b, 255 * alpha); + SDL_Color lineColor = lerpColor(blue, purple, factor); + + lineRGBA(appData.renderer, x1, y1, x2, y2, lineColor.r, lineColor.g, lineColor.b, 255); prevPoint = currentPoint; currentPoint = currentPoint->next; @@ -881,17 +900,6 @@ void drawMap() { pxFromLonLat(&dx, &dy, p->lon, p->lat); screenCoords(&x, &y, dx, dy); - - if((int)(now - p->seen) > DISPLAY_ACTIVE) { - planeColor = grey; - } else { - planeColor = green; - //srand(p->addr); - // planeColor = hsv2SDLColor(255.0 * (double)rand()/(double)RAND_MAX, 255.0, 200.0); - //planeColor = signalToColor((int)(255.0f * (float)rand()/(float)RAND_MAX)); - //fprintf("%d %d %d\n", planeColor.r, planeColor.g, planeColor.b); - } - if(p->created == 0) { p->created = mstime(); } @@ -901,7 +909,7 @@ void drawMap() { circleRGBA(appData.renderer, x, y, 500 - age_ms, 255,255, 255, (uint8_t)(255.0 * age_ms / 500.0)); } else { if(MODES_ACFLAGS_HEADING_VALID) { - int usex = x; + int usex = x; int usey = y; if(p->seenLatLon > p->oldSeen[p->oldIdx]) { @@ -918,6 +926,34 @@ void drawMap() { usey = y + (mstime() - p->msSeenLatLon) * vely; } + if((usex - appData.touchx) * (usex - appData.touchx) + (usey - appData.touchy) * (usey - appData.touchy) < 900) { + selectedPlane = p; + } + + if(p == selectedPlane) { + appData.centerLon += 0.1 * (p->lon - appData.centerLon); + appData.centerLat += 0.1 * (p->lat - appData.centerLat); + + + thickLineRGBA(appData.renderer, x - 40, y - 40, x - 10, y - 40, 4, pink.r, pink.g, pink.b, 255); + thickLineRGBA(appData.renderer, x - 40, y - 40, x - 40, y - 10, 4, pink.r, pink.g, pink.b, 255); + + thickLineRGBA(appData.renderer, x + 40, y - 40, x + 10, y - 40, 4, pink.r, pink.g, pink.b, 255); + thickLineRGBA(appData.renderer, x + 40, y - 40, x + 40, y - 10, 4, pink.r, pink.g, pink.b, 255); + + thickLineRGBA(appData.renderer, x + 40, y + 40, x + 10, y + 40, 4, pink.r, pink.g, pink.b, 255); + thickLineRGBA(appData.renderer, x + 40, y + 40, x + 40, y + 10, 4, pink.r, pink.g, pink.b, 255); + + thickLineRGBA(appData.renderer, x - 40, y + 40, x - 10, y + 40, 4, pink.r, pink.g, pink.b, 255); + thickLineRGBA(appData.renderer, x - 40, y + 40, x - 40, y + 10, 4, pink.r, pink.g, pink.b, 255); + planeColor = lerpColor(pink, grey, (now - p->seen) / (float) DISPLAY_ACTIVE); + } else { + planeColor = lerpColor(green, grey, (now - p->seen) / (float) DISPLAY_ACTIVE); + } + + // if((int)(now - p->seen) > DISPLAY_ACTIVE) { + // planeColor = grey; + // } if(outOfBounds(x,y)) { drawPlaneOffMap(x, y, &(p->cx), &(p->cy), planeColor); @@ -950,15 +986,15 @@ void drawMap() { if(appData.touchx && appData.touchy) { - int radius = (mstime() - appData.touchDownTime); - int alpha = 255 - (int)(0.5 * (mstime() - appData.touchDownTime)); + int radius = .25 * (mstime() - appData.touchDownTime); + int alpha = 128 - (int)(0.5 * (mstime() - appData.touchDownTime)); if(alpha < 0 ) { alpha = 0; appData.touchx = 0; appData.touchy = 0; } - circleRGBA(appData.renderer, appData.touchx, appData.touchy, radius, white.r, white.g, white.b, alpha); + filledCircleRGBA(appData.renderer, appData.touchx, appData.touchy, radius, white.r, white.g, white.b, alpha); } } diff --git a/draw.o.REMOVED.git-id b/draw.o.REMOVED.git-id index 8f54ef4..127f6f3 100644 --- a/draw.o.REMOVED.git-id +++ b/draw.o.REMOVED.git-id @@ -1 +1 @@ -1d914216fcda8f2b793acf12bfbfddfb24809c94 \ No newline at end of file +d08aaa37cf2b39ef11671ed4f318ae82fcf0c1dd \ No newline at end of file diff --git a/font.o b/font.o index 9acfc71c0711e9547104cc59564f6831d781a1cf..3f987831914f6996ea1c148c9ecd75d565df0fa8 100644 GIT binary patch delta 7143 zcmZ{o33OD|8OPrp_DvW-ZZ4RRRFn|V$7qF67Yr&xPDLFc1i}&~5FkK+A%rBdBw` zJoaI?vA)WljWlmTH_K{ARyU=j>xt(aOCy~0yaU|)WGCO&&F4EVySVu&PQJUF4?CJ9 zH(&5Axk-cmloce@YAs*|Is-DE59#iOfpa#$&o?N;&0jy3(@xsxiJrmX+@5R+4?(m6&9bZ>yo~{6T%g2YRsjvG>z2zu1*CkYk=e2H{F>pEec|% zd)6j(ESys~bz$MO`{sn_7RFZGSlTkCGS9Y*eRoSy%T5dDl}?>mZZ-Z?#0s+RX%pK! zBGN+bMB3dSshbcOsnsn|Bels=mgTp;zSxqZ_kKgMz{uNFr;_HiVD3FP#2&lnsLw2+ zL3a}Ojn$s=9qF$O)uDW~0*R1TBXJ>Qn`c;ZpChN_DaRpelvXce{3zQL_I6pR`_rT; zM(rqVa%s*xX^s2SL=%XQvQ;|NXl;UA%Zox&hrnp9HXwVnZAM+?!ZSkCA5ro!rmJgi zLH*$*FU|v~A00GDxV<+Cx&UcowE3}vTjpLthap7t!!9l@64XZZn4pOyyYx{(Pa#2N zkM?ruK0$ZGpA$3%9P=4Lk06qx%@fXmP-^9Kf4vsHj#{Gc(A;uTZ$aNjJV&eN@Oe&9 z)gUldo4++~LzXpNC{H3hR;x@@jJ3^Mv|gO_lF+<^dh&3Pd*BN}8_+=Xc5f2#M(V|R z3~9MqUBHlBTVJo~^z@C~u>B9Em(_${ROl z%i17{9fp5`Ha(f{5Of)`CfMp1h>+$C5Az|RxfQh&v|5e*6P#wNiCXz#CI;0Bgem_p zDkhexDl|;AX~5DZX)}ZuQcWwjv0ejCA~Z>pvS^ZR7V~mCDl~miN18|Q>ZG803I55n zHL$m&)|Yx)gsjOywGQhh+vY~rOc$EJB2FG|=5|#HdKN0*Rwoh24`%yPUGH7nTw04~ zPZstQTw_0B&p>^?ZfaeQpkJVYYJ3=JQ*8ALLQ}L^&y#YOP@Y6J(bIH(IO&L>Cs0SU z6Vnd_?SusR{}=pWo&7yexHfHFPu^Ix=jGH%*bUpe341ysVQmI8?JekV)Dq2M+F#IV zh!ZVgI#|%h~_cSvP)Bqb)4hUjK!WHtrUwM2ZFibB ze`b0_&{vT)O{-xTKh37YZ{4&Y?GBwi!%Ri%mnYPjh)3X85nfa?MRX=J z?cl5(O5PHhju6purdrSkP)&3j)2jvDgF2#znc9M;AW>wiF#NNE=6gPuMhi_IBD1ua z&Hb4#=wZ|njq{CQwxDk#PV{3gTPEm#pk`~6$l9IcYDbxu$X zK!WtAxF5b3`YYfs)+U2rRobx15jnvPM^>>`1sGp!n@z0gEi`*jOCF9g?Jwvjh!=mQ zfcm*XlfsLqQfQVSZ5}OVK2FvPIs>73W#%H!_Pv6ZBSB@;dC46Rv=jXEwXyl&KO*RP zWX-o#E+X@_+JSYH{|5W#+om;pJ1_JJsE9V_c*eHi(ewJM6#_&x-{v|C+7Dr(H#6-e zXg5S7T78CH5nH{1cO$k>C8Pa<$!a@_76er>>K16@;|`i93jYxaqW@*HE+ zPtdM3s171js;TisrM3xjjs1Cl_qwZ*|X;p@Pi-PKXL>AFd@jym| zGK$(owwi)CX$JB_+8{I|p~`G^9Rg+Ae912?yM!hMVWIj|BY997i1nE3f_uHx?0`~{WQgMGiS>C&`RU>y7)k z-c(`FW%~eOUyih8n)-RjvV7B+)~?&7X|L)cI8Ht~01Kf?p~ zsj%O{-TjTQKgfRgjKPj-e`N=r3{JcHxO1oR*`4iPyBhfAt!Fd6^KyMVe+dW({VtB- z=4N)jay9xN;o32Hx!>eS4g1VPc)6~eCTJkHaD|7KKruIr-gkB>-QqGLYo(uI)ORB`(AP!)kIGU zn!;tjL>-{|3_*{JK5D|G+q0>;T#|wdBZsf^{ccRin`TW<)LAfHu6I9|h&4rx7ChqM$#x(E10eSL^I=1?|Y5yYMy5t1+4F$-?d})c#0NT>(kC zt`YFB(Pk7=uYDF8>TZRbHhXg&&o75K65`9$AOx`YcAihScKRC71 zey!GObBL8*yLjxa_YffZk)YRe4F5)$Xlp*hyt3ZLa}A+m8*oNGnZX=8GBUN3%NfZzKs1*VGpvt z*0pzSn%o}P3I79)T~E&#vgo72xiOP2fc~1HbVUu(b19-VL^ctr$!ymr-7UNfCOVj|3Zdvw^*W;Td=v5LP+#VQ i=(_2)b~V|q>@3D_8r-gGr2F4AY~3_iZ9#lf-~R!p&%?+7 delta 6901 zcmZ{p33OD|8OP@iM2LtmY?m7dW~6L_KIfnXDu{#25H$2m*tdiL(GY=Tl8_Jy%YZBq z1crZIz(ZvOHMq14aXBbeQUzu6Fi0t!wrI4rf^8)nP;jH)%ljUNujQVT_wIbZ|NZXw zzI)$&_r08X!F%C(@4DXJ3#$`1E%2(twKd+4+o2Eaic%Dx6P|^MD`evto z%T}t_)ShfV);ptHZ$05;dymH<6KxgOC)xFuj(zfMGPiZ=Q|x*Nr=DYLIy?2;&&f@O z=X#=^Yg*bq)9k9A`Z!+g)Kjg&(N0t8c)RX-^R1n2;*@TDR>Mzq@OXOM#i*ytv(U!$ zykWIS5VTyKF=c`0}Q*o!OMw{{iIb4fhnY6}WUnJ%K3wA#u#tHVb zM#cXI`yJcMo5UxAJ!I0=IDBQgs03Q1^-;GXkQTTi!NyH+t26rQA@8D)+u*IVv>tW` zm$Ux?{ph8}sDQ`Q&-UYe&>sC}S+y6_;+<=2`j<9uQC2i}dcgyEwPxVi<}IBcMRRJe z9a7l5c1bX+MeX6?#m&@q1Rwas+@d@lpXcnQ4BHiz;m*m^AK@&m?uI{0*DlWLrSSU5 zK<$?!KlG}_NQAX2!M<>=ncK>d-@&b}rSo<4HypuiOTCOpwl*VgaNszhc?WUQOhS@0 z(;Mfd$FoFevY|$4^)bvS%XDw&z#5?$hP+YQyh1b8E+052j~hu0u~C*9jylp3p9TZfhiIv90hEp-eHq&dtUJ`$QY;UA~XdCvTKLGM7A=m+e-mA#5l zaU=g4(Q%ded6{pyr9xvNIz^lPt(}%z1uaKnibWpkNz=)`)2aMfXja3Q6Ed$c zZFP;Ka#J|~ksPfGP@NM}i;&E*R3E5ZZQf#isn7=y$kpmIWae6GKPq!WfeXB#v}<7_6{xdQh_3eU|!#`E4zhcl-ORdAqsg~KrH*HKPmm@Lt=gjO9^h?weJ;<>g z5!44?o>o5e$+OH!&aG;BW&Hm}Bu|?kn6?(Q72-tG8lUAJj}f#Fl0*kG?ICCgYMM4< znFa*SM}TM<(;&Ge9aDG7(Xdn+;;D1o7Xzic}TPW2R!H2XNOq(;iL`8!vL>>wmKVQ-Y zK|ey0+V15W>3Kmvg(}c$Crm-e{KPBzdqT4ll?9ec#Wp&g$BBYm)0&^j7lraRglB4V zAEze8UT3Jd%guO1i54>T30j2&(KSrd1>KB#qC1%O5%hid3bncseF`m=j|qh#^$p^M z+T?J?CJ22Il0K?XK5gJHS#j(9AG@Id{rH#F3w#!aI??;&Evpntg2s#YWSz5)gVU}f{WdDB?n(I+N zD`alu*>YacqX^E{ra8ZqDE48C?0Y2x5u$^cwia|e;Zk)~bShN24f9el;wl=2?ub)oEzAkmh5%hd_m1Ce5_ zzDISjWwJPXCxm7LlEwChLq#m55Qu2=1<%GGh4NeE5l!VyNh-(gW~mEeL~mx=QP82N zv)gk1{eqrE1NFWi{u0akZC7NMaSs2nWg&S z1X+$FJU3+CX4XgsUfJJtJPdwoExGSnP9m#A?{N%nLJ7N{u7>;?npnXwC9(LeFg{77v zb)KcpVbDCwT*tXREA)F1ou}0jY?xP}#=uvpRWJ0Z?3>=(UIn;};HS5nmtlxhwomWn zVmcQJ#RkO5QwerfTBd|Y=1rl=hk7JLF9(^ASjvk^s^_EbkzBI)=a;5meiJ6|huMSM ze?AiPEwvH#bnF6Ol{S-kL^|_L>MFM&Nb~~FoLdDQg-DgA2TygCWj69|daBUSs~Krd z;#5^g4M1RlHveEnjZlt89??_0H{30#LTrIn+1R$gGB@)>?u^iUg$D9)mao=bQrv6# zC;SU_=4U+a89X~&dWu{16ZQo>)9x4cd_))K(q6TGp{D!d;zG-;V9zx|S&85xZKm+7 z-Yw`kM2HUL>>U^M9>j?bVb5m-twC~;rJjabY(HEBi?sqWslEr5i!JXDZSd0K9Fxfx zP|0Waf)BtSZNI2TlS%lbP;BAuo)h*iwhJo16ZU8M7I{n9kMof36?U2kiy9pr5#V;7 zjh_hn5_WW2*oX2<^*3y{zYhGO(X(^7B=imZE|$^()0T8HT{*pOW}e~hdm^?(oBmCx zy{THoj_*Pp(R-UvyID3<`dUJCw4kkccaQ`BQu>}F=xkp4XCq9sM9_}>&7%rYqESK9 zx$Qb6h;D2`?U;9Pg0`TZ=sSXb$@D$=9@Qx)Y>LF=?dgdce3YJeyq~hWw}po|4nHD9 z?-BH0OeZ5wv`o+x?kS2S(I=R?dB4Ojwa-8;qdlOY?x^fSfaty^wDAi0d&M#25&cUO z+H_RDKx~=LJT0g@D(9NmZJ$5!XM>AP?6x;|B$}at`fABz>RyFA5*q&H+W4DL+vhr- zdN(0V^j<;tG97{Fa-A~Ori~*JL4wrlSnZC)7liFngL>U*Kr&=Po zf<8&`?#PX}jPu?V5mNR?-bzgm?KmlivC{2vgwvsCJd!JP$~2oIu)ckuQh5A`7v`l+ z?Do~)$vv$^U?sgS3%ZHvQ+5OYy4+sD8Jq0HuGeacnrGf+=$3+&^f zVxdXlwq;kbR|&iO;9Yzb`$}OS#$&YFvA4VYGUx&z{+L!zH6DM9B-Nj@kBeRuj=tw* z|K+RLcL@74{Pcd~D)v7J`$nGFb&mb#Kwa=5Vym<|SQ}ea;Z>V!Q`dx)I*Rbx0oUFY zcEpIIVws(gvA#Eb%gJ0n)Vq5X9$SBBYH_C1%W)*v4@e!J<@_289|ojmtag4K JLwL;%{{=pH!65(u diff --git a/init.o b/init.o index 7d18cc464f0f66f11c9e9fc6bf4d566726e3184b..82dcfa3a4292a88180bfad97fd13a9c26be7557c 100644 GIT binary patch delta 7113 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 diff --git a/input.c b/input.c index 8ccf87a..4fe055d 100644 --- a/input.c +++ b/input.c @@ -83,17 +83,10 @@ void getInput() case SDL_FINGERUP: if(mstime() - appData.touchDownTime < 30) { - //latLonFromScreenCoords(&(appData.touchLat), &(appData.touchLon), event.tfinger.x, event.tfinger.y); - // double scale_factor = (appData.screen_width > appData.screen_height) ? appData.screen_width : appData.screen_height; - - // double dx = -1.0 * (0.75*(double)appData.screen_width / (double)appData.screen_height) * appData.screen_width * event.tfinger.x * appData.maxDist / (0.95 * scale_factor * 0.5); - // double dy = 1.0 * appData.screen_height * event.tfinger.y * appData.maxDist / (0.95 * scale_factor * 0.5); - - // appData.touchLat = dy * (1.0/6371.0) * (180.0f / M_PI); - - // appData.touchLon = dx * (1.0/6371.0) * (180.0f / M_PI) / cos(((appData.centerLat)/2.0f) * M_PI / 180.0f); appData.touchx = appData.screen_width * event.tfinger.x; appData.touchy = appData.screen_height * event.tfinger.y; + selectedPlane = NULL; + } else { appData.touchx = 0; appData.touchy = 0; diff --git a/input.o.REMOVED.git-id b/input.o.REMOVED.git-id index 360c152..896993b 100644 --- a/input.o.REMOVED.git-id +++ b/input.o.REMOVED.git-id @@ -1 +1 @@ -4014ada04a2708aebb111395550edf352c684f96 \ No newline at end of file +71b217637379d15bac063de1731f31a46620dce5 \ No newline at end of file diff --git a/list.o b/list.o index dfda3c3c13dba943d63673ef1a95f209f42440ba..bf268321b29b9c8ce9774ac5e7e7b6862397b489 100644 GIT binary patch delta 7484 zcma)>4_MSyy2s}L{-HFTw2lWw7zq?Be@-Ii?WT@*b7WmhT31t7#{sD@g+^4wR2)+i zjS#-6u(Il;B2=2gP>P!=wYS2%*J86<>~q_8YU`%%ZNts7+FSen=J!qx=RWPzd7e3( z^M2m@<<+M=?)bsp?b$KAtvM0 zuzc|r($c2Qo1A8|#aHhsH%QwiGVYC3o4GpNqWifz!m2iw-yBiC)2y1wvUOSXFe^{a zLwnjSA`f4r8FwsWO-r8|nl~cVX1lGH#kW;P3mdpFCaQT53vU`x9&3L+BXPIqpZl;m zW6ew}G2@kgZgRC*iX%(>BEGu0JWI?(uk;~e89qxNIA+|827W$>}Oo> zeOV$mZl%qZZ4Q^2Or_`WWk#xa34?~GjcKR)1`(i_Q;94wIa%8XDYz3PBGWba6X9!UK6gn15 z(TVem-NFgyLsI>9fTey;vziX?LsD!**+Yi9g{IO>anuttMI*^X8+llGgC$MUXfJd< zRh#m_Xl8M#XgF$Df4Qmy6~)@wR*5M1I`@0p8&Qj12NurHNrx5J`mHChALQnxDN z*y7?Wt!U(LBe2vE|BVjv@FAUpX3ExdEQx9EoON%iSqOPa0Gk#G_{eWOM1(db5aeKN_-Ku6iCcUE zvD_mbgLk2daSEgeFKarp5nd-nI=))x7D;fGyVaY#fC~C{kG2?razi|Wj&ezN!ufJT&0@{h zG|dO$Trb6HC6m?$9oASIQV7_Uk^v66loY==}{YbqW??N z>5E_`-83BH2O6D^aHWSXYS$AUF&F{L6CkQ2KC9|&&*q?_gK#UHL`D;ttdU%Ji7X^? zw?;DbXAqAKl7s8s?jX?x0{D=-FCM)g79{!PVwj*(KP8{ zSuIsIPu&TPy5S;vAJbPgS_ogYc}!GP8{#9hR=epo7Bx~`VZARj{d72q-oeLl9LF9V zxq0x`xW(sas&U8l9EM9Zqr@w4fKHB^tbH^=Gx!F%kV2vmhH~@1nWgFEBS;>~ndWJ9 zH^TUBkc>4B=Cpp61YgRg(QNn4nKS( zIZl#u+>4zEkmM7Rtl_rkVN8-iP5l$6b2O(Rnk1%@WE_95y$vTxR*_^Wd%gfKNg7Eq znooxBP)(9|oBEF*#VdXwkBvG0d<#Unm(22LueYRHz0O2elN>uC#%iPmBDq_$dYq%3 zZpzViVt^<@?$c5|5~F8+`Q)&Vt?(1AilOF<_H`bYIs~7VIeRpk!1X3gejlIcEt>or z_I3*PXQX;vqaW}{{T?o&?`U)gpGRT%o{{Ar$53+#OyXW#jFFr1NB7?47`fT&I&;t| zeH|k=_3L>e68Nt<2d4fVgqX;6%T>8OPds^Oaa3qAz0HF*kOFL%NF ztW@{JP_y~DyclPq`dOKiA4AQydh()MrpZV0CR-CDH@&s6H$S?lt!+O*x5IH*s>T>< zw$;c3(TrT8$29ssJcVuW6FtM!G%=ejrk|O9k08--jI9~f0{(Zc3kVban?{c?y#o6Y zsfMPSe&}D5>DQBfJ8-g7bARzf@{RSnZbp1^tz|qc}COO$4{BFKOlb_U1ZxC$^QgLNQyt3Ic9`Lh?Y=U$P*`OL!HmR zCd7FJj*Uy)QfT#V62iyEiTO~+CyE`IL;35dqkJYhk57!duLVi16U0W$X`LvZL>=W@ z(AhdMvClZmd^H>=#)-|Cb7Ep#^8yIZjW~LO{`V7|CnnMdp8Czi#8gkTCGT&>B`#cK S)#zKDYR6lw+P84Lkn#^Oo2YXD delta 7801 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 delta 5426 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 N+wHfHpkPPTzX6Q(gVg{4 delta 9054 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 diff --git a/status.o.REMOVED.git-id b/status.o.REMOVED.git-id index b903e78..17750e5 100644 --- a/status.o.REMOVED.git-id +++ b/status.o.REMOVED.git-id @@ -1 +1 @@ -ec8f0fb7706c5fa30afa98ef72cf1c6277615e5c \ No newline at end of file +006a8fe10b2ac3777a05e5056d4166533ad2fae5 \ No newline at end of file diff --git a/structs.h b/structs.h index 6ae020c..45b64d7 100644 --- a/structs.h +++ b/structs.h @@ -86,6 +86,9 @@ struct planeObj { struct planeObj *planes; + +struct planeObj *selectedPlane; + struct { double msgRate; double avgSig; diff --git a/view1090.REMOVED.git-id b/view1090.REMOVED.git-id index 267e656..6735ea2 100644 --- a/view1090.REMOVED.git-id +++ b/view1090.REMOVED.git-id @@ -1 +1 @@ -4c1cc2ef49ee01e71918440dd30dd506c50f2a13 \ No newline at end of file +607b9efc8cc81bbdd0c6f524632fc9b69ab1e244 \ No newline at end of file diff --git a/view1090.o.REMOVED.git-id b/view1090.o.REMOVED.git-id index 55d52d1..c48ad66 100644 --- a/view1090.o.REMOVED.git-id +++ b/view1090.o.REMOVED.git-id @@ -1 +1 @@ -c32a44e5918f8a87926408a39f094f258c9f76e6 \ No newline at end of file +188de208d70a8a746cda5dd29c243ac3053a9c0c \ No newline at end of file