Closedown
This commit is contained in:
@@ -6,6 +6,7 @@ import ch.psi.pshell.scan.Scan;
|
||||
import ch.psi.pshell.scan.ScanListener;
|
||||
import ch.psi.pshell.scan.ScanRecord;
|
||||
import ch.psi.pshell.ui.Panel;
|
||||
import ch.psi.utils.Convert;
|
||||
import ch.psi.utils.State;
|
||||
import ch.psi.utils.swing.SwingUtils;
|
||||
import java.awt.Component;
|
||||
@@ -137,6 +138,7 @@ public class PhotonEnergy extends Panel {
|
||||
|
||||
step++;
|
||||
energy += stepSize;
|
||||
energy = Convert.roundDouble(energy, 3);
|
||||
} while (energy <= end);
|
||||
}
|
||||
return ret.toArray(new Double[0][0]);
|
||||
@@ -621,7 +623,11 @@ public class PhotonEnergy extends Panel {
|
||||
}//GEN-LAST:event_buttonStartActionPerformed
|
||||
|
||||
private void buttonAbortActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_buttonAbortActionPerformed
|
||||
abort();
|
||||
try {
|
||||
abort();
|
||||
} catch (Exception ex) {
|
||||
SwingUtils.showException(this, ex);
|
||||
}
|
||||
}//GEN-LAST:event_buttonAbortActionPerformed
|
||||
|
||||
private void radioCisActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_radioCisActionPerformed
|
||||
|
||||
@@ -340,6 +340,11 @@
|
||||
</Events>
|
||||
</Component>
|
||||
<Component class="ch.psi.pshell.swing.RangeSelectionPanel" name="rangeSelectionPanel">
|
||||
<Properties>
|
||||
<Property name="tablePosition" type="ch.psi.pshell.swing.RangeSelectionPanel$TablePosition" editor="org.netbeans.modules.form.editors.EnumEditor">
|
||||
<Value id="bottom"/>
|
||||
</Property>
|
||||
</Properties>
|
||||
<AuxValues>
|
||||
<AuxValue name="JavaCodeGenerator_CreateCodeCustom" type="java.lang.String" value="new ch.psi.pshell.swing.RangeSelectionPanel() {
 protected void onSeriesChanged() {
 updateButtons();
 }
 protected void onSelectionChanged() {
 updateButtons();
 }
}
"/>
|
||||
</AuxValues>
|
||||
|
||||
@@ -404,6 +404,8 @@ public class XPSSpectrum extends Panel {
|
||||
}
|
||||
});
|
||||
|
||||
rangeSelectionPanel.setTablePosition(ch.psi.pshell.swing.RangeSelectionPanel.TablePosition.bottom);
|
||||
|
||||
buttonAbort.setText("Abort");
|
||||
buttonAbort.addActionListener(new java.awt.event.ActionListener() {
|
||||
public void actionPerformed(java.awt.event.ActionEvent evt) {
|
||||
|
||||
Reference in New Issue
Block a user