* Update exporter_help.md
Updated help for exporter
* Update .gitignore
* Bug fixes for deep learning classifier.
Updated the symbol options to make sure opacity is passed through the symbol chooser.
* Updates to the data map FX display
* Updates to DelphinID and Data ModelFX
Used a new writable image for much faster drawing in FX
* bb
* Delete C:\Users\Jamie Macaulay\MATLAB Drive\MATLAB\PAMGUARD\deep_learning\delphinID\whistle_image_example_java.mat
* Updates to DelphinID
* Updates to ReadMe and JavaFX GUI
* Update readme.md
Updates to ReadMe
* Updates to CPOD module and also delphinID classifier
* Fix colour scaling in FX data map
* Create cpod_help.md
* Update cpod_help.md
* Update cpod_help.md
* Updates to CPOD module
Added ability to export CPOD clicks
Added some extra features to data selector
Swing GUI for data selector (in progress)
* Updates to data map FX GUI
* Updates to CPOD module
* Added help files resources for CPOD
* Add CPOD resources for help
* Add CPOD resources for help
* Add CPOD resources for help
* Add CPOD resources for help
* Add CPOD resources for help
* Update cpod_help.md
* Update cpod_help.md
* Bug fixes for deep learning classifier.
Updated the symbol options to make sure opacity is passed through the symbol chooser.
* Updates to the data map FX display
* Updates to DelphinID and Data ModelFX
Used a new writable image for much faster drawing in FX
* Updates to ReadMe and JavaFX GUI
* bb
* Delete C:\Users\Jamie Macaulay\MATLAB Drive\MATLAB\PAMGUARD\deep_learning\delphinID\whistle_image_example_java.mat
* Updates to DelphinID
* Update readme.md
Updates to ReadMe
* Fix colour scaling in FX data map
* Updates to CPOD module and also delphinID classifier
* Updates to CPOD module
Added ability to export CPOD clicks
Added some extra features to data selector
Swing GUI for data selector (in progress)
* Create cpod_help.md
* Update cpod_help.md
* Update cpod_help.md
* Updates to data map FX GUI
* Updates to CPOD module
* Added help files resources for CPOD
* Add CPOD resources for help
* Add CPOD resources for help
* Add CPOD resources for help
* Add CPOD resources for help
* Add CPOD resources for help
* Update cpod_help.md
* Update cpod_help.md
* Bug fix to BT display
The BT display was not selecting clicks properly.
* Import bug fix
* Updates to data map FX GUI
* Updates to datamap FX
* Got date axis working properly.
* Added some arrows to the scroll bar for data map FX pane.
* Working on getting datagrams in FX saving
* Updates to DataMapFX and exporting annotations
* Update MLAnnotationsManager.java
* Working on adding annotations to exporter
* Bug fix for processing files and annotations for exporter
Rebase with main
Bug fix for processing files - stops only the last file processing when "Start normally" selected on data processing
R and MATLAB export of data annotation added.
* Add a ttoltip to the exporter
* Minor text change
* X3 fix and building for MACOS
* Update PAMGuard to build installer for MacOS
* Some fixes to Sound Acquisition dialog layout.
* Squashed commit of the following:
commit 1acddb4cc6
Author: Douglas Gillespie <50671166+douggillespie@users.noreply.github.com>
Date: Tue Oct 8 15:03:32 2024 +0100
MErge from DG (#168)
* Localization output
* update localiser output
* Start effort management system
* Start of Effort plotting
Strat of effort plotting on map. Framework for using Effort data in other areas (such as Tethys output).
* Logger forms update
Effort and Symbol selectors working with Logger forms. Also functions to add, edit and delete form rows in Viewer mode.
* Update LoggerFormGraphics.java
add in correct symbol managemet to forms graphics.
* Effort lines on map
Sort of working OK in real time mode.
* Working effort system
Currently only for map, but seems to work OK
* Update Tethys to latest nilus schema
* Raven importer
Start of a system for a raven importer. Not quite working yet.
* Raven import
Basic functionality working. Not nice to use though.
* Tethys Localization work
Abstracting out writing of localization objects and document header information so that individual localisers can give fine scale control of this stuff.
* updated Nilus
A few updates around track and target motion measures.
* FX Plot for raven data
Also sorted out symbols a bit and improved symbol selector in Generic plots.
* Update spectrogram mark bearing display
Remove the 90-angle bit
* Raven extra columns
Logging of data from additional Raven table columns
* Start effort management system
* Start of Effort plotting
Strat of effort plotting on map. Framework for using Effort data in other areas (such as Tethys output).
* Logger forms update
Effort and Symbol selectors working with Logger forms. Also functions to add, edit and delete form rows in Viewer mode.
* Effort lines on map
Sort of working OK in real time mode.
* Update Tethys to latest nilus schema
* Tethys Localization work
Abstracting out writing of localization objects and document header information so that individual localisers can give fine scale control of this stuff.
* Ishmael Tethys output
Added necessaries for Tethys output from Ishmael detectors. Also found a pretty major bug in the spectrogram correlation detector, where for each block of data it was only testing the first sample of each block, not all samples, for being over threshold.
* Speed and algorithm improvements to Ish matched filter
Seems to be errors in correlation, didn't support multiple channels and
also used very old and slow FFT, so working to fix all three issues.
* Updated matched filter
Updated and working Matched filter, though still some thinking to do about how the scaling of this works, since currently scaled by the template, so whole thing is dependent on the input. Need to think of a better way to do this.
* Update match filt normalisation
Normalisation now correctly using both the template and the signal for normalisation so that it will be data amplitude independent.
* invFFT improvements
Use faster inverse FFT of real data in correlation / delay functions.
* Improve ifft's in other modules to improve TDOA speeds
* Sorting mess of spec plugin graphics
Have got the Ishmael ones scrolling, but when scrolling, there is an offset in the data due to the lag of the correlation functions. Quite hard to fix with available timing data
* Improve ish spectrogram plugin
Sorted scaling and scrollling problems.
* Improve startup checks
Rethread startup checks so that a progress bar shows when PAMGuard is checking input and output files at start up. Also include single file processing in checks.
* Apply all spectrogram overlays
Apply to all function on spectrogram overlays so changes to overlays affect all panels.
commit f2f9870b6f
Author: Douglas Gillespie <50671166+douggillespie@users.noreply.github.com>
Date: Wed Oct 2 15:13:12 2024 +0100
V2.02.13c
Release for installation on teaching lab machines.
commit 7533a7cfbe
Author: Douglas Gillespie <50671166+douggillespie@users.noreply.github.com>
Date: Tue Oct 1 15:00:51 2024 +0100
Tethys output of Group3DLocalisations
Output of Group3D localiser data. Localisations only, no Detections output for this one
commit ef494c0d0e
Author: Jamie Mac <macster110@gmail.com>
Date: Mon Sep 30 13:10:59 2024 +0100
Sud bug fix and updates to CPOD module. (#162)
* Update exporter_help.md
Updated help for exporter
* Update .gitignore
* Bug fixes for deep learning classifier.
Updated the symbol options to make sure opacity is passed through the symbol chooser.
* Updates to the data map FX display
* Updates to DelphinID and Data ModelFX
Used a new writable image for much faster drawing in FX
* bb
* Delete C:\Users\Jamie Macaulay\MATLAB Drive\MATLAB\PAMGUARD\deep_learning\delphinID\whistle_image_example_java.mat
* Updates to DelphinID
* Updates to ReadMe and JavaFX GUI
* Update readme.md
Updates to ReadMe
* Updates to CPOD module and also delphinID classifier
* Fix colour scaling in FX data map
* Create cpod_help.md
* Update cpod_help.md
* Update cpod_help.md
* Updates to CPOD module
Added ability to export CPOD clicks
Added some extra features to data selector
Swing GUI for data selector (in progress)
* Updates to data map FX GUI
* Updates to CPOD module
* Added help files resources for CPOD
* Add CPOD resources for help
* Add CPOD resources for help
* Add CPOD resources for help
* Add CPOD resources for help
* Add CPOD resources for help
* Update cpod_help.md
* Update cpod_help.md
* Bug fixes for deep learning classifier.
Updated the symbol options to make sure opacity is passed through the symbol chooser.
* Updates to the data map FX display
* Updates to DelphinID and Data ModelFX
Used a new writable image for much faster drawing in FX
* Updates to ReadMe and JavaFX GUI
* bb
* Delete C:\Users\Jamie Macaulay\MATLAB Drive\MATLAB\PAMGUARD\deep_learning\delphinID\whistle_image_example_java.mat
* Updates to DelphinID
* Update readme.md
Updates to ReadMe
* Fix colour scaling in FX data map
* Updates to CPOD module and also delphinID classifier
* Updates to CPOD module
Added ability to export CPOD clicks
Added some extra features to data selector
Swing GUI for data selector (in progress)
* Create cpod_help.md
* Update cpod_help.md
* Update cpod_help.md
* Updates to data map FX GUI
* Updates to CPOD module
* Added help files resources for CPOD
* Add CPOD resources for help
* Add CPOD resources for help
* Add CPOD resources for help
* Add CPOD resources for help
* Add CPOD resources for help
* Update cpod_help.md
* Update cpod_help.md
* Bug fix to BT display
The BT display was not selecting clicks properly.
* Import bug fix
* Updates to data map FX GUI
* Updates to datamap FX
* Got date axis working properly.
* Added some arrows to the scroll bar for data map FX pane.
* Working on getting datagrams in FX saving
* Updates to DataMapFX and exporting annotations
* Update MLAnnotationsManager.java
* Working on adding annotations to exporter
* Bug fix for processing files and annotations for exporter
Rebase with main
Bug fix for processing files - stops only the last file processing when "Start normally" selected on data processing
R and MATLAB export of data annotation added.
* Add a ttoltip to the exporter
* Minor text change
* Small UI improvements for Sound Acquisition and MacOS
* Bug fix to exporter
* Update to help points
Updated help points for following modules
Deep learning
CPOD
Matched click classifier
Exporter
---------
Co-authored-by: Douglas Gillespie <50671166+douggillespie@users.noreply.github.com>
Playback when no sound cards are present: Causes problems on new PC's which won't admit to a sound card if nothing is connected, making it impossible to use sound output to slow down processing of files (e.g. during teaching). Have added delay to sort this.
help for data export
fixes to fx symbol opacity
removal of too much print output
change of error message when plugins loaded (don't say there is an error when a plugin is not compatible with that run mode)
Added option for SourcePanel to have a null return value (not used in any current detectors)
* Refactoring Tethys
A lot of refactoring of Nilus wrappers with more useful Objects for PAMGUard to work with.
* Improved document handling
Abstracted wrapper around nilus documents which allows easyish calling of internal functions in Localize and Detections document without a common base class.
* Fix doc deletion in detector output panel
* Working on the exporter
* Working out on exporter
* Working on new symbol options for deep learning and sud file options in SoundAcquisition GUI
* Add zero pad option for sud files.
* Updates to sud zero pad options on FX GUI
* Implementing a data selector for the deep learning module
* Bug fix to data transforms if the wave data and sample length are different
* Updated POm to ignore test resources and updates to DL data selector
* Updates to DL data selector and POM
* Work on the data selector for the deep learning module.
* Working on the exporter
* Working out on exporter
* Working on new symbol options for deep learning and sud file options in SoundAcquisition GUI
* Add zero pad option for sud files.
* Updates to sud zero pad options on FX GUI
* Implementing a data selector for the deep learning module
* Updated POm to ignore test resources and updates to DL data selector
* Bug fix to data transforms if the wave data and sample length are different
* Updates to DL data selector and POM
* Work on the data selector for the deep learning module.
* Data selectors for deep learning models now working with FX
Still have to be implemented in Swing
* Update deep_learning_help.md
Updated help values to have some info on data selectors and symbol managers.
* Updates to deep learning symbol options for swing and data selector panel for swing
Made tooltips last longer on TD display FX
* Update deep_learning_help.md
* Swing symbol modifiers for DL and peak freq
* Squashed commit of the following:
commit bad2255710
Author: Douglas Gillespie <50671166+douggillespie@users.noreply.github.com>
Date: Thu Jul 18 09:47:47 2024 +0100
Better symbol options
Add clearer options button to multi option symbol manager panel.
* Fix bugs in detection display
* Bug fix to hiding panes
* Squashed commit of the following:
commit 8b5b5b2f18
Author: Douglas Gillespie <50671166+douggillespie@users.noreply.github.com>
Date: Fri Jul 19 17:14:28 2024 +0100
Updated data selectors for BT display
Merging old status bar and new DataSelector options so that they work more consistently on the BT display.
commit bad2255710
Author: Douglas Gillespie <50671166+douggillespie@users.noreply.github.com>
Date: Thu Jul 18 09:47:47 2024 +0100
Better symbol options
Add clearer options button to multi option symbol manager panel.
* Deep learning bug fix
* Ignore the class path
* Squashed commit of the following:
commit 577670ccd0
Merge: 6510d2268b5b5b2f
Author: Douglas Gillespie <50671166+douggillespie@users.noreply.github.com>
Date: Mon Jul 22 09:35:01 2024 +0100
Merge branch 'main' of https://github.com/PAMGuard/PAMGuard
commit 6510d2260e
Author: Douglas Gillespie <50671166+douggillespie@users.noreply.github.com>
Date: Mon Jul 22 09:34:58 2024 +0100
Remove unnecessary text output
commit 3da8401756
Author: Douglas Gillespie <50671166+douggillespie@users.noreply.github.com>
Date: Mon Jul 22 09:29:38 2024 +0100
updates to Daq
New DLL, and some LED control, but hasn't fixed stalling problem.
commit 8b5b5b2f18
Author: Douglas Gillespie <50671166+douggillespie@users.noreply.github.com>
Date: Fri Jul 19 17:14:28 2024 +0100
Updated data selectors for BT display
Merging old status bar and new DataSelector options so that they work more consistently on the BT display.
commit bad2255710
Author: Douglas Gillespie <50671166+douggillespie@users.noreply.github.com>
Date: Thu Jul 18 09:47:47 2024 +0100
Better symbol options
Add clearer options button to multi option symbol manager panel.
* Squashed commit of the following:
commit 687220dad5
Author: Douglas Gillespie <50671166+douggillespie@users.noreply.github.com>
Date: Mon Jul 22 11:42:19 2024 +0100
Change click data selector
Change Click BT display so it can handle CompoundDataSelectors
commit 577670ccd0
Merge: 6510d2268b5b5b2f
Author: Douglas Gillespie <50671166+douggillespie@users.noreply.github.com>
Date: Mon Jul 22 09:35:01 2024 +0100
Merge branch 'main' of https://github.com/PAMGuard/PAMGuard
commit 6510d2260e
Author: Douglas Gillespie <50671166+douggillespie@users.noreply.github.com>
Date: Mon Jul 22 09:34:58 2024 +0100
Remove unnecessary text output
commit 3da8401756
Author: Douglas Gillespie <50671166+douggillespie@users.noreply.github.com>
Date: Mon Jul 22 09:29:38 2024 +0100
updates to Daq
New DLL, and some LED control, but hasn't fixed stalling problem.
commit 8b5b5b2f18
Author: Douglas Gillespie <50671166+douggillespie@users.noreply.github.com>
Date: Fri Jul 19 17:14:28 2024 +0100
Updated data selectors for BT display
Merging old status bar and new DataSelector options so that they work more consistently on the BT display.
commit bad2255710
Author: Douglas Gillespie <50671166+douggillespie@users.noreply.github.com>
Date: Thu Jul 18 09:47:47 2024 +0100
Better symbol options
Add clearer options button to multi option symbol manager panel.
---------
Co-authored-by: Jamie Mac <macster110@gmail.com>
* binary store count
Fix issue in binary store object count
* update V10aa/other for testing
* update V10aa/other for testing
* reenable buffer dumping
* update V to 10ac for testing
* Additional diagnostics
Additional output of CPU usage for each module when stopping
* V 2.02.10ad for testing
Fixed issue of finding correct raw data block
* Tidying
Lots of GUI improvement and code tidying. Functionality to export
gzipped documents to reduce traffic.
* V 2.02.10ba for user testing
* Tidy up click selector
Improve layout and tips on dialog and improve logic for manual and
automatic event types.
* Menu tide up
* Update nilus maven for PAMGuard
* Fix reprocess choices
Make sure the choice to continue anyway is always present.
* Improve start of binary file timing
Code to better get binary files to start right on the hour when processing files offline rather than half a sec or so later.
* Fix early data discard
Fix issue in clip generator: when running very fast offline raw data being discarded before clips are generated. Changed threading model slightly and increased data keep time by 2x the thread jitter to try to avoid this.
* Update pom to JSerialCom 2.11.0
* V2.02.11e fix file start skip
Skipping start of files was causing click detector to not find clicks. Changed code so first seconds are still sent, but with data set to 0, rather than not sending data since that was causing sample counts in different bits of PAMGuard to get out of synch.
Implement zip models which allow packaging of deep learning models with metadata\
Fix TDdsiplayFX spinner bug
Bug fixes for deep learning module after testing
Implement a validator to warn if users have selected all or no classes for binary classifcation.
Sorted CSS out so that is accepts multiple stylesheets
Sorted plotting of waveforms from FPOD on dataPlotFX
Sorting out datamap and viewer model for FX GUI
commit 840e6c89a1
Author: Douglas Gillespie <50671166+douggillespie@users.noreply.github.com>
Date: Thu Nov 16 20:36:14 2023 +0000
R2.02.09d
Fix matched template classifier import
fix azigram help file image display
commit acc806d375
Author: Douglas Gillespie <50671166+douggillespie@users.noreply.github.com>
Date: Wed Nov 15 13:08:02 2023 +0000
Updated X3 library to 2.2.6
commit a4f484c76c
Merge: 8e60ad2ed7c4c278
Author: Douglas Gillespie <50671166+douggillespie@users.noreply.github.com>
Date: Wed Nov 15 09:44:09 2023 +0000
Merge branch 'main' of https://github.com/PAMGuard/PAMGuard.git into main
commit 8e60ad2eff
Author: Douglas Gillespie <50671166+douggillespie@users.noreply.github.com>
Date: Wed Nov 15 09:43:39 2023 +0000
update to array diagnostics and sensor control
commit d7c4c278d8
Author: m2oswald <45486636+m2oswald@users.noreply.github.com>
Date: Wed Nov 15 09:17:49 2023 +0000
Added code to Rocca for training/testing classifier (#114)
* allow Rocca to run without classifiers
Fixed bug that threw an error if no classifier files were specified in Rocca Params dialog
* add rocca switch to enable dev mode
currently only shows/hides extra buttons in the Params dialog, but will
extend to more options in the future
* Fix memory issue with RoccaContourDataBlocks not being released for
garbage collection
Set RoccaContourDataBlock objects to null and stop PamObserver Timer to
force release
* Fix problem tracing whistles in Rocca spectrogram pop-up
Whistle and raw data were being cleared before the user had time to trace out the whistle, causing PAMGuard to throw an exception. Both were already being cleared when the pop-up window is closed, so no need to do it here.
* updated for training/testing classifiers
commit d5f504dcd1
Author: Douglas Gillespie <50671166+douggillespie@users.noreply.github.com>
Date: Fri Nov 10 18:08:31 2023 +0000
Bearing localiser offline save
Bug stopping it correctly saving data from the offline task to the
database fixed.
commit 7a44d49e27
Author: Douglas Gillespie <50671166+douggillespie@users.noreply.github.com>
Date: Fri Oct 27 09:59:28 2023 +0100
X3 Version 2.2.3
Add maven jar files for X3/SUD version 2.2.3
commit fa5fe9943d
Author: Douglas Gillespie <50671166+douggillespie@users.noreply.github.com>
Date: Thu Oct 26 14:44:41 2023 +0100
update sud file management to more efficiently skip to the correct part
of a sud file when reading data offline.
commit 60435e567a
Author: Brian S Miller <93690136+BrianSMiller@users.noreply.github.com>
Date: Fri Sep 8 21:54:40 2023 +1000
Fixes issues #111 and fixes#112 (DIFAR module crashes and ability to use Deep Learning Detections in DIFAR module) (#110)
* Bugfix for OverlayMarks
Check for a null pointer exception in OverlayMarks that was causing a crash on startup.
* Bugfix for null pointer in symbol manager
Fix a bug that I found where the DIFAR module was crashing the symbol manager. Seems that this was due to this subclass of clip generator having a null value for it's uniqueName. I've fixed by checking for null values and assigning a generic symbol when null.
* DeepLearning detections canGenerateClips=true
Set flag in DeepLearning detector so that detections are considered 'clips' by Pamguard. This allows them to be processed automatically in the DIFAR Localisation module (and maybe others).
* DIFAR: bugfix frequency limits for auto-detections
Fix a bug in DIFAR module where the frequency limits of automated detections were not being set properly by the DIFAR module.
* DeepLearning - Bugfix to detection duration
Fix bug in deep learning detector where duration (in samples) was being set to number of samples in a hop instead of the number of samples in a segment.
