From 61e54f179991bf1bba79214a9262e92925d839d1 Mon Sep 17 00:00:00 2001
From: Morten Nielsen <mn@iter.dk>
Date: Tue, 28 Jan 2020 22:56:18 -0800
Subject: [PATCH] Sample fixes

---
 .../{GpggaControl.xaml => GgaControl.xaml}         |  4 ++--
 .../{GpggaControl.xaml.cs => GgaControl.xaml.cs}   | 14 +++++++-------
 .../{GpgllControl.xaml => GllControl.xaml}         |  4 ++--
 .../{GpgllControl.xaml.cs => GllControl.xaml.cs}   |  6 +++---
 .../{GpgsaControl.xaml => GsaControl.xaml}         |  4 ++--
 .../{GpgsaControl.xaml.cs => GsaControl.xaml.cs}   | 12 ++++++------
 src/SampleApp.WinDesktop/MainWindow.xaml           |  8 ++++----
 .../{GprmcControl.xaml => RmcControl.xaml}         |  4 ++--
 .../{GprmcControl.xaml.cs => RmcControl.xaml.cs}   |  8 ++++----
 9 files changed, 32 insertions(+), 32 deletions(-)
 rename src/SampleApp.WinDesktop/{GpggaControl.xaml => GgaControl.xaml} (92%)
 rename src/SampleApp.WinDesktop/{GpggaControl.xaml.cs => GgaControl.xaml.cs} (59%)
 rename src/SampleApp.WinDesktop/{GpgllControl.xaml => GllControl.xaml} (87%)
 rename src/SampleApp.WinDesktop/{GpgllControl.xaml.cs => GllControl.xaml.cs} (80%)
 rename src/SampleApp.WinDesktop/{GpgsaControl.xaml => GsaControl.xaml} (87%)
 rename src/SampleApp.WinDesktop/{GpgsaControl.xaml.cs => GsaControl.xaml.cs} (63%)
 rename src/SampleApp.WinDesktop/{GprmcControl.xaml => RmcControl.xaml} (89%)
 rename src/SampleApp.WinDesktop/{GprmcControl.xaml.cs => RmcControl.xaml.cs} (75%)

diff --git a/src/SampleApp.WinDesktop/GpggaControl.xaml b/src/SampleApp.WinDesktop/GgaControl.xaml
similarity index 92%
rename from src/SampleApp.WinDesktop/GpggaControl.xaml
rename to src/SampleApp.WinDesktop/GgaControl.xaml
index 9966419..25e6c08 100644
--- a/src/SampleApp.WinDesktop/GpggaControl.xaml
+++ b/src/SampleApp.WinDesktop/GgaControl.xaml
@@ -1,4 +1,4 @@
-<UserControl x:Class="SampleApp.WinDesktop.GpggaControl"
+<UserControl x:Class="SampleApp.WinDesktop.GgaControl"
              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
@@ -8,7 +8,7 @@
              d:DesignHeight="300" d:DesignWidth="300">
     <StackPanel DataContext="{Binding RelativeSource={RelativeSource AncestorType=UserControl}, Path=Message}">
 		<Border Background="CornflowerBlue" Padding="10" Margin="-10,-10,-10,5">
-			<TextBlock Text="GPGGA" FontSize="20" FontWeight="Bold" Foreground="White" />
+            <TextBlock Text="{Binding MessageType}" FontSize="20" FontWeight="Bold" Foreground="White" />
 		</Border>
 		<TextBlock Text="Location:" FontWeight="Bold" />
 		<TextBlock Text="{Binding Latitude, Mode=OneTime}" />
