This commit is contained in:
X11MA
2016-03-17 11:33:52 +01:00
parent a5f647aae6
commit 196a64230d
6 changed files with 222 additions and 116 deletions

View File

@@ -228,12 +228,14 @@ public class EnergyScan extends Panel {
panelParameters.setBorder(javax.swing.BorderFactory.createTitledBorder("Parameters"));
jLabel1.setHorizontalAlignment(javax.swing.SwingConstants.TRAILING);
jLabel1.setText("E1:");
jLabel1.setText("E start:");
jLabel1.setToolTipText("");
spinnerE1.setModel(new javax.swing.SpinnerNumberModel(680.0d, 0.0d, 9999.0d, 1.0d));
jLabel2.setHorizontalAlignment(javax.swing.SwingConstants.TRAILING);
jLabel2.setText("E2:");
jLabel2.setText("E end:");
jLabel2.setToolTipText("");
spinnerE2.setModel(new javax.swing.SpinnerNumberModel(750.0d, 0.0d, 9999.0d, 1.0d));
@@ -262,7 +264,8 @@ public class EnergyScan extends Panel {
comboRunType.setModel(new javax.swing.DefaultComboBoxModel(new String[] { "+/-", "+", "-", "LH/LV", "LH", "LV" }));
jLabel5.setHorizontalAlignment(javax.swing.SwingConstants.TRAILING);
jLabel5.setText("Rounds:");
jLabel5.setText("Nb of repetitions");
jLabel5.setToolTipText("");
spinnerRounds.setModel(new javax.swing.SpinnerNumberModel(1, 1, 10, 1));
@@ -409,26 +412,27 @@ public class EnergyScan extends Panel {
jRadioButton3.setSelected(true);
jRadioButton3.setText("ID1+ID2");
jCheckBox2.setText("MCP signal");
jCheckBox2.setText("Signal channel 0 p/n");
jCheckBox2.addActionListener(new java.awt.event.ActionListener() {
public void actionPerformed(java.awt.event.ActionEvent evt) {
jCheckBox2ActionPerformed(evt);
}
});
jCheckBox3.setText("MCP I_0");
jCheckBox3.setText("I_0 channel 2 p/n");
jCheckBox3.setToolTipText("");
jLabel6.setText("ID mode");
jLabel7.setText("Save MCP data");
jLabel7.setText("Data channels");
jSpinner1.setModel(new javax.swing.SpinnerNumberModel(0, 0, 1000, 1));
jSpinner2.setModel(new javax.swing.SpinnerNumberModel(0, 0, 1000, 1));
jLabel9.setText("start");
jLabel9.setText("Signal pos");
jLabel14.setText("end");
jLabel14.setText("I_0 pos");
jLabel15.setText("Camshaft position");
@@ -441,19 +445,16 @@ public class EnergyScan extends Panel {
.addGroup(jPanel3Layout.createSequentialGroup()
.addContainerGap()
.addGroup(jPanel3Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
.addGroup(jPanel3Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING, false)
.addGroup(jPanel3Layout.createSequentialGroup()
.addGroup(jPanel3Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
.addComponent(jRadioButton1)
.addComponent(jRadioButton2))
.addGap(80, 80, 80)
.addGroup(jPanel3Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
.addComponent(jCheckBox3)
.addComponent(jCheckBox2)))
.addGroup(jPanel3Layout.createSequentialGroup()
.addComponent(jLabel6)
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
.addComponent(jLabel7)))
.addGroup(jPanel3Layout.createSequentialGroup()
.addGroup(jPanel3Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
.addComponent(jRadioButton1)
.addComponent(jRadioButton2)
.addComponent(jLabel6))
.addGap(74, 74, 74)
.addGroup(jPanel3Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
.addComponent(jLabel7)
.addComponent(jCheckBox3)
.addComponent(jCheckBox2)))
.addGroup(jPanel3Layout.createSequentialGroup()
.addComponent(jRadioButton3)
.addGap(48, 48, 48)
@@ -578,22 +579,6 @@ public class EnergyScan extends Panel {
);
}// </editor-fold>//GEN-END:initComponents
private void buttonExecuteActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_buttonExecuteActionPerformed
try {
run();
} catch (Exception ex) {
showException(ex);
}
}//GEN-LAST:event_buttonExecuteActionPerformed
private void buttonAbortActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_buttonAbortActionPerformed
abort();
}//GEN-LAST:event_buttonAbortActionPerformed
private void jCheckBox1ActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_jCheckBox1ActionPerformed
// TODO add your handling code here:
}//GEN-LAST:event_jCheckBox1ActionPerformed
private void radioK1ActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_radioK1ActionPerformed
// TODO add your handling code here:
}//GEN-LAST:event_radioK1ActionPerformed
@@ -638,6 +623,22 @@ public class EnergyScan extends Panel {
// TODO add your handling code here:
}//GEN-LAST:event_jCheckBox2ActionPerformed
private void jCheckBox1ActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_jCheckBox1ActionPerformed
// TODO add your handling code here:
}//GEN-LAST:event_jCheckBox1ActionPerformed
private void buttonAbortActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_buttonAbortActionPerformed
abort();
}//GEN-LAST:event_buttonAbortActionPerformed
private void buttonExecuteActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_buttonExecuteActionPerformed
try {
run();
} catch (Exception ex) {
showException(ex);
}
}//GEN-LAST:event_buttonExecuteActionPerformed
EditorDialog dlgConfig;
// Variables declaration - do not modify//GEN-BEGIN:variables
private javax.swing.JButton buttonAbort;