Changeset 368

Timestamp:

10/11/08 16:40:26 (16 years ago)

Author:

bjn8

Message:

 

Location:

trunk/src_apollo/org/apollo

Files:

• audio/util/AmplifyPCM.java (added)
• gui/TimeAxis.java (modified) (6 diffs)

trunk/src_apollo/org/apollo/gui/TimeAxis.java

@@ -25 +25 @@
         public static final Font TIME_BAR_FONT = new Font("Arial", Font.PLAIN, 14);
         private static final Stroke TICK_STROKE = Strokes.SOLID_1;
+        
+        private static final Color MAJOR_TICK_COLOR = Color.BLACK;
+        private static final Color MINOR_TICK_COLOR = new Color(0.4f, 0.4f, 0.4f);
         
         private static final int DESIRED_MAJOR_TICK_PIXEL_SPACING = 100;
@@ -210 +213 @@
         
                                 // Skip major positions
-                                if (((tx - majorTickXStart) % majorTickPixelSpacing) == 0) 
+                                if (((tx - majorTickXStart) % majorTickPixelSpacing) <= 4) // could be a pixel out 
                                         tx += minorTickPixelSpacing;
                                 
@@ -311 +314 @@
         public void paint(Graphics g, int x, int y, int height, Color backgroundColor) {
                 
-                if (majorTickXPositions == null) return;
-                
                 int majorTickHeight = height / 2;
                 int minorTickHeight = height / 4;
@@ -321 +322 @@
                 
                 g.setFont(TIME_BAR_FONT);
-                g.setColor(Color.BLACK);
-                ((Graphics2D)g).setStroke(TICK_STROKE);
-                
-                if (majorTickLabels != null) {
-        
-        
+                
+                if (majorTickXPositions != null) {
+
+                        ((Graphics2D)g).setStroke(TICK_STROKE);
+                        
+                        g.setColor(MAJOR_TICK_COLOR);
                         // Draw Major ticks and labels
                         for (int i = 0; i < majorTickLabels.length; i++) {
@@ -344 +345 @@
                                 
                         }
+                        
+                        g.setColor(MINOR_TICK_COLOR);
                         
                         // Draw minor ticks
@@ -358 +361 @@
                 } else if (alternateLabel != null) {
                         
+                        g.setColor(Color.BLACK);
+                        
                         FontMetrics fm   = g.getFontMetrics(TIME_BAR_FONT);
                         Rectangle2D rect = fm.getStringBounds(alternateLabel, g);