hps-java/src/main/java/org/lcsim/hps/monitoring

diff -u -r1.6 -r1.7
--- EventPanel.java	13 Apr 2012 00:56:42 -0000	1.6
+++ EventPanel.java	18 Apr 2012 19:52:15 -0000	1.7
@@ -3,8 +3,6 @@

 import java.awt.Color;
 import java.awt.GridBagConstraints;
 import java.awt.GridBagLayout;

-import java.awt.event.ActionEvent;
-import java.awt.event.ActionListener;

 import java.text.DecimalFormat;
 
 import javax.swing.JLabel;

@@ -12,7 +10,7 @@

 import javax.swing.JTextField;
 import javax.swing.SwingUtilities;
 

-class EventPanel extends JPanel implements ActionListener {

+class EventPanel extends JPanel { 

 
     private JTextField eventCounterField; // number of events in this job, can be reset via menu
     private JTextField elapsedTimeField; // elapsed time between job start or reset command

@@ -27,7 +25,6 @@

     private static final int defaultEventRefresh = 100;
     private int eventRefresh = defaultEventRefresh;
     

-    private long jobStartTime;

     private int eventCount;
     private int badEventCount;
     private int sessionSupplied;

@@ -217,7 +214,7 @@

     	});
     }
     

-    void updateAverageEventRate() {

+    void updateAverageEventRate(long jobStartTime) {

         if (updateEvent) {
             double jobTime = System.currentTimeMillis() - jobStartTime;
             if (jobTime > 0) {

@@ -231,25 +228,15 @@

             }
         }
     }

-        
-    void updateElapsedTime() {    
-        if (updateEvent) {
-            SwingUtilities.invokeLater(new Runnable() {
-                public void run() {
-                    elapsedTimeField.setText(Long.toString((System.currentTimeMillis() - jobStartTime)/1000));                    
-                }
-            });            
-        }
-    }
-    
-    // FIXME: Move this to MonitoringApplicationActionListener.
-    public void actionPerformed(ActionEvent e) {
-        String cmd = e.getActionCommand();
-        if (MonitoringCommands.resetEventsCmd.equals(cmd)) {
-            reset();
-        } 

+            
+    void setElapsedTime(final long time) {
+        SwingUtilities.invokeLater(new Runnable() {
+            public void run() {
+                elapsedTimeField.setText(Long.toString(time));
+            }
+        });       

     }

-        

+           

     void setEventRefresh(final int eventRefresh) {
         this.eventRefresh = eventRefresh;
         SwingUtilities.invokeLater(new Runnable() {

@@ -264,7 +251,6 @@

         resetBadEventCount();
         resetAverageEventRate();
         resetElapsedTime();

-        resetJobStartTime();

     }
 	    
 	private void resetEventCount() {

@@ -284,10 +270,6 @@

 	    });
 	}   
 

-	private void resetJobStartTime() {
-		jobStartTime = System.currentTimeMillis();
-	}
-

 	private void resetAverageEventRate() {
 	    SwingUtilities.invokeLater(new Runnable() {
             public void run() {

hps-java/src/main/java/org/lcsim/hps/monitoring

diff -u -r1.18 -r1.19
--- MonitoringApplication.java	17 Apr 2012 23:25:36 -0000	1.18
+++ MonitoringApplication.java	18 Apr 2012 19:52:15 -0000	1.19
@@ -13,6 +13,7 @@

 import static org.lcsim.hps.monitoring.MonitoringCommands.savePlotsCmd;
 import static org.lcsim.hps.monitoring.MonitoringCommands.screenshotCmd;
 import static org.lcsim.hps.monitoring.MonitoringCommands.terminalCmd;

+import static org.lcsim.hps.monitoring.MonitoringCommands.updateTimerCmd;

 
 import java.awt.AWTException;
 import java.awt.Dimension;

@@ -42,6 +43,7 @@

 import javax.swing.JPanel;
 import javax.swing.JTabbedPane;
 import javax.swing.SwingUtilities;

+import javax.swing.Timer;

 
 import org.jlab.coda.et.EtAttachment;
 import org.jlab.coda.et.EtEvent;

@@ -109,6 +111,10 @@

 	private LCSimEventBuilder eventBuilder;
 	
 	private MonitoringApplicationActionListener actionListener;

+	
+	private Timer timer;
+	
+	private long jobStartTime;

 
 	public static final class JobParameters {
 		private String detectorName;

@@ -145,18 +151,6 @@

 	        else if (disconnectCmd.equals(cmd)) {
 	            app.disconnect(ConnectionStatus.DISCONNECTING);
 	        } 

-	        else if (saveConnectionCmd.equals(cmd)) {
-	            app.connectionPanel.actionPerformed(e);
-	        } 
-	        else if (loadConnectionCmd.equals(cmd)) {
-	            app.connectionPanel.actionPerformed(e);
-	        } 
-	        else if (resetConnectionSettingsCmd.equals(cmd)) {
-	            app.connectionPanel.actionPerformed(e);        
-	        } 
-	        else if (resetEventsCmd.equals(cmd)) {
-	            app.eventPanel.actionPerformed(e);        
-	        } 

 	        else if (eventRefreshCmd.equals(cmd)) {
 	            app.setEventRefresh();
 	        }

@@ -178,6 +172,21 @@

 	        else if (exitCmd.equals(cmd)) {
 	            app.exit();
 	        }

+	        else if (updateTimerCmd.equals(cmd)) {
+	            app.updateTime();
+	        }
+	        else if (resetEventsCmd.equals(cmd)) {
+	            app.resetJob();
+	        } 
+	        else if (saveConnectionCmd.equals(e.getActionCommand())) {
+	            app.connectionPanel.save();
+	        } 
+	        else if (loadConnectionCmd.equals(e.getActionCommand())) {
+	            app.connectionPanel.load();
+	        } 
+	        else if (resetConnectionSettingsCmd.equals(e.getActionCommand())) {
+	            app.connectionPanel.reset();
+	        }

 	    } 
 	}
 	

@@ -546,6 +555,9 @@

 	    
 	    // This is only reset between different jobs (disconnects).
         eventPanel.resetSessionSupplied();

+        
+        // Start the job timer.
+        startTimer();

 
 	    // Start the event processing loop.
 	    int status = eventLoop();

@@ -572,6 +584,8 @@

 	private void stopJob() {
         if (jobManager != null)
             jobManager.finish();

+        timer.stop();
+        timer = null;

 	}
 	
 	private void startEvent() {

@@ -581,10 +595,10 @@

 	private void endEvent() {
 
 		// Update the average event rate.

-		eventPanel.updateAverageEventRate();                    

+		eventPanel.updateAverageEventRate(jobStartTime);                    

 
 		// Update elapsed time.

-		eventPanel.updateElapsedTime();

+		//eventPanel.updateElapsedTime();

 	}
 	
 	private void badEvent() {

@@ -864,4 +878,21 @@

             }
         }
     }

+    
+    private void startTimer() {
+        timer = new Timer(1000, actionListener);
+        timer.setActionCommand(updateTimerCmd);
+        jobStartTime = System.currentTimeMillis();
+        timer.start();
+    }   
+    
+    private void updateTime() {
+        final long elapsedTime = (System.currentTimeMillis() - jobStartTime)/1000;
+        eventPanel.setElapsedTime(elapsedTime);
+    }
+    
+    private void resetJob() {
+        jobStartTime = System.currentTimeMillis();
+        eventPanel.reset();
+    }

 }

\ No newline at end of file

hps-java/src/main/java/org/lcsim/hps/monitoring

diff -u -r1.4 -r1.5
--- MonitoringCommands.java	13 Apr 2012 00:56:42 -0000	1.4
+++ MonitoringCommands.java	18 Apr 2012 19:52:15 -0000	1.5
@@ -23,4 +23,5 @@

 	static final String terminalCmd = "terminalLog";
 	static final String screenshotCmd = "takeScreenshot";
 	static final String eventRefreshCmd = "eventRefreshEdit";

+	static final String updateTimerCmd = "updateTimer";

 }