diff --git a/src/SampleApp.WinDesktop/GpggaControl.xaml.cs b/src/SampleApp.WinDesktop/GgaControl.xaml.cs
similarity index 59%
rename from src/SampleApp.WinDesktop/GpggaControl.xaml.cs
rename to src/SampleApp.WinDesktop/GgaControl.xaml.cs
index 536ad40..f3432d4 100644
--- a/src/SampleApp.WinDesktop/GpggaControl.xaml.cs
+++ b/src/SampleApp.WinDesktop/GgaControl.xaml.cs
@@ -17,22 +17,22 @@ using System.Windows.Shapes;
 namespace SampleApp.WinDesktop
 {
 	/// <summary>
-	/// Interaction logic for GpggaControl.xaml
+	/// Interaction logic for GgaControl.xaml
 	/// </summary>
-	public partial class GpggaControl : UserControl
+	public partial class GgaControl : UserControl
 	{
-		public GpggaControl()
+		public GgaControl()
 		{
 			InitializeComponent();
 		}
 
 		public Gga Message
 		{
-			get { return (Gga)GetValue(GpggaProperty); }
-			set { SetValue(GpggaProperty, value); }
+			get { return (Gga)GetValue(MessageProperty); }
+			set { SetValue(MessageProperty, value); }
 		}
 
-		public static readonly DependencyProperty GpggaProperty =
-			DependencyProperty.Register("Message", typeof(Gga), typeof(GpggaControl), new PropertyMetadata(null));
+		public static readonly DependencyProperty MessageProperty =
+			DependencyProperty.Register(nameof(Message), typeof(Gga), typeof(GgaControl), new PropertyMetadata(null));
 	}
 }
diff --git a/src/SampleApp.WinDesktop/GpgllControl.xaml b/src/SampleApp.WinDesktop/GllControl.xaml
similarity index 87%
rename from src/SampleApp.WinDesktop/GpgllControl.xaml
rename to src/SampleApp.WinDesktop/GllControl.xaml
index 848d429..549888b 100644
--- a/src/SampleApp.WinDesktop/GpgllControl.xaml
+++ b/src/SampleApp.WinDesktop/GllControl.xaml
@@ -1,4 +1,4 @@
-<UserControl x:Class="SampleApp.WinDesktop.GpgllControl"
+<UserControl x:Class="SampleApp.WinDesktop.GllControl"
              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
@@ -8,7 +8,7 @@
              d:DesignHeight="300" d:DesignWidth="300">
 	<StackPanel DataContext="{Binding RelativeSource={RelativeSource AncestorType=UserControl}, Path=Message}">
 		<Border Background="CornflowerBlue" Padding="10" Margin="-10,-10,-10,5">
-			<TextBlock Text="GPGLL" FontSize="20" FontWeight="Bold" Foreground="White"  />
+            <TextBlock Text="{Binding MessageType}" FontSize="20" FontWeight="Bold" Foreground="White"  />
 		</Border>
 		<TextBlock Text="Location:" FontWeight="Bold" />
 		<TextBlock Text="{Binding Latitude, Mode=OneTime}" />
diff --git a/src/SampleApp.WinDesktop/GpgllControl.xaml.cs b/src/SampleApp.WinDesktop/GllControl.xaml.cs
similarity index 80%
rename from src/SampleApp.WinDesktop/GpgllControl.xaml.cs
rename to src/SampleApp.WinDesktop/GllControl.xaml.cs
index eb08ea6..267db34 100644
--- a/src/SampleApp.WinDesktop/GpgllControl.xaml.cs
+++ b/src/SampleApp.WinDesktop/GllControl.xaml.cs
@@ -19,9 +19,9 @@ namespace SampleApp.WinDesktop
 	/// <summary>
 	/// Interaction logic for GpgllControl.xaml
 	/// </summary>
-	public partial class GpgllControl : UserControl
+	public partial class GllControl : UserControl
 	{
-		public GpgllControl()
+		public GllControl()
 		{
 			InitializeComponent();
 		}
@@ -33,6 +33,6 @@ namespace SampleApp.WinDesktop
 		}
 
 		public static readonly DependencyProperty MessageProperty =
-			DependencyProperty.Register("Message", typeof(Gll), typeof(GpgllControl), new PropertyMetadata(null));	
+			DependencyProperty.Register(nameof(Message), typeof(Gll), typeof(GllControl), new PropertyMetadata(null));	
 	}
 }
