Changeset 375 for trunk/src_apollo/org/apollo/widgets

Timestamp:

10/26/08 17:05:11 (16 years ago)

Author:

bjn8

Message:

Lots of minor improvements made prior to evluation study, and small things done afterwards for report :)

File:

• trunk/src_apollo/org/apollo/widgets/SampledTrack.java (modified) (7 diffs)

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

@@ -65 +65 @@
 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;
@@ -381 +382 @@
                                 }
                                 
+                                 if (!e.isConsumed() && e.getButton() == MouseEvent.BUTTON2) {
+                                                if (split(true))
+                                                        e.consume();
+                                        }
+                                
                                 // Consume events if track is selected for expansion
                                 if (ExpandedTrackManager.getInstance().isTrackInExpansionSelection(trackModel)) {
                                         e.consume();
                                 }
-                                
                 
                         }
@@ -415 +420 @@
                                 
                                 // Delete-and-Split audio command
-                                else if (e.isControlDown() && e.getKeyCode() == KeyEvent.VK_DELETE) {
-                                        
-                                        // First is selection valid?
-                                        if (trackModel != null && trackModel.getSelectionLength() > 1 
-                                                        && !fulltrackView.isPlaying()
-                                                        && (trackModel.getFrameCount() - trackModel.getSelectionLength())  > EditableSampledTrackGraphView.MIN_FRAME_SELECTION_SIZE) {
-
-                                                // If so... can a slip be performed? i.e. is there unselected audio to
-                                                // the left and right of selection
-                                                if (trackModel.getSelectionStart() > 0 && 
-                                                                (trackModel.getSelectionStart() + trackModel.getSelectionLength()) < trackModel.getFrameCount()) {
-                                                        
-                                                        // Perform delete-split
-                                                        e.consume();
-                                                        
-                                                        int rightSideStartFrame = trackModel.getSelectionStart() + trackModel.getSelectionLength();
-                                                        
-                                                        // Create a new track widget to contain the right-side audio
-                                                        byte[] rightsideAudio = new byte[(trackModel.getFrameCount() - rightSideStartFrame) * trackModel.getFormat().getFrameSize()];
-                                                        
-                                                        // Copy bytes into new location
-                                                        System.arraycopy(
-                                                                        trackModel.getAllAudioBytes(), 
-                                                                        rightSideStartFrame * trackModel.getFormat().getFrameSize(), 
-                                                                        rightsideAudio, 
-                                                                        0, rightsideAudio.length);
-                                                        
-                                                        // Let this widget keep the left-side audio
-                                                        trackModel.setSelection(trackModel.getSelectionStart(), trackModel.getFrameCount() - trackModel.getSelectionStart());
-                                                        trackModel.removeSelectedBytes();
-                                                        trackModel.setSelection(0,0);
-                                                        
-                                                        // Build the new neighbouring widget
-                                                        Frame target = getParentFrame();
-                                                        if (target == null) target = DisplayIO.getCurrentFrame();
-                                                        
-                                                        // Determine init time
-                                                        Mutable.Long initTime = getInitiationTimeFromMeta();
-                                                        
-                                                        if (initTime == null) initTime = Mutable.createMutableLong(0);
-                                                        
-                                                        initTime.value += AudioMath.framesToMilliseconds(rightSideStartFrame, trackModel.getFormat());
-                                                        
-                                                        SampledTrack rightSideTrack = SampledTrack.createFromMemory(
-                                                                        rightsideAudio, 
-                                                                        trackModel.getFormat(), 
-                                                                        target, 
-                                                                        0, // X Coord overridden
-                                                                        getY(), 
-                                                                        getName() + " part", 
-                                                                        trackMix);
-                                                        
-                                                        // Anchor it
-                                                        target.addAllItems(rightSideTrack.getItems());
-                                                        
-                                                        // Adjust initiation time to be exact
-                                                        rightSideTrack.setInitiationTime(initTime.value);
-                                                        
-                                                        // TODO: FrameLayoutDaemon.getInstance().resumeLayout(this); ?
-                                                }
-                                                
-                                        }
-                
-                                        
+                                else if (!e.isControlDown() && e.getKeyCode() == KeyEvent.VK_DELETE) {
+                                        
+                                        if (split(false))  // try Perform delete-split
+                                                e.consume();
                                         
                                 }
@@ -1426 +1371 @@
         }
         
