Changeset 344

Timestamp:

10/05/08 14:30:01 (16 years ago)

Author:

bjn8

Message:

Improve mouse interactions a little with accurate audio placement

Location:

trunk/src_apollo/org/apollo

Files:

• ApolloSystem.java (modified) (9 diffs)
• AudioFrameKeyboardActions.java (added)
• AudioFrameMouseActions.java (added)
• audio/util/FrameLayoutDaemon.java (modified) (1 diff)
• gui/FrameRenderPasses.java (modified) (2 diffs)
• items/EmulatedTextItem.java (modified) (2 diffs)
• widgets/LinkedTrack.java (modified) (3 diffs)
• widgets/SampledTrack.java (modified) (3 diffs)

trunk/src_apollo/org/apollo/ApolloSystem.java

@@ -3 +3 @@
 import java.awt.Image;
 import java.awt.Toolkit;
-import java.awt.event.KeyEvent;
-import java.awt.event.KeyListener;
-import java.awt.event.MouseEvent;
-import java.awt.event.MouseMotionListener;
 import java.awt.event.WindowEvent;
 import java.awt.event.WindowListener;
@@ -12 +8 @@
 import java.util.Collection;
 import java.util.HashSet;
-import java.util.List;
 import java.util.Set;
 
@@ -30 +25 @@
 import org.apollo.io.SampledAudioFileImporter;
 import org.apollo.util.AudioSystemLog;
-import org.apollo.widgets.LinkedTrack;
-import org.apollo.widgets.SampledTrack;
 import org.expeditee.actions.Actions;
 import org.expeditee.gui.Browser;
-import org.expeditee.gui.DisplayIO;
-import org.expeditee.gui.Frame;
-import org.expeditee.gui.FrameGraphics;
 import org.expeditee.gui.FrameMouseActions;
-import org.expeditee.gui.FreeItems;
 import org.expeditee.importer.FrameDNDTransferHandler;
-import org.expeditee.items.Item;
-import org.expeditee.items.widgets.InteractiveWidget;
 
 /**
@@ -59 +46 @@
         public static final String HELP_MELODYSEARCH_FRAMENAME = SYSTEM_FRAMESET_NAME + 3; 
         
-        private static final int COARSE_PLACEMENT_TOLERANCE = 100; // The minium distance from a track widet to auto-align free space items to
-        
+
         public static boolean useQualityGraphics = true;
         
-        /** Would be nice to seperate outside of this class.. */
-        private static boolean isControlDown = false;
-        private static boolean isShiftDown = false;
-
         private ApolloSystem() {
         }
@@ -85 +67 @@
                                 
                                  try {
-
 
                                         URL url = ClassLoader.getSystemResource("org/apollo/icons/mainicon.png");
@@ -127 +108 @@
                                 });
                                 
-                                // Refresh frame for graphical helpers that display / hide when the
-                                // user presses various keys
-                                Browser._theBrowser.getContentPane().addKeyListener(new KeyListener() {
-
-                                        public void keyPressed(KeyEvent e) {
-                                                isControlDown = e.isControlDown();
-                                                isShiftDown = e.isShiftDown();
-                                                if (e.getKeyCode() == KeyEvent.VK_CONTROL) {
-                                                        FrameGraphics.refresh(false); // For special post effects
-                                                }
-                                                
-                                        }
-
-                                        public void keyReleased(KeyEvent e) {
-                                                isControlDown = e.isControlDown();
-                                                isShiftDown = e.isShiftDown();
-                                                if (e.getKeyCode() == KeyEvent.VK_CONTROL) {
-                                                        FrameGraphics.refresh(false); // For special post effects
-                                                } else if (e.getKeyCode() == KeyEvent.VK_G && e.isControlDown()) {
-                                                        useQualityGraphics = !useQualityGraphics;
-                                                }
-                                        }
-
-                                        public void keyTyped(KeyEvent e) {
-                                        }
-                                        
-                                });
+                                Browser._theBrowser.getContentPane().addKeyListener(new AudioFrameKeyboardActions());
 
                                 // Filter out some special mouse move cases