diff --git a/src/SampleApp.WinDesktop/GpgsaControl.xaml b/src/SampleApp.WinDesktop/GsaControl.xaml
similarity index 87%
rename from src/SampleApp.WinDesktop/GpgsaControl.xaml
rename to src/SampleApp.WinDesktop/GsaControl.xaml
index 0065dbc..0096744 100644
--- a/src/SampleApp.WinDesktop/GpgsaControl.xaml
+++ b/src/SampleApp.WinDesktop/GsaControl.xaml
@@ -1,4 +1,4 @@
-<UserControl x:Class="SampleApp.WinDesktop.GpgsaControl"
+<UserControl x:Class="SampleApp.WinDesktop.GsaControl"
              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
@@ -8,7 +8,7 @@
              d:DesignHeight="300" d:DesignWidth="300">
 	<StackPanel DataContext="{Binding RelativeSource={RelativeSource AncestorType=UserControl}, Path=Message}">
 		<Border Background="CornflowerBlue" Padding="10" Margin="-10,-10,-10,5">
-			<TextBlock Text="GPGSA" FontSize="20" FontWeight="Bold" Foreground="White"  />
+            <TextBlock Text="{Binding MessageType}" FontSize="20" FontWeight="Bold" Foreground="White"  />
 		</Border>
 		<local:KeyValuePairControl Header="GPS Mode: " Value="{Binding Mode}"/>
         <local:KeyValuePairControl Header="Fix Mode: " Value="{Binding Fix, Mode=OneTime}" />
diff --git a/src/SampleApp.WinDesktop/GpgsaControl.xaml.cs b/src/SampleApp.WinDesktop/GsaControl.xaml.cs
similarity index 63%
rename from src/SampleApp.WinDesktop/GpgsaControl.xaml.cs
rename to src/SampleApp.WinDesktop/GsaControl.xaml.cs
index b312e15..5acab7e 100644
--- a/src/SampleApp.WinDesktop/GpgsaControl.xaml.cs
+++ b/src/SampleApp.WinDesktop/GsaControl.xaml.cs
@@ -19,20 +19,20 @@ namespace SampleApp.WinDesktop
 	/// <summary>
 	/// Interaction logic for GpgsaControl.xaml
 	/// </summary>
-	public partial class GpgsaControl : UserControl
+	public partial class GsaControl : UserControl
 	{
-		public GpgsaControl()
+		public GsaControl()
 		{
 			InitializeComponent();
 		}
 
 		public Gsa Message
 		{
-			get { return (Gsa)GetValue(GpgsaProperty); }
-			set { SetValue(GpgsaProperty, value); }
+			get { return (Gsa)GetValue(MessageProperty); }
+			set { SetValue(MessageProperty, value); }
 		}
 
-		public static readonly DependencyProperty GpgsaProperty =
-			DependencyProperty.Register("Message", typeof(Gsa), typeof(GpgsaControl), new PropertyMetadata(null));	
+		public static readonly DependencyProperty MessageProperty =
+			DependencyProperty.Register(nameof(Message), typeof(Gsa), typeof(GsaControl), new PropertyMetadata(null));	
 	}
 }
diff --git a/src/SampleApp.WinDesktop/MainWindow.xaml b/src/SampleApp.WinDesktop/MainWindow.xaml
index 7611dd2..2bb9bc0 100644
--- a/src/SampleApp.WinDesktop/MainWindow.xaml
+++ b/src/SampleApp.WinDesktop/MainWindow.xaml
@@ -23,10 +23,10 @@
             <TabItem Header="GPS Info">
                 <ScrollViewer HorizontalScrollBarVisibility="Disabled" Background="#FFEEEEEE">
                     <WrapPanel x:Name="MessagePanel">
