X-Git-Url: https://ruin.nu/git/?a=blobdiff_plain;f=MooViewCounter.java;h=9e3829e37428fbccb1e0dc364af6f10f272fd4cf;hb=4897f77587b579d4714ff8749134375e9f5ece77;hp=bb06eac5720a4e80d849e11c4984c9ea9619d932;hpb=9cc9e864bbd9993ba0c8a418b3bf82ef90cc930f;p=moosique.git

diff --git a/MooViewCounter.java b/MooViewCounter.java
index bb06eac..9e3829e 100644
--- a/MooViewCounter.java
+++ b/MooViewCounter.java
@@ -15,6 +15,7 @@ public class MooViewCounter extends JPanel {
 	/** 
 	 * Creates 
 	 */
+
 	public MooViewCounter (int ts1, int ts2) {
 		timeSig1 = ts1;
 		timeSig2 = ts2;
@@ -25,18 +26,18 @@ public class MooViewCounter extends JPanel {
 			case  16: measure = timeSig1;  
 			break;
 			case  8: measure = timeSig1 * 2;
-					 halfBeat = measure/timeSig1;
+					 halfBeat = measure / timeSig1;
 			break;
-			case  4: measure = timeSig1 * (int)Math.pow(2,2);
-					 beat = measure/timeSig1;
-					 halfBeat = beat/2; 	  
+			case  4: measure = timeSig1 * 4;
+					 beat = measure / timeSig1;
+					 halfBeat = beat / 2; 	  
 			break;
-			case  2: measure = timeSig1 * (int)Math.pow(2,3); 
-					 halfNote = measure/timeSig1;
-					 beat = halfNote/2;
-					 halfBeat = beat/2;
+			case  2: measure = timeSig1 * 8; 
+					 halfNote = measure / timeSig1;
+					 beat = halfNote / 2;
+					 halfBeat = beat / 2;
 			break;
-			case  1: measure = timeSig1 * (int)Math.pow(2,4);
+			case  1: measure = timeSig1 * 16;
 				     halfNote = measure/2;
 					 beat = halfNote/2;
 					 halfBeat = beat/2;
@@ -44,16 +45,19 @@ public class MooViewCounter extends JPanel {
 		}
 		
 	}
-
 	public void paintComponent(Graphics g) {
 		super.paintComponent(g);
+		setBackground(Color.black);
+
 		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,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*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