X-Git-Url: https://ruin.nu/git/?a=blobdiff_plain;f=MooTrackView.java;h=0bc564cf1dadf74190bb588ed540b972d558d41a;hb=c2644cb200b06d71a3e6c4548c37272228130c3d;hp=1e59ba4d200e507442367c89b6df4018c052365f;hpb=2e2fa52cef9db49f82d1dec2a8c4c03c5c6f387b;p=moosique.git

diff --git a/MooTrackView.java b/MooTrackView.java
index 1e59ba4..0bc564c 100644
--- a/MooTrackView.java
+++ b/MooTrackView.java
@@ -9,16 +9,19 @@ import javax.sound.midi.*;
  * @author  Andersson , Andreen, Lanneskog, Pehrson
  * @version 1
  */
- 
+
 public class MooTrackView extends JPanel implements ActionListener {
 
+	private Track track;
 	private MooTrackTitle title;
 	private NoteArea notes;
 	private Rectangle box;
 	private JPopupMenu popup;
 	private JMenuItem menuItem;
 	
+
 	public MooTrackView (Track track) {
+		this.track = track;
 		setPreferredSize(new Dimension(200, 200));
 		setLayout(new BorderLayout());
 		this.setBorder(BorderFactory.createLineBorder(Color.black));
@@ -27,56 +30,95 @@ public class MooTrackView extends JPanel implements ActionListener {
 		title.setBorder(BorderFactory.createLineBorder(Color.black));
 		add(title, BorderLayout.NORTH);
 
-		notes = new NoteArea();	
+		notes = new NoteArea(track);	
 		notes.setBackground(Color.white);
 		notes.setBorder(BorderFactory.createLineBorder(Color.black));
 
 		popup = new JPopupMenu();
-	        menuItem = new JMenuItem("Add...");
-	        menuItem.addActionListener(this);
-	        popup.add(menuItem);
-	        menuItem = new JMenuItem("Preferences...");
-	        menuItem.addActionListener(this);
-	        popup.add(menuItem);
-
-	        notes.addMouseListener(new PopupListener());
+		menuItem = new JMenuItem("Add...");
+		menuItem.addActionListener(this);
+		popup.add(menuItem);
+		menuItem = new JMenuItem("Preferences...");
+		menuItem.addActionListener(this);
+		popup.add(menuItem);
+
+		notes.addMouseListener(new PopupListener());
 		add(notes, BorderLayout.CENTER);
 	}
-	
+
 	public void actionPerformed(ActionEvent e) {}
-    
+
+	public Track getTrack() {
+		return track;
+	}
+	
+
+	/** 
+	 * Updates the track view.
+	 */
+	public void update() {
+	
+	}
+
 	class NoteArea extends JPanel {
-		public void RectanglePanel() {
-			setPreferredSize(new Dimension(20, 20));
+		public static final int NOTE_SIZE = 25;
+		private int trackLength;
+
+		public NoteArea(Track track) {
+			setLayout(null);
+			trackLength = 60;
+			MidiEvent note;
+			MooNoteElement elem;
+			boolean isOccupied;
+			int x, y, height;
+			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);
+
+					// Places the note element in the appropriate place.
+					x = insets.left;
+					y = insets.top + (int)(mn.getTick() / 24) * NOTE_SIZE;
+					height = NOTE_SIZE;
+					// height = (mn.getDuration() / 24) * NOTE_SIZE;
+					System.out.println("Comp at: " + x + ", " + y + " is: " + findComponentAt(x + 10, y + 10));
+					while(findComponentAt(x, y) instanceof MooNoteElement ||
+					      findComponentAt(x, y + height - 1) instanceof MooNoteElement) x += NOTE_SIZE;
+					elem.setBounds(x, y, NOTE_SIZE, height);
+				}
+			}
 		}
-		
+
 		public void paintComponent(Graphics g) {
 			super.paintComponent(g);
 			Graphics2D g2 = (Graphics2D)g;
-			for (int c = 0; c < 1000; c += 20) {
-				int r=0;
-				for (r = 0; r < 200; r += 20) {
-					box = new Rectangle(r, c, 20, 20);
+			for (int c = 0; c < (trackLength*NOTE_SIZE); c += NOTE_SIZE) {
+				for (int r = 0; r < (10*NOTE_SIZE); r += NOTE_SIZE) {
+					box = new Rectangle(r, c, NOTE_SIZE, NOTE_SIZE);
 					g2.setColor(Color.gray);
 					g2.draw(box);
 				}
 			}
 		}
 	}
-	
+
 	class PopupListener extends MouseAdapter {
-	        public void mousePressed(MouseEvent e) {
+		public void mousePressed(MouseEvent e) {
 			maybeShowPopup(e);
-	        }
-	
-	        public void mouseReleased(MouseEvent e) {
+		}
+
+		public void mouseReleased(MouseEvent e) {
 			maybeShowPopup(e);
-	        }
-	
-	        private void maybeShowPopup(MouseEvent e) {
+		}
+
+		private void maybeShowPopup(MouseEvent e) {
 			if (e.isPopupTrigger()) {
 				popup.show(e.getComponent(), e.getX(), e.getY());
 			}
 		}
 	}
-}
\ No newline at end of file
+}