no message

[moosique.git] / MooTrackView.java

diff --git a/MooTrackView.java b/MooTrackView.java
index 0bc564cf1dadf74190bb588ed540b972d558d41a..1b090ffcf89689d373ecf0fc3f7c3d29edcb9222 100644 (file)
--- a/MooTrackView.java
+++ b/MooTrackView.java
@@ -18,11 +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));
 
@@ -57,20 +58,26 @@ 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 = 25;
+               public static final int NOTE_HEIGHT = 10;
+               public static final int NOTE_WIDTH = 40;
                private int trackLength;
 
                public NoteArea(Track track) {
+                       // Configuring panel
                        setLayout(null);
-                       trackLength = 60;
+                       trackLength = 140;
+                       setPreferredSize(new Dimension(200, 140 * NOTE_HEIGHT));
+
+                       // Temporary variables
                        MidiEvent note;
                        MooNoteElement elem;
-                       boolean isOccupied;
                        int x, y, height;
+
+                       // Placing note elements
                        Insets insets = getInsets();
                        for (int i = 0; i < track.size(); i++) {
                                note = track.get(i);
@@ -80,25 +87,27 @@ public class MooTrackView extends JPanel implements ActionListener {
                                        elem = new MooNoteElement(mn);
                                        add(elem);
 
-                                       // Places the note element in the appropriate place.
+                                       // Moves the note element to 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));
+                                       y = insets.top + (int)(mn.getTick() / 24) * NOTE_HEIGHT;
+                                       height = (mn.getDuration() / 24) * NOTE_HEIGHT;
+                                       if (height == 0) height = NOTE_HEIGHT;
                                        while(findComponentAt(x, y) instanceof MooNoteElement ||
-                                             findComponentAt(x, y + height - 1) instanceof MooNoteElement) x += NOTE_SIZE;
-                                       elem.setBounds(x, y, NOTE_SIZE, height);
+                                             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 < (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);
+                       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);
                                }
@@ -121,4 +130,4 @@ public class MooTrackView extends JPanel implements ActionListener {
                        }
                }
        }
-}
+}
\ No newline at end of file