*** empty log message ***

[moosique.git] / MooTrackView.java

diff --git a/MooTrackView.java b/MooTrackView.java
index dd348fd98e18080327fbf74cfabd20afb0d232cf..129b0af0e78aa91ba33f9416f8166fb32d19baec 100644 (file)
--- a/MooTrackView.java
+++ b/MooTrackView.java
@@ -2,6 +2,7 @@ import javax.swing.*;
 import java.awt.*;
 import java.awt.event.*;
 import javax.sound.midi.*;
+import java.util.*;
 
 /**
  * Graphical representation of a MIDI track.
@@ -13,21 +14,18 @@ import javax.sound.midi.*;
 public class MooTrackView extends JPanel implements ActionListener {
 
        private Track track;
-       private MooTrackTitle title;
        private NoteArea notes;
        private Rectangle box;
        private JPopupMenu popup;
+       private JPopupMenu notePopup;
        private JMenuItem menuItem;
+       protected static int viewLength = 0;
+       public static final int NOTE_HEIGHT = 10, NOTE_WIDTH = 40, VIEW_WIDTH = 200;
 
        public MooTrackView (Track track) {
+               super(true);
                this.track = track;
-               setPreferredSize(new Dimension(200, 200));
                setLayout(new BorderLayout());
-               this.setBorder(BorderFactory.createLineBorder(Color.black));
-
-               title = new MooTrackTitle(track);
-               title.setBorder(BorderFactory.createLineBorder(Color.black));
-               add(title, BorderLayout.NORTH);
 
                notes = new NoteArea(track);    
                notes.setBackground(Color.white);
@@ -37,11 +35,13 @@ public class MooTrackView extends JPanel implements ActionListener {
                menuItem = new JMenuItem("Add...");
                menuItem.addActionListener(this);
                popup.add(menuItem);
+
+               notePopup = new JPopupMenu();
                menuItem = new JMenuItem("Preferences...");
                menuItem.addActionListener(this);
-               popup.add(menuItem);
+               notePopup.add(menuItem);
 
-               notes.addMouseListener(new PopupListener());
+//             notes.addMouseListener(new PopupListener());
                add(notes, BorderLayout.CENTER);
        }
 
@@ -50,25 +50,33 @@ public class MooTrackView extends JPanel implements ActionListener {
        public Track getTrack() {
                return track;
        }
-       
+
 
        /** 
         * Updates the track view.
         */
-       public void update() {
-       
+       public void update(long tickPosition) {
+               repaint();
        }
 
        class NoteArea extends JPanel {
-
-               public static final int NOTE_SIZE = 20;
+               public static final int NOTE_HEIGHT = 10, NOTE_WIDTH = 40, VIEW_WIDTH = 200;
+               private ArrayList rects;
 
                public NoteArea(Track track) {
+                       // Configuring panel
+                       super(true);
                        setLayout(null);
+                       setPreferredSize(new Dimension(VIEW_WIDTH, 140 * NOTE_HEIGHT));
+
+                       // Creating temporary variables
                        MidiEvent note;
                        MooNoteElement elem;
-                       boolean isOccupied;
                        int x, y, height;
+                       int beatsPerSixteenth = Moosique.getSequence().getResolution() / 4;
+                       rects = new ArrayList(track.size() / 2);
+
+                       // Placing note elements
                        Insets insets = getInsets();
                        for (int i = 0; i < track.size(); i++) {
                                note = track.get(i);
@@ -78,22 +86,36 @@ public class MooTrackView extends JPanel implements ActionListener {
                                        elem = new MooNoteElement(mn);
                                        add(elem);
 
-                                       // Places the note element in the appropriate place.
+                                       // Moves the note element to the appropriate place.
                                        x = insets.left;
-                                       y = insets.top + (int)(mn.getTick() / 24) * NOTE_SIZE;
-                                       height = (mn.getDuration() / 24) * NOTE_SIZE;
-                                       //System.out.println(findComponentAt(x, y) != this);
-                                       elem.setBounds(x, y, NOTE_SIZE, 20);
+                                       y = insets.top + (int)(mn.getTick() / beatsPerSixteenth) * NOTE_HEIGHT;
+                                       height = (mn.getDuration() / beatsPerSixteenth) * NOTE_HEIGHT;
+                                       if (height == 0) height = NOTE_HEIGHT;
+                                       Rectangle r = new Rectangle(x, y, NOTE_WIDTH, height);
+                                       while(isOccupied(r)) r.translate(NOTE_WIDTH, 0);
+                                       elem.setBounds(r);
+                                       rects.add(r);
+                                       if (viewLength < (y + height)) viewLength = y + height;
                                }
+                               setPreferredSize(new Dimension(VIEW_WIDTH, viewLength));
+                       }
+                       validate();
+               }
+               
+               private boolean isOccupied(Rectangle r) {
+                       Iterator it = rects.iterator();
+                       while (it.hasNext()) {
+                               if(r.intersects((Rectangle)it.next())) return true;
                        }
+                       return false;
                }
 
                public void paintComponent(Graphics g) {
                        super.paintComponent(g);
                        Graphics2D g2 = (Graphics2D)g;
-                       for (int c = 0; c < 1000; c += 20) {
-                               for (int r = 0; r < 200; r += 20) {
-                                       box = new Rectangle(r, c, 20, 20);
+                       for (int c = 0; c < viewLength || c < getHeight(); c += NOTE_HEIGHT) {
+                               for (int r = 0; r < (10 * NOTE_WIDTH); r += NOTE_WIDTH) {
+                                       box = new Rectangle(r, c, NOTE_WIDTH, NOTE_HEIGHT);
                                        g2.setColor(Color.gray);
                                        g2.draw(box);
                                }
@@ -112,7 +134,10 @@ public class MooTrackView extends JPanel implements ActionListener {
 
                private void maybeShowPopup(MouseEvent e) {
                        if (e.isPopupTrigger()) {
-                               popup.show(e.getComponent(), e.getX(), e.getY());
+                               if (findComponentAt(e.getX(), e.getY()) instanceof MooNoteElement)
+                                       notePopup.show(e.getComponent(), e.getX(), e.getY());
+                               else
+                                       popup.show(e.getComponent(), e.getX(), e.getY());
                        }
                }
        }