*** empty log message ***

[moosique.git] / MooTrackView.java

diff --git a/MooTrackView.java b/MooTrackView.java
index c7850fe65b2eb4aeaed77d5d2f4b96028086641a..129b0af0e78aa91ba33f9416f8166fb32d19baec 100644 (file)
--- a/MooTrackView.java
+++ b/MooTrackView.java
@@ -14,24 +14,18 @@ import java.util.*;
 public class MooTrackView extends JPanel implements ActionListener {
 
        private Track track;
-       private MooTrackTitle title;
        private NoteArea notes;
        private Rectangle box;
        private JPopupMenu popup;
+       private JPopupMenu notePopup;
        private JMenuItem menuItem;
        protected static int viewLength = 0;
-       
+       public static final int NOTE_HEIGHT = 10, NOTE_WIDTH = 40, VIEW_WIDTH = 200;
 
        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);
 
                notes = new NoteArea(track);    
                notes.setBackground(Color.white);
@@ -41,11 +35,13 @@ public class MooTrackView extends JPanel implements ActionListener {
                menuItem = new JMenuItem("Add...");
                menuItem.addActionListener(this);
                popup.add(menuItem);
+
+               notePopup = new JPopupMenu();
                menuItem = new JMenuItem("Preferences...");
                menuItem.addActionListener(this);
-               popup.add(menuItem);
+               notePopup.add(menuItem);
 
-               notes.addMouseListener(new PopupListener());
+//             notes.addMouseListener(new PopupListener());
                add(notes, BorderLayout.CENTER);
        }
 
@@ -54,7 +50,7 @@ public class MooTrackView extends JPanel implements ActionListener {
        public Track getTrack() {
                return track;
        }
-       
+
 
        /** 
         * Updates the track view.
@@ -64,22 +60,20 @@ public class MooTrackView extends JPanel implements ActionListener {
        }
 
        class NoteArea extends JPanel {
-               public static final int NOTE_HEIGHT = 10;
-               public static final int NOTE_WIDTH = 40;
-               private int trackLength;
+               public static final int NOTE_HEIGHT = 10, NOTE_WIDTH = 40, VIEW_WIDTH = 200;
                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(VIEW_WIDTH, 140 * NOTE_HEIGHT));
 
                        // Creating temporary variables
                        MidiEvent note;
                        MooNoteElement elem;
                        int x, y, height;
+                       int beatsPerSixteenth = Moosique.getSequence().getResolution() / 4;
                        rects = new ArrayList(track.size() / 2);
 
                        // Placing note elements
@@ -94,19 +88,16 @@ public class MooTrackView extends JPanel implements ActionListener {
 
                                        // Moves the note element to the appropriate place.
                                        x = insets.left;
-                                       y = insets.top + (int)(mn.getTick() / 24) * NOTE_HEIGHT;
-                                       height = (mn.getDuration() / 24) * NOTE_HEIGHT;
+                                       y = insets.top + (int)(mn.getTick() / beatsPerSixteenth) * NOTE_HEIGHT;
+                                       height = (mn.getDuration() / beatsPerSixteenth) * 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(VIEW_WIDTH, viewLength));
                        }
                        validate();
                }
@@ -122,8 +113,8 @@ public class MooTrackView extends JPanel implements ActionListener {
                public void paintComponent(Graphics g) {
                        super.paintComponent(g);
                        Graphics2D g2 = (Graphics2D)g;
-                       for (int c = 0; c < viewLength ; c += NOTE_HEIGHT) {
-                               for (int r = 0; r < (10*NOTE_WIDTH); r += NOTE_WIDTH) {
+                       for (int c = 0; c < viewLength || c < getHeight(); 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);
@@ -143,7 +134,10 @@ public class MooTrackView extends JPanel implements ActionListener {
 
                private void maybeShowPopup(MouseEvent e) {
                        if (e.isPopupTrigger()) {
-                               popup.show(e.getComponent(), e.getX(), e.getY());
+                               if (findComponentAt(e.getX(), e.getY()) instanceof MooNoteElement)
+                                       notePopup.show(e.getComponent(), e.getX(), e.getY());
+                               else
+                                       popup.show(e.getComponent(), e.getX(), e.getY());
                        }
                }
        }