From 7b4bfd7c728261d8dd04787b138061c2d57f78d1 Mon Sep 17 00:00:00 2001 From: x07maop Date: Tue, 25 Aug 2015 11:00:59 +0200 Subject: [PATCH] Closedown --- plugins/EnergyScan.form | 22 +++++++++++----------- plugins/EnergyScan.java | 23 ++++++++++++----------- plugins/HystScan.form | 20 ++++++++------------ plugins/HystScan.java | 23 +++++++++++++---------- 4 files changed, 44 insertions(+), 44 deletions(-) diff --git a/plugins/EnergyScan.form b/plugins/EnergyScan.form index 03334ab..7e172d0 100644 --- a/plugins/EnergyScan.form +++ b/plugins/EnergyScan.form @@ -32,7 +32,7 @@ - + @@ -251,7 +251,7 @@ - + @@ -359,10 +359,14 @@ - + + + + + @@ -469,16 +473,12 @@ - - - - - - - + + + - + diff --git a/plugins/EnergyScan.java b/plugins/EnergyScan.java index d5e499c..1a53282 100644 --- a/plugins/EnergyScan.java +++ b/plugins/EnergyScan.java @@ -347,7 +347,7 @@ public class EnergyScan extends Panel { } catch (Throwable t){ batch = null; getLogger().log(Level.WARNING, null, ex); - showException((Exception)ex); + //showException((Exception)ex); } return ok; }); @@ -542,7 +542,7 @@ public class EnergyScan extends Panel { jPanel1Layout.setHorizontalGroup( jPanel1Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) .addGroup(jPanel1Layout.createSequentialGroup() - .addContainerGap() + .addContainerGap(javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE) .addGroup(jPanel1Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) .addComponent(jLabel10, javax.swing.GroupLayout.Alignment.TRAILING) .addComponent(jLabel11, javax.swing.GroupLayout.Alignment.TRAILING)) @@ -635,12 +635,15 @@ public class EnergyScan extends Panel { .addComponent(radioTFY) .addComponent(radioE) .addComponent(radioF) - .addComponent(radioI0) - .addComponent(buttonPlot)) + .addComponent(radioI0)) + .addContainerGap(javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)) + .addGroup(javax.swing.GroupLayout.Alignment.TRAILING, jPanel2Layout.createSequentialGroup() + .addContainerGap(javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE) + .addComponent(buttonPlot, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE) .addContainerGap(javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)) ); - jPanel2Layout.linkSize(javax.swing.SwingConstants.HORIZONTAL, new java.awt.Component[] {buttonPlot, radioE, radioF, radioI0, radioTEY, radioTFY}); + jPanel2Layout.linkSize(javax.swing.SwingConstants.HORIZONTAL, new java.awt.Component[] {radioE, radioF, radioI0, radioTEY, radioTFY}); jPanel2Layout.setVerticalGroup( jPanel2Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) @@ -678,12 +681,10 @@ public class EnergyScan extends Panel { panelDataLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) .addGroup(panelDataLayout.createSequentialGroup() .addContainerGap() - .addGroup(panelDataLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) - .addComponent(jLabel6) - .addGroup(panelDataLayout.createSequentialGroup() - .addGap(55, 55, 55) - .addComponent(textFile))) + .addComponent(jLabel6) .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) + .addComponent(textFile) + .addGap(18, 18, 18) .addComponent(buttonDefaults) .addContainerGap()) ); @@ -750,7 +751,7 @@ public class EnergyScan extends Panel { .addGroup(javax.swing.GroupLayout.Alignment.TRAILING, layout.createSequentialGroup() .addComponent(panelParameters, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE) .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) - .addComponent(jPanel2, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))) + .addComponent(jPanel2, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE))) .addGap(0, 0, 0)) ); layout.setVerticalGroup( diff --git a/plugins/HystScan.form b/plugins/HystScan.form index d5af25a..deeae7f 100644 --- a/plugins/HystScan.form +++ b/plugins/HystScan.form @@ -56,7 +56,7 @@ - + @@ -65,7 +65,7 @@ - + @@ -99,7 +99,7 @@ - + @@ -364,16 +364,12 @@ - - - - - - - + + + - + @@ -422,7 +418,7 @@ - + diff --git a/plugins/HystScan.java b/plugins/HystScan.java index 11ee294..1fe82cc 100644 --- a/plugins/HystScan.java +++ b/plugins/HystScan.java @@ -53,6 +53,11 @@ public class HystScan extends Panel { super.setEnabled(value); buttonExecute.setEnabled(value); tableEnergies.setEnabled(value); + textFile.setEnabled(value); + buttonDefaults.setEnabled(value); + comboSetup.setEnabled(value); + comboRunType.setEnabled(value); + for (Component c : panelParameters.getComponents()) { if (!(c instanceof JLabel)) { c.setEnabled(value); @@ -201,7 +206,7 @@ public class HystScan extends Panel { batch = null; reverseScan = false; getLogger().log(Level.WARNING, null, ex); - showException((Exception)ex); + //showException((Exception)ex); } return ok; }); @@ -317,14 +322,14 @@ public class HystScan extends Panel { panelParametersLayout.setHorizontalGroup( panelParametersLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) .addGroup(panelParametersLayout.createSequentialGroup() - .addContainerGap() + .addContainerGap(javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE) .addGroup(panelParametersLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) .addComponent(jScrollPane1, javax.swing.GroupLayout.PREFERRED_SIZE, 0, Short.MAX_VALUE) .addGroup(panelParametersLayout.createSequentialGroup() .addComponent(jLabel13) .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) .addComponent(spinnerEnergies, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))) - .addGap(18, 18, 18) + .addGap(18, 18, Short.MAX_VALUE) .addGroup(panelParametersLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) .addGroup(javax.swing.GroupLayout.Alignment.TRAILING, panelParametersLayout.createSequentialGroup() .addGroup(panelParametersLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) @@ -350,7 +355,7 @@ public class HystScan extends Panel { .addComponent(jLabel5) .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) .addComponent(comboMode, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))) - .addContainerGap()) + .addContainerGap(javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)) ); panelParametersLayout.linkSize(javax.swing.SwingConstants.HORIZONTAL, new java.awt.Component[] {comboMode, spinnerEndField, spinnerOffset, spinnerRampRate, spinnerSleep, spinnerStartField}); @@ -447,12 +452,10 @@ public class HystScan extends Panel { panelDataLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) .addGroup(panelDataLayout.createSequentialGroup() .addContainerGap() - .addGroup(panelDataLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) - .addComponent(jLabel6) - .addGroup(panelDataLayout.createSequentialGroup() - .addGap(55, 55, 55) - .addComponent(textFile))) + .addComponent(jLabel6) .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) + .addComponent(textFile) + .addGap(18, 18, 18) .addComponent(buttonDefaults) .addContainerGap()) ); @@ -487,7 +490,7 @@ public class HystScan extends Panel { jPanel1Layout.setHorizontalGroup( jPanel1Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) .addGroup(jPanel1Layout.createSequentialGroup() - .addContainerGap() + .addContainerGap(javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE) .addGroup(jPanel1Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) .addGroup(jPanel1Layout.createSequentialGroup() .addComponent(jLabel11)