Multiple changes:

Hide Button, Bounces counting, Color changes, G value calculation

Author: Stevan M

GeesWPF/GeesWPF.csproj

@@ -227,6 +227,9 @@
   <ItemGroup>
     <None Include="Resources\icon.ico" />
   </ItemGroup>
+  <ItemGroup>
+    <Resource Include="Images\bounce.png" />
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <Import Project="..\packages\CTrue.FsConnect.1.0.2\build\CTrue.FsConnect.targets" Condition="Exists('..\packages\CTrue.FsConnect.1.0.2\build\CTrue.FsConnect.targets')" />
   <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">

GeesWPF/Images/bounce.png

@@ -6,7 +6,7 @@
         xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
         xmlns:local="clr-namespace:GeesWPF"
         mc:Ignorable="d"
-        Title="LRMDisplay" Height="220" Width="2" Topmost="True" WindowStyle="None" Background="#FF1D3557" ResizeMode="NoResize" Left="-1" Top="40" ShowInTaskbar="False">
+        Title="LRMDisplay" Height="260" Width="1" Topmost="True" WindowStyle="None" Background="#FF1D3557" ResizeMode="NoResize" Left="-1" Top="40" ShowInTaskbar="False">
     <Window.Resources>
         <Storyboard x:Key="show" TargetProperty="Margin">
             <DoubleAnimation Duration="0:0:0.3" Storyboard.TargetProperty="Width" From="2" To="350" AccelerationRatio=".5">
@@ -61,8 +61,10 @@
             </Image.RenderTransform>
         </Image>
         <Image x:Name="image_Copy3" HorizontalAlignment="Left" Height="32" Margin="31,168,0,0" VerticalAlignment="Top" Width="32" Source="Images/slidew.png" RenderTransformOrigin="0.5,0.5"/>
-        <Image x:Name="image1" HorizontalAlignment="Left" Height="220" Margin="311,0,-0.6,0" VerticalAlignment="Top" Width="40" Source="Images/chevron.png" Stretch="None" Cursor="Hand" MouseDown="image1_MouseDown"/>
-        <Button x:Name="button" Content="" HorizontalAlignment="Left" VerticalAlignment="Top" Width="5" Height="220" Background="#FFE63946" BorderBrush="{x:Null}" Cursor="SizeWE" Click="button_Click"/>
+        <Image x:Name="image1" HorizontalAlignment="Left" Height="260" Margin="311,0,-0.6,0" Width="40" Source="Images/chevron.png" Cursor="Hand" MouseDown="image1_MouseDown" Stretch="None"/>
+        <Button x:Name="button" Content="" HorizontalAlignment="Left" VerticalAlignment="Top" Width="5" Height="260" Background="#FFA8DADC" BorderBrush="{x:Null}" Cursor="SizeWE" Click="button_Click"/>
+        <Label x:Name="labelBounces" Content="{Binding BouncesText}" HorizontalAlignment="Left" Margin="68,208,0,0" VerticalAlignment="Top" Foreground="#FFF1FAEE" FontSize="18"/>
+        <Image x:Name="image_Copy2" HorizontalAlignment="Left" Height="32" Margin="31,210,0,0" VerticalAlignment="Top" Width="32" Source="Images/bounce.png" RenderTransformOrigin="0.5,0.5"/>
 
     </Grid>
 

GeesWPF/Images/chevron.png

@@ -34,14 +34,16 @@ public class LogEntry
             public double CrossV { get; set; }
             [Name("Sideslip (deg)")]
             public double Sideslip { get; set; }
