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

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

@@ -1 +1 @@
 package org.apollo.gui;
 
-import java.awt.BasicStroke;
-import java.awt.Color;
-import java.awt.Graphics2D;
-import java.awt.Rectangle;
-import java.awt.Stroke;
 import java.util.LinkedList;
 import java.util.List;
-
-import javax.swing.SwingUtilities;
 
 import org.apollo.audio.ApolloPlaybackMixer;
@@ -23 +16 @@
 import org.apollo.util.AudioMath;
 import org.apollo.widgets.FramePlayer;
+import org.expeditee.core.Colour;
+import org.expeditee.core.Stroke;
+import org.expeditee.core.bounds.AxisAlignedBoxBounds;
+import org.expeditee.gio.EcosystemManager;
+import org.expeditee.gio.GraphicsManager;
 import org.expeditee.gui.Browser;
-import org.expeditee.gui.DisplayIO;
+import org.expeditee.gui.DisplayController;
 import org.expeditee.gui.Frame;
-import org.expeditee.gui.FrameGraphics;
 
 /**
@@ -50 +47 @@
         
         private static final int BAR_STROKE_THICKNESS = 2;
-        private static final Stroke BAR_STROKE = new BasicStroke(BAR_STROKE_THICKNESS);
-        private static final Color BAR_COLOR = Color.DARK_GRAY;
+        private static final Stroke BAR_STROKE = new Stroke(BAR_STROKE_THICKNESS);
+        private static final Colour BAR_COLOR = Colour.DARK_GREY;
         
         private static FramePlaybackBarRenderer instance = new FramePlaybackBarRenderer();
@@ -121 +118 @@
                         }
                         
-                        FrameGraphics.refresh(true);
+                        DisplayController.requestRefresh(true);
                         
                         
@@ -132 +129 @@
                         currentMSPosition = -1;
                         pixelPositions.clear();
-                        FrameGraphics.refresh(true);
+                        DisplayController.requestRefresh(true);
                         
                         break;
@@ -140 +137 @@
         }
         
-        private void invalidate() {
+        private void invalidate()
+        {
                 if (Browser._theBrowser == null) return;
                 
-                int height = Browser._theBrowser.getHeight();
+                int height = EcosystemManager.getGraphicsManager().getWindowSize().getHeight();
                 
                 for (Integer n : pixelPositions) {
-                        FrameGraphics.invalidateArea(new Rectangle(n - 1, 0, BAR_STROKE_THICKNESS + 2, height));
-                }
-        }
-        
-        public void paint(Graphics2D g) {
+                        DisplayController.invalidateArea(new AxisAlignedBoxBounds(n - 1, 0, BAR_STROKE_THICKNESS + 2, height));
+                }
+        }
+        
+        public void paint()
+        {
                 if (Browser._theBrowser == null) return;
                 
-                Frame currentFrame = DisplayIO.getCurrentFrame();
+                Frame currentFrame = DisplayController.getCurrentFrame();
                 
                 if (currentFrame == null || currentFrame.getName() == null || pixelPositionsParent == null ||
                                 !currentFrame.getName().equals(pixelPositionsParent)) return;
                 
-                int height = Browser._theBrowser.getHeight();
-                
-                g.setColor(BAR_COLOR);
-                g.setStroke(BAR_STROKE);
+                int height = EcosystemManager.getGraphicsManager().getWindowSize().getHeight();
+                
+                GraphicsManager gm = EcosystemManager.getGraphicsManager();
                 
                 for (Integer n : pixelPositions) {
-                        g.drawLine(n, 0, n, height);
+                        gm.drawLine(n, 0, n, height, BAR_COLOR, BAR_STROKE);
                 }
         }
@@ -193 +191 @@
                 // Notes: the clock will queue a refresh for the frame after this
                 // event proccesses ... 
-                SwingUtilities.invokeLater(updator);
+                EcosystemManager.getMiscManager().runOnGIOThread(updator);
         }
         
@@ -201 +199 @@
          * @author Brook Novak
          */
-        private class PlaybackFrameBarUpdator implements Runnable {
+        private class PlaybackFrameBarUpdator implements Runnable
+        {
                 public void run() {
                         
                         if (currentMSPosition == -1 || currentTimeline == null) return;
                         
-                        Frame currentFrame = DisplayIO.getCurrentFrame();
+                        Frame currentFrame = DisplayController.getCurrentFrame();
                         
                         if (currentFrame == null || currentFrame.getName() == null) return;