From 0f2604e9aa996db32d296b5e14024ca7e42fb36b Mon Sep 17 00:00:00 2001 From: Michael Andreen Date: Wed, 14 May 2003 12:06:26 +0000 Subject: [PATCH] layout moved to it's own method.. --- MooTrackView.java | 37 +++++++++++++++++++++++-------------- 1 file changed, 23 insertions(+), 14 deletions(-) diff --git a/MooTrackView.java b/MooTrackView.java index f8fe20c..168570d 100644 --- a/MooTrackView.java +++ b/MooTrackView.java @@ -35,13 +35,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) { @@ -50,18 +46,10 @@ public class MooTrackView extends JPanel { elem = new MooNoteElement(this, mn); add(elem); + layoutElement(elem); + // 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(); @@ -74,6 +62,27 @@ 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; + 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; + 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)); + } + + } + public Track getTrack() { return track; } -- 2.39.2