X-Git-Url: https://ruin.nu/git/?a=blobdiff_plain;f=MooTrackView.java;h=96b55f0967c9996bc59f3cb14c3a15f7958fcb22;hb=9a3a74b1814be55eff7d094c57ffa2ab5817933c;hp=0b4618d7a65cce2a875467c19df7421e1d98f7ca;hpb=8de46b00b4e2df79a5b45111bcb981880fca21cf;p=moosique.git

diff --git a/MooTrackView.java b/MooTrackView.java
index 0b4618d..96b55f0 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.
@@ -10,71 +11,135 @@ import javax.sound.midi.*;
  * @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;
+<<<<<<< MooTrackView.java
+	//private Rectangle box2;
+	/** 
+	 * Creates 
+	 */
+	public MooTrackView () {
+=======
 	private JPopupMenu popup;
 	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;
-		//setPreferredSize(new Dimension(200, 9000));
+<<<<<<< MooTrackView.java
+>>>>>>> 1.45
 		setLayout(new BorderLayout());
+<<<<<<< MooTrackView.java
 		this.setBorder(BorderFactory.createLineBorder(Color.black));
-
-		title = new MooTrackTitle(track);
+		add(trackTitle(), BorderLayout.NORTH);
+		add(noteView(), BorderLayout.CENTER);
+		}
+	
+	private JPanel trackTitle () {
+		title = new MooTrackTitle();
+		title.setPreferredSize(new Dimension(PANEL_WIDTH, TITLE_HEIGHT));
 		title.setBorder(BorderFactory.createLineBorder(Color.black));
-		add(title, BorderLayout.NORTH);
+		return title;
+	}
+
+	private JPanel noteView () {
+		notes = new NoteArea();	
+		notes.setBackground(Color.white);
+		notes.setBorder(BorderFactory.createLineBorder(Color.black));	
+		return notes;		
+=======
 
 		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();
+>>>>>>> 1.46
 
+		// Creates pop-up menu.
 		popup = new JPopupMenu();
 		menuItem = new JMenuItem("Add...");
-		menuItem.addActionListener(this);
-		popup.add(menuItem);
-		menuItem = new JMenuItem("Preferences...");
-		menuItem.addActionListener(this);
+		// menuItem.addActionListener();
 		popup.add(menuItem);
 
-		notes.addMouseListener(new PopupListener());
-		add(notes, BorderLayout.CENTER);
+		addMouseListener(new PopupListener());
 	}
 
-	public void actionPerformed(ActionEvent e) {}
-
 	public Track getTrack() {
 		return track;
 	}
-	
+
 
 	/** 
 	 * Updates the track view.
 	 */
-	public void update() {
+	public void update(long tickPosition) {
 		repaint();
+>>>>>>> 1.45
 	}
 
+<<<<<<< MooTrackView.java
 	class NoteArea extends JPanel {
-		public static final int NOTE_HEIGHT = 10;
-		public static final int NOTE_WIDTH = 40;
-		private int trackLength;
+		public static final int NOTE_HEIGHT = 10, NOTE_WIDTH = 40, VIEW_WIDTH = 200;
+		private ArrayList rects;
 
 		public NoteArea(Track track) {
-			System.out.println("Creating track view...");
+			// Configuring panel
+			super(true);
 			setLayout(null);
-			trackLength = 140;
-			setPreferredSize(new Dimension(200,140*NOTE_HEIGHT));
+			setPreferredSize(new Dimension(VIEW_WIDTH, 140 * NOTE_HEIGHT));
+
+			// Creating temporary variables
 			MidiEvent note;
 			MooNoteElement elem;
-			boolean isOccupied;
 			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);
@@ -84,49 +149,95 @@ public class MooTrackView extends JPanel implements ActionListener {
 					elem = new MooNoteElement(mn);
 					add(elem);
 
-					// Places the note element in the appropriate place.
+					// Moves the note element to the appropriate place.
 					x = insets.left;
-					y = insets.top + (int)(mn.getTick() / 24) * NOTE_HEIGHT;
-					height = NOTE_HEIGHT;
-					// height = (mn.getDuration() / 24) * NOTE_HEIGHT;
-					// 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_WIDTH;
-					elem.setBounds(x, y, NOTE_WIDTH, height);
-					if (viewLength < (y+height)) viewLength = y+height;
+					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(200,viewLength));
+				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;
-//(trackLength*NOTE_HEIGHT)
-			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);
+<<<<<<< MooTrackView.java
+			for (int c=0;c<1000;c=c+20) {
+				int r=0;
+				for (r=0;r<200;r=r+20) {
+					box = new Rectangle(r,c,20,20);
 					g2.setColor(Color.gray);
 					g2.draw(box);
 				}
 			}
 		}
 	}
+=======
+	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();
+	}
 
-	class PopupListener extends MouseAdapter {
-		public void mousePressed(MouseEvent e) {
-			maybeShowPopup(e);
+	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);
+			}
 		}
+	}
+>>>>>>> 1.46
 
-		public void mouseReleased(MouseEvent e) {
-			maybeShowPopup(e);
+	private static final int PANEL_WIDTH = 65;
+	private static final int TITLE_HEIGHT = 40;
+	private static final int NOTEVIEW_HEIGHT = 200;
+}
+=======
+			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);
+				}
+			}
 		}
+	}
 
-		private void maybeShowPopup(MouseEvent e) {
+	class PopupListener extends MouseAdapter {
+		public void mousePressed(MouseEvent e) {
 			if (e.isPopupTrigger()) {
 				popup.show(e.getComponent(), e.getX(), e.getY());
 			}
 		}
 	}
+<<<<<<< MooTrackView.java
 }
+>>>>>>> 1.45
+=======
+}>>>>>>> 1.46