X-Git-Url: https://ruin.nu/git/?p=moosique.git;a=blobdiff_plain;f=MooTrackView.java;h=8eba152152198159e9d33ab49d3cb4bc4a5d3f31;hp=1a612e47eb01f7f748ed05e70d01cc88351b7be0;hb=e31778837bee5cfbbaf643d17f1eaeb086d8e50c;hpb=65ea2a43eb97459592d222ea00082e46343c9d8b

diff --git a/MooTrackView.java b/MooTrackView.java
index 1a612e4..8eba152 100644
--- a/MooTrackView.java
+++ b/MooTrackView.java
@@ -14,18 +14,23 @@ import java.util.*;
 public class MooTrackView extends JPanel {
 
 	private Track track;
+	private MooTrackTitle title;
 	private Rectangle box;
 
 	private JPopupMenu popup;
 	private JMenuItem popupAdd;
 	private ArrayList rects;
+	private Insets insets;
+	private int ticksPerSixteenth, popupY = 0;
 	protected static int viewLength = 0;
 	protected static int extraHeight = 0;
 	public static final int NOTE_HEIGHT = 10, NOTE_WIDTH = 40, VIEW_WIDTH = 200;
 
-	public MooTrackView (Track track) {
+	public MooTrackView (Track track, MooTrackTitle title) {
 		super(true);
 		this.track = track;
+		this.title = title;
+		insets = getInsets();
 
 		// Configures panel
 		setBackground(Color.white);
@@ -52,7 +57,6 @@ public class MooTrackView extends JPanel {
 			setPreferredSize(new Dimension(VIEW_WIDTH, viewLength + extraHeight));
 
 		}
-		validate();
 
 		// Creates pop-up menu.
 		popup = new JPopupMenu();
@@ -81,9 +85,8 @@ public class MooTrackView extends JPanel {
 		}
 
 		// Creates temporary variables.
-		int ticksPerSixteenth = Moosique.getSequence().getResolution() / 4;
+		ticksPerSixteenth = Moosique.getSequence().getResolution() / 4;
 		MooNote mn = elem.getNote();
-		Insets insets = getInsets();
 		int x, y, height;
 
 		// Calculates coordinates.
@@ -103,16 +106,20 @@ public class MooTrackView extends JPanel {
 		}
 	}
 
+	/** 
+	 * Returns the track of this view.
+	 * @return the track of this view
+	 */
 	public Track getTrack() {
 		return track;
 	}
 
-
 	/** 
-	 * Updates the track view.
+	 * Returns the title of this view.
+	 * @return the title of this view
 	 */
-	public void update(long tickPosition) {
-		repaint();
+	public MooTrackTitle getTitle() {
+		return title;
 	}
 
 	private boolean isOccupied(Rectangle r) {
@@ -123,22 +130,36 @@ public class MooTrackView extends JPanel {
 		return false;
 	}
 	
+	/** 
+	 * Adds the given note to the current track, and visualises it.
+	 * @param mn	the note to add
+	 */
 	public void addNote(MooNote mn) {
 		mn.addTo(track);
 		MooNoteElement elem = new MooNoteElement(this, mn);
 		add(elem);
 		layoutElement(elem, false);
 		setPreferredSize(new Dimension(VIEW_WIDTH, viewLength + extraHeight));
+		repaint();
 	}
 
-	public void removeNote(MooNoteElement elem, MooNote mn) {
-		mn.removeFrom(track);
+	/** 
+	 * Removes the given note element from the view and its note from the current track.
+	 * @param elem	the note element to remove
+	 */
+	public void removeNote(MooNoteElement elem) {
+		elem.getNote().removeFrom(track);
 		remove(elem);
 		elem.getNote().removeFrom(track);
-		validate();
 		repaint();
 	}
 
+	private void addStandardNote() {
+		long timestamp = (long)(ticksPerSixteenth * (popupY - insets.top) / NOTE_HEIGHT);
+		System.out.println(ticksPerSixteenth + ", " + popupY + ", " + insets.top + ", " + timestamp);
+		addNote(new MooNote(title.getChannel(), 60, 100, timestamp, Moosique.getSequence().getResolution() / 4));
+	}
+
 	public void paintComponent(Graphics g) {
 		super.paintComponent(g);
 		Graphics2D g2 = (Graphics2D)g;
@@ -152,8 +173,16 @@ public class MooTrackView extends JPanel {
 	}
 
 	class MAdapter extends MouseAdapter {
+		public void mouseClicked(MouseEvent e) {
+			if (e.getClickCount() == 2) {
+				popupY = e.getY();
+				addStandardNote();
+			}
+		}
+	
 		public void mousePressed(MouseEvent e) {
 			if (e.isPopupTrigger()) {
+				popupY = e.getY();
 				popup.show(e.getComponent(), e.getX(), e.getY());
 			}
 		}
@@ -168,9 +197,9 @@ public class MooTrackView extends JPanel {
 		public void actionPerformed(ActionEvent e) {
 			Object source = e.getSource();
 			if  (source == popupAdd) {
-				//addNote(new MooNote());
-				// int channel, int pitch, int velocity, long timestamp, int duration
+				addStandardNote();
 			}
+			// new MooNote(int channel, int pitch, int velocity, long timestamp, int duration)
 		}
 	}
 }
\ No newline at end of file