X-Git-Url: https://ruin.nu/git/?a=blobdiff_plain;f=MooNoteElement.java;h=8e5a3bde40b9d6fff8d1632211b3ff1fe2c2ae1e;hb=8cf7c1250a6734bf43381550728a1d8620d294dc;hp=c39d2b58804af037d5f355bd5744e451d421661e;hpb=0f75f154c6485f6428617af221a282ba03ee20ae;p=moosique.git

diff --git a/MooNoteElement.java b/MooNoteElement.java
index c39d2b5..8e5a3bd 100644
--- a/MooNoteElement.java
+++ b/MooNoteElement.java
@@ -9,39 +9,28 @@ 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);
 
 	/** 
 	 * 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));
-		setFont(new Font("Helvetica", Font.PLAIN, 10));
+		columns = mn.getDuration() / (Moosique.getSequence().getResolution() / 4);
+		setBorder(BorderFactory.createLineBorder(Color.black));
+		setBackground(bgColor);
+		addMouseListener(new MAdapter());
 
-		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);
+		pitchRect = new Rectangle(0, 0, 15, 10);
+		veloRect = new Rectangle(20, 0, 40, 10);
 	}
 
 	/** 
@@ -66,34 +55,60 @@ public class MooNoteElement extends JPanel{
 	public void paintComponent(Graphics g)
 	{
 		super.paintComponent(g);
-
-		if (note == null)
-			return;
-
-		if (!(g instanceof Graphics2D))
-			return;
+		if (note == null || !(g instanceof Graphics2D)) return;
 		Graphics2D g2 = (Graphics2D)g;
+		g2.setFont(new Font("Helvetica", Font.PLAIN, 8));
 
 		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;
+		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;
+			case 11: n = "B";  break;
 		}
+		n += pitch / 12;
 
-		g2.drawString(n +" "+(pitch/12), 2, 2);
-
+	/*
+		switch(columns) {
+			case 0:
+			case 1:
+			...
+		}
+	*/
+		
+		g2.drawString(n, 1, 9);
+		g2.drawString("" + note.getVelocity(), 21, 9);
 	}
 
-}
+	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);
+				}
+			} 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);
+				}
+			}
+			e.getComponent().repaint();
+		}
+
+		public void mousePressed(MouseEvent e) {}
+
+		public void mouseReleased(MouseEvent e) {}
+	}
+}
\ No newline at end of file