mirror of
https://github.com/PAMGuard/PAMGuard.git
synced 2024-11-26 09:02:22 +00:00
Merge test
This commit is contained in:
parent
7baf6dcefe
commit
6a6930ea1a
@ -33,7 +33,6 @@ import PamView.help.PamHelp;
|
|||||||
*/
|
*/
|
||||||
public class ArrayDialog extends PamDialog implements ActionListener {
|
public class ArrayDialog extends PamDialog implements ActionListener {
|
||||||
|
|
||||||
|
|
||||||
private static final long serialVersionUID = 1L;
|
private static final long serialVersionUID = 1L;
|
||||||
|
|
||||||
static private ArrayDialog singleInstance = null;
|
static private ArrayDialog singleInstance = null;
|
||||||
@ -56,9 +55,6 @@ public class ArrayDialog extends PamDialog implements ActionListener {
|
|||||||
private ArrayDialog(Frame parentFrame) {
|
private ArrayDialog(Frame parentFrame) {
|
||||||
super(parentFrame, "Pamguard hydrophone array", false);
|
super(parentFrame, "Pamguard hydrophone array", false);
|
||||||
|
|
||||||
// JPanel p = new JPanel();
|
|
||||||
// p.setBorder(BorderFactory.createEmptyBorder(10, 10, 10, 10));
|
|
||||||
// p.setLayout(new BorderLayout());
|
|
||||||
JPanel mainPanel = new JPanel(new BorderLayout());
|
JPanel mainPanel = new JPanel(new BorderLayout());
|
||||||
JSplitPane splitPanel = new JSplitPane(JSplitPane.HORIZONTAL_SPLIT);
|
JSplitPane splitPanel = new JSplitPane(JSplitPane.HORIZONTAL_SPLIT);
|
||||||
mainPanel.add(BorderLayout.CENTER, splitPanel);
|
mainPanel.add(BorderLayout.CENTER, splitPanel);
|
||||||
@ -73,8 +69,6 @@ public class ArrayDialog extends PamDialog implements ActionListener {
|
|||||||
eastPanel.add(channelPanel.getChannelPanel());
|
eastPanel.add(channelPanel.getChannelPanel());
|
||||||
|
|
||||||
environmentPanel = new EnvironmentPanel(this);
|
environmentPanel = new EnvironmentPanel(this);
|
||||||
// eastPanel.add(environmentPanel.getEnvironmentPanel());
|
|
||||||
|
|
||||||
|
|
||||||
hydrophoneDiagram = new HydrophoneDiagram(this);
|
hydrophoneDiagram = new HydrophoneDiagram(this);
|
||||||
JPanel westPanel = new JPanel(new BorderLayout());
|
JPanel westPanel = new JPanel(new BorderLayout());
|
||||||
|
Loading…
Reference in New Issue
Block a user