.

[moosique.git] / MooTrackView.java

diff --git a/MooTrackView.java b/MooTrackView.java
index dd348fd98e18080327fbf74cfabd20afb0d232cf..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;
@@ -60,11 +61,12 @@ public class MooTrackView extends JPanel implements ActionListener {
        }
 
        class NoteArea extends JPanel {
-
-               public static final int NOTE_SIZE = 20;
+               public static final int NOTE_SIZE = 25;
+               private int trackLength;
 
                public NoteArea(Track track) {
                        setLayout(null);
+                       trackLength = 60;
                        MidiEvent note;
                        MooNoteElement elem;
                        boolean isOccupied;
@@ -81,9 +83,12 @@ public class MooTrackView extends JPanel implements ActionListener {
                                        // Places the note element in 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);
+                                       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);
                                }
                        }
                }
@@ -91,9 +96,9 @@ public class MooTrackView extends JPanel implements ActionListener {
                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);
                                }