 |
 |
| Commit in hps-java/src/main/java/org/lcsim/hps/monitoring on MAIN | |||
| ConnectionPanel.java | +29 | 1.15 -> 1.16 | |
| ConnectionStatusPanel.java | +7 | -3 | 1.3 -> 1.4 |
| EventPanel.java | +22 | -1 | 1.9 -> 1.10 |
| JobPanel.java | +19 | 1.7 -> 1.8 | |
| MonitoringApplication.java | +13 | -9 | 1.24 -> 1.25 |
| +90 | -13 | ||
adjustments to field spacing in tabs
diff -u -r1.15 -r1.16 --- ConnectionPanel.java 19 Apr 2012 01:34:27 -0000 1.15 +++ ConnectionPanel.java 23 Apr 2012 21:05:11 -0000 1.16 @@ -3,6 +3,7 @@
import java.awt.Color; import java.awt.GridBagConstraints; import java.awt.GridBagLayout;
+import java.awt.Insets;
import java.awt.event.ActionEvent; import java.io.File; import java.io.FileInputStream;
@@ -51,6 +52,8 @@
connectionParameters = new ConnectionParameters();
setLayout(new GridBagLayout());
+ + Insets insets = new Insets(2, 2, 2, 2);
//
// Define the fields.
@@ -59,6 +62,7 @@
GridBagConstraints c = new GridBagConstraints();
c.gridx = 0;
c.gridy = 0;
+ c.insets = insets;
c.anchor = GridBagConstraints.WEST;
JLabel etNameLabel = new JLabel("ET Name:");
etNameLabel.setHorizontalAlignment(JLabel.LEFT);
@@ -67,6 +71,7 @@
c = new GridBagConstraints();
c.gridx = 1;
c.gridy = 0;
+ c.insets = insets;
c.anchor = GridBagConstraints.EAST;
etNameField = new JTextField("", 20);
etNameField.setHorizontalAlignment(JTextField.RIGHT);
@@ -75,6 +80,7 @@
c = new GridBagConstraints();
c.gridx = 0;
c.gridy = 1;
+ c.insets = insets;
c.anchor = GridBagConstraints.WEST;
JLabel hostLabel = new JLabel("Host:");
hostLabel.setHorizontalAlignment(JLabel.LEFT);
@@ -83,6 +89,7 @@
c = new GridBagConstraints();
c.gridx = 1;
c.gridy = 1;
+ c.insets = insets;
c.anchor = GridBagConstraints.EAST;
hostField = new JTextField(20);
hostField.setHorizontalAlignment(JTextField.RIGHT);
@@ -91,6 +98,7 @@
c = new GridBagConstraints();
c.gridx = 0;
c.gridy = 2;
+ c.insets = insets;
c.anchor = GridBagConstraints.WEST;
JLabel portLabel = new JLabel("Port:");
portLabel.setHorizontalAlignment(JLabel.LEFT);
@@ -99,6 +107,7 @@
c = new GridBagConstraints();
c.gridx = 1;
c.gridy = 2;
+ c.insets = insets;
c.anchor = GridBagConstraints.EAST;
portField = new JTextField(5);
portField.setHorizontalAlignment(JTextField.RIGHT);
@@ -107,6 +116,7 @@
c = new GridBagConstraints();
c.gridx = 0;
c.gridy = 3;
+ c.insets = insets;
c.anchor = GridBagConstraints.WEST;
JLabel blockingLabel = new JLabel("Blocking:");
blockingLabel.setHorizontalAlignment(JLabel.LEFT);
@@ -115,6 +125,7 @@
c = new GridBagConstraints();
c.gridx = 1;
c.gridy = 3;
+ c.insets = insets;
c.anchor = GridBagConstraints.EAST;
blockingCheckBox = new JCheckBox();
add(blockingCheckBox, c);
@@ -122,6 +133,7 @@
c = new GridBagConstraints();
c.gridx = 0;
c.gridy = 4;
+ c.insets = insets;
c.anchor = GridBagConstraints.WEST;
JLabel verboseLabel = new JLabel("Verbose:");
verboseLabel.setHorizontalAlignment(JLabel.LEFT);
@@ -130,6 +142,7 @@
c = new GridBagConstraints();
c.gridx = 1;
c.gridy = 4;
+ c.insets = insets;
c.anchor = GridBagConstraints.EAST;
verboseCheckBox = new JCheckBox();
add(verboseCheckBox, c);
@@ -137,6 +150,7 @@
c = new GridBagConstraints();
c.gridx = 0;
c.gridy = 5;
+ c.insets = insets;
c.anchor = GridBagConstraints.WEST;
JLabel statNameLabel = new JLabel("Station Name:");
statNameLabel.setHorizontalAlignment(JLabel.LEFT);
@@ -145,6 +159,7 @@
c = new GridBagConstraints();
c.gridx = 1;
c.gridy = 5;
+ c.insets = insets;
c.anchor = GridBagConstraints.EAST;
statNameField = new JTextField(10);
statNameField.setHorizontalAlignment(JTextField.RIGHT);
@@ -153,6 +168,7 @@
c = new GridBagConstraints();
c.gridx = 0;
c.gridy = 6;
+ c.insets = insets;
c.anchor = GridBagConstraints.WEST;
JLabel chunkLabel = new JLabel("Chunk Size:");
chunkLabel.setToolTipText("Number of events returned in array.");
@@ -162,6 +178,7 @@
c = new GridBagConstraints();
c.gridx = 1;
c.gridy = 6;
+ c.insets = insets;
c.anchor = GridBagConstraints.EAST;
chunkField = new JTextField(3);
chunkField.setHorizontalAlignment(JTextField.RIGHT);
@@ -170,6 +187,7 @@
c = new GridBagConstraints();
c.gridx = 0;
c.gridy = 7;
+ c.insets = insets;
c.anchor = GridBagConstraints.WEST;
JLabel qSizeLabel = new JLabel("Queue Size:");
qSizeLabel.setHorizontalAlignment(JLabel.LEFT);
@@ -178,6 +196,7 @@
c = new GridBagConstraints();
c.gridx = 1;
c.gridy = 7;
+ c.insets = insets;
c.anchor = GridBagConstraints.EAST;
qSizeField = new JTextField(3);
qSizeField.setHorizontalAlignment(JTextField.RIGHT);
@@ -186,6 +205,7 @@
c = new GridBagConstraints();
c.gridx = 0;
c.gridy = 8;
+ c.insets = insets;
c.anchor = GridBagConstraints.WEST;
JLabel positionLabel = new JLabel("Station Position:");
positionLabel.setHorizontalAlignment(JLabel.LEFT);
@@ -194,6 +214,7 @@
c = new GridBagConstraints();
c.gridx = 1;
c.gridy = 8;
+ c.insets = insets;
c.anchor = GridBagConstraints.EAST;
positionField = new JTextField(3);
positionField.setHorizontalAlignment(JLabel.RIGHT);
@@ -202,6 +223,7 @@
c = new GridBagConstraints();
c.gridx = 0;
c.gridy = 9;
+ c.insets = insets;
c.anchor = GridBagConstraints.WEST;
JLabel ppositionLabel = new JLabel("Station Parallel Position:");
ppositionLabel.setHorizontalAlignment(JLabel.LEFT);
@@ -210,6 +232,7 @@
c = new GridBagConstraints();
c.gridx = 1;
c.gridy = 9;
+ c.insets = insets;
c.anchor = GridBagConstraints.EAST;
ppositionField = new JTextField(3);
ppositionField.setHorizontalAlignment(JLabel.RIGHT);
@@ -218,6 +241,7 @@
c = new GridBagConstraints();
c.gridx = 0;
c.gridy = 10;
+ c.insets = insets;
c.anchor = GridBagConstraints.WEST;
JLabel waitModeLabel = new JLabel("Wait Mode:");
waitModeLabel.setHorizontalAlignment(JLabel.LEFT);
@@ -226,6 +250,7 @@
c = new GridBagConstraints();
c.gridx = 1;
c.gridy = 10;
+ c.insets = insets;
c.anchor = GridBagConstraints.EAST;
waitComboBox = new JComboBox(waitModes);
add(waitComboBox, c);
@@ -233,6 +258,7 @@
c = new GridBagConstraints();
c.gridx = 0;
c.gridy = 11;
+ c.insets = insets;
c.anchor = GridBagConstraints.WEST;
JLabel waitTimeLabel = new JLabel("Wait Time [microseconds]:");
waitTimeLabel.setHorizontalAlignment(JLabel.LEFT);
@@ -241,6 +267,7 @@
c = new GridBagConstraints();
c.gridx = 1;
c.gridy = 11;
+ c.insets = insets;
c.anchor = GridBagConstraints.EAST;
waitTimeField = new JTextField(8);
waitTimeField.setBackground(Color.WHITE);
@@ -250,6 +277,7 @@
c = new GridBagConstraints();
c.gridx = 0;
c.gridy = 12;
+ c.insets = insets;
c.anchor = GridBagConstraints.WEST;
JLabel prescaleLabel = new JLabel("Prescale:");
prescaleLabel.setHorizontalAlignment(JLabel.LEFT);
@@ -258,6 +286,7 @@
c = new GridBagConstraints();
c.gridx = 1;
c.gridy = 12;
+ c.insets = insets;
c.anchor = GridBagConstraints.EAST;
prescaleField = new JTextField(8);
prescaleField.setBackground(Color.WHITE);
diff -u -r1.3 -r1.4 --- ConnectionStatusPanel.java 18 Apr 2012 21:06:54 -0000 1.3 +++ ConnectionStatusPanel.java 23 Apr 2012 21:05:11 -0000 1.4 @@ -3,23 +3,26 @@
import java.awt.Color; import java.awt.GridBagConstraints; import java.awt.GridBagLayout;
+import java.awt.Insets;
import javax.swing.JLabel; import javax.swing.JPanel; import javax.swing.JTextField;
-import org.lcsim.hps.monitoring.ConnectionStatus; -
class ConnectionStatusPanel extends JPanel {
JTextField statusField;
ConnectionStatusPanel() {
- setLayout(new GridBagLayout());
+ + setLayout(new GridBagLayout()); + + Insets insets = new Insets(5,2,1,2);
GridBagConstraints c = new GridBagConstraints();
c.gridx = 0;
c.gridy = 0;
+ c.insets = insets;
c.anchor = GridBagConstraints.WEST;
JLabel statusLabel = new JLabel("Connection Status:");
statusLabel.setHorizontalAlignment(JLabel.LEFT);
@@ -28,6 +31,7 @@
c = new GridBagConstraints();
c.gridx = 1;
c.gridy = 0;
+ c.insets = insets;
c.anchor = GridBagConstraints.EAST;
statusField = new JTextField("", 20);
statusField.setHorizontalAlignment(JTextField.RIGHT);
diff -u -r1.9 -r1.10 --- EventPanel.java 19 Apr 2012 23:01:28 -0000 1.9 +++ EventPanel.java 23 Apr 2012 21:05:11 -0000 1.10 @@ -3,6 +3,7 @@
import java.awt.Color; import java.awt.GridBagConstraints; import java.awt.GridBagLayout;
+import java.awt.Insets;
import java.text.DecimalFormat; import javax.swing.JLabel;
@@ -37,11 +38,14 @@
setLayout(new GridBagLayout());
+ Insets insets = new Insets(2, 2, 2, 2); +
GridBagConstraints c = new GridBagConstraints();
// Panel for labels and values.
c.gridx = 0;
c.gridy = 0;
+ c.insets = insets;
JPanel fieldsPanel = new JPanel();
fieldsPanel.setLayout(new GridBagLayout());
add(fieldsPanel, c);
@@ -49,7 +53,8 @@
// Panel for control buttons.
c = new GridBagConstraints();
c.gridx = 0;
- c.gridy = 1;
+ c.gridy = 1;
+ c.insets = insets;
JPanel buttonsPanel = new JPanel();
buttonsPanel.setLayout(new GridBagLayout());
add(buttonsPanel, c);
@@ -57,6 +62,7 @@
c = new GridBagConstraints();
c.gridx = 0;
c.gridy = 0;
+ c.insets = insets;
c.anchor = GridBagConstraints.WEST;
JLabel eventLabel = new JLabel("Events Processed:");
eventLabel.setHorizontalAlignment(JLabel.LEFT);
@@ -65,6 +71,7 @@
c = new GridBagConstraints();
c.gridx = 1;
c.gridy = 0;
+ c.insets = insets;
c.anchor = GridBagConstraints.EAST;
eventCounterField = new JTextField("0", 6);
eventCounterField.setHorizontalAlignment(JTextField.RIGHT);
@@ -75,6 +82,7 @@
c = new GridBagConstraints();
c.gridx = 0;
c.gridy = 1;
+ c.insets = insets;
c.anchor = GridBagConstraints.WEST;
JLabel timeLabel = new JLabel("Elapsed Time [seconds]:");
timeLabel.setHorizontalAlignment(JLabel.LEFT);
@@ -83,6 +91,7 @@
c = new GridBagConstraints();
c.gridx = 1;
c.gridy = 1;
+ c.insets = insets;
c.anchor = GridBagConstraints.EAST;
elapsedTimeField = new JTextField("0", 10);
elapsedTimeField.setHorizontalAlignment(JTextField.RIGHT);
@@ -93,6 +102,7 @@
c = new GridBagConstraints();
c.gridx = 0;
c.gridy = 2;
+ c.insets = insets;
c.anchor = GridBagConstraints.WEST;
JLabel avgRateLabel = new JLabel("Average Event Rate [Hz]:");
avgRateLabel.setHorizontalAlignment(JLabel.LEFT);
@@ -101,6 +111,7 @@
c = new GridBagConstraints();
c.gridx = 1;
c.gridy = 2;
+ c.insets = insets;
c.anchor = GridBagConstraints.EAST;
avgEventRateField = new JTextField("0", 6);
avgEventRateField.setHorizontalAlignment(JTextField.RIGHT);
@@ -111,6 +122,7 @@
c = new GridBagConstraints();
c.gridx = 0;
c.gridy = 3;
+ c.insets = insets;
c.anchor = GridBagConstraints.WEST;
JLabel refreshLabel = new JLabel("Event Refresh:");
refreshLabel.setHorizontalAlignment(JLabel.LEFT);
@@ -119,6 +131,7 @@
c = new GridBagConstraints();
c.gridx = 1;
c.gridy = 3;
+ c.insets = insets;
c.anchor = GridBagConstraints.EAST;
refreshField = new JTextField(Integer.toString(eventRefresh), 8);
refreshField.setHorizontalAlignment(JTextField.RIGHT);
@@ -129,6 +142,7 @@
c = new GridBagConstraints();
c.gridx = 0;
c.gridy = 4;
+ c.insets = insets;
c.anchor = GridBagConstraints.WEST;
JLabel badEventsLabel = new JLabel("Bad Events:");
badEventsLabel.setHorizontalAlignment(JLabel.LEFT);
@@ -137,6 +151,7 @@
c = new GridBagConstraints();
c.gridx = 1;
c.gridy = 4;
+ c.insets = insets;
c.anchor = GridBagConstraints.EAST;
badEventsField = new JTextField("0", 4);
badEventsField.setHorizontalAlignment(JTextField.RIGHT);
@@ -147,6 +162,7 @@
c = new GridBagConstraints();
c.gridx = 0;
c.gridy = 5;
+ c.insets = insets;
c.anchor = GridBagConstraints.WEST;
JLabel sessionSuppliedLabel = new JLabel("Session Supplied Events:");
sessionSuppliedLabel.setHorizontalAlignment(JLabel.LEFT);
@@ -155,6 +171,7 @@
c = new GridBagConstraints();
c.gridx = 1;
c.gridy = 5;
+ c.insets = insets;
c.anchor = GridBagConstraints.EAST;
sessionSuppliedField = new JTextField("0", 8);
sessionSuppliedField.setHorizontalAlignment(JTextField.RIGHT);
@@ -165,6 +182,7 @@
c = new GridBagConstraints();
c.gridx = 0;
c.gridy = 6;
+ c.insets = insets;
c.anchor = GridBagConstraints.WEST;
JLabel totalSuppliedLabel = new JLabel("Total Supplied Events:");
totalSuppliedLabel.setHorizontalAlignment(JLabel.LEFT);
@@ -173,6 +191,7 @@
c = new GridBagConstraints();
c.gridx = 1;
c.gridy = 6;
+ c.insets = insets;
c.anchor = GridBagConstraints.EAST;
totalSuppliedField = new JTextField("0", 8);
totalSuppliedField.setHorizontalAlignment(JTextField.RIGHT);
@@ -183,6 +202,7 @@
c = new GridBagConstraints();
c.gridx = 0;
c.gridy = 7;
+ c.insets = insets;
c.anchor = GridBagConstraints.WEST;
JLabel maxEventsLabel = new JLabel("Max Events:");
maxEventsLabel.setHorizontalAlignment(JLabel.LEFT);
@@ -191,6 +211,7 @@
c = new GridBagConstraints();
c.gridx = 1;
c.gridy = 7;
+ c.insets = insets;
c.anchor = GridBagConstraints.EAST;
maxEventsField = new JTextField("-1", 8);
maxEventsField.setHorizontalAlignment(JTextField.RIGHT);
diff -u -r1.7 -r1.8 --- JobPanel.java 19 Apr 2012 23:01:28 -0000 1.7 +++ JobPanel.java 23 Apr 2012 21:05:11 -0000 1.8 @@ -3,6 +3,7 @@
import java.awt.Color; import java.awt.GridBagConstraints; import java.awt.GridBagLayout;
+import java.awt.Insets;
import java.awt.event.ActionEvent; import java.awt.event.ActionListener; import java.io.File;
@@ -37,9 +38,12 @@
setLayout(new GridBagLayout());
+ Insets insets = new Insets(2, 2, 2, 2); +
GridBagConstraints c = new GridBagConstraints();
c.gridx = 0;
c.gridy = 0;
+ c.insets = insets;
c.anchor = GridBagConstraints.WEST;
JLabel lcsimSteeringTypeLabel = new JLabel("Steering Type:");
lcsimSteeringTypeLabel.setHorizontalAlignment(JLabel.LEFT);
@@ -49,6 +53,7 @@
c = new GridBagConstraints();
c.gridx = 1;
c.gridy = 0;
+ c.insets = insets;
c.anchor = GridBagConstraints.EAST;
steeringComboBox = new JComboBox(steeringTypes);
steeringComboBox.setSelectedIndex(NONE);
@@ -58,6 +63,7 @@
c = new GridBagConstraints();
c.gridx = 0;
c.gridy = 1;
+ c.insets = insets;
c.anchor = GridBagConstraints.WEST;
JLabel lcsimSteeringLabel = new JLabel("Steering File:");
lcsimSteeringLabel.setHorizontalAlignment(JLabel.LEFT);
@@ -67,6 +73,7 @@
c = new GridBagConstraints();
c.gridx = 1;
c.gridy = 1;
+ c.insets = insets;
c.anchor = GridBagConstraints.EAST;
steeringField = new JTextField("", 30);
steeringField.setHorizontalAlignment(JTextField.RIGHT);
@@ -78,6 +85,7 @@
c = new GridBagConstraints();
c.gridx = 0;
c.gridy = 2;
+ c.insets = insets;
c.anchor = GridBagConstraints.WEST;
JLabel detectorLabel = new JLabel("Detector Name:");
detectorLabel.setHorizontalAlignment(JLabel.LEFT);
@@ -87,6 +95,7 @@
c = new GridBagConstraints();
c.gridx = 1;
c.gridy = 2;
+ c.insets = insets;
c.anchor = GridBagConstraints.EAST;
detectorNameField = new JTextField("", 20);
detectorNameField.setHorizontalAlignment(JTextField.RIGHT);
@@ -96,6 +105,7 @@
c = new GridBagConstraints();
c.gridx = 0;
c.gridy = 3;
+ c.insets = insets;
c.anchor = GridBagConstraints.WEST;
JLabel eventBuilderLabel = new JLabel("Event Builder Class:");
eventBuilderLabel.setHorizontalAlignment(JLabel.LEFT);
@@ -105,6 +115,7 @@
c = new GridBagConstraints();
c.gridx = 1;
c.gridy = 3;
+ c.insets = insets;
c.anchor = GridBagConstraints.EAST;
eventBuilderField = new JTextField("", 30);
eventBuilderField.setHorizontalAlignment(JTextField.RIGHT);
@@ -116,6 +127,7 @@
c = new GridBagConstraints();
c.gridx = 0;
c.gridy = 4;
+ c.insets = insets;
c.anchor = GridBagConstraints.WEST;
JLabel jobComboBoxLabel = new JLabel("Log to File:");
jobComboBoxLabel.setHorizontalAlignment(JLabel.LEFT);
@@ -124,6 +136,7 @@
c = new GridBagConstraints();
c.gridx = 1;
c.gridy = 4;
+ c.insets = insets;
c.anchor = GridBagConstraints.EAST;
logCheckBox = new JCheckBox();
logCheckBox.setEnabled(false);
@@ -132,6 +145,7 @@
c = new GridBagConstraints();
c.gridx = 0;
c.gridy = 5;
+ c.insets = insets;
c.anchor = GridBagConstraints.WEST;
JLabel logFileBoxLabel = new JLabel("Log File:");
logFileBoxLabel.setHorizontalAlignment(JLabel.LEFT);
@@ -141,6 +155,7 @@
c = new GridBagConstraints();
c.gridx = 1;
c.gridy = 5;
+ c.insets = insets;
c.anchor = GridBagConstraints.EAST;
logFileField = new JTextField("", 30);
logFileField.setHorizontalAlignment(JLabel.RIGHT);
@@ -151,6 +166,7 @@
c = new GridBagConstraints();
c.gridx = 0;
c.gridy = 6;
+ c.insets = insets;
c.anchor = GridBagConstraints.WEST;
JLabel disconnectWarningLabel = new JLabel("Warn before disconnect:");
disconnectWarningLabel.setHorizontalAlignment(JLabel.LEFT);
@@ -160,6 +176,7 @@
c = new GridBagConstraints();
c.gridx = 1;
c.gridy = 6;
+ c.insets = insets;
c.anchor = GridBagConstraints.EAST;
disconnectWarningCheckBox = new JCheckBox();
disconnectWarningCheckBox.setSelected(false);
@@ -168,6 +185,7 @@
c = new GridBagConstraints();
c.gridx = 0;
c.gridy = 7;
+ c.insets = insets;
c.anchor = GridBagConstraints.WEST;
JLabel disconnectOnErrorLabel = new JLabel("Disconnect on error:");
disconnectOnErrorLabel.setHorizontalAlignment(JLabel.LEFT);
@@ -177,6 +195,7 @@
c = new GridBagConstraints();
c.gridx = 1;
c.gridy = 7;
+ c.insets = insets;
c.anchor = GridBagConstraints.EAST;
disconnectOnErrorCheckBox = new JCheckBox();
disconnectOnErrorCheckBox.setSelected(true);
diff -u -r1.24 -r1.25 --- MonitoringApplication.java 20 Apr 2012 18:46:30 -0000 1.24 +++ MonitoringApplication.java 23 Apr 2012 21:05:11 -0000 1.25 @@ -99,8 +99,8 @@
private JMenuItem steeringItem; private JMenuItem maxEventsItem;
- private PrintStream sysOut = System.out; - private PrintStream sysErr = System.err;
+ private final PrintStream sysOut = System.out; + private final PrintStream sysErr = System.err;
private ConnectionParameters connectionParameters; private EtConnection connection;
@@ -126,6 +126,8 @@
// Maximum number of events to process before disconnect; for unlimited -1 is used. private int maxEvents = -1;
+ private static final String screenshotFormat = "png"; +
private static final class JobParameters {
private String detectorName;
private String steeringResource;
@@ -583,9 +585,7 @@
connection.cleanup(); System.exit(0); }
- - private static final String screenshotFormat = "png"; -
+
private void screenshot() {
JFileChooser fc = new JFileChooser();
fc.setDialogTitle("Save Screenshot");
@@ -888,8 +888,10 @@
return app;
}
- // Run the app with default parameters. - // TODO: Should check for zero args and if so then use the defaults. Otherwise, should take the parameters from the CL.
+ /** + * Run the monitoring application. + * @param args The command line arguments. + */
public static void main(String[] args)
{
final String defaultDetectorName;
@@ -911,11 +913,13 @@
defaultEventBuilder = args[2];
}
- // Setup the MonitoringApplication GUI.
+ // Create the main app class.
MonitoringApplication app = MonitoringApplication.createMonitoringApplication();
- // Push default settings to JobPanel.
+ // Set job parameters.
app.setJobParameters(new JobParameters(new String[] {defaultDetectorName, defaultSteering, defaultEventBuilder}));
+ + // Run the app.
app.run();
}
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