nu är den klar

[moosique.git] / MooViewCounter.java

diff --git a/MooViewCounter.java b/MooViewCounter.java
index 83e40a650f0f8d72a7439c4196367a5185475241..3c766014c1f203971e9513883c5139654f80f141 100644 (file)
--- a/MooViewCounter.java
+++ b/MooViewCounter.java
@@ -10,33 +10,33 @@ import java.awt.*;
  
 public class MooViewCounter extends JPanel {
 
-       private int measure, halfBeat, beat, halfNote;
+       private int timeSig1, timeSig2, measure, halfBeat, beat, halfNote;
 
        /** 
         * Creates 
         */
-       private int timeSig1, timeSig2;
-        
        public MooViewCounter (int ts1, int ts2) {
                timeSig1 = ts1;
                timeSig2 = ts2;
+               setBackground(Color.black);
+               setPreferredSize(new Dimension(35,200*10));
                
-       switch (timeSig2) {
+               switch (timeSig2) {
                        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;
@@ -47,17 +47,15 @@ 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*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,35,c*10*measure);                    // 1/1
+                       g2.drawLine(0,c*10*measure,30,c*10*measure);                    // 1/1
                        
                }
        }