+            [Name("Bounces")]
+            public double Bounces { get; set; }
         }
 
         public string MakeLogIfEmpty()
         {
             //const string header = "Time,Plane,FPM,Impact (G),Air Speed (kt),Ground Speed (kt),Headwind (kt),Crosswind (kt),Sideslip (deg)";
             string myDocs = System.Environment.GetFolderPath(Environment.SpecialFolder.MyDocuments);
             Directory.CreateDirectory(myDocs + @"\MyMSFS2020Landings-Gees"); //create if doesn't exist
-            string path = myDocs + @"\MyMSFS2020Landings-Gees\Landings.v2.csv";
+            string path = myDocs + @"\MyMSFS2020Landings-Gees\Landings.v3.csv";
             if (!File.Exists(path))
             {
                 using (var writer = new StreamWriter(path))

GeesWPF/LRMDisplay.xaml

@@ -45,8 +45,8 @@
         <GroupBox x:Name="groupBox_Copy" Header="Slider Settings" HorizontalAlignment="Left" Height="80" Margin="10,230,0,0" VerticalAlignment="Top" Width="323" Foreground="#FFF1FAEE">
             <Grid HorizontalAlignment="Left" Height="40" Margin="10,10,-1.8,0" Width="290" VerticalAlignment="Top">
                 <Button x:Name="buttonTest" Content="Test" HorizontalAlignment="Left" VerticalAlignment="Top" Width="51" Height="32" Background="#FFA8DADC" Foreground="#FF1D3557" Click="buttonTest_Click" Margin="242,2,-3,0"/>
-                <CheckBox x:Name="checkBox" Content="Auto close after (seconds):" Margin="1,13,126,0" VerticalAlignment="Top" Foreground="#FFF1FAEE" IsChecked="{Binding AutoCloseLanding, Mode=TwoWay, Source={x:Static properties:Settings.Default}}" Checked="checkBox_Checked"/>
-                <TextBox x:Name="textBox" HorizontalAlignment="Left" Height="19" Margin="169,11,0,0" TextWrapping="Wrap" Text="{Binding CloseAfterLanding, Mode=TwoWay, Source={x:Static properties:Settings.Default}}" VerticalAlignment="Top" Width="30" RenderTransformOrigin="-1.284,0.719" TextAlignment="Right" TextChanged="textBox_TextChanged" PreviewTextInput="textBox_PreviewTextInput"/>
+                <CheckBox x:Name="checkBox" Content="Auto close - Bounce timer (s):" Margin="1,13,106,0" VerticalAlignment="Top" Foreground="#FFF1FAEE" IsChecked="{Binding AutoCloseLanding, Mode=TwoWay, Source={x:Static properties:Settings.Default}}" Checked="checkBox_Checked"/>
+                <TextBox x:Name="textBox" HorizontalAlignment="Left" Height="19" Margin="184,11,0,0" TextWrapping="Wrap" Text="{Binding CloseAfterLanding, Mode=TwoWay, Source={x:Static properties:Settings.Default}}" VerticalAlignment="Top" Width="30" RenderTransformOrigin="-1.284,0.719" TextAlignment="Right" TextChanged="textBox_TextChanged" PreviewTextInput="textBox_PreviewTextInput"/>
             </Grid>
         </GroupBox>
         <GroupBox x:Name="groupBox_Copy1" Header="Landings" HorizontalAlignment="Left" Height="80" Margin="10,315,0,0" VerticalAlignment="Top" Width="323" Foreground="#FFF1FAEE">
@@ -61,5 +61,6 @@
                 <Button x:Name="buttonUpdate" Content="Updates Available" HorizontalAlignment="Left" Margin="185,0,0,0" VerticalAlignment="Top" Width="105" Foreground="#FFF1FAEE" Height="37" Click="buttonUpdate_Click" Visibility="{Binding Updatable, Converter={StaticResource BoolToVis}}" Style="{DynamicResource DarkButton}"/>
             </Grid>
         </GroupBox>
+        <Button x:Name="button_Hide" Content="Hide" HorizontalAlignment="Left" Margin="178,13,0,0" VerticalAlignment="Top" Width="75" Foreground="#FF1D3557" Height="37" Style="{DynamicResource DarkButton}" Background="#FFA8DADC" Click="button_Hide_Click"/>
     </Grid>
 </Window>

GeesWPF/LandingLogger.cs

@@ -67,13 +67,13 @@ public partial class MainWindow : Window
         static public string version;
         int lastDeactivateTick;
         bool lastDeactivateValid;
+        int bounces = 0;
 
         const int SAMPLE_RATE = 20; //ms
-        const int WAIT_AFTER_LANDING = 100;
-        const int BUFFER_SIZE = 10;
+        const int BUFFER_SIZE = 2;
 
         DispatcherTimer timerRead = new DispatcherTimer();
-        DispatcherTimer timerWait = new DispatcherTimer();
+        DispatcherTimer timerBounce = new DispatcherTimer();
         DispatcherTimer timerConnection = new DispatcherTimer();
         BackgroundWorker backgroundConnector = new BackgroundWorker();
         BackgroundWorker backgroundWorkerUpdate = new BackgroundWorker();
@@ -117,8 +117,7 @@ public MainWindow()
             //SIMCONREADER
             timerRead.Interval = new TimeSpan(0, 0, 0, 0, SAMPLE_RATE);
             timerRead.Tick += timerRead_Tick;
-            timerWait.Interval = new TimeSpan(0, 0, 0, 0, WAIT_AFTER_LANDING);
-            timerWait.Tick += timerWait_Tick;
+            timerBounce.Tick += timerBounce_Tick;
             fsConnect.FsDataReceived += HandleReceivedFsData;
             definition.Add(new SimProperty("TITLE", null, SIMCONNECT_DATATYPE.STRING256));
             definition.Add(new SimProperty("SIM ON GROUND", "Bool", SIMCONNECT_DATATYPE.INT32));
@@ -150,7 +149,10 @@ private void timerRead_Tick(object sender, EventArgs e)
             }
             else
             {
-                timerWait.Start();
+                calculateLanding();
+                int BOUNCE_TIMER = Properties.Settings.Default.CloseAfterLanding * 1000;
+                timerBounce.Interval = new TimeSpan(0, 0, 0, 0, BOUNCE_TIMER);
+                timerBounce.Start();
             }
         }
 
