From eb12378238c50eb7cdad6a143893b6884a19d6b3 Mon Sep 17 00:00:00 2001 From: gobbo_a Date: Fri, 4 Nov 2016 13:39:40 +0100 Subject: [PATCH] Startup --- config/jcae.properties | 4 ++-- devices/CurrentCamera.properties | 6 +++--- plugins/GunSolenoidAlignment.form | 18 +++++++----------- plugins/GunSolenoidAlignment.java | 18 +++++++++--------- plugins/LaserGunAlignment.form | 20 ++++++++------------ plugins/LaserGunAlignment.java | 22 ++++++++++------------ 6 files changed, 39 insertions(+), 49 deletions(-) diff --git a/config/jcae.properties b/config/jcae.properties index dc003a9..dcd7b96 100755 --- a/config/jcae.properties +++ b/config/jcae.properties @@ -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= diff --git a/devices/CurrentCamera.properties b/devices/CurrentCamera.properties index 8de78a7..4e53edd 100644 --- a/devices/CurrentCamera.properties +++ b/devices/CurrentCamera.properties @@ -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 diff --git a/plugins/GunSolenoidAlignment.form b/plugins/GunSolenoidAlignment.form index 9f19f8e..00141d4 100644 --- a/plugins/GunSolenoidAlignment.form +++ b/plugins/GunSolenoidAlignment.form @@ -21,26 +21,22 @@ + + - - + - - - - - - - - - + + + + diff --git a/plugins/GunSolenoidAlignment.java b/plugins/GunSolenoidAlignment.java index 3a3dc1f..10dfccc 100644 --- a/plugins/GunSolenoidAlignment.java +++ b/plugins/GunSolenoidAlignment.java @@ -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( diff --git a/plugins/LaserGunAlignment.form b/plugins/LaserGunAlignment.form index a6d8c7d..307345f 100644 --- a/plugins/LaserGunAlignment.form +++ b/plugins/LaserGunAlignment.form @@ -21,26 +21,22 @@ + + - - + - - - - - - - - - + + + + @@ -196,7 +192,7 @@ - + diff --git a/plugins/LaserGunAlignment.java b/plugins/LaserGunAlignment.java index da04ca0..9e8a1eb 100644 --- a/plugins/LaserGunAlignment.java +++ b/plugins/LaserGunAlignment.java @@ -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(