LISTSERV 16.5 - LCD-CVS Archives

+package org.lcsim.hps.monitoring; + +import java.awt.GridBagConstraints; +import java.awt.GridBagLayout; + +import javax.swing.JLabel; +import javax.swing.JPanel; +import javax.swing.JTextField; + +class ConnectionStatusPanel extends JPanel { + + JTextField statusField; + + private static final String[] statuses = { "disconnected", "connected", "connecting", "timed out", "sleeping", "disconnecting" }; + + static final class ConnectionStatus { + static final int DISCONNECTED = 0; + static final int CONNECTED = 1; + static final int CONNECTING = 2; + static final int TIMED_OUT = 3; + static final int SLEEPING = 4; + static final int DISCONNECTING = 5; + } + + ConnectionStatusPanel() { + setLayout(new GridBagLayout()); + + GridBagConstraints c = new GridBagConstraints(); + c.gridx = 0; + c.gridy = 0; + c.anchor = GridBagConstraints.WEST; + JLabel statusLabel = new JLabel("Connection Status:"); + statusLabel.setHorizontalAlignment(JLabel.LEFT); + add(statusLabel, c); + + c = new GridBagConstraints(); + c.gridx = 1; + c.gridy = 0; + c.anchor = GridBagConstraints.EAST; + statusField = new JTextField("", 12); + statusField.setHorizontalAlignment(JTextField.RIGHT); + add(statusField, c); + + setStatus(ConnectionStatus.DISCONNECTED); + } + + public void setStatus(int idx) { + if (idx < 0 || idx > (statuses.length - 1)) { + throw new IllegalArgumentException("Invalid index value. Must be between 0 and " + statuses.length + "."); + } + statusField.setText(statuses[idx].toUpperCase()); + } +}

+import static org.lcsim.hps.monitoring.MonitoringCommands.connectCmd; +import static org.lcsim.hps.monitoring.MonitoringCommands.disconnectCmd; +import static org.lcsim.hps.monitoring.MonitoringCommands.loadConnectionCmd; +import static org.lcsim.hps.monitoring.MonitoringCommands.resetConnectionSettingsCmd; +import static org.lcsim.hps.monitoring.MonitoringCommands.saveConnectionCmd; + +

// FIXME These strings should be changed to constants. If there are duplications // with MonitorinApplication then move to common class like MonitoringCommands. public void actionPerformed(ActionEvent e) {

+ private void setWaitMode(String waitMode) { + if ("sleep".equals(waitMode.toLowerCase())) { + waitComboBox.setSelectedIndex(0); + } else if ("wait".equals(waitMode.toLowerCase())) { + waitComboBox.setSelectedIndex(1); + } else if ("async".equals(waitMode.toLowerCase())) { + waitComboBox.setSelectedIndex(2); + } + } +

- String waitMode = prop.getProperty("waitMode"); - if ("sleep".equals(waitMode.toLowerCase())) { - waitComboBox.setSelectedIndex(0); - } else if ("wait".equals(waitMode.toLowerCase())) { - waitComboBox.setSelectedIndex(1); - }

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

MonitoringApplication.java 1.3 -> 1.4

diff -u -r1.3 -r1.4
--- MonitoringApplication.java	27 Mar 2012 05:02:37 -0000	1.3
+++ MonitoringApplication.java	27 Mar 2012 20:31:49 -0000	1.4
@@ -1,6 +1,17 @@

 package org.lcsim.hps.monitoring;

-import java.awt.BorderLayout;

+import static org.lcsim.hps.monitoring.MonitoringCommands.connectCmd;
+import static org.lcsim.hps.monitoring.MonitoringCommands.disconnectCmd;
+import static org.lcsim.hps.monitoring.MonitoringCommands.exitCmd;
+import static org.lcsim.hps.monitoring.MonitoringCommands.loadConnectionCmd;
+import static org.lcsim.hps.monitoring.MonitoringCommands.resetConnectionSettingsCmd;
+import static org.lcsim.hps.monitoring.MonitoringCommands.resetDriversCmd;
+import static org.lcsim.hps.monitoring.MonitoringCommands.resetEventsCmd;
+import static org.lcsim.hps.monitoring.MonitoringCommands.saveConnectionCmd;
+import static org.lcsim.hps.monitoring.MonitoringCommands.savePlotsCmd;
+
+import java.awt.GridBagConstraints;
+import java.awt.GridBagLayout;

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

@@ -15,18 +26,19 @@

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

+import org.lcsim.hps.monitoring.ConnectionStatusPanel.ConnectionStatus;

 import org.lcsim.job.JobControlManager;
 import org.lcsim.util.Driver;
 import org.lcsim.util.aida.AIDA;

