*** empty log message ***

[moosique.git] / MooNoteElement.java

diff --git a/MooNoteElement.java b/MooNoteElement.java
index c39d2b58804af037d5f355bd5744e451d421661e..c502b4d568cd47e6269e0fb79e0cd3ff1f753ec9 100644 (file)
--- a/MooNoteElement.java
+++ b/MooNoteElement.java
@@ -9,39 +9,21 @@ 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;
 
        /** 
         * 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);
+               columns = mn.getDuration() / 24;
+               setBorder(BorderFactory.createLineBorder(Color.black));
        }
 
        /** 
@@ -67,17 +49,12 @@ public class MooNoteElement extends JPanel{
        {
                super.paintComponent(g);
 
-               if (note == null)
-                       return;
-
-               if (!(g instanceof Graphics2D))
-                       return;
+               if (note == null || !(g instanceof Graphics2D)) return;
                Graphics2D g2 = (Graphics2D)g;
 
                String n = ""; 
                int pitch = note.getPitch();
-               switch( pitch % 12)
-               {
+               switch (pitch % 12) {
                        case 0: n = "C"; break;
                        case 1: n = "C#"; break;
                        case 2: n = "D"; break;
@@ -92,8 +69,16 @@ public class MooNoteElement extends JPanel{
                        case 11: n = "B"; break;
                }
 
-               g2.drawString(n +" "+(pitch/12), 2, 2);
-
+       /*
+               switch(columns) {
+                       case 0:
+                       case 1:
+                       ...
+               }
+       */
+               
+               g2.setFont(new Font("Helvetica", Font.PLAIN, 8));
+               n = n +(pitch/12);
+               g2.drawString(n + " "+ note.getVelocity(), 1, 9);
        }
-
-}
+}
\ No newline at end of file