-                        <local:GprmcControl x:Name="gprmcView" Style="{StaticResource card}" Visibility="{Binding Message, ElementName=gprmcView, Converter={StaticResource nullConv}}" />
-                        <local:GpggaControl x:Name="gpggaView" Style="{StaticResource card}" Visibility="{Binding Message, ElementName=gpggaView, Converter={StaticResource nullConv}}" />
-                        <local:GpgsaControl x:Name="gpgsaView" Style="{StaticResource card}" Visibility="{Binding Message, ElementName=gpgsaView, Converter={StaticResource nullConv}}" />
-                        <local:GpgllControl x:Name="gpgllView" Style="{StaticResource card}" Visibility="{Binding Message, ElementName=gpgllView, Converter={StaticResource nullConv}}" />
+                        <local:RmcControl x:Name="gprmcView" Style="{StaticResource card}" Visibility="{Binding Message, ElementName=gprmcView, Converter={StaticResource nullConv}}" />
+                        <local:GgaControl x:Name="gpggaView" Style="{StaticResource card}" Visibility="{Binding Message, ElementName=gpggaView, Converter={StaticResource nullConv}}" />
+                        <local:GsaControl x:Name="gpgsaView" Style="{StaticResource card}" Visibility="{Binding Message, ElementName=gpgsaView, Converter={StaticResource nullConv}}" />
+                        <local:GllControl x:Name="gpgllView" Style="{StaticResource card}" Visibility="{Binding Message, ElementName=gpgllView, Converter={StaticResource nullConv}}" />
                         <local:PgrmeControl x:Name="pgrmeView" Style="{StaticResource card}" Visibility="{Binding Message, ElementName=pgrmeView, Converter={StaticResource nullConv}}" />
                     </WrapPanel>
                 </ScrollViewer>
diff --git a/src/SampleApp.WinDesktop/GprmcControl.xaml b/src/SampleApp.WinDesktop/RmcControl.xaml
similarity index 89%
rename from src/SampleApp.WinDesktop/GprmcControl.xaml
rename to src/SampleApp.WinDesktop/RmcControl.xaml
index caccc24..305d414 100644
--- a/src/SampleApp.WinDesktop/GprmcControl.xaml
+++ b/src/SampleApp.WinDesktop/RmcControl.xaml
@@ -1,4 +1,4 @@
-<UserControl x:Class="SampleApp.WinDesktop.GprmcControl"
+<UserControl x:Class="SampleApp.WinDesktop.RmcControl"
              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
@@ -8,7 +8,7 @@
              d:DesignHeight="300" d:DesignWidth="300">
 	<StackPanel DataContext="{Binding RelativeSource={RelativeSource AncestorType=UserControl}, Path=Message}">
 		<Border Background="CornflowerBlue" Padding="10" Margin="-10,-10,-10,5">
-			<TextBlock Text="GPRMC" FontSize="20" FontWeight="Bold" Foreground="White"  />
+            <TextBlock Text="{Binding MessageType}" FontSize="20" FontWeight="Bold" Foreground="White"  />
 		</Border>
 		<TextBlock Text="Location:" FontWeight="Bold" />
 		<TextBlock Text="{Binding Latitude, Mode=OneTime}" />
diff --git a/src/SampleApp.WinDesktop/GprmcControl.xaml.cs b/src/SampleApp.WinDesktop/RmcControl.xaml.cs
similarity index 75%
rename from src/SampleApp.WinDesktop/GprmcControl.xaml.cs
rename to src/SampleApp.WinDesktop/RmcControl.xaml.cs
index c6f7d00..63b0b8d 100644
--- a/src/SampleApp.WinDesktop/GprmcControl.xaml.cs
+++ b/src/SampleApp.WinDesktop/RmcControl.xaml.cs
@@ -17,11 +17,11 @@ using System.Windows.Shapes;
 namespace SampleApp.WinDesktop
 {
 	/// <summary>
-	/// Interaction logic for GprmcControl.xaml
+	/// Interaction logic for RmcControl.xaml
 	/// </summary>
-	public partial class GprmcControl : UserControl
+	public partial class RmcControl : UserControl
 	{
-		public GprmcControl()
+		public RmcControl()
 		{
 			InitializeComponent();
 		}
@@ -33,6 +33,6 @@ namespace SampleApp.WinDesktop
 		}
 
 		public static readonly DependencyProperty MessageProperty =
-			DependencyProperty.Register("Message", typeof(Rmc), typeof(GprmcControl), new PropertyMetadata(null));
+			DependencyProperty.Register(nameof(Message), typeof(Rmc), typeof(RmcControl), new PropertyMetadata(null));
 	}
 }