fixed border margin on label dynamics

AircraftLabel.cpp

@@ -161,6 +161,46 @@ void AircraftLabel::calculateForces(Aircraft *check_p) {
 
     // screen edge 
 
+    if(roundScreen) {
+        float radius = screen_width >> 1;
+
+        //left top
+
+        if((p_left - radius) * (p_left - radius) + (p_top - radius) * (p_top - radius) > ((radius - edge_margin) * (radius - edge_margin))) {
+            float pointnorm = sqrt((p_left - radius) * (p_left - radius) + (p_top - radius) * (p_top - radius));
+
+            ddx += boundary_force *  ((radius - edge_margin) * (p_left - radius) / pointnorm - (p_left - radius));
+            ddy += boundary_force *  ((radius - edge_margin) * (p_top - radius) / pointnorm - (p_top - radius));
+        }
+
+        //left bottom
+        
+        if((p_left - radius) * (p_left - radius) + (p_bottom - radius) * (p_bottom - radius) > ((radius - edge_margin) * (radius - edge_margin))) {
+            float pointnorm = sqrt((p_left - radius) * (p_left - radius) + (p_bottom - radius) * (p_bottom - radius));
+
+            ddx += boundary_force *  ((radius - edge_margin) * (p_left - radius) / pointnorm - (p_left - radius));
+            ddy += boundary_force *  ((radius - edge_margin) * (p_bottom - radius) / pointnorm - (p_bottom - radius));
+        }
+
+        //right top
+        
+        if((p_right - radius) * (p_right - radius) + (p_top - radius) * (p_top - radius) > ((radius - edge_margin) * (radius - edge_margin))) {
+            float pointnorm = sqrt((p_right - radius) * (p_right - radius) + (p_top - radius) * (p_top - radius));
+
+            ddx += boundary_force *  ((radius - edge_margin) * (p_right - radius) / pointnorm - (p_right - radius));
+            ddy += boundary_force *  ((radius - edge_margin) * (p_top - radius) / pointnorm - (p_top - radius));
+        }
+
+        //right bottom
+        
+        if((p_right - radius) * (p_right - radius) + (p_bottom - radius) * (p_bottom - radius) > ((radius - edge_margin) * (radius - edge_margin))) {
+            float pointnorm = sqrt((p_right - radius) * (p_right - radius) + (p_bottom - radius) * (p_bottom - radius));
+
+            ddx += boundary_force *  ((radius - edge_margin) * (p_right - radius) / pointnorm - (p_right- radius));
+            ddy += boundary_force *  ((radius - edge_margin) * (p_bottom - radius) / pointnorm - (p_bottom - radius));
+        }
+
+    } else {
         if(p_left < edge_margin) {
             ddx += boundary_force * static_cast<float>(edge_margin - p_left);
         }
@@ -176,6 +216,8 @@ void AircraftLabel::calculateForces(Aircraft *check_p) {
         if(p_bottom > screen_height - edge_margin) {
             ddy += boundary_force * static_cast<float>(screen_height - edge_margin - p_bottom);
         }
+    }
+
 
 
     float all_x = 0;
@@ -253,7 +295,7 @@ void AircraftLabel::calculateForces(Aircraft *check_p) {
 	// snprintf(buff, sizeof(buff), "%2.2f", labelLevel);
 	// debugLabel.setText(buff);
 
- 	float density_mult = 0.5f;
+ 	float density_mult = 0.9f;
  	float level_rate = 0.25f;
 
  	if(elapsed(lastLevelChange) > 1000.0) {
@@ -504,10 +546,11 @@ void AircraftLabel::draw(SDL_Renderer *renderer, bool selected) {
     }	
 }
 
-AircraftLabel::AircraftLabel(Aircraft *p, bool metric, int screen_width, int screen_height, TTF_Font *font) {
+AircraftLabel::AircraftLabel(Aircraft *p, bool metric, bool roundScreen, int screen_width, int screen_height, TTF_Font *font) {
 	this->p = p;
 
 	this->metric = metric;
+    this->roundScreen = roundScreen;
 
 	x = p->x;
     y = p->y + 20; //*screen_uiscale

AircraftLabel.h

@@ -18,7 +18,7 @@ class AircraftLabel {
 
 		void draw(SDL_Renderer *renderer, bool selected);
 
-		AircraftLabel(Aircraft *p, bool metric, int screen_width, int screen_height, TTF_Font *font);
+		AircraftLabel(Aircraft *p, bool metric, bool roundScreen, int screen_width, int screen_height, TTF_Font *font);
 
 	private:
 		SDL_Rect getFullRect(int labelLevel);
@@ -35,6 +35,8 @@ class AircraftLabel {
 
 		bool metric;
 
+		bool roundScreen;
+
 		float x;
 		float y;
 		float w;

Style.h

@@ -68,15 +68,15 @@ typedef struct Style {
 		blue		= {0,0,255,255};
 
 
-	    backgroundColor = black;
+	    backgroundColor = {0,0,0,255};
 
 	    selectedColor = pink;
-	    planeColor = yellow;
+	    planeColor = {0,255,174};
 	    planeGoneColor = grey;
-	    trailColor = yellow_dark;
+	    trailColor = {0,255,174};
 
-	    geoColor = purple_dark;
+	    geoColor = grey_dark;
-	    airportColor = purple;
+	    airportColor = grey;
 
 	    labelColor = white;
 	    labelLineColor = grey_dark;

View.cpp

@@ -135,7 +135,11 @@ void View::screenCoords(int *outX, int *outY, float dx, float dy) {
 }
 
 int View::outOfBounds(int x, int y) {
+    if(roundScreen) {
+        return outOfBounds(x, y, screen_width >> 1);
+    } else {
         return outOfBounds(x, y, 0, 0, screen_width, screen_height);
+    }    
 }
 
 int View::outOfBounds(int x, int y, int left, int top, int right, int bottom) {
@@ -146,6 +150,21 @@ int View::outOfBounds(int x, int y, int left, int top, int right, int bottom) {
     }
 }
 
+
+int View::outOfBounds(int x, int y, int radius) {
+    float f_radius = static_cast<float>(radius);
+    float f_x = static_cast<float>(x);
+    float f_y = static_cast<float>(y);
+
+    if((f_x - f_radius) * (f_x - f_radius) + (f_y - f_radius)  * (f_y - f_radius)  > (f_radius * f_radius)) {
+        return 1;
+    } else {
+        return 0;
+    }
+}
+
+
+
 //
 // Fonts should probably go in Style
 //
@@ -290,6 +309,10 @@ void View::drawStatusBox(int *left, int *top, std::string label, std::string mes
 
 void View::drawStatus() {
 
+    if(roundScreen) {
+        return;
+    }
+
     int left = PAD; 
     int top = screen_height - messageFontHeight - PAD;
 
@@ -326,6 +349,16 @@ void View::drawPlaneOffMap(int x, int y, int *returnx, int *returny, SDL_Color p
     outx = inx;
     outy = iny;
 
+    float inmag = sqrt(inx *inx + iny*iny);
+    float vec[3];
+    vec[0] = inx / inmag;
+    vec[1] = iny /inmag;
+    vec[2] = 0;
+
+    if(roundScreen) {
+        outx = vec[0] * (screen_width>>1);
+        outy = vec[1] * (screen_width>>1);
+    } else {
         if(abs(inx) > abs(y - (screen_height>>1)) *  static_cast<float>(screen_width>>1) / static_cast<float>(screen_height>>1)) { //left / right quadrants
             outx = (screen_width>>1) * ((inx > 0) ? 1.0 : -1.0);
             outy = (outx) * iny / (inx);
@@ -333,15 +366,12 @@ void View::drawPlaneOffMap(int x, int y, int *returnx, int *returny, SDL_Color p
             outy = screen_height * ((iny > 0) ? 0.5 : -0.5 );
             outx = (outy) * inx / (iny);
         }
+    }
+    
 
     // circleRGBA (renderer,(screen_width>>1) + outx, screen_height * CENTEROFFSET + outy,50,planeColor.r,planeColor.g,planeColor.b,SDL_ALPHA_OPAQUE);
     // thickLineRGBA(renderer,screen_width>>1,screen_height * CENTEROFFSET, (screen_width>>1) + outx, screen_height * CENTEROFFSET + outy,arrowWidth,planeColor.r,planeColor.g,planeColor.b,SDL_ALPHA_OPAQUE);
 
-    float inmag = sqrt(inx *inx + iny*iny);
-    float vec[3];
-    vec[0] = inx / inmag;
-    vec[1] = iny /inmag;
-    vec[2] = 0;
 
     float up[] = {0,0,1};
 
@@ -487,6 +517,10 @@ void View::drawTrails(int left, int top, int right, int bottom) {
 
 void View::drawScaleBars()
 {
+    if(roundScreen) {
+        return;
+    }
+    
     int scalePower = 0;
     int scaleBarDist = screenDist((float)pow(10,scalePower));
 
@@ -737,7 +771,7 @@ void View::drawGeography() {
 
 void View::drawPlaneText(Aircraft *p) {
     if(!p->label) {
-        p->label = new AircraftLabel(p,metric,screen_width, screen_height, mapFont);
+        p->label = new AircraftLabel(p,metric, roundScreen, screen_width, screen_height, mapFont);
     }
 
     p->label->update();
@@ -838,7 +872,7 @@ void View::drawPlanes() {
                 
                     //show latlon ping
                     if(elapsed(p->msSeenLatLon) < 500) {
-                        circleRGBA(renderer, p->x, p->y, elapsed(p->msSeenLatLon) * screen_width / (8192), 127,127, 127, 255 - (uint8_t)(255.0 * elapsed(p->msSeenLatLon) / 500.0));   
+                        circleRGBA(renderer, p->x, p->y, 20 * elapsed(p->msSeenLatLon) / 500, 127,127, 127, 255 - (uint8_t)(255.0 * elapsed(p->msSeenLatLon) / 500.0));   
                     }
 
                     drawPlaneText(p);            
@@ -1092,6 +1126,10 @@ View::View(AppData *appData){
     fullscreen              = 0;
     screen_index              = 0;
 
+    metric = 0;
+
+    roundScreen = 0;
+
     centerLon   = 0;
     centerLat   = 0;
 

View.h

@@ -97,6 +97,7 @@ class View {
 		void screenCoords(int *outX, int *outY, float dx, float dy);
 		int outOfBounds(int x, int y);
 		int outOfBounds(int x, int y, int left, int top, int right, int bottom);
+		int outOfBounds(int x, int y, int radius);
 		void drawPlaneOffMap(int x, int y, int *returnx, int *returny, SDL_Color planeColor);
 		void drawPlaneIcon(int x, int y, float heading, SDL_Color planeColor);
 		void drawTrails(int left, int top, int right, int bottom);
@@ -130,6 +131,8 @@ class View {
 	////////////////
 		bool metric;
 
+		bool roundScreen;
+
 		bool fps;
 
 	    float maxDist;

viz1090.cpp

@@ -55,6 +55,7 @@ void showHelp(void) {
 "--lon <longitude>                Longitude in degrees\n"
 "--metric                         Use metric units\n"
 "--port <port>                    TCP Beast output listen port (default: 30005)\n"
+"--round                          Use round display outline (assumes square screen size\n"
 "--server <IPv4/hosname>          TCP Beast output listen IPv4 (default: 127.0.0.1)\n"
 "--screensize <width> <height>    Set frame buffer resolution (default: screen resolution)\n"
 "--screenindex <i>                Set the index of the display to use (default: 0)\n"
@@ -99,6 +100,8 @@ int main(int argc, char **argv) {
             view.fps = 1;         
         } else if (!strcmp(argv[j],"--fullscreen")) {
             view.fullscreen = 1;         
+        } else if (!strcmp(argv[j],"--round")) {
+            view.roundScreen = 1;                     
         } else if (!strcmp(argv[j],"--screenindex")) {
             view.screen_index = atoi(argv[++j]);         
         } else if (!strcmp(argv[j],"--uiscale") && more) {