This commit is contained in:
@@ -2,6 +2,7 @@
|
||||
import ch.psi.pshell.core.Context;
|
||||
import ch.psi.pshell.core.JsonSerializer;
|
||||
import ch.psi.pshell.core.Nameable;
|
||||
import ch.psi.pshell.core.Plugin;
|
||||
import ch.psi.pshell.device.Device;
|
||||
import ch.psi.pshell.device.DeviceAdapter;
|
||||
import ch.psi.pshell.device.DeviceListener;
|
||||
@@ -28,6 +29,7 @@ import ch.psi.utils.Arr;
|
||||
import ch.psi.utils.Convert;
|
||||
import ch.psi.utils.IO;
|
||||
import ch.psi.utils.State;
|
||||
import ch.psi.utils.Str;
|
||||
import ch.psi.utils.swing.SwingUtils;
|
||||
import java.awt.Color;
|
||||
import java.awt.Component;
|
||||
@@ -60,6 +62,8 @@ import javax.swing.JTextArea;
|
||||
import javax.swing.JTextField;
|
||||
import javax.swing.SwingUtilities;
|
||||
import javax.swing.TransferHandler;
|
||||
import javax.swing.event.TableModelEvent;
|
||||
import javax.swing.event.TableModelListener;
|
||||
import javax.swing.filechooser.FileNameExtensionFilter;
|
||||
import javax.swing.table.DefaultTableModel;
|
||||
|
||||
@@ -83,6 +87,7 @@ public class SIStem extends PanelProcessor {
|
||||
final JTextField[] scientaRangeFields;
|
||||
String[] additionalPositioners ;
|
||||
boolean intialized;
|
||||
boolean startButtonPressed;
|
||||
|
||||
static{
|
||||
QueueProcessor.DEFAULT_INFO_COLUMN = "Time";
|
||||
@@ -188,7 +193,7 @@ public class SIStem extends PanelProcessor {
|
||||
});
|
||||
|
||||
scientaPanels = new RegisterPanel[]{textLowEnergy,textCenterEnergy, textHighEnergy, textStepEnergy,
|
||||
textLowThetaY, textCenterThetaY, textHighThetaY, textStepThetaY, textCenterThetaX, textSlices, textChannels};
|
||||
textLowThetaY, textCenterThetaY, textHighThetaY, textStepThetaY, textCenterThetaX, textSlices, textChannels, textExposureDev};
|
||||
scientaRangeFields = new JTextField[]{textXChannelMax, textXChannelMin, textYChannelMax, textYChannelMin};
|
||||
scientaCombos = new DiscretePositionerSelector[]{comboPass, comboAcquisition, comboEnergy, comboLens, comboDetMode};
|
||||
deviceCombos = new JComboBox[]{comboPol, comboGrating};
|
||||
@@ -201,6 +206,13 @@ public class SIStem extends PanelProcessor {
|
||||
updateLens();
|
||||
});
|
||||
|
||||
modelScanned.addTableModelListener(new TableModelListener() {
|
||||
@Override
|
||||
public void tableChanged(TableModelEvent e) {
|
||||
updateTime();
|
||||
}
|
||||
});
|
||||
|
||||
clear();
|
||||
//startTimer(1000, 1000);
|
||||
}
|
||||
@@ -385,6 +397,10 @@ public class SIStem extends PanelProcessor {
|
||||
@Override
|
||||
public void saveAs(String fileName) throws IOException {
|
||||
currentFile = new File(fileName);
|
||||
if (!intialized){
|
||||
return;
|
||||
}
|
||||
|
||||
Map preActions = new LinkedHashMap();
|
||||
|
||||
|
||||
@@ -462,8 +478,28 @@ public class SIStem extends PanelProcessor {
|
||||
updateControls();
|
||||
}
|
||||
|
||||
|
||||
//TODO: remove in next version (use getContext().getPlugin)
|
||||
Plugin getPlugin(String name) {
|
||||
for (Plugin p: getContext().getPlugins()) {
|
||||
if (IO.getPrefix(getPluginName()).equals(name)){
|
||||
return p;
|
||||
}
|
||||
}
|
||||
return null;
|
||||
}
|
||||
|
||||
@Override
|
||||
public void open(String fileName) throws IOException {
|
||||
public void open(String fileName) throws IOException {
|
||||
if (!intialized){
|
||||
//Called from queue, set filename and load file in the panel
|
||||
currentFile = (fileName != null) ? new File(fileName) : null;
|
||||
Plugin p = getPlugin(SIStem.class.getSimpleName());
|
||||
if (p!=null){
|
||||
((SIStem)p).open(fileName);
|
||||
}
|
||||
return;
|
||||
}
|
||||
clear();
|
||||
try{
|
||||
if (fileName != null) {
|
||||
@@ -562,7 +598,7 @@ public class SIStem extends PanelProcessor {
|
||||
|
||||
@Override
|
||||
public void clear() {
|
||||
currentFile = null;
|
||||
currentFile = null;
|
||||
deletePrivateMasterAxis();
|
||||
for (JComboBox combo : deviceCombos) {
|
||||
if (combo.getModel().getSize()>0){
|
||||
@@ -643,28 +679,35 @@ public class SIStem extends PanelProcessor {
|
||||
|
||||
@Override
|
||||
public void execute() throws Exception {
|
||||
checkValues();
|
||||
checkBeamline();
|
||||
save();
|
||||
if (currentFile == null) {
|
||||
return;
|
||||
try{
|
||||
if (intialized){
|
||||
//Called from queue, don't update file contents
|
||||
checkValues();
|
||||
checkBeamline();
|
||||
save();
|
||||
}
|
||||
if (currentFile == null) {
|
||||
return;
|
||||
}
|
||||
Processor p = (getView()==null) ? null : getView().getRunningProcessor(true);
|
||||
boolean showException = (getView()==null) ? startButtonPressed : getView().getPreferences().getScriptPopupDialog() != Preferences.ScriptPopupDialog.None;
|
||||
HashMap args = new HashMap();
|
||||
args.put("NAME", getScanName());
|
||||
this.runAsync("templates/SIStem", args).handle((ret, ex) -> {
|
||||
if (ex != null) {
|
||||
if ((p==null)||!(p instanceof QueueProcessor)){
|
||||
if (showException) {
|
||||
if (!getContext().isAborted()) {
|
||||
showException((Exception)ex);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
return ret;
|
||||
});
|
||||
} finally{
|
||||
startButtonPressed=false;
|
||||
}
|
||||
Processor p = getView().getRunningProcessor(true);
|
||||
HashMap args = new HashMap();
|
||||
args.put("NAME", getScanName());
|
||||
this.runAsync("templates/SIStem", args).handle((ret, ex) -> {
|
||||
if (ex != null) {
|
||||
if ((p==null)||!(p instanceof QueueProcessor)){
|
||||
if (getView().getPreferences().getScriptPopupDialog() != Preferences.ScriptPopupDialog.None) {
|
||||
if (!getContext().isAborted()) {
|
||||
showException((Exception)ex);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
return ret;
|
||||
});
|
||||
|
||||
}
|
||||
|
||||
@Override
|
||||
@@ -1011,8 +1054,10 @@ public class SIStem extends PanelProcessor {
|
||||
public void onValueChanged(final Device device, final Object value, final Object former) {
|
||||
try {
|
||||
Double p = (Double) eval("scienta.getProgress()", true);
|
||||
State state = (State) eval("scienta.getState()", true);
|
||||
SwingUtilities.invokeLater(() -> {
|
||||
progress.setValue((int) (p * 1000));
|
||||
progress.setIndeterminate((p<=0) && (state==State.Busy));
|
||||
});
|
||||
|
||||
} catch (Exception ex) {
|
||||
@@ -1099,6 +1144,8 @@ public class SIStem extends PanelProcessor {
|
||||
comboDetMode = new ch.psi.pshell.swing.DiscretePositionerSelector();
|
||||
textChannels = new ch.psi.pshell.swing.RegisterPanel();
|
||||
textSlices = new ch.psi.pshell.swing.RegisterPanel();
|
||||
jLabel31 = new javax.swing.JLabel();
|
||||
textExposureDev = new ch.psi.pshell.swing.RegisterPanel();
|
||||
jPanel11 = new javax.swing.JPanel();
|
||||
checkZigzag = new javax.swing.JCheckBox();
|
||||
jLabel4 = new javax.swing.JLabel();
|
||||
@@ -1209,13 +1256,13 @@ public class SIStem extends PanelProcessor {
|
||||
.addComponent(jLabel13, javax.swing.GroupLayout.Alignment.TRAILING))
|
||||
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
|
||||
.addGroup(panelEnergyLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
|
||||
.addComponent(textLowEnergy, javax.swing.GroupLayout.DEFAULT_SIZE, 80, Short.MAX_VALUE)
|
||||
.addComponent(textCenterEnergy, javax.swing.GroupLayout.DEFAULT_SIZE, 80, Short.MAX_VALUE)
|
||||
.addComponent(textHighEnergy, javax.swing.GroupLayout.DEFAULT_SIZE, 80, Short.MAX_VALUE)))
|
||||
.addComponent(textLowEnergy, javax.swing.GroupLayout.DEFAULT_SIZE, 78, Short.MAX_VALUE)
|
||||
.addComponent(textCenterEnergy, javax.swing.GroupLayout.DEFAULT_SIZE, 78, Short.MAX_VALUE)
|
||||
.addComponent(textHighEnergy, javax.swing.GroupLayout.DEFAULT_SIZE, 78, Short.MAX_VALUE)))
|
||||
.addGroup(javax.swing.GroupLayout.Alignment.TRAILING, panelEnergyLayout.createSequentialGroup()
|
||||
.addComponent(jLabel15)
|
||||
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
|
||||
.addComponent(textStepEnergy, javax.swing.GroupLayout.DEFAULT_SIZE, 80, Short.MAX_VALUE)))
|
||||
.addComponent(textStepEnergy, javax.swing.GroupLayout.DEFAULT_SIZE, 78, Short.MAX_VALUE)))
|
||||
.addContainerGap())
|
||||
);
|
||||
|
||||
@@ -1240,7 +1287,7 @@ public class SIStem extends PanelProcessor {
|
||||
.addGroup(panelEnergyLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.CENTER)
|
||||
.addComponent(jLabel15)
|
||||
.addComponent(textStepEnergy, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))
|
||||
.addContainerGap(16, Short.MAX_VALUE))
|
||||
.addContainerGap(38, Short.MAX_VALUE))
|
||||
);
|
||||
|
||||
panelY.setBorder(javax.swing.BorderFactory.createTitledBorder("ThetaY "));
|
||||
@@ -1279,13 +1326,13 @@ public class SIStem extends PanelProcessor {
|
||||
.addComponent(jLabel18, javax.swing.GroupLayout.Alignment.TRAILING))
|
||||
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
|
||||
.addGroup(panelYLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
|
||||
.addComponent(textLowThetaY, javax.swing.GroupLayout.DEFAULT_SIZE, 80, Short.MAX_VALUE)
|
||||
.addComponent(textCenterThetaY, javax.swing.GroupLayout.DEFAULT_SIZE, 80, Short.MAX_VALUE)
|
||||
.addComponent(textHighThetaY, javax.swing.GroupLayout.DEFAULT_SIZE, 80, Short.MAX_VALUE)))
|
||||
.addComponent(textLowThetaY, javax.swing.GroupLayout.DEFAULT_SIZE, 78, Short.MAX_VALUE)
|
||||
.addComponent(textCenterThetaY, javax.swing.GroupLayout.DEFAULT_SIZE, 78, Short.MAX_VALUE)
|
||||
.addComponent(textHighThetaY, javax.swing.GroupLayout.DEFAULT_SIZE, 78, Short.MAX_VALUE)))
|
||||
.addGroup(javax.swing.GroupLayout.Alignment.TRAILING, panelYLayout.createSequentialGroup()
|
||||
.addComponent(jLabel20)
|
||||
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
|
||||
.addComponent(textStepThetaY, javax.swing.GroupLayout.DEFAULT_SIZE, 80, Short.MAX_VALUE)))
|
||||
.addComponent(textStepThetaY, javax.swing.GroupLayout.DEFAULT_SIZE, 78, Short.MAX_VALUE)))
|
||||
.addContainerGap())
|
||||
);
|
||||
|
||||
@@ -1310,7 +1357,7 @@ public class SIStem extends PanelProcessor {
|
||||
.addGroup(panelYLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.CENTER)
|
||||
.addComponent(jLabel20)
|
||||
.addComponent(textStepThetaY, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))
|
||||
.addContainerGap(16, Short.MAX_VALUE))
|
||||
.addContainerGap(38, Short.MAX_VALUE))
|
||||
);
|
||||
|
||||
panelX.setBorder(javax.swing.BorderFactory.createTitledBorder("ThetaX"));
|
||||
@@ -1328,7 +1375,7 @@ public class SIStem extends PanelProcessor {
|
||||
.addContainerGap()
|
||||
.addComponent(jLabel26)
|
||||
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
|
||||
.addComponent(textCenterThetaX, javax.swing.GroupLayout.DEFAULT_SIZE, 80, Short.MAX_VALUE)
|
||||
.addComponent(textCenterThetaX, javax.swing.GroupLayout.DEFAULT_SIZE, 78, Short.MAX_VALUE)
|
||||
.addContainerGap())
|
||||
);
|
||||
panelXLayout.setVerticalGroup(
|
||||
@@ -1338,9 +1385,11 @@ public class SIStem extends PanelProcessor {
|
||||
.addGroup(panelXLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.CENTER)
|
||||
.addComponent(jLabel26)
|
||||
.addComponent(textCenterThetaX, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))
|
||||
.addContainerGap(67, Short.MAX_VALUE))
|
||||
.addContainerGap(89, Short.MAX_VALUE))
|
||||
);
|
||||
|
||||
jPanel10.setBorder(javax.swing.BorderFactory.createTitledBorder("Parameters"));
|
||||
|
||||
jLabel29.setHorizontalAlignment(javax.swing.SwingConstants.TRAILING);
|
||||
jLabel29.setText("Energy Mode:");
|
||||
|
||||
@@ -1374,10 +1423,10 @@ public class SIStem extends PanelProcessor {
|
||||
.addComponent(jLabel30))
|
||||
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
|
||||
.addGroup(jPanel10Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
|
||||
.addComponent(comboLens, javax.swing.GroupLayout.DEFAULT_SIZE, 150, Short.MAX_VALUE)
|
||||
.addComponent(comboEnergy, javax.swing.GroupLayout.DEFAULT_SIZE, 150, Short.MAX_VALUE)
|
||||
.addComponent(comboAcquisition, javax.swing.GroupLayout.DEFAULT_SIZE, 150, Short.MAX_VALUE)
|
||||
.addComponent(comboPass, javax.swing.GroupLayout.DEFAULT_SIZE, 150, Short.MAX_VALUE))
|
||||
.addComponent(comboLens, javax.swing.GroupLayout.DEFAULT_SIZE, 146, Short.MAX_VALUE)
|
||||
.addComponent(comboEnergy, javax.swing.GroupLayout.DEFAULT_SIZE, 146, Short.MAX_VALUE)
|
||||
.addComponent(comboAcquisition, javax.swing.GroupLayout.DEFAULT_SIZE, 146, Short.MAX_VALUE)
|
||||
.addComponent(comboPass, javax.swing.GroupLayout.DEFAULT_SIZE, 146, Short.MAX_VALUE))
|
||||
.addContainerGap())
|
||||
);
|
||||
|
||||
@@ -1413,11 +1462,11 @@ public class SIStem extends PanelProcessor {
|
||||
.addContainerGap()
|
||||
.addComponent(jPanel10, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
|
||||
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED)
|
||||
.addComponent(panelEnergy, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
|
||||
.addComponent(panelEnergy, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
|
||||
.addGap(12, 12, 12)
|
||||
.addComponent(panelX, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
|
||||
.addComponent(panelX, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
|
||||
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
|
||||
.addComponent(panelY, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
|
||||
.addComponent(panelY, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
|
||||
.addContainerGap())
|
||||
);
|
||||
jPanel4Layout.setVerticalGroup(
|
||||
@@ -1429,7 +1478,7 @@ public class SIStem extends PanelProcessor {
|
||||
.addComponent(panelX, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
|
||||
.addComponent(panelEnergy, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
|
||||
.addComponent(jPanel10, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))
|
||||
.addContainerGap(169, Short.MAX_VALUE))
|
||||
.addContainerGap(147, Short.MAX_VALUE))
|
||||
);
|
||||
|
||||
jPanel4Layout.linkSize(javax.swing.SwingConstants.VERTICAL, new java.awt.Component[] {jPanel10, panelEnergy, panelX, panelY});
|
||||
@@ -1493,46 +1542,51 @@ public class SIStem extends PanelProcessor {
|
||||
|
||||
textSlices.setName("scienta.slices"); // NOI18N
|
||||
|
||||
jLabel31.setHorizontalAlignment(javax.swing.SwingConstants.TRAILING);
|
||||
jLabel31.setText("Dwell Time (s):");
|
||||
|
||||
textExposureDev.setName("scienta.exposureDev"); // NOI18N
|
||||
|
||||
javax.swing.GroupLayout jPanel5Layout = new javax.swing.GroupLayout(jPanel5);
|
||||
jPanel5.setLayout(jPanel5Layout);
|
||||
jPanel5Layout.setHorizontalGroup(
|
||||
jPanel5Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
|
||||
.addGroup(jPanel5Layout.createSequentialGroup()
|
||||
.addContainerGap(javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
|
||||
.addGroup(jPanel5Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
|
||||
.addGroup(jPanel5Layout.createSequentialGroup()
|
||||
.addContainerGap(13, Short.MAX_VALUE)
|
||||
.addGroup(jPanel5Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
|
||||
.addComponent(jLabel16)
|
||||
.addComponent(jLabel9))
|
||||
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
|
||||
.addGroup(jPanel5Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
|
||||
.addGroup(jPanel5Layout.createSequentialGroup()
|
||||
.addComponent(textXChannelMin, javax.swing.GroupLayout.PREFERRED_SIZE, 68, javax.swing.GroupLayout.PREFERRED_SIZE)
|
||||
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
|
||||
.addComponent(textXChannelMax, javax.swing.GroupLayout.PREFERRED_SIZE, 68, javax.swing.GroupLayout.PREFERRED_SIZE))
|
||||
.addComponent(comboDetMode, javax.swing.GroupLayout.PREFERRED_SIZE, 132, javax.swing.GroupLayout.PREFERRED_SIZE)))
|
||||
.addGroup(jPanel5Layout.createSequentialGroup()
|
||||
.addGroup(jPanel5Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
|
||||
.addComponent(jLabel31)
|
||||
.addComponent(jLabel9)
|
||||
.addComponent(jLabel27)
|
||||
.addComponent(jLabel10)
|
||||
.addComponent(jLabel25))
|
||||
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
|
||||
.addGroup(jPanel5Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
|
||||
.addComponent(textChannels, javax.swing.GroupLayout.PREFERRED_SIZE, 68, javax.swing.GroupLayout.PREFERRED_SIZE)
|
||||
.addGroup(jPanel5Layout.createSequentialGroup()
|
||||
.addComponent(textYChannelMin, javax.swing.GroupLayout.PREFERRED_SIZE, 68, javax.swing.GroupLayout.PREFERRED_SIZE)
|
||||
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
|
||||
.addComponent(textYChannelMax, javax.swing.GroupLayout.PREFERRED_SIZE, 68, javax.swing.GroupLayout.PREFERRED_SIZE))
|
||||
.addComponent(textSlices, javax.swing.GroupLayout.PREFERRED_SIZE, 68, javax.swing.GroupLayout.PREFERRED_SIZE)))
|
||||
.addComponent(textSlices, javax.swing.GroupLayout.PREFERRED_SIZE, 68, javax.swing.GroupLayout.PREFERRED_SIZE)
|
||||
.addGroup(jPanel5Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING, false)
|
||||
.addGroup(jPanel5Layout.createSequentialGroup()
|
||||
.addComponent(textXChannelMin, javax.swing.GroupLayout.PREFERRED_SIZE, 68, javax.swing.GroupLayout.PREFERRED_SIZE)
|
||||
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
|
||||
.addComponent(textXChannelMax, javax.swing.GroupLayout.PREFERRED_SIZE, 68, javax.swing.GroupLayout.PREFERRED_SIZE))
|
||||
.addComponent(comboDetMode, javax.swing.GroupLayout.DEFAULT_SIZE, 0, Short.MAX_VALUE)
|
||||
.addComponent(textExposureDev, javax.swing.GroupLayout.PREFERRED_SIZE, 0, Short.MAX_VALUE)))
|
||||
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED, 28, Short.MAX_VALUE))
|
||||
.addGroup(jPanel5Layout.createSequentialGroup()
|
||||
.addComponent(jLabel27)
|
||||
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
|
||||
.addComponent(textChannels, javax.swing.GroupLayout.PREFERRED_SIZE, 68, javax.swing.GroupLayout.PREFERRED_SIZE))
|
||||
.addComponent(butonPlot))
|
||||
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED, 26, Short.MAX_VALUE)
|
||||
.addComponent(detectorPlot, javax.swing.GroupLayout.DEFAULT_SIZE, 543, Short.MAX_VALUE)
|
||||
.addContainerGap(javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
|
||||
.addComponent(butonPlot)
|
||||
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)))
|
||||
.addComponent(detectorPlot, javax.swing.GroupLayout.DEFAULT_SIZE, 542, Short.MAX_VALUE)
|
||||
.addContainerGap())
|
||||
);
|
||||
|
||||
jPanel5Layout.linkSize(javax.swing.SwingConstants.HORIZONTAL, new java.awt.Component[] {jLabel10, jLabel16, jLabel25, jLabel27, jLabel9});
|
||||
jPanel5Layout.linkSize(javax.swing.SwingConstants.HORIZONTAL, new java.awt.Component[] {jLabel10, jLabel16, jLabel25, jLabel27, jLabel31, jLabel9});
|
||||
|
||||
jPanel5Layout.setVerticalGroup(
|
||||
jPanel5Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
|
||||
@@ -1543,6 +1597,10 @@ public class SIStem extends PanelProcessor {
|
||||
.addGroup(jPanel5Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.CENTER)
|
||||
.addComponent(jLabel16)
|
||||
.addComponent(comboDetMode, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))
|
||||
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
|
||||
.addGroup(jPanel5Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.TRAILING)
|
||||
.addComponent(textExposureDev, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
|
||||
.addComponent(jLabel31))
|
||||
.addGap(18, 18, 18)
|
||||
.addGroup(jPanel5Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.CENTER)
|
||||
.addComponent(jLabel9)
|
||||
@@ -2066,6 +2124,7 @@ public class SIStem extends PanelProcessor {
|
||||
|
||||
private void buttonStartActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_buttonStartActionPerformed
|
||||
try {
|
||||
startButtonPressed=true;
|
||||
execute();
|
||||
} catch (Exception ex) {
|
||||
showException(ex);
|
||||
@@ -2283,6 +2342,7 @@ public class SIStem extends PanelProcessor {
|
||||
private javax.swing.JLabel jLabel29;
|
||||
private javax.swing.JLabel jLabel3;
|
||||
private javax.swing.JLabel jLabel30;
|
||||
private javax.swing.JLabel jLabel31;
|
||||
private javax.swing.JLabel jLabel4;
|
||||
private javax.swing.JLabel jLabel8;
|
||||
private javax.swing.JLabel jLabel9;
|
||||
@@ -2318,6 +2378,7 @@ public class SIStem extends PanelProcessor {
|
||||
private ch.psi.pshell.swing.RegisterPanel textCenterThetaY;
|
||||
private ch.psi.pshell.swing.RegisterPanel textChannels;
|
||||
private javax.swing.JTextArea textDiagnostics;
|
||||
private ch.psi.pshell.swing.RegisterPanel textExposureDev;
|
||||
private javax.swing.JTextField textFile;
|
||||
private ch.psi.pshell.swing.RegisterPanel textHighEnergy;
|
||||
private ch.psi.pshell.swing.RegisterPanel textHighThetaY;
|
||||
|
||||
Reference in New Issue
Block a user