Changeset 1102 for trunk/src/org/apollo/widgets/SampleRecorder.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/widgets/SampleRecorder.java (modified) (18 diffs)

trunk/src/org/apollo/widgets/SampleRecorder.java

@@ -1 +1 @@
 package org.apollo.widgets;
 
-import java.awt.Color;
 import java.awt.Dimension;
 import java.awt.FontMetrics;
@@ -49 +48 @@
 import org.apollo.util.ApolloSystemLog;
 import org.apollo.util.TrackNameCreator;
-import org.expeditee.gui.DisplayIO;
+import org.expeditee.core.Colour;
+import org.expeditee.gio.gesture.StandardGestureActions;
+import org.expeditee.gio.swing.SwingConversions;
+import org.expeditee.gio.swing.SwingMiscManager;
+import org.expeditee.gui.DisplayController;
 import org.expeditee.gui.Frame;
-import org.expeditee.gui.FrameGraphics;
-import org.expeditee.gui.FrameMouseActions;
 import org.expeditee.items.ItemParentStateChangedEvent;
 import org.expeditee.items.Text;
-import org.expeditee.items.widgets.InteractiveWidget;
+import org.expeditee.items.widgets.SwingWidget;
 
 /**
@@ -63 +64 @@
  *
  */
-public class SampleRecorder extends InteractiveWidget 
-        implements ActionListener, Observer, MultitrackLoadListener {
+public class SampleRecorder extends SwingWidget implements ActionListener, Observer, MultitrackLoadListener {
         
         private enum WidgetState {
@@ -105 +105 @@
         private final static int MAX_COUNTDOWN_TIME = 60;
         
-        private static final Color GRAPH_BACKCOLOR = Color.BLACK;
-        private static final Color GRAPH_WAVECOLOR = Color.GREEN;
+        private static final Colour GRAPH_BACKCOLOR = Colour.BLACK;
+        private static final Colour GRAPH_WAVECOLOR = Colour.GREEN;
         
         private final static int RENDER_POINTS_PER_SECOND = 20; // how many points to render each second
@@ -112 +112 @@
         private final static String COUNTDOWN_META = "countdown=";
         
-        public SampleRecorder(Text source, String[] args) {
+        public SampleRecorder(Text source, String[] args)
+        {
                 this(source, args, false);
         }
         
-        public SampleRecorder(Text source, String[] args, boolean isTemporary) {
+        public SampleRecorder(Text source, String[] args, boolean isTemporary)
+        {
                 super(source, new JPanel(new GridBagLayout()),
                                 AnimatedSampleGraph.GRAPH_WIDTH + (2 * HORO_SPACING), 
@@ -132 +134 @@
                 // Create gui layout
                 recordButton = new JButton();
-                recordButton.setIcon(IconRepository.getIcon("record.png"));
+                SwingMiscManager.setJButtonIcon(recordButton, IconRepository.getIcon("record.png"));
                 recordButton.addActionListener(this);
                 recordButton.setPreferredSize(new Dimension(AnimatedSampleGraph.GRAPH_WIDTH / 2, BUTTON_HEIGHT));
                 
                 recordSynchedButton = new JButton();
-                recordSynchedButton.setIcon(IconRepository.getIcon("recordplay.png"));
+                SwingMiscManager.setJButtonIcon(recordSynchedButton, IconRepository.getIcon("recordplay.png"));
                 recordSynchedButton.addActionListener(this);
                 recordSynchedButton.setPreferredSize(new Dimension(AnimatedSampleGraph.GRAPH_WIDTH / 2, BUTTON_HEIGHT));
 
                 stopButton = new JButton();
-                stopButton.setIcon(IconRepository.getIcon("stop.png"));
+                SwingMiscManager.setJButtonIcon(stopButton, IconRepository.getIcon("stop.png"));
                 stopButton.addActionListener(this);
                 stopButton.setPreferredSize(new Dimension(AnimatedSampleGraph.GRAPH_WIDTH, BUTTON_HEIGHT));
@@ -303 +305 @@
         
                                 sampleGraph.alternateText = Integer.toString(countDown);
-                                sampleGraph.alternateTextColor = (countDown > 3) ? Color.WHITE : Color.RED;
+                                sampleGraph.alternateTextColor = (countDown > 3) ? Colour.WHITE : Colour.RED;
                                 sampleGraph.invalidateGraph();
-                                FrameGraphics.refresh(true);
+                                DisplayController.requestRefresh(true);
                                 
                                 countdownThread = new CountDownTimer(countDown);
@@ -373 +375 @@
                                          Frame targetFrame = getParentFrame();
                                          if (targetFrame == null) {
-                                                 targetFrame = DisplayIO.getCurrentFrame();
+                                                 targetFrame = DisplayController.getCurrentFrame();
                                          }
                                          
@@ -398 +400 @@
                                          } else {
                                                  
-                                                 FrameMouseActions.pickup(trackWidget.getItems());
+                                                 StandardGestureActions.pickup(trackWidget.getItems());
                                                         
                                                 // Reset the state
@@ -602 +604 @@
                         assert (state == WidgetState.Ready);
                         
-                        Frame target = DisplayIO.getCurrentFrame();
+                        Frame target = DisplayController.getCurrentFrame();
                         if (target  == null) return;
 
@@ -608 +610 @@
                         
                         RecordOverdubLauncher launcher = new RecordOverdubLauncher((Integer)countDownSpinner.getValue());
-                        launcher.setPosition(FrameMouseActions.MouseX, FrameMouseActions.MouseY);
+                        launcher.setPosition(DisplayController.getMousePosition());
 
                         // Pick it up
-                        FrameMouseActions.pickup(launcher);
+                        StandardGestureActions.pickup(launcher);
                         
                 }
@@ -757 +759 @@
                         setState(WidgetState.LoadingPlayback, "Loading tracks...");
                         
-                        Frame currentFrame = DisplayIO.getCurrentFrame();
+                        Frame currentFrame = DisplayController.getCurrentFrame();
                         if (currentFrame == null || currentFrame.getName() == null) {
                                 
@@ -843 +845 @@
                 
                 private String alternateText = null;
-                private Color alternateTextColor = Color.WHITE;
+                private Colour alternateTextColor = Colour.WHITE;
 
                 AnimatedSampleGraph() {
                         imageBuffer = new BufferedImage(GRAPH_WIDTH, GRAPH_HEIGHT, BufferedImage.TYPE_INT_RGB);
                         imageGraphics = (Graphics2D)imageBuffer.getGraphics();
-                        imageGraphics.setColor(GRAPH_BACKCOLOR);
+                        imageGraphics.setColor(SwingConversions.toSwingColor(GRAPH_BACKCOLOR));
                         imageGraphics.fillRect(0, 0, GRAPH_WIDTH, GRAPH_HEIGHT);
                         setPreferredSize(new Dimension(GRAPH_WIDTH, GRAPH_HEIGHT));
@@ -857 +859 @@
                  */
                 public void clear() {
-                        imageGraphics.setColor(GRAPH_BACKCOLOR);
+                        imageGraphics.setColor(SwingConversions.toSwingColor(GRAPH_BACKCOLOR));
                         imageGraphics.fillRect(0, 0, GRAPH_WIDTH, GRAPH_HEIGHT);
                         invalidateGraph();
@@ -867 +869 @@
                         if (alternateText != null) {
                                 
-                                g.setColor(Color.BLACK);
+                                g.setColor(SwingConversions.toSwingColor(Colour.BLACK));
                                 g.fillRect(0, 0, getWidth(), getHeight());
                                 
-                                g.setFont(TrackWidgetCommons.FREESPACE_TRACKNAME_FONT);
-                                g.setColor(alternateTextColor);
+                                g.setFont(SwingMiscManager.getIfUsingSwingFontManager().getInternalFont(TrackWidgetCommons.FREESPACE_TRACKNAME_FONT));
+                                g.setColor(SwingConversions.toSwingColor(alternateTextColor));
                                 
                                 // Center track name
-                                FontMetrics fm   = g.getFontMetrics(TrackWidgetCommons.FREESPACE_TRACKNAME_FONT);
+                                FontMetrics fm   = g.getFontMetrics(SwingMiscManager.getIfUsingSwingFontManager().getInternalFont(TrackWidgetCommons.FREESPACE_TRACKNAME_FONT));
                                 Rectangle2D rect = fm.getStringBounds(alternateText, g);
                                 
@@ -907 +909 @@
                         
                         // Render backcolor
-                        imageGraphics.setColor(GRAPH_BACKCOLOR);
+                        imageGraphics.setColor(SwingConversions.toSwingColor(GRAPH_BACKCOLOR));
                         imageGraphics.fillRect(GRAPH_WIDTH - pixelWidth, 0, pixelWidth, GRAPH_HEIGHT);
                         
                         // Render wave forms from lastSampleHeight
-                        imageGraphics.setColor(GRAPH_WAVECOLOR);
+                        imageGraphics.setColor(SwingConversions.toSwingColor(GRAPH_WAVECOLOR));
                         int currentPixelX = GRAPH_WIDTH - pixelWidth;
 
@@ -933 +935 @@
                 Rectangle dirty = this.getBounds();
                 dirty.translate(SampleRecorder.this.getX(), SampleRecorder.this.getY());
-                FrameGraphics.invalidateArea(dirty); 
-                FrameGraphics.refresh(true); 
+                DisplayController.invalidateArea(SwingConversions.fromSwingRectangle(dirty)); 
+                DisplayController.requestRefresh(true); 
                 
                 }
@@ -979 +981 @@
                                                         sampleGraph.alternateText = Integer.toString(currentCountdown);
                                                         sampleGraph.alternateTextColor = (currentCountdown > 3) ?
-                                                                                Color.WHITE : Color.RED;
+                                                                                Colour.WHITE : Colour.RED;
                                                         sampleGraph.invalidateGraph();
-                                                        FrameGraphics.refresh(true);
+                                                        DisplayController.requestRefresh(true);
                                                 }
                                         });