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

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

@@ -1 +1 @@
 package org.apollo.gui;
 
+import java.awt.BasicStroke;
 import java.awt.Color;
 import java.awt.Event;
@@ -10 +11 @@
 import java.awt.Point;
 import java.awt.Rectangle;
-import java.awt.Stroke;
 import java.awt.event.ComponentEvent;
 import java.awt.event.ComponentListener;
-import java.awt.image.BufferedImage;
 import java.util.LinkedList;
 import java.util.List;
@@ -31 +30 @@
 import org.apollo.mvc.Subject;
 import org.apollo.mvc.SubjectChangedEvent;
+import org.expeditee.core.Image;
+import org.expeditee.core.bounds.AxisAlignedBoxBounds;
+import org.expeditee.gio.swing.SwingConversions;
+import org.expeditee.gio.swing.SwingMiscManager;
 import org.expeditee.gui.Browser;
-import org.expeditee.gui.FrameGraphics;
+import org.expeditee.gui.DisplayController;
 
 /**
@@ -59 +62 @@
 
         private WaveFormRenderProccessingUnit.WaveFormRenderTask renderTask = null;
-        private BufferedImage backBuffer = null; // Shared resource
+        private Image backBuffer = null; // Shared resource
         private int bufferWidth = -1; // cached from backBuffer - so don't have to lock
         private int bufferHeight = -1; // cached from backBuffer - so don't have to lock
@@ -67 +70 @@
         private int timescaleFrameLength = 0; // in frames
         
-        private final Font RENDER_MESSAGE_FONT = new Font("Arial", Font.ITALIC | Font.BOLD, 14);
+        private final Font RENDER_MESSAGE_FONT = new Font("Arial", Font.BOLD | Font.ITALIC, 14);
         
         private boolean alwaysFullViewOn = false;
@@ -80 +83 @@
         
         /** The stroke used for drawing graph bars. E.G: The selection Start bar. */
-        public static final Stroke GRAPH_BAR_STROKE = Strokes.SOLID_1;
+        public static final BasicStroke GRAPH_BAR_STROKE = SwingConversions.toSwingStroke(Strokes.SOLID_1);
         public static final int GRAPH_BAR_NWIDTH = 1;
         
@@ -139 +142 @@
                                 this, 
                                 0, 0, 
-                                Browser._theBrowser.getContentPane());
+                                SwingMiscManager.getIfUsingSwingGraphicsManager().getContentPane());
         }
         
@@ -339 +342 @@
                                 
                                 if (x >= 0 && x <= viewWidth) { // is the playback position in view?
-                                        FrameGraphics.invalidateArea(new Rectangle(
+                                        DisplayController.invalidateArea(new AxisAlignedBoxBounds(
                                                 x + expediteePosition.x, 
                                                 expediteePosition.y, 
@@ -356 +359 @@
                                 
                                 if (x >= 0 && x <= viewWidth) { // is the playback position in view?
-                                        FrameGraphics.invalidateArea(new Rectangle(
+                                        DisplayController.invalidateArea(new AxisAlignedBoxBounds(
                                                 x + expediteePosition.x , 
                                                 expediteePosition.y, 
@@ -565 +568 @@
                 
                 renderTask = null; // must be on swing thread because could be painting
-                if (backBuffer != null) backBuffer.flush();
+                if (backBuffer != null) backBuffer.releaseImage();
                 backBuffer = null; // must be on swing thread because could be painting
         }
@@ -605 +608 @@
                                 
                                 // Create new sized buffer
-                                backBuffer = new BufferedImage(
+                                backBuffer = Image.createImage(width, height);
+/*                              backBuffer = new BufferedImage(
                                                 width, 
                                                 height,
                                                 BufferedImage.TYPE_BYTE_INDEXED,
-                                                ApolloColorIndexedModels.graphIndexColorModel);
+                                                ApolloColorIndexedModels.graphIndexColorModel);*/
                         }
                 }
@@ -624 +628 @@
                                 );
                 
-                // Wait for invalidation recomendation messages
+                // Wait for invalidation recommendation messages
                 renderTask.addObserver(this);
 
@@ -693 +697 @@
                                 synchronized(backBuffer) {
         
-                                        g.drawImage(backBuffer, 
+                                        g.drawImage(SwingMiscManager.getIfUsingSwingImageManager().getInternalImage(backBuffer), 
                                                         0, 
                                                         0, 
                                                         getWidth(), 
-                                                        getHeight(), 
+                                                        getHeight(),
                                                         null);
                                         
@@ -709 +713 @@
                                 // No need to synchronize waveformBuffer because there is no thread accessing it,
                                 // and a new render thread is always created on this thread.
-                                g.drawImage(backBuffer, 
+                                g.drawImage(SwingMiscManager.getIfUsingSwingImageManager().getInternalImage(backBuffer),
                                                 0, 
                                                 0, 
                                                 getWidth(), 
-                                                getHeight(), 
+                                                getHeight(),
                                                 null);
                                 
@@ -919 +923 @@
          *
          */
-        public interface EffecientInvalidator {
+        public interface EffecientInvalidator
+        {
                 public void onGraphDirty(SampledTrackGraphView graph, Rectangle dirty);
         }
 
-        public Color getBackColor() {
+        public Color getBackColor()
+        {
                 return backColor;
         }
@@ -935 +941 @@
          *      
          */
-        public void setBackColor(Color backColor, Color highlights) {
+        public void setBackColor(Color backColor, Color highlights)
+        {
                 setBackColor(backColor, highlights, true);
         }
@@ -949 +956 @@
          *              Doesnt invalidate if the color has not changed.
          */
-        public void setBackColor(Color backColor, Color highlights, boolean invalidate) {
+        public void setBackColor(Color backColor, Color highlights, boolean invalidate)
+        {
                 if (backColor == null) throw new NullPointerException("backColor");
                 if (this.backColor != backColor || backColorHighlights != highlights) {