Print

---

Author: [log in to unmask]
Date: Wed Oct 26 07:34:05 2016
New Revision: 4527

Log:
Removed the trigger diagnostics panel from the monitoring application. The diagnostics have undergone significant revision and now produce plots, which would be better for shifters. This can be implemented to the monitoring application through more normal means. Additionally, the mechanisms for populating the table used previously no longer exist.

Removed:
    java/trunk/monitoring-app/src/main/java/org/hps/monitoring/application/TriggerDiagnosticsPanel.java
Modified:
    java/trunk/monitoring-app/src/main/java/org/hps/monitoring/application/MonitoringApplication.java
    java/trunk/monitoring-app/src/main/java/org/hps/monitoring/application/MonitoringApplicationFrame.java

Modified: java/trunk/monitoring-app/src/main/java/org/hps/monitoring/application/MonitoringApplication.java
 =============================================================================
--- java/trunk/monitoring-app/src/main/java/org/hps/monitoring/application/MonitoringApplication.java	(original)
+++ java/trunk/monitoring-app/src/main/java/org/hps/monitoring/application/MonitoringApplication.java	Wed Oct 26 07:34:05 2016
@@ -943,7 +943,6 @@
 
             // Add Driver to update the trigger diagnostics tables.
             final List<Driver> drivers = new ArrayList<Driver>();
-            drivers.add(this.frame.getTriggerPanel().new TriggerDiagnosticGUIDriver());
 
             // Add listener to push conditions changes to conditions panel.
             final List<ConditionsListener> conditionsListeners = new ArrayList<ConditionsListener>();

Modified: java/trunk/monitoring-app/src/main/java/org/hps/monitoring/application/MonitoringApplicationFrame.java
 =============================================================================
--- java/trunk/monitoring-app/src/main/java/org/hps/monitoring/application/MonitoringApplicationFrame.java	(original)
+++ java/trunk/monitoring-app/src/main/java/org/hps/monitoring/application/MonitoringApplicationFrame.java	Wed Oct 26 07:34:05 2016
@@ -97,7 +97,8 @@
     /**
      * The trigger diagnostics panel.
      */
-    private final TriggerDiagnosticsPanel triggerPanel;
+    // TODO: Trigger diagnostics panel is now removed; to-be-replaced with plots.
+    //private final TriggerDiagnosticsPanel triggerPanel;
 
     /**
      * Class constructor.
@@ -146,8 +147,9 @@
         tableTabbedPane.addTab("Log Messages", this.logPanel);
 
         // Add the trigger diagnostics tables.
-        this.triggerPanel = new TriggerDiagnosticsPanel();
-        tableTabbedPane.addTab("Trigger Diagnostics", this.triggerPanel);
+        // TODO: Trigger diagnostics panel is removed.
+        //this.triggerPanel = new TriggerDiagnosticsPanel();
+        //tableTabbedPane.addTab("Trigger Diagnostics", this.triggerPanel);
 
         // Add the conditions panel.
         //this.conditionsPanel = new ConditionsPanel();
@@ -281,9 +283,10 @@
      *
      * @return the trigger diagnostics panel
      */
-    TriggerDiagnosticsPanel getTriggerPanel() {
-        return this.triggerPanel;
-    }
+    // TODO: Trigger diagnostics panel is removed.
+    //TriggerDiagnosticsPanel getTriggerPanel() {
+    //    return this.triggerPanel;
+    //}
 
     /**
      * Restore default window settings.