Changeset 152 in tmcsimulator for trunk/src/tmcsim/client

Timestamp:

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

Author:

jdalbey

Message:

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

Location:

trunk/src/tmcsim/client

Files:

• ATMSBatchDriver.java (modified) (6 diffs)
• ATMSBatchViewer.form (modified) (1 diff)
• ATMSBatchViewer.java (modified) (4 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);
     }
     

trunk/src/tmcsim/client/ATMSBatchViewer.form

@@ -58 +58 @@
               </Group>
               <Group type="102" alignment="0" attributes="0">
-                  <EmptySpace min="-2" pref="186" max="-2" attributes="0"/>
-                  <Component id="txtClockTime" min="-2" pref="65" max="-2" attributes="0"/>
+                  <EmptySpace min="-2" pref="112" max="-2" attributes="0"/>
+                  <Component id="txtClockTime" min="-2" pref="225" max="-2" attributes="0"/>
                   <EmptySpace max="32767" attributes="0"/>
               </Group>

trunk/src/tmcsim/client/ATMSBatchViewer.java

@@ -13 +13 @@
 import javax.swing.JList;
 import javax.swing.JOptionPane;
+import tmcsim.cadsimulator.CADServer;
 
 /**
@@ -39 +40 @@
     }
 
-    public void update(String currentTime, Queue<String> events)
+    public void update(String currentTime, String atmsTime, Queue<String> events)
     {
         lstEvents.setModel(new MyListModel(events));
-        txtClockTime.setText(currentTime);
+        txtClockTime.setText(currentTime + " / " +atmsTime);
     }
     class MyListModel extends AbstractListModel<String>
@@ -96 +97 @@
                 .addGap(59, 59, 59))
             .addGroup(pnlEventsLayout.createSequentialGroup()
-                .addGap(186, 186, 186)
-                .addComponent(txtClockTime, javax.swing.GroupLayout.PREFERRED_SIZE, 65, javax.swing.GroupLayout.PREFERRED_SIZE)
+                .addGap(112, 112, 112)
+                .addComponent(txtClockTime, javax.swing.GroupLayout.PREFERRED_SIZE, 225, javax.swing.GroupLayout.PREFERRED_SIZE)
                 .addContainerGap(javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE))
         );
@@ -229 +230 @@
                 ATMSBatchViewer view = new ATMSBatchViewer(null,items);
                 view.setVisible(true);
-                view.update("01", sample);
+                view.update("01", "02", sample);
                 
             }