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

Fix problem in threading hydrophone locator (was very broken in viewer)

Browse Source
This commit is contained in:
douggillespie 2022-01-19 13:41:03 +00:00
parent 794aaf86c8
commit 5aaedec235
1 changed files with 36 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

51
src/Array/ThreadingHydrophoneLocator.java
View File

@ -67,23 +67,40 @@ public class ThreadingHydrophoneLocator extends StraightHydrophoneLocator implem
synchronized (originMethod.getSynchronizationObject()) {
OriginIterator gpsIt = originMethod.getGpsDataIterator(PamDataBlock.ITERATOR_END);
// GPSControl gpsControl = GPSControl.getGpsControl();
// if (gpsControl == null) {
// return new GpsData();
// }
// GPSDataBlock gpsDataBlock = gpsControl.getGpsDataBlock();
// synchronized (gpsDataBlock.getSynchLock()) {
// ListIterator<GpsDataUnit> gpsIt = gpsDataBlock.getListIterator(timeMilliseconds, 0, PamDataBlock.MATCH_BEFORE, PamDataBlock.POSITION_AFTER);
if (gpsIt == null) {
return new GpsData();
return new GpsData(); // return (0,0)
}
if (gpsIt.hasPrevious()) {
/**
* Now need to go back until we're close to the time of interest, or it all goes
* badly wrong.
*/
while (gpsIt.hasPrevious()) {
gpsUnit = gpsIt.previous();
gpsData = prevGpsData = gpsUnit;
double ahead = (timeMilliseconds - gpsUnit.getTimeInMillis())*prevGpsData.getSpeedMetric()/1000.;
distBack -= ahead;
gpsData = gpsUnit;
if (gpsUnit.getTimeInMillis() < timeMilliseconds) {
break;
}
}
if (gpsData == null && gpsIt.hasPrevious()) {
/*
* I don't think this line can ever be called since gpsUnit must have been
* set in the while loop avoe.
*/
gpsUnit = gpsIt.previous();
}
if (gpsIt.hasPrevious() == false) {
/**
* We're off the start of the available track, so can do nothing except use the stright model to
* interpolate backwards.
*/
return super.getStreamerGpsPos(timeMilliseconds);
}
gpsData = prevGpsData = gpsUnit;
double ahead = (timeMilliseconds - gpsUnit.getTimeInMillis())*prevGpsData.getSpeedMetric()/1000.;
distBack -= ahead;
while (distBack > 0 && gpsIt.hasPrevious()) {
gpsUnit = gpsIt.previous();
gpsData = gpsUnit;
@ -92,11 +109,15 @@ public class ThreadingHydrophoneLocator extends StraightHydrophoneLocator implem
continue;
}
double dist = gpsData.distanceToMetres(prevGpsData);
if (dist > distBack) {
// distBack += dist;
distBack-=dist;
if (distBack < 0) {
break;
}
// if (dist > distBack) {
// break;
// }
else {
distBack-=dist;
prevGpsData = gpsData;
}
}