Subversion Repositories Projects

Compare Revisions

Ignore whitespace Rev 2358 → Rev 2359

/MKLiveView/v1.0/Source/MKLiveView.csproj
331,13 → 331,13
<Resource Include="Images\SaveFile.png" />
</ItemGroup>
<ItemGroup>
<Resource Include="Images\WPToCopter.png" />
<Resource Include="Images\CurrentPos.png" />
</ItemGroup>
<ItemGroup>
<Resource Include="Images\WPToCopter1.png" />
<Resource Include="Images\Save.png" />
</ItemGroup>
<ItemGroup>
<Resource Include="Images\FromCopterToPc1.png" />
<Resource Include="Images\Delete.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.
/MKLiveView/v1.0/Source/MKLiveView.sln
1,7 → 1,7

Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 14
VisualStudioVersion = 14.0.24720.0
VisualStudioVersion = 14.0.25123.0
MinimumVisualStudioVersion = 10.0.40219.1
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MKLiveView", "MKLiveView.csproj", "{1805AEEA-A2F6-445A-8128-62370F66CA37}"
ProjectSection(ProjectDependencies) = postProject
13,6 → 13,8
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "GMap.NET.WindowsPresentation", "GMap.NET.WindowsPresentation\GMap.NET.WindowsPresentation.csproj", "{644FE7D4-0184-400F-B2D7-99CB41360658}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "KeyPad", "KeyPad\KeyPad.csproj", "{3ADBFF38-915C-4115-9CDD-81C0CAD9733A}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
73,6 → 75,20
{644FE7D4-0184-400F-B2D7-99CB41360658}.v4.0-Release|Any CPU.Build.0 = v4.0-Release|Any CPU
{644FE7D4-0184-400F-B2D7-99CB41360658}.v4.0-Release|x86.ActiveCfg = v4.0-Release|Any CPU
{644FE7D4-0184-400F-B2D7-99CB41360658}.v4.0-Release|x86.Build.0 = v4.0-Release|Any CPU
{3ADBFF38-915C-4115-9CDD-81C0CAD9733A}.Debug|Any CPU.ActiveCfg = Debug|x86
{3ADBFF38-915C-4115-9CDD-81C0CAD9733A}.Debug|x86.ActiveCfg = Debug|x86
{3ADBFF38-915C-4115-9CDD-81C0CAD9733A}.Debug|x86.Build.0 = Debug|x86
{3ADBFF38-915C-4115-9CDD-81C0CAD9733A}.Release|Any CPU.ActiveCfg = Release|x86
{3ADBFF38-915C-4115-9CDD-81C0CAD9733A}.Release|x86.ActiveCfg = Release|x86
{3ADBFF38-915C-4115-9CDD-81C0CAD9733A}.Release|x86.Build.0 = Release|x86
{3ADBFF38-915C-4115-9CDD-81C0CAD9733A}.v4.0-Debug|Any CPU.ActiveCfg = Release|x86
{3ADBFF38-915C-4115-9CDD-81C0CAD9733A}.v4.0-Debug|Any CPU.Build.0 = Release|x86
{3ADBFF38-915C-4115-9CDD-81C0CAD9733A}.v4.0-Debug|x86.ActiveCfg = Debug|x86
{3ADBFF38-915C-4115-9CDD-81C0CAD9733A}.v4.0-Debug|x86.Build.0 = Debug|x86
{3ADBFF38-915C-4115-9CDD-81C0CAD9733A}.v4.0-Release|Any CPU.ActiveCfg = Release|x86
{3ADBFF38-915C-4115-9CDD-81C0CAD9733A}.v4.0-Release|Any CPU.Build.0 = Release|x86
{3ADBFF38-915C-4115-9CDD-81C0CAD9733A}.v4.0-Release|x86.ActiveCfg = Release|x86
{3ADBFF38-915C-4115-9CDD-81C0CAD9733A}.v4.0-Release|x86.Build.0 = Release|x86
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
/MKLiveView/v1.0/Source/MainWindow.xaml
1180,8 → 1180,8
<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">
<Label x:Name="label4" Content="points" HorizontalAlignment="Right" Margin="0,480,46,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,20,0" VerticalAlignment="Top" Width="26" Foreground="White" HorizontalContentAlignment="Right" Padding="0" Height="16" FontSize="13"/>
<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"/>
<Label x:Name="lblWPIndex" Content="##" HorizontalAlignment="Left" Margin="170,194,0,0" VerticalAlignment="Top" Width="28" Foreground="White" Visibility="Hidden"/>
<Border Margin="10,456,0,3" BorderBrush="White" BorderThickness="0.5" CornerRadius="5" HorizontalAlignment="Left" Width="640">
1199,7 → 1199,7
</Rectangle>
<Button x:Name="btnGetWPList" Content="" HorizontalAlignment="Left" Height="36" Margin="112,0,0,0" VerticalAlignment="Bottom" Width="92" Click="btnGetWP_Click" ToolTip="Download WP-list from copter" BorderBrush="#FFBDBDBD" Style="{DynamicResource ButtonWithoutEffectStyle}">
<Button.Background>
<ImageBrush ImageSource="Images/FromCopterToPc1.png" Stretch="Uniform"/>
<ImageBrush ImageSource="Images/FromCopterToPc.png" Stretch="Uniform"/>
</Button.Background>
</Button>
<Rectangle HorizontalAlignment="Left" Width="94" Stroke="#FFE4E4E4" StrokeThickness="0.5" Margin="12,0,0,-1" Height="40" VerticalAlignment="Bottom">
1215,7 → 1215,7
</Rectangle>
<Button x:Name="btnSendWPList" Content="" HorizontalAlignment="Left" Height="36" Margin="13,0,0,0" VerticalAlignment="Bottom" Width="92" ToolTip="Upload WP-list to copter" BorderBrush="#FFBDBDBD" Click="btnSendWPList_Click" Style="{DynamicResource ButtonWithoutEffectStyle}">
<Button.Background>
<ImageBrush ImageSource="Images/WPToCopter1.png" Stretch="Uniform"/>
<ImageBrush ImageSource="Images/FromPcToCopter.png" Stretch="Uniform"/>
</Button.Background>
</Button>
<Rectangle HorizontalAlignment="Left" Width="94" Stroke="#FFE4E4E4" StrokeThickness="0.5" Margin="229,0,0,-1" Height="40" VerticalAlignment="Bottom">
1248,7 → 1248,7
</Style>
</Rectangle.Style>
</Rectangle>
<Button x:Name="btnClearWPList" Content="" HorizontalAlignment="Left" Height="36" Margin="434,0,0,1" VerticalAlignment="Bottom" Width="94" ToolTip="Download WP-list from copter" BorderBrush="#FFBDBDBD" Style="{DynamicResource ButtonWithoutEffectStyle}" Click="btnClearWPList_Click">
<Button x:Name="btnClearWPList" Content="" HorizontalAlignment="Left" Height="36" Margin="434,0,0,1" VerticalAlignment="Bottom" Width="94" ToolTip="clear all items from the local WP list" BorderBrush="#FFBDBDBD" Style="{DynamicResource ButtonWithoutEffectStyle}" Click="btnClearWPList_Click">
<Button.Background>
<ImageBrush ImageSource="Images/DeleteList.png" Stretch="Uniform"/>
</Button.Background>
1265,7 → 1265,7
</Style>
</Rectangle.Style>
</Rectangle>
<Button x:Name="btnClearCopterList" Content="" HorizontalAlignment="Left" Height="36" Margin="535,0,0,1" VerticalAlignment="Bottom" Width="92" ToolTip="Download WP-list from copter" BorderBrush="#FFBDBDBD" Style="{DynamicResource ButtonWithoutEffectStyle}" Click="btnClearCopterList_Click">
<Button x:Name="btnClearCopterList" Content="" HorizontalAlignment="Left" Height="36" Margin="535,0,0,1" VerticalAlignment="Bottom" Width="92" ToolTip="clear all items from the WP list in the copter" BorderBrush="#FFBDBDBD" Style="{DynamicResource ButtonWithoutEffectStyle}" Click="btnClearCopterList_Click">
<Button.Background>
<ImageBrush ImageSource="Images/DeleteCopterList.png" Stretch="Uniform"/>
</Button.Background>
1290,24 → 1290,8
<Label x:Name="label4_Copy13" Content="save to file (.wpl)" HorizontalAlignment="Left" Margin="324,0,0,35" VerticalAlignment="Bottom" Width="98" Foreground="White"/>
</Grid>
</Border>
<Border Margin="10,324,0,75" BorderBrush="White" BorderThickness="0.5" CornerRadius="5" HorizontalAlignment="Left" Width="941">
<Border Margin="10,340,0,75" BorderBrush="White" BorderThickness="0.5" CornerRadius="5" HorizontalAlignment="Left" Width="831">
<Grid Margin="-0.5,-0.5,-0.5,4.5">
<Rectangle HorizontalAlignment="Left" Width="94" Stroke="#FFE4E4E4" StrokeThickness="0.5" Margin="837,0,0,61" Height="40" VerticalAlignment="Bottom">
<Rectangle.Style>
<Style TargetType="{x:Type Rectangle}">
<Style.Triggers>
<DataTrigger Binding="{Binding IsMouseOver, ElementName=btnSendActiveWP}" Value="True">
<Setter Property="Fill" Value="{DynamicResource PressedItemBrush}"/>
</DataTrigger>
</Style.Triggers>
</Style>
</Rectangle.Style>
</Rectangle>
<Button x:Name="btnSendActiveWP" Content="" HorizontalAlignment="Left" Height="36" Margin="838,0,0,62" VerticalAlignment="Bottom" Width="93" ToolTip="Set WP as active WP" BorderBrush="#FFBDBDBD" Style="{DynamicResource ButtonWithoutEffectStyle}" Click="btnSendActiveWP_Click">
<Button.Background>
<ImageBrush ImageSource="Images/WPToCopter.png" Stretch="Uniform"/>
</Button.Background>
</Button>
<ComboBox x:Name="cbWPEditType" HorizontalAlignment="Left" Height="22" Margin="10,24,0,0" VerticalAlignment="Top" Width="66">
<ComboBoxItem Content="WP"/>
<ComboBoxItem Content="POI"/>
1364,12 → 1348,11
</ComboBox>
<Label x:Name="label4_Copy26" Content="Out1Timer" HorizontalAlignment="Left" Margin="762,6,0,0" Width="63" Foreground="White" Padding="0" Height="18" VerticalAlignment="Top"/>
<TextBox x:Name="tbWPEditOut1" HorizontalAlignment="Left" Height="22" Margin="762,24,0,0" VerticalAlignment="Top" Width="42" IsUndoEnabled="False" MaxLines="1" MaxLength="2" Foreground="White" Background="{x:Null}" VerticalContentAlignment="Center"/>
<Label x:Name="label4_Copy27" Content="send as active WP" HorizontalAlignment="Left" Margin="835,-1,-1,97" VerticalAlignment="Bottom" Width="107" Foreground="White" Height="26"/>
<Rectangle HorizontalAlignment="Left" Width="94" Stroke="#FFE4E4E4" StrokeThickness="0.5" Margin="10,0,0,-2" Height="40" VerticalAlignment="Bottom">
<Rectangle HorizontalAlignment="Left" Width="94" Stroke="#FFE4E4E4" StrokeThickness="0.5" Margin="12,0,0,-2" Height="40" VerticalAlignment="Bottom">
<Rectangle.Style>
<Style TargetType="{x:Type Rectangle}">
<Style.Triggers>
<DataTrigger Binding="{Binding IsMouseOver, ElementName=btnSendActiveWP_Copy1}" Value="True">
<DataTrigger Binding="{Binding IsMouseOver, ElementName=btnEditWPSave}" Value="True">
<Setter Property="Fill" Value="{DynamicResource PressedItemBrush}"/>
</DataTrigger>
</Style.Triggers>
1376,17 → 1359,17
</Style>
</Rectangle.Style>
</Rectangle>
<Button x:Name="btnSendActiveWP_Copy1" Content="" HorizontalAlignment="Left" Height="36" Margin="11,0,0,-1" VerticalAlignment="Bottom" Width="93" ToolTip="Set WP as active WP" BorderBrush="#FFBDBDBD" Style="{DynamicResource ButtonWithoutEffectStyle}" Click="btnSendActiveWP2_Click">
<Button x:Name="btnEditWPSave" Content="" HorizontalAlignment="Left" Height="36" Margin="13,0,0,-1" VerticalAlignment="Bottom" Width="93" ToolTip="save the changes made to the list" BorderBrush="#FFBDBDBD" Style="{DynamicResource ButtonWithoutEffectStyle}" Click="btnEditWPSave">
<Button.Background>
<ImageBrush ImageSource="Images/WPToCopter.png" Stretch="Uniform"/>
<ImageBrush ImageSource="Images/Save.png" Stretch="Uniform"/>
</Button.Background>
</Button>
<Label x:Name="label4_Copy29" Content="set as active WP" HorizontalAlignment="Left" Margin="8,0,0,34" VerticalAlignment="Bottom" Width="96" Foreground="White" Height="26"/>
<Rectangle HorizontalAlignment="Left" Width="94" Stroke="#FFE4E4E4" StrokeThickness="0.5" Margin="837,0,0,2" Height="40" VerticalAlignment="Bottom">
<Label x:Name="label4_Copy27" Content="save changes" HorizontalAlignment="Left" Margin="10,0,0,34" VerticalAlignment="Bottom" Width="96" Foreground="White" Height="26"/>
<Rectangle HorizontalAlignment="Left" Width="94" Stroke="#FFE4E4E4" StrokeThickness="0.5" Margin="113,0,0,-2" Height="40" VerticalAlignment="Bottom">
<Rectangle.Style>
<Style TargetType="{x:Type Rectangle}">
<Style.Triggers>
<DataTrigger Binding="{Binding IsMouseOver, ElementName=btnWPEditAddCurrentPo}" Value="True">
<DataTrigger Binding="{Binding IsMouseOver, ElementName=btnEditWPSave}" Value="True">
<Setter Property="Fill" Value="{DynamicResource PressedItemBrush}"/>
</DataTrigger>
</Style.Triggers>
1393,15 → 1376,15
</Style>
</Rectangle.Style>
</Rectangle>
<Button x:Name="btnWPEditAddCurrentPos" Content="" HorizontalAlignment="Left" Height="36" Margin="838,0,0,3" VerticalAlignment="Bottom" Width="93" ToolTip="Set WP as active WP" BorderBrush="#FFBDBDBD" Style="{DynamicResource ButtonWithoutEffectStyle}" Click="btnWPEditAddCurrentPos_Click">
<Button x:Name="btnEditWPDel" Content="" HorizontalAlignment="Left" Height="36" Margin="114,0,0,-1" VerticalAlignment="Bottom" Width="93" ToolTip="delete WP from list" BorderBrush="#FFBDBDBD" Style="{DynamicResource ButtonWithoutEffectStyle}" Click="btnEditWPDel">
<Button.Background>
<ImageBrush ImageSource="Images/WPToCopter.png" Stretch="Uniform"/>
<ImageBrush ImageSource="Images/Delete.png" Stretch="Uniform"/>
</Button.Background>
</Button>
<Label x:Name="label4_Copy28" Content="add current Pos" HorizontalAlignment="Left" Margin="835,0,-1,38" VerticalAlignment="Bottom" Width="107" Foreground="White" Height="26"/>
<Label x:Name="label4_Copy30" Content="delete WP" HorizontalAlignment="Left" Margin="111,0,0,34" VerticalAlignment="Bottom" Width="96" Foreground="White" Height="26"/>
</Grid>
</Border>
<DataGrid x:Name="dgvWP" Margin="10,5,10,207" Background="{x:Null}" ItemsSource="{Binding}" HorizontalContentAlignment="Center" VerticalContentAlignment="Center" FontSize="14" HorizontalGridLinesBrush="#FF688CAF" VerticalGridLinesBrush="#FF688CAF" HeadersVisibility="Column" BorderBrush="{x:Null}" Padding="0" AutoGenerateColumns="False" MouseUp="dgvWP_MouseUp" CanUserAddRows="False" CanUserDeleteRows="False" CanUserResizeRows="False" MouseDoubleClick="dgvWP_MouseDoubleClick" CanUserReorderColumns="False" CanUserResizeColumns="False" CanUserSortColumns="False" IsReadOnly="True">
<DataGrid x:Name="dgvWP" Margin="10,5,10,191" Background="{x:Null}" ItemsSource="{Binding}" HorizontalContentAlignment="Center" VerticalContentAlignment="Center" FontSize="14" HorizontalGridLinesBrush="#FF688CAF" VerticalGridLinesBrush="#FF688CAF" HeadersVisibility="Column" BorderBrush="{x:Null}" Padding="0" AutoGenerateColumns="False" MouseUp="dgvWP_MouseUp" CanUserAddRows="False" CanUserDeleteRows="False" CanUserResizeRows="False" MouseDoubleClick="dgvWP_MouseDoubleClick" CanUserReorderColumns="False" CanUserResizeColumns="False" CanUserSortColumns="False" IsReadOnly="True">
<DataGrid.Columns>
<DataGridTextColumn Header="Index" Binding="{Binding Path=Index}"/>
<DataGridTextColumn Header="Type" Binding="{Binding Path=Type, Converter={StaticResource wpConvert}, ConverterParameter= Type}"/>
1420,12 → 1403,46
</DataGrid.Columns>
</DataGrid>
<CheckBox x:Name="checkBoxShowWPRoute" Content="show route" HorizontalAlignment="Right" Height="22" Margin="0,504,0,0" VerticalAlignment="Top" Width="84" Foreground="#FFFFFEFE" Click="checkBoxShowWPRoute_Click"/>
<Label x:Name="label4_Copy9" Content="distance" HorizontalAlignment="Right" Margin="0,462,46,0" VerticalAlignment="Top" Width="57" Foreground="White" Padding="0" Height="18" HorizontalContentAlignment="Right" VerticalContentAlignment="Center" FontSize="13"/>
<Label x:Name="label4_Copy9" Content="distance" HorizontalAlignment="Right" Margin="0,462,51,0" VerticalAlignment="Top" Width="57" Foreground="White" Padding="0" Height="18" HorizontalContentAlignment="Right" VerticalContentAlignment="Center" FontSize="13"/>
<Label x:Name="lblWPRouteDistance" Content="0 m" HorizontalAlignment="Right" Margin="0,463,4,0" VerticalAlignment="Top" Width="42" Foreground="White" HorizontalContentAlignment="Right" VerticalContentAlignment="Center" Padding="0" FontSize="13"/>
<Label x:Name="label4_Copy14" Content="points NC (w/o POI)" HorizontalAlignment="Right" Margin="0,461,138,0" VerticalAlignment="Top" Width="118" Foreground="White" Height="20" HorizontalContentAlignment="Right" Padding="0" VerticalContentAlignment="Center" FontSize="13"/>
<Label x:Name="lblWPCountNC" Content="##" HorizontalAlignment="Right" Margin="0,463,113,0" VerticalAlignment="Top" Width="25" Foreground="White" HorizontalContentAlignment="Right" Padding="0" Height="16" FontSize="13"/>
<Label x:Name="label4_Copy15" Content="Index NC" HorizontalAlignment="Right" Margin="0,480,138,0" VerticalAlignment="Top" Width="65" Foreground="White" Height="21" HorizontalContentAlignment="Right" Padding="0" VerticalContentAlignment="Center" FontSize="13"/>
<Label x:Name="lblWPIndexNC" Content="##" HorizontalAlignment="Right" Margin="0,482,113,0" VerticalAlignment="Top" Width="25" Foreground="White" HorizontalContentAlignment="Right" Padding="0" Height="16" FontSize="13"/>
<Label x:Name="label4_Copy14" Content="points NC (w/o POI)" HorizontalAlignment="Right" Margin="0,461,143,0" VerticalAlignment="Top" Width="118" Foreground="White" Height="20" HorizontalContentAlignment="Right" Padding="0" VerticalContentAlignment="Center" FontSize="13"/>
<Label x:Name="lblWPCountNC" Content="##" HorizontalAlignment="Right" Margin="0,463,118,0" VerticalAlignment="Top" Width="25" Foreground="White" HorizontalContentAlignment="Right" Padding="0" Height="16" FontSize="13"/>
<Label x:Name="label4_Copy15" Content="Index NC" HorizontalAlignment="Right" Margin="0,480,143,0" VerticalAlignment="Top" Width="65" Foreground="White" Height="21" HorizontalContentAlignment="Right" Padding="0" VerticalContentAlignment="Center" FontSize="13"/>
<Label x:Name="lblWPIndexNC" Content="##" HorizontalAlignment="Right" Margin="0,482,118,0" VerticalAlignment="Top" Width="25" Foreground="White" HorizontalContentAlignment="Right" Padding="0" Height="16" FontSize="13"/>
<Rectangle HorizontalAlignment="Left" Width="94" Stroke="#FFE4E4E4" StrokeThickness="0.5" Margin="857,0,0,135" Height="40" VerticalAlignment="Bottom">
<Rectangle.Style>
<Style TargetType="{x:Type Rectangle}">
<Style.Triggers>
<DataTrigger Binding="{Binding IsMouseOver, ElementName=btnWPEditAddCurrentPos}" Value="True">
<Setter Property="Fill" Value="{DynamicResource PressedItemBrush}"/>
</DataTrigger>
</Style.Triggers>
</Style>
</Rectangle.Style>
</Rectangle>
<Button x:Name="btnWPEditAddCurrentPos" Content="" HorizontalAlignment="Left" Height="36" Margin="858,0,0,136" VerticalAlignment="Bottom" Width="93" ToolTip="add current copter position to WP list" BorderBrush="#FFBDBDBD" Style="{DynamicResource ButtonWithoutEffectStyle}" Click="btnWPEditAddCurrentPos_Click">
<Button.Background>
<ImageBrush ImageSource="Images/CurrentPos.png" Stretch="Uniform"/>
</Button.Background>
</Button>
<Label x:Name="label4_Copy28" Content="add current Pos" HorizontalAlignment="Left" Margin="855,0,-1,171" VerticalAlignment="Bottom" Width="107" Foreground="White" Height="26"/>
<Rectangle HorizontalAlignment="Left" Width="94" Stroke="#FFE4E4E4" StrokeThickness="0.5" Margin="857,0,0,75" Height="40" VerticalAlignment="Bottom">
<Rectangle.Style>
<Style TargetType="{x:Type Rectangle}">
<Style.Triggers>
<DataTrigger Binding="{Binding IsMouseOver, ElementName=btnSendActiveWP_Copy1}" Value="True">
<Setter Property="Fill" Value="{DynamicResource PressedItemBrush}"/>
</DataTrigger>
</Style.Triggers>
</Style>
</Rectangle.Style>
</Rectangle>
<Button x:Name="btnSendActiveWP_Copy1" Content="" HorizontalAlignment="Left" Height="36" Margin="858,0,0,76" VerticalAlignment="Bottom" Width="93" ToolTip="Set WP as active WP" BorderBrush="#FFBDBDBD" Style="{DynamicResource ButtonWithoutEffectStyle}" Click="btnSendActiveWP_Click">
<Button.Background>
<ImageBrush ImageSource="Images/Blitz.png" Stretch="Uniform"/>
</Button.Background>
</Button>
<Label x:Name="label4_Copy29" Content="set as active WP" HorizontalAlignment="Left" Margin="855,0,0,111" VerticalAlignment="Bottom" Width="96" Foreground="White" Height="26"/>
</Grid>
<Grid x:Name="GridSideBarR" Background="#66000000" Margin="0,36,0,0" HorizontalAlignment="Right" Width="23">
<Label x:Name="labelMotordata" Content="Motors" Padding="0" RenderTransformOrigin="0.5,0.5" Margin="-25,233,-26,0" HorizontalContentAlignment="Center" VerticalContentAlignment="Stretch" MouseDown="labelMotorData_MouseDown" FontSize="14" HorizontalAlignment="Left" Width="74" Height="22" VerticalAlignment="Top">
/MKLiveView/v1.0/Source/MainWindow.xaml.cs
3251,23 → 3251,7
Dispatcher.Invoke(() => dgvWP.Items.Refresh());
Thread.Sleep(10);
}
Dispatcher.Invoke(() =>
{
if (comboBoxRouteColor.SelectionBoxItem != null)
{
string s = comboBoxRouteColor.SelectionBoxItem.ToString();
mRouteWP = new GMapRoute(wpList, _getBrush(s));
}
else
mRouteWP = new GMapRoute(wpList, null);
 
if (_bShowWPRoute)
MainMap.Markers.Add(mRouteWP);
});
 
