X-Git-Url: https://ruin.nu/git/?a=blobdiff_plain;f=MooTrackView.java;h=c7850fe65b2eb4aeaed77d5d2f4b96028086641a;hb=5380690b9fc56b683d15765382669d79c50d3414;hp=12c6babb179d37c2def5d38f40637665b305b9b4;hpb=090ed9e7cda839261543f2992c67f1c94f3e6935;p=moosique.git

diff --git a/MooTrackView.java b/MooTrackView.java
index 12c6bab..c7850fe 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.
@@ -18,16 +19,19 @@ public class MooTrackView extends JPanel implements ActionListener {
 	private Rectangle box;
 	private JPopupMenu popup;
 	private JMenuItem menuItem;
+	protected static int viewLength = 0;
+	
 
 	public MooTrackView (Track track) {
+		super(true);
 		this.track = track;
-		setPreferredSize(new Dimension(200, 200));
+		//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);
+		//title = new MooTrackTitle(track);
+		//title.setBorder(BorderFactory.createLineBorder(Color.black));
+		//add(title, BorderLayout.NORTH);
 
 		notes = new NoteArea(track);	
 		notes.setBackground(Color.white);
@@ -55,41 +59,72 @@ public class MooTrackView extends JPanel implements ActionListener {
 	/** 
 	 * Updates the track view.
 	 */
-	public void update() {
-	
+	public void update(long tickPosition) {
+		repaint();
 	}
 
 	class NoteArea extends JPanel {
-
-		public static final int NOTE_SIZE = 20;
+		public static final int NOTE_HEIGHT = 10;
+		public static final int NOTE_WIDTH = 40;
+		private int trackLength;
+		private ArrayList rects;
 
 		public NoteArea(Track track) {
+			// Configuring panel
+			super(true);
+			setLayout(null);
+			trackLength = 140;
+			setPreferredSize(new Dimension(200, 140 * NOTE_HEIGHT));
+
+			// Creating temporary variables
 			MidiEvent note;
 			MooNoteElement elem;
-			boolean isOccupied;
 			int x, y, height;
+			rects = new ArrayList(track.size() / 2);
+
+			// Placing note elements
 			Insets insets = getInsets();
 			for (int i = 0; i < track.size(); i++) {
 				note = track.get(i);
 				if (note instanceof MooNote) {
+					// Adds the note element to the note area.
 					MooNote mn = (MooNote)note;
 					elem = new MooNoteElement(mn);
 					add(elem);
+
+					// Moves the note element to the appropriate place.
 					x = insets.left;
-					y = insets.top + (int)(mn.getTick() / 24) * NOTE_SIZE;
-					height = (mn.getDuration() / 24) * NOTE_SIZE;
-					while(findComponentAt(x, y) != this || findComponentAt(x, y + height - 1) != this) x += NOTE_SIZE;
-					elem.setBounds(x, y, NOTE_SIZE, height);
+					y = insets.top + (int)(mn.getTick() / 24) * NOTE_HEIGHT;
+					height = (mn.getDuration() / 24) * NOTE_HEIGHT;
+					if (height == 0) height = NOTE_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;
+
+					// while(findComponentAt(x, y) instanceof MooNoteElement ||
+					//       findComponentAt(x, y + height - 1) instanceof MooNoteElement) x += NOTE_WIDTH;
 				}
+				setPreferredSize(new Dimension(200, 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 < 1000; c += 20) {
-				for (int r = 0; r < 200; r += 20) {
-					box = new Rectangle(r, c, 20, 20);
+			for (int c = 0; c < viewLength ; 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);
 				}