Merge pull request #6 from coraxx/avalonia11

Avalonia11

Author: coraxx

Libs/ScottPlot.Avalonia.deps.json

@@ -3,7 +3,7 @@ Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio Version 17
 VisualStudioVersion = 17.5.33502.453
 MinimumVisualStudioVersion = 10.0.40219.1
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MergeSync", "MergeSynced\MergeSynced.csproj", "{C40C709A-CA51-4A72-891B-54C1EA72758C}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MergeSynced", "MergeSynced\MergeSynced.csproj", "{C40C709A-CA51-4A72-891B-54C1EA72758C}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution

Libs/ScottPlot.Avalonia.dll

@@ -1,17 +1,28 @@
 <Application xmlns="https://github.com/avaloniaui"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              xmlns:local="using:MergeSynced"
-             x:Class="MergeSynced.App" Name="MergeSynced">
+             x:Class="MergeSynced.App"
+             Name="MergeSynced"
+             RequestedThemeVariant="Default">
 
 	<NativeMenu.Menu>
 		<NativeMenu>
-			<NativeMenuItem Header="About Merge Synced" Click="AboutMenuItem_OnClick" />
+			<NativeMenuItem Header="About MergeSynced" Click="AboutMenuItem_OnClick" />
 		</NativeMenu>
 	</NativeMenu.Menu>
 
     <Application.Styles>
-        <FluentTheme Mode="Light"/>
-        <!--<StyleInclude Source="/Controls/CustomCheckBox.axaml" />-->
+        <FluentTheme>
+            <FluentTheme.Palettes>
+                <ColorPaletteResources x:Key="Dark"
+                                       RegionColor="#FF232323"
+                                       AltHigh="#FF232323"
+                                       AltLow="#FF232323"
+                                       AltMedium="#FF232323"
+                                       AltMediumHigh="#FF232323"
+                                       AltMediumLow="#FF232323"  />
+            </FluentTheme.Palettes>
+        </FluentTheme>
     </Application.Styles>
 
     <Application.Resources>

Libs/ScottPlot.deps.json

@@ -1,8 +1,9 @@
 using System;
 using Avalonia;
 using Avalonia.Controls.ApplicationLifetimes;
+using Avalonia.Data.Core.Plugins;
 using Avalonia.Markup.Xaml;
-using MergeSynced.ViewModels;
+using MergeSynced.Views;
 
 namespace MergeSynced
 {
@@ -17,7 +18,10 @@ public override void OnFrameworkInitializationCompleted()
         {
             if (ApplicationLifetime is IClassicDesktopStyleApplicationLifetime desktop)
             {
-                desktop.MainWindow = new Views.MainWindow();
+                // Line below is needed to remove Avalonia data validation.
+                // Without this line you will get duplicate validations from both Avalonia and CT
+                BindingPlugins.DataValidators.RemoveAt(0);
+                desktop.MainWindow = new MainWindow();
             }
 
             base.OnFrameworkInitializationCompleted();

Libs/ScottPlot.dll

@@ -17,7 +17,7 @@ public class WavTools
         /// <param name="l">Output of left channel</param>
         /// <param name="r">Output of right channel</param>
         /// <returns>Details of wav file</returns>
-        public WavHeader? ReadWav(string filename, out float[]? l, out float[]? r)
+        public static WavHeader? ReadWav(string filename, out float[]? l, out float[]? r)
         {
             l = r = null;
 
@@ -161,7 +161,7 @@ public class WavTools
         /// <param name="filename">Path to file name</param>
         /// <param name="m">Output of left channel</param>
         /// <returns>Details of wav file</returns>
-        public WavHeader? ReadWav(string filename, out float[]? m)
+        public static WavHeader? ReadWav(string filename, out float[]? m)
         {
             m = null;
 
@@ -290,5 +290,86 @@ public class WavTools
                 return null;
             }
         }
+
+        /// <summary>
+        /// Source: https://gist.github.com/adrianseeley/264417d295ccd006e7fd
+        /// </summary>
+        /// <param name="array">Input data</param>
+        /// <param name="length">Length of return array</param>
+        /// <returns></returns>
+        public static float[] Downsample(float[] array, int length)
+        {
+            int insert = 0;
+            float[] window = new float[length];
+            float[] windowX = new float[length];
+            int bucketSizeLessStartAndEnd = length - 2;
+
+            float bucketSize = (float)(array.Length - 2) / bucketSizeLessStartAndEnd;
+            int a = 0;
+            int nextA = 0;
+            int maxAreaPointX = 0;
+            float maxAreaPointY = 0f;
+            window[insert] = array[a]; // Always add the first point
+            windowX[insert] = 0;
+            insert++;
+            for (int i = 0; i < bucketSizeLessStartAndEnd; i++)
+            {
+                // Calculate point average for next bucket (containing c)
+                float avgX = 0;
+                float avgY = 0;
+                int start = (int)(Math.Floor((i + 1) * bucketSize) + 1);
+                int end = (int)(Math.Floor((i + 2) * bucketSize) + 1);
+                if (end >= array.Length)
+                {
+                    end = array.Length;
+                }
+                int span = end - start;
+                for (; start < end; start++)
+                {
+                    avgX += start;
+                    avgY += array[start];
+                }
+                avgX /= span;
+                avgY /= span;
+
+                // Get the range for this bucket
+                int bucketStart = (int)(Math.Floor((i + 0) * bucketSize) + 1);
+                int bucketEnd = (int)(Math.Floor((i + 1) * bucketSize) + 1);
+                bucketEnd = bucketEnd > array.Length ? array.Length : bucketEnd;
+
+                // Point a
+                float aX = a;
+                float aY = array[a];
+                float maxArea = -1;
+                for (; bucketStart < bucketEnd; bucketStart++)
+                {
+                    // Calculate triangle area over three buckets
+                    if (bucketStart >= array.Length)
+                    {
+                        continue;
+                    };
+                    float area = Math.Abs((aX - avgX) * (array[bucketStart] - aY) - (aX - (float)bucketStart) * (avgY - aY)) * 0.5f;
+                    if (area > maxArea)
+                    {
+                        maxArea = area;
+                        maxAreaPointX = bucketStart;
+                        maxAreaPointY = array[bucketStart];
+                        nextA = bucketStart; // Next a is this b
+                    }
+                }
+                // Pick this point from the Bucket
+                window[insert] = maxAreaPointY;
+                windowX[insert] = maxAreaPointX;
+                insert++;
+
+                // Current a becomes the next_a (chosen b)
+                a = nextA;
+            }
+
+            window[insert] = array[^1]; // Always add last
+            windowX[insert] = array.Length;
+
+            return window;
+        }
     }
 }