From d4b5d186a421c595172d850b0e9a5e5f171c966e Mon Sep 17 00:00:00 2001
From: Darth Affe <darthaffe@wyrez.org>
Date: Sun, 13 Aug 2017 12:30:42 +0200
Subject: [PATCH] Fixed visibility for disabled equalizers, added reset button

---
 .../AudioProcessing/AudioProcessor.cs         |   2 +-
 .../AudioProcessing/Equalizer/IEqualizer.cs   |   2 +
 .../Equalizer/MultiBandEqualizer.cs           |  18 ++-
 .../Converter/BoolToVisibilityConverter.cs    |   4 +-
 .../KeyboardAudioVisualizer.csproj            |   4 +
 .../Resources/KeyboardAudioVisualizer.xaml    |   2 +
 KeyboardAudioVisualizer/Styles/Button.xaml    |  41 +++++
 KeyboardAudioVisualizer/Styles/Theme.xaml     |   7 +
 .../Visualization/EqualizerVisualization.xaml | 142 ++++++++----------
 .../UI/Visualization/EqualizerVisualizer.cs   |  13 ++
 10 files changed, 154 insertions(+), 81 deletions(-)
 create mode 100644 KeyboardAudioVisualizer/Styles/Button.xaml

diff --git a/KeyboardAudioVisualizer/AudioProcessing/AudioProcessor.cs b/KeyboardAudioVisualizer/AudioProcessing/AudioProcessor.cs
index d1e51f1..aa50b5d 100644
--- a/KeyboardAudioVisualizer/AudioProcessing/AudioProcessor.cs
+++ b/KeyboardAudioVisualizer/AudioProcessing/AudioProcessor.cs
@@ -59,7 +59,7 @@ namespace KeyboardAudioVisualizer.AudioProcessing
             _spectrumProvider.Initialize();
 
             //TODO DarthAffe 03.08.2017: Initialize correctly; Settings
-            MultiBandEqualizer equalizer = new MultiBandEqualizer();
+            MultiBandEqualizer equalizer = new MultiBandEqualizer { IsEnabled = false };
             PrimaryVisualizationProvider = new FrequencyBarsVisualizationProvider(new FrequencyBarsVisualizationProviderConfiguration(), _spectrumProvider) { Equalizer = equalizer };
             //PrimaryVisualizationProvider = new BeatVisualizationProvider(new BeatVisualizationProviderConfiguration(), _spectrumProvider);
             PrimaryVisualizationProvider.Initialize();
diff --git a/KeyboardAudioVisualizer/AudioProcessing/Equalizer/IEqualizer.cs b/KeyboardAudioVisualizer/AudioProcessing/Equalizer/IEqualizer.cs
index 3c693ca..a5dd8b7 100644
--- a/KeyboardAudioVisualizer/AudioProcessing/Equalizer/IEqualizer.cs
+++ b/KeyboardAudioVisualizer/AudioProcessing/Equalizer/IEqualizer.cs
@@ -12,5 +12,7 @@ namespace KeyboardAudioVisualizer.AudioProcessing.Equalizer
 
         EqualizerBand AddBand(float offset, float modification);
         void RemoveBandBand(EqualizerBand band);
+
+        void Reset();
     }
 }
diff --git a/KeyboardAudioVisualizer/AudioProcessing/Equalizer/MultiBandEqualizer.cs b/KeyboardAudioVisualizer/AudioProcessing/Equalizer/MultiBandEqualizer.cs
index ca3aa21..56ef50a 100644
--- a/KeyboardAudioVisualizer/AudioProcessing/Equalizer/MultiBandEqualizer.cs
+++ b/KeyboardAudioVisualizer/AudioProcessing/Equalizer/MultiBandEqualizer.cs
@@ -14,7 +14,12 @@ namespace KeyboardAudioVisualizer.AudioProcessing.Equalizer
 
         private readonly Dictionary<int, float[]> _values = new Dictionary<int, float[]>();
 
-        public bool IsEnabled { get; set; } = true;
+        private bool _isEnabled;
+        public bool IsEnabled
+        {
+            get => _isEnabled;
+            set => SetProperty(ref _isEnabled, value);
+        }
 
         #endregion
 
