From ab5cc7a9dc710e69b53cb08070afc818d09cf028 Mon Sep 17 00:00:00 2001
From: Jerker Dahlblom <jdahlblom@users.noreply.github.com>
Date: Fri, 20 Oct 2023 19:05:18 +0300
Subject: [PATCH] Limit decimals now possible in Test Range

---
 .../Communication/TCPClientHandler.cs         |  1 -
 src/client/DCSInsight/DCSInsight.csproj       |  2 +-
 src/client/DCSInsight/Misc/Extensions.cs      |  1 -
 .../DCSInsight/Misc/ResultComparator.cs       | 20 +++++++++++
 src/client/DCSInsight/Misc/TextBoxParam.cs    |  7 +---
 .../DCSInsight/Windows/WindowRangeTest.xaml   | 14 ++++++--
 .../Windows/WindowRangeTest.xaml.cs           | 35 +++++++++++++++----
 7 files changed, 62 insertions(+), 18 deletions(-)

diff --git a/src/client/DCSInsight/Communication/TCPClientHandler.cs b/src/client/DCSInsight/Communication/TCPClientHandler.cs
index dff1a1c..480983d 100644
--- a/src/client/DCSInsight/Communication/TCPClientHandler.cs
+++ b/src/client/DCSInsight/Communication/TCPClientHandler.cs
@@ -6,7 +6,6 @@
 using System;
 using System.Collections.Generic;
 using System.Net;
-using System.Net.Http;
 using System.Net.Sockets;
 using System.Text;
 using System.Threading;
diff --git a/src/client/DCSInsight/DCSInsight.csproj b/src/client/DCSInsight/DCSInsight.csproj
index e2a1211..4546402 100644
--- a/src/client/DCSInsight/DCSInsight.csproj
+++ b/src/client/DCSInsight/DCSInsight.csproj
@@ -6,7 +6,7 @@
     <UseWPF>true</UseWPF>
     <AssemblyName>dcs-insight</AssemblyName>
     <Version>1.0.0</Version>
-    <AssemblyVersion>1.7.3</AssemblyVersion>
+    <AssemblyVersion>1.7.4</AssemblyVersion>
     <ApplicationIcon>Images\Magnifier_icon.ico</ApplicationIcon>
   </PropertyGroup>
   <ItemGroup>
diff --git a/src/client/DCSInsight/Misc/Extensions.cs b/src/client/DCSInsight/Misc/Extensions.cs
index 9c81bab..8c716ab 100644
--- a/src/client/DCSInsight/Misc/Extensions.cs
+++ b/src/client/DCSInsight/Misc/Extensions.cs
@@ -1,6 +1,5 @@
 using System;
 using System.Globalization;
-using System.IO;
 using Newtonsoft.Json;
 
 namespace DCSInsight.Misc
diff --git a/src/client/DCSInsight/Misc/ResultComparator.cs b/src/client/DCSInsight/Misc/ResultComparator.cs
index b294906..eb0d6fc 100644
--- a/src/client/DCSInsight/Misc/ResultComparator.cs
+++ b/src/client/DCSInsight/Misc/ResultComparator.cs
@@ -1,5 +1,6 @@
 using System;
 using System.Diagnostics;
+using System.Globalization;
 using System.Text;
 using DCSInsight.JSON;
 
@@ -9,6 +10,9 @@ internal class ResultComparator
     {
         private readonly DCSAPI _dcsApi;
         private readonly object _lockObject = new();
+        private static NumberFormatInfo _numberFormatInfoDecimals = NumberFormatInfo.InvariantInfo;
+        private static bool _limitDecimals;
+        private static int _decimalPlaces;
 
         public ResultComparator(DCSAPI dcsApi)
         {
@@ -57,6 +61,11 @@ public bool SetResult(DCSAPI dcsApi)
                         throw new Exception("SetResult() : This is not the matching DCSAPI.");
                     }
 
+                    if (_limitDecimals && double.TryParse(dcsApi.Result, NumberStyles.AllowDecimalPoint | NumberStyles.Float, _numberFormatInfoDecimals, out _))
+                    {
+                        dcsApi.Result = Math.Round(decimal.Parse(dcsApi.Result, NumberStyles.AllowDecimalPoint | NumberStyles.Float, _numberFormatInfoDecimals), _decimalPlaces).ToString(CultureInfo.InvariantCulture);
+                    }
+
                     if (dcsApi.Result != _dcsApi.Result)
                     {
                         _dcsApi.Result = dcsApi.Result;
@@ -88,5 +97,16 @@ public string GetResultString()
                 return currentTestString.ToString();
             }
         }
