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

Startup

Browse Source
This commit is contained in:
x03daop
2015-11-03 11:22:19 +01:00
parent b960ca60e0
commit d7689139ff
4 changed files with 26 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
config/tasks.properties
+1 -1
View File
@@ -1 +1 @@
scan_guard=3
#scan_guard=3
plugins/ManipulatorScan.form
+12
View File
@@ -360,6 +360,7 @@
<Component id="checkCur1" alignment="0" min="-2" max="-2" attributes="0"/>
<Component id="checkCur2" alignment="0" min="-2" max="-2" attributes="0"/>
<Component id="checkCur3" alignment="0" min="-2" max="-2" attributes="0"/>
<Component id="checkImageIntegration1" alignment="0" min="-2" max="-2" attributes="0"/>
</Group>
<EmptySpace min="0" pref="0" max="32767" attributes="0"/>
</Group>
@@ -376,6 +377,8 @@
<EmptySpace max="-2" attributes="0"/>
<Component id="checkImageIntegration" min="-2" max="-2" attributes="0"/>
<EmptySpace max="-2" attributes="0"/>
<Component id="checkImageIntegration1" min="-2" max="-2" attributes="0"/>
<EmptySpace max="-2" attributes="0"/>
<Component id="checkSpectrum" min="-2" max="-2" attributes="0"/>
<EmptySpace max="-2" attributes="0"/>
<Component id="checkTotalCount" min="-2" max="-2" attributes="0"/>
@@ -491,6 +494,15 @@
<Property name="name" type="java.lang.String" value="MachineCurrent" noResource="true"/>
</Properties>
</Component>
<Component class="javax.swing.JCheckBox" name="checkImageIntegration1">
<Properties>
<Property name="selected" type="boolean" value="true"/>
<Property name="text" type="java.lang.String" value="Scienta Angle Distribution"/>
<Property name="toolTipText" type="java.lang.String" value=""/>
<Property name="contentAreaFilled" type="boolean" value="false"/>
<Property name="name" type="java.lang.String" value="AngleDistribution" noResource="true"/>
</Properties>
</Component>
</SubComponents>
</Container>
<Container class="javax.swing.JPanel" name="jPanel3">
plugins/ManipulatorScan.java
+12 -1
View File
@@ -164,6 +164,7 @@ public class ManipulatorScan extends Panel {
checkCounts3 = new javax.swing.JCheckBox();
checkCounts4 = new javax.swing.JCheckBox();
checkCurrent = new javax.swing.JCheckBox();
checkImageIntegration1 = new javax.swing.JCheckBox();
jPanel3 = new javax.swing.JPanel();
buttonStart = new javax.swing.JButton();
buttonAbort = new javax.swing.JButton();
@@ -392,6 +393,12 @@ public class ManipulatorScan extends Panel {
checkCurrent.setText("Machine Current");
checkCurrent.setName("MachineCurrent"); // NOI18N
checkImageIntegration1.setSelected(true);
checkImageIntegration1.setText("Scienta Angle Distribution");
checkImageIntegration1.setToolTipText("");
checkImageIntegration1.setContentAreaFilled(false);
checkImageIntegration1.setName("AngleDistribution"); // NOI18N
javax.swing.GroupLayout panelSensorsLayout = new javax.swing.GroupLayout(panelSensors);
panelSensors.setLayout(panelSensorsLayout);
panelSensorsLayout.setHorizontalGroup(
@@ -413,7 +420,8 @@ public class ManipulatorScan extends Panel {
.addComponent(checkCurrent)
.addComponent(checkCur1)
.addComponent(checkCur2)
.addComponent(checkCur3))
.addComponent(checkCur3)
.addComponent(checkImageIntegration1))
.addGap(0, 0, Short.MAX_VALUE)))
.addContainerGap())
);
@@ -425,6 +433,8 @@ public class ManipulatorScan extends Panel {
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
.addComponent(checkImageIntegration)
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
.addComponent(checkImageIntegration1)
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
.addComponent(checkSpectrum)
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
.addComponent(checkTotalCount)
@@ -577,6 +587,7 @@ public class ManipulatorScan extends Panel {
private javax.swing.JCheckBox checkCurrent;
private javax.swing.JCheckBox checkImage;
private javax.swing.JCheckBox checkImageIntegration;
private javax.swing.JCheckBox checkImageIntegration1;
private javax.swing.JCheckBox checkSpectrum;
private javax.swing.JCheckBox checkTotalCount;
private javax.swing.JComboBox comboMotor;
script/ManipulatorScan.py
+1 -1
View File
@@ -9,5 +9,5 @@ LATENCY (double)
RELATIVE (BOOLEAN)
"""
set_preference(Preference.PLOT_TYPES,{'ImageIntegrator':1})
#set_preference(Preference.PLOT_TYPES,{'ImageIntegrator':1})
lscan(MOTOR, SENSORS, RANGE[0], RANGE[1], STEPS, LATENCY, RELATIVE, before_read=trig_scienta, after_read = AfterReadout)