X-Git-Url: https://ruin.nu/git/?a=blobdiff_plain;f=MooTrackView.java;h=c1d8b5878cdb66b4f4b0d1ceef38a3f62c499f83;hb=4526e51b70110f7272b0c2a3a5f207657d690029;hp=f2afcaae2be4e18373b97a3250d4cfe5ce7b29e0;hpb=a8b0b5e27d120df964c5b6d8554a6207951b00d0;p=moosique.git diff --git a/MooTrackView.java b/MooTrackView.java index f2afcaa..c1d8b58 100644 --- a/MooTrackView.java +++ b/MooTrackView.java @@ -19,13 +19,14 @@ public class MooTrackView extends JPanel { private JPopupMenu popup, selPopup; private JMenu selPopupTranspUp, selPopupTranspDown; - private JMenuItem popupAdd; - private JMenuItem selPopupRemove, selPopupTranspUpOct, selPopupTranspDownOct; + private JMenuItem popupAdd, popupPaste; + private JMenuItem selPopupCopy, selPopupCut, selPopupRemove, selPopupTranspUpOct, selPopupTranspDownOct; - private ArrayList rects; - private ArrayList selected; + private ArrayList coords, copyBuffer; + private TreeSet selection; private Insets insets; private int ticksPerSixteenth, popupY = 0; + private boolean leftMouseButtonPressed = false; protected static int viewLength = 0; protected static int extraHeight = 0; public static final int NOTE_HEIGHT = 10, NOTE_WIDTH = 40, VIEW_WIDTH = 200; @@ -39,8 +40,17 @@ public class MooTrackView extends JPanel { super(true); this.track = track; this.title = title; + + // Creates instance variables insets = getInsets(); - selected = new ArrayList(); + coords = new ArrayList(track.size() / 2); + selection = new TreeSet(); + copyBuffer = new ArrayList(); + + // Creates temporary variables + MidiEvent note; + MooNoteElement elem; + extraHeight = Toolkit.getDefaultToolkit().getScreenSize().height - 150; // Configures panel setBackground(Color.white); @@ -48,12 +58,6 @@ public class MooTrackView extends JPanel { setLayout(null); setPreferredSize(new Dimension(VIEW_WIDTH, 140 * NOTE_HEIGHT)); - // Creates temporary variables - MidiEvent note; - MooNoteElement elem; - rects = new ArrayList(track.size() / 2); - extraHeight = Toolkit.getDefaultToolkit().getScreenSize().height - 150; - // Places note elements for (int i = 0; i < track.size(); i++) { note = track.get(i); @@ -74,9 +78,18 @@ public class MooTrackView extends JPanel { popupAdd = new JMenuItem("Add note..."); popupAdd.addActionListener(pList); popup.add(popupAdd); + popupPaste = new JMenuItem("Paste"); + popupPaste.addActionListener(pList); + popup.add(popupPaste); // Creates selection pop-up menu. selPopup = new JPopupMenu(); + selPopupCopy = new JMenuItem("Copy selection"); + selPopupCopy.addActionListener(pList); + selPopup.add(selPopupCopy); + selPopupCut = new JMenuItem("Cut selection"); + selPopupCut.addActionListener(pList); + selPopup.add(selPopupCut); selPopupRemove = new JMenuItem("Remove selection"); selPopupRemove.addActionListener(pList); selPopup.add(selPopupRemove); @@ -106,10 +119,10 @@ public class MooTrackView extends JPanel { Rectangle r = new Rectangle(); if (old){ r = elem.getBounds(r); - for (Iterator i = rects.iterator(); i.hasNext();){ + for (Iterator i = coords.iterator(); i.hasNext();){ Object ob = i.next(); if (r.equals(ob)){ - rects.remove(ob); + coords.remove(ob); break; } } @@ -122,7 +135,7 @@ public class MooTrackView extends JPanel { // Calculates coordinates. x = insets.left; - y = insets.top + (int)(mn.getTick() / ticksPerSixteenth) * NOTE_HEIGHT; + y = insets.top + Math.round(mn.getTick() / ticksPerSixteenth) * NOTE_HEIGHT; height = (mn.getDuration() / ticksPerSixteenth) * NOTE_HEIGHT; if (height == 0) height = NOTE_HEIGHT; r = new Rectangle(x, y, NOTE_WIDTH, height); @@ -130,12 +143,15 @@ public class MooTrackView extends JPanel { // Places the element in the appropriate place. while(isOccupied(r)) r.translate(NOTE_WIDTH, 0); elem.setBounds(r); - rects.add(r); + coords.add(r); if (viewLength < (y + height)){ viewLength = y + height; if(old)setPreferredSize(new Dimension(VIEW_WIDTH, viewLength + extraHeight)); } - if(old)repaint(); + if (old) { + validate(); + repaint(); + } } /** @@ -159,7 +175,7 @@ public class MooTrackView extends JPanel { * @return true if the position is occupied. */ private boolean isOccupied(Rectangle r) { - Iterator it = rects.iterator(); + Iterator it = coords.iterator(); while (it.hasNext()) { if(r.intersects((Rectangle)it.next())) return true; } @@ -177,6 +193,7 @@ public class MooTrackView extends JPanel { layoutElement(elem, false); setPreferredSize(new Dimension(VIEW_WIDTH, viewLength + extraHeight)); Moosique.setEdited(); + validate(); repaint(); } @@ -184,7 +201,7 @@ public class MooTrackView extends JPanel { * Adds a standard note to this track. */ private void addStandardNote() { - int row = (popupY - insets.top) / NOTE_HEIGHT; + int row = (popupY - insets.top) / NOTE_HEIGHT; long timestamp = (long)(ticksPerSixteenth * row); addNote(new MooNote(title.getChannel(), 60, 100, timestamp, Moosique.getSequence().getResolution() / 4)); } @@ -198,34 +215,37 @@ public class MooTrackView extends JPanel { remove(elem); Rectangle r = new Rectangle(); r = elem.getBounds(r); - rects.remove(r); + coords.remove(r); Moosique.setEdited(); + validate(); repaint(); } /** - * Deselects all notes. + * Selects the given note + * @param the note to select */ public void selectNote(MooNoteElement elem) { - selected.add(elem); + selection.add(elem); } /** - * Deselects all notes. + * Deselects the given note + * @param the note to deselect */ public void deselectNote(MooNoteElement elem) { - selected.remove(selected.indexOf(elem)); + selection.remove(elem); } /** * Deselects all notes. */ public void deselectAllNotes() { - Iterator it = selected.iterator(); + Iterator it = selection.iterator(); while(it.hasNext()) { ((MooNoteElement)it.next()).deselect(); } - selected.clear(); + selection.clear(); } /** @@ -233,7 +253,7 @@ public class MooTrackView extends JPanel { * @return if the given element is the only selected one */ public boolean isTheOnlySelected(MooNoteElement elem) { - Iterator it = selected.iterator(); + Iterator it = selection.iterator(); while(it.hasNext()) { if (!it.next().equals(elem)) return false; } @@ -241,27 +261,107 @@ public class MooTrackView extends JPanel { } /** - * Shows a popup-menu with options for the current selection of note elements. - * @param c the component over which to display the menu - * @param x the x-coordinate in which to display the menu - * @param y the y-coordinate in which to display the menu + * Copies the current selection. */ - public void showSelectionPopup(Component c, int x, int y) { - selPopup.show(c, x, y); + public void copySelectedNotes() { + copyBuffer = new ArrayList(selection.size()); + Iterator it = selection.iterator(); + while(it.hasNext()) { + copyBuffer.add(((MooNoteElement)it.next()).getNote().clone()); + } + Collections.sort(copyBuffer); + } + + /** + * Cuts the current selection. + */ + public void cutSelectedNotes() { + copySelectedNotes(); + removeSelectedNotes(); + } + + /** + * Pastes the current copy buffer at the given timestamp. + */ + public void pasteCopiedNotes() { + int row = (popupY - insets.top) / NOTE_HEIGHT; + long timestamp = (long)(ticksPerSixteenth * row); + if (copyBuffer.size() > 0) { + long startTime = ((MooNote)copyBuffer.get(0)).getTick(); + Iterator it = copyBuffer.iterator(); + while(it.hasNext()) { + MooNote mn = (MooNote)((MooNote)it.next()).clone(); + mn.setTick(mn.getTick() - startTime + timestamp); + addNote(mn); + } + } + } + + /** + * Removes the current selection. + */ + public void removeSelectedNotes() { + Iterator it = selection.iterator(); + while(it.hasNext()) { + removeNote((MooNoteElement)it.next()); + } + selection.clear(); } /** * Transposes all selected notes the given number of halftones. */ private void transposeSelectedNotes(int halftones) { - Iterator it = selected.iterator(); + Iterator it = selection.iterator(); while(it.hasNext()) { MooNoteElement elem = (MooNoteElement)it.next(); - elem.getNote().transpose(halftones); - elem.update(); + elem.transpose(halftones); } } + /** + * Moves the current selection the given number of ticks. + * @param ticks the number of ticks to move the selection. + */ + public void moveSelectedNotes(int ticks) { + if (ticks > 0) { + // If the selection should be moved downwards, traverses the list in the natural order. + Iterator it = selection.iterator(); + while(it.hasNext()) { + MooNoteElement elem = (MooNoteElement)it.next(); + elem.getNote().setTick(elem.getNote().getTick() + ticks); + layoutElement(elem, true); + } + } else { + // If the selection should be moved upwards, traverses the list in the opposite order. + ArrayList selectedList = new ArrayList(selection); + ListIterator it = selectedList.listIterator(selectedList.size()); + while(it.hasPrevious()) { + MooNoteElement elem = (MooNoteElement)it.previous(); + elem.getNote().setTick(elem.getNote().getTick() + ticks); + layoutElement(elem, true); + } + } + } + + /** + * Moves the current selection, depending on the given delta y. + * @param y the number of pixels the selection is moved. + */ + public void maybeMoveSelectedNotes(int y) { + moveSelectedNotes(ticksPerSixteenth * (y / NOTE_HEIGHT)); + } + + /** + * Shows a popup-menu with options for the current selection of note elements. + * @param c the component over which to display the menu + * @param x the x-coordinate in which to display the menu + * @param y the y-coordinate in which to display the menu + */ + public void showSelectionPopup(Component c, int x, int y) { + selPopup.show(c, x, y); + } + /** * Draws the grid that is on the background. * @param g The Graphics object used to draw the grid. @@ -278,6 +378,14 @@ public class MooTrackView extends JPanel { } } + /** + * Returns whether the left mouse button is currently pressed or not. + * @return true if the left mosue button is currently pressed + */ + public boolean isLeftMouseButtonPressed() { + return leftMouseButtonPressed; + } + /** * The adapter used to listen on mouse actions */ @@ -297,20 +405,15 @@ public class MooTrackView extends JPanel { } public void mousePressed(MouseEvent e) { + if (SwingUtilities.isLeftMouseButton(e)) leftMouseButtonPressed = true; maybeShowPopup(e); } public void mouseReleased(MouseEvent e) { + if (SwingUtilities.isLeftMouseButton(e)) leftMouseButtonPressed = false; maybeShowPopup(e); } - /** - * Selects the notes within the area that was selected. - */ - public void mouseDragged(MouseEvent e) { - - } - /** * Shows the menu if an OS-specific popup-trigger was activated. */ @@ -325,7 +428,7 @@ public class MooTrackView extends JPanel { * Grabs the focus when the mouse has entered. */ public void mouseEntered(MouseEvent e) { - // Moosique.setActiveChannel(track.getChannel()); + Moosique.setActiveChannel(title.getChannel()); grabFocus(); } } @@ -336,14 +439,18 @@ public class MooTrackView extends JPanel { class PopupListener implements ActionListener { public void actionPerformed(ActionEvent e) { Object source = e.getSource(); + // Handling panel popup actions. if (source == popupAdd) { addStandardNote(); + } else if (source == popupPaste) { + pasteCopiedNotes(); + // Handling selection popup actions. + } else if (source == selPopupCopy) { + copySelectedNotes(); + } else if (source == selPopupCut) { + cutSelectedNotes(); } else if (source == selPopupRemove) { - Iterator it = selected.iterator(); - while(it.hasNext()) { - removeNote((MooNoteElement)it.next()); - } - selected.clear(); + removeSelectedNotes(); } else if (source == selPopupTranspUpOct) { transposeSelectedNotes(12); } else if (source == selPopupTranspDownOct) {