pshell_config/sf-op
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Startup

Browse Source
This commit is contained in:
gobbo_a
2016-11-04 13:39:40 +01:00
parent 187a545667
commit eb12378238
6 changed files with 39 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
config/jcae.properties
View File

@@ -1,8 +1,8 @@
#Fri Nov 04 13:07:42 CET 2016
#Fri Nov 04 13:39:35 CET 2016
ch.psi.jcae.ContextFactory.addressList=172.26.0.255 172.26.2.255 172.26.8.255 172.26.16.255 172.26.24.255 172.26.32.255 172.26.40.255 172.26.120.255
ch.psi.jcae.ContextFactory.maxArrayBytes=50000000
ch.psi.jcae.ChannelFactory.retries=1
ch.psi.jcae.ChannelFactory.timeout=500
ch.psi.jcae.ChannelFactory.timeout=1500
ch.psi.jcae.impl.DefaultChannelService.retries=4
ch.psi.jcae.impl.DefaultChannelService.timeout=1000
ch.psi.jcae.ContextFactory.serverPort=

6
devices/CurrentCamera.properties
View File

@@ -1,4 +1,4 @@
#Fri Nov 04 13:10:23 CET 2016
#Fri Nov 04 13:39:14 CET 2016
colormap=Rainbow
colormapAutomatic=true
colormapMax=0.0
@@ -20,7 +20,7 @@ rotationCrop=false
scale=1.0
spatialCalOffsetX=-630.0
spatialCalOffsetY=-612.0
spatialCalScaleX=26.761819803746654
spatialCalScaleY=26.595744680851062
spatialCalScaleX=-26.761819803746654
spatialCalScaleY=-26.595744680851062
spatialCalUnits=mm
transpose=false

18
plugins/GunSolenoidAlignment.form
View File

@@ -21,26 +21,22 @@
<DimensionLayout dim="0">
<Group type="103" groupAlignment="0" attributes="0">
<Group type="102" attributes="0">
<EmptySpace min="-2" max="-2" attributes="0"/>
<Component id="panelParameters" min="-2" max="-2" attributes="0"/>
<EmptySpace min="-2" max="-2" attributes="0"/>
<Group type="103" groupAlignment="0" attributes="0">
<Group type="102" attributes="0">
<EmptySpace max="32767" attributes="0"/>
<Group type="102" alignment="1" attributes="0">
<Component id="buttonRun" min="-2" pref="92" max="-2" attributes="0"/>
<EmptySpace type="separate" max="-2" attributes="0"/>
<Component id="buttonAbort" min="-2" pref="92" max="-2" attributes="0"/>
</Group>
<Group type="102" alignment="0" attributes="0">
<EmptySpace min="-2" pref="12" max="-2" attributes="0"/>
<Group type="103" groupAlignment="0" attributes="0">
<Group type="102" alignment="1" attributes="0">
<EmptySpace min="-2" pref="12" max="-2" attributes="0"/>
<Component id="progressBar" pref="367" max="32767" attributes="0"/>
<EmptySpace type="separate" min="-2" max="-2" attributes="0"/>
<Component id="buttonClear" min="-2" max="-2" attributes="0"/>
</Group>
<Component id="centroidPlot" pref="0" max="32767" attributes="0"/>
</Group>
<Component id="progressBar" max="32767" attributes="0"/>
<EmptySpace type="separate" min="-2" max="-2" attributes="0"/>
<Component id="buttonClear" min="-2" max="-2" attributes="0"/>
</Group>
<Component id="centroidPlot" alignment="0" pref="443" max="32767" attributes="0"/>
</Group>
<EmptySpace min="-2" max="-2" attributes="0"/>
</Group>

18
plugins/GunSolenoidAlignment.java
View File