+
+        public static void SetDecimals(bool limitDecimals, int decimalPlaces)
+        {
+            _limitDecimals = limitDecimals;
+            _decimalPlaces = decimalPlaces;
+            _numberFormatInfoDecimals = new NumberFormatInfo
+            {
+                NumberDecimalSeparator = ".",
+                NumberDecimalDigits = decimalPlaces
+            };
+        }
     }
 }
diff --git a/src/client/DCSInsight/Misc/TextBoxParam.cs b/src/client/DCSInsight/Misc/TextBoxParam.cs
index de1e229..c4ed6f9 100644
--- a/src/client/DCSInsight/Misc/TextBoxParam.cs
+++ b/src/client/DCSInsight/Misc/TextBoxParam.cs
@@ -1,9 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using System.Windows.Controls;
+using System.Windows.Controls;
 
 namespace DCSInsight.Misc
 {
diff --git a/src/client/DCSInsight/Windows/WindowRangeTest.xaml b/src/client/DCSInsight/Windows/WindowRangeTest.xaml
index 2463a90..443ebdc 100644
--- a/src/client/DCSInsight/Windows/WindowRangeTest.xaml
+++ b/src/client/DCSInsight/Windows/WindowRangeTest.xaml
@@ -6,7 +6,7 @@
         xmlns:local="clr-namespace:DCSInsight.Windows"
         xmlns:userControls="clr-namespace:DCSInsight.UserControls"
         mc:Ignorable="d"
-        Title="Range Test API Calls" MaxHeight="600" MinHeight="200" Width="850" Closing="WindowRangeTest_OnClosing" WindowStartupLocation="CenterScreen" Loaded="WindowRangeTest_OnLoaded">
+        Title="Range Test API Calls" MaxHeight="600" MinHeight="200" Width="1000" Closing="WindowRangeTest_OnClosing" WindowStartupLocation="CenterScreen" Loaded="WindowRangeTest_OnLoaded">
     <Grid>
         <Grid.ColumnDefinitions>
             <ColumnDefinition Width="1*"/>
@@ -27,10 +27,20 @@
             <Label VerticalAlignment="Center" Margin="0,0,0,0" >
                 <CheckBox Name="CheckBoxLoop" VerticalAlignment="Center" IsChecked="False" Checked="CheckBoxLoop_OnChecked" Unchecked="CheckBoxLoop_OnUnchecked"/>
             </Label>
-            <Label VerticalAlignment="Center" Content="Show changes only"  Margin="10,0,0,0" />
+            <Label VerticalAlignment="Center" Content="Changes only"  Margin="10,0,0,0" />
             <Label VerticalAlignment="Center" Margin="0,0,0,0" >
                 <CheckBox Name="CheckBoxShowChangesOnly" VerticalAlignment="Center" IsChecked="False" Checked="CheckBoxShowChangesOnly_OnChecked" Unchecked="CheckBoxShowChangesOnly_OnUnchecked"/>
             </Label>
+            <Label VerticalAlignment="Center" Content="Decimals" Margin="0,0,0,0" />
+            <ComboBox Name="ComboBoxDecimals" SelectedValuePath="Content"  IsReadOnly="True" SelectedIndex="0" SelectionChanged="ComboBoxDecimals_OnSelectionChanged">
+                <ComboBoxItem>*</ComboBoxItem>
+                <ComboBoxItem>0</ComboBoxItem>
+                <ComboBoxItem>1</ComboBoxItem>
+                <ComboBoxItem>2</ComboBoxItem>
+                <ComboBoxItem>3</ComboBoxItem>
+                <ComboBoxItem>4</ComboBoxItem>
+                <ComboBoxItem>5</ComboBoxItem>
+            </ComboBox>
             <CheckBox Name="CheckBoxTop" Content="On Top" BorderBrush="Gray" Margin="20,0,0,0" Checked="CheckBoxTop_OnChecked" Unchecked="CheckBoxTop_OnUnchecked"></CheckBox>
             <Button Width="20" Content="?" Margin="10,0,0,0" BorderBrush="Black" FontSize="14" Name="ButtonInformation"  Click="ButtonInformation_OnClick"></Button>
         </ToolBar>
diff --git a/src/client/DCSInsight/Windows/WindowRangeTest.xaml.cs b/src/client/DCSInsight/Windows/WindowRangeTest.xaml.cs
index f89cd23..d813da4 100644
--- a/src/client/DCSInsight/Windows/WindowRangeTest.xaml.cs
+++ b/src/client/DCSInsight/Windows/WindowRangeTest.xaml.cs
@@ -1,16 +1,12 @@
 using System;
 using System.Collections.Generic;
 using System.ComponentModel;
-using System.ComponentModel.Design;
-using System.Diagnostics;
+using System.Globalization;
 using System.Linq;
-using System.Text;
 using System.Threading;
 using System.Windows;
 using System.Windows.Controls;
 using System.Windows.Input;
-using System.Windows.Media;
-using System.Windows.Media.Imaging;
 using DCSInsight.Events;
 using DCSInsight.Interfaces;
 using DCSInsight.JSON;
@@ -98,7 +94,7 @@ public void ErrorMessage(ErrorEventArgs args)
             {
                 if (!_isConnected || !_isRunning) return;
 
-                Dispatcher?.BeginInvoke((Action)(() => TextBoxResults.Text += args.Message));
+                Dispatcher?.BeginInvoke((Action)(() => AddResultText(args.Message)));
                 AutoResetEvent1.Set();
             }
             catch (Exception ex)
@@ -146,7 +142,7 @@ public void DataReceived(DataEventArgs args)
                     }
                     else
                     {
-                        Dispatcher?.BeginInvoke((Action)(() => TextBoxResults.Text += _resultComparatorList.First(o => o.IsMatch(args.DCSApi)).GetResultString()));
+                        Dispatcher?.BeginInvoke((Action)(() => AddResultText(_resultComparatorList.First(o => o.IsMatch(args.DCSApi)).GetResultString())));
                         ;
                         AutoResetEvent1.Set();
                     }
@@ -584,6 +580,7 @@ private void CheckBoxLoop_OnChecked(object sender, RoutedEventArgs e)
             try
             {
                 _doLoop = true;
+                CheckBoxShowChangesOnly.IsChecked = true;
                 SetFormState();
             }
             catch (Exception ex)
@@ -631,5 +628,29 @@ private void CheckBoxShowChangesOnly_OnUnchecked(object sender, RoutedEventArgs
             }
         }
 
+        private void AddResultText(string text)
+        {
+            TextBoxResults.Text += text;
+            TextBoxResults.ScrollToEnd();
+        }
+
+        private void ComboBoxDecimals_OnSelectionChanged(object sender, SelectionChangedEventArgs e)
+        {
+            try
+            {
+                var item = ComboBoxDecimals.SelectedValue.ToString();
+                if (item != null && item != "*")
+                {
+                    ResultComparator.SetDecimals(true, Convert.ToInt32(item));
+                    return;
+                }
+
+                ResultComparator.SetDecimals(false, 0);
+            }
+            catch (Exception ex)
+            {
+                Common.ShowErrorMessageBox(ex);
+            }
+        }
     }
 }