Changeset 117 in tmcsimulator-scriptbuilder for trunk/src/scriptbuilder/gui/panels

Timestamp:

09/07/2017 02:08:40 PM (9 years ago)

Author:

bmcguffin

Message:

Redesigned the method by which the first event in an event is added to relative time 00:00:00.

Added a second timestamp panel to the incident editor screen, which displays absolute script time in red. The original timestamp panel displays time relative to the start of the incident, in black.

Location:

trunk/src/scriptbuilder/gui/panels

Files:

• IncidentTimelinePanel.java (modified) (1 diff)
• TimeStampPanel.java (modified) (4 diffs)

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

@@ -243 +243 @@
                 if (getTopLevelAncestor() instanceof IncidentEditorFrame)
                 {
+                    if (incident.slices.size() == 0)
+                    {
+                        newSlice = 0;
+                    }
                     if (g.currentEventType != null)
                     {

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

@@ -1 +1 @@
 package scriptbuilder.gui.panels;
 
+import java.awt.Color;
 import java.awt.Dimension;
 import java.awt.Graphics;
@@ -20 +21 @@
 {
 
+    private int offset = 0;
+
+    private boolean isAbsolute = false;
+
     private int longestLength = ScriptBuilderGuiConstants.TICK_TIMELINE_SMALLEST_LENGTH;
 
@@ -38 +43 @@
     {
         super();
+    }
+
+    public void setOffset(int newOffset)
+    {
+        offset = newOffset;
+    }
+
+    public void setAbsolute(boolean abs)
+    {
+        isAbsolute = abs;
     }
 
@@ -144 +159 @@
                 * ScriptBuilderGuiConstants.PIXEL_WIDTH_PER_HORIZONTAL_TICK
                 + ScriptBuilderGuiConstants.TICK_TIMELINE_LEFT_MARGIN;
-        int seconds = 0;
+        int seconds = offset;
 
         // Major Ticks
-        g2d.setColor(ScriptBuilderGuiConstants.TIMELINE_TICK_COLOR);
-        seconds = 0;
+        if (isAbsolute)
+        {
+            g2d.setColor(Color.red);
+        }
+        else
+        {
+            g2d.setColor(ScriptBuilderGuiConstants.TIMELINE_TICK_COLOR);
+        }
         for (int i = ScriptBuilderGuiConstants.TICK_TIMELINE_LEFT_MARGIN;
                 i <= longestLengthPlusMargin;