Changeset 44 in tmcsimulator for trunk/src/tmcsim/cadsimulator/viewer/SimulationStatusPanel.java

Timestamp:

06/23/2016 06:30:20 PM (10 years ago)

Author:

jdalbey

Message:

MultiFile? commit: Add CADViewer Interface and change CADSimulator to Observer Pattern.

File:

• trunk/src/tmcsim/cadsimulator/viewer/SimulationStatusPanel.java (modified) (12 diffs)

trunk/src/tmcsim/cadsimulator/viewer/SimulationStatusPanel.java

@@ -5 +5 @@
 import java.awt.Dimension;
 import java.awt.Font;
-import java.util.logging.Handler;
-import java.util.logging.Level;
-import java.util.logging.LogRecord;
-import java.util.logging.Logger;
+import java.util.Observable;
 import javax.swing.BorderFactory;
 import javax.swing.Box;
@@ -19 +16 @@
 import javax.swing.border.EtchedBorder;
 import javax.swing.border.TitledBorder;
+import tmcsim.cadsimulator.viewer.model.CADSimulatorStatus;
 import tmcsim.common.CADEnums.PARAMICS_STATUS;
 import tmcsim.common.CADEnums.SCRIPT_STATUS;
@@ -37 +35 @@
  * </ul>
  *
- * @author Matthew Cechini
+ * @author Matthew Cechini, jdalbey
  * @version
  */
