X-Git-Url: https://ruin.nu/git/?p=moosique.git;a=blobdiff_plain;f=MooTrackView.java;h=854cfec806308b0680360ea5a0f41c1999b4301a;hp=ccaa10553ccbe38bc546c5ff67a1aa197c8ef913;hb=e49990e17bff158ad638a16ba4aa616673b94627;hpb=cd7d6166d73969c1c811ac7153cc6eee59a6a685

diff --git a/MooTrackView.java b/MooTrackView.java
index ccaa105..854cfec 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.
@@ -9,80 +10,147 @@ import javax.sound.midi.*;
  * @author  Andersson , Andreen, Lanneskog, Pehrson
  * @version 1
  */
- 
-public class MooTrackView extends JPanel implements ActionListener {
+
+public class MooTrackView extends JPanel {
 
 	private Track track;
-	private MooTrackTitle title;
-	private NoteArea notes;
 	private Rectangle box;
+
 	private JPopupMenu popup;
 	private JMenuItem menuItem;
-	
+	private ArrayList rects;
+	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) {
+		super(true);
 		this.track = track;
-		setPreferredSize(new Dimension(200, 200));
-		setLayout(new BorderLayout());
-		this.setBorder(BorderFactory.createLineBorder(Color.black));
 
-		title = new MooTrackTitle(track);
-		title.setBorder(BorderFactory.createLineBorder(Color.black));
-		add(title, BorderLayout.NORTH);
+		// Configures panel
+		setBackground(Color.white);
+		setBorder(BorderFactory.createLineBorder(Color.black));
+		setLayout(null);
+		setPreferredSize(new Dimension(VIEW_WIDTH, 140 * NOTE_HEIGHT));
 
-		notes = new NoteArea();	
-		notes.setBackground(Color.white);
-		notes.setBorder(BorderFactory.createLineBorder(Color.black));
+		// Creates temporary variables
+		MidiEvent note;
+		MooNoteElement elem;
+		rects = new ArrayList(track.size() / 2);
+		extraHeight = Toolkit.getDefaultToolkit().getScreenSize().height - 150;
 
+		// Places note elements
+		for (int i = 0; i < track.size(); i++) {
+			note = track.get(i);
+			if (note instanceof MooNote) {
+				// Adds the note element to the note area and moves it to the appropriate place.
+				MooNote mn = (MooNote)note;
+				elem = new MooNoteElement(this, mn);
+				add(elem);
+				layoutElement(elem, false);
+			}
+			setPreferredSize(new Dimension(VIEW_WIDTH, viewLength + extraHeight));
+
+		}
+		validate();
+
+		// Creates pop-up menu.
 		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());
-		add(notes, BorderLayout.CENTER);
+		menuItem = new JMenuItem("Add note...");
+		// menuItem.addActionListener();
+		popup.add(menuItem);
+
+		// Adds listeners for popup menu and keyboard synthesizer.
+		addMouseListener(new MAdapter());
+		addKeyListener(new MooKeyboard());
 	}
-	
-	public void actionPerformed(ActionEvent e) {}
-    
+
+	public void layoutElement(MooNoteElement elem, boolean old){
+		// If the element is currently in the view, removes its coordinates from the list.
+		Rectangle r = new Rectangle();
+		if (old){
+			r = elem.getBounds(r);
+			for (Iterator i = rects.iterator(); i.hasNext();){
+				Object ob = i.next();
+				if (r.equals(ob)){
+					rects.remove(ob);
+					break;
+				}
+			}
+		}
+
+		// Creates temporary variables.
+		int ticksPerSixteenth = Moosique.getSequence().getResolution() / 4;
+		MooNote mn = elem.getNote();
+		Insets insets = getInsets();
+		int x, y, height;
+
+		// Calculates coordinates.
+		x = insets.left;
+		y = insets.top + (int)(mn.getTick() / ticksPerSixteenth) * NOTE_HEIGHT;
+		height = (mn.getDuration() / ticksPerSixteenth) * NOTE_HEIGHT;
+		if (height == 0) height = NOTE_HEIGHT;
+		r = new Rectangle(x, y, NOTE_WIDTH, height);
+
+		// Places the element in the appropriate place.
+		while(isOccupied(r)) r.translate(NOTE_WIDTH, 0);
+		elem.setBounds(r);
+		rects.add(r);
+		if (viewLength < (y + height)){
+			viewLength = y + height;
+			if(old)setPreferredSize(new Dimension(VIEW_WIDTH, viewLength + extraHeight));
+		}
+
+	}
+
 	public Track getTrack() {
 		return track;
 	}
 
-	class NoteArea extends JPanel {
-		public void RectanglePanel() {
-			setPreferredSize(new Dimension(20, 20));
+
+	/** 
+	 * Updates the track view.
+	 */
+	public void update(long tickPosition) {
+		repaint();
+	}
+
+	private boolean isOccupied(Rectangle r) {
+		Iterator it = rects.iterator();
+		while (it.hasNext()) {
+			if(r.intersects((Rectangle)it.next())) return true;
 		}
-		
-		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);
-					g2.setColor(Color.gray);
-					g2.draw(box);
-				}
+		return false;
+	}
+	
+	public void remove(MooNoteElement elem) {
+		remove((Component)elem);
+		elem.getNote().removeFrom(track);
+		validate();
+		repaint();
+	}
+
+	public void paintComponent(Graphics g) {
+		super.paintComponent(g);
+		Graphics2D g2 = (Graphics2D)g;
+		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);
 			}
 		}
 	}
-	
-	class PopupListener extends MouseAdapter {
-	        public void mousePressed(MouseEvent e) {
-			maybeShowPopup(e);
-	        }
-	
-	        public void mouseReleased(MouseEvent e) {
-			maybeShowPopup(e);
-	        }
-	
-	        private void maybeShowPopup(MouseEvent e) {
+
+	class MAdapter extends MouseAdapter {
+		public void mousePressed(MouseEvent e) {
 			if (e.isPopupTrigger()) {
 				popup.show(e.getComponent(), e.getX(), e.getY());
 			}
 		}
+
+		public void mouseEntered(MouseEvent e) {
+			// Moosique.setActiveChannel(track.getChannel());
+		}
 	}
-}
\ No newline at end of file
+}