Skip to content

Commit

Permalink
Merge pull request #1482 from dwcaress/caress-tmp
Browse files Browse the repository at this point in the history 
Caress tmp
  • Loading branch information
@dwcaress
dwcaress authored Sep 6, 2024
2 parents 0dd0e89 + d79c824 commit 7ca676d
Show file tree
Hide file tree
Showing 7 changed files with 463 additions and 447 deletions.
853 changes: 432 additions & 421 deletions ChangeLog.html
View file

Large diffs are not rendered by default.

11 changes: 11 additions & 0 deletions ChangeLog.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ or beta, are equally accessible as tarballs through the Github interface.
---
### MB-System Version 5.8 Releases and Release Notes:
---
- Version 5.8.2beta14 September 6, 2024
- Version 5.8.2beta13 August 23, 2024
- Version 5.8.2beta12 August 22, 2024
- Version 5.8.2beta11 August 19, 2024
Expand All @@ -46,6 +47,16 @@ or beta, are equally accessible as tarballs through the Github interface.

---

#### 5.8.2beta14 (August 23, 2024)

Mbphotomosaic: Removed unnecessary --correction-file-color option (redundant with --correction-file)

mbm_grdplot: Fixed -G7 option for plotting images with geodetics defined in world files
rather than embedded as in GeoTiffs. Specifically allows use of png images with transparency.

Formats 232 (MBF_WISSLR) and 233 (MBF_WISSLP): Fixed initial beam flagging by mbpreprocess
for secondary sounding picks (when the lidar was operated in multipick mode)

#### 5.8.2beta13 (August 23, 2024)

Mbphotomosaic: Fixed use of the --dark-image-ignore and --dark-image-multiply options
Expand Down
Binary file modified ChangeLog.pdf
View file
Binary file not shown.
6 changes: 3 additions & 3 deletions src/macros/mbm_grdplot
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1121,7 +1121,7 @@ if (!$bounds || !$zbounds || $zmode == 1)
/\S+\s+v_min:\s+(\S+)\s+v_max:\s+(\S+)\s+name:\s+(.+)/;
}
}
if ($color_mode != 6 && $zmin_f >= $zmax_f)
if ($color_mode != 6 && $color_mode != 7 && $zmin_f >= $zmax_f)
{
if ($zbounds)
{
Expand Down Expand Up @@ -1156,7 +1156,7 @@ if (!$bounds || !$zbounds || $zmode == 1)

# check that there are data
if ($xmin_f >= $xmax_f || $ymin_f >= $ymax_f
|| ($color_mode != 6 && $zmin_f >= $zmax_f && !$zbounds))
|| ($color_mode != 6 && $color_mode != 7 && $zmin_f >= $zmax_f && !$zbounds))
{
print "\a";
print "$xmin_f $xmax_f $ymin_f $ymax_f $zmin_f $zmax_f\n";
Expand Down Expand Up @@ -1222,7 +1222,7 @@ if (!$zbounds)

# check that there are data
if ((!$use_corner_points && ($xmin >= $xmax || $ymin >= $ymax))
|| ($color_mode != 6 && $zmin >= $zmax))
|| ($color_mode != 6 && $color_mode != 7 && $zmin >= $zmax))
{
print "\a";
die "Improper data limits: x: $xmin $xmax y: $ymin $ymax z: $zmin $zmax\n$program_name aborted.\n"
Expand Down
4 changes: 2 additions & 2 deletions src/mbio/mb_define.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -37,8 +37,8 @@
#include <stdint.h>

/* Define version and date for this release */
#define MB_VERSION "5.8.2beta13"
#define MB_VERSION_DATE "23 August 2024"
#define MB_VERSION "5.8.2beta14"
#define MB_VERSION_DATE "6 September 2024"

/* CMake supports current OS's and so there is only one form of RPC and XDR and no mb_config.h file */
#ifdef CMAKE_BUILD_SYSTEM
Expand Down
17 changes: 11 additions & 6 deletions src/mbio/mbsys_3ddwissl.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3750,12 +3750,17 @@ int mbsys_3ddwissl_calculatebathymetry
}

/* set beamflag */
if (sounding->amplitude * amplitude_factor >= amplitude_threshold)
sounding->beamflag = MB_FLAG_NONE;
else if (isounding_largest == isounding)
sounding->beamflag = MB_FLAG_FLAG + MB_FLAG_SONAR;
else
sounding->beamflag = MB_FLAG_MULTIPICK;
if (isounding_largest == isounding) {
if (sounding->amplitude * amplitude_factor >= amplitude_threshold)
sounding->beamflag = MB_FLAG_NONE;
else
sounding->beamflag = MB_FLAG_FLAG + MB_FLAG_SONAR;
} else {
if (sounding->amplitude * amplitude_factor >= amplitude_threshold)
sounding->beamflag = MB_FLAG_FLAG + MB_FLAG_MULTIPICK;
else
sounding->beamflag = MB_FLAG_NULL;
}

/* translate to takeoff coordinates */
mb_rollpitch_to_takeoff(verbose, alpha, beta, &theta, &phi, error);
Expand Down
19 changes: 4 additions & 15 deletions src/photo/mbphotomosaic.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -129,7 +129,6 @@ char usage_message[] = "mbphotomosaic \n"
"\t--correction-range=target/coeff\n"
"\t--correction-standoff=target/coeff\n"
"\t--correction-file=imagecorrection.yaml\n"
"\t--correction-file-color\n"
"\t--reference-gain=gain\n"
"\t--reference-exposure=exposure\n"
"\t--reference-intensity=intensity\n"
Expand Down Expand Up @@ -2687,7 +2686,6 @@ int main(int argc, char** argv)
* --correction-range=target/coeff
* --correction-standoff=target/coeff
* --correction-file=imagecorrection.yaml
* --correction-file-color
* --reference-gain=gain
* --reference-exposure=exposure
* --reference-intensity=intensity
Expand Down Expand Up @@ -2742,7 +2740,6 @@ int main(int argc, char** argv)
{"correction-range", required_argument, NULL, 0},
{"correction-standoff", required_argument, NULL, 0},
{"correction-file", required_argument, NULL, 0},
{"correction-file-color", no_argument, NULL, 0},
{"reference-gain", required_argument, NULL, 0},
{"reference-exposure", required_argument, NULL, 0},
{"reference-intensity", required_argument, NULL, 0},
Expand Down Expand Up @@ -3022,12 +3019,6 @@ int main(int argc, char** argv)
}
}

