non-symmetric drawing, separate brush for bottom section

markheath · Sep 13, 2012 · f8dc22c · f8dc22c
1 parent 1de56c6
commit f8dc22c
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 5 deletions.
diff --git a/WpfWaveform/MainWindow.xaml b/WpfWaveform/MainWindow.xaml
@@ -18,6 +18,8 @@
             <RadioButton VerticalAlignment="Center" Margin="5,0" Name="radioButtonVertical" Content="Vertical" />
             <Label VerticalAlignment="Center">Fill:</Label>
             <toolkitx:ColorPicker Name="colorPickerFill" />
+            <Label VerticalAlignment="Center">Bottom:</Label>
+            <toolkitx:ColorPicker Name="colorPickerBottom" />
             <Label VerticalAlignment="Center">Outline:</Label>
             <toolkitx:ColorPicker Name="colorPickerOutline" />
         </StackPanel>

diff --git a/WpfWaveform/MainWindow.xaml.cs b/WpfWaveform/MainWindow.xaml.cs
@@ -25,7 +25,8 @@ public MainWindow()
         {
             InitializeComponent();
             this.radioButtonBezier.IsChecked = true;
-            this.colorPickerFill.SelectedColor = Colors.LightGray;
+            this.colorPickerFill.SelectedColor = Colors.Gray;
+            this.colorPickerBottom.SelectedColor = Colors.LightGray;
             this.colorPickerOutline.SelectedColor = Colors.SlateGray;
 
             this.colorPickerFill.SelectedColorChanged += OnDrawingPropertyChanged;
@@ -52,7 +53,8 @@ private void Button_Click(object sender, RoutedEventArgs e)
             if (result.HasValue && result.Value)
             {
                 var generator = new WaveFormPointsGenerator();
-                this.mipMap = generator.GetPeaks(ofd.FileName, 4100);
+                // 4100 = 10 points per second
+                this.mipMap = generator.GetPeaks(ofd.FileName, 22050);
                 GenerateWaveform();
             }
         }
@@ -64,20 +66,26 @@ private void GenerateWaveform()
             var generator = new WaveFormPointsGenerator();
             Brush strokeBrush = new SolidColorBrush(colorPickerOutline.SelectedColor);
             Brush fillBrush = new SolidColorBrush(colorPickerFill.SelectedColor);
+            Brush bottomBrush = new SolidColorBrush(colorPickerBottom.SelectedColor);
             canvas.Children.Clear();
             var topPoints = mipMap.Peaks.Select(p => p.Channels[0].Max / 32768.0);
             var bottomPoints = mipMap.Peaks.Select(p => p.Channels[0].Min / 32768.0);
 
             if (radioButtonVertical.IsChecked.Value)
             {
-                var path = generator.GetAsVerticalLines(topPoints, bottomPoints, 0, 110, -100, strokeBrush);
+                double xOffset = 0.5;
+                var path = generator.GetAsVerticalLines(topPoints, bottomPoints, xOffset, 110, -100, strokeBrush);
                 canvas.Children.Add(path);
             }
             else
             {
                 if (!checkBoxOutline.IsChecked.Value) strokeBrush = null;
-                var topPath = radioButtonBezier.IsChecked.Value ? generator.GetBezierPath(topPoints, 0, 2, 110, -100, strokeBrush, fillBrush) : generator.GetLinearPath(topPoints, 0, 2, 110, -100, strokeBrush, fillBrush);
-                var bottomPath = radioButtonBezier.IsChecked.Value ? generator.GetBezierPath(bottomPoints, 0, 2, 110, -100, strokeBrush, fillBrush) : generator.GetLinearPath(bottomPoints, 0, 2, 110, -100, strokeBrush, fillBrush);
+                double xStep = 1; // was 2
+                double yMultTop = -100;
+                double yMultBottom = -25;
+
+                var topPath = radioButtonBezier.IsChecked.Value ? generator.GetBezierPath(topPoints, 0, xStep, 110, yMultTop, strokeBrush, fillBrush) : generator.GetLinearPath(topPoints, 0, xStep, 110, yMultTop, strokeBrush, fillBrush);
+                var bottomPath = radioButtonBezier.IsChecked.Value ? generator.GetBezierPath(bottomPoints, 0, xStep, 110, yMultBottom, strokeBrush, bottomBrush) : generator.GetLinearPath(bottomPoints, 0, xStep, 110, yMultBottom, strokeBrush, bottomBrush);
                 canvas.Children.Add(topPath);
                 canvas.Children.Add(bottomPath);
             }