minor changes.

[moosique.git] / MooView.java

diff --git a/MooView.java b/MooView.java
index 5f8c15ea598acc356224cbd0b61897f1a197b6c1..8223eca49e62ff4d28e3c5f3398778ba14fa08d8 100644 (file)
--- a/MooView.java
+++ b/MooView.java
@@ -9,18 +9,32 @@ import java.awt.event.*;
  * @author  Einar Pehrson
  */
 
-public class MooView extends JScrollPane {
+public class MooView extends JPanel {
 
        private JPanel trackPanel;
+       private JPanel titlePanel;
+       private int numberOfTracks;
+       private JScrollPane trackViews;
+       private JScrollPane trackTitles;
 
        /** 
         * Creates the main view
         */
        public MooView(Track[] tracks) {
-               super(VERTICAL_SCROLLBAR_ALWAYS, HORIZONTAL_SCROLLBAR_AS_NEEDED);
+               trackViews = new JScrollPane(JScrollPane.VERTICAL_SCROLLBAR_ALWAYS, JScrollPane.HORIZONTAL_SCROLLBAR_AS_NEEDED);
                trackPanel = new JPanel(new GridLayout(1,3), true);
+               trackViews.setViewportView(trackPanel);
+
+               trackTitles = new JScrollPane(JScrollPane.VERTICAL_SCROLLBAR_NEVER, JScrollPane.HORIZONTAL_SCROLLBAR_NEVER);
+               titlePanel = new JPanel(new GridLayout(1,3),true);
+               trackTitles.setViewportView(titlePanel);
+
+               trackViews.setColumnHeaderView(trackTitles);
+               numberOfTracks = tracks.length;
                setTracks(tracks);
-               setViewportView(trackPanel);
+               setLayout(new BorderLayout());
+               add(trackTitles, BorderLayout.NORTH);
+               add(trackViews, BorderLayout.CENTER);
        }
 
        /** 
@@ -28,13 +42,33 @@ public class MooView extends JScrollPane {
         * @param tracks        the tracks for which to add views
         */
        public void setTracks(Track[] tracks) {
-               trackPanel.removeAll();
-               ((GridLayout)trackPanel.getLayout()).setColumns(tracks.length);
-               for (int i = 0; i < tracks.length; i++) {
-                       trackPanel.add(new MooTrackView(tracks[i]));
+               if (tracks.length == 1) {
+                       // If MIDI file is of type 0, creates a view for the track.
+                       trackPanel.add(new MooTrackView(tracks[0]));
+                       titlePanel.add(new MooTrackTitle(tracks[0]));
+               } else {
+                       // Creates dialog for progress bar.
+                       JDialog progressDialog = new JDialog(Moosique.getGUI(), "Visualizing...", false);
+                       JProgressBar progressBar = new JProgressBar(0, tracks.length);
+                       progressBar.setValue(0);
+                       progressBar.setStringPainted(true);
+                       progressDialog.getContentPane().add(progressBar);
+                       progressDialog.pack();
+                       progressDialog.setLocation((Toolkit.getDefaultToolkit().getScreenSize().width - progressDialog.getWidth()) / 2, (Toolkit.getDefaultToolkit().getScreenSize().height - progressDialog.getHeight()) / 2);
+                       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));
+                       for (int i = 1; i < tracks.length; i++) {
+                               trackPanel.add(new MooTrackView(tracks[i]));
+                               titlePanel.add(new MooTrackTitle(tracks[i]));
+                               progressBar.setValue(i+1);
+                       }
+                       progressDialog.dispose();
                }
                trackPanel.validate();
-               validate();
+               trackViews.setViewportView(trackPanel);
        }
 
        /** 
@@ -43,7 +77,7 @@ public class MooView extends JScrollPane {
        public void update() {
                Component[] comps = getComponents();
                for (int i = 0; i < comps.length; i++) {
-                       ((MooTrackView)comps[i]).update();
+                       if(comps[i] instanceof MooTrackView) ((MooTrackView)comps[i]).update();
                }
        }
 
@@ -53,7 +87,10 @@ public class MooView extends JScrollPane {
         * @param index         the index at which to insert the view
         */
        public void addTrackView(Track track, int index) {
-               add(new MooTrackView(track), index);
+               ((GridLayout)trackPanel.getLayout()).setColumns(++numberOfTracks);
+               ((GridLayout)titlePanel.getLayout()).setColumns(++numberOfTracks);
+               trackPanel.add(new MooTrackView(track), index);
+               titlePanel.add(new MooTrackTitle(track), index);
                validate();
        }
 
@@ -63,6 +100,7 @@ public class MooView extends JScrollPane {
         */
        public void removeTrackView(int index) {
                remove(index);
+               ((GridLayout)trackPanel.getLayout()).setColumns(--numberOfTracks);
                validate();
        }
-}
\ No newline at end of file
+}