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

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).

Location:

trunk/src/scriptbuilder/gui/panels

Files:

• IncidentTimelineTickPanel.java (copied) (copied from trunk/src/scriptbuilder/gui/panels/TimelineTickPanel.java) (2 diffs)
• IncidentsPanel.java (modified) (1 diff)
• ScriptBuilderNumberPanel.java (copied) (copied from trunk/src/scriptbuilder/gui/panels/IncidentNumberPanel.java) (6 diffs)
• ScriptBuilderTimelinePanel.java (copied) (copied from trunk/src/scriptbuilder/gui/panels/IncidentTimelinePanel.java) (7 diffs)

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

@@ -21 +21 @@
  * @author Bryan McGuffin
  */
-public class TimelineTickPanel extends JPanel
+public class IncidentTimelineTickPanel extends JPanel
 {
 
@@ -82 +82 @@
      * Constructor. Set up the mouse listener.
      */
-    public TimelineTickPanel()
+    public IncidentTimelineTickPanel()
     {
         super();

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

@@ -20 +20 @@
     private SimulationScript script;
     private TimelineTickPanel timelineTickPanel;
-    private List<IncidentTimelinePanel> incidentPanels;
-    private List<IncidentNumberPanel> numberPanels;
+    private List<ScriptBuilderTimelinePanel> incidentPanels;
+    private List<ScriptBuilderNumberPanel> numberPanels;
 
     /**

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

@@ -26 +26 @@
  * @author Bryan McGuffin
  */
-public class IncidentNumberPanel extends JPanel
+public class ScriptBuilderNumberPanel extends JPanel
 {
 
     ScriptIncident incident;
     boolean visible;
-    public boolean collapsed = false;
-    private static Image collapseImage = null, expandImage = null;
-
-    /**
-     * Get the icon to use for the "collapse" button.
-     *
-     * @return Collapse.png
-     */
-    private static Image getCollapseImage()
-    {
-        if (collapseImage == null)
-        {
-            try
-            {
-                collapseImage = ImageIO.read(images.Images.getImage("Collapse.png"));
-            }
-            catch (IOException ex)
-            {
-                Logger.getLogger(IncidentNumberPanel.class.getName()).log(Level.SEVERE, null, ex);
-            }
-        }
-
-        return collapseImage;
-    }
-
-    /**
-     * Get the icon to use for the "expand" button.
-     *
-     * @return Expand.png
-     */
-    private static Image getExpandImage()
-    {
-        if (expandImage == null)
-        {
-            try
-            {
-                expandImage = ImageIO.read(images.Images.getImage("Expand.png"));
-            }
-            catch (IOException ex)
-            {
-                Logger.getLogger(IncidentNumberPanel.class.getName()).log(Level.SEVERE, null, ex);
-            }
-        }
-
-        return expandImage;
-    }
 
     /**
@@ -84 +38 @@
     private class IncidentNumberMouseListener extends MouseInputAdapter
     {
-
-        private final Shape collapseExpandButtonShape
-                = new Rectangle(ScriptBuilderGuiConstants.COLLEX_BUTTON_X,
-                        ScriptBuilderGuiConstants.COLLEX_BUTTON_Y,
-                        ScriptBuilderGuiConstants.COLLEX_BUTTON_WIDTH,
-                        ScriptBuilderGuiConstants.COLLEX_BUTTON_HEIGHT);
 
         /**
@@ -100 +48 @@
         public void mouseClicked(MouseEvent e)
         {
-            if (collapseExpandButtonShape.contains(e.getX(), e.getY()))
-            {
-                incident.setCollapsed(!collapsed);
-            }
+
         }
     }
@@ -110 +55 @@
      * Constructor. Sets up the mouse listener.
      */
-    public IncidentNumberPanel()
+    public ScriptBuilderNumberPanel()
     {
         super();
@@ -131 +76 @@
         this.visible = incident != null;
 
-        if (incident != null)
-        {
-            this.collapsed = incident.collapsed;
-        }
-
         Dimension newSize;
         if (visible)
         {
-            if (collapsed)
-            {
-                newSize = new Dimension(
-                        ScriptBuilderGuiConstants.INCIDENT_NUMBER_WIDTH,
-                        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.INCIDENT_NUMBER_WIDTH,
-                        ScriptBuilderGuiConstants.TIMELINE_COLLAPSED_HEIGHT
-                        + ScriptBuilderGuiConstants.SCRIPT_EVENT_ICON_STEP * (mostEvents + 1));
-            }
+            newSize = new Dimension(ScriptBuilderGuiConstants.INCIDENT_NUMBER_WIDTH,
+                    ScriptBuilderGuiConstants.TIMELINE_COLLAPSED_HEIGHT
+                    + ScriptBuilderGuiConstants.SCRIPT_EVENT_ICON_STEP * 2);
+
         }
         else
@@ -198 +122 @@
                 ScriptBuilderGuiConstants.INCIDENT_NUMBER_TOP_MARGIN);
 
-        g2d.drawImage((collapsed ? getExpandImage() : getCollapseImage()),
-                ScriptBuilderGuiConstants.COLLEX_BUTTON_X,
-                ScriptBuilderGuiConstants.COLLEX_BUTTON_Y, null);
+        int y = ScriptBuilderGuiConstants.INCIDENT_NUMBER_TOP_MARGIN * 2 - 14;
+        g2d.setFont(ScriptBuilderGuiConstants.INCIDENT_NAME_FONT);
+        for (String line : incident.name.split(" "))
+        {
+            g2d.drawString(line, 20, y);
+            y += 12;
+        }
 
-        if (!collapsed)
-        {
-            int y = ScriptBuilderGuiConstants.INCIDENT_NUMBER_TOP_MARGIN * 2 - 14;
-            g2d.setFont(ScriptBuilderGuiConstants.INCIDENT_NAME_FONT);
-            for (String line : incident.name.split(" "))
-            {
-                g2d.drawString(line, 20, y);
-                y += 12;
-            }
-        }
     }
 }

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)