diff --git a/src/main/java/ch/psi/mxsc/Controller.java b/src/main/java/ch/psi/mxsc/Controller.java
index 6194b8a..5c92a42 100644
--- a/src/main/java/ch/psi/mxsc/Controller.java
+++ b/src/main/java/ch/psi/mxsc/Controller.java
@@ -12,6 +12,7 @@ import ch.psi.pshell.device.GenericDevice;
import ch.psi.pshell.device.ProcessVariableBase;
import ch.psi.pshell.device.ReadbackDevice;
import ch.psi.pshell.ui.Panel;
+import ch.psi.utils.swing.SwingUtils;
import java.io.IOException;
import java.util.HashMap;
import java.util.List;
@@ -215,6 +216,8 @@ public class Controller {
void onPuckPressed(Puck puck){
//getMainFrame().textDetSensors.setText(String.valueOf(puck.getDetection()));
//getMainFrame().textDetImage.setText(String.valueOf(puck.getImageDetection()));
+
+
}
void onSamplePressed(Sample sample){
@@ -233,4 +236,15 @@ public class Controller {
return getMainFrame().getContext();
}
+ void execute(String statement){
+ getMainFrame().execute(statement);
+ }
+
+ void execute(String statement, boolean background){
+ getMainFrame().execute(statement, background);
+ }
+
+ void execute(String statement, boolean background, boolean showReturn){
+ getMainFrame().execute(statement, background, showReturn);
+ }
}
diff --git a/src/main/java/ch/psi/mxsc/MainPanel.form b/src/main/java/ch/psi/mxsc/MainPanel.form
index 765b5a1..70e0c88 100644
--- a/src/main/java/ch/psi/mxsc/MainPanel.form
+++ b/src/main/java/ch/psi/mxsc/MainPanel.form
@@ -35,8 +35,6 @@
-
-
@@ -61,7 +59,6 @@
-
@@ -87,17 +84,15 @@
+
-
-
-
-
-
+
+
-
-
+
+
@@ -106,14 +101,14 @@
-
-
-
+
+
+
-
-
+
+
@@ -266,7 +261,7 @@
-
+
@@ -291,11 +286,11 @@
-
+
-
+
-
+
@@ -341,9 +336,9 @@
-
+
-
+
@@ -353,7 +348,7 @@
-
+
@@ -593,6 +588,7 @@
+
@@ -609,6 +605,8 @@
+
+
@@ -637,6 +635,14 @@
+
+
+
+
+
+
+
+
@@ -675,7 +681,7 @@
-
+
@@ -747,87 +753,6 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
@@ -854,7 +779,7 @@
-
+
@@ -897,7 +822,7 @@
-
+
@@ -910,8 +835,8 @@
-
-
+
+
@@ -919,14 +844,14 @@
-
+
-
+
@@ -936,7 +861,7 @@
-
+
@@ -968,7 +893,7 @@
-
+
@@ -976,24 +901,19 @@
-
-
-
-
-
-
-
+
+
+
+
-
-
-
-
-
-
+
+
+
+
@@ -1008,15 +928,6 @@
-
-
-
-
-
-
-
-
-
@@ -1041,22 +952,28 @@
-
-
-
-
-
-
-
-
-
-
-
+
+
+
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -1067,10 +984,18 @@
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
@@ -1138,6 +1063,16 @@
+
+
+
+
+
+
+
+
+
+
@@ -1153,23 +1088,23 @@
-
+
-
+
-
-
+
+
-
-
+
+
diff --git a/src/main/java/ch/psi/mxsc/MainPanel.java b/src/main/java/ch/psi/mxsc/MainPanel.java
index 459d0e1..9553e51 100644
--- a/src/main/java/ch/psi/mxsc/MainPanel.java
+++ b/src/main/java/ch/psi/mxsc/MainPanel.java
@@ -4,6 +4,7 @@
package ch.psi.mxsc;
+import ch.psi.pshell.core.Plugin;
import ch.psi.pshell.device.Device;
import ch.psi.pshell.device.DeviceAdapter;
import ch.psi.pshell.imaging.Renderer;
@@ -11,7 +12,6 @@ import ch.psi.pshell.imaging.RendererMode;
import ch.psi.pshell.imaging.Source;
import ch.psi.pshell.ui.App;
import ch.psi.pshell.ui.Panel;
-import ch.psi.utils.State;
import ch.psi.utils.swing.SwingUtils;
import java.awt.Color;
import java.awt.Dialog;
@@ -21,6 +21,7 @@ import java.util.logging.Level;
import javax.swing.GroupLayout;
import javax.swing.ImageIcon;
import javax.swing.JComponent;
+import javax.swing.JDialog;
/**
*
@@ -35,6 +36,11 @@ public class MainPanel extends Panel {
basePlatePanel.setMode(BasePlatePanel.Mode.single);
labelRoomTemperature.setVisible(false);
buttonExpertCommands.setVisible(false);
+ buttonRecovery.setVisible(false);
+ buttonReleaseLocal.setVisible(false);
+ buttonReleasePsys.setVisible(false);
+ panelViewType.setVisible(false);
+ panelDetection.setVisible(false);
}
@Override
@@ -77,14 +83,6 @@ public class MainPanel extends Panel {
});
updateFillingControl(((Device) getDevice("ln2_main_power")).take());
- ((Device) getDevice("hexiposi")).addListener(new DeviceAdapter() {
- @Override
- public void onStateChanged(Device device, State state, State former) {
- updateHexiposiState(state);
- }
- });
- updateHexiposiState(((Device) getDevice("hexiposi")).getState());
-
((Device) getDevice("air_pressure_ok")).addListener(new DeviceAdapter() {
@Override
public void onValueChanged(Device device, Object value, Object former) {
@@ -163,12 +161,7 @@ public class MainPanel extends Panel {
ledFillingControl.setColor(Color.BLACK);
}
}
-
- 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);
@@ -219,10 +212,16 @@ public class MainPanel extends Panel {
}
void execute(String statement, boolean background){
+ execute(statement, background, false);
+ }
+
+ void execute(String statement, boolean background, boolean showReturn){
try {
evalAsync(statement, background).handle((ret, ex) -> {
if (ex != null){
showException((Exception)ex);
+ } else if (showReturn){
+ SwingUtils.showMessage(getTopLevel(), "Return", String.valueOf(ret));
}
return ret;
});
@@ -231,6 +230,7 @@ public class MainPanel extends Panel {
}
}
+
void execute(String script, Object args){
try {
runAsync(script, args).handle((ret, ex) -> {
@@ -276,6 +276,35 @@ public class MainPanel extends Panel {
}
+ void setExpertMode(boolean expert){
+ buttonExpertCommands.setVisible(expert);
+ buttonRecovery.setVisible(expert);
+ devicesPanel.setActive(expert);
+ buttonReleaseLocal.setVisible(expert);
+ buttonReleasePsys.setVisible(expert);
+ panelViewType.setVisible(expert);
+ panelDetection.setVisible(expert);
+
+ if (checkExpert.isSelected()!=expert){
+ checkExpert.setSelected(expert);
+ }
+ }
+
+ Plugin commandsPlugin;
+ void showCommandsPanel(){
+ if (commandsPlugin!=null){
+ getContext().getPluginManager().unloadPlugin(commandsPlugin);
+ }
+ commandsPlugin = getContext().getPluginManager().loadInitializePlugin(getContext().getSetup().expandPath("{plugins}/Commands.java"));
+ }
+
+ Plugin recoveryPlugin;
+ void showRecoveryPanel(){
+ if (recoveryPlugin!=null){
+ getContext().getPluginManager().unloadPlugin(recoveryPlugin);
+ }
+ recoveryPlugin = getContext().getPluginManager().loadInitializePlugin(getContext().getSetup().expandPath("{plugins}/Recovery.java"));
+ }
/** This method is called from within the constructor to
* initialize the form.
@@ -298,12 +327,12 @@ public class MainPanel extends Panel {
ledLidControlActive3 = new ch.psi.pshell.swing.Led();
ledLidControlActive5 = new ch.psi.pshell.swing.Led();
jLabel23 = new javax.swing.JLabel();
- panelDet = new javax.swing.JPanel();
+ panelDetection = new javax.swing.JPanel();
buttonClearDet = new javax.swing.JButton();
buttonPuckDet = new javax.swing.JButton();
panelHexiposi = new javax.swing.JPanel();
hexiposiPanel = new ch.psi.mxsc.HexiposiPanel();
- jPanel9 = new javax.swing.JPanel();
+ panelViewType = new javax.swing.JPanel();
buttonCamera = new javax.swing.JToggleButton();
buttonDrawing = new javax.swing.JToggleButton();
jPanel1 = new javax.swing.JPanel();
@@ -321,6 +350,7 @@ public class MainPanel extends Panel {
devicesPanel = new ch.psi.mxsc.DevicesPanel();
checkExpert = new javax.swing.JCheckBox();
buttonExpertCommands = new javax.swing.JButton();
+ buttonRecovery = new javax.swing.JButton();
jPanel4 = new javax.swing.JPanel();
ledFillingControl = new ch.psi.pshell.swing.Led();
ledFillingDewar = new ch.psi.pshell.swing.Led();
@@ -329,12 +359,6 @@ public class MainPanel extends Panel {
deviceValuePanel1 = new ch.psi.pshell.swing.DeviceValuePanel();
jLabel14 = new javax.swing.JLabel();
labelRoomTemperature = new javax.swing.JLabel();
- jPanel6 = new javax.swing.JPanel();
- ledLidControlActive = new ch.psi.pshell.swing.Led();
- jLabel6 = new javax.swing.JLabel();
- ledLidInitialized = new ch.psi.pshell.swing.Led();
- jLabel7 = new javax.swing.JLabel();
- buttonInitHexiposi = new javax.swing.JButton();
jPanel7 = new javax.swing.JPanel();
led5 = new ch.psi.pshell.swing.Led();
led6 = new ch.psi.pshell.swing.Led();
@@ -347,7 +371,6 @@ public class MainPanel extends Panel {
textType = new javax.swing.JTextField();
jPanel10 = new javax.swing.JPanel();
buttonInitHexiposi1 = new javax.swing.JButton();
- buttonInitHexiposi2 = new javax.swing.JButton();
jPanel13 = new javax.swing.JPanel();
ledAirPressure = new ch.psi.pshell.swing.Led();
jLabel24 = new javax.swing.JLabel();
@@ -359,6 +382,7 @@ public class MainPanel extends Panel {
ledPsysSafety = new ch.psi.pshell.swing.Led();
buttonReleaseLocal = new javax.swing.JButton();
buttonReleasePsys = new javax.swing.JButton();
+ filler1 = new javax.swing.Box.Filler(new java.awt.Dimension(0, 0), new java.awt.Dimension(0, 0), new java.awt.Dimension(32767, 32767));
jPanel12 = new javax.swing.JPanel();
btViewDewar = new javax.swing.JToggleButton();
btViewRT = new javax.swing.JToggleButton();
@@ -448,7 +472,7 @@ public class MainPanel extends Panel {
.addComponent(jLabel23)))
);
- panelDet.setBorder(javax.swing.BorderFactory.createTitledBorder("Detection"));
+ panelDetection.setBorder(javax.swing.BorderFactory.createTitledBorder("Detection"));
buttonClearDet.setText("Clear");
buttonClearDet.addActionListener(new java.awt.event.ActionListener() {
@@ -464,25 +488,25 @@ public class MainPanel extends Panel {
}
});
- javax.swing.GroupLayout panelDetLayout = new javax.swing.GroupLayout(panelDet);
- panelDet.setLayout(panelDetLayout);
- panelDetLayout.setHorizontalGroup(
- panelDetLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
- .addGroup(panelDetLayout.createSequentialGroup()
+ javax.swing.GroupLayout panelDetectionLayout = new javax.swing.GroupLayout(panelDetection);
+ panelDetection.setLayout(panelDetectionLayout);
+ panelDetectionLayout.setHorizontalGroup(
+ panelDetectionLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
+ .addGroup(panelDetectionLayout.createSequentialGroup()
.addContainerGap(12, Short.MAX_VALUE)
- .addGroup(panelDetLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING, false)
+ .addGroup(panelDetectionLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING, false)
.addComponent(buttonClearDet, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
.addComponent(buttonPuckDet, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE))
.addContainerGap(12, Short.MAX_VALUE))
);
- panelDetLayout.setVerticalGroup(
- panelDetLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
- .addGroup(javax.swing.GroupLayout.Alignment.TRAILING, panelDetLayout.createSequentialGroup()
- .addContainerGap(22, Short.MAX_VALUE)
+ panelDetectionLayout.setVerticalGroup(
+ panelDetectionLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
+ .addGroup(javax.swing.GroupLayout.Alignment.TRAILING, panelDetectionLayout.createSequentialGroup()
+ .addContainerGap(javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
.addComponent(buttonPuckDet)
- .addGap(18, 18, 18)
+ .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED)
.addComponent(buttonClearDet)
- .addContainerGap(44, Short.MAX_VALUE))
+ .addContainerGap(javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE))
);
panelHexiposi.setBorder(javax.swing.BorderFactory.createTitledBorder("Cover"));
@@ -499,12 +523,12 @@ public class MainPanel extends Panel {
panelHexiposiLayout.setVerticalGroup(
panelHexiposiLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
.addGroup(panelHexiposiLayout.createSequentialGroup()
- .addGap(0, 7, Short.MAX_VALUE)
+ .addGap(0, 24, Short.MAX_VALUE)
.addComponent(hexiposiPanel, 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(35, Short.MAX_VALUE))
);
- jPanel9.setBorder(javax.swing.BorderFactory.createTitledBorder("View"));
+ panelViewType.setBorder(javax.swing.BorderFactory.createTitledBorder("View"));
buttonCamera.setText("Image");
buttonCamera.addActionListener(new java.awt.event.ActionListener() {
@@ -521,23 +545,23 @@ public class MainPanel extends Panel {
}
});
- javax.swing.GroupLayout jPanel9Layout = new javax.swing.GroupLayout(jPanel9);
- jPanel9.setLayout(jPanel9Layout);
- jPanel9Layout.setHorizontalGroup(
- jPanel9Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
- .addGroup(javax.swing.GroupLayout.Alignment.TRAILING, jPanel9Layout.createSequentialGroup()
+ javax.swing.GroupLayout panelViewTypeLayout = new javax.swing.GroupLayout(panelViewType);
+ panelViewType.setLayout(panelViewTypeLayout);
+ panelViewTypeLayout.setHorizontalGroup(
+ panelViewTypeLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
+ .addGroup(javax.swing.GroupLayout.Alignment.TRAILING, panelViewTypeLayout.createSequentialGroup()
.addGap(2, 2, 2)
- .addGroup(jPanel9Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
+ .addGroup(panelViewTypeLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
.addComponent(buttonCamera, javax.swing.GroupLayout.PREFERRED_SIZE, 71, javax.swing.GroupLayout.PREFERRED_SIZE)
.addComponent(buttonDrawing))
.addGap(2, 2, 2))
);
- jPanel9Layout.linkSize(javax.swing.SwingConstants.HORIZONTAL, new java.awt.Component[] {buttonCamera, buttonDrawing});
+ panelViewTypeLayout.linkSize(javax.swing.SwingConstants.HORIZONTAL, new java.awt.Component[] {buttonCamera, buttonDrawing});
- jPanel9Layout.setVerticalGroup(
- jPanel9Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
- .addGroup(javax.swing.GroupLayout.Alignment.TRAILING, jPanel9Layout.createSequentialGroup()
+ panelViewTypeLayout.setVerticalGroup(
+ panelViewTypeLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
+ .addGroup(javax.swing.GroupLayout.Alignment.TRAILING, panelViewTypeLayout.createSequentialGroup()
.addContainerGap()
.addComponent(buttonCamera)
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED)
@@ -550,36 +574,33 @@ public class MainPanel extends Panel {
basePlatePanelLayout.setHorizontalGroup(
basePlatePanelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
.addGroup(javax.swing.GroupLayout.Alignment.TRAILING, basePlatePanelLayout.createSequentialGroup()
+ .addContainerGap()
.addGroup(basePlatePanelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
- .addGroup(basePlatePanelLayout.createSequentialGroup()
- .addContainerGap()
- .addComponent(panelLegend, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))
- .addComponent(panelHexiposi, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))
+ .addComponent(panelLegend, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
+ .addComponent(panelDetection, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
.addGroup(basePlatePanelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
- .addComponent(jPanel9, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
- .addComponent(panelDet, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))
+ .addComponent(panelViewType, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
+ .addComponent(panelHexiposi, javax.swing.GroupLayout.Alignment.TRAILING, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))
.addContainerGap())
);
- basePlatePanelLayout.linkSize(javax.swing.SwingConstants.HORIZONTAL, new java.awt.Component[] {jPanel9, panelDet, panelHexiposi, panelLegend});
+ basePlatePanelLayout.linkSize(javax.swing.SwingConstants.HORIZONTAL, new java.awt.Component[] {panelDetection, panelHexiposi, panelLegend, panelViewType});
basePlatePanelLayout.setVerticalGroup(
basePlatePanelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
.addGroup(javax.swing.GroupLayout.Alignment.TRAILING, basePlatePanelLayout.createSequentialGroup()
- .addGroup(basePlatePanelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
- .addComponent(panelHexiposi, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
- .addComponent(jPanel9, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))
+ .addGroup(basePlatePanelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING, false)
+ .addComponent(panelViewType, 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, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
.addGroup(basePlatePanelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
- .addComponent(panelDet, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
- .addComponent(panelLegend, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))
+ .addComponent(panelLegend, javax.swing.GroupLayout.Alignment.TRAILING, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
+ .addComponent(panelHexiposi, javax.swing.GroupLayout.Alignment.TRAILING, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))
.addContainerGap())
);
- basePlatePanelLayout.linkSize(javax.swing.SwingConstants.VERTICAL, new java.awt.Component[] {panelDet, panelLegend});
-
- basePlatePanelLayout.linkSize(javax.swing.SwingConstants.VERTICAL, new java.awt.Component[] {jPanel9, panelHexiposi});
+ basePlatePanelLayout.linkSize(javax.swing.SwingConstants.VERTICAL, new java.awt.Component[] {panelHexiposi, panelLegend});
jPanel1.setBorder(javax.swing.BorderFactory.createTitledBorder("LN2 Level"));
@@ -699,6 +720,13 @@ public class MainPanel extends Panel {
}
});
+ buttonRecovery.setText("Recovery");
+ buttonRecovery.addActionListener(new java.awt.event.ActionListener() {
+ public void actionPerformed(java.awt.event.ActionEvent evt) {
+ buttonRecoveryActionPerformed(evt);
+ }
+ });
+
javax.swing.GroupLayout jPanel5Layout = new javax.swing.GroupLayout(jPanel5);
jPanel5.setLayout(jPanel5Layout);
jPanel5Layout.setHorizontalGroup(
@@ -709,7 +737,8 @@ public class MainPanel extends Panel {
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED, 81, Short.MAX_VALUE)
.addGroup(jPanel5Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING, false)
.addComponent(buttonExpertCommands, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
- .addComponent(checkExpert, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE))
+ .addComponent(checkExpert, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
+ .addComponent(buttonRecovery, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE))
.addContainerGap())
);
jPanel5Layout.setVerticalGroup(
@@ -722,6 +751,8 @@ public class MainPanel extends Panel {
.addComponent(checkExpert)
.addGap(18, 18, 18)
.addComponent(buttonExpertCommands)
+ .addGap(18, 18, 18)
+ .addComponent(buttonRecovery)
.addContainerGap(javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE))
);
@@ -763,7 +794,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(24, Short.MAX_VALUE))))
+ .addContainerGap(javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE))))
);
jPanel4Layout.setVerticalGroup(
jPanel4Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
@@ -785,57 +816,6 @@ public class MainPanel extends Panel {
.addContainerGap(javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE))
);
- jPanel6.setBorder(javax.swing.BorderFactory.createTitledBorder("Recovering"));
-
- jLabel6.setText("Known position");
-
- jLabel7.setText("Valid segment");
-
- buttonInitHexiposi.setText("Recover");
- buttonInitHexiposi.setEnabled(false);
- buttonInitHexiposi.addActionListener(new java.awt.event.ActionListener() {
- public void actionPerformed(java.awt.event.ActionEvent evt) {
- buttonInitHexiposiActionPerformed(evt);
- }
- });
-
- javax.swing.GroupLayout jPanel6Layout = new javax.swing.GroupLayout(jPanel6);
- jPanel6.setLayout(jPanel6Layout);
- jPanel6Layout.setHorizontalGroup(
- jPanel6Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
- .addGroup(jPanel6Layout.createSequentialGroup()
- .addContainerGap()
- .addGroup(jPanel6Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
- .addGroup(jPanel6Layout.createSequentialGroup()
- .addComponent(ledLidControlActive, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
- .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
- .addComponent(jLabel6))
- .addGroup(jPanel6Layout.createSequentialGroup()
- .addComponent(ledLidInitialized, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
- .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
- .addComponent(jLabel7)))
- .addContainerGap(28, Short.MAX_VALUE))
- .addGroup(javax.swing.GroupLayout.Alignment.TRAILING, jPanel6Layout.createSequentialGroup()
- .addContainerGap(javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
- .addComponent(buttonInitHexiposi)
- .addContainerGap(javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE))
- );
- jPanel6Layout.setVerticalGroup(
- jPanel6Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
- .addGroup(jPanel6Layout.createSequentialGroup()
- .addContainerGap()
- .addGroup(jPanel6Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE)
- .addComponent(ledLidControlActive, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
- .addComponent(jLabel6))
- .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
- .addGroup(jPanel6Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE)
- .addComponent(ledLidInitialized, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
- .addComponent(jLabel7))
- .addGap(18, 18, Short.MAX_VALUE)
- .addComponent(buttonInitHexiposi)
- .addContainerGap(19, Short.MAX_VALUE))
- );
-
jPanel7.setBorder(javax.swing.BorderFactory.createTitledBorder("Beamline Status"));
jLabel8.setText("Valve state");
@@ -857,7 +837,7 @@ public class MainPanel extends Panel {
.addComponent(led6, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
.addComponent(jLabel9)))
- .addContainerGap(javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE))
+ .addContainerGap(11, Short.MAX_VALUE))
);
jPanel7Layout.setVerticalGroup(
jPanel7Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
@@ -873,7 +853,7 @@ public class MainPanel extends Panel {
.addGap(0, 0, 0))
);
- jPanel8.setBorder(javax.swing.BorderFactory.createTitledBorder("Detection"));
+ jPanel8.setBorder(javax.swing.BorderFactory.createTitledBorder("Scanner"));
jLabel11.setText("Puck:");
@@ -893,7 +873,7 @@ public class MainPanel extends Panel {
.addGroup(jPanel8Layout.createSequentialGroup()
.addComponent(jLabel13)
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
- .addComponent(textSample, javax.swing.GroupLayout.DEFAULT_SIZE, 51, Short.MAX_VALUE))
+ .addComponent(textSample, javax.swing.GroupLayout.DEFAULT_SIZE, 57, Short.MAX_VALUE))
.addGroup(jPanel8Layout.createSequentialGroup()
.addComponent(jLabel11)
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
@@ -906,7 +886,7 @@ public class MainPanel extends Panel {
jPanel8Layout.setVerticalGroup(
jPanel8Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
.addGroup(jPanel8Layout.createSequentialGroup()
- .addContainerGap()
+ .addContainerGap(29, Short.MAX_VALUE)
.addGroup(jPanel8Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE)
.addComponent(jLabel11)
.addComponent(textType, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))
@@ -914,10 +894,10 @@ 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))
- .addGap(0, 0, 0))
+ .addContainerGap(30, Short.MAX_VALUE))
);
- jPanel10.setBorder(javax.swing.BorderFactory.createTitledBorder("Puck Loading"));
+ jPanel10.setBorder(javax.swing.BorderFactory.createTitledBorder("Sample Load"));
buttonInitHexiposi1.setText("Start");
buttonInitHexiposi1.setEnabled(false);
@@ -927,33 +907,21 @@ public class MainPanel extends Panel {
}
});
- buttonInitHexiposi2.setText("Data");
- buttonInitHexiposi2.setEnabled(false);
- buttonInitHexiposi2.addActionListener(new java.awt.event.ActionListener() {
- public void actionPerformed(java.awt.event.ActionEvent evt) {
- buttonInitHexiposi2ActionPerformed(evt);
- }
- });
-
javax.swing.GroupLayout jPanel10Layout = new javax.swing.GroupLayout(jPanel10);
jPanel10.setLayout(jPanel10Layout);
jPanel10Layout.setHorizontalGroup(
jPanel10Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
- .addGroup(jPanel10Layout.createSequentialGroup()
- .addContainerGap(javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
- .addGroup(jPanel10Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING, false)
- .addComponent(buttonInitHexiposi2, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
- .addComponent(buttonInitHexiposi1, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE))
- .addContainerGap(javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE))
+ .addGroup(javax.swing.GroupLayout.Alignment.TRAILING, jPanel10Layout.createSequentialGroup()
+ .addContainerGap(28, Short.MAX_VALUE)
+ .addComponent(buttonInitHexiposi1, javax.swing.GroupLayout.PREFERRED_SIZE, 70, javax.swing.GroupLayout.PREFERRED_SIZE)
+ .addContainerGap(28, Short.MAX_VALUE))
);
jPanel10Layout.setVerticalGroup(
jPanel10Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
- .addGroup(jPanel10Layout.createSequentialGroup()
- .addContainerGap()
- .addComponent(buttonInitHexiposi1)
- .addGap(18, 18, 18)
- .addComponent(buttonInitHexiposi2)
- .addGap(0, 0, 0))
+ .addGroup(javax.swing.GroupLayout.Alignment.TRAILING, jPanel10Layout.createSequentialGroup()
+ .addContainerGap(23, Short.MAX_VALUE)
+ .addComponent(buttonInitHexiposi1, javax.swing.GroupLayout.PREFERRED_SIZE, 70, javax.swing.GroupLayout.PREFERRED_SIZE)
+ .addContainerGap(24, Short.MAX_VALUE))
);
jPanel13.setBorder(javax.swing.BorderFactory.createTitledBorder("System Status"));
@@ -994,27 +962,36 @@ public class MainPanel extends Panel {
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
.addGroup(jPanel13Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
.addGroup(jPanel13Layout.createSequentialGroup()
- .addGroup(jPanel13Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
- .addComponent(jLabell21)
- .addComponent(jLabel26))
- .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
- .addGroup(jPanel13Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
- .addComponent(buttonReleaseLocal)
- .addComponent(buttonReleasePsys))
- .addContainerGap(javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE))
+ .addComponent(jLabel25)
+ .addContainerGap(101, Short.MAX_VALUE))
.addGroup(jPanel13Layout.createSequentialGroup()
- .addGroup(jPanel13Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
- .addComponent(jLabel25)
- .addComponent(jLabel24))
+ .addGroup(jPanel13Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.TRAILING)
+ .addGroup(jPanel13Layout.createSequentialGroup()
+ .addComponent(jLabel24)
+ .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
+ .addComponent(filler1, javax.swing.GroupLayout.PREFERRED_SIZE, 70, javax.swing.GroupLayout.PREFERRED_SIZE))
+ .addGroup(jPanel13Layout.createSequentialGroup()
+ .addGroup(jPanel13Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
+ .addComponent(jLabell21)
+ .addComponent(jLabel26))
+ .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
+ .addGroup(jPanel13Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
+ .addComponent(buttonReleaseLocal)
+ .addComponent(buttonReleasePsys))))
.addContainerGap(javax.swing.GroupLayout.DEFAULT_SIZE, 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(ledAirPressure, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
- .addComponent(jLabel24))
+ .addGroup(jPanel13Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
+ .addGroup(jPanel13Layout.createSequentialGroup()
+ .addContainerGap()
+ .addGroup(jPanel13Layout.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)))
+ .addGroup(jPanel13Layout.createSequentialGroup()
+ .addGap(20, 20, 20)
+ .addComponent(filler1, javax.swing.GroupLayout.PREFERRED_SIZE, 11, javax.swing.GroupLayout.PREFERRED_SIZE)))
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
.addGroup(jPanel13Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE)
.addComponent(ledN2Pressure, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
@@ -1053,11 +1030,11 @@ public class MainPanel extends Panel {
jPanel12Layout.setHorizontalGroup(
jPanel12Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
.addGroup(jPanel12Layout.createSequentialGroup()
- .addContainerGap(javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
+ .addContainerGap(32, Short.MAX_VALUE)
.addGroup(jPanel12Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
.addComponent(btViewDewar)
.addComponent(btViewRT))
- .addContainerGap(javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE))
+ .addContainerGap(31, Short.MAX_VALUE))
);
jPanel12Layout.linkSize(javax.swing.SwingConstants.HORIZONTAL, new java.awt.Component[] {btViewDewar, btViewRT});
@@ -1065,11 +1042,11 @@ public class MainPanel extends Panel {
jPanel12Layout.setVerticalGroup(
jPanel12Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
.addGroup(jPanel12Layout.createSequentialGroup()
- .addContainerGap()
- .addComponent(btViewDewar)
+ .addContainerGap(javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
+ .addComponent(btViewDewar, javax.swing.GroupLayout.PREFERRED_SIZE, 35, javax.swing.GroupLayout.PREFERRED_SIZE)
.addGap(18, 18, 18)
- .addComponent(btViewRT)
- .addGap(0, 0, Short.MAX_VALUE))
+ .addComponent(btViewRT, javax.swing.GroupLayout.PREFERRED_SIZE, 35, javax.swing.GroupLayout.PREFERRED_SIZE)
+ .addContainerGap(javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE))
);
panelContext.setBorder(javax.swing.BorderFactory.createTitledBorder("Context"));
@@ -1115,8 +1092,6 @@ public class MainPanel extends Panel {
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED)
.addComponent(jPanel7, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED)
- .addComponent(jPanel6, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
- .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED)
.addComponent(jPanel8, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED)
.addComponent(jPanel12, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
@@ -1140,7 +1115,6 @@ public class MainPanel extends Panel {
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
.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.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
.addComponent(jPanel10, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
@@ -1149,7 +1123,7 @@ public class MainPanel extends Panel {
.addContainerGap())
);
- layout.linkSize(javax.swing.SwingConstants.VERTICAL, new java.awt.Component[] {jPanel10, jPanel13, jPanel4, jPanel6, jPanel7, jPanel8});
+ layout.linkSize(javax.swing.SwingConstants.VERTICAL, new java.awt.Component[] {jPanel10, jPanel13, jPanel4, jPanel7, jPanel8});
}// //GEN-END:initComponents
@@ -1158,18 +1132,9 @@ public class MainPanel extends Panel {
updateViewType();
}//GEN-LAST:event_buttonCameraActionPerformed
- private void buttonInitHexiposiActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_buttonInitHexiposiActionPerformed
- try{
- this.showDevicePanel("hexiposi");
- } catch (Exception ex) {
- showException(ex);
- }
- }//GEN-LAST:event_buttonInitHexiposiActionPerformed
-
private void buttonExpertCommandsActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_buttonExpertCommandsActionPerformed
try{
- //this.showRenderer("img");
- getContext().getPluginManager().loadInitializePlugin(getContext().getSetup().expandPath("{plugins}/Expert.java"));
+ showCommandsPanel();
} catch (Exception ex) {
showException(ex);
}
@@ -1230,13 +1195,8 @@ public class MainPanel extends Panel {
// TODO add your handling code here:
}//GEN-LAST:event_buttonInitHexiposi1ActionPerformed
- private void buttonInitHexiposi2ActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_buttonInitHexiposi2ActionPerformed
- // TODO add your handling code here:
- }//GEN-LAST:event_buttonInitHexiposi2ActionPerformed
-
private void checkExpertActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_checkExpertActionPerformed
- buttonExpertCommands.setVisible(checkExpert.isSelected());
- devicesPanel.setActive(checkExpert.isSelected());
+ setExpertMode(checkExpert.isSelected());
}//GEN-LAST:event_checkExpertActionPerformed
private void buttonDrawingActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_buttonDrawingActionPerformed
@@ -1254,6 +1214,14 @@ public class MainPanel extends Panel {
updateViewMode();
}//GEN-LAST:event_btViewRTActionPerformed
+ private void buttonRecoveryActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_buttonRecoveryActionPerformed
+ try{
+ showRecoveryPanel();
+ } catch (Exception ex) {
+ showException(ex);
+ }
+ }//GEN-LAST:event_buttonRecoveryActionPerformed
+
// Variables declaration - do not modify//GEN-BEGIN:variables
private ch.psi.mxsc.BasePlatePanel basePlatePanel;
@@ -1263,25 +1231,23 @@ public class MainPanel extends Panel {
private javax.swing.JButton buttonClearDet;
private javax.swing.JToggleButton buttonDrawing;
private javax.swing.JButton buttonExpertCommands;
- private javax.swing.JButton buttonInitHexiposi;
private javax.swing.JButton buttonInitHexiposi1;
- private javax.swing.JButton buttonInitHexiposi2;
private javax.swing.JButton buttonPuckDet;
+ private javax.swing.JButton buttonRecovery;
private javax.swing.JButton buttonReleaseLocal;
private javax.swing.JButton buttonReleasePsys;
private javax.swing.JCheckBox checkExpert;
private ch.psi.pshell.swing.DeviceValuePanel deviceValuePanel1;
private ch.psi.mxsc.DevicesPanel devicesPanel;
+ private javax.swing.Box.Filler filler1;
private ch.psi.mxsc.HexiposiPanel hexiposiPanel;
private javax.swing.JLabel jLabel1;
private javax.swing.JLabel jLabel10;
private javax.swing.JLabel jLabel11;
- private javax.swing.JLabel jLabel12;
private javax.swing.JLabel jLabel13;
private javax.swing.JLabel jLabel14;
private javax.swing.JLabel jLabel15;
private javax.swing.JLabel jLabel16;
- private javax.swing.JLabel jLabel17;
private javax.swing.JLabel jLabel19;
private javax.swing.JLabel jLabel2;
private javax.swing.JLabel jLabel20;
@@ -1292,24 +1258,19 @@ public class MainPanel extends Panel {
private javax.swing.JLabel jLabel3;
private javax.swing.JLabel jLabel4;
private javax.swing.JLabel jLabel5;
- private javax.swing.JLabel jLabel6;
- private javax.swing.JLabel jLabel7;
private javax.swing.JLabel jLabel8;
private javax.swing.JLabel jLabel9;
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;
private javax.swing.JPanel jPanel5;
- private javax.swing.JPanel jPanel6;
private javax.swing.JPanel jPanel7;
private javax.swing.JPanel jPanel8;
- private javax.swing.JPanel jPanel9;
private javax.swing.JSeparator jSeparator1;
private javax.swing.JSeparator jSeparator2;
private javax.swing.JSeparator jSeparator3;
@@ -1319,26 +1280,23 @@ public class MainPanel extends Panel {
private ch.psi.pshell.swing.Led ledAirPressure;
private ch.psi.pshell.swing.Led ledFillingControl;
private ch.psi.pshell.swing.Led ledFillingDewar;
- private ch.psi.pshell.swing.Led ledLidControlActive;
private ch.psi.pshell.swing.Led ledLidControlActive1;
private ch.psi.pshell.swing.Led ledLidControlActive2;
private ch.psi.pshell.swing.Led ledLidControlActive3;
private ch.psi.pshell.swing.Led ledLidControlActive4;
private ch.psi.pshell.swing.Led ledLidControlActive5;
- private ch.psi.pshell.swing.Led ledLidInitialized;
private ch.psi.pshell.swing.Led ledLocalSafety;
private ch.psi.pshell.swing.Led ledN2Pressure;
private ch.psi.pshell.swing.Led ledPsysSafety;
private javax.swing.JPanel panelContext;
- private javax.swing.JPanel panelDet;
+ private javax.swing.JPanel panelDetection;
private javax.swing.JPanel panelHexiposi;
private javax.swing.JPanel panelLegend;
+ private javax.swing.JPanel panelViewType;
private javax.swing.JProgressBar progressLN2;
private javax.swing.JProgressBar progressWater;
private javax.swing.JTextField textSample;
- private javax.swing.JTextField textSample1;
private javax.swing.JTextField textType;
- private javax.swing.JTextField textType1;
// End of variables declaration//GEN-END:variables
}