Fixed drag select in track view.

[moosique.git] / MooNoteElement.java

diff --git a/MooNoteElement.java b/MooNoteElement.java
index 43b7b27ff6153bad1673dc63df67066222df46f2..7ea74227d0be3a456226583adfa3fe9a8bed560f 100644 (file)
--- a/MooNoteElement.java
+++ b/MooNoteElement.java
@@ -13,18 +13,19 @@ public class MooNoteElement extends JPanel {
 
        private MooTrackView mtv;
        private MooNote note;
+       private JPopupMenu popup;
+       private JMenuItem popupRemove, popupProp, popupTranspOctUp, popupTranspOctDown;
        private Rectangle pitchRect, veloRect;
+       private String notePitch, noteVelocity;
+       private boolean selected = false;
        public Color textColor;
        public static final Color bgColor = new Color(160, 218, 255);
        public static final Color invBgColor = new Color(96, 38, 0);
-       private String notePitch, noteVelocity;
-       private JPopupMenu popup;
-       private JMenuItem popupRemove, popupProp, popupTransposeOctUp, popupTransposeOctDown;
 
        /** 
         * Creates a new note element.
         * @param parent        The MooTrackView that this element will be painted on.
-        * @param mn    the note that will be graphically represented
+        * @param mn            the note that will be graphically represented
         */
        public MooNoteElement (MooTrackView parent, MooNote mn) {
                mtv = parent;
@@ -48,12 +49,12 @@ public class MooNoteElement extends JPanel {
                popupRemove = new JMenuItem("Remove");
                popupRemove.addActionListener(pList);
                popup.add(popupRemove);
-               popupTransposeOctUp = new JMenuItem("Transpose one octave up");
-               popupTransposeOctUp.addActionListener(pList);
-               popup.add(popupTransposeOctUp);
-               popupTransposeOctDown = new JMenuItem("Transpose one octave down");
-               popupTransposeOctDown.addActionListener(pList);
-               popup.add(popupTransposeOctDown);
+               popupTranspOctUp = new JMenuItem("Transpose one octave up");
+               popupTranspOctUp.addActionListener(pList);
+               popup.add(popupTranspOctUp);
+               popupTranspOctDown = new JMenuItem("Transpose one octave down");
+               popupTranspOctDown.addActionListener(pList);
+               popup.add(popupTranspOctDown);
        }
 
        /** 
@@ -68,7 +69,8 @@ public class MooNoteElement extends JPanel {
         * Selects the current NoteElement.
         */
        public void select() {
-               mtv.addSelected(this);
+               selected = true;
+               mtv.selectNote(this);
                setBackground(invBgColor);
                textColor = Color.white;
                repaint();
@@ -78,12 +80,22 @@ public class MooNoteElement extends JPanel {
         * Deselects the current NoteElement.
         */
        public void deselect() {
-               // mtv.removeSelected(this);
+               selected = false;
+               // mtv.deselectNote(this);
                setBackground(bgColor);
                textColor = Color.black;
                repaint();
        }
 
+       /** 
+        * Transposes the current note element the given number of halftones.
+        * @param halftones     the number of halftones to transpose - positive for up, negative for down
+        */
+       public void transpose(int halftones) {
+               note.transpose(halftones);
+               update();
+       }
+
        /**
         * Draws the string that shows the note's properties.
         * @param g     The Graphics object used to draw the strings.
@@ -131,18 +143,53 @@ public class MooNoteElement extends JPanel {
                        case 10: notePitch = "A#"; break;
                        case 11: notePitch = "B";  break;
                }
-               notePitch += pitch / 12;
+               notePitch += pitch / 12 - 1;
                noteVelocity = ""+note.getVelocity();
        }
 
+
+       /**
+        * Asks the MooTrackView that the note element is painted on to remove this element and the note.
+        */
+       protected void remove(){
+               mtv.removeNote(this);
+       }
+
+       /**
+        * Updates the graphical content of the element and repaints it.
+        */
+       public void update() {
+               calculateString();
+               repaint();
+       }
+
+       /**
+        * Layout this changed elemnt.
+        */
+       protected void newLayout(){
+               mtv.layoutElement(this,true);
+       }
+
        /**
         * Listener that checks the mouse actions on this element.
         */
        class MAdapter extends MouseAdapter {
        
+               /**
+                * Selects the note if 
+                */
+               public void mouseEntered(MouseEvent e) {
+                       if (mtv.isLeftMouseButtonPressed()) select();
+               }
+
+               /**
+                * If left mouse button is clicked, selects the note and plays it.
+                */
                public void mouseClicked(MouseEvent e) {
-                       select();
-                       // Play the note
+                       if (SwingUtilities.isLeftMouseButton(e) && !e.isControlDown()) {
+                               select();
+                               // Play the note
+                       }
                }
 
                /**
@@ -155,10 +202,11 @@ public class MooNoteElement extends JPanel {
                        if (e.isControlDown()) {
                                if (pitchRect.contains(e.getPoint())) {
                                        if (SwingUtilities.isRightMouseButton(e)) {
-                                               note.setPitch(note.getPitch() + 1);
+                                               note.transpose(1);
                                        } else if (SwingUtilities.isLeftMouseButton(e)) {
-                                               note.setPitch(note.getPitch() - 1);
+                                               note.transpose(-1);
                                        }
+                                       Moosique.setEdited();
                                        calculateString();
                                        repaint();
                                } else if (veloRect.contains(e.getPoint())) {
@@ -167,6 +215,7 @@ public class MooNoteElement extends JPanel {
                                        } else if (SwingUtilities.isLeftMouseButton(e)) {
                                                note.setVelocity(note.getVelocity() - 1);
                                        }
+                                       Moosique.setEdited();
                                        calculateString();
                                        repaint();
                                }
@@ -181,7 +230,10 @@ public class MooNoteElement extends JPanel {
                 * Shows the menu if an OS-specific popup-trigger was activated.
                 */
                private void maybeShowPopup(MouseEvent e) {
-                       if (e.isPopupTrigger() && !e.isControlDown()) popup.show(e.getComponent(), e.getX(), e.getY());
+                       if (e.isPopupTrigger() && !e.isControlDown()) {
+                               if (!selected || mtv.isTheOnlySelected((MooNoteElement)e.getComponent())) popup.show(e.getComponent(), e.getX(), e.getY());
+                               else mtv.showSelectionPopup(e.getComponent(), e.getX(), e.getY());
+                       }
                }
        }
 
@@ -193,27 +245,14 @@ public class MooNoteElement extends JPanel {
                        Object source = e.getSource();
                        if (source == popupProp) {
                                new MooDialog(note);
+                               newLayout();
                        } else if (source == popupRemove) {
                                remove();
-                       } else if (source == popupTransposeOctUp) {
-                               note.setPitch(note.getPitch() + 12);
-                               update();
-                       } else if (source == popupTransposeOctDown) {
-                               note.setPitch(note.getPitch() - 12);
-                               update();
+                       } else if (source == popupTranspOctUp) {
+                               transpose(12);
+                       } else if (source == popupTranspOctDown) {
+                               transpose(-12);
                        }
                }
-
-               private void update() {
-                       calculateString();
-                       repaint();
-               }
-       }
-
-       /**
-        * Asks the MooTrackView that the note element is painted on to remove this element and the note.
-        */
-       protected void remove(){
-               mtv.removeNote(this);
        }
 }