diff --git a/pom.xml b/pom.xml index 49c3139b..18f1ee7d 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ 4.0.0 org.pamguard Pamguard - 2.02.09c + 2.02.09d Pamguard Java12+ Pamguard for Java 12+, using Maven to control dependcies www.pamguard.org diff --git a/src/PamUtils/TxtFileUtils.java b/src/PamUtils/TxtFileUtils.java index 58d8c72b..72bab5fc 100644 --- a/src/PamUtils/TxtFileUtils.java +++ b/src/PamUtils/TxtFileUtils.java @@ -89,7 +89,8 @@ public class TxtFileUtils { //5/08/2022 - there was a bug here where there is some sort of invisible character that does not appear on the //print screen - the only way you can tell is the char array is greater than the number of digits - removed all non numeric //characters. - String number = new String(recordsOnLine[i].strip().replaceAll("[^\\d.]", "")); + // updated again on 15/11/23 to include - signs, or you end up with the abs(of every number!) + String number = new String(recordsOnLine[i].strip().replaceAll("[^\\d.-]", "")); dat = Double.valueOf(number); //dat = DecimalFormat.getNumberInstance().parse(new String(recordsOnLine[i].strip().toCharArray())).doubleValue(); } diff --git a/src/help/localisation/difar/difarAzigram/docs/azigram.html b/src/help/localisation/difar/difarAzigram/docs/azigram.html index f1ec9541..6b576e4a 100644 --- a/src/help/localisation/difar/difarAzigram/docs/azigram.html +++ b/src/help/localisation/difar/difarAzigram/docs/azigram.html @@ -36,11 +36,11 @@ The Azigram plugin is version 0.0.1 and has been tested on Pamguard version 2.01

The sample rate of the Azigram output can be chosen from the Output panel of the settings. The plugin uses frequency domain downsampling in order to acheive the selected sample rate. When selecting the output sample rate, the output FFT length and FFT hop will be altered in order to maintain the same time and frequency resolution as the upstream FFT module.

-

+

The Azigram can be viewed on a Spectrogram Display. The HSV colour model is recommended for viewing Azigrams. This colour model is circular so will better illustrate the circular nature of the angular data (e.g. sounds from 359 degrees will be similar in colour to sounds from 1 degree). The limits of the Amplitude Range on the "Scales" tab of the "Spectrogram Parameters" should be manually set to Min 0 and Max 360. While this tab suggests that the Min and Max are in dB, the Azigram module will treat these values as degrees if an Azigram is being displayed.

-

+

 

@@ -48,7 +48,7 @@ The Azigram plugin is version 0.0.1 and has been tested on Pamguard version 2.01

The screenshot below shows the DIFAR Azigram Module displaying the Azigram output (top graph) and regular spectrogram ouput (middle panel) of a synthetic test signal. The test signal is a simulated DIFAR source with 8 short FM downsweeps arriving from 0-315 degrees in 45 degree increments. The bottom panel shows the PAMGuard Data Model.

-

+