Subversion Repositories Projects

Compare Revisions

Ignore whitespace Rev 2360 → Rev 2361

/MKLiveView/v1.0/Source/KeyPad/bin/Debug/KeyPad.dll
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
/MKLiveView/v1.0/Source/KeyPad/bin/Debug/KeyPad.pdb
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
/MKLiveView/v1.0/Source/KeyPad/obj/x86/Debug/DesignTimeResolveAssemblyReferencesInput.cache
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
/MKLiveView/v1.0/Source/KeyPad/obj/x86/Debug/KeyPad.csproj.FileListAbsolute.txt
39,3 → 39,15
E:\VS Projekts\WPF\KeyPad\KeyPad\obj\x86\Debug\KeyPad.csproj.GenerateResource.Cache
E:\VS Projekts\WPF\KeyPad\KeyPad\obj\x86\Debug\KeyPad.dll
E:\VS Projekts\WPF\KeyPad\KeyPad\obj\x86\Debug\KeyPad.pdb
E:\Documents\VS Projects\MKLiveView\WPF\MKLiveView\KeyPad\bin\Debug\KeyPad.dll.config
E:\Documents\VS Projects\MKLiveView\WPF\MKLiveView\KeyPad\bin\Debug\KeyPad.dll
E:\Documents\VS Projects\MKLiveView\WPF\MKLiveView\KeyPad\bin\Debug\KeyPad.pdb
E:\Documents\VS Projects\MKLiveView\WPF\MKLiveView\KeyPad\obj\x86\Debug\KeyPad.csprojResolveAssemblyReference.cache
E:\Documents\VS Projects\MKLiveView\WPF\MKLiveView\KeyPad\obj\x86\Debug\Keypad.baml
E:\Documents\VS Projects\MKLiveView\WPF\MKLiveView\KeyPad\obj\x86\Debug\Keypad.g.cs
E:\Documents\VS Projects\MKLiveView\WPF\MKLiveView\KeyPad\obj\x86\Debug\KeyPad_MarkupCompile.cache
E:\Documents\VS Projects\MKLiveView\WPF\MKLiveView\KeyPad\obj\x86\Debug\KeyPad.g.resources
E:\Documents\VS Projects\MKLiveView\WPF\MKLiveView\KeyPad\obj\x86\Debug\KeyPad.Properties.Resources.resources
E:\Documents\VS Projects\MKLiveView\WPF\MKLiveView\KeyPad\obj\x86\Debug\KeyPad.csproj.GenerateResource.Cache
E:\Documents\VS Projects\MKLiveView\WPF\MKLiveView\KeyPad\obj\x86\Debug\KeyPad.dll
E:\Documents\VS Projects\MKLiveView\WPF\MKLiveView\KeyPad\obj\x86\Debug\KeyPad.pdb
/MKLiveView/v1.0/Source/KeyPad/obj/x86/Debug/KeyPad.csproj.GenerateResource.Cache
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
/MKLiveView/v1.0/Source/KeyPad/obj/x86/Debug/KeyPad.dll
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
/MKLiveView/v1.0/Source/KeyPad/obj/x86/Debug/KeyPad.pdb
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
/MKLiveView/v1.0/Source/KeyPad/obj/x86/Debug/KeyPad_MarkupCompile.cache
4,7 → 4,7
library
C#
.cs
E:\VS Projekts\WPF\KeyPad\KeyPad\obj\x86\Debug\
E:\Documents\VS Projects\MKLiveView\WPF\MKLiveView\KeyPad\obj\x86\Debug\
KeyPad
none
false
/MKLiveView/v1.0/Source/KeyPad/obj/x86/Debug/KeyPad_MarkupCompile.i.cache
4,7 → 4,7
library
C#
.cs
E:\VS Projekts\WPF\KeyPad\KeyPad\obj\x86\Debug\
E:\Documents\VS Projects\MKLiveView\WPF\MKLiveView\KeyPad\obj\x86\Debug\
KeyPad
none
false
12,7 → 12,7
 
11274475397
 
