Changeset 57 in tmcsimulator for trunk/src/tmcsim

Timestamp:

03/14/2017 07:25:16 PM (9 years ago)

Author:

jdalbey

Message:

Clock Client first draft

Location:

trunk/src/tmcsim

Files:

• application.properties (modified) (1 diff)
• client/CADClockDisplay.java (modified) (1 diff)
• client/CADClockView.java (modified) (5 diffs)

trunk/src/tmcsim/application.properties

@@ -1 @@
-#Tue, 14 Mar 2017 19:06:53 -0700
+#Tue, 14 Mar 2017 20:23:50 -0700
 
-Application.revision=55
+Application.revision=56
 
-Application.buildnumber=31
+Application.buildnumber=32

trunk/src/tmcsim/client/CADClockDisplay.java

@@ -156 +156 @@
         // relationship.
         theClientScreenView = new CADClockView(theClientScreenModel);
-        theClientScreenView.setVisible(false);
-
+        theClientScreenModel.addObserver(theClientScreenView);
+        theClientScreenView.setVisible(true);
+        // Create the CAD Client thread to run the CADClientModel Object.
+        Thread clientThread = new Thread(theClientScreenModel);
+        clientThread.start();
+        
         // TODO: set up model-view relationship similar to ClientView and
         // ScreenView

trunk/src/tmcsim/client/CADClockView.java

@@ -1 +1 @@
 package tmcsim.client;
 
+import java.awt.BorderLayout;
 import java.awt.Color;
 import java.awt.Dimension;
@@ -15 +16 @@
 import javax.swing.BoxLayout;
 import javax.swing.JFrame;
+import javax.swing.JLabel;
 import javax.swing.JOptionPane;
 import javax.swing.JPanel;
 import javax.swing.JTextPane;
+import javax.swing.WindowConstants;
 import javax.xml.parsers.DocumentBuilderFactory;
 
@@ -60 +63 @@
     /** Current CAD Screen number. */
     private CADScreenNum currentScreenNum = null;
+    private JPanel mainPane;
+    private JLabel currentTime;
     
-
     /**
      * Constructor. Build panes, add key listeners, and set up observer
@@ -71 +75 @@
     public CADClockView(CADClientModel mod) {
         super("CAD Client");
+        this.setDefaultCloseOperation(WindowConstants.EXIT_ON_CLOSE);
         theModel = mod;
+        currentTime = new JLabel("00:00");
         
+        mainPane = new JPanel();
+        setSize(new Dimension(730, 455));
+        setMaximumSize(new Dimension(730, 455));
+        setMinimumSize(new Dimension(730, 455));
+        mainPane.setLayout(new BorderLayout());
+        mainPane.setBorder(BorderFactory.createLineBorder(Color.black));   
+        mainPane.setBackground(Color.LIGHT_GRAY);
+        mainPane.add(currentTime,BorderLayout.CENTER);
+        add(mainPane); 
+        pack();
     }
 
@@ -110 +126 @@
         }
         
-        ObserverMessage oMessage = (ObserverMessage)arg;
-    
+        ObserverMessage oMessage = (ObserverMessage)arg;    
+        
         switch(oMessage.type) {
+            // Time updates occur once a minute
             case TIME_UPDATE:
-                System.out.println("CAD time is now" + (String)oMessage.value);           
+                currentTime.setText("" + (String)oMessage.value);
                 break;
         }