Reformat source

coldino · Apr 3, 2021 · 533521c · 533521c
1 parent bc96d4d
commit 533521c
Show file tree

Hide file tree

Showing 13 changed files with 90 additions and 63 deletions.
diff --git a/LarkatorGUI/App.xaml.cs b/LarkatorGUI/App.xaml.cs
@@ -46,7 +46,7 @@ protected override void OnStartup(StartupEventArgs e)
             RegisterExceptionHandlers();
 #endif
         }
-        
+
         private void RegisterExceptionHandlers()
         {
             AppDomain.CurrentDomain.UnhandledException += CurrentDomain_UnhandledException;

diff --git a/LarkatorGUI/ArkReader.cs b/LarkatorGUI/ArkReader.cs
@@ -38,8 +38,7 @@ public void SetArkData(ArkData data)
 
         private static Task<(GameObjectContainer gameObjects, float gameTime)> ReadSavegameFile(string fileName)
         {
-            return Task.Run(() =>
-            {
+            return Task.Run(() => {
                 if (new FileInfo(fileName).Length > int.MaxValue)
                     throw new Exception("Input file is too large.");
 
@@ -109,7 +108,7 @@ public async Task PerformConversion(string saveFile)
             // Read objects directly from the savegame
             (GameObjectContainer gameObjectContainer, float gameTime) = await ReadSavegameFile(saveFile);
 
-            var containers = gameObjectContainer.Select(o => IdentifyCalibrationBox(o)).Where(v => v != null).Cast<(Position,string)>().ToList();
+            var containers = gameObjectContainer.Select(o => IdentifyCalibrationBox(o)).Where(v => v != null).Cast<(Position, string)>().ToList();
 
             return containers;
         }
@@ -160,7 +159,7 @@ private Dino ConvertCreature(GameObject obj)
                 Location = ConvertCoordsToLatLong(obj.Location),
                 WildLevels = new StatPoints(),
             };
-        
+
             var status = obj.CharacterStatusComponent();
             if (status != null)
             {

diff --git a/LarkatorGUI/CalibrationWindow.xaml.cs b/LarkatorGUI/CalibrationWindow.xaml.cs
@@ -1,5 +1,4 @@
-using Newtonsoft.Json;
-using System;
+using System;
 using System.Diagnostics;
 using System.Windows;
 using System.Windows.Controls;
@@ -45,15 +44,17 @@ private void Image_MouseDown(object sender, MouseButtonEventArgs e)
 
         private void Image_MouseUp(object sender, MouseButtonEventArgs e)
         {
-            if (!dragging) return;
+            if (!dragging)
+                return;
             var img = (Image)sender;
             img.ReleaseMouseCapture();
             dragging = false;
         }
 
         private void Image_MouseMove(object sender, MouseEventArgs e)
         {
-            if (!dragging) return;
+            if (!dragging)
+                return;
 
             var img = (Image)sender;
             var pos = Mouse.GetPosition(img);
@@ -73,7 +74,7 @@ private double UpdateBound(double cal, double mult, double x)
 
         private void Filename_TextChanged(object sender, TextChangedEventArgs e)
         {
-           calibration.Image = $"imgs\\map_{((TextBox)sender).Text}.jpg";
+            calibration.Image = $"imgs\\map_{((TextBox)sender).Text}.jpg";
         }
 
         private void UpdateOutput_TextChanged(object sender, TextChangedEventArgs e)
@@ -199,7 +200,7 @@ public string Output
 
         public static readonly DependencyProperty ImageProperty =
             DependencyProperty.Register("Image", typeof(string), typeof(Calibration), new PropertyMetadata(""));
-        
+
         public static readonly DependencyProperty FilenameProperty =
             DependencyProperty.Register("Filename", typeof(string), typeof(Calibration), new PropertyMetadata(""));
 
@@ -208,7 +209,8 @@ public string Output
 
         public void Recalculate()
         {
-            if (Bounds == null) return;
+            if (Bounds == null)
+                return;
 
             var minX = Math.Min(Bounds.X1, Bounds.X2);
             var minY = Math.Min(Bounds.Y1, Bounds.Y2);

diff --git a/LarkatorGUI/Converters.cs b/LarkatorGUI/Converters.cs
@@ -1,4 +1,5 @@
 using Larkator.Common;
+
 using System;
 using System.Collections.Generic;
 using System.Globalization;
@@ -11,8 +12,10 @@ public class BoolToVisibilityConverter : IValueConverter
     {
         public object Convert(object value, Type targetType, object parameter, CultureInfo culture)
         {
-            if (value is bool asBool) return asBool ? Visibility.Visible : Visibility.Collapsed;
-            if (value is int asInt) return asInt != 0 ? Visibility.Visible : Visibility.Collapsed;
+            if (value is bool asBool)
+                return asBool ? Visibility.Visible : Visibility.Collapsed;
+            if (value is int asInt)
+                return asInt != 0 ? Visibility.Visible : Visibility.Collapsed;
             return Visibility.Collapsed;
         }
 
@@ -83,7 +86,8 @@ public class GenderToImageConverter : IValueConverter
         public object Convert(object value, Type targetType, object parameter, CultureInfo culture)
         {
             bool? gender = (bool?)value;
-            if (!gender.HasValue) return "imgs/nogender.png";
+            if (!gender.HasValue)
+                return "imgs/nogender.png";
             if (gender.Value)
                 return "imgs/female.png";
             else
@@ -101,7 +105,8 @@ public class GenderToLetterConverter : IValueConverter
         public object Convert(object value, Type targetType, object parameter, CultureInfo culture)
         {
             bool? gender = (bool?)value;
-            if (!gender.HasValue) return "";
+            if (!gender.HasValue)
+                return "";
             if (gender.Value)
                 return "F";
             else

diff --git a/LarkatorGUI/DebounceDispatcher.cs b/LarkatorGUI/DebounceDispatcher.cs
@@ -53,8 +53,7 @@ public void Debounce(int interval, Action<object> action,
             // timer is recreated for each event and effectively
             // resets the timeout. Action only fires after timeout has fully
             // elapsed without other events firing in between
-            timer = new DispatcherTimer(TimeSpan.FromMilliseconds(interval), priority, (s, e) =>
-            {
+            timer = new DispatcherTimer(TimeSpan.FromMilliseconds(interval), priority, (s, e) => {
                 if (timer == null)
                     return;
 
@@ -97,8 +96,7 @@ public void Throttle(int interval, Action<object> action,
             if (curTime.Subtract(timerStarted).TotalMilliseconds < interval)
                 interval -= (int)curTime.Subtract(timerStarted).TotalMilliseconds;
 
-            timer = new DispatcherTimer(TimeSpan.FromMilliseconds(interval), priority, (s, e) =>
-            {
+            timer = new DispatcherTimer(TimeSpan.FromMilliseconds(interval), priority, (s, e) => {
                 if (timer == null)
                     return;
 

diff --git a/LarkatorGUI/DinoViewModel.cs b/LarkatorGUI/DinoViewModel.cs
@@ -1,4 +1,5 @@
 using Larkator.Common;
+
 using System.Windows;
 using System.Windows.Media;
 

diff --git a/LarkatorGUI/DummyMainWindow.cs b/LarkatorGUI/DummyMainWindow.cs
@@ -1,4 +1,5 @@
 using Larkator.Common;
+
 using System;
 using System.Collections.ObjectModel;
 using System.Linq;

diff --git a/LarkatorGUI/FontSizeHelper.cs b/LarkatorGUI/FontSizeHelper.cs
@@ -11,21 +11,24 @@ public sealed class FontSizeHelper
 
         public static double GetRelativeFontSize(DependencyObject d)
         {
-            if (d == null) throw new ArgumentNullException(nameof(d), "in GetRelativeFontSize");
+            if (d == null)
+                throw new ArgumentNullException(nameof(d), "in GetRelativeFontSize");
 
             return (double)d.GetValue(RelativeFontSizeProperty);
         }
 
         public static void SetRelativeFontSize(DependencyObject d, double value)
         {
-            if (d == null) throw new ArgumentNullException(nameof(d), "in SetRelativeFontSize");
+            if (d == null)
+                throw new ArgumentNullException(nameof(d), "in SetRelativeFontSize");
 
             d.SetValue(RelativeFontSizeProperty, value);
         }
 
         private static void RelativeFontSizeChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
         {
-            if (d == null) throw new ArgumentNullException(nameof(d), "in RelativeFontSizeChanged");
+            if (d == null)
+                throw new ArgumentNullException(nameof(d), "in RelativeFontSizeChanged");
 
             d.ClearValue(TextBlock.FontSizeProperty);
             var old = (double)d.GetValue(TextBlock.FontSizeProperty);

diff --git a/LarkatorGUI/LinearRegression.cs b/LarkatorGUI/LinearRegression.cs
@@ -1,8 +1,5 @@
 using System;
-using System.Collections.Generic;
 using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
 namespace LarkatorGUI
 {
-Original file line number
+Diff line change
@@ Expand Up / @@ -46,7 +46,7 @@ protected override void OnStartup(StartupEventArgs e) @@
                 RegisterExceptionHandlers();
     #endif
             }
             private void RegisterExceptionHandlers()
             {
                 AppDomain.CurrentDomain.UnhandledException += CurrentDomain_UnhandledException;
@@ Expand Down @@