Commit Graph

1183 Commits

Author SHA1 Message Date
Douglas Gillespie
9f998165ee
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
2022-05-02 19:40:24 +01:00
Douglas Gillespie
a0900a667e Small update to RawDatautils to handle null data 2022-05-02 19:38:14 +01:00
Douglas Gillespie
f9787a9633
Merge branch 'PAMGuard:main' into main 2022-04-28 13:48:41 +01:00
Jamie Mac
b0f5ce85a8 Bug fixes to FX GUI 2022-04-28 10:58:06 +01:00
Jamie Mac
1f86738f2d Bug fix to UI 2022-04-28 10:57:07 +01:00
Jamie Mac
5153f325ae 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.
2022-04-28 10:57:07 +01:00
Jamie Mac
2ed51b9c70 Fix standard classifier JSON logging 2022-04-28 10:57:07 +01:00
Jamie Mac
80b580d30d Updates and bug fixes to click train detector and CPOD importer 2022-04-28 10:57:07 +01:00
Jamie Mac
8b66f68c71 Screenshots 2022-04-28 10:57:07 +01:00
Jamie Mac
f6fc0398ef 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
2022-04-28 10:57:07 +01:00
Jamie Mac
9050330be3 Updates and bug fixes to click train detector and CPOD importer 2022-04-28 10:57:07 +01:00
Jamie Mac
a58994937d Screenshots 2022-04-28 10:57:07 +01:00
Jamie Mac
b61a480ec4 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
2022-04-28 10:57:07 +01:00
Jamie Mac
8ad62a59e9 Merge fixes to click train detector 2022-04-28 10:56:00 +01:00
Jamie Mac
819ef74643 Fix standard classifier JSON logging 2022-04-28 10:56:00 +01:00
Jamie Mac
4af74b50ef Updates and bug fixes to click train detector and CPOD importer 2022-04-28 10:56:00 +01:00
Jamie Mac
6ad6bde40f 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
2022-04-28 10:56:00 +01:00
Jamie Mac
b0d64c1fe3 Updates and bug fixes to click train detector and CPOD importer 2022-04-28 10:56:00 +01:00
Jamie Mac
9fc9d00e2c Screenshots 2022-04-28 10:56:00 +01:00
Jamie Mac
38ec18216e 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
2022-04-28 10:56:00 +01:00
Jamie Mac
d85d9078a1
Bug fixes (#31)
* 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

* Updates to FX GUI

* Bug fixes

Click train detector now registers click train if there are no longer any click detections for a significant period of time.

Jitter in wrap spectrogram for TDisplayFX fixed

Deep learning module compatible with bearing localiser

Updates to FX GUI
2022-04-28 10:52:03 +01:00
Douglas Gillespie
c4ee5f389b
Contact Collator Updated (#30)
* 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
2022-04-27 09:34:27 +01:00
Douglas Gillespie
7a0b85f015 Merge branch 'main' of https://github.com/douggillespie/PAMGuard 2022-04-27 09:28:54 +01:00
Douglas Gillespie
50e3e86784 Updates to support new features in Contact Collator 2022-04-27 09:27:46 +01:00
Douglas Gillespie
35617c2571 Update .gitignore 2022-04-27 09:18:28 +01:00
Douglas Gillespie
f8cf8a72cb Update .gitignore 2022-04-27 09:17:00 +01:00
Douglas Gillespie
cba66b4ec9 FLAC Speed
Improve flac speed
2022-04-27 09:14:00 +01:00
Douglas Gillespie
2842143613 Sorting out sample rate info in clip display to support Contact Collator
plugin
2022-04-26 13:29:50 +01:00
Douglas Gillespie
a62cff4f11 couple of updates to support new contact collator plugin 2022-04-22 16:22:55 +01:00
Jamie Mac
3090bdab67 Updates to FX GUI 2022-04-22 11:37:15 +01:00
Douglas Gillespie
add1be56ab Merge branch 'main' of https://github.com/douggillespie/PAMGuard 2022-04-20 12:35:04 +01:00
Douglas Gillespie
bc7e5b189c Update DecimatorParams.java 2022-04-20 12:34:50 +01:00
Douglas Gillespie
bfd93cb623 Update command line options 2022-04-20 12:34:35 +01:00
Douglas Gillespie
db28beb6da Change synchronization on RawDataTransforms soit uses the owner data
holder, not itself for synchronization. Otherwise you get thread locks.
2022-04-20 12:34:12 +01:00
Jamie Mac
da387005a3
Click train, CPOD, Time Base Display, Ishmael updates and Google deep learning integration (#28)
* 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
2022-04-20 12:27:21 +01:00
Jamie Mac
0578b35408 Bug fix to UI 2022-04-20 11:46:00 +01:00
Jamie Mac
3b7d043b73 Merge branch 'main' of https://github.com/macster110/PAMGuard 2022-04-20 11:29:18 +01:00
Jamie Mac
628b965a8b Merge fixes to click train detector 2022-04-20 11:21:25 +01:00
Jamie Mac
d9d4b0fee8 Updates to TDisplayFX
yFIshmael now owrks with TDisplayFX
TDisplayFX UI changes to make simpler.
Some abstraction for drawing lines on TDisplayFX
2022-04-20 10:41:41 +01:00
Jamie Mac
0a9af3c9d4 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.
2022-04-20 10:41:29 +01:00
Jamie Mac
16153a2048 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.
2022-04-20 10:41:29 +01:00
Jamie Mac
7e90b4019d 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
2022-04-20 10:41:26 +01:00
Jamie Mac
d3fa533122 Added some colour averaging in the TFDisplayFX spectrgoram 2022-04-20 10:41:26 +01:00
Jamie Mac
d7b5c2bad0 Fixed bug in sweep classifier when using SoundTrap click detections 2022-04-20 10:41:26 +01:00
Jamie Mac
38c7ceb942 Fix standard classifier JSON logging 2022-04-20 10:41:26 +01:00
Jamie Mac
44b67022d2 Update KetosClassifier.java 2022-04-20 10:41:19 +01:00
Jamie Mac
fdb6c19daf Bug fix for raw spectrogram in TDDisplayFX 2022-04-20 10:41:19 +01:00
Jamie Mac
4b4e3c1a43 Updates and bug fixes to click train detector and CPOD importer 2022-04-20 10:40:30 +01:00
Jamie Mac
fa50f47865 Update click_train_help.md 2022-04-20 10:33:38 +01:00
Jamie Mac
dc07ec3c01 Update click_train_help.md 2022-04-20 10:30:46 +01:00