diff --git a/plugins/WireScan.form b/plugins/WireScan.form
index 929cd8a..684ae3c 100644
--- a/plugins/WireScan.form
+++ b/plugins/WireScan.form
@@ -77,10 +77,8 @@
-
-
@@ -106,6 +104,17 @@
+
+
+
+
+
+
+
+
+
+
+
@@ -181,27 +190,23 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
-
+
+
+
@@ -465,5 +470,13 @@
+
+
+
+
+
+
+
+
diff --git a/plugins/WireScan.java b/plugins/WireScan.java
index 2c73103..58bd56f 100644
--- a/plugins/WireScan.java
+++ b/plugins/WireScan.java
@@ -5,6 +5,7 @@
import ch.psi.pshell.device.Device;
import ch.psi.pshell.device.DeviceAdapter;
import ch.psi.pshell.epics.ChannelDouble;
+import ch.psi.pshell.epics.ChannelInteger;
import ch.psi.pshell.epics.Epics;
import ch.psi.pshell.plot.LinePlotSeries;
import ch.psi.pshell.plot.Plot;
@@ -91,7 +92,13 @@ public class WireScan extends Panel {
if (App.hasArgument("ws")){
comboWireScanner.setSelectedItem(App.getArgumentValue("ws"));
}
- comboWireScannerActionPerformed(null);
+ comboWireScannerActionPerformed(null);
+
+ Device dev = new ChannelInteger (null, "SIN-TIMAST-TMA:Evt-15-Freq-I");
+ dev.setMonitored(true);
+ dev.initialize();
+ panelPosition1.setDevice(dev);
+
} catch (Exception ex) {
showException(ex);
}
@@ -100,7 +107,7 @@ public class WireScan extends Panel {
@Override
public void onStart() {
- super.onStart();
+ super.onStart();
}
@Override
@@ -308,6 +315,8 @@ public class WireScan extends Panel {
spinnerStartY = new javax.swing.JSpinner();
labelEndY = new javax.swing.JLabel();
spinnerEndY = new javax.swing.JSpinner();
+ jLabel15 = new javax.swing.JLabel();
+ panelPosition1 = new ch.psi.pshell.swing.DeviceValuePanel();
comboWireScanner.addActionListener(new java.awt.event.ActionListener() {
public void actionPerformed(java.awt.event.ActionEvent evt) {
@@ -440,6 +449,9 @@ public class WireScan extends Panel {
spinnerEndY.setModel(new javax.swing.SpinnerNumberModel(1000.0d, -10000.0d, 10000.0d, 1.0d));
+ jLabel15.setHorizontalAlignment(javax.swing.SwingConstants.TRAILING);
+ jLabel15.setText("Trigger(Hz):");
+
javax.swing.GroupLayout layout = new javax.swing.GroupLayout(this);
this.setLayout(layout);
layout.setHorizontalGroup(
@@ -495,10 +507,8 @@ public class WireScan extends Panel {
.addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
.addComponent(comboScanType, 0, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
.addComponent(comboBpm3, 0, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
- .addComponent(panelStatus, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
.addComponent(comboBpm1, 0, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
.addComponent(comboBpm2, 0, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
- .addComponent(spinnerStartY)
.addGroup(layout.createSequentialGroup()
.addComponent(spinnerVel, javax.swing.GroupLayout.PREFERRED_SIZE, 104, javax.swing.GroupLayout.PREFERRED_SIZE)
.addGap(18, 18, Short.MAX_VALUE)
@@ -517,7 +527,16 @@ public class WireScan extends Panel {
.addGap(8, 8, 8)
.addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
.addComponent(spinnerEndX, javax.swing.GroupLayout.Alignment.TRAILING)
- .addComponent(spinnerEndY, javax.swing.GroupLayout.Alignment.TRAILING))))))
+ .addComponent(spinnerEndY, javax.swing.GroupLayout.Alignment.TRAILING)))
+ .addGroup(layout.createSequentialGroup()
+ .addComponent(spinnerStartY)
+ .addGap(0, 0, Short.MAX_VALUE))
+ .addGroup(javax.swing.GroupLayout.Alignment.TRAILING, layout.createSequentialGroup()
+ .addComponent(panelStatus, javax.swing.GroupLayout.PREFERRED_SIZE, 0, Short.MAX_VALUE)
+ .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED)
+ .addComponent(jLabel15)
+ .addGap(4, 4, 4)
+ .addComponent(panelPosition1, javax.swing.GroupLayout.PREFERRED_SIZE, 72, javax.swing.GroupLayout.PREFERRED_SIZE)))))
.addComponent(jLabel8))
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED)
.addComponent(plot, javax.swing.GroupLayout.DEFAULT_SIZE, 418, Short.MAX_VALUE)
@@ -589,22 +608,21 @@ public class WireScan extends Panel {
.addComponent(jLabel12)
.addComponent(ledHomed, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
- .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING, false)
- .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE)
- .addComponent(buttonMotorPanel)
- .addComponent(buttonHoming))
- .addGroup(layout.createSequentialGroup()
- .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.CENTER)
- .addComponent(jLabel13)
- .addComponent(labelPosX))
- .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
- .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.CENTER)
- .addComponent(jLabel14)
- .addComponent(labelPosY))))
+ .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.CENTER)
+ .addComponent(jLabel13)
+ .addComponent(labelPosX)
+ .addComponent(buttonHoming)
+ .addComponent(buttonMotorPanel))
+ .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
+ .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.CENTER)
+ .addComponent(jLabel14)
+ .addComponent(labelPosY))
.addGap(18, 18, Short.MAX_VALUE)
.addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.CENTER)
.addComponent(jLabel10)
- .addComponent(panelStatus, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))
+ .addComponent(panelStatus, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
+ .addComponent(panelPosition1, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
+ .addComponent(jLabel15))
.addGap(18, 18, Short.MAX_VALUE)
.addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE)
.addComponent(buttonAbort)
@@ -621,6 +639,8 @@ public class WireScan extends Panel {
layout.linkSize(javax.swing.SwingConstants.VERTICAL, new java.awt.Component[] {spinnerCycles, spinnerEndX, spinnerEndY});
+ layout.linkSize(javax.swing.SwingConstants.VERTICAL, new java.awt.Component[] {panelPosition1, panelStatus});
+
}// //GEN-END:initComponents
private void comboWireScannerActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_comboWireScannerActionPerformed
@@ -818,6 +838,7 @@ public class WireScan extends Panel {
private javax.swing.JLabel jLabel12;
private javax.swing.JLabel jLabel13;
private javax.swing.JLabel jLabel14;
+ private javax.swing.JLabel jLabel15;
private javax.swing.JLabel jLabel2;
private javax.swing.JLabel jLabel3;
private javax.swing.JLabel jLabel4;
@@ -832,6 +853,7 @@ public class WireScan extends Panel {
private javax.swing.JLabel labelStartY;
private ch.psi.pshell.swing.Led ledHomed;
private ch.psi.pshell.swing.DeviceValuePanel panelPosition;
+ private ch.psi.pshell.swing.DeviceValuePanel panelPosition1;
private ch.psi.pshell.swing.DeviceValuePanel panelStatus;
private ch.psi.pshell.plot.LinePlotJFree plot;
private javax.swing.JSpinner spinnerCycles;