Changeset 77 in tmcsimulator-scriptbuilder for trunk/src/scriptbuilder/gui

Timestamp:

08/25/2017 01:50:04 PM (9 years ago)

Author:

jdalbey

Message:

ScriptBuilderTimelinePanel?.java: change title bar text, adjust logic from double if to if else.

File:

• trunk/src/scriptbuilder/gui/panels/ScriptBuilderTimelinePanel.java (modified) (3 diffs)

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

@@ -329 +329 @@
 
         Graphics2D g2d = (Graphics2D) g;
-        if (getTopLevelAncestor() instanceof ScriptBuilderFrame)
+//        jdalbey removed this decision and replaced it with ELSE clause
+//                so it will work with any alternate ancestor.
+//        if (getTopLevelAncestor() instanceof ScriptBuilderFrame)
+//        {
+//            IncidentTimelineDrawer.DrawScriptBuilderTimeline(g2d, incident);
+//        }
+        if (getTopLevelAncestor() instanceof IncidentEditorFrame)
+        {
+            IncidentTimelineDrawer.DrawIncidentTimeline(g2d, incident, false);
+        }
+        else
         {
             IncidentTimelineDrawer.DrawScriptBuilderTimeline(g2d, incident);
-        }
-        if (getTopLevelAncestor() instanceof IncidentEditorFrame)
-        {
-            IncidentTimelineDrawer.DrawIncidentTimeline(g2d, incident, false);
         }
 
@@ -370 +376 @@
     public static void main(String[] args)
     {
-        JFrame frame = new JFrame("FrameDemo");
+        JFrame frame = new JFrame("ScriptBuilderTimelinePanel Demo");
         frame.setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE);
 
@@ -380 +386 @@
         script.loadScriptFromFile(inFile);
         // retrieve a single incident from the script
-        ScriptIncident inci = script.incidents.get(1);
+        ScriptIncident inci = script.incidents.get(2);
         // update this panel with an incident
         pnl.timelinePanelUpdate(inci);