X-Git-Url: https://ruin.nu/git/?a=blobdiff_plain;f=MooNoteElement.java;h=beed5c416acb498a25a95ff46291e419d3733ddd;hb=ae0bb1ddc2361a9c7f08579488870f0b99b14cb6;hp=459bf5bde05334adfd19919c7632c15289289831;hpb=2987fea4ec5854c2431e042f17daf5a923c438a1;p=moosique.git

diff --git a/MooNoteElement.java b/MooNoteElement.java
index 459bf5b..beed5c4 100644
--- a/MooNoteElement.java
+++ b/MooNoteElement.java
@@ -9,12 +9,14 @@ 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 JMenu popupTranspUp, popupTranspDown;
+	private JMenuItem popupRemove, popupProp;
+	private JMenuItem[] popupTranspUpItems, popupTranspDownItems;
 	private Rectangle pitchRect, veloRect;
 	private String notePitch, noteVelocity;
 	private boolean selected = false, leftMouseButtonPressed = false, mouseIn = false;
@@ -42,19 +44,12 @@ public class MooNoteElement extends JPanel {
 
 		// Creates pop-up menu.
 		popup = new JPopupMenu();
-		PopupListener pList = new PopupListener();
-		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);
+		popupProp = addMenuItem(popup, "Preferences...");
+		popupRemove = addMenuItem(popup, "Remove");
+		popupTranspUpItems = new JMenuItem[12];
+		popupTranspDownItems = new JMenuItem[12];
+		popupTranspUp = createTransposeMenu(popup, popupTranspUpItems, "note up");
+		popupTranspDown = createTransposeMenu(popup, popupTranspDownItems, "note down");
 	}
 
 	/** 
@@ -65,6 +60,14 @@ 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.
 	 */
@@ -170,11 +173,53 @@ public class MooNoteElement extends JPanel {
 		mtv.layoutElement(this,true);
 	}
 
+	/**
+	 * Adds a menu item with the given command to the given popup menu.
+	 */
+	private JMenuItem addMenuItem(JPopupMenu menu, String command) {
+		JMenuItem item = new JMenuItem(command);
+		item.addActionListener(new PopupListener());
+		menu.add(item);
+		return item;
+	}
+
+	/**
+	 * Adds a menu item with the given command to the given menu.
+	 */
+	private JMenuItem addMenuItem(JMenu menu, String command) {
+		JMenuItem item = new JMenuItem(command);
+		item.addActionListener(new PopupListener());
+		menu.add(item);
+		return item;
+	}
+
+	/**
+	 * Creates a transpose sub menu with the given title in the given popup menu,
+	 * inserting the items into the given array.
+	 */
+	private JMenu createTransposeMenu(JPopupMenu menu, JMenuItem[] items, String title) {
+		JMenu trans = new JMenu("Transpose " + title);
+		menu.add(trans);
+		items[0] = addMenuItem(trans, "One octave");
+		for (int i = 1; i < 12; i++) {
+			items[i] = addMenuItem(trans, (i) + " halftones");
+		}
+		return trans;
+	}
+
 	/**
 	 * Listener that checks the mouse actions on this element.
 	 */
 	class MAdapter extends MouseAdapter {
 	
+		/**
+		 * Plays the note on double-click.
+		 */
+		public void mouseClicked(MouseEvent e) {
+			if (SwingUtilities.isLeftMouseButton(e) && e.getClickCount() == 2)
+				Moosique.getReceiver().send(note.getMessage(), -1);
+		}
+
 		/**
 		 * Selects the note if mouse entered with the left mouse button pressed.
 		 */
@@ -190,6 +235,7 @@ public class MooNoteElement extends JPanel {
 		 */
 		public void mouseExited(MouseEvent e) {
 			mouseIn = false;
+			Moosique.getReceiver().send(note.getNoteOffEvent().getMessage(), -1);
 		}
 
 		/**
@@ -221,13 +267,17 @@ public class MooNoteElement extends JPanel {
 				}
 			} else {
 				select();
-				// Play the note
 				maybeShowPopup(e);
 			}
 		}
 
 		public void mouseReleased(MouseEvent e) {
-			if (!maybeShowPopup(e) && !mouseIn) mtv.maybeMoveSelectedNotes(getY(), getY() + e.getY());
+			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);
+				
+			}
 		}
 
 		/**
@@ -244,20 +294,28 @@ public class MooNoteElement extends JPanel {
 	}
 
 	/**
-	 * Listens on the actions made to the popupmenu.
+	 * Takes the appropriate action when a user selects an item on the popup menu.
 	 */
 	class PopupListener implements ActionListener {
 		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();
+				update();
 			} else if (source == popupRemove) {
 				remove();
-			} else if (source == popupTranspOctUp) {
+			} else if (source == popupTranspUpItems[0]) {
 				transpose(12);
-			} else if (source == popupTranspOctDown) {
+			} else if (source == popupTranspDownItems[0]) {
 				transpose(-12);
+			} else {
+				for (int i = 1; i < 12; i++) {
+					if (source == popupTranspUpItems[i]) transpose(i);
+					else if (source == popupTranspDownItems[i]) transpose(-i);
+				}
 			}
 		}
 	}