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

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

@@ -5 +5 @@
 import java.awt.Graphics;
 import java.awt.Graphics2D;
-import java.awt.Point;
 import java.awt.Rectangle;
 import java.awt.Shape;
-import java.awt.Stroke;
 import java.awt.event.ActionEvent;
 import java.awt.event.KeyEvent;
@@ -27 +25 @@
 import javax.swing.SwingUtilities;
 
-import org.apollo.AudioFrameKeyboardActions;
-import org.apollo.AudioFrameMouseActions;
+import org.apollo.ApolloGestureActions;
+import org.apollo.ApolloKBMGestureTranslator;
 import org.apollo.audio.ApolloPlaybackMixer;
 import org.apollo.audio.ApolloSubjectChangedEvent;
@@ -56 +54 @@
 import org.apollo.util.AudioMath;
 import org.apollo.util.Mutable;
-import org.apollo.util.PopupReaper;
 import org.apollo.util.TrackModelHandler;
 import org.apollo.util.TrackModelLoadManager;
 import org.apollo.util.TrackNameCreator;
-import org.expeditee.gui.Browser;
-import org.expeditee.gui.DisplayIO;
+import org.expeditee.Util;
+import org.expeditee.core.Colour;
+import org.expeditee.core.Point;
+import org.expeditee.core.Stroke;
+import org.expeditee.core.bounds.AxisAlignedBoxBounds;
+import org.expeditee.gio.gesture.StandardGestureActions;
+import org.expeditee.gio.swing.MouseEventRouter;
+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.FrameIO;
-import org.expeditee.gui.FrameMouseActions;
-import org.expeditee.gui.MouseEventRouter;
 import org.expeditee.gui.PopupManager;
 import org.expeditee.items.ItemParentStateChangedEvent;
@@ -72 +74 @@
 import org.expeditee.items.Text;
 import org.expeditee.items.widgets.HeavyDutyInteractiveWidget;
-import org.expeditee.items.widgets.InteractiveWidget;
 import org.expeditee.items.widgets.InteractiveWidgetInitialisationFailedException;
 import org.expeditee.items.widgets.InteractiveWidgetNotAvailableException;
+import org.expeditee.items.widgets.Widget;
 
 /**
@@ -82 +84 @@
  *
  */
