This commit is contained in:
alex
2017-08-30 19:23:54 +01:00
parent 01b1cbe624
commit ca42f24794
2 changed files with 5 additions and 5 deletions

View File

@@ -128,14 +128,14 @@ int loadClutter(char *filename, double radius, struct site tx)
int loadLIDAR(char *filenames, int resample) int loadLIDAR(char *filenames, int resample)
{ {
char *filename; char *filename;
char *files[100]; // 10x10 tiles char *files[256]; // 20x20=400, 16x16=256 tiles
int indx = 0, fc = 0, hoffset = 0, voffset = 0, pos, success; int indx = 0, fc = 0, hoffset = 0, voffset = 0, pos, success;
double xll, yll, xur, yur, cellsize, avgCellsize = 0, smCellsize = 0; double xll, yll, xur, yur, cellsize, avgCellsize = 0, smCellsize = 0;
char found, free_page = 0, jline[20], lid_file[255], char found, free_page = 0, jline[20], lid_file[255],
path_plus_name[255], *junk = NULL; path_plus_name[255], *junk = NULL;
char line[25000]; char line[25000];
char * pch; char * pch;
double TO_DEG = (180 / PI); double TO_DEG = (180 / PI);
FILE *fd; FILE *fd;
tile_t *tiles; tile_t *tiles;

View File

@@ -1,4 +1,4 @@
double version = 3.05; double version = 3.06;
/****************************************************************************\ /****************************************************************************\
* Signal Server: Radio propagation simulator by Alex Farrant QCVS, 2E0TDW * * Signal Server: Radio propagation simulator by Alex Farrant QCVS, 2E0TDW *
****************************************************************************** ******************************************************************************
@@ -1047,7 +1047,7 @@ int main(int argc, char *argv[])
unsigned char LRmap = 0, txsites = 0, topomap = 0, geo = 0, kml = unsigned char LRmap = 0, txsites = 0, topomap = 0, geo = 0, kml =
0, area_mode = 0, max_txsites, ngs = 0; 0, area_mode = 0, max_txsites, ngs = 0;
char mapfile[255], ano_filename[255], lidar_tiles[4096], clutter_file[255]; char mapfile[255], ano_filename[255], lidar_tiles[16384], clutter_file[255];
char *az_filename, *el_filename, *udt_file = NULL; char *az_filename, *el_filename, *udt_file = NULL;
double altitude = 0.0, altitudeLR = 0.0, tx_range = 0.0, double altitude = 0.0, altitudeLR = 0.0, tx_range = 0.0,
@@ -1287,7 +1287,7 @@ int main(int argc, char *argv[])
z = x + 1; z = x + 1;
lidar=1; lidar=1;
if (z <= y && argv[z][0] && argv[z][0] != '-') if (z <= y && argv[z][0] && argv[z][0] != '-')
strncpy(lidar_tiles, argv[z], 4094); strncpy(lidar_tiles, argv[z], 16382);
} }
if (strcmp(argv[x], "-res") == 0) { if (strcmp(argv[x], "-res") == 0) {