Closedown

This commit is contained in:
x07maop
2015-08-24 18:14:34 +02:00
parent 50df26dc16
commit aeb7e39c24
6 changed files with 466 additions and 99 deletions

View File

@@ -3,17 +3,14 @@
*/
import java.awt.Component;
import java.io.FileInputStream;
import java.nio.file.Files;
import java.nio.file.Path;
import java.nio.file.Paths;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.Properties;
import java.util.logging.Level;
import javax.swing.DefaultComboBoxModel;
import javax.swing.JLabel;
import ch.psi.utils.Chrono;
import ch.psi.utils.State;
import ch.psi.utils.swing.DsvEditor;
import ch.psi.utils.swing.Editor.EditorDialog;
@@ -28,6 +25,9 @@ import ch.psi.pshell.plot.LinePlotBase;
import ch.psi.pshell.plot.LinePlotSeries;
import ch.psi.pshell.plot.Plot;
import ch.psi.pshell.ui.Panel;
import java.awt.event.WindowAdapter;
import java.awt.event.WindowEvent;
import java.io.File;
/**
*
@@ -46,17 +46,19 @@ public class EnergyScan extends Panel {
ChannelInteger count;
double[] offsets = new double[4];
/*
//Overridable callbacks
@Override
public void onStart() {
super.onStart();
loadConfig();
}
*/
@Override
public void onInitialize(int runCount) {
super.onInitialize(runCount);
loadConfig();
count = (ChannelInteger) getController().getDevicePool().getByName("count");
data = (ChannelDoubleArray) getController().getDevicePool().getByName("data");
@@ -145,7 +147,6 @@ public class EnergyScan extends Panel {
comboRunType.setEnabled(value);
buttonConfigure.setEnabled(value);
textFile.setEnabled(value);
textFolder.setEnabled(value);
buttonDefaults.setEnabled(value);
buttonPlot.setEnabled(value);
checkParameterControls();
@@ -237,12 +238,7 @@ public class EnergyScan extends Panel {
} else {
mode = "lin_" + String.format("%1.0f", (Double) spinnerAlpha.getValue());
}
path = path.replaceAll("\\{date\\}", Chrono.getTimeStr(time, "YYYYMMdd"));
path = path.replaceAll("\\{time\\}", Chrono.getTimeStr(time, "HHmmss"));
path = path.replaceAll("\\{year\\}", Chrono.getTimeStr(time, "YYYY"));
path = path.replaceAll("\\{month\\}", Chrono.getTimeStr(time, "MM"));
path = path.replaceAll("\\{day\\}", Chrono.getTimeStr(time, "dd"));
path = getController().getSetup().expandPath(path);
path = path.replaceAll("\\{el\\}", String.valueOf(comboSetup.getSelectedItem()));
path = path.replaceAll("\\{mode\\}", mode);
return path;
@@ -276,23 +272,31 @@ public class EnergyScan extends Panel {
}
void setElement() throws Exception {
Properties prop = new Properties();
prop.load(new FileInputStream(getConfigFile().toFile()));
String selection = comboSetup.getSelectedItem().toString();
String val = prop.getProperty(selection);
String[] tokens = val.split(";");
if (tokens.length != 8) {
throw new Exception("Invalid file format");
}
spinnerE1.setValue(Double.valueOf(tokens[0].trim()));
spinnerE2.setValue(Double.valueOf(tokens[1].trim()));
spinnerTime.setValue(Double.valueOf(tokens[2].trim()));
spinnerDelay.setValue(Double.valueOf(tokens[3].trim()));
for (String line : Files.readAllLines(getConfigFile())) {
if ((line != null) && (!line.trim().isEmpty())) {
String[] tokens = line.split("=");
if (tokens.length <2) {
throw new Exception("Invalid file format");
}
if (tokens[0].equals(selection)){
tokens = tokens[1].trim().split(";");
if (tokens.length != 8) {
throw new Exception("Invalid file format");
}
spinnerE1.setValue(Double.valueOf(tokens[0].trim()));
spinnerE2.setValue(Double.valueOf(tokens[1].trim()));
spinnerTime.setValue(Double.valueOf(tokens[2].trim()));
spinnerDelay.setValue(Double.valueOf(tokens[3].trim()));
offsets[0] = Double.valueOf(tokens[4].trim());
offsets[1] = Double.valueOf(tokens[5].trim());
offsets[2] = Double.valueOf(tokens[6].trim());
offsets[3] = Double.valueOf(tokens[7].trim());
offsets[0] = Double.valueOf(tokens[4].trim());
offsets[1] = Double.valueOf(tokens[5].trim());
offsets[2] = Double.valueOf(tokens[6].trim());
offsets[3] = Double.valueOf(tokens[7].trim());
break;
}
}
}
}
void setRunType() throws Exception {
@@ -341,8 +345,7 @@ public class EnergyScan extends Panel {
String file = expandPath(textFile.getText());
args.put("FILE", file);
String folder = expandPath(textFolder.getText());
String folder = expandPath("{year}_{month}/{date}");
args.put("FOLDER", folder);
scanStartTimestamp = System.currentTimeMillis();
buttonAbort.setEnabled(true);
@@ -404,8 +407,6 @@ public class EnergyScan extends Panel {
buttonDefaults = new javax.swing.JButton();
jLabel6 = new javax.swing.JLabel();
textFile = new javax.swing.JTextField();
jLabel7 = new javax.swing.JLabel();
textFolder = new javax.swing.JTextField();
jPanel3 = new javax.swing.JPanel();
buttonExecute = new javax.swing.JButton();
buttonAbort = new javax.swing.JButton();
@@ -664,9 +665,9 @@ public class EnergyScan extends Panel {
.addContainerGap())
);
panelData.setBorder(javax.swing.BorderFactory.createTitledBorder("Data"));
panelData.setBorder(javax.swing.BorderFactory.createTitledBorder("File"));
buttonDefaults.setText("Defaults");
buttonDefaults.setText("Default");
buttonDefaults.addActionListener(new java.awt.event.ActionListener() {
public void actionPerformed(java.awt.event.ActionEvent evt) {
buttonDefaultsActionPerformed(evt);
@@ -676,9 +677,6 @@ public class EnergyScan extends Panel {
jLabel6.setHorizontalAlignment(javax.swing.SwingConstants.TRAILING);
jLabel6.setText("File:");
jLabel7.setHorizontalAlignment(javax.swing.SwingConstants.TRAILING);
jLabel7.setText("Folder:");
javax.swing.GroupLayout panelDataLayout = new javax.swing.GroupLayout(panelData);
panelData.setLayout(panelDataLayout);
panelDataLayout.setHorizontalGroup(
@@ -686,31 +684,20 @@ public class EnergyScan extends Panel {
.addGroup(panelDataLayout.createSequentialGroup()
.addContainerGap()
.addGroup(panelDataLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
.addGroup(panelDataLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
.addComponent(jLabel7, javax.swing.GroupLayout.Alignment.TRAILING)
.addComponent(jLabel6, javax.swing.GroupLayout.Alignment.TRAILING))
.addComponent(jLabel6)
.addGroup(panelDataLayout.createSequentialGroup()
.addGap(55, 55, 55)
.addGroup(panelDataLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
.addComponent(textFolder)
.addComponent(textFile))))
.addComponent(textFile)))
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
.addComponent(buttonDefaults)
.addContainerGap())
);
panelDataLayout.linkSize(javax.swing.SwingConstants.HORIZONTAL, new java.awt.Component[] {jLabel6, jLabel7});
panelDataLayout.setVerticalGroup(
panelDataLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
.addGroup(panelDataLayout.createSequentialGroup()
.addGroup(panelDataLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE)
.addComponent(jLabel6)
.addComponent(textFile, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
.addGroup(panelDataLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE)
.addComponent(jLabel7)
.addComponent(textFolder, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
.addComponent(textFile, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
.addComponent(buttonDefaults, javax.swing.GroupLayout.PREFERRED_SIZE, 27, javax.swing.GroupLayout.PREFERRED_SIZE))
.addContainerGap())
);
@@ -821,9 +808,11 @@ public class EnergyScan extends Panel {
private void comboSetupActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_comboSetupActionPerformed
try {
setElement();
if (!isManualRun()) {
setRunType();
if (comboSetup.getSelectedItem()!=null){
setElement();
if (!isManualRun()) {
setRunType();
}
}
} catch (Exception ex) {
showException(ex);
@@ -841,6 +830,14 @@ public class EnergyScan extends Panel {
dlgConfig = editor.getDialog(getView(), false);
editor.load(getConfigFile().toString());
editor.setTitle("Energy Scan Configuration");
dlgConfig.addWindowListener(new WindowAdapter() {
@Override
public void windowClosed(WindowEvent e) {
if (System.currentTimeMillis() - new File(dlgConfig.getEditor().getFileName()).lastModified() < 5000){
loadConfig();
}
}
});
}
dlgConfig.setSize(680, 320);
showWindow(dlgConfig);
@@ -870,7 +867,6 @@ public class EnergyScan extends Panel {
private void buttonDefaultsActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_buttonDefaultsActionPerformed
textFile.setText("{el}_{mode}");
textFolder.setText("{year}_{month}/{date}");
}//GEN-LAST:event_buttonDefaultsActionPerformed
private void buttonPlotActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_buttonPlotActionPerformed
@@ -901,7 +897,6 @@ public class EnergyScan extends Panel {
private javax.swing.JLabel jLabel4;
private javax.swing.JLabel jLabel5;
private javax.swing.JLabel jLabel6;
private javax.swing.JLabel jLabel7;
private javax.swing.JLabel jLabel8;
private javax.swing.JLabel jLabel9;
private javax.swing.JPanel jPanel1;
@@ -921,6 +916,5 @@ public class EnergyScan extends Panel {
private javax.swing.JSpinner spinnerOffset;
private javax.swing.JSpinner spinnerTime;
private javax.swing.JTextField textFile;
private javax.swing.JTextField textFolder;
// End of variables declaration//GEN-END:variables
}