last changes and relelase notes V2.02.15

icon changes, release notes.
This commit is contained in:
Douglas Gillespie 2024-12-02 14:37:10 +00:00
parent 3d2ac81236
commit 45e4612bdb
15 changed files with 316 additions and 157 deletions

View File

@ -6,9 +6,8 @@
<attribute name="maven.pomderived" value="true"/> <attribute name="maven.pomderived" value="true"/>
</attributes> </attributes>
</classpathentry> </classpathentry>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/Amazon Coretto 21"> <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17">
<attributes> <attributes>
<attribute name="module" value="true"/>
<attribute name="maven.pomderived" value="true"/> <attribute name="maven.pomderived" value="true"/>
</attributes> </attributes>
</classpathentry> </classpathentry>

4
.gitignore vendored
View File

@ -13,6 +13,10 @@
#ignore target directory #ignore target directory
/target/ /target/
#ignore quarto built website files
/src/quartohelp/_site/
/src/quartohelp/.Rproj.user/
# Package Files remove jar from this since there is one we want. Most are in target which is excluded anyway.# # Package Files remove jar from this since there is one we want. Most are in target which is excluded anyway.#
*.notjar *.notjar
*.war *.war

View File

@ -1,6 +1,5 @@
eclipse.preferences.version=1 eclipse.preferences.version=1
encoding//src/rawDeepLearningClassifer/segmenter/SegmenterProcess.java=UTF-8 encoding//src/rawDeepLearningClassifer/segmenter/SegmenterProcess.java=UTF-8
encoding//src/test=UTF-8
encoding//src/test/resources=UTF-8 encoding//src/test/resources=UTF-8
encoding/<project>=UTF-8 encoding/<project>=UTF-8
encoding/src=UTF-8 encoding/src=UTF-8

View File

@ -11,9 +11,9 @@ org.eclipse.jdt.core.codeComplete.staticFinalFieldPrefixes=
org.eclipse.jdt.core.codeComplete.staticFinalFieldSuffixes= org.eclipse.jdt.core.codeComplete.staticFinalFieldSuffixes=
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate
org.eclipse.jdt.core.compiler.codegen.targetPlatform=21 org.eclipse.jdt.core.compiler.codegen.targetPlatform=17
org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
org.eclipse.jdt.core.compiler.compliance=21 org.eclipse.jdt.core.compiler.compliance=17
org.eclipse.jdt.core.compiler.debug.lineNumber=generate org.eclipse.jdt.core.compiler.debug.lineNumber=generate
org.eclipse.jdt.core.compiler.debug.localVariable=generate org.eclipse.jdt.core.compiler.debug.localVariable=generate
org.eclipse.jdt.core.compiler.debug.sourceFile=generate org.eclipse.jdt.core.compiler.debug.sourceFile=generate
@ -23,4 +23,4 @@ org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning
org.eclipse.jdt.core.compiler.release=enabled org.eclipse.jdt.core.compiler.release=enabled
org.eclipse.jdt.core.compiler.source=21 org.eclipse.jdt.core.compiler.source=17

View File

