nordic-dev.net/PAMGuard
nordic-dev.net/PAMGuard
2
0
Fork 0
mirror of https://github.com/PAMGuard/PAMGuard.git synced 2024-11-22 07:02:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #48 from PAMGuard/main

Browse Source 
Merge from main
This commit is contained in:
Douglas Gillespie 2023-12-14 10:51:17 +00:00 committed by GitHub
commit 951e3116a5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pom.xml
View File

@ -4,7 +4,7 @@
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<groupId>org.pamguard</groupId> <groupId>org.pamguard</groupId>
<artifactId>Pamguard</artifactId> <artifactId>Pamguard</artifactId>
<version>2.02.09c</version> <version>2.02.09d</version>
<name>Pamguard Java12+</name> <name>Pamguard Java12+</name>
<description>Pamguard for Java 12+, using Maven to control dependcies</description> <description>Pamguard for Java 12+, using Maven to control dependcies</description>
<url>www.pamguard.org</url> <url>www.pamguard.org</url>

3
src/PamUtils/TxtFileUtils.java
View File

@ -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 //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 //print screen - the only way you can tell is the char array is greater than the number of digits - removed all non numeric
//characters. //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 = Double.valueOf(number);
//dat = DecimalFormat.getNumberInstance().parse(new String(recordsOnLine[i].strip().toCharArray())).doubleValue(); //dat = DecimalFormat.getNumberInstance().parse(new String(recordsOnLine[i].strip().toCharArray())).doubleValue();
} }

6
src/help/localisation/difar/difarAzigram/docs/azigram.html
View File

@ -36,11 +36,11 @@ The Azigram plugin is version 0.0.1 and has been tested on Pamguard version 2.01
<p>The sample rate of the Azigram output can be&nbsp;chosen from the&nbsp;Output panel of the settings. The plugin uses frequency domain downsampling in order to acheive the&nbsp;selected sample rate. When selecting the output sample rate, the output FFT length and FFT hop will be altered in order to maintain&nbsp;the same time and frequency resolution as the upstream FFT module.</p> <p>The sample rate of the Azigram output can be&nbsp;chosen from the&nbsp;Output panel of the settings. The plugin uses frequency domain downsampling in order to acheive the&nbsp;selected sample rate. When selecting the output sample rate, the output FFT length and FFT hop will be altered in order to maintain&nbsp;the same time and frequency resolution as the upstream FFT module.</p>
<p><img src="AzigramSettings.png" /></p> <p><img src="./images/AzigramSettings.png" /></p>
<p>The Azigram can be viewed on a Spectrogram Display.&nbsp;The HSV colour model is recommended for viewing Azigrams. This&nbsp;colour model&nbsp;is circular&nbsp;so will better illustrate the&nbsp;circular nature of the angular data (e.g.&nbsp;sounds from&nbsp;359 degrees will be similar in colour to sounds from 1 degree).&nbsp;The limits of the Amplitude Range on the &quot;Scales&quot; tab of the&nbsp;&quot;Spectrogram Parameters&quot; should be manually set to Min 0 and Max 360. While this tab&nbsp;suggests that the&nbsp;Min and Max are in dB,&nbsp;the&nbsp;Azigram module will treat these&nbsp;values as degrees if an Azigram is being displayed.</p> <p>The Azigram can be viewed on a Spectrogram Display.&nbsp;The HSV colour model is recommended for viewing Azigrams. This&nbsp;colour model&nbsp;is circular&nbsp;so will better illustrate the&nbsp;circular nature of the angular data (e.g.&nbsp;sounds from&nbsp;359 degrees will be similar in colour to sounds from 1 degree).&nbsp;The limits of the Amplitude Range on the &quot;Scales&quot; tab of the&nbsp;&quot;Spectrogram Parameters&quot; should be manually set to Min 0 and Max 360. While this tab&nbsp;suggests that the&nbsp;Min and Max are in dB,&nbsp;the&nbsp;Azigram module will treat these&nbsp;values as degrees if an Azigram is being displayed.</p>
<p><img src="AzigramDisplay.png" /></p> <p><img src="./images/AzigramDisplay.png" /></p>
<p>&nbsp;</p> <p>&nbsp;</p>
@ -48,7 +48,7 @@ The Azigram plugin is version 0.0.1 and has been tested on Pamguard version 2.01
<p>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.</p> <p>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.</p>
<p><img src="AzigramExample.png" /></p> <p><img src="./images/AzigramExample.png" /></p>
<p>&nbsp;</p> <p>&nbsp;</p>