@@ -213,54 +215,73 @@ private static void HandleReceivedFsData(object sender, FsDataReceivedEventArgs
             SafeToRead = true;
         }
 
-        private void timerWait_Tick(object sender, EventArgs e)
+        private void calculateLanding()
         {
             //impact calculation
             try
             {
-                double sample_time = Convert.ToDouble(SAMPLE_RATE) * 0.001; //ms
                 double fpm = 60 * Onground.ElementAt(0).LandingRate;
                 Int32 FPM = Convert.ToInt32(-fpm);
 
                 double gees = 0;
-                int Gforcemeterlen = 100 / SAMPLE_RATE; // take 100ms average for G force
-                for (int i = 0; i < Gforcemeterlen; i++)
+                //int Gforcemeterlen = 100 / SAMPLE_RATE; // take 100ms average for G force
+                for (int i = 0; i < BUFFER_SIZE; i++)
                 {
-                    gees += Onground.ElementAt(i).Gforce;
-                    Console.WriteLine(Onground.ElementAt(i).Gforce);
+                    if (Onground.ElementAt(i).Gforce > gees)
+                    {
+                        gees = Onground.ElementAt(i).Gforce;
+                    }
+                    /*gees += Onground.ElementAt(i).Gforce;
+                    Console.WriteLine(Onground.ElementAt(i).Gforce);*/
                 }
-                gees /= Gforcemeterlen;
+               // gees /= BUFFER_SIZE;*/
+              //  gees += Onground.ElementAt(0).Gforce;
+
 
                 double incAngle = Math.Atan(Inair.Last().LateralSpeed / Inair.Last().ForwardSpeed) * 180 / Math.PI;
-                
-               // EnterLog(Inair.First().Type, FPM, gees, Inair.Last().AirspeedInd, Inair.Last().GroundSpeed, Inair.Last().WindHead, Inair.Last().WindLat, incAngle);
-                viewModel.LastLandingParameters = new ViewModel.Parameters
+
+                if (bounces == 0)
                 {
-                    Name = Inair.First().Type,
-                    FPM = FPM,
-                    Gees = Math.Round(gees, 2),
-                    Airspeed = Math.Round(Inair.Last().AirspeedInd, 2),
-                    Groundspeed = Math.Round(Inair.Last().GroundSpeed, 2),
-                    Crosswind = Math.Round(Inair.Last().WindLat, 2),
-                    Headwind = Math.Round(Inair.Last().WindHead, 2),
-                    Slip = Math.Round(incAngle, 2)
-                };
-                winLRM.SlideLeft();
-               // viewModel.UpdateTable();
+                    // EnterLog(Inair.First().Type, FPM, gees, Inair.Last().AirspeedInd, Inair.Last().GroundSpeed, Inair.Last().WindHead, Inair.Last().WindLat, incAngle);
+                    viewModel.SetParams(new ViewModel.Parameters
+                    {
+                        Name = Inair.First().Type,
+                        FPM = FPM,
+                        Gees = Math.Round(gees, 2),
+                        Airspeed = Math.Round(Inair.Last().AirspeedInd, 2),
+                        Groundspeed = Math.Round(Inair.Last().GroundSpeed, 2),
+                        Crosswind = Math.Round(Inair.Last().WindLat, 2),
+                        Headwind = Math.Round(Inair.Last().WindHead, 2),
+                        Slip = Math.Round(incAngle, 2),
+                        Bounces = 0
+                    });
+                    winLRM.SlideLeft();
+                    bounces++;
+                }
+                else
+                {
+                    viewModel.BounceParams();
+                }
+                // viewModel.UpdateTable();
                 //LRMDisplay form = new LRMDisplay(FPM, gees, Inair.Last().AirspeedInd, Inair.Last().GroundSpeed, Inair.Last().WindHead, Inair.Last().WindLat, incAngle);
                 //form.Show();
-                timerWait.Stop();
                 Inair.Clear();
                 Onground.Clear();
                 ShowLanding = false;
-                viewModel.UpdateTable();
             }
             catch (Exception ex)
             {
                 Console.WriteLine(ex.Message);
                 //some params are missing. likely the user is in the main menu. ignore
             }
         }