+        private boolean ignoreInjection = false;
         private MouseEvent lastInsertME = null;
         
@@ -1493 +1439 @@
                                         MouseEvent me = MouseEventRouter.getCurrentMouseEvent();
                                         
-                                        if (me != null && me != lastInsertME &&
+                                        if (!ignoreInjection && me != null && me != lastInsertME &&
                                                         (me.getButton() == MouseEvent.BUTTON2 ||
                                                                         me.getButton() == MouseEvent.BUTTON3)) {
@@ -1517 +1463 @@
                                                 }
                                                         
-                                        } else if (me == lastInsertME) {
+                                        } else if (!ignoreInjection && me == lastInsertME) {
                                                 // Note due to a injection removing this widget while in the midst of
                                                 // anchoring, the widget parent event filtering will not work thus
@@ -1792 +1738 @@
 //      }
         
+        private boolean split(boolean extractSelection) {
+                
+                // First is operation valid?
+                if (trackModel != null && trackModel.getSelectionLength() > 1 
+                                && !fulltrackView.isPlaying()
+                                && (trackModel.getFrameCount() - trackModel.getSelectionLength())  > EditableSampledTrackGraphView.MIN_FRAME_SELECTION_SIZE) {
+
+                        // If so... can a slip be performed? i.e. is there unselected audio to
+                        // the left and right of selection
+                        if (trackModel.getSelectionStart() > 0 && 
+                                        (trackModel.getSelectionStart() + trackModel.getSelectionLength()) < trackModel.getFrameCount()) {
+                                
+                                // Perform split
+                                int rightSideStartFrame = trackModel.getSelectionStart() + trackModel.getSelectionLength();
+                                
+                                // Create a new track widget to contain the right-side audio
+                                byte[] rightsideAudio = new byte[(trackModel.getFrameCount() - rightSideStartFrame) * trackModel.getFormat().getFrameSize()];
+                                
+                                // Copy bytes into new location
+                                System.arraycopy(
+                                                trackModel.getAllAudioBytes(), 
+                                                rightSideStartFrame * trackModel.getFormat().getFrameSize(), 
+                                                rightsideAudio, 
+                                                0, rightsideAudio.length);
+                                
+                                byte[] selectedBytes = (extractSelection) ? trackModel.getSelectedFramesCopy() : null;
+                                
+                                // Let this widget keep the left-side audio
+                                trackModel.setSelection(trackModel.getSelectionStart(), trackModel.getFrameCount() - trackModel.getSelectionStart());
+                                trackModel.removeSelectedBytes();
+                                trackModel.setSelection(0,0);
+                                
+                                // Build the new neighbouring widget
+                                Frame target = getParentFrame();
+                                if (target == null) target = DisplayIO.getCurrentFrame();
+                                
+                                // Determine init time
+                                Mutable.Long initTime = getInitiationTimeFromMeta();
+                                
+                                if (initTime == null) initTime = Mutable.createMutableLong(0);
+                                
+                                initTime.value += AudioMath.framesToMilliseconds(rightSideStartFrame, trackModel.getFormat());
+                                
+                                SampledTrack rightSideTrack = SampledTrack.createFromMemory(
+                                                rightsideAudio, 
+                                                trackModel.getFormat(), 
+                                                target, 
+                                                0, // X Coord overridden
+                                                getY(), 
+                                                getName() + " part", 
+                                                trackMix);
+        
+                                // Anchor it
+                                rightSideTrack.ignoreInjection = true;
+                                target.addAllItems(rightSideTrack.getItems());
+                                rightSideTrack.ignoreInjection = false;
+                                
+                                // Adjust initiation time to be exact
+                                rightSideTrack.setInitiationTime(initTime.value);
+                                
+                                // If extracting audio then attatch it to the cursor
+                                if (selectedBytes != null) {
+                                        assert(extractSelection);
+        
+                                        SampledTrack extractedTrack = SampledTrack.createFromMemory(
+                                                        selectedBytes, 
+                                                        trackModel.getFormat(), 
+                                                        target, 
+                                                        getX(), // X Coord overridden
+                                                        getY(), 
+                                                        getName() + " part", 
+                                                        trackMix);
+                                        
+                                        FrameMouseActions.pickup(extractedTrack.getItems());
+                                        
+                                }
+                        }
+                
+                        return true;
+                }
+                
+                return false;
+                
+        }
         /**
          * Doesn't expand if not anchored ...