-//TODO Add connection status field = disconnected | connected | connecting

 public class MonitoringApplication extends JPanel implements ActionListener {
 	
 	private JTabbedPane tabs;
 	
 	private ConnectionPanel connectionPanel;

+	private ConnectionStatusPanel connectionStatusPanel;

 	private EventPanel eventPanel;

-	private JobPanel jobPanel;

+	private JobPanel jobPanel;

 	
 	private JMenuBar menuBar;

@@ -39,32 +51,58 @@

 	JMenuItem resetEventsItem;
 	JMenuItem savePlotsItem;
 	JMenuItem resetDriversItem;

-	
-	final String connectCmd = "connect";
-	final String disconnectCmd = "disconnect";
-	final String saveConnectionCmd = "saveConnection";
-	final String loadConnectionCmd = "loadConnection";
-	final String resetConnectionSettingsCmd = "resetConnectionSettings";
-	final String resetEventsCmd = "resetEvents";
-	final String savePlotsCmd = "savePlots";
-	final String resetDriversCmd = "resetDrivers";
-	final String exitCmd = "exit";
-

 	private JobControlManager mgr = null;
 		
 	public MonitoringApplication() {

-		super(new BorderLayout());
-

+		//super(new BorderLayout());
+		super(new GridBagLayout());
+								
+		// Setup the menus.
+		createMenu();
+

//

-		// Menu bar.

+		// Connection status panel, placed at top.

//

+		GridBagConstraints c = new GridBagConstraints();
+		c.gridx = 0;
+		c.gridy = 0;
+		c.anchor = GridBagConstraints.NORTHWEST;
+		connectionStatusPanel = new ConnectionStatusPanel();
+		add(connectionStatusPanel, c);
+		
+		//
+		// Create a tab for each sub-panel.
+		//
+		
+		JPanel tabsPanel = new JPanel();
+		
+		tabs = new JTabbedPane();
+		
+		connectionPanel = new ConnectionPanel();
+		eventPanel = new EventPanel();
+		jobPanel = new JobPanel();
+		
+		tabs.addTab("Connection", connectionPanel);
+		tabs.addTab("Event Monitor", eventPanel);
+		tabs.addTab("Job Settings", jobPanel);
+		
+		tabsPanel.add(tabs);
+		
+		c = new GridBagConstraints();
+		c.gridx = 0;
+		c.gridy = 1;		
+		add(tabsPanel, c);
+	}
+
+	private void createMenu() {
+

 		menuBar = new JMenuBar();
 		
 		JMenu connectionMenu = new JMenu("Connection");

-		menuBar.add(connectionMenu);
-

+		menuBar.add(connectionMenu);

 		
 		connectItem = new JMenuItem("Connect");
 		connectItem.setMnemonic(KeyEvent.VK_C);

@@ -128,22 +166,6 @@

 		resetDriversItem.addActionListener(this);
 		resetDriversItem.setEnabled(false);
 		jobMenu.add(resetDriversItem);

-		
-		//
-		// Create tabs for panels.
-		//
-		
-		tabs = new JTabbedPane();
-		
-		connectionPanel = new ConnectionPanel();
-		eventPanel = new EventPanel();
-		jobPanel = new JobPanel();
-		
-		tabs.addTab("Connection", connectionPanel);
-		tabs.addTab("Event Monitor", eventPanel);
-		tabs.addTab("Job Settings", jobPanel);
-				
-		add(tabs);

 	}
 	
 	public void setJobControlManager(JobControlManager mgr) {

@@ -212,6 +234,9 @@

 		// Re-enable the ConnectionPanel.
 		connectionPanel.enableConnectionPanel(true);

+		// Set status.
+		connectionStatusPanel.setStatus(ConnectionStatus.DISCONNECTED);
+

 		// Reset the LCSim Drivers, which should destroy Plotters.
 		resetDrivers();		
 	}

@@ -225,6 +250,9 @@

 		connectionLoadItem.setEnabled(false);
 		savePlotsItem.setEnabled(true);
 		resetDriversItem.setEnabled(true);

+		
+		// Set status.
+		connectionStatusPanel.setStatus(ConnectionStatus.CONNECTED);

 	}
 			
 	ConnectionPanel getConnectionPanel() {

@@ -238,15 +266,22 @@

 	JobPanel getJobPanel() {
 		return jobPanel;
 	}

+	
+	ConnectionStatusPanel getConnectionStatusPanel() {
+		return connectionStatusPanel;
+	}

+	/**
+	 * Sets up the frame to run the application.  
+	 * This should be called using Runnable.run() (see MonitoringExample).
+	 */

 	void start() {
         JFrame frame = new JFrame("HPS Monitoring");
         frame.setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE);

         this.setOpaque(true);
         frame.setContentPane(this);
         frame.setJMenuBar(menuBar);

+        frame.setResizable(false);

         frame.pack();
         frame.setVisible(true);
     }

- if (occuPlotter == null) { - occuPlotter = fac.createPlotterFactory().create(detector.getDetectorName() + " : HPS SVT Sensor Occupancy Plots"); - IPlotterStyle pstyle = occuPlotter.style(); - pstyle.dataStyle().fillStyle().setColor("green"); - pstyle.dataStyle().markerStyle().setColor("green"); - pstyle.dataStyle().errorBarStyle().setVisible(false); - pstyle.statisticsBoxStyle().setVisible(false); - }

+ //if (occuPlotter == null) { + occuPlotter = fac.createPlotterFactory().create(detector.getDetectorName() + " : HPS SVT Sensor Occupancy Plots"); + IPlotterStyle pstyle = occuPlotter.style(); + pstyle.dataStyle().fillStyle().setColor("green"); + pstyle.dataStyle().markerStyle().setColor("green"); + pstyle.dataStyle().errorBarStyle().setVisible(false); + pstyle.statisticsBoxStyle().setVisible(false); + //}

Commit in `hps-java/src` on MAIN
`main/java/org/lcsim/hps/monitoring/ConnectionStatusPanel.java`	+53		added 1.1
`/MonitoringCommands.java`	+17		added 1.1
`/ConnectionPanel.java`	+23	-13	1.7 -> 1.8
`/MonitoringApplication.java`	+72	-37	1.3 -> 1.4
`/MonitoringExample.java`	+11	-17	1.3 -> 1.4
`/SensorOccupancyPlotsDriver.java`	+18	-12	1.7 -> 1.8
`test/java/org/lcsim/hps/evio/Evio4FileDumpTest.java`	+1	-1	1.2 -> 1.3
	+195	-80