Closedown

This commit is contained in:
2019-12-10 09:46:38 +01:00
parent 4e56d41a49
commit c63881a34f
5 changed files with 644 additions and 632 deletions

View File

@@ -1,2 +1,2 @@
#Thu Dec 05 12:46:01 CET 2019
FileSequentialNumber=215
#Tue Dec 10 09:46:27 CET 2019
FileSequentialNumber=218

File diff suppressed because it is too large Load Diff

View File

@@ -9,6 +9,8 @@ import ch.psi.utils.swing.SwingUtils;
import java.awt.Component;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.logging.Level;
import java.util.logging.Logger;
import javax.swing.JCheckBox;
import javax.swing.SpinnerNumberModel;
@@ -565,7 +567,11 @@ public class HoloScan extends Panel {
}//GEN-LAST:event_buttonStartActionPerformed
private void buttonAbortActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_buttonAbortActionPerformed
abort();
try {
abort();
} catch (InterruptedException ex) {
SwingUtils.showException(this, ex);
}
}//GEN-LAST:event_buttonAbortActionPerformed
private void radioStepSizeActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_radioStepSizeActionPerformed

View File

@@ -77,7 +77,7 @@
</Group>
<Group type="102" alignment="0" attributes="0">
<Component id="jLabel3" min="-2" max="-2" attributes="0"/>
<EmptySpace pref="85" max="32767" attributes="0"/>
<EmptySpace pref="92" max="32767" attributes="0"/>
<Component id="spinnerLatency" linkSize="4" min="-2" max="-2" attributes="0"/>
</Group>
<Group type="102" attributes="0">
@@ -509,7 +509,7 @@
<EmptySpace max="-2" attributes="0"/>
<Group type="103" groupAlignment="0" attributes="0">
<Component id="buttonStart" max="32767" attributes="0"/>
<Component id="buttonAbort" pref="203" max="32767" attributes="0"/>
<Component id="buttonAbort" pref="244" max="32767" attributes="0"/>
</Group>
<EmptySpace max="-2" attributes="0"/>
</Group>

View File

@@ -10,6 +10,8 @@ import ch.psi.utils.swing.SwingUtils;
import java.awt.Component;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.logging.Level;
import java.util.logging.Logger;
import javax.swing.JCheckBox;
import javax.swing.SpinnerNumberModel;
@@ -534,7 +536,11 @@ public class ManipulatorScan extends Panel {
}//GEN-LAST:event_buttonStartActionPerformed
private void buttonAbortActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_buttonAbortActionPerformed
abort();
try {
abort();
} catch (InterruptedException ex) {
SwingUtils.showException(this, ex);
}
}//GEN-LAST:event_buttonAbortActionPerformed
private void radioStepSizeActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_radioStepSizeActionPerformed