From e471d9aaa190fa2a38f3eb08bbc4c6a29681d91e Mon Sep 17 00:00:00 2001 From: Roland Andersson Date: Thu, 15 May 2003 12:20:04 +0000 Subject: [PATCH] *** empty log message *** --- MooViewCounter.java | 59 +++++++++++++++++++++------------------------ 1 file changed, 28 insertions(+), 31 deletions(-) diff --git a/MooViewCounter.java b/MooViewCounter.java index 9e3829e..3f646e8 100644 --- a/MooViewCounter.java +++ b/MooViewCounter.java @@ -11,37 +11,37 @@ import java.awt.*; public class MooViewCounter extends JPanel { private int timeSig1, timeSig2, measure, halfBeat, beat, halfNote; - + private static final int CELL_HEIGHT = 10; + /** - * Creates + * Creates an musical ruler depending on the timesignature */ public MooViewCounter (int ts1, int ts2) { timeSig1 = ts1; timeSig2 = ts2; setBackground(Color.black); - setPreferredSize(new Dimension(35,200*10)); - + setPreferredSize(new Dimension(35, 200 * CELL_HEIGHT)); switch (timeSig2) { - case 16: measure = timeSig1; - break; - case 8: measure = timeSig1 * 2; - halfBeat = measure / timeSig1; - break; - case 4: measure = timeSig1 * 4; - beat = measure / timeSig1; - halfBeat = beat / 2; - break; - case 2: measure = timeSig1 * 8; - halfNote = measure / timeSig1; - beat = halfNote / 2; - halfBeat = beat / 2; - break; - case 1: measure = timeSig1 * 16; - halfNote = measure/2; - beat = halfNote/2; - halfBeat = beat/2; - break; + case 16: measure = timeSig1; // 1/16 + break; + case 8: measure = timeSig1 * 2; // 1/16 + halfBeat = measure / timeSig1; // 1/8 + break; + case 4: measure = timeSig1 * 4; // 1/16 + halfBeat = beat / 2; // 1/8 + beat = measure / timeSig1; // 1/4 + break; + case 2: measure = timeSig1 * 8; // 1/16 + halfBeat = beat / 2; // 1/8 + beat = halfNote / 2; // 1/4 + halfNote = measure / timeSig1; // 1/2 + break; + case 1: measure = timeSig1 * 16; // 1/16 + halfBeat = beat / 2; // 1/8 + beat = halfNote / 2; // 1/4 + halfNote = measure / 2; // 1/2 + break; } } @@ -51,16 +51,13 @@ public class MooViewCounter extends JPanel { if (!(g instanceof Graphics2D)) return; Graphics2D g2 = (Graphics2D)g; - - setPreferredSize(new Dimension(50,200*10)); g2.setColor(Color.white); for (int c = 0; c < 200; c++) { - g2.drawLine(0,c*10,5,c*10); // 1/16 - g2.drawLine(0,c*10*halfBeat,10,c*10*halfBeat); // 1/8 - g2.drawLine(0,c*10*beat,15,c*10*beat); // 1/4 - g2.drawLine(0,c*10*halfNote,20,c*10*halfNote); // 1/2 - g2.drawLine(0,c*10*measure,30,c*10*measure); // 1/1 - + g2.drawLine(0, c * CELL_HEIGHT, 5, c * CELL_HEIGHT); // 1/16 + g2.drawLine(0, c * CELL_HEIGHT * halfBeat, CELL_HEIGHT, c * CELL_HEIGHT * halfBeat); // 1/8 + g2.drawLine(0, c * CELL_HEIGHT * beat, 15, c * CELL_HEIGHT * beat); // 1/4 + g2.drawLine(0, c * CELL_HEIGHT * halfNote, 20, c * CELL_HEIGHT * halfNote); // 1/2 + g2.drawLine(0, c * CELL_HEIGHT * measure, 30, c * CELL_HEIGHT * measure); // 1/1 } } } \ No newline at end of file -- 2.39.2