mirror of
https://github.com/PAMGuard/PAMGuard.git
synced 2024-11-28 01:52:28 +00:00
Merge from DG (#179)
* 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. * small change to viewer scroll Change in how it tries to miss gaps in the data
This commit is contained in:
parent
acf3169a2f
commit
b7fffd6486
@ -6,8 +6,9 @@
|
|||||||
<attribute name="maven.pomderived" value="true"/>
|
<attribute name="maven.pomderived" value="true"/>
|
||||||
</attributes>
|
</attributes>
|
||||||
</classpathentry>
|
</classpathentry>
|
||||||
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17">
|
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER">
|
||||||
<attributes>
|
<attributes>
|
||||||
|
<attribute name="module" value="true"/>
|
||||||
<attribute name="maven.pomderived" value="true"/>
|
<attribute name="maven.pomderived" value="true"/>
|
||||||
</attributes>
|
</attributes>
|
||||||
</classpathentry>
|
</classpathentry>
|
||||||
|
@ -644,10 +644,10 @@ public class ViewerScrollerManager extends AbstractScrollManager implements PamS
|
|||||||
newMin = checkMinimumTime(menuMouseTime - scrollRange / 2);
|
newMin = checkMinimumTime(menuMouseTime - scrollRange / 2);
|
||||||
newMax = checkMaximumTime(newMin + scrollRange);
|
newMax = checkMaximumTime(newMin + scrollRange);
|
||||||
newMin = menuMouseTime - scrollRange/2;
|
newMin = menuMouseTime - scrollRange/2;
|
||||||
// newMin = checkGapPos(dataBlock, newMin, newMax); // doesn't work.
|
// newMin = checkGapPos(dataBlock, newMin, newMax);
|
||||||
newMax = newMin + scrollRange;
|
newMax = newMin + scrollRange;
|
||||||
System.out.printf("Centering scoller at %s, range %s to %s\n", PamCalendar.formatDBDateTime(menuMouseTime),
|
// System.out.printf("Centering scoller at %s, range %s to %s\n", PamCalendar.formatDBDateTime(menuMouseTime),
|
||||||
PamCalendar.formatDBDateTime(newMin), PamCalendar.formatDBDateTime(newMax));
|
// PamCalendar.formatDBDateTime(newMin), PamCalendar.formatDBDateTime(newMax));
|
||||||
aScroller.setRangeMillis(newMin, newMax, false);
|
aScroller.setRangeMillis(newMin, newMax, false);
|
||||||
aScroller.setValueMillis(menuMouseTime);
|
aScroller.setValueMillis(menuMouseTime);
|
||||||
}
|
}
|
||||||
@ -796,7 +796,7 @@ public class ViewerScrollerManager extends AbstractScrollManager implements PamS
|
|||||||
* the next data.
|
* the next data.
|
||||||
*/
|
*/
|
||||||
if ((oldMinGap == OfflineDataMap.IN_GAP)) {
|
if ((oldMinGap == OfflineDataMap.IN_GAP)) {
|
||||||
newStart = getNextDataStart(scroller, oldMin);
|
newStart = getNextDataStart(scroller, newMin);
|
||||||
if (newStart != Long.MAX_VALUE) {
|
if (newStart != Long.MAX_VALUE) {
|
||||||
return newStart;
|
return newStart;
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user