Changeset 53 in tmcsimulator-scriptbuilder for trunk/src/scriptbuilder/gui/panels/ScriptBuilderTimelinePanel.java

Timestamp:

08/09/2017 10:03:37 AM (9 years ago)

Author:

bmcguffin

Message:

Duplicated main ScriptBuilder? window. The new window will become the Incident Editor window (see Storyboard 2a-B). The main ScriptBuilder? window will become the Incident Combiner window (see storyboard 1a-B).

File:

• trunk/src/scriptbuilder/gui/panels/ScriptBuilderTimelinePanel.java (copied) (copied from trunk/src/scriptbuilder/gui/panels/IncidentTimelinePanel.java) (7 diffs)

trunk/src/scriptbuilder/gui/panels/ScriptBuilderTimelinePanel.java

@@ -29 +29 @@
  * @version 2017/06/30
  */
-public class IncidentTimelinePanel extends JPanel
+public class ScriptBuilderTimelinePanel extends JPanel
 {
 
@@ -39 +39 @@
      * If true, this panel is in its minimized state.
      */
-    boolean collapsed;
+    //boolean collapsed;
     /**
      * If false, this panel won't be drawn.
@@ -198 +198 @@
                     lastSlice = newSlice;
                     String newToolTip;
-                    if (collapsed)
-                    {
-                        newToolTip = incident.slices.get(newSlice).toString();
-                    }
-                    else
-                    {
-                        newToolTip = incident.slices.get(newSlice).getToolTipText(y);
-                    }
+
+                    newToolTip = incident.slices.get(newSlice).toString();
+
                     setToolTipText((newToolTip == null || newToolTip.equals(""))
                             ? null : newToolTip);
@@ -218 +213 @@
      * Constructor. Generates a HashMap of all possible event types.
      */
-    public IncidentTimelinePanel()
+    public ScriptBuilderTimelinePanel()
     {
         super();
@@ -258 +253 @@
     {
         this.incident = incident;
-        if (incident != null)
-        {
-            this.collapsed = incident.collapsed;
-        }
         this.visible = incident != null;
 
@@ -267 +258 @@
         if (visible)
         {
-            if (collapsed)
-            {
-                newSize = new Dimension((incident.length + incident.offset)
-                        / ScriptBuilderGuiConstants.HORIZONTAL_TICK_RESOLUTION
-                        * ScriptBuilderGuiConstants.PIXEL_WIDTH_PER_HORIZONTAL_TICK,
-                        ScriptBuilderGuiConstants.TIMELINE_COLLAPSED_HEIGHT);
-            }
-            else
-            {
-                int mostEvents = 0;
-                for (TimeSlice slice : incident.getSlices())
-                {
-                    if (slice.events.size() > mostEvents)
-                    {
-                        mostEvents = slice.events.size();
-                    }
-                }
-
-                newSize = new Dimension((ScriptBuilderGuiConstants.MAX_SIMULATION_LENGTH)
-                        / ScriptBuilderGuiConstants.HORIZONTAL_TICK_RESOLUTION
-                        * ScriptBuilderGuiConstants.PIXEL_WIDTH_PER_HORIZONTAL_TICK,
-                        ScriptBuilderGuiConstants.TIMELINE_COLLAPSED_HEIGHT
-                        + ScriptBuilderGuiConstants.SCRIPT_EVENT_ICON_STEP * (mostEvents + 1));
-            }
+
+            newSize = new Dimension(((incident.length + incident.offset)
+                    / ScriptBuilderGuiConstants.HORIZONTAL_TICK_RESOLUTION
+                    * ScriptBuilderGuiConstants.PIXEL_WIDTH_PER_HORIZONTAL_TICK)
+                    + ScriptBuilderGuiConstants.EVENT_ICON_WIDTH,
+                    ScriptBuilderGuiConstants.TIMELINE_COLLAPSED_HEIGHT
+                    + ScriptBuilderGuiConstants.SCRIPT_EVENT_ICON_STEP * 2);
+
         }
         else
@@ -319 +294 @@
 
         Graphics2D g2d = (Graphics2D) g;
-        IncidentTimelineDrawer.DrawIncidentTimeline(g2d, incident, collapsed);
+        IncidentTimelineDrawer.DrawScriptBuilderTimeline(g2d, incident);
 
         if (focused)