From: Einar Pehrson Date: Sat, 17 May 2003 18:42:26 +0000 (+0000) Subject: Fixed exit if sequence unsaved prompt. X-Git-Url: https://ruin.nu/git/?p=moosique.git;a=commitdiff_plain;h=fbafab9c4127f793cfe955003860dcde0d6a0588 Fixed exit if sequence unsaved prompt. Tweaked note selection. --- diff --git a/MooDialog.java b/MooDialog.java index 54d6fdf..333d741 100644 --- a/MooDialog.java +++ b/MooDialog.java @@ -419,10 +419,10 @@ public class MooDialog extends JDialog { note.setPitch(Integer.parseInt(pitch.getText())); note.setVelocity(Integer.parseInt(velocity.getText())); note.setDuration(Integer.parseInt(length.getText())); - - setVisible(false); + Moosique.setEdited(); + setVisible(false); } else { // user closed dialog or clicked cancel - setVisible(false); + setVisible(false); } } } diff --git a/MooNoteElement.java b/MooNoteElement.java index 43b7b27..ce5e1e9 100644 --- a/MooNoteElement.java +++ b/MooNoteElement.java @@ -13,13 +13,14 @@ public class MooNoteElement extends JPanel { private MooTrackView mtv; private MooNote note; + private JPopupMenu popup; + private JMenuItem popupRemove, popupProp, popupTransposeOctUp, popupTransposeOctDown; private Rectangle pitchRect, veloRect; + private String notePitch, noteVelocity; + private boolean selected = false; public Color textColor; public static final Color bgColor = new Color(160, 218, 255); public static final Color invBgColor = new Color(96, 38, 0); - private String notePitch, noteVelocity; - private JPopupMenu popup; - private JMenuItem popupRemove, popupProp, popupTransposeOctUp, popupTransposeOctDown; /** * Creates a new note element. @@ -68,6 +69,7 @@ public class MooNoteElement extends JPanel { * Selects the current NoteElement. */ public void select() { + selected = true; mtv.addSelected(this); setBackground(invBgColor); textColor = Color.white; @@ -78,6 +80,7 @@ public class MooNoteElement extends JPanel { * Deselects the current NoteElement. */ public void deselect() { + selected = false; // mtv.removeSelected(this); setBackground(bgColor); textColor = Color.black; @@ -135,14 +138,27 @@ public class MooNoteElement extends JPanel { noteVelocity = ""+note.getVelocity(); } + + /** + * Asks the MooTrackView that the note element is painted on to remove this element and the note. + */ + protected void remove(){ + mtv.removeNote(this); + } + /** * Listener that checks the mouse actions on this element. */ class MAdapter extends MouseAdapter { + /** + * If left mouse button is clicked, selects the note and plays it. + */ public void mouseClicked(MouseEvent e) { - select(); - // Play the note + if (SwingUtilities.isLeftMouseButton(e) && !e.isControlDown()) { + select(); + // Play the note + } } /** @@ -159,6 +175,7 @@ public class MooNoteElement extends JPanel { } else if (SwingUtilities.isLeftMouseButton(e)) { note.setPitch(note.getPitch() - 1); } + Moosique.setEdited(); calculateString(); repaint(); } else if (veloRect.contains(e.getPoint())) { @@ -167,6 +184,7 @@ public class MooNoteElement extends JPanel { } else if (SwingUtilities.isLeftMouseButton(e)) { note.setVelocity(note.getVelocity() - 1); } + Moosique.setEdited(); calculateString(); repaint(); } @@ -181,7 +199,10 @@ public class MooNoteElement extends JPanel { * Shows the menu if an OS-specific popup-trigger was activated. */ private void maybeShowPopup(MouseEvent e) { - if (e.isPopupTrigger() && !e.isControlDown()) popup.show(e.getComponent(), e.getX(), e.getY()); + if (e.isPopupTrigger() && !e.isControlDown()) { + if (!selected || mtv.isTheOnlySelected((MooNoteElement)e.getComponent())) popup.show(e.getComponent(), e.getX(), e.getY()); + else mtv.showSelectionPopup(e.getComponent(), e.getX(), e.getY()); + } } } @@ -209,11 +230,4 @@ public class MooNoteElement extends JPanel { repaint(); } } - - /** - * Asks the MooTrackView that the note element is painted on to remove this element and the note. - */ - protected void remove(){ - mtv.removeNote(this); - } } diff --git a/MooTrackView.java b/MooTrackView.java index 43403e6..4f5c4f3 100644 --- a/MooTrackView.java +++ b/MooTrackView.java @@ -156,6 +156,7 @@ public class MooTrackView extends JPanel { add(elem); layoutElement(elem, false); setPreferredSize(new Dimension(VIEW_WIDTH, viewLength + extraHeight)); + Moosique.setEdited(); repaint(); } @@ -167,6 +168,7 @@ public class MooTrackView extends JPanel { elem.getNote().removeFrom(track); remove(elem); elem.getNote().removeFrom(track); + Moosique.setEdited(); repaint(); } @@ -204,6 +206,28 @@ public class MooTrackView extends JPanel { selected.clear(); } + /** + * Determines if the given MooNoteElement is the only one in the track view that is selected. + * @return if the given element is the only selected one + */ + public boolean isTheOnlySelected(MooNoteElement elem) { + Iterator it = selected.iterator(); + while(it.hasNext()) { + if (!it.next().equals(elem)) return false; + } + return true; + } + + /** + * 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) { + + } + /** * Draws the grid that is on the background. * @param g The Graphics object used to draw the grid. @@ -244,6 +268,13 @@ public class MooTrackView extends JPanel { 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. */ diff --git a/Moosique.java b/Moosique.java index dd0b8a4..ee9a745 100644 --- a/Moosique.java +++ b/Moosique.java @@ -17,6 +17,7 @@ public class Moosique { private static Sequence seq; private static Sequencer sequencer; private static Synthesizer synthesizer; + private static Receiver receiver; private static MidiChannel[] channels; private static MidiChannel activeChannel; private static MidiEvent[] timeSignatures, tempoChanges; @@ -33,6 +34,9 @@ public class Moosique { /** * Starts the application. + * + * Parses command-line arguments, acquires MIDI devices and connects them, + * loads a sequence and creates the GUI. */ public static void main (String[] args) { System.out.println("\nMoosique version 1.0\n"); @@ -53,11 +57,13 @@ public class Moosique { synthesizer = MidiSystem.getSynthesizer(); System.out.print("."); synthesizer.open(); - sequencer.getTransmitter().setReceiver(synthesizer.getReceiver()); + receiver = synthesizer.getReceiver(); + sequencer.getTransmitter().setReceiver(receiver); channels = synthesizer.getChannels(); setActiveChannel(0); } catch (MidiUnavailableException e) { System.out.println("Failed, quitting."); + // System.exit(1); } System.out.println("Done"); @@ -92,6 +98,56 @@ public class Moosique { } } + + + + + + + + /* *** + ** ACCESSOR METHODS ** + *** */ + + + + + + + + + /** + * Returns the currently active MidiChannel. + * @return the active MidiChannel + */ + public static MidiChannel getActiveChannel() { + return activeChannel; + } + + /** + * Returns the MidiChannels of the selected synthesizer. + * @return the available MidiChannels + */ + public static MidiChannel getChannel(int i) { + return channels[i]; + } + + /** + * Returns the MidiChannels of the selected synthesizer. + * @return the available MidiChannels + */ + public static MidiChannel[] getChannels() { + return channels; + } + + /** + * Returns the current editing position of the sequencer. + * @return the tick position + */ + public static long getEditPosition() { + return editPosition; + } + /** * Returns the GUI. * @return the GUI @@ -100,6 +156,14 @@ public class Moosique { return gui; } + /** + * Returns the receiver of the current sequencer. + * @return the receiver + */ + public static Receiver getReceiver() { + return receiver; + } + /** * Returns the current sequence. * @return the current sequence @@ -117,27 +181,73 @@ public class Moosique { } /** - * Returns the MidiChannels of the selected synthesizer. - * @return the available MidiChannels + * Returns the tempo of the current sequence. + * @return the tick position */ - public static MidiChannel[] getChannels() { - return channels; + public static int getTempo() { + return 120; + // if (tempoMsg == null) return 0; } /** - * Returns the MidiChannels of the selected synthesizer. - * @return the available MidiChannels + * Returns the tempo of the current sequence. + * @return the tick position */ - public static MidiChannel getChannel(int i) { - return channels[i]; + public static int[] getTimeSig() { + int[] ts = {4, 4}; + return ts; + // if (timeSigMsg == null) return 0; } /** - * Returns the currently active MidiChannel. - * @return the active MidiChannel + * Returns true if the current sequence has been edited. + * @return the tick position */ - public static MidiChannel getActiveChannel() { - return activeChannel; + public static boolean isEdited() { + return isEdited; + } + + /** + * Returns whether the given track should be drawn + * @return true if the given track should be drawn + */ + public static boolean shouldBeDrawn(Track track) { + if (drawEmptyTracks) return true; + else return (!emptyTracks.contains(track)); + } + + + + + + + + + /* *** + ** MUTATOR METHODS ** + *** */ + + + + + + + + + /** + * Fast forwards the current sequence the given number of measures. + * @param measures the number of measures to fast forward + */ + public static void forward(long ticks) { + editPosition += ticks; + } + + /** + * Rewinds the current sequence the given number of measures. + * @param measures the number of measures to rewind + */ + public static void rewind(long ticks) { + editPosition -= ticks; } /** @@ -149,36 +259,68 @@ public class Moosique { } /** - * Replaces the current sequence with a new one, holding three empty tracks. + * Sets whether empty tracks should be drawn + * @param state true if empty tracks should be drawn */ - public static void clearSequence() { - // Creates a new sequence and sends it to the sequencer. - try { - seq = new Sequence(Sequence.PPQ, DEFAULT_RESOLUTION, DEFAULT_TRACKS); - sequencer.setSequence(seq); - filename = null; - emptyTracks = new ArrayList(); - } catch (InvalidMidiDataException e) {} - // Sends sequence to GUI. - if (gui != null) gui.setSequence(seq); + public static void setDrawEmptyTracks(boolean state) { + drawEmptyTracks = state; } /** - * Starts playback of the current sequence. + * Sets the current sequence as edited, which implies prompts when loading a new sequence. */ - public static void play() { - sequencer.setTickPosition(editPosition); - resume(); + public static void setEdited() { + isEdited = true; } /** - * Pauses playback of the current sequence. + * Sets the current editing position of the sequencer. + * @param ticks the tick position */ - public static void pause() { - if (sequencer.isRunning()) { - sequencer.stop(); - } - if (player != null) player.interrupt(); + public static void setEditPosition(long ticks) { + editPosition = ticks; + } + + /** + * Sets the current editing position of the sequencer. + * @param ticks the tick position + */ + public static void setTempo(int bpm) { + // tempoMsg + } + + /** + * Sets the current editing position of the sequencer. + * @param ticks the tick position + */ + public static void setTimeSig(int bpm) { + // timeSigMsg + } + + + + + + + + + /* *** + ** PLAYBACK METHODS ** + *** */ + + + + + + + + + /** + * Starts playback of the current sequence. + */ + public static void play() { + sequencer.setTickPosition(editPosition); + resume(); } /** @@ -233,6 +375,16 @@ public class Moosique { player.start(); } + /** + * Pauses playback of the current sequence. + */ + public static void pause() { + if (sequencer.isRunning()) { + sequencer.stop(); + } + if (player != null) player.interrupt(); + } + /** * Stops playback of the current sequence. */ @@ -245,108 +397,41 @@ public class Moosique { gui.update((long)0); } - /** - * Returns the current editing position of the sequencer. - * @return the tick position - */ - public static long getEditPosition() { - return editPosition; - } - /** - * Sets the current editing position of the sequencer. - * @param ticks the tick position - */ - public static void setEditPosition(long ticks) { - editPosition = ticks; - } - /** - * Returns the tempo of the current sequence. - * @return the tick position - */ - public static int getTempo() { - return 120; - // if (tempoMsg == null) return 0; - } - /** - * Sets the current editing position of the sequencer. - * @param ticks the tick position - */ - public static void setTempo(int bpm) { - // tempoMsg - } - /** - * Returns the tempo of the current sequence. - * @return the tick position - */ - public static int[] getTimeSig() { - int[] ts = {4, 4}; - return ts; - // if (timeSigMsg == null) return 0; - } - /** - * Sets the current editing position of the sequencer. - * @param ticks the tick position - */ - public static void setTimeSig(int bpm) { - // timeSigMsg - } - /** - * Returns true if the current sequence has been edited. - * @return the tick position - */ - public static boolean isEdited() { - return isEdited; - } - /** - * Sets the current sequence as edited, which implies prompts when loading a new sequence. - */ - public static void setEdited() { - isEdited = true; - } + /* *** + ** SYSTEM & IO METHODS ** + *** */ + + + - /** - * Rewinds the current sequence the given number of measures. - * @param measures the number of measures to rewind - */ - public static void rewind(long ticks) { - editPosition -= ticks; - } - /** - * Fast forwards the current sequence the given number of measures. - * @param measures the number of measures to fast forward - */ - public static void forward(long ticks) { - editPosition += ticks; - } - /** - * Returns whether the given track should be drawn - * @return true if the given track should be drawn - */ - public static boolean shouldBeDrawn(Track track) { - if (drawEmptyTracks) return true; - else return (!emptyTracks.contains(track)); - } /** - * Sets whether empty tracks should be drawn - * @param state true if empty tracks should be drawn + * Replaces the current sequence with a new one, holding three empty tracks. */ - public static void setDrawEmptyTracks(boolean state) { - drawEmptyTracks = state; + public static void clearSequence() { + // Creates a new sequence and sends it to the sequencer. + try { + seq = new Sequence(Sequence.PPQ, DEFAULT_RESOLUTION, DEFAULT_TRACKS); + sequencer.setSequence(seq); + filename = null; + emptyTracks = new ArrayList(); + } catch (InvalidMidiDataException e) {} + // Sends sequence to GUI. + if (gui != null) gui.setSequence(seq); } /** - * Loads the MooSequence in the given file. + * Loads a MIDI sequence from the given file. * @param filename the filename to use */ public static boolean load(String file) { @@ -380,8 +465,8 @@ public class Moosique { } } } -// timeSignatures = ts.toArray(timeSignatures); -// tempoChanges = tc.toArray(tempoChanges); + // timeSignatures = ts.toArray(timeSignatures); + // tempoChanges = tc.toArray(tempoChanges); // Wraps each NoteOn event with its NoteOff event in a MooNote ArrayList noteOns, noteOffs; @@ -446,6 +531,17 @@ public class Moosique { return true; } + /** + * Saves the current sequence to the previously given filename. + */ + public static boolean save() { + if (filename == null) return false; + else { + saveAs(filename); + return true; + } + } + /** * Saves the current sequence to the given filename * @param file the filename to use @@ -462,21 +558,18 @@ public class Moosique { } } - /** - * Saves the current sequence to the previously given filename. - */ - public static boolean save() { - if (filename == null) return false; - else { - saveAs(filename); - return true; - } - } - /** * Releases all reserved devices and exits the program. */ public static void quit() { + if (isEdited && gui != null) { + int exitOption = JOptionPane.showConfirmDialog(gui, + "The current sequence has been edited, but not saved.\nDo you wish to quit anyway?", + "File not saved - really quit?", + JOptionPane.OK_CANCEL_OPTION, + JOptionPane.WARNING_MESSAGE); + if (exitOption == JOptionPane.CANCEL_OPTION || exitOption == JOptionPane.CLOSED_OPTION) return; + } if (sequencer.isOpen()) sequencer.close(); if (synthesizer.isOpen()) synthesizer.close(); System.exit(0); diff --git a/To Do.txt b/To Do.txt index 2fb00c4..68a0bbe 100644 --- a/To Do.txt +++ b/To Do.txt @@ -4,26 +4,29 @@ x Spara konfiguration? Arbetskatalog Fem senast öppnade filerna Valda MIDI-enheter - -x Integrera MooViewCounter i MooTrackView genom att istället variera de horisontella streckens gråa nyanser?!? - (Omöjligt att följa strecken till högra änden av skärmen.) - -x Ändra längden på MooNoteElement (JPanel). - Känn av klick på panelens gräns, MouseMotionListener känner av när ny ruta nås. - void mouseDragged(MouseEvent) - Called in response to the user moving the mouse while holding a mouse button down. - This event is fired by the component that fired the most recent mouse-pressed event, - even if the cursor is no longer over that component. - x Fixa InstrumentList. x Fixa så att toolbarens rutor sitter fast! x Räkna ut tempo och taktart. Skicka (på nåt sätt) tempovektorn till MooToolbar. x Gör en ruta för tempot i MooToolbar. x Gör en ruta för taktarten i MooViews övre vänstra hörn. -x Implementera klart menyn, med alla dialoger. +x Implementera klart menyn, med alla dialoger. (Går visst att göra med JOptionPane, kolla denna: + http://java.sun.com/tutorial/uiswing/components/example-swing/CustomDialog.java) x Lägg till en tom panel i MooGUI för att fylla ut skärmen. Använd setBounds() +x Textfält som gör att man bara kan skriva in siffror? (MooNoteProp) + +MooTrackView + x Fixa markera, kopiera, klipp ut och klistra in. x Highlighta noter som spelas? (Enligt kravspec.) -x Textfält som gör att man bara kan skriva in siffror? (MooNoteProp) +x Ändra längden på MooNoteElement (JPanel). + Känn av klick på panelens gräns, MouseMotionListener känner av när ny ruta nås. + void mouseDragged(MouseEvent) + Called in response to the user moving the mouse while holding a mouse button down. + This event is fired by the component that fired the most recent mouse-pressed event, + even if the cursor is no longer over that component. + Eller.. ComponentListener.componentMoved(ComponentEvent e) + +x Integrera MooViewCounter i MooTrackView genom att istället variera de horisontella streckens gråa nyanser?!? + (Omöjligt att följa strecken till högra änden av skärmen.) \ No newline at end of file