X-Git-Url: https://ruin.nu/git/?p=moosique.git;a=blobdiff_plain;f=MooTrackView.java;h=8eba152152198159e9d33ab49d3cb4bc4a5d3f31;hp=a9a41d9f127a9c6a8871b5b8515c46cfcd9d1aea;hb=e31778837bee5cfbbaf643d17f1eaeb086d8e50c;hpb=c54c8150061571a2aaf4ea81e027498b6bc248a7

diff --git a/MooTrackView.java b/MooTrackView.java
index a9a41d9..8eba152 100644
--- a/MooTrackView.java
+++ b/MooTrackView.java
@@ -11,140 +11,195 @@ import java.util.*;
  * @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 JMenuItem popupAdd;
+	private ArrayList rects;
+	private Insets insets;
+	private int ticksPerSixteenth, popupY = 0;
 	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) {
+	public MooTrackView (Track track, MooTrackTitle title) {
 		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);
+		this.title = title;
+		insets = getInsets();
+
+		// 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;
+		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));
 
-		notes = new NoteArea(track);	
-		notes.setBackground(Color.white);
-		notes.setBorder(BorderFactory.createLineBorder(Color.black));
+		}
 
+		// 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);
+		PopupListener pList = new PopupListener();
+		popupAdd = new JMenuItem("Add note...");
+		popupAdd.addActionListener(pList);
+		popup.add(popupAdd);
+
+		// 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.
+		ticksPerSixteenth = Moosique.getSequence().getResolution() / 4;
+		MooNote mn = elem.getNote();
+		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));
+		}
+	}
 
+	/** 
+	 * Returns the track of this view.
+	 * @return the track of this view
+	 */
 	public Track getTrack() {
 		return track;
 	}
+
+	/** 
+	 * Returns the title of this view.
+	 * @return the title of this view
+	 */
+	public MooTrackTitle getTitle() {
+		return title;
+	}
+
+	private boolean isOccupied(Rectangle r) {
+		Iterator it = rects.iterator();
+		while (it.hasNext()) {
+			if(r.intersects((Rectangle)it.next())) return true;
+		}
+		return false;
+	}
 	
+	/** 
+	 * Adds the given note to the current track, and visualises it.
+	 * @param mn	the note to add
+	 */
+	public void addNote(MooNote mn) {
+		mn.addTo(track);
+		MooNoteElement elem = new MooNoteElement(this, mn);
+		add(elem);
+		layoutElement(elem, false);
+		setPreferredSize(new Dimension(VIEW_WIDTH, viewLength + extraHeight));
+		repaint();
+	}
 
 	/** 
-	 * Updates the track view.
+	 * Removes the given note element from the view and its note from the current track.
+	 * @param elem	the note element to remove
 	 */
-	public void update() {
+	public void removeNote(MooNoteElement elem) {
+		elem.getNote().removeFrom(track);
+		remove(elem);
+		elem.getNote().removeFrom(track);
 		repaint();
 	}
 
-	class NoteArea extends JPanel {
-		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;
-			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, mn.getDuration() / 24);
-					add(elem);
-
-					// 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;
-					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;
-		}
+	private void addStandardNote() {
+		long timestamp = (long)(ticksPerSixteenth * (popupY - insets.top) / NOTE_HEIGHT);
+		System.out.println(ticksPerSixteenth + ", " + popupY + ", " + insets.top + ", " + timestamp);
+		addNote(new MooNote(title.getChannel(), 60, 100, timestamp, Moosique.getSequence().getResolution() / 4));
+	}
 
-		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) {
-					box = new Rectangle(r, c, NOTE_WIDTH, NOTE_HEIGHT);
-					g2.setColor(Color.gray);
-					g2.draw(box);
-				}
+	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 {
+	class MAdapter extends MouseAdapter {
+		public void mouseClicked(MouseEvent e) {
+			if (e.getClickCount() == 2) {
+				popupY = e.getY();
+				addStandardNote();
+			}
+		}
+	
 		public void mousePressed(MouseEvent e) {
-			maybeShowPopup(e);
+			if (e.isPopupTrigger()) {
+				popupY = e.getY();
+				popup.show(e.getComponent(), e.getX(), e.getY());
+			}
 		}
 
-		public void mouseReleased(MouseEvent e) {
-			maybeShowPopup(e);
+		public void mouseEntered(MouseEvent e) {
+			// Moosique.setActiveChannel(track.getChannel());
+			grabFocus();
 		}
+	}
 
-		private void maybeShowPopup(MouseEvent e) {
-			if (e.isPopupTrigger()) {
-				popup.show(e.getComponent(), e.getX(), e.getY());
+	class PopupListener implements ActionListener {
+		public void actionPerformed(ActionEvent e) {
+			Object source = e.getSource();
+			if  (source == popupAdd) {
+				addStandardNote();
 			}
+			// new MooNote(int channel, int pitch, int velocity, long timestamp, int duration)
 		}
 	}
-}
+}
\ No newline at end of file