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

Logger form plotting

Browse Source 
Fixed logger form plotting in Viewer so that points can find their
correct GPS position (based on time)
This commit is contained in:
Douglas Gillespie 2023-12-19 16:41:57 +00:00
parent 0085215eff
commit 1461808b14
4 changed files with 66 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
src/loggerForms/FormDescription.java
View File

@ -38,6 +38,14 @@ import com.fasterxml.jackson.core.JsonGenerator;
import com.fasterxml.jackson.core.JsonParser; import com.fasterxml.jackson.core.JsonParser;
import com.fasterxml.jackson.core.JsonToken; import com.fasterxml.jackson.core.JsonToken;
import Array.streamerOrigin.GPSOriginMethod;
import Array.streamerOrigin.GPSOriginSystem;
import Array.streamerOrigin.HydrophoneOriginMethod;
import Array.streamerOrigin.HydrophoneOriginMethods;
import Array.streamerOrigin.OriginIterator;
import Array.streamerOrigin.StaticOriginSystem;
import GPS.GpsData;
import org.w3c.dom.Document; import org.w3c.dom.Document;
import org.w3c.dom.Element; import org.w3c.dom.Element;
import org.w3c.dom.NodeList; import org.w3c.dom.NodeList;
@ -49,6 +57,7 @@ import pamScrollSystem.ScrollPaneAddon;
import PamView.PamTabPanel; import PamView.PamTabPanel;
import PamView.panel.PamPanel; import PamView.panel.PamPanel;
import PamView.symbol.StandardSymbolManager; import PamView.symbol.StandardSymbolManager;
import PamguardMVC.PamDataBlock;
import PamguardMVC.PamDataUnit; import PamguardMVC.PamDataUnit;
import PamController.PamControlledUnitSettings; import PamController.PamControlledUnitSettings;
import PamController.PamController; import PamController.PamController;
@ -2021,4 +2030,32 @@ public class FormDescription implements Cloneable, Comparable<FormDescription> {
public void setNeedsUDFSave(boolean needsUDFSave) { public void setNeedsUDFSave(boolean needsUDFSave) {
this.needsUDFSave = needsUDFSave; this.needsUDFSave = needsUDFSave;
} }
public GpsData getOriginLatLong(FormsDataUnit formsDataUnit) {
GpsData gps = getOrigin(GPSOriginSystem.class, formsDataUnit);
if (gps != null) {
return gps;
}
gps = getOrigin(StaticOriginSystem.class, formsDataUnit);
return gps;
}
private GpsData getOrigin(Class originClass, FormsDataUnit formsDataUnit) {
HydrophoneOriginMethods origins = HydrophoneOriginMethods.getInstance();
HydrophoneOriginMethod origin = origins.getMethod(GPSOriginMethod.class, null, null);
if (origin == null) {
return null;
}
OriginIterator gpsIter = origin.getGpsDataIterator(PamDataBlock.ITERATOR_END);
GpsData prev = null;
while (gpsIter.hasPrevious()) {
prev = gpsIter.previous();
if (prev.getTimeInMillis() < formsDataUnit.getTimeMilliseconds()) {
break;
}
}
return prev;
}
} }

4
src/loggerForms/FormsDataUnit.java
View File

@ -87,7 +87,9 @@ public class FormsDataUnit extends PamDataUnit {
* we want to as a reference, etc. * we want to as a reference, etc.
*/ */
if (recalculate || formOriginLatLong == null) { if (recalculate || formOriginLatLong == null) {
formOriginLatLong = loggerForm.getOriginLatLong(this); if (formDescription != null) {
formOriginLatLong = formDescription.getOriginLatLong(this);
}
} }
return formOriginLatLong; return formOriginLatLong;
} }

2
src/loggerForms/FormsLogging.java
View File

@ -112,7 +112,7 @@ public class FormsLogging extends SQLLogging {
// } // }
// } // }
// formDescription.getf
FormsDataUnit formsDataUnit = new FormsDataUnit(null, timeMilliseconds, formDescription, formData); FormsDataUnit formsDataUnit = new FormsDataUnit(null, timeMilliseconds, formDescription, formData);
formsDataUnit.setDatabaseIndex(databaseIndex); formsDataUnit.setDatabaseIndex(databaseIndex);

50
src/loggerForms/LoggerForm.java
View File

@ -104,7 +104,7 @@ public class LoggerForm{
private CounterControl counter; private CounterControl counter;
private HydrophoneOriginMethods origins = HydrophoneOriginMethods.getInstance(); // private HydrophoneOriginMethods origins = HydrophoneOriginMethods.getInstance();
/** /**
* @return the hasCounter * @return the hasCounter
@ -911,30 +911,30 @@ public class LoggerForm{
return saveButton; return saveButton;
} }
public GpsData getOriginLatLong(FormsDataUnit formsDataUnit) { // public GpsData getOriginLatLong(FormsDataUnit formsDataUnit) {
GpsData gps = getOrigin(GPSOriginSystem.class, formsDataUnit); // GpsData gps = getOrigin(GPSOriginSystem.class, formsDataUnit);
if (gps != null) { // if (gps != null) {
return gps; // return gps;
} // }
gps = getOrigin(StaticOriginSystem.class, formsDataUnit); // gps = getOrigin(StaticOriginSystem.class, formsDataUnit);
return gps; // return gps;
} // }
//
private GpsData getOrigin(Class originClass, FormsDataUnit formsDataUnit) { // private GpsData getOrigin(Class originClass, FormsDataUnit formsDataUnit) {
HydrophoneOriginMethod origin = origins.getMethod(GPSOriginMethod.class, null, null); // HydrophoneOriginMethod origin = origins.getMethod(GPSOriginMethod.class, null, null);
if (origin == null) { // if (origin == null) {
return null; // return null;
} // }
OriginIterator gpsIter = origin.getGpsDataIterator(PamDataBlock.ITERATOR_END); // OriginIterator gpsIter = origin.getGpsDataIterator(PamDataBlock.ITERATOR_END);
GpsData prev = null; // GpsData prev = null;
while (gpsIter.hasPrevious()) { // while (gpsIter.hasPrevious()) {
prev = gpsIter.previous(); // prev = gpsIter.previous();
if (prev.getTimeInMillis() < formsDataUnit.getTimeMilliseconds()) { // if (prev.getTimeInMillis() < formsDataUnit.getTimeMilliseconds()) {
break; // break;
} // }
} // }
return prev; // return prev;
} // }
// /** // /**