Commit Graph

91 Commits

Author SHA1 Message Date
Douglas Gillespie
7fefb38620 Change synchronization on RawDataTransforms soit uses the owner data
holder, not itself for synchronization. Otherwise you get thread locks.
2022-03-29 11:39:26 +01:00
Douglas Gillespie
aec4a44213
Merge pull request #2 from PAMGuard/main
merging with dev branch
2022-03-25 11:18:13 +00:00
Douglas Gillespie
d49d204a8a
Merge branch 'main' into main 2022-03-25 11:18:05 +00:00
Douglas Gillespie
f365695b4f Feature fix for reading flac files offline, where it was getting a bit
confused about load start times and attempting to reload for too much
data, causing out of memory errors.
2022-03-22 11:46:30 +00:00
Douglas Gillespie
8d6aeb735a
updates to PAMGuard command line options and UDP control (#25)
* Fix network sender since it was hopelessly out of date and did not send
data in the correct format. OK now, though only tested on NARW.

* Mods to support command line and Network control of PAMGuard and to
retrieve summary information from some modules.
2022-03-18 14:52:47 +00:00
Douglas Gillespie
f48579ff22
Improvements to udp PAMGuard control (#24)
* comment changes in graphics

* Mods to enable getting and setting parameters for individual modules via
xml i/o via udp commands.
2022-03-15 14:26:38 +00:00
Douglas Gillespie
7ee8bdbe2c Mods to enable getting and setting parameters for individual modules via
xml i/o via udp commands.
2022-03-15 14:22:48 +00:00
Douglas Gillespie
c539943680 comment changes in graphics 2022-03-14 14:44:14 +00:00
Douglas Gillespie
e3f83071ae
Merge pull request #1 from PAMGuard/main
Fixes to NoGUI, Network send and spectrogram graphics.  (#23)
2022-02-27 14:20:31 +00:00
Douglas Gillespie
178275939c
Merge branch 'main' into main 2022-02-27 14:20:07 +00:00
Douglas Gillespie
ff048eed9f
Fixes to NoGUI, Network send and spectrogram graphics. (#23)
* Update .project

* Terminal commands

* Fix network sender since it was hopelessly out of date and did not send
data in the correct format. OK now, though only tested on NARW.

* Fix NoGui operatoin and Network sender
2022-02-27 14:06:26 +00:00
Douglas Gillespie
a03a29e772 Update .project 2022-02-23 10:17:29 +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