update DL help

This commit is contained in:
Douglas Gillespie 2024-06-24 13:28:02 +01:00
parent 9d467593de
commit 18cb59a209
21 changed files with 1125 additions and 1012 deletions

View File

@ -0,0 +1,7 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<launchConfiguration type="org.eclipse.ant.AntBuilderLaunchConfigurationType">
<booleanAttribute key="org.eclipse.ui.externaltools.ATTR_BUILDER_ENABLED" value="false"/>
<stringAttribute key="org.eclipse.ui.externaltools.ATTR_DISABLED_BUILDER" value="net.sourceforge.metrics.builder"/>
<mapAttribute key="org.eclipse.ui.externaltools.ATTR_TOOL_ARGUMENTS"/>
<booleanAttribute key="org.eclipse.ui.externaltools.ATTR_TRIGGERS_CONFIGURED" value="true"/>
</launchConfiguration>

View File

@ -11,8 +11,13 @@
</arguments> </arguments>
</buildCommand> </buildCommand>
<buildCommand> <buildCommand>
<name>net.sourceforge.metrics.builder</name> <name>org.eclipse.ui.externaltools.ExternalToolBuilder</name>
<triggers>full,incremental,</triggers>
<arguments> <arguments>
<dictionary>
<key>LaunchConfigHandle</key>
<value>&lt;project&gt;/.externalToolBuilders/net.sourceforge.metrics.builder.launch</value>
</dictionary>
</arguments> </arguments>
</buildCommand> </buildCommand>
<buildCommand> <buildCommand>

View File

