X-Git-Url: https://ruin.nu/git/?p=moosique.git;a=blobdiff_plain;f=MooNoteElement.java;h=7ea74227d0be3a456226583adfa3fe9a8bed560f;hp=3a068cd67908b13456b1ae0bf014401ff7f0cd7c;hb=6154ba318198471a2b94391df6aab6f2b6cd9b29;hpb=8acc1b9983cf0c679fbe556f480a6d7f4d45e518 diff --git a/MooNoteElement.java b/MooNoteElement.java index 3a068cd..7ea7422 100644 --- a/MooNoteElement.java +++ b/MooNoteElement.java @@ -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, popupTransposeOctUp, popupTransposeOctDown; + 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); @@ -47,21 +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); - - } - - /** - * Returns true if the current NoteElement is selected, otherwise false. - * @return if the element is selected - */ - public boolean isSelected() { - return selected; + 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); } /** @@ -74,10 +67,33 @@ public class MooNoteElement extends JPanel { /** * 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(); } /** @@ -89,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) { @@ -126,33 +143,70 @@ 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) { - // Play the note + if (SwingUtilities.isLeftMouseButton(e) && !e.isControlDown()) { + select(); + // Play the note + } } /** * Checks if the mouse is pressed. - * 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. + * 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())) { @@ -161,6 +215,7 @@ public class MooNoteElement extends JPanel { } else if (SwingUtilities.isLeftMouseButton(e)) { note.setVelocity(note.getVelocity() - 1); } + Moosique.setEdited(); calculateString(); repaint(); } @@ -175,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()); + } } } @@ -187,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); } }