X-Git-Url: https://ruin.nu/git/?p=moosique.git;a=blobdiff_plain;f=MooView.java;h=0215b829054c51c50fb6e9f6bb273b6239025db7;hp=4ce6a8288987059901e29a52a98235bf275cd194;hb=e31778837bee5cfbbaf643d17f1eaeb086d8e50c;hpb=2236a670e9f9c0a83c97b9cd4ae8ffaa0a051519 diff --git a/MooView.java b/MooView.java index 4ce6a82..0215b82 100644 --- a/MooView.java +++ b/MooView.java @@ -51,8 +51,9 @@ public class MooView extends JScrollPane { 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); @@ -69,12 +70,11 @@ public class MooView extends JScrollPane { trackPanel.setLayout(gL); for (int i = 1; i < tracks.length; i++) { if (Moosique.shouldBeDrawn(tracks[i])) { - System.out.println("Draws track " + i); - trackPanel.add(new MooTrackView(tracks[i])); - titlePanel.add(new MooTrackTitle(tracks[i],i)); + MooTrackTitle title = new MooTrackTitle(tracks[i]); + titlePanel.add(title); + trackPanel.add(new MooTrackView(tracks[i], title)); progressBar.setValue(i); } else { - System.out.println("Doesn't draw track " + i); gL.setColumns(--numberOfTracks); trackPanel.setLayout(gL); } @@ -100,10 +100,6 @@ public class MooView extends JScrollPane { */ 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); - } } /** @@ -114,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(); }