Changeset 239 in tmcsimulator for trunk/src/atmsdriver/trafficeventseditor/TrafficEventsEditor.java

Timestamp:

12/20/2017 02:15:21 AM (8 years ago)

Author:

jtorres

Message:

TrafficEventsEditor?: added direction column to station selection. Added direction status label to current selection panel.

File:

• trunk/src/atmsdriver/trafficeventseditor/TrafficEventsEditor.java (modified) (13 diffs)

trunk/src/atmsdriver/trafficeventseditor/TrafficEventsEditor.java

@@ -270 +270 @@
     private class StationTableModel extends AbstractTableModel
     {
-        String[] columnNames = {"lds_id", "postmile", "location"};
+        String[] columnNames = {"lds_id", "direction", "postmile", "location"};
         String[][] data;
         Highway hwy;
@@ -279 +279 @@
         {
             hwy = TrafficEventsEditor.this.timeFrames.currentHighway;
-            cols = 3;
+            cols = columnNames.length;
             rows = hwy != null ? hwy.stations.size() : 0;
             data = new String[rows][cols];
@@ -285 +285 @@
             {
                 data[i][0] = Integer.toString(hwy.stations.get(i).ldsID);
-                data[i][1] = Double.toString(hwy.stations.get(i).postmile);
-                data[i][2] = hwy.stations.get(i).location;
+                data[i][1] = hwy.stations.get(i).direction.getLetter();
+                data[i][2] = Double.toString(hwy.stations.get(i).postmile);
+                data[i][3] = hwy.stations.get(i).location;
             }
         }
@@ -370 +371 @@
         CurrentLoopDetectorDescLabel = new javax.swing.JLabel();
         jLabel8 = new javax.swing.JLabel();
+        jLabel9 = new javax.swing.JLabel();
+        CurrentStationDirectionLabel = new javax.swing.JLabel();
         jPanel7 = new javax.swing.JPanel();
         GreenButton = new javax.swing.JRadioButton();
@@ -536 +539 @@
         jLabel8.setText("Desc:");
 
+        jLabel9.setText("Direction:");
+
+        CurrentStationDirectionLabel.setText("null");
+
         javax.swing.GroupLayout jPanel9Layout = new javax.swing.GroupLayout(jPanel9);
         jPanel9.setLayout(jPanel9Layout);
@@ -550 +557 @@
                         .addGap(6, 6, 6)
                         .addGroup(jPanel9Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
+                            .addComponent(jLabel9)
                             .addComponent(jLabel5)
                             .addComponent(jLabel4)
@@ -556 +564 @@
                 .addGap(18, 18, 18)
                 .addGroup(jPanel9Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
-                    .addComponent(CurrentLoopDetectorDescLabel)
                     .addComponent(CurrentLoopDetectorTypeLabel)
                     .addComponent(CurrentLoopDetectorLabel)
-                    .addComponent(CurrentStationPostmileLabel)
+                    .addComponent(CurrentStationLocationLabel)
+                    .addComponent(CurrentStationDirectionLabel)
                     .addComponent(CurrentStationLabel)
                     .addComponent(CurrentHighwayLabel)
                     .addComponent(CurrentTimeFrameLabel)
-                    .addComponent(CurrentStationLocationLabel))
+                    .addComponent(CurrentStationPostmileLabel)
+                    .addComponent(CurrentLoopDetectorDescLabel))
                 .addContainerGap(239, Short.MAX_VALUE))
         );
@@ -583 +592 @@
                 .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
                 .addGroup(jPanel9Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE)
+                    .addComponent(jLabel9)
+                    .addComponent(CurrentStationDirectionLabel))
+                .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
+                .addGroup(jPanel9Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE)
                     .addComponent(jLabel4)
                     .addComponent(CurrentStationPostmileLabel))
@@ -601 +614 @@
                     .addComponent(jLabel8)
                     .addComponent(CurrentLoopDetectorDescLabel))
-                .addContainerGap(31, Short.MAX_VALUE))
+                .addContainerGap(12, Short.MAX_VALUE))
         );
 
@@ -665 +678 @@
                 .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
                 .addComponent(DeleteEventButton)
-                .addContainerGap(22, Short.MAX_VALUE))
+                .addContainerGap(25, Short.MAX_VALUE))
         );
 
@@ -1106 +1119 @@
     private javax.swing.JLabel CurrentLoopDetectorLabel;
     private javax.swing.JLabel CurrentLoopDetectorTypeLabel;
+    private javax.swing.JLabel CurrentStationDirectionLabel;
     private javax.swing.JLabel CurrentStationLabel;
     private javax.swing.JLabel CurrentStationLocationLabel;
@@ -1138 +1152 @@
     private javax.swing.JLabel jLabel7;
     private javax.swing.JLabel jLabel8;
+    private javax.swing.JLabel jLabel9;
     private javax.swing.JPanel jPanel1;
     private javax.swing.JPanel jPanel10;
@@ -1172 +1187 @@
                 ? Double.toString(timeFrames.currentStation.postmile)
                 : "");
+        CurrentStationDirectionLabel.setText(timeFrames.currentStation != null
+                ? timeFrames.currentStation.direction.getLetter()
+                : "");
         CurrentStationLocationLabel.setText(timeFrames.currentStation != null
                 ? timeFrames.currentStation.location