nordic-dev.net/PAMGuard
nordic-dev.net/PAMGuard
2
0
Fork 0
mirror of https://github.com/PAMGuard/PAMGuard.git synced 2024-11-22 07:02:29 +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 1461808b14
commit 2fa91d69a5
1 changed files with 39 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
src/tethys/calibration/swing/CalibrationsTable.java
View File

@ -18,6 +18,8 @@ import javax.swing.table.AbstractTableModel;
import javax.xml.datatype.XMLGregorianCalendar; import javax.xml.datatype.XMLGregorianCalendar;
import PamController.PamController; import PamController.PamController;
import PamController.soundMedium.GlobalMedium;
import PamController.soundMedium.GlobalMediumManager;
import PamUtils.PamCalendar; import PamUtils.PamCalendar;
import PamView.dialog.warn.WarnOnce; import PamView.dialog.warn.WarnOnce;
import PamView.panel.PamPanel; import PamView.panel.PamPanel;
@ -195,7 +197,7 @@ public class CalibrationsTable extends TethysGUIPanel {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
private String[] columnNames = {"Document", "Id", "Date", "End to End", "Hydrophone", "Preamp"}; private String[] columnNames = {"Document", "Id", "Date", "End to End", "Hydrophone"};
@Override @Override
public Object getValueAt(int rowIndex, int columnIndex) { public Object getValueAt(int rowIndex, int columnIndex) {
@ -223,9 +225,9 @@ public class CalibrationsTable extends TethysGUIPanel {
long ms = TethysTimeFuncs.millisFromGregorianXML(ts); long ms = TethysTimeFuncs.millisFromGregorianXML(ts);
return PamCalendar.formatDBDate(ms); return PamCalendar.formatDBDate(ms);
case 3: case 3:
return cal.getSensitivityDBFS(); return getFSString(cal);
case 4: case 4:
return cal.getType(); return getPhoneString(cal);
// return String.format("%3.1fdB %s", cal.getSensitivityV(), cal.getType()); // return String.format("%3.1fdB %s", cal.getSensitivityV(), cal.getType());
} }
return null; return null;
@ -243,9 +245,41 @@ public class CalibrationsTable extends TethysGUIPanel {
@Override @Override
public String getColumnName(int column) { public String getColumnName(int column) {
return columnNames[column]; if (column == 4) {
return PamController.getInstance().getGlobalMediumManager().getRecieverString();
}
else {
return columnNames[column];
}
} }
}
public String getFSString(Calibration cal) {
Double fs = cal.getSensitivityDBFS();
if (fs == null) {
return null;
}
double ir = cal.getIntensityReferenceUPa();
String str = String.format("%3.1fdB", fs);
if (ir != 0) {
str += String.format(" re%.0f\u00B5Pa", ir);
}
return str;
}
public Object getPhoneString(Calibration cal) {
Double dbV = cal.getSensitivityV();
if (dbV == null) {
dbV = cal.getSensitivityDBV();
}
if (dbV == null) {
return null;
}
double ir = cal.getIntensityReferenceUPa();
String str = String.format("%3.1fdB", dbV);
if (ir != 0) {
str += String.format(" re%.0fV/\u00B5Pa", ir);
}
return str;
} }
} }