inte helt klar

[moosique.git] / MooTrackView.java

diff --git a/MooTrackView.java b/MooTrackView.java
index 168570d28cb62e530e7f46cfbd7577e7b9db833b..4b033c1f4184fe7c8395b7092d4301eb74fdd0b9 100644 (file)
--- a/MooTrackView.java
+++ b/MooTrackView.java
@@ -20,12 +20,14 @@ 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) {
                super(true);
                this.track = track;
 
+               extraHeight = Toolkit.getDefaultToolkit().getScreenSize().height - 150;
                // Configures panel
                setBackground(Color.white);
                setBorder(BorderFactory.createLineBorder(Color.black));
@@ -46,10 +48,12 @@ public class MooTrackView extends JPanel {
                                elem = new MooNoteElement(this, mn);
                                add(elem);
 
-                               layoutElement(elem);
+                               layoutElement(elem,false);
 
                                // Moves the note element to the appropriate place.
                        }
+                       setPreferredSize(new Dimension(VIEW_WIDTH, viewLength + extraHeight));
+
                }
                validate();
 
@@ -62,23 +66,34 @@ public class MooTrackView extends JPanel {
                addMouseListener(new PopupListener());
        }
 
-       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){
+               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 ticksPerSixteenth = 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;
+               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);
                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));
                }
 
        }