*** empty log message ***

[moosique.git] / MooNoteElement.java

diff --git a/MooNoteElement.java b/MooNoteElement.java
index 3640113034b314f79112f2f2302891df2c81e7fa..65ed0baf554dd78aab1676e1e7aa41cd6807ecd9 100644 (file)
--- a/MooNoteElement.java
+++ b/MooNoteElement.java
@@ -9,39 +9,31 @@ import java.awt.event.*;
  * @version 1
  */
  
-public class MooNoteElement extends JPanel{
+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.
-        * @param mn The note that will be graphically represented
+        * @param mn    the note that will be graphically represented
+        * @param rows  the number of rows that the note will occupy
         */
        public MooNoteElement (MooNote mn) {
                note = mn;
-               setPreferredSize(new Dimension(20,20));
-               setFont(new Font("Helvetica", Font.PLAIN, 10));
-
-               class MouseList implements MouseListener{
-                       public void mouseClicked(MouseEvent event){
-                               //Bring upp dialog to edit note.
-                       }
-
-                       public void mouseEntered(MouseEvent event){
-                               //Show note props in statusbar?
-                       }
-
-                       public void mouseExited(MouseEvent event){
-                               //Reset statusbar?
-                       }
-
-                       public void mousePressed(MouseEvent event){     }
-
-                       public void mouseReleased(MouseEvent event){}
-               };
-               MouseListener listener = new MouseList();
-               addMouseListener(listener);
+               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);
        }
 
        /** 
@@ -66,31 +58,68 @@ public class MooNoteElement extends JPanel{
        public void paintComponent(Graphics g)
        {
                super.paintComponent(g);
-
-               if (!(g instanceof Graphics2D))
-                       return;
+               if (!(g instanceof Graphics2D)) return;
                Graphics2D g2 = (Graphics2D)g;
+               g2.setFont(new Font("Helvetica", Font.PLAIN, 8));
+       /*
+               switch(columns) {
+                       case 0:
+                       case 1:
+                       ...
+               }
+       */
+               
+               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();
+       }
 
-               String note = ""; //TODO: shoudl really change this name..
-               int pitch = this.note.getPitch();
-               switch( pitch % 12)
-               {
-                       case 0: note = "C"; break;
-                       case 1: note = "C#"; break;
-                       case 2: note = "D"; break;
-                       case 3: note = "D#"; break;
-                       case 4: note = "E"; break;
-                       case 5: note = "F"; break;
-                       case 6: note = "F#"; break;
-                       case 7: note = "G"; break;
-                       case 8: note ="G#"; break;
-                       case 9: note = "A"; break;
-                       case 10: note = "A#"; break;
-                       case 11: note = "B"; break;
+       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();
                }
 
-               g2.drawString(note +" "+(pitch/12), 2, 2);
+               public void mousePressed(MouseEvent e) {}
 
+               public void mouseReleased(MouseEvent e) {}
        }
-
 }