diff --git a/plugins/Kollimators.form b/plugins/Kollimators.form index 6689b89..da9fc49 100644 --- a/plugins/Kollimators.form +++ b/plugins/Kollimators.form @@ -23,7 +23,7 @@ - + @@ -103,7 +103,7 @@ - + @@ -197,12 +197,12 @@ - + - + - + diff --git a/plugins/Kollimators.java b/plugins/Kollimators.java index 5f66f1f..8196ecc 100644 --- a/plugins/Kollimators.java +++ b/plugins/Kollimators.java @@ -70,6 +70,7 @@ public class Kollimators extends javax.swing.JPanel { public void animate(String deviceName) { g_deviceName = deviceName; + jLabelDeviceName.setText(deviceName); connect(deviceName+":STA2:1", jTextSta); connect(deviceName+":IST1:1", jTextDist); connect(deviceName+":IST1:1", jTextIst1); @@ -123,7 +124,7 @@ public class Kollimators extends javax.swing.JPanel { jTextRes = new javax.swing.JTextField(); jLabel8 = new javax.swing.JLabel(); jLabelDeviceName = new javax.swing.JLabel(); - jButton1 = new javax.swing.JButton(); + jButtonReconnect = new javax.swing.JButton(); jLabel1.setText("STA:"); @@ -160,10 +161,10 @@ public class Kollimators extends javax.swing.JPanel { jLabelDeviceName.setHorizontalAlignment(javax.swing.SwingConstants.RIGHT); jLabelDeviceName.setHorizontalTextPosition(javax.swing.SwingConstants.LEFT); - jButton1.setText("Reconnect"); - jButton1.addActionListener(new java.awt.event.ActionListener() { + jButtonReconnect.setText("Refresh"); + jButtonReconnect.addActionListener(new java.awt.event.ActionListener() { public void actionPerformed(java.awt.event.ActionEvent evt) { - jButton1ActionPerformed(evt); + jButtonReconnectActionPerformed(evt); } }); @@ -177,7 +178,7 @@ public class Kollimators extends javax.swing.JPanel { .addGap(3, 3, 3) .addComponent(jLabelDeviceName, javax.swing.GroupLayout.DEFAULT_SIZE, 100, Short.MAX_VALUE)) .addGroup(layout.createSequentialGroup() - .addComponent(jButton1) + .addComponent(jButtonReconnect) .addGap(0, 0, Short.MAX_VALUE))) .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) @@ -243,15 +244,15 @@ public class Kollimators extends javax.swing.JPanel { .addComponent(jTextDist, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE) .addComponent(jLabel8) .addComponent(jTextRes, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE) - .addComponent(jButton1)) + .addComponent(jButtonReconnect)) .addContainerGap(javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)) ); }// //GEN-END:initComponents - private void jButton1ActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_jButton1ActionPerformed + private void jButtonReconnectActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_jButtonReconnectActionPerformed // TODO add your handling code here: animate(); - }//GEN-LAST:event_jButton1ActionPerformed + }//GEN-LAST:event_jButtonReconnectActionPerformed /** @@ -293,7 +294,7 @@ public class Kollimators extends javax.swing.JPanel { } // Variables declaration - do not modify//GEN-BEGIN:variables - private javax.swing.JButton jButton1; + private javax.swing.JButton jButtonReconnect; private javax.swing.JLabel jLabel1; private javax.swing.JLabel jLabel2; private javax.swing.JLabel jLabel3;