]> ruin.nu Git - moosique.git/blobdiff - MooNoteElement.java
Fixed drag select in track view.
[moosique.git] / MooNoteElement.java
index 6f372349e5372c2e657f71333366075c0d4dfe50..7ea74227d0be3a456226583adfa3fe9a8bed560f 100644 (file)
@@ -13,26 +13,28 @@ public class MooNoteElement extends JPanel {
 
        private MooTrackView mtv;
        private MooNote note;
-       private boolean selected;
+       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);
-       private String notePitch;
-       private String noteVelocity;
-       private JPopupMenu popup;
-       private JMenuItem popupRemove, popupProp;
+       public static final Color invBgColor = new Color(96, 38, 0);
 
        /** 
         * 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;
                note = mn;
                calculateString();
+               addMouseListener(new MAdapter());
                setBorder(BorderFactory.createLineBorder(Color.black));
                setBackground(bgColor);
-               addMouseListener(new MAdapter());
+               textColor = Color.black;
 
                // Defines coordinates.
                pitchRect = new Rectangle(0, 0, 15, 10);
@@ -44,27 +46,54 @@ public class MooNoteElement extends JPanel {
                popupProp = new JMenuItem("Preferences...");
                popupProp.addActionListener(pList);
                popup.add(popupProp);
-
                popupRemove = new JMenuItem("Remove");
                popupRemove.addActionListener(pList);
                popup.add(popupRemove);
-
+               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);
        }
 
        /** 
-        * Returns true if the current NoteElement is selected, otherwise false.
-        * @return if the element is selected
+        * Returns the note of this element.
+        * @return the note
         */
-       public boolean isSelected() {
-               return selected;
+       public MooNote getNote() {
+               return note;
        }
 
        /** 
         * Selects the current NoteElement.
-        * @param state if the element should be selected
         */
-       public void setSelected(boolean state) {
-               selected = state;
+       public void select() {
+               selected = true;
+               mtv.selectNote(this);
+               setBackground(invBgColor);
+               textColor = Color.white;
+               repaint();
+       }
+
+       /** 
+        * Deselects the current NoteElement.
+        */
+       public void deselect() {
+               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();
        }
 
        /**
@@ -76,6 +105,7 @@ public class MooNoteElement extends JPanel {
                super.paintComponent(g);
                if (!(g instanceof Graphics2D)) return;
                Graphics2D g2 = (Graphics2D)g;
+               g2.setColor(textColor);
                g2.setFont(new Font("Helvetica", Font.PLAIN, 8));
        /*
                switch(columns) {
@@ -85,8 +115,8 @@ public class MooNoteElement extends JPanel {
                }
        */
                
-               g2.drawString(notePitch, 1, 9);
-               g2.drawString("" + noteVelocity, 21, 9);
+               g2.drawString(notePitch, 1, 8);
+               g2.drawString("" + noteVelocity, 21, 8);
        }
 
        /**
@@ -113,49 +143,96 @@ 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();
        }
 
+
        /**
-        * Gets the note that is element represents
-        * @return the MooNote object.
+        * Asks the MooTrackView that the note element is painted on to remove this element and the note.
         */
-       public MooNote getNote(){
-               return 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) {
+                       if (SwingUtilities.isLeftMouseButton(e) && !e.isControlDown()) {
+                               select();
+                               // Play the note
+                       }
+               }
+
                /**
                 * Checks if the mouse is pressed.
-                * Pops up the menu if right mousebutton is used.
-                * Increases the pitch or velocity if the right mousebutton is pressed while holding ctrl down.
-                * Decreases the pitch or velocity if the left mousebutton is pressed while holding ctrl down.
-                * @param e The events recieved.
+                * Increases the pitch or velocity if the right mouse button is pressed while holding CTRL.
+                * Decreases the pitch or velocity if the left mouse button is pressed while holding CTRL.
+                * @param e the event recieved.
                 */
                public void mousePressed(MouseEvent e) {
                        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())) {
                                        if (SwingUtilities.isRightMouseButton(e)) {
                                                note.setVelocity(note.getVelocity() + 1);
                                        } else if (SwingUtilities.isLeftMouseButton(e)) {
                                                note.setVelocity(note.getVelocity() - 1);
                                        }
+                                       Moosique.setEdited();
                                        calculateString();
+                                       repaint();
                                }
-                               e.getComponent().repaint();
-                       } else if (e.isPopupTrigger()) {
-                               popup.show(e.getComponent(), e.getX(), e.getY());
+                       } else maybeShowPopup(e);
+               }
+
+               public void mouseReleased(MouseEvent e) {
+                       maybeShowPopup(e);
+               }
+
+               /**
+                * Shows the menu if an OS-specific popup-trigger was activated.
+                */
+               private void maybeShowPopup(MouseEvent e) {
+                       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());
                        }
                }
        }
@@ -166,19 +243,16 @@ public class MooNoteElement extends JPanel {
        class PopupListener implements ActionListener {
                public void actionPerformed(ActionEvent e) {
                        Object source = e.getSource();
-                       if  (source == popupProp) {
+                       if (source == popupProp) {
                                new MooDialog(note);
-                       } else if  (source == popupRemove) {
+                               newLayout();
+                       } else if (source == popupRemove) {
                                remove();
+                       } else if (source == popupTranspOctUp) {
+                               transpose(12);
+                       } else if (source == popupTranspOctDown) {
+                               transpose(-12);
                        }
                }
        }
-
-       /**
-        * Asks the MooTrackView that it's painted on to remove this element and the note.
-        */
-       protected void remove(){
-               mtv.removeNote(this, note);
-       }
-
 }