X-Git-Url: https://ruin.nu/git/?a=blobdiff_plain;f=MooNoteElement.java;h=65ed0baf554dd78aab1676e1e7aa41cd6807ecd9;hb=31f81450a303d52bf37ec8bcbb12e0f3b3b8b833;hp=b42bcb96e73f2a2b532ae28e72b02d79cfe3f248;hpb=d7666fadd2f8baca8a03cacae836f2563fe4dd5d;p=moosique.git

diff --git a/MooNoteElement.java b/MooNoteElement.java
index b42bcb9..65ed0ba 100644
--- a/MooNoteElement.java
+++ b/MooNoteElement.java
@@ -9,51 +9,117 @@ 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;
+	private Rectangle pitchRect, veloRect;
+	public static final Color bgColor = new Color(160, 218, 255);
+	private String notePitch;
+	private String noteVelocity;
+
 	/** 
 	 * 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.
-			}
+		calculateString();
+		columns = mn.getDuration() / (Moosique.getSequence().getResolution() / 4);
+		setBorder(BorderFactory.createLineBorder(Color.black));
+		setBackground(bgColor);
+		addMouseListener(new MAdapter());
 
-			public void mouseEntered(MouseEvent event){
-				//Show note props in statusbar?
-			}
-
-			public void mouseExited(MouseEvent event){
-				//Reset statusbar?
-			}
+		pitchRect = new Rectangle(0, 0, 15, 10);
+		veloRect = new Rectangle(20, 0, 40, 10);
+	}
 
-			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;
 	}
 
-	/***
+	/**
 	 *
 	 */
 	public void paintComponent(Graphics g)
 	{
 		super.paintComponent(g);
-
-		if (!(g instanceof Graphics2D))
-			return;
+		if (!(g instanceof Graphics2D)) return;
 		Graphics2D g2 = (Graphics2D)g;
+		g2.setFont(new Font("Helvetica", Font.PLAIN, 8));
+	/*
+		switch(columns) {
+			case 0:
+			case 1:
+			...
+		}
+	*/
+		
+		g2.drawString(notePitch, 1, 9);
+		g2.drawString("" + noteVelocity, 21, 9);
+	}
+
+	protected void calculateString(){
+
+		noteVelocity = ""; 
+		notePitch = "";
+		if(note == null) return;
+
+		int pitch = note.getPitch();
+		switch (pitch % 12) {
+			case  0: notePitch = "C";  break;
+			case  1: notePitch = "C#"; break;
+			case  2: notePitch = "D";  break;
+			case  3: notePitch = "D#"; break;
+			case  4: notePitch = "E";  break;
+			case  5: notePitch = "F";  break;
+			case  6: notePitch = "F#"; break;
+			case  7: notePitch = "G";  break;
+			case  8: notePitch = "G#"; break;
+			case  9: notePitch = "A";  break;
+			case 10: notePitch = "A#"; break;
+			case 11: notePitch = "B";  break;
+		}
+		notePitch += pitch / 12;
+		noteVelocity = ""+note.getVelocity();
+	}
+
+	class MAdapter extends MouseAdapter {
+		public void mouseClicked(MouseEvent e) {
+			if (pitchRect.contains(e.getPoint())) {
+				if (SwingUtilities.isRightMouseButton(e)) {
+					note.setPitch(note.getPitch() + 1);
+				} else if (SwingUtilities.isLeftMouseButton(e)) {
+					note.setPitch(note.getPitch() - 1);
+				}
+				calculateString();
+			} else if (veloRect.contains(e.getPoint())) {
+				if (SwingUtilities.isRightMouseButton(e)) {
+					note.setVelocity(note.getVelocity() + 1);
+				} else if (SwingUtilities.isLeftMouseButton(e)) {
+					note.setVelocity(note.getVelocity() - 1);
+				}
+				calculateString();
+			}
+			e.getComponent().repaint();
+		}
+
+		public void mousePressed(MouseEvent e) {}
 
-		//Draw the note representation
+		public void mouseReleased(MouseEvent e) {}
 	}
-			
 }