no message

[moosique.git] / MooTrackView.java

diff --git a/MooTrackView.java b/MooTrackView.java
index dd348fd98e18080327fbf74cfabd20afb0d232cf..16d396f2e0a845053e83843e51707dceed42f862 100644 (file)
--- a/MooTrackView.java
+++ b/MooTrackView.java
@@ -18,10 +18,12 @@ public class MooTrackView extends JPanel implements ActionListener {
        private Rectangle box;
        private JPopupMenu popup;
        private JMenuItem menuItem;
+       protected static int viewLength = 0;
+       
 
        public MooTrackView (Track track) {
                this.track = track;
-               setPreferredSize(new Dimension(200, 200));
+               //setPreferredSize(new Dimension(200, 9000));
                setLayout(new BorderLayout());
                this.setBorder(BorderFactory.createLineBorder(Color.black));
 
@@ -56,15 +58,18 @@ public class MooTrackView extends JPanel implements ActionListener {
         * Updates the track view.
         */
        public void update() {
-       
+               repaint();
        }
 
        class NoteArea extends JPanel {
-
-               public static final int NOTE_SIZE = 20;
+               public static final int NOTE_HEIGHT = 10;
+               public static final int NOTE_WIDTH = 40;
+               private int trackLength;
 
                public NoteArea(Track track) {
                        setLayout(null);
+                       trackLength = 140;
+                       setPreferredSize(new Dimension(200,140*NOTE_HEIGHT));
                        MidiEvent note;
                        MooNoteElement elem;
                        boolean isOccupied;
@@ -80,20 +85,26 @@ 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);
+                                       y = insets.top + (int)(mn.getTick() / 24) * NOTE_HEIGHT;
+                                       height = NOTE_HEIGHT;
+                                       // height = (mn.getDuration() / 24) * NOTE_HEIGHT;
+                                       while(findComponentAt(x, y) instanceof MooNoteElement ||
+                                             findComponentAt(x, y + height - 1) instanceof MooNoteElement) x += NOTE_WIDTH;
+                                       elem.setBounds(x, y, NOTE_WIDTH, height);
+                                       if (viewLength < (y+height)) viewLength = y+height;
                                }
+                               setPreferredSize(new Dimension(200,viewLength));
                        }
+                       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);
+//(trackLength*NOTE_HEIGHT)
+                       for (int c = 0; c < viewLength ; 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);
                                }