@ -388,7 +388,7 @@ PamguardBeta_ViewerMode.exe):</p>
<h1><a name="_LATEST_VERSION_2.02.03"></a><a name="_VERSION_2.02.07_January"></a><a <h1><a name="_LATEST_VERSION_2.02.03"></a><a name="_VERSION_2.02.07_January"></a><a
name="_Latest_Version_2.02.10"></a><em><span style='font-size:12.0pt; name="_Latest_Version_2.02.10"></a><em><span style='font-size:12.0pt;
font-family:"Cambria",serif;font-style:normal'><a href="#_Version_2.02.11_April">Latest font-family:"Cambria",serif;font-style:normal'><a href="#_Version_2.02.11_April">Latest
Version 2.02.11 April 2024</a></span></em></h1> Version 2.02.11 May 2024</a></span></em></h1>
<h1><em><span style='font-size:12.0pt;font-family:"Cambria",serif;font-style: <h1><em><span style='font-size:12.0pt;font-family:"Cambria",serif;font-style:
normal'><a href="#_Version_2.02.10_January">Version 2.02.10 January 2024</a></span></em></h1> normal'><a href="#_Version_2.02.10_January">Version 2.02.10 January 2024</a></span></em></h1>
@ -465,7 +465,7 @@ Version 2.00.10 June 2017</a></span></h1>
name="_Latest_Version_2.02.06"></a><a name="_Latest_Version_2.02.07"></a><a name="_Latest_Version_2.02.06"></a><a name="_Latest_Version_2.02.07"></a><a
name="_Latest_Version_2.02.08"></a><a name="_Version_2.02.09_June"></a><a name="_Latest_Version_2.02.08"></a><a name="_Version_2.02.09_June"></a><a
name="_Version_2.02.10_January"></a><a name="_Version_2.02.11_April"></a>Version name="_Version_2.02.10_January"></a><a name="_Version_2.02.11_April"></a>Version
2.02.11 April 2024</h1> 2.02.11 May 2024</h1>
<p class=MsoNormal>&nbsp;</p> <p class=MsoNormal>&nbsp;</p>
@ -479,8 +479,8 @@ continually reset them. </p>
<h2>Bug Fixes</h2> <h2>Bug Fixes</h2>
<p class=MsoNormal>Linking clicks to offline clicks table. We had a database <p class=MsoNormal>Linking clicks to offline clicks table. We had a database
that had become corrupted so added code to relink offline clicks to their corresponding that had become corrupted so added code to relink offline clicks to their
clicks from binary data. </p> corresponding clicks from binary data. </p>
<p class=MsoNormal>Drawing non-acoustic data: Data that were not associated <p class=MsoNormal>Drawing non-acoustic data: Data that were not associated
with any hydrophones, e.g. visual sightings in Logger forms were not drawing on with any hydrophones, e.g. visual sightings in Logger forms were not drawing on
@ -502,9 +502,9 @@ database. </p>
<h2><span lang=EN-US>New Features</span></h2> <h2><span lang=EN-US>New Features</span></h2>
<p class=MsoNormal><b><span lang=EN-US>Importing modules</span></b><span <p class=MsoNormal><b><span lang=EN-US>Importing modules</span></b><span
lang=EN-US> from other configurations: New options from file menu allowing import lang=EN-US> from other configurations: New options from file menu allowing
of specific modules, or module settings from other configurations. E.g. if you import of specific modules, or module settings from other configurations. E.g.
had three similar configurations and had set one of them up with a new if you had three similar configurations and had set one of them up with a new
detector, or got the click classifier settings set up just right in one of detector, or got the click classifier settings set up just right in one of
those configurations, you can import the additional modules or the click those configurations, you can import the additional modules or the click
detector settings easily into the other configurations. </span></p> detector settings easily into the other configurations. </span></p>
@ -532,9 +532,9 @@ correctly saving updated bearings to the database. Now fixed. </span></p>
<p class=MsoNormal><b><span lang=EN-US>ROCCA Classifier fixes</span></b></p> <p class=MsoNormal><b><span lang=EN-US>ROCCA Classifier fixes</span></b></p>
<p class=MsoNormal><span lang=EN-US>Allow Rocca to run without classifiers: Fixed <p class=MsoNormal><span lang=EN-US>Allow Rocca to run without classifiers:
bug that threw an error if no classifier files were &nbsp;specified in Rocca Fixed bug that threw an error if no classifier files were &nbsp;specified in
Params dialog</span></p> Rocca Params dialog</span></p>
<p class=MsoNormal><span lang=EN-US>Fix memory issue with <p class=MsoNormal><span lang=EN-US>Fix memory issue with
RoccaContourDataBlocks not being released for garbage collection</span></p> RoccaContourDataBlocks not being released for garbage collection</span></p>
@ -593,8 +593,8 @@ were reading local time, even when set to use UTC. </span></p>
which mostly occurred when processing large datasets of many offline files, has which mostly occurred when processing large datasets of many offline files, has
been fixed.</span></p> been fixed.</span></p>
<p class=MsoNormal><span lang=EN-US>Data Map: “Scroll To Data” pop-up menu, <p class=MsoNormal><span lang=EN-US>Data Map: “Scroll To Data” pop-up menu, which
which didnt always scroll to the correct place, is now fixed. </span></p> didnt always scroll to the correct place, is now fixed. </span></p>
<p class=MsoNormal><span lang=EN-US>Bearing Localiser offline: If reprocessing <p class=MsoNormal><span lang=EN-US>Bearing Localiser offline: If reprocessing
bearings, the localizer was not correctly loading required raw or FFT data to bearings, the localizer was not correctly loading required raw or FFT data to
@ -803,9 +803,8 @@ the TF FX display to crash if no data were displayed.</span></p>
<p class=MsoNormal><span lang=EN-US>See major release notes for V 2.02.01 <p class=MsoNormal><span lang=EN-US>See major release notes for V 2.02.01
below. </span></p> below. </span></p>
<p class=MsoNormal><span lang=EN-US>Bug 495: TD FX display throws <p class=MsoNormal><span lang=EN-US>Bug 495: TD FX display throws NullPointerException
NullPointerException if user has removed all data units and then moves mouse if user has removed all data units and then moves mouse over display area.</span></p>
over display area.</span></p>
<h1><a name="_Latest_Version_2.02.01"></a><span lang=EN-US>Version 2.02.01 <h1><a name="_Latest_Version_2.02.01"></a><span lang=EN-US>Version 2.02.01
October 2021</span></h1> October 2021</span></h1>
@ -993,9 +992,8 @@ help</a>. </p>
<p class=MsoNormal><b>If you are upgrading from a PAMGuard core release <p class=MsoNormal><b>If you are upgrading from a PAMGuard core release
(1.15.xx), PAMGuard Version 2 contains major updates. You should read and (1.15.xx), PAMGuard Version 2 contains major updates. You should read and
understand the notes listed for <a href="#_Latest_Beta_Version_2.00.10">Beta understand the notes listed for <a href="#_Latest_Beta_Version_2.00.10">Beta Version
Version 2.00.10</a> before proceeding with installation and use of this 2.00.10</a> before proceeding with installation and use of this version.</b></p>
version.</b></p>
<p class=MsoNormal>This version of PAMGuard has been bundled with Java 13 <p class=MsoNormal>This version of PAMGuard has been bundled with Java 13
(release 13.0.1). PSFX files generated in previous beta releases (2.xx.xx) (release 13.0.1). PSFX files generated in previous beta releases (2.xx.xx)
@ -1104,11 +1102,11 @@ understand the notes listed for <a href="#_Latest_Beta_Version_2.00.10">Beta
Version 2.00.10</a> before proceeding with installation and use of this Version 2.00.10</a> before proceeding with installation and use of this
version.</b></p> version.</b></p>
<p class=MsoNormal>This version of PAMGuard has been bundled with Java 13 <p class=MsoNormal>This version of PAMGuard has been bundled with Java 13 (release
(release 13.0.1). PSFX files generated in previous beta releases (2.xx.xx) 13.0.1). PSFX files generated in previous beta releases (2.xx.xx) should be
should be compatible with this version, and vice-versa. PSF files generated in compatible with this version, and vice-versa. PSF files generated in core
core releases (1.15.xx) can be loaded in this version, but will be converted to releases (1.15.xx) can be loaded in this version, but will be converted to PSFX
PSFX files when PAMGuard exits.</p> files when PAMGuard exits.</p>
<p class=MsoNormal><b><span lang=EN-US>Bug Fixes</span></b></p> <p class=MsoNormal><b><span lang=EN-US>Bug Fixes</span></b></p>
@ -1218,10 +1216,10 @@ lang=EN-US> </span>Add functionality for bluetooth headsets. </p>
<p class=MsoListParagraph style='text-indent:-18.0pt'><span lang=EN-US>2. </span><span <p class=MsoListParagraph style='text-indent:-18.0pt'><span lang=EN-US>2. </span><span
lang=EN-US style='font-size:7.0pt;font-family:"Times New Roman",serif'>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</span><span lang=EN-US style='font-size:7.0pt;font-family:"Times New Roman",serif'>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</span><span
lang=EN-US> </span>Add user-facing option to adjust the startup delay for the time-correction lang=EN-US> </span>Add user-facing option to adjust the startup delay for the
(Global Time module). This provides a workaround to speed up analysis of time-correction (Global Time module). This provides a workaround to speed up
thousands of wav files (i.e. by setting startup delay to 0 instead of default analysis of thousands of wav files (i.e. by setting startup delay to 0 instead
value of 2000 ms). </p> of default value of 2000 ms). </p>
<p class=MsoListParagraph style='text-indent:-18.0pt'><span lang=EN-US>3. </span><span <p class=MsoListParagraph style='text-indent:-18.0pt'><span lang=EN-US>3. </span><span
lang=EN-US style='font-size:7.0pt;font-family:"Times New Roman",serif'>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</span><span lang=EN-US style='font-size:7.0pt;font-family:"Times New Roman",serif'>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</span><span
@ -1232,8 +1230,8 @@ lang=EN-US style='font-size:7.0pt;font-family:"Times New Roman",serif'>&nbsp;&nb
Add 15 minute data load option to viewer mode. </p> Add 15 minute data load option to viewer mode. </p>
<p class=MsoListParagraph style='text-indent:-18.0pt'><span lang=EN-US>5. </span><span <p class=MsoListParagraph style='text-indent:-18.0pt'><span lang=EN-US>5. </span><span
lang=EN-US style='font-size:7.0pt;font-family:"Times New Roman",serif'>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</span> lang=EN-US style='font-size:7.0pt;font-family:"Times New Roman",serif'>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</span><span
Add 3D map for target motion module. </p> lang=EN-US> </span>Add 3D map for target motion module. </p>
<p class=MsoListParagraph style='text-indent:-18.0pt'><span lang=EN-US>6. </span><span <p class=MsoListParagraph style='text-indent:-18.0pt'><span lang=EN-US>6. </span><span
lang=EN-US style='font-size:7.0pt;font-family:"Times New Roman",serif'>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</span><span lang=EN-US style='font-size:7.0pt;font-family:"Times New Roman",serif'>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</span><span
@ -1301,8 +1299,9 @@ PSFX files when PAMGuard exits.</p>
<p class=MsoNormal><b><span lang=EN-US>Bug Fixes</span></b></p> <p class=MsoNormal><b><span lang=EN-US>Bug Fixes</span></b></p>
<p class=MsoListParagraph style='text-indent:-18.0pt'><span lang=EN-US>1. </span><span <p class=MsoListParagraph style='text-indent:-18.0pt'><span lang=EN-US>1. </span><span
lang=EN-US style='font-size:7.0pt;font-family:"Times New Roman",serif'>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</span> lang=EN-US style='font-size:7.0pt;font-family:"Times New Roman",serif'>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</span><span
Bug 433. Custom storage options were being lost when Pamguard restarted.</p> lang=EN-US> </span>Bug 433. Custom storage options were being lost when
Pamguard restarted.</p>
<p class=MsoListParagraph style='text-indent:-18.0pt'><span lang=EN-US>2. </span><span <p class=MsoListParagraph style='text-indent:-18.0pt'><span lang=EN-US>2. </span><span
lang=EN-US style='font-size:7.0pt;font-family:"Times New Roman",serif'>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</span><span lang=EN-US style='font-size:7.0pt;font-family:"Times New Roman",serif'>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</span><span
@ -1446,15 +1445,15 @@ Detector display. </p>
<p class=MsoListParagraph style='text-indent:-18.0pt'><span lang=EN-US>1. </span><span <p class=MsoListParagraph style='text-indent:-18.0pt'><span lang=EN-US>1. </span><span
lang=EN-US style='font-size:7.0pt;font-family:"Times New Roman",serif'>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</span><span lang=EN-US style='font-size:7.0pt;font-family:"Times New Roman",serif'>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</span><span
lang=EN-US> </span>This version of PAMGuard has been upgraded to make it lang=EN-US> </span>This version of PAMGuard has been upgraded to make it compatible
compatible with Java 12. psfx files generated in previous beta releases should with Java 12. psfx files generated in previous beta releases should be
be compatible with this version, and vice-versa.</p> compatible with this version, and vice-versa.</p>
<p class=MsoListParagraph style='text-indent:-18.0pt'><span lang=EN-US>2. </span><span <p class=MsoListParagraph style='text-indent:-18.0pt'><span lang=EN-US>2. </span><span
lang=EN-US style='font-size:7.0pt;font-family:"Times New Roman",serif'>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</span> lang=EN-US style='font-size:7.0pt;font-family:"Times New Roman",serif'>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</span>
Java 12 is better at handling Windows scaling issues on high-DPI displays. Beyond Java 12 is better at handling Windows scaling issues on high-DPI displays.
that, users should not notice much of a difference between this version and Beyond that, users should not notice much of a difference between this version
previous beta releases.</p> and previous beta releases.</p>
<!-- ************************************************************************************************************************** --><!-- ************************************************************************************************************************** --> <!-- ************************************************************************************************************************** --><!-- ************************************************************************************************************************** -->
@ -1528,9 +1527,9 @@ with installation and use of this version.</span></p>
<p class=MsoListParagraph style='text-indent:-18.0pt'><span lang=EN-US>1. </span><span <p class=MsoListParagraph style='text-indent:-18.0pt'><span lang=EN-US>1. </span><span
lang=EN-US style='font-size:7.0pt;font-family:"Times New Roman",serif'>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; lang=EN-US style='font-size:7.0pt;font-family:"Times New Roman",serif'>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
</span>Bug 413. Binary file crashing during load, after a system failure. </span>Bug 413. Binary file crashing during load, after a system failure. Failure
Failure could cause the file to become corrupt, which caused a crash during could cause the file to become corrupt, which caused a crash during subsequent
subsequent load</p> load</p>
<p class=MsoListParagraph style='text-indent:-18.0pt'><span lang=EN-US>2. </span><span <p class=MsoListParagraph style='text-indent:-18.0pt'><span lang=EN-US>2. </span><span
lang=EN-US style='font-size:7.0pt;font-family:"Times New Roman",serif'>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; lang=EN-US style='font-size:7.0pt;font-family:"Times New Roman",serif'>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
@ -1688,8 +1687,8 @@ lang=EN-US style='font-size:7.0pt;font-family:"Times New Roman",serif'>&nbsp;&nb
<p class=MsoNormal><b><span lang=EN-US>Upgrades</span></b></p> <p class=MsoNormal><b><span lang=EN-US>Upgrades</span></b></p>
<p class=MsoListParagraph style='text-indent:-18.0pt'><span lang=EN-US>1. </span><span <p class=MsoListParagraph style='text-indent:-18.0pt'><span lang=EN-US>1. </span><span
lang=EN-US style='font-size:7.0pt;font-family:"Times New Roman",serif'>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</span> lang=EN-US style='font-size:7.0pt;font-family:"Times New Roman",serif'>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</span><span
Improvement to Range Rings in Map display.</p> lang=EN-US> </span>Improvement to Range Rings in Map display.</p>
<p class=MsoListParagraph style='text-indent:-18.0pt'><span lang=EN-US>2. </span><span <p class=MsoListParagraph style='text-indent:-18.0pt'><span lang=EN-US>2. </span><span
lang=EN-US style='font-size:7.0pt;font-family:"Times New Roman",serif'>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</span> lang=EN-US style='font-size:7.0pt;font-family:"Times New Roman",serif'>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</span>
@ -1743,8 +1742,8 @@ with installation and use of this version.</span></p>
<p class=MsoListParagraph style='text-indent:-18.0pt'><span lang=EN-US>1. </span><span <p class=MsoListParagraph style='text-indent:-18.0pt'><span lang=EN-US>1. </span><span
lang=EN-US style='font-size:7.0pt;font-family:"Times New Roman",serif'>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; lang=EN-US style='font-size:7.0pt;font-family:"Times New Roman",serif'>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
</span>Bug 338. Problem displaying coastlines and bathymetric contours around </span>Bug 338. Problem displaying coastlines and bathymetric contours around the
the dateline (+/- 180 longitude) in the map.</p> dateline (+/- 180 longitude) in the map.</p>
<p class=MsoListParagraph style='text-indent:-18.0pt'><span lang=EN-US>2. </span><span <p class=MsoListParagraph style='text-indent:-18.0pt'><span lang=EN-US>2. </span><span
lang=EN-US style='font-size:7.0pt;font-family:"Times New Roman",serif'>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; lang=EN-US style='font-size:7.0pt;font-family:"Times New Roman",serif'>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
@ -2327,13 +2326,13 @@ lang=EN-US>&nbsp;</span></p>
<p class=MsoListParagraph style='text-indent:-18.0pt'><span lang=EN-US>1.</span><span <p class=MsoListParagraph style='text-indent:-18.0pt'><span lang=EN-US>1.</span><span
lang=EN-US style='font-size:7.0pt;font-family:"Times New Roman",serif'>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; lang=EN-US style='font-size:7.0pt;font-family:"Times New Roman",serif'>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
</span><span lang=EN-US>Bug 317. Rocca Module Data Purging. </span>The ROCCA </span><span lang=EN-US>Bug 317. Rocca Module Data Purging. </span>The ROCCA
module was not performing data purging when using classifiers developed for module was not performing data purging when using classifiers developed for Hawaii/Temperate
Hawaii/Temperate Pacific/North Atlantic datasets. This has been corrected.</p> Pacific/North Atlantic datasets. This has been corrected.</p>
<p class=MsoListParagraph style='text-indent:-18.0pt'><span lang=EN-US>2.</span><span <p class=MsoListParagraph style='text-indent:-18.0pt'><span lang=EN-US>2.</span><span
lang=EN-US style='font-size:7.0pt;font-family:"Times New Roman",serif'>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; lang=EN-US style='font-size:7.0pt;font-family:"Times New Roman",serif'>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
</span>Bug 320. Pamguard stopped reading Click Detector Event data from </span>Bug 320. Pamguard stopped reading Click Detector Event data from database
database when target motion analysis information was encountered. Corrected.</p> when target motion analysis information was encountered. Corrected.</p>
<p class=MsoListParagraph style='text-indent:-18.0pt'><span lang=EN-US>3.</span><span <p class=MsoListParagraph style='text-indent:-18.0pt'><span lang=EN-US>3.</span><span
lang=EN-US style='font-size:7.0pt;font-family:"Times New Roman",serif'>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; lang=EN-US style='font-size:7.0pt;font-family:"Times New Roman",serif'>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
@ -2438,9 +2437,9 @@ jar file will be required rather than a new bespoke PAMGuard installation.</span
unchanged, in most cases simply requiring the addition of an interface class. unchanged, in most cases simply requiring the addition of an interface class.
&nbsp;Instructions for the development of new modules utilizing the plug-in &nbsp;Instructions for the development of new modules utilizing the plug-in
scheme can be found <a href="http://www.pamguard.org/16_HowtomakePlug-Ins.html" scheme can be found <a href="http://www.pamguard.org/16_HowtomakePlug-Ins.html"
target="_blank">here</a>. &nbsp;Plug-in modules can be downloaded from the target="_blank">here</a>. &nbsp;Plug-in modules can be downloaded from the PAMGuard
PAMGuard website here, but developers are encouraged to host and maintain their website here, but developers are encouraged to host and maintain their own
own modules.</span></p> modules.</span></p>
<p class=MsoNormal><span lang=EN-US>Modules of interest to the general PAM <p class=MsoNormal><span lang=EN-US>Modules of interest to the general PAM
community will remain as part of the core PAMGuard installation. However, community will remain as part of the core PAMGuard installation. However,
@ -2615,9 +2614,9 @@ main click detector display. </span></p>
<p class=MsoNormal><b><span lang=EN-US>Target Motion Analysis</span></b></p> <p class=MsoNormal><b><span lang=EN-US>Target Motion Analysis</span></b></p>
<p class=MsoNormal><span lang=EN-US>A major piece of work has been undertaken to <p class=MsoNormal><span lang=EN-US>A major piece of work has been undertaken
improve the Target Motion tracking with PAMGuard. Details are available in the to improve the Target Motion tracking with PAMGuard. Details are available in
online help. Users of the Click Detector will notice the following changes:</span></p> the online help. Users of the Click Detector will notice the following changes:</span></p>
<p class=MsoListParagraph style='text-indent:-18.0pt'><span lang=EN-US>1.</span><span <p class=MsoListParagraph style='text-indent:-18.0pt'><span lang=EN-US>1.</span><span
lang=EN-US style='font-size:7.0pt;font-family:"Times New Roman",serif'>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; lang=EN-US style='font-size:7.0pt;font-family:"Times New Roman",serif'>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
@ -2936,9 +2935,9 @@ See the help file for details.</span></p>
lang=EN-US style='font-size:7.0pt;font-family:"Times New Roman",serif'>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; lang=EN-US style='font-size:7.0pt;font-family:"Times New Roman",serif'>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
</span><span lang=EN-US>Feature Request 45.</span><span lang=EN-US </span><span lang=EN-US>Feature Request 45.</span><span lang=EN-US
style='font-size:7.0pt'> </span><span lang=EN-US>Click classification settings style='font-size:7.0pt'> </span><span lang=EN-US>Click classification settings
export / import. Click classification settings can be exported individually to export / import. Click classification settings can be exported individually to files
files and imported into other click detector configurations. See the help file and imported into other click detector configurations. See the help file for
for details. </span></p> details. </span></p>
<p class=MsoListParagraph style='text-indent:-18.0pt'><span lang=EN-US>3.</span><span <p class=MsoListParagraph style='text-indent:-18.0pt'><span lang=EN-US>3.</span><span
lang=EN-US style='font-size:7.0pt;font-family:"Times New Roman",serif'>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; lang=EN-US style='font-size:7.0pt;font-family:"Times New Roman",serif'>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
@ -3055,8 +3054,8 @@ allocation to allow more memory for the database interface. Hopefully Fixed. </p
<p class=MsoListParagraph style='margin-left:38.25pt;text-indent:-20.25pt'><span <p class=MsoListParagraph style='margin-left:38.25pt;text-indent:-20.25pt'><span
lang=EN-AU>9.</span><span lang=EN-AU style='font-size:7.0pt;font-family:"Times New Roman",serif'>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; lang=EN-AU>9.</span><span lang=EN-AU style='font-size:7.0pt;font-family:"Times New Roman",serif'>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
</span>Bug 239. <span lang=EN-AU>Fixed bug in the DIFAR module that was incorrectly </span>Bug 239. <span lang=EN-AU>Fixed bug in the DIFAR module that was
preventing cross-fixes for some calls.</span></p> incorrectly preventing cross-fixes for some calls.</span></p>
<p class=MsoNormal>Details of these bugs can be found at <a <p class=MsoNormal>Details of these bugs can be found at <a
href="https://sourceforge.net/p/pamguard/bugs">https://sourceforge.net/p/pamguard/bugs</a></p> href="https://sourceforge.net/p/pamguard/bugs">https://sourceforge.net/p/pamguard/bugs</a></p>
@ -3152,9 +3151,9 @@ crash when analyzing click event containing unclassified clicks</span></p>
<p class=MsoListParagraph style='margin-left:47.25pt;text-indent:-29.25pt'><span <p class=MsoListParagraph style='margin-left:47.25pt;text-indent:-29.25pt'><span
lang=EN-US>8.</span><span lang=EN-US style='font-size:7.0pt;font-family:"Times New Roman",serif'>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; lang=EN-US>8.</span><span lang=EN-US style='font-size:7.0pt;font-family:"Times New Roman",serif'>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
</span><span lang=EN-US>Bug 230. Click Bearing Display. With a two hydrophone </span><span lang=EN-US>Bug 230. Click Bearing Display. With a two hydrophone system,
system, clicks calculated to have a bearing of exactly 180 degrees would be clicks calculated to have a bearing of exactly 180 degrees would be displayed
displayed at 0 degrees on the bearing time display.</span></p> at 0 degrees on the bearing time display.</span></p>
<p class=MsoListParagraph style='margin-left:36.75pt;text-indent:-18.75pt'><span <p class=MsoListParagraph style='margin-left:36.75pt;text-indent:-18.75pt'><span
lang=EN-US>&nbsp;</span></p> lang=EN-US>&nbsp;</span></p>
@ -3206,9 +3205,8 @@ total loss of the PAMGuard configuration in viewer mode and has been rectified.
7.0pt;font-family:"Times New Roman",serif'>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</span>Bug 7.0pt;font-family:"Times New Roman",serif'>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</span>Bug
218. SAIL Acquisition card would hang the system. This has also been fixed. </p> 218. SAIL Acquisition card would hang the system. This has also been fixed. </p>
<p class=MsoListParagraph style='text-indent:-18.0pt'>7.&nbsp;&nbsp;&nbsp; Bug <p class=MsoListParagraph style='text-indent:-18.0pt'>7.&nbsp;&nbsp;&nbsp; Bug 219.
219. Problems displaying Offline Click Events in the Viewer map have been Problems displaying Offline Click Events in the Viewer map have been fixed. </p>
fixed. </p>
<p class=MsoNormal>&nbsp;</p> <p class=MsoNormal>&nbsp;</p>
@ -3515,9 +3513,9 @@ to these menus to provide additional information to users. &nbsp;</p>
<p class=MsoNormal style='margin-left:36.0pt'><i>Radar Display</i></p> <p class=MsoNormal style='margin-left:36.0pt'><i>Radar Display</i></p>
<p class=MsoNormal style='margin-left:36.0pt'>Functionality has been added to the <p class=MsoNormal style='margin-left:36.0pt'>Functionality has been added to
radar display so that bearings can be shown relative to either the vessel or to the radar display so that bearings can be shown relative to either the vessel
true North. </p> or to true North. </p>
<p class=MsoNormal style='margin-left:36.0pt'>Better control of data in viewer <p class=MsoNormal style='margin-left:36.0pt'>Better control of data in viewer
mode, making is easy to scroll through and view data for short time periods. </p> mode, making is easy to scroll through and view data for short time periods. </p>
@ -3872,11 +3870,11 @@ Symbol'>'</span><span style='font-size:7.0pt;font-family:"Times New Roman",serif
<p class=MsoNormal>2. Improved offline viewer functionality. </p> <p class=MsoNormal>2. Improved offline viewer functionality. </p>
<p class=MsoNormal>The offline viewer is much improved with better data <p class=MsoNormal>The offline viewer is much improved with better data scrolling
scrolling and the ability to view data either stored in the database or the and the ability to view data either stored in the database or the binary
binary storage system. Work has stated on functions which read and use data storage system. Work has stated on functions which read and use data stored in
stored in audio files. This is currently limited to re-calculating and audio files. This is currently limited to re-calculating and displaying
displaying displaying spectrogram data during viewer mode operation.&nbsp; </p> displaying spectrogram data during viewer mode operation.&nbsp; </p>
<p class=MsoNormal>3. Heading sensor readout</p> <p class=MsoNormal>3. Heading sensor readout</p>
@ -4083,13 +4081,13 @@ port is closed. Might prevent a few problems when using a GPS. </p>
<p class=MsoNormal><b>Bug Fixes</b></p> <p class=MsoNormal><b>Bug Fixes</b></p>
<p class=MsoNormal>Crashes caused in real time or Mixed Mode if the number of <p class=MsoNormal>Crashes caused in real time or Mixed Mode if the number of software
software channels exceeds the number of hydrophones configured in the array channels exceeds the number of hydrophones configured in the array manager. It
manager. It is of course illogical to have software channels which are not is of course illogical to have software channels which are not assigned to a
assigned to a hydrophone, so rather than entirely prevent PAMGUARD from hydrophone, so rather than entirely prevent PAMGUARD from crashing I have
crashing I have inserted additional checks into the hydrophone array dialog inserted additional checks into the hydrophone array dialog which will prevent
which will prevent the user from closing that dialog unless all software the user from closing that dialog unless all software channels are assigned to
channels are assigned to a hydrophone. </p> a hydrophone. </p>
<h2><span style='font-weight:normal'>Version 1.8.01 Beta February 2010</span></h2> <h2><span style='font-weight:normal'>Version 1.8.01 Beta February 2010</span></h2>
@ -4302,11 +4300,11 @@ Symbol'>'</span><span style='font-size:7.0pt;font-family:"Times New Roman",serif
<p class=MsoListParagraph style='text-indent:-18.0pt'><span style='font-family: <p class=MsoListParagraph style='text-indent:-18.0pt'><span style='font-family:
Symbol'>'</span><span style='font-size:7.0pt;font-family:"Times New Roman",serif'>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; Symbol'>'</span><span style='font-size:7.0pt;font-family:"Times New Roman",serif'>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
</span>New menu functionality by right clicking on any of the tabs of the main tab </span>New menu functionality by right clicking on any of the tabs of the main
control will allow the user to copy the tab contents to the system clipboard tab control will allow the user to copy the tab contents to the system
from where it can be copied into other programs (e.g. Word, Powerpoint, clipboard from where it can be copied into other programs (e.g. Word,
etc.).Some modules, such as the map, have this implemented in other menus Powerpoint, etc.).Some modules, such as the map, have this implemented in other
(right click) and also allow printing.&nbsp; </p> menus (right click) and also allow printing.&nbsp; </p>
<p class=MsoListParagraph style='text-indent:-18.0pt'><span style='font-family: <p class=MsoListParagraph style='text-indent:-18.0pt'><span style='font-family:
Symbol'>'</span><span style='font-size:7.0pt;font-family:"Times New Roman",serif'>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; Symbol'>'</span><span style='font-size:7.0pt;font-family:"Times New Roman",serif'>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
@ -4374,8 +4372,8 @@ online help. </p>
<p class=MsoNormal><b>PAMGUARD Mixed Mode operation</b></p> <p class=MsoNormal><b>PAMGUARD Mixed Mode operation</b></p>
<p class=MsoNormal>Analyses data from wav or AIF file and synchronises it with GPS <p class=MsoNormal>Analyses data from wav or AIF file and synchronises it with
data reloaded from a database so that detected sounds may be correctly GPS data reloaded from a database so that detected sounds may be correctly
localised. Multiple display frames - enables PAMGUARD GUI to be split into localised. Multiple display frames - enables PAMGUARD GUI to be split into
multiple display windows, displayed on multiple monitors if desired. Enables multiple display windows, displayed on multiple monitors if desired. Enables
the operator to simultaneously view the map and the click detector for example, the operator to simultaneously view the map and the click detector for example,
@ -4411,9 +4409,9 @@ now been fixed. </p>
<p class=MsoNormal><b>Sound Recorder</b></p> <p class=MsoNormal><b>Sound Recorder</b></p>
<p class=MsoNormal>Level meters are shown for the correct channels (after <p class=MsoNormal>Level meters are shown for the correct channels (after channel
channel numbering has been changed). Occasional crash due to synchronisation numbering has been changed). Occasional crash due to synchronisation problems
problems when &nbsp;multi-threading now fixed.</p> when &nbsp;multi-threading now fixed.</p>
<p class=MsoNormal><b>Whistle Detector</b></p> <p class=MsoNormal><b>Whistle Detector</b></p>
@ -4687,9 +4685,9 @@ Symbol'>'</span><span style='font-size:7.0pt;font-family:"Times New Roman",serif
<p class=MsoListParagraph style='text-indent:-18.0pt'><span style='font-family: <p class=MsoListParagraph style='text-indent:-18.0pt'><span style='font-family:
Symbol'>'</span><span style='font-size:7.0pt;font-family:"Times New Roman",serif'>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; Symbol'>'</span><span style='font-size:7.0pt;font-family:"Times New Roman",serif'>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
</span>Better drawing of held spectrogram when putting mark rectangles on a </span>Better drawing of held spectrogram when putting mark rectangles on a spectrogram
spectrogram display. All panels are now correctly frozen. The rectangle is display. All panels are now correctly frozen. The rectangle is drawn in red on
drawn in red on the marked panel and in green on other panels. </p> the marked panel and in green on other panels. </p>
<p class=MsoListParagraph style='text-indent:-18.0pt'><span style='font-family: <p class=MsoListParagraph style='text-indent:-18.0pt'><span style='font-family:
Symbol'>'</span><span style='font-size:7.0pt;font-family:"Times New Roman",serif'>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; Symbol'>'</span><span style='font-size:7.0pt;font-family:"Times New Roman",serif'>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
@ -4705,9 +4703,9 @@ coming in through the ASIO card and back out through its headphone socket
<p class=MsoListParagraph style='text-indent:-18.0pt'><span style='font-family: <p class=MsoListParagraph style='text-indent:-18.0pt'><span style='font-family:
Symbol'>'</span><span style='font-size:7.0pt;font-family:"Times New Roman",serif'>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; Symbol'>'</span><span style='font-size:7.0pt;font-family:"Times New Roman",serif'>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
</span>Operation will depend on the configuration of individual sound cards and </span>Operation will depend on the configuration of individual sound cards and
how they are configured to mix incoming data with data from the PC. This is how they are configured to mix incoming data with data from the PC. This is sometimes
sometimes a physical switch on the card and sometimes a software configuration a physical switch on the card and sometimes a software configuration utility
utility specific to that sound card. </p> specific to that sound card. </p>
<p class=MsoListParagraph style='text-indent:-18.0pt'><span style='font-family: <p class=MsoListParagraph style='text-indent:-18.0pt'><span style='font-family:
Symbol'>'</span><span style='font-size:7.0pt;font-family:"Times New Roman",serif'>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; Symbol'>'</span><span style='font-size:7.0pt;font-family:"Times New Roman",serif'>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;

