diff --git a/src/main/java/ch/psi/mxsc/BasePlate.java b/src/main/java/ch/psi/mxsc/BasePlate.java
index 19deb0d..9336145 100644
--- a/src/main/java/ch/psi/mxsc/BasePlate.java
+++ b/src/main/java/ch/psi/mxsc/BasePlate.java
@@ -166,11 +166,6 @@ public class BasePlate extends DeviceBase {
new Puck(this, i);
}
getPucks()[0].setSelected(true);
- if (MainPanel.BASE_PLATE_LAYOUT == BasePlateLayout.x06da){
- for (int i = 20; i< 30; i++){
- getPucks()[i].setEnabled(false);
- }
- }
}
diff --git a/src/main/java/ch/psi/mxsc/DevicesPanel.form b/src/main/java/ch/psi/mxsc/DevicesPanel.form
index 0f52faa..1c0ef57 100644
--- a/src/main/java/ch/psi/mxsc/DevicesPanel.form
+++ b/src/main/java/ch/psi/mxsc/DevicesPanel.form
@@ -39,11 +39,6 @@
-
-
-
-
-
@@ -93,11 +88,6 @@
-
-
-
-
-
@@ -179,20 +169,6 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/src/main/java/ch/psi/mxsc/DevicesPanel.java b/src/main/java/ch/psi/mxsc/DevicesPanel.java
index eaa35c4..6e614ad 100644
--- a/src/main/java/ch/psi/mxsc/DevicesPanel.java
+++ b/src/main/java/ch/psi/mxsc/DevicesPanel.java
@@ -17,7 +17,6 @@ import java.awt.Window;
public class DevicesPanel extends javax.swing.JPanel {
GenericDevice robot;
- GenericDevice hexiposi;
GenericDevice barcode_reader;
GenericDevice barcode_reader_puck;
GenericDevice wago;
@@ -37,7 +36,7 @@ public class DevicesPanel extends javax.swing.JPanel {
}
GenericDevice[] getDevices(){
- return new GenericDevice[]{robot, hexiposi, barcode_reader, barcode_reader_puck, wago, laser, puck_detection, sm};
+ return new GenericDevice[]{robot, barcode_reader, barcode_reader_puck, wago, laser, puck_detection, sm};
}
final DeviceAdapter deviceListener = new DeviceAdapter() {
@@ -69,7 +68,6 @@ public class DevicesPanel extends javax.swing.JPanel {
}
}
robot = Controller.getInstance().getDevice("robot");
- hexiposi = Controller.getInstance().getDevice("hexiposi");
barcode_reader = Controller.getInstance().getDevice("barcode_reader");
barcode_reader_puck = Controller.getInstance().getDevice("barcode_reader_puck");
wago = Controller.getInstance().getDevice("wago");
@@ -94,7 +92,6 @@ public class DevicesPanel extends javax.swing.JPanel {
}
setLedState(ledCamera, img);
setLedState(ledMonitorCamera, monitor_cam);
- setLedState(ledHexiposi, hexiposi);
setLedState(ledLaser, laser);
setLedState(ledPuckDetection, puck_detection);
setLedState(ledRobot, robot);
@@ -160,7 +157,6 @@ public class DevicesPanel extends javax.swing.JPanel {
active = value;
labelCamera.setActive(value);
labelMonitorCamera.setActive(value);
- labelHexiposi.setActive(value);
labelLaser.setActive(value);
labelPuckDetection.setActive(value);
labelReader.setActive(value);
@@ -190,8 +186,6 @@ public class DevicesPanel extends javax.swing.JPanel {
ledLaser = new ch.psi.pshell.swing.Led();
labelCamera = new ch.psi.mxsc.HyperlinkLabel();
ledCamera = new ch.psi.pshell.swing.Led();
- labelHexiposi = new ch.psi.mxsc.HyperlinkLabel();
- ledHexiposi = new ch.psi.pshell.swing.Led();
labelReader = new ch.psi.mxsc.HyperlinkLabel();
ledBarcodeReader = new ch.psi.pshell.swing.Led();
labelPuckDetection = new ch.psi.mxsc.HyperlinkLabel();
@@ -257,20 +251,6 @@ public class DevicesPanel extends javax.swing.JPanel {
}
});
- labelHexiposi.setText("Hexiposi");
- labelHexiposi.setActive(true);
- labelHexiposi.addMouseListener(new java.awt.event.MouseAdapter() {
- public void mouseClicked(java.awt.event.MouseEvent evt) {
- labelHexiposiMouseClicked(evt);
- }
- });
-
- ledHexiposi.addMouseListener(new java.awt.event.MouseAdapter() {
- public void mouseClicked(java.awt.event.MouseEvent evt) {
- labelHexiposiMouseClicked(evt);
- }
- });
-
labelReader.setText("Barcode Reader");
labelReader.setActive(true);
labelReader.addMouseListener(new java.awt.event.MouseAdapter() {
@@ -350,10 +330,6 @@ public class DevicesPanel extends javax.swing.JPanel {
.addComponent(ledCamera, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
.addComponent(labelCamera, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))
- .addGroup(layout.createSequentialGroup()
- .addComponent(ledHexiposi, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
- .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
- .addComponent(labelHexiposi, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))
.addGroup(layout.createSequentialGroup()
.addComponent(ledBarcodeReader, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
@@ -392,10 +368,6 @@ public class DevicesPanel extends javax.swing.JPanel {
.addComponent(ledCamera, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
.addComponent(labelCamera, 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(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE)
- .addComponent(ledHexiposi, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
- .addComponent(labelHexiposi, 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(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE)
.addComponent(ledBarcodeReader, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
.addComponent(labelReader, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))
@@ -415,10 +387,6 @@ public class DevicesPanel extends javax.swing.JPanel {
);
}// //GEN-END:initComponents
- private void labelHexiposiMouseClicked(java.awt.event.MouseEvent evt) {//GEN-FIRST:event_labelHexiposiMouseClicked
- showDevicePanel("hexiposi");
- }//GEN-LAST:event_labelHexiposiMouseClicked
-
private void ledRobotMouseClicked(java.awt.event.MouseEvent evt) {//GEN-FIRST:event_ledRobotMouseClicked
showDevicePanel("robot");
}//GEN-LAST:event_ledRobotMouseClicked
@@ -461,7 +429,6 @@ public class DevicesPanel extends javax.swing.JPanel {
// Variables declaration - do not modify//GEN-BEGIN:variables
private ch.psi.mxsc.HyperlinkLabel labelCamera;
- private ch.psi.mxsc.HyperlinkLabel labelHexiposi;
private ch.psi.mxsc.HyperlinkLabel labelLaser;
private ch.psi.mxsc.HyperlinkLabel labelMonitorCamera;
private ch.psi.mxsc.HyperlinkLabel labelPuckDetection;
@@ -471,7 +438,6 @@ public class DevicesPanel extends javax.swing.JPanel {
private ch.psi.mxsc.HyperlinkLabel labelWago;
private ch.psi.pshell.swing.Led ledBarcodeReader;
private ch.psi.pshell.swing.Led ledCamera;
- private ch.psi.pshell.swing.Led ledHexiposi;
private ch.psi.pshell.swing.Led ledLaser;
private ch.psi.pshell.swing.Led ledMonitorCamera;
private ch.psi.pshell.swing.Led ledPuckDetection;
diff --git a/src/main/java/ch/psi/mxsc/HexiposiPanel.form b/src/main/java/ch/psi/mxsc/HexiposiPanel.form
deleted file mode 100644
index 65351ee..0000000
--- a/src/main/java/ch/psi/mxsc/HexiposiPanel.form
+++ /dev/null
@@ -1,173 +0,0 @@
-
-
-
diff --git a/src/main/java/ch/psi/mxsc/HexiposiPanel.java b/src/main/java/ch/psi/mxsc/HexiposiPanel.java
deleted file mode 100644
index 31f686c..0000000
--- a/src/main/java/ch/psi/mxsc/HexiposiPanel.java
+++ /dev/null
@@ -1,143 +0,0 @@
-package ch.psi.mxsc;
-
-import ch.psi.pshell.device.DiscretePositionerBase;
-import ch.psi.pshell.swing.DevicePanel;
-import java.awt.Color;
-
-/**
- *
- */
-public class HexiposiPanel extends DevicePanel {
-
- final Color COLOR_ON = Color.GREEN; //new Color(51,102,255);
- final Color COLOR_OFF = Color.BLACK;
-
- public HexiposiPanel() {
- initComponents();
- //setDeviceName("hexiposi");
-
- }
-
- @Override
- public DiscretePositionerBase getDevice(){
- return (DiscretePositionerBase) super.getDevice();
- }
-
- @Override
- protected void onDeviceReadbackChanged(Object value) {
- ledA.setColor("A".equals(value) ? COLOR_ON: COLOR_OFF);
- ledB.setColor("B".equals(value) ? COLOR_ON: COLOR_OFF);
- ledC.setColor("C".equals(value) ? COLOR_ON: COLOR_OFF);
- ledD.setColor("D".equals(value) ? COLOR_ON: COLOR_OFF);
- ledE.setColor("E".equals(value) ? COLOR_ON: COLOR_OFF);
- ledF.setColor("F".equals(value) ? COLOR_ON: COLOR_OFF);
- if ((value==null) || (value.toString().trim().isEmpty()) || (value.toString().equalsIgnoreCase("Unknown"))){
- textPosition.setText("");
- } else {
- textPosition.setText((value.toString()).substring(0, 1));
- }
-
- repaint();
- }
-
-
-
- /**
- * 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() {
-
- filler9 = new javax.swing.Box.Filler(new java.awt.Dimension(0, 0), new java.awt.Dimension(0, 0), new java.awt.Dimension(32767, 32767));
- 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));
- ledD = 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));
- ledC = 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));
- ledE = new ch.psi.pshell.swing.Led();
- filler10 = new javax.swing.Box.Filler(new java.awt.Dimension(0, 0), new java.awt.Dimension(0, 0), new java.awt.Dimension(32767, 32767));
- textPosition = new javax.swing.JLabel();
- filler4 = new javax.swing.Box.Filler(new java.awt.Dimension(0, 0), new java.awt.Dimension(0, 0), new java.awt.Dimension(32767, 32767));
- ledB = 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));
- ledF = 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));
- ledA = 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);
-
- ledD.setHorizontalAlignment(javax.swing.SwingConstants.CENTER);
- circlePanel2.add(ledD);
- circlePanel2.add(filler7);
-
- ledC.setHorizontalAlignment(javax.swing.SwingConstants.CENTER);
- circlePanel2.add(ledC);
- circlePanel2.add(filler6);
-
- ledE.setHorizontalAlignment(javax.swing.SwingConstants.CENTER);
- circlePanel2.add(ledE);
- circlePanel2.add(filler10);
-
- textPosition.setFont(new java.awt.Font("Monospaced", 0, 14)); // NOI18N
- textPosition.setForeground(new java.awt.Color(0, 128, 0));
- textPosition.setHorizontalAlignment(javax.swing.SwingConstants.CENTER);
- circlePanel2.add(textPosition);
- circlePanel2.add(filler4);
-
- ledB.setHorizontalAlignment(javax.swing.SwingConstants.CENTER);
- circlePanel2.add(ledB);
- circlePanel2.add(filler3);
-
- ledF.setHorizontalAlignment(javax.swing.SwingConstants.CENTER);
- circlePanel2.add(ledF);
- circlePanel2.add(filler2);
-
- ledA.setHorizontalAlignment(javax.swing.SwingConstants.CENTER);
- circlePanel2.add(ledA);
- 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, 73, Short.MAX_VALUE)
- .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
- .addComponent(circlePanel2, javax.swing.GroupLayout.Alignment.TRAILING, javax.swing.GroupLayout.DEFAULT_SIZE, 73, Short.MAX_VALUE))
- );
- layout.setVerticalGroup(
- layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
- .addGap(0, 71, Short.MAX_VALUE)
- .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
- .addGroup(layout.createSequentialGroup()
- .addComponent(circlePanel2, javax.swing.GroupLayout.PREFERRED_SIZE, 71, javax.swing.GroupLayout.PREFERRED_SIZE)
- .addGap(0, 0, 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 filler10;
- private javax.swing.Box.Filler filler2;
- private javax.swing.Box.Filler filler3;
- private javax.swing.Box.Filler filler4;
- private javax.swing.Box.Filler filler6;
- private javax.swing.Box.Filler filler7;
- private javax.swing.Box.Filler filler8;
- private javax.swing.Box.Filler filler9;
- private ch.psi.pshell.swing.Led ledA;
- private ch.psi.pshell.swing.Led ledB;
- private ch.psi.pshell.swing.Led ledC;
- private ch.psi.pshell.swing.Led ledD;
- private ch.psi.pshell.swing.Led ledE;
- private ch.psi.pshell.swing.Led ledF;
- private javax.swing.JLabel textPosition;
- // End of variables declaration//GEN-END:variables
-}
diff --git a/src/main/java/ch/psi/mxsc/MainPanel.form b/src/main/java/ch/psi/mxsc/MainPanel.form
index bccb809..9077b65 100644
--- a/src/main/java/ch/psi/mxsc/MainPanel.form
+++ b/src/main/java/ch/psi/mxsc/MainPanel.form
@@ -99,7 +99,7 @@
-
+
@@ -116,7 +116,7 @@
-
+
@@ -322,7 +322,7 @@
-
+
diff --git a/src/main/java/ch/psi/mxsc/MainPanel.java b/src/main/java/ch/psi/mxsc/MainPanel.java
index 8b6ef69..26bafc3 100644
--- a/src/main/java/ch/psi/mxsc/MainPanel.java
+++ b/src/main/java/ch/psi/mxsc/MainPanel.java
@@ -593,7 +593,7 @@ public class MainPanel extends Panel {
int center_x = ((Number)this.eval("cover_detection.config.center_x", true)).intValue();
int center_y = ((Number)this.eval("cover_detection.config.center_y", true)).intValue();
int diam_dewar = ((Number)this.eval("cover_detection.config.diameter_dewar", true)).intValue();
- double dewar_wall = ((Number)this.eval("cover_detection.config.dewar_wall", true)).doubleValue();
+ double dewar_wall = ((Number)this.eval("cover_detection.config.border_dewar", true)).doubleValue();
int diam =(int) (dewar_wall * diam_dewar);
Rectangle roi = new Rectangle(center_x-diam/2,center_y - diam/2, diam, diam );
basePlatePanel.basePlateGraphics.setImageRoi(roi);
@@ -967,10 +967,10 @@ public class MainPanel extends Panel {
Point det = null;
try{
mm = new Point(Array.getInt(value, 4), Array.getInt(value, 5));
- det = new Point(Array.getInt(value, 0), Array.getInt(value, 1));
- basePlatePanel.basePlateGraphics.setDetection(det);
+ det = new Point(Array.getInt(value, 0), Array.getInt(value, 1));
} catch (Exception ex){
}
+ basePlatePanel.basePlateGraphics.setDetection(det);
Point aux = mm;
SwingUtilities.invokeLater(()->{
textCoverDet.setText((aux==null) ? "" :aux.x + ", " + aux.y);
@@ -1005,7 +1005,7 @@ public class MainPanel extends Panel {
panelDetection = new javax.swing.JPanel();
buttonCalibrationPanel = new javax.swing.JButton();
buttonDetectionCalibrate = new javax.swing.JButton();
- panelHexiposi = new javax.swing.JPanel();
+ panelCover = new javax.swing.JPanel();
jLabel1 = new javax.swing.JLabel();
textCoverDet = new javax.swing.JTextField();
jLabel2 = new javax.swing.JLabel();
@@ -1196,8 +1196,8 @@ public class MainPanel extends Panel {
.addContainerGap(javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE))
);
- panelHexiposi.setBorder(javax.swing.BorderFactory.createTitledBorder("Cover"));
- panelHexiposi.setPreferredSize(new java.awt.Dimension(112, 153));
+ panelCover.setBorder(javax.swing.BorderFactory.createTitledBorder("Cover"));
+ panelCover.setPreferredSize(new java.awt.Dimension(112, 153));
jLabel1.setHorizontalAlignment(javax.swing.SwingConstants.CENTER);
jLabel1.setText("Detection:");
@@ -1215,22 +1215,22 @@ public class MainPanel extends Panel {
textCoverMove.setDisabledTextColor(new java.awt.Color(0, 0, 0));
textCoverMove.setEnabled(false);
- javax.swing.GroupLayout panelHexiposiLayout = new javax.swing.GroupLayout(panelHexiposi);
- panelHexiposi.setLayout(panelHexiposiLayout);
- panelHexiposiLayout.setHorizontalGroup(
- panelHexiposiLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
- .addGroup(panelHexiposiLayout.createSequentialGroup()
+ javax.swing.GroupLayout panelCoverLayout = new javax.swing.GroupLayout(panelCover);
+ panelCover.setLayout(panelCoverLayout);
+ panelCoverLayout.setHorizontalGroup(
+ panelCoverLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
+ .addGroup(panelCoverLayout.createSequentialGroup()
.addContainerGap()
- .addGroup(panelHexiposiLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
+ .addGroup(panelCoverLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
.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(textCoverMove, javax.swing.GroupLayout.DEFAULT_SIZE, 90, Short.MAX_VALUE))
.addContainerGap())
);
- panelHexiposiLayout.setVerticalGroup(
- panelHexiposiLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
- .addGroup(panelHexiposiLayout.createSequentialGroup()
+ panelCoverLayout.setVerticalGroup(
+ panelCoverLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
+ .addGroup(panelCoverLayout.createSequentialGroup()
.addContainerGap()
.addComponent(jLabel1)
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
@@ -1296,7 +1296,7 @@ public class MainPanel extends Panel {
.addComponent(panelDetection, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE))
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED, 255, Short.MAX_VALUE)
.addGroup(basePlatePanelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING, false)
- .addComponent(panelHexiposi, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
+ .addComponent(panelCover, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
.addComponent(panelViewType, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE))
.addContainerGap())
);
@@ -1309,11 +1309,11 @@ 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(panelHexiposi, 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, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))
.addContainerGap())
);
- basePlatePanelLayout.linkSize(javax.swing.SwingConstants.VERTICAL, new java.awt.Component[] {panelHexiposi, panelLegend});
+ basePlatePanelLayout.linkSize(javax.swing.SwingConstants.VERTICAL, new java.awt.Component[] {panelCover, panelLegend});
panelLN2Level.setBorder(javax.swing.BorderFactory.createTitledBorder("LN2 Level"));
@@ -1952,7 +1952,7 @@ public class MainPanel extends Panel {
private void buttonDetectionCalibrateActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_buttonDetectionCalibrateActionPerformed
try {
- this.runAsync("imgproc/NewCoverCalibration", this, false);
+ this.runAsync("imgproc/CoverCalibration", this, false);
} catch (Exception ex) {
showException(ex);
}
@@ -2110,6 +2110,7 @@ public class MainPanel extends Panel {
private ch.psi.pshell.swing.Led ledRoomTemperature;
private javax.swing.JPanel panelBeamlineStatus;
private javax.swing.JPanel panelBottom;
+ private javax.swing.JPanel panelCover;
private javax.swing.JPanel panelDatamatrix;
private javax.swing.JPanel panelDetail;
private javax.swing.JPanel panelDetection;
@@ -2117,7 +2118,6 @@ public class MainPanel extends Panel {
private javax.swing.JPanel panelDisplayMode;
private javax.swing.JPanel panelExpert;
private ch.psi.pshell.swing.DeviceValuePanel panelHeaterTemp;
- private javax.swing.JPanel panelHexiposi;
private javax.swing.JPanel panelLN2Level;
private javax.swing.JPanel panelLegend;
private javax.swing.JPanel panelRight;