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

More on granularity

Browse Source 
Nice format of granularity in display tables.
This commit is contained in:
Douglas Gillespie 2023-09-11 17:47:50 +01:00
parent c221d78aa2
commit 65dfb5688b
3 changed files with 93 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

56
src/tethys/dbxml/DBXMLQueries.java
View File

@ -4,6 +4,7 @@ import java.io.IOException;
import java.io.StringReader;
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
import javax.xml.datatype.XMLGregorianCalendar;
import javax.xml.parsers.DocumentBuilder;
@ -25,7 +26,10 @@ import nilus.Deployment;
import nilus.Deployment.Instrument;
import nilus.DeploymentRecoveryDetails;
import nilus.DescriptionType;
import nilus.DetectionEffortKind;
import nilus.Detections;
import nilus.GranularityEnumType;
import nilus.GranularityType;
import nilus.Helper;
import tethys.TethysControl;
import tethys.TethysTimeFuncs;
@ -748,6 +752,27 @@ public class DBXMLQueries {
return root.getTextContent();
}
public String getElementAttribute(Element root, String elName, String attribute) {
String[] tree = elName.split("\\.");
for (String element : tree) {
NodeList nodeList = root.getElementsByTagName(element);
// should only be one node for what we're unpacking.
if (nodeList == null || nodeList.getLength() == 0) {
return null;
}
int count = nodeList.getLength();
for (int i = 0; i < count; i++) {
Node firstNode = nodeList.item(i);
if (firstNode instanceof Element) {
root = (Element) firstNode;
break;
}
}
}
return root.getAttribute(attribute);
}
public Document convertStringToXMLDocument(String xmlString) {
//Parser that produces DOM object trees from XML content
DocumentBuilderFactory factory = DocumentBuilderFactory.newInstance();
@ -776,7 +801,7 @@ public class DBXMLQueries {
public Detections getDetectionsDocInfo(String detectionsDocName) {
String oldqueryBase = "{\"species\":{\"query\":{\"op\":\"lib:abbrev2tsn\",\"optype\":\"function\",\"operands\":[\"%s\",\"SIO.SWAL.v1\"]},\"return\":{\"op\":\"lib:tsn2abbrev\",\"optype\":\"function\",\"operands\":[\"%s\",\"SIO.SWAL.v1\"]}},\"return\":[\"Detections/Id\",\"Detections/Description\",\"Detections/DataSource\",\"Detections/Algorithm\"],\"select\":[{\"op\":\"=\",\"operands\":[\"Detections/Id\",\"DetectionsDocName\"],\"optype\":\"binary\"}],\"enclose\":1}";
// updated May 23
String queryBase = "{\"species\":{\"query\":{\"op\":\"lib:completename2tsn\",\"optype\":\"function\",\"operands\":[\"%s\"]},\"return\":{\"op\":\"lib:tsn2completename\",\"optype\":\"function\",\"operands\":[\"%s\"]}},\"return\":[\"Detections/Id\",\"Detections/Description\",\"Detections/DataSource\",\"Detections/Algorithm\",\"Detections/QualityAssurance\",\"Detections/UserId\",\"Detections/MetadataInfo\"],\"select\":[{\"op\":\"=\",\"operands\":[\"Detections/Id\",\"DetectionsDocName\"],\"optype\":\"binary\"}],\"enclose\":1}";
String queryBase = "{\"species\":{\"query\":{\"op\":\"lib:completename2tsn\",\"optype\":\"function\",\"operands\":[\"%s\"]},\"return\":{\"op\":\"lib:tsn2completename\",\"optype\":\"function\",\"operands\":[\"%s\"]}},\"return\":[\"Detections/Id\",\"Detections/Description\",\"Detections/DataSource\",\"Detections/Algorithm\",\"Detections/QualityAssurance\",\"Detections/UserId\",\"Detections/MetadataInfo\",\"Detections/Effort\"],\"select\":[{\"op\":\"=\",\"operands\":[\"Detections/Id\",\"DetectionsDocName\"],\"optype\":\"binary\"}],\"enclose\":1}";
String query = queryBase.replace("DetectionsDocName", detectionsDocName);
DBQueryResult queryResult;
try {
@ -819,6 +844,35 @@ public class DBXMLQueries {
description.setAbstract(getElementData(result, "Description.Abstract"));
description.setMethod(getElementData(result, "Description.Method"));
description.setObjectives(getElementData(result, "Description.Objectives"));
// try to find the granularity.
String granularityString = getElementData(result, "Effort.Kind.Granularity");
GranularityEnumType granularity = null;
if (granularityString != null) {
granularity = GranularityEnumType.fromValue(granularityString);
List<DetectionEffortKind> kinds = detections.getEffort().getKind();
DetectionEffortKind kind = new DetectionEffortKind();
GranularityType granularityType = new GranularityType();
granularityType.setValue(granularity);
kind.setGranularity(granularityType);
// try to find the rest of the granularity information.
String binSize_m = getElementAttribute(result, "Effort.Kind.Granularity", "BinSize_m");
String encounterGap_m = getElementAttribute(result, "Effort.Kind.Granularity", "EncounterGap_m");
String firstBinStart = getElementAttribute(result, "Effort.Kind.Granularity", "FirstBinStart");
try {
granularityType.setBinSizeM(Double.valueOf(binSize_m));
}
catch (NumberFormatException e) {
}
try {
granularityType.setEncounterGapM(Double.valueOf(encounterGap_m));
}
catch (NumberFormatException e) {
}
kinds.add(kind);
}
// String

17
src/tethys/niluswraps/PDeployment.java
View File

@ -3,6 +3,7 @@ package tethys.niluswraps;
import PamUtils.PamCalendar;
import nilus.Deployment;
import nilus.DeploymentRecoveryDetails;
import nilus.GranularityType;
import tethys.TethysTimeFuncs;
import tethys.deployment.RecordingPeriod;
/**
@ -61,5 +62,21 @@ public class PDeployment {
}
}
public static String formatGranularity(GranularityType granularity) {
if (granularity == null) {
return null;
}
String str = String.format("%s", granularity.getValue());
Double bin = granularity.getBinSizeM();
if (bin != null) {
str += String.format(" (%3.1f s)", bin*60);
}
Double gap = granularity.getEncounterGapM();
if (gap != null) {
str += String.format( " (%3.1f s)", gap);
}
return str;
}
}

23
src/tethys/swing/DatablockDetectionsPanel.java
View File

@ -5,6 +5,7 @@ import java.awt.event.ActionEvent;
import java.awt.event.ActionListener;
import java.awt.event.MouseAdapter;
import java.awt.event.MouseEvent;
import java.util.List;
import javax.swing.JComponent;
import javax.swing.JLabel;
@ -18,12 +19,15 @@ import javax.swing.table.AbstractTableModel;
import PamView.tables.SwingTableColumnWidths;
import PamguardMVC.PamDataBlock;
import nilus.DetectionEffortKind;
import nilus.Detections;
import nilus.GranularityType;
import tethys.TethysControl;
import tethys.TethysState;
import tethys.TethysState.StateType;
import tethys.dbxml.TethysException;
import tethys.detection.StreamDetectionsSummary;
import tethys.niluswraps.PDeployment;
import tethys.niluswraps.PDetections;
import tethys.niluswraps.TethysCollections;
@ -167,7 +171,7 @@ public class DatablockDetectionsPanel extends TethysGUIPanel implements StreamTa
private class TableModel extends AbstractTableModel {
private String[] colNames = {"Document", "Count", "Abstract"};
private String[] colNames = {"Document", "Granularity", "Count", "Abstract"};
@Override
public int getRowCount() {
@ -205,8 +209,23 @@ public class DatablockDetectionsPanel extends TethysGUIPanel implements StreamTa
case 0:
return dets.getId();
case 1:
return pDets.count;
List<DetectionEffortKind> kinds = dets.getEffort().getKind();
if (kinds == null) {
return null;
}
for (DetectionEffortKind kind : kinds) {
if (kind.getGranularity() != null) {
GranularityType granularity = kind.getGranularity();
return PDeployment.formatGranularity(granularity);
// if (granularity != null) {
// return granularity.getValue();
// }
}
}
break;
case 2:
return pDets.count;
case 3:
return dets.getDescription().getAbstract();
}
return null;