@ -386,7 +386,8 @@ PamguardBeta_ViewerMode.exe):</p>
<p class=MsoNormal><em><span style='font-family:"Calibri",sans-serif'>&nbsp;</span></em></p> <p class=MsoNormal><em><span style='font-family:"Calibri",sans-serif'>&nbsp;</span></em></p>
<h2><em><span style='font-size:12.0pt;font-family:"Cambria",serif;font-weight: <h2><em><span style='font-size:12.0pt;font-family:"Cambria",serif;font-weight:
normal;font-style:normal'><a href="#_Version_2.02.Next"><b>Version 2.02.Next</b></a></span></em></h2> normal;font-style:normal'><a href="#_Version_2.02.Next"><b>Latest V</b><b>ersion
2.02.</b><b>15 December 2024</b></a></span></em></h2>
<h2>&nbsp;</h2> <h2>&nbsp;</h2>
@ -474,9 +475,24 @@ name="_Latest_Version_2.02.05"></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="_Latest_Version_2.02.07"></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.09_June"></a><a name="_Version_2.02.10_January"></a><a
name="_Version_2.02.11_April"></a><a name="_Version_2.02.14_October"></a><a name="_Version_2.02.11_April"></a><a name="_Version_2.02.14_October"></a><a
name="_Version_2.02.Next"></a>Version 2.02.Next</h1> name="_Version_2.02.Next"></a>Version 2.02.15 December 2014</h1>
<h2>Bug fixes</h2> <p class=MsoNormal>First official release for MacOS11+, ARM Processors</p>
<h2>New Features</h2>
<p class=MsoNormal>Added ability to export click events to the exporter.</p>
<p class=MsoNormal>Updates to deep learning module to deal with group
detections.</p>
<p class=MsoNormal>New icons and graphical user interface style for Mac.</p>
<h2>Bug Fixes</h2>
<p class=MsoNormal>Fixed important timing bug that affected offline analysis
when there was a gap in data, causing certain binary files before the gap to be
closed with an incorrect end time. </p>
<p class=MsoNormal>Fixed issue #177 with clip generator dialog always reverting <p class=MsoNormal>Fixed issue #177 with clip generator dialog always reverting
to first available input source. </p> to first available input source. </p>
@ -487,9 +503,9 @@ to first available input source. </p>
<h2>New Features</h2> <h2>New Features</h2>
<p class=MsoNormal>Rocca update: Ability to specify whether strong <p class=MsoNormal>Rocca update: Ability to specify whether strong whistle/encounter
whistle/encounter threshold is applied as an absolute value, or as the threshold is applied as an absolute value, or as the difference between the
difference between the highest and second-highest votes.</p> highest and second-highest votes.</p>
<p class=MsoNormal>Tethys: Export of Group3D Localiser data</p> <p class=MsoNormal>Tethys: Export of Group3D Localiser data</p>
@ -555,9 +571,9 @@ Visualiser, Audacity etc.)</p>
<h2>Tethys Database</h2> <h2>Tethys Database</h2>
<p class=MsoNormal>Many users will be aware that were integrating an interface <p class=MsoNormal>Many users will be aware that were integrating an interface
to the <a href="https://tethys.sdsu.edu/">Tethys Database</a> into PAMGuard. to the <a href="https://tethys.sdsu.edu/">Tethys Database</a> into PAMGuard. Some
Some basic features are available for testing. If interested, please contact basic features are available for testing. If interested, please contact the
the PAMGuard support team. </p> PAMGuard support team. </p>
<h2>Bug Fixes</h2> <h2>Bug Fixes</h2>
@ -580,9 +596,9 @@ as PAMGuard stops / restarts. </p>
function fixed and now inserts correct times of start and ends of events into function fixed and now inserts correct times of start and ends of events into
database. </p> database. </p>
<p class=MsoNormal>Clip generator. Changes to ensure PAMGuard keeps audio data <p class=MsoNormal>Clip generator. Changes to ensure PAMGuard keeps audio data long
long enough to make clips. In some circumstances data were being discarded too enough to make clips. In some circumstances data were being discarded too early
early so clips could not be created. </p> so clips could not be created. </p>
<p class=MsoNormal>Acquisition “Skip initial seconds” feature, designed to <p class=MsoNormal>Acquisition “Skip initial seconds” feature, designed to
remove high sample levels e.g. from calibration tones at start of a soundtrap remove high sample levels e.g. from calibration tones at start of a soundtrap
@ -609,9 +625,9 @@ exact times, rather than a couple of seconds after the hour. </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>
@ -686,10 +702,10 @@ name of the folder containing the files.</p>
<h2><span lang=EN-US>Bug Fixes</span></h2> <h2><span lang=EN-US>Bug Fixes</span></h2>
<p class=MsoNormal><span lang=EN-US>Time zone displays: Fixed some bugs <p class=MsoNormal><span lang=EN-US>Time zone displays: Fixed some bugs associated
associated with options to have PAMGuard display times in local time, rather with options to have PAMGuard display times in local time, rather than UTC.
than UTC. This was affecting times typed into the scroll bars of displays which This was affecting times typed into the scroll bars of displays which were
were reading local time, even when set to use UTC. </span></p> reading local time, even when set to use UTC. </span></p>
<h1><a name="_Version_2.02.08_May"></a><span lang=EN-US>Version 2.02.08 May <h1><a name="_Version_2.02.08_May"></a><span lang=EN-US>Version 2.02.08 May
2023</span></h1> 2023</span></h1>
@ -713,10 +729,10 @@ handlers to handle corrupt map files. </span></p>
<h2><span lang=EN-US>New Features</span></h2> <h2><span lang=EN-US>New Features</span></h2>
<p class=MsoNormal><span lang=EN-US>Restart Options: When you restart processing <p class=MsoNormal><span lang=EN-US>Restart Options: When you restart
of offline files, if output data already exist (binary data of within database processing of offline files, if output data already exist (binary data of
tables) you will be asked if you want to overwrite the data, cancel, or try to within database tables) you will be asked if you want to overwrite the data,
continue from where to left off. </span></p> cancel, or try to continue from where to left off. </span></p>
<p class=MsoNormal><span lang=EN-US>Updated SoundTrap sud file interface so <p class=MsoNormal><span lang=EN-US>Updated SoundTrap sud file interface so
that PAMGuard now extracts and stores the Click Detector settings from the sud that PAMGuard now extracts and stores the Click Detector settings from the sud
@ -910,8 +926,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 <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 NullPointerException <p class=MsoNormal><span lang=EN-US>Bug 495: TD FX display throws
if user has removed all data units and then moves mouse over display area.</span></p> 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 <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>
@ -934,11 +951,11 @@ font-family:"Times New Roman",serif'>&nbsp;</span></p>
<h2>File Format Change</h2> <h2>File Format Change</h2>
<p class=MsoNormal>Changes have been made to the binary file format to support the <p class=MsoNormal>Changes have been made to the binary file format to support
output of additional noise outputs for certain detectors (See below). Binary the output of additional noise outputs for certain detectors (See below).
files created with this version will not be compatible with earlier versions Binary files created with this version will not be compatible with earlier
2.01.### and below. This version will read and may convert earlier format versions 2.01.### and below. This version will read and may convert earlier
binary files.</p> format binary files.</p>
<p class=MsoNormal style='margin-bottom:0cm'><span style='font-size:12.0pt; <p class=MsoNormal style='margin-bottom:0cm'><span style='font-size:12.0pt;
font-family:"Times New Roman",serif'>&nbsp;</span></p> font-family:"Times New Roman",serif'>&nbsp;</span></p>
@ -1210,11 +1227,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>
@ -1324,10 +1341,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 lang=EN-US> </span>Add user-facing option to adjust the startup delay for the time-correction
time-correction (Global Time module). This provides a workaround to speed up (Global Time module). This provides a workaround to speed up analysis of
analysis of thousands of wav files (i.e. by setting startup delay to 0 instead thousands of wav files (i.e. by setting startup delay to 0 instead of default
of default value of 2000 ms). </p> 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
@ -1392,11 +1409,10 @@ placement, etc.</p>
<h1><a name="_Latest_Beta_Version_2.01.03"></a><span lang=EN-US>Version 2.01.03 <h1><a name="_Latest_Beta_Version_2.01.03"></a><span lang=EN-US>Version 2.01.03
February 2020</span></h1> February 2020</span></h1>
<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),
(1.15.xx), PAMGuard Version 2 contains major updates. You should read and PAMGuard Version 2 contains major updates. You should read and understand the
understand the notes listed for <a href="#_Latest_Beta_Version_2.00.10">Beta notes listed for <a href="#_Latest_Beta_Version_2.00.10">Beta Version 2.00.10</a>
Version 2.00.10</a> before proceeding with installation and use of this 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)
@ -1553,9 +1569,9 @@ 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 compatible lang=EN-US> </span>This version of PAMGuard has been upgraded to make it
with Java 12. psfx files generated in previous beta releases should be compatible with Java 12. psfx files generated in previous beta releases should
compatible with this version, and vice-versa.</p> be 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>
@ -1577,8 +1593,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;</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>Bug 427. Soundtrap import not closing binary files properly if lang=EN-US> </span>Bug 427. Soundtrap import not closing binary files properly
BCL files do not contain off-effort 'E' line</p> if BCL files do not contain off-effort 'E' line</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>
@ -1860,9 +1876,9 @@ from many channels.</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;
</span>Bugs 398 and 399. Click Detector, FFT Engine and Filter modules were losing </span>Bugs 398 and 399. Click Detector, FFT Engine and Filter modules were
source during startup, if the source selected was not the first raw data source losing source during startup, if the source selected was not the first raw data
in the list.</p> source in the list.</p>
<p class=MsoListParagraph style='text-indent:-18.0pt'><span lang=EN-US>4. </span><span <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; lang=EN-US style='font-size:7.0pt;font-family:"Times New Roman",serif'>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
@ -1940,8 +1956,8 @@ measurement period.</p>
<p class=MsoListParagraph style='text-indent:-18.0pt'><span lang=EN-US>8. </span><span <p class=MsoListParagraph style='text-indent:-18.0pt'><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; lang=EN-US style='font-size:7.0pt;font-family:"Times New Roman",serif'>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
</span>Bug 389. Multiple annotations of the same class would not be stored to </span>Bug 389. Multiple annotations of the same class would not be stored to the
the database if they had the same class. This was affecting the Spectrogram database if they had the same class. This was affecting the Spectrogram
Annotation module which has now been given two text type annotations.</p> Annotation module which has now been given two text type annotations.</p>
<p class=MsoListParagraph style='text-indent:-18.0pt'><span lang=EN-US>9. </span><span <p class=MsoListParagraph style='text-indent:-18.0pt'><span lang=EN-US>9. </span><span
@ -1977,9 +1993,9 @@ see new options in main menu.</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>Added Matched Template Click Classifier. Classifies clicks based lang=EN-US> </span>Added Matched Template Click Classifier. Classifies clicks
on an ideal template to match and a template to reject. An example of this is based on an ideal template to match and a template to reject. An example of
to classify beaked whale clicks in an environment with dolphin clicks.</p> this is to classify beaked whale clicks in an environment with dolphin clicks.</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> lang=EN-US style='font-size:7.0pt;font-family:"Times New Roman",serif'>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</span>
@ -2062,8 +2078,8 @@ 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>10. </span><span <p class=MsoListParagraph style='text-indent:-18.0pt'><span lang=EN-US>10. </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 376. Error when using a serialised data map which spans a period of </span>Bug 376. Error when using a serialised data map which spans a period of time
time in which Pamguard modules have changed.</p> in which Pamguard modules have changed.</p>
<p class=MsoListParagraph style='text-indent:-18.0pt'><span lang=EN-US>11. </span><span <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; lang=EN-US style='font-size:7.0pt;font-family:"Times New Roman",serif'>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
@ -2090,8 +2106,8 @@ format to ISO8601 standard.</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>A number of upgrades and fixes to the Localiser algorithms, including lang=EN-US> </span>A number of upgrades and fixes to the Localiser algorithms,
expanding to work with whistles.</p> including expanding to work with whistles.</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
@ -2174,9 +2190,9 @@ trying to classify a boxed whistle</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>During conversion from Core to Beta versions, if there are lang=EN-US> </span>During conversion from Core to Beta versions, if there are any
any problems matching database units to binary store units the UID values will problems matching database units to binary store units the UID values will now
now be set to negative numbers instead of leaving them null. The user is warned be set to negative numbers instead of leaving them null. The user is warned
about this and encouraged to manually fix the database.</p> about this and encouraged to manually fix the database.</p>
<!-- ************************************************************************************************************************** --> <!-- ************************************************************************************************************************** -->
@ -2434,8 +2450,8 @@ 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
module was not performing data purging when using classifiers developed for was not performing data purging when using classifiers developed for
Hawaii/Temperate Pacific/North Atlantic datasets. This has been corrected.</p> 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 <p class=MsoListParagraph style='text-indent:-18.0pt'><span lang=EN-US>2.</span><span
@ -2546,9 +2562,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,
@ -2736,9 +2752,9 @@ the database. </span></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><span lang=EN-US>The number of data streams associated with the click detector </span><span lang=EN-US>The number of data streams associated with the click
has been tidied up so that there are a) All Click, b) Tracked Clicks (those detector has been tidied up so that there are a) All Click, b) Tracked Clicks
which are part of an event) and c) Events. </span></p> (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 <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;
@ -3044,9 +3060,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;
@ -3081,10 +3097,10 @@ displaying in the viewer. This is now fixed. </span></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-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; 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 </span><span lang=EN-US>Bug 248. Crash in hydrophone array manager. Bug in array
array manager would crash PAMGuard when the click detector was configured with manager would crash PAMGuard when the click detector was configured with more
more channels than the sound acquisition system (almost impossible to achieve, channels than the sound acquisition system (almost impossible to achieve, but
but someone managed it). </span></p> someone managed it). </span></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-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; 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;
@ -3509,8 +3525,8 @@ File/BinaryStore/Datagram options menu. </p>
<p class=MsoNormal><i>Viewer Configuration</i></p> <p class=MsoNormal><i>Viewer Configuration</i></p>
<p class=MsoNormal>The Viewer configuration is now saved into a separate <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 database table from 'normal' settings so that Viewer can run at same time as
operation, but with slightly different display settings. </p> normal operation, but with slightly different display settings. </p>
<p class=MsoNormal><i>Spectrogram Display</i></p> <p class=MsoNormal><i>Spectrogram Display</i></p>
@ -3586,10 +3602,11 @@ whistle.</p>
<li class=MsoNormal style='margin-bottom:0cm'>Storage options (<a <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>) 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> whereby clicks were stored to database is now fixed. </li>
<li class=MsoNormal style='margin-bottom:0cm'>Sound Recorder output folder is now <li class=MsoNormal style='margin-bottom:0cm'>Sound Recorder output folder is
defaulting to the User folder (Generally C:\Users\username\PAMRecordings) now defaulting to the User folder (Generally
instead of C:\Program Files (x86)\PamguardBeta which didn't work since the C:\Users\username\PAMRecordings) instead of C:\Program Files
software doesn't have write access to that folder. </li> (x86)\PamguardBeta which didn't work since the software doesn't have write
access to that folder. </li>
</ol> </ol>
<p class=MsoNormal>&nbsp;</p> <p class=MsoNormal>&nbsp;</p>
@ -3654,9 +3671,9 @@ databases.</p>
<p class=MsoNormal style='margin-left:36.0pt'>National Instruments cards: Added <p class=MsoNormal style='margin-left:36.0pt'>National Instruments cards: Added
code in support of the new x-series devices. </p> code in support of the new x-series devices. </p>
<p class=MsoNormal style='margin-left:36.0pt'>ASIO sound cards: Added support <p class=MsoNormal style='margin-left:36.0pt'>ASIO sound cards: Added support for
for a new open source ASIO driver system (jasiohost). The old system has been a new open source ASIO driver system (jasiohost). The old system has been left
left in place for now while we assess users response to the newer system. </p> in place for now while we assess users response to the newer system. </p>
<p class=MsoNormal style='margin-left:36.0pt'><i>AIS</i></p> <p class=MsoNormal style='margin-left:36.0pt'><i>AIS</i></p>
@ -3676,9 +3693,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'><i>Logger Forms</i></p>
<p class=MsoNormal style='margin-left:36.0pt'>A substantial amount of work has been <p class=MsoNormal style='margin-left:36.0pt'>A substantial amount of work has
carried out on Logger forms, funded by the South West fisheries Science Center. been carried out on Logger forms, funded by the South West fisheries Science
</p> Center. </p>
<p class=MsoNormal style='margin-left:36.0pt'><i>Click Detector</i></p> <p class=MsoNormal style='margin-left:36.0pt'><i>Click Detector</i></p>
@ -3737,8 +3754,8 @@ elements has been fixed. </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;
</span>Database Speed: A substantial rewriting of some of the indexing methods </span>Database Speed: A substantial rewriting of some of the indexing methods in
in the database module has led to a significant increase in the speed at which 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). 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. 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 Other changes have increased the speed (again by orders of magnitude) at which
@ -3979,11 +3996,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>
@ -4122,8 +4139,8 @@ minute of data during real time operation. </p>
<p class=MsoNormal>PAMGUARD Viewer scrolling mechanism has changed. </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 <p class=MsoNormal>Each display now has a small control in the right hand end
a scroll bar or a slider which allows you to page through data. This is only 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 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> more displays are set up for offline data viewing in future releases. </p>
@ -4190,13 +4207,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>
@ -4422,8 +4439,8 @@ them before proceeding with installation.</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;
</span>Installer now setting permissions on some of the default settings files so </span>Installer now setting permissions on some of the default settings files
that under Vista they can still be written to without needed to be an so that under Vista they can still be written to without needed to be an
Administrator</p> Administrator</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:
@ -4443,11 +4460,11 @@ now been fixed. </p>
<p class=MsoNormal><b>Bug Fixes</b></p> <p class=MsoNormal><b>Bug Fixes</b></p>
<p class=MsoNormal>Decimator was calculating incorrect filter coefficients (coefficients <p class=MsoNormal>Decimator was calculating incorrect filter coefficients
were based on the output sample rate, not the input sample rate, so it's likely (coefficients were based on the output sample rate, not the input sample rate,
that actual filtering of data was minimal). This is now rectified. Ishmael so it's likely that actual filtering of data was minimal). This is now
matched filter. Would crash if template file not correctly loaded. Now issues a rectified. Ishmael matched filter. Would crash if template file not correctly
warning message to the terminal and does not crash. </p> loaded. Now issues a warning message to the terminal and does not crash. </p>
<p class=MsoNormal>Spelling correction on user input form (Sumbit - Submit)</p> <p class=MsoNormal>Spelling correction on user input form (Sumbit - Submit)</p>

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.14a</version> <version>2.02.15</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>
@ -67,9 +67,11 @@
<dmgFileName>${project.build.finalName}</dmgFileName> <dmgFileName>${project.build.finalName}</dmgFileName>
<appendVersion>false</appendVersion> <appendVersion>false</appendVersion>
</dmg> </dmg>
<app>
<includeDependencies>false</includeDependencies>
</app>
<jdk> <jdk>
<include>true</include> <include>true</include>
<location>/Library/Java/JavaVirtualMachines/amazon-corretto-21.jdk</location>
</jdk> </jdk>
<codesign> <codesign>
<enable>false</enable> <enable>false</enable>
@ -80,7 +82,7 @@
<plugin> <plugin>
<groupId>org.codehaus.mojo</groupId> <groupId>org.codehaus.mojo</groupId>
<artifactId>exec-maven-plugin</artifactId> <artifactId>exec-maven-plugin</artifactId>
<version>3.1.0</version> <version>3.5.0</version>
<executions> <executions>
<execution> <execution>
<id>sign-app</id> <id>sign-app</id>
@ -95,9 +97,10 @@
<argument>echo ${project.basedir}/target/${project.build.finalName}.dmg <argument>echo ${project.basedir}/target/${project.build.finalName}.dmg
xattr -cr ${project.basedir}/target/PAMGuard.app xattr -cr ${project.basedir}/target/PAMGuard.app
codesign --force --sign "3rd Party Mac Developer Application: Jamie Macaulay" ${project.basedir}/target/PAMGuard.app codesign --force --sign "3rd Party Mac Developer Application: Jamie Macaulay" ${project.basedir}/target/PAMGuard.app
ln -s ${project.basedir}/target/PAMGuard.app ${project.basedir}/target/bundle/PAMGuard.app cp -r ${project.basedir}/target/PAMGuard.app ${project.basedir}/target/bundle/PAMGuard.app
cd ${project.basedir}/target/bundle cd ${project.basedir}/target/bundle
hdiutil create -srcfolder ${project.basedir}/target/bundle -volname "PAMGuard" -fs HFS+ -o "${project.build.finalName}-signed.dmg"</argument> hdiutil create -srcfolder ${project.basedir}/target/bundle -volname "PAMGuard" -fs HFS+ -o "${project.build.finalName}-signed.dmg"
rm -r ${project.basedir}/target/bundle/PAMGuard.app</argument>
</arguments> </arguments>
</configuration> </configuration>
</execution> </execution>
@ -141,11 +144,36 @@
<plugin> <plugin>
<artifactId>maven-compiler-plugin</artifactId> <artifactId>maven-compiler-plugin</artifactId>
<version>3.12.1</version> <version>3.12.1</version>
<executions>
<execution>
<id>default-compile</id>
<phase>compile</phase>
<goals>
<goal>compile</goal>
</goals>
<configuration>
<release>21</release>
<compilerId>jdt</compilerId>
</configuration>
</execution>
<execution>
<id>default-testCompile</id>
<phase>test-compile</phase>
<goals>
<goal>testCompile</goal>
</goals>
<configuration>
<release>21</release>
<compilerId>jdt</compilerId>
</configuration>
</execution>
</executions>
<dependencies> <dependencies>
<dependency> <dependency>
<groupId>org.eclipse.tycho</groupId> <groupId>org.eclipse.tycho</groupId>
<artifactId>tycho-compiler-jdt</artifactId> <artifactId>tycho-compiler-jdt</artifactId>
<version>1.5.1</version> <version>1.5.1</version>
<scope>compile</scope>
</dependency> </dependency>
</dependencies> </dependencies>
<configuration> <configuration>
@ -178,6 +206,17 @@
</transformer> </transformer>
<transformer /> <transformer />
</transformers> </transformers>
<filters>
<filter>
<artifact>*:*</artifact>
<excludes>
<exclude>META-INF/*.SF</exclude>
<exclude>META-INF/*.DSA</exclude>
<exclude>META-INF/*.RSA</exclude>
<exclude>test/resources/**</exclude>
</excludes>
</filter>
</filters>
</configuration> </configuration>
</execution> </execution>
</executions> </executions>
@ -214,7 +253,7 @@
<goal>copy-dependencies</goal> <goal>copy-dependencies</goal>
</goals> </goals>
<configuration> <configuration>
<outputDirectory>${project.build.directory}/tempDependencies</outputDirectory> <outputDirectory>C:\Users\dg50\source\repos\PAMGuardPAMGuard\target/tempDependencies</outputDirectory>
<overWriteReleases>false</overWriteReleases> <overWriteReleases>false</overWriteReleases>
<overWriteSnapshots>false</overWriteSnapshots> <overWriteSnapshots>false</overWriteSnapshots>
<overWriteIfNewer>true</overWriteIfNewer> <overWriteIfNewer>true</overWriteIfNewer>
@ -222,6 +261,87 @@
</execution> </execution>
</executions> </executions>
</plugin> </plugin>
<plugin>
<groupId>de.perdian.maven.plugins</groupId>
<artifactId>macosappbundler-maven-plugin</artifactId>
<version>1.21.1</version>
<executions>
<execution>
<phase>deploy</phase>
<goals>
<goal>bundle</goal>
</goals>
<configuration>
<plist>
<JVMMainClassName>pamguard.Pamguard</JVMMainClassName>
<CFBundleIconFile>src/Resources/PamguardIcon2.icns</CFBundleIconFile>
<CFBundleDisplayName>PAMGuard</CFBundleDisplayName>
<CFBundleDevelopmentRegion>English</CFBundleDevelopmentRegion>
<CFBundleURLTypes>
<string>msa</string>
</CFBundleURLTypes>
<JVMVersion>21+</JVMVersion>
<JVMArguments>
<string>-c</string>
</JVMArguments>
<NSAppSleepDisabled>true</NSAppSleepDisabled>
</plist>
<dmg>
<generate>true</generate>
<additionalResources>
<additionalResource>
<directory>C:\Users\dg50\source\repos\PAMGuardPAMGuard/target/bundle/</directory>
</additionalResource>
</additionalResources>
<dmgFileName>Pamguard-2.02.15</dmgFileName>
<appendVersion>false</appendVersion>
</dmg>
<jdk>
<include>false</include>
<location>/Library/Java/JavaVirtualMachines/amazon-corretto-21.jdk</location>
</jdk>
<codesign>
<enable>false</enable>
<identity>3rd Party Mac Developer Application: Jamie Macaulay (7365S9DZ34)</identity>
</codesign>
</configuration>
</execution>
</executions>
<configuration>
<plist>
<JVMMainClassName>pamguard.Pamguard</JVMMainClassName>
<CFBundleIconFile>src/Resources/PamguardIcon2.icns</CFBundleIconFile>
<CFBundleDisplayName>PAMGuard</CFBundleDisplayName>
<CFBundleDevelopmentRegion>English</CFBundleDevelopmentRegion>
<CFBundleURLTypes>
<string>msa</string>
</CFBundleURLTypes>
<JVMVersion>21+</JVMVersion>
<JVMArguments>
<string>-c</string>
</JVMArguments>
<NSAppSleepDisabled>true</NSAppSleepDisabled>
</plist>
<dmg>
<generate>true</generate>
<additionalResources>
<additionalResource>
<directory>C:\Users\dg50\source\repos\PAMGuardPAMGuard/target/bundle/</directory>
</additionalResource>
</additionalResources>
<dmgFileName>Pamguard-2.02.15</dmgFileName>
<appendVersion>false</appendVersion>
</dmg>
<jdk>
<include>false</include>
<location>/Library/Java/JavaVirtualMachines/amazon-corretto-21.jdk</location>
</jdk>
<codesign>
<enable>false</enable>
<identity>3rd Party Mac Developer Application: Jamie Macaulay (7365S9DZ34)</identity>
</codesign>
</configuration>
</plugin>
</plugins> </plugins>
</build> </build>
</profile> </profile>
@ -250,19 +370,25 @@
<name>bedatadriven public repo</name> <name>bedatadriven public repo</name>
<url>https://nexus.bedatadriven.com/content/groups/public/</url> <url>https://nexus.bedatadriven.com/content/groups/public/</url>
</repository> </repository>
<repository>
<snapshots>
<enabled>false</enabled>
</snapshots>
<id>talan</id>
<name>talan</name>
<url>https://nexus.talanlabs.com/content/repositories/releases/</url>
</repository>
<repository> <repository>
<id>central</id> <id>central</id>
<url>https://repo1.maven.org/maven2</url> <url>https://repo1.maven.org/maven2</url>
</repository> </repository>
</repositories> </repositories>
<dependencies>
<dependency>
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter</artifactId>
<version>5.11.3</version>
<scope>test</scope>
<exclusions>
<exclusion>
<artifactId>junit-jupiter-params</artifactId>
<groupId>org.junit.jupiter</groupId>
</exclusion>
</exclusions>
</dependency>
</dependencies>
<reporting> <reporting>
<plugins> <plugins>
<plugin> <plugin>
@ -272,6 +398,17 @@
</plugin> </plugin>
</plugins> </plugins>
</reporting> </reporting>
<dependencyManagement>
<dependencies>
<dependency>
<groupId>org.junit</groupId>
<artifactId>junit-bom</artifactId>
<version>5.11.3</version>
<type>pom</type>
<scope>import</scope>
</dependency>
</dependencies>
</dependencyManagement>
<properties> <properties>
<maven.compiler.source>11</maven.compiler.source> <maven.compiler.source>11</maven.compiler.source>
<mockito.version>1.10.19</mockito.version> <mockito.version>1.10.19</mockito.version>

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.14b</version> <version>2.02.15</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>
@ -494,13 +494,6 @@
<groupId>io.github.macster110</groupId> <groupId>io.github.macster110</groupId>
<artifactId>jpamutils</artifactId> <artifactId>jpamutils</artifactId>
<version>0.0.59e</version> <version>0.0.59e</version>
<exclusions>
<exclusion>
<!-- com.github.psambit9791:wavfile:jar:0.1 pulls in various junit dependencies which breaks our own testing -->
<groupId>org.junit.platform</groupId>
<artifactId>junit-platform-surefire-provider</artifactId>
</exclusion>
</exclusions>
</dependency> </dependency>
<!--jpam project - Deep learning java library --> <!--jpam project - Deep learning java library -->

View File

@ -31,7 +31,7 @@ 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.14a"; static public final String version = "2.02.15";
/** /**
* Release date * Release date

View File

@ -884,8 +884,6 @@ public class PamCalendar {
*/ */
public static void setSessionStartTime(long sessionStartTime) { public static void setSessionStartTime(long sessionStartTime) {
setSessionStartTime(sessionStartTime, 0); setSessionStartTime(sessionStartTime, 0);
// PamCalendar.sessionStartTime = sessionStartTime;
// PamController.getInstance().updateMasterClock(getTimeInMillis());
} }
/** /**

View File

@ -172,13 +172,13 @@ public class PamGui extends PamView implements WindowListener, PamSettings {
frame.setDefaultCloseOperation(WindowConstants.DO_NOTHING_ON_CLOSE); frame.setDefaultCloseOperation(WindowConstants.DO_NOTHING_ON_CLOSE);
String iconLoc; String iconLoc = PamIcon.getPAMGuardIconPath(PamIcon.LARGE);
switch (PamController.getInstance().getRunMode()){ // switch (PamController.getInstance().getRunMode()){
case(PamController.RUN_NETWORKRECEIVER):iconLoc=PamIcon.getPAMGuardIconPath(PamIcon.NORMAL);break; // case(PamController.RUN_NETWORKRECEIVER):iconLoc=PamIcon.getPAMGuardIconPath(PamIcon.NORMAL);break;
case(PamController.RUN_PAMVIEW):iconLoc=PamIcon.getPAMGuardIconPath(PamIcon.NORMAL);break; // case(PamController.RUN_PAMVIEW):iconLoc=PamIcon.getPAMGuardIconPath(PamIcon.NORMAL);break;
case(PamController.RUN_MIXEDMODE):iconLoc=PamIcon.getPAMGuardIconPath(PamIcon.NORMAL);break; // case(PamController.RUN_MIXEDMODE):iconLoc=PamIcon.getPAMGuardIconPath(PamIcon.NORMAL);break;
default:iconLoc=PamIcon.getPAMGuardIconPath(PamIcon.NORMAL); // default:iconLoc=PamIcon.getPAMGuardIconPath(PamIcon.LARGE);
} // }
frame.setIconImage(new ImageIcon(ClassLoader frame.setIconImage(new ImageIcon(ClassLoader
.getSystemResource(iconLoc)).getImage()); .getSystemResource(iconLoc)).getImage());

View File

@ -27,7 +27,8 @@ public class PamIcon {
//the default is windows. Icon automatically resize on Windows. //the default is windows. Icon automatically resize on Windows.
// Even on Windows, use a / slash. A \\ doesn't work (OK in debugger, not in built version) // Even on Windows, use a / slash. A \\ doesn't work (OK in debugger, not in built version)
String path = "Resources/pamguardIcon.png"; // String path = "Resources/pamguardIcon.png";
String path = "Resources/PAMGuardIcon2Opaque.png";
if (System.getProperty("os.name").equals("Linux") || System.getProperty("os.name").startsWith("Mac")) { if (System.getProperty("os.name").equals("Linux") || System.getProperty("os.name").startsWith("Mac")) {
switch (sizeFlag) { switch (sizeFlag) {
@ -42,6 +43,16 @@ public class PamIcon {
break; break;
} }
} }
else {
switch (sizeFlag) {
case SMALL:
path = "Resources/PAMGuardIcon2small.png";
break;
case NORMAL:
path = "Resources/PAMGuardIcon2medium.png";
break;
}
}
return path; return path;

View File

@ -140,8 +140,7 @@ abstract public class PamDialog extends JDialog {
// System.out.println("Get icon: " + ClassLoader // System.out.println("Get icon: " + ClassLoader
// .getSystemResource(PamIcon.getPAMGuardIconPath(PamIcon.SMALL))); // .getSystemResource(PamIcon.getPAMGuardIconPath(PamIcon.SMALL)));
setIconImage(new ImageIcon(ClassLoader setIconImage(PamIcon.getPAMGuardImageIcon(PamIcon.SMALL).getImage());
.getSystemResource("Resources/pamguardIcon.png")).getImage());
setDefaultCloseOperation(DO_NOTHING_ON_CLOSE); setDefaultCloseOperation(DO_NOTHING_ON_CLOSE);

View File

@ -15,6 +15,7 @@ import javax.swing.JLabel;
import javax.swing.JPanel; import javax.swing.JPanel;
import javax.swing.border.EmptyBorder; import javax.swing.border.EmptyBorder;
import PamView.PamIcon;
import PamView.dialog.PamDialog; import PamView.dialog.PamDialog;
import PamView.dialog.PamGridBagContraints; import PamView.dialog.PamGridBagContraints;
@ -63,7 +64,7 @@ public class WarnOnceDialog extends PamDialog {
JPanel p = new JPanel(new GridBagLayout()); JPanel p = new JPanel(new GridBagLayout());
p.setBorder(new EmptyBorder(10, 10, 0, 10)); p.setBorder(new EmptyBorder(10, 10, 0, 10));
GridBagConstraints c = new PamGridBagContraints(); GridBagConstraints c = new PamGridBagContraints();
ImageIcon pgIcon = new ImageIcon(ClassLoader.getSystemResource("Resources/pamguardIcon.png")); ImageIcon pgIcon = new ImageIcon(PamIcon.getPAMGuardIconPath(PamIcon.SMALL));
p.add(new JLabel(pgIcon), c); p.add(new JLabel(pgIcon), c);
c.gridx++; c.gridx++;
p.add(new JLabel(" "), c); p.add(new JLabel(" "), c);

Binary file not shown.

After

Width:  |  Height:  |  Size: 84 KiB

View File

@ -2,6 +2,7 @@ package pamViewFX.fxNodes.pamDialogFX;
import java.util.Optional; import java.util.Optional;
import PamView.PamIcon;
import dataPlotsFX.FXIconLoder; import dataPlotsFX.FXIconLoder;
import javafx.event.ActionEvent; import javafx.event.ActionEvent;
import javafx.geometry.Point2D; import javafx.geometry.Point2D;
@ -104,7 +105,7 @@ public abstract class PamDialogFX<T> extends Dialog<T> {
*/ */
private void setDefaultIcon() { private void setDefaultIcon() {
try { try {
Image icon = FXIconLoder.createImage("Resources/pamguardIcon.png"); Image icon = FXIconLoder.createImage(PamIcon.getPAMGuardIconPath(PamIcon.SMALL));
Stage stage = (Stage) this.getDialogPane().getScene().getWindow(); Stage stage = (Stage) this.getDialogPane().getScene().getWindow();
stage.getIcons().add(icon); stage.getIcons().add(icon);
} }