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

diff --git a/MooTrackView.java b/MooTrackView.java
index abf79ca..96b55f0 100644
--- a/MooTrackView.java
+++ b/MooTrackView.java
@@ -1,25 +1,40 @@
 import javax.swing.*;
-import java.awt.event.*;
 import java.awt.*;
+import java.awt.event.*;
+import javax.sound.midi.*;
+import java.util.*;
 
 /**
  * Graphical representation of a MIDI track.
  * 
- * @author  Andersson, Andreen, Lanneskog, Pehrson
+ * @author  Andersson , Andreen, Lanneskog, Pehrson
  * @version 1
  */
- 
+
 public class MooTrackView extends JPanel {
 
-	private MooTrackTitle title;
-	private NoteArea notes;
+	private Track track;
 	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;
+<<<<<<< MooTrackView.java
+>>>>>>> 1.45
 		setLayout(new BorderLayout());
+<<<<<<< MooTrackView.java
 		this.setBorder(BorderFactory.createLineBorder(Color.black));
 		add(trackTitle(), BorderLayout.NORTH);
 		add(noteView(), BorderLayout.CENTER);
@@ -37,16 +52,131 @@ public class MooTrackView extends JPanel {
 		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();
+		popup.add(menuItem);
+
+		addMouseListener(new PopupListener());
 	}
-	
+
+	public Track getTrack() {
+		return track;
+	}
+
+
+	/** 
+	 * Updates the track view.
+	 */
+	public void update(long tickPosition) {
+		repaint();
+>>>>>>> 1.45
+	}
+
+<<<<<<< MooTrackView.java
 	class NoteArea extends JPanel {
-		public void RectanglePanel() {
-			setPreferredSize(new Dimension(20, 20));
+		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;
+<<<<<<< MooTrackView.java
 			for (int c=0;c<1000;c=c+20) {
 				int r=0;
 				for (r=0;r<200;r=r+20) {
@@ -57,8 +187,57 @@ public class MooTrackView extends JPanel {
 			}
 		}
 	}
+=======
+	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);
+			}
+		}
+	}
+>>>>>>> 1.46
 
 	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);
+				}
+			}
+		}
+	}
+
+	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