nu är den klar

[moosique.git] / MooViewCounter.java

diff --git a/MooViewCounter.java b/MooViewCounter.java
index bb06eac5720a4e80d849e11c4984c9ea9619d932..3c766014c1f203971e9513883c5139654f80f141 100644 (file)
--- a/MooViewCounter.java
+++ b/MooViewCounter.java
@@ -25,18 +25,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;