51883802014
5-425624737
12-1381780322
Keypad.xaml;
 
/MKLiveView/v1.0/Source/MKLiveView.csproj
255,6 → 255,10
<Project>{644fe7d4-0184-400f-b2d7-99cb41360658}</Project>
<Name>GMap.NET.WindowsPresentation</Name>
</ProjectReference>
<ProjectReference Include="KeyPad\KeyPad.csproj">
<Project>{3adbff38-915c-4115-9cdd-81c0cad9733a}</Project>
<Name>KeyPad</Name>
</ProjectReference>
</ItemGroup>
<ItemGroup>
<Resource Include="Images\height.png" />
339,6 → 343,12
<ItemGroup>
<Resource Include="Images\Delete.png" />
</ItemGroup>
<ItemGroup>
<Resource Include="Images\WPToCopter1.png" />
<Resource Include="Images\WPToCopter.png" />
<Resource Include="Images\FromCopterToPc1.png" />
</ItemGroup>
<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/MKLiveView.sln
1,7 → 1,7

Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 14
VisualStudioVersion = 14.0.25123.0
VisualStudioVersion = 14.0.24720.0
MinimumVisualStudioVersion = 10.0.40219.1
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MKLiveView", "MKLiveView.csproj", "{1805AEEA-A2F6-445A-8128-62370F66CA37}"
ProjectSection(ProjectDependencies) = postProject
/MKLiveView/v1.0/Source/MainWindow.xaml
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/FromCopterToPc.png" Stretch="Uniform"/>
<ImageBrush ImageSource="Images/FromCopterToPc1.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/FromPcToCopter.png" Stretch="Uniform"/>
<ImageBrush ImageSource="Images/WPToCopter1.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">
1359,7 → 1359,7
</Style>
</Rectangle.Style>
</Rectangle>
<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 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_Click">
<Button.Background>
<ImageBrush ImageSource="Images/Save.png" Stretch="Uniform"/>
</Button.Background>
1376,7 → 1376,7
</Style>
</Rectangle.Style>
</Rectangle>
<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 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_Click">
<Button.Background>
<ImageBrush ImageSource="Images/Delete.png" Stretch="Uniform"/>
</Button.Background>
1420,7 → 1420,7
</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 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="btnWPAddCurrentPos_Click">
<Button.Background>
<ImageBrush ImageSource="Images/CurrentPos.png" Stretch="Uniform"/>
</Button.Background>
/MKLiveView/v1.0/Source/MainWindow.xaml.cs
3699,6 → 3699,34
 
}
 
private void btnEditWPSave_Click(object sender, RoutedEventArgs e)
{
 
}
private void btnEditWPDel_Click(object sender, RoutedEventArgs e)
{
 
}
private void tbWPEdit_KeyDown(object sender, KeyEventArgs e)
{
if(!((TextBox)sender).IsReadOnly)
{
KeyPad.Keypad k = new KeyPad.Keypad(this);
 
//var x = KeyInterop.VirtualKeyFromKey(e.Key);
KeyConverter x = new KeyConverter();
string s = x.ConvertToString(e.Key);
 
if ("1234567890,\b".IndexOf(s) < 0) //general check for valid chars(0-9) and backspace (\b)
e.Handled = true;
else
if ("\b".IndexOf(s) < 0)
if (Convert.ToInt16(((TextBox)sender).Text + s) > 360) //if valid and not backspace, check for upper limit of the resulting number
e.Handled = true;
 
}
}
 
private void tbWPEditHeading_KeyDown(object sender, KeyEventArgs e)
{
if(!tbWPEditHeading.IsReadOnly)
3716,7 → 3744,7
 
}
}
private void btnWPEditAddCurrentPos_Click(object sender, RoutedEventArgs e)
private void btnWPAddCurrentPos_Click(object sender, RoutedEventArgs e)
{
object[] o = new object[16];
 
3852,7 → 3880,6
}
}
 
 
private void btnLoadGPXLog_Click(object sender, RoutedEventArgs e)
{
_loadGPXLog();