X-Git-Url: https://ruin.nu/git/?a=blobdiff_plain;f=MooNoteElement.java;h=c39d2b58804af037d5f355bd5744e451d421661e;hb=0f75f154c6485f6428617af221a282ba03ee20ae;hp=3640113034b314f79112f2f2302891df2c81e7fa;hpb=a377991ed2bf7c9e050e68d32304159db0862cd6;p=moosique.git diff --git a/MooNoteElement.java b/MooNoteElement.java index 3640113..c39d2b5 100644 --- a/MooNoteElement.java +++ b/MooNoteElement.java @@ -67,29 +67,32 @@ public class MooNoteElement extends JPanel{ { super.paintComponent(g); + if (note == null) + return; + if (!(g instanceof Graphics2D)) return; Graphics2D g2 = (Graphics2D)g; - String note = ""; //TODO: shoudl really change this name.. - int pitch = this.note.getPitch(); + String n = ""; + int pitch = 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; + 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.drawString(note +" "+(pitch/12), 2, 2); + g2.drawString(n +" "+(pitch/12), 2, 2); }