Changeset 1102 for trunk/src/org/apollo/gui/TimeAxis.java

Timestamp:

05/10/18 16:04:51 (6 years ago)

Author:

davidb

Message:

Reworking of the code-base to separate logic from graphics. This version of Expeditee now supports a JFX graphics as an alternative to SWING

File:

• trunk/src/org/apollo/gui/TimeAxis.java (modified) (10 diffs)

trunk/src/org/apollo/gui/TimeAxis.java

@@ -1 +1 @@
 package org.apollo.gui;
 
-import java.awt.Color;
-import java.awt.Font;
-import java.awt.FontMetrics;
-import java.awt.GradientPaint;
-import java.awt.Graphics;
-import java.awt.Graphics2D;
-import java.awt.Stroke;
-import java.awt.geom.Rectangle2D;
-import java.awt.image.BufferedImage;
 import java.util.LinkedList;
 
 import org.apollo.ApolloSystem;
-import org.expeditee.gui.Browser;
+import org.expeditee.core.Colour;
+import org.expeditee.core.Dimension;
+import org.expeditee.core.Fill;
+import org.expeditee.core.Font;
+import org.expeditee.core.GradientFill;
+import org.expeditee.core.Point;
+import org.expeditee.core.Stroke;
+import org.expeditee.core.TextLayout;
+import org.expeditee.gio.EcosystemManager;
+import org.expeditee.gio.GraphicsManager;
+import org.expeditee.gio.swing.SwingConversions;
 
 /**
@@ -23 +24 @@
 public class TimeAxis {
         
-        private static final long serialVersionUID = 1L;
-        
-        public static final Font TIME_BAR_FONT = new Font("Arial", Font.PLAIN, 14);
+        public static final Font TIME_BAR_FONT = new Font("Arial", Font.Style.PLAIN, 14);
         private static final Stroke TICK_STROKE = Strokes.SOLID_1;
         
-        private static final Color MAJOR_TICK_COLOR = Color.BLACK;
-        private static final Color MINOR_TICK_COLOR = new Color(0.4f, 0.4f, 0.4f);
+        private static final Colour MAJOR_TICK_COLOR = Colour.BLACK;
+        private static final Colour MINOR_TICK_COLOR = new Colour(0.4f, 0.4f, 0.4f);
         
         private static final int DESIRED_MAJOR_TICK_PIXEL_SPACING = 100;
@@ -43 +42 @@
         private long totalTrackMSLength = 0;
 
-        public TimeAxis() {
+        public TimeAxis()
+        {
         }
 
@@ -51 +51 @@
                         long timeLengthSamples,
                         long totalTrackMSLength, 
-                        int width) {
+                        int width)
+        {
 
                 assert(width > 0);
@@ -146 +147 @@
                 LinkedList<Integer> majorTickLabelPositions = new LinkedList<Integer>();
         
-                Graphics g = null;
-                try {
-                
-                        
-                        // Create a temp graphics for centered label positioning
-                        if (Browser._theBrowser != null && Browser._theBrowser.g != null) {
-                                g = Browser._theBrowser.g.create();
-                        } else {
-                                g = new BufferedImage(1,1,BufferedImage.TYPE_BYTE_INDEXED).getGraphics();
-                        }
-                        
-                        do {
-        
-                                majorTickPositions.add(new Integer((int)currentTickX));
-
-                                String label = createSpecificTimeLabel((long)currentTickTime, timeAggregation);
-                                
-                                majorTickLabels.add(label);
-
-                                // Center label
-                                FontMetrics fm   = g.getFontMetrics(TIME_BAR_FONT);
-                                Rectangle2D rect = fm.getStringBounds(label, g);
-                                int textWidth  = (int)(rect.getWidth());
-                                
-                                majorTickLabelPositions.add(new Integer((int)currentTickX - (textWidth >> 1)));
-
-                                currentTickX += majorTickPixelSpacing;
-                                currentTickTime += timeAggregation;
-        
-                        } while (currentTickX < width);
-
-                        
-                } finally {
-                        if (g != null)
-                                g.dispose();
-                }
+                do {
+                        majorTickPositions.add(new Integer((int)currentTickX));
+
+                        String label = createSpecificTimeLabel((long)currentTickTime, timeAggregation);
+                        
+                        majorTickLabels.add(label);
+
+                        // Center label
+                        int textWidth = EcosystemManager.getTextLayoutManager().layoutStringSimple(label, TIME_BAR_FONT).getPixelBounds(0, 0).getWidth();
+                        
+                        majorTickLabelPositions.add(new Integer((int)currentTickX - (textWidth >> 1)));
+
+                        currentTickX += majorTickPixelSpacing;
+                        currentTickTime += timeAggregation;
+                        
+                } while (currentTickX < width);
                 
                 this.majorTickLabels = majorTickLabels.toArray(new String[0]);
@@ -227 +208 @@
         
         
-        public String createSpecificTimeLabel(long atTime, double timeAggregation) {
-
+        public String createSpecificTimeLabel(long atTime, double timeAggregation)
+        {
                 Long min = null;
                 Long sec = null;
@@ -261 +242 @@
         }
         
-        public static String createTimeLabel(Long min, Long sec, Long ms) {
-                
+        public static String createTimeLabel(Long min, Long sec, Long ms)
+        {
                 if (min == null && sec == null && ms != null) {
                         return ms + "ms";
@@ -314 +295 @@
         }
         
-        public void paint(Graphics g, int x, int y, int height, Color backgroundColor) {
+        public void paint(int x, int y, int height, Colour backgroundColor) {
                 
                 int majorTickHeight = height / 2;
@@ -320 +301 @@
 
                 // Draw backing
+                Fill backingFill;
                 if (ApolloSystem.useQualityGraphics) {
-                        
-                        GradientPaint gp = new GradientPaint(
-                                        x + (width / 2), y + (int)(height * 0.5), backgroundColor,
-                                        x + (width / 2), y, SampledTrackGraphView.DEFAULT_BACKGROUND_HIGHTLIGHTS_COLOR);
-                        ((Graphics2D)g).setPaint(gp);
-                        
+                        backingFill = new GradientFill(backgroundColor, new Point(x + (width / 2), y + (int)(height * 0.5)), SwingConversions.fromSwingColor(SampledTrackGraphView.DEFAULT_BACKGROUND_HIGHTLIGHTS_COLOR), new Point(x + (width / 2), y));
                 } else {
-                        g.setColor(backgroundColor);
-                }
-                
-                g.fillRect(x, y, width, height);
-                
-                g.setFont(TIME_BAR_FONT);
+                        backingFill = new Fill(backgroundColor);
+                }
+                
+                GraphicsManager gm = EcosystemManager.getGraphicsManager();
+                
+                gm.drawRectangle(new Point(x, y), new Dimension(width, height), 0.0, backingFill, null, null, null);
                 
                 if (majorTickXPositions != null) {
-
-                        ((Graphics2D)g).setStroke(TICK_STROKE);
-                        
-                        g.setColor(MAJOR_TICK_COLOR);
                         // Draw Major ticks and labels
                         for (int i = 0; i < majorTickLabels.length; i++) {
                                 
                                 // Label
-                                g.drawString(
+                                gm.drawString(
                                                 majorTickLabels[i], 
-                                                x + majorTickLabelXPositions[i], 
-                                                y + height - 2);
+                                                new Point(x + majorTickLabelXPositions[i], y + height - 2),
+                                                TIME_BAR_FONT,
+                                                MAJOR_TICK_COLOR);
                                 
                                 // Tick
-                                g.drawLine(
-                                                x + majorTickXPositions[i], 
+                                gm.drawLine(x + majorTickXPositions[i], 
                                                 y, 
                                                 x + majorTickXPositions[i], 
-                                                y + majorTickHeight);
+                                                y + majorTickHeight, MAJOR_TICK_COLOR, TICK_STROKE);
                                 
                         }
-                        
-                        g.setColor(MINOR_TICK_COLOR);
                         
                         // Draw minor ticks
                         if (minorTickXPositions != null) {
                                 for (int tx : minorTickXPositions) {
-                                        g.drawLine(
+                                        gm.drawLine(
                                                         x + tx, 
                                                         y, 
                                                         x + tx, 
-                                                        y + minorTickHeight);
+                                                        y + minorTickHeight, MINOR_TICK_COLOR, TICK_STROKE);
                                 }
                         }
@@ -373 +344 @@
                 } else if (alternateLabel != null) {
                         
-                        g.setColor(Color.BLACK);
-                        
-                        FontMetrics fm   = g.getFontMetrics(TIME_BAR_FONT);
-                        Rectangle2D rect = fm.getStringBounds(alternateLabel, g);
-                        int textWidth  = (int)(rect.getWidth());
-                        
-                        g.drawString(
-                                        alternateLabel, 
-                                        x + ((width >> 1) - (textWidth >> 1)), 
-                                        y + (height - 2));
-
-                }
-                
-        }
-
-        public int getWidth() {
+                        TextLayout layout = EcosystemManager.getTextLayoutManager().layoutStringSimple(alternateLabel, TIME_BAR_FONT);
+
+                        int textWidth  = layout.getPixelBounds(0, 0).getWidth();
+                        gm.drawTextLayout(layout, new Point(x + ((width >> 1) - (textWidth >> 1)), y + (height - 2)), Colour.BLACK);
+                        
+                }
+                
+        }
+
+        public int getWidth()
+        {
                 return width;
         }