Changeset 47 in tmcsimulator for trunk/src/tmcsim/simulationmanager

Timestamp:

06/28/2016 02:25:42 PM (10 years ago)

Author:

jdalbey

Message:

Merge 305 modifications into trunk.

Location:

trunk/src/tmcsim/simulationmanager

Files:

• SimulationManager.java (modified) (3 diffs)
• SimulationManagerView.java (modified) (1 diff)

trunk/src/tmcsim/simulationmanager/SimulationManager.java

@@ -9 +9 @@
 import java.util.logging.Level;
 import java.util.logging.Logger;
-
 import javax.swing.JOptionPane;
 import javax.swing.UIManager;
-
 import tmcsim.common.CADEnums.PARAMICS_STATUS;
+import tmcsim.common.ScriptException;
 import tmcsim.common.SimulationException;
 
@@ -48 +47 @@
 
     private static final String CONFIG_FILE_NAME = "sim_manager_config.properties";
-        /**
+    /**
      * Error logger.
      */
@@ -192 +191 @@
 
     /**
+     * Load a simulation script from the specified file.
+     *
+     * @param scriptFile the XML file containing the simulation control script
+     * to be run.
+     * @throws ScriptException if the script throws an exception
+     * @throws SimulationException if the simulation throws an exception
+     */
+    public void loadScript(File scriptFile) throws ScriptException, SimulationException
+    {
+        theSimManagerModel.loadScript(scriptFile);
+    }
+
+    /**
      * Main class.
      *
      * @param args Command line arguments.
      */
-    static public void main(String[] args) {
+    static public void main(String[] args)
+    {
         //System.setProperty("swing.defaultlaf", "com.sun.java.swing.plaf.nimbus.NimbusLookAndFeel");
-        if(System.getProperty("CONFIG_DIR") == null){
-                System.setProperty("CONFIG_DIR", "config");
-        }
-        
-        try {           
-                UIManager.setLookAndFeel(UIManager.getSystemLookAndFeelClassName());
+        if (System.getProperty("CONFIG_DIR") == null)
+        {
+            System.setProperty("CONFIG_DIR", "config");
+        }
+
+        try
+        {
+            UIManager.setLookAndFeel(UIManager.getSystemLookAndFeelClassName());
             new SimulationManager(System.getProperty("CONFIG_DIR") + System.getProperty("file.separator") + CONFIG_FILE_NAME);
-        } catch (Exception e) {
+        } catch (Exception e)
+        {
             simManLogger.logp(Level.SEVERE, "SimulationManager", "Main",
                     "Error occured initializing application", e);

trunk/src/tmcsim/simulationmanager/SimulationManagerView.java

@@ -866 +866 @@
         paramicsStatusLabel     = new JLabel("Status:");
         paramicsStatusInfoLabel = new JLabel("Unknown");
+        paramicsStatusInfoLabel.setName("paramicsStatusInfoLabel");
         paramicsStatusBox.add(paramicsStatusLabel);
         paramicsStatusBox.add(Box.createHorizontalStrut(10));