View File

@ -4,7 +4,7 @@
<groupId>org.pamguard</groupId> <groupId>org.pamguard</groupId>
<artifactId>Pamguard</artifactId> <artifactId>Pamguard</artifactId>
<name>Pamguard</name> <name>Pamguard</name>
<version>2.02.11d</version> <version>2.02.11f</version>
<description>Pamguard using Maven to control dependencies</description> <description>Pamguard using Maven to control dependencies</description>
<url>www.pamguard.org</url> <url>www.pamguard.org</url>
<organization> <organization>

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.11e</version> <version>2.02.11f</version>
<name>Pamguard</name> <name>Pamguard</name>
<description>Pamguard using Maven to control dependencies</description> <description>Pamguard using Maven to control dependencies</description>
<url>www.pamguard.org</url> <url>www.pamguard.org</url>

File diff suppressed because it is too large Load Diff

View File

@ -31,12 +31,12 @@ public class PamguardVersionInfo {
* Version number, major version.minorversion.sub-release. * Version number, major version.minorversion.sub-release.
* Note: can't go higher than sub-release 'f' * Note: can't go higher than sub-release 'f'
*/ */
static public final String version = "2.02.11e"; static public final String version = "2.02.11f";
/** /**
* Release date * Release date
*/ */
static public final String date = "19 June 2024"; static public final String date = "24 June 2024";
// /** // /**
// * Release type - Beta or Core // * Release type - Beta or Core

View File

@ -472,7 +472,7 @@ final public class PamModel implements PamSettings {
mi.setModulesMenuGroup(utilitiesGroup); mi.setModulesMenuGroup(utilitiesGroup);
mi.setMaxNumber(1); mi.setMaxNumber(1);
//mi.addGUICompatabilityFlag(PamGUIManager.FX); //has FX enabled GUI. //mi.addGUICompatabilityFlag(PamGUIManager.FX); //has FX enabled GUI.
// mi.setHidden(SMRUEnable.isEnable() == false); mi.setHidden(SMRUEnable.isEnable() == false);
} }
/* /*

View File

@ -382,7 +382,7 @@ public class RawSoundPlotDataFX {
if (soundStore.currentRawDataMillis==0){ if (soundStore.currentRawDataMillis==0){
if (++timeErrors < 10) { if (++timeErrors < 10) {
System.err.println("RawSoundPlotData: Raw sound data has no associated millisecond time: "+ soundStore.currentRawDataMillis); // System.err.println("RawSoundPlotData: Raw sound data has no associated millisecond time: "+ soundStore.currentRawDataMillis);
} }
return; return;
} }

Binary file not shown.

Before

Width:  |  Height:  |  Size: 522 KiB

After

Width:  |  Height:  |  Size: 164 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 547 KiB

After

Width:  |  Height:  |  Size: 178 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 396 KiB

After

Width:  |  Height:  |  Size: 105 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 525 KiB

After

Width:  |  Height:  |  Size: 221 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 81 KiB

View File

@ -9,8 +9,14 @@
<body> <body>
<h1 id="pamguard-s-deep-learning-module">PAMGuard&#39;s Deep <h1 id="pamguard-s-deep-learning-module">PAMGuard&#39;s Deep
Learning Module</h1> Learning Module</h1>
<h2 id="common-bugs-and-mistakes">Common Bugs and Mistakes</h2>
<br> <h2 id="common-bugs-and-mistakes">Common bugs and mistakes</h2>
<p>The first time you use the module and/or load a different type
of model e.g. a tensorflow or pytorch model, you must be connected to
the internet.</p>
<p>You must install the correct version of CUDA for hardware
acceleration using an Nvidea GPU. See the currently supported CUDA
versions on the Pytorch and Tensorflow websites.</p>
<p>You should always have deep learning models in their own folder. <p>You should always have deep learning models in their own folder.
Do not have any additional jar files or other programming related Do not have any additional jar files or other programming related
things (like .dll files) in the same or sub folders. This has been things (like .dll files) in the same or sub folders. This has been

View File

@ -7,20 +7,18 @@
</head> </head>
<body> <body>
<h1 id="pamguard-s-deep-learning-module">PAMGuard Deep <h1 id="pamguard-s-deep-learning-module">PAMGuard Deep Learning
Learning Module</h1> Module</h1>
<h2 id="creation-and-config">Creation and Configuration</h2>
<br> <h2 id="creating-an-instance-of-the-module">Creating an instance
<h3 id="creating-an-instance-of-the-module">Creating an instance of the module</h2>
of the module</h3>
<p> <p>
The module can be added from the <em>File&gt; Add modules &gt; The module can be added from the <em>File&gt; Add modules &gt;
Classifier &gt; Raw deep learning classifier</em> menu or by right Classifier &gt; Raw deep learning classifier</em> menu or by right
clicking in the data model. More than one instance of the module can clicking in the data model. More than one instance of the module can
be added if multiple deep learning models are required. be added if multiple deep learning models are required.
</p> </p>
<br> <h2 id="module-settings">Module settings</h2>
<h3 id="module-settings">Module settings</h3>
<p> <p>
The module settings are opened by selecting the <em>Settings &gt; The module settings are opened by selecting the <em>Settings &gt;
Raw deep learning classifier</em> menu. The main settings pane is shown Raw deep learning classifier</em> menu. The main settings pane is shown
@ -28,18 +26,18 @@
and <em>Deep Learning Model</em> and <em>Deep Learning Model</em>
</p> </p>
<p align="center"> <p align="center">
<img width="700" height="630" <img src="images/deep_leanring_module_help.png">
src="images/deep_leanring_module_help.png">
</p> </p>
<p> <p>
<em>The main settings pane for the deep learning module with <em>The main settings pane for the deep learning module with
descriptions</em> descriptions</em>
</p> </p>
<br>
<h3 id="raw-sound-data">Raw Sound Data</h3> <h3 id="raw-sound-data">Raw Sound Data</h3>
<p>The deep learning module accepts any raw data source i.e., any <p>The deep learning module accepts any raw data source i.e., any
data source that contains raw waveform data.</p> data source that contains raw waveform data e.g. clicks, clips and
Ishmael detections. Note that the module accepts whislte and moan
detections but only if a delphinID classifier has been loaded.</p>
<p>If the data is continuous, e.g. from the Sound Acquisition <p>If the data is continuous, e.g. from the Sound Acquisition
module then deep learning detections are saved to PAMGuard&#39;s data module then deep learning detections are saved to PAMGuard&#39;s data
management system if they pass a user defined prediction threshold. management system if they pass a user defined prediction threshold.
@ -57,7 +55,6 @@
processes. So, for example if channels 0 and 2 are in a group, then processes. So, for example if channels 0 and 2 are in a group, then
the raw waveform data from both channel 0 and 2 will be saved and can the raw waveform data from both channel 0 and 2 will be saved and can
be used in downstream processes, e.g., for localisation.</p> be used in downstream processes, e.g., for localisation.</p>
<br>
<h3 id="segmentation">Segmentation</h3> <h3 id="segmentation">Segmentation</h3>
<p> <p>
The segmentation section defines how the raw data is segmented. Some The segmentation section defines how the raw data is segmented. Some
@ -72,7 +69,6 @@
re-merge</em> is the maximum number of segments that can form a single re-merge</em> is the maximum number of segments that can form a single
data unit before a new data unit is automatically created. data unit before a new data unit is automatically created.
</p> </p>
<br>
<h3 id="deep-learning-model">Deep Learning Model</h3> <h3 id="deep-learning-model">Deep Learning Model</h3>
<p>The deep learning model section is used to select the deep <p>The deep learning model section is used to select the deep
learning model. The drop down menu is used to select the framework the learning model. The drop down menu is used to select the framework the
@ -92,14 +88,12 @@
</p> </p>
<p>Once the model has loaded there some unique options depending on <p>Once the model has loaded there some unique options depending on
the currently selected framework.</p> the currently selected framework.</p>
<br>
<h4 id="generic-model">Generic Model</h4> <h4 id="generic-model">Generic Model</h4>
<p> <p>
A generic model must be set up via the <em>Advanced</em> menu button. A generic model must be set up via the <em>Advanced</em> menu button.
</p> </p>
<p align="center"> <p align="center">
<img width="700" height="700" <img src="images/advanced_settings_generic_1.png">
src="images/advanced_settings_generic_1.png">
</p> </p>
<p> <p>
@ -124,8 +118,7 @@
including the shape of the input data e.g. a 100x50 image. including the shape of the input data e.g. a 100x50 image.
</p> </p>
<p align="center"> <p align="center">
<img width="700" height="700" <img src="images/advanced_settings_generic_2.png">
src="images/advanced_settings_generic_2.png">
</p> </p>
<p> <p>
@ -146,16 +139,15 @@
transforms and input and output data whenever settings up a new transforms and input and output data whenever settings up a new
PAMGuard data model and allow easier sharing of classifiers amongst PAMGuard data model and allow easier sharing of classifiers amongst
researchers.</p> researchers.</p>
<br> <h4 id="koogu-ketos-animalspot-pamguard-zip-and-delphinid-models">Koogu,
<h4 id="animalspot-and-ketos-models">AnimalSpot and Ketos models</h4> Ketos, AnimalSpot, PAMGuard zip and delphinID models</h4>
<p> <p>
If using an AnimalSpot or Ketos model then all transforms are If using a deep learning model from a supported framework then all
automatically set up. The transforms can be viewed and altered via the transforms are automatically set up. The transforms can be viewed and
Advanced menu button but in the majority of cases these settings altered via the Advanced menu button but in the majority of cases
should not be used. It is advisable to select &quot;Use default these settings should not be used. For some models, it is advisable to
segment length&quot; to change the <em>Window length</em> to the select &quot;Use default segment length&quot; to change the <em>Window
default for the selected model. Note that this is often necessary for length</em> to the default for the selected model.
Ketos models but usually not a requirement for AnimalSpot models.
</p> </p>
<p align="center"> <p align="center">
<img width="700" height="700" <img width="700" height="700"
@ -163,18 +155,43 @@
</p> </p>
<p> <p>
<em>An AnimalSpot or Ketos model will automatically create a list <em>An AnimalSpot, Ketos or other supported deep learning model
of transforms with the appropriate settings. These is no need to use will automatically create a list of transforms with the appropriate
the advanced pane but it is there in case users wish to change settings. These is no need to use the advanced pane but it is there
transform settings for some reason</em> in case users wish to change transform settings for some reason</em>
</p> </p>
<h3 id="default-models">Default Models</h3>
<p>Default models are selectable from the menu button in the Deep
Learning Pane. Default models are deep learning classifiers which are
open source, known to be effective and have have been published in
open access academic litrature; they are downloaded directly from a
GitHub repository and then all associated settings are automtically
applied. The default model selection pane also contains hyperlinks to
the papers descirbing each model which will take users directly to the
relvent website.</p>
<p align="center">
<img src="images/default_settings_humpback_1.png">
</p>
<p>
<em>Default models can be downloaded. Default models are models
which are published, open and have been known to work well amongst
the bioacoustics community. More will be added to PAMGaurd over time.
If you you would like your model to become a defualt model then drop
PAMGuard support an email.</em>
</p>
<br> <br>
<br> <br>
<br> <br>
<p class="prevLink"><a href="rawDeepLearning_overview.html">Previous: <p class="prevLink">
Overview</a></p> <a href="rawDeepLearning_overview.html">Previous: Overview</a>
<p class="nextLink"><a href="rawDeepLearning_Running.html">Next: </p>
Running the Deep Learning module</a></p> <p class="nextLink">
<a href="rawDeepLearning_Running.html">Next: Running the Deep
Learning module</a>
</p>
<br> <br>
<br> <br>
<br> <br>

View File

@ -9,12 +9,12 @@
<body> <body>
<h1 id="pamguard-s-deep-learning-module">PAMGuard&#39;s Deep <h1 id="pamguard-s-deep-learning-module">PAMGuard&#39;s Deep
Learning Module</h1> Learning Module</h1>
<h2 id="viewing-and-exporting-results">Viewing and exporting <h2 id="viewing-and-exporting-results">Viewing and exporting
results</h2> results</h2>
<br>
<p>Output from the deep learning module can be viewed in PAMGuard <p>Output from the deep learning module can be viewed in PAMGuard
viewer mode, or extracted from binary files using MATLAB or R.</p> viewer mode, or extracted from binary files using MATLAB or R.</p>
<br>
<h3 id="pamguard-viewer-mode">PAMGuard viewer mode</h3> <h3 id="pamguard-viewer-mode">PAMGuard viewer mode</h3>
<p>Detections form continuous raw data are shown in the datagram in <p>Detections form continuous raw data are shown in the datagram in
the same way as all data streams in PAMGuard.</p> the same way as all data streams in PAMGuard.</p>
@ -32,7 +32,7 @@
manual analyst can quickly navigate to detections with high prediction manual analyst can quickly navigate to detections with high prediction
values for a certain class. Hovering over or right clicking on a data values for a certain class. Hovering over or right clicking on a data
unit in the time display and selecting the information button, will unit in the time display and selecting the information button, will
show the data unit&#39;s metadata, including the prediction values for all show the data units metadata, including the prediction values for all
output classes from the deep learning model.</p> output classes from the deep learning model.</p>
<p align="center"> <p align="center">
<img src="images/bat_time_base_display.png"> <img src="images/bat_time_base_display.png">
@ -50,7 +50,6 @@
deep learning prediction values. The spectrogram will also show deep deep learning prediction values. The spectrogram will also show deep
learning detections as translucent blue boxes (these must be selected learning detections as translucent blue boxes (these must be selected
in the right click menu).</p> in the right click menu).</p>
<br>
<h3 id="matlab">MATLAB</h3> <h3 id="matlab">MATLAB</h3>
<p>The easiest way to export to MATLAB is to select the desired <p>The easiest way to export to MATLAB is to select the desired
units in the time base display, right click and select the MATLAB units in the time base display, right click and select the MATLAB
@ -96,7 +95,7 @@ predicitons = dldetections(<span class="hljs-number">1</span>).annotations.dlcla
waveform data in each structure;</p> waveform data in each structure;</p>
<pre> <pre>
<code class="lang-matlab"> <code class="lang-matlab">
<span class="hljs-comment">% plot all the spectrograms.</span> <span class="hljs-comment">% plot all the spectrograms.</span>
clf clf
tiledlayout(<span class="hljs-number">5</span>,<span class="hljs-number">5</span>) tiledlayout(<span class="hljs-number">5</span>,<span class="hljs-number">5</span>)
<span class="hljs-keyword">for</span> <span class="hljs-built_in">i</span>=<span <span class="hljs-keyword">for</span> <span class="hljs-built_in">i</span>=<span
@ -155,7 +154,6 @@ tiledlayout(<span class="hljs-number">5</span>,<span class="hljs-number">5</span
<em>Right whale detections from a deep learning model imported <em>Right whale detections from a deep learning model imported
and then plotted in MATLAB</em> and then plotted in MATLAB</em>
</p> </p>
<br>
<h3 id="r">R</h3> <h3 id="r">R</h3>
<p>In the same way as MATLAB export, the PAMGuard time base display <p>In the same way as MATLAB export, the PAMGuard time base display
and export selected data units directly to an R struct which can be and export selected data units directly to an R struct which can be
@ -165,13 +163,17 @@ tiledlayout(<span class="hljs-number">5</span>,<span class="hljs-number">5</span
functions compared to the MATLAB library. The PAMBinaries R library functions compared to the MATLAB library. The PAMBinaries R library
can be found <a href="https://github.com/TaikiSan21/PamBinaries">here</a>. can be found <a href="https://github.com/TaikiSan21/PamBinaries">here</a>.
</p> </p>
<br> <br>
<br> <br>
<br> <br>
<p class="prevLink"><a href="rawDeepLearning_Running.html">Previous: <p class="prevLink">
Running the Deep Learning module</a></p> <a href="rawDeepLearning_Running.html">Previous: Running the Deep
<p class="nextLink"><a href="rawDeepLearning_Bugs.html">Next: Learning module</a>
Common Bugs and Mistakes</a></p> </p>
<p class="nextLink">
<a href="rawDeepLearning_Bugs.html">Next: Common Bugs and Mistakes</a>
</p>
<br> <br>
<br> <br>
<br> <br>

View File

@ -10,12 +10,10 @@
<h1 id="pamguard-s-deep-learning-module">PAMGuard&#39;s Deep <h1 id="pamguard-s-deep-learning-module">PAMGuard&#39;s Deep
Learning Module</h1> Learning Module</h1>
<h2 id="running">Running</h2> <h2 id="running">Running</h2>
<br>
<h3 id="real-time">Real time</h3> <h3 id="real-time">Real time</h3>
<p>In real time, the deep learning model runs automatically when <p>In real time, the deep learning model runs automatically when
processing starts. A warning will appear if there are issues with the processing starts. A warning will appear if there are issues with the
model and/or it cannot cope with real time speeds.</p> model and/or it cannot cope with real time speeds.</p>
<br>
<h3 id="viewer-mode">Viewer Mode</h3> <h3 id="viewer-mode">Viewer Mode</h3>
<p> <p>
The deep learning module can be re-run on <em>detector</em> data (e.g. The deep learning module can be re-run on <em>detector</em> data (e.g.
@ -26,13 +24,18 @@
Detections without a deep learning annotation will have one added and Detections without a deep learning annotation will have one added and
detections with an existing annotation will have it overwritten. detections with an existing annotation will have it overwritten.
</p> </p>
<br> <br>
<br> <br>
<br> <br>
<p class="prevLink"><a href="rawDeepLearning_CreateAndConfig.html">Previous: <p class="prevLink">
Creating and Configuring the Deep Learning module</a></p> <a href="rawDeepLearning_CreateAndConfig.html">Previous: Creating
<p class="nextLink"><a href="rawDeepLearning_Results.html">Next: and Configuring the Deep Learning module</a>
Viewing and Exporting Results</a></p> </p>
<p class="nextLink">
<a href="rawDeepLearning_Results.html">Next: Viewing and Exporting
Results</a>
</p>
<br> <br>
<br> <br>
<br> <br>

View File

@ -7,10 +7,11 @@
</head> </head>
<body> <body>
<h1 id="pamguard-s-deep-learning-module">PAMGuard Deep <h1 id="pamguard-s-deep-learning-module">PAMGuard&#39;s deep
Learning Module</h1> learning module</h1>
<p>Note: this module requires an internet connection upon first use
to download correct libraries.</p>
<h2 id="overview">Overview</h2> <h2 id="overview">Overview</h2>
<p>PAMGuard&#39;s deep learning module allows users to deploy a <p>PAMGuard&#39;s deep learning module allows users to deploy a
large variety of deep learning models natively in PAMGuard. It is core large variety of deep learning models natively in PAMGuard. It is core
module, fully integrated into PAMGuard&#39;s display and data module, fully integrated into PAMGuard&#39;s display and data
@ -19,9 +20,7 @@
signal and can integrate into multiple types of acoustic analysis signal and can integrate into multiple types of acoustic analysis
workflows, for example post analysis of recorder data or used as part workflows, for example post analysis of recorder data or used as part
of real time localisation workflow.</p> of real time localisation workflow.</p>
<h2 id="how-it-works">How it works</h2>
<br>
<h3 id="how-it-works">How it works</h3>
<p>The deep learning module accepts raw data from different types <p>The deep learning module accepts raw data from different types
of data sources, e.g. from the Sound Acquisition module, clicks and of data sources, e.g. from the Sound Acquisition module, clicks and
clips. It segments data into equal sized chunks with a specified clips. It segments data into equal sized chunks with a specified
@ -32,8 +31,7 @@
learning model, then can be automatically set up by PAMGuard. learning model, then can be automatically set up by PAMGuard.
Currently there are three implemented frameworks</p> Currently there are three implemented frameworks</p>
<p align="center"> <p align="center">
<img width="900" height="370" <img src="images/deep_learning_module_process.png">
src="images/deep_learning_module_process.png">
</p> </p>
<p> <p>
@ -44,7 +42,6 @@
the model are saved and can be viewed in real time (e.g. mitigation) the model are saved and can be viewed in real time (e.g. mitigation)
or in post processing (e.g. data from SoundTraps).</em> or in post processing (e.g. data from SoundTraps).</em>
</p> </p>
<br>
<h3 id="generic-model">Generic Model</h3> <h3 id="generic-model">Generic Model</h3>
<p> <p>
A generic model allows a user to load any model compatible with the <a A generic model allows a user to load any model compatible with the <a
@ -54,12 +51,11 @@
existing framework instead of a generic model as these models will existing framework instead of a generic model as these models will
automatically generate the required transforms. automatically generate the required transforms.
</p> </p>
<br>
<h3 id="animalspot">AnimalSpot</h3> <h3 id="animalspot">AnimalSpot</h3>
<p> <p>
<a href="https://github.com/ChristianBergler/ANIMAL-SPOT">ANIMAL-SPOT</a> <a href="https://github.com/ChristianBergler/ANIMAL-SPOT">ANIMAL-SPOT</a>
is a deep learning based framework which was initially designed for <a is a deep learning based framework which was initially designed for <a
href="https://github.com/ChristianBergler/ORCA-SPOT">killer href="(https://github.com/ChristianBergler/ORCA-SPOT">killer
whale sound detection</a>) in noise heavy underwater recordings (see <a whale sound detection</a>) in noise heavy underwater recordings (see <a
href="https://www.nature.com/articles/s41598-019-47335-w">Bergler href="https://www.nature.com/articles/s41598-019-47335-w">Bergler
et al. (2019)</a>). It has now been expanded to a be species independent et al. (2019)</a>). It has now been expanded to a be species independent
@ -68,21 +64,43 @@
AnimalSpot models will automatically set up their own data transforms AnimalSpot models will automatically set up their own data transforms
and output classes. and output classes.
</p> </p>
<br>
<h3 id="ketos">Ketos</h3> <h3 id="ketos">Ketos</h3>
<p> <p>
<a href="https://meridian.cs.dal.ca/2015/04/12/ketos/">Ketos</a> is an <a href="https://meridian.cs.dal.ca/2015/04/12/ketos/">Ketos</a> is an
acoustic deep learning framework based on Tensorflow and developed by acoustic deep learning framework based on Tensorflow and developed by
<a href="https://meridian.cs.dal.ca/">MERIDIAN</a>. It has excellent <a href="https://meridian.cs.dal.ca/">MERIDIAN</a>. It has excellent
resources and tutorials and Python libraries can be installed easily resources and tutorials and Python libraries can be installed easily
via pip. Imported Ketos model will automatically set up their own data via pip. Imported Ketos (.ktpb) models will automatically set up their
own data transforms and output classes.
</p>
<h3 id="koogu">Koogu</h3>
<p>
<a href="https://shyamblast.github.io/Koogu/en/stable/">Koogu </a> is
a Python package which allows users to train a deep learning model.
Koogu helps users by integrating with some frequency used annotation
programs and provides tools to train and test classifiers. Imported
Koogu models (.kgu) will automatically set up their own data
transforms and output classes. transforms and output classes.
</p> </p>
<h3 id="pamguardzip">PAMGuardZip</h3>
<p>
PAMGuard zip models consist of a deep learning model (either a
Tensorflow saved_model.pb or PyTorch <em>*.py model) alongside a
PAMGuard metdata file (</em>.pdtf*) within a zip archive. The metadata
file contains all the information needed for PAMGaurd to set up the
model. PAMGuard will import the zip file, decompress it and search for
the relevent deep learning model and metadata file then set up all
settings accordingly. This framework allows users to easily share
pre-tested PAMGuard compatible models.
</p>
<br> <br>
<br> <br>
<br> <br>
<p class="nextLink"><a href="rawDeepLearning_CreateAndConfig.html">Next: <p class="nextLink">
Creating and Configuring the Deep Learning module</a></p> <a href="rawDeepLearning_CreateAndConfig.html">Next: Creating and
Configuring the Deep Learning module</a>
</p>
<br> <br>
<br> <br>
<br> <br>

View File

@ -21,6 +21,7 @@ public class CounterControl extends SimpleControl {
Character suffix; Character suffix;
public enum CounterSuffix {NOSUFFIX, CHARSUFFIX};
public CounterControl(ControlDescription controlDescription, public CounterControl(ControlDescription controlDescription,
LoggerForm loggerForm) { LoggerForm loggerForm) {
@ -36,25 +37,19 @@ public class CounterControl extends SimpleControl {
} }
private String calculateCounter() { private String calculateCounter() {
int num = FormCounterManagement.getInstance().getCounterNumber(this,controlDescription.getFormDescription().getDBTABLENAME()); int num = FormCounterManagement.getInstance().getCounterNumber(this,controlDescription.getFormDescription().getDBTABLENAME());
String numSt = Integer.toString(num); String numSt = String.format("%03d", num);
int nZeros = 3-numSt.length(); // int nZeros = 3-numSt.length();
//
String tSt = ""; // String tSt = "";
for (int i=0;i<nZeros;i++){ // for (int i=0;i<nZeros;i++){
tSt+="0"; // tSt+="0";
// System.out.println(tSt); //// System.out.println(tSt);
} // }
//
numSt = tSt+numSt; // numSt = tSt+numSt;
// System.out.println(tSt); // System.out.println(tSt);
// System.out.println(numSt); // System.out.println(numSt);
@ -109,31 +104,19 @@ public class CounterControl extends SimpleControl {
} }
@Override @Override
AbstractFormatter getAbstractformatter() { AbstractFormatter getAbstractformatter() {
DefaultFormatter formatter = new DefaultFormatter(); DefaultFormatter formatter = new DefaultFormatter();
return formatter; return formatter;
} }
public void updateCounter() { public void updateCounter() {
if (loggerForm.getNewOrEdit()==LoggerForm.EditDataForm) return; if (loggerForm.getNewOrEdit()==LoggerForm.EditDataForm) return;
// System.out.println("updateCounter"); // System.out.println("updateCounter");
setData(calculateCounter()); setData(calculateCounter());
} }
} }

View File

@ -2,7 +2,9 @@ package loggerForms.formdesign.controlpropsets;
import loggerForms.FormDescription; import loggerForms.FormDescription;
import loggerForms.UDColName; import loggerForms.UDColName;
import loggerForms.controlDescriptions.ControlTypes;
import loggerForms.formdesign.ControlTitle; import loggerForms.formdesign.ControlTitle;
import loggerForms.formdesign.itempanels.BooleanCtrlColPanel;
import loggerForms.formdesign.itempanels.CtrlColPanel; import loggerForms.formdesign.itempanels.CtrlColPanel;
public class CounterPropertySet extends BasePropertySet { public class CounterPropertySet extends BasePropertySet {
@ -15,12 +17,17 @@ public class CounterPropertySet extends BasePropertySet {
@Override @Override
public CtrlColPanel getItemPropertyPanel(ControlTitle selTitle, public CtrlColPanel getItemPropertyPanel(ControlTitle selTitle,
UDColName propertyName) { UDColName propertyName) {
// if (selTitle.getType() == ControlTypes.COUNTER) {
// System.out.println("counter");
// }
switch (propertyName) { switch (propertyName) {
case Plot: case Plot:
case Autoclear: case Autoclear:
case ReadOnly: case ReadOnly:
case AutoUpdate: case AutoUpdate:
return null; return null;
// case Topic:
// return new BooleanCtrlColPanel(selTitle, new );
} }
return super.getItemPropertyPanel(selTitle, propertyName); return super.getItemPropertyPanel(selTitle, propertyName);
} }