Changeset 109 in tmcsimulator for trunk/src/tmcsim/client/ATMSDriverClient.java

Timestamp:

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

Author:

jdalbey

Message:

ATMSDriverClient.java Enhanced to call ConsoleDriver? methods to update highway colors. Removed redundant code in Station..java.

File:

• trunk/src/tmcsim/client/ATMSDriverClient.java (modified) (4 diffs)

trunk/src/tmcsim/client/ATMSDriverClient.java

@@ -1 +1 @@
 package tmcsim.client;
 
+import atmsdriver.ConsoleDriver;
+import atmsdriver.model.Highways;
+import atmsdriver.model.Station;
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
@@ -94 +97 @@
     private Queue<String> eventQueue;
     
+    /** Instance of ConsoleDriver that contains the highway model */
+    private ConsoleDriver console;
 
     /**
@@ -109 +114 @@
             System.exit(0);
         }
-
+        Highways highways = new Highways(
+        "config/vds_data/lds.txt",
+        "config/vds_data/loop.txt",
+        "config/vds_data/highwaysMeta.txt",
+        "localhost", 8080);
+        console = new ConsoleDriver(highways);
+        
         connect(cadClientProp.getProperty(PROPERTIES.CAD_SIM_HOST.name).trim(),
                 cadClientProp.getProperty(PROPERTIES.CAD_RMI_PORT.name).trim());
@@ -146 +157 @@
                     {
                         System.out.println("LAUNCHING EVENT at " + nextEvent );
+                        // Extract fields from event and prepare them 
+                        Scanner lineScan = new Scanner(nextEvent);
+                        lineScan.next(); // skip time field
+                        int routeNumber = lineScan.nextInt();
+                        Station.DIRECTION dir = Station.DIRECTION.toDirection(lineScan.next());
+                        double postmile = lineScan.nextDouble();
+                        int range = lineScan.nextInt();
+                        ConsoleDriver.DOTCOLOR dotcolor = ConsoleDriver.DOTCOLOR.toDotColor(lineScan.next());
+                        // apply colorization to highways
+                        console.applyColorToHighwayStretch(routeNumber, dir, postmile, range, dotcolor);
+                        // Remove this event from the queue, we're done with it.
                         eventQueue.remove();
                     }
-                    //theView.updateTime("" + formatInterval(simtime));
                 }
             }