Sprint Dez/2020
This commit is contained in:
gac-x11ma
@@ -431,9 +431,6 @@ public class DataAcquisition extends Panel {
|
||||
jLabel31 = new javax.swing.JLabel();
|
||||
textClearOutliersMask = new javax.swing.JButton();
|
||||
spinnerOutliersThreshold = new javax.swing.JSpinner();
|
||||
buttonTriggerDetector = new javax.swing.JButton();
|
||||
buttonShowDetectorPanel = new javax.swing.JButton();
|
||||
buttonMeasurements = new javax.swing.JToggleButton();
|
||||
panelNorm2 = new javax.swing.JPanel();
|
||||
radioAvDetector = new javax.swing.JRadioButton();
|
||||
radioAvPshell = new javax.swing.JRadioButton();
|
||||
@@ -641,7 +638,7 @@ public class DataAcquisition extends Panel {
|
||||
.addComponent(jLabel31)
|
||||
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
|
||||
.addComponent(spinnerOutliersThreshold, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
|
||||
.addGap(0, 0, Short.MAX_VALUE)))
|
||||
.addGap(0, 330, Short.MAX_VALUE)))
|
||||
.addContainerGap())
|
||||
);
|
||||
|
||||
@@ -663,27 +660,6 @@ public class DataAcquisition extends Panel {
|
||||
.addContainerGap())
|
||||
);
|
||||
|
||||
buttonTriggerDetector.setText("Trigger Detector");
|
||||
buttonTriggerDetector.addActionListener(new java.awt.event.ActionListener() {
|
||||
public void actionPerformed(java.awt.event.ActionEvent evt) {
|
||||
buttonTriggerDetectorActionPerformed(evt);
|
||||
}
|
||||
});
|
||||
|
||||
buttonShowDetectorPanel.setText("Show Detector Panel");
|
||||
buttonShowDetectorPanel.addActionListener(new java.awt.event.ActionListener() {
|
||||
public void actionPerformed(java.awt.event.ActionEvent evt) {
|
||||
buttonShowDetectorPanelActionPerformed(evt);
|
||||
}
|
||||
});
|
||||
|
||||
buttonMeasurements.setText("Image Measurements");
|
||||
buttonMeasurements.addActionListener(new java.awt.event.ActionListener() {
|
||||
public void actionPerformed(java.awt.event.ActionEvent evt) {
|
||||
buttonMeasurementsActionPerformed(evt);
|
||||
}
|
||||
});
|
||||
|
||||
panelNorm2.setBorder(javax.swing.BorderFactory.createTitledBorder("Averaging"));
|
||||
|
||||
buttonGroup1.add(radioAvDetector);
|
||||
@@ -733,19 +709,9 @@ public class DataAcquisition extends Panel {
|
||||
.addGroup(jPanel1Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
|
||||
.addComponent(panelNorm, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
|
||||
.addComponent(panelNorm1, javax.swing.GroupLayout.Alignment.TRAILING, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
|
||||
.addGroup(javax.swing.GroupLayout.Alignment.TRAILING, jPanel1Layout.createSequentialGroup()
|
||||
.addGap(0, 0, Short.MAX_VALUE)
|
||||
.addGroup(jPanel1Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
|
||||
.addComponent(buttonTriggerDetector, javax.swing.GroupLayout.Alignment.TRAILING, javax.swing.GroupLayout.PREFERRED_SIZE, 200, javax.swing.GroupLayout.PREFERRED_SIZE)
|
||||
.addComponent(buttonShowDetectorPanel, javax.swing.GroupLayout.Alignment.TRAILING, javax.swing.GroupLayout.DEFAULT_SIZE, 201, Short.MAX_VALUE)
|
||||
.addComponent(buttonMeasurements, javax.swing.GroupLayout.Alignment.TRAILING, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE))
|
||||
.addGap(0, 0, Short.MAX_VALUE))
|
||||
.addComponent(panelNorm2, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE))
|
||||
.addContainerGap())
|
||||
);
|
||||
|
||||
jPanel1Layout.linkSize(javax.swing.SwingConstants.HORIZONTAL, new java.awt.Component[] {buttonMeasurements, buttonShowDetectorPanel, buttonTriggerDetector});
|
||||
|
||||
jPanel1Layout.setVerticalGroup(
|
||||
jPanel1Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
|
||||
.addGroup(jPanel1Layout.createSequentialGroup()
|
||||
@@ -755,13 +721,7 @@ public class DataAcquisition extends Panel {
|
||||
.addComponent(panelNorm2, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
|
||||
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
|
||||
.addComponent(panelNorm1, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
|
||||
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
|
||||
.addComponent(buttonMeasurements)
|
||||
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED)
|
||||
.addComponent(buttonShowDetectorPanel, javax.swing.GroupLayout.PREFERRED_SIZE, 25, javax.swing.GroupLayout.PREFERRED_SIZE)
|
||||
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED)
|
||||
.addComponent(buttonTriggerDetector)
|
||||
.addContainerGap(javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE))
|
||||
.addContainerGap(123, Short.MAX_VALUE))
|
||||
);
|
||||
|
||||
jTabbedPane1.addTab("Detector", jPanel1);
|
||||
@@ -1583,14 +1543,6 @@ public class DataAcquisition extends Panel {
|
||||
}
|
||||
}//GEN-LAST:event_buttonSpecAbortActionPerformed
|
||||
|
||||
private void buttonTriggerDetectorActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_buttonTriggerDetectorActionPerformed
|
||||
try {
|
||||
this.evalAsync("trigger_eiger()");
|
||||
} catch (Exception ex) {
|
||||
showException(ex);
|
||||
}
|
||||
}//GEN-LAST:event_buttonTriggerDetectorActionPerformed
|
||||
|
||||
private void buttonAddActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_buttonAddActionPerformed
|
||||
try {
|
||||
modelRegions.addRow(new Object[]{Double.NaN, Double.NaN, Double.NaN});
|
||||
@@ -1635,14 +1587,6 @@ public class DataAcquisition extends Panel {
|
||||
// TODO add your handling code here:
|
||||
}//GEN-LAST:event_textNormKeyTyped
|
||||
|
||||
private void buttonShowDetectorPanelActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_buttonShowDetectorPanelActionPerformed
|
||||
try {
|
||||
this.showDevicePanel("eiger");
|
||||
} catch (Exception ex) {
|
||||
showException(ex);
|
||||
}
|
||||
}//GEN-LAST:event_buttonShowDetectorPanelActionPerformed
|
||||
|
||||
private void buttonShowNormActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_buttonShowNormActionPerformed
|
||||
try {
|
||||
this.enableNorm(buttonShowNorm.isSelected());
|
||||
@@ -1694,14 +1638,6 @@ public class DataAcquisition extends Panel {
|
||||
}
|
||||
}//GEN-LAST:event_spinnerOutliersThresholdStateChanged
|
||||
|
||||
private void buttonMeasurementsActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_buttonMeasurementsActionPerformed
|
||||
try {
|
||||
evalAsync(buttonMeasurements.isSelected() ? "start_measurements()" : "stop_measurements()");
|
||||
} catch (Exception ex) {
|
||||
showException(ex);
|
||||
}
|
||||
}//GEN-LAST:event_buttonMeasurementsActionPerformed
|
||||
|
||||
private void buttonOpenActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_buttonOpenActionPerformed
|
||||
try {
|
||||
JFileChooser chooser = new JFileChooser(ABSORTION_SPECTRUM_PATH);
|
||||
@@ -1817,7 +1753,6 @@ public class DataAcquisition extends Panel {
|
||||
private javax.swing.ButtonGroup buttonGroup1;
|
||||
private javax.swing.JButton buttonImgAbort;
|
||||
private javax.swing.JButton buttonImgStart;
|
||||
private javax.swing.JToggleButton buttonMeasurements;
|
||||
private javax.swing.JButton buttonOpen;
|
||||
private javax.swing.JButton buttonRemove;
|
||||
private javax.swing.JButton buttonRoiAdd;
|
||||
@@ -1827,11 +1762,9 @@ public class DataAcquisition extends Panel {
|
||||
private javax.swing.JButton buttonRoiSave;
|
||||
private javax.swing.JButton buttonSave;
|
||||
private javax.swing.JButton buttonSetNorm;
|
||||
private javax.swing.JButton buttonShowDetectorPanel;
|
||||
private javax.swing.JToggleButton buttonShowNorm;
|
||||
private javax.swing.JButton buttonSpecAbort;
|
||||
private javax.swing.JButton buttonSpecStart;
|
||||
private javax.swing.JButton buttonTriggerDetector;
|
||||
private javax.swing.JCheckBox checkImgAutosave;
|
||||
private javax.swing.JCheckBox checkSpecSaveImages;
|
||||
private javax.swing.JCheckBox checkSpecSaveSpectrum;
|
||||
|
||||
Reference in New Issue
Block a user