@@ -65,6 +65,8 @@ public class GunSolenoidAlignment extends Panel {
running = false;
}
progressBar.setIndeterminate(!state.isInitialized());
for (Component c : panelParameters.getComponents()) {
if (!(c instanceof JPanel)){
c.setEnabled(state == State.Ready);
@@ -319,22 +321,20 @@ public class GunSolenoidAlignment extends Panel {
layout.setHorizontalGroup(
layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
.addGroup(layout.createSequentialGroup()
.addContainerGap()
.addComponent(panelParameters, 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)
.addGroup(layout.createSequentialGroup()
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
.addGroup(javax.swing.GroupLayout.Alignment.TRAILING, layout.createSequentialGroup()
.addComponent(buttonRun, javax.swing.GroupLayout.PREFERRED_SIZE, 92, javax.swing.GroupLayout.PREFERRED_SIZE)
.addGap(18, 18, 18)
.addComponent(buttonAbort, javax.swing.GroupLayout.PREFERRED_SIZE, 92, javax.swing.GroupLayout.PREFERRED_SIZE))
.addGroup(layout.createSequentialGroup()
.addGap(12, 12, 12)
.addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
.addGroup(javax.swing.GroupLayout.Alignment.TRAILING, layout.createSequentialGroup()
.addGap(12, 12, 12)
.addComponent(progressBar, javax.swing.GroupLayout.DEFAULT_SIZE, 367, Short.MAX_VALUE)
.addGap(18, 18, 18)
.addComponent(buttonClear))
.addComponent(centroidPlot, javax.swing.GroupLayout.PREFERRED_SIZE, 0, Short.MAX_VALUE))))
.addComponent(progressBar, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
.addGap(18, 18, 18)
.addComponent(buttonClear))
.addComponent(centroidPlot, javax.swing.GroupLayout.DEFAULT_SIZE, 443, Short.MAX_VALUE))
.addContainerGap())
);
layout.setVerticalGroup(

20
plugins/LaserGunAlignment.form
View File

@@ -21,26 +21,22 @@
<DimensionLayout dim="0">
<Group type="103" groupAlignment="0" attributes="0">
<Group type="102" attributes="0">
<EmptySpace min="-2" max="-2" attributes="0"/>
<Component id="panelParameters" min="-2" max="-2" attributes="0"/>
<EmptySpace min="-2" max="-2" attributes="0"/>
<Group type="103" groupAlignment="0" attributes="0">
<Group type="102" attributes="0">
<EmptySpace max="32767" attributes="0"/>
<Group type="102" alignment="1" attributes="0">
<Component id="buttonRun" min="-2" pref="92" max="-2" attributes="0"/>
<EmptySpace type="separate" max="-2" attributes="0"/>
<Component id="buttonAbort" min="-2" pref="92" max="-2" attributes="0"/>
</Group>
<Group type="102" alignment="0" attributes="0">
<EmptySpace min="-2" pref="12" max="-2" attributes="0"/>
<Group type="103" groupAlignment="0" attributes="0">
<Group type="102" alignment="1" attributes="0">
<EmptySpace min="-2" pref="12" max="-2" attributes="0"/>
<Component id="progressBar" pref="367" max="32767" attributes="0"/>
<EmptySpace type="separate" min="-2" max="-2" attributes="0"/>
<Component id="buttonClear" min="-2" max="-2" attributes="0"/>
</Group>
<Component id="centroidPlot" pref="0" max="32767" attributes="0"/>
</Group>
<Component id="progressBar" max="32767" attributes="0"/>
<EmptySpace type="separate" min="-2" max="-2" attributes="0"/>
<Component id="buttonClear" min="-2" max="-2" attributes="0"/>
</Group>
<Component id="centroidPlot" alignment="0" pref="412" max="32767" attributes="0"/>
</Group>
<EmptySpace min="-2" max="-2" attributes="0"/>
</Group>
@@ -196,7 +192,7 @@
<Component id="checkSaveImages" min="-2" max="-2" attributes="0"/>
<EmptySpace max="-2" attributes="0"/>
<Component id="checkElog" min="-2" max="-2" attributes="0"/>
<EmptySpace pref="57" max="32767" attributes="0"/>
<EmptySpace pref="72" max="32767" attributes="0"/>
</Group>
</Group>
</DimensionLayout>

22
plugins/LaserGunAlignment.java
View File

@@ -65,6 +65,8 @@ public class LaserGunAlignment extends Panel {
running = false;
}
progressBar.setIndeterminate(!state.isInitialized());
for (Component c : panelParameters.getComponents()) {
if (!(c instanceof JPanel)){
c.setEnabled(state == State.Ready);
@@ -89,14 +91,12 @@ public class LaserGunAlignment extends Panel {
int index = 1;
void onEndScan(ScanResult sr, List hx, List hy) {
System.out.println("In onEndScan");
progressBar.setValue(1000);
double[] x = (double[]) Convert.toDouble(hx);
double[] y = (double[]) Convert.toDouble(hy);
LinePlotErrorSeries hull = new LinePlotErrorSeries(scanSeries.getName() + "H", scanSeries.getColor());
centroidPlot.addSeries(hull);
hull.setData((double[]) Convert.toDouble(x), (double[]) Convert.toDouble(y));
System.out.println("Set");
//Add ELOG entry
if (checkElog.isSelected()) {
String file = Paths.get(getController().getSetup().getContextPath(), "CentroidPlot.jpg").toString();
@@ -299,7 +299,7 @@ System.out.println("Set");
.addComponent(checkSaveImages)
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
.addComponent(checkElog)
.addContainerGap(57, Short.MAX_VALUE))
.addContainerGap(72, Short.MAX_VALUE))
);
centroidPlot.setLegendVisible(true);
@@ -320,22 +320,20 @@ System.out.println("Set");
layout.setHorizontalGroup(
layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
.addGroup(layout.createSequentialGroup()
.addContainerGap()
.addComponent(panelParameters, 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)
.addGroup(layout.createSequentialGroup()
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
.addGroup(javax.swing.GroupLayout.Alignment.TRAILING, layout.createSequentialGroup()
.addComponent(buttonRun, javax.swing.GroupLayout.PREFERRED_SIZE, 92, javax.swing.GroupLayout.PREFERRED_SIZE)
.addGap(18, 18, 18)
.addComponent(buttonAbort, javax.swing.GroupLayout.PREFERRED_SIZE, 92, javax.swing.GroupLayout.PREFERRED_SIZE))
.addGroup(layout.createSequentialGroup()
.addGap(12, 12, 12)
.addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
.addGroup(javax.swing.GroupLayout.Alignment.TRAILING, layout.createSequentialGroup()
.addGap(12, 12, 12)
.addComponent(progressBar, javax.swing.GroupLayout.DEFAULT_SIZE, 367, Short.MAX_VALUE)
.addGap(18, 18, 18)
.addComponent(buttonClear))
.addComponent(centroidPlot, javax.swing.GroupLayout.PREFERRED_SIZE, 0, Short.MAX_VALUE))))
.addComponent(progressBar, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
.addGap(18, 18, 18)
.addComponent(buttonClear))
.addComponent(centroidPlot, javax.swing.GroupLayout.DEFAULT_SIZE, 412, Short.MAX_VALUE))
.addContainerGap())
);
layout.setVerticalGroup(