pshell_config/x03da
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Closedown

Browse Source
This commit is contained in:
x03daop
2015-07-16 14:26:34 +02:00
parent e4a0a8a6ab
commit 5949983dbb
5 changed files with 27 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/HoloScan.java
+7 -1
View File
@@ -3,6 +3,7 @@
*/
import ch.psi.pshell.dev.Motor;
import ch.psi.pshell.epics.Scienta;
import ch.psi.pshell.ui.Panel;
import ch.psi.utils.State;
import ch.psi.utils.swing.SwingUtils;
@@ -565,7 +566,12 @@ public class HoloScan extends Panel {
}//GEN-LAST:event_buttonStartActionPerformed
private void buttonAbortActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_buttonAbortActionPerformed
abort();
try {
abort();
((Scienta) getDevice("scienta")).stop();
} catch (Exception ex) {
showException(ex);
}
}//GEN-LAST:event_buttonAbortActionPerformed
private void radioStepSizeActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_radioStepSizeActionPerformed
plugins/ManipulatorScan.form
+4 -11
View File
@@ -93,18 +93,11 @@
<Group type="103" groupAlignment="0" attributes="0">
<Group type="102" alignment="1" attributes="0">
<Group type="103" groupAlignment="1" attributes="0">
<Group type="102" attributes="0">
<Group type="103" groupAlignment="0" attributes="0">
<Component id="jLabel4" alignment="1" min="-2" max="-2" attributes="0"/>
<Component id="jLabel5" alignment="1" min="-2" max="-2" attributes="0"/>
</Group>
<EmptySpace max="-2" attributes="0"/>
</Group>
<Group type="102" alignment="1" attributes="0">
<Component id="jLabel7" min="-2" max="-2" attributes="0"/>
<EmptySpace max="-2" attributes="0"/>
</Group>
<Component id="jLabel4" alignment="1" min="-2" max="-2" attributes="0"/>
<Component id="jLabel5" alignment="1" min="-2" max="-2" attributes="0"/>
<Component id="jLabel7" alignment="1" min="-2" max="-2" attributes="0"/>
</Group>
<EmptySpace max="-2" attributes="0"/>
<Group type="103" groupAlignment="0" max="-2" attributes="0">
<Component id="spinnerFrom" alignment="1" max="32767" attributes="0"/>
<Component id="spinnerRange" linkSize="4" alignment="1" max="32767" attributes="0"/>
plugins/ManipulatorScan.java
+7 -1
View File
@@ -3,6 +3,7 @@
*/
import ch.psi.pshell.dev.Motor;
import ch.psi.pshell.epics.Scienta;
import ch.psi.pshell.ui.Panel;
import ch.psi.utils.State;
import ch.psi.utils.swing.SwingUtils;
@@ -533,7 +534,12 @@ public class ManipulatorScan extends Panel {
}//GEN-LAST:event_buttonStartActionPerformed
private void buttonAbortActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_buttonAbortActionPerformed
abort();
try {
abort();
((Scienta) getDevice("scienta")).stop();
} catch (Exception ex) {
showException(ex);
}
}//GEN-LAST:event_buttonAbortActionPerformed
private void radioStepSizeActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_radioStepSizeActionPerformed
plugins/XPSSpectrum.java
+6 -1
View File
@@ -458,7 +458,12 @@ public class XPSSpectrum extends Panel {
}// </editor-fold>//GEN-END:initComponents
private void buttonAbortActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_buttonAbortActionPerformed
abort();
try {
abort();
scienta.stop();
} catch (Exception ex) {
showException(ex);
}
}//GEN-LAST:event_buttonAbortActionPerformed
private void buttonInitialScanActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_buttonInitialScanActionPerformed
script/XPSSpectrum.py
+3 -1
View File
@@ -33,7 +33,7 @@ try:
scienta.setIterations(1)
#iterations done in script
xdata = scienta.spectrumX
xdata = None
ydata = None
for j in range(vars[2]):
trig_scienta()
@@ -43,6 +43,8 @@ try:
else:
for k in range (len(spectrum_array)):
ydata[k] = ydata[k] + spectrum_array[k]
if xdata is None:
xdata = scienta.spectrumX
plots[i].getSeries(0).setData(xdata, ydata)
if skip_iteration:
break