Changeset 210 in tmcsimulator

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.

Location:

trunk

Files:

• src/tmcsim/application.properties (modified) (1 diff)
• src/tmcsim/cadsimulator/CADServer.java (modified) (4 diffs)
• src/tmcsim/cadsimulator/managers/TrafficModelManager.java (modified) (4 diffs)
• src/tmcsim/cadsimulator/viewer/CADServerViewer.java (modified) (8 diffs)
• src/tmcsim/cadsimulator/viewer/TrafficModelViewPanel.form (added)
• src/tmcsim/cadsimulator/viewer/TrafficModelViewPanel.java (added)
• test/tmcsim/cadsimulator/SystemTest.java (modified) (1 diff)

trunk/src/tmcsim/application.properties

@@ -3 +3 @@
 Application.revision=208
 
-Application.buildnumber=68
+Application.buildnumber=69

trunk/src/tmcsim/cadsimulator/CADServer.java

@@ -21 +21 @@
 import tmcsim.cadsimulator.managers.SimulationClockManager;
 import tmcsim.cadsimulator.managers.TrafficModelManager;
-import tmcsim.cadsimulator.managers.TrafficModelViewer;
 import tmcsim.cadsimulator.viewer.model.CADSimulatorState;
 import tmcsim.common.SimulationException;
@@ -178 +177 @@
      */
     protected static TrafficModelManager theTrafficMgr = null;
-    private TrafficModelViewer trafficView = null;
     
     /**
@@ -259 +257 @@
                     CAD_PROPERTIES.TRAFFICMGR_PROP_FILE.name),
                     theCoordinator);
-            trafficView = new TrafficModelViewer(theTrafficMgr);
-             theTrafficMgr.addObserver(trafficView);
+            theTrafficMgr.addObserver(theViewer);
+            theTrafficMgr.run();
 
             theMediaMgr = new MediaManager(
@@ -315 +313 @@
 
         theViewer.setVisible(true);
-        trafficView.setVisible(true);
-
 
     }

trunk/src/tmcsim/cadsimulator/managers/TrafficModelManager.java

@@ -76 +76 @@
      */
     private Properties props = null;
+    
+    /** 
+     * The Coordinator object from which we obtain the simulation clock.
+     */ 
+    private Coordinator theCoordinator;
+
     /**
      * Highways in traffic network
@@ -95 +101 @@
     private String currentClock = "";
     
-    /**
-     * GUI for this driver
-     */
-    //private TrafficModelViewer theView;
-    
+   
     /**
      * Constructor. Loads the Properties file and initializes the
-     * ATMSCommunicator with the parsed data.
+     * highway network model. 
      *
      * @param propertiesFile Target file path of properties file.
@@ -118 +120 @@
                 props.getProperty(PROPERTIES.FEPSIM_IP_ADDR.name),
                 8080); 
-        
+        this.theCoordinator = theCoordinator;
+    }
+    /**
+     * Load the traffic events and start processing the event queue.
+     * Usage: addObserver must be called before calling run.
+     */
+    public void run()
+    {
         loadEvents();
         
@@ -378 +387 @@
     }
 
-    /**
-     * Construct the CADClient with the properties file path, either from the
-     * command line arguments or default.
-     *
-     * @param args Command line arguments.
-     */
-    public static void main(String[] args) throws RemoteException
-    {
-        final String CONFIG_FILE_NAME = "traffic_model_config.properties";        
-        if (System.getProperty("CONFIG_DIR") == null)
-        {
-            System.setProperty("CONFIG_DIR", "config");
-        }
-        CADSimulatorState theModel = new CADSimulatorState();
-        Coordinator theCoordinator = new Coordinator(theModel);
-        try
-        {
-            UIManager.setLookAndFeel(UIManager.getSystemLookAndFeelClassName());
-            TrafficModelManager mgr = new TrafficModelManager(System.getProperty("CONFIG_DIR") + System.getProperty("file.separator") + CONFIG_FILE_NAME,                    
-            theCoordinator);
-            TrafficModelViewer view = new TrafficModelViewer(mgr);
-            view.setVisible(true);
-            mgr.addObserver(view);
-        }
-        catch (Exception e)
-        {
-            logger.logp(Level.SEVERE, "SimulationManager", "Main",
-                    "Error initializing application.");
-
-            JOptionPane.showMessageDialog(new JWindow(), e.getMessage(),
-                    "Error - Program Exiting", JOptionPane.ERROR_MESSAGE);
-
-            System.exit(-1);
-        }
-
-    }
     class WriteToConsoleThread extends Thread
     {

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);
+        }
     }
 }

trunk/test/tmcsim/cadsimulator/SystemTest.java

@@ -62 +62 @@
 
         // Check CAD Simulator appears with no script and nothing connected
-        assertTrue("Title bar incorrect", cadwindow.getTitle().trim().startsWith("CAD Simulator"));
+        assertTrue("Title bar incorrect", cadwindow.getTitle().trim().startsWith("CAD Server"));
         Panel mainPanel = cadwindow.getPanel("contentPane");
         TextBox txtStatus = mainPanel.getTextBox("simulationStatus");