X-Git-Url: https://ruin.nu/git/?p=moosique.git;a=blobdiff_plain;f=MooNoteElement.java;h=43b7b27ff6153bad1673dc63df67066222df46f2;hp=65ed0baf554dd78aab1676e1e7aa41cd6807ecd9;hb=aae2d0b4428236b4147f466b3858a34bb7ed174f;hpb=7e4a687ccbb528a4383d7feae3ac4aa854bc5bad

diff --git a/MooNoteElement.java b/MooNoteElement.java
index 65ed0ba..43b7b27 100644
--- a/MooNoteElement.java
+++ b/MooNoteElement.java
@@ -11,55 +11,89 @@ import java.awt.event.*;
  
 public class MooNoteElement extends JPanel {
 
+	private MooTrackView mtv;
 	private MooNote note;
-	private int columns;
-	private boolean selected;
 	private Rectangle pitchRect, veloRect;
+	public Color textColor;
 	public static final Color bgColor = new Color(160, 218, 255);
-	private String notePitch;
-	private String noteVelocity;
+	public static final Color invBgColor = new Color(96, 38, 0);
+	private String notePitch, noteVelocity;
+	private JPopupMenu popup;
+	private JMenuItem popupRemove, popupProp, popupTransposeOctUp, popupTransposeOctDown;
 
 	/** 
 	 * Creates a new note element.
+	 * @param parent	The MooTrackView that this element will be painted on.
 	 * @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;
 		calculateString();
-		columns = mn.getDuration() / (Moosique.getSequence().getResolution() / 4);
+		addMouseListener(new MAdapter());
 		setBorder(BorderFactory.createLineBorder(Color.black));
 		setBackground(bgColor);
-		addMouseListener(new MAdapter());
+		textColor = Color.black;
 
+		// 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);
+		popupTransposeOctUp = new JMenuItem("Transpose one octave up");
+		popupTransposeOctUp.addActionListener(pList);
+		popup.add(popupTransposeOctUp);
+		popupTransposeOctDown = new JMenuItem("Transpose one octave down");
+		popupTransposeOctDown.addActionListener(pList);
+		popup.add(popupTransposeOctDown);
 	}
 
 	/** 
-	 * Returns true if the current NoteElement is selected, otherwise false.
-	 * @return if the element is selected
+	 * Returns the note of this element.
+	 * @return the note
 	 */
-	public boolean isSelected() {
-		return selected;
+	public MooNote getNote() {
+		return note;
 	}
 
 	/** 
 	 * Selects the current NoteElement.
-	 * @param state	if the element should be selected
 	 */
-	public void setSelected(boolean state) {
-		selected = state;
+	public void select() {
+		mtv.addSelected(this);
+		setBackground(invBgColor);
+		textColor = Color.white;
+		repaint();
+	}
+
+	/** 
+	 * Deselects the current NoteElement.
+	 */
+	public void deselect() {
+		// mtv.removeSelected(this);
+		setBackground(bgColor);
+		textColor = Color.black;
+		repaint();
 	}
 
 	/**
-	 *
+	 * Draws the string that shows the note's properties.
+	 * @param g	The Graphics object used to draw the strings.
 	 */
 	public void paintComponent(Graphics g)
 	{
 		super.paintComponent(g);
 		if (!(g instanceof Graphics2D)) return;
 		Graphics2D g2 = (Graphics2D)g;
+		g2.setColor(textColor);
 		g2.setFont(new Font("Helvetica", Font.PLAIN, 8));
 	/*
 		switch(columns) {
@@ -69,10 +103,13 @@ public class MooNoteElement extends JPanel {
 		}
 	*/
 		
-		g2.drawString(notePitch, 1, 9);
-		g2.drawString("" + noteVelocity, 21, 9);
+		g2.drawString(notePitch, 1, 8);
+		g2.drawString("" + noteVelocity, 21, 8);
 	}
 
+	/**
+	 * Calculate what the string that shows the note properties should look like.
+	 */
 	protected void calculateString(){
 
 		noteVelocity = ""; 
@@ -98,28 +135,85 @@ public class MooNoteElement extends JPanel {
 		noteVelocity = ""+note.getVelocity();
 	}
 
+	/**
+	 * Listener that checks the mouse actions on this element.
+	 */
 	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);
+			select();
+			// Play the note
+		}
+
+		/**
+		 * Checks if the mouse is pressed.
+		 * Increases the pitch or velocity if the right mouse button is pressed while holding CTRL.
+		 * Decreases the pitch or velocity if the left mouse button is pressed while holding CTRL.
+		 * @param e the event recieved.
+		 */
+		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();
+					repaint();
+				} 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();
+					repaint();
 				}
-				calculateString();
+			} else maybeShowPopup(e);
+		}
+
+		public void mouseReleased(MouseEvent e) {
+			maybeShowPopup(e);
+		}
+
+		/**
+		 * Shows the menu if an OS-specific popup-trigger was activated.
+		 */
+		private void maybeShowPopup(MouseEvent e) {
+			if (e.isPopupTrigger() && !e.isControlDown()) popup.show(e.getComponent(), e.getX(), e.getY());
+		}
+	}
+
+	/**
+	 * Listens on the actions made to the popupmenu.
+	 */
+	class PopupListener implements ActionListener {
+		public void actionPerformed(ActionEvent e) {
+			Object source = e.getSource();
+			if (source == popupProp) {
+				new MooDialog(note);
+			} else if (source == popupRemove) {
+				remove();
+			} else if (source == popupTransposeOctUp) {
+				note.setPitch(note.getPitch() + 12);
+				update();
+			} else if (source == popupTransposeOctDown) {
+				note.setPitch(note.getPitch() - 12);
+				update();
 			}
-			e.getComponent().repaint();
 		}
 
-		public void mousePressed(MouseEvent e) {}
+		private void update() {
+			calculateString();
+			repaint();
+		}
+	}
 
-		public void mouseReleased(MouseEvent e) {}
+	/**
+	 * Asks the MooTrackView that the note element is painted on to remove this element and the note.
+	 */
+	protected void remove(){
+		mtv.removeNote(this);
 	}
 }