*** empty log message ***

[moosique.git] / MooTrackView.java

diff --git a/MooTrackView.java b/MooTrackView.java
index bf6e31f7554872d79baaed367476889b34e51482..12c6babb179d37c2def5d38f40637665b305b9b4 100644 (file)
--- a/MooTrackView.java
+++ b/MooTrackView.java
@@ -29,7 +29,7 @@ public class MooTrackView extends JPanel implements ActionListener {
                title.setBorder(BorderFactory.createLineBorder(Color.black));
                add(title, BorderLayout.NORTH);
 
-               notes = new NoteArea(); 
+               notes = new NoteArea(track);    
                notes.setBackground(Color.white);
                notes.setBorder(BorderFactory.createLineBorder(Color.black));
 
@@ -50,18 +50,45 @@ public class MooTrackView extends JPanel implements ActionListener {
        public Track getTrack() {
                return track;
        }
+       
+
+       /** 
+        * Updates the track view.
+        */
+       public void update() {
+       
+       }
 
        class NoteArea extends JPanel {
-               public void RectanglePanel() {
-                       setPreferredSize(new Dimension(20, 20));
+
+               public static final int NOTE_SIZE = 20;
+
+               public NoteArea(Track track) {
+                       MidiEvent note;
+                       MooNoteElement elem;
+                       boolean isOccupied;
+                       int x, y, height;
+                       Insets insets = getInsets();
+                       for (int i = 0; i < track.size(); i++) {
+                               note = track.get(i);
+                               if (note instanceof MooNote) {
+                                       MooNote mn = (MooNote)note;
+                                       elem = new MooNoteElement(mn);
+                                       add(elem);
+                                       x = insets.left;
+                                       y = insets.top + (int)(mn.getTick() / 24) * NOTE_SIZE;
+                                       height = (mn.getDuration() / 24) * NOTE_SIZE;
+                                       while(findComponentAt(x, y) != this || findComponentAt(x, y + height - 1) != this) x += NOTE_SIZE;
+                                       elem.setBounds(x, y, NOTE_SIZE, height);
+                               }
+                       }
                }
 
                public void paintComponent(Graphics g) {
                        super.paintComponent(g);
                        Graphics2D g2 = (Graphics2D)g;
                        for (int c = 0; c < 1000; c += 20) {
-                               int r=0;
-                               for (r = 0; r < 200; r += 20) {
+                               for (int r = 0; r < 200; r += 20) {
                                        box = new Rectangle(r, c, 20, 20);
                                        g2.setColor(Color.gray);
                                        g2.draw(box);