*** empty log message ***

[moosique.git] / MooTrackView.java

diff --git a/MooTrackView.java b/MooTrackView.java
index 4e4f0027161da12374c71d308f5124438d1bcd3b..0bc564cf1dadf74190bb588ed540b972d558d41a 100644 (file)
--- a/MooTrackView.java
+++ b/MooTrackView.java
@@ -18,6 +18,7 @@ public class MooTrackView extends JPanel implements ActionListener {
        private Rectangle box;
        private JPopupMenu popup;
        private JMenuItem menuItem;
+       
 
        public MooTrackView (Track track) {
                this.track = track;
@@ -50,26 +51,54 @@ public class MooTrackView extends JPanel implements ActionListener {
        public Track getTrack() {
                return track;
        }
+       
+
+       /** 
+        * Updates the track view.
+        */
+       public void update() {
+       
+       }
 
        class NoteArea extends JPanel {
+               public static final int NOTE_SIZE = 25;
+               private int trackLength;
 
                public NoteArea(Track track) {
+                       setLayout(null);
+                       trackLength = 60;
                        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));
+                                       // Adds the note element to the note area.
+                                       MooNote mn = (MooNote)note;
+                                       elem = new MooNoteElement(mn);
+                                       add(elem);
+
+                                       // Places the note element in the appropriate place.
+                                       x = insets.left;
+                                       y = insets.top + (int)(mn.getTick() / 24) * NOTE_SIZE;
+                                       height = NOTE_SIZE;
+                                       // height = (mn.getDuration() / 24) * NOTE_SIZE;
+                                       System.out.println("Comp at: " + x + ", " + y + " is: " + findComponentAt(x + 10, y + 10));
+                                       while(findComponentAt(x, y) instanceof MooNoteElement ||
+                                             findComponentAt(x, y + height - 1) instanceof MooNoteElement) x += NOTE_SIZE;
+                                       elem.setBounds(x, y, NOTE_SIZE, height);
                                }
                        }
-                       validate();
                }
 
                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 < (trackLength*NOTE_SIZE); c += NOTE_SIZE) {
+                               for (int r = 0; r < (10*NOTE_SIZE); r += NOTE_SIZE) {
+                                       box = new Rectangle(r, c, NOTE_SIZE, NOTE_SIZE);
                                        g2.setColor(Color.gray);
                                        g2.draw(box);
                                }
@@ -92,4 +121,4 @@ public class MooTrackView extends JPanel implements ActionListener {
                        }
                }
        }
-}
\ No newline at end of file
+}