X-Git-Url: https://ruin.nu/git/?p=moosique.git;a=blobdiff_plain;f=MooView.java;h=d64f8852610d874a4039291e392b3970e1c8a1bd;hp=9ee52b3636abd882686e27658e3f4193c12fd10f;hb=948e069926266ead58bc5466520e131941f2466c;hpb=3895c924f1ebe07d2def43568dce002d9589f821

diff --git a/MooView.java b/MooView.java
index 9ee52b3..d64f885 100644
--- a/MooView.java
+++ b/MooView.java
@@ -2,6 +2,7 @@ import javax.sound.midi.*;
 import javax.swing.*;
 import java.awt.*;
 import java.awt.event.*;
+import java.beans.*;
 
 /**
  * The main view, the container of the track views.
@@ -9,31 +10,26 @@ import java.awt.event.*;
  * @author  Einar Pehrson
  */
 
-public class MooView extends JPanel {
+public class MooView extends JScrollPane {
 
 	private JPanel trackPanel;
 	private JPanel titlePanel;
 	private int numberOfTracks;
-	private JScrollPane trackViews;
-	private JScrollPane trackTitles;
 
 	/** 
 	 * Creates the main view
 	 */
 	public MooView(Track[] tracks) {
-		trackViews = new JScrollPane(JScrollPane.VERTICAL_SCROLLBAR_ALWAYS, JScrollPane.HORIZONTAL_SCROLLBAR_AS_NEEDED);
+		super(JScrollPane.VERTICAL_SCROLLBAR_ALWAYS, JScrollPane.HORIZONTAL_SCROLLBAR_AS_NEEDED);
 		trackPanel = new JPanel(new GridLayout(1,3), true);
-		trackViews.setViewportView(trackPanel);
+		setViewportView(trackPanel);
 
-		trackTitles = new JScrollPane(JScrollPane.VERTICAL_SCROLLBAR_NEVER, JScrollPane.HORIZONTAL_SCROLLBAR_NEVER);
 		titlePanel = new JPanel(new GridLayout(1,3),true);
-		trackTitles.setViewportView(titlePanel);
 
-		numberOfTracks = tracks.length;
+		JViewport columnHeader = new JViewport();
+		columnHeader.setView(titlePanel);
+		setColumnHeaderView(columnHeader);
 		setTracks(tracks);
-		setLayout(new BorderLayout());
-		add(trackTitles, BorderLayout.NORTH);
-		add(trackViews, BorderLayout.CENTER);
 	}
 
 	/** 
@@ -41,10 +37,15 @@ public class MooView extends JPanel {
 	 * @param tracks	the tracks for which to add views
 	 */
 	public void setTracks(Track[] tracks) {
-		if (tracks.length == 1) {
+		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);
@@ -57,26 +58,36 @@ public class MooView extends JPanel {
 			progressDialog.setVisible(true);
 	
 			// Starts filling the track panel with track views, while updating the progress bar.
-			trackPanel.removeAll();
-			trackPanel.setLayout(new GridLayout(1,tracks.length));
+			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();
 		}
+/*		JPanel filler = new JPanel();
+		int totalViewLength = trackPanel.getComponents().length * MooTrackView.VIEW_WIDTH;
+		if (totalViewLength < getWidth()) {
+			System.out.println("Adding filler since width = " + getWidth() + " and tracks = " + totalViewLength);
+			((GridLayout)trackPanel.getLayout()).setColumns(numberOfTracks + 1);
+			filler.setPreferredSize(new Dimension(getWidth() - totalViewLength, 140 * MooTrackView.NOTE_HEIGHT));
+			trackPanel.add(filler);
+			setPreferredSize(new Dimension(getWidth(), getHeight()));
+		}
+*/
 		trackPanel.validate();
-		trackViews.setViewportView(trackPanel);
+		setViewportView(trackPanel);
 	}
 
 	/** 
 	 * Calls on each track view to update itself.
 	 */
-	public void update() {
+	public void update(long tickPosition) {
+		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();
+			if(comps[i] instanceof MooTrackView) ((MooTrackView)comps[i]).update(tickPosition);
 		}
 	}
 
@@ -89,7 +100,7 @@ public class MooView extends JPanel {
 		((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();
 	}