@@ -159 +114 @@
                                                 FrameMouseActions.getInstance());
                                 
-                                // The mouse move code below essentially is for auto-alignment of free items 
-                                // to anchored track widgets while holding the shift button
-                                Browser._theBrowser.getMouseEventRouter().addExpediteeMouseMotionListener(new MouseMotionListener() {
-
-                                        public void mouseDragged(MouseEvent e) {
-                                                FrameMouseActions.getInstance().mouseDragged(e);
-                                        }
-
-                                        public void mouseMoved(MouseEvent e) {
-        
-                                                boolean forwareToExpeditee = true;
-                                                
-                                                if (isControlDown != e.isControlDown()) {
-                                                        isControlDown = e.isControlDown();
-                                                        FrameGraphics.refresh(false); // For special post effects
-                                                }
-                                                
-                                                isShiftDown = e.isShiftDown();
-                                                
-                                                if (e.isShiftDown() && 
-                                                                !FreeItems.getInstance().isEmpty()) { 
-                                                        
-                                                        // Couse movement of free items: Restraining left-most pixel in items
-                                                        // to the closest anchored track widgets x position.
-                                                        
-                                                        Frame currentFrame = DisplayIO.getCurrentFrame();
-                                                        if (currentFrame != null) {
-                                                                
-                                                                // Search all anchored track x positions for the current frame
-                                                                List<InteractiveWidget> widgets = currentFrame.getInteractiveWidgets();
-                                                                
-                                                                int closestXPosition = -1;
-                                                                int closestDistance = -1;
-                                                                
-                                                                for (InteractiveWidget iw : widgets) {
-                                                                        if (iw instanceof SampledTrack || iw instanceof LinkedTrack) {
-                                                                                int distance = Math.abs(e.getX() - iw.getX());
-                                                                                if (closestDistance < 0 || distance < closestDistance) {
-                                                                                        closestDistance = distance;
-                                                                                        closestXPosition = iw.getX();
-                                                                                }
-
-                                                                                distance = Math.abs(e.getX() - (iw.getX() + iw.getWidth()));
-                                                                                if (closestDistance < 0 || distance < closestDistance) {
-                                                                                        closestDistance = distance;
-                                                                                        closestXPosition = iw.getX() + iw.getWidth();
-                                                                                }
-                                                                                
-                                                                        }
-                                                                }
-                                                                
-                                                                int smallestX = FreeItems.getInstance().get(0).getX();
-                                                                int smallestY = FreeItems.getInstance().get(0).getY();
-
-                                                                for (Item i : FreeItems.getInstance()) {
-                                                                        if (i.getX() < smallestX) smallestX = i.getX();
-                                                                        if (i.getY() < smallestY) smallestY = i.getY();
-                                                                }
-                                                                
-                                                                // Should auto-adjust free items?
-                                                                if (closestDistance > 0 &&
-                                                                                closestDistance < COARSE_PLACEMENT_TOLERANCE) { // NB: 0 = do nothing since already there
-        
-                                                                        for (Item i : FreeItems.getInstance()) {
-                                                                                i.setPosition(
-                                                                                                closestXPosition + (i.getX() - smallestX), 
-                                                                                                e.getY() + (i.getY() - smallestY));
-                                                                                
-                                                                        }
-                                                                        
-                                                                } else if (closestDistance > 0) { // keep things set to cursor
-
-                                                                        for (Item i : FreeItems.getInstance()) {
-                                                                                i.setPosition(
-                                                                                                e.getX() + (i.getX() - smallestX), 
-                                                                                                e.getY() + (i.getY() - smallestY));
-                                                                        }
-                        
-                                                                }
-                                                                
-                                                                forwareToExpeditee = false;
-
-                                                        }
-                                                        
-                                                }
-                                                
-                                                // Expeditees frame mouse actions uses an offset and fights over free-item
-                                                // movement if it listens to the mouse event router... therefore add an extra
-                                                // layer to avoid this... otherwise auto-aligned items jitter like crazy while
-                                                // moving the cursus
-                                                if (forwareToExpeditee) {
-                                                        FrameMouseActions.getInstance().mouseMoved(e);
-                                                } else {
-                                                        FrameGraphics.refresh(true);
-                                                }
-                                        }
-
-                                });
+                                Browser._theBrowser.getMouseEventRouter().addExpediteeMouseMotionListener(new AudioFrameMouseActions());
                         }
                 });
