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

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

@@ -2 +2 @@
 
 import java.awt.Dimension;
+import java.awt.Graphics2D;
 import java.awt.GridBagConstraints;
 import java.awt.GridBagLayout;
-import java.awt.Rectangle;
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
-import java.awt.event.ComponentEvent;
-import java.awt.event.ComponentListener;
 import java.util.LinkedList;
 
 import javax.swing.JButton;
 import javax.swing.JLabel;
-import javax.swing.SwingUtilities;
+import javax.swing.JPanel;
 
 import org.apollo.audio.SampledTrackModel;
@@ -22 +20 @@
 import org.apollo.util.TrackModelHandler;
 import org.apollo.util.TrackModelLoadManager;
+import org.expeditee.core.bounds.AxisAlignedBoxBounds;
+import org.expeditee.gio.EcosystemManager;
+import org.expeditee.gio.InputManager.WindowEventListener;
+import org.expeditee.gio.InputManager.WindowEventType;
+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.MessageBay;
+import org.expeditee.gui.DisplayController;
 import org.expeditee.gui.Popup;
 import org.expeditee.gui.PopupManager;
+import org.expeditee.gui.PopupManager.ExpandShrinkAnimator;
 
 /**
@@ -40 +44 @@
         
         /** All epxanded tracks ... either in all in view or all selected ... to be viewed */
-        private LinkedList<ExpandedTrackPopup> expandedTracks = new LinkedList<ExpandedTrackPopup> (); // SHARED Model data
+        private LinkedList<ExpandedTrackPopup> expandedTracks = new LinkedList<ExpandedTrackPopup>(); // SHARED Model data
 
         private MultiTrackExpansionPopup trackSelectionPopup = new MultiTrackExpansionPopup();
         
         private static ExpandedTrackManager instance = new ExpandedTrackManager();
