X-Git-Url: https://ruin.nu/git/?p=moosique.git;a=blobdiff_plain;f=MooViewCounter.java;h=de1dac2db6e25c53bde2e2ded1d9c49791d24c60;hp=5153912c19e2d8f1f32a63be2fc2043e3bd3e1c3;hb=HEAD;hpb=948e069926266ead58bc5466520e131941f2466c

diff --git a/MooViewCounter.java b/MooViewCounter.java
index 5153912..de1dac2 100644
--- a/MooViewCounter.java
+++ b/MooViewCounter.java
@@ -1,8 +1,9 @@
+import javax.sound.midi.*;
 import javax.swing.*;
 import java.awt.*;
 
 /**
- * 
+ * A graphical representation of the time signature of the current sequence.
  * 
  * @author  Andersson, Andreen, Lanneskog, Pehrson
  * @version 1
@@ -10,50 +11,73 @@ import java.awt.*;
  
 public class MooViewCounter extends JPanel {
 
-	//public static final int LINE_LENGTH;
 	private int measure, halfBeat, beat, halfNote;
-	//private String check; 
-	//private Line[];
-
+	private static final int CELL_HEIGHT = 10;
+	
 	/** 
-	 * Creates 
+	 * Creates an musical ruler depending on the timesignature
 	 */
-	private int timeSig1, timeSig2;
-	 
-	public MooViewCounter (int ts1, int ts2) {
-		timeSig1 = ts1;
-		timeSig2 = ts2;
-		
-	switch (timeSig2) {
-			case  16: measure = timeSig1;  
-			break;
-			case  8: measure = timeSig1 * 2;
-					 halfBeat = measure/timeSig1;
-			break;
-			case  4: measure = timeSig1 * (int)Math.pow(2,2);  
-			break;
-			case  2: measure = timeSig1 * (int)Math.pow(2,3); 
-			break;
-			case  1: measure = timeSig1 * (int)Math.pow(2,4);  
-			break;
+	public MooViewCounter (MetaMessage[] timeSigs) {
+		// ...for now
+		int timeSig1 = 4, timeSig2 = 4;
+		calculateLineSpecs(timeSig1, timeSig2);
+		setBackground(Moosique.getGUI().bgColor);
+		setPreferredSize(new Dimension(35, 200 * CELL_HEIGHT));
+	}
+
+	private void calculateLineSpecs(int ts1, int ts2) {
+		switch (ts2) {
+			case 16: measure = ts1;  		// 1/16
+				 break;
+			case  8: measure = ts1 * 2;	// 1/16
+				 halfBeat = measure / ts1;	// 1/8
+				 break;
+			case  2: measure = ts1 * 8; 	// 1/16
+				 halfBeat = beat / 2;		// 1/8
+				 beat = halfNote / 2;		// 1/4
+				 halfNote = measure / ts1;	// 1/2
+				 break;
+			case  1: measure = ts1 * 16;	// 1/16
+				 halfBeat = beat / 2;		// 1/8
+				 beat = halfNote / 2;		// 1/4
+				 halfNote = measure / 2;	// 1/2
+				 break;
+			default: measure = ts1 * 4;	// 1/16
+				 halfBeat = beat / 2; 		// 1/8		
+				 beat = measure / ts1;	// 1/4	
+				 break;
 		}
-		
 	}
 
+	/**
+	 * Draws the ruler-like fields.
+	 * @param g The Graphics object it operates on.
+	 */
 	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);
+		g2.setColor(Color.black);
+
+
+		/* Using time signature...
+		for (int i = 0, tick = getTicksForPosition(i, 0, 0); tick < Moosique.getSequence().getTickLength(); i++) {
+			int[] ts = getTimeSig(tick);
+			calculateLineSpecs(ts[0], ts[1]);
+			g2.drawLine(0, c * CELL_HEIGHT, 5, c * CELL_HEIGHT); 					// 1/16
+			g2.drawLine(0, c * CELL_HEIGHT * halfBeat, 10, 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
+		}
+		*/
+
 		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/4),15,c*10*(beat/4)); 			// 1/4
-			g2.drawLine(0,c*10*(halfNote/2),20,c*10*(halfNote/2));	// 1/2
-			g2.drawLine(0,c*10*measure,35,c*10*measure);			// 1/1
-			
+			g2.drawLine(0, c * CELL_HEIGHT, 5, c * CELL_HEIGHT); 					// 1/16
+			g2.drawLine(0, c * CELL_HEIGHT * halfBeat, 10, 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
+}