Changeset 210 in tmcsimulator for trunk/src/tmcsim/cadsimulator/viewer/CADServerViewer.java

Timestamp:

11/02/2017 12:32:10 PM (9 years ago)

Author:

jdalbey

Message:

Integrate TrafficModelViewer? into the CAD Server GUI as an additional tab. Eliminates the separate window for traffic mgr view.

File:

• trunk/src/tmcsim/cadsimulator/viewer/CADServerViewer.java (modified) (8 diffs)

trunk/src/tmcsim/cadsimulator/viewer/CADServerViewer.java

@@ -18 +18 @@
 import javax.swing.JTabbedPane;
 import javax.swing.KeyStroke;
+import tmcsim.cadsimulator.managers.TrafficModelManager;
 import tmcsim.cadsimulator.viewer.actions.ExitAction;
 import tmcsim.cadsimulator.viewer.model.CADMediaStatus;
@@ -35 +36 @@
 public class CADServerViewer extends JFrame implements CADViewer
 {
+    private JTabbedPane cadSimTabbedPane;
+    private JMenuBar menubar;
+    private JMenu fileMenu;
+    private JMenuItem exitMenuItem;
 
     /**
@@ -48 +53 @@
      */
     private ConfigStatusPanel configPanel;
-
+    /*
+     * Panel to display Traffic Model Event Queue
+    */
+    private TrafficModelViewPanel trafficPanel;
+    
     /**
      * Constructor.
@@ -133 +142 @@
         mediaPanel = new MediaStatusPanel();
         configPanel = new ConfigStatusPanel();
+        trafficPanel = new TrafficModelViewPanel();
 
         cadSimTabbedPane = new JTabbedPane();
@@ -138 +148 @@
         cadSimTabbedPane.addTab("Media", mediaPanel);
         cadSimTabbedPane.addTab("Config", configPanel);
+        cadSimTabbedPane.addTab("Traffic", trafficPanel);
 
         add(cadSimTabbedPane);
@@ -153 +164 @@
 
         javax.swing.JMenu helpMenu = new javax.swing.JMenu("Help");
-        javax.swing.JMenuItem aboutItem = new javax.swing.JMenuItem("About");
 
-        aboutItem.addActionListener(new java.awt.event.ActionListener()
-        {
-            public void actionPerformed(java.awt.event.ActionEvent evt)
-            {
-                String ver = "";//RevisionNumber.getString();
-                JOptionPane.showMessageDialog(rootPane, "Version: " + ver, "About", JOptionPane.INFORMATION_MESSAGE);
-            }
-        });
-        helpMenu.add(aboutItem);
         menubar.add(helpMenu);
 
@@ -173 +174 @@
         setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE);
     }
-    private JTabbedPane cadSimTabbedPane;
-    private JMenuBar menubar;
-    private JMenu fileMenu;
-    private JMenuItem exitMenuItem;
 
     @Override
@@ -189 +186 @@
             mediaPanel.refresh(obs);
         }
+        if (obs instanceof TrafficModelManager)
+        {
+            trafficPanel.update(obs, obj);
+        }
     }
 }