no message

[moosique.git] / MooTrackView.java

diff --git a/MooTrackView.java b/MooTrackView.java
index 16d396f2e0a845053e83843e51707dceed42f862..81384425b7289063262d4968546aab0033cdfb6b 100644 (file)
--- a/MooTrackView.java
+++ b/MooTrackView.java
@@ -2,6 +2,7 @@ import javax.swing.*;
 import java.awt.*;
 import java.awt.event.*;
 import javax.sound.midi.*;
+import java.util.*;
 
 /**
  * Graphical representation of a MIDI track.
@@ -22,14 +23,15 @@ public class MooTrackView extends JPanel implements ActionListener {
        
 
        public MooTrackView (Track track) {
+               super(true);
                this.track = track;
                //setPreferredSize(new Dimension(200, 9000));
                setLayout(new BorderLayout());
                this.setBorder(BorderFactory.createLineBorder(Color.black));
 
-               title = new MooTrackTitle(track);
-               title.setBorder(BorderFactory.createLineBorder(Color.black));
-               add(title, BorderLayout.NORTH);
+               //title = new MooTrackTitle(track);
+               //title.setBorder(BorderFactory.createLineBorder(Color.black));
+               //add(title, BorderLayout.NORTH);
 
                notes = new NoteArea(track);    
                notes.setBackground(Color.white);
@@ -65,15 +67,22 @@ public class MooTrackView extends JPanel implements ActionListener {
                public static final int NOTE_HEIGHT = 10;
                public static final int NOTE_WIDTH = 40;
                private int trackLength;
+               private ArrayList rects;
 
                public NoteArea(Track track) {
+                       // Configuring panel
+                       super(true);
                        setLayout(null);
                        trackLength = 140;
-                       setPreferredSize(new Dimension(200,140*NOTE_HEIGHT));
+                       setPreferredSize(new Dimension(200, 140 * NOTE_HEIGHT));
+
+                       // Creating temporary variables
                        MidiEvent note;
                        MooNoteElement elem;
-                       boolean isOccupied;
                        int x, y, height;
+                       rects = new ArrayList(track.size() / 2);
+
+                       // Placing note elements
                        Insets insets = getInsets();
                        for (int i = 0; i < track.size(); i++) {
                                note = track.get(i);
@@ -83,25 +92,36 @@ 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_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;
+                                       height = (mn.getDuration() / 24) * NOTE_HEIGHT;
+                                       if (height == 0) height = NOTE_HEIGHT;
+                                       Rectangle r = new Rectangle(x, y, NOTE_WIDTH, height);
+                                       while(isOccupied(r)) r.translate(NOTE_WIDTH, 0);
+                                       elem.setBounds(r);
+                                       rects.add(r);
+                                       if (viewLength < (y + height)) viewLength = y + height;
+
+                                       // while(findComponentAt(x, y) instanceof MooNoteElement ||
+                                       //       findComponentAt(x, y + height - 1) instanceof MooNoteElement) x += NOTE_WIDTH;
                                }
-                               setPreferredSize(new Dimension(200,viewLength));
+                               setPreferredSize(new Dimension(200, viewLength));
                        }
                        validate();
                }
+               
+               private boolean isOccupied(Rectangle r) {
+                       Iterator it = rects.iterator();
+                       while (it.hasNext()) {
+                               if(r.intersects((Rectangle)it.next())) return true;
+                       }
+                       return false;
+               }
 
                public void paintComponent(Graphics g) {
                        super.paintComponent(g);
                        Graphics2D g2 = (Graphics2D)g;
-//(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);