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

@@ -167,23 +167,26 @@ public class DelayScan extends Panel {
jLabel14 = new javax.swing.JLabel();
jLabel15 = new javax.swing.JLabel();
jCheckBox4 = new javax.swing.JCheckBox();
panelSetup = new javax.swing.JPanel();
jLabel10 = new javax.swing.JLabel();
jTextField2 = new javax.swing.JTextField();
panelParameters.setBorder(javax.swing.BorderFactory.createTitledBorder("Parameters"));
jLabel1.setHorizontalAlignment(javax.swing.SwingConstants.TRAILING);
jLabel1.setText("Delay start (ns):");
spinnerStart.setModel(new javax.swing.SpinnerNumberModel(680.0d, 0.0d, 9999.0d, 1.0d));
spinnerStart.setModel(new javax.swing.SpinnerNumberModel(0.0d, 0.0d, 9999.0d, 1.0d));
spinnerStart.setValue(0);
jLabel2.setHorizontalAlignment(javax.swing.SwingConstants.TRAILING);
jLabel2.setText("LPP delay at t=0");
spinnerDelay.setModel(new javax.swing.SpinnerNumberModel(750.0d, 0.0d, 9999.0d, 1.0d));
jLabel3.setHorizontalAlignment(javax.swing.SwingConstants.TRAILING);
jLabel3.setText("Delay end (ns):");
spinnerEnd.setModel(new javax.swing.SpinnerNumberModel(2.0d, 0.0d, 60.0d, 1.0d));
spinnerEnd.setModel(new javax.swing.SpinnerNumberModel(50.0d, 0.0d, 60.0d, 1.0d));
spinnerEnd.setValue(50);
jLabel4.setHorizontalAlignment(javax.swing.SwingConstants.TRAILING);
jLabel4.setText("LPP fine delay at t=0");
@@ -193,7 +196,8 @@ public class DelayScan extends Panel {
jLabel8.setHorizontalAlignment(javax.swing.SwingConstants.TRAILING);
jLabel8.setText("Step size (ns):");
spinnerSize.setModel(new javax.swing.SpinnerNumberModel(0.0d, -20.0d, 20.0d, 1.0d));
spinnerSize.setModel(new javax.swing.SpinnerNumberModel(1.0d, -20.0d, 20.0d, 1.0d));
spinnerSize.setValue(1);
jLabel13.setHorizontalAlignment(javax.swing.SwingConstants.TRAILING);
jLabel13.setText("Offset2:");
@@ -218,7 +222,7 @@ public class DelayScan extends Panel {
spinnerRounds.setModel(new javax.swing.SpinnerNumberModel(1, 1, 10, 1));
jLabel5.setHorizontalAlignment(javax.swing.SwingConstants.TRAILING);
jLabel5.setText("Rounds:");
jLabel5.setText("Nb of repetitions:");
spinnerOffset1.setModel(new javax.swing.SpinnerNumberModel(0.0d, -20.0d, 20.0d, 1.0d));
@@ -234,10 +238,6 @@ public class DelayScan extends Panel {
.addGroup(panelParametersLayout.createSequentialGroup()
.addContainerGap()
.addGroup(panelParametersLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
.addGroup(panelParametersLayout.createSequentialGroup()
.addComponent(jLabel16)
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
.addComponent(jTextField1, javax.swing.GroupLayout.PREFERRED_SIZE, 161, javax.swing.GroupLayout.PREFERRED_SIZE))
.addGroup(panelParametersLayout.createSequentialGroup()
.addGroup(panelParametersLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
.addGroup(panelParametersLayout.createSequentialGroup()
@@ -260,8 +260,7 @@ public class DelayScan extends Panel {
.addComponent(spinnerStart, javax.swing.GroupLayout.Alignment.TRAILING, javax.swing.GroupLayout.PREFERRED_SIZE, 80, javax.swing.GroupLayout.PREFERRED_SIZE)))
.addComponent(jLabel11)
.addGroup(panelParametersLayout.createSequentialGroup()
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED, 6, javax.swing.GroupLayout.PREFERRED_SIZE)
.addGap(56, 56, 56)
.addGap(62, 62, 62)
.addComponent(comboRunType, javax.swing.GroupLayout.PREFERRED_SIZE, 105, javax.swing.GroupLayout.PREFERRED_SIZE)))
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
.addGroup(panelParametersLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.TRAILING)
@@ -270,12 +269,18 @@ public class DelayScan extends Panel {
.addComponent(jLabel18)
.addComponent(jLabel5))
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
.addGroup(panelParametersLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING, false)
.addComponent(spinnerRounds, javax.swing.GroupLayout.Alignment.TRAILING)
.addComponent(spinnerAcqTime, javax.swing.GroupLayout.Alignment.TRAILING)
.addComponent(spinnerFineDelay, javax.swing.GroupLayout.Alignment.TRAILING)
.addComponent(spinnerDelay, javax.swing.GroupLayout.Alignment.TRAILING))))
.addContainerGap(javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE))
.addGroup(panelParametersLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
.addGroup(panelParametersLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING, false)
.addComponent(spinnerRounds, javax.swing.GroupLayout.Alignment.TRAILING)
.addComponent(spinnerAcqTime, javax.swing.GroupLayout.Alignment.TRAILING)
.addComponent(spinnerFineDelay, javax.swing.GroupLayout.Alignment.TRAILING))
.addComponent(spinnerDelay, javax.swing.GroupLayout.PREFERRED_SIZE, 85, javax.swing.GroupLayout.PREFERRED_SIZE))
.addContainerGap(javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE))
.addGroup(panelParametersLayout.createSequentialGroup()
.addComponent(jLabel16)
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
.addComponent(jTextField1, javax.swing.GroupLayout.PREFERRED_SIZE, 161, javax.swing.GroupLayout.PREFERRED_SIZE)
.addContainerGap(javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE))))
);
panelParametersLayout.linkSize(javax.swing.SwingConstants.HORIZONTAL, new java.awt.Component[] {jLabel2, jLabel4});
@@ -354,14 +359,15 @@ public class DelayScan 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");
@@ -371,9 +377,9 @@ public class DelayScan extends Panel {
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");
@@ -462,18 +468,50 @@ public class DelayScan extends Panel {
.addContainerGap(13, Short.MAX_VALUE))
);
panelSetup.setBorder(javax.swing.BorderFactory.createTitledBorder("Setup"));
jLabel10.setText("Saving path");
jTextField2.setText("X:\\public");
javax.swing.GroupLayout panelSetupLayout = new javax.swing.GroupLayout(panelSetup);
panelSetup.setLayout(panelSetupLayout);
panelSetupLayout.setHorizontalGroup(
panelSetupLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
.addGroup(panelSetupLayout.createSequentialGroup()
.addContainerGap()
.addComponent(jLabel10)
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
.addComponent(jTextField2))
);
panelSetupLayout.setVerticalGroup(
panelSetupLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
.addGroup(panelSetupLayout.createSequentialGroup()
.addGap(7, 7, 7)
.addGroup(panelSetupLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE)
.addComponent(jLabel10)
.addComponent(jTextField2, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))
.addContainerGap(17, Short.MAX_VALUE))
);
javax.swing.GroupLayout layout = new javax.swing.GroupLayout(this);
this.setLayout(layout);
layout.setHorizontalGroup(
layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
.addComponent(jPanel3, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
.addComponent(panelParameters, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
.addGroup(layout.createSequentialGroup()
.addContainerGap()
.addComponent(panelSetup, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
.addContainerGap())
);
layout.setVerticalGroup(
layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
.addGroup(layout.createSequentialGroup()
.addComponent(panelParameters, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED, 111, Short.MAX_VALUE)
.addGap(18, 18, 18)
.addComponent(panelSetup, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED, 28, Short.MAX_VALUE)
.addComponent(jPanel3, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))
);
}// </editor-fold>//GEN-END:initComponents
@@ -514,6 +552,7 @@ public class DelayScan extends Panel {
private javax.swing.JCheckBox jCheckBox3;
private javax.swing.JCheckBox jCheckBox4;
private javax.swing.JLabel jLabel1;
private javax.swing.JLabel jLabel10;
private javax.swing.JLabel jLabel11;
private javax.swing.JLabel jLabel13;
private javax.swing.JLabel jLabel14;
@@ -536,7 +575,9 @@ public class DelayScan extends Panel {
private javax.swing.JSpinner jSpinner1;
private javax.swing.JSpinner jSpinner2;
private javax.swing.JTextField jTextField1;
private javax.swing.JTextField jTextField2;
private javax.swing.JPanel panelParameters;
private javax.swing.JPanel panelSetup;
private javax.swing.JSpinner spinnerAcqTime;
private javax.swing.JSpinner spinnerDelay;
private javax.swing.JSpinner spinnerEnd;