diff --git a/src/main/java/ch/psi/mxsc/MainPanel.form b/src/main/java/ch/psi/mxsc/MainPanel.form index 9122cf6..e8914f5 100644 --- a/src/main/java/ch/psi/mxsc/MainPanel.form +++ b/src/main/java/ch/psi/mxsc/MainPanel.form @@ -16,7 +16,7 @@ - + @@ -29,9 +29,11 @@ - + + + @@ -58,14 +60,17 @@ - - - - - - + + + + + + + + + - + @@ -327,11 +332,11 @@ - + - + @@ -485,7 +490,7 @@ - + @@ -494,7 +499,7 @@ - + @@ -522,7 +527,7 @@ - + @@ -586,7 +591,7 @@ - + @@ -607,7 +612,7 @@ - + @@ -696,7 +701,7 @@ - + @@ -718,7 +723,7 @@ - + @@ -765,7 +770,7 @@ - + @@ -775,7 +780,7 @@ - + @@ -800,7 +805,7 @@ - + @@ -864,7 +869,7 @@ - + @@ -881,7 +886,7 @@ - + @@ -918,5 +923,103 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/main/java/ch/psi/mxsc/MainPanel.java b/src/main/java/ch/psi/mxsc/MainPanel.java index 3d8cdc3..04aec2c 100644 --- a/src/main/java/ch/psi/mxsc/MainPanel.java +++ b/src/main/java/ch/psi/mxsc/MainPanel.java @@ -81,6 +81,37 @@ public class MainPanel extends Panel { }); updateHexiposiState(((Device) getDevice("hexiposi")).getState()); + ((Device) getDevice("air_pressure_ok")).addListener(new DeviceAdapter() { + @Override + public void onValueChanged(Device device, Object value, Object former) { + updateAirPressure(value); + } + }); + updateAirPressure(((Device) getDevice("air_pressure_ok")).take()); + + ((Device) getDevice("n2_pressure_ok")).addListener(new DeviceAdapter() { + @Override + public void onValueChanged(Device device, Object value, Object former) { + updateN2Pressure(value); + } + }); + updateN2Pressure(((Device) getDevice("n2_pressure_ok")).take()); + + ((Device) getDevice("feedback_local_safety")).addListener(new DeviceAdapter() { + @Override + public void onValueChanged(Device device, Object value, Object former) { + updateLocalSafety(value); + } + }); + updateLocalSafety(((Device) getDevice("feedback_local_safety")).take()); + + ((Device) getDevice("feedback_psys_safety")).addListener(new DeviceAdapter() { + @Override + public void onValueChanged(Device device, Object value, Object former) { + updatePsysSafety(value); + } + }); + updatePsysSafety(((Device) getDevice("feedback_psys_safety")).take()); } void updateLevel(Object value){ @@ -125,8 +156,48 @@ public class MainPanel extends Panel { void updateHexiposiState(State state){ ledLidControlActive.setColor(state.isInitialized() ? Color.GREEN : Color.BLACK ); ledLidInitialized.setColor((state.isNormal()&& state !=State.Disabled) ? Color.GREEN : Color.BLACK); + } + + void updateAirPressure(Object value){ + if ((value == null) || !(value instanceof Boolean)){ + ledAirPressure.setColor(Color.BLACK); + } else if ((Boolean)value){ + ledAirPressure.setColor(Color.GREEN); + } else { + ledAirPressure.setColor(Color.RED); + } } + void updateN2Pressure(Object value){ + if ((value == null) || !(value instanceof Boolean)){ + ledN2Pressure.setColor(Color.BLACK); + } else if ((Boolean)value){ + ledN2Pressure.setColor(Color.GREEN); + } else { + ledN2Pressure.setColor(Color.RED); + } + } + + void updateLocalSafety(Object value){ + if ((value == null) || !(value instanceof Boolean)){ + ledLocalSafety.setColor(Color.BLACK); + } else if ((Boolean)value){ + ledLocalSafety.setColor(Color.GREEN); + } else { + ledLocalSafety.setColor(Color.RED); + } + } + + void updatePsysSafety(Object value){ + if ((value == null) || !(value instanceof Boolean)){ + ledPsysSafety.setColor(Color.BLACK); + } else if ((Boolean)value){ + ledPsysSafety.setColor(Color.GREEN); + } else { + ledPsysSafety.setColor(Color.RED); + } + } + @@ -200,6 +271,15 @@ public class MainPanel extends Panel { jLabel17 = new javax.swing.JLabel(); jLabel18 = new javax.swing.JLabel(); panelDewar = new ch.psi.pshell.swing.ProcessVariablePanel(); + jPanel13 = new javax.swing.JPanel(); + ledAirPressure1 = new ch.psi.pshell.swing.Led(); + jLabel24 = new javax.swing.JLabel(); + jLabel25 = new javax.swing.JLabel(); + ledN2Pressure1 = new ch.psi.pshell.swing.Led(); + jLabel26 = new javax.swing.JLabel(); + ledLocalSafety1 = new ch.psi.pshell.swing.Led(); + jLabell21 = new javax.swing.JLabel(); + ledPsysSafety1 = new ch.psi.pshell.swing.Led(); basePlatePanel.setBorder(javax.swing.BorderFactory.createTitledBorder("Dewar")); @@ -335,7 +415,7 @@ public class MainPanel extends Panel { .addGap(4, 4, 4) .addGroup(jPanel3Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING, false) .addComponent(jSeparator2) - .addComponent(jLabel3, javax.swing.GroupLayout.PREFERRED_SIZE, 35, Short.MAX_VALUE))) + .addComponent(jLabel3, javax.swing.GroupLayout.DEFAULT_SIZE, 35, Short.MAX_VALUE))) .addGroup(jPanel3Layout.createSequentialGroup() .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) .addComponent(jSeparator3, javax.swing.GroupLayout.PREFERRED_SIZE, 31, javax.swing.GroupLayout.PREFERRED_SIZE)) @@ -355,11 +435,11 @@ public class MainPanel extends Panel { .addGroup(jPanel3Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) .addComponent(progressLN2, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE) .addGroup(jPanel3Layout.createSequentialGroup() - .addContainerGap(56, Short.MAX_VALUE) + .addContainerGap(53, Short.MAX_VALUE) .addComponent(jSeparator1, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE) .addGap(0, 0, 0) .addComponent(jLabel1, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE) - .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED, 57, Short.MAX_VALUE) + .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED, 53, Short.MAX_VALUE) .addComponent(jSeparator2, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE) .addGap(0, 0, 0) .addComponent(jLabel3, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE) @@ -460,7 +540,7 @@ public class MainPanel extends Panel { .addComponent(ledFillingControl, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE) .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) .addComponent(jLabel4) - .addContainerGap(64, Short.MAX_VALUE)) + .addContainerGap(javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)) .addGroup(jPanel4Layout.createSequentialGroup() .addComponent(ledFillingDewar, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE) .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) @@ -468,7 +548,7 @@ public class MainPanel extends Panel { .addGroup(jPanel4Layout.createSequentialGroup() .addComponent(jLabel14) .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) - .addComponent(deviceValuePanel1, javax.swing.GroupLayout.PREFERRED_SIZE, 0, Short.MAX_VALUE) + .addComponent(deviceValuePanel1, javax.swing.GroupLayout.DEFAULT_SIZE, 32, Short.MAX_VALUE) .addContainerGap()) .addComponent(jLabel5))))) ); @@ -487,7 +567,7 @@ public class MainPanel extends Panel { .addGroup(jPanel4Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) .addComponent(jLabel14) .addComponent(deviceValuePanel1, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)) - .addContainerGap(javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)) + .addContainerGap(23, Short.MAX_VALUE)) ); jPanel6.setBorder(javax.swing.BorderFactory.createTitledBorder("Lid Motion Control")); @@ -536,7 +616,7 @@ public class MainPanel extends Panel { .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) .addComponent(jLabel7)) .addComponent(buttonInitHexiposi)) - .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED, 40, Short.MAX_VALUE) + .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED, 6, Short.MAX_VALUE) .addComponent(jPanel9, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE) .addContainerGap()) ); @@ -553,7 +633,7 @@ public class MainPanel extends Panel { .addComponent(jLabel7)) .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED) .addComponent(buttonInitHexiposi) - .addContainerGap(javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)) + .addContainerGap(18, Short.MAX_VALUE)) .addComponent(jPanel9, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE) ); @@ -584,7 +664,7 @@ public class MainPanel extends Panel { .addComponent(led7, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE) .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) .addComponent(jLabel10))) - .addContainerGap(59, Short.MAX_VALUE)) + .addContainerGap(22, Short.MAX_VALUE)) ); jPanel7Layout.setVerticalGroup( jPanel7Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) @@ -601,7 +681,7 @@ public class MainPanel extends Panel { .addGroup(jPanel7Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE) .addComponent(led7, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE) .addComponent(jLabel10)) - .addContainerGap(javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)) + .addContainerGap(26, Short.MAX_VALUE)) ); jPanel8.setBorder(javax.swing.BorderFactory.createTitledBorder("Robot Gripper")); @@ -628,7 +708,7 @@ public class MainPanel extends Panel { .addGroup(jPanel8Layout.createSequentialGroup() .addComponent(jLabel13) .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) - .addComponent(textSample, javax.swing.GroupLayout.DEFAULT_SIZE, 187, Short.MAX_VALUE)) + .addComponent(textSample, javax.swing.GroupLayout.DEFAULT_SIZE, 136, Short.MAX_VALUE)) .addGroup(jPanel8Layout.createSequentialGroup() .addComponent(jLabel12) .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) @@ -636,7 +716,7 @@ public class MainPanel extends Panel { .addGroup(jPanel8Layout.createSequentialGroup() .addComponent(jLabel11) .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) - .addComponent(textType, javax.swing.GroupLayout.DEFAULT_SIZE, 187, Short.MAX_VALUE))) + .addComponent(textType))) .addContainerGap()) ); @@ -657,7 +737,7 @@ public class MainPanel extends Panel { .addGroup(jPanel8Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE) .addComponent(jLabel13) .addComponent(textSample, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)) - .addContainerGap(javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)) + .addContainerGap(26, Short.MAX_VALUE)) ); jPanel10.setBorder(javax.swing.BorderFactory.createTitledBorder("RT Humidifier Box")); @@ -681,7 +761,7 @@ public class MainPanel extends Panel { .addComponent(led15, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE) .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) .addComponent(jLabel18))) - .addContainerGap(52, Short.MAX_VALUE)) + .addContainerGap(javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)) ); jPanel10Layout.setVerticalGroup( jPanel10Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) @@ -694,7 +774,7 @@ public class MainPanel extends Panel { .addGroup(jPanel10Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE) .addComponent(led15, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE) .addComponent(jLabel18)) - .addContainerGap(javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)) + .addContainerGap(52, Short.MAX_VALUE)) ); panelDewar.setBorder(javax.swing.BorderFactory.createTitledBorder(null, "Dewar Light", javax.swing.border.TitledBorder.LEFT, javax.swing.border.TitledBorder.DEFAULT_POSITION)); @@ -705,11 +785,67 @@ public class MainPanel extends Panel { panelDewar.setShowSlider(true); panelDewar.setShowStop(false); + jPanel13.setBorder(javax.swing.BorderFactory.createTitledBorder("System Status")); + + jLabel24.setText("Air Pressure"); + + jLabel25.setText("N2 Pressure"); + + jLabel26.setText("Local Safety"); + + jLabell21.setText("Psys Safety"); + + javax.swing.GroupLayout jPanel13Layout = new javax.swing.GroupLayout(jPanel13); + jPanel13.setLayout(jPanel13Layout); + jPanel13Layout.setHorizontalGroup( + jPanel13Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) + .addGroup(jPanel13Layout.createSequentialGroup() + .addContainerGap() + .addGroup(jPanel13Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) + .addGroup(jPanel13Layout.createSequentialGroup() + .addComponent(ledAirPressure1, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE) + .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) + .addComponent(jLabel24)) + .addGroup(jPanel13Layout.createSequentialGroup() + .addComponent(ledN2Pressure1, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE) + .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) + .addComponent(jLabel25)) + .addGroup(jPanel13Layout.createSequentialGroup() + .addComponent(ledLocalSafety1, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE) + .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) + .addComponent(jLabel26)) + .addGroup(jPanel13Layout.createSequentialGroup() + .addComponent(ledPsysSafety1, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE) + .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) + .addComponent(jLabell21))) + .addContainerGap(38, Short.MAX_VALUE)) + ); + jPanel13Layout.setVerticalGroup( + jPanel13Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) + .addGroup(jPanel13Layout.createSequentialGroup() + .addContainerGap() + .addGroup(jPanel13Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE) + .addComponent(ledAirPressure1, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE) + .addComponent(jLabel24)) + .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) + .addGroup(jPanel13Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE) + .addComponent(ledN2Pressure1, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE) + .addComponent(jLabel25)) + .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) + .addGroup(jPanel13Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE) + .addComponent(ledLocalSafety1, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE) + .addComponent(jLabel26)) + .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) + .addGroup(jPanel13Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE) + .addComponent(ledPsysSafety1, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE) + .addComponent(jLabell21))) + ); + javax.swing.GroupLayout layout = new javax.swing.GroupLayout(this); this.setLayout(layout); layout.setHorizontalGroup( layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) - .addGroup(javax.swing.GroupLayout.Alignment.TRAILING, layout.createSequentialGroup() + .addGroup(layout.createSequentialGroup() .addComponent(jPanel1, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE) .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) .addComponent(basePlatePanel, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE) @@ -723,6 +859,8 @@ public class MainPanel extends Panel { .addGroup(layout.createSequentialGroup() .addComponent(jPanel4, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE) .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED) + .addComponent(jPanel13, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE) + .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) .addComponent(jPanel6, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE) .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED) .addComponent(jPanel7, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE) @@ -745,14 +883,19 @@ public class MainPanel extends Panel { .addComponent(jPanel1, javax.swing.GroupLayout.Alignment.LEADING, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE) .addComponent(basePlatePanel, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)) .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED) - .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING, false) - .addComponent(jPanel4, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE) - .addComponent(jPanel6, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE) - .addComponent(jPanel7, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE) - .addComponent(jPanel8, javax.swing.GroupLayout.Alignment.TRAILING, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE) - .addComponent(jPanel10, javax.swing.GroupLayout.Alignment.TRAILING, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)) + .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) + .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING, false) + .addComponent(jPanel4, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE) + .addComponent(jPanel6, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE) + .addComponent(jPanel7, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE) + .addComponent(jPanel8, javax.swing.GroupLayout.Alignment.TRAILING, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE) + .addComponent(jPanel10, javax.swing.GroupLayout.Alignment.TRAILING, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)) + .addComponent(jPanel13, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)) .addContainerGap()) ); + + layout.linkSize(javax.swing.SwingConstants.VERTICAL, new java.awt.Component[] {jPanel10, jPanel13, jPanel4, jPanel6, jPanel7, jPanel8}); + }// //GEN-END:initComponents private void buttonCameraActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_buttonCameraActionPerformed @@ -836,6 +979,12 @@ public class MainPanel extends Panel { private javax.swing.JLabel jLabel19; private javax.swing.JLabel jLabel2; private javax.swing.JLabel jLabel20; + private javax.swing.JLabel jLabel21; + private javax.swing.JLabel jLabel22; + private javax.swing.JLabel jLabel23; + private javax.swing.JLabel jLabel24; + private javax.swing.JLabel jLabel25; + private javax.swing.JLabel jLabel26; private javax.swing.JLabel jLabel3; private javax.swing.JLabel jLabel4; private javax.swing.JLabel jLabel5; @@ -843,9 +992,13 @@ public class MainPanel extends Panel { private javax.swing.JLabel jLabel7; private javax.swing.JLabel jLabel8; private javax.swing.JLabel jLabel9; + private javax.swing.JLabel jLabell20; + private javax.swing.JLabel jLabell21; private javax.swing.JPanel jPanel1; private javax.swing.JPanel jPanel10; private javax.swing.JPanel jPanel11; + private javax.swing.JPanel jPanel12; + private javax.swing.JPanel jPanel13; private javax.swing.JPanel jPanel2; private javax.swing.JPanel jPanel3; private javax.swing.JPanel jPanel4; @@ -862,6 +1015,8 @@ public class MainPanel extends Panel { private ch.psi.pshell.swing.Led led5; private ch.psi.pshell.swing.Led led6; private ch.psi.pshell.swing.Led led7; + private ch.psi.pshell.swing.Led ledAirPressure; + private ch.psi.pshell.swing.Led ledAirPressure1; private ch.psi.pshell.swing.Led ledFillingControl; private ch.psi.pshell.swing.Led ledFillingDewar; private ch.psi.pshell.swing.Led ledLidControlActive; @@ -870,6 +1025,12 @@ public class MainPanel extends Panel { private ch.psi.pshell.swing.Led ledLidControlActive3; private ch.psi.pshell.swing.Led ledLidControlActive4; private ch.psi.pshell.swing.Led ledLidInitialized; + private ch.psi.pshell.swing.Led ledLocalSafety; + private ch.psi.pshell.swing.Led ledLocalSafety1; + private ch.psi.pshell.swing.Led ledN2Pressure; + private ch.psi.pshell.swing.Led ledN2Pressure1; + private ch.psi.pshell.swing.Led ledPsysSafety; + private ch.psi.pshell.swing.Led ledPsysSafety1; private ch.psi.pshell.swing.ProcessVariablePanel panelDewar; private javax.swing.JProgressBar progressLN2; private javax.swing.JProgressBar progressWater; diff --git a/src/main/java/ch/psi/mxsc/RoomTempBasePlatePanel.form b/src/main/java/ch/psi/mxsc/RoomTempBasePlatePanel.form index ca04019..51eecaa 100644 --- a/src/main/java/ch/psi/mxsc/RoomTempBasePlatePanel.form +++ b/src/main/java/ch/psi/mxsc/RoomTempBasePlatePanel.form @@ -1,125 +1,125 @@ - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+ + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
diff --git a/src/main/java/ch/psi/mxsc/RoomTempBasePlatePanel.java b/src/main/java/ch/psi/mxsc/RoomTempBasePlatePanel.java index 01a064f..7165dab 100644 --- a/src/main/java/ch/psi/mxsc/RoomTempBasePlatePanel.java +++ b/src/main/java/ch/psi/mxsc/RoomTempBasePlatePanel.java @@ -1,119 +1,119 @@ -/* - * 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() { - - jPanel3 = new javax.swing.JPanel(); - roomTempPuckPanel1 = new ch.psi.mxsc.RoomTempPuckPanel(); - roomTempPuckPanel2 = new ch.psi.mxsc.RoomTempPuckPanel(); - jPanel5 = new javax.swing.JPanel(); - roomTempPuckPanel5 = new ch.psi.mxsc.RoomTempPuckPanel(); - roomTempPuckPanel6 = new ch.psi.mxsc.RoomTempPuckPanel(); - - 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.PREFERRED_SIZE, 0, Short.MAX_VALUE) - .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED) - .addComponent(roomTempPuckPanel2, javax.swing.GroupLayout.PREFERRED_SIZE, 0, 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, 101, Short.MAX_VALUE) - .addComponent(roomTempPuckPanel1, javax.swing.GroupLayout.PREFERRED_SIZE, 0, Short.MAX_VALUE)) - .addContainerGap()) - ); - - 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, 93, Short.MAX_VALUE) - .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED) - .addComponent(roomTempPuckPanel6, javax.swing.GroupLayout.DEFAULT_SIZE, 87, 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, 101, Short.MAX_VALUE) - .addComponent(roomTempPuckPanel5, javax.swing.GroupLayout.PREFERRED_SIZE, 0, 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() - .addGroup(layout.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()) - ); - layout.setVerticalGroup( - layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) - .addGroup(javax.swing.GroupLayout.Alignment.TRAILING, layout.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()) - ); - }// //GEN-END:initComponents - - - // Variables declaration - do not modify//GEN-BEGIN:variables - private javax.swing.JPanel jPanel3; - private javax.swing.JPanel jPanel4; - private javax.swing.JPanel jPanel5; - private ch.psi.mxsc.RoomTempPuckPanel roomTempPuckPanel1; - private ch.psi.mxsc.RoomTempPuckPanel roomTempPuckPanel2; - private ch.psi.mxsc.RoomTempPuckPanel roomTempPuckPanel3; - private ch.psi.mxsc.RoomTempPuckPanel roomTempPuckPanel4; - private ch.psi.mxsc.RoomTempPuckPanel roomTempPuckPanel5; - private ch.psi.mxsc.RoomTempPuckPanel roomTempPuckPanel6; - // End of variables declaration//GEN-END:variables -} +/* + * 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() { + + jPanel3 = new javax.swing.JPanel(); + roomTempPuckPanel1 = new ch.psi.mxsc.RoomTempPuckPanel(); + roomTempPuckPanel2 = new ch.psi.mxsc.RoomTempPuckPanel(); + jPanel5 = new javax.swing.JPanel(); + roomTempPuckPanel5 = new ch.psi.mxsc.RoomTempPuckPanel(); + roomTempPuckPanel6 = new ch.psi.mxsc.RoomTempPuckPanel(); + + 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.PREFERRED_SIZE, 0, Short.MAX_VALUE) + .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED) + .addComponent(roomTempPuckPanel2, javax.swing.GroupLayout.PREFERRED_SIZE, 0, 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, 101, Short.MAX_VALUE) + .addComponent(roomTempPuckPanel1, javax.swing.GroupLayout.PREFERRED_SIZE, 0, Short.MAX_VALUE)) + .addContainerGap()) + ); + + 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, 93, Short.MAX_VALUE) + .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED) + .addComponent(roomTempPuckPanel6, javax.swing.GroupLayout.DEFAULT_SIZE, 87, 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, 101, Short.MAX_VALUE) + .addComponent(roomTempPuckPanel5, javax.swing.GroupLayout.PREFERRED_SIZE, 0, 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() + .addGroup(layout.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()) + ); + layout.setVerticalGroup( + layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) + .addGroup(javax.swing.GroupLayout.Alignment.TRAILING, layout.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()) + ); + }// //GEN-END:initComponents + + + // Variables declaration - do not modify//GEN-BEGIN:variables + private javax.swing.JPanel jPanel3; + private javax.swing.JPanel jPanel4; + private javax.swing.JPanel jPanel5; + private ch.psi.mxsc.RoomTempPuckPanel roomTempPuckPanel1; + private ch.psi.mxsc.RoomTempPuckPanel roomTempPuckPanel2; + private ch.psi.mxsc.RoomTempPuckPanel roomTempPuckPanel3; + private ch.psi.mxsc.RoomTempPuckPanel roomTempPuckPanel4; + 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 index 8077a34..3b94a25 100644 --- a/src/main/java/ch/psi/mxsc/RoomTempPuckPanel.form +++ b/src/main/java/ch/psi/mxsc/RoomTempPuckPanel.form @@ -1,155 +1,155 @@ - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+ + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
diff --git a/src/main/java/ch/psi/mxsc/RoomTempPuckPanel.java b/src/main/java/ch/psi/mxsc/RoomTempPuckPanel.java index 4f462f0..a15b111 100644 --- a/src/main/java/ch/psi/mxsc/RoomTempPuckPanel.java +++ b/src/main/java/ch/psi/mxsc/RoomTempPuckPanel.java @@ -1,110 +1,110 @@ -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 -} +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/Sample.java b/src/main/java/ch/psi/mxsc/Sample.java index f970443..32b020f 100644 --- a/src/main/java/ch/psi/mxsc/Sample.java +++ b/src/main/java/ch/psi/mxsc/Sample.java @@ -1,186 +1,186 @@ -/* - * Copyright (c) 2014 Paul Scherrer Institute. All rights reserved. - */ -package ch.psi.mxsc; - -import ch.psi.pshell.device.Device; -import ch.psi.pshell.device.DeviceBase; -import ch.psi.pshell.imaging.DimensionDouble; -import ch.psi.pshell.imaging.PointDouble; -import ch.psi.utils.swing.SwingUtils; -import java.awt.Color; -import java.awt.Dimension; -import java.awt.Font; -import java.awt.Graphics; -import java.awt.Graphics2D; -import java.awt.Point; - -/** - * - */ -public class Sample extends DeviceBase { - - final int index; - - public Sample(Puck puck, int index){ - super(puck.getName() + ":" + (index+1)); - setParent(puck); - this.index = index; - } - - public Puck getPuck() { - return (Puck) getParent(); - } - - DimensionDouble getSize(){ - return new DimensionDouble(12.0, 12.0); - } - - - public int getIndex() { - return index; - } - - boolean enabled; - - public boolean isEnabled() { - return enabled; - } - - public void setEnabled(boolean value) { - enabled = value; - } - - - boolean selected; - - public boolean isSelected() { - return selected && getPuck().getBasePlate().isSelectable(); - } - - public void setSelected(boolean value) { - if (value != selected){ - if (value == true){ - ((Puck)getParent()).setSelected(true); - for (Device d : getParent().getChildren()){ - if (d instanceof Sample){ - ((Sample)d).selected = false; - } - } - } - selected = value; - } - } - - boolean present; - - public boolean isPresent() { - return present; - } - - public void setPresent(boolean value) { - present = value; - } - - boolean loaded; - - public boolean isLoaded() { - return loaded; - } - - public void setLoaded(boolean value) { - loaded = value; - if (value) { - wasLoaded = true; - } - } - - boolean wasLoaded; - - public boolean wasLoaded() { - return wasLoaded; - } - - Color getColor() { - Color ret = Color.LIGHT_GRAY; - - if (isLoaded()) { - ret = Color.BLUE; - } else if (wasLoaded()) { - ret = Color.GREEN; - } else if (isPresent()) { - ret = Color.CYAN.darker().darker(); - } - - if (isSelected()) { - ret = ret.brighter(); - } - return ret; - } - - int getNormalDrawSize() { - return getPuck().getDrawSize(getSize().getWidth() ); - } - int getDrawSize() { - int ret = getNormalDrawSize(); - if (isSelected()) { - ret += 2; - } - return ret; - } - - Point getDrawPosition() { - return getPuck().getDrawPosition(getPuck().getSamplePosition(this)); - } - - - Color getLabelColor(boolean drawBackground) { - return drawBackground ? getPuck().isHighlithted() ? Color.DARK_GRAY : new Color(92, 92, 92) : new Color (0,96,0); - } - - Font getLabelFont() { - //return new Font("Times New Roman", Font.PLAIN, 8); - return new Font("Courier New", Font.PLAIN, 8); - } - - Point getLabelPosition(String text, Graphics g) { - Point center = getDrawPosition(); - Dimension textSize = SwingUtils.getTextSize(text, g.getFontMetrics()); - return new Point(center.x - textSize.width / 2 + 1, center.y + (g.getFontMetrics().getAscent()/2)); - } - - Color getBorderColor(boolean drawBackground) { - if (drawBackground){ - if (!isEnabled()) { - return Color.GRAY; - } else if (isSelected()) { - return new Color(32,32,32); - } - return Color.GRAY; - } - return isSelected() ? new Color(0,32,0) : new Color(0,128,0); - } - - void draw (Graphics2D g, boolean drawBackground){ - Point position = getDrawPosition(); - int size = getDrawSize(); - - if (drawBackground){ - g.setColor(getColor()); - g.fillOval(position.x - size / 2, position.y - size / 2, size, size); - } - g.setColor(getBorderColor(drawBackground)); - g.drawOval(position.x - size / 2, position.y - size / 2, size, size); - - String text = String.valueOf(index + 1); - Point labelPosition = getLabelPosition(text, g); - if (getNormalDrawSize()>10){ - g.setColor(getLabelColor(drawBackground)); - g.setFont(getLabelFont()); - g.drawString(text, labelPosition.x, labelPosition.y); - } - g.setPaintMode(); - - } - -} +/* + * Copyright (c) 2014 Paul Scherrer Institute. All rights reserved. + */ +package ch.psi.mxsc; + +import ch.psi.pshell.device.Device; +import ch.psi.pshell.device.DeviceBase; +import ch.psi.pshell.imaging.DimensionDouble; +import ch.psi.pshell.imaging.PointDouble; +import ch.psi.utils.swing.SwingUtils; +import java.awt.Color; +import java.awt.Dimension; +import java.awt.Font; +import java.awt.Graphics; +import java.awt.Graphics2D; +import java.awt.Point; + +/** + * + */ +public class Sample extends DeviceBase { + + final int index; + + public Sample(Puck puck, int index){ + super(puck.getName() + ":" + (index+1)); + setParent(puck); + this.index = index; + } + + public Puck getPuck() { + return (Puck) getParent(); + } + + DimensionDouble getSize(){ + return new DimensionDouble(12.0, 12.0); + } + + + public int getIndex() { + return index; + } + + boolean enabled; + + public boolean isEnabled() { + return enabled; + } + + public void setEnabled(boolean value) { + enabled = value; + } + + + boolean selected; + + public boolean isSelected() { + return selected && getPuck().getBasePlate().isSelectable(); + } + + public void setSelected(boolean value) { + if (value != selected){ + if (value == true){ + ((Puck)getParent()).setSelected(true); + for (Device d : getParent().getChildren()){ + if (d instanceof Sample){ + ((Sample)d).selected = false; + } + } + } + selected = value; + } + } + + boolean present; + + public boolean isPresent() { + return present; + } + + public void setPresent(boolean value) { + present = value; + } + + boolean loaded; + + public boolean isLoaded() { + return loaded; + } + + public void setLoaded(boolean value) { + loaded = value; + if (value) { + wasLoaded = true; + } + } + + boolean wasLoaded; + + public boolean wasLoaded() { + return wasLoaded; + } + + Color getColor() { + Color ret = Color.LIGHT_GRAY; + + if (isLoaded()) { + ret = Color.BLUE; + } else if (wasLoaded()) { + ret = Color.GREEN; + } else if (isPresent()) { + ret = Color.CYAN.darker().darker(); + } + + if (isSelected()) { + ret = ret.brighter(); + } + return ret; + } + + int getNormalDrawSize() { + return getPuck().getDrawSize(getSize().getWidth() ); + } + int getDrawSize() { + int ret = getNormalDrawSize(); + if (isSelected()) { + ret += 2; + } + return ret; + } + + Point getDrawPosition() { + return getPuck().getDrawPosition(getPuck().getSamplePosition(this)); + } + + + Color getLabelColor(boolean drawBackground) { + return drawBackground ? getPuck().isHighlithted() ? Color.DARK_GRAY : new Color(92, 92, 92) : new Color (0,96,0); + } + + Font getLabelFont() { + //return new Font("Times New Roman", Font.PLAIN, 8); + return new Font("Courier New", Font.PLAIN, 8); + } + + Point getLabelPosition(String text, Graphics g) { + Point center = getDrawPosition(); + Dimension textSize = SwingUtils.getTextSize(text, g.getFontMetrics()); + return new Point(center.x - textSize.width / 2 + 1, center.y + (g.getFontMetrics().getAscent()/2)); + } + + Color getBorderColor(boolean drawBackground) { + if (drawBackground){ + if (!isEnabled()) { + return Color.GRAY; + } else if (isSelected()) { + return new Color(32,32,32); + } + return Color.GRAY; + } + return isSelected() ? new Color(0,32,0) : new Color(0,128,0); + } + + void draw (Graphics2D g, boolean drawBackground){ + Point position = getDrawPosition(); + int size = getDrawSize(); + + if (drawBackground){ + g.setColor(getColor()); + g.fillOval(position.x - size / 2, position.y - size / 2, size, size); + } + g.setColor(getBorderColor(drawBackground)); + g.drawOval(position.x - size / 2, position.y - size / 2, size, size); + + String text = String.valueOf(index + 1); + Point labelPosition = getLabelPosition(text, g); + if (getNormalDrawSize()>10){ + g.setColor(getLabelColor(drawBackground)); + g.setFont(getLabelFont()); + g.drawString(text, labelPosition.x, labelPosition.y); + } + g.setPaintMode(); + + } + +}