X-Git-Url: https://ruin.nu/git/?a=blobdiff_plain;f=MooNoteElement.java;h=7488d1543d94a54a9a66099263d072767f0dad55;hb=948e069926266ead58bc5466520e131941f2466c;hp=969433fb928eec864372b0a68f23950f4b65d5ad;hpb=f2a6b00defcf7804b30e8d167015500e33d6cedb;p=moosique.git

diff --git a/MooNoteElement.java b/MooNoteElement.java
index 969433f..7488d15 100644
--- a/MooNoteElement.java
+++ b/MooNoteElement.java
@@ -9,37 +9,62 @@ import java.awt.event.*;
  * @version 1
  */
  
-public class MooNoteElement extends JPanel{
+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));
+		calculateString();
+		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.
-			}
+		// Defines coordinates.
+		pitchRect = new Rectangle(0, 0, 15, 10);
+		veloRect = new Rectangle(20, 0, 40, 10);
 
-			public void mouseEntered(MouseEvent event){
-				//Show note props in statusbar?
-			}
+		// Creates pop-up menu.
+		popup = new JPopupMenu();
+		PopupListener pList = new PopupListener();
+		popupProp = new JMenuItem("Preferences...");
+		popupProp.addActionListener(pList);
+		popup.add(popupProp);
 
-			public void mouseExited(MouseEvent event){
-				//Reset statusbar?
-			}
+		popupRemove = new JMenuItem("Remove");
+		popupRemove.addActionListener(pList);
+		popup.add(popupRemove);
 
-			public void mousePressed(MouseEvent event){	}
+	}
 
-			public void mouseReleased(MouseEvent event){}
-		};
-		MouseListener listener = new MouseList();
-		addMouseListener(listener);
-			
+	/** 
+	 * Returns true if the current NoteElement is selected, otherwise false.
+	 * @return if the element is selected
+	 */
+	public boolean isSelected() {
+		return selected;
+	}
+
+	/** 
+	 * Selects the current NoteElement.
+	 * @param state	if the element should be selected
+	 */
+	public void setSelected(boolean state) {
+		selected = state;
 	}
 
 	/**
@@ -48,31 +73,88 @@ public class MooNoteElement extends JPanel{
 	public void paintComponent(Graphics g)
 	{
 		super.paintComponent(g);
-
-		if (!(g instanceof Graphics2D))
-			return;
+		if (!(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;
+		g2.setFont(new Font("Helvetica", Font.PLAIN, 8));
+	/*
+		switch(columns) {
+			case 0:
+			case 1:
+			...
 		}
+	*/
 		
-		g2.drawString(note +" "+(pitch/12), 2, 2);
+		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();
+	}
+
+	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());
+			}
+		}
 	}
-			
+
+	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.remove(this);
+	}
+
 }