Changeset 255 in tmcsimulator

Timestamp:

02/10/2019 11:46:05 AM (7 years ago)

Author:

jdalbey

Message:

TrafficEventsEditor? - modified to use JD's custom TimeSelectionDialog? for choosing new time frames.

Location:

trunk/src

Files:

• atmsdriver/ConsoleTrafficDriver.java (modified) (1 diff)
• atmsdriver/trafficeventseditor/TrafficEventsEditor.java (modified) (4 diffs)
• tmcsim/application.properties (modified) (1 diff)

trunk/src/atmsdriver/ConsoleTrafficDriver.java

@@ -17 +17 @@
 /**
  * A console application to drive the ATMS Server.
+ * Use for test driving the FEP Simulator.
  *
  * @author jdalbey, John A. Torres

trunk/src/atmsdriver/trafficeventseditor/TrafficEventsEditor.java

@@ -1 @@
-/*
- * To change this license header, choose License Headers in Project Properties.
- * To change this template file, choose Tools | Templates
- * and open the template in the editor.
- */
 package atmsdriver.trafficeventseditor;
 
@@ -10 +5 @@
 import atmsdriver.model.LoopDetector.DOTCOLOR;
 import atmsdriver.model.Station;
+import timeselector.*;
 import java.io.File;
 import java.util.ArrayList;
@@ -20 +16 @@
 import javax.swing.DefaultListSelectionModel;
 import javax.swing.JComboBox;
+import javax.swing.JDialog;
 import javax.swing.JFileChooser;
+import javax.swing.JFrame;
 import javax.swing.JList;
 import javax.swing.JOptionPane;
+import javax.swing.JPanel;
 import javax.swing.JTable;
 import javax.swing.JTextField;
@@ -995 +994 @@
     private void addNewTimeFrameButtonClicked(java.awt.event.ActionEvent evt)//GEN-FIRST:event_addNewTimeFrameButtonClicked
     {//GEN-HEADEREND:event_addNewTimeFrameButtonClicked
-        // String name = JOptionPane.showInputDialog(this, "Enter a time frame (HH:MM:SS)");
-        String[] hourChoices = getTimeChoices();
-        String[] minChoices = getTimeChoices();
-        String[] secChoices = {"00", "30"};
-        
-        JComboBox hourCombo = new JComboBox(hourChoices);
-        JComboBox minCombo = new JComboBox(minChoices);
-        JComboBox secCombo = new JComboBox(secChoices);
-        
-        Object[] message = {
-            "Hour:", hourCombo,
-            "Minute:", minCombo,
-            "Second:", secCombo
-        };
-        int option = JOptionPane.showConfirmDialog(this, message, "Enter a time frame:", JOptionPane.OK_CANCEL_OPTION);
-        if(option == JOptionPane.OK_OPTION)
-        {
-            String h = hourCombo.getSelectedItem().toString();
-            String m = minCombo.getSelectedItem().toString();
-            String s = secCombo.getSelectedItem().toString();
-            String cum = h + ":" + m + ":" + s;
-            timeFrames.addTimeFrame(cum);
-        }
-        /*if(name != null)
-        {
-            timeFrames.addTimeFrame(name);
-        }*/
+        // Obtain the time of the previous time frame
+        int size = timeFrames.frames.size();
+        if (timeFrames.frames.size() > 0)
+        {
+            String prevTime = timeFrames.frames.get(size-1).toString();
+        }
+        // Show a dialog for the user to select a time in HH:MM:SS
+        // TODO: this could be enhanced so it appears with previous time
+        TimeSelectionDialog dialog = new TimeSelectionDialog((JFrame)this, true);
+        dialog.setLocation(200,400);
+        dialog.setVisible(true);
+        // Add the new time frame
+        timeFrames.addTimeFrame(dialog.getSelectedTime());
+        dialog.dispose();
+            
     }//GEN-LAST:event_addNewTimeFrameButtonClicked
 

trunk/src/tmcsim/application.properties

@@ -1 @@
-#Sat, 09 Feb 2019 09:41:52 -0800
+#Sun, 10 Feb 2019 13:07:36 -0800
 
-Application.revision=247
+Application.revision=253
 
 Application.buildnumber=91