-public class SampledTrack extends HeavyDutyInteractiveWidget 
-        implements TrackModelHandler, EffecientInvalidator, Observer {
+public class SampledTrack extends HeavyDutyInteractiveWidget implements TrackModelHandler, EffecientInvalidator, Observer {
 
         /** The observered subject. Can be null */
@@ -115 +116 @@
         private static final Stroke FREESPACE_OUTLINING = Strokes.SOLID_2;
         
-        private static final Color SEMI_TRANSPARENT_FREESPACE_BACKCOLOR = new Color(
+        private static final Colour SEMI_TRANSPARENT_FREESPACE_BACKCOLOR = new Colour(
                         FREESPACE_BACKCOLOR.getRed(), FREESPACE_BACKCOLOR.getGreen(),
-                        FREESPACE_BACKCOLOR.getBlue(), 128);
+                        FREESPACE_BACKCOLOR.getBlue(), Colour.FromComponent255(128));
         
         
@@ -173 +174 @@
                 initObservers();
                 
+        }
+        
+        @Override
+        public void onMoved()
+        {
+                if (nameLabel != null) nameLabel.setPosition(new Point(getX() + 10, getY() + 20));
         }
 
@@ -279 +286 @@
 
                                 if (nameLabel != null) {
-                                        nameLabel.onMouseMoved(e, fulltrackView);
+                                        nameLabel.gainFocus();
                                 }
                                 
@@ -291 +298 @@
                                         
                                         // Get rid of all popups
-                                        PopupManager.getInstance().hideAutohidePopups();
+                                        PopupManager.getInstance().hideAutoHidePopups();
                                         
                                         Rectangle animationSource = _swingComponent.getBounds();
@@ -297 +304 @@
                                         // Determine where popup should show
                                         int x = SampledTrack.this.getX();
-                                        int y = SampledTrack.this.getY() - playbackControlPopup.getHeight() - 2; // by default show above
+                                        int y = SampledTrack.this.getY() - playbackControlPopup.getFullBounds().getHeight() - 2; // by default show above
                                         
                                         // I get sick.dizzy from the popup expanding from the whole thing...
                                         animationSource.height = 1;
-                                        animationSource.width = Math.min(animationSource.width, playbackControlPopup.getWidth());
+                                        animationSource.width = Math.min(animationSource.width, playbackControlPopup.getFullBounds().getWidth());
                                         
                                         if (y < 0) {
@@ -309 +316 @@
 
                                         // Animate the popup
-                                        PopupManager.getInstance().showPopup(
-                                                        playbackControlPopup, 
-                                                        new Point(x, y), 
-                                                        fulltrackView,
-                                                        PopupManager.getInstance().new ExpandShrinkAnimator(
-                                                                        animationSource,
-                                                                        Color.LIGHT_GRAY));
-                                        
-                                        PopupReaper.getInstance().initPopupLifetime(
-                                                        playbackControlPopup, 
-                                                        PopupManager.getInstance().new ExpandShrinkAnimator(
-                                                                        animationSource,
-                                                                        Color.LIGHT_GRAY), 
-                                                                        TrackWidgetCommons.POPUP_LIFETIME);
-                                        
+                                        playbackControlPopup.getAutoHideTime().setLifetime(TrackWidgetCommons.POPUP_LIFETIME);
+                                        PopupManager.getInstance().add(playbackControlPopup);
+                                        playbackControlPopup.show();
                                 } else {
-                                        PopupReaper.getInstance().revivePopup(playbackControlPopup, TrackWidgetCommons.POPUP_LIFETIME);
+                                        playbackControlPopup.show();
                                 }
                                 
@@ -398 +393 @@
                 fulltrackView.addKeyListener(new KeyListener() {
 
-                        public void keyPressed(KeyEvent e) {
-                                if (!e.isControlDown() && nameLabel != null) {
-                                        if (nameLabel.onKeyPressed(e, fulltrackView)) {
-                                                e.consume();
-                                        }
-                                }
-                        }
-
-                        public void keyReleased(KeyEvent e) {
-                                if (!e.isControlDown() && nameLabel != null) {
-                                        if (nameLabel.onKeyReleased(e, fulltrackView)) {
-                                                e.consume();
-                                        }
-                                }
-                                
+                        public void keyPressed(KeyEvent e)
+                        {
+                        }
+
+                        public void keyReleased(KeyEvent e)
+                        {
                                 // Toggle pitch-track indexing
                                 if (e.isControlDown() && e.getKeyCode() == KeyEvent.VK_I) {
                                         setShouldOmitIndexAudio(!shouldOmitIndexAudio());
-                                        FrameGraphics.refresh(true);
+                                        DisplayController.requestRefresh(true);
                                 }
                                 
@@ -429 +415 @@
                                 else if (e.isControlDown() && e.getKeyCode() == KeyEvent.VK_L) {
 
-                                        Frame current = DisplayIO.getCurrentFrame();
+                                        Frame current = DisplayController.getCurrentFrame();
                                         
                                         if (current != null) {
@@ -473 +459 @@
                                         }
         
-                                } else if (e.isControlDown() && 
-                                                (e.getKeyCode() == KeyEvent.VK_LEFT || e.getKeyCode() == KeyEvent.VK_RIGHT)) {
-                                        e.consume();
-                                        AudioFrameKeyboardActions.adjustInitationTime(SampledTrack.this, e.getKeyCode() == KeyEvent.VK_LEFT);
-                                } else if (e.isControlDown() && 
-                                                (e.getKeyCode() == KeyEvent.VK_UP || e.getKeyCode() == KeyEvent.VK_DOWN)) {
-                                        e.consume();
-                                        AudioFrameKeyboardActions.adjustVerticlePosition(SampledTrack.this, e.getKeyCode() == KeyEvent.VK_UP);
+                                } else if (e.isControlDown()) {
+                                        if (e.getKeyCode() == KeyEvent.VK_LEFT) {
+                                                e.consume();
+                                                ApolloGestureActions.adjustInitiationTime(SampledTrack.this, -ApolloKBMGestureTranslator.TRACK_WIDGET_TIMELINE_ADJUSTMENT);
+                                        } else if (e.getKeyCode() == KeyEvent.VK_RIGHT) {
+                                                e.consume();
+                                                ApolloGestureActions.adjustInitiationTime(SampledTrack.this, ApolloKBMGestureTranslator.TRACK_WIDGET_TIMELINE_ADJUSTMENT);
+                                        } else if (e.getKeyCode() == KeyEvent.VK_UP) {
+                                                e.consume();
+                                                ApolloGestureActions.adjustVerticalPosition(SampledTrack.this, -ApolloKBMGestureTranslator.TRACK_WIDGET_VERTICAL_ADJUSTMENT);
+                                        } else if (e.getKeyCode() == KeyEvent.VK_DOWN) {
+                                                e.consume();
+                                                ApolloGestureActions.adjustVerticalPosition(SampledTrack.this, ApolloKBMGestureTranslator.TRACK_WIDGET_VERTICAL_ADJUSTMENT);
+                                        }
                                 }
 
@@ -490 +482 @@
                 });
                 
-                
-                
-                nameLabel = new EmulatedTextItem(_swingComponent, new Point(10, 20));
-                nameLabel.setBackgroundColor(Color.WHITE);      
+                nameLabel = new EmulatedTextItem("", (new Point(10, 20)).add(getBounds().getTopLeft()));
+                nameLabel.setBackgroundColor(Colour.WHITE);     
                 
                 String metaName = getStrippedDataString(TrackWidgetCommons.META_NAME_TAG);
@@ -616 +606 @@
                 Text source = new Text(
                                 targetFrame.getNextItemID(),
-                                ItemUtils.GetTag(ItemUtils.TAG_IWIDGET) + ":" + formatArgs(args));
+                                ItemUtils.GetTag(ItemUtils.TAG_IWIDGET) + ":" + Util.formatArgs(args));
                 
                 source.setParent(targetFrame);
@@ -685 +675 @@
         
         @Override
-        public InteractiveWidget copy() 
+        public Widget copy() 
                 throws InteractiveWidgetNotAvailableException, InteractiveWidgetInitialisationFailedException {
                 
@@ -1119 +1109 @@
         }
 
-        public void onGraphDirty(SampledTrackGraphView graph, Rectangle dirty) {
+        public void onGraphDirty(SampledTrackGraphView graph, Rectangle dirty)
+        {
         dirty.translate(getX(), getY() - 1);
-        FrameGraphics.invalidateArea(dirty); 
-        FrameGraphics.refresh(true);
+        DisplayController.invalidateArea(SwingConversions.fromSwingRectangle(dirty)); 
+        DisplayController.requestRefresh(true);
         }
 
@@ -1131 +1122 @@
 
         @Override
-        protected void onSizeChanged() {
+        protected void onSizeChanged()
+        {
                 super.onSizeChanged();
                 // Keep meta as constant as possible for best reults
@@ -1246 +1238 @@
 
         @Override
-        public void paintInFreeSpace(Graphics g) {
-                paintInFreeSpace(g, false);
-        }
-        
-        public void paintInFreeSpace(Graphics g, boolean isAtFinalPass) { 
+        public void paintInFreeSpace()
+        {
+                paintInFreeSpace(false);
+        }
+        
+        public void paintInFreeSpace(boolean isAtFinalPass)
+        {
+                Graphics g = SwingMiscManager.getIfUsingSwingGraphicsManager().getCurrentSurface();
 
                 if (isLoaded()) { 
@@ -1270 +1265 @@
                                         
 
-                                        Point containerPoint = SwingUtilities.convertPoint(me.getComponent(), 
-                                                        new Point(0,0), Browser._theBrowser.getContentPane());
+                                        Point containerPoint = SwingConversions.fromSwingPoint(SwingUtilities.convertPoint(me.getComponent(), 
+                                                        new java.awt.Point(0,0), SwingMiscManager.getIfUsingSwingGraphicsManager().getContentPane()));
                                         
                                         Shape clipBackUp = g.getClip();
                                         g.setClip(null);
                                         
-                                        g.setColor(Color.ORANGE);
+                                        g.setColor(SwingConversions.toSwingColor(Colour.ORANGE));
                                         ((Graphics2D)g).setStroke(EditableSampledTrackGraphView.GRAPH_BAR_STROKE);
                                         g.drawLine(
@@ -1284 +1279 @@
                                                         containerPoint.y + me.getComponent().getHeight());
                                         
-                                        FrameGraphics.invalidateArea(new Rectangle(
+                                        DisplayController.invalidateArea(new AxisAlignedBoxBounds(
                                                         containerPoint.x + me.getX(), 
                                                         containerPoint.y, 
@@ -1293 +1288 @@
                                         g.setClip(clipBackUp);
                                         
-                                        g.setColor(SEMI_TRANSPARENT_FREESPACE_BACKCOLOR);
+                                        g.setColor(SwingConversions.toSwingColor(SEMI_TRANSPARENT_FREESPACE_BACKCOLOR));
                                         g.fillRect(getX(), getY(), getWidth(), getHeight());
                                         
                                         if (isAtFinalPass) { // final pass does not draw the borders... so must manually draw them
-                                                g.setColor(Color.BLACK);
-                                                ((Graphics2D)g).setStroke(FREESPACE_OUTLINING);
+                                                g.setColor(SwingConversions.toSwingColor(Colour.BLACK));
+                                                ((Graphics2D)g).setStroke(SwingConversions.toSwingStroke(FREESPACE_OUTLINING));
                                                 g.drawRect(getX(), getY(), getWidth(), getHeight());
                                         }
@@ -1311 +1306 @@
                 }
                 
-                super.paintInFreeSpace(g);
+                super.paintInFreeSpace();
                 
                 if (isLoaded()) {
@@ -1318 +1313 @@
                         Rectangle tmpClip = (clipBackUp != null) ? clipBackUp.getBounds() : 
                                 new Rectangle(0, 0, 
-                                                Browser._theBrowser.getContentPane().getWidth(), 
-                                                Browser._theBrowser.getContentPane().getHeight());
-                                
-                        g.setClip(tmpClip.intersection(getBounds()));
+                                                SwingMiscManager.getIfUsingSwingGraphicsManager().getContentPane().getWidth(), 
+                                                SwingMiscManager.getIfUsingSwingGraphicsManager().getContentPane().getHeight());
+                                
+                        g.setClip(tmpClip.intersection(SwingConversions.toSwingRectangle(getBounds())));
                 
                         // Draw the name
@@ -1327 +1322 @@
                         if (name == null) name = "Unnamed";
 
-                        g.setFont(TrackWidgetCommons.FREESPACE_TRACKNAME_FONT);
-                        g.setColor(TrackWidgetCommons.FREESPACE_TRACKNAME_TEXT_COLOR);
+                        g.setFont(SwingMiscManager.getIfUsingSwingFontManager().getInternalFont(TrackWidgetCommons.FREESPACE_TRACKNAME_FONT));
+                        g.setColor(SwingConversions.toSwingColor(TrackWidgetCommons.FREESPACE_TRACKNAME_TEXT_COLOR));
                         
                         // 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(name, g);
                         
@@ -1349 +1344 @@
 
         @Override
-        public void paint(Graphics g) {
-                super.paint(g);
+        public void paintHeavyDutyWidget(Graphics2D g)
+        {
+                super.paintHeavyDutyWidget(g);
                 
                 if (isLoaded() && nameLabel != null) {
-                        nameLabel.paint(g);
+                        nameLabel.paint();
                         
                         if (shouldOmitIndexAudio()) {
@@ -1360 +1356 @@
                                                 -20 : 0;
                                 
-                                IconRepository.getIcon("omitindexed.png").paintIcon(
+                                /*IconRepository.getIcon("omitindexed.png").paintIcon(
                                                 _swingComponent, 
                                                 g, 
                                                 getX() + getWidth() - EditableSampledTrackGraphView.LOCK_ICON_CORNER_OFFSET + shiftOffset, 
-                                                getY() + EditableSampledTrackGraphView.LOCK_ICON_CORNER_OFFSET - 16);
+                                                getY() + EditableSampledTrackGraphView.LOCK_ICON_CORNER_OFFSET - 16);*/
+                                
+                                g.drawImage(SwingMiscManager.getIfUsingSwingImageManager().getInternalImage(IconRepository.getIcon("omitindexed.png")),
+                                                getX() + getWidth() - EditableSampledTrackGraphView.LOCK_ICON_CORNER_OFFSET + shiftOffset, 
+                                                getY() + EditableSampledTrackGraphView.LOCK_ICON_CORNER_OFFSET - 16, null);
                                 
                         }
@@ -1404 +1404 @@
                                                 boolean inferInitTime = true;
                                                 
-                                                if (AudioFrameMouseActions.isYAxisRestictionOn()) {
+                                                if (ApolloGestureActions.isYAxisRestictionOn()) {
                                                         Mutable.Long ms = getInitiationTimeFromMeta();
                                                         if (ms != null) {
@@ -1417 +1417 @@
                                                 }
                                                 
-                                                inferInitTime &= 
-                                                        (AudioFrameMouseActions.isMouseAnchoring() || AudioFrameMouseActions.isMouseStamping());
-
+                                                // Also must not set initiation time if the frame is simply being displayed
+                                                //inferInitTime &= (AudioFrameMouseActions.isMouseAnchoring() || AudioFrameMouseActions.isMouseStamping());
+                                                inferInitTime &= (eventType == ItemParentStateChangedEvent.EVENT_TYPE_ADDED);
+                                                
                                                 if (inferInitTime) 
                                                         initTime = Mutable.createMutableLong(FrameLayoutDaemon.getInstance().getMSAtX(getX(), parent));
@@ -1499 +1500 @@
                                                 MouseEventRouter.getCurrentMouseEvent().getButton() == MouseEvent.BUTTON2 &&
                                                 MouseEventRouter.getCurrentMouseEvent() != lastInsertME) {
-                                        Frame suspended = DisplayIO.getCurrentFrame();
+                                        Frame suspended = DisplayController.getCurrentFrame();
                                         if (suspended != null) {
                                                 FrameLayoutDaemon.getInstance().suspendLayout(suspended, this);
@@ -1682 +1683 @@
                 
                 // Get border color currently used
-                Color oldC = getSource().getBorderColor();
-                
-                Color newC = TrackWidgetCommons.getBorderColor(
+                Colour oldC = getSource().getBorderColor();
+                
+                Colour newC = TrackWidgetCommons.getBorderColor(
                                 SoundDesk.getInstance().isSolo(trackMix.getChannelID()), 
                                 trackMix.isMuted());
@@ -1772 +1773 @@
                                 // Build the new neighbouring widget
                                 Frame target = getParentFrame();
-                                if (target == null) target = DisplayIO.getCurrentFrame();
+                                if (target == null) target = DisplayController.getCurrentFrame();
                                 
                                 // Determine init time
@@ -1811 +1812 @@
                                                         trackMix);
                                         
-                                        FrameMouseActions.pickup(extractedTrack.getItems());
+                                        StandardGestureActions.pickup(extractedTrack.getItems());
                                         
                                 }
@@ -1840 +1841 @@
                                                 trackModel,
                                                 pfname,
-                                                _swingComponent.getBounds(),
+                                                SwingConversions.fromSwingRectangle(_swingComponent.getBounds()),
                                                 trackMix);
 
@@ -1846 +1847 @@
 
                                 // Get rid of all popups
-                                PopupManager.getInstance().hideAutohidePopups();
+                                PopupManager.getInstance().hideAutoHidePopups();
                                 
                                 int start = trackModel.getSelectionStart();
@@ -1859 +1860 @@
                                 ExpandedTrackManager.getInstance().expandSingleTrack(
                                                 trackModel, 
-                                                _swingComponent.getBounds(),
+                                                SwingConversions.fromSwingRectangle(_swingComponent.getBounds()),
                                                 trackMix,
                                                 pfname,
@@ -1882 +1883 @@
          *
          */
-        private class PlaybackPopup extends PlaybackControlPopup implements Observer {
-
-                private static final long serialVersionUID = 1L;
-                
-                public PlaybackPopup() {
+        private class PlaybackPopup extends PlaybackControlPopup implements Observer
+        {
+                public PlaybackPopup()
+                {
                         miscButton.setActionCommand("expand");
-                        miscButton.setIcon(IconRepository.getIcon("expand.png"));
+                        SwingMiscManager.setJButtonIcon(miscButton, IconRepository.getIcon("expand.png"));
                         miscButton.setToolTipText("Expand");
-
                 }
 
                 @Override
-                public void onHide() {
-                        super.onHide();
-                        
+                public void onHide()
+                {
                         // Listen for volume or mute changed events
                         trackMix.removeObserver(this);
@@ -1905 +1903 @@
 
                 @Override
-                public void onShow() {
-                        super.onShow();
+                public void onShow()
+                {
                         // Listen for volume or mute changed events
                         trackMix.addObserver(this);
@@ -2016 +2014 @@
                 }
                 
-                public Subject getObservedSubject() {
+                public Subject getObservedSubject()
+                {
                         return null;
                 }
 
-                public void setObservedSubject(Subject parent) {
+                public void setObservedSubject(Subject parent)
+                {
                 }
 
@@ -2026 +2026 @@
                  * Receives events from the track model OR from the observed track sequence.
                  */
-                public void modelChanged(Subject source, SubjectChangedEvent event) {
-
+                public void modelChanged(Subject source, SubjectChangedEvent event)
+                {
                         // Synch GUI with track state
                         switch (event.getID()) {
@@ -2049 +2049 @@
                                 stopButton.setEnabled(true);
                                 rewindButton.setEnabled(false);
-                                playPauseButton.setIcon(IconRepository.getIcon("pause.png"));
+                                SwingMiscManager.setJButtonIcon(playPauseButton, IconRepository.getIcon("pause.png"));
                                 
                                 invalidateStateIcons();
@@ -2063 +2063 @@
                                 rewindButton.setEnabled(true);
                                 stopButton.setEnabled(false);
-                                playPauseButton.setIcon(IconRepository.getIcon("play.png"));
+                                SwingMiscManager.setJButtonIcon(playPauseButton, IconRepository.getIcon("play.png"));
                                 
                                 // Note:
@@ -2109 +2109 @@
 
                 @Override
-                protected void volumeChanged() {
+                protected void volumeChanged()
+                {
                         trackMix.setVolume(((float)volumeSlider.getValue()) / 100.0f);
                 }
 
                 @Override
-                protected void muteChanged() {
+                protected void muteChanged()
+                {
                         trackMix.setMuted(muteButton.isSelected());
                 }
 
                 @Override
-                protected void soloChanged() {
+                protected void soloChanged()
+                {
                         SoundDesk.getInstance().setSoloIDPrefix(soloButton.isSelected() ?
                                         trackMix.getChannelID() : null
                                         );
                 }
-                
         }
 
         @Override
-        public boolean isWidgetEdgeThicknessAdjustable() {
+        public boolean isWidgetEdgeThicknessAdjustable()
+        {
                 return false;
         }
-        
-        
-        
 }