hps-java/src/main/java/org/lcsim/hps/monitoring
diff -u -r1.11 -r1.12
--- MonitoringApplication.java 10 Apr 2012 01:00:13 -0000 1.11
+++ MonitoringApplication.java 13 Apr 2012 00:02:54 -0000 1.12
@@ -59,14 +59,13 @@
import org.lcsim.util.aida.AIDA;
// TODO: Make screenshot format selectable in combo box (png, jpeg, etc.).
-// TODO: Have subclass that implements ActionListener instead of this one.
-// TODO: Add some spacing/padding in tab fields.
+// TODO: Add some spacing/padding around the components in tabs.
// TODO: Event refresh should be set via "Event -> Event Refresh..." which can check for validity and then push to GUI.
// Disallow direct edits to Event Monitor GUI component.
// TODO: Move the parts of this class having to do with EtEvent/EvioEvent/LCSimEvent to separate classes.
-// TODO: Move the Swing parts of this class to MonitoringApplicationGui.
-// TODO: Need Timer thread to update elapsed time fields independent of event processing.
-// http://docs.oracle.com/javase/1.4.2/docs/api/java/util/Timer.html
+// TODO: Move the Swing parts of this class to MonitoringGui class.
+// TODO: Should have Timer to update elapsed time field independent of event processing.
+// http://docs.oracle.com/javase/1.4.2/docs/api/java/util/Timer.html
// TODO: help menu
public class MonitoringApplication {
@@ -328,48 +327,7 @@
private boolean connectionRequested() {
return connectionStatus == ConnectionStatus.CONNECTION_REQUESTED;
}
- /*
- public void actionPerformed(ActionEvent e) {
- String cmd = e.getActionCommand();
- if (connectCmd.equals(cmd)) {
- requestConnection();
- }
- else if (disconnectCmd.equals(cmd)) {
- disconnect(ConnectionStatus.DISCONNECTING);
- }
- else if (saveConnectionCmd.equals(cmd)) {
- connectionPanel.actionPerformed(e);
- }
- else if (loadConnectionCmd.equals(cmd)) {
- connectionPanel.actionPerformed(e);
- }
- else if (resetConnectionSettingsCmd.equals(cmd)) {
- connectionPanel.actionPerformed(e);
- }
- else if (resetEventsCmd.equals(cmd)) {
- eventPanel.actionPerformed(e);
- }
- else if (savePlotsCmd.equals(cmd)) {
- savePlots();
- }
- else if (resetDriversCmd.equals(cmd)) {
- resetDrivers();
- }
- else if (logCmd.equals(cmd)) {
- logToFile();
- }
- else if (terminalCmd.equals(cmd)) {
- logToTerminal();
- }
- else if (screenshotCmd.equals(cmd)) {
- screenshot();
- }
- else if (exitCmd.equals(cmd)) {
- exit();
- }
- }
- */
-
+
private void showDialog(String m) {
JOptionPane.showMessageDialog(mainPanel, m);
}
@@ -730,6 +688,7 @@
private EvioEvent createEvioEvent(EtEvent etEvent) throws IOException, EvioException {
ByteBuffer buf = etEvent.getDataBuffer();
+ System.out.println("createEvioEvent - buf position = " + buf.position());
EvioReader reader = new EvioReader(buf);
EvioEvent evioEvent = null;
try {