tell/SwissMX
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Browse Source
This commit is contained in:
gac-S_Changer
2019-02-28 16:38:32 +01:00
parent 32233e9a1f
commit 41aa11866f
12 changed files with 389 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/Commands.java
+50 -4
View File
@@ -23,6 +23,7 @@ public class Commands extends Panel {
((JSpinner.DefaultEditor)spinnerSegment.getEditor()).getTextField().setHorizontalAlignment(JTextField.CENTER);
((JSpinner.DefaultEditor)spinnerPuck.getEditor()).getTextField().setHorizontalAlignment(JTextField.CENTER);
((JSpinner.DefaultEditor)spinnerSample.getEditor()).getTextField().setHorizontalAlignment(JTextField.CENTER);
startTimer(2000, 200);
}
//Overridable callbacks
@@ -63,6 +64,14 @@ public class Commands extends Panel {
public void onExecutedFile(String fileName, Object result) {
}
@Override
protected void onTimer() {
try{
textGripperType.setText(String.valueOf(eval("robot.get_tool()", true)));
} catch (Exception ex){
textGripperType.setText("");
}
}
//Callback to perform update - in event thread
@Override
protected void doUpdate() {
@@ -154,6 +163,9 @@ public class Commands extends Panel {
jPanel1 = new javax.swing.JPanel();
buttonGripperScan = new javax.swing.JButton();
buttonTrash = new javax.swing.JButton();
buttonGripperDetect = new javax.swing.JButton();
jLabel8 = new javax.swing.JLabel();
textGripperType = new javax.swing.JTextField();
tabAdvanced = new javax.swing.JPanel();
pnLowLevel = new javax.swing.JPanel();
buttonMovePark = new javax.swing.JButton();
@@ -421,15 +433,36 @@ public class Commands extends Panel {
}
});
buttonGripperDetect.setText("Detect Type");
buttonGripperDetect.addActionListener(new java.awt.event.ActionListener() {
public void actionPerformed(java.awt.event.ActionEvent evt) {
buttonGripperDetectActionPerformed(evt);
}
});
jLabel8.setText("Type:");
textGripperType.setEditable(false);
textGripperType.setBackground(new java.awt.Color(204, 204, 204));
textGripperType.setHorizontalAlignment(javax.swing.JTextField.CENTER);
javax.swing.GroupLayout jPanel1Layout = new javax.swing.GroupLayout(jPanel1);
jPanel1.setLayout(jPanel1Layout);
jPanel1Layout.setHorizontalGroup(
jPanel1Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
.addGroup(jPanel1Layout.createSequentialGroup()
.addContainerGap()
.addComponent(buttonGripperScan, javax.swing.GroupLayout.PREFERRED_SIZE, 100, javax.swing.GroupLayout.PREFERRED_SIZE)
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
.addComponent(buttonTrash, javax.swing.GroupLayout.PREFERRED_SIZE, 100, javax.swing.GroupLayout.PREFERRED_SIZE)
.addGroup(jPanel1Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
.addGroup(jPanel1Layout.createSequentialGroup()
.addComponent(buttonGripperScan, javax.swing.GroupLayout.PREFERRED_SIZE, 100, javax.swing.GroupLayout.PREFERRED_SIZE)
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
.addComponent(buttonTrash, javax.swing.GroupLayout.PREFERRED_SIZE, 100, javax.swing.GroupLayout.PREFERRED_SIZE))
.addGroup(jPanel1Layout.createSequentialGroup()
.addComponent(buttonGripperDetect, javax.swing.GroupLayout.PREFERRED_SIZE, 100, javax.swing.GroupLayout.PREFERRED_SIZE)
.addGap(56, 56, 56)
.addComponent(jLabel8)
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED)
.addComponent(textGripperType)))
.addContainerGap())
);
jPanel1Layout.setVerticalGroup(
@@ -439,6 +472,11 @@ public class Commands extends Panel {
.addGroup(jPanel1Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE)
.addComponent(buttonGripperScan)
.addComponent(buttonTrash))
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED)
.addGroup(jPanel1Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE)
.addComponent(buttonGripperDetect)
.addComponent(jLabel8)
.addComponent(textGripperType, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))
.addContainerGap(javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE))
);
@@ -933,9 +971,14 @@ public class Commands extends Panel {
}//GEN-LAST:event_buttonPutRTActionPerformed
private void buttonMoveRTActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_buttonMoveRTActionPerformed
execute("move_aux()");
execute("move_rt()");
}//GEN-LAST:event_buttonMoveRTActionPerformed
private void buttonGripperDetectActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_buttonGripperDetectActionPerformed
execute("update_robot_tool()");
onTimer();
}//GEN-LAST:event_buttonGripperDetectActionPerformed
// Variables declaration - do not modify//GEN-BEGIN:variables
private javax.swing.JButton buttonClearSampleDb;
private javax.swing.JButton buttonDry;
@@ -944,6 +987,7 @@ public class Commands extends Panel {
private javax.swing.JButton buttonGetDewar;
private javax.swing.JButton buttonGetGonio;
private javax.swing.JButton buttonGetRT;
private javax.swing.JButton buttonGripperDetect;
private javax.swing.JButton buttonGripperScan;
private javax.swing.JButton buttonMount;
private javax.swing.JButton buttonMoveAux;
@@ -977,6 +1021,7 @@ public class Commands extends Panel {
private javax.swing.JLabel jLabel5;
private javax.swing.JLabel jLabel6;
private javax.swing.JLabel jLabel7;
private javax.swing.JLabel jLabel8;
private javax.swing.JPanel jPanel1;
private javax.swing.JPanel jPanel5;
private javax.swing.JTabbedPane jTabbedPane1;
@@ -992,5 +1037,6 @@ public class Commands extends Panel {
private javax.swing.JSpinner spinnerSegment;
private javax.swing.JPanel tabAdvanced;
private javax.swing.JPanel tabCommands;
private javax.swing.JTextField textGripperType;
// End of variables declaration//GEN-END:variables
}