X-Git-Url: https://ruin.nu/git/?a=blobdiff_plain;f=MooNoteElement.java;h=60808898339361e3b70a53b21b6ac03c325713d7;hb=1f2ba8a0848ee0c5f0ea94f7bc40ea502c0dff74;hp=43b7b27ff6153bad1673dc63df67066222df46f2;hpb=ecef41268a927f27f71839d5df1d68a151b37e5e;p=moosique.git diff --git a/MooNoteElement.java b/MooNoteElement.java index 43b7b27..6080889 100644 --- a/MooNoteElement.java +++ b/MooNoteElement.java @@ -9,22 +9,23 @@ import java.awt.event.*; * @version 1 */ -public class MooNoteElement extends JPanel { +public class MooNoteElement extends JPanel implements Comparable{ 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, leftMouseButtonPressed = false, mouseIn = 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); } /** @@ -64,11 +65,20 @@ public class MooNoteElement extends JPanel { return note; } + /** + * Compares the note of this element to that of another note. + * @return a negative integer, zero, or a positive integer as this object is less than, equal to, or greater than the specified object + */ + public int compareTo(Object o) { + return note.compareTo(((MooNoteElement)o).getNote()); + } + /** * Selects the current NoteElement. */ public void select() { - mtv.addSelected(this); + selected = true; + mtv.selectNote(this); setBackground(invBgColor); textColor = Color.white; repaint(); @@ -78,12 +88,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 +151,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 { - public void mouseClicked(MouseEvent e) { - select(); - // Play the note + /** + * Selects the note if mouse entered with the left mouse button pressed. + */ + public void mouseEntered(MouseEvent e) { + mouseIn = true; + if (mtv.isLeftMouseButtonPressed()) { + select(); + } + } + + /** + * Registers mouse exited. + */ + public void mouseExited(MouseEvent e) { + mouseIn = false; } /** @@ -155,10 +210,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,21 +223,36 @@ public class MooNoteElement extends JPanel { } else if (SwingUtilities.isLeftMouseButton(e)) { note.setVelocity(note.getVelocity() - 1); } + Moosique.setEdited(); calculateString(); repaint(); } - } else maybeShowPopup(e); + } else { + select(); + // Play the note + maybeShowPopup(e); + } } public void mouseReleased(MouseEvent e) { - maybeShowPopup(e); + if (!maybeShowPopup(e) && !mouseIn) { + int y = e.getY(); + if (y < 0) mtv.maybeMoveSelectedNotes((int)Math.floor((double)y / MooTrackView.NOTE_HEIGHT) * MooTrackView.NOTE_HEIGHT); + if (y > getHeight()) mtv.maybeMoveSelectedNotes((int)Math.ceil(((double)y - getHeight()) / MooTrackView.NOTE_HEIGHT) * MooTrackView.NOTE_HEIGHT); + + } } /** * 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()); + private boolean maybeShowPopup(MouseEvent e) { + if (!e.isPopupTrigger()) return false; + if (!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()); + } + return true; } } @@ -192,28 +263,18 @@ public class MooNoteElement extends JPanel { public void actionPerformed(ActionEvent e) { Object source = e.getSource(); if (source == popupProp) { + System.out.println("Duration: " + note.getDuration()); new MooDialog(note); + System.out.println("Duration: " + note.getDuration()); + newLayout(); + repaint(); } 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); } }