LISTSERV 16.5 - LCD-CVS Archives

- setLayout(new GridBagLayout()); - - // Panel for labels and values. - //GridBagConstraints c = new GridBagConstraints(); - //c.gridx = 0; - //c.gridy = 0; - //JPanel fieldsPanel = new JPanel(); - //fieldsPanel.setLayout(new GridBagLayout()); - //add(fieldsPanel, c);

- private void connect() { - connectPressed = true; - /* - connectButton.setEnabled(false); - disconnectButton.setEnabled(true); - loadButton.setEnabled(false); - resetButton.setEnabled(false); - */ - } - - private void disconnect() { - connectPressed = false; - /* - connectButton.setEnabled(true); - disconnectButton.setEnabled(false); - loadButton.setEnabled(true); - resetButton.setEnabled(true); - */

+ private void setConnectRequested() { + connectRequested = true; + disconnectRequested = false; + enableConnectionPanel(false); + } + + private void setDisconnectRequested() { + disconnectRequested = true; + connectRequested = false; + } + + void enableConnectionPanel(boolean e) { + etNameField.setEnabled(e); + hostField.setEnabled(e); + portField.setEnabled(e); + blockingField.setEnabled(e); + verboseField.setEnabled(e); + statNameField.setEnabled(e); + chunkField.setEnabled(e); + qSizeField.setEnabled(e); + positionField.setEnabled(e); + ppositionField.setEnabled(e); + waitComboBox.setEnabled(e); + waitTimeField.setEnabled(e); + } + + boolean connectRequested() { + return this.connectRequested; + } + + boolean disconnectRequested() { + return this.disconnectRequested;

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

MonitoringExample.java 1.1 -> 1.2

diff -u -r1.1 -r1.2
--- MonitoringExample.java	27 Mar 2012 03:18:21 -0000	1.1
+++ MonitoringExample.java	27 Mar 2012 04:13:37 -0000	1.2
@@ -21,14 +21,9 @@

 import org.lcsim.util.DriverAdapter;
 
 /**

- * This class is an example of an event consumer for an ET system.
- * 
- * Based on Carl Timmer's apps.Consumer class from jevio 4.0 release.
- *

+ * This is an example monitoring application using the classes from the org.lcsim.hps.monitoring package.

  * @author Jeremy McCormick
  */

-// TODO Move the code that wraps Driver and event loop into the JobControlManager.
-// TODO Add connection status field = disconnected | connected | connecting

 public class MonitoringExample {
     
     private static final String defaultDetectorName = "HPS-Test-JLAB-v4pt0";

@@ -59,109 +54,120 @@

     	jobPanel.setDetectorName(defaultDetectorName);
     	jobPanel.setSteeringFile(defaultSteeringFile);

-        // Wait for connection via GUI.
-        ConnectionPanel connectionPanel = gui.getConnectionPanel();
-        while (!connectionPanel.connectPressed()) {
-        	try { Thread.sleep(1000); } catch (InterruptedException e)  {};
-        }        
-        ConnectionParameters cn = connectionPanel.getConnectionParameters();
-        
-        // Try block is mostly for EtExceptions and friends.
-        try {        	
-        	       
-        	// Setup connection to ET system.
-        	EtConnection et = EtConnection.makeEtConnection(cn);
-        	EtSystem sys = et.getEtSystem();
-        	EtAttachment att = et.getEtAttachment();   
-        	                        
-            // Job manager to run LCSim.
-            String steeringFile = jobPanel.getSteeringFile();
-            jobMgr = new JobControlManager();
-            jobMgr.checkInputFiles(false);
-            InputStream is = this.getClass().getResourceAsStream(steeringFile);
-            jobMgr.setup(is);
-            
-            // Set ref to JobControlManager in GUI so resetting works.
-            gui.setJobControlManager(jobMgr);
-                                    
-            // Make a DriverAdapter for wrapping event loop.
-            DriverAdapter driverAdapter = jobMgr.getDriverAdapter();
-                                    
-            // Call wrapper to startOfData() on DriverAdapter.
-            driverAdapter.configure(null);
-                        
-            // Make the builder for creating LCSim events from EVIO data.
-            String detectorName = jobPanel.getDetectorName();
-            LCSimEventBuilder eventBuilder = new LCSimEventBuilder(detectorName);
-            eventBuilder.setDebug(false);
-                                                
-            // Start job timer.
-            EventPanel eventPanel = gui.getEventPanel();
-            eventPanel.updateJobStartTime();
-
-            // array of events
-            EtEvent[] mevs = null;
-            
-            // EtEvent loop.
-            while (true) { 
-                try {           
-                	// Choose wait or sleep mode depending on connection settings.
-                	if (cn.waitMode == WaitMode.WAIT) {
-                		mevs = sys.getEvents(att, Mode.TIMED, Modify.NOTHING, cn.waitTime, cn.chunk);
-                	} else {
-                		mevs = sys.getEvents(att, Mode.SLEEP, Modify.NOTHING, 0, cn.chunk);
-                	}
-                	
-                    // Loop over retrieved EtEvents.
-                    for (EtEvent mev : mevs) {
-
-                    	// Update GUI's event count.
-                    	eventPanel.updateEventCount();                    
-
-                    	// Get EvioEvent and check for errors.
-                    	ByteBuffer buf = mev.getDataBuffer();
-                    	EvioReader reader = new EvioReader(buf);
-                    	EvioEvent evioEvent = null;
-                    	try {
-                    		evioEvent = reader.parseNextEvent();
-                    	} catch (java.nio.BufferUnderflowException e) {
-                    		// Error will be caught by subsequent check on null event.
-                    	}
-                    	if (evioEvent == null) {
-                    		eventPanel.updateBadEventCount();
-                    		continue;
-                    	}
-
-                    	// Create LCSim event from EVIO data.
-                    	EventHeader lcsimEvent = eventBuilder.makeLCSimEvent(evioEvent);
-
-                    	// Make a new event for DriverAdapter.
-                    	RecordSuppliedEvent loopEvent = new RecordSuppliedEvent(new Object(), lcsimEvent);
-
-                    	// Call process methods via Driver Adapter.
-                    	driverAdapter.recordSupplied(loopEvent);
-
-                    	// Update the average event rate.
-                    	eventPanel.updateAverageEventRate();                    
-
-                    	// Update elapsed time.
-                    	eventPanel.updateElapsedTime();
-                }
-                    
-                // Put events back into the ET system.
-                sys.putEvents(att, mevs);   
-                
-                } catch (EtTimeoutException e) {
-                    System.out.println("ET Consumer timed out.");
-                    driverAdapter.finish(null);
-                    System.out.println("Press ENTER to exit ...");
-                    System.console().readLine();
-                    System.exit(0);
-                }
-            }
-        } catch (Exception ex) {
-            System.out.println("Error using ET system as consumer.");
-            ex.printStackTrace();
-        }
-    }

+    	// Get ConnectionPanel which can be used to connect/disconnect from ET system.
+		ConnectionPanel connectionPanel = gui.getConnectionPanel();
+    	
+    	// GUI loop.  Use 'Exit' command from GUI to quit.
+    	while (true) {
+
+    		// Wait for connection to be requested via GUI.
+    		while (!connectionPanel.connectRequested()) {
+    			try { Thread.sleep(1000); } catch (InterruptedException e)  {};
+    		}        
+    		ConnectionParameters cn = connectionPanel.getConnectionParameters();
+    		    		
+    		// This makes sure applicable menu items are enabled/disabled.
+    		gui.connect();
+
+    		// Try block is mostly for EtExceptions and friends.
+    		try {        	
+
+    			// Setup connection to ET system.
+    			EtConnection et = EtConnection.makeEtConnection(cn);
+    			EtSystem sys = et.getEtSystem();
+    			EtAttachment att = et.getEtAttachment();   
+
+    			// Job manager to run LCSim.
+    			String steeringFile = jobPanel.getSteeringFile();
+    			jobMgr = new JobControlManager();
+    			jobMgr.checkInputFiles(false);
+    			InputStream is = this.getClass().getResourceAsStream(steeringFile);
+    			jobMgr.setup(is);
+
+    			// Set ref to JobControlManager in GUI so resetting works.
+    			gui.setJobControlManager(jobMgr);
+
+    			// Make a DriverAdapter for wrapping event loop.
+    			DriverAdapter driverAdapter = jobMgr.getDriverAdapter();
+
+    			// Call wrapper to startOfData() on DriverAdapter.
+    			driverAdapter.configure(null);
+
+    			// Make the builder for creating LCSim events from EVIO data.
+    			String detectorName = jobPanel.getDetectorName();
+    			LCSimEventBuilder eventBuilder = new LCSimEventBuilder(detectorName);
+    			eventBuilder.setDebug(false);
+
+    			// Start job timer.
+    			EventPanel eventPanel = gui.getEventPanel();
+    			eventPanel.updateJobStartTime();
+
+    			// array of events
+    			EtEvent[] mevs = null;
+
+    			// EtEvent loop.
+    			while (true) { 
+    				try {           
+    					// Choose wait or sleep mode depending on connection settings.
+    					if (cn.waitMode == WaitMode.WAIT) {
+    						mevs = sys.getEvents(att, Mode.TIMED, Modify.NOTHING, cn.waitTime, cn.chunk);
+    					} else {
+    						mevs = sys.getEvents(att, Mode.SLEEP, Modify.NOTHING, 0, cn.chunk);
+    					}
+
+    					// Loop over retrieved EtEvents.
+    					for (EtEvent mev : mevs) {
+
+    						// Update GUI's event count.
+    						eventPanel.updateEventCount();                    
+
+    						// Get EvioEvent and check for errors.
+    						ByteBuffer buf = mev.getDataBuffer();
+    						EvioReader reader = new EvioReader(buf);
+    						EvioEvent evioEvent = null;
+    						try {
+    							evioEvent = reader.parseNextEvent();
+    						} catch (java.nio.BufferUnderflowException e) {
+    							// Error will be caught by subsequent check on null event.
+    						}
+    						if (evioEvent == null) {
+    							eventPanel.updateBadEventCount();
+    							continue;
+    						}
+
+    						// Create LCSim event from EVIO data.
+    						EventHeader lcsimEvent = eventBuilder.makeLCSimEvent(evioEvent);
+
+    						// Supply record to Driver Adapter.
+    						driverAdapter.recordSupplied(new RecordSuppliedEvent(new Object(), lcsimEvent));
+
+    						// Update the average event rate.
+    						eventPanel.updateAverageEventRate();                    
+
+    						// Update elapsed time.
+    						eventPanel.updateElapsedTime();
+    					}
+
+    					// Put events back into the ET system.
+    					sys.putEvents(att, mevs);   
+    					
+    					// Break out of event loop if GUI wants disconnect. 
+    					if (connectionPanel.disconnectRequested()) {
+    						System.out.println("Disconnect requested.  Breaking out of event loop.");
+    						gui.disconnect();
+    						break;
+    					}
+
+    				} catch (EtTimeoutException e) {
+    					System.out.println("ET Consumer timed out.");
+    					driverAdapter.finish(null);
+    					break;
+    				}
+    			}
+    		} catch (Exception ex) {
+    			System.out.println("Error using ET system as consumer.");
+    			ex.printStackTrace();
+    		}
+    	}      
+    }

\ No newline at end of file

Commit in `hps-java/src/main/java/org/lcsim/hps/monitoring` on MAIN
`ConnectionPanel.java`	+40	-40	1.5 -> 1.6
`MonitoringApplication.java`	+46	-11	1.1 -> 1.2
`MonitoringExample.java`	+117	-111	1.1 -> 1.2
`SensorOccupancyPlotsDriver.java`	+1		1.5 -> 1.6
	+204	-162