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
2016-07-26 17:06:06 +02:00
parent f2ef2e7cbb
commit 9e7746bc4f
2 changed files with 23 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
plugins/HoloScan.form
View File

@@ -533,20 +533,20 @@
<Component id="buttonAbort" max="32767" attributes="0"/>
<Group type="102" attributes="0">
<Group type="103" groupAlignment="0" attributes="0">
<Component id="checkEndScan" min="-2" max="-2" attributes="0"/>
<Group type="102" alignment="0" attributes="0">
<Component id="jLabel1" linkSize="9" min="-2" max="-2" attributes="0"/>
<EmptySpace max="-2" attributes="0"/>
<Component id="dvpAcqTime" linkSize="12" min="-2" pref="76" max="-2" attributes="0"/>
</Group>
<Group type="102" alignment="0" attributes="0">
<Component id="jLabel2" linkSize="9" min="-2" max="-2" attributes="0"/>
<EmptySpace type="unrelated" max="-2" attributes="0"/>
<Component id="textTotalTime" linkSize="12" min="-2" max="-2" attributes="0"/>
</Group>
<Component id="jLabel1" linkSize="9" alignment="0" min="-2" max="-2" attributes="0"/>
<Component id="jLabel2" linkSize="9" alignment="0" min="-2" max="-2" attributes="0"/>
</Group>
<EmptySpace max="-2" attributes="0"/>
<Group type="103" groupAlignment="0" attributes="0">
<Component id="textTotalTime" linkSize="12" alignment="1" min="-2" max="-2" attributes="0"/>
<Component id="dvpAcqTime" linkSize="12" alignment="1" min="-2" pref="76" max="-2" attributes="0"/>
</Group>
<EmptySpace min="0" pref="0" max="32767" attributes="0"/>
</Group>
<Group type="102" attributes="0">
<Component id="checkEndScan" min="-2" max="-2" attributes="0"/>
<EmptySpace min="53" pref="53" max="-2" attributes="0"/>
</Group>
</Group>
<EmptySpace max="-2" attributes="0"/>
</Group>

24
plugins/HoloScan.java
View File

@@ -39,8 +39,7 @@ public class HoloScan extends Panel {
@Override
public void onInitialize(int runCount) {
Motor phi = (Motor) getDevice("ManipulatorPhi");
Motor theta = (Motor) getDevice("ManipulatorTheta");
Scienta scienta = (Scienta) getDevice("Scienta");
Motor theta = (Motor) getDevice("ManipulatorTheta");
motorPanelPhi.setDevice(phi);
motorPanelTheta.setDevice(theta);
dvpAcqTime.setDevice(scienta.getAcquisitionTime());
@@ -62,6 +61,7 @@ public class HoloScan extends Panel {
protected void onTimer(){
try{
Scienta scienta = (Scienta) getDevice("Scienta");
int steps = (radioSteps.isSelected() ?
(Integer)spinnerStepsPhi.getValue() * (Integer)spinnerStepsTheta.getValue() :
(int)(Math.abs((Double)spinnerToPhi.getValue() - (Double)spinnerFromPhi.getValue()) / (Integer)spinnerStepSizePhi.getValue() + 1) *
@@ -526,16 +526,16 @@ public class HoloScan extends Panel {
.addComponent(buttonAbort, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
.addGroup(jPanel3Layout.createSequentialGroup()
.addGroup(jPanel3Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
.addComponent(checkEndScan)
.addGroup(jPanel3Layout.createSequentialGroup()
.addComponent(jLabel1)
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
.addComponent(dvpAcqTime, javax.swing.GroupLayout.PREFERRED_SIZE, 76, javax.swing.GroupLayout.PREFERRED_SIZE))
.addGroup(jPanel3Layout.createSequentialGroup()
.addComponent(jLabel2)
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED)
.addComponent(textTotalTime)))
.addGap(0, 0, Short.MAX_VALUE)))
.addComponent(jLabel1)
.addComponent(jLabel2))
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
.addGroup(jPanel3Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
.addComponent(textTotalTime, javax.swing.GroupLayout.Alignment.TRAILING)
.addComponent(dvpAcqTime, javax.swing.GroupLayout.Alignment.TRAILING, javax.swing.GroupLayout.PREFERRED_SIZE, 76, javax.swing.GroupLayout.PREFERRED_SIZE))
.addGap(0, 0, Short.MAX_VALUE))
.addGroup(jPanel3Layout.createSequentialGroup()
.addComponent(checkEndScan)
.addGap(53, 53, 53)))
.addContainerGap())
);