/MKLiveView/v1.0/Source/App.xaml.cs |
---|
2,12 → 2,21 |
using System.Collections.Generic; |
using System.Configuration; |
using System.Data; |
using System.Globalization; |
using System.Linq; |
using System.Reflection; |
using System.Resources; |
using System.Threading.Tasks; |
using System.Windows; |
using System.Windows.Threading; |
namespace MKLiveView |
{ |
{ /// <summary> |
/// Anwendungsweiter Delegat zum aktualisieren der UI-Elemente auf dem UI-Thread. |
/// </summary> |
/// <remarks>Wird benötigt um Cross-Threading Situationen zu vermeiden.</remarks> |
internal delegate void Invoker(); |
/// <summary> |
/// Interaktionslogik für "App.xaml" |
/// </summary> |
/MKLiveView/v1.0/Source/MKLiveView.csproj |
---|
348,7 → 348,12 |
<Resource Include="Images\WPToCopter.png" /> |
<Resource Include="Images\FromCopterToPc1.png" /> |
</ItemGroup> |
<ItemGroup /> |
<ItemGroup> |
<Resource Include="Images\Test.png" /> |
</ItemGroup> |
<ItemGroup> |
<SplashScreen Include="Images\Logo.png" /> |
</ItemGroup> |
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" /> |
<!-- To modify your build process, add your task inside one of the targets below and uncomment it. |
Other similar extension points exist, see Microsoft.Common.targets. |
/MKLiveView/v1.0/Source/MainWindow.xaml |
---|
10,7 → 10,7 |
x:Class="MKLiveView.MainWindow" |
mc:Ignorable="d" |
Title="MK LiveView 1.0" Height="686" Width="1017" Icon="MK.ico" |
DataContext="{Binding RelativeSource={RelativeSource Self}}" Loaded="Window_Loaded" Closing="Window_Closing"> |
DataContext="{Binding RelativeSource={RelativeSource Self}}" Loaded="Window_Loaded" Closing="Window_Closing" Closed="Window_Closed"> |
<Window.Resources> |
<wpConverter:waypointsConverter x:Key="wpConvert" /> |
1187,7 → 1187,7 |
<Button x:Name="btnOSDEnter" Content="" HorizontalAlignment="Left" Height="34" Margin="87,90,0,0" VerticalAlignment="Top" Width="52" Click="btnOSDEnter_Click"/> |
<Button x:Name="btnOSDLeave" Content="" HorizontalAlignment="Left" Height="34" Margin="144,90,0,0" VerticalAlignment="Top" Width="52" Click="btnOSDLeave_Click"/> |
</Grid> |
<Grid x:Name="GridWP" Margin="23,36,25,0" Background="#7F000000" Height="526" VerticalAlignment="Top" Visibility="Hidden"> |
<Grid x:Name="GridWP" Margin="23,36,25,0" Background="#7F000000" Height="526" VerticalAlignment="Top" Visibility="Collapsed"> |
<Label x:Name="label4" Content="points" HorizontalAlignment="Right" Margin="0,480,51,0" VerticalAlignment="Top" Width="53" Foreground="White" Height="19" HorizontalContentAlignment="Right" Padding="0" VerticalContentAlignment="Center" FontSize="13"/> |
<Label x:Name="lblWPCount" Content="##" HorizontalAlignment="Right" Margin="0,482,19,0" VerticalAlignment="Top" Width="26" Foreground="White" HorizontalContentAlignment="Right" Padding="0" Height="16" FontSize="13"/> |
<Label x:Name="label4_Copy" Content="WP Index" HorizontalAlignment="Left" Margin="94,194,0,0" VerticalAlignment="Top" Width="80" Foreground="White" Visibility="Hidden"/> |
/MKLiveView/v1.0/Source/MainWindow.xaml.cs |
---|
629,6 → 629,11 |
if(_bGPXLog && dtGPX.Rows.Count > 0) |
_saveGPXLog(); |
} |
private void Window_Closed(object sender, EventArgs e) |
{ |
Application.Current.Shutdown(); |
} |
#endregion events |
#region GMap |
2330,7 → 2335,7 |
//Event_Flag |
bData[17] = Convert.ToByte(dr[13]); |
//Index |
bData[18] = index > 0 ? (byte)index : Convert.ToByte((int)dr[0]); |
bData[18] = index > -1 ? (byte)index : Convert.ToByte((int)dr[0]); |
//Type |
bData[19] = Convert.ToByte(dr[1]); |
//WP_EventChannelValue |
2717,6 → 2722,8 |
if(sVal != "") comboBoxFSColor.SelectedIndex = Convert.ToInt32(sVal); |
sVal = ini.IniReadValue("waypoints", "coptercolor"); |
if(sVal != "") comboBoxCopterColor.SelectedIndex = Convert.ToInt32(sVal); |
sVal = ini.IniReadValue("waypoints", "landingcolor"); |
if(sVal != "") comboBoxLandingColor.SelectedIndex = Convert.ToInt32(sVal); |
sVal = ini.IniReadValue("waypoints", "routecolor"); |
if(sVal != "") comboBoxRouteColor.SelectedIndex = Convert.ToInt32(sVal); |
sVal = ini.IniReadValue("waypoints", "showWPRoute"); |
2822,6 → 2829,7 |
ini.IniWriteValue("waypoints", "poicolor", comboBoxPOIColor.SelectedIndex.ToString()); |
ini.IniWriteValue("waypoints", "fscolor", comboBoxFSColor.SelectedIndex.ToString()); |
ini.IniWriteValue("waypoints", "coptercolor", comboBoxCopterColor.SelectedIndex.ToString()); |
ini.IniWriteValue("waypoints", "landingcolor", comboBoxLandingColor.SelectedIndex.ToString()); |
ini.IniWriteValue("waypoints", "routecolor", comboBoxRouteColor.SelectedIndex.ToString()); |
ini.IniWriteValue("waypoints", "showWPRoute", _bShowWPRoute.ToString()); |
3470,7 → 3478,7 |
} |
}); |
} |
private void comboBoxWPColor_DropDownClosed(object sender, EventArgs e) |
private void comboBoxWPColor_DropDownClosed(object sender, EventArgs e) |
{ |
_MarkerColorSelection(sender, 0); |
} |
3590,7 → 3598,7 |
{ |
DataRow dr = dtWaypoints.Rows[0]; |
dr[13] = _Simulate ? 3 : 0; |
_sendWayPoint(dr, 1, 's', true); |
_sendWayPoint(dr, 0, 's', true); |
rectSimulate.Visibility = _Simulate ? Visibility.Visible : Visibility.Hidden; |
} |
} |
4093,7 → 4101,6 |
} |
} |
private void btnLoadGPXLog_Click(object sender, RoutedEventArgs e) |
{ |
_loadGPXLog(); |