inte helt klar

[moosique.git] / MooView.java

diff --git a/MooView.java b/MooView.java
index 3323540b55ae4cda0af8ac21659730ecd64a4bae..d64f8852610d874a4039291e392b3970e1c8a1bd 100644 (file)
--- a/MooView.java
+++ b/MooView.java
@@ -29,7 +29,6 @@ public class MooView extends JScrollPane {
                JViewport columnHeader = new JViewport();
                columnHeader.setView(titlePanel);
                setColumnHeaderView(columnHeader);
-               numberOfTracks = tracks.length;
                setTracks(tracks);
        }
 
@@ -38,10 +37,15 @@ public class MooView extends JScrollPane {
         * @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);
@@ -54,15 +58,24 @@ 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,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();
                setViewportView(trackPanel);
        }
@@ -71,6 +84,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 / (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);
@@ -86,7 +100,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();
        }