Changeset 35 in tmcsimulator for trunk/src/tmcsim

Timestamp:

04/29/2016 03:23:31 PM (10 years ago)

Author:

jdalbey

Message:

Removed ATMS synchronizing from Coordinator

File:

• trunk/src/tmcsim/cadsimulator/Coordinator.java (modified) (3 diffs)

trunk/src/tmcsim/cadsimulator/Coordinator.java

@@ -158 +158 @@
 
         coorLogger.logp(Level.INFO, "Coordinator", "startSimulation",
-                "starting...");
+                "entering startSimulation()");
         if (!CADSimulator.theIncidentMgr.areIncidentsLoaded())
         {
@@ -168 +168 @@
                 public void run()
                 {
-                    try
-                    {
-                        setScriptStatus(SCRIPT_STATUS.ATMS_SYNCHRONIZATION);
-
-                        long currentATMSTime = CADSimulator.theATMSMgr.getCurrentTime();
-                        long sleepTime = ((60 * 1000) - (currentATMSTime % (60 * 1000))) % (30 * 1000);
-
+//                    try
+//                    {
+//                        setScriptStatus(SCRIPT_STATUS.ATMS_SYNCHRONIZATION);
+//
+//                        long currentATMSTime = CADSimulator.theATMSMgr.getCurrentTime();
+//                        long sleepTime = ((60 * 1000) - (currentATMSTime % (60 * 1000))) % (30 * 1000);
+//
+//                        coorLogger.logp(Level.INFO, "Coordinator", "StartSimulation",
+//                                "Sleeping for " + sleepTime / 1000 + " seconds.");
+//                        Thread.sleep(sleepTime);
+//
+//                        //currentATMSTime += sleepTime;
+//                        //ParamicsCommunicator.getInstance().serverTime.setTimeInMillis(currentATMSTime);
+//                    } catch (Exception e)
+//                    {
+//                        setScriptStatus(SCRIPT_STATUS.SCRIPT_RUNNING);
+//
+//                        coorLogger.logp(Level.SEVERE, "Coordinator", "StartSimulation:run",
+//                                "Unable to connect to ATMS server.", e);
+//                    } finally
+//                    {
                         coorLogger.logp(Level.INFO, "Coordinator", "StartSimulation",
-                                "Sleeping for " + sleepTime / 1000 + " seconds.");
-                        Thread.sleep(sleepTime);
-
-                        //currentATMSTime += sleepTime;
-                        //ParamicsCommunicator.getInstance().serverTime.setTimeInMillis(currentATMSTime);
-                    } catch (Exception e)
-                    {
-                        setScriptStatus(SCRIPT_STATUS.SCRIPT_RUNNING);
-
-                        coorLogger.logp(Level.SEVERE, "Coordinator", "StartSimulation:run",
-                                "Unable to connect to ATMS server.", e);
-                    } finally
-                    {
+                                "Starting WITH paramics connected ");
                         CADSimulator.theSimulationCntrlMgr.startSimulation();
                         CADSimulator.theParamicsSimMgr.startSimulation();
                         CADSimulator.theSoundPlayer.setAudioEnabled(true);
-                        coorLogger.logp(Level.INFO, "Coordinator", "StartSimulation:run",
-                                "Simulation has started.");
-                    }
+//                    }
                 }
             };
@@ -200 +200 @@
             Thread startThread = new Thread(startRun);
             startThread.start();
-        } else
-        {
+        } else // Paramics isn't connected so start without it
+        {
+            coorLogger.logp(Level.INFO, "Coordinator", "startSimulation",
+                "starting without paramics connection. ..");            
             CADSimulator.theSimulationCntrlMgr.startSimulation();
             CADSimulator.theSoundPlayer.setAudioEnabled(true);
         }
+        coorLogger.logp(Level.INFO, "Coordinator", "StartSimulation:run",
+                "Simulation has started.");
     }