Changeset 6 in tmcsimulator for trunk/src/tmcsim/simulationmanager/SimulationManagerView.java

Timestamp:

04/20/2016 02:29:52 PM (10 years ago)

Author:

jdalbey

Message:

Multifile commit. Add version # to Paramics Communicator. Move Load button in Sim Mgr. Add several tests. Add package jars target.

File:

• trunk/src/tmcsim/simulationmanager/SimulationManagerView.java (modified) (6 diffs)

trunk/src/tmcsim/simulationmanager/SimulationManagerView.java

@@ -737 +737 @@
         simulationStatus     = new JLabel("Simulation Status");
         simulationStatusText = new JLabel("No Script");
+        simulationStatusText.setName("simulationStatusText");
         simulationStatusText.setFont(new Font("Geneva", Font.BOLD, 14));
         
@@ -746 +747 @@
         pauseButton  = new JButton(new PauseSimulationAction(this));
         resetButton = new JButton(new ResetSimulationAction(this));
+        loadScriptButton = new JButton(new LoadScriptAction(this));
+        loadScriptButton.setAlignmentX(Box.CENTER_ALIGNMENT);
         
         startButton.setEnabled(false);
@@ -756 +759 @@
         simulationTimeButtonBox = new Box(BoxLayout.X_AXIS);
         
+        simulationTimeButtonBox.add(loadScriptButton);
         simulationTimeButtonBox.add(startButton);
         simulationTimeButtonBox.add(pauseButton);
         simulationTimeButtonBox.add(resetButton);
+//        currentScript = new JLabel(" no script loaded");
+        //currentScript.setAlignmentX(Box.LEFT_ALIGNMENT);
+//        simulationTimeButtonBox.add (currentScript);
         
         simulationStatus.setAlignmentX(Box.CENTER_ALIGNMENT);
         simulationStatusText.setAlignmentX(Box.CENTER_ALIGNMENT);
-        simulationStatusText.setName("simulationStatusText");
         
         TitledBorder title = BorderFactory.createTitledBorder(
@@ -779 +785 @@
         scriptBox.setAlignmentX(Box.CENTER_ALIGNMENT);
         
-        loadScriptButton = new JButton(new LoadScriptAction(this));
-        loadScriptButton.setAlignmentX(Box.CENTER_ALIGNMENT);
-        
         scriptBox.add(simulationStatusBox);
         scriptBox.add(Box.createVerticalStrut(5));
-        scriptBox.add(loadScriptButton);
         
         simulationClockLabel = new JLabel("0:00:00");
@@ -800 +802 @@
         simulationTimeAndStatusBox = Box.createHorizontalBox();
         simulationTimeAndStatusBox.setAlignmentX(Box.LEFT_ALIGNMENT);
-        simulationTimeAndStatusBox.setMaximumSize(new Dimension(640, 200));
-        simulationTimeAndStatusBox.setPreferredSize(new Dimension(640, 160));
+        simulationTimeAndStatusBox.setMaximumSize(new Dimension(640, 300));
+        simulationTimeAndStatusBox.setPreferredSize(new Dimension(640, 1600));
         simulationTimeAndStatusBox.add(Box.createHorizontalStrut(5));
         simulationTimeAndStatusBox.add(simulationTimeBox);
@@ -1224 +1226 @@
     private JLabel timeScheduledLabel;
     private JLabel CADClientClockLabel;
-            
+    private JLabel currentScript;
     private Box adminInteractionBox;    
     private Box simulationRightSideBox;