From bb7314f4534d9159402c00b16cd53d3ce22fa0cb Mon Sep 17 00:00:00 2001 From: Merlijn van Deen Date: Mon, 30 Sep 2024 11:56:17 +0200 Subject: [PATCH] Filtered Noise Measurement: add units to measures Signed-off-by: Merlijn van Deen --- src/dbht/DbHtDisplayDialog.java | 2 +- src/noiseOneBand/OneBandControl.java | 7 ++++++- src/noiseOneBand/OneBandDisplayDialog.java | 6 +++--- 3 files changed, 10 insertions(+), 5 deletions(-) diff --git a/src/dbht/DbHtDisplayDialog.java b/src/dbht/DbHtDisplayDialog.java index b7178542..36d8204f 100644 --- a/src/dbht/DbHtDisplayDialog.java +++ b/src/dbht/DbHtDisplayDialog.java @@ -42,7 +42,7 @@ public class DbHtDisplayDialog extends PamDialog { mainPanel.setLayout(new BoxLayout(mainPanel, BoxLayout.Y_AXIS)); JPanel scalePanel = new JPanel(new GridBagLayout()); - scalePanel.setBorder(new TitledBorder("Amlitude Scale")); + scalePanel.setBorder(new TitledBorder("Amplitude Scale")); GridBagConstraints c = new PamGridBagContraints(); c.gridwidth = 3; addComponent(scalePanel, showGrid = new JCheckBox("Show Grid"), c); diff --git a/src/noiseOneBand/OneBandControl.java b/src/noiseOneBand/OneBandControl.java index c4082534..0ef07104 100644 --- a/src/noiseOneBand/OneBandControl.java +++ b/src/noiseOneBand/OneBandControl.java @@ -24,7 +24,12 @@ import offlineProcessing.OfflineTaskGroup; public class OneBandControl extends PamControlledUnit implements PamSettings { 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 OneBandPulseProcess pulseProcess; protected OneBandParameters oneBandParameters = new OneBandParameters(); diff --git a/src/noiseOneBand/OneBandDisplayDialog.java b/src/noiseOneBand/OneBandDisplayDialog.java index 03b19cca..f561b5dd 100644 --- a/src/noiseOneBand/OneBandDisplayDialog.java +++ b/src/noiseOneBand/OneBandDisplayDialog.java @@ -48,7 +48,7 @@ public class OneBandDisplayDialog extends PamDialog { mainPanel.add(tabPane); JPanel scalePanel = new JPanel(new GridBagLayout()); - scalePanel.setBorder(new TitledBorder("Amlitude Scale")); + scalePanel.setBorder(new TitledBorder("Amplitude Scale")); GridBagConstraints c = new PamGridBagContraints(); c.gridwidth = 3; addComponent(scalePanel, showGrid = new JCheckBox("Show Grid"), c); @@ -62,14 +62,14 @@ public class OneBandDisplayDialog extends PamDialog { c.gridx++; addComponent(scalePanel, minAmp = new JTextField(5), c); 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.gridy++; addComponent(scalePanel, new JLabel("Max ", SwingConstants.RIGHT), c); c.gridx++; addComponent(scalePanel, maxAmp = new JTextField(5), c); 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");