Changeset 1102 for trunk/src/org/apollo/gui/SampledTrackGraphViewPort.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/SampledTrackGraphViewPort.java (modified) (8 diffs)

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

@@ -1 +1 @@
 package org.apollo.gui;
 
-import java.awt.Color;
 import java.awt.Event;
-import java.awt.Font;
-import java.awt.FontMetrics;
 import java.awt.Graphics;
 import java.awt.Graphics2D;
-import java.awt.Stroke;
 import java.awt.event.ComponentEvent;
 import java.awt.event.ComponentListener;
@@ -17 +13 @@
 import java.awt.event.MouseWheelEvent;
 import java.awt.event.MouseWheelListener;
-import java.awt.geom.Rectangle2D;
-import java.awt.image.BufferedImage;
 import java.util.LinkedList;
 import java.util.List;
@@ -27 +21 @@
 import org.apollo.mvc.SubjectChangedEvent;
 import org.apollo.util.AudioMath;
-import org.expeditee.gui.Browser;
+import org.expeditee.core.Colour;
+import org.expeditee.core.Font;
+import org.expeditee.core.Stroke;
+import org.expeditee.core.TextLayout;
+import org.expeditee.core.bounds.AxisAlignedBoxBounds;
+import org.expeditee.gio.EcosystemManager;
+import org.expeditee.gio.swing.SwingConversions;
+import org.expeditee.gio.swing.SwingMiscManager;
 
 public class SampledTrackGraphViewPort extends SampledTrackGraphView
@@ -43 +44 @@
         private static final int ZOOM_ADJUSTMENT_MODE_MODIFYZOOM = 3;
         
-        public static final Color ZOOM_BACKING_COLOR_NORMAL = new Color(251, 255, 168);
-        private static final Color ZOOM_BACKING_COLOR_HIGHLIGHT = new Color(255, 255, 224);
-        private static final Color ZOOM_BACKING_BORDER_COLOR = new Color(215, 219, 144);
+        public static final Colour ZOOM_BACKING_COLOR_NORMAL = Colour.FromRGB255(251, 255, 168);
+        private static final Colour ZOOM_BACKING_COLOR_HIGHLIGHT = Colour.FromRGB255(255, 255, 224);
+        private static final Colour ZOOM_BACKING_BORDER_COLOR = Colour.FromRGB255(215, 219, 144);
         public static final Stroke ZOOM_BACKING_BORDER_STROKE = Strokes.SOLID_1;
         
-        public static final Font TIME_HELPER_FONT = new Font("Arial", Font.PLAIN, 12);
-        public static final Color TIME_HELPER_COLOR = new Color(132, 175, 201);
-        public static final Color TIME_HELPER_BORDERCOLOR = new Color(111, 146, 168);
+        public static final Font TIME_HELPER_FONT = new Font("Arial", Font.Style.PLAIN, 12);
+        public static final Colour TIME_HELPER_COLOR = Colour.FromRGB255(132, 175, 201);
+        public static final Colour TIME_HELPER_BORDERCOLOR = Colour.FromRGB255(111, 146, 168);
         
         // displays the current zoom or the new zoom-selection
@@ -67 +68 @@
         private List<ZoomChangeListener> zoomChangeListeners = new LinkedList<ZoomChangeListener>();
 
