LISTSERV 16.5 - LCD-CVS Archives

- JTextField etNameField; - JTextField hostField; - JTextField portField; - JCheckBox blockingCheckBox; - JCheckBox verboseCheckBox; - JTextField statNameField; - JTextField chunkField; - JTextField qSizeField; - JTextField positionField; - JTextField ppositionField; - JComboBox waitComboBox; - JTextField waitTimeField; - JTextField prescaleField;

+ private JTextField etNameField; + private JTextField hostField; + private JTextField portField; + private JCheckBox blockingCheckBox; + private JCheckBox verboseCheckBox; + private JTextField statNameField; + private JTextField chunkField; + private JTextField qSizeField; + private JTextField positionField; + private JTextField ppositionField; + private JComboBox waitComboBox; + private JTextField waitTimeField; + private JTextField prescaleField; + + private ConnectionParameters connectionParameters;

if (idx < 0 || idx > (ConnectionStatus.NUMBER_STATUSES - 1)) { throw new IllegalArgumentException("Invalid index value. Must be between 0 and " + (ConnectionStatus.NUMBER_STATUSES - 1) + "."); }

- 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 - private JTextField avgEventRateField; // average event rate in this job or between resets

+ private JTextField eventCounterField; // number of events in this job + private JTextField elapsedTimeField; // elapsed time between job start + private JTextField avgEventRateField; // average event rate in this job

- private JTextField sessionSuppliedField; // number of events supplied in this session, ignored by reset command - private JTextField totalSuppliedField; // number of events supplied since app started (this is never reset by any user command)

+ private JTextField sessionSuppliedField; // number of events supplied in this session; ignored by reset command + private JTextField totalSuppliedField; // number of events supplied since the application started

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

MonitoringApplication.java 1.19 -> 1.20

diff -u -r1.19 -r1.20
--- MonitoringApplication.java	18 Apr 2012 19:52:15 -0000	1.19
+++ MonitoringApplication.java	18 Apr 2012 21:06:54 -0000	1.20
@@ -13,7 +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 static org.lcsim.hps.monitoring.MonitoringCommands.udpateTimeCmd;

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

@@ -172,7 +172,7 @@

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

-	        else if (updateTimerCmd.equals(cmd)) {

+	        else if (udpateTimeCmd.equals(cmd)) {

 	            app.updateTime();
 	        }
 	        else if (resetEventsCmd.equals(cmd)) {

@@ -202,20 +202,15 @@

 		// Setup the menus.
 		createMenu();

-		//
-		// Connection status panel, placed at top.
-		//
-

+		// Main panel.

 		GridBagConstraints c = new GridBagConstraints();
 		c.gridx = 0;
 		c.gridy = 0;
 		c.anchor = GridBagConstraints.NORTHWEST;
 		connectionStatusPanel = new ConnectionStatusPanel();
 		mainPanel.add(connectionStatusPanel, c);

-		
-		//
-		// Create a tab for each sub-panel.
-		//

+	
+		// Sub-panels.

 		connectionPanel = new ConnectionPanel();
 		eventPanel = new EventPanel();
 		jobPanel = new JobPanel();

@@ -228,6 +223,7 @@

 		tabs.addTab("Job Settings", jobPanel);
 		tabsPanel.add(tabs);

+		// Add tabs to main panel.

 		c = new GridBagConstraints();
 		c.gridx = 0;
 		c.gridy = 1;

@@ -346,7 +342,7 @@

 	    connectionStatusPanel.setStatus(status);
 	}

-	int getConnectionStatus() {

+	private int getConnectionStatus() {

 	    return connectionStatus;
 	}

@@ -387,8 +383,8 @@

         }
     }

+    // FIXME: Put this in JobManager???

 	private synchronized void resetDrivers() {

-	    // FIXME: Put this in JobManager???

 		if (jobManager != null) {
 			for (Driver driver : jobManager.getDriverExecList()) {
 				if (driver instanceof Resettable) {

@@ -595,10 +591,7 @@

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

-		eventPanel.updateAverageEventRate(jobStartTime);                    
-
-		// Update elapsed time.
-		//eventPanel.updateElapsedTime();

+		eventPanel.updateAverageEventRate(jobStartTime);

 	}
 	
 	private void badEvent() {

@@ -881,7 +874,7 @@

     
     private void startTimer() {
         timer = new Timer(1000, actionListener);

-        timer.setActionCommand(updateTimerCmd);

+        timer.setActionCommand(udpateTimeCmd);

         jobStartTime = System.currentTimeMillis();
         timer.start();
     }

- IHistogram1D adcValuePlot; - IHistogram1D rawHitCountPlot; - IHistogram1D tkrHitCountPlot; - IHistogram1D tkrCountPlot; - ICloud1D hitsPerTrackPlot; - IHistogram1D tkrMomXPlot; - IHistogram1D tkrMomYPlot; - IHistogram1D tkrMomZPlot; - IHistogram1D tkrMomPlot; - ICloud1D timePlot; - ICloud1D ecalTimePlot; - ICloud1D ecalAmplitudePlot; - ICloud1D ecalHitsPlot;

+ private IHistogram1D adcValuePlot; + private IHistogram1D rawHitCountPlot; + private IHistogram1D tkrHitCountPlot; + private IHistogram1D tkrCountPlot; + private ICloud1D hitsPerTrackPlot; + private IHistogram1D tkrMomXPlot; + private IHistogram1D tkrMomYPlot; + private IHistogram1D tkrMomZPlot; + private IHistogram1D tkrMomPlot; + private ICloud1D timePlot; + private ICloud1D ecalTimePlot; + private ICloud1D ecalAmplitudePlot; + private ICloud1D ecalHitsPlot;

Commit in `hps-java/src/main/java/org/lcsim/hps/monitoring` on MAIN
`ConnectionPanel.java`	+17	-17	1.13 -> 1.14
`ConnectionStatus.java`	+1	-1	1.1 -> 1.2
`ConnectionStatusPanel.java`	+1	-1	1.2 -> 1.3
`EventPanel.java`	+7	-7	1.7 -> 1.8
`JobPanel.java`	+8	-8	1.5 -> 1.6
`MonitoringApplication.java`	+10	-17	1.19 -> 1.20
`MonitoringCommands.java`	+6	-6	1.5 -> 1.6
`MonitoringPlotsDriver.java`	+13	-13	1.2 -> 1.3
	+63	-70