From cd89c65d7c32338ea445ae4eec5bd31e5bc3d59a Mon Sep 17 00:00:00 2001
From: Douglas Gillespie <50671166+douggillespie@users.noreply.github.com>
Date: Tue, 13 Sep 2022 09:07:11 +0100
Subject: [PATCH 1/6] Fix synchronization problem in RawDataTransfroms
---
src/PamguardMVC/RawDataTransforms.java | 162 +++++++++++++------------
1 file changed, 87 insertions(+), 75 deletions(-)
diff --git a/src/PamguardMVC/RawDataTransforms.java b/src/PamguardMVC/RawDataTransforms.java
index 6008aa5f..98ffd01b 100644
--- a/src/PamguardMVC/RawDataTransforms.java
+++ b/src/PamguardMVC/RawDataTransforms.java
@@ -188,29 +188,31 @@ public class RawDataTransforms {
* @param fftLength
* @return Power spectrum
*/
- public synchronized double[] getPowerSpectrum(int channel, int fftLength) {
- if (powerSpectra == null) {
- powerSpectra = new double[PamUtils.getNumChannels(dataUnit.getChannelBitmap())][];
- }
- if (fftLength == 0) {
- fftLength = getCurrentSpectrumLength();
- }
-
- if (powerSpectra[channel] == null
- || powerSpectra[channel].length != fftLength / 2) {
- ComplexArray cData = getComplexSpectrumHann(channel, fftLength);
- currentSpecLen = fftLength;
- powerSpectra[channel] = cData.magsq();
- if (powerSpectra==null){
- System.err.println("DLDetection: could not calculate power spectra");
- return null;
-
+ public double[] getPowerSpectrum(int channel, int fftLength) {
+ synchronized (synchObject) {
+ if (powerSpectra == null) {
+ powerSpectra = new double[PamUtils.getNumChannels(dataUnit.getChannelBitmap())][];
}
- if (powerSpectra[channel].length != fftLength/2) {
- powerSpectra[channel] = Arrays.copyOf(powerSpectra[channel], fftLength/2);
+ if (fftLength == 0) {
+ fftLength = getCurrentSpectrumLength();
}
+
+ if (powerSpectra[channel] == null
+ || powerSpectra[channel].length != fftLength / 2) {
+ ComplexArray cData = getComplexSpectrumHann(channel, fftLength);
+ currentSpecLen = fftLength;
+ powerSpectra[channel] = cData.magsq();
+ if (powerSpectra==null){
+ System.err.println("DLDetection: could not calculate power spectra");
+ return null;
+
+ }
+ if (powerSpectra[channel].length != fftLength/2) {
+ powerSpectra[channel] = Arrays.copyOf(powerSpectra[channel], fftLength/2);
+ }
+ }
+ return powerSpectra[channel];
}
- return powerSpectra[channel];
}
@@ -220,25 +222,27 @@ public class RawDataTransforms {
* @param fftLength
* @return Sum of power spectra
*/
- public synchronized double[] getTotalPowerSpectrum(int fftLength) {
- if (fftLength == 0) {
- fftLength = getCurrentSpectrumLength();
- }
- if (fftLength == 0) {
- fftLength = PamUtils.getMinFftLength(getSampleDuration());
- }
- double[] ps;
- if (totalPowerSpectrum == null
- || totalPowerSpectrum.length != fftLength / 2) {
- totalPowerSpectrum = new double[fftLength / 2];
- for (int c = 0; c < PamUtils.getNumChannels(this.dataUnit.getChannelBitmap()); c++) {
- ps = getPowerSpectrum(c, fftLength);
- for (int i = 0; i < fftLength / 2; i++) {
- totalPowerSpectrum[i] += ps[i];
+ public double[] getTotalPowerSpectrum(int fftLength) {
+ synchronized (synchObject) {
+ if (fftLength == 0) {
+ fftLength = getCurrentSpectrumLength();
+ }
+ if (fftLength == 0) {
+ fftLength = PamUtils.getMinFftLength(getSampleDuration());
+ }
+ double[] ps;
+ if (totalPowerSpectrum == null
+ || totalPowerSpectrum.length != fftLength / 2) {
+ totalPowerSpectrum = new double[fftLength / 2];
+ for (int c = 0; c < PamUtils.getNumChannels(this.dataUnit.getChannelBitmap()); c++) {
+ ps = getPowerSpectrum(c, fftLength);
+ for (int i = 0; i < fftLength / 2; i++) {
+ totalPowerSpectrum[i] += ps[i];
+ }
}
}
+ return totalPowerSpectrum;
}
- return totalPowerSpectrum;
}
@@ -253,15 +257,17 @@ public class RawDataTransforms {
* @param fftLength - the FFT length to use.
* @return the complex spectrum - the comnplex spectrum of the wave data from the specified channel.
*/
- public synchronized ComplexArray getComplexSpectrumHann(int channel, int fftLength) {
- complexSpectrum = new ComplexArray[PamUtils.getNumChannels(dataUnit.getChannelBitmap())];
- if (complexSpectrum[channel] == null
- || complexSpectrum.length != fftLength / 2) {
+ public ComplexArray getComplexSpectrumHann(int channel, int fftLength) {
+ synchronized (synchObject) {
+ complexSpectrum = new ComplexArray[PamUtils.getNumChannels(dataUnit.getChannelBitmap())];
+ if (complexSpectrum[channel] == null
+ || complexSpectrum.length != fftLength / 2) {
- complexSpectrum[channel] = getComplexSpectrumHann(rawData.getWaveData()[channel], fftLength);
- currentSpecLen = fftLength;
+ complexSpectrum[channel] = getComplexSpectrumHann(rawData.getWaveData()[channel], fftLength);
+ currentSpecLen = fftLength;
+ }
+ return complexSpectrum[channel];
}
- return complexSpectrum[channel];
}
@@ -389,29 +395,31 @@ public class RawDataTransforms {
* @param fftLength
* @return the complex spectrum
*/
- public synchronized ComplexArray getComplexSpectrum(int channel, int fftLength) {
- double[] paddedRawData;
- double[] rawData;
- int i, mn;
+ public ComplexArray getComplexSpectrum(int channel, int fftLength) {
+ synchronized (synchObject) {
+ double[] paddedRawData;
+ double[] rawData;
+ int i, mn;
- if (complexSpectrum == null) {
- complexSpectrum = new ComplexArray[getNChan()];
- }
- if (complexSpectrum[channel] == null
- || complexSpectrum.length != fftLength / 2) {
- paddedRawData = new double[fftLength];
- rawData = getWaveData(channel);
- //double[] rotData = getRotationCorrection(channel);
- mn = Math.min(fftLength, getSampleDuration().intValue());
- for (i = 0; i < mn; i++) {
- paddedRawData[i] = rawData[i];//-rotData[i];
+ if (complexSpectrum == null) {
+ complexSpectrum = new ComplexArray[getNChan()];
}
- for (i = mn; i < fftLength; i++) {
- paddedRawData[i] = 0;
+ if (complexSpectrum[channel] == null
+ || complexSpectrum.length != fftLength / 2) {
+ paddedRawData = new double[fftLength];
+ rawData = getWaveData(channel);
+ //double[] rotData = getRotationCorrection(channel);
+ mn = Math.min(fftLength, getSampleDuration().intValue());
+ for (i = 0; i < mn; i++) {
+ paddedRawData[i] = rawData[i];//-rotData[i];
+ }
+ for (i = mn; i < fftLength; i++) {
+ paddedRawData[i] = 0;
+ }
+ complexSpectrum[channel] = fastFFT.rfft(paddedRawData, fftLength);
}
- complexSpectrum[channel] = fastFFT.rfft(paddedRawData, fftLength);
+ return complexSpectrum[channel];
}
- return complexSpectrum[channel];
}
@@ -420,14 +428,16 @@ public class RawDataTransforms {
* @param iChan channel index
* @return analytic waveform
*/
- public synchronized double[] getAnalyticWaveform(int iChan) {
- if (analyticWaveform == null) {
- analyticWaveform = new double[getNChan()][];
+ public double[] getAnalyticWaveform(int iChan) {
+ synchronized (synchObject) {
+ if (analyticWaveform == null) {
+ analyticWaveform = new double[getNChan()][];
+ }
+ // if (analyticWaveform[iChan] == null) {
+ analyticWaveform[iChan] = hilbert.getHilbert(getWaveData(iChan));
+ // }
+ return analyticWaveform[iChan];
}
- // if (analyticWaveform[iChan] == null) {
- analyticWaveform[iChan] = hilbert.getHilbert(getWaveData(iChan));
- // }
- return analyticWaveform[iChan];
}
/**
@@ -439,12 +449,14 @@ public class RawDataTransforms {
* @param fftFilterParams fft filter parameters.
* @return analystic waveform.
*/
- public synchronized double[] getAnalyticWaveform(int iChan, boolean filtered, FFTFilterParams fftFilterParams) {
- if (filtered == false || fftFilterParams == null) {
- return getAnalyticWaveform(iChan);
- }
- else {
- return getFilteredAnalyticWaveform(fftFilterParams, iChan);
+ public double[] getAnalyticWaveform(int iChan, boolean filtered, FFTFilterParams fftFilterParams) {
+ synchronized (synchObject) {
+ if (filtered == false || fftFilterParams == null) {
+ return getAnalyticWaveform(iChan);
+ }
+ else {
+ return getFilteredAnalyticWaveform(fftFilterParams, iChan);
+ }
}
}
From ae6e2f947b886810a5ebf35f8b2e2e6e9cd822cc Mon Sep 17 00:00:00 2001
From: Douglas Gillespie <50671166+douggillespie@users.noreply.github.com>
Date: Tue, 13 Sep 2022 09:12:34 +0100
Subject: [PATCH 2/6] Merge Dougs fork (#53)
* Variable sound output level
Mods to SoundPlayback module to allow additional parameters. Implemented
system for NI cards to allow changes to selected output voltage range
meaning output can be boosted to level higher than current default.
* Code to support nogui operations when no screens present on headless
system
* Fix problem of nogui headless operation trying to access screen size.
* Click detector display fixes
1. ICI not displaying correctly
2. Component sizes in display dialog on hres monitors
* Work on batch processing, after testing of options to autostart,
autoexit and set wav file folder, database and binary store.
* Update MHTClickTrainAlgorithm.java
Fix unsynchronised access to a datablock in click train detector which was causing index errors.
* Revamp of offline process messaging and control
Includes some databsae logging of completed tasks
* Offline task logging
Bit more work, including notes and database storage of task
reprocessing. Guess this could all become 'proper' PAMGuard data and be
shown in a table on the display but that not priority enough.
* Dialog packing
Fix a couple of dialogs which don't back well on HDPI monitors
* UDP Control
Added multiport functionality
* Java version
Changes unpacker to deal with non numeric characters on Linux
* Fix to getVersion()
So new version of this command should now work on Linux and Windows.
* Multiport test
Quick tester for multiport comms
* Spectrogram display
Stop spectrogram display continually recreating panels since it was
unsubscribing discarded ones and sometimes causing crash in observable
notifications.
* Backup manager bug
Error if no database. Fixed.
* Daylight saving problem
Fix daylight saving problem in generation of timestamps in SQLTypes. See long explanation in SQLTypes.java. Only occurred in the hour after daylight saving starts.
---
src/PamUtils/PamCalendar.java | 3 ++-
src/generalDatabase/SQLTypes.java | 23 +++++++++++++++++++++--
src/pamguard/Pamguard.java | 3 +++
3 files changed, 26 insertions(+), 3 deletions(-)
diff --git a/src/PamUtils/PamCalendar.java b/src/PamUtils/PamCalendar.java
index 8a43bb74..3ce2eebc 100644
--- a/src/PamUtils/PamCalendar.java
+++ b/src/PamUtils/PamCalendar.java
@@ -83,7 +83,8 @@ public class PamCalendar {
* viewPositions which is the number of milliseconds from the sessionsStartTime.
*/
private static long viewPosition;
-
+
+
/**
* If files are being analysed, return the time based on the file
* position. Otherwise just take the normal system time.
diff --git a/src/generalDatabase/SQLTypes.java b/src/generalDatabase/SQLTypes.java
index b8746472..a81edd89 100644
--- a/src/generalDatabase/SQLTypes.java
+++ b/src/generalDatabase/SQLTypes.java
@@ -337,11 +337,30 @@ public class SQLTypes {
* @return Appropriate object (Generally TimeStamp, but SWLite uses Long)
*/
public Object getTimeStamp(Long timeMillis) {
+ /**
+ * This has just got nasty WRT time zones.
+ * When the TimeStamp is written to database it uses the default time zone correction, which of course
+ * I don't want since I only do UTC. I was therefore subtracting this off before creating the ts
+ * so that it all worked fine when it was added back on again.
+ * This was fine for many years until someone processed data from exactly when the clocks went
+ * forward in the spring. Because the data were just after the clocks going forward, it took off
+ * an hour, then failed to add it back on again since the time was now before daylight saving.
+ * Amazed this has never happened before. Well done G and E ! I can fix it by setting the
+ * default time zone to UTC when PAMGuard starts, but note that all future references to local time
+ * will then be UTC. If I try to change it temporarily it doesn't help since the Timestamp always
+ * goes to the default, so it needs to be on UTC at the moment data are written to the database, not
+ * just in this function.
+ */
if (timeMillis == null) {
return null;
}
- TimeZone tz = TimeZone.getDefault();
- return new Timestamp(timeMillis - tz.getOffset(timeMillis));
+// TimeZone tz = TimeZone.getDefault();
+// TimeZone.setDefault(PamCalendar.defaultTimeZone);
+// Timestamp ts = new Timestamp(timeMillis - tz.getOffset(timeMillis));
+ Timestamp ts = new Timestamp(timeMillis);
+// TimeZone.setDefault(tz);
+// Timestamp newTS = ts.toLocalDateTime();
+ return ts;
}
/**
diff --git a/src/pamguard/Pamguard.java b/src/pamguard/Pamguard.java
index c955192a..d5825b26 100644
--- a/src/pamguard/Pamguard.java
+++ b/src/pamguard/Pamguard.java
@@ -33,6 +33,7 @@ import PamController.pamBuoyGlobals;
import PamController.command.TerminalController;
import PamModel.SMRUEnable;
import PamUtils.FileFunctions;
+import PamUtils.PamCalendar;
import PamUtils.PamExceptionHandler;
import PamUtils.PlatformInfo;
import PamUtils.Splash;
@@ -134,6 +135,8 @@ public class Pamguard {
Thread folderSizeThread = new Thread(folderSizeMon);
folderSizeThread.start();
+ TimeZone.setDefault(PamCalendar.defaultTimeZone);
+
System.out.println("**********************************************************");
try {
// get the java runnable file name.
From b01cb4d10020aba4b46ba17c6e16fa02c6350e46 Mon Sep 17 00:00:00 2001
From: Douglas Gillespie <50671166+douggillespie@users.noreply.github.com>
Date: Tue, 13 Sep 2022 11:19:31 +0100
Subject: [PATCH 3/6] Fix bug in 3DOffline task
Problems with making catalogue of offline tasks. not important for now,
but needs revisiting.
---
pom.xml | 2 +-
src/PamController/PamguardVersionInfo.java | 4 ++--
src/group3dlocaliser/offline/Group3DOfflineTask.java | 3 +++
3 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/pom.xml b/pom.xml
index f68a2585..2f583f7f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
4.0.0
org.pamguard
Pamguard
- 2.02.04f
+ 2.02.04aa
Pamguard Java12+
Pamguard for Java 12+, using Maven to control dependcies
www.pamguard.org
diff --git a/src/PamController/PamguardVersionInfo.java b/src/PamController/PamguardVersionInfo.java
index 47e3a7c3..7c93b681 100644
--- a/src/PamController/PamguardVersionInfo.java
+++ b/src/PamController/PamguardVersionInfo.java
@@ -31,12 +31,12 @@ public class PamguardVersionInfo {
* Version number, major version.minorversion.sub-release.
* Note: can't go higher than sub-release 'f'
*/
- static public final String version = "2.02.04a";
+ static public final String version = "2.02.04aa";
/**
* Release date
*/
- static public final String date = "23 June 2022";
+ static public final String date = "13 September 2022";
// /**
// * Release type - Beta or Core
diff --git a/src/group3dlocaliser/offline/Group3DOfflineTask.java b/src/group3dlocaliser/offline/Group3DOfflineTask.java
index 11268ca0..0a9a8e94 100644
--- a/src/group3dlocaliser/offline/Group3DOfflineTask.java
+++ b/src/group3dlocaliser/offline/Group3DOfflineTask.java
@@ -30,6 +30,9 @@ public class Group3DOfflineTask extends OfflineTask{
@Override
public String getName() {
+ if (group3DControl == null) {
+ return null;
+ }
return group3DControl.getUnitName();
}
From bad3f79903083b71c8c4abfa5114d152a1989176 Mon Sep 17 00:00:00 2001
From: Jamie Mac
Date: Wed, 14 Sep 2022 11:32:31 +0100
Subject: [PATCH 4/6] Added help file for matched click classifier (#52)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
* Updates to click train detector
New GUI for click train classification - more intuitive and allows users to build more powerful classifiers.
CPOD data can now build average waveforms.
CPOD click trains can be viewed in TDisplayFX pop up menu displays
Fixed Peak Frequency symbol chooser so it saves the colour box settings
* Create click_train_help.md
* Update click_train_help.md
* Screenshots
* Update click_train_help.md
* Update click_train_help.md
* Update click_train_help.md
* More screenshots
* Add screenshots
* Update click_train_help.md
* Add classifier screenshot
* Update click_train_help.md
* Update click_train_help.md
* Update click_train_help.md
* Updates and bug fixes to click train detector and CPOD importer
* Update click_train_help.md
* Update POM with latest jdl4pam
* Add screenshots for click train detector help
* Screenshots
* Update click_train_help.md
* Defult option for CPOD and porpoise to click train detector.
Also a minor
* Update pom.xml
* Bug fix for raw spectrogram in TDDisplayFX
* Update KetosClassifier.java
* Updates to click train detector
New GUI for click train classification - more intuitive and allows users to build more powerful classifiers.
CPOD data can now build average waveforms.
CPOD click trains can be viewed in TDisplayFX pop up menu displays
Fixed Peak Frequency symbol chooser so it saves the colour box settings
* Create click_train_help.md
* Update click_train_help.md
* Screenshots
* Update click_train_help.md
* More screenshots
* Update click_train_help.md
* Update click_train_help.md
* Add screenshots
* Add classifier screenshot
* Update click_train_help.md
* Updates and bug fixes to click train detector and CPOD importer
* Update click_train_help.md
* Update click_train_help.md
* Update click_train_help.md
* Update click_train_help.md
* Add screenshots for click train detector help
* Screenshots
* Update click_train_help.md
* Defult option for CPOD and porpoise to click train detector.
Also a minor
* Bug fix for raw spectrogram in TDDisplayFX
* Update KetosClassifier.java
* Fix standard classifier JSON logging
* Update click_train_help.md
* Fixed bug in sweep classifier when using SoundTrap click detections
* Added some colour averaging in the TFDisplayFX spectrgoram
* Bug fix for rainbow click bearings
Bug fix when rainbow clicks are imported mean bearings cannot be calculated - was an array size issue in DelayGroup
* Google humpback whale deep learning classifier
Google's humpback whale deep learning classifier can now be imported.
Updated TDisplayFX to make the data selection panes cleaner and clearer.
Updated the TDisplayFX so that predicitons from deep learning models now have some display options e.g. changing colour.
* Updated the prediction plots on time display
Deep learning prediciton plots on the time display have now been updated to have some colour options and also act as a legend.
* Updates to TDisplayFX
yFIshmael now owrks with TDisplayFX
TDisplayFX UI changes to make simpler.
Some abstraction for drawing lines on TDisplayFX
* Updates to click train detector
New GUI for click train classification - more intuitive and allows users to build more powerful classifiers.
CPOD data can now build average waveforms.
CPOD click trains can be viewed in TDisplayFX pop up menu displays
Fixed Peak Frequency symbol chooser so it saves the colour box settings
* Create click_train_help.md
* Update click_train_help.md
* Screenshots
* Update click_train_help.md
* More screenshots
* Update click_train_help.md
* Update click_train_help.md
* Add screenshots
* Add classifier screenshot
* Update click_train_help.md
* Updates and bug fixes to click train detector and CPOD importer
* Update click_train_help.md
* Update click_train_help.md
* Update click_train_help.md
* Update click_train_help.md
* Add screenshots for click train detector help
* Screenshots
* Update click_train_help.md
* Defult option for CPOD and porpoise to click train detector.
Also a minor
* Updates to click train detector
New GUI for click train classification - more intuitive and allows users to build more powerful classifiers.
CPOD data can now build average waveforms.
CPOD click trains can be viewed in TDisplayFX pop up menu displays
Fixed Peak Frequency symbol chooser so it saves the colour box settings
* Create click_train_help.md
* Update click_train_help.md
* Update click_train_help.md
* Updates and bug fixes to click train detector and CPOD importer
* Bug fix for raw spectrogram in TDDisplayFX
* Update KetosClassifier.java
* Fix standard classifier JSON logging
* Fixed bug in sweep classifier when using SoundTrap click detections
* Added some colour averaging in the TFDisplayFX spectrgoram
* Bug fix for rainbow click bearings
Bug fix when rainbow clicks are imported mean bearings cannot be calculated - was an array size issue in DelayGroup
* Google humpback whale deep learning classifier
Google's humpback whale deep learning classifier can now be imported.
Updated TDisplayFX to make the data selection panes cleaner and clearer.
Updated the TDisplayFX so that predicitons from deep learning models now have some display options e.g. changing colour.
* Updated the prediction plots on time display
Deep learning prediciton plots on the time display have now been updated to have some colour options and also act as a legend.
* Updates to TDisplayFX
yFIshmael now owrks with TDisplayFX
TDisplayFX UI changes to make simpler.
Some abstraction for drawing lines on TDisplayFX
* Merge fixes to click train detector
* Bug fix to UI
* Updates to FX GUI
* Updates to click train detector
New GUI for click train classification - more intuitive and allows users to build more powerful classifiers.
CPOD data can now build average waveforms.
CPOD click trains can be viewed in TDisplayFX pop up menu displays
Fixed Peak Frequency symbol chooser so it saves the colour box settings
* Screenshots
* Updates and bug fixes to click train detector and CPOD importer
* Updates to click train detector
New GUI for click train classification - more intuitive and allows users to build more powerful classifiers.
CPOD data can now build average waveforms.
CPOD click trains can be viewed in TDisplayFX pop up menu displays
Fixed Peak Frequency symbol chooser so it saves the colour box settings
* Updates and bug fixes to click train detector and CPOD importer
* Fix standard classifier JSON logging
* Merge fixes to click train detector
* Updates to click train detector
New GUI for click train classification - more intuitive and allows users to build more powerful classifiers.
CPOD data can now build average waveforms.
CPOD click trains can be viewed in TDisplayFX pop up menu displays
Fixed Peak Frequency symbol chooser so it saves the colour box settings
* Screenshots
* Updates and bug fixes to click train detector and CPOD importer
* Updates to click train detector
New GUI for click train classification - more intuitive and allows users to build more powerful classifiers.
CPOD data can now build average waveforms.
CPOD click trains can be viewed in TDisplayFX pop up menu displays
Fixed Peak Frequency symbol chooser so it saves the colour box settings
* Screenshots
* Updates and bug fixes to click train detector and CPOD importer
* Fix standard classifier JSON logging
* Google humpback whale deep learning classifier
Google's humpback whale deep learning classifier can now be imported.
Updated TDisplayFX to make the data selection panes cleaner and clearer.
Updated the TDisplayFX so that predicitons from deep learning models now have some display options e.g. changing colour.
* Bug fix to UI
* Bug fixes to FX GUI
* Updates to click train detector
* Squashed commit of the following:
commit 9f998165ee95dbb16acaf420876f3aeab75c2158
Author: Douglas Gillespie <50671166+douggillespie@users.noreply.github.com>
Date: Mon May 2 19:40:24 2022 +0100
Updates to support ContactCollator plugin (#33)
* Change synchronization on RawDataTransforms soit uses the owner data
holder, not itself for synchronization. Otherwise you get thread locks.
* fix problem in SummaryComand
* Update command line options
* Change synchronization on RawDataTransforms soit uses the owner data
holder, not itself for synchronization. Otherwise you get thread locks.
* Update command line options
* Update DecimatorParams.java
* couple of updates to support new contact collator plugin
* Sorting out sample rate info in clip display to support Contact Collator
plugin
* FLAC Speed
Improve flac speed
* Update .gitignore
* Update .gitignore
* Updates to support new features in Contact Collator
* Small update to RawDatautils to handle null data
* Updates to click train detector
* Squashed commit of the following:
commit 62b020b3204aa56189b1c2da88bcbb9f49140936
Author: Douglas Gillespie <50671166+douggillespie@users.noreply.github.com>
Date: Sat May 14 06:52:20 2022 +0100
Add a new offlinefileslist function
commit 3a9a5311aa529b66340f6ae322f88905b911947a
Author: Douglas Gillespie <50671166+douggillespie@users.noreply.github.com>
Date: Wed Apr 27 09:43:31 2022 +0100
Update .gitignore
commit 9f998165ee95dbb16acaf420876f3aeab75c2158
Author: Douglas Gillespie <50671166+douggillespie@users.noreply.github.com>
Date: Mon May 2 19:40:24 2022 +0100
Updates to support ContactCollator plugin (#33)
* Change synchronization on RawDataTransforms soit uses the owner data
holder, not itself for synchronization. Otherwise you get thread locks.
* fix problem in SummaryComand
* Update command line options
* Change synchronization on RawDataTransforms soit uses the owner data
holder, not itself for synchronization. Otherwise you get thread locks.
* Update command line options
* Update DecimatorParams.java
* couple of updates to support new contact collator plugin
* Sorting out sample rate info in clip display to support Contact Collator
plugin
* FLAC Speed
Improve flac speed
* Update .gitignore
* Update .gitignore
* Updates to support new features in Contact Collator
* Small update to RawDatautils to handle null data
* Updated data selector for click train detector
* Click train detector updates and bug fixes
Fixed very annoying bug which meant templates did not show properly when the dialog was first opened in swing.
Added feature to simple classifier were % of clicks of one click classification (or other data selector paramter) can be used to classify.
* Bug fix and improvements for Ketos
Ketos models now automatically set the correct sample length when loaded.
Bug fix for the TDisplayFX - null pointer exception if no class names loaded and sorted recently introduced bug in drawing predictions.
* Updates to deep learning and FX GUI
Added some more example sounds to deep learning UI.
Updated click detector in the FX GUI.
* PAMGuard FX sound output update
* Updates to FX GUI
* Updates to FX GUI
* Update RawDataTransforms.java
* Fixes to FX UI
* Squashed commit of the following:
commit 11ba8bf91e1cd55e4305c4060a379f9ff0c58c4d
Author: Douglas Gillespie <50671166+douggillespie@users.noreply.github.com>
Date: Thu Aug 4 11:45:47 2022 +0100
MErge from DG Branch (#47)
* Variable sound output level
Mods to SoundPlayback module to allow additional parameters. Implemented
system for NI cards to allow changes to selected output voltage range
meaning output can be boosted to level higher than current default.
* Code to support nogui operations when no screens present on headless
system
* Fix problem of nogui headless operation trying to access screen size.
* Click detector display fixes
1. ICI not displaying correctly
2. Component sizes in display dialog on hres monitors
* Work on batch processing, after testing of options to autostart,
autoexit and set wav file folder, database and binary store.
* Update MHTClickTrainAlgorithm.java
Fix unsynchronised access to a datablock in click train detector which was causing index errors.
* Revamp of offline process messaging and control
Includes some databsae logging of completed tasks
* Offline task logging
Bit more work, including notes and database storage of task
reprocessing. Guess this could all become 'proper' PAMGuard data and be
shown in a table on the display but that not priority enough.
* Dialog packing
Fix a couple of dialogs which don't back well on HDPI monitors
* UDP Control
Added multiport functionality
commit 9a9f542d95b6cbc571d60a2250a2d4accf8dc4b3
Author: Douglas Gillespie <50671166+douggillespie@users.noreply.github.com>
Date: Thu Aug 4 11:42:45 2022 +0100
Merge DG to Main (#46)
* Variable sound output level
Mods to SoundPlayback module to allow additional parameters. Implemented
system for NI cards to allow changes to selected output voltage range
meaning output can be boosted to level higher than current default.
* Code to support nogui operations when no screens present on headless
system
* Fix problem of nogui headless operation trying to access screen size.
* Click detector display fixes
1. ICI not displaying correctly
2. Component sizes in display dialog on hres monitors
* Work on batch processing, after testing of options to autostart,
autoexit and set wav file folder, database and binary store.
* Update MHTClickTrainAlgorithm.java
Fix unsynchronised access to a datablock in click train detector which was causing index errors.
* Revamp of offline process messaging and control
Includes some databsae logging of completed tasks
* Offline task logging
Bit more work, including notes and database storage of task
reprocessing. Guess this could all become 'proper' PAMGuard data and be
shown in a table on the display but that not priority enough.
* Dialog packing
Fix a couple of dialogs which don't back well on HDPI monitors
* UDP Control
Added multiport functionality
commit 49cd547aee3e4366e1aaa51b8fe7418199c2ad73
Author: Douglas Gillespie <50671166+douggillespie@users.noreply.github.com>
Date: Thu Aug 4 11:40:29 2022 +0100
Merge DG branch (#45)
* Variable sound output level
Mods to SoundPlayback module to allow additional parameters. Implemented
system for NI cards to allow changes to selected output voltage range
meaning output can be boosted to level higher than current default.
* Code to support nogui operations when no screens present on headless
system
* Fix problem of nogui headless operation trying to access screen size.
* Click detector display fixes
1. ICI not displaying correctly
2. Component sizes in display dialog on hres monitors
* Work on batch processing, after testing of options to autostart,
autoexit and set wav file folder, database and binary store.
* Update MHTClickTrainAlgorithm.java
Fix unsynchronised access to a datablock in click train detector which was causing index errors.
* Revamp of offline process messaging and control
Includes some databsae logging of completed tasks
* Offline task logging
Bit more work, including notes and database storage of task
reprocessing. Guess this could all become 'proper' PAMGuard data and be
shown in a table on the display but that not priority enough.
* Dialog packing
Fix a couple of dialogs which don't back well on HDPI monitors
* UDP Control
Added multiport functionality
commit 016cfd0da54021dcbe787f0a20856604b81bf7af
Author: Douglas Gillespie <50671166+douggillespie@users.noreply.github.com>
Date: Thu Aug 4 11:35:06 2022 +0100
Dialog positioning
New functions to better positions dialogs on screen
commit c9f2ab3e97ec289ee8c1bcfe4531c84f77ee7fa8
Author: Douglas Gillespie <50671166+douggillespie@users.noreply.github.com>
Date: Mon Aug 1 11:13:24 2022 +0100
puch to main (#44)
* Variable sound output level
Mods to SoundPlayback module to allow additional parameters. Implemented
system for NI cards to allow changes to selected output voltage range
meaning output can be boosted to level higher than current default.
* Code to support nogui operations when no screens present on headless
system
* Fix problem of nogui headless operation trying to access screen size.
* Click detector display fixes
1. ICI not displaying correctly
2. Component sizes in display dialog on hres monitors
* Work on batch processing, after testing of options to autostart,
autoexit and set wav file folder, database and binary store.
* Update MHTClickTrainAlgorithm.java
Fix unsynchronised access to a datablock in click train detector which was causing index errors.
* Revamp of offline process messaging and control
Includes some databsae logging of completed tasks
* Offline task logging
Bit more work, including notes and database storage of task
reprocessing. Guess this could all become 'proper' PAMGuard data and be
shown in a table on the display but that not priority enough.
* Dialog packing
Fix a couple of dialogs which don't back well on HDPI monitors
commit 55f5a3fcf12c6c8a727318a17f9dece401adc9f3
Author: Douglas Gillespie <50671166+douggillespie@users.noreply.github.com>
Date: Mon Aug 1 10:59:36 2022 +0100
Group detections menu
Small changes to limit the number of menu items in "Add to existing
group" to a maximum of 25 entries.
commit b3f6c0e6657de91a7e015a48f5f218f60f23c5f5
Author: Douglas Gillespie <50671166+douggillespie@users.noreply.github.com>
Date: Fri Jul 29 10:50:45 2022 +0100
Handle -nogui option in PamWorker
PamWorker used to catalog files at startup (if a file folder input
system is used). This creates a progress dialog. Stop it appearing in
-nogui operations.
commit 8569b6b579659cba8229596e91c35355bc5ed61b
Author: Douglas Gillespie <50671166+douggillespie@users.noreply.github.com>
Date: Fri Jul 22 08:30:47 2022 +0100
Click display fixes (#41)
* Variable sound output level
Mods to SoundPlayback module to allow additional parameters. Implemented
system for NI cards to allow changes to selected output voltage range
meaning output can be boosted to level higher than current default.
* Code to support nogui operations when no screens present on headless
system
* Fix problem of nogui headless operation trying to access screen size.
* Click detector display fixes
1. ICI not displaying correctly
2. Component sizes in display dialog on hres monitors
commit 128a512ff60c26b5acedd76de96c0905c6bf27ae
Author: Douglas Gillespie <50671166+douggillespie@users.noreply.github.com>
Date: Tue Jul 19 16:37:57 2022 +0100
Another attempt at stopping it crashing on a headless system
Dealing with displays that get created for clickangle vetos and a call
to the gui in the click train detector.
commit 6eaa6e4978b2483e5828ca4a3914c58d7a9cfe2d
Author: Douglas Gillespie <50671166+douggillespie@users.noreply.github.com>
Date: Tue Jul 19 08:20:07 2022 +0100
nogoi fix for headless systems. (#40)
* Variable sound output level
Mods to SoundPlayback module to allow additional parameters. Implemented
system for NI cards to allow changes to selected output voltage range
meaning output can be boosted to level higher than current default.
* Code to support nogui operations when no screens present on headless
system
* Fix problem of nogui headless operation trying to access screen size.
commit 9fdd30556bf391428e1d3f2f9e91dbbdf771fa84
Author: Douglas Gillespie <50671166+douggillespie@users.noreply.github.com>
Date: Tue Jul 12 15:53:07 2022 +0100
Variable sound output level (#39)
Mods to SoundPlayback module to allow additional parameters. Implemented
system for NI cards to allow changes to selected output voltage range
meaning output can be boosted to level higher than current default.
* Bug fixes to click train detector
Fixed bug with number of coasts in the MHT Kernel
Added an option for amplitude to have a maximum
Removed print statements.
* Bug fix for click train logging
The size of the string classifers field was dynamically set - this was a bug.
* Bug fixes to the click train detector
Bearing classifier section now updates properly when dialog reopened
Fixed rare bug when garbage bot attempts to find the last data unit in a list of zero units.
* Squashed commit of the following:
commit 5a37bfe915925ea2307dd09928538c7e639ca52c
Author: Douglas Gillespie <50671166+douggillespie@users.noreply.github.com>
Date: Fri Aug 19 08:17:06 2022 +0100
Changes from DG branch (#50)
* Variable sound output level
Mods to SoundPlayback module to allow additional parameters. Implemented
system for NI cards to allow changes to selected output voltage range
meaning output can be boosted to level higher than current default.
* Code to support nogui operations when no screens present on headless
system
* Fix problem of nogui headless operation trying to access screen size.
* Click detector display fixes
1. ICI not displaying correctly
2. Component sizes in display dialog on hres monitors
* Work on batch processing, after testing of options to autostart,
autoexit and set wav file folder, database and binary store.
* Update MHTClickTrainAlgorithm.java
Fix unsynchronised access to a datablock in click train detector which was causing index errors.
* Revamp of offline process messaging and control
Includes some databsae logging of completed tasks
* Offline task logging
Bit more work, including notes and database storage of task
reprocessing. Guess this could all become 'proper' PAMGuard data and be
shown in a table on the display but that not priority enough.
* Dialog packing
Fix a couple of dialogs which don't back well on HDPI monitors
* UDP Control
Added multiport functionality
* Java version
Changes unpacker to deal with non numeric characters on Linux
* Fix to getVersion()
So new version of this command should now work on Linux and Windows.
* Multiport test
Quick tester for multiport comms
* Spectrogram display
Stop spectrogram display continually recreating panels since it was
unsubscribing discarded ones and sometimes causing crash in observable
notifications.
* Backup manager bug
Error if no database. Fixed.
commit b08e86e330c5ca2de4b6902eb7ec514f47278a7c
Author: Jamie Mac
Date: Wed Aug 17 09:16:52 2022 +0100
Bug fix for click train detector (#49)
* Updates to click train detector
New GUI for click train classification - more intuitive and allows users to build more powerful classifiers.
CPOD data can now build average waveforms.
CPOD click trains can be viewed in TDisplayFX pop up menu displays
Fixed Peak Frequency symbol chooser so it saves the colour box settings
* Create click_train_help.md
* Update click_train_help.md
* Screenshots
* Update click_train_help.md
* Update click_train_help.md
* Update click_train_help.md
* More screenshots
* Add screenshots
* Update click_train_help.md
* Add classifier screenshot
* Update click_train_help.md
* Update click_train_help.md
* Update click_train_help.md
* Updates and bug fixes to click train detector and CPOD importer
* Update click_train_help.md
* Update POM with latest jdl4pam
* Add screenshots for click train detector help
* Screenshots
* Update click_train_help.md
* Defult option for CPOD and porpoise to click train detector.
Also a minor
* Update pom.xml
* Bug fix for raw spectrogram in TDDisplayFX
* Update KetosClassifier.java
* Updates to click train detector
New GUI for click train classification - more intuitive and allows users to build more powerful classifiers.
CPOD data can now build average waveforms.
CPOD click trains can be viewed in TDisplayFX pop up menu displays
Fixed Peak Frequency symbol chooser so it saves the colour box settings
* Create click_train_help.md
* Update click_train_help.md
* Screenshots
* Update click_train_help.md
* More screenshots
* Update click_train_help.md
* Update click_train_help.md
* Add screenshots
* Add classifier screenshot
* Update click_train_help.md
* Updates and bug fixes to click train detector and CPOD importer
* Update click_train_help.md
* Update click_train_help.md
* Update click_train_help.md
* Update click_train_help.md
* Add screenshots for click train detector help
* Screenshots
* Update click_train_help.md
* Defult option for CPOD and porpoise to click train detector.
Also a minor
* Bug fix for raw spectrogram in TDDisplayFX
* Update KetosClassifier.java
* Fix standard classifier JSON logging
* Update click_train_help.md
* Fixed bug in sweep classifier when using SoundTrap click detections
* Added some colour averaging in the TFDisplayFX spectrgoram
* Bug fix for rainbow click bearings
Bug fix when rainbow clicks are imported mean bearings cannot be calculated - was an array size issue in DelayGroup
* Google humpback whale deep learning classifier
Google's humpback whale deep learning classifier can now be imported.
Updated TDisplayFX to make the data selection panes cleaner and clearer.
Updated the TDisplayFX so that predicitons from deep learning models now have some display options e.g. changing colour.
* Updated the prediction plots on time display
Deep learning prediciton plots on the time display have now been updated to have some colour options and also act as a legend.
* Updates to TDisplayFX
yFIshmael now owrks with TDisplayFX
TDisplayFX UI changes to make simpler.
Some abstraction for drawing lines on TDisplayFX
* Updates to click train detector
New GUI for click train classification - more intuitive and allows users to build more powerful classifiers.
CPOD data can now build average waveforms.
CPOD click trains can be viewed in TDisplayFX pop up menu displays
Fixed Peak Frequency symbol chooser so it saves the colour box settings
* Create click_train_help.md
* Update click_train_help.md
* Screenshots
* Update click_train_help.md
* More screenshots
* Update click_train_help.md
* Update click_train_help.md
* Add screenshots
* Add classifier screenshot
* Update click_train_help.md
* Updates and bug fixes to click train detector and CPOD importer
* Update click_train_help.md
* Update click_train_help.md
* Update click_train_help.md
* Update click_train_help.md
* Add screenshots for click train detector help
* Screenshots
* Update click_train_help.md
* Defult option for CPOD and porpoise to click train detector.
Also a minor
* Updates to click train detector
New GUI for click train classification - more intuitive and allows users to build more powerful classifiers.
CPOD data can now build average waveforms.
CPOD click trains can be viewed in TDisplayFX pop up menu displays
Fixed Peak Frequency symbol chooser so it saves the colour box settings
* Create click_train_help.md
* Update click_train_help.md
* Update click_train_help.md
* Updates and bug fixes to click train detector and CPOD importer
* Bug fix for raw spectrogram in TDDisplayFX
* Update KetosClassifier.java
* Fix standard classifier JSON logging
* Fixed bug in sweep classifier when using SoundTrap click detections
* Added some colour averaging in the TFDisplayFX spectrgoram
* Bug fix for rainbow click bearings
Bug fix when rainbow clicks are imported mean bearings cannot be calculated - was an array size issue in DelayGroup
* Google humpback whale deep learning classifier
Google's humpback whale deep learning classifier can now be imported.
Updated TDisplayFX to make the data selection panes cleaner and clearer.
Updated the TDisplayFX so that predicitons from deep learning models now have some display options e.g. changing colour.
* Updated the prediction plots on time display
Deep learning prediciton plots on the time display have now been updated to have some colour options and also act as a legend.
* Updates to TDisplayFX
yFIshmael now owrks with TDisplayFX
TDisplayFX UI changes to make simpler.
Some abstraction for drawing lines on TDisplayFX
* Merge fixes to click train detector
* Bug fix to UI
* Updates to FX GUI
* Updates to click train detector
New GUI for click train classification - more intuitive and allows users to build more powerful classifiers.
CPOD data can now build average waveforms.
CPOD click trains can be viewed in TDisplayFX pop up menu displays
Fixed Peak Frequency symbol chooser so it saves the colour box settings
* Screenshots
* Updates and bug fixes to click train detector and CPOD importer
* Updates to click train detector
New GUI for click train classification - more intuitive and allows users to build more powerful classifiers.
CPOD data can now build average waveforms.
CPOD click trains can be viewed in TDisplayFX pop up menu displays
Fixed Peak Frequency symbol chooser so it saves the colour box settings
* Updates and bug fixes to click train detector and CPOD importer
* Fix standard classifier JSON logging
* Merge fixes to click train detector
* Updates to click train detector
New GUI for click train classification - more intuitive and allows users to build more powerful classifiers.
CPOD data can now build average waveforms.
CPOD click trains can be viewed in TDisplayFX pop up menu displays
Fixed Peak Frequency symbol chooser so it saves the colour box settings
* Screenshots
* Updates and bug fixes to click train detector and CPOD importer
* Updates to click train detector
New GUI for click train classification - more intuitive and allows users to build more powerful classifiers.
CPOD data can now build average waveforms.
CPOD click trains can be viewed in TDisplayFX pop up menu displays
Fixed Peak Frequency symbol chooser so it saves the colour box settings
* Screenshots
* Updates and bug fixes to click train detector and CPOD importer
* Fix standard classifier JSON logging
* Google humpback whale deep learning classifier
Google's humpback whale deep learning classifier can now be imported.
Updated TDisplayFX to make the data selection panes cleaner and clearer.
Updated the TDisplayFX so that predicitons from deep learning models now have some display options e.g. changing colour.
* Bug fix to UI
* Bug fixes to FX GUI
* Updates to click train detector
* Squashed commit of the following:
commit 9f998165ee95dbb16acaf420876f3aeab75c2158
Author: Douglas Gillespie <50671166+douggillespie@users.noreply.github.com>
Date: Mon May 2 19:40:24 2022 +0100
Updates to support ContactCollator plugin (#33)
* Change synchronization on RawDataTransforms soit uses the owner data
holder, not itself for synchronization. Otherwise you get thread locks.
* fix problem in SummaryComand
* Update command line options
* Change synchronization on RawDataTransforms soit uses the owner data
holder, not itself for synchronization. Otherwise you get thread locks.
* Update command line options
* Update DecimatorParams.java
* couple of updates to support new contact collator plugin
* Sorting out sample rate info in clip display to support Contact Collator
plugin
* FLAC Speed
Improve flac speed
* Update .gitignore
* Update .gitignore
* Updates to support new features in Contact Collator
* Small update to RawDatautils to handle null data
* Updates to click train detector
* Squashed commit of the following:
commit 62b020b3204aa56189b1c2da88bcbb9f49140936
Author: Douglas Gillespie <50671166+douggillespie@users.noreply.github.com>
Date: Sat May 14 06:52:20 2022 +0100
Add a new offlinefileslist function
commit 3a9a5311aa529b66340f6ae322f88905b911947a
Author: Douglas Gillespie <50671166+douggillespie@users.noreply.github.com>
Date: Wed Apr 27 09:43:31 2022 +0100
Update .gitignore
commit 9f998165ee95dbb16acaf420876f3aeab75c2158
Author: Douglas Gillespie <50671166+douggillespie@users.noreply.github.com>
Date: Mon May 2 19:40:24 2022 +0100
Updates to support ContactCollator plugin (#33)
* Change synchronization on RawDataTransforms soit uses the owner data
holder, not itself for synchronization. Otherwise you get thread locks.
* fix problem in SummaryComand
* Update command line options
* Change synchronization on RawDataTransforms soit uses the owner data
holder, not itself for synchronization. Otherwise you get thread locks.
* Update command line options
* Update DecimatorParams.java
* couple of updates to support new contact collator plugin
* Sorting out sample rate info in clip display to support Contact Collator
plugin
* FLAC Speed
Improve flac speed
* Update .gitignore
* Update .gitignore
* Updates to support new features in Contact Collator
* Small update to RawDatautils to handle null data
* Updated data selector for click train detector
* Click train detector updates and bug fixes
Fixed very annoying bug which meant templates did not show properly when the dialog was first opened in swing.
Added feature to simple classifier were % of clicks of one click classification (or other data selector paramter) can be used to classify.
* Bug fix and improvements for Ketos
Ketos models now automatically set the correct sample length when loaded.
Bug fix for the TDisplayFX - null pointer exception if no class names loaded and sorted recently introduced bug in drawing predictions.
* Updates to deep learning and FX GUI
Added some more example sounds to deep learning UI.
Updated click detector in the FX GUI.
* PAMGuard FX sound output update
* Updates to FX GUI
* Updates to FX GUI
* Update RawDataTransforms.java
* Fixes to FX UI
* Squashed commit of the following:
commit 11ba8bf91e1cd55e4305c4060a379f9ff0c58c4d
Author: Douglas Gillespie <50671166+douggillespie@users.noreply.github.com>
Date: Thu Aug 4 11:45:47 2022 +0100
MErge from DG Branch (#47)
* Variable sound output level
Mods to SoundPlayback module to allow additional parameters. Implemented
system for NI cards to allow changes to selected output voltage range
meaning output can be boosted to level higher than current default.
* Code to support nogui operations when no screens present on headless
system
* Fix problem of nogui headless operation trying to access screen size.
* Click detector display fixes
1. ICI not displaying correctly
2. Component sizes in display dialog on hres monitors
* Work on batch processing, after testing of options to autostart,
autoexit and set wav file folder, database and binary store.
* Update MHTClickTrainAlgorithm.java
Fix unsynchronised access to a datablock in click train detector which was causing index errors.
* Revamp of offline process messaging and control
Includes some databsae logging of completed tasks
* Offline task logging
Bit more work, including notes and database storage of task
reprocessing. Guess this could all become 'proper' PAMGuard data and be
shown in a table on the display but that not priority enough.
* Dialog packing
Fix a couple of dialogs which don't back well on HDPI monitors
* UDP Control
Added multiport functionality
commit 9a9f542d95b6cbc571d60a2250a2d4accf8dc4b3
Author: Douglas Gillespie <50671166+douggillespie@users.noreply.github.com>
Date: Thu Aug 4 11:42:45 2022 +0100
Merge DG to Main (#46)
* Variable sound output level
Mods to SoundPlayback module to allow additional parameters. Implemented
system for NI cards to allow changes to selected output voltage range
meaning output can be boosted to level higher than current default.
* Code to support nogui operations when no screens present on headless
system
* Fix problem of nogui headless operation trying to access screen size.
* Click detector display fixes
1. ICI not displaying correctly
2. Component sizes in display dialog on hres monitors
* Work on batch processing, after testing of options to autostart,
autoexit and set wav file folder, database and binary store.
* Update MHTClickTrainAlgorithm.java
Fix unsynchronised access to a datablock in click train detector which was causing index errors.
* Revamp of offline process messaging and control
Includes some databsae logging of completed tasks
* Offline task logging
Bit more work, including notes and database storage of task
reprocessing. Guess this could all become 'proper' PAMGuard data and be
shown in a table on the display but that not priority enough.
* Dialog packing
Fix a couple of dialogs which don't back well on HDPI monitors
* UDP Control
Added multiport functionality
commit 49cd547aee3e4366e1aaa51b8fe7418199c2ad73
Author: Douglas Gillespie <50671166+douggillespie@users.noreply.github.com>
Date: Thu Aug 4 11:40:29 2022 +0100
Merge DG branch (#45)
* Variable sound output level
Mods to SoundPlayback module to allow additional parameters. Implemented
system for NI cards to allow changes to selected output voltage range
meaning output can be boosted to level higher than current default.
* Code to support nogui operations when no screens present on headless
system
* Fix problem of nogui headless operation trying to access screen size.
* Click detector display fixes
1. ICI not displaying correctly
2. Component sizes in display dialog on hres monitors
* Work on batch processing, after testing of options to autostart,
autoexit and set wav file folder, database and binary store.
* Update MHTClickTrainAlgorithm.java
Fix unsynchronised access to a datablock in click train detector which was causing index errors.
* Revamp of offline process messaging and control
Includes some databsae logging of completed tasks
* Offline task logging
Bit more work, including notes and database storage of task
reprocessing. Guess this could all become 'proper' PAMGuard data and be
shown in a table on the display but that not priority enough.
* Dialog packing
Fix a couple of dialogs which don't back well on HDPI monitors
* UDP Control
Added multiport functionality
commit 016cfd0da54021dcbe787f0a20856604b81bf7af
Author: Douglas Gillespie <50671166+douggillespie@users.noreply.github.com>
Date: Thu Aug 4 11:35:06 2022 +0100
Dialog positioning
New functions to better positions dialogs on screen
commit c9f2ab3e97ec289ee8c1bcfe4531c84f77ee7fa8
Author: Douglas Gillespie <50671166+douggillespie@users.noreply.github.com>
Date: Mon Aug 1 11:13:24 2022 +0100
puch to main (#44)
* Variable sound output level
Mods to SoundPlayback module to allow additional parameters. Implemented
system for NI cards to allow changes to selected output voltage range
meaning output can be boosted to level higher than current default.
* Code to support nogui operations when no screens present on headless
system
* Fix problem of nogui headless operation trying to access screen size.
* Click detector display fixes
1. ICI not displaying correctly
2. Component sizes in display dialog on hres monitors
* Work on batch processing, after testing of options to autostart,
autoexit and set wav file folder, database and binary store.
* Update MHTClickTrainAlgorithm.java
Fix unsynchronised access to a datablock in click train detector which was causing index errors.
* Revamp of offline process messaging and control
Includes some databsae logging of completed tasks
* Offline task logging
Bit more work, including notes and database storage of task
reprocessing. Guess this could all become 'proper' PAMGuard data and be
shown in a table on the display but that not priority enough.
* Dialog packing
Fix a couple of dialogs which don't back well on HDPI monitors
commit 55f5a3fcf12c6c8a727318a17f9dece401adc9f3
Author: Douglas Gillespie <50671166+douggillespie@users.noreply.github.com>
Date: Mon Aug 1 10:59:36 2022 +0100
Group detections menu
Small changes to limit the number of menu items in "Add to existing
group" to a maximum of 25 entries.
commit b3f6c0e6657de91a7e015a48f5f218f60f23c5f5
Author: Douglas Gillespie <50671166+douggillespie@users.noreply.github.com>
Date: Fri Jul 29 10:50:45 2022 +0100
Handle -nogui option in PamWorker
PamWorker used to catalog files at startup (if a file folder input
system is used). This creates a progress dialog. Stop it appearing in
-nogui operations.
commit 8569b6b579659cba8229596e91c35355bc5ed61b
Author: Douglas Gillespie <50671166+douggillespie@users.noreply.github.com>
Date: Fri Jul 22 08:30:47 2022 +0100
Click display fixes (#41)
* Variable sound output level
Mods to SoundPlayback module to allow additional parameters. Implemented
system for NI cards to allow changes to selected output voltage range
meaning output can be boosted to level higher than current default.
* Code to support nogui operations when no screens present on headless
system
* Fix problem of nogui headless operation trying to access screen size.
* Click detector display fixes
1. ICI not displaying correctly
2. Component sizes in display dialog on hres monitors
commit 128a512ff60c26b5acedd76de96c0905c6bf27ae
Author: Douglas Gillespie <50671166+douggillespie@users.noreply.github.com>
Date: Tue Jul 19 16:37:57 2022 +0100
Another attempt at stopping it crashing on a headless system
Dealing with displays that get created for clickangle vetos and a call
to the gui in the click train detector.
commit 6eaa6e4978b2483e5828ca4a3914c58d7a9cfe2d
Author: Douglas Gillespie <50671166+douggillespie@users.noreply.github.com>
Date: Tue Jul 19 08:20:07 2022 +0100
nogoi fix for headless systems. (#40)
* Variable sound output level
Mods to SoundPlayback module to allow additional parameters. Implemented
system for NI cards to allow changes to selected output voltage range
meaning output can be boosted to level higher than current default.
* Code to support nogui operations when no screens present on headless
system
* Fix problem of nogui headless operation trying to access screen size.
commit 9fdd30556bf391428e1d3f2f9e91dbbdf771fa84
Author: Douglas Gillespie <50671166+douggillespie@users.noreply.github.com>
Date: Tue Jul 12 15:53:07 2022 +0100
Variable sound output level (#39)
Mods to SoundPlayback module to allow additional parameters. Implemented
system for NI cards to allow changes to selected output voltage range
meaning output can be boosted to level higher than current default.
* Bug fixes to click train detector
Fixed bug with number of coasts in the MHT Kernel
Added an option for amplitude to have a maximum
Removed print statements.
* Bug fix for click train logging
The size of the string classifers field was dynamically set - this was a bug.
Co-authored-by: Douglas Gillespie <50671166+douggillespie@users.noreply.github.com>
commit ef0330173b5a9683fb79c9cb027b207a768ae30c
Author: Jamie Mac
Date: Mon Aug 8 10:32:19 2022 +0100
Click trian detector fixes (#48)
* Updates to click train detector
New GUI for click train classification - more intuitive and allows users to build more powerful classifiers.
CPOD data can now build average waveforms.
CPOD click trains can be viewed in TDisplayFX pop up menu displays
Fixed Peak Frequency symbol chooser so it saves the colour box settings
* Create click_train_help.md
* Update click_train_help.md
* Screenshots
* Update click_train_help.md
* Update click_train_help.md
* Update click_train_help.md
* More screenshots
* Add screenshots
* Update click_train_help.md
* Add classifier screenshot
* Update click_train_help.md
* Update click_train_help.md
* Update click_train_help.md
* Updates and bug fixes to click train detector and CPOD importer
* Update click_train_help.md
* Update POM with latest jdl4pam
* Add screenshots for click train detector help
* Screenshots
* Update click_train_help.md
* Defult option for CPOD and porpoise to click train detector.
Also a minor
* Update pom.xml
* Bug fix for raw spectrogram in TDDisplayFX
* Update KetosClassifier.java
* Updates to click train detector
New GUI for click train classification - more intuitive and allows users to build more powerful classifiers.
CPOD data can now build average waveforms.
CPOD click trains can be viewed in TDisplayFX pop up menu displays
Fixed Peak Frequency symbol chooser so it saves the colour box settings
* Create click_train_help.md
* Update click_train_help.md
* Screenshots
* Update click_train_help.md
* More screenshots
* Update click_train_help.md
* Update click_train_help.md
* Add screenshots
* Add classifier screenshot
* Update click_train_help.md
* Updates and bug fixes to click train detector and CPOD importer
* Update click_train_help.md
* Update click_train_help.md
* Update click_train_help.md
* Update click_train_help.md
* Add screenshots for click train detector help
* Screenshots
* Update click_train_help.md
* Defult option for CPOD and porpoise to click train detector.
Also a minor
* Bug fix for raw spectrogram in TDDisplayFX
* Update KetosClassifier.java
* Fix standard classifier JSON logging
* Update click_train_help.md
* Fixed bug in sweep classifier when using SoundTrap click detections
* Added some colour averaging in the TFDisplayFX spectrgoram
* Bug fix for rainbow click bearings
Bug fix when rainbow clicks are imported mean bearings cannot be calculated - was an array size issue in DelayGroup
* Google humpback whale deep learning classifier
Google's humpback whale deep learning classifier can now be imported.
Updated TDisplayFX to make the data selection panes cleaner and clearer.
Updated the TDisplayFX so that predicitons from deep learning models now have some display options e.g. changing colour.
* Updated the prediction plots on time display
Deep learning prediciton plots on the time display have now been updated to have some colour options and also act as a legend.
* Updates to TDisplayFX
yFIshmael now owrks with TDisplayFX
TDisplayFX UI changes to make simpler.
Some abstraction for drawing lines on TDisplayFX
* Updates to click train detector
New GUI for click train classification - more intuitive and allows users to build more powerful classifiers.
CPOD data can now build average waveforms.
CPOD click trains can be viewed in TDisplayFX pop up menu displays
Fixed Peak Frequency symbol chooser so it saves the colour box settings
* Create click_train_help.md
* Update click_train_help.md
* Screenshots
* Update click_train_help.md
* More screenshots
* Update click_train_help.md
* Update click_train_help.md
* Add screenshots
* Add classifier screenshot
* Update click_train_help.md
* Updates and bug fixes to click train detector and CPOD importer
* Update click_train_help.md
* Update click_train_help.md
* Update click_train_help.md
* Update click_train_help.md
* Add screenshots for click train detector help
* Screenshots
* Update click_train_help.md
* Defult option for CPOD and porpoise to click train detector.
Also a minor
* Updates to click train detector
New GUI for click train classification - more intuitive and allows users to build more powerful classifiers.
CPOD data can now build average waveforms.
CPOD click trains can be viewed in TDisplayFX pop up menu displays
Fixed Peak Frequency symbol chooser so it saves the colour box settings
* Create click_train_help.md
* Update click_train_help.md
* Update click_train_help.md
* Updates and bug fixes to click train detector and CPOD importer
* Bug fix for raw spectrogram in TDDisplayFX
* Update KetosClassifier.java
* Fix standard classifier JSON logging
* Fixed bug in sweep classifier when using SoundTrap click detections
* Added some colour averaging in the TFDisplayFX spectrgoram
* Bug fix for rainbow click bearings
Bug fix when rainbow clicks are imported mean bearings cannot be calculated - was an array size issue in DelayGroup
* Google humpback whale deep learning classifier
Google's humpback whale deep learning classifier can now be imported.
Updated TDisplayFX to make the data selection panes cleaner and clearer.
Updated the TDisplayFX so that predicitons from deep learning models now have some display options e.g. changing colour.
* Updated the prediction plots on time display
Deep learning prediciton plots on the time display have now been updated to have some colour options and also act as a legend.
* Updates to TDisplayFX
yFIshmael now owrks with TDisplayFX
TDisplayFX UI changes to make simpler.
Some abstraction for drawing lines on TDisplayFX
* Merge fixes to click train detector
* Bug fix to UI
* Updates to FX GUI
* Updates to click train detector
New GUI for click train classification - more intuitive and allows users to build more powerful classifiers.
CPOD data can now build average waveforms.
CPOD click trains can be viewed in TDisplayFX pop up menu displays
Fixed Peak Frequency symbol chooser so it saves the colour box settings
* Screenshots
* Updates and bug fixes to click train detector and CPOD importer
* Updates to click train detector
New GUI for click train classification - more intuitive and allows users to build more powerful classifiers.
CPOD data can now build average waveforms.
CPOD click trains can be viewed in TDisplayFX pop up menu displays
Fixed Peak Frequency symbol chooser so it saves the colour box settings
* Updates and bug fixes to click train detector and CPOD importer
* Fix standard classifier JSON logging
* Merge fixes to click train detector
* Updates to click train detector
New GUI for click train classification - more intuitive and allows users to build more powerful classifiers.
CPOD data can now build average waveforms.
CPOD click trains can be viewed in TDisplayFX pop up menu displays
Fixed Peak Frequency symbol chooser so it saves the colour box settings
* Screenshots
* Updates and bug fixes to click train detector and CPOD importer
* Updates to click train detector
New GUI for click train classification - more intuitive and allows users to build more powerful classifiers.
CPOD data can now build average waveforms.
CPOD click trains can be viewed in TDisplayFX pop up menu displays
Fixed Peak Frequency symbol chooser so it saves the colour box settings
* Screenshots
* Updates and bug fixes to click train detector and CPOD importer
* Fix standard classifier JSON logging
* Google humpback whale deep learning classifier
Google's humpback whale deep learning classifier can now be imported.
Updated TDisplayFX to make the data selection panes cleaner and clearer.
Updated the TDisplayFX so that predicitons from deep learning models now have some display options e.g. changing colour.
* Bug fix to UI
* Bug fixes to FX GUI
* Updates to click train detector
* Squashed commit of the following:
commit 9f998165ee95dbb16acaf420876f3aeab75c2158
Author: Douglas Gillespie <50671166+douggillespie@users.noreply.github.com>
Date: Mon May 2 19:40:24 2022 +0100
Updates to support ContactCollator plugin (#33)
* Change synchronization on RawDataTransforms soit uses the owner data
holder, not itself for synchronization. Otherwise you get thread locks.
* fix problem in SummaryComand
* Update command line options
* Change synchronization on RawDataTransforms soit uses the owner data
holder, not itself for synchronization. Otherwise you get thread locks.
* Update command line options
* Update DecimatorParams.java
* couple of updates to support new contact collator plugin
* Sorting out sample rate info in clip display to support Contact Collator
plugin
* FLAC Speed
Improve flac speed
* Update .gitignore
* Update .gitignore
* Updates to support new features in Contact Collator
* Small update to RawDatautils to handle null data
* Updates to click train detector
* Squashed commit of the following:
commit 62b020b3204aa56189b1c2da88bcbb9f49140936
Author: Douglas Gillespie <50671166+douggillespie@users.noreply.github.com>
Date: Sat May 14 06:52:20 2022 +0100
Add a new offlinefileslist function
commit 3a9a5311aa529b66340f6ae322f88905b911947a
Author: Douglas Gillespie <50671166+douggillespie@users.noreply.github.com>
Date: Wed Apr 27 09:43:31 2022 +0100
Update .gitignore
commit 9f998165ee95dbb16acaf420876f3aeab75c2158
Author: Douglas Gillespie <50671166+douggillespie@users.noreply.github.com>
Date: Mon May 2 19:40:24 2022 +0100
Updates to support ContactCollator plugin (#33)
* Change synchronization on RawDataTransforms soit uses the owner data
holder, not itself for synchronization. Otherwise you get thread locks.
* fix problem in SummaryComand
* Update command line options
* Change synchronization on RawDataTransforms soit uses the owner data
holder, not itself for synchronization. Otherwise you get thread locks.
* Update command line options
* Update DecimatorParams.java
* couple of updates to support new contact collator plugin
* Sorting out sample rate info in clip display to support Contact Collator
plugin
* FLAC Speed
Improve flac speed
* Update .gitignore
* Update .gitignore
* Updates to support new features in Contact Collator
* Small update to RawDatautils to handle null data
* Updated data selector for click train detector
* Click train detector updates and bug fixes
Fixed very annoying bug which meant templates did not show properly when the dialog was first opened in swing.
Added feature to simple classifier were % of clicks of one click classification (or other data selector paramter) can be used to classify.
* Bug fix and improvements for Ketos
Ketos models now automatically set the correct sample length when loaded.
Bug fix for the TDisplayFX - null pointer exception if no class names loaded and sorted recently introduced bug in drawing predictions.
* Updates to deep learning and FX GUI
Added some more example sounds to deep learning UI.
Updated click detector in the FX GUI.
* PAMGuard FX sound output update
* Updates to FX GUI
* Updates to FX GUI
* Update RawDataTransforms.java
* Fixes to FX UI
* Squashed commit of the following:
commit 11ba8bf91e1cd55e4305c4060a379f9ff0c58c4d
Author: Douglas Gillespie <50671166+douggillespie@users.noreply.github.com>
Date: Thu Aug 4 11:45:47 2022 +0100
MErge from DG Branch (#47)
* Variable sound output level
Mods to SoundPlayback module to allow additional parameters. Implemented
system for NI cards to allow changes to selected output voltage range
meaning output can be boosted to level higher than current default.
* Code to support nogui operations when no screens present on headless
system
* Fix problem of nogui headless operation trying to access screen size.
* Click detector display fixes
1. ICI not displaying correctly
2. Component sizes in display dialog on hres monitors
* Work on batch processing, after testing of options to autostart,
autoexit and set wav file folder, database and binary store.
* Update MHTClickTrainAlgorithm.java
Fix unsynchronised access to a datablock in click train detector which was causing index errors.
* Revamp of offline process messaging and control
Includes some databsae logging of completed tasks
* Offline task logging
Bit more work, including notes and database storage of task
reprocessing. Guess this could all become 'proper' PAMGuard data and be
shown in a table on the display but that not priority enough.
* Dialog packing
Fix a couple of dialogs which don't back well on HDPI monitors
* UDP Control
Added multiport functionality
commit 9a9f542d95b6cbc571d60a2250a2d4accf8dc4b3
Author: Douglas Gillespie <50671166+douggillespie@users.noreply.github.com>
Date: Thu Aug 4 11:42:45 2022 +0100
Merge DG to Main (#46)
* Variable sound output level
Mods to SoundPlayback module to allow additional parameters. Implemented
system for NI cards to allow changes to selected output voltage range
meaning output can be boosted to level higher than current default.
* Code to support nogui operations when no screens present on headless
system
* Fix problem of nogui headless operation trying to access screen size.
* Click detector display fixes
1. ICI not displaying correctly
2. Component sizes in display dialog on hres monitors
* Work on batch processing, after testing of options to autostart,
autoexit and set wav file folder, database and binary store.
* Update MHTClickTrainAlgorithm.java
Fix unsynchronised access to a datablock in click train detector which was causing index errors.
* Revamp of offline process messaging and control
Includes some databsae logging of completed tasks
* Offline task logging
Bit more work, including notes and database storage of task
reprocessing. Guess this could all become 'proper' PAMGuard data and be
shown in a table on the display but that not priority enough.
* Dialog packing
Fix a couple of dialogs which don't back well on HDPI monitors
* UDP Control
Added multiport functionality
commit 49cd547aee3e4366e1aaa51b8fe7418199c2ad73
Author: Douglas Gillespie <50671166+douggillespie@users.noreply.github.com>
Date: Thu Aug 4 11:40:29 2022 +0100
Merge DG branch (#45)
* Variable sound output level
Mods to SoundPlayback module to allow additional parameters. Implemented
system for NI cards to allow changes to selected output voltage range
meaning output can be boosted to level higher than current default.
* Code to support nogui operations when no screens present on headless
system
* Fix problem of nogui headless operation trying to access screen size.
* Click detector display fixes
1. ICI not displaying correctly
2. Component sizes in display dialog on hres monitors
* Work on batch processing, after testing of options to autostart,
autoexit and set wav file folder, database and binary store.
* Update MHTClickTrainAlgorithm.java
Fix unsynchronised access to a datablock in click train detector which was causing index errors.
* Revamp of offline process messaging and control
Includes some databsae logging of completed tasks
* Offline task logging
Bit more work, including notes and database storage of task
reprocessing. Guess this could all become 'proper' PAMGuard data and be
shown in a table on the display but that not priority enough.
* Dialog packing
Fix a couple of dialogs which don't back well on HDPI monitors
* UDP Control
Added multiport functionality
commit 016cfd0da54021dcbe787f0a20856604b81bf7af
Author: Douglas Gillespie <50671166+douggillespie@users.noreply.github.com>
Date: Thu Aug 4 11:35:06 2022 +0100
Dialog positioning
New functions to better positions dialogs on screen
commit c9f2ab3e97ec289ee8c1bcfe4531c84f77ee7fa8
Author: Douglas Gillespie <50671166+douggillespie@users.noreply.github.com>
Date: Mon Aug 1 11:13:24 2022 +0100
puch to main (#44)
* Variable sound output level
Mods to SoundPlayback module to allow additional parameters. Implemented
system for NI cards to allow changes to selected output voltage range
meaning output can be boosted to level higher than current default.
* Code to support nogui operations when no screens present on headless
system
* Fix problem of nogui headless operation trying to access screen size.
* Click detector display fixes
1. ICI not displaying correctly
2. Component sizes in display dialog on hres monitors
* Work on batch processing, after testing of options to autostart,
autoexit and set wav file folder, database and binary store.
* Update MHTClickTrainAlgorithm.java
Fix unsynchronised access to a datablock in click train detector which was causing index errors.
* Revamp of offline process messaging and control
Includes some databsae logging of completed tasks
* Offline task logging
Bit more work, including notes and database storage of task
reprocessing. Guess this could all become 'proper' PAMGuard data and be
shown in a table on the display but that not priority enough.
* Dialog packing
Fix a couple of dialogs which don't back well on HDPI monitors
commit 55f5a3fcf12c6c8a727318a17f9dece401adc9f3
Author: Douglas Gillespie <50671166+douggillespie@users.noreply.github.com>
Date: Mon Aug 1 10:59:36 2022 +0100
Group detections menu
Small changes to limit the number of menu items in "Add to existing
group" to a maximum of 25 entries.
commit b3f6c0e6657de91a7e015a48f5f218f60f23c5f5
Author: Douglas Gillespie <50671166+douggillespie@users.noreply.github.com>
Date: Fri Jul 29 10:50:45 2022 +0100
Handle -nogui option in PamWorker
PamWorker used to catalog files at startup (if a file folder input
system is used). This creates a progress dialog. Stop it appearing in
-nogui operations.
commit 8569b6b579659cba8229596e91c35355bc5ed61b
Author: Douglas Gillespie <50671166+douggillespie@users.noreply.github.com>
Date: Fri Jul 22 08:30:47 2022 +0100
Click display fixes (#41)
* Variable sound output level
Mods to SoundPlayback module to allow additional parameters. Implemented
system for NI cards to allow changes to selected output voltage range
meaning output can be boosted to level higher than current default.
* Code to support nogui operations when no screens present on headless
system
* Fix problem of nogui headless operation trying to access screen size.
* Click detector display fixes
1. ICI not displaying correctly
2. Component sizes in display dialog on hres monitors
commit 128a512ff60c26b5acedd76de96c0905c6bf27ae
Author: Douglas Gillespie <50671166+douggillespie@users.noreply.github.com>
Date: Tue Jul 19 16:37:57 2022 +0100
Another attempt at stopping it crashing on a headless system
Dealing with displays that get created for clickangle vetos and a call
to the gui in the click train detector.
commit 6eaa6e4978b2483e5828ca4a3914c58d7a9cfe2d
Author: Douglas Gillespie <50671166+douggillespie@users.noreply.github.com>
Date: Tue Jul 19 08:20:07 2022 +0100
nogoi fix for headless systems. (#40)
* Variable sound output level
Mods to SoundPlayback module to allow additional parameters. Implemented
system for NI cards to allow changes to selected output voltage range
meaning output can be boosted to level higher than current default.
* Code to support nogui operations when no screens present on headless
system
* Fix problem of nogui headless operation trying to access screen size.
commit 9fdd30556bf391428e1d3f2f9e91dbbdf771fa84
Author: Douglas Gillespie <50671166+douggillespie@users.noreply.github.com>
Date: Tue Jul 12 15:53:07 2022 +0100
Variable sound output level (#39)
Mods to SoundPlayback module to allow additional parameters. Implemented
system for NI cards to allow changes to selected output voltage range
meaning output can be boosted to level higher than current default.
* Bug fixes to click train detector
Fixed bug with number of coasts in the MHT Kernel
Added an option for amplitude to have a maximum
Removed print statements.
Co-authored-by: Douglas Gillespie <50671166+douggillespie@users.noreply.github.com>
* Update DLModelWorker.java
* Create matched_click_classifer_help.md
* Update help files for matched click classifier
* Update matched_click_classifer_help.md
* Update matched_click_classifer_help.md
* New screenshots got help files
* New screenshot
* Update matched_click_classifer_help.md
New help file for the matched click classified.
* Update matched_click_classifer_help.md
* Squashed commit of the following:
commit 6b15b3d536f2334aa9769e10c268659a254e19c8
Author: Douglas Gillespie <50671166+douggillespie@users.noreply.github.com>
Date: Tue Aug 23 15:21:28 2022 +0100
Change min java version to 11 which should be ok on some embedded
systems.
commit 4b3a37636b2081323c39dcbb133c1474ad2a9daa
Author: Douglas Gillespie <50671166+douggillespie@users.noreply.github.com>
Date: Tue Aug 23 14:30:46 2022 +0100
CTD Fixes
Couple more fixes to menus and datablock selection
commit c641c58e4f524f0c8beb3967c9fec8b34c412121
Author: Jamie Mac
Date: Tue Aug 23 14:19:28 2022 +0100
Bug fixes to click train detector (#51)
* Updates to click train detector
New GUI for click train classification - more intuitive and allows users to build more powerful classifiers.
CPOD data can now build average waveforms.
CPOD click trains can be viewed in TDisplayFX pop up menu displays
Fixed Peak Frequency symbol chooser so it saves the colour box settings
* Create click_train_help.md
* Update click_train_help.md
* Screenshots
* Update click_train_help.md
* Update click_train_help.md
* Update click_train_help.md
* More screenshots
* Add screenshots
* Update click_train_help.md
* Add classifier screenshot
* Update click_train_help.md
* Update click_train_help.md
* Update click_train_help.md
* Updates and bug fixes to click train detector and CPOD importer
* Update click_train_help.md
* Update POM with latest jdl4pam
* Add screenshots for click train detector help
* Screenshots
* Update click_train_help.md
* Defult option for CPOD and porpoise to click train detector.
Also a minor
* Update pom.xml
* Bug fix for raw spectrogram in TDDisplayFX
* Update KetosClassifier.java
* Updates to click train detector
New GUI for click train classification - more intuitive and allows users to build more powerful classifiers.
CPOD data can now build average waveforms.
CPOD click trains can be viewed in TDisplayFX pop up menu displays
Fixed Peak Frequency symbol chooser so it saves the colour box settings
* Create click_train_help.md
* Update click_train_help.md
* Screenshots
* Update click_train_help.md
* More screenshots
* Update click_train_help.md
* Update click_train_help.md
* Add screenshots
* Add classifier screenshot
* Update click_train_help.md
* Updates and bug fixes to click train detector and CPOD importer
* Update click_train_help.md
* Update click_train_help.md
* Update click_train_help.md
* Update click_train_help.md
* Add screenshots for click train detector help
* Screenshots
* Update click_train_help.md
* Defult option for CPOD and porpoise to click train detector.
Also a minor
* Bug fix for raw spectrogram in TDDisplayFX
* Update KetosClassifier.java
* Fix standard classifier JSON logging
* Update click_train_help.md
* Fixed bug in sweep classifier when using SoundTrap click detections
* Added some colour averaging in the TFDisplayFX spectrgoram
* Bug fix for rainbow click bearings
Bug fix when rainbow clicks are imported mean bearings cannot be calculated - was an array size issue in DelayGroup
* Google humpback whale deep learning classifier
Google's humpback whale deep learning classifier can now be imported.
Updated TDisplayFX to make the data selection panes cleaner and clearer.
Updated the TDisplayFX so that predicitons from deep learning models now have some display options e.g. changing colour.
* Updated the prediction plots on time display
Deep learning prediciton plots on the time display have now been updated to have some colour options and also act as a legend.
* Updates to TDisplayFX
yFIshmael now owrks with TDisplayFX
TDisplayFX UI changes to make simpler.
Some abstraction for drawing lines on TDisplayFX
* Updates to click train detector
New GUI for click train classification - more intuitive and allows users to build more powerful classifiers.
CPOD data can now build average waveforms.
CPOD click trains can be viewed in TDisplayFX pop up menu displays
Fixed Peak Frequency symbol chooser so it saves the colour box settings
* Create click_train_help.md
* Update click_train_help.md
* Screenshots
* Update click_train_help.md
* More screenshots
* Update click_train_help.md
* Update click_train_help.md
* Add screenshots
* Add classifier screenshot
* Update click_train_help.md
* Updates and bug fixes to click train detector and CPOD importer
* Update click_train_help.md
* Update click_train_help.md
* Update click_train_help.md
* Update click_train_help.md
* Add screenshots for click train detector help
* Screenshots
* Update click_train_help.md
* Defult option for CPOD and porpoise to click train detector.
Also a minor
* Updates to click train detector
New GUI for click train classification - more intuitive and allows users to build more powerful classifiers.
CPOD data can now build average waveforms.
CPOD click trains can be viewed in TDisplayFX pop up menu displays
Fixed Peak Frequency symbol chooser so it saves the colour box settings
* Create click_train_help.md
* Update click_train_help.md
* Update click_train_help.md
* Updates and bug fixes to click train detector and CPOD importer
* Bug fix for raw spectrogram in TDDisplayFX
* Update KetosClassifier.java
* Fix standard classifier JSON logging
* Fixed bug in sweep classifier when using SoundTrap click detections
* Added some colour averaging in the TFDisplayFX spectrgoram
* Bug fix for rainbow click bearings
Bug fix when rainbow clicks are imported mean bearings cannot be calculated - was an array size issue in DelayGroup
* Google humpback whale deep learning classifier
Google's humpback whale deep learning classifier can now be imported.
Updated TDisplayFX to make the data selection panes cleaner and clearer.
Updated the TDisplayFX so that predicitons from deep learning models now have some display options e.g. changing colour.
* Updated the prediction plots on time display
Deep learning prediciton plots on the time display have now been updated to have some colour options and also act as a legend.
* Updates to TDisplayFX
yFIshmael now owrks with TDisplayFX
TDisplayFX UI changes to make simpler.
Some abstraction for drawing lines on TDisplayFX
* Merge fixes to click train detector
* Bug fix to UI
* Updates to FX GUI
* Updates to click train detector
New GUI for click train classification - more intuitive and allows users to build more powerful classifiers.
CPOD data can now build average waveforms.
CPOD click trains can be viewed in TDisplayFX pop up menu displays
Fixed Peak Frequency symbol chooser so it saves the colour box settings
* Screenshots
* Updates and bug fixes to click train detector and CPOD importer
* Updates to click train detector
New GUI for click train classification - more intuitive and allows users to build more powerful classifiers.
CPOD data can now build average waveforms.
CPOD click trains can be viewed in TDisplayFX pop up menu displays
Fixed Peak Frequency symbol chooser so it saves the colour box settings
* Updates and bug fixes to click train detector and CPOD importer
* Fix standard classifier JSON logging
* Merge fixes to click train detector
* Updates to click train detector
New GUI for click train classification - more intuitive and allows users to build more powerful classifiers.
CPOD data can now build average waveforms.
CPOD click trains can be viewed in TDisplayFX pop up menu displays
Fixed Peak Frequency symbol chooser so it saves the colour box settings
* Screenshots
* Updates and bug fixes to click train detector and CPOD importer
* Updates to click train detector
New GUI for click train classification - more intuitive and allows users to build more powerful classifiers.
CPOD data can now build average waveforms.
CPOD click trains can be viewed in TDisplayFX pop up menu displays
Fixed Peak Frequency symbol chooser so it saves the colour box settings
* Screenshots
* Updates and bug fixes to click train detector and CPOD importer
* Fix standard classifier JSON logging
* Google humpback whale deep learning classifier
Google's humpback whale deep learning classifier can now be imported.
Updated TDisplayFX to make the data selection panes cleaner and clearer.
Updated the TDisplayFX so that predicitons from deep learning models now have some display options e.g. changing colour.
* Bug fix to UI
* Bug fixes to FX GUI
* Updates to click train detector
* Squashed commit of the following:
commit 9f998165ee95dbb16acaf420876f3aeab75c2158
Author: Douglas Gillespie <50671166+douggillespie@users.noreply.github.com>
Date: Mon May 2 19:40:24 2022 +0100
Updates to support ContactCollator plugin (#33)
* Change synchronization on RawDataTransforms soit uses the owner data
holder, not itself for synchronization. Otherwise you get thread locks.
* fix problem in SummaryComand
* Update command line options
* Change synchronization on RawDataTransforms soit uses the owner data
holder, not itself for synchronization. Otherwise you get thread locks.
* Update command line options
* Update DecimatorParams.java
* couple of updates to support new contact collator plugin
* Sorting out sample rate info in clip display to support Contact Collator
plugin
* FLAC Speed
Improve flac speed
* Update .gitignore
* Update .gitignore
* Updates to support new features in Contact Collator
* Small update to RawDatautils to handle null data
* Updates to click train detector
* Squashed commit of the following:
commit 62b020b3204aa56189b1c2da88bcbb9f49140936
Author: Douglas Gillespie <50671166+douggillespie@users.noreply.github.com>
Date: Sat May 14 06:52:20 2022 +0100
Add a new offlinefileslist function
commit 3a9a5311aa529b66340f6ae322f88905b911947a
Author: Douglas Gillespie <50671166+douggillespie@users.noreply.github.com>
Date: Wed Apr 27 09:43:31 2022 +0100
Update .gitignore
commit 9f998165ee95dbb16acaf420876f3aeab75c2158
Author: Douglas Gillespie <50671166+douggillespie@users.noreply.github.com>
Date: Mon May 2 19:40:24 2022 +0100
Updates to support ContactCollator plugin (#33)
* Change synchronization on RawDataTransforms soit uses the owner data
holder, not itself for synchronization. Otherwise you get thread locks.
* fix problem in SummaryComand
* Update command line options
* Change synchronization on RawDataTransforms soit uses the owner data
holder, not itself for synchronization. Otherwise you get thread locks.
* Update command line options
* Update DecimatorParams.java
* couple of updates to support new contact collator plugin
* Sorting out sample rate info in clip display to support Contact Collator
plugin
* FLAC Speed
Improve flac speed
* Update .gitignore
* Update .gitignore
* Updates to support new features in Contact Collator
* Small update to RawDatautils to handle null data
* Updated data selector for click train detector
* Click train detector updates and bug fixes
Fixed very annoying bug which meant templates did not show properly when the dialog was first opened in swing.
Added feature to simple classifier were % of clicks of one click classification (or other data selector paramter) can be used to classify.
* Bug fix and improvements for Ketos
Ketos models now automatically set the correct sample length when loaded.
Bug fix for the TDisplayFX - null pointer exception if no class names loaded and sorted recently introduced bug in drawing predictions.
* Updates to deep learning and FX GUI
Added some more example sounds to deep learning UI.
Updated click detector in the FX GUI.
* PAMGuard FX sound output update
* Updates to FX GUI
* Updates to FX GUI
* Update RawDataTransforms.java
* Fixes to FX UI
* Squashed commit of the following:
commit 11ba8bf91e1cd55e4305c4060a379f9ff0c58c4d
Author: Douglas Gillespie <50671166+douggillespie@users.noreply.github.com>
Date: Thu Aug 4 11:45:47 2022 +0100
MErge from DG Branch (#47)
* Variable sound output level
Mods to SoundPlayback module to allow additional parameters. Implemented
system for NI cards to allow changes to selected output voltage range
meaning output can be boosted to level higher than current default.
* Code to support nogui operations when no screens present on headless
system
* Fix problem of nogui headless operation trying to access screen size.
* Click detector display fixes
1. ICI not displaying correctly
2. Component sizes in display dialog on hres monitors
* Work on batch processing, after testing of options to autostart,
autoexit and set wav file folder, database and binary store.
* Update MHTClickTrainAlgorithm.java
Fix unsynchronised access to a datablock in click train detector which was causing index errors.
* Revamp of offline process messaging and control
Includes some databsae logging of completed tasks
* Offline task logging
Bit more work, including notes and database storage of task
reprocessing. Guess this could all become 'proper' PAMGuard data and be
shown in a table on the display but that not priority enough.
* Dialog packing
Fix a couple of dialogs which don't back well on HDPI monitors
* UDP Control
Added multiport functionality
commit 9a9f542d95b6cbc571d60a2250a2d4accf8dc4b3
Author: Douglas Gillespie <50671166+douggillespie@users.noreply.github.com>
Date: Thu Aug 4 11:42:45 2022 +0100
Merge DG to Main (#46)
* Variable sound output level
Mods to SoundPlayback module to allow additional parameters. Implemented
system for NI cards to allow changes to selected output voltage range
meaning output can be boosted to level higher than current default.
* Code to support nogui operations when no screens present on headless
system
* Fix problem of nogui headless operation trying to access screen size.
* Click detector display fixes
1. ICI not displaying correctly
2. Component sizes in display dialog on hres monitors
* Work on batch processing, after testing of options to autostart,
autoexit and set wav file folder, database and binary store.
* Update MHTClickTrainAlgorithm.java
Fix unsynchronised access to a datablock in click train detector which was causing index errors.
* Revamp of offline process messaging and control
Includes some databsae logging of completed tasks
* Offline task logging
Bit more work, including notes and database storage of task
reprocessing. Guess this could all become 'proper' PAMGuard data and be
shown in a table on the display but that not priority enough.
* Dialog packing
Fix a couple of dialogs which don't back well on HDPI monitors
* UDP Control
Added multiport functionality
commit 49cd547aee3e4366e1aaa51b8fe7418199c2ad73
Author: Douglas Gillespie <50671166+douggillespie@users.noreply.github.com>
Date: Thu Aug 4 11:40:29 2022 +0100
Merge DG branch (#45)
* Variable sound output level
Mods to SoundPlayback module to allow additional parameters. Implemented
system for NI cards to allow changes to selected output voltage range
meaning output can be boosted to level higher than current default.
* Code to support nogui operations when no screens present on headless
system
* Fix problem of nogui headless operation trying to access screen size.
* Click detector display fixes
1. ICI not displaying correctly
2. Component sizes in display dialog on hres monitors
* Work on batch processing, after testing of options to autostart,
autoexit and set wav file folder, database and binary store.
* Update MHTClickTrainAlgorithm.java
Fix unsynchronised access to a datablock in click train detector which was causing index errors.
* Revamp of offline process messaging and control
Includes some databsae logging of completed tasks
* Offline task logging
Bit more work, including notes and database storage of task
reprocessing. Guess this could all become 'proper' PAMGuard data and be
shown in a table on the display but that not priority enough.
* Dialog packing
Fix a couple of dialogs which don't back well on HDPI monitors
* UDP Control
Added multiport functionality
commit 016cfd0da54021dcbe787f0a20856604b81bf7af
Author: Douglas Gillespie <50671166+douggillespie@users.noreply.github.com>
Date: Thu Aug 4 11:35:06 2022 +0100
Dialog positioning
New functions to better positions dialogs on screen
commit c9f2ab3e97ec289ee8c1bcfe4531c84f77ee7fa8
Author: Douglas Gillespie <50671166+douggillespie@users.noreply.github.com>
Date: Mon Aug 1 11:13:24 2022 +0100
puch to main (#44)
* Variable sound output level
Mods to SoundPlayback module to allow additional parameters. Implemented
system for NI cards to allow changes to selected output voltage range
meaning output can be boosted to level higher than current default.
* Code to support nogui operations when no screens present on headless
system
* Fix problem of nogui headless operation trying to access screen size.
* Click detector display fixes
1. ICI not displaying correctly
2. Component sizes in display dialog on hres monitors
* Work on batch processing, after testing of options to autostart,
autoexit and set wav file folder, database and binary store.
* Update MHTClickTrainAlgorithm.java
Fix unsynchronised access to a datablock in click train detector which was causing index errors.
* Revamp of offline process messaging and control
Includes some databsae logging of completed tasks
* Offline task logging
Bit more work, including notes and database storage of task
reprocessing. Guess this could all become 'proper' PAMGuard data and be
shown in a table on the display but that not priority enough.
* Dialog packing
Fix a couple of dialogs which don't back well on HDPI monitors
commit 55f5a3fcf12c6c8a727318a17f9dece401adc9f3
Author: Douglas Gillespie <50671166+douggillespie@users.noreply.github.com>
Date: Mon Aug 1 10:59:36 2022 +0100
Group detections menu
Small changes to limit the number of menu items in "Add to existing
group" to a maximum of 25 entries.
commit b3f6c0e6657de91a7e015a48f5f218f60f23c5f5
Author: Douglas Gillespie <50671166+douggillespie@users.noreply.github.com>
Date: Fri Jul 29 10:50:45 2022 +0100
Handle -nogui option in PamWorker
PamWorker used to catalog files at startup (if a file folder input
system is used). This creates a progress dialog. Stop it appearing in
-nogui operations.
commit 8569b6b579659cba8229596e91c35355bc5ed61b
Author: Douglas Gillespie <50671166+douggillespie@users.noreply.github.com>
Date: Fri Jul 22 08:30:47 2022 +0100
Click display fixes (#41)
* Variable sound output level
Mods to SoundPlayback module to allow additional parameters. Implemented
system for NI cards to allow changes to selected output voltage range
meaning output can be boosted to level higher than current default.
* Code to support nogui operations when no screens present on headless
system
* Fix problem of nogui headless operation trying to access screen size.
* Click detector display fixes
1. ICI not displaying correctly
2. Component sizes in display dialog on hres monitors
commit 128a512ff60c26b5acedd76de96c0905c6bf27ae
Author: Douglas Gillespie <50671166+douggillespie@users.noreply.github.com>
Date: Tue Jul 19 16:37:57 2022 +0100
Another attempt at stopping it crashing on a headless system
Dealing with displays that get created for clickangle vetos and a call
to the gui in the click train detector.
commit 6eaa6e4978b2483e5828ca4a3914c58d7a9cfe2d
Author: Douglas Gillespie <50671166+douggillespie@users.noreply.github.com>
Date: Tue Jul 19 08:20:07 2022 +0100
nogoi fix for headless systems. (#40)
* Variable sound output level
Mods to SoundPlayback module to allow additional parameters. Implemented
system for NI cards to allow changes to selected output voltage range
meaning output can be boosted to level higher than current default.
* Code to support nogui operations when no screens present on headless
system
* Fix problem of nogui headless operation trying to access screen size.
commit 9fdd30556bf391428e1d3f2f9e91dbbdf771fa84
Author: Douglas Gillespie <50671166+douggillespie@users.noreply.github.com>
Date: Tue Jul 12 15:53:07 2022 +0100
Variable sound output level (#39)
Mods to SoundPlayback module to allow additional parameters. Implemented
system for NI cards to allow changes to selected output voltage range
meaning output can be boosted to level higher than current default.
* Bug fixes to click train detector
Fixed bug with number of coasts in the MHT Kernel
Added an option for amplitude to have a maximum
Removed print statements.
* Bug fix for click train logging
The size of the string classifers field was dynamically set - this was a bug.
* Bug fixes to the click train detector
Bearing classifier section now updates properly when dialog reopened
Fixed rare bug when garbage bot attempts to find the last data unit in a list of zero units.
* Squashed commit of the following:
commit 5a37bfe915925ea2307dd09928538c7e639ca52c
Author: Douglas Gillespie <50671166+douggillespie@users.noreply.github.com>
Date: Fri Aug 19 08:17:06 2022 +0100
Changes from DG branch (#50)
* Variable sound output level
Mods to SoundPlayback module to allow additional parameters. Implemented
system for NI cards to allow changes to selected output voltage range
meaning output can be boosted to level higher than current default.
* Code to support nogui operations when no screens present on headless
system
* Fix problem of nogui headless operation trying to access screen size.
* Click detector display fixes
1. ICI not displaying correctly
2. Component sizes in display dialog on hres monitors
* Work on batch processing, after testing of options to autostart,
autoexit and set wav file folder, database and binary store.
* Update MHTClickTrainAlgorithm.java
Fix unsynchronised access to a datablock in click train detector which was causing index errors.
* Revamp of offline process messaging and control
Includes some databsae logging of completed tasks
* Offline task logging
Bit more work, including notes and database storage of task
reprocessing. Guess this could all become 'proper' PAMGuard data and be
shown in a table on the display but that not priority enough.
* Dialog packing
Fix a couple of dialogs which don't back well on HDPI monitors
* UDP Control
Added multiport functionality
* Java version
Changes unpacker to deal with non numeric characters on Linux
* Fix to getVersion()
So new version of this command should now work on Linux and Windows.
* Multiport test
Quick tester for multiport comms
* Spectrogram display
Stop spectrogram display continually recreating panels since it was
unsubscribing discarded ones and sometimes causing crash in observable
notifications.
* Backup manager bug
Error if no database. Fixed.
commit b08e86e330c5ca2de4b6902eb7ec514f47278a7c
Author: Jamie Mac
Date: Wed Aug 17 09:16:52 2022 +0100
Bug fix for click train detector (#49)
* Updates to click train detector
New GUI for click train classification - more intuitive and allows users to build more powerful classifiers.
CPOD data can now build average waveforms.
CPOD click trains can be viewed in TDisplayFX pop up menu displays
Fixed Peak Frequency symbol chooser so it saves the colour box settings
* Create click_train_help.md
* Update click_train_help.md
* Screenshots
* Update click_train_help.md
* Update click_train_help.md
* Update click_train_help.md
* More screenshots
* Add screenshots
* Update click_train_help.md
* Add classifier screenshot
* Update click_train_help.md
* Update click_train_help.md
* Update click_train_help.md
* Updates and bug fixes to click train detector and CPOD importer
* Update click_train_help.md
* Update POM with latest jdl4pam
* Add screenshots for click train detector help
* Screenshots
* Update click_train_help.md
* Defult option for CPOD and porpoise to click train detector.
Also a minor
* Update pom.xml
* Bug fix for raw spectrogram in TDDisplayFX
* Update KetosClassifier.java
* Updates to click train detector
New GUI for click train classification - more intuitive and allows users to build more powerful classifiers.
CPOD data can now build average waveforms.
CPOD click trains can be viewed in TDisplayFX pop up menu displays
Fixed Peak Frequency symbol chooser so it saves the colour box settings
* Create click_train_help.md
* Update click_train_help.md
* Screenshots
* Update click_train_help.md
* More screenshots
* Update click_train_help.md
* Update click_train_help.md
* Add screenshots
* Add classifier screenshot
* Update click_train_help.md
* Updates and bug fixes to click train detector and CPOD importer
* Update click_train_help.md
* Update click_train_help.md
* Update click_train_help.md
* Update click_train_help.md
* Add screenshots for click train detector help
* Screenshots
* Update click_train_help.md
* Defult option for CPOD and porpoise to click train detector.
Also a minor
* Bug fix for raw spectrogram in TDDisplayFX
* Update KetosClassifier.java
* Fix standard classifier JSON logging
* Update click_train_help.md
* Fixed bug in sweep classifier when using SoundTrap click detections
* Added some colour averaging in the TFDisplayFX spectrgoram
* Bug fix for rainbow click bearings
Bug fix when rainbow clicks are imported mean bearings cannot be calculated - was an array size issue in DelayGroup
* Google humpback whale deep learning classifier
Google's humpback whale deep learning classifier can now be imported.
Updated TDisplayFX to make the data selection panes cleaner and clearer.
Updated the TDisplayFX so that predicitons from deep learning models now have some display options e.g. changing colour.
* Updated the prediction plots on time display
Deep learning prediciton plots on the time display have now been updated to have some colour options and also act as a legend.
* Updates to TDisplayFX
yFIshmael now owrks with TDisplayFX
TDisplayFX UI changes to make simpler.
Some abstraction for drawing lines on TDisplayFX
* Updates to click train detector
New GUI for click train classification - more intuitive and allows users to build more powerful classifiers.
CPOD data can now build average waveforms.
CPOD click trains can be viewed in TDisplayFX pop up menu displays
Fixed Peak Frequency symbol chooser so it saves the colour box settings
* Create click_train_help.md
* Update click_train_help.md
* Screenshots
* Update click_train_help.md
* More screenshots
* Update click_train_help.md
* Update click_train_help.md
* Add screenshots
* Add classifier screenshot
* Update click_train_help.md
* Updates and bug fixes to click train detector and CPOD importer
* Update click_train_help.md
* Update click_train_help.md
* Update click_train_help.md
* Update click_train_help.md
* Add screenshots for click train detector help
* Screenshots
* Update click_train_help.md
* Defult option for CPOD and porpoise to click train detector.
Also a minor
* Updates to click train detector
New GUI for click train classification - more intuitive and allows users to build more powerful classifiers.
CPOD data can now build average waveforms.
CPOD click trains can be viewed in TDisplayFX pop up menu displays
Fixed Peak Frequency symbol chooser so it saves the colour box settings
* Create click_train_help.md
* Update click_train_help.md
* Update click_train_help.md
* Updates and bug fixes to click train detector and CPOD importer
* Bug fix for raw spectrogram in TDDisplayFX
* Update KetosClassifier.java
* Fix standard classifier JSON logging
* Fixed bug in sweep classifier when using SoundTrap click detections
* Added some colour averaging in the TFDisplayFX spectrgoram
* Bug fix for rainbow click bearings
Bug fix when rainbow clicks are imported mean bearings cannot be calculated - was an array size issue in DelayGroup
* Google humpback whale deep learning classifier
Google's humpback whale deep learning classifier can now be imported.
Updated TDisplayFX to make the data selection panes cleaner and clearer.
Updated the TDisplayFX so that predicitons from deep learning models now have some display options e.g. changing colour.
* Updated the prediction plots on time display
Deep learning prediciton plots on the time display have now been updated to have some colour options and also act as a legend.
* Updates to TDisplayFX
yFIshmael now owrks with TDisplayFX
TDisplayFX UI changes to make simpler.
Some abstraction for drawing lines on TDisplayFX
* Merge fixes to click train detector
* Bug fix to UI
* Updates to FX GUI
* Updates to click train detector
New GUI for click train classification - more intuitive and allows users to build more powerful classifiers.
CPOD data can now build average waveforms.
CPOD click trains can be viewed in TDisplayFX pop up menu displays
Fixed Peak Frequency symbol chooser so it saves the colour box settings
* Screenshots
* Updates and bug fixes to click train detector and CPOD importer
* Updates to click train detector
New GUI for click train classification - more intuitive and allows users to build more powerful classifiers.
CPOD data can now build average waveforms.
CPOD click trains can be viewed in TDisplayFX pop up menu displays
Fixed Peak Frequency symbol chooser so it saves the colour box settings
* Updates and bug fixes to click train detector and CPOD importer
* Fix standard classifier JSON logging
* Merge fixes to click train detector
* Updates to click train detector
New GUI for click train classification - more intuitive and allows users to build more powerful classifiers.
CPOD data can now build average waveforms.
CPOD click trains can be viewed in TDisplayFX pop up menu displays
Fixed Peak Frequency symbol chooser so it saves the colour box settings
* Screenshots
* Updates and bug fixes to click train detector and CPOD importer
* Updates to click train detector
New GUI for click train classification - more intuitive and allows users to build more powerful classifiers.
CPOD data can now build average waveforms.
CPOD click trains can be viewed in TDisplayFX pop up menu displays
Fixed Peak Frequency symbol chooser so it saves the colour box settings
* Screenshots
* Updates and bug fixes to click train detector and CPOD importer
* Fix standard classifier JSON logging
* Google humpback whale deep learning classifier
Google's humpback whale deep learning classifier can now be imported.
Updated TDisplayFX to make the data selection panes cleaner and clearer.
Updated the TDisplayFX so that predicitons from deep learning models now have some display options e.g. changing colour.
* Bug fix to UI
* Bug fixes to FX GUI
* Updates to click train detector
* Squashed commit of the following:
commit 9f998165ee95dbb16acaf420876f3aeab75c2158
Author: Douglas Gillespie <50671166+douggillespie@users.noreply.github.com>
Date: Mon May 2 19:40:24 2022 +0100
Updates to support ContactCollator plugin (#33)
* Change synchronization on RawDataTransforms soit uses the owner data
holder, not itself for synchronization. Otherwise you get thread locks.
* fix problem in SummaryComand
* Update command line options
* Change synchronization on RawDataTransforms soit uses the owner data
holder, not itself for synchronization. Otherwise you get thread locks.
* Update command line options
* Update DecimatorParams.java
* couple of updates to support new contact collator plugin
* Sorting out sample rate info in clip display to support Contact Collator
plugin
* FLAC Speed
Improve flac speed
* Update .gitignore
* Update .gitignore
* Updates to support new features in Contact Collator
* Small update to RawDatautils to handle null data
* Updates to click train detector
* Squashed commit of the following:
commit 62b020b3204aa56189b1c2da88bcbb9f49140936
Author: Douglas Gillespie <50671166+douggillespie@users.noreply.github.com>
Date: Sat May 14 06:52:20 2022 +0100
Add a new offlinefileslist function
commit 3a9a5311aa529b66340f6ae322f88905b911947a
Author: Douglas Gillespie <50671166+douggillespie@users.noreply.github.com>
Date: Wed Apr 27 09:43:31 2022 +0100
Update .gitignore
commit 9f998165ee95dbb16acaf420876f3aeab75c2158
Author: Douglas Gillespie <50671166+douggillespie@users.noreply.github.com>
Date: Mon May 2 19:40:24 2022 +0100
Updates to support ContactCollator plugin (#33)
* Change synchronization on RawDataTransforms soit uses the owner data
holder, not itself for synchronization. Otherwise you get thread locks.
* fix problem in SummaryComand
* Update command line options
* Change synchronization on RawDataTransforms soit uses the owner data
holder, not itself for synchronization. Otherwise you get thread locks.
* Update command line options
* Update DecimatorParams.java
* couple of updates to support new contact collator plugin
* Sorting out sample rate info in clip display to support Contact Collator
plugin
* FLAC Speed
Improve flac speed
* Update .gitignore
* Update .gitignore
* Updates to support new features in Contact Collator
* Small update to RawDatautils to handle null data
* Updated data selector for click train detector
* Click train detector updates and bug fixes
Fixed very annoying bug which meant templates did not show properly when the dialog was first opened in swing.
Added feature to simple classifier were % of clicks of one click classification (or other data selector paramter) can be used to classify.
* Bug fix and improvements for Ketos
Ketos models now automatically set the correct sample length when loaded.
Bug fix for the TDisplayFX - null pointer exception if no class names loaded and sorted recently introduced bug in drawing predictions.
* Updates to deep learning and FX GUI
Added some more example sounds to deep learning UI.
Updated click detector in the FX GUI.
* PAMGuard FX sound output update
* Updates to FX GUI
* Updates to FX GUI
* Update RawDataTransforms.java
* Fixes to FX UI
* Squashed commit of the following:
commit 11ba8bf91e1cd55e4305c4060a379f9ff0c58c4d
Author: Douglas Gillespie <50671166+douggillespie@users.noreply.github.com>
Date: Thu Aug 4 11:45:47 2022 +0100
MErge from DG Branch (#47)
* Variable sound output level
Mods to SoundPlayback module to allow additional parameters. Implemented
system for NI cards to allow changes to selected output voltage range
meaning output can be boosted to level higher than current default.
* Code to support nogui operations when no screens present on headless
system
* Fix problem of nogui headless operation trying to access screen size.
* Click detector display fixes
1. ICI not displaying correctly
2. Component sizes in display dialog on hres monitors
* Work on batch processing, after testing of options to autostart,
autoexit and set wav file folder, database and binary store.
* Update MHTClickTrainAlgorithm.java
Fix unsynchronised access to a datablock in click train detector which was causing index errors.
* Revamp of offline process messaging and control
Includes some databsae logging of completed tasks
* Offline task logging
Bit more work, including notes and database storage of task
reprocessing. Guess this could all become 'proper' PAMGuard data and be
shown in a table on the display but that not priority enough.
* Dialog packing
Fix a couple of dialogs which don't back well on HDPI monitors
* UDP Control
Added multiport functionality
commit 9a9f542d95b6cbc571d60a2250a2d4accf8dc4b3
Author: Douglas Gillespie <50671166+douggillespie@users.noreply.github.com>
Date: Thu Aug 4 11:42:45 2022 +0100
Merge DG to Main (#46)
* Variable sound output level
Mods to SoundPlayback module to allow additional parameters. Implemented
system for NI cards to allow changes to selected output voltage range
meaning output can be boosted to level higher than current default.
* Code to support nogui operations when no screens present on headless
system
* Fix problem of nogui headless operation trying to access screen size.
* Click detector display fixes
1. ICI not displaying correctly
2. Component sizes in display dialog on hres monitors
* Work on batch processing, after testing of options to autostart,
autoexit and set wav file folder, database and binary store.
* Update MHTClickTrainAlgorithm.java
Fix unsynchronised access to a datablock in click train detector which was causing index errors.
* Revamp of offline process messaging and control
Includes some databsae logging of completed tasks
* Offline task logging
Bit more work, including notes and database storage of task
reprocessing. Guess this could all become 'proper' PAMGuard data and be
shown in a table on the display but that not priority enough.
* Dialog packing
Fix a couple of dialogs which don't back well on HDPI monitors
* UDP Control
Added multiport functionality
commit 49cd547aee3e4366e1aaa51b8fe7418199c2ad73
Author: Douglas Gillespie <50671166+douggillespie@users.noreply.github.com>
Date: Thu Aug 4 11:40:29 2022 +0100
Merge DG branch (#45)
* Variable sound output level
Mods to SoundPlayback module to allow additional parameters. Implemented
system for NI cards to allow changes to selected output voltage range
meaning output can be boosted to level higher than current default.
* Code to support nogui operations when no screens present on headless
system
* Fix problem of nogui headless operation trying to access screen size.
* Click detector display fixes
1. ICI not displaying correctly
2. Component sizes in display dialog on hres monitors
* Work on batch processing, after testing of options to autostart,
autoexit and set wav file folder, database and binary store.
* Update MHTClickTrainAlgorithm.java
Fix unsynchronised access to a datablock in click train detector which was causing index errors.
* Revamp of offline process messaging and control
Includes some databsae logging of completed tasks
* Offline task logging
Bit more work, including notes and database storage of task
reprocessing. Guess this could all become 'proper' PAMGuard data and be
shown in a table on the display but that not priority enough.
* Dialog packing
Fix a couple of dialogs which don't back well on HDPI monitors
* UDP Control
Added multiport functionality
commit 016cfd0da54021dcbe787f0a20856604b81bf7af
Author: Douglas Gillespie <50671166+douggillespie@users.noreply.github.com>
Date: Thu Aug 4 11:35:06 2022 +0100
Dialog positioning
New functions to better positions dialogs on screen
commit c9f2ab3e97ec289ee8c1bcfe4531c84f77ee7fa8
Author: Douglas Gillespie <50671166+douggillespie@users.noreply.github.com>
Date: Mon Aug 1 11:13:24 2022 +0100
puch to main (#44)
* Variable sound output level
Mods to SoundPlayback module to allow additional parameters. Implemented
system for NI cards to allow changes to selected output voltage range
meaning output can be boosted to level higher than current default.
* Code to support nogui operations when no screens present on headless
system
* Fix problem of nogui headless operation trying to access screen size.
* Click detector display fixes
1. ICI not displaying correctly
2. Component sizes in display dialog on hres monitors
* Work on batch processing, after testing of options to autostart,
autoexit and set wav file folder, database and binary store.
* Update MHTClickTrainAlgorithm.java
Fix unsynchronised access to a datablock in click train detector which was causing index errors.
* Revamp of offline process messaging and control
Includes some databsae logging of completed tasks
* Offline task logging
Bit more work, including notes and database storage of task
reprocessing. Guess this could all become 'proper' PAMGuard data and be
shown in a table on the display but that not priority enough.
* Dialog packing
Fix a couple of dialogs which don't back well on HDPI monitors
commit 55f5a3fcf12c6c8a727318a17f9dece401adc9f3
Author: Douglas Gillespie <50671166+douggillespie@users.noreply.github.com>
Date: Mon Aug 1 10:59:36 2022 +0100
Group detections menu
Small changes to limit the number of menu items in "Add to existing
group" to a maximum of 25 entries.
commit b3f6c0e6657de91a7e015a48f5f218f60f23c5f5
Author: Douglas Gillespie <50671166+douggillespie@users.noreply.github.com>
Date: Fri Jul 29 10:50:45 2022 +0100
Handle -nogui option in PamWorker
PamWorker used to catalog files at startup (if a file folder input
system is used). This creates a progress dialog. Stop it appearing in
-nogui operations.
commit 8569b6b579659cba8229596e91c35355bc5ed61b
Author: Douglas Gillespie <50671166+douggillespie@users.noreply.github.com>
Date: Fri Jul 22 08:30:47 2022 +0100
Click display fixes (#41)
* Variable sound output level
Mods to SoundPlayback module to allow additional parameters. Implemented
system for NI cards to allow changes to selected output voltage range
meaning output can be boosted to level higher than current default.
* Code to support nogui operations when no screens present on headless
system
* Fix problem of nogui headless operation trying to access screen size.
* Click detector display fixes
1. ICI not displaying correctly
2. Component sizes in display dialog on hres monitors
commit 128a512ff60c26b5acedd76de96c0905c6bf27ae
Author: Douglas Gillespie <50671166+douggillespie@users.noreply.github.com>
Date: Tue Jul 19 16:37:57 2022 +0100
Another attempt at stopping it crashing on a headless system
Dealing with displays that get created for clickangle vetos and a call
to the gui in the click train detector.
commit 6eaa6e4978b2483e5828ca4a3914c58d7a9cfe2d
Author: Douglas Gillespie <50671166+douggillespie@users.noreply.github.com>
Date: Tue Jul 19 08:20:07 2022 +0100
nogoi fix for headless systems. (#40)
* Variable sound output level
Mods to SoundPlayback module to allow additional parameters. Implemented
system for NI cards to allow changes to selected output voltage range
meaning output can be boosted to level higher than current default.
* Code to support nogui operations when no screens present on headless
system
* Fix problem of nogui headless operation trying to access screen size.
commit 9fdd30556bf391428e1d3f2f9e91dbbdf771fa84
Author: Douglas Gillespie <50671166+douggillespie@users.noreply.github.com>
Date: Tue Jul 12 15:53:07 2022 +0100
Variable sound output level (#39)
Mods to SoundPlayback module to allow additional parameters. Implemented
system for NI cards to allow changes to selected output voltage range
meaning output can be boosted to level higher than current default.
* Bug fixes to click train detector
Fixed bug with number of coasts in the MHT Kernel
Added an option for amplitude to have a maximum
Removed print statements.
* Bug fix for click train logging
The size of the string classifers field was dynamically set - this was a bug.
Co-authored-by: Douglas Gillespie <50671166+douggillespie@users.noreply.github.com>
commit ef0330173b5a9683fb79c9cb027b207a768ae30c
Author: Jamie Mac
Date: Mon Aug 8 10:32:19 2022 +0100
Click trian detector fixes (#48)
* Updates to click train detector
New GUI for click train classification - more intuitive and allows users to build more powerful classifiers.
CPOD data can now build average waveforms.
CPOD click trains can be viewed in TDisplayFX pop up menu displays
Fixed Peak Frequency symbol chooser so it saves the colour box settings
* Create click_train_help.md
* Update click_train_help.md
* Screenshots
* Update click_train_help.md
* Update click_train_help.md
* Update click_train_help.md
* More screenshots
* Add screenshots
* Update click_train_help.md
* Add classifier screenshot
* Update click_train_help.md
* Update click_train_help.md
* Update click_train_help.md
* Updates and bug fixes to click train detector and CPOD importer
* Update click_train_help.md
* Update POM with latest jdl4pam
* Add screenshots for click train detector help
* Screenshots
* Update click_train_help.md
* Defult option for CPOD and porpoise to click train detector.
Also a minor
* Update pom.xml
* Bug fix for raw spectrogram in TDDisplayFX
* Update KetosClassifier.java
* Updates to click train detector
New GUI for click train classification - more intuitive and allows users to build more powerful classifiers.
CPOD data can now build average waveforms.
CPOD click trains can be viewed in TDisplayFX pop up menu displays
Fixed Peak Frequency symbol chooser so it saves the colour box settings
* Create click_train_help.md
* Update click_train_help.md
* Screenshots
* Update click_train_help.md
* More screenshots
* Update click_train_help.md
* Update click_train_help.md
* Add screenshots
* Add classifier screenshot
* Update click_train_help.md
* Updates and bug fixes to click train detector and CPOD importer
* Update click_train_help.md
* Update click_train_help.md
* Update click_train_help.md
* Update click_train_help.md
* Add screenshots for click train detector help
* Screenshots
* Update click_train_help.md
* Defult option for CPOD and porpoise to click train detector.
Also a minor
* Bug fix for raw spectrogram in TDDisplayFX
* Update KetosClassifier.java
* Fix standard classifier JSON logging
* Update click_train_help.md
* Fixed bug in sweep classifier when using SoundTrap click detections
* Added some colour averaging in the TFDisplayFX spectrgoram
* Bug fix for rainbow click bearings
Bug fix when rainbow clicks are imported mean bearings cannot be calculated - was an array size issue in DelayGroup
* Google humpback whale deep learning classifier
Google's humpback whale deep learning classifier can now be imported.
Updated TDisplayFX to make the data selection panes cleaner and clearer.
Updated the TDisplayFX so that predicitons from deep learning models now have some display options e.g. changing colour.
* Updated the prediction plots on time display
Deep learning prediciton plots on the time display have now been updated to have some colour options and also act as a legend.
* Updates to TDisplayFX
yFIshmael now owrks with TDisplayFX
TDisplayFX UI changes to make simpler.
Some abstraction for drawing lines on TDisplayFX
* Updates to click train detector
New GUI for click train classification - more intuitive and allows users to build more powerful classifiers.
CPOD data can now build average waveforms.
CPOD click trains can be viewed in TDisplayFX pop up menu displays
Fixed Peak Frequency symbol chooser so it saves the colour box settings
* Create click_train_help.md
* Update click_train_help.md
* Screenshots
* Update click_train_help.md
* More screenshots
* Update click_train_help.md
* Update click_train_help.md
* Add screenshots
* Add classifier screenshot
* Update click_train_help.md
* Updates and bug fixes to click train detector and CPOD importer
* Update click_train_help.md
* Update click_train_help.md
* Update click_train_help.md
* Update click_train_help.md
* Add screenshots for click train detector help
* Screenshots
* Update click_train_help.md
* Defult option for CPOD and porpoise to click train detector.
Also a minor
* Updates to click train detector
New GUI for click train classification - more intuitive and allows users to build more powerful classifiers.
CPOD data can now build average waveforms.
CPOD click trains can be viewed in TDisplayFX pop up menu displays
Fixed Peak Frequency symbol chooser so it saves the colour box settings
* Create click_train_help.md
* Update click_train_help.md
* Update click_train_help.md
* Updates and bug fixes to click train detector and CPOD importer
* Bug fix for raw spectrogram in TDDisplayFX
* Update KetosClassifier.java
* Fix standard classifier JSON logging
* Fixed bug in sweep classifier when using SoundTrap click detections
* Added some colour averaging in the TFDisplayFX spectrgoram
* Bug fix for rainbow click bearings
Bug fix when rainbow clicks are imported mean bearings cannot be calculated - was an array size issue in DelayGroup
* Google humpback whale deep learning classifier
Google's humpback whale deep learning classifier can now be imported.
Updated TDisplayFX to make the data selection panes cleaner and clearer.
Updated the TDisplayFX so that predicitons from deep learning models now have some display options e.g. changing colour.
* Updated the prediction plots on time display
Deep learning prediciton plots on the time display have now been updated to have some colour options and also act as a legend.
* Updates to TDisplayFX
yFIshmael now owrks with TDisplayFX
TDisplayFX UI changes to make simpler.
Some abstraction for drawing lines on TDisplayFX
* Merge fixes to click train detector
* Bug fix to UI
* Updates to FX GUI
* Updates to click train detector
New GUI for click train classification - more intuitive and allows users to build more powerful classifiers.
CPOD data can now build average waveforms.
CPOD click trains can be viewed in TDisplayFX pop up menu displays
Fixed Peak Frequency symbol chooser so it saves the colour box settings
* Screenshots
* Updates and bug fixes to click train detector and CPOD importer
* Updates to click train detector
New GUI for click train classification - more intuitive and allows users to build more powerful classifiers.
CPOD data can now build average waveforms.
CPOD click trains can be viewed in TDisplayFX pop up menu displays
Fixed Peak Frequency symbol chooser so it saves the colour box settings
* Updates and bug fixes to click train detector and CPOD importer
* Fix standard classifier JSON logging
* Merge fixes to click train detector
* Updates to click train detector
New GUI for click train classification - more intuitive and allows users to build more powerful classifiers.
CPOD data can now build average waveforms.
CPOD click trains can be viewed in TDisplayFX pop up menu displays
Fixed Peak Frequency symbol chooser so it saves the colour box settings
* Screenshots
* Updates and bug fixes to click train detector and CPOD importer
* Updates to click train detector
New GUI for click train classification - more intuitive and allows users to build more powerful classifiers.
CPOD data can now build average waveforms.
CPOD click trains can be viewed in TDisplayFX pop up menu displays
Fixed Peak Frequency symbol chooser so it saves the colour box settings
* Screenshots
* Updates and bug fixes to click train detector and CPOD importer
* Fix standard classifier JSON logging
* Google humpback whale deep learning classifier
Google's humpback whale deep learning classifier can now be imported.
Updated TDisplayFX to make the data selection panes cleaner and clearer.
Updated the TDisplayFX so that predicitons from deep learning models now have some display options e.g. changing colour.
* Bug fix to UI
* Bug fixes to FX GUI
* Updates to click train detector
* Squashed commit of the following:
commit 9f998165ee95dbb16acaf420876f3aeab75c2158
Author: Douglas Gillespie <50671166+douggillespie@users.noreply.github.com>
Date: Mon May 2 19:40:24 2022 +0100
Updates to support ContactCollator plugin (#33)
* Change synchronization on RawDataTransforms soit uses the owner data
holder, not itself for synchronization. Otherwise you get thread locks.
* fix problem in SummaryComand
* Update command line options
* Change synchronization on RawDataTransforms soit uses the owner data
holder, not itself for synchronization. Otherwise you get thread locks.
* Update command line options
* Update DecimatorParams.java
* couple of updates to support new contact collator plugin
* Sorting out sample rate info in clip display to support Contact Collator
plugin
* FLAC Speed
Improve flac speed
* Update .gitignore
* Update .gitignore
* Updates to support new features in Contact Collator
* Small update to RawDatautils to handle null data
* Updates to click train detector
* Squashed commit of the following:
commit 62b020b3204aa56189b1c2da88bcbb9f49140936
Author: Douglas Gillespie <50671166+douggillespie@users.noreply.github.com>
Date: Sat May 14 06:52:20 2022 +0100
Add a new offlinefileslist function
commit 3a9a5311aa529b66340f6ae322f88905b911947a
Author: Douglas Gillespie <50671166+douggillespie@users.noreply.github.com>
Date: Wed Apr 27 09:43:31 2022 +0100
Update .gitignore
commit 9f998165ee95dbb16acaf420876f3aeab75c2158
Author: Douglas Gillespie <50671166+douggillespie@users.noreply.github.com>
Date: Mon May 2 19:40:24 2022 +0100
Updates to support ContactCollator plugin (#33)
* Change synchronization on RawDataTransforms soit uses the owner data
holder, not itself for synchronization. Otherwise you get thread locks.
* fix problem in SummaryComand
* Update command line options
* Change synchronization on RawDataTransforms soit uses the owner data
holder, not itself for synchronization. Otherwise you get thread locks.
* Update command line options
* Update DecimatorParams.java
* couple of updates to support new contact collator plugin
* Sorting out sample rate info in clip display to support Contact Collator
plugin
* FLAC Speed
Improve flac speed
* Update .gitignore
* Update .gitignore
* Updates to support new features in Contact Collator
* Small update to RawDatautils to handle null data
* Updated data selector for click train detector
* Click train detector updates and bug fixes
Fixed very annoying bug which meant templates did not show properly when the dialog was first opened in swing.
Added feature to simple classifier were % of clicks of one click classification (or other data selector paramter) can be used to classify.
* Bug fix and improvements for Ketos
Ketos models now automatically set the correct sample length when loaded.
Bug fix for the TDisplayFX - null pointer exception if no class names loaded and sorted recently introduced bug in drawing predictions.
* Updates to deep learning and FX GUI
Added some more example sounds to deep learning UI.
Updated click detector in the FX GUI.
* PAMGuard FX sound output update
* Updates to FX GUI
* Updates to FX GUI
* Update RawDataTransforms.java
* Fixes to FX UI
* Squashed commit of the following:
commit 11ba8bf91e1cd55e4305c4060a379f9ff0c58c4d
Author: Douglas Gillespie <50671166+douggillespie@users.noreply.github.com>
Date: Thu Aug 4 11:45:47 2022 +0100
MErge from DG Branch (#47)
* Variable sound output level
Mods to SoundPlayback module to allow additional parameters. Implemented
system for NI cards to allow changes to selected output voltage range
meaning output can be boosted to level higher than current default.
* Code to support nogui operations when no screens present on headless
system
* Fix problem of nogui headless operation trying to access screen size.
* Click detector display fixes
1. ICI not displaying correctly
2. Component sizes in display dialog on hres monitors
* Work on batch processing, after testing of options to autostart,
autoexit and set wav file folder, database and binary store.
* Update MHTClickTrainAlgorithm.java
Fix unsynchronised access to a datablock in click train detector which was causing index errors.
* Revamp of offline process messaging and control
Includes some databsae logging of completed tasks
* Offline task logging
Bit more work, including notes and database storage of task
reprocessing. Guess this could all become 'proper' PAMGuard data and be
shown in a table on the display but that not priority enough.
* Dialog packing
Fix a couple of dialogs which don't back well on HDPI monitors
* UDP Control
Added multiport functionality
commit 9a9f542d95b6cbc571d60a2250a2d4accf8dc4b3
Author: Douglas Gillespie <50671166+douggillespie@users.noreply.github.com>
Date: Thu Aug 4 11:42:45 2022 +0100
Merge DG to Main (#46)
* Variable sound output level
Mods to SoundPlayback module to allow additional parameters. Implemented
system for NI cards to allow changes to selected output voltage range
meaning output can be boosted to level higher than current default.
* Code to support nogui operations when no screens present on headless
system
* Fix problem of nogui headless operation trying to access screen size.
* Click detector display fixes
1. ICI not displaying correctly
2. Component sizes in display dialog on hres monitors
* Work on batch processing, after testing of options to autostart,
autoexit and set wav file folder, database and binary store.
* Update MHTClickTrainAlgorithm.java
Fix unsynchronised …
* Bug fixes to the matched click classifier
The matched click classifier was not working when an in built click classifier was used. This was caused by an index out of bounds exception in the alarm system.
Added new features;
* The Time base display now exports sample rate to .mat files.
* Bug fix file separator on time base display so it works on mac and Linux
* Matched click classifier imports the first click in a list of click structures as a template.
* Changed default length for restricted bins to 2048.
* Add picture for help file
* Update matched_click_classifer_help.md
* Update matched_click_classifer_help.md
* Squashed commit of the following:
commit b01cb4d10020aba4b46ba17c6e16fa02c6350e46
Author: Douglas Gillespie <50671166+douggillespie@users.noreply.github.com>
Date: Tue Sep 13 11:19:31 2022 +0100
Fix bug in 3DOffline task
Problems with making catalogue of offline tasks. not important for now,
but needs revisiting.
commit ae6e2f947b886810a5ebf35f8b2e2e6e9cd822cc
Author: Douglas Gillespie <50671166+douggillespie@users.noreply.github.com>
Date: Tue Sep 13 09:12:34 2022 +0100
Merge Dougs fork (#53)
* Variable sound output level
Mods to SoundPlayback module to allow additional parameters. Implemented
system for NI cards to allow changes to selected output voltage range
meaning output can be boosted to level higher than current default.
* Code to support nogui operations when no screens present on headless
system
* Fix problem of nogui headless operation trying to access screen size.
* Click detector display fixes
1. ICI not displaying correctly
2. Component sizes in display dialog on hres monitors
* Work on batch processing, after testing of options to autostart,
autoexit and set wav file folder, database and binary store.
* Update MHTClickTrainAlgorithm.java
Fix unsynchronised access to a datablock in click train detector which was causing index errors.
* Revamp of offline process messaging and control
Includes some databsae logging of completed tasks
* Offline task logging
Bit more work, including notes and database storage of task
reprocessing. Guess this could all become 'proper' PAMGuard data and be
shown in a table on the display but that not priority enough.
* Dialog packing
Fix a couple of dialogs which don't back well on HDPI monitors
* UDP Control
Added multiport functionality
* Java version
Changes unpacker to deal with non numeric characters on Linux
* Fix to getVersion()
So new version of this command should now work on Linux and Windows.
* Multiport test
Quick tester for multiport comms
* Spectrogram display
Stop spectrogram display continually recreating panels since it was
unsubscribing discarded ones and sometimes causing crash in observable
notifications.
* Backup manager bug
Error if no database. Fixed.
* Daylight saving problem
Fix daylight saving problem in generation of timestamps in SQLTypes. See long explanation in SQLTypes.java. Only occurred in the hour after daylight saving starts.
commit cd89c65d7c32338ea445ae4eec5bd31e5bc3d59a
Author: Douglas Gillespie <50671166+douggillespie@users.noreply.github.com>
Date: Tue Sep 13 09:07:11 2022 +0100
Fix synchronization problem in RawDataTransfroms
commit 6b15b3d536f2334aa9769e10c268659a254e19c8
Author: Douglas Gillespie <50671166+douggillespie@users.noreply.github.com>
Date: Tue Aug 23 15:21:28 2022 +0100
Change min java version to 11 which should be ok on some embedded
systems.
commit 4b3a37636b2081323c39dcbb133c1474ad2a9daa
Author: Douglas Gillespie <50671166+douggillespie@users.noreply.github.com>
Date: Tue Aug 23 14:30:46 2022 +0100
CTD Fixes
Couple more fixes to menus and datablock selection
commit c641c58e4f524f0c8beb3967c9fec8b34c412121
Author: Jamie Mac
Date: Tue Aug 23 14:19:28 2022 +0100
Bug fixes to click train detector (#51)
* Updates to click train detector
New GUI for click train classification - more intuitive and allows users to build more powerful classifiers.
CPOD data can now build average waveforms.
CPOD click trains can be viewed in TDisplayFX pop up menu displays
Fixed Peak Frequency symbol chooser so it saves the colour box settings
* Create click_train_help.md
* Update click_train_help.md
* Screenshots
* Update click_train_help.md
* Update click_train_help.md
* Update click_train_help.md
* More screenshots
* Add screenshots
* Update click_train_help.md
* Add classifier screenshot
* Update click_train_help.md
* Update click_train_help.md
* Update click_train_help.md
* Updates and bug fixes to click train detector and CPOD importer
* Update click_train_help.md
* Update POM with latest jdl4pam
* Add screenshots for click train detector help
* Screenshots
* Update click_train_help.md
* Defult option for CPOD and porpoise to click train detector.
Also a minor
* Update pom.xml
* Bug fix for raw spectrogram in TDDisplayFX
* Update KetosClassifier.java
* Updates to click train detector
New GUI for click train classification - more intuitive and allows users to build more powerful classifiers.
CPOD data can now build average waveforms.
CPOD click trains can be viewed in TDisplayFX pop up menu displays
Fixed Peak Frequency symbol chooser so it saves the colour box settings
* Create click_train_help.md
* Update click_train_help.md
* Screenshots
* Update click_train_help.md
* More screenshots
* Update click_train_help.md
* Update click_train_help.md
* Add screenshots
* Add classifier screenshot
* Update click_train_help.md
* Updates and bug fixes to click train detector and CPOD importer
* Update click_train_help.md
* Update click_train_help.md
* Update click_train_help.md
* Update click_train_help.md
* Add screenshots for click train detector help
* Screenshots
* Update click_train_help.md
* Defult option for CPOD and porpoise to click train detector.
Also a minor
* Bug fix for raw spectrogram in TDDisplayFX
* Update KetosClassifier.java
* Fix standard classifier JSON logging
* Update click_train_help.md
* Fixed bug in sweep classifier when using SoundTrap click detections
* Added some colour averaging in the TFDisplayFX spectrgoram
* Bug fix for rainbow click bearings
Bug fix when rainbow clicks are imported mean bearings cannot be calculated - was an array size issue in DelayGroup
* Google humpback whale deep learning classifier
Google's humpback whale deep learning classifier can now be imported.
Updated TDisplayFX to make the data selection panes cleaner and clearer.
Updated the TDisplayFX so that predicitons from deep learning models now have some display options e.g. changing colour.
* Updated the prediction plots on time display
Deep learning prediciton plots on the time display have now been updated to have some colour options and also act as a legend.
* Updates to TDisplayFX
yFIshmael now owrks with TDisplayFX
TDisplayFX UI changes to make simpler.
Some abstraction for drawing lines on TDisplayFX
* Updates to click train detector
New GUI for click train classification - more intuitive and allows users to build more powerful classifiers.
CPOD data can now build average waveforms.
CPOD click trains can be viewed in TDisplayFX pop up menu displays
Fixed Peak Frequency symbol chooser so it saves the colour box settings
* Create click_train_help.md
* Update click_train_help.md
* Screenshots
* Update click_train_help.md
* More screenshots
* Update click_train_help.md
* Update click_train_help.md
* Add screenshots
* Add classifier screenshot
* Update click_train_help.md
* Updates and bug fixes to click train detector and CPOD importer
* Update click_train_help.md
* Update click_train_help.md
* Update click_train_help.md
* Update click_train_help.md
* Add screenshots for click train detector help
* Screenshots
* Update click_train_help.md
* Defult option for CPOD and porpoise to click train detector.
Also a minor
* Updates to click train detector
New GUI for click train classification - more intuitive and allows users to build more powerful classifiers.
CPOD data can now build average waveforms.
CPOD click trains can be viewed in TDisplayFX pop up menu displays
Fixed Peak Frequency symbol chooser so it saves the colour box settings
* Create click_train_help.md
* Update click_train_help.md
* Update click_train_help.md
* Updates and bug fixes to click train detector and CPOD importer
* Bug fix for raw spectrogram in TDDisplayFX
* Update KetosClassifier.java
* Fix standard classifier JSON logging
* Fixed bug in sweep classifier when using SoundTrap click detections
* Added some colour averaging in the TFDisplayFX spectrgoram
* Bug fix for rainbow click bearings
Bug fix when rainbow clicks are imported mean bearings cannot be calculated - was an array size issue in DelayGroup
* Google humpback whale deep learning classifier
Google's humpback whale deep learning classifier can now be imported.
Updated TDisplayFX to make the data selection panes cleaner and clearer.
Updated the TDisplayFX so that predicitons from deep learning models now have some display options e.g. changing colour.
* Updated the prediction plots on time display
Deep learning prediciton plots on the time display have now been updated to have some colour options and also act as a legend.
* Updates to TDisplayFX
yFIshmael now owrks with TDisplayFX
TDisplayFX UI changes to make simpler.
Some abstraction for drawing lines on TDisplayFX
* Merge fixes to click train detector
* Bug fix to UI
* Updates to FX GUI
* Updates to click train detector
New GUI for click train classification - more intuitive and allows users to build more powerful classifiers.
CPOD data can now build average waveforms.
CPOD click trains can be viewed in TDisplayFX pop up menu displays
Fixed Peak Frequency symbol chooser so it saves the colour box settings
* Screenshots
* Updates and bug fixes to click train detector and CPOD importer
* Updates to click train detector
New GUI for click train classification - more intuitive and allows users to build more powerful classifiers.
CPOD data can now build average waveforms.
CPOD click trains can be viewed in TDisplayFX pop up menu displays
Fixed Peak Frequency symbol chooser so it saves the colour box settings
* Updates and bug fixes to click train detector and CPOD importer
* Fix standard classifier JSON logging
* Merge fixes to click train detector
* Updates to click train detector
New GUI for click train classification - more intuitive and allows users to build more powerful classifiers.
CPOD data can now build average waveforms.
CPOD click trains can be viewed in TDisplayFX pop up menu displays
Fixed Peak Frequency symbol chooser so it saves the colour box settings
* Screenshots
* Updates and bug fixes to click train detector and CPOD importer
* Updates to click train detector
New GUI for click train classification - more intuitive and allows users to build more powerful classifiers.
CPOD data can now build average waveforms.
CPOD click trains can be viewed in TDisplayFX pop up menu displays
Fixed Peak Frequency symbol chooser so it saves the colour box settings
* Screenshots
* Updates and bug fixes to click train detector and CPOD importer
* Fix standard classifier JSON logging
* Google humpback whale deep learning classifier
Google's humpback whale deep learning classifier can now be imported.
Updated TDisplayFX to make the data selection panes cleaner and clearer.
Updated the TDisplayFX so that predicitons from deep learning models now have some display options e.g. changing colour.
* Bug fix to UI
* Bug fixes to FX GUI
* Updates to click train detector
* Squashed commit of the following:
commit 9f998165ee95dbb16acaf420876f3aeab75c2158
Author: Douglas Gillespie <50671166+douggillespie@users.noreply.github.com>
Date: Mon May 2 19:40:24 2022 +0100
Updates to support ContactCollator plugin (#33)
* Change synchronization on RawDataTransforms soit uses the owner data
holder, not itself for synchronization. Otherwise you get thread locks.
* fix problem in SummaryComand
* Update command line options
* Change synchronization on RawDataTransforms soit uses the owner data
holder, not itself for synchronization. Otherwise you get thread locks.
* Update command line options
* Update DecimatorParams.java
* couple of updates to support new contact collator plugin
* Sorting out sample rate info in clip display to support Contact Collator
plugin
* FLAC Speed
Improve flac speed
* Update .gitignore
* Update .gitignore
* Updates to support new features in Contact Collator
* Small update to RawDatautils to handle null data
* Updates to click train detector
* Squashed commit of the following:
commit 62b020b3204aa56189b1c2da88bcbb9f49140936
Author: Douglas Gillespie <50671166+douggillespie@users.noreply.github.com>
Date: Sat May 14 06:52:20 2022 +0100
Add a new offlinefileslist function
commit 3a9a5311aa529b66340f6ae322f88905b911947a
Author: Douglas Gillespie <50671166+douggillespie@users.noreply.github.com>
Date: Wed Apr 27 09:43:31 2022 +0100
Update .gitignore
commit 9f998165ee95dbb16acaf420876f3aeab75c2158
Author: Douglas Gillespie <50671166+douggillespie@users.noreply.github.com>
Date: Mon May 2 19:40:24 2022 +0100
Updates to support ContactCollator plugin (#33)
* Change synchronization on RawDataTransforms soit uses the owner data
holder, not itself for synchronization. Otherwise you get thread locks.
* fix problem in SummaryComand
* Update command line options
* Change synchronization on RawDataTransforms soit uses the owner data
holder, not itself for synchronization. Otherwise you get thread locks.
* Update command line options
* Update DecimatorParams.java
* couple of updates to support new contact collator plugin
* Sorting out sample rate info in clip display to support Contact Collator
plugin
* FLAC Speed
Improve flac speed
* Update .gitignore
* Update .gitignore
* Updates to support new features in Contact Collator
* Small update to RawDatautils to handle null data
* Updated data selector for click train detector
* Click train detector updates and bug fixes
Fixed very annoying bug which meant templates did not show properly when the dialog was first opened in swing.
Added feature to simple classifier were % of clicks of one click classification (or other data selector paramter) can be used to classify.
* Bug fix and improvements for Ketos
Ketos models now automatically set the correct sample length when loaded.
Bug fix for the TDisplayFX - null pointer exception if no class names loaded and sorted recently introduced bug in drawing predictions.
* Updates to deep learning and FX GUI
Added some more example sounds to deep learning UI.
Updated click detector in the FX GUI.
* PAMGuard FX sound output update
* Updates to FX GUI
* Updates to FX GUI
* Update RawDataTransforms.java
* Fixes to FX UI
* Squashed commit of the following:
commit 11ba8bf91e1cd55e4305c4060a379f9ff0c58c4d
Author: Douglas Gillespie <50671166+douggillespie@users.noreply.github.com>
Date: Thu Aug 4 11:45:47 2022 +0100
MErge from DG Branch (#47)
* Variable sound output level
Mods to SoundPlayback module to allow additional parameters. Implemented
system for NI cards to allow changes to selected output voltage range
meaning output can be boosted to level higher than current default.
* Code to support nogui operations when no screens present on headless
system
* Fix problem of nogui headless operation trying to access screen size.
* Click detector display fixes
1. ICI not displaying correctly
2. Component sizes in display dialog on hres monitors
* Work on batch processing, after testing of options to autostart,
autoexit and set wav file folder, database and binary store.
* Update MHTClickTrainAlgorithm.java
Fix unsynchronised access to a datablock in click train detector which was causing index errors.
* Revamp of offline process messaging and control
Includes some databsae logging of completed tasks
* Offline task logging
Bit more work, including notes and database storage of task
reprocessing. Guess this could all become 'proper' PAMGuard data and be
shown in a table on the display but that not priority enough.
* Dialog packing
Fix a couple of dialogs which don't back well on HDPI monitors
* UDP Control
Added multiport functionality
commit 9a9f542d95b6cbc571d60a2250a2d4accf8dc4b3
Author: Douglas Gillespie <50671166+douggillespie@users.noreply.github.com>
Date: Thu Aug 4 11:42:45 2022 +0100
Merge DG to Main (#46)
* Variable sound output level
Mods to SoundPlayback module to allow additional parameters. Implemented
system for NI cards to allow changes to selected output voltage range
meaning output can be boosted to level higher than current default.
* Code to support nogui operations when no screens present on headless
system
* Fix problem of nogui headless operation trying to access screen size.
* Click detector display fixes
1. ICI not displaying correctly
2. Component sizes in display dialog on hres monitors
* Work on batch processing, after testing of options to autostart,
autoexit and set wav file folder, database and binary store.
* Update MHTClickTrainAlgorithm.java
Fix unsynchronised access to a datablock in click train detector which was causing index errors.
* Revamp of offline process messaging and control
Includes some databsae logging of completed tasks
* Offline task logging
Bit more work, including notes and database storage of task
reprocessing. Guess this could all become 'proper' PAMGuard data and be
shown in a table on the display but that not priority enough.
* Dialog packing
Fix a couple of dialogs which don't back well on HDPI monitors
* UDP Control
Added multiport functionality
commit 49cd547aee3e4366e1aaa51b8fe7418199c2ad73
Author: Douglas Gillespie <50671166+douggillespie@users.noreply.github.com>
Date: Thu Aug 4 11:40:29 2022 +0100
Merge DG branch (#45)
* Variable sound output level
Mods to SoundPlayback module to allow additional parameters. Implemented
system for NI cards to allow changes to selected output voltage range
meaning output can be boosted to level higher than current default.
* Code to support nogui operations when no screens present on headless
system
* Fix problem of nogui headless operation trying to access screen size.
* Click detector display fixes
1. ICI not displaying correctly
2. Component sizes in display dialog on hres monitors
* Work on batch processing, after testing of options to autostart,
autoexit and set wav file folder, database and binary store.
* Update MHTClickTrainAlgorithm.java
Fix unsynchronised access to a datablock in click train detector which was causing index errors.
* Revamp of offline process messaging and control
Includes some databsae logging of completed tasks
* Offline task logging
Bit more work, including notes and database storage of task
reprocessing. Guess this could all become 'proper' PAMGuard data and be
shown in a table on the display but that not priority enough.
* Dialog packing
Fix a couple of dialogs which don't back well on HDPI monitors
* UDP Control
Added multiport functionality
commit 016cfd0da54021dcbe787f0a20856604b81bf7af
Author: Douglas Gillespie <50671166+douggillespie@users.noreply.github.com>
Date: Thu Aug 4 11:35:06 2022 +0100
Dialog positioning
New functions to better positions dialogs on screen
commit c9f2ab3e97ec289ee8c1bcfe4531c84f77ee7fa8
Author: Douglas Gillespie <50671166+douggillespie@users.noreply.github.com>
Date: Mon Aug 1 11:13:24 2022 +0100
puch to main (#44)
* Variable sound output level
Mods to SoundPlayback module to allow additional parameters. Implemented
system for NI cards to allow changes to selected output voltage range
meaning output can be boosted to level higher than current default.
* Code to support nogui operations when no screens present on headless
system
* Fix problem of nogui headless operation trying to access screen size.
* Click detector display fixes
1. ICI not displaying correctly
2. Component sizes in display dialog on hres monitors
* Work on batch processing, after testing of options to autostart,
autoexit and set wav file folder, database and binary store.
* Update MHTClickTrainAlgorithm.java
Fix unsynchronised access to a datablock in click train detector which was causing index errors.
* Revamp of offline process messaging and control
Includes some databsae logging of completed tasks
* Offline task logging
Bit more work, including notes and database storage of task
reprocessing. Guess this could all become 'proper' PAMGuard data and be
shown in a table on the display but that not priority enough.
* Dialog packing
Fix a couple of dialogs which don't back well on HDPI monitors
commit 55f5a3fcf12c6c8a727318a17f9dece401adc9f3
Author: Douglas Gillespie <50671166+douggillespie@users.noreply.github.com>
Date: Mon Aug 1 10:59:36 2022 +0100
Group detections menu
Small changes to limit the number of menu items in "Add to existing
group" to a maximum of 25 entries.
commit b3f6c0e6657de91a7e015a48f5f218f60f23c5f5
Author: Douglas Gillespie <50671166+douggillespie@users.noreply.github.com>
Date: Fri Jul 29 10:50:45 2022 +0100
Handle -nogui option in PamWorker
PamWorker used to catalog files at startup (if a file folder input
system is used). This creates a progress dialog. Stop it appearing in
-nogui operations.
commit 8569b6b579659cba8229596e91c35355bc5ed61b
Author: Douglas Gillespie <50671166+douggillespie@users.noreply.github.com>
Date: Fri Jul 22 08:30:47 2022 +0100
Click display fixes (#41)
* Variable sound output level
Mods to SoundPlayback module to allow additional parameters. Implemented
system for NI cards to allow changes to selected output voltage range
meaning output can be boosted to level higher than current default.
* Code to support nogui operations when no screens present on headless
system
* Fix problem of nogui headless operation trying to access screen size.
* Click detector display fixes
1. ICI not displaying correctly
2. Component sizes in display dialog on hres monitors
commit 128a512ff60c26b5acedd76de96c0905c6bf27ae
Author: Douglas Gillespie <50671166+douggillespie@users.noreply.github.com>
Date: Tue Jul 19 16:37:57 2022 +0100
Another attempt at stopping it crashing on a headless system
Dealing with displays that get created for clickangle vetos and a call
to the gui in the click train detector.
commit 6eaa6e4978b2483e5828ca4a3914c58d7a9cfe2d
Author: Douglas Gillespie <50671166+douggillespie@users.noreply.github.com>
Date: Tue Jul 19 08:20:07 2022 +0100
nogoi fix for headless systems. (#40)
* Variable sound output level
Mods to SoundPlayback module to allow additional parameters. Implemented
system for NI cards to allow changes to selected output voltage range
meaning output can be boosted to level higher than current default.
* Code to support nogui operations when no screens present on headless
system
* Fix problem of nogui headless operation trying to access screen size.
commit 9fdd30556bf391428e1d3f2f9e91dbbdf771fa84
Author: Douglas Gillespie <50671166+douggillespie@users.noreply.github.com>
Date: Tue Jul 12 15:53:07 2022 +0100
Variable sound output level (#39)
Mods to SoundPlayback module to allow additional parameters. Implemented
system for NI cards to allow changes to selected output voltage range
meaning output can be boosted to level higher than current default.
* Bug fixes to click train detector
Fixed bug with number of coasts in the MHT Kernel
Added an option for amplitude to have a maximum
Removed print statements.
* Bug fix for click train logging
The size of the string classifers field was dynamically set - this was a bug.
* Bug fixes to the click train detector
Bearing classifier section now updates properly when dialog reopened
Fixed rare bug when garbage bot attempts to find the last data unit in a list of zero units.
* Squashed commit of the following:
commit 5a37bfe915925ea2307dd09928538c7e639ca52c
Author: Douglas Gillespie <50671166+douggillespie@users.noreply.github.com>
Date: Fri Aug 19 08:17:06 2022 +0100
Changes from DG branch (#50)
* Variable sound output level
Mods to SoundPlayback module to allow additional parameters. Implemented
system for NI cards to allow changes to selected output voltage range
meaning output can be boosted to level higher than current default.
* Code to support nogui operations when no screens present on headless
system
* Fix problem of nogui headless operation trying to access screen size.
* Click detector display fixes
1. ICI not displaying correctly
2. Component sizes in display dialog on hres monitors
* Work on batch processing, after testing of options to autostart,
autoexit and set wav file folder, database and binary store.
* Update MHTClickTrainAlgorithm.java
Fix unsynchronised access to a datablock in click train detector which was causing index errors.
* Revamp of offline process messaging and control
Includes some databsae logging of completed tasks
* Offline task logging
Bit more work, including notes and database storage of task
reprocessing. Guess this could all become 'proper' PAMGuard data and be
shown in a table on the display but that not priority enough.
* Dialog packing
Fix a couple of dialogs which don't back well on HDPI monitors
* UDP Control
Added multiport functionality
* Java version
Changes unpacker to deal with non numeric characters on Linux
* Fix to getVersion()
So new version of this command should now work on Linux and Windows.
* Multiport test
Quick tester for multiport comms
* Spectrogram display
Stop spectrogram display continually recreating panels since it was
unsubscribing discarded ones and sometimes causing crash in observable
notifications.
* Backup manager bug
Error if no database. Fixed.
commit b08e86e330c5ca2de4b6902eb7ec514f47278a7c
Author: Jamie Mac
Date: Wed Aug 17 09:16:52 2022 +0100
Bug fix for click train detector (#49)
* Updates to click train detector
New GUI for click train classification - more intuitive and allows users to build more powerful classifiers.
CPOD data can now build average waveforms.
CPOD click trains can be viewed in TDisplayFX pop up menu displays
Fixed Peak Frequency symbol chooser so it saves the colour box settings
* Create click_train_help.md
* Update click_train_help.md
* Screenshots
* Update click_train_help.md
* Update click_train_help.md
* Update click_train_help.md
* More screenshots
* Add screenshots
* Update click_train_help.md
* Add classifier screenshot
* Update click_train_help.md
* Update click_train_help.md
* Update click_train_help.md
* Updates and bug fixes to click train detector and CPOD importer
* Update click_train_help.md
* Update POM with latest jdl4pam
* Add screenshots for click train detector help
* Screenshots
* Update click_train_help.md
* Defult option for CPOD and porpoise to click train detector.
Also a minor
* Update pom.xml
* Bug fix for raw spectrogram in TDDisplayFX
* Update KetosClassifier.java
* Updates to click train detector
New GUI for click train classification - more intuitive and allows users to build more powerful classifiers.
CPOD data can now build average waveforms.
CPOD click trains can be viewed in TDisplayFX pop up menu displays
Fixed Peak Frequency symbol chooser so it saves the colour box settings
* Create click_train_help.md
* Update click_train_help.md
* Screenshots
* Update click_train_help.md
* More screenshots
* Update click_train_help.md
* Update click_train_help.md
* Add screenshots
* Add classifier screenshot
* Update click_train_help.md
* Updates and bug fixes to click train detector and CPOD importer
* Update click_train_help.md
* Update click_train_help.md
* Update click_train_help.md
* Update click_train_help.md
* Add screenshots for click train detector help
* Screenshots
* Update click_train_help.md
* Defult option for CPOD and porpoise to click train detector.
Also a minor
* Bug fix for raw spectrogram in TDDisplayFX
* Update KetosClassifier.java
* Fix standard classifier JSON logging
* Update click_train_help.md
* Fixed bug in sweep classifier when using SoundTrap click detections
* Added some colour averaging in the TFDisplayFX spectrgoram
* Bug fix for rainbow click bearings
Bug fix when rainbow clicks are imported mean bearings cannot be calculated - was an array size issue in DelayGroup
* Google humpback whale deep learning classifier
Google's humpback whale deep learning classifier can now be imported.
Updated TDisplayFX to make the data selection panes cleaner and clearer.
Updated the TDisplayFX so that predicitons from deep learning models now have some display options e.g. changing colour.
* Updated the prediction plots on time display
Deep learning prediciton plots on the time display have now been updated to have some colour options and also act as a legend.
* Updates to TDisplayFX
yFIshmael now owrks with TDisplayFX
TDisplayFX UI changes to make simpler.
Some abstraction for drawing lines on TDisplayFX
* Updates to click train detector
New GUI for click train classification - more intuitive and allows users to build more powerful classifiers.
CPOD data can now build average waveforms.
CPOD click trains can be viewed in TDisplayFX pop up menu displays
Fixed Peak Frequency symbol chooser so it saves the colour box settings
* Create click_train_help.md
* Update click_train_help.md
* Screenshots
* Update click_train_help.md
* More screenshots
* Update click_train_help.md
* Update click_train_help.md
* Add screenshots
* Add classifier screenshot
* Update click_train_help.md
* Updates and bug fixes to click train detector and CPOD importer
* Update click_train_help.md
* Update click_train_help.md
* Update click_train_help.md
* Update click_train_help.md
* Add screenshots for click train detector help
* Screenshots
* Update click_train_help.md
* Defult option for CPOD and porpoise to click train detector.
Also a minor
* Updates to click train detector
New GUI for click train classification - more intuitive and allows users to build more powerful classifiers.
CPOD data can now build average waveforms.
CPOD click trains can be viewed in TDisplayFX pop up menu displays
Fixed Peak Frequency symbol chooser so it saves the colour box settings
* Create click_train_help.md
* Update click_train_help.md
* Update click_train_help.md
* Updates and bug fixes to click train detector and CPOD importer
* Bug fix for raw spectrogram in TDDisplayFX
* Update KetosClassifier.java
* Fix standard classifier JSON logging
* Fixed bug in sweep classifier when using SoundTrap click detections
* Added some colour averaging in the TFDisplayFX spectrgoram
* Bug fix for rainbow click bearings
Bug fix when rainbow clicks are imported mean bearings cannot be calculated - was an array size issue in DelayGroup
* Google humpback whale deep learning classifier
Google's humpback whale deep learning classifier can now be imported.
Updated TDisplayFX to make the data selection panes cleaner and clearer.
Updated the TDisplayFX so that predicitons from deep learning models now have some display options e.g. changing colour.
* Updated the prediction plots on time display
Deep learning prediciton plots on the time display have now been updated to have some colour options and also act as a legend.
* Updates to TDisplayFX
yFIshmael now owrks with TDisplayFX
TDisplayFX UI changes to make simpler.
Some abstraction for drawing lines on TDisplayFX
* Merge fixes to click train detector
* Bug fix to UI
* Updates to FX GUI
* Updates to click train detector
New GUI for click train classification - more intuitive and allows users to build more powerful classifiers.
CPOD data can now build average waveforms.
CPOD click trains can be viewed in TDisplayFX pop up menu displays
Fixed Peak Frequency symbol chooser so it saves the colour box settings
* Screenshots
* Updates and bug fixes to click train detector and CPOD importer
* Updates to click train detector
New GUI for click train classification - more intuitive and allows users to build more powerful classifiers.
CPOD data can now build average waveforms.
CPOD click trains can be viewed in TDisplayFX pop up menu displays
Fixed Peak Frequency symbol chooser so it saves the colour box settings
* Updates and bug fixes to click train detector and CPOD importer
* Fix standard classifier JSON logging
* Merge fixes to click train detector
* Updates to click train detector
New GUI for click train classification - more intuitive and allows users to build more powerful classifiers.
CPOD data can now build average waveforms.
CPOD click trains can be viewed in TDisplayFX pop up menu displays
Fixed Peak Frequency symbol chooser so it saves the colour box settings
* Screenshots
* Updates and bug fixes to click train detector and CPOD importer
* Updates to click train detector
New GUI for click train classification - more intuitive and allows users to build more powerful classifiers.
CPOD data can now build average waveforms.
CPOD click trains can be viewed in TDisplayFX pop up menu displays
Fixed Peak Frequency symbol chooser so it saves the colour box settings
* Screenshots
* Updates and bug fixes to click train detector and CPOD importer
* Fix standard classifier JSON logging
* Google humpback whale deep learning classifier
Google's humpback whale deep learning classifier can now be imported.
Updated TDisplayFX to make the data selection panes cleaner and clearer.
Updated the TDisplayFX so that predicitons from deep learning models now have some display options e.g. changing colour.
* Bug fix to UI
* Bug fixes to FX GUI
* Updates to click train detector
* Squashed commit of the following:
commit 9f998165ee95dbb16acaf420876f3aeab75c2158
Author: Douglas Gillespie <50671166+douggillespie@users.noreply.github.com>
Date: Mon May 2 19:40:24 2022 +0100
Updates to support ContactCollator plugin (#33)
* Change synchronization on RawDataTransforms soit uses the owner data
holder, not itself for synchronization. Otherwise you get thread locks.
* fix problem in SummaryComand
* Update command line options
* Change synchronization on RawDataTransforms soit uses the owner data
holder, not itself for synchronization. Otherwise you get thread locks.
* Update command line options
* Update DecimatorParams.java
* couple of updates to support new contact collator plugin
* Sorting out sample rate info in clip display to support Contact Collator
plugin
* FLAC Speed
Improve flac speed
* Update .gitignore
* Update .gitignore
* Updates to support new features in Contact Collator
* Small update to RawDatautils to handle null data
* Updates to click train detector
* Squashed commit of the following:
commit 62b020b3204aa56189b1c2da88bcbb9f49140936
Author: Douglas Gillespie <50671166+douggillespie@users.noreply.github.com>
Date: Sat May 14 06:52:20 2022 +0100
Add a new offlinefileslist function
commit 3a9a5311aa529b66340f6ae322f88905b911947a
Author: Douglas Gillespie <50671166+douggillespie@users.noreply.github.com>
Date: Wed Apr 27 09:43:31 2022 +0100
Update .gitignore
commit 9f998165ee95dbb16acaf420876f3aeab75c2158
Author: Douglas Gillespie <50671166+douggillespie@users.noreply.github.com>
Date: Mon May 2 19:40:24 2022 +0100
Updates to support ContactCollator plugin (#33)
* Change synchronization on RawDataTransforms soit uses the owner data
holder, not itself for synchronization. Otherwise you get thread locks.
* fix problem in SummaryComand
* Update command line options
* Change synchronization on RawDataTransforms soit uses the owner data
holder, not itself for synchronization. Otherwise you get thread locks.
* Update command line options
* Update DecimatorParams.java
* couple of updates to support new contact collator plugin
* Sorting out sample rate info in clip display to support Contact Collator
plugin
* FLAC Speed
Improve flac speed
* Update .gitignore
* Update .gitignore
* Updates to support new features in Contact Collator
* Small update to RawDatautils to handle null data
* Updated data selector for click train detector
* Click train detector updates and bug fixes
Fixed very annoying bug which meant templates did not show properly when the dialog was first opened in swing.
Added feature to simple classifier were % of clicks of one click classification (or other data selector paramter) can be used to classify.
* Bug fix and improvements for Ketos
Ketos models now automatically set the correct sample length when loaded.
Bug fix for the TDisplayFX - null pointer exception if no class names loaded and sorted recently introduced bug in drawing predictions.
* Updates to deep learning and FX GUI
Added some more example sounds to deep learning UI.
Updated click detector in the FX GUI.
* PAMGuard FX sound output update
* Updates to FX GUI
* Updates to FX GUI
* Update RawDataTransforms.java
* Fixes to FX UI
* Squashed commit of the following:
commit 11ba8bf91e1cd55e4305c4060a379f9ff0c58c4d
Author: Douglas Gillespie <50671166+douggillespie@users.noreply.github.com>
Date: Thu Aug 4 11:45:47 2022 +0100
MErge from DG Branch (#47)
* Variable sound output level
Mods to SoundPlayback module to allow additional parameters. Implemented
system for NI cards to allow changes to selected output voltage range
meaning output can be boosted to level higher than current default.
* Code to support nogui operations when no screens present on headless
system
* Fix problem of nogui headless operation trying to access screen size.
* Click detector display fixes
1. ICI not displaying correctly
2. Component sizes in display dialog on hres monitors
* Work on batch processing, after testing of options to autostart,
autoexit and set wav file folder, database and binary store.
* Update MHTClickTrainAlgorithm.java
Fix unsynchronised access to a datablock in click train detector which was causing index errors.
* Revamp of offline process messaging and control
Includes some databsae logging of completed tasks
* Offline task logging
Bit more work, including notes and database storage of task
reprocessing. Guess this could all become 'proper' PAMGuard data and be
shown in a table on the display but that not priority enough.
* Dialog packing
Fix a couple of dialogs which don't back well on HDPI monitors
* UDP Control
Added multiport functionality
commit 9a9f542d95b6cbc571d60a2250a2d4accf8dc4b3
Author: Douglas Gillespie <50671166+douggillespie@users.noreply.github.com>
Date: Thu Aug 4 11:42:45 2022 +0100
Merge DG to Main (#46)
* Variable sound output level
Mods to SoundPlayback module to allow additional parameters. Implemented
system for NI cards to allow changes to selected output voltage range
meaning output can be boosted to level higher than current default.
* Code to support nogui operations when no screens present on headless
system
* Fix problem of nogui headless operation trying to access screen size.
* Click detector display fixes
1. ICI not displaying correctly
2. Component sizes in display dialog on hres monitors
* Work on batch processing, after testing of options to autostart,
autoexit and set wav file folder, database and binary store.
* Update MHTClickTrainAlgorithm.java
Fix unsynchronised access to a datablock in click train detector which was causing index errors.
* Revamp of offline process messaging and control
Includes some databsae logging of completed tasks
* Offline task logging
Bit more work, including notes and database storage of task
reprocessing. Guess this could all become 'proper' PAMGuard data and be
shown in a table on the display but that not priority enough.
* Dialog packing
Fix a couple of dialogs which don't back well on HDPI monitors
* UDP Control
Added multiport functionality
commit 49cd547aee3e4366e1aaa51b8fe7418199c2ad73
Author: Douglas Gillespie <50671166+douggillespie@users.noreply.github.com>
Date: Thu Aug 4 11:40:29 2022 +0100
Merge DG branch (#45)
* Variable sound output level
Mods to SoundPlayback module to allow additional parameters. Implemented
system for NI cards to allow changes to selected output voltage range
meaning output can be boosted to level higher than current default.
* Code to support nogui operations when no screens present on headless
system
* Fix problem of nogui headless operation trying to access screen size.
* Click detector display fixes
1. ICI not displaying correctly
2. Component sizes in display dialog on hres monitors
* Work on batch processing, after testing of options to autostart,
autoexit and set wav file folder, database and binary store.
* Update MHTClickTrainAlgorithm.java
Fix unsynchronised access to a datablock in click train detector which was causing index errors.
* Revamp of offline process messaging and control
Includes some databsae logging of completed tasks
* Offline task logging
Bit more work, including notes and database storage of task
reprocessing. Guess this could all become 'proper' PAMGuard data and be
shown in a table on the display but that not priority enough.
* Dialog packing
Fix a couple of dialogs which don't back well on HDPI monitors
* UDP Control
Added multiport functionality
commit 016cfd0da54021dcbe787f0a20856604b81bf7af
Author: Douglas Gillespie <50671166+douggillespie@users.noreply.github.com>
Date: Thu Aug 4 11:35:06 2022 +0100
Dialog positioning
New functions to better positions dialogs on screen
commit c9f2ab3e97ec289ee8c1bcfe4531c84f77ee7fa8
Author: Douglas Gillespie <50671166+douggillespie@users.noreply.github.com>
Date: Mon Aug 1 11:13:24 2022 +0100
puch to main (#44)
* Variable sound output level
Mods to SoundPlayback module to allow additional parameters. Implemented
system for NI cards to allow changes to selected output voltage range
meaning output can be boosted to level higher than current default.
* Code to support nogui operations when no screens present on headless
system
* Fix problem of nogui headless operation trying to access screen size.
* Click detector display fixes
1. ICI not displaying correctly
2. Component sizes in display dialog on hres monitors
* Work on batch processing, after testing of options to autostart,
autoexit and set wav file folder, database and binary store.
* Update MHTClickTrainAlgorithm.java
Fix unsynchronised access to a datablock in click train detector which was causing index errors.
* Revamp of offline process messaging and control
Includes some databsae logging of completed tasks
* Offline task logging
Bit more work, including notes and database storage of task
reprocessing. Guess this could all become 'proper' PAMGuard data and be
shown in a table on the display but that not priority enough.
* Dialog packing
Fix a couple of dialogs which don't back well on HDPI monitors
commit 55f5a3fcf12c6c8a727318a17f9dece401adc9f3
Author: Douglas Gillespie <50671166+douggillespie@users.noreply.github.com>
Date: Mon Aug 1 10:59:36 2022 +0100
Group detections menu
Small changes to limit the number of menu items in "Add to existing
group" to a maximum of 25 entries.
commit b3f6c0e6657de91a7e015a48f5f218f60f23c5f5
Author: Douglas Gillespie <50671166+douggillespie@users.noreply.github.com>
Date: Fri Jul 29 10:50:45 2022 +0100
Handle -nogui option in PamWorker
PamWorker used to catalog files at startup (if a file folder input
system is used). This creates a progress dialog. Stop it appearing in
-nogui operations.
commit 8569b6b579659cba8229596e91c35355bc5ed61b
Author: Douglas Gillespie <50671166+douggillespie@users.noreply.github.com>
Date: Fri Jul 22 08:30:47 2022 +0100
Click display fixes (#41)
* Variable sound output level
Mods to SoundPlayback module to allow additional parameters. Implemented
system for NI cards to allow changes to selected output voltage range
meaning output can be boosted to level higher than current default.
* Code to support nogui operations when no screens present on headless
system
* Fix problem of nogui headless operation trying to access screen size.
* Click detector display fixes
1. ICI not displaying correctly
2. Component sizes in display dialog on hres monitors
commit 128a512ff60c26b5acedd76de96c0905c6bf27ae
Author: Douglas Gillespie <50671166+douggillespie@users.noreply.github.com>
Date: Tue Jul 19 16:37:57 2022 +0100
Another attempt at stopping it crashing on a headless system
Dealing with displays that get created for clickangle vetos and a call
to the gui in the click train detector.
commit 6eaa6e4978b2483e5828ca4a3914c58d7a9cfe2d
Author: Douglas Gillespie <50671166+douggillespie@users.noreply.github.com>
Date: Tue Jul 19 08:20:07 2022 +0100
nogoi fix for headless systems. (#40)
* Variable sound output level
Mods to SoundPlayback module to allow additional parameters. Implemented
system for NI cards to allow changes to selected output voltage range
meaning output can be boosted to level higher than current default.
* Code to support nogui operations when no screens present on headless
system
* Fix problem of nogui headless operation trying to access screen size.
commit 9fdd30556bf391428e1d3f2f9e91dbbdf771fa84
Author: Douglas Gillespie <50671166+douggillespie@users.noreply.github.com>
Date: Tue Jul 12 15:53:07 2022 +0100
Variable sound output level (#39)
Mods to SoundPlayback module to allow additional parameters. Implemented
system for NI cards to allow changes to selected output voltage range
meaning output can be boosted to level higher than current default.
* Bug fixes to click train detector
Fixed bug with number of coasts in the MHT Kernel
Added an option for amplitude to have a maximum
Removed print statements.
* Bug fix for click train logging
The size of the string classifers field was dynamically set - this was a bug.
Co-authored-by: Douglas Gillespie <50671166+douggillespie@users.noreply.github.com>
commit ef0330173b5a9683fb79c9cb027b207a768ae30c
Author: Jamie Mac
Date: Mon Aug 8 10:32:19 2022 +0100
Click trian detector fixes (#48)
* Updates to click train detector
New GUI for click train classification - more intuitive and allows users to build more powerful classifiers.
CPOD data can now build average waveforms.
CPOD click trains can be viewed in TDisplayFX pop up menu displays
Fixed Peak Frequency symbol chooser so it saves the colour box settings
* Create click_train_help.md
* Update click_train_help.md
* Screenshots
* Update click_train_help.md
* Update click_train_help.md
* Update click_train_help.md
* More screenshots
* Add screenshots
* Update click_train_help.md
* Add classifier screenshot
* Update click_train_help.md
* Update click_train_help.md
* Update click_train_help.md
* Updates and bug fixes to click train detector and CPOD importer
* Update click_train_help.md
* Update POM with latest jdl4pam
* Add screenshots for click train detector help
* Screenshots
* Update click_train_help.md
* Defult option for CPOD and porpoise to click train detector.
Also a minor
* Update pom.xml
* Bug fix for raw spectrogram in TDDisplayFX
* Update KetosClassifier.java
* Updates to click train detector
New GUI for click train classification - more intuitive and allows users to build more powerful classifiers.
CPOD data can now build average waveforms.
CPOD click trains can be viewed in TDisplayFX pop up menu displays
Fixed Peak Frequency symbol chooser so it saves the colour box settings
* Create click_train_help.md
* Update click_train_help.md
* Screenshots
* Update click_train_help.md
* More screenshots
* Update click_train_help.md
* Update click_train_help.md
* Add screenshots
* Add classifier screenshot
* Update click_train_help.md
* Updates and bug fixes to click train detector and CPOD importer
* Update click_train_help.md
* Update click_train_help.md
* Update click_train_help.md
* Update click_train_help.md
* Add screenshots for click train detector help
* Screenshots
* Update click_train_help.md
* Defult option for CPOD and porpoise to click train detector.
Also a minor
* Bug fix for raw spectrogram in TDDisplayFX
* Update KetosClassifier.java
* Fix standard classifier JSON logging
* Update click_train_help.md
* Fixed bug in sweep classifier when using SoundTrap click detections
* Added some colour averaging in the TFDisplayFX spectrgoram
* Bug fix for rainbow click bearings
Bug fix when rainbow clicks are imported mean bearings cannot be calculated - was an array size issue in DelayGroup
* Google humpback whale deep learning classifier
Google's humpback whale deep learning classifier can now be imported.
Updated TDisplayFX to make the data selection panes cleaner and clearer.
Updated the TDisplayFX so that predicitons from deep learning models now have some display options e.g. changing colour.
* Updated the prediction plots on time display
Deep learning prediciton plots on the time display have now been updated to have some colour options and also act as a legend.
* Updates to TDisplayFX
yFIshmael now owrks with TDisplayFX
TDisplayFX UI changes to make simpler.
Some abstraction for drawing lines on TDisplayFX
* Updates to click train detector
New GUI for click train classification - more intuitive and allows users to build more powerful classifiers.
CPOD data can now build average waveforms.
CPOD click trains can be viewed in TDisplayFX pop up menu displays
Fixed Peak Frequency symbol chooser so it saves the colour box settings
* Create click_train_help.md
* Update click_train_help.md
* Screenshots
* Update click_train_help.md
* More screenshots
* Update click_train_help.md
* Update click_train_help.md
* Add screenshots
* Add classifier screenshot
* Update click_train_help.md
* Updates and bug fixes to click train detector and CPOD importer
* Update click_train_help.md
* Update click_train_help.md
* Update click_train_help.md
* Update click_train_help.md
* Add screenshots for click train detector help
* Screenshots
* Update click_train_help.md
* Defult option for CPOD and porpoise to click train detector.
Also a minor
* Updates to click train detector
New GUI for click train classification - more intuitive and allows users to build more powerful classifiers.
CPOD data can now build average waveforms.
CPOD click trains can be viewed in TDisplayFX pop up menu displays
Fixed Peak Frequency symbol chooser so it saves the colour box settings
* Create click_train_help.md
* Update click_train_help.md
* Update click_train_help.md
* Updates and bug fixes to click train detector and CPOD importer
* Bug fix for raw spectrogram in TDDisplayFX
* Update KetosClassifier.java
* Fix standard classifier JSON logging
* Fixed bug in sweep classifier when using SoundTrap click detections
* Added some colour averaging in the TFDisplayFX spectrgoram
* Bug fix for rainbow click bearings
Bug fix when rainbow clicks are imported mean bearings cannot be calculated - was an array size issue in DelayGroup
* Google humpback whale deep learning classifier
Google's humpback whale deep learning classifier can now be imported.
Updated TDisplayFX to make the data selection panes cleaner and clearer.
Updated the TDisplayFX so that predicitons from deep learning models now have some display options e.g. changing colour.
* Updated the prediction plots on time display
Deep learning prediciton plots on the time display have now been updated to have some colour options and also act as a legend.
* Updates to TDisplayFX
yFIshmael now owrks with TDisplayFX
TDisplayFX UI changes to make simpler.
Some abstraction for drawing lines on TDisplayFX
* Merge fixes to click train detector
* Bug fix to UI
* Updates to FX GUI
* Updates to click train detector
New GUI for click train classification - more intuitive and allows users to build more powerful classifiers.
CPOD data can now build average waveforms.
CPOD click trains can be viewed in TDisplayFX pop up menu displays
Fixed Peak Frequency symbol chooser so it saves the colour box settings
* Screenshots
* Updates and bug fixes to click train detector and CPOD importer
* Updates to click train detector
New GUI for click train classification - more intuitive and allows users to build more powerful classifiers.
CPOD data can now build average waveforms.
CPOD click trains can be viewed in TDisplayFX pop up menu displays
Fixed Peak Frequency symbol chooser so it saves the colour box settings
* Updates and bug fixes to click train detector and CPOD importer
* Fix standard classifier JSON logging
* Merge fixes to click train detector
* Updates to click train detector
New GUI for click train classification - more intuitive and allows users to build more powerful classifiers.
CPOD data can now build average waveforms.
CPOD click trains can be viewed in TDisplayFX pop up menu displays
Fixed Peak Frequency symbol chooser so it saves the colour box settings
* Screenshots
* Updates and bug fixes to click train detector and CPOD importer
* Updates to click train detector
New GUI for click train classification - more intuitive and allows users to build more powerful classifiers.
CPOD data can now build average waveforms.
CPOD click trains can be viewed in TDisplayFX pop up menu displays
Fixed Peak Frequency symbol chooser so it saves the colour box settings
* Screenshots
* Updates and bug fixes to click train detector and CPOD importer
* Fix standard classifier JSON logging
* Google humpback whale deep learning classifier
Google's humpback whale deep learning classifier can now be imported.
Updated TDisplayFX to make the data selection panes cleaner and clearer.
Updated the TDisplayFX so that predicitons from deep learning models now have some display options e.g. changing colour.
* Bug fix to UI
* Bug fixes to FX GUI
* Updates to click train detector
* Squashed commit of the following:
commit 9f998165ee95dbb16acaf420876f3aeab75c2158
Author: Douglas Gillespie <50671166+douggillespie@users.noreply.github.com>
Date: Mon May 2 19:40:24 2022 +0100
Updates to support ContactCollator plugin (#33)
* Change synchronization on RawDataTransforms soit uses the owner data
holder, not itself for synchronization. Otherwise you get thread locks.
* fix problem in SummaryComand
* Update command line options
* Change synchronization on RawDataTransforms soit uses the owner data
holder, not itself for synchronization. Otherwise you get thread locks.
* Update command line options
* Update DecimatorParams.java
* couple of updates to support new contact collator plugin
* Sorting out sample rate info in clip display to support Contact Collator
plugin
* FLAC Speed
Improve flac speed
* Update .gitignore
* Update .gitignore
* Updates to support new features in Contact Collator
* Small update to RawDatautils to handle null data
* Updates to click train detector
* Squashed commit of the following:
commit 62b020b3204aa56189b1c2da88bcbb9f49140936
Author: Douglas Gillespie <50671166+douggillespie@users.noreply.github.com>
Date: Sat May 14 06:52:20 2022 +0100
Add a new offlinefileslist function
commit 3a9a5311aa529b66340f6ae322f88905b911947a
Author: Douglas Gillespie <50671166+douggillespie@users.noreply.github.com>
Date: Wed Apr 27 09:43:31 2022 +0100
Update .gitignore
commit 9f998165ee95dbb16acaf420876f3aeab75c2158
Author: Douglas Gillespie <50671166+douggillespie@users.noreply.github.com>
Date: Mon May 2 19:40:24 2022 +0100
Updates to support ContactCollator plugin (#33)
* Change synchronization on RawDataTransforms soit uses the owner data
holder, not itself for synchronization. Otherwise you get thread locks.
* fix problem in SummaryComand
* Update command line options
* Change synchronization on RawDataTransforms soit uses the owner data
holder, not itself for synchronization. Otherwise you get thread locks.
* Update command line options
* Update DecimatorParams.java
* couple of updates to support new contact collator plugin
* Sorting out sample rate info in clip display to support Contact Collator
plugin
* FLAC Speed
Improve flac speed
* Update .gitignore
* Update .gitignore
* Updates to support new features in Contact Collator
* Small update to RawDatautils to handle null data
* Updated data selector for click train detector
* Click train detector updates and bug fixes
Fixed very annoying bug which meant templates did not show properly when the dialog was first opened in swing.
Added feature to simple classifier were % of clicks of one click classification (or other data selector paramter) can be used to classify.
* Bug fix and improvements for Ketos
Ketos models now automatically set the correct sample length when loaded.
Bug fix for the TDisplayFX - null pointer exception if no class names loaded and sorted recently introduced bug in drawing predictions.
* Updates to deep learning and FX GUI
Added some more example sounds to deep learning UI.
Updated click detector in the FX GUI.
* PAMGuard FX sound output update
* Updates to FX GUI
* Updates to FX GUI
* Update RawDataTransforms.java
* Fixes to FX UI
* Squashed commit of the following:
commit 11ba8bf91e1cd55e4305c4060a379f9ff0c58c4d
Author: Douglas Gillespie <50671166+…
Co-authored-by: Douglas Gillespie <50671166+douggillespie@users.noreply.github.com>
---
src/clickDetector/ClickAlarmManager.java | 1 +
.../basicSweep/SweepClassifier.java | 1 +
.../mht/test/ExampleClickTrains.java | 8 +-
.../TemplateSpectrumPane.java | 11 +-
.../MLExport/MLDetectionsManager.java | 23 +++-
.../MLExport/MLExportOverlayMenu.java | 6 +-
.../menuOptions/MLExport/MLRawExport.java | 2 +-
.../ImportTemplateMAT.java | 120 +++++++++++++++---
.../MatchTemplate.java | 2 +-
.../MatchedTemplateParams.java | 2 +-
.../layoutFX/MTClassifierPane.java | 5 +-
.../matched_click_classifer_help.md | 110 ++++++++++++++++
.../resources/exporting_mat_clicks.png | Bin 0 -> 167908 bytes
.../resources/matched_click_bt_display.png | Bin 0 -> 1439320 bytes
.../matched_click_dialog_summary.png | Bin 0 -> 719222 bytes
.../matched_click_tdisplay_example.png | Bin 0 -> 644185 bytes
.../genericModel/DLModelWorker.java | 6 +-
17 files changed, 262 insertions(+), 35 deletions(-)
create mode 100644 src/matchedTemplateClassifer/matched_click_classifer_help.md
create mode 100644 src/matchedTemplateClassifer/resources/exporting_mat_clicks.png
create mode 100644 src/matchedTemplateClassifer/resources/matched_click_bt_display.png
create mode 100644 src/matchedTemplateClassifer/resources/matched_click_dialog_summary.png
create mode 100644 src/matchedTemplateClassifer/resources/matched_click_tdisplay_example.png
diff --git a/src/clickDetector/ClickAlarmManager.java b/src/clickDetector/ClickAlarmManager.java
index e82782ee..d4572cf6 100644
--- a/src/clickDetector/ClickAlarmManager.java
+++ b/src/clickDetector/ClickAlarmManager.java
@@ -107,6 +107,7 @@ public class ClickAlarmManager extends PamProcess {
ClickDetection cd = (ClickDetection) arg;
// System.out.println("ClickAlarm hashcode, time = " + System.identityHashCode(arg) + "," + cd.getTimeMilliseconds() + "," + cd.getClickType() );
if (cd.getClickType()!=0) {
+
ClickTypeCommonParams commonParams = clickControl.getClickIdentifier().getCommonParams(cd.getClickType());
if (commonParams==null) return;
diff --git a/src/clickDetector/ClickClassifiers/basicSweep/SweepClassifier.java b/src/clickDetector/ClickClassifiers/basicSweep/SweepClassifier.java
index d257e900..dfb742d1 100644
--- a/src/clickDetector/ClickClassifiers/basicSweep/SweepClassifier.java
+++ b/src/clickDetector/ClickClassifiers/basicSweep/SweepClassifier.java
@@ -142,6 +142,7 @@ public class SweepClassifier implements ClickIdentifier , PamSettings {
@Override
public ClickTypeCommonParams getCommonParams(int code) {
int codeIdx = codeToListIndex(code);
+ if (codeIdx<0 || codeIdx>=sweepClassifierParameters.getNumSets()) return null;
return sweepClassifierParameters.getSet(codeIdx);
}
diff --git a/src/clickTrainDetector/clickTrainAlgorithms/mht/test/ExampleClickTrains.java b/src/clickTrainDetector/clickTrainAlgorithms/mht/test/ExampleClickTrains.java
index f58ef5e9..ade0870a 100644
--- a/src/clickTrainDetector/clickTrainAlgorithms/mht/test/ExampleClickTrains.java
+++ b/src/clickTrainDetector/clickTrainAlgorithms/mht/test/ExampleClickTrains.java
@@ -82,16 +82,16 @@ public class ExampleClickTrains {
String path = null;
switch (type) {
case SIMCLICKS_1:
- path = masterPath + "\\" + "simtrains_1.mat";
+ path = masterPath + File.separator + "simtrains_1.mat";
break;
case SIMCLICKS_2:
- path = masterPath + "\\" + "simtrains_2.mat";
+ path = masterPath + File.separator + "simtrains_2.mat";
break;
case DOLPHINS_ST:
- path = masterPath + "\\" + "20190801_212731_clicks_dolphins_ST.mat";
+ path = masterPath + File.separator + "20190801_212731_clicks_dolphins_ST.mat";
break;
case SIMCLICKS_3:
- path = masterPath + "\\" + "simtrains_3_corr.mat";
+ path = masterPath + File.separator + "simtrains_3_corr.mat";
break;
}
File file = new File(path);
diff --git a/src/clickTrainDetector/layout/classification/templateClassifier/TemplateSpectrumPane.java b/src/clickTrainDetector/layout/classification/templateClassifier/TemplateSpectrumPane.java
index 7def1c3c..ab4af7c6 100644
--- a/src/clickTrainDetector/layout/classification/templateClassifier/TemplateSpectrumPane.java
+++ b/src/clickTrainDetector/layout/classification/templateClassifier/TemplateSpectrumPane.java
@@ -217,14 +217,16 @@ public class TemplateSpectrumPane extends PamBorderPane {
* @param file - the file to open.
*/
private MatchTemplate openFile(File file) {
+ try {
MatchTemplate template = null;
String extension = getFileExtension(file);
for (int i=0; i< this.templateImporters.size(); i++) {
for (int j=0; j list = new ArrayList();
+
+ //keep a track of the data units that have been transcribed. This means data units that are multiple types
+ //(e.g. a raw data holder and click) are not added to two different list of structures.
+ boolean[] alreadyStruct = new boolean[dataUnits.size()];
+
//iterate through possible export functions.
for (int i=0; i=1) list.add(mlStructure);
+
+ if (n>=1) {
+ list.add(mlStructure);
+ list.add(new MLDouble((mlDataUnitsExport.get(i).getName()+"_sR"), new double[] {sampleRate}, 1));
+ }
+
}
+
+
//now ready to save.
return list;
diff --git a/src/dataPlotsFX/overlaymark/menuOptions/MLExport/MLExportOverlayMenu.java b/src/dataPlotsFX/overlaymark/menuOptions/MLExport/MLExportOverlayMenu.java
index eecc9850..f185529f 100644
--- a/src/dataPlotsFX/overlaymark/menuOptions/MLExport/MLExportOverlayMenu.java
+++ b/src/dataPlotsFX/overlaymark/menuOptions/MLExport/MLExportOverlayMenu.java
@@ -139,13 +139,13 @@ public class MLExportOverlayMenu extends ExportOverlayMenu {
//create the filename;
long millisStart=foundDataUnits.getFirstTimeMillis();
String currentPath = PamCalendar.formatFileDateTime(millisStart, false);
- //add data types to the filen,ae
- for (int i=0 ;i{
@Override
public String getName() {
- return "pam_data_units";
+ return "raw_data_units";
}
}
diff --git a/src/matchedTemplateClassifer/ImportTemplateMAT.java b/src/matchedTemplateClassifer/ImportTemplateMAT.java
index c246b0d2..6b905042 100644
--- a/src/matchedTemplateClassifer/ImportTemplateMAT.java
+++ b/src/matchedTemplateClassifer/ImportTemplateMAT.java
@@ -6,6 +6,7 @@ import java.io.IOException;
import com.jmatio.io.MatFileReader;
import com.jmatio.types.MLDouble;
+import com.jmatio.types.MLStructure;
/**
@@ -25,23 +26,114 @@ public class ImportTemplateMAT implements TemplateImport {
@Override
public MatchTemplate importTemplate(File filePath){
-
+ errorCode = 0; //reset error code
try {
//System.out.println("Import MAT file waveform");
- //the matlab file reader.
+ //the MATLAB file reader.
mfr = new MatFileReader(filePath);
- MLDouble sampleRateML = (MLDouble) mfr.getMLArray("sR");
+
+ MatchTemplate matchTemplate;
- MLDouble waveformML = (MLDouble) mfr.getMLArray("waveform");
- if (waveformML==null) waveformML = (MLDouble) mfr.getMLArray("spectrum"); //might be a spectrum
+ //try standard template first
+ matchTemplate = getTemplateStandard(mfr);
- if (sampleRateML==null || waveformML==null) {
+ //use the first click from a structure of clicks.
+ if (matchTemplate == null && errorCode==0) {
+ matchTemplate = getTemplateStruct(mfr);
+ }
+
+ //if the match template is still null then the file is the wrong format.
+ if (matchTemplate == null && errorCode==0) {
errorCode=TemplateImport.INCORRECT_FILE_FORMAT;
- return null;
+ return null;
}
+ matchTemplate.name = filePath.getName();
+
+ return matchTemplate;
+
+
+ } catch (FileNotFoundException e) {
+ e.printStackTrace();
+ } catch (IOException e) {
+ e.printStackTrace();
+ }
+ catch (Exception e) {
+ e.printStackTrace();
+ }
+
+ return null;
+ }
+
+ /**
+ * Get a template which has a simple sR and waveform field.
+ * @param mfr - .mat file reader.
+ * @return the match template.
+ */
+ private MatchTemplate getTemplateStruct(MatFileReader mfr2) {
+
+ //the MATLAB file reader.
+ MLStructure clicksStruct = (MLStructure) mfr.getMLArray("clicks");
+ MLDouble sampleRateML = (MLDouble) mfr.getMLArray("clicks_sR");
+
+
+
+ if (clicksStruct==null) {
+ clicksStruct = (MLStructure) mfr.getMLArray("raw_data_units");
+ sampleRateML = (MLDouble) mfr.getMLArray("raw_data_units_sR");
+ }
+
+
+
+ if (sampleRateML==null || clicksStruct==null) {
+ return null;
+ }
+
+ MLDouble waveML = (MLDouble) clicksStruct.getField("wave", 0);
+ double[][] waveform = waveML.getArray();
+
+
+ MatchTemplate matchedTemplate = new MatchTemplate(null, waveform[0], (float) sampleRateML.get(0).doubleValue());
+
+
+ return matchedTemplate;
+
+ }
+
+
+ /**
+ * Get a template which has a simple sR and waveform field.
+ * @param mfr - .mat file reader.
+ * @return the match template.
+ */
+ private MatchTemplate getTemplateStandard(MatFileReader mfr) {
+
+ //System.out.println("Import MAT file waveform");
+
+
+
+ //the MATLAB file reader.
+ MLDouble sampleRateML = (MLDouble) mfr.getMLArray("sR");
+ if (sampleRateML==null) sampleRateML = (MLDouble) mfr.getMLArray("sr"); //try a different name for the sample rate
+ if (sampleRateML==null) sampleRateML = (MLDouble) mfr.getMLArray("fs"); //try a different name for the sample rate
+ if (sampleRateML==null) sampleRateML = (MLDouble) mfr.getMLArray("samplerate"); //try a different name for the sample rate
+ if (sampleRateML==null) sampleRateML = (MLDouble) mfr.getMLArray("sample_rate"); //try a different name for the sample rate
+ if (sampleRateML==null) sampleRateML = (MLDouble) mfr.getMLArray("sampleRate"); //try a different name for the sample rate
+ if (sampleRateML==null) sampleRateML = (MLDouble) mfr.getMLArray("clicks_sR"); //try a different name for the sample rate
+
+
+ //get the waveform or spectrum
+ MLDouble waveformML = (MLDouble) mfr.getMLArray("waveform");
+
+ if (waveformML==null) waveformML = (MLDouble) mfr.getMLArray("wave"); //try a different name for the waveform
+ if (waveformML==null) waveformML = (MLDouble) mfr.getMLArray("spectrum"); //might be a spectrum
+
+
+ if (sampleRateML==null || waveformML==null) {
+ return null;
+ }
//import a wave in column or row dimension
int size = Math.max(waveformML.getM(), waveformML.getN());
@@ -55,23 +147,15 @@ public class ImportTemplateMAT implements TemplateImport {
for (int i = 0 ; iwaveformML.getN() ? waveformML.get(i, 0) : waveformML.get(0, i);
}
- float sR= new Double(sampleRateML.getArray()[0][0]).floatValue();
+ float sR= Float.valueOf((float) sampleRateML.getArray()[0][0]);
+
//now create waveform
// System.out.println("Create a waveform with " + waveform.length + " samples with a sample rate of "
// + sR + " Hz");
- MatchTemplate matchedTemplate = new MatchTemplate(filePath.getName(), waveform, sR);
+ MatchTemplate matchedTemplate = new MatchTemplate(null, waveform, sR);
return matchedTemplate;
- } catch (FileNotFoundException e) {
- // TODO Auto-generated catch block
- e.printStackTrace();
- } catch (IOException e) {
- // TODO Auto-generated catch block
- e.printStackTrace();
- }
-
- return null;
}
diff --git a/src/matchedTemplateClassifer/MatchTemplate.java b/src/matchedTemplateClassifer/MatchTemplate.java
index d8276e9c..7f758ddf 100644
--- a/src/matchedTemplateClassifer/MatchTemplate.java
+++ b/src/matchedTemplateClassifer/MatchTemplate.java
@@ -46,7 +46,7 @@ public class MatchTemplate implements RawDataHolder, Serializable, Cloneable, Ma
@Override
public String toString() {
- return super.toString() + " sR: " + sR + " waveform length: " + waveform + " " + name;
+ return super.toString() + " sR: " + sR + " waveform length: " + waveform == null ? "null waveform" : waveform.length + " " + name;
}
@Override
diff --git a/src/matchedTemplateClassifer/MatchedTemplateParams.java b/src/matchedTemplateClassifer/MatchedTemplateParams.java
index cfea7e6c..05f8b107 100644
--- a/src/matchedTemplateClassifer/MatchedTemplateParams.java
+++ b/src/matchedTemplateClassifer/MatchedTemplateParams.java
@@ -114,7 +114,7 @@ public class MatchedTemplateParams implements Serializable, Cloneable, ManagedPa
/**
* The number of bins to sample around.
*/
- public int restrictedBins=128;
+ public int restrictedBins=2048;
/**
* True to search for for wave peak and sample around it.
diff --git a/src/matchedTemplateClassifer/layoutFX/MTClassifierPane.java b/src/matchedTemplateClassifer/layoutFX/MTClassifierPane.java
index 1c927c73..73874e85 100644
--- a/src/matchedTemplateClassifer/layoutFX/MTClassifierPane.java
+++ b/src/matchedTemplateClassifer/layoutFX/MTClassifierPane.java
@@ -367,10 +367,11 @@ public class MTClassifierPane extends SettingsPane {
String extension = getFileExtension(file);
for (int i=0; i< this.templateImporters.size(); i++) {
for (int j=0; j Matched click classifier**_. The settings are split into the three sections, general settings, click waveform and click templates.
+
+
+ 
+
+
+_The settings pane of the matched click classifier_
+
+### General Settings
+
+The general settings allow for channel options, species ID and the default colours for classified clicks to be to be set.
+_
+Channel Options _allows users to define whether a single click from one channel, all clicks or an averaged click should be used to be used for classification in multi-channel situations. if there is only one channel then this makes no difference.
+
+_Click Type_ sets the number that defines the species ID. Make sure this is not the same as any of the species IDs in the default click classifier (this is why the default is set so high).
+
+_Symbol_ and _Fill_ define the default colours clicks which have been classified by the matched click classifier should be plotted on displays.
+
+### Click Waveform Settings
+
+Before a click is classified it undergoes some pre-conditioning by the matched click classifier.
+
+_Restrict parameter extraction to XX samples_ sets the maximum length of the waveform to the classifier. If this is selected, then center of the click is located and samples trimmed around the center. In some use cases, for example SoundTrap detections, which may be 10,000 samples long, setting a lower number of maximum samples can greatly increase processing speed and improve the accuracy of results. Note that if the number of samples is set too low (e.g. well below the click template length) then the correaltion values will not make much sense.
+
+_Peak threshold_ and _Smoothing_ are both parameters used to find the click center so that a click can be trimmed to the maximum number of samples. The click length is measured by calculating the waveform envelope using a Hilbert Transform. The envelope is smoothed using a moving average filter (the _Smoothing_ parameter defines the size of the averaging window). The click is trimmed as follows. First the peak of the waveform envelope is found. The length of the click is defined as the point at which the click falls _Peak threshold_ dB below the peak. The center of the click is then the middle of this snippet. The click is then trimmed from the center of the click.
+
+_Amplitude normalisation_ If there is a very loud click compared to a template it's correlation score will be different to that of a very quiet click of with exactly the same waveform. It is therefore a good idea to normalise the waveform before it is compared the match click classifier. The types of normalisation are
+* _norm_ - this is the default - the click is divided by it's RMS amplitude.
+* _peak to peak_ this can be useful for some types of shorter click e.g. dolphins - the click is divided by it's peak to peak amplitude.
+* _none_ no normalisation (not recommended).
+
+### Template settings
+
+The matched click classifier has two templates, a match and a reject. The match template should match a stereotypical click of the target species and the reject template can either be a click from a confounding species (e.g. dolphin) or blank. Selecting the drop-down menu from the _Import_ button allows for a selection of some default templates. Custom templates can be imported by selecting the _Import_ button. Custom templates can either be a .csv. or .mat file using the following format.
+
+**.csv** - the first _row_ are the waveform measurements from -1 to 1 (make sure you save with a sufficient number of decimal points). The second row and first column is the sample rate in sample per second.
+
+**.mat** - a .mat file that contains two variables named _sR_ and _waveform_. _sR_ is the sample rate in samples per second and _waveform_ is a 1D array containing the waveform for the template form -1 to 1. Arrays of click structures imported using the PAMGuard to MATLAB library can also be used. The first channel of the first click in a list of clicks structures will be imported as the template. The click structure should be names _clicks_ and the sample rate should be saved as a seperate variable named _sR_ in sampes per second.
+
+The match and reject templates are plotted to provide a user with some visualisation of the classifier settings - the drop down menu allows the user to select different ways to plot the templates and is purely for visualisation purposes so makes no difference to classifier settings.
+
+_threshold_ is the threshold at which a click is classified. If the difference between the match and reject templates is above the _threshold_ value then the
+click is classified.
+
+The + button can be used to add more tabs. Each tab contains a click/reject template pair and unique threshold setting. A click is classified if at least one of the match/reject templates passes it's set threshold.
+
+## Visualising Results
+
+The matched click classifier changes the species type flag of a click if at least one of the classifiers passes threshold. This means clicks can be visualised in the click bearing time display or the time base display. The classifier also saves the correlation values for each match/reject template pair which can be accessed in MATLAB/R or through the PAMGuard GUI.
+
+### Click bearing time display
+
+Matched clicks can be viewed in the bearing time display. If a click passes the threshold of one match/reject pair then the click symbol (defined in general settings) is shown in the bearing time display if _Colour by Matched Template Classifier_ is selected in the right click menu. The correlation values are shown by hovering the mouse over a click to bring up the info tool tip.
+
+
+ 
+
+
+_Screenshot of clicks classified from the matched click classifier showing matched clicks (coloured pink)_
+
+### Time base display
+
+The time base display FX can show clicks classified by the matched clicks classifier. _Colour by Matched Template Classifier_ must be selecting in the right settings window.
+
+
+ 
+
+
+_Screenshot of Time Base display FX showing clicks classified by the match click classifier (coloured pink). The correlation values can be found in the meta data section of the detection pop up menu (highlighted)_
+
+Note that the time base display allows users to export clicks to be used as templates. Using the advanced pop up menu right click on a click detection and select the MATLAB icon. A .mat file of the selected click or clicks will be saved to your root user folder in a folder called _PAMGuard Manual Export_. This .mat file can be opened by the matched click classifier - the first channel of the first click in the list will be imported as a template.
+
+
+
+ 
+
+
+
+### Extracting correlation values using MATLAB/R
+
+Clicks are loaded from binary files using the MATLAB/R function
+
+```
+clicks = loadPamguardBinaryFile("/path/to/pamguardfile.pgdf");
+```
+
+where clicks is a list of MATLAB/R structures containing the data for each click in the file.
+
+The matched click classifier template threshold, match value and reject value are then accessed from each click using
+
+```
+matchedtemplatevals = clicks(1).annotations. mclassification
+```
+
+```matachedtemplatevals``` is a list of where each row is the threshold value, match value and reject value for each match/reject template pair.
+
+
diff --git a/src/matchedTemplateClassifer/resources/exporting_mat_clicks.png b/src/matchedTemplateClassifer/resources/exporting_mat_clicks.png
new file mode 100644
index 0000000000000000000000000000000000000000..3a2f1c01f9a856b7c97565f9ab0953dbdbd8df01
GIT binary patch
literal 167908
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