tror den är klar

diff --git a/MooViewCounter.java b/MooViewCounter.java
index 5153912c19e2d8f1f32a63be2fc2043e3bd3e1c3..83e40a650f0f8d72a7439c4196367a5185475241 100644 (file)
--- a/MooViewCounter.java
+++ b/MooViewCounter.java
@@ -10,10 +10,7 @@ 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[];
 
        /** 
         * Creates 
@@ -30,11 +27,19 @@ public class MooViewCounter extends JPanel {
                        case  8: measure = timeSig1 * 2;
                                         halfBeat = measure/timeSig1;
                        break;
-                       case  4: measure = timeSig1 * (int)Math.pow(2,2);  
+                       case  4: measure = timeSig1 * (int)Math.pow(2,2);
+                                        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;
                        break;
-                       case  1: measure = timeSig1 * (int)Math.pow(2,4);  
+                       case  1: measure = timeSig1 * (int)Math.pow(2,4);
+                                    halfNote = measure/2;
+                                        beat = halfNote/2;
+                                        halfBeat = beat/2;
                        break;
                }
                
@@ -50,8 +55,8 @@ public class MooViewCounter extends JPanel {
                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*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
                        
                }