X-Git-Url: https://ruin.nu/git/?a=blobdiff_plain;f=MooTrackView.java;h=7b9decfc393446a76a87541409f44b35cd084d00;hb=202c33e20594aa60904a90e827b3a4a22fb4aa30;hp=96b55f0967c9996bc59f3cb14c3a15f7958fcb22;hpb=9a3a74b1814be55eff7d094c57ffa2ab5817933c;p=moosique.git diff --git a/MooTrackView.java b/MooTrackView.java index 96b55f0..7b9decf 100644 --- a/MooTrackView.java +++ b/MooTrackView.java @@ -15,50 +15,19 @@ public class MooTrackView extends JPanel { private Track track; private Rectangle box; -<<<<<<< MooTrackView.java - //private Rectangle box2; - /** - * Creates - */ - public MooTrackView () { -======= + 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; -<<<<<<< MooTrackView.java ->>>>>>> 1.45 - setLayout(new BorderLayout()); -<<<<<<< MooTrackView.java - this.setBorder(BorderFactory.createLineBorder(Color.black)); - add(trackTitle(), BorderLayout.NORTH); - add(noteView(), BorderLayout.CENTER); - } - - private JPanel trackTitle () { - title = new MooTrackTitle(); - title.setPreferredSize(new Dimension(PANEL_WIDTH, TITLE_HEIGHT)); - title.setBorder(BorderFactory.createLineBorder(Color.black)); - return title; - } - - private JPanel noteView () { - notes = new NoteArea(); - notes.setBackground(Color.white); - notes.setBorder(BorderFactory.createLineBorder(Color.black)); - return notes; -======= - - notes = new NoteArea(track); - notes.setBackground(Color.white); - notes.setBorder(BorderFactory.createLineBorder(Color.black)); -======= + extraHeight = Toolkit.getDefaultToolkit().getScreenSize().height - 150; // Configures panel setBackground(Color.white); setBorder(BorderFactory.createLineBorder(Color.black)); @@ -68,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) { @@ -83,21 +48,14 @@ 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(); ->>>>>>> 1.46 // Creates pop-up menu. popup = new JPopupMenu(); @@ -108,6 +66,38 @@ 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; } @@ -118,76 +108,8 @@ public class MooTrackView extends JPanel { */ public void update(long tickPosition) { repaint(); ->>>>>>> 1.45 } -<<<<<<< MooTrackView.java - class NoteArea extends JPanel { - public static final int NOTE_HEIGHT = 10, NOTE_WIDTH = 40, VIEW_WIDTH = 200; - private ArrayList rects; - - public NoteArea(Track track) { - // Configuring panel - super(true); - setLayout(null); - setPreferredSize(new Dimension(VIEW_WIDTH, 140 * NOTE_HEIGHT)); - - // Creating temporary variables - MidiEvent note; - MooNoteElement elem; - int x, y, height; - int beatsPerSixteenth = Moosique.getSequence().getResolution() / 4; - rects = new ArrayList(track.size() / 2); - - // Placing note elements - Insets insets = getInsets(); - for (int i = 0; i < track.size(); i++) { - note = track.get(i); - if (note instanceof MooNote) { - // Adds the note element to the note area. - MooNote mn = (MooNote)note; - elem = new MooNoteElement(mn); - add(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)); - } - validate(); - } - - private boolean isOccupied(Rectangle r) { - Iterator it = rects.iterator(); - while (it.hasNext()) { - if(r.intersects((Rectangle)it.next())) return true; - } - return false; - } - - public void paintComponent(Graphics g) { - super.paintComponent(g); - Graphics2D g2 = (Graphics2D)g; -<<<<<<< MooTrackView.java - for (int c=0;c<1000;c=c+20) { - int r=0; - for (r=0;r<200;r=r+20) { - box = new Rectangle(r,c,20,20); - g2.setColor(Color.gray); - g2.draw(box); - } - } - } - } -======= private boolean isOccupied(Rectangle r) { Iterator it = rects.iterator(); while (it.hasNext()) { @@ -198,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) { @@ -212,22 +136,6 @@ public class MooTrackView extends JPanel { } } } ->>>>>>> 1.46 - - private static final int PANEL_WIDTH = 65; - private static final int TITLE_HEIGHT = 40; - private static final int NOTEVIEW_HEIGHT = 200; -} -======= - for (int c = 0; c < viewLength || c < getHeight(); c += NOTE_HEIGHT) { - for (int r = 0; r < (10 * NOTE_WIDTH); r += NOTE_WIDTH) { - box = new Rectangle(r, c, NOTE_WIDTH, NOTE_HEIGHT); - g2.setColor(Color.gray); - g2.draw(box); - } - } - } - } class PopupListener extends MouseAdapter { public void mousePressed(MouseEvent e) { @@ -236,8 +144,4 @@ public class MooTrackView extends JPanel { } } } -<<<<<<< MooTrackView.java } ->>>>>>> 1.45 -======= -}>>>>>>> 1.46