*** empty log message ***

[moosique.git] / MooTrackView.java

diff --git a/MooTrackView.java b/MooTrackView.java
index fafab990ba77b4fc47f260e40e929f1ee7e06610..12c6babb179d37c2def5d38f40637665b305b9b4 100644 (file)
--- a/MooTrackView.java
+++ b/MooTrackView.java
@@ -61,15 +61,27 @@ public class MooTrackView extends JPanel implements ActionListener {
 
        class NoteArea extends JPanel {
 
+               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) {
-                                       add(new MooNoteElement((MooNote)note));
+                                       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);
                                }
                        }
-                       validate();
                }
 
                public void paintComponent(Graphics g) {
@@ -100,4 +112,4 @@ public class MooTrackView extends JPanel implements ActionListener {
                        }
                }
        }
-}
\ No newline at end of file
+}