MapRoute mr = new MapRoute(wpList, "WPList");
Dispatcher.Invoke(() => lblWPRouteDistance.Content = (mr.Distance * 1000).ToString("0 m"));
 
_routeUpdate();
}
}
}
3352,6 → 3336,26
return Brushes.Magenta;
}
}
void _routeUpdate()
{
Dispatcher.Invoke(() =>
{
if (comboBoxRouteColor.SelectionBoxItem != null)
{
string s = comboBoxRouteColor.SelectionBoxItem.ToString();
mRouteWP = new GMapRoute(wpList, _getBrush(s));
}
else
mRouteWP = new GMapRoute(wpList, null);
 
if (_bShowWPRoute)
MainMap.Markers.Add(mRouteWP);
});
 
MapRoute mr = new MapRoute(wpList, "WPList");
Dispatcher.Invoke(() => lblWPRouteDistance.Content = (mr.Distance * 1000).ToString("0 m"));
 
}
void _setMarkerColor(GMapMarker wpMarker,int iType)
{
Dispatcher.Invoke(() =>
3577,6 → 3581,13
}
private void dgvWP_MouseUp(object sender, MouseButtonEventArgs e)
{
_dgvWPselectEditRow();
}
private void dgvWP_MouseDoubleClick(object sender, MouseButtonEventArgs e)
{
}
void _dgvWPselectEditRow()
{
if (dgvWP.SelectedIndex > -1 && dgvWP.SelectedIndex < dtWaypoints.Rows.Count)
{
Dispatcher.Invoke(() => {
3599,9 → 3610,6
});
}
}
private void dgvWP_MouseDoubleClick(object sender, MouseButtonEventArgs e)
{
}
void _setWPEditFields(int index)
{
int iVal;
3710,33 → 3718,68
}
private void btnWPEditAddCurrentPos_Click(object sender, RoutedEventArgs e)
{
cbWPEditType.SelectedIndex = dgvWP.ItemContainerGenerator.Items.Count;
tbWPEditPrefix.Text = "P";
tbWPEditLat.Text = copter.Position.Lat.ToString();
tbWPEditLon.Text = copter.Position.Lng.ToString();
tbWPEditAlt.Text = ((double)iAnalogData[4] / (double)10).ToString();
object[] o = new object[16];
 
cbWPEditHeading.SelectedIndex = 2;
tbWPEditHeading.Text = iAnalogData[10].ToString();
tbWPEditHeading.IsReadOnly = false;
o[0] = dgvWP.ItemContainerGenerator.Items.Count+1;
o[1] = 0;
// cbWPEditType.SelectedIndex = 0;
// tbWPEditPrefix.Text = "P";
o[2] = "P" + o[0].ToString();
// tbWPEditLat.Text = copter.Position.Lat.ToString();
o[3] = copter.Position.Lat;
// tbWPEditLon.Text = copter.Position.Lng.ToString();
o[4] = copter.Position.Lng;
// tbWPEditAlt.Text = ((double)iAnalogData[4] / (double)10).ToString();
o[5] = iAnalogData[4].ToString();
 
cbWPEditSpeed.SelectedIndex = 1;
tbWPEditSpeed.Text = "5.0";
tbWPEditSpeed.IsReadOnly = false;
// cbWPEditHeading.SelectedIndex = 2;
o[6] = tbWPEditHeading.Text = iAnalogData[10].ToString();
// tbWPEditHeading.IsReadOnly = false;
 
cbWPEditClimbrate.SelectedIndex = 1;
tbWPEditClimbrate.Text = "5.0";
tbWPEditClimbrate.IsReadOnly = false;
// cbWPEditSpeed.SelectedIndex = 1;
// tbWPEditSpeed.Text = "5.0";
// tbWPEditSpeed.IsReadOnly = false;
o[7] = "50";
 
tbWPEditRadius.Text = "10";
tbWPEditHoldtime.Text = "5";
tbWPEditAutoTrigger.Text = "0";
// cbWPEditClimbrate.SelectedIndex = 1;
// tbWPEditClimbrate.Text = "5.0";
// tbWPEditClimbrate.IsReadOnly = false;
o[8] = "50";
 
cbWPEditCamAngle.SelectedIndex = 1;
tbWPEditCamAngle.Text = "AUTO";
tbWPEditCamAngle.IsReadOnly = true;
// tbWPEditRadius.Text = "10";
o[9] = "10";
// tbWPEditHoldtime.Text = "5";
o[10] = "5";
// tbWPEditAutoTrigger.Text = "0";
o[11] = "0";
// cbWPEditCamAngle.SelectedIndex = 1;
// tbWPEditCamAngle.Text = "AUTO";
// tbWPEditCamAngle.IsReadOnly = true;
o[12] = "255";
 
tbWPEditOut1.Text = "0";
o[13] = "0";
// tbWPEditOut1.Text = "0";
o[14] = "0";
o[15] = "0";
 
dtWaypoints.Rows.Add(o);
GMapMarker wpMarker = new GMapMarker(new PointLatLng((double)o[3], (double)o[4]));
wpMarker.Shape = new CustomMarkerWP(this, wpMarker, (string)o[2], (int)o[1]);
wpMarker.Offset = new System.Windows.Point(-11.5, -11.5);
wpMarker.ZIndex = 100;
_setMarkerColor(wpMarker, (int)o[1]);
MainMap.Markers.Add(wpMarker);
wpList.Add(new PointLatLng((double)o[3], (double)o[4]));
Dispatcher.Invoke(() => lblWPCount.Content = o[0].ToString());
if (mRouteWP != null)
MainMap.Markers.Remove(mRouteWP);
_routeUpdate();
Dispatcher.Invoke(() => {
dgvWP.Items.Refresh();
dgvWP.SelectedIndex = (int)o[0] -1;
dgvWP.UpdateLayout();
_dgvWPselectEditRow();
});
}
 
#endregion WP