Service mode and no cover detection
This commit is contained in:
gac-S_Changer
@@ -423,7 +423,7 @@ public class MainPanel extends Panel {
|
||||
updateMode(((Device) getDevice("robot")).take());
|
||||
} catch (Exception ex) {
|
||||
this.getLogger().log(Level.SEVERE, null, ex);
|
||||
}
|
||||
}
|
||||
|
||||
DeviceBase dev = (DeviceBase) this.getDevice("cover_detection");
|
||||
dev.addListener(cover_detection_listener);
|
||||
@@ -438,7 +438,7 @@ public class MainPanel extends Panel {
|
||||
buttonCamera.setSelected(true);
|
||||
}
|
||||
}
|
||||
updateCameraView();
|
||||
SwingUtilities.invokeLater(()->{updateCameraView();});
|
||||
} catch (Exception ex){
|
||||
getLogger().log(Level.SEVERE, null, ex);
|
||||
}
|
||||
@@ -467,6 +467,13 @@ public class MainPanel extends Panel {
|
||||
ledRoomTemperature.setColor(Color.BLACK);
|
||||
labelRoomTemperature.setText("Room Temperature");
|
||||
}
|
||||
|
||||
try {
|
||||
ledServiceMode.setColor(Controller.getInstance().isServiceMode() ? Color.YELLOW : Color.GREEN);
|
||||
} catch (Exception ex) {
|
||||
ledServiceMode.setColor(Color.BLACK);
|
||||
}
|
||||
|
||||
try {
|
||||
if ((expertChrono != null) && (expertChrono.isTimeout(10 * 60000))) { //After 10min
|
||||
setExpertMode(false);
|
||||
@@ -596,7 +603,7 @@ public class MainPanel extends Panel {
|
||||
|
||||
void updateCameraView() {
|
||||
try{
|
||||
if (buttonCamera.isSelected()){
|
||||
//if (buttonCamera.isSelected()){
|
||||
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();
|
||||
@@ -604,7 +611,7 @@ public class MainPanel extends Panel {
|
||||
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);
|
||||
}
|
||||
//}
|
||||
} catch (Exception ex){
|
||||
if (getState().isInitialized()){
|
||||
getLogger().log(Level.SEVERE, null, ex);
|
||||
@@ -707,29 +714,39 @@ public class MainPanel extends Panel {
|
||||
|
||||
}
|
||||
|
||||
void setExpertMode(boolean expert) {
|
||||
boolean current = buttonExpertCommands.isVisible();
|
||||
buttonExpertCommands.setVisible(expert);
|
||||
buttonRecovery.setVisible(expert);
|
||||
buttonCalibrateImage.setVisible(expert);
|
||||
buttonCalibrateCover.setVisible(expert);
|
||||
devicesPanel.setActive(expert);
|
||||
//panelViewType.setVisible(expert);
|
||||
panelDetection.setVisible(expert && !isRt());
|
||||
buttonConfig.setVisible(expert);
|
||||
Puck.setDisplayDetectionError(expert);
|
||||
volatile boolean updating;
|
||||
void setExpertMode(boolean expert) {
|
||||
try{
|
||||
updating = true;
|
||||
boolean current = buttonExpertCommands.isVisible();
|
||||
buttonExpertCommands.setVisible(expert);
|
||||
buttonRecovery.setVisible(expert);
|
||||
checkService.setVisible(expert);
|
||||
buttonCalibrateCover.setVisible(expert);
|
||||
devicesPanel.setActive(expert);
|
||||
//panelViewType.setVisible(expert);
|
||||
panelDetection.setVisible(expert && !isRt());
|
||||
buttonConfig.setVisible(expert);
|
||||
Puck.setDisplayDetectionError(expert);
|
||||
|
||||
if (checkExpert.isSelected() != expert) {
|
||||
checkExpert.setSelected(expert);
|
||||
}
|
||||
//if (expert == false) {
|
||||
// buttonCamera.setSelected(true);
|
||||
// buttonDrawing.setSelected(false);
|
||||
// updateViewType();
|
||||
//}
|
||||
|
||||
if (current != expert) {
|
||||
onModeChange(expert);
|
||||
if (checkExpert.isSelected() != expert) {
|
||||
checkExpert.setSelected(expert);
|
||||
}
|
||||
|
||||
|
||||
if (expert == false) {
|
||||
Controller.getInstance().setServiceMode(false);
|
||||
// buttonCamera.setSelected(true);
|
||||
// buttonDrawing.setSelected(false);
|
||||
// updateViewType();
|
||||
} else {
|
||||
checkService.setSelected( Controller.getInstance().isServiceMode());
|
||||
}
|
||||
if (current != expert) {
|
||||
onModeChange(expert);
|
||||
}
|
||||
} finally {
|
||||
updating = false;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -975,11 +992,16 @@ public class MainPanel extends Panel {
|
||||
mm = new Point(Array.getInt(value, 4), Array.getInt(value, 5));
|
||||
det = new Point(Array.getInt(value, 0), Array.getInt(value, 1));
|
||||
} catch (Exception ex){
|
||||
}
|
||||
basePlatePanel.basePlateGraphics.setDetection(det);
|
||||
Point aux = mm;
|
||||
}
|
||||
Point fmm = mm;
|
||||
Point fdet = det;
|
||||
SwingUtilities.invokeLater(()->{
|
||||
textCoverDet.setText((aux==null) ? "" :aux.x + ", " + aux.y);
|
||||
if ((value!=null) && (value instanceof String) && ((String)value).toLowerCase().startsWith("no cover")){
|
||||
textCoverDet.setText("No Cover");
|
||||
} else {
|
||||
textCoverDet.setText((fmm==null) ? "" :fmm.x + ", " + fmm.y);
|
||||
}
|
||||
basePlatePanel.basePlateGraphics.setDetection(fdet);
|
||||
});
|
||||
}
|
||||
};
|
||||
@@ -1049,6 +1071,9 @@ public class MainPanel extends Panel {
|
||||
panelHeaterTemp = new ch.psi.pshell.swing.DeviceValuePanel();
|
||||
ledDryer = new ch.psi.pshell.swing.Led();
|
||||
jLabel27 = new javax.swing.JLabel();
|
||||
labelManualMode1 = new javax.swing.JLabel();
|
||||
ledServiceMode = new ch.psi.pshell.swing.Led();
|
||||
checkService = new javax.swing.JCheckBox();
|
||||
panelDatamatrix = new javax.swing.JPanel();
|
||||
jLabel11 = new javax.swing.JLabel();
|
||||
jLabel13 = new javax.swing.JLabel();
|
||||
@@ -1063,7 +1088,6 @@ public class MainPanel extends Panel {
|
||||
devicesPanel = new ch.psi.mxsc.DevicesPanel();
|
||||
panelExpert = new javax.swing.JPanel();
|
||||
checkExpert = new javax.swing.JCheckBox();
|
||||
buttonCalibrateImage = new javax.swing.JButton();
|
||||
buttonCalibrateCover = new javax.swing.JButton();
|
||||
buttonExpertCommands = new javax.swing.JButton();
|
||||
buttonRecovery = new javax.swing.JButton();
|
||||
@@ -1212,6 +1236,11 @@ public class MainPanel extends Panel {
|
||||
textCoverDet.setHorizontalAlignment(javax.swing.JTextField.CENTER);
|
||||
textCoverDet.setDisabledTextColor(new java.awt.Color(0, 0, 0));
|
||||
textCoverDet.setEnabled(false);
|
||||
textCoverDet.addActionListener(new java.awt.event.ActionListener() {
|
||||
public void actionPerformed(java.awt.event.ActionEvent evt) {
|
||||
textCoverDetActionPerformed(evt);
|
||||
}
|
||||
});
|
||||
|
||||
jLabel2.setHorizontalAlignment(javax.swing.SwingConstants.CENTER);
|
||||
jLabel2.setText("Last Move:");
|
||||
@@ -1231,21 +1260,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(textCoverMove, javax.swing.GroupLayout.DEFAULT_SIZE, 90, Short.MAX_VALUE))
|
||||
.addComponent(textCoverMove, javax.swing.GroupLayout.DEFAULT_SIZE, 80, Short.MAX_VALUE))
|
||||
.addContainerGap())
|
||||
);
|
||||
panelCoverLayout.setVerticalGroup(
|
||||
panelCoverLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
|
||||
.addGroup(panelCoverLayout.createSequentialGroup()
|
||||
.addContainerGap()
|
||||
.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)
|
||||
.addGap(18, 18, 18)
|
||||
.addContainerGap(12, Short.MAX_VALUE)
|
||||
.addComponent(jLabel2)
|
||||
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
|
||||
.addComponent(textCoverMove, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
|
||||
.addContainerGap(18, Short.MAX_VALUE))
|
||||
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED, 18, 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))
|
||||
);
|
||||
|
||||
panelViewType.setBorder(javax.swing.BorderFactory.createTitledBorder("View"));
|
||||
@@ -1272,11 +1301,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(18, Short.MAX_VALUE)
|
||||
.addGroup(panelViewTypeLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.CENTER)
|
||||
.addComponent(buttonDrawing)
|
||||
.addComponent(buttonCamera))
|
||||
.addContainerGap(javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE))
|
||||
.addContainerGap(18, Short.MAX_VALUE))
|
||||
);
|
||||
|
||||
panelViewTypeLayout.linkSize(javax.swing.SwingConstants.HORIZONTAL, new java.awt.Component[] {buttonCamera, buttonDrawing});
|
||||
@@ -1342,7 +1371,7 @@ public class MainPanel extends Panel {
|
||||
);
|
||||
jPanel3Layout.setVerticalGroup(
|
||||
jPanel3Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
|
||||
.addComponent(progressLN2, javax.swing.GroupLayout.DEFAULT_SIZE, 411, Short.MAX_VALUE)
|
||||
.addComponent(progressLN2, javax.swing.GroupLayout.DEFAULT_SIZE, 428, Short.MAX_VALUE)
|
||||
.addGroup(javax.swing.GroupLayout.Alignment.TRAILING, jPanel3Layout.createSequentialGroup()
|
||||
.addContainerGap(javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
|
||||
.addComponent(jLabel4)
|
||||
@@ -1392,7 +1421,7 @@ public class MainPanel extends Panel {
|
||||
panelBeamlineStatusLayout.setVerticalGroup(
|
||||
panelBeamlineStatusLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
|
||||
.addGroup(panelBeamlineStatusLayout.createSequentialGroup()
|
||||
.addGap(0, 3, Short.MAX_VALUE)
|
||||
.addGap(0, 1, Short.MAX_VALUE)
|
||||
.addGroup(panelBeamlineStatusLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE)
|
||||
.addComponent(led5, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
|
||||
.addComponent(jLabel8))
|
||||
@@ -1400,7 +1429,7 @@ public class MainPanel extends Panel {
|
||||
.addGroup(panelBeamlineStatusLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE)
|
||||
.addComponent(led6, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
|
||||
.addComponent(jLabel9))
|
||||
.addContainerGap(9, Short.MAX_VALUE))
|
||||
.addContainerGap(7, Short.MAX_VALUE))
|
||||
);
|
||||
|
||||
panelSystemStatus.setBorder(javax.swing.BorderFactory.createTitledBorder("System Status"));
|
||||
@@ -1431,6 +1460,14 @@ public class MainPanel extends Panel {
|
||||
|
||||
jLabel27.setText("Dryer");
|
||||
|
||||
labelManualMode1.setText("Service Mode");
|
||||
|
||||
checkService.addActionListener(new java.awt.event.ActionListener() {
|
||||
public void actionPerformed(java.awt.event.ActionEvent evt) {
|
||||
checkServiceActionPerformed(evt);
|
||||
}
|
||||
});
|
||||
|
||||
javax.swing.GroupLayout panelSystemStatusLayout = new javax.swing.GroupLayout(panelSystemStatus);
|
||||
panelSystemStatus.setLayout(panelSystemStatusLayout);
|
||||
panelSystemStatusLayout.setHorizontalGroup(
|
||||
@@ -1445,20 +1482,26 @@ public class MainPanel extends Panel {
|
||||
.addComponent(ledRoomTemperature, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
|
||||
.addComponent(ledPsysSafety, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
|
||||
.addComponent(ledManualMode, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
|
||||
.addComponent(ledDryer, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))
|
||||
.addComponent(ledDryer, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
|
||||
.addComponent(ledServiceMode, 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.LEADING)
|
||||
.addComponent(jLabel24)
|
||||
.addComponent(jLabel25)
|
||||
.addGroup(panelSystemStatusLayout.createSequentialGroup()
|
||||
.addComponent(jLabel29)
|
||||
.addGap(18, 18, Short.MAX_VALUE)
|
||||
.addComponent(panelHeaterTemp, javax.swing.GroupLayout.PREFERRED_SIZE, 50, javax.swing.GroupLayout.PREFERRED_SIZE))
|
||||
.addComponent(jLabel26)
|
||||
.addComponent(jLabell21)
|
||||
.addComponent(labelRoomTemperature)
|
||||
.addComponent(labelManualMode)
|
||||
.addComponent(jLabel27))
|
||||
.addGroup(panelSystemStatusLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
|
||||
.addComponent(jLabel24)
|
||||
.addComponent(jLabel25)
|
||||
.addComponent(jLabel26)
|
||||
.addComponent(jLabell21)
|
||||
.addComponent(labelRoomTemperature)
|
||||
.addComponent(labelManualMode)
|
||||
.addComponent(jLabel27)
|
||||
.addGroup(panelSystemStatusLayout.createSequentialGroup()
|
||||
.addComponent(labelManualMode1)
|
||||
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED)
|
||||
.addComponent(checkService))))
|
||||
.addContainerGap(javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE))
|
||||
.addGroup(panelSystemStatusLayout.createSequentialGroup()
|
||||
.addComponent(filler1, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
|
||||
@@ -1469,13 +1512,19 @@ public class MainPanel extends Panel {
|
||||
panelSystemStatusLayout.setVerticalGroup(
|
||||
panelSystemStatusLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
|
||||
.addGroup(panelSystemStatusLayout.createSequentialGroup()
|
||||
.addGap(0, 9, Short.MAX_VALUE)
|
||||
.addGap(0, 6, Short.MAX_VALUE)
|
||||
.addGroup(panelSystemStatusLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE)
|
||||
.addComponent(ledManualMode, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
|
||||
.addComponent(labelManualMode))
|
||||
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
|
||||
.addGroup(panelSystemStatusLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.TRAILING)
|
||||
.addGroup(panelSystemStatusLayout.createSequentialGroup()
|
||||
.addGroup(panelSystemStatusLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE)
|
||||
.addComponent(ledManualMode, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
|
||||
.addComponent(labelManualMode))
|
||||
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
|
||||
.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(checkService))
|
||||
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
|
||||
.addGroup(panelSystemStatusLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
|
||||
.addGroup(javax.swing.GroupLayout.Alignment.TRAILING, panelSystemStatusLayout.createSequentialGroup()
|
||||
.addGroup(panelSystemStatusLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE)
|
||||
.addComponent(ledRoomTemperature, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
|
||||
.addComponent(labelRoomTemperature))
|
||||
@@ -1483,7 +1532,7 @@ public class MainPanel extends Panel {
|
||||
.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(panelHeaterTemp, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))
|
||||
.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)
|
||||
@@ -1504,12 +1553,12 @@ public class MainPanel extends Panel {
|
||||
.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))
|
||||
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED, 13, Short.MAX_VALUE)
|
||||
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED, 12, Short.MAX_VALUE)
|
||||
.addGroup(panelSystemStatusLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
|
||||
.addGroup(panelSystemStatusLayout.createSequentialGroup()
|
||||
.addComponent(buttonRelease)
|
||||
.addGap(0, 0, Short.MAX_VALUE))
|
||||
.addComponent(filler1, javax.swing.GroupLayout.DEFAULT_SIZE, 37, Short.MAX_VALUE))
|
||||
.addComponent(filler1, javax.swing.GroupLayout.DEFAULT_SIZE, 36, Short.MAX_VALUE))
|
||||
.addGap(4, 4, 4))
|
||||
);
|
||||
|
||||
@@ -1552,7 +1601,7 @@ public class MainPanel extends Panel {
|
||||
panelDatamatrixLayout.setVerticalGroup(
|
||||
panelDatamatrixLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
|
||||
.addGroup(panelDatamatrixLayout.createSequentialGroup()
|
||||
.addGap(0, 4, Short.MAX_VALUE)
|
||||
.addGap(0, 2, Short.MAX_VALUE)
|
||||
.addGroup(panelDatamatrixLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE)
|
||||
.addComponent(jLabel11)
|
||||
.addComponent(textPuckDatamatrix, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))
|
||||
@@ -1560,7 +1609,7 @@ public class MainPanel extends Panel {
|
||||
.addGroup(panelDatamatrixLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE)
|
||||
.addComponent(jLabel13)
|
||||
.addComponent(textSampleDatamatrix, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))
|
||||
.addGap(0, 4, Short.MAX_VALUE))
|
||||
.addGap(0, 2, Short.MAX_VALUE))
|
||||
);
|
||||
|
||||
javax.swing.GroupLayout panelStatusLayout = new javax.swing.GroupLayout(panelStatus);
|
||||
@@ -1650,13 +1699,6 @@ public class MainPanel extends Panel {
|
||||
}
|
||||
});
|
||||
|
||||
buttonCalibrateImage.setText("Calibrate");
|
||||
buttonCalibrateImage.addActionListener(new java.awt.event.ActionListener() {
|
||||
public void actionPerformed(java.awt.event.ActionEvent evt) {
|
||||
buttonCalibrateImageActionPerformed(evt);
|
||||
}
|
||||
});
|
||||
|
||||
buttonCalibrateCover.setText("Exposure");
|
||||
buttonCalibrateCover.addActionListener(new java.awt.event.ActionListener() {
|
||||
public void actionPerformed(java.awt.event.ActionEvent evt) {
|
||||
@@ -1689,37 +1731,34 @@ public class MainPanel extends Panel {
|
||||
panelExpert.setLayout(panelExpertLayout);
|
||||
panelExpertLayout.setHorizontalGroup(
|
||||
panelExpertLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
|
||||
.addGroup(panelExpertLayout.createSequentialGroup()
|
||||
.addComponent(checkExpert, javax.swing.GroupLayout.PREFERRED_SIZE, 92, javax.swing.GroupLayout.PREFERRED_SIZE)
|
||||
.addGap(0, 0, Short.MAX_VALUE))
|
||||
.addGroup(panelExpertLayout.createSequentialGroup()
|
||||
.addGroup(panelExpertLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
|
||||
.addComponent(buttonExpertCommands, 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)
|
||||
.addComponent(buttonCalibrateImage, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
|
||||
.addComponent(buttonCalibrateCover, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
|
||||
.addComponent(buttonConfig, javax.swing.GroupLayout.PREFERRED_SIZE, 85, javax.swing.GroupLayout.PREFERRED_SIZE))
|
||||
.addContainerGap(javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE))
|
||||
.addGroup(panelExpertLayout.createSequentialGroup()
|
||||
.addComponent(checkExpert, javax.swing.GroupLayout.PREFERRED_SIZE, 92, javax.swing.GroupLayout.PREFERRED_SIZE)
|
||||
.addGap(0, 0, Short.MAX_VALUE))
|
||||
);
|
||||
|
||||
panelExpertLayout.linkSize(javax.swing.SwingConstants.HORIZONTAL, new java.awt.Component[] {buttonCalibrateCover, buttonCalibrateImage, buttonConfig, buttonExpertCommands, buttonRecovery});
|
||||
panelExpertLayout.linkSize(javax.swing.SwingConstants.HORIZONTAL, new java.awt.Component[] {buttonCalibrateCover, buttonConfig, buttonExpertCommands, buttonRecovery});
|
||||
|
||||
panelExpertLayout.setVerticalGroup(
|
||||
panelExpertLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
|
||||
.addGroup(panelExpertLayout.createSequentialGroup()
|
||||
.addGap(0, 0, 0)
|
||||
.addComponent(checkExpert)
|
||||
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
|
||||
.addGap(18, 18, Short.MAX_VALUE)
|
||||
.addComponent(buttonExpertCommands)
|
||||
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED)
|
||||
.addGap(18, 18, 18)
|
||||
.addComponent(buttonRecovery)
|
||||
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED)
|
||||
.addComponent(buttonCalibrateImage)
|
||||
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED)
|
||||
.addGap(18, 18, 18)
|
||||
.addComponent(buttonCalibrateCover)
|
||||
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED)
|
||||
.addGap(18, 18, 18)
|
||||
.addComponent(buttonConfig)
|
||||
.addGap(0, 0, 0))
|
||||
.addContainerGap(javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE))
|
||||
);
|
||||
|
||||
javax.swing.GroupLayout panelDevicesLayout = new javax.swing.GroupLayout(panelDevices);
|
||||
@@ -1759,7 +1798,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, 112, Short.MAX_VALUE)
|
||||
.addComponent(panelDetail, javax.swing.GroupLayout.DEFAULT_SIZE, 125, Short.MAX_VALUE)
|
||||
.addGap(0, 0, 0)
|
||||
.addComponent(panelDevices, javax.swing.GroupLayout.PREFERRED_SIZE, 280, javax.swing.GroupLayout.PREFERRED_SIZE)
|
||||
.addGap(0, 0, 0)
|
||||
@@ -1823,7 +1862,7 @@ public class MainPanel extends Panel {
|
||||
panelSamplesLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
|
||||
.addGroup(panelSamplesLayout.createSequentialGroup()
|
||||
.addGap(0, 0, 0)
|
||||
.addComponent(panelTableSamples, javax.swing.GroupLayout.DEFAULT_SIZE, 56, Short.MAX_VALUE)
|
||||
.addComponent(panelTableSamples, javax.swing.GroupLayout.DEFAULT_SIZE, 43, Short.MAX_VALUE)
|
||||
.addGap(0, 0, 0))
|
||||
);
|
||||
|
||||
@@ -1930,7 +1969,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, 79, Short.MAX_VALUE)
|
||||
.addComponent(panelBottom, javax.swing.GroupLayout.DEFAULT_SIZE, 66, Short.MAX_VALUE)
|
||||
.addGap(1, 1, 1))
|
||||
);
|
||||
}// </editor-fold>//GEN-END:initComponents
|
||||
@@ -2011,11 +2050,6 @@ public class MainPanel extends Panel {
|
||||
}
|
||||
}//GEN-LAST:event_buttonRecoveryActionPerformed
|
||||
|
||||
private void buttonCalibrateImageActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_buttonCalibrateImageActionPerformed
|
||||
onExpertCommand(null);
|
||||
execute("imgproc/CameraCalibration", null, false, true);
|
||||
}//GEN-LAST:event_buttonCalibrateImageActionPerformed
|
||||
|
||||
private void buttonCalibrateCoverActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_buttonCalibrateCoverActionPerformed
|
||||
onExpertCommand(null);
|
||||
execute("setup/CoverDetectionExposureScan.py", null, false, true);
|
||||
@@ -2052,13 +2086,26 @@ public class MainPanel extends Panel {
|
||||
execute("release_safety()", true);
|
||||
}//GEN-LAST:event_buttonReleaseActionPerformed
|
||||
|
||||
private void textCoverDetActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_textCoverDetActionPerformed
|
||||
// TODO add your handling code here:
|
||||
}//GEN-LAST:event_textCoverDetActionPerformed
|
||||
|
||||
private void checkServiceActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_checkServiceActionPerformed
|
||||
try {
|
||||
if (!updating){
|
||||
Controller.getInstance().setServiceMode(checkService.isSelected());
|
||||
}
|
||||
} catch (Exception ex) {
|
||||
showException(ex);
|
||||
}
|
||||
}//GEN-LAST:event_checkServiceActionPerformed
|
||||
|
||||
|
||||
// Variables declaration - do not modify//GEN-BEGIN:variables
|
||||
ch.psi.mxsc.BasePlatePanel basePlatePanel;
|
||||
private javax.swing.JToggleButton btViewDewar;
|
||||
private javax.swing.JToggleButton btViewRT;
|
||||
private javax.swing.JButton buttonCalibrateCover;
|
||||
private javax.swing.JButton buttonCalibrateImage;
|
||||
private javax.swing.JToggleButton buttonCamera;
|
||||
private javax.swing.JButton buttonConfig;
|
||||
private javax.swing.JButton buttonDetectionCalibrate;
|
||||
@@ -2069,6 +2116,7 @@ public class MainPanel extends Panel {
|
||||
private javax.swing.JButton buttonRecovery;
|
||||
private javax.swing.JButton buttonRelease;
|
||||
private javax.swing.JCheckBox checkExpert;
|
||||
private javax.swing.JCheckBox checkService;
|
||||
private ch.psi.mxsc.DevicesPanel devicesPanel;
|
||||
private javax.swing.Box.Filler filler1;
|
||||
private javax.swing.JLabel jLabel1;
|
||||
@@ -2092,6 +2140,7 @@ public class MainPanel extends Panel {
|
||||
private javax.swing.JPanel jPanel3;
|
||||
private javax.swing.JPanel jPanel4;
|
||||
private javax.swing.JLabel labelManualMode;
|
||||
private javax.swing.JLabel labelManualMode1;
|
||||
private javax.swing.JLabel labelRoomTemperature;
|
||||
private ch.psi.pshell.swing.Led led5;
|
||||
private ch.psi.pshell.swing.Led led6;
|
||||
@@ -2108,6 +2157,7 @@ public class MainPanel extends Panel {
|
||||
private ch.psi.pshell.swing.Led ledN2Pressure;
|
||||
private ch.psi.pshell.swing.Led ledPsysSafety;
|
||||
private ch.psi.pshell.swing.Led ledRoomTemperature;
|
||||
private ch.psi.pshell.swing.Led ledServiceMode;
|
||||
private javax.swing.JPanel panelBeamlineStatus;
|
||||
private javax.swing.JPanel panelBottom;
|
||||
private javax.swing.JPanel panelCover;
|
||||
|
||||
Reference in New Issue
Block a user