2.92 Bigger, faster LIDAR

This commit is contained in:
alex
2016-09-29 22:19:50 +01:00
parent ffdbe0f079
commit b7a8170d4a
4 changed files with 82 additions and 156 deletions

20
main.cc
View File

@@ -1,4 +1,4 @@
double version = 2.91;
double version = 2.92;
/****************************************************************************\
* Signal Server: Radio propagation simulator by Alex Farrant QCVS, 2E0TDW *
******************************************************************************
@@ -45,7 +45,7 @@ char string[255], sdf_path[255], udt_file[255], opened = 0, gpsav =
double earthradius, max_range = 0.0, forced_erp, dpp, ppd, yppd,
fzone_clearance = 0.6, forced_freq, clutter, lat, lon, txh, tercon, terdic,
north, east, south, west, dBm, loss, field_strength,
min_north = 90, max_north = -90, min_west = 360, max_west = -1, westoffset=-180, eastoffset=180, delta=0, rxGain=0;
min_north = 90, max_north = -90, min_west = 360, max_west = -1, westoffset=180, eastoffset=-180, delta=0, rxGain=0;
int ippd, mpi,
max_elevation = -32768, min_elevation = 32768, bzerror, contour_threshold,
@@ -1024,7 +1024,7 @@ int main(int argc, char *argv[])
unsigned char LRmap = 0, txsites = 0, topomap = 0, geo = 0, kml =
0, area_mode = 0, max_txsites, ngs = 0;
char mapfile[255], udt_file[255], ano_filename[255], lidar_tiles[512], clutter_file[255];
char mapfile[255], udt_file[255], ano_filename[255], lidar_tiles[1024], clutter_file[255];
double altitude = 0.0, altitudeLR = 0.0, tx_range = 0.0,
rx_range = 0.0, deg_range = 0.0, deg_limit = 0.0, deg_range_lon;
@@ -1036,9 +1036,9 @@ int main(int argc, char *argv[])
}
if (strstr(argv[0], "signalserverLIDAR")) {
MAXPAGES = 4;
MAXPAGES = 25; // 5x5
lidar = 1;
IPPD = 5000;
IPPD = 500; // will be overridden based upon file header...
}
strncpy(ss_name, "Signal Server\0", 14);
@@ -1227,7 +1227,7 @@ int main(int argc, char *argv[])
z = x + 1;
lidar=1;
if (z <= y && argv[z][0] && argv[z][0] != '-')
strncpy(lidar_tiles, argv[z], 253);
strncpy(lidar_tiles, argv[z], 1022);
}
if (strcmp(argv[x], "-res") == 0) {
@@ -1616,14 +1616,18 @@ int main(int argc, char *argv[])
"correct and try again.\n");
exit(EXIT_FAILURE);
}
ippd = IPPD;
if(debug){
fprintf(stdout,"%.4f,%.4f,%.4f,%.4f\n",max_north,min_west,min_north,max_west);
fprintf(stdout,"%.4f,%.4f,%.4f,%.4f,%d x %d\n",max_north,min_west,min_north,max_west,width,height);
}
ppd=rint(height / (max_north-min_north));
yppd=rint(width / (max_west-min_west));
//ppd=(double)ippd;
//yppd=ppd;
if(delta>0){
tx_site[0].lon+=delta;
}