Commit Graph

89 Commits

Author SHA1 Message Date
Jamie Mac
aed87ee3b8 Add classifier screenshot 2022-02-23 12:23:19 +00:00
Jamie Mac
7cae9c6f7a Add screenshots 2022-02-23 12:23:19 +00:00
Jamie Mac
7e23f0be25 Update click_train_help.md 2022-02-23 12:23:18 +00:00
Jamie Mac
6a2393a107 Update click_train_help.md 2022-02-23 12:23:18 +00:00
Jamie Mac
888c9bba4d More screenshots 2022-02-23 12:23:18 +00:00
Jamie Mac
98d43426a6 Update click_train_help.md 2022-02-23 12:23:18 +00:00
Jamie Mac
a0ecdfa83a Screenshots 2022-02-23 12:23:18 +00:00
Jamie Mac
96b06bffa4 Update click_train_help.md 2022-02-23 12:23:18 +00:00
Jamie Mac
0f421c5a71 Create click_train_help.md 2022-02-23 12:23:18 +00:00
Jamie Mac
2e6bed6a74 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-02-23 12:23:18 +00:00
Douglas Gillespie
a4be692d29
Daqbinary (#22)
* Make a couple o fthings private

Code tidy in VR Range Panel

* Remove binary from Acquisition since it messes up database
2022-02-23 09:57:04 +00:00
Douglas Gillespie
01c41a2896 Simple fix to amplitude calculations which were not thread safe. Not
constants are stored per channel rather than a single constant, so will
be fine.
2022-02-23 09:54:34 +00:00
Douglas Gillespie
027a854084
Fix viewer problems (#21)
* Update .project

* Two little problems. 1. Packing of navigation dialog in Viewer mode; 2.
stopping limits of viewer scroll bar extending to present, which was
annoying with old data since data were in tiny fraction of scroll.

* Revert "Update .project"

This reverts commit ba2f15c088.

* Revert "Revert "Update .project""

This reverts commit bffd413cfa.

* Revert "Revert "Revert "Update .project"""

This reverts commit c8f2f2a1be.
2022-02-22 13:03:05 +00:00
Douglas Gillespie
4ef27e0944
Keep old project name 2022-02-22 12:23:15 +00:00
Douglas Gillespie
b3cb30c512
Viewer updates (#19)
* Update .project

* Two little problems. 1. Packing of navigation dialog in Viewer mode; 2.
stopping limits of viewer scroll bar extending to present, which was
annoying with old data since data were in tiny fraction of scroll.

* Revert "Update .project"

This reverts commit ba2f15c088.

* Revert "Revert "Update .project""

This reverts commit bffd413cfa.

* Revert "Revert "Revert "Update .project"""

This reverts commit c8f2f2a1be.
2022-02-22 12:22:19 +00:00
Douglas Gillespie
642080d8db
Daqbinary (#20)
* Make a couple o fthings private

Code tidy in VR Range Panel

* Remove binary from Acquisition since it messes up database
2022-02-22 12:14:32 +00:00
Douglas Gillespie
081514f9d2
Update .project (#17) 2022-02-18 17:10:49 +00:00
Douglas Gillespie
e0c9abcc3d
Rw improvement (#16)
* Update .project

* RWE imporvement to peak detection and dealing with smoothing.

* Make improvements to MARW edge detector so that it doesn't merge
harmonics, by using a threshold down from the peak as well as up from
the noise
2022-02-18 17:05:51 +00:00
Douglas Gillespie
591d3157b6 Updates to readme and version info for release of V2.02.03 2022-02-08 17:32:13 +00:00
Douglas Gillespie
be4a5a8816 Merge branch 'main' of https://github.com/PAMGuard/PAMGuard.git into pr/10 2022-02-08 17:00:17 +00:00
Jamie Mac
7bbd6918c4
Add template names to matched click classifier. (#12)
* Bug fix for matched click classifier

Some of the alarm stuff in the click detector was throwing an exception because the matched click classifier adds a click ID that is not in the click ID module's list...now fixed and test with porpoises.

* Matched click classifier now has template names

The name field of the imported templates is now the file name of the template.
2022-02-08 16:08:14 +00:00
Douglas Gillespie
1a59d7c08c Merge branch 'main' of https://github.com/PAMGuard/PAMGuard.git into pr/10 2022-02-08 11:58:25 +00:00
Jamie Mac
6ef5adcad2
Bug fix for matched click classifier (#10)
* Bug fix for matched click classifier

Some of the alarm stuff in the click detector was throwing an exception because the matched click classifier adds a click ID that is not in the click ID module's list...now fixed and test with porpoises.

* Matched click classifier now has template names

The name field of the imported templates is now the file name of the template.
2022-02-08 10:56:46 +00:00
Jamie Mac
5195549357 Matched click classifier now has template names
The name field of the imported templates is now the file name of the template.
2022-02-08 10:56:12 +00:00
Douglas Gillespie
3c18822949 Merge branch 'main' of https://github.com/douggillespie/PAMGuard-Development into main 2022-02-08 10:52:11 +00:00
Douglas Gillespie
cf3d6f3a6d Fix problem with merged files in acquisition. Was not working correctly
and likely to merge files that shouldn't be merged.
2022-02-08 10:51:43 +00:00
Douglas Gillespie
f486675fad Adding a Maven build configuration to the repo to make life easier for
people wanting to build an executable jar file
2022-02-04 16:45:17 +00:00
Jamie Mac
deb2409e56 Bug fix for matched click classifier
Some of the alarm stuff in the click detector was throwing an exception because the matched click classifier adds a click ID that is not in the click ID module's list...now fixed and test with porpoises.
2022-02-03 14:43:26 +00:00
Douglas Gillespie
28c26343d5 Merge branch 'main' of Development branch into main 2022-02-03 12:34:24 +00:00
Douglas Gillespie
cff60ad335 Updates to Logger forms which weren't plotting data correctly. Added
data selector and origin method which fixes it.
2022-02-03 12:15:20 +00:00
Douglas Gillespie
08ea80d521 Getting jar files from main which are needed for some libs that are not
on Maven
2022-02-02 14:51:58 +00:00
Douglas Gillespie
78d136d1f0 Add some jar files which are not in Maven so can now build on a virgin
machine.
2022-02-02 14:11:09 +00:00
Douglas Gillespie
187ad2e922
Update project name to PAMGuard main 2022-02-01 15:32:10 +00:00
Douglas Gillespie
59e5735d4d
Merge pull request #7 from macster110/main
Matched click classifier bug fixes and TDDisplayFX real time changes
2022-02-01 15:02:52 +00:00
douggillespie
ccec9566c7 Added correct Affectedblock for click template classifier 2022-02-01 14:59:26 +00:00
Jamie Mac
3607a4fbef Update MTClassifier.java 2022-02-01 10:01:56 +00:00
Jamie Mac
b2e1afbd74 Bug fixes to matched click classifier and TDisplayFX 2022-01-28 15:27:07 +00:00
Jamie Mac
50bb5a6807 Fixed serialization bug in matched click classifier 2022-01-28 15:27:07 +00:00
Jamie Mac
5b2f6f440b More bug fixes for matched template 2022-01-28 15:27:07 +00:00
Jamie Mac
cf4e3ccfe1 Bug fixes for matched filter
The match filter used in the matched click classifier was flipping arrays instead of using the complex conjugate for FFT xcorr. Ooops
2022-01-28 15:27:07 +00:00
douggillespie
3c8d976fff Fix filters so that input and output channels are only called afer
InitialisationComplete.
2022-01-24 11:29:00 +00:00
Douglas Gillespie
4ddf206b9b
Added storage of thresholds, stats level and peak state to binary output (#1)
of GPL detector so that these can be displayed in viewer.
2022-01-19 16:12:07 +00:00
douggillespie
5aaedec235 Fix problem in threading hydrophone locator (was very broken in viewer) 2022-01-19 13:41:03 +00:00
douggillespie
794aaf86c8 fix null pointer exception in UIDRrpairFunctions 2022-01-18 17:16:12 +00:00
douggillespie
f4ada3fa94 POM now working for Jamies dl library. 2022-01-18 15:28:46 +00:00
douggillespie
31eb174146 Add enabler to ColourComboBox 2022-01-15 18:12:13 +00:00
douggillespie
3d26fce9d1 Messing with POM to get Jamies dl code working. His Maven repo is
currently not working, so I've included his jar and also had to include
ai.djl in the POM for some classes he uses, but aren't in his jar.
Should be working now.
2022-01-15 17:53:27 +00:00
Douglas Gillespie
31323f624c
Merge pull request #3 from macster110/main
POM changes and deep learning fixes for ketos
2022-01-14 10:41:45 +00:00
Jamie Mac
7cb657bac6 Update .gitignore 2022-01-14 10:33:47 +00:00
Douglas Gillespie
29d7370427
Delete target directory
Getting the target directory off github since it's not needed there
2022-01-14 10:27:05 +00:00