Fixed the select function.

diff --git a/MooNoteElement.java b/MooNoteElement.java
index 3a068cd67908b13456b1ae0bf014401ff7f0cd7c..43b7b27ff6153bad1673dc63df67066222df46f2 100644 (file)
--- 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 c2f1c0fa20097364e509b16493e548ec7916f250..e22c3219846e013d6553dbbda8f851c8b65fe250 100644 (file)
--- 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 bac8cbc59fa4d8c75cd09c0078ac5be21a22a1ac..43403e6989279c5abfdc9a23b422da6c1b67aa02 100644 (file)
--- 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 (file)
Binary files a/midi/test3.mid and b/midi/test3.mid differ