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

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

@@ -2 +2 @@
 
 import java.awt.Graphics2D;
-import java.awt.image.BufferedImage;
 import java.util.LinkedList;
 
@@ -10 +9 @@
 import org.apollo.mvc.AbstractSubject;
 import org.apollo.mvc.SubjectChangedEvent;
+import org.expeditee.core.Image;
+import org.expeditee.gio.swing.SwingConversions;
+import org.expeditee.gio.swing.SwingMiscManager;
 
 public class WaveFormRenderProccessingUnit {
@@ -176 +178 @@
                                         bufferWidth = currentTask.imageBuffer.getWidth();
                                         
-                                        g = currentTask.imageBuffer.createGraphics();
-        
-                                        g.setStroke(Strokes.SOLID_1);
+                                        g = SwingMiscManager.getIfUsingSwingImageManager().getImageGraphics(currentTask.imageBuffer);
+        
+                                        g.setStroke(SwingConversions.toSwingStroke(Strokes.SOLID_1));
 
                                         // Clear the buffer with transparent pixels
-                                        g.setBackground(ApolloColorIndexedModels.KEY_COLOR);
+                                        g.setBackground(SwingConversions.toSwingColor(ApolloColorIndexedModels.KEY_COLOR));
                                         g.clearRect(0, 0, bufferWidth, currentTask.imageBuffer.getHeight());
                                         
@@ -233 +235 @@
                                         synchronized(currentTask.imageBuffer) { 
                                                 
-                                                g.setColor(ApolloColorIndexedModels.WAVEFORM_COLOR);
+                                                g.setColor(SwingConversions.toSwingColor(ApolloColorIndexedModels.WAVEFORM_COLOR));
                                                 
                                                 if (aggregationSize == 1) {
@@ -344 +346 @@
                 private static final int STATE_STOPPED = 3;
                 
-                private BufferedImage imageBuffer; // nullified when stopped.
+                private Image imageBuffer; // nullified when stopped.
                 private byte[] audioBytes; // nullified when stopped. - Arrays (not contents) are immutable so no need to worry about threading issues with indexes
                 private final int startFrame;
@@ -352 +354 @@
                 
                 public WaveFormRenderTask(
-                                BufferedImage imageBuffer, 
+                                Image imageBuffer, 
                                 byte[] audioBytes, 
                                 AudioFormat format,