no message

[moosique.git] / MooTrackView.java

diff --git a/MooTrackView.java b/MooTrackView.java
index 0e5d09c21f5b48c1675da312d7ce26a48b811775..f2afcaae2be4e18373b97a3250d4cfe5ce7b29e0 100644 (file)
--- a/MooTrackView.java
+++ b/MooTrackView.java
@@ -17,8 +17,11 @@ public class MooTrackView extends JPanel {
        private MooTrackTitle title;
        private Rectangle box;
 
-       private JPopupMenu popup;
+       private JPopupMenu popup, selPopup;
+       private JMenu selPopupTranspUp, selPopupTranspDown;
        private JMenuItem popupAdd;
+       private JMenuItem selPopupRemove, selPopupTranspUpOct, selPopupTranspDownOct;
+
        private ArrayList rects;
        private ArrayList selected;
        private Insets insets;
@@ -65,13 +68,29 @@ public class MooTrackView extends JPanel {
 
                }
 
-               // Creates pop-up menu.
+               // Creates panel pop-up menu.
                popup = new JPopupMenu();
                PopupListener pList = new PopupListener();
                popupAdd = new JMenuItem("Add note...");
                popupAdd.addActionListener(pList);
                popup.add(popupAdd);
 
+               // Creates selection pop-up menu.
+               selPopup = new JPopupMenu();
+               selPopupRemove = new JMenuItem("Remove selection");
+               selPopupRemove.addActionListener(pList);
+               selPopup.add(selPopupRemove);
+               selPopupTranspUp = new JMenu("Transpose selection up");
+               selPopup.add(selPopupTranspUp);
+               selPopupTranspUpOct = new JMenuItem("One octave");
+               selPopupTranspUpOct.addActionListener(pList);
+               selPopupTranspUp.add(selPopupTranspUpOct);
+               selPopupTranspDown = new JMenu("Transpose selection down");
+               selPopup.add(selPopupTranspDown);
+               selPopupTranspDownOct = new JMenuItem("One octave");
+               selPopupTranspDownOct.addActionListener(pList);
+               selPopupTranspDown.add(selPopupTranspDownOct);
+
                // Adds listeners for popup menu and keyboard synthesizer.
                addMouseListener(new MAdapter());
                addKeyListener(new MooKeyboard());
@@ -161,6 +180,15 @@ public class MooTrackView extends JPanel {
                repaint();
        }
 
+       /**
+        * Adds a standard note to this track.
+        */
+       private void addStandardNote() {
+               int row =  (popupY - insets.top) / NOTE_HEIGHT;
+               long timestamp = (long)(ticksPerSixteenth * row);
+               addNote(new MooNote(title.getChannel(), 60, 100, timestamp, Moosique.getSequence().getResolution() / 4));
+       }
+
        /** 
         * Removes the given note element from the view and its note from the current track.
         * @param elem  the note element to remove
@@ -168,38 +196,31 @@ public class MooTrackView extends JPanel {
        public void removeNote(MooNoteElement elem) {
                elem.getNote().removeFrom(track);
                remove(elem);
-               elem.getNote().removeFrom(track);
+               Rectangle r = new Rectangle();
+               r = elem.getBounds(r);
+               rects.remove(r);
                Moosique.setEdited();
                repaint();
        }
 
-       /**
-        * Adds a standard note to this track.
-        */
-       private void addStandardNote() {
-               int row =  (popupY - insets.top) / NOTE_HEIGHT;
-               long timestamp = (long)(ticksPerSixteenth * row);
-               addNote(new MooNote(title.getChannel(), 60, 100, timestamp, Moosique.getSequence().getResolution() / 4));
-       }
-
        /**
         * Deselects all notes.
         */
-       public void addSelected(MooNoteElement elem) {
+       public void selectNote(MooNoteElement elem) {
                selected.add(elem);
        }
 
        /**
         * Deselects all notes.
         */
-       public void removeSelected(MooNoteElement elem) {
+       public void deselectNote(MooNoteElement elem) {
                selected.remove(selected.indexOf(elem));
        }
 
        /**
         * Deselects all notes.
         */
-       public void deselectAll() {
+       public void deselectAllNotes() {
                Iterator it = selected.iterator();
                while(it.hasNext()) {
                        ((MooNoteElement)it.next()).deselect();
@@ -226,7 +247,19 @@ public class MooTrackView extends JPanel {
         * @param y     the y-coordinate in which to display the menu
         */
        public void showSelectionPopup(Component c, int x, int y) {
-               
+               selPopup.show(c, x, y);
+       }
+
+       /**
+        * Transposes all selected notes the given number of halftones.
+        */
+       private void transposeSelectedNotes(int halftones) {
+               Iterator it = selected.iterator();
+               while(it.hasNext()) {
+                       MooNoteElement elem = (MooNoteElement)it.next();
+                       elem.getNote().transpose(halftones);
+                       elem.update();
+               }
        }
 
        /**
@@ -254,10 +287,12 @@ public class MooTrackView extends JPanel {
                 * Deselects all note on click, adds a standard note on double click.
                 */
                public void mouseClicked(MouseEvent e) {
-                       deselectAll();
-                       if (e.getClickCount() == 2) {
-                               popupY = e.getY();
-                               addStandardNote();
+                       if (SwingUtilities.isLeftMouseButton(e)) {
+                               deselectAllNotes();
+                               if (e.getClickCount() == 2) {
+                                       popupY = e.getY();
+                                       addStandardNote();
+                               }
                        }
                }
        
@@ -296,15 +331,24 @@ public class MooTrackView extends JPanel {
        }
 
        /**
-        * Listens on actions on the popupmenu and executes the appropriate action.
+        * Listens on actions on the popup menu and executes the appropriate action.
         */
        class PopupListener implements ActionListener {
                public void actionPerformed(ActionEvent e) {
                        Object source = e.getSource();
-                       if  (source == popupAdd) {
+                       if (source == popupAdd) {
                                addStandardNote();
+                       } else if (source == selPopupRemove) {
+                               Iterator it = selected.iterator();
+                               while(it.hasNext()) {
+                                       removeNote((MooNoteElement)it.next());
+                               }
+                               selected.clear();
+                       } else if (source == selPopupTranspUpOct) {
+                               transposeSelectedNotes(12);
+                       } else if (source == selPopupTranspDownOct) {
+                               transposeSelectedNotes(-12);
                        }
-                       // new MooNote(int channel, int pitch, int velocity, long timestamp, int duration)
                }
        }
 }