Readded the MooKeyboard listener to MooTrackView.

[moosique.git] / MooTrackView.java

diff --git a/MooTrackView.java b/MooTrackView.java
index 168570d28cb62e530e7f46cfbd7577e7b9db833b..854cfec806308b0680360ea5a0f41c1999b4301a 100644 (file)
--- a/MooTrackView.java
+++ b/MooTrackView.java
@@ -20,6 +20,7 @@ public class MooTrackView extends JPanel {
        private JMenuItem menuItem;
        private ArrayList rects;
        protected static int viewLength = 0;
+       protected static int extraHeight = 0;
        public static final int NOTE_HEIGHT = 10, NOTE_WIDTH = 40, VIEW_WIDTH = 200;
 
        public MooTrackView (Track track) {
@@ -36,49 +37,68 @@ public class MooTrackView extends JPanel {
                MidiEvent note;
                MooNoteElement elem;
                rects = new ArrayList(track.size() / 2);
+               extraHeight = Toolkit.getDefaultToolkit().getScreenSize().height - 150;
 
                // Places note elements
                for (int i = 0; i < track.size(); i++) {
                        note = track.get(i);
                        if (note instanceof MooNote) {
-                               // Adds the note element to the note area.
+                               // Adds the note element to the note area and moves it to the appropriate place.
                                MooNote mn = (MooNote)note;
                                elem = new MooNoteElement(this, mn);
                                add(elem);
-
-                               layoutElement(elem);
-
-                               // Moves the note element to the appropriate place.
+                               layoutElement(elem, false);
                        }
+                       setPreferredSize(new Dimension(VIEW_WIDTH, viewLength + extraHeight));
+
                }
                validate();
 
                // Creates pop-up menu.
                popup = new JPopupMenu();
-               menuItem = new JMenuItem("Add...");
+               menuItem = new JMenuItem("Add note...");
                // menuItem.addActionListener();
                popup.add(menuItem);
 
-               addMouseListener(new PopupListener());
+               // Adds listeners for popup menu and keyboard synthesizer.
+               addMouseListener(new MAdapter());
+               addKeyListener(new MooKeyboard());
        }
 
-       public void layoutElement(MooNoteElement elem){
-               int extraHeight = Toolkit.getDefaultToolkit().getScreenSize().height - 150;
-               int beatsPerSixteenth = Moosique.getSequence().getResolution() / 4;
+       public void layoutElement(MooNoteElement elem, boolean old){
+               // If the element is currently in the view, removes its coordinates from the list.
+               Rectangle r = new Rectangle();
+               if (old){
+                       r = elem.getBounds(r);
+                       for (Iterator i = rects.iterator(); i.hasNext();){
+                               Object ob = i.next();
+                               if (r.equals(ob)){
+                                       rects.remove(ob);
+                                       break;
+                               }
+                       }
+               }
+
+               // Creates temporary variables.
+               int ticksPerSixteenth = Moosique.getSequence().getResolution() / 4;
                MooNote mn = elem.getNote();
                Insets insets = getInsets();
                int x, y, height;
+
+               // Calculates coordinates.
                x = insets.left;
-               y = insets.top + (int)(mn.getTick() / beatsPerSixteenth) * NOTE_HEIGHT;
-               height = (mn.getDuration() / beatsPerSixteenth) * NOTE_HEIGHT;
+               y = insets.top + (int)(mn.getTick() / ticksPerSixteenth) * NOTE_HEIGHT;
+               height = (mn.getDuration() / ticksPerSixteenth) * NOTE_HEIGHT;
                if (height == 0) height = NOTE_HEIGHT;
-               Rectangle r = new Rectangle(x, y, NOTE_WIDTH, height);
+               r = new Rectangle(x, y, NOTE_WIDTH, height);
+
+               // Places the element in the appropriate place.
                while(isOccupied(r)) r.translate(NOTE_WIDTH, 0);
                elem.setBounds(r);
                rects.add(r);
                if (viewLength < (y + height)){
                        viewLength = y + height;
-                       setPreferredSize(new Dimension(VIEW_WIDTH, viewLength + extraHeight));
+                       if(old)setPreferredSize(new Dimension(VIEW_WIDTH, viewLength + extraHeight));
                }
 
        }
@@ -122,11 +142,15 @@ public class MooTrackView extends JPanel {
                }
        }
 
-       class PopupListener extends MouseAdapter {
+       class MAdapter extends MouseAdapter {
                public void mousePressed(MouseEvent e) {
                        if (e.isPopupTrigger()) {
                                popup.show(e.getComponent(), e.getX(), e.getY());
                        }
                }
+
+               public void mouseEntered(MouseEvent e) {
+                       // Moosique.setActiveChannel(track.getChannel());
+               }
        }
 }