X-Git-Url: https://ruin.nu/git/?p=moosique.git;a=blobdiff_plain;f=MooTrackView.java;h=c058cc5e01ec881e0922a5b67c951dcc47967683;hp=129b0af0e78aa91ba33f9416f8166fb32d19baec;hb=b5028dc9c03585cdf231a37d8996a7e836932c3e;hpb=357944d9255bb7cb1ad5ed4f5c960b22a8c64b8f

diff --git a/MooTrackView.java b/MooTrackView.java
index 129b0af..c058cc5 100644
--- a/MooTrackView.java
+++ b/MooTrackView.java
@@ -11,46 +11,96 @@ import java.util.*;
  * @version 1
  */
 
-public class MooTrackView extends JPanel implements ActionListener {
+public class MooTrackView extends JPanel {
 
 	private Track track;
-	private NoteArea notes;
 	private Rectangle box;
 	private JPopupMenu popup;
-	private JPopupMenu notePopup;
 	private JMenuItem menuItem;
+	private ArrayList rects;
 	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;
-		setLayout(new BorderLayout());
 
-		notes = new NoteArea(track);	
-		notes.setBackground(Color.white);
-		notes.setBorder(BorderFactory.createLineBorder(Color.black));
+		// Configures panel
+		setBackground(Color.white);
+		setBorder(BorderFactory.createLineBorder(Color.black));
+		setLayout(null);
+		setPreferredSize(new Dimension(VIEW_WIDTH, 140 * NOTE_HEIGHT));
+
+		// Creates temporary variables
+		MidiEvent note;
+		MooNoteElement elem;
+		int extraHeight = Toolkit.getDefaultToolkit().getScreenSize().height - 150;
+		int x, y, height;
+		int beatsPerSixteenth = Moosique.getSequence().getResolution() / 4;
+		rects = new ArrayList(track.size() / 2);
+
+		// Places 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(this, mn);
+				add(elem);
+
+				// Moves the note element to the appropriate place.
+				x = insets.left;
+				y = insets.top + (int)(mn.getTick() / beatsPerSixteenth) * NOTE_HEIGHT;
+				height = (mn.getDuration() / beatsPerSixteenth) * 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;
+			}
+			setPreferredSize(new Dimension(VIEW_WIDTH, viewLength + extraHeight));
+		}
+		validate();
 
+		// Creates pop-up menu.
 		popup = new JPopupMenu();
 		menuItem = new JMenuItem("Add...");
-		menuItem.addActionListener(this);
+		// menuItem.addActionListener();
 		popup.add(menuItem);
 
-		notePopup = new JPopupMenu();
-		menuItem = new JMenuItem("Preferences...");
-		menuItem.addActionListener(this);
-		notePopup.add(menuItem);
-
-//		notes.addMouseListener(new PopupListener());
-		add(notes, BorderLayout.CENTER);
+		addMouseListener(new PopupListener());
 	}
 
-	public void actionPerformed(ActionEvent e) {}
-
 	public Track getTrack() {
 		return track;
 	}
 
+	private boolean isOccupied(Rectangle r) {
+		Iterator it = rects.iterator();
+		while (it.hasNext()) {
+			if(r.intersects((Rectangle)it.next())) return true;
+		}
+		return false;
+	}
+	
+	public void remove(MooNoteElement elem) {
+		remove((Component)elem);
+		validate();
+	}
+
+	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);
+			}
+		}
+	}
 
 	/** 
 	 * Updates the track view.
@@ -59,86 +109,11 @@ public class MooTrackView extends JPanel implements ActionListener {
 		repaint();
 	}
 
-	class NoteArea extends JPanel {
-		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);
-			setPreferredSize(new Dimension(VIEW_WIDTH, 140 * NOTE_HEIGHT));
-
-			// 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();
-			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() / beatsPerSixteenth) * NOTE_HEIGHT;
-					height = (mn.getDuration() / beatsPerSixteenth) * 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;
-				}
-				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 < 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) {
 			if (e.isPopupTrigger()) {
-				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());
+				popup.show(e.getComponent(), e.getX(), e.getY());
 			}
 		}
 	}
-}
+}
\ No newline at end of file