@@ -45 +43 @@
 
     /**
-     * Logging Handler to listen for Information and Error messages logged for
-     * the CAD Simulator. Received LogRecords are displayed in the info or error
-     * message Text Area.
-     *
-     * @author Matthew Cechini
-     */
-    private class SimulatorErrorHandler extends Handler
-    {
-
-        public void close() throws SecurityException
-        {
-        }
-
-        public void flush()
-        {
-        }
-
-        public void publish(LogRecord rec)
-        {
-            StringBuffer msgBuffer = new StringBuffer();
-
-            msgBuffer.append(rec.getSourceClassName() + "."
-                    + rec.getSourceMethodName() + " = "
-                    + rec.getMessage());
-
-            if (rec.getLevel() == Level.INFO)
-            {
-                infoMessagesTA.setText(infoMessagesTA.getText()
-                        + msgBuffer.toString() + "\n");
-            } else
-            {
-                errorMessagesTA.setText(errorMessagesTA.getText()
-                        + msgBuffer.toString() + "\n");
-            }
-        }
+     * Refresh this view
+     *
+     * @param obs the Observable we are watching
+     */
+    public void refresh(Observable obs)
+    {
+        CADSimulatorStatus status = (CADSimulatorStatus) obs;
+        termConnectedTF.setText(String.valueOf(status.getNumClients()));
+        String yesno = "No";
+        // Should we show yes or no?
+        if (status.isSimManagerConnected())
+        {
+            yesno = "Yes";
+        }
+        managerConnectedTF.setText(yesno);
+        simulationClockLabel.setText(status.getCurrentTime());
+        setScriptStatus(status.getScriptStatus());
+        setParamicsStatus(status.getParamicsStatus());
+
+        String netText = status.getParmicsNetworkID();
+        if (netText.length() == 0)
+        {
+            netText = "None";
+        }
+        setParamicsNetworkLoaded(netText);
+
+        String msgOut = status.getInfoMessages();
+        infoMessagesTA.setText(msgOut);
+        errorMessagesTA.setText(status.getErrorMessages());
     }
     /**
@@ -85 +77 @@
      */
     private int numClientsConnected = 0;
-    /**
-     * Logging ErrorHandler.
-     */
-    private SimulatorErrorHandler errorHandler;
 
     /**
@@ -102 +90 @@
         initMessagesPanes();
 
-        errorHandler = new SimulatorErrorHandler();
-        Logger.getLogger("tmcsim.cadsimulator").addHandler(errorHandler);
-
-        CADSimulatorViewerBox = Box.createVerticalBox();
-        CADSimulatorViewerBox.add(simulationTimeAndStatusBox);
-        CADSimulatorViewerBox.add(additionalInfoBox);
-        CADSimulatorViewerBox.add(infoMessagesPane);
-        CADSimulatorViewerBox.add(errorMessagesPane);
-
-        add(CADSimulatorViewerBox);
-    }
-
-    /**
-     * Method is called when a CAD Client disconnects from the CAD Simulator.
-     * The displayed number of connected clients is incremented by one.
-     */
-    public void connectClient()
-    {
-
-        numClientsConnected++;
-
-        termConnectedTF.setText(String.valueOf(numClientsConnected));
-    }
-
-    /**
-     * Method is called when a CAD Client disconnects from the CAD Simulator.
-     * The displayed number of connected clients is decremented by one.
-     */
-    public void disconnectClient()
-    {
-
-        if (numClientsConnected > 0)
-        {
-            numClientsConnected--;
-        }
-
-        termConnectedTF.setText(String.valueOf(numClientsConnected));
-    }
-
-    /**
-     * Method is called when Simulation Manager connects or disconnects.
-     *
-     * @param connection True if simulation manager is connected, false if not.
-     */
-    public void setSimManagerStatus(boolean connection)
-    {
-
-        if (connection)
-        {
-            managerConnectedTF.setText("Yes");
-        } else
-        {
-            managerConnectedTF.setText("No");
-        }
-
-    }
-
-    /**
-     * Method called to convert current simulation time (parameter long value)
-     * to a string of format H:MM:SS. Time is then updated on GUI.
-     *
-     * @param seconds Long value of current time
-     */
-    public void setTime(long seconds)
-    {
-        String time = new String();
-        long timeSegment;
-
-        timeSegment = seconds / 3600;
-        time += String.valueOf(timeSegment) + ":";
-
-        seconds = seconds % 3600;
-
-        timeSegment = seconds / 60;
-        if (timeSegment < 10)
-        {
-            time += "0";
-        }
-
-        time += String.valueOf(timeSegment) + ":";
-        seconds = seconds % 60;
-
-        timeSegment = seconds;
-        if (timeSegment < 10)
-        {
-            time += "0";
-        }
-
-        time += String.valueOf(timeSegment);
-
-        simulationClockLabel.setText(time);
-
+        //  errorHandler = new SimulatorErrorHandler();
+        //  Logger.getLogger("tmcsim.cadsimulator").addHandler(errorHandler);
+
+        cadSimulatorViewerBox = Box.createVerticalBox();
+        cadSimulatorViewerBox.add(simulationTimeAndStatusBox);
+        cadSimulatorViewerBox.add(additionalInfoBox);
+        cadSimulatorViewerBox.add(infoMessagesPane);
+        cadSimulatorViewerBox.add(errorMessagesPane);
+
+        add(cadSimulatorViewerBox);
     }
 
@@ -206 +112 @@
     protected void displayError(String errorMessage)
     {
+        // Do we clear or append?
         if (errorMessage == null)
         {
             errorMessagesTA.setText("");
-        } else
+        }
+        else
         {
             errorMessagesTA.append(errorMessage + "\n");
@@ -253 +161 @@
      * </table>
      */
-    public void setScriptStatus(SCRIPT_STATUS newStatus)
-    {
-
+    private void setScriptStatus(SCRIPT_STATUS newStatus)
+    {
+        // Display text based on status value
         switch (newStatus)
         {
@@ -291 +199 @@
      * or dropped.
      */
-    public void setParamicsStatus(PARAMICS_STATUS newStatus)
-    {
-
+    private void setParamicsStatus(PARAMICS_STATUS newStatus)
+    {
+        // Display text based on status value
         switch (newStatus)
         {
@@ -310 +218 @@
      * @param networkID Unique ID for Paramics network that has been loaded.
      */
-    public void setParamicsNetworkLoaded(String networkID)
+    private void setParamicsNetworkLoaded(String networkID)
     {
         networkLoadedTF.setText(networkID);
@@ -325 +233 @@
         simulationStatus = new JLabel("Simulation Status");
         simulationStatusText = new JLabel("No Script");
+        simulationStatusText.setName("simulationStatusText");
 
         simulationTime.setLayout(new BorderLayout());
@@ -470 +379 @@
     private Box paramicsConnectedBox;
     private Box networkLoadedBox;
-    private Box CADSimulatorViewerBox;
+    private Box cadSimulatorViewerBox;
     private Box simulationTimeAndStatusBox;
     private Box simulationStatusBox;