Merge pull request #34 from PAMGuard/main

V2.02.06
This commit is contained in:
Douglas Gillespie 2022-11-16 12:09:19 +00:00 committed by GitHub
commit 6f3992dc2d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
9 changed files with 353 additions and 198 deletions

View File

@ -450,7 +450,9 @@ Version 2.00.10 June 2017</a></span></h1>
name="_Latest_Version_2.02.06"></a><span lang=EN-US>Latest Version 2.02.06
November 2022</span></h1>
<h2><span lang=EN-US>Bug Fix</span></h2>
<h2><span lang=EN-US>Bug Fixes</span></h2>
<p class=MsoNormal><span lang=EN-US>Two memory leaks:</span></p>
<p class=MsoNormal><span lang=EN-US>A memory leak has been found which seems to
mostly occur in Viewer mode. Some data on background noise measurements are not
@ -458,13 +460,16 @@ being cleared from memory, so memory will eventually run out. This could happen
after browsing a lot of data, but was most likely when reprocessing files
offline, for example running click classifiers. This is now fixed. </span></p>
<p class=MsoNormal><span lang=EN-US>Also fixed a memory leak in the ROCCA
whistle classification module.</span></p>
<h2><span lang=EN-US>New Features</span></h2>
<p class=MsoNormal><span lang=EN-US>SoundTrap SUD file reading. If youre using
SoundTrap autonomous recorders from Ocean Instruments, you no longer need to
decompress the SoundTrap files prior to processing. This will save time and a
lot of disk space. Extraction of clicks from the inbuilt SoundTrap Click
detector an also happen while processing SUD file data with other detectors,
detector can also happen while processing SUD file data with other detectors,
thereby streamlining the whole processing chain. Read the online Help for
details. &nbsp;&nbsp;</span></p>
@ -483,10 +488,10 @@ system to have nested classifiers which can be enabled or disabled. </span></p>
<p class=MsoNormal><span lang=EN-US>Changes to classification GUI to
accommodate the new classification system.</span></p>
<p class=MsoNormal><span lang=EN-US>Addition of data selectors to the minimum
number of clicks accepted by the classifier. This allows the click-by-click
classifier and the click train detector to be used to together to improve
classification accuracy. </span></p>
<p class=MsoNormal><span lang=EN-US>Addition of data selectors to the minimum number
of clicks accepted by the classifier. This allows the click-by-click classifier
and the click train detector to be used to together to improve classification
accuracy. </span></p>
<p class=MsoNormal><b><span lang=EN-US>Bug fixes</span></b></p>
@ -586,8 +591,9 @@ 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
below. </span></p>
<p class=MsoNormal><span lang=EN-US>Bug 495: TD FX display throws NullPointerException
if user has removed all data units and then moves mouse over display area.</span></p>
<p class=MsoNormal><span lang=EN-US>Bug 495: TD FX display throws
NullPointerException if user has removed all data units and then moves mouse
over display area.</span></p>
<h1><a name="_Latest_Version_2.02.01"></a><span lang=EN-US>Version 2.02.01
October 2021</span></h1>
@ -633,9 +639,9 @@ href="http://www.pamguard.org/downloads.php?cat_id=3">here</a>.</p>
lang=EN-US> </span></p>
<p class=MsoNormal>This module has been renamed ÓDetection GrouperÔ, so
as to avoid confusion with the Group 3D localizer. This is because the Detection
Grouper is more for organizing data into groups to be localized than it is for
doing localization.</p>
as to avoid confusion with the Group 3D localizer. This is because the
Detection Grouper is more for organizing data into groups to be localized than
it is for doing localization.</p>
<p class=MsoNormal><b><span lang=EN-US>Minor Bug Fixes</span></b><span
lang=EN-US> </span></p>
@ -695,9 +701,9 @@ Implemented a Backup Manager for backing up multiple types of data to multiple
locations] </p>
<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>
Upgrades to how PAMGuard lets the user enter custom date formats in the Sound
Acquisition dialog </p>
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>Upgrades to how PAMGuard lets the user enter custom date
formats in the Sound Acquisition dialog </p>
<p class=MsoListParagraph style='text-indent:-18.0pt'><span lang=EN-US>7. </span><span
lang=EN-US style='font-size:7.0pt;font-family:"Times New Roman",serif'>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</span><span
@ -754,9 +760,9 @@ included in a future release. </p>
lang=EN-US style='font-size:7.0pt;font-family:"Times New Roman",serif'>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</span>
An implementation of the Generalized Power Law Detector, developed by Tyler
Helble ([Helble et al., ÃÂA generalized power-law detection algorithm for
humpback whale vocalizations’, The Journal of the Acoustical Society of America,
vol. 131, no. 4, pp. 2682–2699, 2012) is now available. For details, see the
online help </p>
humpback whale vocalizations’, The Journal of the Acoustical Society of
America, vol. 131, no. 4, pp. 2682–2699, 2012) is now available. For
details, see the online help </p>
<p class=MsoListParagraph style='text-indent:-18.0pt'><span lang=EN-US>18. </span><span
lang=EN-US style='font-size:7.0pt;font-family:"Times New Roman",serif'>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</span>
@ -1063,11 +1069,10 @@ placement, etc.</p>
<h1><a name="_Latest_Beta_Version_2.01.03"></a><span lang=EN-US>Version 2.01.03
February 2020</span></h1>
<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
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.</b></p>
<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 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.</b></p>
<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)
@ -1122,8 +1127,9 @@ lang=EN-US> </span>Bug 442. BT Display does not change click symbol color when
Colour By Superdetection is selected.</p>
<p class=MsoListParagraph style='text-indent:-18.0pt'><span lang=EN-US>11. </span><span
lang=EN-US style='font-size:7.0pt;font-family:"Times New Roman",serif'>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</span>
Bug 443. NI playback crashing immediately if a device is not present.</p>
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>Bug 443. NI playback crashing immediately if a device is not
present.</p>
<p class=MsoListParagraph style='text-indent:-18.0pt'><span lang=EN-US>12. </span><span
lang=EN-US style='font-size:7.0pt;font-family:"Times New Roman",serif'>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</span>
@ -1132,8 +1138,8 @@ files.</p>
<p class=MsoListParagraph style='text-indent:-18.0pt'><span lang=EN-US>13. </span><span
lang=EN-US style='font-size:7.0pt;font-family:"Times New Roman",serif'>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</span>
Bug 445. Overlay data in FX spectrogram display gets out of sync with
underlying spectrogram image.</p>
Bug 445. Overlay data in FX spectrogram display gets out of sync with underlying
spectrogram image.</p>
<p class=MsoListParagraph style='text-indent:-18.0pt'><span lang=EN-US>14. </span><span
lang=EN-US style='font-size:7.0pt;font-family:"Times New Roman",serif'>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</span>
@ -1172,19 +1178,19 @@ Added option in Sound Acquisition settings dialog to override filename time
stamp and use PC local time instead. </p>
<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>
Add option to Whistle &amp; Moan Detector data selector to only display
whistles that have super-detections. </p>
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 option to Whistle &amp; Moan Detector data selector to
only display whistles that have super-detections. </p>
<p class=MsoListParagraph style='text-indent:-18.0pt'><span lang=EN-US>4. </span><span
lang=EN-US style='font-size:7.0pt;font-family:"Times New Roman",serif'>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</span>
Functionality to clone hydrophone streamers. </p>
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>Functionality to clone hydrophone streamers. </p>
<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>
Added automatic log file - all messages to the console will now be written to a
txt file as well. File is stored in user.home/Pamguard folder - look under the Help
menu item for a shortcut to open the folder. </p>
txt file as well. File is stored in user.home/Pamguard folder - look under the
Help menu item for a shortcut to open the folder. </p>
<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>
@ -1222,9 +1228,9 @@ Detector display. </p>
<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> </span>This version of PAMGuard has been upgraded to make it compatible
with Java 12. psfx files generated in previous beta releases should be
compatible with this version, and vice-versa.</p>
lang=EN-US> </span>This version of PAMGuard has been upgraded to make it
compatible with Java 12. psfx files generated in previous beta releases should
be compatible with this version, and vice-versa.</p>
<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>
@ -1282,8 +1288,9 @@ lang=EN-US style='font-size:7.0pt;font-family:"Times New Roman",serif'>&nbsp;&nb
lang=EN-US> </span>Difar enhancements based on recent field testing.</p>
<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>
Click Train Detector upgrades, including localisation capabilities.</p>
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>Click Train Detector upgrades, including localisation
capabilities.</p>
<p class=MsoListParagraph style='text-indent:-18.0pt'><span lang=EN-US>4. </span><span
lang=EN-US style='font-size:7.0pt;font-family:"Times New Roman",serif'>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</span><span
@ -1386,9 +1393,9 @@ lang=EN-US> </span>Added adaptive noise filter to Ishmael Detectors.</p>
<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><span
lang=EN-US> </span>Many upgrades to the Sound Playback module, including a
high-pass filter, gain control, and the ability to mix wavefrom and envelope
data together to listen to high-frequency clicks and dolphin whistles at the
same time.</p>
high-pass filter, gain control, and the ability to mix wavefrom and envelope data
together to listen to high-frequency clicks and dolphin whistles at the same
time.</p>
<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>
@ -1584,8 +1591,8 @@ first time the spectrogram dialog is opened.</p>
<p class=MsoListParagraph style='text-indent:-18.0pt'><span lang=EN-US>4. </span><span
lang=EN-US style='font-size:7.0pt;font-family:"Times New Roman",serif'>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
</span>Bug 385. Bug in offline toolbar which will crash if the classifier dialog
is opened and then closed with no classifiers specified.</p>
</span>Bug 385. Bug in offline toolbar which will crash if the classifier
dialog is opened and then closed with no classifiers specified.</p>
<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;
@ -1866,9 +1873,9 @@ window.</p>
<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>Bug 336. Files were being corrupted if the limit file size option was set
to a lower value in viewer than it has been when data were collected - would
truncate files being rewritten after change.</p>
</span>Bug 336. Files were being corrupted if the limit file size option was
set to a lower value in viewer than it has been when data were collected -
would truncate files being rewritten after change.</p>
<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;
@ -1972,8 +1979,8 @@ lang=EN-US style='font-size:7.0pt;font-family:"Times New Roman",serif'>&nbsp;&nb
Added sound playback and other useful information to bar on FX display</p>
<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>
Updates/bug fixes to the landmark module. </p>
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>Updates/bug fixes to the landmark module. </p>
<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
@ -2004,9 +2011,9 @@ Added circular movement option to source simulation </p>
<h1><a name="_Latest_Beta_Version_2.00.10"></a><span lang=EN-US>Beta Version
2.00.10 June 2017</span></h1>
<p class=MsoNormal><span lang=EN-US>PAMGuard Version 2 contains major updates. You
should read and understand these notes before proceeding with installation and
use of this version. These changes have been funded under contract to NOAA
<p class=MsoNormal><span lang=EN-US>PAMGuard Version 2 contains major updates.
You should read and understand these notes before proceeding with installation
and use of this version. These changes have been funded under contract to NOAA
Fisheries, contract no. WE-133F-16-SE-1126.</span></p>
<h3><span lang=EN-US>Binary File Structural Changes</span></h3>
@ -2046,9 +2053,9 @@ in both data stores. </span></p>
added to PAMGuard which can display multiple types of data on the same time
axis. It can for instance be used to display bearings to whistles on a
bearing-time type display similar to that commonly used in the click detector.
Composite display graphs containing data from more than one detector are also possible.
For details, see the PAMGuard help file (Displays / Time Display FX). Note that
this display is only available if you are running Java 8 or later. </span></p>
Composite display graphs containing data from more than one detector are also
possible. For details, see the PAMGuard help file (Displays / Time Display FX).
Note that this display is only available if you are running Java 8 or later. </span></p>
<h3><span lang=EN-US>Event Marking and the Detection Group Localiser</span></h3>
@ -2101,8 +2108,8 @@ lang=EN-US>&nbsp;</span></p>
<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>Bug 317. Rocca Module Data Purging. </span>The ROCCA
module was not performing data purging when using classifiers developed for
</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
Hawaii/Temperate Pacific/North Atlantic datasets. This has been corrected.</p>
<p class=MsoListParagraph style='text-indent:-18.0pt'><span lang=EN-US>2.</span><span
@ -2118,10 +2125,10 @@ lang=EN-US style='font-size:7.0pt;font-family:"Times New Roman",serif'>&nbsp;&nb
<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>Added Copy-to-Clipboard button to Warning dialogs, to store error messages
and stack trace information on the Windows clipboard. This information can then
be easily pasted into emails, text documents, etc when contacting Pamguard
support.</p>
</span>Added Copy-to-Clipboard button to Warning dialogs, to store error
messages and stack trace information on the Windows clipboard. This information
can then be easily pasted into emails, text documents, etc when contacting
Pamguard support.</p>
<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;
@ -2149,8 +2156,8 @@ list grew to a ridiculous size. Code has been put in place to a) stop it
happening again and b) to repair any configuration files which are corrupted.
Corrupted files will be slow to load, slow to save and will be &gt; several
megabytes in size. It may be necessary to delete the PamguardSettings table in
any databases since these too may have become oversized which will slow down
viewer mode PAMGuard start-up.</p>
any databases since these too may have become oversized which will slow down viewer
mode PAMGuard start-up.</p>
<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;
@ -2197,9 +2204,9 @@ January 2017</span></h1>
<p class=MsoListParagraph style='margin-left:38.25pt;text-indent:-20.25pt'><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;&nbsp;
</span><span lang=EN-US>Bug 306. Certain methods have been querying
AcousticDataUnit.getDuration and expecting to receive a response in milliseconds.
However, getDuration actually returns the number of samples. &nbsp;This has
been corrected. </span></p>
AcousticDataUnit.getDuration and expecting to receive a response in
milliseconds. However, getDuration actually returns the number of samples.
&nbsp;This has been corrected. </span></p>
<p class=MsoNormal><b><span lang=EN-US>Plug-Ins</span></b></p>
@ -2242,9 +2249,9 @@ dependencies)</span></p>
<p class=MsoNormal><b><span lang=EN-US>Other Changes</span></b></p>
<p class=MsoNormal><span lang=EN-US>The installer has been updated to handle both
64 bit and 32 bit installations. PAMGuard psf files are now registered in the
Windows Registry, so double-clicking on a psf file should run PAMGuard in
<p class=MsoNormal><span lang=EN-US>The installer has been updated to handle
both 64 bit and 32 bit installations. PAMGuard psf files are now registered in
the Windows Registry, so double-clicking on a psf file should run PAMGuard in
normal mode (as opposed to Viewer or Mixed modes). Note that the Windows
Registry can only hold a single executable reference for psf files; therefore,
for users with multiple installations of PAMGuard, double-clicking on a psf
@ -2307,8 +2314,8 @@ until now. It's fixed.</p>
<p class=MsoListParagraph style='margin-left:40.5pt;text-indent:-22.5pt'>2.<span
style='font-size:7.0pt;font-family:"Times New Roman",serif'>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
</span>Bug 292. Incorrect labels on Target Motion panel in viewer - 3D algorithm
was labelled as 2D.Fixed</p>
</span>Bug 292. Incorrect labels on Target Motion panel in viewer - 3D
algorithm was labelled as 2D.Fixed</p>
<p class=MsoListParagraph style='margin-left:40.5pt;text-indent:-22.5pt'>3.<span
style='font-size:7.0pt;font-family:"Times New Roman",serif'>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
@ -2337,8 +2344,8 @@ appear when you right click on the display. </p>
<p class=MsoListParagraph style='margin-left:40.5pt;text-indent:-22.5pt'>7.<span
style='font-size:7.0pt;font-family:"Times New Roman",serif'>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
</span>Bug 297. Airgun display was not correctly showing itself at fixed locations,
but always following the vessel track. This is now fixed. </p>
</span>Bug 297. Airgun display was not correctly showing itself at fixed
locations, but always following the vessel track. This is now fixed. </p>
<p class=MsoListParagraph style='margin-left:40.5pt;text-indent:-22.5pt'>8.<span
style='font-size:7.0pt;font-family:"Times New Roman",serif'>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
@ -2404,8 +2411,8 @@ the database. </span></p>
<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>The number of data streams associated with the click
detector has been tidied up so that there are a) All Click, b) Tracked Clicks (those
which are part of an event) and c) Events. </span></p>
detector has been tidied up so that there are a) All Click, b) Tracked Clicks
(those which are part of an event) and c) Events. </span></p>
<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;
@ -2427,9 +2434,9 @@ combine automatic and manual tracking. </span></p>
<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>Improved options are available to the user, via the click
detector bearing time display, to correct and relabel clicks / entire click
trains. </span></p>
</span><span lang=EN-US>Improved options are available to the user, via the
click detector bearing time display, to correct and relabel clicks / entire
click trains. </span></p>
<p class=MsoNormal><span lang=EN-US>Developers will hopefully find that the
target motion code has been improved in a way which will make it much easier to
@ -2448,21 +2455,22 @@ intuitive compared to the old method of typing directly into the database. </p>
<p class=MsoNormal><span lang=EN-US>Users have often found that PAMGuard can be
'jumpy', i.e. the spectrogram does not scroll smoothly, but pauses for a second
every few seconds. This is caused by the Java garbage collector cleaning up unused
objects in memory. With 64 bit versions, which allow for more memory, some of
these pauses were becoming quite long (due to the increased amount of memory
that needed to be cleaned up). In some circumstances, these pauses were making
data acquisition systems unstable. We have therefore entirely rewritten the way
in which PAMGuard handles arrays of spectrogram data (complex numbers) so that
instead of large numbers of small Java objects there are now fewer, larger,
simpler java objects. These reduce processing delays for garbage collection and
give an overall speed improvement, but will otherwise not be noticed by users. </span></p>
every few seconds. This is caused by the Java garbage collector cleaning up
unused objects in memory. With 64 bit versions, which allow for more memory,
some of these pauses were becoming quite long (due to the increased amount of
memory that needed to be cleaned up). In some circumstances, these pauses were
making data acquisition systems unstable. We have therefore entirely rewritten
the way in which PAMGuard handles arrays of spectrogram data (complex numbers)
so that instead of large numbers of small Java objects there are now fewer,
larger, simpler java objects. These reduce processing delays for garbage collection
and give an overall speed improvement, but will otherwise not be noticed by
users. </span></p>
<p class=MsoNormal><i><span lang=EN-US>Click Detector RainbowClick file output</span></i></p>
<p class=MsoNormal><span lang=EN-US>This feature has been removed since it has
been obsolete for several years. Users should use the PAMGuard binary storage
system for Click Detector data. </span></p>
been obsolete for several years. Users should use the PAMGuard binary storage system
for Click Detector data. </span></p>
<h1><a name="_Latest_Version_1.15.04"></a><span lang=EN-US>Version 1.15.04 July
2016</span></h1>
@ -2597,16 +2605,16 @@ and datagram creation.</p>
<h1><a name="_Toc444450394"></a><span lang=EN-US>Version 1.15.00 February 2016</span></h1>
<p class=MsoNormal><span lang=EN-US>Beta Version 1.15.00 64 bit and Core
version 1.15.00 32 bit. Both using identical Java core software but linking to
<p class=MsoNormal><span lang=EN-US>Beta Version 1.15.00 64 bit and Core version
1.15.00 32 bit. Both using identical Java core software but linking to
different libraries for control of sound input devices. </span></p>
<p class=MsoNormal><span lang=EN-US>This is the first release of a 64 bit
version of PAMGuard. As with the 32 bit version a number of C language
libraries are required to interface to external sound cards and other data
acquisition devices. These have been extensively tested on several different computers,
but may not be as stable as the 32 bit versions. Please report any problems
immediately to the PAMGuard team. </span></p>
acquisition devices. These have been extensively tested on several different
computers, but may not be as stable as the 32 bit versions. Please report any
problems immediately to the PAMGuard team. </span></p>
<p class=MsoNormal><b><span lang=EN-US>Other Changes</span></b></p>
@ -2646,9 +2654,9 @@ contains queries. Fixed.</span></p>
<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>Bug 254. Lookup lists failing in imported SQLite databases.
</span>This was caused by the system 'padding' topic's with blank spaces and is
now fixed. </p>
</span><span lang=EN-US>Bug 254. Lookup lists failing in imported SQLite
databases. </span>This was caused by the system 'padding' topic's with blank
spaces and is now fixed. </p>
<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;
@ -2748,9 +2756,9 @@ displaying in the viewer. This is now fixed. </span></p>
<p class=MsoListParagraph style='margin-left:38.25pt;text-indent:-20.25pt'><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;&nbsp;
</span><span lang=EN-US>Bug 248. Crash in hydrophone array manager. Bug in
array manager would crash PAMGuard when the click detector was configured with more
channels than the sound acquisition system (almost impossible to achieve, but
someone managed it). </span></p>
array manager would crash PAMGuard when the click detector was configured with
more channels than the sound acquisition system (almost impossible to achieve,
but someone managed it). </span></p>
<p class=MsoListParagraph style='margin-left:38.25pt;text-indent:-20.25pt'><span
lang=EN-US>4.</span><span lang=EN-US style='font-size:7.0pt;font-family:"Times New Roman",serif'>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
@ -2759,8 +2767,8 @@ events. </span></p>
<p class=MsoListParagraph style='margin-left:38.25pt;text-indent:-20.25pt'><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;&nbsp;
</span><span lang=EN-US>Bug 250. DIFAR module was crashing if it attempted to
triangulate between more than two simultaneous bearings. Fixed. </span></p>
</span><span lang=EN-US>Bug 250. DIFAR module was crashing if it attempted to triangulate
between more than two simultaneous bearings. Fixed. </span></p>
<p class=MsoListParagraph style='margin-left:38.25pt;text-indent:-20.25pt'><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;&nbsp;
@ -2769,8 +2777,8 @@ lang=EN-US>6.</span><span lang=EN-US style='font-size:7.0pt;font-family:"Times N
<p class=MsoListParagraph style='margin-left:38.25pt;text-indent:-20.25pt'><span
lang=EN-US>7.</span><span lang=EN-US style='font-size:7.0pt;font-family:"Times New Roman",serif'>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
</span><span lang=EN-US>Bug 252. Bug which plotted bearings to whistle and moan
detections from the front hydrophone rather than the central position between hydrophones
now fixed. </span></p>
detections from the front hydrophone rather than the central position between
hydrophones now fixed. </span></p>
<p class=MsoListParagraph style='text-indent:-18.0pt'><span lang=EN-US>&nbsp;</span></p>
@ -2980,9 +2988,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
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
219. Problems displaying Offline Click Events in the Viewer map have been
fixed. </p>
<p class=MsoListParagraph style='text-indent:-18.0pt'>7.&nbsp;&nbsp;&nbsp; Bug 219.
Problems displaying Offline Click Events in the Viewer map have been fixed. </p>
<p class=MsoNormal>&nbsp;</p>
@ -3072,17 +3079,17 @@ PAMGuard should be started and stopped using the red and black buttons.</p>
<p class=MsoNormal><i>DIFAR</i> (Localisation Group)</p>
<p class=MsoNormal>This module, funded by the Australian Antarctic Division
allows the de-multiplexing and calculation of angles from military style DIFAR sonobuoys.
See online help for details.&nbsp; </p>
allows the de-multiplexing and calculation of angles from military style DIFAR
sonobuoys. See online help for details.&nbsp; </p>
<p class=MsoNormal><i>MEAL Localiser</i> (Localisation Group)</p>
<p class=MsoNormal>This module, developed by Jamie Macaulay of St Andrews
University estimates the 3D localisation of clicks using a variety of
algorithms. It's primarily been developed to track harbour porpoise in three
dimensions over scales of 10's of metres. While currently only working with
output from the click detector, we hope eventually to extend its use to
whistles as well. </p>
dimensions over scales of 10's of metres. While currently only working with output
from the click detector, we hope eventually to extend its use to whistles as
well. </p>
<p class=MsoNormal><i>Accelerometer Readout</i> (Sensors group)</p>
@ -3152,11 +3159,10 @@ different. Details are available in the online help. </p>
<p class=MsoNormal><i>FLAC File Support</i></p>
<p class=MsoNormal>Can now read raw audio data direct from FLAC files. <a
href="http://en.wikipedia.org/wiki/FLAC">FLAC</a> is a lossless compression
algorithm for audio data. Files, or folders of files are accessed in the same
way as WAV and AIFF files in the Sound Acquisition module. In a future release
we also hope to provide support for writing FLAC files from the sound recorder
module. </p>
href="http://en.wikipedia.org/wiki/FLAC">FLAC</a> is a lossless compression algorithm
for audio data. Files, or folders of files are accessed in the same way as WAV
and AIFF files in the Sound Acquisition module. In a future release we also
hope to provide support for writing FLAC files from the sound recorder module. </p>
<p class=MsoNormal><i>Sound Recorder Module</i></p>
@ -3169,14 +3175,14 @@ Millisecond time is also now included in the output file names. </p>
<p class=MsoNormal>Datagram options in Viewer have been improved so that the
user has to verify the time binning for datagrams the first time the viewer is
run and can also change the time bins from the File menu (See the
File/BinaryStore/Datagram options menu. </p>
run and can also change the time bins from the File menu (See the File/BinaryStore/Datagram
options menu. </p>
<p class=MsoNormal><i>Viewer Configuration</i></p>
<p class=MsoNormal>The Viewer configuration is now saved into a separate database
table from 'normal' settings so that Viewer can run at same time as normal
operation, but with slightly different display settings. </p>
<p class=MsoNormal>The Viewer configuration is now saved into a separate
database table from 'normal' settings so that Viewer can run at same time as
normal operation, but with slightly different display settings. </p>
<p class=MsoNormal><i>Spectrogram Display</i></p>
@ -3222,8 +3228,8 @@ whistle.</p>
longer possible to change configurations once PAMGuard has been launched
and pressing 'Cancel' on the select dialog causes PAMGuard to exit. </li>
<li class=MsoNormal style='margin-bottom:0cm'>Airgun display. If this was
included in the PAMGuard model before the GPS module it would hang
PAMGuard. This has been rectified. </li>
included in the PAMGuard model before the GPS module it would hang PAMGuard.
This has been rectified. </li>
<li class=MsoNormal style='margin-bottom:0cm'>Fixed occasional exceptions in
the sound output modules when playing back from files. </li>
<li class=MsoNormal style='margin-bottom:0cm'>Fixed exceptions in spectrogram
@ -3252,10 +3258,11 @@ whistle.</p>
<li class=MsoNormal style='margin-bottom:0cm'>Storage options (<a
href="https://sourceforge.net/p/pamguard/bugs/175/">https://sourceforge.net/p/pamguard/bugs/175/</a>)
whereby clicks were stored to database is now fixed. </li>
<li class=MsoNormal style='margin-bottom:0cm'>Sound Recorder output folder is now
defaulting to the User folder (Generally C:\Users\username\PAMRecordings)
instead of C:\Program Files (x86)\PamguardBeta which didn't work since the
software doesn't have write access to that folder. </li>
<li class=MsoNormal style='margin-bottom:0cm'>Sound Recorder output folder is
now defaulting to the User folder (Generally
C:\Users\username\PAMRecordings) instead of C:\Program Files
(x86)\PamguardBeta which didn't work since the software doesn't have write
access to that folder. </li>
</ol>
<p class=MsoNormal>&nbsp;</p>
@ -3342,9 +3349,9 @@ information correctly in the binary files. </p>
<p class=MsoNormal style='margin-left:36.0pt'><i>Logger Forms</i></p>
<p class=MsoNormal style='margin-left:36.0pt'>A substantial amount of work has been
carried out on Logger forms, funded by the South West fisheries Science Center.
</p>
<p class=MsoNormal style='margin-left:36.0pt'>A substantial amount of work has
been carried out on Logger forms, funded by the South West fisheries Science
Center. </p>
<p class=MsoNormal style='margin-left:36.0pt'><i>Click Detector</i></p>
@ -3403,8 +3410,8 @@ elements has been fixed. </p>
<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;
</span>Database Speed: A substantial rewriting of some of the indexing methods
in the database module has led to a significant increase in the speed at which
</span>Database Speed: A substantial rewriting of some of the indexing methods in
the database module has led to a significant increase in the speed at which
data are written to the database (orders of magnitude for large databases).
This is having a significant impact on the overall reliability of the software.
Other changes have increased the speed (again by orders of magnitude) at which
@ -3626,10 +3633,10 @@ source, even if that data source is loaded after the FFT module is created.</p>
<p class=MsoNormal>1. Binary storage module. </p>
<p class=MsoNormal>Performs a parallel role to the PAMGAURD database but uses
binary files in a proprietary format which is considerably more efficient for
data of unknown length such as whistle contours or small clips of click
waveform. This feature is currently implemented in the following modules:</p>
<p class=MsoNormal>Performs a parallel role to the PAMGAURD database but uses binary
files in a proprietary format which is considerably more efficient for data of
unknown length such as whistle contours or small clips of click waveform. This
feature is currently implemented in the following modules:</p>
<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;
@ -3645,11 +3652,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>The offline viewer is much improved with better data
scrolling and the ability to view data either stored in the database or the
binary storage system. Work has stated on functions which read and use data
stored in audio files. This is currently limited to re-calculating and
displaying displaying spectrogram data during viewer mode operation.&nbsp; </p>
<p class=MsoNormal>The offline viewer is much improved with better data scrolling
and the ability to view data either stored in the database or the binary
storage system. Work has stated on functions which read and use data stored in
audio files. This is currently limited to re-calculating and displaying
displaying spectrogram data during viewer mode operation.&nbsp; </p>
<p class=MsoNormal>3. Heading sensor readout</p>
@ -3746,9 +3753,9 @@ re-label those channels 0,1,2,3. </p>
numbering scheme. For instance, if you had a configuration which worked in real
time using channels 7 and 8 of a sound card, you could not use that same
configuration to analyse wav files, which would always read their data as
channels 0 and 1. Similarly if you switched sound cards, you may have to
reconfigure every detector and several of the displays to handle the changes in
channel numbering. </p>
channels 0 and 1. Similarly if you switched sound cards, you may have to reconfigure
every detector and several of the displays to handle the changes in channel
numbering. </p>
<p class=MsoNormal>I have spent a considerable amount of time trying to work
out a better system for handling channel numbering in PAMGUARD and have decided
@ -3788,8 +3795,8 @@ minute of data during real time operation. </p>
<p class=MsoNormal>PAMGUARD Viewer scrolling mechanism has changed. </p>
<p class=MsoNormal>Each display now has a small control in the right hand end of
a scroll bar or a slider which allows you to page through data. This is only
<p class=MsoNormal>Each display now has a small control in the right hand end
of a scroll bar or a slider which allows you to page through data. This is only
well implemented for the map, but will be an increasingly important feature as
more displays are set up for offline data viewing in future releases. </p>
@ -3880,8 +3887,8 @@ frequency versions of the click detector.</p>
<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;
</span>Note that this does not (yet) permit simultaneous acquisition and
playback through</p>
</span>Note that this does not (yet) permit simultaneous acquisition and playback
through</p>
<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;
@ -4076,10 +4083,10 @@ 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:
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 control will allow the user to copy the tab contents to the system
clipboard from where it can be copied into other programs (e.g. Word,
Powerpoint, etc.).Some modules, such as the map, have this implemented in other
menus (right click) and also allow printing.&nbsp; </p>
tab control will allow the user to copy the tab contents to the system clipboard
from where it can be copied into other programs (e.g. Word, Powerpoint,
etc.).Some modules, such as the map, have this implemented in other menus
(right click) and also allow printing.&nbsp; </p>
<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;

View File

@ -4,7 +4,7 @@
<groupId>org.pamguard</groupId>
<artifactId>Pamguard</artifactId>
<name>Pamguard Java12+</name>
<version>2.02.05a</version>
<version>2.02.06</version>
<description>Pamguard for Java 12+, using Maven to control dependcies</description>
<url>www.pamguard.org</url>
<organization>

View File

@ -210,14 +210,8 @@ public class AcquisitionControl extends PamControlledUnit implements PamSettings
else {
PamStatusBar statusBar = PamStatusBar.getStatusBar();
if (statusBar != null) {
// statusBar.getToolBar().add(statusBarText = new JLabel());
// fillStatusBarText();
// statusBar.getToolBar().add(levelBar = new JProgressBar(-60, 0));
// levelBar.setValue(-60);
// levelBar.setOrientation(JProgressBar.HORIZONTAL);
if (statusBar != null && statusBarComponent != null) {
statusBar.add(statusBarComponent);
// statusBar.getToolBar().addSeparator();
setupStatusBar();
}
}
@ -248,6 +242,7 @@ public class AcquisitionControl extends PamControlledUnit implements PamSettings
private PamPanel systemPanel;
protected Component getStatusBarComponent() {
PamPanel p = new PamPanel();
p.add(statusBarText = new PamLabel());

View File

@ -0,0 +1,33 @@
package generalDatabase;
/**
* Run some tests to try to work out why it's so much slower to load
* data when the query is based on a non indexed column compared
* to an index one, even though the actual query execution time
* is a small fraction of the total time.
* @author dg50
*
*/
public class DatabaseFetchSpeed {
String dbName = "C:\\ProjectData\\meyGenMayData\\Database\\MeygenTritechDetectHDD_03_24.06.2022.sqlite3";
long[] idRange = {9906111, 9906977};
long[] uidRange = {8030630, 8031496};
String[] utcRange = {"2022-05-24 09:27:34", "2022-05-24 09:27:52"};
public static void main(String[] args) {
// TODO Auto-generated method stub
}
public DatabaseFetchSpeed() {
//
// qStr{1} = sprintf('SELECT Id FROM Gemini_Threshold_Detector_Targets WHERE Id BETWEEN %d and %d', ...
// idRange(1), idRange(2));
// qStr{2} = sprintf('SELECT Id FROM Gemini_Threshold_Detector_Targets WHERE UID BETWEEN %d and %d', ...
// uidRange(1), uidRange(2));
// qStr{3} = sprintf('SELECT Id FROM Gemini_Threshold_Detector_Targets WHERE UTC BETWEEN ''%s'' and ''%s''', ...
// utcRange{1}, utcRange{2});
}
}

View File

@ -24,7 +24,10 @@
package soundtrap;
import java.awt.Component;
import Acquisition.AcquisitionControl;
import Acquisition.DaqSystem;
/**
* @author SCANS
@ -34,6 +37,14 @@ public class STAcquisitionControl extends AcquisitionControl {
public static final String STUNITTYPE = "SoundTrap Data Acquisition";
private STAcquisitionProcess stAcquisitionProcess;
private STDaqSystem stDaqSystem;
/*
* Standard voltage for soundtrap data. note that ST calibration is only
* provided as end to end peak input, so the correct thing to do is set the peak to peak as 2
* (0-peak = 1) and then put the hydrophone sensitivity as - the end to end and all will be well.
*/
public static final double SOUNDTRAPVP2P = 2.0;
/**
* @param name
@ -41,46 +52,12 @@ public class STAcquisitionControl extends AcquisitionControl {
public STAcquisitionControl(String name) {
super(name);
// super(STUNITTYPE, name);
//
// acquisitionControl = this;
//
// fileDate = new StandardFileDate(this);
//
// pamController = PamController.getInstance();
//
// registerDaqSystem(new FileInputSystem(this));
// registerDaqSystem(folderSystem = new FolderInputSystem(this));
//
// daqChannelListManager = new DAQChannelListManager(this);
//
// PamSettingManager.getInstance().registerSettings(this);
//
// addPamProcess(acquisitionProcess = new STAcquisitionProcess(this));
//
// daqMenuEnabler = new MenuItemEnabler();
//
// statusBarComponent = getStatusBarComponent();
//
// if (isViewer) {
// offlineFileServer = new OfflineFileServer(this, fileDate);
// }
// else {
// PamStatusBar statusBar = PamStatusBar.getStatusBar();
//
// if (statusBar != null) {
// statusBar.getToolBar().add(statusBarComponent);
// statusBar.getToolBar().addSeparator();
// setupStatusBar();
// }
// }
// setSelectedSystem();
//
// TDDataProviderRegisterFX.getInstance().registerDataInfo(new RawSoundProviderFX(this));
// add a second PAM process, for the click data
registerDaqSystem(stDaqSystem = new STDaqSystem());
addPamProcess(stAcquisitionProcess = new STAcquisitionProcess(this));
acquisitionParameters.voltsPeak2Peak = SOUNDTRAPVP2P;
}
@Override
@ -101,6 +78,30 @@ public class STAcquisitionControl extends AcquisitionControl {
return stAcquisitionProcess;
}
// @Override
// protected Component getStatusBarComponent() {
// // call it to create the fields, just incase, then return null;
// super.getStatusBarComponent();
// return null;
// }
// @Override
// protected void setupStatusBar() {
//// if (systemPanel == null) return;
//// systemPanel.removeAll();
//// DaqSystem daqSys = findDaqSystem(null);
//// if (daqSys == null) return;
//// Component specialComponent = daqSys.getStatusBarComponent();
//// if (specialComponent != null) {
//// systemPanel.add(specialComponent);
//// }
// }
@Override
public DaqSystem findDaqSystem(String systemType) {
return stDaqSystem;
}
}

View File

@ -63,7 +63,7 @@ public class STClickControl extends ClickControl {
super(name);
// create a private acquisition control that only this module can see
rawSource = new AcquisitionControl("Private Sound Acq for Soundtrap Click Detector");
rawSource = new STAcquisitionControl("Private Sound Acq for Soundtrap Click Detector");
sudFileDWVHandler = new SudFileDWVHandler(this);
sudFileDWVHandler.subscribeSUD();

View File

@ -0,0 +1,107 @@
package soundtrap;
import javax.swing.JComponent;
import Acquisition.AcquisitionControl;
import Acquisition.AcquisitionDialog;
import Acquisition.DaqSystem;
public class STDaqSystem extends DaqSystem {
public STDaqSystem() {
// TODO Auto-generated constructor stub
}
@Override
public String getSystemType() {
return "SoundTrap clicks";
}
@Override
public String getSystemName() {
return "SoundTrap clicks";
}
@Override
public JComponent getDaqSpecificDialogComponent(AcquisitionDialog acquisitionDialog) {
// TODO Auto-generated method stub
return null;
}
@Override
public void dialogSetParams() {
// TODO Auto-generated method stub
}
@Override
public boolean dialogGetParams() {
// TODO Auto-generated method stub
return false;
}
@Override
public int getMaxSampleRate() {
return PARAMETER_UNKNOWN;
}
@Override
public int getMaxChannels() {
return 1;
}
@Override
public double getPeak2PeakVoltage(int swChannel) {
// TODO Auto-generated method stub
return 2;
}
@Override
public boolean prepareSystem(AcquisitionControl daqControl) {
// TODO Auto-generated method stub
return true;
}
@Override
public boolean startSystem(AcquisitionControl daqControl) {
// TODO Auto-generated method stub
return true;
}
@Override
public void stopSystem(AcquisitionControl daqControl) {
// TODO Auto-generated method stub
}
@Override
public boolean isRealTime() {
// TODO Auto-generated method stub
return true;
}
@Override
public boolean canPlayBack(float sampleRate) {
// TODO Auto-generated method stub
return false;
}
@Override
public int getDataUnitSamples() {
// TODO Auto-generated method stub
return 100;
}
@Override
public void daqHasEnded() {
// TODO Auto-generated method stub
}
@Override
public String getDeviceName() {
// TODO Auto-generated method stub
return "Sound Trap detector";
}
}

View File

@ -12,6 +12,7 @@ import PamController.PamControlledUnit;
import PamController.PamControlledUnitSettings;
import PamController.PamSettingManager;
import PamController.PamSettings;
import PamView.dialog.warn.WarnOnce;
public class STToolsControl extends PamControlledUnit implements PamSettings {
@ -21,9 +22,17 @@ public class STToolsControl extends PamControlledUnit implements PamSettings {
public static final String dwvFileEnd = ".dwv";
public static final String bclFileEnd = ".bcl";
private String warn = "<html>Versions 2.02.06 of PAMGuard and later can read SoundTrap SUD files directly, removing the need " +
" to decompress them and then use this module to import the SoundTrap click detector data into PAMGuard.<p><br>" +
"Instead you should process the SUD files in 'normal mode' and include a SoundTrap Click Detector in "
+ "your configuration. Click data will then be automatically unpacked into the correct binary files"
+ " as you process the SUD file audio data.<p><br>"
+ "You can remove this module which is now obsolete. See the online help for details.";
public STToolsControl(String unitName) {
super("Sound Trap Tools", unitName);
PamSettingManager.getInstance().registerSettings(this);
WarnOnce.showWarning("Importing SoundTrap data", warn, WarnOnce.WARNING_MESSAGE);
}
/* (non-Javadoc)

View File

@ -19,6 +19,7 @@ import PamUtils.PamCalendar;
import clickDetector.ClickDetection;
import clickDetector.ClickDetector;
import clickDetector.ClickDetector.ChannelGroupDetector;
import soundtrap.STAcquisitionControl;
import soundtrap.STClickControl;
import wavFiles.ByteConverter;
@ -77,6 +78,8 @@ public class SudFileDWVHandler implements SUDNotificationHandler {
stClickControl.findRawDataBlock().setChannelMap(1);
stClickControl.findRawDataBlock().setSampleRate((float) sampleRate, true);
stClickControl.getSTAcquisition().acquisitionParameters.sampleRate = (float) sampleRate;
stClickControl.getSTAcquisition().acquisitionParameters.voltsPeak2Peak = STAcquisitionControl.SOUNDTRAPVP2P;
stClickControl.getSTAcquisition().getAcquisitionProcess().setSampleRate((float) sampleRate, true);
// System.out.printf("Open input stream fs = %3.1f\n", sampleRate);
}