*** empty log message ***

[moosique.git] / MooNoteElement.java

diff --git a/MooNoteElement.java b/MooNoteElement.java
index 65afa7bc8061552e130eb6bb1af4a63ed15e86a7..65ed0baf554dd78aab1676e1e7aa41cd6807ecd9 100644 (file)
--- a/MooNoteElement.java
+++ b/MooNoteElement.java
@@ -14,7 +14,10 @@ public class MooNoteElement extends JPanel {
        private MooNote note;
        private int columns;
        private boolean selected;
+       private Rectangle pitchRect, veloRect;
        public static final Color bgColor = new Color(160, 218, 255);
+       private String notePitch;
+       private String noteVelocity;
 
        /** 
         * Creates a new note element.
@@ -23,9 +26,14 @@ public class MooNoteElement extends JPanel {
         */
        public MooNoteElement (MooNote mn) {
                note = mn;
-               columns = mn.getDuration() / 24;
+               calculateString();
+               columns = mn.getDuration() / (Moosique.getSequence().getResolution() / 4);
                setBorder(BorderFactory.createLineBorder(Color.black));
                setBackground(bgColor);
+               addMouseListener(new MAdapter());
+
+               pitchRect = new Rectangle(0, 0, 15, 10);
+               veloRect = new Rectangle(20, 0, 40, 10);
        }
 
        /** 
@@ -50,27 +58,9 @@ public class MooNoteElement extends JPanel {
        public void paintComponent(Graphics g)
        {
                super.paintComponent(g);
-
-               if (note == null || !(g instanceof Graphics2D)) return;
+               if (!(g instanceof Graphics2D)) return;
                Graphics2D g2 = (Graphics2D)g;
-
-               String n = ""; 
-               int pitch = note.getPitch();
-               switch (pitch % 12) {
-                       case 0: n = "C"; break;
-                       case 1: n = "C#"; break;
-                       case 2: n = "D"; break;
-                       case 3: n = "D#"; break;
-                       case 4: n = "E"; break;
-                       case 5: n = "F"; break;
-                       case 6: n = "F#"; break;
-                       case 7: n = "G"; break;
-                       case 8: n ="G#"; break;
-                       case 9: n = "A"; break;
-                       case 10: n = "A#"; break;
-                       case 11: n = "B"; break;
-               }
-
+               g2.setFont(new Font("Helvetica", Font.PLAIN, 8));
        /*
                switch(columns) {
                        case 0:
@@ -79,8 +69,57 @@ public class MooNoteElement extends JPanel {
                }
        */
                
-               g2.setFont(new Font("Helvetica", Font.PLAIN, 8));
-               n = n +(pitch/12);
-               g2.drawString(n + " "+ note.getVelocity(), 1, 9);
+               g2.drawString(notePitch, 1, 9);
+               g2.drawString("" + noteVelocity, 21, 9);
+       }
+
+       protected void calculateString(){
+
+               noteVelocity = ""; 
+               notePitch = "";
+               if(note == null) return;
+
+               int pitch = note.getPitch();
+               switch (pitch % 12) {
+                       case  0: notePitch = "C";  break;
+                       case  1: notePitch = "C#"; break;
+                       case  2: notePitch = "D";  break;
+                       case  3: notePitch = "D#"; break;
+                       case  4: notePitch = "E";  break;
+                       case  5: notePitch = "F";  break;
+                       case  6: notePitch = "F#"; break;
+                       case  7: notePitch = "G";  break;
+                       case  8: notePitch = "G#"; break;
+                       case  9: notePitch = "A";  break;
+                       case 10: notePitch = "A#"; break;
+                       case 11: notePitch = "B";  break;
+               }
+               notePitch += pitch / 12;
+               noteVelocity = ""+note.getVelocity();
+       }
+
+       class MAdapter extends MouseAdapter {
+               public void mouseClicked(MouseEvent e) {
+                       if (pitchRect.contains(e.getPoint())) {
+                               if (SwingUtilities.isRightMouseButton(e)) {
+                                       note.setPitch(note.getPitch() + 1);
+                               } else if (SwingUtilities.isLeftMouseButton(e)) {
+                                       note.setPitch(note.getPitch() - 1);
+                               }
+                               calculateString();
+                       } else if (veloRect.contains(e.getPoint())) {
+                               if (SwingUtilities.isRightMouseButton(e)) {
+                                       note.setVelocity(note.getVelocity() + 1);
+                               } else if (SwingUtilities.isLeftMouseButton(e)) {
+                                       note.setVelocity(note.getVelocity() - 1);
+                               }
+                               calculateString();
+                       }
+                       e.getComponent().repaint();
+               }
+
+               public void mousePressed(MouseEvent e) {}
+
+               public void mouseReleased(MouseEvent e) {}
        }
-}
\ No newline at end of file
+}