diff --git a/src/main/java/ch/psi/mxsc/BasePlate.java b/src/main/java/ch/psi/mxsc/BasePlate.java index 6559bc5..858c291 100644 --- a/src/main/java/ch/psi/mxsc/BasePlate.java +++ b/src/main/java/ch/psi/mxsc/BasePlate.java @@ -6,6 +6,7 @@ package ch.psi.mxsc; import ch.psi.mxsc.MainPanel.BasePlateLayout; import ch.psi.pshell.device.Device; import ch.psi.pshell.device.DeviceBase; +import ch.psi.pshell.device.DeviceConfig; import ch.psi.pshell.imaging.DimensionDouble; import ch.psi.pshell.imaging.PointDouble; import java.io.IOException; @@ -99,6 +100,11 @@ public class BasePlate extends DeviceBase { } getPucks()[0].setSelected(true); } + + + BasePlate(String name, DeviceConfig config) { + super(name, config); + } @Override protected void doInitialize() throws IOException, InterruptedException { diff --git a/src/main/java/ch/psi/mxsc/Controller.java b/src/main/java/ch/psi/mxsc/Controller.java index 748d153..72ac39c 100644 --- a/src/main/java/ch/psi/mxsc/Controller.java +++ b/src/main/java/ch/psi/mxsc/Controller.java @@ -46,6 +46,7 @@ public class Controller { static Controller instance; final BasePlate basePlate; + final RoomTemperatureBasePlate roomTemperatureBasePlate; final /*Panel*/ MainPanel mainFrame; Device hexiposi; Device barcode_reader; @@ -116,6 +117,8 @@ public class Controller { clearPuckStates(); basePlate.addListener(basePlateListener); + roomTemperatureBasePlate = new RoomTemperatureBasePlate(); + } final DeviceListener basePlateListener = new DeviceAdapter() { diff --git a/src/main/java/ch/psi/mxsc/MainPanel.form b/src/main/java/ch/psi/mxsc/MainPanel.form index c9ceae4..c3aa852 100644 --- a/src/main/java/ch/psi/mxsc/MainPanel.form +++ b/src/main/java/ch/psi/mxsc/MainPanel.form @@ -31,7 +31,7 @@ - + @@ -334,21 +334,21 @@ - + - + - + - + @@ -384,12 +384,12 @@ - + - + @@ -896,7 +896,7 @@ - + @@ -1004,9 +1004,9 @@ - + - + @@ -1018,7 +1018,7 @@ - + diff --git a/src/main/java/ch/psi/mxsc/MainPanel.java b/src/main/java/ch/psi/mxsc/MainPanel.java index 6d97fdb..66b6016 100644 --- a/src/main/java/ch/psi/mxsc/MainPanel.java +++ b/src/main/java/ch/psi/mxsc/MainPanel.java @@ -431,7 +431,7 @@ public class MainPanel extends Panel { } boolean viewDewar = true; - RoomTempBasePlatePanel roomTempPanel; + RoomTemperaturePanel roomTempPanel; WaterLevelPanel waterLevelPanel; void updateViewMode() { @@ -443,9 +443,10 @@ public class MainPanel extends Panel { ((GroupLayout) panelTop.getLayout()).replace(waterLevelPanel, panelLN2Level); } else { if (roomTempPanel == null) { - roomTempPanel = new RoomTempBasePlatePanel(); - roomTempPanel.setBorder(javax.swing.BorderFactory.createTitledBorder("RT Humidifier")); + roomTempPanel = new RoomTemperaturePanel(); + roomTempPanel.setBorder(javax.swing.BorderFactory.createTitledBorder("Room Temperature")); } + roomTempPanel.setDevice(Controller.getInstance().roomTemperatureBasePlate); ((GroupLayout) panelTop.getLayout()).replace(basePlatePanel, roomTempPanel); if (waterLevelPanel == null) { waterLevelPanel = new WaterLevelPanel(); diff --git a/src/main/java/ch/psi/mxsc/Puck.java b/src/main/java/ch/psi/mxsc/Puck.java index 28c7e9a..0926741 100644 --- a/src/main/java/ch/psi/mxsc/Puck.java +++ b/src/main/java/ch/psi/mxsc/Puck.java @@ -181,6 +181,21 @@ public class Puck extends DeviceBase { new Sample(this, i); } } + + Puck(BasePlate basePlate, int index, Character segment, int number, int address, int angle) { + //super(String.valueOf(index+1)); + super(segment + "" + number, new PuckConfig()); + this.setParent(basePlate); + this.index = index; + this.segment = segment; + this.number = number; + this.address = address; + this.angle = angle; + for (int i = 0; i < numberOfSamples; i++) { + new Sample(this, i); + } + } + @Override public PuckConfig getConfig(){ diff --git a/src/main/java/ch/psi/mxsc/RoomTempBasePlatePanel.form b/src/main/java/ch/psi/mxsc/RoomTempBasePlatePanel.form deleted file mode 100644 index 9b2e486..0000000 --- a/src/main/java/ch/psi/mxsc/RoomTempBasePlatePanel.form +++ /dev/null @@ -1,174 +0,0 @@ - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
diff --git a/src/main/java/ch/psi/mxsc/RoomTempBasePlatePanel.java b/src/main/java/ch/psi/mxsc/RoomTempBasePlatePanel.java deleted file mode 100644 index b0417d2..0000000 --- a/src/main/java/ch/psi/mxsc/RoomTempBasePlatePanel.java +++ /dev/null @@ -1,150 +0,0 @@ -/* - * To change this license header, choose License Headers in Project Properties. - * To change this template file, choose Tools | Templates - * and open the template in the editor. - */ -package ch.psi.mxsc; - -import ch.psi.pshell.swing.DevicePanel; - -/** - * - * @author gac-S_Changer - */ -public class RoomTempBasePlatePanel extends DevicePanel { - - /** - * Creates new form RoomTempBasePlate - */ - public RoomTempBasePlatePanel() { - initComponents(); - } - - /** - * This method is called from within the constructor to initialize the form. - * WARNING: Do NOT modify this code. The content of this method is always - * regenerated by the Form Editor. - */ - @SuppressWarnings("unchecked") - // //GEN-BEGIN:initComponents - private void initComponents() { - - jPanel2 = new javax.swing.JPanel(); - jPanel1 = new javax.swing.JPanel(); - jPanel5 = new javax.swing.JPanel(); - roomTempPuckPanel5 = new ch.psi.mxsc.RoomTempPuckPanel(); - roomTempPuckPanel6 = new ch.psi.mxsc.RoomTempPuckPanel(); - jPanel3 = new javax.swing.JPanel(); - roomTempPuckPanel1 = new ch.psi.mxsc.RoomTempPuckPanel(); - roomTempPuckPanel2 = new ch.psi.mxsc.RoomTempPuckPanel(); - - javax.swing.GroupLayout jPanel2Layout = new javax.swing.GroupLayout(jPanel2); - jPanel2.setLayout(jPanel2Layout); - jPanel2Layout.setHorizontalGroup( - jPanel2Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) - .addGap(0, 100, Short.MAX_VALUE) - ); - jPanel2Layout.setVerticalGroup( - jPanel2Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) - .addGap(0, 100, Short.MAX_VALUE) - ); - - jPanel1.setBorder(javax.swing.BorderFactory.createTitledBorder(" Lid States")); - - jPanel5.setBorder(javax.swing.BorderFactory.createTitledBorder("")); - - javax.swing.GroupLayout jPanel5Layout = new javax.swing.GroupLayout(jPanel5); - jPanel5.setLayout(jPanel5Layout); - jPanel5Layout.setHorizontalGroup( - jPanel5Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) - .addGroup(jPanel5Layout.createSequentialGroup() - .addContainerGap() - .addComponent(roomTempPuckPanel5, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE) - .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED) - .addComponent(roomTempPuckPanel6, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE) - .addContainerGap()) - ); - jPanel5Layout.setVerticalGroup( - jPanel5Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) - .addGroup(jPanel5Layout.createSequentialGroup() - .addContainerGap() - .addGroup(jPanel5Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.TRAILING) - .addComponent(roomTempPuckPanel6, javax.swing.GroupLayout.DEFAULT_SIZE, 123, Short.MAX_VALUE) - .addComponent(roomTempPuckPanel5, javax.swing.GroupLayout.PREFERRED_SIZE, 0, Short.MAX_VALUE)) - .addContainerGap()) - ); - - jPanel3.setBorder(javax.swing.BorderFactory.createTitledBorder("")); - - javax.swing.GroupLayout jPanel3Layout = new javax.swing.GroupLayout(jPanel3); - jPanel3.setLayout(jPanel3Layout); - jPanel3Layout.setHorizontalGroup( - jPanel3Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) - .addGroup(jPanel3Layout.createSequentialGroup() - .addContainerGap() - .addComponent(roomTempPuckPanel1, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE) - .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED) - .addComponent(roomTempPuckPanel2, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE) - .addContainerGap()) - ); - jPanel3Layout.setVerticalGroup( - jPanel3Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) - .addGroup(jPanel3Layout.createSequentialGroup() - .addContainerGap() - .addGroup(jPanel3Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.TRAILING) - .addComponent(roomTempPuckPanel2, javax.swing.GroupLayout.DEFAULT_SIZE, 124, Short.MAX_VALUE) - .addComponent(roomTempPuckPanel1, javax.swing.GroupLayout.PREFERRED_SIZE, 0, Short.MAX_VALUE)) - .addContainerGap()) - ); - - javax.swing.GroupLayout jPanel1Layout = new javax.swing.GroupLayout(jPanel1); - jPanel1.setLayout(jPanel1Layout); - jPanel1Layout.setHorizontalGroup( - jPanel1Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) - .addGroup(jPanel1Layout.createSequentialGroup() - .addContainerGap() - .addGroup(jPanel1Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) - .addComponent(jPanel3, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE) - .addComponent(jPanel5, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)) - .addContainerGap()) - ); - jPanel1Layout.setVerticalGroup( - jPanel1Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) - .addGroup(jPanel1Layout.createSequentialGroup() - .addContainerGap() - .addComponent(jPanel3, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE) - .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) - .addComponent(jPanel5, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE) - .addContainerGap()) - ); - - javax.swing.GroupLayout layout = new javax.swing.GroupLayout(this); - this.setLayout(layout); - layout.setHorizontalGroup( - layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) - .addGroup(layout.createSequentialGroup() - .addContainerGap() - .addComponent(jPanel1, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE) - .addContainerGap(23, Short.MAX_VALUE)) - ); - layout.setVerticalGroup( - layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) - .addGroup(layout.createSequentialGroup() - .addContainerGap() - .addComponent(jPanel1, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE) - .addContainerGap(16, Short.MAX_VALUE)) - ); - }// //GEN-END:initComponents - - - // Variables declaration - do not modify//GEN-BEGIN:variables - private javax.swing.JPanel jPanel1; - private javax.swing.JPanel jPanel2; - private javax.swing.JPanel jPanel3; - private javax.swing.JPanel jPanel5; - private ch.psi.mxsc.RoomTempPuckPanel roomTempPuckPanel1; - private ch.psi.mxsc.RoomTempPuckPanel roomTempPuckPanel2; - private ch.psi.mxsc.RoomTempPuckPanel roomTempPuckPanel5; - private ch.psi.mxsc.RoomTempPuckPanel roomTempPuckPanel6; - // End of variables declaration//GEN-END:variables -} diff --git a/src/main/java/ch/psi/mxsc/RoomTempPuckPanel.form b/src/main/java/ch/psi/mxsc/RoomTempPuckPanel.form deleted file mode 100644 index 3b94a25..0000000 --- a/src/main/java/ch/psi/mxsc/RoomTempPuckPanel.form +++ /dev/null @@ -1,155 +0,0 @@ - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
diff --git a/src/main/java/ch/psi/mxsc/RoomTempPuckPanel.java b/src/main/java/ch/psi/mxsc/RoomTempPuckPanel.java deleted file mode 100644 index a15b111..0000000 --- a/src/main/java/ch/psi/mxsc/RoomTempPuckPanel.java +++ /dev/null @@ -1,110 +0,0 @@ -package ch.psi.mxsc; - -import ch.psi.pshell.swing.DevicePanel; - -/** - * - */ -public class RoomTempPuckPanel extends DevicePanel { - - /** - * Creates new form RoomTempPuckPanel - */ - public RoomTempPuckPanel() { - initComponents(); - } - - /** - * This method is called from within the constructor to initialize the form. - * WARNING: Do NOT modify this code. The content of this method is always - * regenerated by the Form Editor. - */ - @SuppressWarnings("unchecked") - // //GEN-BEGIN:initComponents - private void initComponents() { - - circlePanel2 = new ch.psi.mxsc.CirclePanel(); - filler8 = new javax.swing.Box.Filler(new java.awt.Dimension(0, 0), new java.awt.Dimension(0, 0), new java.awt.Dimension(32767, 32767)); - led1 = new ch.psi.pshell.swing.Led(); - filler7 = new javax.swing.Box.Filler(new java.awt.Dimension(0, 0), new java.awt.Dimension(0, 0), new java.awt.Dimension(0, 0)); - led2 = new ch.psi.pshell.swing.Led(); - filler6 = new javax.swing.Box.Filler(new java.awt.Dimension(0, 0), new java.awt.Dimension(0, 0), new java.awt.Dimension(32767, 32767)); - led3 = new ch.psi.pshell.swing.Led(); - filler5 = new javax.swing.Box.Filler(new java.awt.Dimension(0, 0), new java.awt.Dimension(0, 0), new java.awt.Dimension(32767, 32767)); - led4 = new ch.psi.pshell.swing.Led(); - filler4 = new javax.swing.Box.Filler(new java.awt.Dimension(0, 0), new java.awt.Dimension(0, 0), new java.awt.Dimension(32767, 32767)); - led5 = new ch.psi.pshell.swing.Led(); - filler3 = new javax.swing.Box.Filler(new java.awt.Dimension(0, 0), new java.awt.Dimension(0, 0), new java.awt.Dimension(32767, 32767)); - led6 = new ch.psi.pshell.swing.Led(); - filler2 = new javax.swing.Box.Filler(new java.awt.Dimension(0, 0), new java.awt.Dimension(0, 0), new java.awt.Dimension(32767, 32767)); - led7 = new ch.psi.pshell.swing.Led(); - filler1 = new javax.swing.Box.Filler(new java.awt.Dimension(0, 0), new java.awt.Dimension(0, 0), new java.awt.Dimension(32767, 32767)); - - circlePanel2.setLayout(new java.awt.GridLayout(5, 3)); - circlePanel2.add(filler8); - - led1.setHorizontalAlignment(javax.swing.SwingConstants.CENTER); - led1.setColor(new java.awt.Color(255, 0, 51)); - circlePanel2.add(led1); - circlePanel2.add(filler7); - - led2.setHorizontalAlignment(javax.swing.SwingConstants.CENTER); - circlePanel2.add(led2); - circlePanel2.add(filler6); - - led3.setHorizontalAlignment(javax.swing.SwingConstants.CENTER); - circlePanel2.add(led3); - circlePanel2.add(filler5); - - led4.setHorizontalAlignment(javax.swing.SwingConstants.CENTER); - circlePanel2.add(led4); - circlePanel2.add(filler4); - - led5.setHorizontalAlignment(javax.swing.SwingConstants.CENTER); - circlePanel2.add(led5); - circlePanel2.add(filler3); - - led6.setHorizontalAlignment(javax.swing.SwingConstants.CENTER); - circlePanel2.add(led6); - circlePanel2.add(filler2); - - led7.setHorizontalAlignment(javax.swing.SwingConstants.CENTER); - circlePanel2.add(led7); - circlePanel2.add(filler1); - - javax.swing.GroupLayout layout = new javax.swing.GroupLayout(this); - this.setLayout(layout); - layout.setHorizontalGroup( - layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) - .addGap(0, 156, Short.MAX_VALUE) - .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) - .addComponent(circlePanel2, javax.swing.GroupLayout.Alignment.TRAILING, javax.swing.GroupLayout.DEFAULT_SIZE, 156, Short.MAX_VALUE)) - ); - layout.setVerticalGroup( - layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) - .addGap(0, 129, Short.MAX_VALUE) - .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) - .addComponent(circlePanel2, javax.swing.GroupLayout.Alignment.TRAILING, javax.swing.GroupLayout.DEFAULT_SIZE, 129, Short.MAX_VALUE)) - ); - }// //GEN-END:initComponents - - - // Variables declaration - do not modify//GEN-BEGIN:variables - private ch.psi.mxsc.CirclePanel circlePanel2; - private javax.swing.Box.Filler filler1; - private javax.swing.Box.Filler filler2; - private javax.swing.Box.Filler filler3; - private javax.swing.Box.Filler filler4; - private javax.swing.Box.Filler filler5; - private javax.swing.Box.Filler filler6; - private javax.swing.Box.Filler filler7; - private javax.swing.Box.Filler filler8; - private ch.psi.pshell.swing.Led led1; - private ch.psi.pshell.swing.Led led2; - private ch.psi.pshell.swing.Led led3; - private ch.psi.pshell.swing.Led led4; - private ch.psi.pshell.swing.Led led5; - private ch.psi.pshell.swing.Led led6; - private ch.psi.pshell.swing.Led led7; - // End of variables declaration//GEN-END:variables -} diff --git a/src/main/java/ch/psi/mxsc/RoomTemperatureBasePlate.java b/src/main/java/ch/psi/mxsc/RoomTemperatureBasePlate.java new file mode 100644 index 0000000..235cd31 --- /dev/null +++ b/src/main/java/ch/psi/mxsc/RoomTemperatureBasePlate.java @@ -0,0 +1,26 @@ +/* + * Copyright (c) 2014 Paul Scherrer Institute. All rights reserved. + */ +package ch.psi.mxsc; + +import java.util.ArrayList; + +/** + * + */ +public class RoomTemperatureBasePlate extends BasePlate { + + RoomTemperatureBasePlate() { + super("RoomTemperatureBasePlate", new BasePlateConfig()); + ArrayList pucks = new ArrayList<>(); + for (int i = 0; i < getNumberOfPucks(); i++) { + new Puck(this, 30+i, 'R', i+1, i+1, 0); + } + } + + @Override + public int getNumberOfPucks() { + return 5; + } + +} diff --git a/src/main/java/ch/psi/mxsc/RoomTemperaturePanel.form b/src/main/java/ch/psi/mxsc/RoomTemperaturePanel.form new file mode 100644 index 0000000..03d5e97 --- /dev/null +++ b/src/main/java/ch/psi/mxsc/RoomTemperaturePanel.form @@ -0,0 +1,185 @@ + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
diff --git a/src/main/java/ch/psi/mxsc/RoomTemperaturePanel.java b/src/main/java/ch/psi/mxsc/RoomTemperaturePanel.java new file mode 100644 index 0000000..af1c7b1 --- /dev/null +++ b/src/main/java/ch/psi/mxsc/RoomTemperaturePanel.java @@ -0,0 +1,185 @@ +/* + * To change this license header, choose License Headers in Project Properties. + * To change this template file, choose Tools | Templates + * and open the template in the editor. + */ +package ch.psi.mxsc; + +import ch.psi.pshell.swing.DevicePanel; + +/** + * + * @author gac-S_Changer + */ +public class RoomTemperaturePanel extends DevicePanel { + + /** + * Creates new form RoomTempBasePlate + */ + public RoomTemperaturePanel() { + initComponents(); + } + + + public void setDevice(RoomTemperatureBasePlate dev){ + if (dev!=null){ + panelPuck1.setDevice(dev.getPucks()[0]); + panelPuck2.setDevice(dev.getPucks()[1]); + panelPuck3.setDevice(dev.getPucks()[2]); + panelPuck4.setDevice(dev.getPucks()[3]); + panelPuck5.setDevice(dev.getPucks()[4]); + } + } + + /** + * This method is called from within the constructor to initialize the form. + * WARNING: Do NOT modify this code. The content of this method is always + * regenerated by the Form Editor. + */ + @SuppressWarnings("unchecked") + // //GEN-BEGIN:initComponents + private void initComponents() { + + jPanel2 = new javax.swing.JPanel(); + jPanel1 = new javax.swing.JPanel(); + panelPuck2 = new ch.psi.mxsc.PuckPanel(); + panelPuck4 = new ch.psi.mxsc.PuckPanel(); + panelPuck1 = new ch.psi.mxsc.PuckPanel(); + panelPuck3 = new ch.psi.mxsc.PuckPanel(); + panelPuck5 = new ch.psi.mxsc.PuckPanel(); + + javax.swing.GroupLayout jPanel2Layout = new javax.swing.GroupLayout(jPanel2); + jPanel2.setLayout(jPanel2Layout); + jPanel2Layout.setHorizontalGroup( + jPanel2Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) + .addGap(0, 100, Short.MAX_VALUE) + ); + jPanel2Layout.setVerticalGroup( + jPanel2Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) + .addGap(0, 100, Short.MAX_VALUE) + ); + + jPanel1.setBorder(javax.swing.BorderFactory.createTitledBorder("Pucks")); + + javax.swing.GroupLayout panelPuck2Layout = new javax.swing.GroupLayout(panelPuck2); + panelPuck2.setLayout(panelPuck2Layout); + panelPuck2Layout.setHorizontalGroup( + panelPuck2Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) + .addGap(0, 132, Short.MAX_VALUE) + ); + panelPuck2Layout.setVerticalGroup( + panelPuck2Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) + .addGap(0, 162, Short.MAX_VALUE) + ); + + javax.swing.GroupLayout panelPuck4Layout = new javax.swing.GroupLayout(panelPuck4); + panelPuck4.setLayout(panelPuck4Layout); + panelPuck4Layout.setHorizontalGroup( + panelPuck4Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) + .addGap(0, 132, Short.MAX_VALUE) + ); + panelPuck4Layout.setVerticalGroup( + panelPuck4Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) + .addGap(0, 162, Short.MAX_VALUE) + ); + + javax.swing.GroupLayout panelPuck1Layout = new javax.swing.GroupLayout(panelPuck1); + panelPuck1.setLayout(panelPuck1Layout); + panelPuck1Layout.setHorizontalGroup( + panelPuck1Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) + .addGap(0, 132, Short.MAX_VALUE) + ); + panelPuck1Layout.setVerticalGroup( + panelPuck1Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) + .addGap(0, 162, Short.MAX_VALUE) + ); + + javax.swing.GroupLayout panelPuck3Layout = new javax.swing.GroupLayout(panelPuck3); + panelPuck3.setLayout(panelPuck3Layout); + panelPuck3Layout.setHorizontalGroup( + panelPuck3Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) + .addGap(0, 132, Short.MAX_VALUE) + ); + panelPuck3Layout.setVerticalGroup( + panelPuck3Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) + .addGap(0, 162, Short.MAX_VALUE) + ); + + javax.swing.GroupLayout panelPuck5Layout = new javax.swing.GroupLayout(panelPuck5); + panelPuck5.setLayout(panelPuck5Layout); + panelPuck5Layout.setHorizontalGroup( + panelPuck5Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) + .addGap(0, 132, Short.MAX_VALUE) + ); + panelPuck5Layout.setVerticalGroup( + panelPuck5Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) + .addGap(0, 162, Short.MAX_VALUE) + ); + + javax.swing.GroupLayout jPanel1Layout = new javax.swing.GroupLayout(jPanel1); + jPanel1.setLayout(jPanel1Layout); + jPanel1Layout.setHorizontalGroup( + jPanel1Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) + .addGroup(jPanel1Layout.createSequentialGroup() + .addGroup(jPanel1Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) + .addGroup(jPanel1Layout.createSequentialGroup() + .addContainerGap(56, Short.MAX_VALUE) + .addComponent(panelPuck2, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE) + .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED, 56, Short.MAX_VALUE) + .addComponent(panelPuck4, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE) + .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED, 56, Short.MAX_VALUE)) + .addGroup(jPanel1Layout.createSequentialGroup() + .addContainerGap(javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE) + .addComponent(panelPuck1, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE) + .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE) + .addComponent(panelPuck3, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE) + .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE) + .addComponent(panelPuck5, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))) + .addContainerGap(javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)) + ); + + jPanel1Layout.linkSize(javax.swing.SwingConstants.HORIZONTAL, new java.awt.Component[] {panelPuck1, panelPuck2, panelPuck3, panelPuck4, panelPuck5}); + + jPanel1Layout.setVerticalGroup( + jPanel1Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) + .addGroup(jPanel1Layout.createSequentialGroup() + .addContainerGap() + .addGroup(jPanel1Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.TRAILING) + .addComponent(panelPuck2, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE) + .addComponent(panelPuck4, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)) + .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED) + .addGroup(jPanel1Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) + .addComponent(panelPuck1, javax.swing.GroupLayout.Alignment.TRAILING, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE) + .addComponent(panelPuck3, javax.swing.GroupLayout.Alignment.TRAILING, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE) + .addComponent(panelPuck5, javax.swing.GroupLayout.Alignment.TRAILING, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)) + .addContainerGap()) + ); + + javax.swing.GroupLayout layout = new javax.swing.GroupLayout(this); + this.setLayout(layout); + layout.setHorizontalGroup( + layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) + .addGroup(layout.createSequentialGroup() + .addContainerGap() + .addComponent(jPanel1, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE) + .addContainerGap()) + ); + layout.setVerticalGroup( + layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) + .addGroup(layout.createSequentialGroup() + .addContainerGap() + .addComponent(jPanel1, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)) + ); + }// //GEN-END:initComponents + + + // Variables declaration - do not modify//GEN-BEGIN:variables + private javax.swing.JPanel jPanel1; + private javax.swing.JPanel jPanel2; + private ch.psi.mxsc.PuckPanel panelPuck1; + private ch.psi.mxsc.PuckPanel panelPuck2; + private ch.psi.mxsc.PuckPanel panelPuck3; + private ch.psi.mxsc.PuckPanel panelPuck4; + private ch.psi.mxsc.PuckPanel panelPuck5; + // End of variables declaration//GEN-END:variables +}