-        public SampledTrackGraphViewPort() {
+        public SampledTrackGraphViewPort()
+        {
                 super();
                 
-                setBackColor(new Color(250, 250, 250), new Color(230, 230, 230));
+                setBackColor(SwingConversions.toSwingColor(Colour.FromRGB255(250, 250, 250)), SwingConversions.toSwingColor(Colour.FromRGB255(230, 230, 230)));
                 setAlwaysFullView(true);
 
@@ -531 +533 @@
                 void paint(Graphics g) {
                         
-                        color =  (zoomAdjustmentMode == ZOOM_ADJUSTMENT_MODE_NONE) ?
-                                        ZOOM_BACKING_COLOR_NORMAL : ZOOM_BACKING_COLOR_HIGHLIGHT;
+                        color = SwingConversions.toSwingColor((zoomAdjustmentMode == ZOOM_ADJUSTMENT_MODE_NONE) ? ZOOM_BACKING_COLOR_NORMAL : ZOOM_BACKING_COLOR_HIGHLIGHT);
                         super.paint(g);
                         
-                        g.setColor(ZOOM_BACKING_BORDER_COLOR);
-                        ((Graphics2D)g).setStroke(ZOOM_BACKING_BORDER_STROKE);
+                        g.setColor(SwingConversions.toSwingColor(ZOOM_BACKING_BORDER_COLOR));
+                        ((Graphics2D)g).setStroke(SwingConversions.toSwingStroke(ZOOM_BACKING_BORDER_STROKE));
                         g.drawLine(left, 0, left, getHeight());
                         g.drawLine(left + width, 0, left + width, getHeight());
@@ -542 +543 @@
                 }
                 
-                void postPaint(Graphics g) {
-                        // Paint little helper labels when ajusting view port
-                        if (startTimeHelpLabel != null && endTimeHelpLabel != null &&
-                                        zoomAdjustmentMode != ZOOM_ADJUSTMENT_MODE_NONE) {
-                                
-                                g.setColor(TIME_HELPER_COLOR);
+                void postPaint(Graphics g)
+                {
+                        // Paint little helper labels when adjusting view port
+                        if (startTimeHelpLabel != null && endTimeHelpLabel != null && zoomAdjustmentMode != ZOOM_ADJUSTMENT_MODE_NONE) {
+                                
+                                g.setColor(SwingConversions.toSwingColor(TIME_HELPER_COLOR));
                                 g.fillRect(labelStartX - 2, labelStartY - labelHeight + 2, labelWidth + 3, labelHeight);
                                 g.fillRect(labelEndX - 2, labelEndY  - labelHeight + 2, labelWidth + 3, labelHeight);
                                 
-                                g.setColor(TIME_HELPER_BORDERCOLOR);
-                                ((Graphics2D)g).setStroke(ZOOM_BACKING_BORDER_STROKE);
+                                g.setColor(SwingConversions.toSwingColor(TIME_HELPER_BORDERCOLOR));
+                                ((Graphics2D)g).setStroke(SwingConversions.toSwingStroke(ZOOM_BACKING_BORDER_STROKE));
                                 g.drawRect(labelStartX - 2, labelStartY - labelHeight + 2, labelWidth + 3, labelHeight);
                                 g.drawRect(labelEndX - 2, labelEndY  - labelHeight + 2, labelWidth + 3, labelHeight);
 
-                                g.setFont(TIME_HELPER_FONT);
-                                g.setColor(Color.BLACK);
+                                g.setFont(SwingMiscManager.getIfUsingSwingFontManager().getInternalFont(TIME_HELPER_FONT));
+                                g.setColor(SwingConversions.toSwingColor(Colour.BLACK));
                                 g.drawString(startTimeHelpLabel, labelStartX, labelStartY);
                                 g.drawString(endTimeHelpLabel, labelEndX, labelEndY);
@@ -603 +604 @@
                                 
                                 // Create a temp graphics for centered label positioning
-                                if (Browser._theBrowser != null && Browser._theBrowser.g != null) {
+                                /*if (Browser._theBrowser != null && Browser._theBrowser.g != null) {
                                         g = Browser._theBrowser.g.create();
                                 } else {
                                         g = new BufferedImage(1,1,BufferedImage.TYPE_BYTE_INDEXED).getGraphics();
-                                }
+                                }*/
                 
                                 // Position labels
-                                FontMetrics fm   = g.getFontMetrics(TIME_HELPER_FONT);
-                                Rectangle2D rect = fm.getStringBounds(startTimeHelpLabel, g);
+                                //FontMetrics fm   = g.getFontMetrics(TIME_HELPER_FONT);
+                                //Rectangle2D rect = fm.getStringBounds(startTimeHelpLabel, g);
+                                TextLayout layout = EcosystemManager.getTextLayoutManager().layoutStringSimple(startTimeHelpLabel, TIME_HELPER_FONT);
+                                AxisAlignedBoxBounds rect = layout.getPixelBounds(0, 0);
                                 
                                 labelWidth = (int)rect.getWidth();