X-Git-Url: https://ruin.nu/git/?a=blobdiff_plain;f=MooView.java;h=1d15f2c8918fedfb1240e3051940fa67263568f6;hb=2875ce498e9bf83ed635156599dd29a3c3b379de;hp=2defbc6fb50d3641263269134bbe446bc49d6e68;hpb=fb491f02df0fa9cf8e7fb8511885e51e5660a21d;p=moosique.git

diff --git a/MooView.java b/MooView.java
index 2defbc6..1d15f2c 100644
--- a/MooView.java
+++ b/MooView.java
@@ -14,6 +14,7 @@ public class MooView extends JScrollPane {
 
 	private JPanel trackPanel;
 	private JPanel titlePanel;
+	private MooViewCounter viewCounter;
 	private int numberOfTracks;
 
 	/** 
@@ -25,10 +26,15 @@ public class MooView extends JScrollPane {
 		setViewportView(trackPanel);
 
 		titlePanel = new JPanel(new GridLayout(1,3),true);
-
 		JViewport columnHeader = new JViewport();
 		columnHeader.setView(titlePanel);
 		setColumnHeaderView(columnHeader);
+
+		viewCounter = new MooViewCounter(4, 4);
+		JViewport rowHeader = new JViewport();
+		rowHeader.setView(viewCounter);
+		setRowHeaderView(rowHeader);
+
 		setTracks(tracks);
 	}
 
@@ -37,11 +43,15 @@ public class MooView extends JScrollPane {
 	 * @param tracks	the tracks for which to add views
 	 */
 	public void setTracks(Track[] tracks) {
+		setDoubleBuffered(true);
 		numberOfTracks = tracks.length;
+		trackPanel.removeAll();
+		titlePanel.removeAll();
 		if (numberOfTracks == 1) {
 			// If MIDI file is of type 0, creates a view for the track.
+			trackPanel.setLayout(new FlowLayout());
 			trackPanel.add(new MooTrackView(tracks[0]));
-			titlePanel.add(new MooTrackTitle(tracks[0]));
+			titlePanel.add(new MooTrackTitle(tracks[0],0));
 		} else {
 			// Creates dialog for progress bar.
 			JDialog progressDialog = new JDialog(Moosique.getGUI(), "Visualizing...", false);
@@ -54,12 +64,11 @@ public class MooView extends JScrollPane {
 			progressDialog.setVisible(true);
 	
 			// Starts filling the track panel with track views, while updating the progress bar.
-			trackPanel.removeAll();
 			trackPanel.setLayout(new GridLayout(1,numberOfTracks));
 			for (int i = 1; i < tracks.length; i++) {
 				trackPanel.add(new MooTrackView(tracks[i]));
-				titlePanel.add(new MooTrackTitle(tracks[i]));
-				progressBar.setValue(i+1);
+				titlePanel.add(new MooTrackTitle(tracks[i],i));
+				progressBar.setValue(i);
 			}
 			progressDialog.dispose();
 		}
@@ -81,7 +90,7 @@ public class MooView extends JScrollPane {
 	 * Calls on each track view to update itself.
 	 */
 	public void update(long tickPosition) {
-		getViewport().setViewPosition(new Point((int)getViewport().getViewPosition().getX(), (int)(tickPosition / 24) * MooTrackView.NOTE_HEIGHT));
+		getViewport().setViewPosition(new Point((int)getViewport().getViewPosition().getX(), (int)(tickPosition / (Moosique.getSequence().getResolution() / 4)) * MooTrackView.NOTE_HEIGHT));
 		Component[] comps = getComponents();
 		for (int i = 0; i < comps.length; i++) {
 			if(comps[i] instanceof MooTrackView) ((MooTrackView)comps[i]).update(tickPosition);
@@ -97,7 +106,7 @@ public class MooView extends JScrollPane {
 		((GridLayout)trackPanel.getLayout()).setColumns(++numberOfTracks);
 		((GridLayout)titlePanel.getLayout()).setColumns(++numberOfTracks);
 		trackPanel.add(new MooTrackView(track), index);
-		titlePanel.add(new MooTrackTitle(track), index);
+		titlePanel.add(new MooTrackTitle(track,index), index);
 		validate();
 	}