X-Git-Url: https://ruin.nu/git/?a=blobdiff_plain;f=MooNoteElement.java;h=3a068cd67908b13456b1ae0bf014401ff7f0cd7c;hb=8acc1b9983cf0c679fbe556f480a6d7f4d45e518;hp=e93eb298ace082ede63be2c0dafd84936f407a08;hpb=65ea2a43eb97459592d222ea00082e46343c9d8b;p=moosique.git

diff --git a/MooNoteElement.java b/MooNoteElement.java
index e93eb29..3a068cd 100644
--- a/MooNoteElement.java
+++ b/MooNoteElement.java
@@ -19,12 +19,12 @@ public class MooNoteElement extends JPanel {
 	private String notePitch;
 	private String noteVelocity;
 	private JPopupMenu popup;
-	private JMenuItem popupRemove, popupProp;
+	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 rows	the number of rows that the note will occupy
 	 */
 	public MooNoteElement (MooTrackView parent, MooNote mn) {
 		mtv = parent;
@@ -44,10 +44,15 @@ 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);
+		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);
 
 	}
 
@@ -59,6 +64,14 @@ public class MooNoteElement extends JPanel {
 		return selected;
 	}
 
+	/** 
+	 * Returns the note of this element.
+	 * @return the note
+	 */
+	public MooNote getNote() {
+		return note;
+	}
+
 	/** 
 	 * Selects the current NoteElement.
 	 * @param state	if the element should be selected
@@ -68,7 +81,8 @@ public class MooNoteElement extends JPanel {
 	}
 
 	/**
-	 *
+	 * Draws the string that shows the note's properties.
+	 * @param g	The Graphics object used to draw the strings.
 	 */
 	public void paintComponent(Graphics g)
 	{
@@ -84,10 +98,13 @@ 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);
 	}
 
+	/**
+	 * Calculate what the string that shows the note properties should look like.
+	 */
 	protected void calculateString(){
 
 		noteVelocity = ""; 
@@ -113,11 +130,21 @@ public class MooNoteElement extends JPanel {
 		noteVelocity = ""+note.getVelocity();
 	}
 
-	public MooNote getNote(){
-		return note;
-	}
-
+	/**
+	 * Listener that checks the mouse actions on this element.
+	 */
 	class MAdapter extends MouseAdapter {
+	
+		public void mouseClicked(MouseEvent e) {
+			// 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.
+		 * @param e the event recieved.
+		 */
 		public void mousePressed(MouseEvent e) {
 			if (e.isControlDown()) {
 				if (pitchRect.contains(e.getPoint())) {
@@ -127,6 +154,7 @@ public class MooNoteElement extends JPanel {
 						note.setPitch(note.getPitch() - 1);
 					}
 					calculateString();
+					repaint();
 				} else if (veloRect.contains(e.getPoint())) {
 					if (SwingUtilities.isRightMouseButton(e)) {
 						note.setVelocity(note.getVelocity() + 1);
@@ -134,27 +162,52 @@ public class MooNoteElement extends JPanel {
 						note.setVelocity(note.getVelocity() - 1);
 					}
 					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()) popup.show(e.getComponent(), e.getX(), e.getY());
 		}
 	}
 
+	/**
+	 * Listens on the actions made to the popupmenu.
+	 */
 	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) {
+			} 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();
 			}
 		}
+
+		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, note);
+		mtv.removeNote(this);
 	}
-
 }