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

Timestamp:

10/20/2017 09:18:44 AM (9 years ago)

Author:

jdalbey

Message:

Coordinator.java: new method getATMStime added for use by ATMSBatchDriver.

File:

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

trunk/src/tmcsim/client/ATMSBatchDriver.java

@@ -32 +32 @@
 import javax.swing.Timer;
 import javax.swing.UIManager;
+import tmcsim.cadsimulator.CADServer;
 import tmcsim.common.SimulationException;
 import tmcsim.interfaces.CADClientInterface;
@@ -158 +159 @@
         theView = new ATMSBatchViewer(this, new ArrayList<String>(incidents.keySet()));
         theView.setVisible(true);
-        theView.update("0:00", eventQueue);
+        theView.update("0:00", "1:11", eventQueue);
 
         // Create a timer that fetches the simulation time every second.
@@ -167 +168 @@
             {
                 String currentClock = "";
+                String currentATMStime = "";
                 Date simClock = new Date();                
                 // Obtain the simulation time from the CAD server
@@ -173 +175 @@
                     long simtime = theCoorInt.getCurrentSimulationTime();
                     currentClock = formatInterval(simtime);
+                    long ATMStime = theCoorInt.getATMStime();       
+                    Date atmsdate = new Date(ATMStime);
+                    currentATMStime = formatter.format(atmsdate);
                     try {
                         simClock = formatter.parse(currentClock);
@@ -231 +236 @@
                         }
                     }
-                    theView.update(currentClock, eventQueue);
+                    
+                    theView.update(currentClock, currentATMStime, eventQueue);
                 }
             }
@@ -322 +328 @@
         }
         // Now refresh the view with the updated queue of events
-        theView.update("0:00", eventQueue);
+        theView.update("0:00", "0:00", eventQueue);
     }