From ecef41268a927f27f71839d5df1d68a151b37e5e Mon Sep 17 00:00:00 2001 From: Einar Pehrson Date: Sat, 17 May 2003 12:34:10 +0000 Subject: [PATCH] Fixed the select function. --- MooNoteElement.java | 42 ++++++++++++++++++++++++------------------ MooTrackTitle.java | 6 +++--- MooTrackView.java | 30 +++++++++++++++++++++++++++++- midi/test3.mid | Bin 350 -> 384 bytes 4 files changed, 56 insertions(+), 22 deletions(-) diff --git a/MooNoteElement.java b/MooNoteElement.java index 3a068cd..43b7b27 100644 --- a/MooNoteElement.java +++ b/MooNoteElement.java @@ -13,11 +13,11 @@ public class MooNoteElement extends JPanel { private MooTrackView mtv; private MooNote note; - private boolean selected; private Rectangle pitchRect, veloRect; + public Color textColor; public static final Color bgColor = new Color(160, 218, 255); - private String notePitch; - private String noteVelocity; + public static final Color invBgColor = new Color(96, 38, 0); + private String notePitch, noteVelocity; private JPopupMenu popup; private JMenuItem popupRemove, popupProp, popupTransposeOctUp, popupTransposeOctDown; @@ -30,9 +30,10 @@ public class MooNoteElement extends JPanel { mtv = parent; note = mn; calculateString(); + addMouseListener(new MAdapter()); setBorder(BorderFactory.createLineBorder(Color.black)); setBackground(bgColor); - addMouseListener(new MAdapter()); + textColor = Color.black; // Defines coordinates. pitchRect = new Rectangle(0, 0, 15, 10); @@ -53,15 +54,6 @@ public class MooNoteElement extends JPanel { popupTransposeOctDown = new JMenuItem("Transpose one octave down"); popupTransposeOctDown.addActionListener(pList); popup.add(popupTransposeOctDown); - - } - - /** - * Returns true if the current NoteElement is selected, otherwise false. - * @return if the element is selected - */ - public boolean isSelected() { - return selected; } /** @@ -74,10 +66,22 @@ public class MooNoteElement extends JPanel { /** * Selects the current NoteElement. - * @param state if the element should be selected */ - public void setSelected(boolean state) { - selected = state; + public void select() { + mtv.addSelected(this); + setBackground(invBgColor); + textColor = Color.white; + repaint(); + } + + /** + * Deselects the current NoteElement. + */ + public void deselect() { + // mtv.removeSelected(this); + setBackground(bgColor); + textColor = Color.black; + repaint(); } /** @@ -89,6 +93,7 @@ public class MooNoteElement extends JPanel { super.paintComponent(g); if (!(g instanceof Graphics2D)) return; Graphics2D g2 = (Graphics2D)g; + g2.setColor(textColor); g2.setFont(new Font("Helvetica", Font.PLAIN, 8)); /* switch(columns) { @@ -136,13 +141,14 @@ public class MooNoteElement extends JPanel { class MAdapter extends MouseAdapter { public void mouseClicked(MouseEvent e) { + select(); // Play the note } /** * Checks if the mouse is pressed. - * Increases the pitch or velocity if the right mousebutton is pressed while holding ctrl down. - * Decreases the pitch or velocity if the left mousebutton is pressed while holding ctrl down. + * Increases the pitch or velocity if the right mouse button is pressed while holding CTRL. + * Decreases the pitch or velocity if the left mouse button is pressed while holding CTRL. * @param e the event recieved. */ public void mousePressed(MouseEvent e) { diff --git a/MooTrackTitle.java b/MooTrackTitle.java index c2f1c0f..e22c321 100644 --- a/MooTrackTitle.java +++ b/MooTrackTitle.java @@ -76,15 +76,15 @@ public class MooTrackTitle extends JPanel { channelBox.addActionListener(new ActionListener(){ public void actionPerformed(ActionEvent e){ - int chan = channelBox.getSelectedIndex(); + channel = channelBox.getSelectedIndex(); MidiEvent me; MooNote mn; - instruments.setChannel(channelBox.getSelectedIndex()); + instruments.setChannel(channel); for (int j = 0; j < track.size(); j++) { me = track.get(j); if (me instanceof MooNote){ mn = (MooNote)me; - mn.setChannel(chan); + mn.setChannel(channel); } }}}); add(channelBox); diff --git a/MooTrackView.java b/MooTrackView.java index bac8cbc..43403e6 100644 --- a/MooTrackView.java +++ b/MooTrackView.java @@ -20,6 +20,7 @@ public class MooTrackView extends JPanel { private JPopupMenu popup; private JMenuItem popupAdd; private ArrayList rects; + private ArrayList selected; private Insets insets; private int ticksPerSixteenth, popupY = 0; protected static int viewLength = 0; @@ -36,6 +37,7 @@ public class MooTrackView extends JPanel { this.track = track; this.title = title; insets = getInsets(); + selected = new ArrayList(); // Configures panel setBackground(Color.white); @@ -177,6 +179,31 @@ public class MooTrackView extends JPanel { addNote(new MooNote(title.getChannel(), 60, 100, timestamp, Moosique.getSequence().getResolution() / 4)); } + /** + * Deselects all notes. + */ + public void addSelected(MooNoteElement elem) { + selected.add(elem); + } + + /** + * Deselects all notes. + */ + public void removeSelected(MooNoteElement elem) { + selected.remove(selected.indexOf(elem)); + } + + /** + * Deselects all notes. + */ + public void deselectAll() { + Iterator it = selected.iterator(); + while(it.hasNext()) { + ((MooNoteElement)it.next()).deselect(); + } + selected.clear(); + } + /** * Draws the grid that is on the background. * @param g The Graphics object used to draw the grid. @@ -199,9 +226,10 @@ public class MooTrackView extends JPanel { class MAdapter extends MouseAdapter { /** - * Adds a standard note if doubleclicked. + * Deselects all note on click, adds a standard note on double click. */ public void mouseClicked(MouseEvent e) { + deselectAll(); if (e.getClickCount() == 2) { popupY = e.getY(); addStandardNote(); diff --git a/midi/test3.mid b/midi/test3.mid index 2e2aa18bc16b9621ac39cd273e3b5baa93ade7ec..460b3bccb457379dcb5ae3e7a80966fcadfcc702 100644 GIT binary patch literal 384 zcmZvYJr06E5Jo=};u*Flq1z~73la+GXr$u+7F(Fuc>-HITP`a;WC>=Wdh@-R{mFFw z%}YA!phVZMf80rl#*;$*(L49%nQO}uU*ciuMQNr~W9uC@_y!-d#kcr{ao^In^r7Vy zD>J16TkO!`9UeNSoy?TtJC_{)wc>QeeBio;i-y#jSE_TMhK!uaZ2UZDLVul~{oiJP GTmAxmEnH^+ literal 350 zcma)&u?mAQ6h*I88w(i>F8zS6p-3_a3d!c=<_C0mL!n#0z)#2@x3_4eI28it=H}(S z%NwV=05~E;j@vjrAH3ywU9srwg4D=)ZlG75RwA|ZTYOlzQc$WCM3Xw8psWMkfI9GR zWNl>ao&)`X{+IiAE1GAv&=w|HR$Ep(QBKV4pd2STx{j_VJwtdYy;PK?NA)w&L{SW3 hBJ*tNbn55^m<|U@-E&$8-LqfMet&S=)$iUG{RTdEP(A