diff --git a/plugins/HoloScan.form b/plugins/HoloScan.form
index a7c3988b..bece8a81 100644
--- a/plugins/HoloScan.form
+++ b/plugins/HoloScan.form
@@ -533,20 +533,20 @@
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
diff --git a/plugins/HoloScan.java b/plugins/HoloScan.java
index ee0ea95f..c87344b7 100644
--- a/plugins/HoloScan.java
+++ b/plugins/HoloScan.java
@@ -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())
);