X-Git-Url: https://ruin.nu/git/?a=blobdiff_plain;f=MooNoteElement.java;h=3b08887000f07f515cbbcfab170972ef6fb0cfe3;hb=5380690b9fc56b683d15765382669d79c50d3414;hp=969433fb928eec864372b0a68f23950f4b65d5ad;hpb=f2a6b00defcf7804b30e8d167015500e33d6cedb;p=moosique.git

diff --git a/MooNoteElement.java b/MooNoteElement.java
index 969433f..3b08887 100644
--- a/MooNoteElement.java
+++ b/MooNoteElement.java
@@ -9,37 +9,36 @@ import java.awt.event.*;
  * @version 1
  */
  
-public class MooNoteElement extends JPanel{
+public class MooNoteElement extends JPanel {
 
 	private MooNote note;
+	private int columns;
+	private boolean selected;
+
 	/** 
 	 * Creates a new note element.
-	 * @param mn The note that will be graphically represented
+	 * @param mn	the note that will be graphically represented
+	 * @param rows	the number of rows that the note will occupy
 	 */
 	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?
-			}
+		columns = mn.getDuration() / 24;
+	}
 
-			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,30 +48,36 @@ public class MooNoteElement extends JPanel{
 	{
 		super.paintComponent(g);
 
-		if (!(g instanceof Graphics2D))
-			return;
+		if (note == null || !(g instanceof Graphics2D)) return;
 		Graphics2D g2 = (Graphics2D)g;
-		
-		String note = ""; //TODO: shoudl really change this name..
-		int pitch = this.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;
+
+		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.drawString(note +" "+(pitch/12), 2, 2);
 
+	/*
+		switch(columns) {
+			case 0:
+			case 1:
+			...
+		}
+	*/
+		
+		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