Changeset 347 in tmcsimulator for trunk

Timestamp:

03/25/2019 07:35:45 PM (7 years ago)

Author:

jdalbey

Message:

Coordinator.java: Enhance tick() method to write current time to a json file, for use by web clients. Also update build.xml so Sim Mgr jar includes needed time selector library.

Location:

trunk

Files:

• IDE_metadata/NetBeans/TMCSim/build.xml (modified) (1 diff)
• src/tmcsim/application.properties (modified) (1 diff)
• src/tmcsim/cadsimulator/Coordinator.java (modified) (4 diffs)

trunk/IDE_metadata/NetBeans/TMCSim/build.xml

@@ -194 +194 @@
             tmcsim/client/cadclientgui/**, tmcsim/interfaces/**"
        excludes="**/Test.class">
-        <zipgroupfileset dir="dist/lib" includes="xercesImpl.jar"/>
+        <zipgroupfileset dir="dist/lib" includes="xercesImpl.jar,SimTimeSelector_r28.jar"/>
         <manifest>
             <attribute name="Main-Class" value="tmcsim.simulationmanager.SimulationManager"/>

trunk/src/tmcsim/application.properties

@@ -1 @@
-#Sun, 24 Mar 2019 20:49:11 -0700
+#Mon, 25 Mar 2019 20:51:26 -0700
 
-Application.revision=345
+Application.revision=346
 
-Application.buildnumber=110
+Application.buildnumber=112

trunk/src/tmcsim/cadsimulator/Coordinator.java

@@ -2 +2 @@
 
 import java.io.File;
+import java.io.FileWriter;
+import java.io.PrintWriter;
 import java.rmi.RemoteException;
 import java.rmi.server.UnicastRemoteObject;
@@ -68 +70 @@
 import tmcsim.interfaces.CoordinatorInterface;
 import tmcsim.interfaces.SimulationManagerInterface;
+import tmcsim.simulationmanager.SimulationManagerView;
 
 /**
@@ -90 +93 @@
 {
     /**
+     * The name of the file where the simulation clock time is written
+     */
+    public static final String kSimClockFilename = "webapps/sim_clock.json";
+    /**
      * Error logger.
      */
@@ -700 +707 @@
 
                     CADServer.theIncidentMgr.tick(currentSimTime);
-                }
+                    /* Write the currentSimTime to a file. 
+                       This will be read asynchronously by web clients, e.g.,
+                       the electronic instructor notebook, that want to display
+                       the current simulation time.
+                    */
+                    PrintWriter writer = null;
+                    try {
+                        writer = new PrintWriter(new FileWriter(kSimClockFilename));
+                        // Format output as json
+                        String lineout =  "{\"clock\":\"" 
+                                + SimulationManagerView.longToTime(currentSimTime) + "\"}";
+                        writer.println(lineout);
+                        writer.close();
+                        } catch (Exception ex) 
+                        {
+                        coorLogger.logp(Level.SEVERE, "Coordinator", "tick:run",
+                                "Failed to write current sim time to file.", ex);
+                        } 
+                        }
             };