nordic-dev.net/PAMGuard
nordic-dev.net/PAMGuard
2
0
Fork 0
mirror of https://github.com/PAMGuard/PAMGuard.git synced 2024-11-21 14:42:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge from DG (#178)

Browse Source 
* 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.

* SMall changes to OfflineTaskGroup

Copy data before processing to avoid concurrency problems

* Scroller imporvements

Better functions in scroll manager to enable jumping to somewhere interesting from other commands in PAMGuard, e.g. from data table views.

* Update PamCalendar.java

Fix issue with times in file analysis, where a time notification was being sent with incorrect file time, confusing the binary store
This commit is contained in:
Douglas Gillespie 2024-11-08 08:59:43 +00:00 committed by GitHub
parent 2ab8fd9444
commit acf3169a2f
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 18 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/PamUtils/PamCalendar.java
View File

@ -66,13 +66,13 @@ public class PamCalendar {
* For accurate timing within detectors, always try to use sample number
* and count samples from the start time for the detector.
*/
private static long soundFileTimeInMillis;
private static volatile long soundFileTimeInMillis;
/**
* Time that data processing started - can be set to a file time
* when files are being processed, otherwise it's just the current time.
*/
private static long sessionStartTime;
private static volatile long sessionStartTime;
/**
* When running in viewer mode, use the sessionStartTime and the viewEndtime
@ -877,9 +877,25 @@ public class PamCalendar {
/**
*
* @param sessionStartTime the time that processing started
* And also set the file time to zero within that since both this
* and setSoundFileTime send out notifications, so this can really mess
* up timing, causing new binary files to be created and all sorts of
* other problems.
*/
public static void setSessionStartTime(long sessionStartTime) {
setSessionStartTime(sessionStartTime, 0);
// PamCalendar.sessionStartTime = sessionStartTime;
// PamController.getInstance().updateMasterClock(getTimeInMillis());
}
/**
*
* @param sessionStartTime the time that processing started
* @param soundFileTimeMillis sound file time relative to start time. Good to set this zero right away.
*/
public static void setSessionStartTime(long sessionStartTime, long soundFileTimeMillis) {
PamCalendar.sessionStartTime = sessionStartTime;
PamCalendar.soundFileTimeInMillis = soundFileTimeMillis;
PamController.getInstance().updateMasterClock(getTimeInMillis());
}