X-Git-Url: https://ruin.nu/git/?p=moosique.git;a=blobdiff_plain;f=MooNoteElement.java;h=e93eb298ace082ede63be2c0dafd84936f407a08;hp=e854a44fd030a0f211635a8b5b715623097c9bff;hb=ce9a16d679f2058454af367e972888ba8e2c34c0;hpb=c83e74facf762222fe4578f175408cc50d360518

diff --git a/MooNoteElement.java b/MooNoteElement.java
index e854a44..e93eb29 100644
--- a/MooNoteElement.java
+++ b/MooNoteElement.java
@@ -11,37 +11,44 @@ import java.awt.event.*;
  
 public class MooNoteElement extends JPanel {
 
+	private MooTrackView mtv;
 	private MooNote note;
 	private boolean selected;
+	private Rectangle pitchRect, veloRect;
+	public static final Color bgColor = new Color(160, 218, 255);
+	private String notePitch;
+	private String noteVelocity;
+	private JPopupMenu popup;
+	private JMenuItem popupRemove, popupProp;
 
 	/** 
 	 * 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) {
+	public MooNoteElement (MooTrackView parent, MooNote mn) {
+		mtv = parent;
 		note = mn;
-		setPreferredSize(new Dimension(20,20));
-		setFont(new Font("Helvetica", Font.PLAIN, 10));
+		calculateString();
+		setBorder(BorderFactory.createLineBorder(Color.black));
+		setBackground(bgColor);
+		addMouseListener(new MAdapter());
+
+		// Defines coordinates.
+		pitchRect = new Rectangle(0, 0, 15, 10);
+		veloRect = new Rectangle(20, 0, 40, 10);
+
+		// Creates pop-up menu.
+		popup = new JPopupMenu();
+		PopupListener pList = new PopupListener();
+		popupProp = new JMenuItem("Preferences...");
+		popupProp.addActionListener(pList);
+		popup.add(popupProp);
+
+		popupRemove = new JMenuItem("Remove");
+		popupRemove.addActionListener(pList);
+		popup.add(popupRemove);
 
-		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);
 	}
 
 	/** 
@@ -66,34 +73,88 @@ public class MooNoteElement extends JPanel {
 	public void paintComponent(Graphics g)
 	{
 		super.paintComponent(g);
+		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);
+	}
 
-		if (note == null)
-			return;
+	protected void calculateString(){
 
-		if (!(g instanceof Graphics2D))
-			return;
-		Graphics2D g2 = (Graphics2D)g;
+		noteVelocity = ""; 
+		notePitch = "";
+		if(note == null) return;
 
-		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;
+		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();
+	}
+
+	public MooNote getNote(){
+		return note;
+	}
+
+	class MAdapter extends MouseAdapter {
+		public void mousePressed(MouseEvent e) {
+			if (e.isControlDown()) {
+				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();
+			} else if (e.isPopupTrigger()) {
+				popup.show(e.getComponent(), e.getX(), e.getY());
+			}
+		}
+	}
 
-		g2.drawString(n +" "+(pitch/12), 2, 2);
+	class PopupListener implements ActionListener {
+		public void actionPerformed(ActionEvent e) {
+			Object source = e.getSource();
+			if  (source == popupProp) {
+				new MooDialog(note);
+			} else if  (source == popupRemove) {
+				remove();
+			}
+		}
+	}
 
+	protected void remove(){
+		mtv.removeNote(this, note);
 	}
 
 }