X-Git-Url: https://ruin.nu/git/?a=blobdiff_plain;f=MooNoteElement.java;h=beb5702b0467b663f102f2482e73cf75cbcb96fb;hb=9becc0105a709c62132cc6ff111ba1943ebb32de;hp=8b71b3cfb31e72caabf1edff3479f1dd930beecf;hpb=b707e72e9ba0631a60460dd368019029954a7ec7;p=moosique.git

diff --git a/MooNoteElement.java b/MooNoteElement.java
index 8b71b3c..beb5702 100644
--- a/MooNoteElement.java
+++ b/MooNoteElement.java
@@ -2,44 +2,40 @@ import javax.swing.*;
 import java.awt.*;
 import java.awt.event.*;
 
-/*
+/**
  * Graphical representation of a MIDI note.
  * 
  * @author  Andersson, Andreen, Lanneskog, Pehrson
  * @version 1
  */
  
-public class MooNoteElement extends JPanel{
+public class MooNoteElement extends JPanel {
 
 	private MooNote note;
-	/* 
+	private boolean selected;
+
+	/** 
 	 * Creates a new note element.
 	 * @param mn The note that will be graphically represented
 	 */
 	public MooNoteElement (MooNote mn) {
 		note = mn;
-		setPreferredSize(new Dimension(20,20));
-
-		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){	}
+	/** 
+	 * Returns true if the current NoteElement is selected, otherwise false.
+	 * @return if the element is selected
+	 */
+	public boolean isSelected() {
+		return selected;
+	}
 
-			public void mouseReleased(MouseEvent event){}
-		};
-		MouseListener listener = new MouseList();
-		addMouseListener(listener);
-			
+	/** 
+	 * Selects the current NoteElement.
+	 * @param state	if the element should be selected
+	 */
+	public void setSelected(boolean state) {
+		selected = state;
 	}
 
 	/**
@@ -49,11 +45,27 @@ public class MooNoteElement extends JPanel{
 	{
 		super.paintComponent(g);
 
-		if (!(g instanceof Graphics2D))
-			return;
+		if (note == null || !(g instanceof Graphics2D)) return;
 		Graphics2D g2 = (Graphics2D)g;
 
-		//Draw the note representation
+		String n = ""; 
+		int pitch = note.getPitch();
+		switch (pitch % 12) {
+			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.setFont(new Font("Helvetica", Font.PLAIN, 8));
+		n = n +(pitch/12);
+		g2.drawString(n + " "+ note.getVelocity(), 1, 9);
 	}
-			
-}
+}
\ No newline at end of file