Closedown

This commit is contained in:
x03daop
2016-05-03 09:53:55 +02:00
parent aa7153633e
commit 27db492ef8
3 changed files with 14 additions and 1 deletions
+7 -1
View File
@@ -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
+5
View File
@@ -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() {&#xa; protected void onSeriesChanged() {&#xa; updateButtons();&#xa; }&#xa; protected void onSelectionChanged() {&#xa; updateButtons();&#xa; }&#xa;}&#xa;"/>
</AuxValues>
+2
View File
@@ -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) {