Changeset 1102 for trunk/src/org/apollo/items/RecordOverdubLauncher.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/items/RecordOverdubLauncher.java (modified) (6 diffs)

trunk/src/org/apollo/items/RecordOverdubLauncher.java

@@ -1 +1 @@
 package org.apollo.items;
-
-import java.awt.Color;
-import java.awt.GradientPaint;
-import java.awt.Graphics2D;
-import java.awt.Paint;
-import java.awt.Polygon;
-import java.awt.Stroke;
 
 import org.apollo.ApolloSystem;
@@ -12 +5 @@
 import org.apollo.io.IconRepository;
 import org.apollo.widgets.SampleRecorder;
+import org.expeditee.core.Colour;
+import org.expeditee.core.Dimension;
+import org.expeditee.core.Fill;
+import org.expeditee.core.GradientFill;
+import org.expeditee.core.Point;
+import org.expeditee.core.Stroke;
+import org.expeditee.core.bounds.AxisAlignedBoxBounds;
+import org.expeditee.core.bounds.Bounds;
+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.items.Item;
@@ -23 +26 @@
                 private static int WIDTH = 80;
                 private static int HEIGHT = 80;
-                private static Stroke BORDER_STOKE = Strokes.SOLID_1;
+                private static Stroke BORDER_STROKE = Strokes.SOLID_1;
                 private int countdown;
                 
-                private static final Color BASE_COLOR = new Color(255, 100, 100);
-                private static final Color HIGHLIGHT_COLOR = new Color(253, 255, 201);
+                private static final Colour BASE_COLOR = Colour.FromRGB255(255, 100, 100);
+                private static final Colour HIGHLIGHT_COLOR = Colour.FromRGB255(253, 255, 201);
                 
                 public RecordOverdubLauncher(int countdown) {
@@ -49 +52 @@
 
                 @Override
-                public void paint(Graphics2D g) {
+                public void paint() {
                         if (Browser._theBrowser == null) return;
                         
-                        Paint restore = g.getPaint();
+                        GraphicsManager g = EcosystemManager.getGraphicsManager();
                         
+                        Fill fill = null;
                         if (ApolloSystem.useQualityGraphics) {
-                                GradientPaint gp = new GradientPaint(
-                                                _x + (WIDTH / 2), _y, HIGHLIGHT_COLOR,
-                                                _x + (WIDTH / 2), _y + HEIGHT - (HEIGHT / 5), BASE_COLOR);
-                                g.setPaint(gp);
+                                Point fromPoint = new Point(_x + (WIDTH / 2), _y);
+                                Point toPoint = new Point(_x + (WIDTH / 2), _y + HEIGHT - (HEIGHT / 5));
+                                fill = new GradientFill(HIGHLIGHT_COLOR, fromPoint, BASE_COLOR, toPoint);
                         } else {
-                                g.setColor(BASE_COLOR);
+                                fill = new Fill(BASE_COLOR);
                         }
                         
-                        g.fillRect((int)_x, (int)_y, WIDTH, HEIGHT);
+                        Point topLeft = new Point((int)_x, (int)_y);
+                        Dimension size = new Dimension(WIDTH, HEIGHT);
+                        g.drawRectangle(topLeft, size, 0.0, fill, Colour.BLACK, BORDER_STROKE, null);
                         
-                        g.setPaint(restore);
+                        /*IconRepository.getIcon("recordplay.png").paintIcon(
+                                        Browser._theBrowser.getContentPane(), g, getX() + 25, getY() + 25);*/
                         
-                        g.setColor(Color.BLACK);
-                        g.setStroke(BORDER_STOKE);
-                        g.drawRect((int)_x, (int)_y, WIDTH, HEIGHT);
-                        
-                        IconRepository.getIcon("recordplay.png").paintIcon(
-                                        Browser._theBrowser.getContentPane(), g, getX() + 25, getY() + 25);
+                        g.drawImage(IconRepository.getIcon("recordplay.png"), new Point(getX() + 25, getY() + 25));
                         
                 }
@@ -92 +93 @@
 
                 @Override
-                public void updatePolygon() {
-                        
-                        _poly = new Polygon();
-
-                        int x = (int)_x;
-                        int y = (int)_y;
-                        
-                        _poly.addPoint(x, y);
-                        _poly.addPoint(x + WIDTH, y);
-                        _poly.addPoint(x + WIDTH, y + HEIGHT);
-                        _poly.addPoint(x, y + HEIGHT);
-
+                public Bounds updateBounds()
+                {
+                        return new AxisAlignedBoxBounds((int) _x, (int) _y, WIDTH, HEIGHT);
                 }
 
@@ -128 +120 @@
                         parent.removeItem(this);
                         
-                        Frame currentFrame = DisplayIO.getCurrentFrame();
+                        Frame currentFrame = DisplayController.getCurrentFrame();
                         
                         if (currentFrame != null) {