Author: [log in to unmask]
Date: Wed Feb 4 14:42:36 2015
New Revision: 2047
Log:
Make branch of monitoring-app module for development.
Added:
java/branches/monitoring-app-HPSJAVA-332/ (props changed)
- copied from r2041, java/trunk/monitoring-app/
java/branches/monitoring-app-HPSJAVA-332/src/main/java/org/hps/monitoring/gui/MonitoringApplication.java
- copied unchanged from r2045, java/trunk/monitoring-app/src/main/java/org/hps/monitoring/gui/MonitoringApplication.java
Modified:
java/branches/monitoring-app-HPSJAVA-332/src/main/java/org/hps/monitoring/gui/DataSourcePanel.java
java/branches/monitoring-app-HPSJAVA-332/src/main/java/org/hps/monitoring/gui/PlotInfoWindow.java
java/branches/monitoring-app-HPSJAVA-332/src/main/java/org/hps/monitoring/subsys/et/EtSystemMonitor.java
Modified: java/branches/monitoring-app-HPSJAVA-332/src/main/java/org/hps/monitoring/gui/DataSourcePanel.java
=============================================================================
--- java/branches/monitoring-app-HPSJAVA-332/src/main/java/org/hps/monitoring/gui/DataSourcePanel.java (original)
+++ java/branches/monitoring-app-HPSJAVA-332/src/main/java/org/hps/monitoring/gui/DataSourcePanel.java Wed Feb 4 14:42:36 2015
@@ -83,7 +83,7 @@
@Override
public boolean accept(File pathname) {
- if (pathname.getName().contains(".evio")) {
+ if (pathname.getName().contains(".evio") || pathname.isDirectory()) {
return true;
} else {
return false;
Modified: java/branches/monitoring-app-HPSJAVA-332/src/main/java/org/hps/monitoring/gui/PlotInfoWindow.java
=============================================================================
--- java/branches/monitoring-app-HPSJAVA-332/src/main/java/org/hps/monitoring/gui/PlotInfoWindow.java (original)
+++ java/branches/monitoring-app-HPSJAVA-332/src/main/java/org/hps/monitoring/gui/PlotInfoWindow.java Wed Feb 4 14:42:36 2015
@@ -44,6 +44,7 @@
* <p>
* The information is updated dynamically via the <code>AIDAObserver</code> API on the AIDA object.
*/
+// FIXME: The default size of this component should be bigger.
public class PlotInfoWindow extends JFrame implements AIDAListener, ActionListener, FunctionListener {
JComboBox<Object> plotComboBox;
Modified: java/branches/monitoring-app-HPSJAVA-332/src/main/java/org/hps/monitoring/subsys/et/EtSystemMonitor.java
=============================================================================
--- java/branches/monitoring-app-HPSJAVA-332/src/main/java/org/hps/monitoring/subsys/et/EtSystemMonitor.java (original)
+++ java/branches/monitoring-app-HPSJAVA-332/src/main/java/org/hps/monitoring/subsys/et/EtSystemMonitor.java Wed Feb 4 14:42:36 2015
@@ -19,6 +19,7 @@
int events = 0;
long eventReceivedMillis = 0;
long warningIntervalMillis = 1000; /* default of 1 second */
+ int timerInterval = 10000;
Timer timer = new Timer("ET Event Monitor");
public EtSystemMonitor() {
@@ -28,6 +29,10 @@
public void setWarningIntervalMillis(long warningIntervalMillis) {
this.warningIntervalMillis = warningIntervalMillis;
+ }
+
+ public void setTimerInterval(int timerInterval) {
+ this.timerInterval = timerInterval;
}
public void startJob() {
@@ -50,7 +55,7 @@
}
};
- timer.schedule(task, 0, 1000);
+ timer.schedule(task, 0, timerInterval);
}
public void process(EtEvent event) {
