X-Git-Url: https://ruin.nu/git/?a=blobdiff_plain;f=MooTrackView.java;h=8827f3187b89a6ef299f29aa11339ed4d189a651;hb=ce9a16d679f2058454af367e972888ba8e2c34c0;hp=b06355430b125be17116ef370a5c26a761f55563;hpb=cb597eafcb8d01784857381580ae5f35b5427e63;p=moosique.git diff --git a/MooTrackView.java b/MooTrackView.java index b063554..8827f31 100644 --- a/MooTrackView.java +++ b/MooTrackView.java @@ -14,6 +14,7 @@ import java.util.*; public class MooTrackView extends JPanel { private Track track; + private MooTrackTitle title; private Rectangle box; private JPopupMenu popup; @@ -23,9 +24,10 @@ public class MooTrackView extends JPanel { protected static int extraHeight = 0; public static final int NOTE_HEIGHT = 10, NOTE_WIDTH = 40, VIEW_WIDTH = 200; - public MooTrackView (Track track) { + public MooTrackView (Track track, MooTrackTitle title) { super(true); this.track = track; + this.title = title; // Configures panel setBackground(Color.white); @@ -52,7 +54,6 @@ public class MooTrackView extends JPanel { setPreferredSize(new Dimension(VIEW_WIDTH, viewLength + extraHeight)); } - validate(); // Creates pop-up menu. popup = new JPopupMenu(); @@ -66,7 +67,7 @@ public class MooTrackView extends JPanel { addKeyListener(new MooKeyboard()); } - public void layoutElementMooNoteElement elem, boolean old){ + 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){ @@ -101,7 +102,6 @@ public class MooTrackView extends JPanel { viewLength = y + height; if(old)setPreferredSize(new Dimension(VIEW_WIDTH, viewLength + extraHeight)); } - } public Track getTrack() { @@ -130,13 +130,13 @@ public class MooTrackView extends JPanel { add(elem); layoutElement(elem, false); setPreferredSize(new Dimension(VIEW_WIDTH, viewLength + extraHeight)); + repaint(); } public void removeNote(MooNoteElement elem, MooNote mn) { mn.removeFrom(track); remove(elem); elem.getNote().removeFrom(track); - validate(); repaint(); } @@ -169,8 +169,9 @@ public class MooTrackView extends JPanel { public void actionPerformed(ActionEvent e) { Object source = e.getSource(); if (source == popupAdd) { - addNote(new MooNote()); + //addNote(new MooNote()); // int channel, int pitch, int velocity, long timestamp, int duration + } } } } \ No newline at end of file