-        private ExpandedTrackManager() {
-                
+        
+        private ExpandedTrackManager()
+        {
                 // Keep view centered to browser size
-                SwingUtilities.invokeLater(new Runnable() {
-                        public void run() {
-
-                                // Keep expanded view centered to the browser window
-                                if (Browser._theBrowser != null) {
-                                        Browser._theBrowser.addComponentListener(new ComponentListener() {
-
-                                                public void componentHidden(ComponentEvent e) {
-                                                }
-
-                                                public void componentMoved(ComponentEvent e) {
-                                                }
-
-                                                public void componentResized(ComponentEvent e) {
-                                                        
-                                                        if (PopupManager.getInstance().isShowing(trackSelectionPopup)) {
-                                                                // User currently selecting..
-                                                                trackSelectionPopup.setLocation(
-                                                                                (Browser._theBrowser.getWidth() / 2) - (trackSelectionPopup.getWidth() / 2), 0);
-                                                                
-                                                        } else { // expanded views might be showing
-                                                                
-                                                                // Fails with Maximizing of window on some systems... swing
-                                                                // bug!! really anoying
-                                                                updateLayout();
-        
-                                                        }
-        
-                                                }
-
-                                                public void componentShown(ComponentEvent e) {
-                                                }
-                                                
-                                        });
+                EcosystemManager.getInputManager().addWindowEventListener(new WindowEventListener()
+                {
+                        @Override
+                        public void onWindowEvent(WindowEventType type)
+                        {
+                                if (type != WindowEventType.WINDOW_RESIZED) return;
+                                if (PopupManager.getInstance().isShowing(trackSelectionPopup)) {
+                                        // User currently selecting..
+                                        trackSelectionPopup.setLocation((EcosystemManager.getGraphicsManager().getWindowSize().getWidth() - trackSelectionPopup.getFullBounds().getWidth()) / 2, 0);
+                                        
+                                } else { // expanded views might be showing
+                                        
+                                        // Fails with maximising of window on some systems... swing
+                                        // bug!! really annoying
+                                        updateLayout();
+
                                 }
-                                
-                        }
+                        }
+                        
                 });
                 
-                // Registewr for (indirectly) handling track models
+                // Register for (indirectly) handling track models
                 TrackModelLoadManager.getInstance().addTrackModelHandler(this);
 
+                PopupManager.getInstance().add(trackSelectionPopup);
         }
         
@@ -162 +150 @@
          *              If trackModel or trackMix or trackSourceFrameName or localFilename is null.
          */
-        public boolean addTrackToSelection(
-                        SampledTrackModel track, 
-                        String trackSourceFrameName,
-                        Rectangle animationSource,
-                        TrackMixSubject mix) {
-                
+        public boolean addTrackToSelection(SampledTrackModel track, String trackSourceFrameName, AxisAlignedBoxBounds animationSource, TrackMixSubject mix)
+        {
                 assert(track != null);
                 assert(Browser._theBrowser != null);
@@ -174 +158 @@
                 synchronized(expandedTracks) {
         
-                        if (expandedTracks.size() < MAX_EXPANDED_TRACK_SIZE 
-                                        && !isTrackInExpansionSelection(track)) {
+                        if (expandedTracks.size() < MAX_EXPANDED_TRACK_SIZE && !isTrackInExpansionSelection(track)) {
                                 
                                 ExpandedTrackPopup.giveToExpandedTrackManager(
@@ -183 +166 @@
                                                 0,
                                                 track.getFrameCount()); /** @see #receiveExpandedTrackPopup */
-        
-                                Rectangle trackSelectionPopupBounds = null;
                                 
                                 // Ensure that the trackSelectionPopup is not already showing / animated to show
                                 if (!PopupManager.getInstance().isShowing(trackSelectionPopup)) {
                                         
-                                        trackSelectionPopupBounds = new Rectangle(
-                                                        (Browser._theBrowser.getWidth() / 2 ) - (trackSelectionPopup.getWidth() / 2),
-                                                        0, 
-                                                        trackSelectionPopup.getWidth(), 
-                                                        trackSelectionPopup.getHeight());
+                                        trackSelectionPopup.setLocation((DisplayController.getFramePaintArea().getWidth() - trackSelectionPopup.getFullBounds().getWidth()) / 2, 0);
                                         
                                         // Creep from above
-                                        PopupManager.getInstance().showPopup(
-                                                        trackSelectionPopup,
-                                                        trackSelectionPopupBounds.getLocation(),
-                                                        null,
-                                                        PopupManager.getInstance().new ExpandShrinkAnimator(
-                                                                        trackSelectionPopupBounds,
-                                                                        null));
-                                        
-                                } else {
-                                        trackSelectionPopup.repaint();
+                                        trackSelectionPopup.show();
                                 }
                                 
                                 // Animate a fake popup expanding into the trackSelectionPopup from the given source if not null
                                 if (animationSource != null) {
-                                        
-                                        PopupManager.getInstance().doPureAnimation(PopupManager.getInstance().new ExpandShrinkAnimator(
-                                                        animationSource, null), 
-                                                        (trackSelectionPopupBounds == null) ?
-                                                                        trackSelectionPopup.getBounds() : trackSelectionPopupBounds);
+                                        ((ExpandShrinkAnimator) trackSelectionPopup.getAnimator()).setInitialBounds(animationSource);
                                 }
                                 
@@ -253 +217 @@
          * 
          */
-        public void expandSingleTrack(
-                        SampledTrackModel track, 
-                        Rectangle animationSource, 
-                        TrackMixSubject mix,
-                        String trackSourceFrameName,
-                        int frameStart,
-                        int frameLength) {
+        public void expandSingleTrack(SampledTrackModel track, AxisAlignedBoxBounds animationSource, TrackMixSubject mix, String trackSourceFrameName, int frameStart, int frameLength)
+        {
                 assert(animationSource != null);
                 assert(track != null);
@@ -265 +224 @@
                 synchronized(expandedTracks) {
                         // Hide all expandedTracks that are currently showing
-                        while (!expandedTracks.isEmpty())
-                                PopupManager.getInstance().hidePopup(expandedTracks.getFirst());
+                        for (ExpandedTrackPopup expandedTrack : expandedTracks) {
+                                expandedTrack.hide();
+                        }
                 }
 
@@ -315 +275 @@
         }
         
-        private void cancelSelection() {
-                
+        private void cancelSelection()
+        {
                 hideTrackSelectionPopup();
                 
                 // Remove from selection
-                LinkedList<? extends ExpandedTrackPopup> old = (LinkedList<? extends ExpandedTrackPopup>)expandedTracks.clone();
+                LinkedList<? extends ExpandedTrackPopup> old = (LinkedList<? extends ExpandedTrackPopup>) expandedTracks.clone();
                 
                 synchronized(expandedTracks) {
@@ -341 +301 @@
          *              A tracks ExpandedTrackPopup if one exists.
          */
-        private ExpandedTrackPopup getExpandedTrackPopup(SampledTrackModel track) {
+        private ExpandedTrackPopup getExpandedTrackPopup(SampledTrackModel track)
+        {
                 assert(track != null);
                 
@@ -362 +323 @@
          *              True if the track is expanded - or is selected to be expanded..
          */
-        public boolean isTrackInExpansionSelection(SampledTrackModel track) {
+        public boolean isTrackInExpansionSelection(SampledTrackModel track)
+        {
                 assert(track != null);
                 return getExpandedTrackPopup(track) != null;
@@ -371 +333 @@
          *                      True if at least 1 expanded track is showing - or is selected to show.
          */
-        public boolean doesExpandedTrackExist() {
+        public boolean doesExpandedTrackExist()
+        {
                 synchronized(expandedTracks) {
                         return expandedTracks.size() > 0;
@@ -377 +340 @@
         }
         
-        public boolean isAnyExpandedTrackVisible() {
+        public boolean isAnyExpandedTrackVisible()
+        {
                 for (ExpandedTrackPopup xtp : expandedTracks) {
                         if (PopupManager.getInstance().isShowing(xtp)) return true;
@@ -389 +353 @@
          *
          */
-        public void showSelection() {
+        public void showSelection()
+        {
                 expandTracks(null);
         }
         
         /**
-         * Returns immediatly if there are no tracks selected. Only expands if the popup is not already expanded.
+         * Returns immediately if there are no tracks selected. Only expands if the popup is not already expanded.
          * 
          * @param directAnimSource
@@ -401 +366 @@
          *              a widget).
          */
-        private void expandTracks(Rectangle directAnimSource) {
-
+        private void expandTracks(AxisAlignedBoxBounds directAnimSource)
+        {
                 synchronized(expandedTracks) {
                         
@@ -418 +383 @@
                         for (ExpandedTrackPopup xtp : expandedTracks) {
         
-                                // Note: returns immediatly if already showing
-                                PopupManager.getInstance().showPopup(
-                                                xtp, 
-                                                xtp.getLocation(), 
-                                                null,
-                                                PopupManager.getInstance().new ExpandShrinkAnimator(
-                                                                directAnimSource,
-                                                                null));
+                                // Note: returns immediately if already showing
+                                ((ExpandShrinkAnimator) xtp.getAnimator()).setInitialBounds(directAnimSource);
+                                xtp.show();
                         
                         }
@@ -435 +395 @@
         }
         
-        private void hideTrackSelectionPopup() {
-                PopupManager.getInstance().hidePopup(
-                                trackSelectionPopup, PopupManager.getInstance().new ExpandShrinkAnimator(
-                                                new Rectangle((Browser._theBrowser.getWidth() / 2 ) - (trackSelectionPopup.getWidth() / 2),
-                                                                0, trackSelectionPopup.getWidth(), trackSelectionPopup.getHeight()), null));
+        private void hideTrackSelectionPopup()
+        {
+                trackSelectionPopup.hide();
         }
         
@@ -446 +404 @@
          * current state of the window.
          */
-        private void updateLayout() {
-                
-                synchronized(expandedTracks) {
-                                
-        
+        private void updateLayout()
+        {
+                synchronized(expandedTracks) {
+
                         if (expandedTracks.isEmpty()) return;
                         
@@ -456 +413 @@
                         assert(Browser._theBrowser != null);
                 
-                        int cpWidth = Browser._theBrowser.getContentPane().getWidth();
-                        int cpHeight = Browser._theBrowser.getContentPane().getHeight();
-                        if (!FrameGraphics.isAudienceMode()) { // if message bay is showing - the remove the height
-                                
-                                cpHeight -= MessageBay.MESSAGE_BUFFER_HEIGHT;
+                        int cpWidth = DisplayController.getFramePaintArea().getWidth();
+                        int cpHeight = DisplayController.getFramePaintArea().getHeight();
+                        if (!DisplayController.isAudienceMode()) { // if message bay is showing - the remove the height
+                                
+                                cpHeight -= DisplayController.getMessageBayPaintArea().getHeight();
                                 
                         }
@@ -504 +461 @@
          * Global Track model re-use .... can be called from any thread
          */
-        public SampledTrackModel getSharedSampledTrackModel(String localfilename) {
+        public SampledTrackModel getSharedSampledTrackModel(String localfilename)
+        {
                 synchronized(expandedTracks) {
                         for (ExpandedTrackPopup xtp : expandedTracks) {
@@ -521 +479 @@
          *
          */
-        private class MultiTrackExpansionPopup extends Popup implements ActionListener {
-                
+        private class MultiTrackExpansionPopup extends Popup implements ActionListener
+        {
+                private JPanel panel;
                 private JButton expandButton;
                 private JButton cancelButton;
@@ -528 +487 @@
                 private JLabel selected2;
                 private JLabel selectedMore;
-
-                private static final long serialVersionUID = 1L;
+                
                 //private final Color BACK_COLOR = SampledTrackGraphViewPort.ZOOM_BACKING_COLOR_NORMAL;
                 
-                MultiTrackExpansionPopup() {
-                        super(new GridBagLayout());
-                        setSize(260, 80);
-                        super.setAudoHide(false);
-                        
-                        expandButton = new JButton(IconRepository.getIcon("expand.png"));
+                MultiTrackExpansionPopup()
+                {
+                        super(new ExpandShrinkAnimator());
+                        
+                        panel = new JPanel(new GridBagLayout());
+                        panel.setSize(260, 80);
+                        
+                        expandButton = new JButton();
+                        SwingMiscManager.setJButtonIcon(expandButton, IconRepository.getIcon("expand.png"));
                         expandButton.addActionListener(this);
                         expandButton.setPreferredSize(new Dimension(40, 40));
                         expandButton.setToolTipText("Expand selection");
                         
-                        cancelButton = new JButton(IconRepository.getIcon("close.png"));
+                        cancelButton = new JButton();
+                        SwingMiscManager.setJButtonIcon(cancelButton, IconRepository.getIcon("close.png"));
                         cancelButton.addActionListener(this);
                         cancelButton.setPreferredSize(new Dimension(40, 40));
@@ -563 +525 @@
                         c.gridy = 0;
                         c.fill = GridBagConstraints.CENTER;
-                        add(expandButton, c);
+                        panel.add(expandButton, c);
                         
                         c = new GridBagConstraints();
@@ -569 +531 @@
                         c.gridy = 0;
                         c.fill = GridBagConstraints.CENTER;
-                        add(cancelButton, c);
+                        panel.add(cancelButton, c);
                         
                         c = new GridBagConstraints();
@@ -576 +538 @@
                         c.gridwidth = 2;
                         c.fill = GridBagConstraints.CENTER;
-                        add(selected1, c);
+                        panel.add(selected1, c);
                         
                         c = new GridBagConstraints();
@@ -583 +545 @@
                         c.gridwidth = 2;
                         c.fill = GridBagConstraints.CENTER;
-                        add(selected2, c);
+                        panel.add(selected2, c);
                         
                         c = new GridBagConstraints();
@@ -591 +553 @@
                         c.gridheight = 2;
                         c.fill = GridBagConstraints.CENTER;
-                        add(selectedMore, c);
-
-                }
-                
-                public void onTrackSelectionChanged() {
-                        
+                        panel.add(selectedMore, c);
+                }
+                
+                public void setLocation(int x, int y)
+                {
+                        panel.setLocation(x, y);
+                }
+                
+                public void onTrackSelectionChanged()
+                {
                         synchronized(expandedTracks) {
                                         
@@ -628 +594 @@
                 }
 
-                public void actionPerformed(ActionEvent e) {
+                public void actionPerformed(ActionEvent e)
+                {
                         if (e.getSource() == expandButton) {
                                 showSelection();
@@ -635 +602 @@
                         }
                 }
-                
-                
-
-        }
-        
-        
+
+                @Override
+                protected void paintInternal()
+                {
+                        Graphics2D g = SwingMiscManager.getIfUsingSwingGraphicsManager().getCurrentSurface();
+                        
+                        panel.paint(g);
+                }
+
+                @Override
+                public AxisAlignedBoxBounds getFullBounds()
+                {
+                        return SwingConversions.fromSwingRectangle(panel.getBounds());
+                }
+
+                @Override
+                public void onHide()
+                {
+                }
+
+                @Override
+                public void onShow()
+                {
+                }
+        }
 }