+        private void timerBounce_Tick(object sender, EventArgs e)
+        {
+            bounces = 0;
+            viewModel.LogParams();
+            timerBounce.Stop();
+        }
+
         #endregion
 
         #region Sim Connection
@@ -304,6 +325,10 @@ private void button_Click(object sender, RoutedEventArgs e)
             notifyIcon.Visible = false;
             Environment.Exit(1);
         }
+        private void button_Hide_Click(object sender, RoutedEventArgs e)
+        {
+            this.Hide();
+        }
         private void redditLink_MouseDown(object sender, MouseButtonEventArgs e)
         {
             Process.Start("https://www.reddit.com/r/MSFS2020LandingRate/");
@@ -425,8 +450,8 @@ private void backgroundWorkerUpdate_DoWork(object sender, System.ComponentModel.
             viewModel.Updatable = viewModel.Version != latest.TagName;
             updateUri = latest.HtmlUrl;
         }
-        #endregion
 
+        #endregion
 
     }
 }

GeesWPF/MainWindow.xaml

@@ -51,5 +51,5 @@
 // You can specify all the values or you can default the Build and Revision Numbers
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.0")]
-[assembly: AssemblyFileVersion("1.0.0")]
+[assembly: AssemblyVersion("1.1.0")]
+[assembly: AssemblyFileVersion("1.1.0")]

GeesWPF/MainWindow.xaml.cs

@@ -134,40 +134,7 @@ public void UpdateTable()
             LandingLogger logger = new LandingLogger();
             logTable = logger.LandingLog;
             PropertyChanged?.Invoke(this, new PropertyChangedEventArgs("LandingTable"));
-
-            /*string path = System.Environment.GetFolderPath(Environment.SpecialFolder.MyDocuments);
-            BindData(path + @"\MyMSFS2020Landings-Gees\Landings.v1.csv");*/
         }
