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

Filtered Noise Measurement: add units to measures

Browse Source 
Signed-off-by: Merlijn van Deen <m.vandeen@fugro.com>
This commit is contained in:
Merlijn van Deen 2024-09-30 11:56:17 +02:00
parent a323d60361
commit bb7314f453
3 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/dbht/DbHtDisplayDialog.java
View File

@ -42,7 +42,7 @@ public class DbHtDisplayDialog extends PamDialog {
mainPanel.setLayout(new BoxLayout(mainPanel, BoxLayout.Y_AXIS)); mainPanel.setLayout(new BoxLayout(mainPanel, BoxLayout.Y_AXIS));
JPanel scalePanel = new JPanel(new GridBagLayout()); JPanel scalePanel = new JPanel(new GridBagLayout());
scalePanel.setBorder(new TitledBorder("Amlitude Scale")); scalePanel.setBorder(new TitledBorder("Amplitude Scale"));
GridBagConstraints c = new PamGridBagContraints(); GridBagConstraints c = new PamGridBagContraints();
c.gridwidth = 3; c.gridwidth = 3;
addComponent(scalePanel, showGrid = new JCheckBox("Show Grid"), c); addComponent(scalePanel, showGrid = new JCheckBox("Show Grid"), c);

7
src/noiseOneBand/OneBandControl.java
View File

@ -24,7 +24,12 @@ import offlineProcessing.OfflineTaskGroup;
public class OneBandControl extends PamControlledUnit implements PamSettings { public class OneBandControl extends PamControlledUnit implements PamSettings {
public static final int NMEASURES = 4; public static final int NMEASURES = 4;
public static final String[] measureNames = {"RMS", "0-Peak", "Peak-Peak", "Integrated SEL"}; public static final String[] measureNames = {
"RMS (dB re 1µPa)",
"0-Peak (dB re 1µPa)",
"Peak-Peak (dB re 1µPa)",
"Integrated SEL (dB re 1µPa²s)"
};
private OneBandProcess oneBandProcess; private OneBandProcess oneBandProcess;
private OneBandPulseProcess pulseProcess; private OneBandPulseProcess pulseProcess;
protected OneBandParameters oneBandParameters = new OneBandParameters(); protected OneBandParameters oneBandParameters = new OneBandParameters();

6
src/noiseOneBand/OneBandDisplayDialog.java
View File

@ -48,7 +48,7 @@ public class OneBandDisplayDialog extends PamDialog {
mainPanel.add(tabPane); mainPanel.add(tabPane);
JPanel scalePanel = new JPanel(new GridBagLayout()); JPanel scalePanel = new JPanel(new GridBagLayout());
scalePanel.setBorder(new TitledBorder("Amlitude Scale")); scalePanel.setBorder(new TitledBorder("Amplitude Scale"));
GridBagConstraints c = new PamGridBagContraints(); GridBagConstraints c = new PamGridBagContraints();
c.gridwidth = 3; c.gridwidth = 3;
addComponent(scalePanel, showGrid = new JCheckBox("Show Grid"), c); addComponent(scalePanel, showGrid = new JCheckBox("Show Grid"), c);
@ -62,14 +62,14 @@ public class OneBandDisplayDialog extends PamDialog {
c.gridx++; c.gridx++;
addComponent(scalePanel, minAmp = new JTextField(5), c); addComponent(scalePanel, minAmp = new JTextField(5), c);
c.gridx++; c.gridx++;
addComponent(scalePanel, new JLabel(" dB re 1\u03BCPa ", SwingConstants.LEFT), c); addComponent(scalePanel, new JLabel(" dB", SwingConstants.LEFT), c);
c.gridx = 0; c.gridx = 0;
c.gridy++; c.gridy++;
addComponent(scalePanel, new JLabel("Max ", SwingConstants.RIGHT), c); addComponent(scalePanel, new JLabel("Max ", SwingConstants.RIGHT), c);
c.gridx++; c.gridx++;
addComponent(scalePanel, maxAmp = new JTextField(5), c); addComponent(scalePanel, maxAmp = new JTextField(5), c);
c.gridx++; c.gridx++;
addComponent(scalePanel, new JLabel(" dB re 1\u03BCPa ", SwingConstants.LEFT), c); addComponent(scalePanel, new JLabel(" dB", SwingConstants.LEFT), c);
tabPane.add(scalePanel, "Scale"); tabPane.add(scalePanel, "Scale");