X-Git-Url: https://ruin.nu/git/?a=blobdiff_plain;f=MooNoteElement.java;h=ca1d5c2e9bb533f7c01914f59e2b9afce728c08e;hb=c2644cb200b06d71a3e6c4548c37272228130c3d;hp=3640113034b314f79112f2f2302891df2c81e7fa;hpb=2c2d2bff843fc32659acc06c9893a0439ed51c62;p=moosique.git

diff --git a/MooNoteElement.java b/MooNoteElement.java
index 3640113..ca1d5c2 100644
--- a/MooNoteElement.java
+++ b/MooNoteElement.java
@@ -9,7 +9,7 @@ import java.awt.event.*;
  * @version 1
  */
  
-public class MooNoteElement extends JPanel{
+public class MooNoteElement extends JPanel {
 
 	private MooNote note;
 	private boolean selected;
@@ -20,28 +20,6 @@ public class MooNoteElement extends JPanel{
 	 */
 	public MooNoteElement (MooNote mn) {
 		note = mn;
-		setPreferredSize(new Dimension(20,20));
-		setFont(new Font("Helvetica", Font.PLAIN, 10));
-
-		class MouseList implements MouseListener{
-			public void mouseClicked(MouseEvent event){
-				//Bring upp dialog to edit note.
-			}
-
-			public void mouseEntered(MouseEvent event){
-				//Show note props in statusbar?
-			}
-
-			public void mouseExited(MouseEvent event){
-				//Reset statusbar?
-			}
-
-			public void mousePressed(MouseEvent event){	}
-
-			public void mouseReleased(MouseEvent event){}
-		};
-		MouseListener listener = new MouseList();
-		addMouseListener(listener);
 	}
 
 	/** 
@@ -67,29 +45,34 @@ public class MooNoteElement extends JPanel{
 	{
 		super.paintComponent(g);
 
+		if (note == null)
+			return;
+
 		if (!(g instanceof Graphics2D))
 			return;
 		Graphics2D g2 = (Graphics2D)g;
 
-		String note = ""; //TODO: shoudl really change this name..
-		int pitch = this.note.getPitch();
+		String n = ""; 
+		int pitch = note.getPitch();
 		switch( pitch % 12)
 		{
-			case 0: note = "C"; break;
-			case 1: note = "C#"; break;
-			case 2: note = "D"; break;
-			case 3: note = "D#"; break;
-			case 4: note = "E"; break;
-			case 5: note = "F"; break;
-			case 6: note = "F#"; break;
-			case 7: note = "G"; break;
-			case 8: note ="G#"; break;
-			case 9: note = "A"; break;
-			case 10: note = "A#"; break;
-			case 11: note = "B"; break;
+			case 0: n = "C"; break;
+			case 1: n = "C#"; break;
+			case 2: n = "D"; break;
+			case 3: n = "D#"; break;
+			case 4: n = "E"; break;
+			case 5: n = "F"; break;
+			case 6: n = "F#"; break;
+			case 7: n = "G"; break;
+			case 8: n ="G#"; break;
+			case 9: n = "A"; break;
+			case 10: n = "A#"; break;
+			case 11: n = "B"; break;
 		}
-
-		g2.drawString(note +" "+(pitch/12), 2, 2);
+		g2.setFont(new Font("Helvetica", Font.PLAIN, 10));
+		n = n +(pitch/12);
+		g2.drawString(n, 1, 11);
+		g2.drawString(""+note.getVelocity(),1,23);
 
 	}