Fixed the file loading. Now the program finds ALL the notes.

[moosique.git] / MooViewCounter.java

diff --git a/MooViewCounter.java b/MooViewCounter.java
index dcbd00cc16ff3dc4ca5ede73cf2c8b455823c912..d5f8d6b49c088fac7b63c72564c4c3828f773616 100644 (file)
--- a/MooViewCounter.java
+++ b/MooViewCounter.java
@@ -10,18 +10,17 @@ import java.awt.*;
  
 public class MooViewCounter extends JPanel {
 
-       private int timeSig1, timeSig2, measure, halfBeat, beat, halfNote;
+       private int measure, halfBeat, beat, halfNote;
        private static final int CELL_HEIGHT = 10;
        
        /** 
         * Creates an musical ruler depending on the timesignature
         */
 
-       public MooViewCounter (int ts1, int ts2) {
-               timeSig1 = ts1;
-               timeSig2 = ts2;
-               setBackground(Color.black);
+       public MooViewCounter (int timeSig1, int timeSig2) {
+               setBackground(Moosique.getGUI().bgColor);
                setPreferredSize(new Dimension(35, 200 * CELL_HEIGHT));
+
                switch (timeSig2) {
                        case  16: measure = timeSig1;           // 1/16
                                break;
@@ -51,7 +50,7 @@ public class MooViewCounter extends JPanel {
 
                if (!(g instanceof Graphics2D)) return;
                Graphics2D g2 = (Graphics2D)g;
-               g2.setColor(Color.white);
+               g2.setColor(Color.black);
                for (int c = 0; c < 200; c++) {
                        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