Closedown

This commit is contained in:
x03daop
2015-11-02 12:07:36 +01:00
parent 49dc30ce17
commit cd46b12f17
15 changed files with 488 additions and 322 deletions

View File

@@ -379,45 +379,45 @@ public class HoloScan extends Panel {
checkImage.setText("Scienta Image");
checkImage.setToolTipText("");
checkImage.setContentAreaFilled(false);
checkImage.setName("scienta.dataMatrix"); // NOI18N
checkImage.setName("Scienta.dataMatrix"); // NOI18N
checkImageIntegration.setSelected(true);
checkImageIntegration.setText("Scienta Image Integration");
checkImageIntegration.setToolTipText("");
checkImageIntegration.setContentAreaFilled(false);
checkImageIntegration.setName("integration"); // NOI18N
checkImageIntegration.setName("Integration"); // NOI18N
checkSpectrum.setSelected(true);
checkSpectrum.setText("Scienta Spectrum");
checkSpectrum.setName("scienta.spectrum"); // NOI18N
checkSpectrum.setName("Scienta.spectrum"); // NOI18N
checkCounts1.setText("Counts Region 1");
checkCounts1.setName("countsr1"); // NOI18N
checkCounts1.setName("CountsR1"); // NOI18N
checkTotalCount.setSelected(true);
checkTotalCount.setText("Total Counts");
checkTotalCount.setName("counts"); // NOI18N
checkTotalCount.setName("Counts"); // NOI18N
checkCounts2.setText("Counts Region 2");
checkCounts2.setName("countsr2"); // NOI18N
checkCounts2.setName("CountsR2"); // NOI18N
checkCounts3.setText("Counts Region 3");
checkCounts3.setName("countsr3"); // NOI18N
checkCounts3.setName("CountsR3"); // NOI18N
checkCounts4.setText("Counts Region 4");
checkCounts4.setName("countsr4"); // NOI18N
checkCounts4.setName("CountsR4"); // NOI18N
checkCurrent.setText("Current");
checkCurrent.setName("current"); // NOI18N
checkCurrent.setText("MachineCurrent");
checkCurrent.setName("MachineCurrent"); // NOI18N
checkCur1.setText("Cur 1");
checkCur1.setName("cur1"); // NOI18N
checkCur1.setText("SampleCurrent");
checkCur1.setName("SampleCurrent"); // NOI18N
checkCur2.setText("Cur 2");
checkCur2.setName("cur2"); // NOI18N
checkCur2.setText("RefCurrent");
checkCur2.setName("RefCurrent"); // NOI18N
checkCur3.setText("Cur 3");
checkCur3.setName("cur3"); // NOI18N
checkCur3.setText("AuxCurrent");
checkCur3.setName("AuxCurrent"); // NOI18N
buttonScientaSetup.setText("Scienta Setup");
buttonScientaSetup.addActionListener(new java.awt.event.ActionListener() {
@@ -551,7 +551,7 @@ public class HoloScan extends Panel {
private void buttonScientaSetupActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_buttonScientaSetupActionPerformed
try{
showDevicePanel("scienta");
showDevicePanel("Scienta");
} catch (Exception ex){
SwingUtils.showException(this, ex);
}
@@ -568,7 +568,7 @@ public class HoloScan extends Panel {
private void buttonAbortActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_buttonAbortActionPerformed
try {
abort();
((Scienta) getDevice("scienta")).stop();
((Scienta) getDevice("Scienta")).stop();
} catch (Exception ex) {
showException(ex);
}