/* correction-file-color */
else if (strcmp("correction-file-color", options[option_index].name) == 0)
{
control.corr_color_enabled = true;
}

/* reference-gain */
else if (strcmp("reference-gain", options[option_index].name) == 0)
{
Expand Down Expand Up @@ -3303,7 +3294,6 @@ int main(int argc, char** argv)
else if (control.corr_mode == MBPM_CORRECTION_FILE) {
fprintf(stream,"%s control.corr_mode: %d MBPM_CORRECTION_FILE\n", first, control.corr_mode);
fprintf(stream,"%s ImageCorrectionFile: %s\n", first, ImageCorrectionFile);
fprintf(stream,"%s control.corr_color_enabled: %d\n", first, control.corr_color_enabled);
}
else {
fprintf(stream,"%s control.corr_mode: %d MBPM_CORRECTION_NONE\n", first, control.corr_mode);
Expand Down Expand Up @@ -3667,6 +3657,10 @@ control.OutputBounds[0], control.OutputBounds[1], control.OutputBounds[2], contr
fprintf(stream," control.OutputDx[1]: dy: %.9f\n",control.OutputDx[1]);
fprintf(stream," control.OutputDim[0]: xdim: %d\n",control.OutputDim[0]);
fprintf(stream," control.OutputDim[1]: ydim: %d\n",control.OutputDim[1]);
fprintf(stream," pbounds[0]: west: %.9f\n",pbounds[0]);
fprintf(stream," pbounds[1]: east: %.9f\n",pbounds[1]);
fprintf(stream," pbounds[2]: south: %.9f\n",pbounds[2]);
fprintf(stream," pbounds[3]: north: %.9f\n",pbounds[3]);
}

/* If output file specified then create an an output image and priority map
Expand Down Expand Up @@ -3900,11 +3894,6 @@ control.OutputBounds[0], control.OutputBounds[1], control.OutputBounds[2], contr
}
}

/* correction-file-color */
else if (strncmp(imageLeftFile, "--correction-file-color", 23) == 0) {
control.corr_color_enabled = true;
}

/* reference-gain */
else if (strncmp(imageLeftFile, "--reference-gain=", 17) == 0) {
if (sscanf(imageLeftFile,"--reference-gain=%lf", &control.reference_gain) == 1 ) {
Expand Down

0 comments on commit 7ca676d

Please sign in to comment.