Changeset 354

Timestamp:

10/09/08 23:00:37 (16 years ago)

Author:

bjn8

Message:

A improved rendered

File:

• trunk/src_apollo/org/apollo/gui/WaveFormRenderProccessingUnit.java (modified) (3 diffs)

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

@@ -113 +113 @@
                 private WaveFormRenderTask currentTask;
                 
-                private final static float AMPLITUDES_PER_PIXEL = 0.5f; // resolution: how many amplitudes per pixel to render 
+                private final static float AMPLITUDES_PER_PIXEL = 1.0f; // resolution: how many amplitudes per pixel to render 
                 private final static int FRAME_RENDER_RATE = 2000; // The approximate amount of frames to render per pass
                 
@@ -236 +236 @@
                                                 g.setColor(ApolloColorIndexedModels.WAVEFORM_COLOR);
                                                 
-                                                for (float h : amps) {
-                                                        
-                                                        int x = (int)(currentAmplitude * ((float)bufferWidth / (float)(totalAmplitudes - 1))); 
-                                                        int y = halfMaxHeight - (int)(h * halfMaxHeight);
-                                                        
-                                                        if (currentAmplitude == 0) { // never draw line on first point
-                                                                
-                                                                lastXPosition = 0;
-                                                                lastYPosition = y;
-                                                                
-                                                        } else {
-                                
-                                                                g.drawLine(
-                                                                                lastXPosition, 
-                                                                                lastYPosition, 
-                                                                                x, 
-                                                                                y);
-                                                                
-                                                                lastXPosition = x;
-                                                                lastYPosition = y;
-                                                                
+                                                if (aggregationSize == 1) {
+                                                
+                                                        for (float h : amps) {
+                                                                
+                                                                int x = (int)(currentAmplitude * ((float)bufferWidth / (float)(totalAmplitudes - 1))); 
+                                                                int y = halfMaxHeight - (int)(h * halfMaxHeight);
+                                                                
+                                                                if (currentAmplitude == 0) { // never draw line on first point
+                                                                        
+                                                                        lastXPosition = 0;
+                                                                        lastYPosition = y;
+                                                                        
+                                                                } else {
+                                        
+                                                                        g.drawLine(
+                                                                                        lastXPosition, 
+                                                                                        lastYPosition, 
+                                                                                        x, 
+                                                                                        y);
+                                                                        
+                                                                        lastXPosition = x;
+                                                                        lastYPosition = y;
+                                                                        
+                                                                }
+                                                                
+                                                                currentAmplitude ++;
                                                         }
                                                         
-                                                        currentAmplitude ++;
+                                                } else { // dual version - looks nicer and conceptually easy to see audio
+                                                        
+                                                        for (int i = 0; i < amps.length; i+=2) {
+                                                                
+                                                                float peak = amps[i];
+                                                                float trough = amps[i + 1];
+                
+                                                                int x = (int)(currentAmplitude * ((float)bufferWidth / (float)(totalAmplitudes - 1))); 
+                                                                int ypeak = halfMaxHeight - (int)(peak * halfMaxHeight);
+                                                                int ytrough = halfMaxHeight - (int)(trough * halfMaxHeight);
+                                                                
+                                                                if (currentAmplitude == 0) { // never draw line on first point
+                                                                        
+                                                                        lastXPosition = lastYPosition = 0;
+                                                                        
+                                                                } else {
+                                        
+                                                                        g.drawLine(
+                                                                                        x, 
+                                                                                        ypeak, 
+                                                                                        x, 
+                                                                                        ytrough);
+                                                                        
+                                                                        lastXPosition = x;
+                                                                        lastYPosition = 0;
+                                                                        
+                                                                }
+                                                                
+                                                                currentAmplitude ++;
+                                                        }
+                                                        
                                                 }
                                                 
@@ -335 +370 @@
                         this.frameLength = frameLength;
                         this.recommendInvalidations = recommendInvalidations;
-                        renderer = new PeakTroughWaveFormRenderer(format);
+                        renderer = new DualPeakTroughWaveFormRenderer(format);
                 }