X-Git-Url: https://ruin.nu/git/?a=blobdiff_plain;f=MooTrackView.java;h=129b0af0e78aa91ba33f9416f8166fb32d19baec;hb=8cf7c1250a6734bf43381550728a1d8620d294dc;hp=864ed07b2fe6a30a4431d12084973ac9399ace09;hpb=981f5dcd3e4ae1aeaa3f2f584dff1bce74ad8707;p=moosique.git

diff --git a/MooTrackView.java b/MooTrackView.java
index 864ed07..129b0af 100644
--- a/MooTrackView.java
+++ b/MooTrackView.java
@@ -2,6 +2,7 @@ import javax.swing.*;
 import java.awt.*;
 import java.awt.event.*;
 import javax.sound.midi.*;
+import java.util.*;
 
 /**
  * Graphical representation of a MIDI track.
@@ -13,23 +14,18 @@ import javax.sound.midi.*;
 public class MooTrackView extends JPanel implements ActionListener {
 
 	private Track track;
-	private MooTrackTitle title;
 	private NoteArea notes;
 	private Rectangle box;
 	private JPopupMenu popup;
+	private JPopupMenu notePopup;
 	private JMenuItem menuItem;
 	protected static int viewLength = 0;
-	
+	public static final int NOTE_HEIGHT = 10, NOTE_WIDTH = 40, VIEW_WIDTH = 200;
 
 	public MooTrackView (Track track) {
+		super(true);
 		this.track = track;
-		//setPreferredSize(new Dimension(200, 9000));
 		setLayout(new BorderLayout());
-		this.setBorder(BorderFactory.createLineBorder(Color.black));
-
-		//title = new MooTrackTitle(track);
-		//title.setBorder(BorderFactory.createLineBorder(Color.black));
-		//add(title, BorderLayout.NORTH);
 
 		notes = new NoteArea(track);	
 		notes.setBackground(Color.white);
@@ -39,11 +35,13 @@ public class MooTrackView extends JPanel implements ActionListener {
 		menuItem = new JMenuItem("Add...");
 		menuItem.addActionListener(this);
 		popup.add(menuItem);
+
+		notePopup = new JPopupMenu();
 		menuItem = new JMenuItem("Preferences...");
 		menuItem.addActionListener(this);
-		popup.add(menuItem);
+		notePopup.add(menuItem);
 
-		notes.addMouseListener(new PopupListener());
+//		notes.addMouseListener(new PopupListener());
 		add(notes, BorderLayout.CENTER);
 	}
 
@@ -52,30 +50,31 @@ public class MooTrackView extends JPanel implements ActionListener {
 	public Track getTrack() {
 		return track;
 	}
-	
+
 
 	/** 
 	 * Updates the track view.
 	 */
-	public void update() {
+	public void update(long tickPosition) {
 		repaint();
 	}
 
 	class NoteArea extends JPanel {
-		public static final int NOTE_HEIGHT = 10;
-		public static final int NOTE_WIDTH = 40;
-		private int trackLength;
+		public static final int NOTE_HEIGHT = 10, NOTE_WIDTH = 40, VIEW_WIDTH = 200;
+		private ArrayList rects;
 
 		public NoteArea(Track track) {
 			// Configuring panel
+			super(true);
 			setLayout(null);
-			trackLength = 140;
-			setPreferredSize(new Dimension(200, 140 * NOTE_HEIGHT));
+			setPreferredSize(new Dimension(VIEW_WIDTH, 140 * NOTE_HEIGHT));
 
-			// Temporary variables
+			// Creating temporary variables
 			MidiEvent note;
 			MooNoteElement elem;
 			int x, y, height;
+			int beatsPerSixteenth = Moosique.getSequence().getResolution() / 4;
+			rects = new ArrayList(track.size() / 2);
 
 			// Placing note elements
 			Insets insets = getInsets();
@@ -89,24 +88,33 @@ public class MooTrackView extends JPanel implements ActionListener {
 
 					// Moves the note element to the appropriate place.
 					x = insets.left;
-					y = insets.top + (int)(mn.getTick() / 24) * NOTE_HEIGHT;
-					height = (mn.getDuration() / 24) * NOTE_HEIGHT;
+					y = insets.top + (int)(mn.getTick() / beatsPerSixteenth) * NOTE_HEIGHT;
+					height = (mn.getDuration() / beatsPerSixteenth) * NOTE_HEIGHT;
 					if (height == 0) height = NOTE_HEIGHT;
-					while(findComponentAt(x, y) instanceof MooNoteElement ||
-					      findComponentAt(x, y + height - 1) instanceof MooNoteElement) x += NOTE_WIDTH;
-					elem.setBounds(x, y, NOTE_WIDTH, height);
+					Rectangle r = new Rectangle(x, y, NOTE_WIDTH, height);
+					while(isOccupied(r)) r.translate(NOTE_WIDTH, 0);
+					elem.setBounds(r);
+					rects.add(r);
 					if (viewLength < (y + height)) viewLength = y + height;
 				}
-				setPreferredSize(new Dimension(200,viewLength));
+				setPreferredSize(new Dimension(VIEW_WIDTH, viewLength));
 			}
 			validate();
 		}
+		
+		private boolean isOccupied(Rectangle r) {
+			Iterator it = rects.iterator();
+			while (it.hasNext()) {
+				if(r.intersects((Rectangle)it.next())) return true;
+			}
+			return false;
+		}
 
 		public void paintComponent(Graphics g) {
 			super.paintComponent(g);
 			Graphics2D g2 = (Graphics2D)g;
-			for (int c = 0; c < viewLength ; c += NOTE_HEIGHT) {
-				for (int r = 0; r < (10*NOTE_WIDTH); r += NOTE_WIDTH) {
+			for (int c = 0; c < viewLength || c < getHeight(); c += NOTE_HEIGHT) {
+				for (int r = 0; r < (10 * NOTE_WIDTH); r += NOTE_WIDTH) {
 					box = new Rectangle(r, c, NOTE_WIDTH, NOTE_HEIGHT);
 					g2.setColor(Color.gray);
 					g2.draw(box);
@@ -126,7 +134,10 @@ public class MooTrackView extends JPanel implements ActionListener {
 
 		private void maybeShowPopup(MouseEvent e) {
 			if (e.isPopupTrigger()) {
-				popup.show(e.getComponent(), e.getX(), e.getY());
+				if (findComponentAt(e.getX(), e.getY()) instanceof MooNoteElement)
+					notePopup.show(e.getComponent(), e.getX(), e.getY());
+				else
+					popup.show(e.getComponent(), e.getX(), e.getY());
 			}
 		}
 	}