 |
 |
| Commit in hps-java/src/main/java/org/lcsim/hps/monitoring on MAIN | |||
| MonitoringApplication.java | +11 | -9 | 1.38 -> 1.39 |
| ConnectionPanel.java | +19 | -21 | 1.20 -> 1.21 |
| +30 | -30 | ||
done poking the monitoring app
diff -u -r1.38 -r1.39 --- MonitoringApplication.java 4 May 2012 19:46:05 -0000 1.38 +++ MonitoringApplication.java 4 May 2012 21:49:30 -0000 1.39 @@ -448,17 +448,16 @@
// TODO: Command line arguments should be: [etFile] [steeringFile] (according to Matthew Graham!)
public static void main(String[] args) {
final String defaultDetectorName;
- final String defaultSteering;
+ final String defaultSteering = "/org/lcsim/hps/steering/TestRunMonitoring.lcsim";
final String defaultEventBuilder;
// Set up command line parsing.
Options options = new Options();
options.addOption(new Option("h", false, "Print this help."));
-// options.addOption(new Option("e", true, "ET file buffer to use."));
options.addOption(new Option("p", true, "Load properties file."));
options.addOption(new Option("r", true, "Load specified steering file resource."));
-// options.addOption(new Option("x", true, "Load specified steering file path."));
+ options.addOption(new Option("x", true, "Load specified steering file path."));
options.addOption(new Option("d", true, "Detector to use."));
options.addOption(new Option("b", true, "Event builder to use."));
CommandLineParser parser = new PosixParser();
@@ -478,12 +477,6 @@
System.exit(1);
}
- if (cl.hasOption("r")) {
- defaultSteering = cl.getOptionValue("r");
- } else {
- defaultSteering = "/org/lcsim/hps/steering/TestRunMonitoring.lcsim";
- }
-
if (cl.hasOption("d")) {
defaultDetectorName = cl.getOptionValue("d");
} else {
@@ -507,6 +500,15 @@
// Set job parameters.
app.setJobParameters(new JobParameters(new String[]{defaultDetectorName, defaultSteering, defaultEventBuilder}));
+ if (cl.hasOption("r")) {
+ app.jobPanel.setSteeringResource(cl.getOptionValue("r"));
+ }
+
+ if (cl.hasOption("x")) {
+ app.jobPanel.setSteeringFile(cl.getOptionValue("x"));
+ }
+
+
// Run the app.
app.run();
}
diff -u -r1.20 -r1.21 --- ConnectionPanel.java 4 May 2012 20:29:01 -0000 1.20 +++ ConnectionPanel.java 4 May 2012 21:49:30 -0000 1.21 @@ -19,7 +19,7 @@
/** * @author Jeremy McCormick <[log in to unmask]>
- * @version $Id: ConnectionPanel.java,v 1.20 2012/05/04 20:29:01 meeg Exp $
+ * @version $Id: ConnectionPanel.java,v 1.21 2012/05/04 21:49:30 meeg Exp $
*/
class ConnectionPanel extends FieldsPanel {
@@ -33,22 +33,20 @@
private JTextField qSizeField;
private JTextField positionField;
private JTextField ppositionField;
- private JComboBox waitComboBox;
+ private JComboBox waitComboBox;
private JTextField waitTimeField;
private JTextField prescaleField;
-
private ConnectionParameters connectionParameters;
-
- static final String[] waitModes = {
- Mode.SLEEP.toString(),
- Mode.TIMED.toString(),
- Mode.ASYNC.toString()
+ static final String[] waitModes = {
+ Mode.SLEEP.toString(),
+ Mode.TIMED.toString(),
+ Mode.ASYNC.toString()
};
ConnectionPanel() {
super(new Insets(1, 1, 1, 1), true);
-
+
setLayout(new GridBagLayout());
// Define fields.
@@ -65,7 +63,7 @@
waitComboBox = addComboBox("Wait Mode", waitModes);
waitTimeField = addField("Wait Time [microseconds]", 8);
prescaleField = addField("Prescale", 8);
-
+
// Set default connection parameters which are pushed to GUI.
setConnectionParameters(new ConnectionParameters());
}
@@ -90,18 +88,18 @@
private Mode getWaitMode() {
Mode mode = null;
- String sel = (String)waitComboBox.getSelectedItem();
+ String sel = (String) waitComboBox.getSelectedItem();
if (Mode.TIMED.toString().equalsIgnoreCase(sel)) {
mode = Mode.TIMED;
} else if (Mode.ASYNC.toString().equalsIgnoreCase(sel)) {
mode = Mode.ASYNC;
} else if (Mode.SLEEP.toString().equalsIgnoreCase(sel)) {
mode = Mode.SLEEP;
- }
+ }
return mode;
}
- private void setWaitMode(Mode waitMode) {
+ private void setWaitMode(Mode waitMode) {
if (waitMode == Mode.SLEEP) {
waitComboBox.setSelectedIndex(0);
} else if (waitMode == Mode.TIMED) {
@@ -117,7 +115,7 @@
portField.setText(Integer.toString(cn.port));
blockingCheckBox.setSelected(cn.blocking);
verboseCheckBox.setSelected(cn.verbose);
- statNameField.setText(cn.statName);
+ statNameField.setText(cn.statName);
chunkField.setText(Integer.toString(cn.chunk));
qSizeField.setText(Integer.toString(cn.qSize));
positionField.setText(Integer.toString(cn.position));
@@ -149,8 +147,8 @@
int r = fc.showSaveDialog(ConnectionPanel.this);
if (r == JFileChooser.APPROVE_OPTION) {
File file = fc.getSelectedFile();
- writePropertiesFile(file); - }
+ writePropertiesFile(file); + }
}
void load() {
@@ -178,7 +176,7 @@
prop.setProperty("qSize", qSizeField.getText());
prop.setProperty("position", positionField.getText());
prop.setProperty("pposition", ppositionField.getText());
- prop.setProperty("waitMode", (String)waitComboBox.getSelectedItem());
+ prop.setProperty("waitMode", (String) waitComboBox.getSelectedItem());
prop.setProperty("waitTime", waitTimeField.getText());
prop.setProperty("prescale", prescaleField.getText());
try {
@@ -202,7 +200,7 @@
}
}
- public void loadPropertiesFile(File file) {
+ void loadPropertiesFile(File file) {
Properties prop = new Properties();
try {
prop.load(new FileInputStream(file));
@@ -216,14 +214,14 @@
qSizeField.setText(prop.getProperty("qSize"));
positionField.setText(prop.getProperty("position"));
ppositionField.setText(prop.getProperty("pposition"));
- setWaitMode(prop.getProperty("waitMode"));
+ setWaitMode(prop.getProperty("waitMode"));
waitTimeField.setText(prop.getProperty("waitTime"));
prescaleField.setText(prop.getProperty("prescale"));
} catch (FileNotFoundException e) {
showErrorDialog(e.getLocalizedMessage());
} catch (IOException e) {
showErrorDialog(e.getLocalizedMessage());
- }
+ }
this.connectionParameters = getConnectionParameters();
- }
+ }
}
\ No newline at end of file
Use REPLY-ALL to reply to list
To unsubscribe from the LCD-CVS list, click the following link:
https://listserv.slac.stanford.edu/cgi-bin/wa?SUBED1=LCD-CVS&A=1