removed some stuff

[moosique.git] / MooTrackView.java

diff --git a/MooTrackView.java b/MooTrackView.java
index c058cc5e01ec881e0922a5b67c951dcc47967683..7b9decfc393446a76a87541409f44b35cd084d00 100644 (file)
--- a/MooTrackView.java
+++ b/MooTrackView.java
@@ -15,16 +15,19 @@ public class MooTrackView extends JPanel {
 
        private Track track;
        private Rectangle box;
+
        private JPopupMenu popup;
        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) {
                super(true);
                this.track = track;
 
+               extraHeight = Toolkit.getDefaultToolkit().getScreenSize().height - 150;
                // Configures panel
                setBackground(Color.white);
                setBorder(BorderFactory.createLineBorder(Color.black));
@@ -34,13 +37,9 @@ public class MooTrackView extends JPanel {
                // Creates temporary variables
                MidiEvent note;
                MooNoteElement elem;
-               int extraHeight = Toolkit.getDefaultToolkit().getScreenSize().height - 150;
-               int x, y, height;
-               int beatsPerSixteenth = Moosique.getSequence().getResolution() / 4;
                rects = new ArrayList(track.size() / 2);
 
                // Places note elements
-               Insets insets = getInsets();
                for (int i = 0; i < track.size(); i++) {
                        note = track.get(i);
                        if (note instanceof MooNote) {
@@ -49,18 +48,12 @@ public class MooTrackView extends JPanel {
                                elem = new MooNoteElement(this, mn);
                                add(elem);
 
+                               layoutElement(elem,false);
+
                                // Moves the note element to the appropriate place.
-                               x = insets.left;
-                               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;
                        }
                        setPreferredSize(new Dimension(VIEW_WIDTH, viewLength + extraHeight));
+
                }
                validate();
 
@@ -73,10 +66,50 @@ public class MooTrackView extends JPanel {
                addMouseListener(new PopupListener());
        }
 
+       public void layoutElement(MooNoteElement elem, boolean old){
+               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;
+                               }
+                       }
+               }
+
+               int beatsPerSixteenth = Moosique.getSequence().getResolution() / 4;
+               MooNote mn = elem.getNote();
+               Insets insets = getInsets();
+               int x, y, height;
+               x = insets.left;
+               y = insets.top + (int)(mn.getTick() / beatsPerSixteenth) * NOTE_HEIGHT;
+               height = (mn.getDuration() / beatsPerSixteenth) * NOTE_HEIGHT;
+               if (height == 0) height = NOTE_HEIGHT;
+               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;
+                       if(old)setPreferredSize(new Dimension(VIEW_WIDTH, viewLength + extraHeight));
+               }
+
+       }
+
        public Track getTrack() {
                return track;
        }
 
+
+       /** 
+        * Updates the track view.
+        */
+       public void update(long tickPosition) {
+               repaint();
+       }
+
        private boolean isOccupied(Rectangle r) {
                Iterator it = rects.iterator();
                while (it.hasNext()) {
@@ -87,7 +120,9 @@ public class MooTrackView extends JPanel {
        
        public void remove(MooNoteElement elem) {
                remove((Component)elem);
+               elem.getNote().removeFrom(track);
                validate();
+               repaint();
        }
 
        public void paintComponent(Graphics g) {
@@ -102,13 +137,6 @@ public class MooTrackView extends JPanel {
                }
        }
 
-       /** 
-        * Updates the track view.
-        */
-       public void update(long tickPosition) {
-               repaint();
-       }
-
        class PopupListener extends MouseAdapter {
                public void mousePressed(MouseEvent e) {
                        if (e.isPopupTrigger()) {
@@ -116,4 +144,4 @@ public class MooTrackView extends JPanel {
                        }
                }
        }
-}
\ No newline at end of file
+}