Changeset 128 in tmcsimulator for trunk/src/tmcsim/client/ATMSBatchDriver.java

Timestamp:

10/17/2017 09:11:22 AM (9 years ago)

Author:

jdalbey

Message:

ATMSBatchDriver.java Added a GUI to display event queue. Highways.java modified to throw an exception when writeToFEP can't connect to FEP_Sim.

File:

• trunk/src/tmcsim/client/ATMSBatchDriver.java (modified) (5 diffs)

trunk/src/tmcsim/client/ATMSBatchDriver.java

@@ -114 +114 @@
     /** Instance of ConsoleDriver that contains the highway model */
     private ConsoleDriver console;
-
+    
+    /** GUI for this driver */
+    private ATMSBatchViewer theView;
+    
     /**
      * Constructor. Initialize data from parsed properties file. Create a socket
@@ -142 +145 @@
         // READ THE BATCH FILE OF COMMANDS and put in a queue
         readBatchFile();
+        // Launch the display
+        theView = new ATMSBatchViewer();
+        theView.setVisible(true);
+        theView.update("0:00", eventQueue);        
         // Create a timer that fetches the simulation time every second.
         Timer timer = new Timer(ONE_SECOND, new ActionListener()
@@ -162 +169 @@
                         System.exit(-1);
                     }                    
-                    System.out.println("Current clock: " + currentClock);
+                    //System.out.println("Current clock: " + currentClock);
                 } catch (RemoteException ex)
                 {
@@ -181 +188 @@
                         eventQueue.remove();
                     }
-                    System.out.println("Next event will be launched at: " + formatter.format(eventTime));
+                    //System.out.println("Next event will be launched at: " + formatter.format(eventTime));
+                    theView.update(currentClock, eventQueue);
                     // Check the queue of events to see if the first
                     // item should be launched.  IF so, 
@@ -381 +389 @@
             while (true)
             {
-                // Write the highway network status to the FEP Simulator
-                highways.writeToFEP();
+                try {
+                    // Write the highway network status to the FEP Simulator
+                    highways.writeToFEP();
+                } catch (SimulationException ex) 
+                {
+                    System.out.println("Skipping writeToFEP...");
+                }
 
                 // Wait for FEP Sim to process the data we just sent