diff --git a/nbactions.xml b/nbactions.xml index 2e53b1a..f082581 100644 --- a/nbactions.xml +++ b/nbactions.xml @@ -12,7 +12,7 @@ ${exec.vmArgs} -classpath %classpath ${exec.mainClass} ${exec.appArgs} java - -p ch.psi.mxsc.MainPanel -u=true -home=D:\Dev\pshell\home -r 6d + -p ch.psi.mxsc.MainPanel -home C:\Dev\pshell\home -r 6d ch.psi.pshell.workbench.App @@ -31,7 +31,7 @@ java true -agentlib:jdwp=transport=dt_socket,server=n,address=${jpda.address} - -p ch.psi.mxsc.MainPanel -u=true -home=D:\Dev\pshell\home -r 6d + -p ch.psi.mxsc.MainPanel -home C:\Dev\pshell\home -r 6d ch.psi.pshell.workbench.App @@ -47,7 +47,7 @@ ${exec.vmArgs} -classpath %classpath ${exec.mainClass} ${exec.appArgs} java - -p ch.psi.mxsc.MainPanel -u=true -home=D:\Dev\pshell\home -r 6d + -p ch.psi.mxsc.MainPanel -home C:\Dev\pshell\home -r 6d ch.psi.pshell.workbench.App diff --git a/src/main/java/ch/psi/mxsc/MainPanel.form b/src/main/java/ch/psi/mxsc/MainPanel.form index 97ff37c..13cf06a 100644 --- a/src/main/java/ch/psi/mxsc/MainPanel.form +++ b/src/main/java/ch/psi/mxsc/MainPanel.form @@ -97,7 +97,7 @@ - + @@ -645,19 +645,19 @@ - + - - - - + + + + - + - + @@ -684,7 +684,7 @@ - + @@ -698,7 +698,7 @@ - + @@ -706,27 +706,27 @@ - + - + - + - + - + @@ -743,32 +743,44 @@ + + + - + - + + + + - + + + + - + + + + @@ -795,6 +807,9 @@ + + + @@ -802,6 +817,9 @@ + + + @@ -809,8 +827,11 @@ + + + - + @@ -826,18 +847,24 @@ + + + - + - + + + + diff --git a/src/main/java/ch/psi/mxsc/MainPanel.java b/src/main/java/ch/psi/mxsc/MainPanel.java index 35b5c39..0665696 100644 --- a/src/main/java/ch/psi/mxsc/MainPanel.java +++ b/src/main/java/ch/psi/mxsc/MainPanel.java @@ -6,14 +6,10 @@ package ch.psi.mxsc; import ch.psi.mxsc.BasePlatePanel.SelectionMode; import ch.psi.pshell.framework.Context; import ch.psi.pshell.device.Device; -import ch.psi.pshell.device.DeviceListener; import ch.psi.pshell.device.DeviceBase; import ch.psi.pshell.device.DeviceListener; import ch.psi.pshell.device.GenericDevice; import ch.psi.pshell.extension.Plugin; -import ch.psi.pshell.imaging.PointDouble; -import ch.psi.pshell.imaging.Renderer; -import ch.psi.pshell.imaging.RendererMode; import ch.psi.pshell.imaging.Source; import ch.psi.pshell.scripting.ViewPreference; import ch.psi.pshell.framework.App; @@ -26,6 +22,7 @@ import ch.psi.pshell.swing.Document; import ch.psi.pshell.swing.DocumentListener; import ch.psi.pshell.swing.Editor; import ch.psi.pshell.swing.JsonTableEditor; +import ch.psi.pshell.swing.Led; import ch.psi.pshell.swing.SwingUtils; import java.awt.BorderLayout; import java.awt.Color; @@ -41,14 +38,11 @@ import java.awt.event.ActionEvent; import java.awt.event.MouseAdapter; import java.awt.event.MouseEvent; import java.io.File; -import java.io.IOException; import java.lang.reflect.Array; import java.util.ArrayList; import java.util.List; import java.util.Map; import java.util.logging.Level; -import java.util.logging.Logger; -import javax.script.ScriptException; import javax.swing.GroupLayout; import javax.swing.ImageIcon; import javax.swing.JComponent; @@ -60,6 +54,8 @@ import javax.swing.JMenuItem; import javax.swing.JPanel; import javax.swing.JPopupMenu; import javax.swing.SwingUtilities; +import javax.swing.border.LineBorder; +import javax.swing.border.TitledBorder; import javax.swing.event.ListSelectionEvent; import javax.swing.event.ListSelectionListener; import javax.swing.table.DefaultTableModel; @@ -470,6 +466,9 @@ public class MainPanel extends Panel { SwingUtilities.invokeLater(()->{updateCameraView();}); } + boolean alarmPulse; + boolean alarming; + @Override protected void onTimer() { try { @@ -510,6 +509,34 @@ public class MainPanel extends Panel { } else { status = null; } + + boolean alarm = false; + boolean warning = false; + for (Led led : SwingUtils.getComponentsByType(panelSystemStatus, Led.class)){ + if (led.getColor().equals(Color.RED)){ + alarm = true; + } + if (led.getColor().equals(Color.YELLOW)){ + warning = true; + } + } + boolean isAlarming = alarm;// (alarm || warning); + alarmPulse = isAlarming ? !alarmPulse : false; + if (isAlarming || alarming){ + TitledBorder border = (TitledBorder) panelSystemStatus.getBorder(); + if (alarmPulse ){ + Color color = alarm ? Color.RED : Color.YELLOW; + //border.setTitleColor(color); + border.setBorder(new LineBorder(color, 2, true)); + //panelSystemStatus.setBackground(Color.RED); + } else { + //border.setTitleColor(null); + border.setBorder(null); + //panelSystemStatus.setBackground(null); + } + panelSystemStatus.repaint(); + } + alarming = isAlarming; } catch (Exception ex) { getLogger().log(Level.WARNING, null, ex); } @@ -1208,12 +1235,12 @@ public class MainPanel extends Panel { jLabel9 = new javax.swing.JLabel(); panelSystemStatus = new javax.swing.JPanel(); ledAirPressure = new ch.psi.pshell.swing.Led(); - jLabel24 = new javax.swing.JLabel(); - jLabel25 = new javax.swing.JLabel(); + labelAirPressure = new javax.swing.JLabel(); + labelN2Pressure = new javax.swing.JLabel(); ledN2Pressure = new ch.psi.pshell.swing.Led(); - jLabel26 = new javax.swing.JLabel(); + labelLocalSafety = new javax.swing.JLabel(); ledLocalSafety = new ch.psi.pshell.swing.Led(); - jLabell21 = new javax.swing.JLabel(); + labelPsysSafety = new javax.swing.JLabel(); ledPsysSafety = new ch.psi.pshell.swing.Led(); buttonRelease = new javax.swing.JButton(); filler1 = new javax.swing.Box.Filler(new java.awt.Dimension(0, 30), new java.awt.Dimension(0, 30), new java.awt.Dimension(32767, 30)); @@ -1222,11 +1249,11 @@ public class MainPanel extends Panel { ledManualMode = new ch.psi.pshell.swing.Led(); labelManualMode = new javax.swing.JLabel(); ledHeaterOk = new ch.psi.pshell.swing.Led(); - jLabel29 = new javax.swing.JLabel(); + labelHeaterOk = new javax.swing.JLabel(); panelHeaterTemp = new ch.psi.pshell.swing.DeviceValuePanel(); ledDryer = new ch.psi.pshell.swing.Led(); - jLabel27 = new javax.swing.JLabel(); - labelManualMode1 = new javax.swing.JLabel(); + labelDryer = new javax.swing.JLabel(); + labelServiceMode = new javax.swing.JLabel(); ledServiceMode = new ch.psi.pshell.swing.Led(); checkService = new javax.swing.JCheckBox(); panelDatamatrix = new javax.swing.JPanel(); @@ -1358,7 +1385,7 @@ public class MainPanel extends Panel { panelDetectionLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) .addGroup(panelDetectionLayout.createSequentialGroup() .addContainerGap() - .addComponent(buttonSampleLoad, javax.swing.GroupLayout.DEFAULT_SIZE, 90, Short.MAX_VALUE) + .addComponent(buttonSampleLoad, javax.swing.GroupLayout.DEFAULT_SIZE, 106, Short.MAX_VALUE) .addContainerGap()) ); panelDetectionLayout.setVerticalGroup( @@ -1403,21 +1430,21 @@ public class MainPanel extends Panel { .addComponent(jLabel1, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE) .addComponent(textCoverDet) .addComponent(jLabel2, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE) - .addComponent(textCoverCache, javax.swing.GroupLayout.DEFAULT_SIZE, 90, Short.MAX_VALUE)) + .addComponent(textCoverCache, javax.swing.GroupLayout.DEFAULT_SIZE, 106, Short.MAX_VALUE)) .addContainerGap()) ); panelCoverLayout.setVerticalGroup( panelCoverLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) .addGroup(panelCoverLayout.createSequentialGroup() - .addContainerGap(12, Short.MAX_VALUE) + .addContainerGap(javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE) .addComponent(jLabel2) .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) .addComponent(textCoverCache, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE) - .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED, 18, Short.MAX_VALUE) + .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE) .addComponent(jLabel1) .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) .addComponent(textCoverDet, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE) - .addContainerGap(12, Short.MAX_VALUE)) + .addContainerGap(javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)) ); panelViewType.setBorder(javax.swing.BorderFactory.createTitledBorder("View")); @@ -1445,11 +1472,11 @@ public class MainPanel extends Panel { panelViewTypeLayout.setHorizontalGroup( panelViewTypeLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) .addGroup(javax.swing.GroupLayout.Alignment.TRAILING, panelViewTypeLayout.createSequentialGroup() - .addContainerGap(javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE) + .addContainerGap(14, Short.MAX_VALUE) .addGroup(panelViewTypeLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING, false) .addComponent(buttonCamera, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE) .addComponent(buttonDrawing, javax.swing.GroupLayout.DEFAULT_SIZE, 90, Short.MAX_VALUE)) - .addContainerGap(javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)) + .addContainerGap(14, Short.MAX_VALUE)) ); panelViewTypeLayout.setVerticalGroup( panelViewTypeLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) @@ -1470,9 +1497,9 @@ public class MainPanel extends Panel { .addGroup(basePlatePanelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING, false) .addComponent(panelLegend, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE) .addComponent(panelDetection, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)) - .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED, 242, Short.MAX_VALUE) + .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED, 196, Short.MAX_VALUE) .addGroup(basePlatePanelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING, false) - .addComponent(panelCover, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE) + .addComponent(panelCover, javax.swing.GroupLayout.DEFAULT_SIZE, 128, Short.MAX_VALUE) .addComponent(panelViewType, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)) .addContainerGap()) ); @@ -1488,7 +1515,7 @@ public class MainPanel extends Panel { .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE) .addGroup(basePlatePanelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) .addComponent(panelLegend, javax.swing.GroupLayout.Alignment.TRAILING, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE) - .addComponent(panelCover, javax.swing.GroupLayout.Alignment.TRAILING, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)) + .addComponent(panelCover, javax.swing.GroupLayout.Alignment.TRAILING, javax.swing.GroupLayout.PREFERRED_SIZE, 159, javax.swing.GroupLayout.PREFERRED_SIZE)) .addContainerGap()) ); @@ -1515,7 +1542,7 @@ public class MainPanel extends Panel { ); jPanel3Layout.setVerticalGroup( jPanel3Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) - .addComponent(progressLN2, javax.swing.GroupLayout.DEFAULT_SIZE, 428, Short.MAX_VALUE) + .addComponent(progressLN2, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE) .addGroup(javax.swing.GroupLayout.Alignment.TRAILING, jPanel3Layout.createSequentialGroup() .addContainerGap(javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE) .addComponent(jLabel4) @@ -1578,13 +1605,21 @@ public class MainPanel extends Panel { panelSystemStatus.setBorder(javax.swing.BorderFactory.createTitledBorder("System Status")); - jLabel24.setText("Air Pressure"); + ledAirPressure.setLedSize(16); - jLabel25.setText("N2 Pressure"); + labelAirPressure.setText("Air Pressure"); - jLabel26.setText("Local Safety"); + labelN2Pressure.setText("N2 Pressure"); - jLabell21.setText("Door Safety"); + ledN2Pressure.setLedSize(16); + + labelLocalSafety.setText("Local Safety"); + + ledLocalSafety.setLedSize(16); + + labelPsysSafety.setText("Door Safety"); + + ledPsysSafety.setLedSize(16); buttonRelease.setText("Release"); buttonRelease.addActionListener(new java.awt.event.ActionListener() { @@ -1593,18 +1628,28 @@ public class MainPanel extends Panel { } }); + ledRoomTemperature.setLedSize(16); + labelRoomTemperature.setText("Room Temperature"); + ledManualMode.setLedSize(16); + labelManualMode.setText("Manual Mode"); - jLabel29.setText("Heater"); + ledHeaterOk.setLedSize(16); + + labelHeaterOk.setText("Heater"); panelHeaterTemp.setBorder(javax.swing.BorderFactory.createEtchedBorder()); panelHeaterTemp.setDeviceName("rim_heater_temp"); - jLabel27.setText("Dryer"); + ledDryer.setLedSize(16); - labelManualMode1.setText("Service Mode"); + labelDryer.setText("Dryer"); + + labelServiceMode.setText("Service Mode"); + + ledServiceMode.setLedSize(16); checkService.addActionListener(new java.awt.event.ActionListener() { public void actionPerformed(java.awt.event.ActionEvent evt) { @@ -1631,18 +1676,18 @@ public class MainPanel extends Panel { .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) .addGroup(panelSystemStatusLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) .addGroup(panelSystemStatusLayout.createSequentialGroup() - .addComponent(jLabel29) + .addComponent(labelHeaterOk) .addGap(18, 18, Short.MAX_VALUE) .addComponent(panelHeaterTemp, javax.swing.GroupLayout.PREFERRED_SIZE, 50, javax.swing.GroupLayout.PREFERRED_SIZE)) - .addComponent(jLabel24) - .addComponent(jLabel25) - .addComponent(jLabel26) - .addComponent(jLabell21) + .addComponent(labelAirPressure) + .addComponent(labelN2Pressure) + .addComponent(labelLocalSafety) + .addComponent(labelPsysSafety) .addComponent(labelRoomTemperature) .addComponent(labelManualMode) - .addComponent(jLabel27) + .addComponent(labelDryer) .addGroup(panelSystemStatusLayout.createSequentialGroup() - .addComponent(labelManualMode1) + .addComponent(labelServiceMode) .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED) .addComponent(checkService))) .addContainerGap(javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)) @@ -1663,7 +1708,7 @@ public class MainPanel extends Panel { .addGroup(panelSystemStatusLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.TRAILING) .addGroup(panelSystemStatusLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE) .addComponent(ledServiceMode, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE) - .addComponent(labelManualMode1)) + .addComponent(labelServiceMode)) .addComponent(checkService)) .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) .addGroup(panelSystemStatusLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) @@ -1674,28 +1719,28 @@ public class MainPanel extends Panel { .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) .addGroup(panelSystemStatusLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE) .addComponent(ledHeaterOk, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE) - .addComponent(jLabel29))) + .addComponent(labelHeaterOk))) .addComponent(panelHeaterTemp, javax.swing.GroupLayout.Alignment.TRAILING, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)) .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) .addGroup(panelSystemStatusLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE) .addComponent(ledAirPressure, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE) - .addComponent(jLabel24)) + .addComponent(labelAirPressure)) .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) .addGroup(panelSystemStatusLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE) .addComponent(ledN2Pressure, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE) - .addComponent(jLabel25)) + .addComponent(labelN2Pressure)) .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) .addGroup(panelSystemStatusLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE) .addComponent(ledDryer, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE) - .addComponent(jLabel27)) + .addComponent(labelDryer)) .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) .addGroup(panelSystemStatusLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE) .addComponent(ledLocalSafety, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE) - .addComponent(jLabel26)) + .addComponent(labelLocalSafety)) .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) .addGroup(panelSystemStatusLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE) .addComponent(ledPsysSafety, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE) - .addComponent(jLabell21)) + .addComponent(labelPsysSafety)) .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE) .addGroup(panelSystemStatusLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) .addGroup(panelSystemStatusLayout.createSequentialGroup() @@ -1885,7 +1930,7 @@ public class MainPanel extends Panel { .addComponent(buttonExpertCommands, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE) .addGroup(panelExpertLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING, false) .addComponent(buttonRecovery, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE) - .addComponent(buttonConfig, javax.swing.GroupLayout.DEFAULT_SIZE, 85, Short.MAX_VALUE) + .addComponent(buttonConfig, javax.swing.GroupLayout.PREFERRED_SIZE, 85, Short.MAX_VALUE) .addComponent(buttonDetectionCalibrate, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE) .addComponent(buttonDetectionExposure, javax.swing.GroupLayout.PREFERRED_SIZE, 92, javax.swing.GroupLayout.PREFERRED_SIZE)) ); @@ -1897,7 +1942,7 @@ public class MainPanel extends Panel { .addGroup(panelExpertLayout.createSequentialGroup() .addGap(0, 0, 0) .addComponent(checkExpert) - .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE) + .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED, 14, Short.MAX_VALUE) .addComponent(buttonExpertCommands) .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED) .addComponent(buttonRecovery) @@ -1907,7 +1952,7 @@ public class MainPanel extends Panel { .addComponent(buttonDetectionCalibrate) .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED) .addComponent(buttonDetectionExposure) - .addContainerGap(javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)) + .addContainerGap(8, Short.MAX_VALUE)) ); javax.swing.GroupLayout panelDevicesLayout = new javax.swing.GroupLayout(panelDevices); @@ -1917,18 +1962,18 @@ public class MainPanel extends Panel { .addGroup(panelDevicesLayout.createSequentialGroup() .addGap(0, 0, 0) .addComponent(devicesPanel, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE) - .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED, 26, Short.MAX_VALUE) + .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE) .addComponent(panelExpert, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE) - .addContainerGap(26, Short.MAX_VALUE)) + .addContainerGap(javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)) ); panelDevicesLayout.setVerticalGroup( panelDevicesLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) .addGroup(panelDevicesLayout.createSequentialGroup() - .addContainerGap(10, Short.MAX_VALUE) + .addContainerGap(8, Short.MAX_VALUE) .addGroup(panelDevicesLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) .addComponent(panelExpert, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE) .addComponent(devicesPanel, javax.swing.GroupLayout.DEFAULT_SIZE, 238, Short.MAX_VALUE)) - .addContainerGap(9, Short.MAX_VALUE)) + .addContainerGap(7, Short.MAX_VALUE)) ); javax.swing.GroupLayout panelRightLayout = new javax.swing.GroupLayout(panelRight); @@ -1947,7 +1992,7 @@ public class MainPanel extends Panel { panelRightLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) .addGroup(panelRightLayout.createSequentialGroup() .addGap(0, 0, 0) - .addComponent(panelDetail, javax.swing.GroupLayout.DEFAULT_SIZE, 125, Short.MAX_VALUE) + .addComponent(panelDetail, javax.swing.GroupLayout.DEFAULT_SIZE, 142, Short.MAX_VALUE) .addGap(0, 0, 0) .addComponent(panelDevices, javax.swing.GroupLayout.PREFERRED_SIZE, 280, javax.swing.GroupLayout.PREFERRED_SIZE) .addGap(0, 0, 0) @@ -2118,7 +2163,7 @@ public class MainPanel extends Panel { .addGroup(javax.swing.GroupLayout.Alignment.TRAILING, layout.createSequentialGroup() .addComponent(panelTop, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE) .addGap(0, 0, 0) - .addComponent(panelBottom, javax.swing.GroupLayout.DEFAULT_SIZE, 66, Short.MAX_VALUE) + .addComponent(panelBottom, javax.swing.GroupLayout.DEFAULT_SIZE, 49, Short.MAX_VALUE) .addGap(1, 1, 1)) ); }// //GEN-END:initComponents @@ -2281,20 +2326,20 @@ public class MainPanel extends Panel { private javax.swing.JLabel jLabel2; private javax.swing.JLabel jLabel20; private javax.swing.JLabel jLabel23; - private javax.swing.JLabel jLabel24; - private javax.swing.JLabel jLabel25; - private javax.swing.JLabel jLabel26; - private javax.swing.JLabel jLabel27; - private javax.swing.JLabel jLabel29; private javax.swing.JLabel jLabel4; private javax.swing.JLabel jLabel8; private javax.swing.JLabel jLabel9; - private javax.swing.JLabel jLabell21; private javax.swing.JPanel jPanel3; private javax.swing.JPanel jPanel4; + private javax.swing.JLabel labelAirPressure; + private javax.swing.JLabel labelDryer; + private javax.swing.JLabel labelHeaterOk; + private javax.swing.JLabel labelLocalSafety; private javax.swing.JLabel labelManualMode; - private javax.swing.JLabel labelManualMode1; + private javax.swing.JLabel labelN2Pressure; + private javax.swing.JLabel labelPsysSafety; private javax.swing.JLabel labelRoomTemperature; + private javax.swing.JLabel labelServiceMode; private ch.psi.pshell.swing.Led led5; private ch.psi.pshell.swing.Led led6; private ch.psi.pshell.swing.Led ledAirPressure;