This commit is contained in:
gac-x09la
@@ -177,9 +177,8 @@ public class SIStem extends PanelProcessor {
|
||||
//Overridable callbacks
|
||||
@Override
|
||||
public void onInitialize(int runCount) {
|
||||
if ((modelFixed.getRowCount() == 0) && (modelScanned.getRowCount() == 0) && (modelInactive.getRowCount() == 0)) {
|
||||
initInactive();
|
||||
|
||||
if (runCount==0) {
|
||||
clear();
|
||||
}
|
||||
}
|
||||
|
||||
@@ -294,7 +293,7 @@ public class SIStem extends PanelProcessor {
|
||||
config.put("SETTLING_TIME", spinnerLatency.getValue());
|
||||
config.put("PASSES", spinnerPasses.getValue());
|
||||
config.put("ZIGZAG", checkZigzag.isSelected());
|
||||
config.put("COMPRESSION", true);
|
||||
config.put("COMPRESSION", checkCompression.isSelected());
|
||||
|
||||
String json = JsonSerializer.encode(config, true);
|
||||
Files.write(currentFile.toPath(), json.getBytes());
|
||||
@@ -357,6 +356,7 @@ public class SIStem extends PanelProcessor {
|
||||
spinnerLatency.setValue(config.get("SETTLING_TIME"));
|
||||
spinnerPasses.setValue(config.get("PASSES"));
|
||||
checkZigzag.setSelected((Boolean) config.get("ZIGZAG"));
|
||||
checkCompression.setSelected((Boolean) config.get("COMPRESSION"));
|
||||
}
|
||||
updateControls();
|
||||
}
|
||||
@@ -386,8 +386,13 @@ public class SIStem extends PanelProcessor {
|
||||
setDevices(textSensors, Arr.toList(DEFAULT_SENSORS));
|
||||
setDevices(textSnapshots, Arr.toList(DEFAULT_SNAPS));
|
||||
setDevices(textDiagnostics, Arr.toList(DEFAULT_DIAGS));
|
||||
setDevices(textMonitors, Arr.toList(DEFAULT_MONITORS));
|
||||
setDevices(textMonitors, Arr.toList(DEFAULT_MONITORS));
|
||||
initInactive();
|
||||
|
||||
spinnerLatency.setValue(0.0);
|
||||
spinnerPasses.setValue(1);
|
||||
checkZigzag.setSelected(false);
|
||||
checkCompression.setSelected(true);
|
||||
updateControls();
|
||||
}
|
||||
|
||||
@@ -439,12 +444,6 @@ public class SIStem extends PanelProcessor {
|
||||
|
||||
void updateControls() {
|
||||
State state = getState();
|
||||
try {
|
||||
textFileId.setText(String.valueOf(getContext().getFileSequentialNumber()));
|
||||
} catch (Exception ex) {
|
||||
textFileId.setText("");
|
||||
}
|
||||
|
||||
String fileName = getFileName();
|
||||
if (fileName == null) {
|
||||
textFile.setText("");
|
||||
@@ -529,9 +528,6 @@ public class SIStem extends PanelProcessor {
|
||||
private void initComponents() {
|
||||
|
||||
buttonScienta = new javax.swing.JButton();
|
||||
jLabel2 = new javax.swing.JLabel();
|
||||
textFileId = new javax.swing.JTextField();
|
||||
buttonResetId = new javax.swing.JButton();
|
||||
buttonStart = new javax.swing.JButton();
|
||||
buttonAbort = new javax.swing.JButton();
|
||||
jPanel2 = new javax.swing.JPanel();
|
||||
@@ -587,6 +583,8 @@ public class SIStem extends PanelProcessor {
|
||||
jLabel1 = new javax.swing.JLabel();
|
||||
spinnerPasses = new javax.swing.JSpinner();
|
||||
jLabel8 = new javax.swing.JLabel();
|
||||
jLabel22 = new javax.swing.JLabel();
|
||||
checkCompression = new javax.swing.JCheckBox();
|
||||
jPanel1 = new javax.swing.JPanel();
|
||||
jScrollPane1 = new javax.swing.JScrollPane();
|
||||
tableInactive = new javax.swing.JTable();
|
||||
@@ -617,18 +615,6 @@ public class SIStem extends PanelProcessor {
|
||||
}
|
||||
});
|
||||
|
||||
jLabel2.setText("File ID:");
|
||||
|
||||
textFileId.setEditable(false);
|
||||
textFileId.setHorizontalAlignment(javax.swing.JTextField.CENTER);
|
||||
|
||||
buttonResetId.setText("Reset");
|
||||
buttonResetId.addActionListener(new java.awt.event.ActionListener() {
|
||||
public void actionPerformed(java.awt.event.ActionEvent evt) {
|
||||
buttonResetIdActionPerformed(evt);
|
||||
}
|
||||
});
|
||||
|
||||
buttonStart.setText("Start");
|
||||
buttonStart.addActionListener(new java.awt.event.ActionListener() {
|
||||
public void actionPerformed(java.awt.event.ActionEvent evt) {
|
||||
@@ -1012,43 +998,54 @@ public class SIStem extends PanelProcessor {
|
||||
|
||||
jTabbedPane1.addTab("Detector", jPanel5);
|
||||
|
||||
jLabel4.setHorizontalAlignment(javax.swing.SwingConstants.TRAILING);
|
||||
jLabel4.setText("Settling Time:");
|
||||
|
||||
spinnerLatency.setModel(new javax.swing.SpinnerNumberModel(0.0d, 0.0d, 1000.0d, 1.0d));
|
||||
|
||||
jLabel1.setHorizontalAlignment(javax.swing.SwingConstants.TRAILING);
|
||||
jLabel1.setText("Passes:");
|
||||
|
||||
spinnerPasses.setModel(new javax.swing.SpinnerNumberModel(1, 1, 1000, 1));
|
||||
|
||||
jLabel8.setHorizontalAlignment(javax.swing.SwingConstants.TRAILING);
|
||||
jLabel8.setText("Zigzag:");
|
||||
|
||||
jLabel22.setHorizontalAlignment(javax.swing.SwingConstants.TRAILING);
|
||||
jLabel22.setText("Compression:");
|
||||
|
||||
javax.swing.GroupLayout jPanel11Layout = new javax.swing.GroupLayout(jPanel11);
|
||||
jPanel11.setLayout(jPanel11Layout);
|
||||
jPanel11Layout.setHorizontalGroup(
|
||||
jPanel11Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
|
||||
.addGroup(jPanel11Layout.createSequentialGroup()
|
||||
.addContainerGap(242, Short.MAX_VALUE)
|
||||
.addContainerGap(294, Short.MAX_VALUE)
|
||||
.addGroup(jPanel11Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
|
||||
.addComponent(jLabel22)
|
||||
.addComponent(jLabel8)
|
||||
.addComponent(jLabel4)
|
||||
.addComponent(jLabel1))
|
||||
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
|
||||
.addGroup(jPanel11Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
|
||||
.addComponent(spinnerPasses, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
|
||||
.addGroup(javax.swing.GroupLayout.Alignment.TRAILING, jPanel11Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
|
||||
.addComponent(checkZigzag)
|
||||
.addComponent(spinnerLatency, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)))
|
||||
.addContainerGap(268, Short.MAX_VALUE))
|
||||
.addComponent(checkCompression)
|
||||
.addComponent(checkZigzag)
|
||||
.addComponent(spinnerLatency, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
|
||||
.addComponent(spinnerPasses, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))
|
||||
.addContainerGap(319, Short.MAX_VALUE))
|
||||
);
|
||||
|
||||
jPanel11Layout.linkSize(javax.swing.SwingConstants.HORIZONTAL, new java.awt.Component[] {spinnerLatency, spinnerPasses});
|
||||
|
||||
jPanel11Layout.linkSize(javax.swing.SwingConstants.HORIZONTAL, new java.awt.Component[] {jLabel1, jLabel4, jLabel8});
|
||||
jPanel11Layout.linkSize(javax.swing.SwingConstants.HORIZONTAL, new java.awt.Component[] {jLabel1, jLabel22, jLabel4, jLabel8});
|
||||
|
||||
jPanel11Layout.setVerticalGroup(
|
||||
jPanel11Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
|
||||
.addGroup(jPanel11Layout.createSequentialGroup()
|
||||
.addGap(20, 20, 20)
|
||||
.addGroup(jPanel11Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE)
|
||||
.addComponent(checkCompression)
|
||||
.addComponent(jLabel22))
|
||||
.addGap(18, 18, 18)
|
||||
.addGroup(jPanel11Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE)
|
||||
.addComponent(checkZigzag)
|
||||
.addComponent(jLabel8))
|
||||
@@ -1060,7 +1057,7 @@ public class SIStem extends PanelProcessor {
|
||||
.addGroup(jPanel11Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE)
|
||||
.addComponent(jLabel1)
|
||||
.addComponent(spinnerPasses, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))
|
||||
.addContainerGap(77, Short.MAX_VALUE))
|
||||
.addContainerGap(62, Short.MAX_VALUE))
|
||||
);
|
||||
|
||||
jTabbedPane1.addTab("Scan", jPanel11);
|
||||
@@ -1290,37 +1287,27 @@ public class SIStem extends PanelProcessor {
|
||||
.addContainerGap()
|
||||
.addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
|
||||
.addGroup(layout.createSequentialGroup()
|
||||
.addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
|
||||
.addGroup(layout.createSequentialGroup()
|
||||
.addComponent(buttonScienta)
|
||||
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
|
||||
.addComponent(jLabel2)
|
||||
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
|
||||
.addComponent(textFileId, javax.swing.GroupLayout.PREFERRED_SIZE, 67, javax.swing.GroupLayout.PREFERRED_SIZE)
|
||||
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
|
||||
.addComponent(buttonResetId))
|
||||
.addGroup(javax.swing.GroupLayout.Alignment.TRAILING, layout.createSequentialGroup()
|
||||
.addGap(0, 0, Short.MAX_VALUE)
|
||||
.addComponent(buttonStart)
|
||||
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED)
|
||||
.addComponent(buttonAbort)
|
||||
.addGap(0, 0, Short.MAX_VALUE)))
|
||||
.addContainerGap())
|
||||
.addComponent(buttonScienta)
|
||||
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
|
||||
.addComponent(buttonStart)
|
||||
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED)
|
||||
.addComponent(buttonAbort))
|
||||
.addGroup(layout.createSequentialGroup()
|
||||
.addComponent(jLabel3)
|
||||
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
|
||||
.addComponent(textFile)
|
||||
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
|
||||
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED)
|
||||
.addComponent(buttonOpen)
|
||||
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
|
||||
.addComponent(buttonSave)
|
||||
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
|
||||
.addComponent(buttonAddToQueue)
|
||||
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
|
||||
.addComponent(buttonClear))))
|
||||
.addComponent(buttonClear)))
|
||||
.addContainerGap())
|
||||
);
|
||||
|
||||
layout.linkSize(javax.swing.SwingConstants.HORIZONTAL, new java.awt.Component[] {buttonAbort, buttonAddToQueue, buttonResetId, buttonStart});
|
||||
layout.linkSize(javax.swing.SwingConstants.HORIZONTAL, new java.awt.Component[] {buttonAbort, buttonAddToQueue, buttonStart});
|
||||
|
||||
layout.linkSize(javax.swing.SwingConstants.HORIZONTAL, new java.awt.Component[] {buttonClear, buttonOpen, buttonSave});
|
||||
|
||||
@@ -1340,11 +1327,6 @@ public class SIStem extends PanelProcessor {
|
||||
.addGap(18, 18, 18)
|
||||
.addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE)
|
||||
.addComponent(buttonScienta)
|
||||
.addComponent(buttonResetId)
|
||||
.addComponent(jLabel2)
|
||||
.addComponent(textFileId, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))
|
||||
.addGap(18, 18, 18)
|
||||
.addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE)
|
||||
.addComponent(buttonStart)
|
||||
.addComponent(buttonAbort))
|
||||
.addContainerGap())
|
||||
@@ -1359,15 +1341,6 @@ public class SIStem extends PanelProcessor {
|
||||
}
|
||||
}//GEN-LAST:event_buttonScientaActionPerformed
|
||||
|
||||
private void buttonResetIdActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_buttonResetIdActionPerformed
|
||||
try {
|
||||
this.getContext().setFileSequentialNumber(0);
|
||||
updateControls();
|
||||
} catch (Exception ex) {
|
||||
showException(ex);
|
||||
}
|
||||
}//GEN-LAST:event_buttonResetIdActionPerformed
|
||||
|
||||
private void buttonStartActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_buttonStartActionPerformed
|
||||
try {
|
||||
execute();
|
||||
@@ -1449,10 +1422,10 @@ public class SIStem extends PanelProcessor {
|
||||
private javax.swing.JButton buttonAddToQueue;
|
||||
private javax.swing.JButton buttonClear;
|
||||
private javax.swing.JButton buttonOpen;
|
||||
private javax.swing.JButton buttonResetId;
|
||||
private javax.swing.JButton buttonSave;
|
||||
private javax.swing.JButton buttonScienta;
|
||||
private javax.swing.JButton buttonStart;
|
||||
private javax.swing.JCheckBox checkCompression;
|
||||
private javax.swing.JCheckBox checkZigzag;
|
||||
private javax.swing.JComboBox comboAcquisition;
|
||||
private javax.swing.JComboBox comboDetMode;
|
||||
@@ -1470,12 +1443,8 @@ public class SIStem extends PanelProcessor {
|
||||
private javax.swing.JLabel jLabel17;
|
||||
private javax.swing.JLabel jLabel18;
|
||||
private javax.swing.JLabel jLabel19;
|
||||
private javax.swing.JLabel jLabel2;
|
||||
private javax.swing.JLabel jLabel20;
|
||||
private javax.swing.JLabel jLabel21;
|
||||
private javax.swing.JLabel jLabel22;
|
||||
private javax.swing.JLabel jLabel23;
|
||||
private javax.swing.JLabel jLabel24;
|
||||
private javax.swing.JLabel jLabel25;
|
||||
private javax.swing.JLabel jLabel26;
|
||||
private javax.swing.JLabel jLabel27;
|
||||
@@ -1495,7 +1464,6 @@ public class SIStem extends PanelProcessor {
|
||||
private javax.swing.JPanel jPanel5;
|
||||
private javax.swing.JPanel jPanel6;
|
||||
private javax.swing.JPanel jPanel7;
|
||||
private javax.swing.JPanel jPanel8;
|
||||
private javax.swing.JPanel jPanel9;
|
||||
private javax.swing.JScrollPane jScrollPane1;
|
||||
private javax.swing.JScrollPane jScrollPane2;
|
||||
@@ -1513,24 +1481,19 @@ public class SIStem extends PanelProcessor {
|
||||
private javax.swing.JTextField textCenterEnergy;
|
||||
private javax.swing.JTextField textCenterThetaX;
|
||||
private javax.swing.JTextField textCenterThetaY;
|
||||
private javax.swing.JTextField textCenterThetaY1;
|
||||
private javax.swing.JTextField textChannels;
|
||||
private javax.swing.JTextArea textDiagnostics;
|
||||
private javax.swing.JTextField textFile;
|
||||
private javax.swing.JTextField textFileId;
|
||||
private javax.swing.JTextField textHighEnergy;
|
||||
private javax.swing.JTextField textHighThetaY;
|
||||
private javax.swing.JTextField textHighThetaY1;
|
||||
private javax.swing.JTextField textLowEnergy;
|
||||
private javax.swing.JTextField textLowThetaY;
|
||||
private javax.swing.JTextField textLowThetaY1;
|
||||
private javax.swing.JTextArea textMonitors;
|
||||
private javax.swing.JTextArea textSensors;
|
||||
private javax.swing.JTextField textSlices;
|
||||
private javax.swing.JTextArea textSnapshots;
|
||||
private javax.swing.JTextField textStepEnergy;
|
||||
private javax.swing.JTextField textStepThetaY;
|
||||
private javax.swing.JTextField textStepThetaY1;
|
||||
private javax.swing.JTextField textXChannelMax;
|
||||
private javax.swing.JTextField textXChannelMin;
|
||||
private javax.swing.JTextField textYChannelMax;
|
||||
|
||||
Reference in New Issue
Block a user