-   /*     private void BindData(string filePath)
-        {
-            MakeLogIfEmpty();
-            logTable.Columns.Clear();
-            logTable.Rows.Clear();
-            string[] lines = System.IO.File.ReadAllLines(filePath);
-            if (lines.Length > 0)
-            {
-                //first line to create header
-                string firstLine = lines[0];
-                string[] headerLabels = firstLine.Split(',');
-                foreach (string headerWord in headerLabels)
-                {
-                    logTable.Columns.Add(new DataColumn(headerWord));
-                }
-                //For Data
-                for (int i = lines.Length - 1; i > 0; i--)
-                {
-                    string[] dataWords = lines[i].Split(',');
-                    DataRow dr = logTable.NewRow();
-                    int columnIndex = 0;
-                    foreach (string headerWord in headerLabels)
-                    {
-                        dr[headerWord] = dataWords[columnIndex++];
-                    }
-                    logTable.Rows.Add(dr);
-                }
-            }
-            PropertyChanged?.Invoke(this, new PropertyChangedEventArgs("LandingTable"));
-        }*/
         #endregion
 
         #region Landing Rate Data
@@ -181,8 +148,10 @@ public class Parameters
             public double Headwind { get; set; }
             public double Slip { get; set; }
             public double Crosswind { get; set; }
+            public int Bounces { get; set; }
         }
 
+
         private Parameters _lastLandingParams = new Parameters
         {
             Name = null,
@@ -192,37 +161,47 @@ public class Parameters
             Groundspeed = 63,
             Headwind = -7,
             Crosswind = 3,
-            Slip = 1.53
+            Slip = 1.53,
+            Bounces = 0
         };
-        public Parameters LastLandingParameters
+        public void SetParams (Parameters value)
         {
-            get { return LastLandingParameters; }
-            set
+            _lastLandingParams = value;
+            PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(""));
+        }
+
+        public void BounceParams()
+        {
+            _lastLandingParams.Bounces += 1;
+            PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(""));
+        }
+        public void LogParams()
+        {
+            LandingLogger logger = new LandingLogger();
+            logger.EnterLog(new LandingLogger.LogEntry
             {
-                _lastLandingParams = value;
-                LandingLogger logger = new LandingLogger();
-                logger.EnterLog(new LandingLogger.LogEntry
-                {
-                    Time = DateTime.Now,
-                    Plane = value.Name,
-                    Fpm = value.FPM,
-                    G = value.Gees,
-                    AirV = value.Airspeed,
-                    GroundV = value.Groundspeed,
-                    HeadV = value.Headwind,
-                    CrossV = value.Crosswind,
-                    Sideslip = value.Slip
-                });
-                PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(""));
-            }
+                Time = DateTime.Now,
+                Plane = _lastLandingParams.Name,
+                Fpm = _lastLandingParams.FPM,
+                G = _lastLandingParams.Gees,
+                AirV = _lastLandingParams.Airspeed,
+                GroundV = _lastLandingParams.Groundspeed,
+                HeadV = _lastLandingParams.Headwind,
+                CrossV = _lastLandingParams.Crosswind,
+                Sideslip = _lastLandingParams.Slip,
+                Bounces = _lastLandingParams.Bounces
+            });
+            UpdateTable();
+            PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(""));
         }
+
         public string FPMText
         {
             get { return _lastLandingParams.FPM.ToString("0 fpm"); }
         }
         public string GeesText
         {
-            get { return _lastLandingParams.Gees.ToString("0.##G"); }
+            get { return _lastLandingParams.Gees.ToString("0.## G"); }
         }
         public string GeesImage
         {
@@ -274,6 +253,19 @@ public string AlphaText
         {
             get { return _lastLandingParams.Slip.ToString("0.##º Left Sideslip; 0.##º Right Sideslip;"); }
         }
+
+        public string BouncesText
+        {
+            get {
+                string unit = " bounces";
+                if (_lastLandingParams.Bounces == 1)
+                {
+                    unit = " bounce";
+                }
+                return _lastLandingParams.Bounces.ToString() + unit; 
+            }
+        }
+
         #endregion
 
         protected void OnPropertyChanged([CallerMemberName] String propertyName = "")