X-Git-Url: https://ruin.nu/git/?p=moosique.git;a=blobdiff_plain;f=MooView.java;h=0215b829054c51c50fb6e9f6bb273b6239025db7;hp=a5ceea42b9f5646924d9004b4caeab0d6a9eacd3;hb=d564984e345995ca352c4f5eee3296c6e02010de;hpb=2ee5615787c8377a17a91158ea18adbae1aa74c2

diff --git a/MooView.java b/MooView.java
index a5ceea4..0215b82 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;
 
 	/** 
@@ -23,12 +24,18 @@ public class MooView extends JScrollPane {
 		super(JScrollPane.VERTICAL_SCROLLBAR_ALWAYS, JScrollPane.HORIZONTAL_SCROLLBAR_AS_NEEDED);
 		trackPanel = new JPanel(new GridLayout(1,3), true);
 		setViewportView(trackPanel);
+		getViewport().setScrollMode(JViewport.BACKINGSTORE_SCROLL_MODE);
 
 		titlePanel = new JPanel(new GridLayout(1,3),true);
-
 		JViewport columnHeader = new JViewport();
 		columnHeader.setView(titlePanel);
 		setColumnHeaderView(columnHeader);
+
+		viewCounter = new MooViewCounter(null);
+		JViewport rowHeader = new JViewport();
+		rowHeader.setView(viewCounter);
+		setRowHeaderView(rowHeader);
+
 		setTracks(tracks);
 	}
 
@@ -37,14 +44,16 @@ 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],0));
+			MooTrackTitle title = new MooTrackTitle(tracks[0]);
+			titlePanel.add(title);
+			trackPanel.add(new MooTrackView(tracks[0], title));
 		} else {
 			// Creates dialog for progress bar.
 			JDialog progressDialog = new JDialog(Moosique.getGUI(), "Visualizing...", false);
@@ -57,11 +66,18 @@ public class MooView extends JScrollPane {
 			progressDialog.setVisible(true);
 	
 			// Starts filling the track panel with track views, while updating the progress bar.
-			trackPanel.setLayout(new GridLayout(1,numberOfTracks));
+			GridLayout gL = new GridLayout(1,numberOfTracks);
+			trackPanel.setLayout(gL);
 			for (int i = 1; i < tracks.length; i++) {
-				trackPanel.add(new MooTrackView(tracks[i]));
-				titlePanel.add(new MooTrackTitle(tracks[i],i));
-				progressBar.setValue(i+1);
+				if (Moosique.shouldBeDrawn(tracks[i])) {
+					MooTrackTitle title = new MooTrackTitle(tracks[i]);
+					titlePanel.add(title);
+					trackPanel.add(new MooTrackView(tracks[i], title));
+					progressBar.setValue(i);
+				} else {
+					gL.setColumns(--numberOfTracks);
+					trackPanel.setLayout(gL);
+				}
 			}
 			progressDialog.dispose();
 		}
@@ -83,11 +99,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));
-		Component[] comps = getComponents();
-		for (int i = 0; i < comps.length; i++) {
-			if(comps[i] instanceof MooTrackView) ((MooTrackView)comps[i]).update(tickPosition);
-		}
+		getViewport().setViewPosition(new Point((int)getViewport().getViewPosition().getX(), (int)(tickPosition / (Moosique.getSequence().getResolution() / 4)) * MooTrackView.NOTE_HEIGHT));
 	}
 
 	/** 
@@ -98,8 +110,9 @@ public class MooView extends JScrollPane {
 	public void addTrackView(Track track, int index) {
 		((GridLayout)trackPanel.getLayout()).setColumns(++numberOfTracks);
 		((GridLayout)titlePanel.getLayout()).setColumns(++numberOfTracks);
-		trackPanel.add(new MooTrackView(track), index);
-		titlePanel.add(new MooTrackTitle(track,index), index);
+		MooTrackTitle title = new MooTrackTitle(track);
+		titlePanel.add(title, index);
+		trackPanel.add(new MooTrackView(track, title), index);
 		validate();
 	}