@@ -263 +121 @@
                  //Browser._theBrowser.etTitle("Apollo");
 
-                System.err.println("WARNING: MISSING MAIN ICON"); // TODO
-                
                 AudioSystemLog.println("  Preparing sub-systems...");
                 
@@ -346 +202 @@
         }
         
-        
-        /**
-         * @return True if control is down.
-         */
-        public static boolean isControlDown() {
-                return isControlDown;
-        }
-        
-        
-        /**
-         * @return True if shift is down.
-         */
-        public static boolean isShiftDown() {
-                return isShiftDown;
-        }
 
 

trunk/src_apollo/org/apollo/audio/util/FrameLayoutDaemon.java

@@ -587 +587 @@
         
         /**
+         * @param ms
+         *              The time to translate the x position from
+         * 
+         * @param targetFrame
+         *              The frame to determine the timeline information from
+         * 
+         * @return
+         *              Null if the timeline for the target frame could not
+         *              be determined/inferred or has no timeline. Otherwise the
+         *              X pixal position at the given time.
+         */
+        public NullableLong getXAtMS(long ms, Frame targetFrame) {
+                assert(targetFrame != null);
+                
+                Timeline tl = getTimeline(targetFrame);
+                if (tl == null) return null;
+                return new NullableLong(tl.getXAtMSTime(ms));
+        }
+        
+        /**
          * Determines the pixel width from a time range (ms) for a target frame.
          * <b>NOTE</B> Width is clamped to it is never smaller than {@link #MIN_TRACK_WIDGET_WIDTH}

trunk/src_apollo/org/apollo/gui/FrameRenderPasses.java

@@ -10 +10 @@
 import java.util.LinkedList;
 
-import org.apollo.ApolloSystem;
+import org.apollo.AudioFrameKeyboardActions;
 import org.apollo.audio.util.Timeline;
 import org.apollo.items.FramePlaybackLauncher;
@@ -171 +171 @@
                 
                 helperLinesToPaint = null;
-                shouldDrawFullscreenHelpers = ApolloSystem.isControlDown() || 
-                        (ApolloSystem.isShiftDown() && !FreeItems.getInstance().isEmpty());
+                shouldDrawFullscreenHelpers = AudioFrameKeyboardActions.isControlDown() || 
+                        (AudioFrameKeyboardActions.isShiftDown() && !FreeItems.getInstance().isEmpty());
 
                 // Get free tracks and paint line helpers

trunk/src_apollo/org/apollo/items/EmulatedTextItem.java

@@ -8 +8 @@
 import java.awt.Graphics;
 import java.awt.Graphics2D;
+import java.awt.IllegalComponentStateException;
 import java.awt.Point;
 import java.awt.Rectangle;
@@ -517 +518 @@
                 
                 // Restore emulated position for consuming mouse movements
+                try {
                 Point pos = this.convertToExpediteeSpace(parentComponant.getLocationOnScreen());
                 emulatedSource.setPosition(
                                 pos.x + masterOffset.x, 
                                 pos.y + masterOffset.y);
+                } catch (IllegalComponentStateException ex) { // Cannot fix this .. this whole class needs revising
+                        ex.printStackTrace();
+                }
         }
         

trunk/src_apollo/org/apollo/widgets/LinkedTrack.java

@@ -31 +31 @@
 
 import org.apollo.ApolloSystem;
+import org.apollo.AudioFrameMouseActions;
 import org.apollo.audio.ApolloSubjectChangedEvent;
 import org.apollo.audio.SampledAudioManager;
@@ -57 +58 @@
 import org.apollo.util.AudioMath;
 import org.apollo.util.AudioSystemLog;
+import org.apollo.util.NullableLong;
 import org.apollo.util.ODFrameHeirarchyFetcher;
 import org.apollo.util.PopupReaper;
@@ -645 +647 @@
                         String link = getAbsoluteLink();
 
-                        // Determine new initation time according to anchored position
-                        long initTime = (parent != null) ? 
-                                                FrameLayoutDaemon.getInstance().getMSAtX(getX(), parent)
-                                                : 0;
+
+                        // Determine new initation time according to anchored position...
+                        long initTime = getInitiationTimeFromMeta();
+                        
+                        // If the user is restricting-y-axis movement then they might be moving 
+                        // this tracks Y-position only for layout reasons as opposed to repositioning
+                        // where in the audio timeline the track should be. This must be accurate and
+                        // avoid loosing the exact initiation time due to pixel-resolutoin issues
+                        if (parent != null) {
+                                
+                                boolean inferInitTime = true;
+                                
+                                if (AudioFrameMouseActions.isYAxisRestictionOn()) {
+                                        Long ms = getInitiationTimeFromMeta();
+                                        if (ms != null) {
+                                                NullableLong timex = FrameLayoutDaemon.getInstance().getXAtMS(
+                                                                ms, 
+                                                                parent);
+                                                if (timex != null && timex.getLongValue() == getX()) {
+                                                        initTime = ms;
+                                                        inferInitTime = false;
+                                                }
+                                        }
+                                }
+
+                                if (inferInitTime) 
+                                        initTime = FrameLayoutDaemon.getInstance().getMSAtX(getX(), parent);
+                        }
 
                         if (link != null) {

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

@@ -28 +28 @@
 import javax.swing.SwingUtilities;
 
+import org.apollo.AudioFrameMouseActions;
 import org.apollo.audio.ApolloPlaybackMixer;
 import org.apollo.audio.ApolloSubjectChangedEvent;
@@ -53 +54 @@
 import org.apollo.mvc.SubjectChangedEvent;
 import org.apollo.util.AudioMath;
+import org.apollo.util.NullableLong;
 import org.apollo.util.PopupReaper;
 import org.apollo.util.TrackModelHandler;
@@ -1361 +1363 @@
                                         parent = getParentFrame();
 
-                                        // Determine new initation time according to anchored position
-                                        long initTime = (parent != null) ? 
-                                                        FrameLayoutDaemon.getInstance().getMSAtX(getX(), parent)
-                                                        : 0;
-                                        
+                                        // Determine new initation time according to anchored position...
+                                        long initTime = getInitiationTimeFromMeta();
+                                        
+                                        // If the user is restricting-y-axis movement then they might be moving 
+                                        // this tracks Y-position only for layout reasons as opposed to repositioning
+                                        // where in the audio timeline the track should be. This must be accurate and
+                                        // avoid loosing the exact initiation time due to pixel-resolutoin issues
+                                        if (parent != null) {
+                                                
+                                                boolean inferInitTime = true;
+                                                
+                                                if (AudioFrameMouseActions.isYAxisRestictionOn()) {
+                                                        Long ms = getInitiationTimeFromMeta();
+                                                        if (ms != null) {
+                                                                NullableLong timex = FrameLayoutDaemon.getInstance().getXAtMS(
+                                                                                ms, 
+                                                                                parent);
+                                                                if (timex != null && timex.getLongValue() == getX()) {
+                                                                        initTime = ms;
+                                                                        inferInitTime = false;
+                                                                }
+                                                        }
+                                                }
+
+                                                if (inferInitTime) 
+                                                        initTime = FrameLayoutDaemon.getInstance().getMSAtX(getX(), parent);
+                                        }
+
                                         // Keep TrackGraphModel consistant
                                         AudioStructureModel.getInstance().onTrackWidgetAnchored(