HFNOC/Signal-Server
2
0
Fork 0
forked from ExternalVendorCode/Signal-Server
Code Pull Requests Activity

Detect perm errors in DBM colors

Browse Source
This commit is contained in:
Gareth Evans
2017-03-04 19:13:37 +00:00
parent 7fb07b1793
commit af13a8d4ba
3 changed files with 12 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
inputs.cc
View File

@@ -1297,7 +1297,7 @@ int LoadLossColors(struct site xmtr)
return 0; return 0;
} }
void LoadDBMColors(struct site xmtr) int LoadDBMColors(struct site xmtr)
{ {
int x, y, ok, val[4]; int x, y, ok, val[4];
char filename[255], string[80], *pointer = NULL, *s = NULL; char filename[255], string[80], *pointer = NULL, *s = NULL;
@@ -1397,14 +1397,13 @@ void LoadDBMColors(struct site xmtr)
region.levels = 16; region.levels = 16;
fd = fopen(filename, "r"); if ( (fd = fopen(filename, "r")) == NULL && xmtr.filename[0] == '\0' )
if (fd == NULL && xmtr.filename[0] == '\0')
/* Don't save if we don't have an output file */ /* Don't save if we don't have an output file */
return; return 0;
if (fd == NULL) { if (fd == NULL) {
fd = fopen(filename, "w"); if( (fd = fopen(filename, "w")) == NULL )
return errno;
for (x = 0; x < region.levels; x++) for (x = 0; x < region.levels; x++)
fprintf(fd, "%+4d: %3d, %3d, %3d\n", region.level[x], fprintf(fd, "%+4d: %3d, %3d, %3d\n", region.level[x],
@@ -1456,6 +1455,7 @@ void LoadDBMColors(struct site xmtr)
fclose(fd); fclose(fd);
region.levels = x; region.levels = x;
} }
return 0;
} }
void LoadTopoData(int max_lon, int min_lon, int max_lat, int min_lat) void LoadTopoData(int max_lon, int min_lon, int max_lat, int min_lat)

2
inputs.hh
View File

@@ -8,7 +8,7 @@ char LoadSDF(char *name, int winfiles);
int LoadPAT(char *az_filename, char *el_filename); int LoadPAT(char *az_filename, char *el_filename);
int LoadSignalColors(struct site xmtr); int LoadSignalColors(struct site xmtr);
int LoadLossColors(struct site xmtr); int LoadLossColors(struct site xmtr);
void LoadDBMColors(struct site xmtr); int LoadDBMColors(struct site xmtr);
void LoadTopoData(int max_lon, int min_lon, int max_lat, int min_lat); void LoadTopoData(int max_lon, int min_lon, int max_lat, int min_lat);
void LoadUDT(char *filename); void LoadUDT(char *filename);
int loadLIDAR(char *filename); int loadLIDAR(char *filename);

7
outputs.cc
View File

@@ -528,7 +528,7 @@ void DoRxdPwr(char *filename, unsigned char geo, unsigned char kml,
image_ctx_t ctx; image_ctx_t ctx;
int success; int success;
if((success = image_init(&ctx, width, (kml ? height : height + 30), IMAGE_RGB, IMAGE_DEFAULT)) != 0){ if( (success = image_init(&ctx, width, (kml ? height : height + 30), IMAGE_RGB, IMAGE_DEFAULT)) != 0 ){
fprintf(stderr,"Error initializing image\n"); fprintf(stderr,"Error initializing image\n");
exit(success); exit(success);
} }
@@ -538,7 +538,10 @@ void DoRxdPwr(char *filename, unsigned char geo, unsigned char kml,
255.0 / pow((double)(max_elevation - min_elevation), 255.0 / pow((double)(max_elevation - min_elevation),
one_over_gamma); one_over_gamma);
LoadDBMColors(xmtr[0]); if( (success = LoadDBMColors(xmtr[0])) != 0 ){
fprintf(stderr,"Error loading DBM colors\n");
exit(success);
}
if( filename != NULL ) { if( filename != NULL ) {