@@ -22,8 +27,7 @@ namespace KeyboardAudioVisualizer.AudioProcessing.Equalizer
 
         public MultiBandEqualizer()
         {
-            AddBand(0, 0, true);
-            AddBand(1, 0, true);
+            Reset();
         }
 
         #endregion
@@ -51,6 +55,13 @@ namespace KeyboardAudioVisualizer.AudioProcessing.Equalizer
             InvalidateCache();
         }
 
+        public void Reset()
+        {
+            Bands.Clear();
+            AddBand(0, 0, true);
+            AddBand(1, 0, true);
+        }
+
         public float[] CalculateValues(int count)
         {
             if (!_values.TryGetValue(count, out float[] values))
@@ -66,6 +77,7 @@ namespace KeyboardAudioVisualizer.AudioProcessing.Equalizer
             float[] values = new float[count];
 
             List<EqualizerBand> orderedBands = Bands.OrderBy(x => x.Offset).ToList();
+            if (orderedBands.Count < 2) return values;
 
             for (int i = 0; i < count; i++)
             {
diff --git a/KeyboardAudioVisualizer/Converter/BoolToVisibilityConverter.cs b/KeyboardAudioVisualizer/Converter/BoolToVisibilityConverter.cs
index 50958ca..42aafb2 100644
--- a/KeyboardAudioVisualizer/Converter/BoolToVisibilityConverter.cs
+++ b/KeyboardAudioVisualizer/Converter/BoolToVisibilityConverter.cs
@@ -10,7 +10,9 @@ namespace KeyboardAudioVisualizer.Converter
     {
         #region Methods
 
-        public object Convert(object value, Type targetType, object parameter, CultureInfo culture) => (value as bool?) == true ? Visibility.Visible : Visibility.Collapsed;
+        public object Convert(object value, Type targetType, object parameter, CultureInfo culture)
+            => (value as bool?) == true ? Visibility.Visible
+            : (string.Equals(parameter?.ToString(), "true", StringComparison.OrdinalIgnoreCase) ? Visibility.Hidden : Visibility.Collapsed);
 
         public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture) => value as Visibility? == Visibility.Visible;
 
diff --git a/KeyboardAudioVisualizer/KeyboardAudioVisualizer.csproj b/KeyboardAudioVisualizer/KeyboardAudioVisualizer.csproj
index 274534d..8988d84 100644
--- a/KeyboardAudioVisualizer/KeyboardAudioVisualizer.csproj
+++ b/KeyboardAudioVisualizer/KeyboardAudioVisualizer.csproj
@@ -206,6 +206,10 @@
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
     </Page>
+    <Page Include="Styles\Button.xaml">
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+    </Page>
     <Page Include="Styles\ImageButton.xaml">
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
diff --git a/KeyboardAudioVisualizer/Resources/KeyboardAudioVisualizer.xaml b/KeyboardAudioVisualizer/Resources/KeyboardAudioVisualizer.xaml
index e67945c..6dd28ce 100644
--- a/KeyboardAudioVisualizer/Resources/KeyboardAudioVisualizer.xaml
+++ b/KeyboardAudioVisualizer/Resources/KeyboardAudioVisualizer.xaml
@@ -12,6 +12,7 @@
         <styles:CachedResourceDictionary Source="/KeyboardAudioVisualizer;component/Styles/GroupBox.xaml" />
         <styles:CachedResourceDictionary Source="/KeyboardAudioVisualizer;component/Styles/ToolTip.xaml" />
         <styles:CachedResourceDictionary Source="/KeyboardAudioVisualizer;component/Styles/ComboBox.xaml" />
+        <styles:CachedResourceDictionary Source="/KeyboardAudioVisualizer;component/Styles/Button.xaml" />
     </styles:CachedResourceDictionary.MergedDictionaries>
 
     <converter:EqualsToBoolConverter x:Key="EqualsToBoolConverter" />
@@ -24,6 +25,7 @@
     <Style TargetType="GroupBox" BasedOn="{StaticResource StyleGroupBoxBox}" />
     <Style TargetType="ToolTip" BasedOn="{StaticResource StyleToolTip}" />
     <Style TargetType="ComboBox" BasedOn="{StaticResource StyleComboBox}" />
+    <Style TargetType="Button" BasedOn="{StaticResource StyleButton}" />
 
 </styles:CachedResourceDictionary>
 
diff --git a/KeyboardAudioVisualizer/Styles/Button.xaml b/KeyboardAudioVisualizer/Styles/Button.xaml
new file mode 100644
index 0000000..a890e72
--- /dev/null
+++ b/KeyboardAudioVisualizer/Styles/Button.xaml
@@ -0,0 +1,41 @@
+<styles:CachedResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+                                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                                    xmlns:styles="clr-namespace:KeyboardAudioVisualizer.Styles">
+
+    <styles:CachedResourceDictionary.MergedDictionaries>
+        <styles:CachedResourceDictionary Source="/KeyboardAudioVisualizer;component/Styles/FrameworkElement.xaml" />
+        <styles:CachedResourceDictionary Source="/KeyboardAudioVisualizer;component/Styles/Theme.xaml" />
+    </styles:CachedResourceDictionary.MergedDictionaries>
+
+    <Style x:Key="StyleButton" 
+           BasedOn="{StaticResource StyleFrameworkElement}"
+           TargetType="Button">
+        <Setter Property="Foreground" Value="{StaticResource BrushButtonForeground}" />
+        <Setter Property="FontSize" Value="{StaticResource FontSizeDefault}" />
+        <Setter Property="FontFamily" Value="pack://application:,,,/Resources/#Cinzel" />
+        <Setter Property="Background" Value="{StaticResource BrushButtonBackground}" />
+        <Setter Property="BorderBrush" Value="{StaticResource BrushButtonBorder}" />
+        <Setter Property="BorderThickness" Value="2" />
+        <Setter Property="Padding" Value="4,2" />
+
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="Button">
+                    <Border BorderThickness="{TemplateBinding BorderThickness}" 
+                            BorderBrush="{TemplateBinding BorderBrush}" 
+                            Background="{TemplateBinding Background}">
+                        <ContentPresenter Margin="{TemplateBinding Padding}" />
+                    </Border>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+        
+        <Style.Triggers>
+            <Trigger Property="IsMouseOver" Value="True">
+                <Setter Property="Background" Value="{StaticResource BrushButtonHover}" />
+            </Trigger>
+        </Style.Triggers>
+    </Style>
+
+</styles:CachedResourceDictionary>
+    
\ No newline at end of file
diff --git a/KeyboardAudioVisualizer/Styles/Theme.xaml b/KeyboardAudioVisualizer/Styles/Theme.xaml
index f70bf72..1dfdea1 100644
--- a/KeyboardAudioVisualizer/Styles/Theme.xaml
+++ b/KeyboardAudioVisualizer/Styles/Theme.xaml
@@ -29,12 +29,19 @@
     <SolidColorBrush x:Key="BrushTooltipBorder" presentationOptions:Freeze="True" Color="{StaticResource ColorJetBlack}" />
     <SolidColorBrush x:Key="BrushTooltipBackground" presentationOptions:Freeze="True" Color="{StaticResource ColorJetBlackTransparent}" />
 
+    <!-- GroupBox -->
     <SolidColorBrush x:Key="BrushComboBoxForeground" presentationOptions:Freeze="True" Color="{StaticResource ColorGainsboro}" />
     <SolidColorBrush x:Key="BrushComboBoxBackground" presentationOptions:Freeze="True" Color="{StaticResource ColorBuckinghamGrayTransparent}" />
     <SolidColorBrush x:Key="BrushComboBoxBackgroundPopup" presentationOptions:Freeze="True" Color="{StaticResource ColorBuckinghamGray}" />
     <SolidColorBrush x:Key="BrushComboBoxBorder" presentationOptions:Freeze="True" Color="{StaticResource ColorJetBlackTransparent}" />
     <SolidColorBrush x:Key="BrushComboBoxHover" presentationOptions:Freeze="True" Color="{StaticResource ColorJetBlack}" />
 
+    <!-- Button -->
+    <SolidColorBrush x:Key="BrushButtonForeground" presentationOptions:Freeze="True" Color="{StaticResource ColorGainsboro}" />
+    <SolidColorBrush x:Key="BrushButtonBackground" presentationOptions:Freeze="True" Color="{StaticResource ColorBuckinghamGrayTransparent}" />
+    <SolidColorBrush x:Key="BrushButtonBorder" presentationOptions:Freeze="True" Color="{StaticResource ColorJetBlackTransparent}" />
+    <SolidColorBrush x:Key="BrushButtonHover" presentationOptions:Freeze="True" Color="{StaticResource ColorJetBlack}" />
+
     <!-- Navigation -->
     <SolidColorBrush x:Key="BrushNavigationItem" presentationOptions:Freeze="True" Color="{StaticResource ColorGainsboro}" />
     <SolidColorBrush x:Key="BrushNavigationItemBlur" presentationOptions:Freeze="True" Color="{StaticResource ColorBananaYellow}" />
diff --git a/KeyboardAudioVisualizer/UI/Visualization/EqualizerVisualization.xaml b/KeyboardAudioVisualizer/UI/Visualization/EqualizerVisualization.xaml
index fbd2cdc..d44f372 100644
--- a/KeyboardAudioVisualizer/UI/Visualization/EqualizerVisualization.xaml
+++ b/KeyboardAudioVisualizer/UI/Visualization/EqualizerVisualization.xaml
@@ -23,100 +23,90 @@
         <Setter Property="Template">
             <Setter.Value>
                 <ControlTemplate TargetType="{x:Type visualization:EqualizerVisualizer}">
-                    <Grid x:Name="Container" Background="Transparent">
-                        <Polyline x:Name="PART_Line" Stroke="White" StrokeThickness="2" StrokeLineJoin="Round">
-                            <Polyline.Points>
-                                <MultiBinding Converter="{StaticResource EqualizerBandsToPointsConverter}" ConverterParameter="120">
-                                    <Binding RelativeSource="{RelativeSource TemplatedParent}" Path="Equalizer" />
-                                    <Binding RelativeSource="{RelativeSource TemplatedParent}" Path="Equalizer.Bands" />
-                                    <Binding Path="ActualWidth" ElementName="Container" />
-                                    <Binding Path="ActualHeight" ElementName="Container" />
-                                </MultiBinding>
-                            </Polyline.Points>
-                        </Polyline>
+                    <Grid>
+                        <Grid x:Name="Container" Background="Transparent"
+                              Visibility="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=Equalizer.IsEnabled, Converter={StaticResource BoolToVisibilityConverter}}">
+                            <Polyline x:Name="PART_Line" Stroke="White" StrokeThickness="2" StrokeLineJoin="Round">
+                                <Polyline.Points>
+                                    <MultiBinding Converter="{StaticResource EqualizerBandsToPointsConverter}" ConverterParameter="120">
+                                        <Binding RelativeSource="{RelativeSource TemplatedParent}" Path="Equalizer" />
+                                        <Binding RelativeSource="{RelativeSource TemplatedParent}" Path="Equalizer.Bands" />
+                                        <Binding Path="ActualWidth" ElementName="Container" />
+                                        <Binding Path="ActualHeight" ElementName="Container" />
+                                    </MultiBinding>
+                                </Polyline.Points>
+                            </Polyline>
 
-                        <ItemsControl x:Name="PART_Grips" Opacity="0"
-                                      Visibility="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=Equalizer.IsEnabled, Converter={StaticResource BoolToVisibilityConverter}}"
-                                      ItemsSource="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=Equalizer.Bands}">
-                            <ItemsControl.ItemsPanel>
-                                <ItemsPanelTemplate>
-                                    <Canvas />
-                                </ItemsPanelTemplate>
-                            </ItemsControl.ItemsPanel>
+                            <ItemsControl x:Name="PART_Grips" Opacity="0"
+                                          ItemsSource="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=Equalizer.Bands}">
+                                <ItemsControl.ItemsPanel>
+                                    <ItemsPanelTemplate>
+                                        <Canvas />
+                                    </ItemsPanelTemplate>
+                                </ItemsControl.ItemsPanel>
 
-                            <ItemsControl.ItemTemplate>
-                                <DataTemplate DataType="equalizer:EqualizerBand">
-                                    <Border Width="24" Height="24" CornerRadius="12"
-                                            BorderThickness="3" BorderBrush="{StaticResource BrushEqualizerBorder}"
-                                            Background="{StaticResource BrushEqualizerBackground}" />
-                                </DataTemplate>
-                            </ItemsControl.ItemTemplate>
+                                <ItemsControl.ItemTemplate>
+                                    <DataTemplate DataType="equalizer:EqualizerBand">
+                                        <Border Width="24" Height="24" CornerRadius="12"
+                                                BorderThickness="3" BorderBrush="{StaticResource BrushEqualizerBorder}"
+                                                Background="{StaticResource BrushEqualizerBackground}" />
+                                    </DataTemplate>
+                                </ItemsControl.ItemTemplate>
 
-                            <ItemsControl.ItemContainerStyle>
-                                <Style TargetType="ContentPresenter">
-                                    <Setter Property="Canvas.Left">
-                                        <Setter.Value>
-                                            <MultiBinding Converter="{StaticResource OffsetToPosXConverter}" ConverterParameter="12">
-                                                <Binding Path="Offset" />
-                                                <Binding Path="ActualWidth" ElementName="PART_Grips" />
-                                            </MultiBinding>
-                                        </Setter.Value>
-                                    </Setter>
-                                    <Setter Property="Canvas.Top">
-                                        <Setter.Value>
-                                            <MultiBinding Converter="{StaticResource ValueToPosYConverter}" ConverterParameter="12">
-                                                <Binding Path="Value" />
-                                                <Binding Path="ActualHeight" ElementName="PART_Grips" />
-                                            </MultiBinding>
-                                        </Setter.Value>
-                                    </Setter>
-                                </Style>
-                            </ItemsControl.ItemContainerStyle>
-                        </ItemsControl>
+                                <ItemsControl.ItemContainerStyle>
+                                    <Style TargetType="ContentPresenter">
+                                        <Setter Property="Canvas.Left">
+                                            <Setter.Value>
+                                                <MultiBinding Converter="{StaticResource OffsetToPosXConverter}" ConverterParameter="12">
+                                                    <Binding Path="Offset" />
+                                                    <Binding Path="ActualWidth" ElementName="PART_Grips" />
+                                                </MultiBinding>
+                                            </Setter.Value>
+                                        </Setter>
+                                        <Setter Property="Canvas.Top">
+                                            <Setter.Value>
+                                                <MultiBinding Converter="{StaticResource ValueToPosYConverter}" ConverterParameter="12">
+                                                    <Binding Path="Value" />
+                                                    <Binding Path="ActualHeight" ElementName="PART_Grips" />
+                                                </MultiBinding>
+                                            </Setter.Value>
+                                        </Setter>
+                                    </Style>
+                                </ItemsControl.ItemContainerStyle>
+                            </ItemsControl>
+                        </Grid>
+
+                        <StackPanel VerticalAlignment="Top" HorizontalAlignment="Left"
+                                    Margin="0,-4,0,0" Orientation="Horizontal">
+                            <CheckBox VerticalAlignment="Center" Content="Enable Equalizer"
+                                      Foreground="{StaticResource BrushForeground}"
+                                      IsChecked="{Binding Path=Equalizer.IsEnabled, RelativeSource={RelativeSource TemplatedParent}}" />
+
+                            <Button VerticalAlignment="Center" Margin="12,0,0,0" 
+                                    Visibility="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=Equalizer.IsEnabled, Converter={StaticResource BoolToVisibilityConverter}, ConverterParameter=True}"
+                                    Content="Reset" Command="{TemplateBinding ResetCommand}" />
+                        </StackPanel>
                     </Grid>
 
                     <ControlTemplate.Triggers>
-                        <MultiDataTrigger>
-                            <MultiDataTrigger.Conditions>
-                                <Condition Binding="{Binding Path=IsMouseOver, RelativeSource={RelativeSource TemplatedParent}}" Value="True" />
-                                <!--<Condition Binding="{Binding Path=Equalizer.IsEnabled, RelativeSource={RelativeSource AncestorType={x:Type visualization:EqualizerVisualizer}}}" Value="True" />-->
-                            </MultiDataTrigger.Conditions>
-                            <MultiDataTrigger.EnterActions>
+                        <Trigger Property="IsMouseOver" Value="True">
+                            <Trigger.EnterActions>
                                 <BeginStoryboard>
                                     <Storyboard>
                                         <DoubleAnimation Duration="0:0:0.2" To="1"
                                                          Storyboard.TargetName="PART_Grips" Storyboard.TargetProperty="Opacity" />
                                     </Storyboard>
                                 </BeginStoryboard>
-                            </MultiDataTrigger.EnterActions>
-                            <MultiDataTrigger.ExitActions>
+                            </Trigger.EnterActions>
+                            <Trigger.ExitActions>
                                 <BeginStoryboard>
                                     <Storyboard>
                                         <DoubleAnimation Duration="0:0:0.25" To="0"
                                                          Storyboard.TargetName="PART_Grips" Storyboard.TargetProperty="Opacity" />
                                     </Storyboard>
                                 </BeginStoryboard>
-                            </MultiDataTrigger.ExitActions>
-                        </MultiDataTrigger>
-
-                        <!--<DataTrigger Binding="{Binding Path=Equalizer.IsEnabled, RelativeSource={RelativeSource AncestorType={x:Type visualization:EqualizerVisualizer}}}" Value="False">
-                            <DataTrigger.EnterActions>
-                                <BeginStoryboard>
-                                    <Storyboard>
-                                        <DoubleAnimation Duration="0:0:0.2" To="1"
-                                                         Storyboard.TargetName="PART_Line" Storyboard.TargetProperty="Opacity" />
-                                    </Storyboard>
-                                </BeginStoryboard>
-                            </DataTrigger.EnterActions>
-                            <DataTrigger.ExitActions>
-                                <BeginStoryboard>
-                                    <Storyboard>
-                                        <DoubleAnimation Duration="0:0:0.25" To="0"
-                                                         Storyboard.TargetName="PART_Line" Storyboard.TargetProperty="Opacity" />
-                                    </Storyboard>
-                                </BeginStoryboard>
-                            </DataTrigger.ExitActions>
-                        </DataTrigger>-->
+                            </Trigger.ExitActions>
+                        </Trigger>
                     </ControlTemplate.Triggers>
                 </ControlTemplate>
             </Setter.Value>
diff --git a/KeyboardAudioVisualizer/UI/Visualization/EqualizerVisualizer.cs b/KeyboardAudioVisualizer/UI/Visualization/EqualizerVisualizer.cs
index e8f5210..5c7c8a1 100644
--- a/KeyboardAudioVisualizer/UI/Visualization/EqualizerVisualizer.cs
+++ b/KeyboardAudioVisualizer/UI/Visualization/EqualizerVisualizer.cs
@@ -22,6 +22,15 @@ namespace KeyboardAudioVisualizer.UI.Visualization
             set => SetValue(EqualizerProperty, value);
         }
 
+        public static readonly DependencyProperty ResetCommandProperty = DependencyProperty.Register(
+            "ResetCommand", typeof(ICommand), typeof(EqualizerVisualizer), new PropertyMetadata(null));
+
+        public ICommand ResetCommand
+        {
+            get => (ICommand)GetValue(ResetCommandProperty);
+            set => SetValue(ResetCommandProperty, value);
+        }
+
         // ReSharper restore InconsistentNaming
         #endregion
 
@@ -34,6 +43,10 @@ namespace KeyboardAudioVisualizer.UI.Visualization
 
         #region Constructors
 
+        public EqualizerVisualizer()
+        {
+            ResetCommand = new ActionCommand(() => Equalizer?.Reset());
+        }
 
         #endregion