From 9034c026fbb3376f536b0ece2a366585abfbcfe0 Mon Sep 17 00:00:00 2001 From: glompos21 Date: Tue, 7 Jan 2025 00:08:51 +0200 Subject: [PATCH 1/5] fix problem when compiling with debian sid --- src/models/los.cc | 2 +- src/outputs.cc | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/models/los.cc b/src/models/los.cc index 3fab042..92fda4d 100644 --- a/src/models/los.cc +++ b/src/models/los.cc @@ -139,7 +139,7 @@ namespace { spdlog::debug("Starting rangePropagation for {} range {:.6f}N {:.6f}W to {:.6f}N {:.6f}W, {} points at {:.8f} dpp [Segment {}]", vertical ? "vertical" : "horizontal", - v->min_north, v->min_west, v->max_north, v->max_west, progress.total, dpp, progress.id); + v->min_north, v->min_west, v->max_north, v->max_west, progress.total.load(), dpp, progress.id); // Init our varaibles for tracking position over the loop double lat = v->min_north; diff --git a/src/outputs.cc b/src/outputs.cc index e3709ca..2211220 100644 --- a/src/outputs.cc +++ b/src/outputs.cc @@ -1534,8 +1534,8 @@ void PathReport(struct site source, struct site destination, char *name, if((loss*1.5) < free_space_loss){ fprintf(fd2,"Model error! Computed loss of %.1fdB is greater than free space loss of %.1fdB. Check your inuts for model %d\n",loss,free_space_loss,propmodel); - spdlog::error("Model error! Computed loss of {:.1f} dB is greater than free space loss of {:.1f} dB. Check your inuts for model {}",loss,free_space_loss,propmodel); - return; + spdlog::error("Model error! Computed loss of {:.1f} dB is greater than free space loss of {:.1f} dB. Check your inputs for model {}", loss, free_space_loss, static_cast(propmodel)); + return; } if (free_space_loss != 0.0) From 25ff9152a74b478ffc612c84f4ee8f7f1d42c879 Mon Sep 17 00:00:00 2001 From: glompos21 Date: Tue, 7 Jan 2025 00:09:32 +0200 Subject: [PATCH 2/5] fix bug when generating large filename ie all coordinates had 2 digites --- src/inputs.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/inputs.cc b/src/inputs.cc index bbe27e5..ccb0a45 100644 --- a/src/inputs.cc +++ b/src/inputs.cc @@ -2076,7 +2076,7 @@ int LoadTopoData(bbox region) spdlog::debug("Loading topo for tile {}N {}W to {}N {}W", tile_lat, tile_lon, tile_lat + 1, tile_lon + 1); // Generate the filename string to load char basename[32], string[32]; - snprintf(basename, 12, "%d_%d_%d_%d", tile_lat, tile_lat + 1, tile_lon, tile_lon + 1); + snprintf(basename, 16, "%d_%d_%d_%d", tile_lat, tile_lat + 1, tile_lon, tile_lon + 1); strcpy(string, basename); if (ippd == 3600) strcat(string, "-hd"); // Load the tile From 4ceb6f81b1a25a80d3c55fb4728bdb193b8720be Mon Sep 17 00:00:00 2001 From: glompos21 Date: Tue, 7 Jan 2025 00:10:10 +0200 Subject: [PATCH 3/5] change output to work with updated version signalserver_gui --- src/main.cc | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/src/main.cc b/src/main.cc index 06345db..79c2f06 100644 --- a/src/main.cc +++ b/src/main.cc @@ -2090,17 +2090,11 @@ int main(int argc, char *argv[]) if (tx_site[0].lon < -180.0) tx_site[0].lon += 360; - if (cropping) { - spdlog::debug("| {:.6f} ", tx_site[0].lat+cropLat); - spdlog::debug("| {:.6f} ", tx_site[0].lon+cropLon); - spdlog::debug("| {:.6f} ", tx_site[0].lat-cropLat); - spdlog::debug("| {:.6f} |",tx_site[0].lon-cropLon); + spdlog::info("Area boundaries:{:.6f} | {:.6f} | {:.6f} | {:.6f} ", tx_site[0].lat+cropLat, tx_site[0].lon+cropLon, tx_site[0].lat-cropLat,tx_site[0].lon-cropLon); + } else { - spdlog::debug("| {:.6f} ", max_north); - spdlog::debug("| {:.6f} ", east); - spdlog::debug("| {:.6f} ", min_north); - spdlog::debug("| {:.6f} |",west); + spdlog::info("Area boundaries:{:.6f} | {:.6f} | {:.6f} | {:.6f} ",max_north,east,min_north,west); } } else { From a41ed9288156a8638912a16d1f807c890935da04 Mon Sep 17 00:00:00 2001 From: W3AXL Date: Fri, 2 May 2025 13:33:33 -0400 Subject: [PATCH 4/5] small updates to logging and gitignore --- .gitignore | 13 ++++++++++++- src/main.cc | 4 +--- 2 files changed, 13 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index 3a12437..87da17d 100644 --- a/.gitignore +++ b/.gitignore @@ -50,6 +50,17 @@ _deps # Output data *.ppm *.dcf +output/ # VSCode -.vscode/ \ No newline at end of file +.vscode/ + +# Images +*.png +*.kmz +*.tiff + +# Built utils +utils/sdf/usgs2sdf/srtm2sdf +utils/sdf/usgs2sdf/srtm2sdf-hd +utils/sdf/usgs2sdf/usgs2sdf diff --git a/src/main.cc b/src/main.cc index 06345db..8978d21 100644 --- a/src/main.cc +++ b/src/main.cc @@ -1082,8 +1082,6 @@ int main(int argc, char *argv[]) IPPD = 6000; // will be overridden based upon file header... } - spdlog::info(VERT_SEP); - if (strstr(argv[0], "signalserverHD")) { spdlog::info(sshd_block); } @@ -1098,7 +1096,7 @@ int main(int argc, char *argv[]) spdlog::info("Version {}.{} ({} {})", VER_MAJ, VER_MIN, GIT_BRANCH, GIT_COMMIT_HASH); spdlog::info(" Compile date: {} {}", __DATE__, __TIME__); spdlog::info(" Built for {} DEM tiles at {} pixels", MAXPAGES, IPPD); - spdlog::info(VERT_SEP); + spdlog::info(""); if (argc == 1) { fprintf(stdout, "License: GNU General Public License (GPL) version 2\n\n"); From 59970c17a4dfebde0cd65adb817c099b1b282ed0 Mon Sep 17 00:00:00 2001 From: Ruud Schramp Date: Tue, 10 Jun 2025 21:04:56 +0200 Subject: [PATCH 5/5] Update cmake-multi-platform.yml Missing libbz2-dev --- .github/workflows/cmake-multi-platform.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/cmake-multi-platform.yml b/.github/workflows/cmake-multi-platform.yml index 12c6fbb..84027e2 100644 --- a/.github/workflows/cmake-multi-platform.yml +++ b/.github/workflows/cmake-multi-platform.yml @@ -29,7 +29,7 @@ jobs: - uses: actions/checkout@v4 - name: Install spdlog on Ubuntu - run: sudo apt-get install -y libspdlog-dev + run: sudo apt-get install -y libspdlog-dev libbz2-dev - name: Set reusable strings id: strings