*** empty log message ***

[moosique.git] / MooNoteElement.java

diff --git a/MooNoteElement.java b/MooNoteElement.java
index d5e4d2a433ece1f041b1056403b473425c75d63a..8d8778d369e57a18b778f39734a9158644b50385 100644 (file)
--- a/MooNoteElement.java
+++ b/MooNoteElement.java
@@ -13,7 +13,6 @@ public class MooNoteElement extends JPanel {
 
        private MooTrackView mtv;
        private MooNote note;
-       private int columns;
        private boolean selected;
        private Rectangle pitchRect, veloRect;
        public static final Color bgColor = new Color(160, 218, 255);
@@ -24,14 +23,13 @@ public class MooNoteElement extends JPanel {
 
        /** 
         * Creates a new note element.
+        * @param parent        The MooTrackView that this element will be painted on.
         * @param mn    the note that will be graphically represented
-        * @param rows  the number of rows that the note will occupy
         */
        public MooNoteElement (MooTrackView parent, MooNote mn) {
                mtv = parent;
                note = mn;
                calculateString();
-               columns = mn.getDuration() / (Moosique.getSequence().getResolution() / 4);
                setBorder(BorderFactory.createLineBorder(Color.black));
                setBackground(bgColor);
                addMouseListener(new MAdapter());
@@ -61,6 +59,14 @@ public class MooNoteElement extends JPanel {
                return selected;
        }
 
+       /** 
+        * Returns the note of this element.
+        * @return the note
+        */
+       public MooNote getNote() {
+               return note;
+       }
+
        /** 
         * Selects the current NoteElement.
         * @param state if the element should be selected
@@ -70,7 +76,8 @@ public class MooNoteElement extends JPanel {
        }
 
        /**
-        *
+        * Draws the string that shows the note's properties.
+        * @param g     The Graphics object used to draw the strings.
         */
        public void paintComponent(Graphics g)
        {
@@ -86,10 +93,13 @@ public class MooNoteElement extends JPanel {
                }
        */
                
-               g2.drawString(notePitch, 1, 9);
-               g2.drawString("" + noteVelocity, 21, 9);
+               g2.drawString(notePitch, 1, 8);
+               g2.drawString("" + noteVelocity, 21, 8);
        }
 
+       /**
+        * Calculate what the string that shows the note properties should look like.
+        */
        protected void calculateString(){
 
                noteVelocity = ""; 
@@ -115,7 +125,22 @@ public class MooNoteElement extends JPanel {
                noteVelocity = ""+note.getVelocity();
        }
 
+       /**
+        * Listener that checks the mouse actions on this element.
+        */
        class MAdapter extends MouseAdapter {
+       
+               public void mouseClicked(MouseEvent e) {
+                       
+               }
+
+               /**
+                * Checks if the mouse is pressed.
+                * Pops up the menu if right mousebutton is used.
+                * 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.
+                * @param e The events recieved.
+                */
                public void mousePressed(MouseEvent e) {
                        if (e.isControlDown()) {
                                if (pitchRect.contains(e.getPoint())) {
@@ -134,21 +159,31 @@ public class MooNoteElement extends JPanel {
                                        calculateString();
                                }
                                e.getComponent().repaint();
-                       }
-                       if (e.isPopupTrigger()) {
+                       } else if (e.isPopupTrigger()) {
                                popup.show(e.getComponent(), e.getX(), e.getY());
                        }
                }
        }
 
+       /**
+        * Listens on the actions made to the popupmenu.
+        */
        class PopupListener implements ActionListener {
                public void actionPerformed(ActionEvent e) {
                        Object source = e.getSource();
                        if  (source == popupProp) {
                                new MooDialog(note);
                        } else if  (source == popupRemove) {
-                               mtv.remove((MooNoteElement)((JComponent)e.getSource()).getParent().getParent());
+                               remove();
                        }
                }
        }
+
+       /**
+        * Asks the MooTrackView that it's painted on to remove this element and the note.
+        */
+       protected void remove(){
+               mtv.removeNote(this);
+       }
+
 }