WebSVN - Projects - Diff - Rev 2399 and 2401 - /MKLiveView/v1.0/Source/MainWindow.xaml

         xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
         xmlns:local="clr-namespace:MKLiveView"
         xmlns:WindowsPresentation="clr-namespace:GMap.NET.WindowsPresentation;assembly=GMap.NET.WindowsPresentation"
         xmlns:ArtificialHorizon="clr-namespace:MKLiveView.ArtificialHorizon"
         xmlns:wpConverter="clr-namespace:MKLiveView"
+        xmlns:ed="http://schemas.microsoft.com/expression/2010/drawing"
         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" Closed="Window_Closed">
     <Window.Resources>
             <GradientStop Color="#FFFFEAC6"/>
             <GradientStop Color="#FFFFD99B" Offset="0.18"/>
             <GradientStop Color="#FFFFD07F" Offset="0.39"/>
             <GradientStop Color="#FFFFC961" Offset="1"/>
         </LinearGradientBrush>
-        <Style x:Key="ButtonWithoutEffectStyle" TargetType="Button">
+        <Style x:Key="ButtonWithoutEffectStyle" TargetType="{x:Type Button}">
             <Setter Property="Background" Value="Transparent" />
             <Setter Property="Template">
                 <Setter.Value>
-                    <ControlTemplate TargetType="Button">
+                    <ControlTemplate TargetType="{x:Type Button}">
                         <Grid Background="{TemplateBinding Background}">
                             <ContentPresenter />
-                            <Border Name="border"
+                            <Border x:Name="border"
-                                BorderThickness="0"
+        						BorderThickness="0"
-                                Padding="4,2"
+        						Padding="4,2"
-                                BorderBrush="#FFE4E4E4"
+        						BorderBrush="#FFE4E4E4"
-                                CornerRadius="0"
+        						CornerRadius="0"
-                                Background="{TemplateBinding Background}">
+        						Background="{TemplateBinding Background}">
                                 <ContentPresenter HorizontalAlignment="Center" VerticalAlignment="Center" />
                             </Border>
                         </Grid>
         <Style TargetType="{x:Type DataGridRowHeader}">
             <Setter Property="Background" Value="Transparent" />
         </Style>
         <Style x:Key="CanvasVisibility" TargetType="{x:Type Canvas}">
             <Style.Triggers>
-                <DataTrigger Binding="{Binding Path=Tag.IsChecked, RelativeSource={RelativeSource Self}}" Value="False">
+                <DataTrigger Binding="{Binding Tag.IsChecked, RelativeSource={RelativeSource Self}}" Value="False">
+                    <Setter Property="Visibility" Value="Collapsed" />
+                </DataTrigger>
+            </Style.Triggers>
+        </Style>
+        <Style x:Key="GridVisibility" TargetType="{x:Type Grid}">
+            <Style.Triggers>
+                <DataTrigger Binding="{Binding Tag.IsChecked, RelativeSource={RelativeSource Self}}" Value="False">
-                    <Setter Property="Canvas.Visibility" Value="Collapsed" />
+                    <Setter Property="Visibility" Value="Collapsed" />
                 </DataTrigger>
             </Style.Triggers>
         </Style>
                 </Trigger>
             </Style.Triggers>
         </Style>
         <Storyboard x:Key="VoltageCritAnim" Duration="0:0:1" RepeatBehavior="Forever">
             <ColorAnimationUsingKeyFrames
-                Storyboard.TargetName="rectTopVoltage"
+        		Storyboard.TargetName="rectTopVoltage"
-                Storyboard.TargetProperty="Fill.(SolidColorBrush.Color)">
+        		Storyboard.TargetProperty="Fill.(SolidColorBrush.Color)">
                 <DiscreteColorKeyFrame KeyTime="0:0:0" Value="Red" />
                 <DiscreteColorKeyFrame KeyTime="0:0:0.5" Value="Transparent" />
             </ColorAnimationUsingKeyFrames>
         </Storyboard>
         <Storyboard x:Key="SatFixLostAnim" Duration="0:0:1" RepeatBehavior="Forever">
             <ColorAnimationUsingKeyFrames
-                Storyboard.TargetName="tbTopSats"
+        		Storyboard.TargetName="tbTopSats"
-                Storyboard.TargetProperty="Background.(SolidColorBrush.Color)">
+        		Storyboard.TargetProperty="Background.(SolidColorBrush.Color)">
                 <DiscreteColorKeyFrame KeyTime="0:0:0" Value="Red" />
                 <DiscreteColorKeyFrame KeyTime="0:0:0.5" Value="Transparent" />
             </ColorAnimationUsingKeyFrames>
         </Storyboard>
         <Storyboard x:Key="MagneticFieldCritAnim" Duration="0:0:1" RepeatBehavior="Forever">
             <ColorAnimationUsingKeyFrames
-                Storyboard.TargetName="tbTopEarthMag"
+        		Storyboard.TargetName="tbTopEarthMag"
-                Storyboard.TargetProperty="Background.(SolidColorBrush.Color)">
+        		Storyboard.TargetProperty="Background.(SolidColorBrush.Color)">
                 <DiscreteColorKeyFrame KeyTime="0:0:0" Value="Red" />
                 <DiscreteColorKeyFrame KeyTime="0:0:0.5" Value="Transparent" />
             </ColorAnimationUsingKeyFrames>
         </Storyboard>
         <Storyboard x:Key="DistanceCritAnim" Duration="0:0:1" RepeatBehavior="Forever">
             <ColorAnimationUsingKeyFrames
-                Storyboard.TargetName="tbTopDistanceHP"
+        		Storyboard.TargetName="tbTopDistanceHP"
-                Storyboard.TargetProperty="Background.(SolidColorBrush.Color)">
+        		Storyboard.TargetProperty="Background.(SolidColorBrush.Color)">
                 <DiscreteColorKeyFrame KeyTime="0:0:0" Value="Red" />
                 <DiscreteColorKeyFrame KeyTime="0:0:0.5" Value="Transparent" />
             </ColorAnimationUsingKeyFrames>
         </Storyboard>
         <Storyboard x:Key="RCCritAnim" Duration="0:0:1" RepeatBehavior="Forever">
             <ColorAnimationUsingKeyFrames
-                Storyboard.TargetName="tbTopRC"
+        		Storyboard.TargetName="tbTopRC"
-                Storyboard.TargetProperty="Background.(SolidColorBrush.Color)">
+        		Storyboard.TargetProperty="Background.(SolidColorBrush.Color)">
                 <DiscreteColorKeyFrame KeyTime="0:0:0" Value="Red" />
                 <DiscreteColorKeyFrame KeyTime="0:0:0.5" Value="Transparent" />
             </ColorAnimationUsingKeyFrames>
         </Storyboard>
         <Style x:Key="HideSwitchNCLabel" TargetType="{x:Type Label}">
             <WindowsPresentation:GMapControl x:Name="MainMap" Loaded="MainMap_Loaded" OnPositionChanged="MainMap_OnPositionChanged" OnMapZoomChanged="MainMap_OnMapZoomChanged" StylusDown="MainMap_StylusDown" StylusUp="MainMap_StylusUp" StylusMove="MainMap_StylusMove"/>
         </Grid>
         <Grid>
             <Grid.LayoutTransform>
                 <ScaleTransform
-                    CenterX="0"
+					CenterX="0"
-                    CenterY="0"
+					CenterY="0"
-                    ScaleX="{Binding ElementName=UIScaleSlider,Path=Value}"
+					ScaleX="{Binding Value, ElementName=UIScaleSlider}"
-                    ScaleY="{Binding ElementName=UIScaleSlider,Path=Value}"
+					ScaleY="{Binding Value, ElementName=UIScaleSlider}"
                 />
             </Grid.LayoutTransform>
             <Grid x:Name="GridTop" Height="36" VerticalAlignment="Top" Background="#7F000000">
                 <Grid.LayoutTransform>
                     <ScaleTransform
-                    CenterX="0"
+						CenterX="0"
-                    CenterY="0"
+						CenterY="0"
-                    ScaleX="{Binding ElementName=UIScaleTopSlider,Path=Value}"
+						ScaleX="{Binding Value, ElementName=UIScaleTopSlider}"
-                    ScaleY="{Binding ElementName=UIScaleTopSlider,Path=Value}"
+						ScaleY="{Binding Value, ElementName=UIScaleTopSlider}"
                 />
                 </Grid.LayoutTransform>
                                     <TextBox x:Name="textBoxSerial1_val3" HorizontalAlignment="Left" Height="29" Margin="122,96,0,0" TextWrapping="Wrap" Text="0" VerticalAlignment="Top" Width="58" MaxLines="1" MaxLength="3" IsUndoEnabled="False" FontSize="14" VerticalContentAlignment="Center" HorizontalContentAlignment="Center" KeyUp="textBox_serial_KeyPress" TextChanged="textBoxSerial1_val3_TextChanged"/>
                                     <Button x:Name="btnSer1_val1" Content="{Binding Text, ElementName=textBoxSerial1_val1}" HorizontalAlignment="Left" Height="35" Margin="2,128,0,0" VerticalAlignment="Top" Width="58" FontSize="14" Click="btnSer1_val1_Click">
                                         <Button.Style>
                                             <Style TargetType="{x:Type Button}">
                                                 <Style.Triggers>
-                                                    <DataTrigger Binding="{Binding Text,ElementName=textBoxSerial1_val1}"></DataTrigger>
+                                                    <DataTrigger Binding="{Binding Text, ElementName=textBoxSerial1_val1}"/>
                                                 </Style.Triggers>
                                             </Style>
                                         </Button.Style>
                                     </Button>
                                     <Button x:Name="btnSer1_val2" Content="{Binding Text, ElementName=textBoxSerial1_val2}" HorizontalAlignment="Left" Height="35" Margin="62,128,0,0" VerticalAlignment="Top" Width="58" FontSize="14" Click="btnSer1_val2_Click">
                                         <Button.Style>
                                             <Style TargetType="{x:Type Button}">
                                                 <Style.Triggers>
-                                                    <DataTrigger Binding="{Binding Text,ElementName=textBoxSerial1_val2}"></DataTrigger>
+                                                    <DataTrigger Binding="{Binding Text, ElementName=textBoxSerial1_val2}"/>
                                                 </Style.Triggers>
                                             </Style>
                                         </Button.Style>
                                     </Button>
                                     <Button x:Name="btnSer1_val3" Content="{Binding Text, ElementName=textBoxSerial1_val3}" HorizontalAlignment="Left" Height="35" Margin="122,128,0,0" VerticalAlignment="Top" Width="58" FontSize="14" Click="btnSer1_val3_Click">
                                         <Button.Style>
                                             <Style TargetType="{x:Type Button}">
                                                 <Style.Triggers>
-                                                    <DataTrigger Binding="{Binding Text,ElementName=textBoxSerial1_val3}"></DataTrigger>
+                                                    <DataTrigger Binding="{Binding Text, ElementName=textBoxSerial1_val3}"/>
                                                 </Style.Triggers>
                                             </Style>
                                         </Button.Style>
                                     </Button>
                                     <TextBox x:Name="textBoxSerial2_val3" HorizontalAlignment="Left" Height="29" Margin="122,96,0,0" TextWrapping="Wrap" Text="0" VerticalAlignment="Top" Width="58" MaxLines="1" MaxLength="3" IsUndoEnabled="False" FontSize="14" VerticalContentAlignment="Center" HorizontalContentAlignment="Center" KeyUp="textBox_serial_KeyPress" TextChanged="textBoxSerial2_val3_TextChanged"/>
                                     <Button x:Name="btnSer2_val1" Content="{Binding Text, ElementName=textBoxSerial2_val1}" HorizontalAlignment="Left" Height="35" Margin="2,128,0,0" VerticalAlignment="Top" Width="58" FontSize="14" Click="btnSer2_val1_Click">
                                         <Button.Style>
                                             <Style TargetType="{x:Type Button}">
                                                 <Style.Triggers>
-                                                    <DataTrigger Binding="{Binding Text,ElementName=textBoxSerial1_val1}"></DataTrigger>
+                                                    <DataTrigger Binding="{Binding Text, ElementName=textBoxSerial1_val1}"/>
                                                 </Style.Triggers>
                                             </Style>
                                         </Button.Style>
                                     </Button>
                                     <Button x:Name="btnSer2_val2" Content="{Binding Text, ElementName=textBoxSerial2_val2}" HorizontalAlignment="Left" Height="35" Margin="62,128,0,0" VerticalAlignment="Top" Width="58" FontSize="14" Click="btnSer2_val2_Click">
                                         <Button.Style>
                                             <Style TargetType="{x:Type Button}">
                                                 <Style.Triggers>
-                                                    <DataTrigger Binding="{Binding Text,ElementName=textBoxSerial2_val2}"></DataTrigger>
+                                                    <DataTrigger Binding="{Binding Text, ElementName=textBoxSerial2_val2}"/>
                                                 </Style.Triggers>
                                             </Style>
                                         </Button.Style>
                                     </Button>
                                     <Button x:Name="btnSer2_val3" Content="{Binding Text, ElementName=textBoxSerial2_val3}" HorizontalAlignment="Left" Height="35" Margin="122,128,0,0" VerticalAlignment="Top" Width="58" FontSize="14" Click="btnSer2_val3_Click">
                                         <Button.Style>
                                             <Style TargetType="{x:Type Button}">
                                                 <Style.Triggers>
-                                                    <DataTrigger Binding="{Binding Text,ElementName=textBoxSerial2_val3}"></DataTrigger>
+                                                    <DataTrigger Binding="{Binding Text, ElementName=textBoxSerial2_val3}"/>
                                                 </Style.Triggers>
                                             </Style>
                                         </Button.Style>
                                     </Button>
             </Grid>
             <Grid x:Name="GridSettings" Background="#7B000000" HorizontalAlignment="Left" Width="233" Margin="23,36,0,0">
                 <TabControl x:Name="tabControlSettings" HorizontalAlignment="Left" Width="229" Background="{x:Null}" Margin="4,0,0,0">
                     <TabItem Header="General" Margin="0,0,5.849,0">
                         <Grid x:Name="TabGridGeneral">
-                            <local:SerialPortCtrl x:Name="serialPortCtrl" HorizontalAlignment="Left" Height="256" Margin="11,5,0,0" VerticalAlignment="Top" Width="210"/>
+                            <wpConverter:SerialPortCtrl x:Name="serialPortCtrl" HorizontalAlignment="Left" Height="256" Margin="11,5,0,0" VerticalAlignment="Top" Width="210"/>
                             <GroupBox x:Name="groupBox" Header="timings autoupdate (ms)" HorizontalAlignment="Left" Height="129" Margin="10,278,0,0" VerticalAlignment="Top" Width="210" Foreground="White" BorderThickness="0.5,0.5,0.4,0.4" FontSize="14">
                                 <Grid Margin="0,0,-12,-6">
                                     <Label x:Name="label" Content="debug values" HorizontalAlignment="Left" Margin="4,13,0,0" VerticalAlignment="Top" Foreground="White" Padding="0"/>
                                     <Label x:Name="label_Copy" Content="Nav-Ctrl values" HorizontalAlignment="Left" Margin="4,36,0,0" VerticalAlignment="Top" Foreground="White" Padding="0"/>
                                     <Label x:Name="label_Copy1" Content="BL-Ctrl values" HorizontalAlignment="Left" Margin="4,59,0,0" VerticalAlignment="Top" Foreground="White" Padding="0"/>
                                     <CheckBox x:Name="chkBoxTopBarShowSatellites" Content="Satellites" Foreground="White" Margin="10,141,70,0" IsChecked="True" Height="18" VerticalAlignment="Top" />
                                     <CheckBox x:Name="chkBoxTopBarShowRC" Content="RC quality" Foreground="White" Margin="10,157,70,0" IsChecked="True" Height="18" VerticalAlignment="Top" />
                                 </Grid>
                             </GroupBox>
                             <CheckBox x:Name="chkBoxShowHorizon" Content="Show Horizon/Heading" Foreground="White" Margin="14,529,64,0" IsChecked="True" Height="18" VerticalAlignment="Top" />
-                            <CheckBox x:Name="chkBoxSaveFullScreenState" Content="save fullscreen&#xD;&#xA;scalings" Foreground="White" Margin="119,285,0,0" IsChecked="True" Height="33" VerticalAlignment="Top" VerticalContentAlignment="Center" Click="chkBoxSaveFullScreenState_Click" />
+                            <CheckBox x:Name="chkBoxSaveFullScreenState" Content="save fullscreen&#xA;scalings" Foreground="White" Margin="119,285,0,0" IsChecked="True" Height="33" VerticalAlignment="Top" VerticalContentAlignment="Center" Click="chkBoxSaveFullScreenState_Click" />
                             <CheckBox x:Name="chkBoxSaveNormalState" Content="save normal&#xA;window scalings" Foreground="White" Margin="6,285,106,0" IsChecked="True" Height="33" VerticalAlignment="Top" VerticalContentAlignment="Center" Click="chkBoxSaveNormalState_Click" />
                         </Grid>
                     </TabItem>
                     <TabItem Header="Map" Height="20" VerticalAlignment="Top" Margin="1.022,0,-4,0">
                         <Grid x:Name="GridMapData" Margin="0,0,-3,-1" HorizontalAlignment="Left" Width="226">
                             <Label Height="23" HorizontalAlignment="Right" Margin="0,349,4,0" x:Name="label2_Copy" VerticalAlignment="Top" Width="27" VerticalContentAlignment="Center" Foreground="White" Content="lat"/>
                             <Label Height="29" HorizontalAlignment="Right" Margin="0,370,4,0" x:Name="label3_Copy" VerticalAlignment="Top" VerticalContentAlignment="Center" Width="27" Foreground="White" Content="lng"/>
                             <Label HorizontalAlignment="Right" Margin="0,325,111,0" x:Name="label1_Copy1" Width="109" Foreground="White" Content="Current position" Height="28" VerticalAlignment="Top"/>
                             <Slider x:Name="sliderMapZoom" Style="{DynamicResource TouchSliderStyle}" HorizontalAlignment="Left" Margin="10,303,0,0" Width="206" Maximum="24" SmallChange="1" Value="0" IsSnapToTickEnabled="True" ValueChanged="sliderMapZoom_ValueChanged" Height="29" VerticalAlignment="Top"/>
                             <Label Height="23" HorizontalAlignment="Right" Margin="0,275,139,0" x:Name="label2_Copy1" VerticalAlignment="Top" Width="69" VerticalContentAlignment="Center" Foreground="White" Content="Zoomlevel"/>
-                            <Label Height="23" HorizontalAlignment="Right" Margin="0,275,101,0" x:Name="labelZoom" VerticalAlignment="Top" Width="49" VerticalContentAlignment="Center" Foreground="White" Content="{Binding Value,ElementName=sliderMapZoom}" HorizontalContentAlignment="Center"/>
+                            <Label Height="23" HorizontalAlignment="Right" Margin="0,275,101,0" x:Name="labelZoom" VerticalAlignment="Top" Width="49" VerticalContentAlignment="Center" Foreground="White" Content="{Binding Value, ElementName=sliderMapZoom}" HorizontalContentAlignment="Center"/>
                             <Button x:Name="btnSetHP" Content="set Home" Margin="7,400,139,0" Click="btnSetHP_Click" Height="24" VerticalAlignment="Top"/>
                             <Button x:Name="btnClearHP" Content="clear Home" Margin="7,424,139,0" Click="btnClearHP_Click" Height="25" VerticalAlignment="Top" RenderTransformOrigin="0.5,0.6"/>
                             <Button x:Name="btnGotoHP" Content="goto Home" Margin="92,424,54,0" Click="btnGotoHP_Click" Height="25" VerticalAlignment="Top"/>
                             <CheckBox x:Name="checkBoxGPXLog" Content="GPX-Log" HorizontalAlignment="Left" Margin="8,457,0,0" Width="107" RenderTransformOrigin="0.783,27.263" Foreground="White" FontSize="14" VerticalContentAlignment="Center" Height="20" VerticalAlignment="Top" ToolTip="the map follows the copter - the copter is always centered" Click="checkBoxGPXLog_Click"/>
                             <Rectangle HorizontalAlignment="Left" Width="72" Stroke="#FFE4E4E4" StrokeThickness="0.5" Margin="128,454,0,0" Height="39" VerticalAlignment="Top">
                                                 </Style.Triggers>
                                             </Style>
                                         </Label.Style>
                                     </Label>
                                     <Label x:Name="labelThresholdVoltageCrit_Copy" Content="critical" HorizontalAlignment="Left" Margin="8,41,0,0" VerticalAlignment="Top" Foreground="White"/>
-                                    <Slider x:Name="sliderThresholdVoltageWarn" HorizontalAlignment="Left" Height="23" Margin="10,22,0,0" VerticalAlignment="Top" Width="177" ValueChanged="sliderThresholdVoltageWarn_ValueChanged" Maximum="30" TickFrequency="0.1" IsSnapToTickEnabled="True">
+                                    <Slider x:Name="sliderThresholdVoltageWarn" HorizontalAlignment="Left" Height="23" Margin="10,22,0,0" VerticalAlignment="Top" Width="177" ValueChanged="sliderThresholdVoltageWarn_ValueChanged" Maximum="30" TickFrequency="0.1" IsSnapToTickEnabled="True"/>
-                                    </Slider>
                                     <Label x:Name="labelThresholdVoltageWarn"  HorizontalAlignment="Left" Margin="86,-2,0,0" VerticalAlignment="Top" Foreground="White" Height="25" Width="45" Content="{Binding Value, ElementName=sliderThresholdVoltageWarn}">
                                         <Label.Style>
                                             <Style TargetType="{x:Type Label}">
                                                 <Style.Triggers>
                                                     <DataTrigger Binding="{Binding Value, ElementName=sliderThresholdVoltageWarn}">
                         <GradientStop Color="#FF9DCAF9" Offset="0"/>
                         <GradientStop Color="#FF004385" Offset="1"/>
                     </LinearGradientBrush>
                 </Border.BorderBrush>
             </Border>
-            <ArtificialHorizon:ArtificialHorizon x:Name="ArtHor" Margin="0,0,-22,-29" Height="143" Width="177" HorizontalAlignment="Right" VerticalAlignment="Bottom" Visibility="{Binding IsChecked, ElementName=chkBoxShowHorizon, Converter={StaticResource BooleanToVisibility}}">
+            <ArtificialHorizon:ArtificialHorizon x:Name="ArtHor" Margin="0,0,-22,-29" Height="143" Width="177" HorizontalAlignment="Right" VerticalAlignment="Bottom" Visibility="{Binding IsChecked, Converter={StaticResource BooleanToVisibility}, ElementName=chkBoxShowHorizon}">
                 <ArtificialHorizon:ArtificialHorizon.RenderTransform>
                     <ScaleTransform
-                    CenterX="136"
+						CenterX="136"
-                    CenterY="117"
+						CenterY="117"
-                    ScaleX="{Binding ElementName=UIScaleHorizonSlider,Path=Value}"
+						ScaleX="{Binding Value, ElementName=UIScaleHorizonSlider}"
-                    ScaleY="{Binding ElementName=UIScaleHorizonSlider,Path=Value}"
+						ScaleY="{Binding Value, ElementName=UIScaleHorizonSlider}"
                 />
                 </ArtificialHorizon:ArtificialHorizon.RenderTransform>
             </ArtificialHorizon:ArtificialHorizon>
             <Grid x:Name="GridLog" Margin="257,0,0,0" Background="#66000000" Height="66" VerticalAlignment="Bottom" HorizontalAlignment="Left" Width="518">
                 <Grid.LayoutTransform>
                     <ScaleTransform
-                    CenterX="0"
+						CenterX="0"
-                    CenterY="0"
+						CenterY="0"
-                    ScaleX="{Binding ElementName=UIScaleLOGSlider,Path=Value}"
+						ScaleX="{Binding Value, ElementName=UIScaleLOGSlider}"
-                    ScaleY="{Binding ElementName=UIScaleLOGSlider,Path=Value}"
+						ScaleY="{Binding Value, ElementName=UIScaleLOGSlider}"
                 />
                 </Grid.LayoutTransform>
                 <RichTextBox x:Name="rtfError" Height="60" VerticalAlignment="Bottom" HorizontalAlignment="Right" Width="232" Margin="0,0,4,2" IsDocumentEnabled="True" AllowDrop="False" AcceptsReturn="False" IsReadOnly="True" IsUndoEnabled="False" UndoLimit="0" />
                 <RichTextBox x:Name="rtfTerminal" Margin="0,0,239,2" HorizontalAlignment="Right" Width="276" Height="60" VerticalAlignment="Bottom" />
             </Grid>
             <Grid x:Name="GridMotors" Margin="0,38,25,0" Background="#66000000" Height="285" VerticalAlignment="Top" HorizontalAlignment="Right" Width="132" Visibility="Hidden">
                 <Grid.LayoutTransform>
                     <ScaleTransform
-                    CenterX="0"
+						CenterX="0"
-                    CenterY="0"
+						CenterY="0"
-                    ScaleX="{Binding ElementName=UIScaleMotorsSlider,Path=Value}"
+						ScaleX="{Binding Value, ElementName=UIScaleMotorsSlider}"
-                    ScaleY="{Binding ElementName=UIScaleMotorsSlider,Path=Value}"
+						ScaleY="{Binding Value, ElementName=UIScaleMotorsSlider}"
                 />
                 </Grid.LayoutTransform>
                 <DataGrid x:Name="dgvMotors1" HorizontalAlignment="Left" Height="272" Margin="1,3,-6,0" VerticalAlignment="Top" Width="137" ItemsSource="{Binding}" HorizontalContentAlignment="Center" VerticalContentAlignment="Center" FontSize="14" IsReadOnly="True" Background="{x:Null}" HorizontalGridLinesBrush="#FF688CAF" VerticalGridLinesBrush="#FF688CAF" HeadersVisibility="Column" HorizontalScrollBarVisibility="Disabled" VerticalScrollBarVisibility="Disabled" BorderBrush="{x:Null}"/>
                 <!--<DataGrid x:Name="dgvMotors2" HorizontalAlignment="Left" Height="116" Margin="137,6,0,0" VerticalAlignment="Top" Width="129" ItemsSource="{Binding}" IsReadOnly="True" VerticalContentAlignment="Center" HorizontalContentAlignment="Center" FontSize="14" Background="{x:Null}" HorizontalGridLinesBrush="#FF688CAF" VerticalGridLinesBrush="#FF688CAF" HeadersVisibility="Column" HorizontalScrollBarVisibility="Disabled" VerticalScrollBarVisibility="Disabled" BorderBrush="{x:Null}" Visibility="Collapsed"/>-->
             </Grid>
             <Grid x:Name="GridOSD" Margin="0,38,330,0" Background="#66000000" Height="127" VerticalAlignment="Top" HorizontalAlignment="Right" Width="257" Visibility="Hidden">
                 <Grid.LayoutTransform>
                     <ScaleTransform
-                    CenterX="0"
+						CenterX="0"
-                    CenterY="0"
+						CenterY="0"
-                    ScaleX="{Binding ElementName=UIScaleOSDSlider,Path=Value}"
+						ScaleX="{Binding Value, ElementName=UIScaleOSDSlider}"
-                    ScaleY="{Binding ElementName=UIScaleOSDSlider,Path=Value}"
+						ScaleY="{Binding Value, ElementName=UIScaleOSDSlider}"
                 />
                 </Grid.LayoutTransform>
                 <RichTextBox x:Name="rtfOSD" Height="83" VerticalAlignment="Top" HorizontalAlignment="Left" Width="190" Margin="10,5,0,0" FontFamily="Consolas" FontSize="16" />
                 <ComboBox x:Name="cbOSD" HorizontalAlignment="Left" Margin="203,96,0,0" VerticalAlignment="Top" Width="47" Height="27" DropDownClosed="cbOSD_DropDownClosing"/>
                 <Button x:Name="btnOSDBackward" Content="Å" HorizontalAlignment="Left" Height="34" Margin="203,44,0,0" VerticalAlignment="Top" Width="47" FontFamily="Wingdings 3" Click="btnOSDBackward_Click"/>
                 <Button x:Name="btnOSDForward" Content="Æ" HorizontalAlignment="Left" Height="34" Margin="203,5,0,0" VerticalAlignment="Top" Width="47" FontFamily="Wingdings 3" Click="btnOSDForward_Click"/>
                 <Label x:Name="label_Copy7" Content="Page" HorizontalAlignment="Left" Margin="205,78,0,0" VerticalAlignment="Top" Foreground="White" Padding="0" Width="47"/>
                 <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>
-            <Label x:Name="lblSimu" Content="Simulation active" HorizontalAlignment="Left" Height="22" Margin="257,37,0,0" VerticalAlignment="Top" Width="135" FontSize="16" VerticalContentAlignment="Center" HorizontalContentAlignment="Center" Padding="0" FontFamily="Arial" BorderBrush="#FFF9A40F" BorderThickness="2" Foreground="Black" Visibility="Hidden">
+            <Label x:Name="lblSimu" Content="Simulation active" Height="22" Margin="0,36,24,0" VerticalAlignment="Top" FontSize="16" VerticalContentAlignment="Center" HorizontalContentAlignment="Center" Padding="0" FontFamily="Arial" BorderBrush="#FFF9A40F" BorderThickness="2" Foreground="Black" HorizontalAlignment="Right" Width="135" Visibility="Collapsed">
                 <Label.Background>
                     <LinearGradientBrush EndPoint="0,1" StartPoint="0,0">
                         <GradientStop Color="#FFFFD8C6"/>
                         <GradientStop Color="#FFFFD29B" Offset="0.18"/>
                         <GradientStop Color="#FFFFD07F" Offset="0.391"/>
                         <Label x:Name="label4_Copy34" Content="send to copter" HorizontalAlignment="Left" Margin="190,0,0,34" VerticalAlignment="Bottom" Width="96" Foreground="White" Height="26"/>
                     </Grid>
                 </Border>
                 <DataGrid x:Name="dgvWP" Margin="10,5,10,195" 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="Index" Binding="{Binding Index}"/>
-                        <DataGridTextColumn Header="Type" Binding="{Binding Path=Type, Converter={StaticResource wpConvert}, ConverterParameter= Type}"/>
+                        <DataGridTextColumn Header="Type" Binding="{Binding Type, ConverterParameter=Type, Converter={StaticResource wpConvert}}"/>
-                        <DataGridTextColumn Header="Name" Binding="{Binding Path=Name}"/>
+                        <DataGridTextColumn Header="Name" Binding="{Binding Name}"/>
-                        <DataGridTextColumn Header="Latitude" Binding="{Binding Path=Latitude, Converter={StaticResource wpConvert}, ConverterParameter= Latitude}"/>
+                        <DataGridTextColumn Header="Latitude" Binding="{Binding Latitude, ConverterParameter=Latitude, Converter={StaticResource wpConvert}}"/>
-                        <DataGridTextColumn Header="Longitude" Binding="{Binding Path=Longitude, Converter={StaticResource wpConvert}, ConverterParameter= Longitude}"/>
+                        <DataGridTextColumn Header="Longitude" Binding="{Binding Longitude, ConverterParameter=Longitude, Converter={StaticResource wpConvert}}"/>
-                        <DataGridTextColumn Header="Altitude" Binding="{Binding Path=Altitude, Converter={StaticResource wpConvert}, ConverterParameter= Altitude}"/>
+                        <DataGridTextColumn Header="Altitude" Binding="{Binding Altitude, ConverterParameter=Altitude, Converter={StaticResource wpConvert}}"/>
-                        <DataGridTextColumn Header="Heading" Binding="{Binding Path=Heading, Converter={StaticResource wpConvert}, ConverterParameter= Heading}"/>
+                        <DataGridTextColumn Header="Heading" Binding="{Binding Heading, ConverterParameter=Heading, Converter={StaticResource wpConvert}}"/>
-                        <DataGridTextColumn Header="Speed" Binding="{Binding Path=Speed, Converter={StaticResource wpConvert}, ConverterParameter= Speed}"/>
+                        <DataGridTextColumn Header="Speed" Binding="{Binding Speed, ConverterParameter=Speed, Converter={StaticResource wpConvert}}"/>
-                        <DataGridTextColumn Header="ClimbRate" Binding="{Binding Path=ClimbRate, Converter={StaticResource wpConvert}, ConverterParameter= ClimbRate}"/>
+                        <DataGridTextColumn Header="ClimbRate" Binding="{Binding ClimbRate, ConverterParameter=ClimbRate, Converter={StaticResource wpConvert}}"/>
-                        <DataGridTextColumn Header="Radius" Binding="{Binding Path=Radius, Converter={StaticResource wpConvert}, ConverterParameter= Radius}"/>
+                        <DataGridTextColumn Header="Radius" Binding="{Binding Radius, ConverterParameter=Radius, Converter={StaticResource wpConvert}}"/>
-                        <DataGridTextColumn Header="HoldTime" Binding="{Binding Path=HoldTime, Converter={StaticResource wpConvert}, ConverterParameter= DelayTime}"/>
+                        <DataGridTextColumn Header="HoldTime" Binding="{Binding HoldTime, ConverterParameter=DelayTime, Converter={StaticResource wpConvert}}"/>
-                        <DataGridTextColumn Header="AutoTrigger" Binding="{Binding Path=AutoTrigger, Converter={StaticResource wpConvert}, ConverterParameter= AutoTrigger}"/>
+                        <DataGridTextColumn Header="AutoTrigger" Binding="{Binding AutoTrigger, ConverterParameter=AutoTrigger, Converter={StaticResource wpConvert}}"/>
-                        <DataGridTextColumn Header="CamAngle" Binding="{Binding Path=CamAngle, Converter={StaticResource wpConvert}, ConverterParameter= CamAngle}"/>
+                        <DataGridTextColumn Header="CamAngle" Binding="{Binding CamAngle, ConverterParameter=CamAngle, Converter={StaticResource wpConvert}}"/>
-                        <DataGridTextColumn Header="Out1Timer" Binding="{Binding Path=Out1Timer}"/>
+                        <DataGridTextColumn Header="Out1Timer" Binding="{Binding Out1Timer}"/>
                     </DataGrid.Columns>
                 </DataGrid>
-                <CheckBox x:Name="checkBoxShowWPRoute" Content="show route" HorizontalAlignment="Right" Height="22" Margin="0,428,4,0" VerticalAlignment="Top" Width="84" Foreground="#FFFFFEFE" Click="checkBoxShowWPRoute_Click"/>
+                <CheckBox x:Name="checkBoxShowWPRoute" Content="show route" HorizontalAlignment="Right" Height="22" Margin="0,405,4,0" VerticalAlignment="Top" Width="99" Foreground="#FFFFFEFE" Click="checkBoxShowWPRoute_Click"/>
                 <Label x:Name="label4_Copy9" Content="total distance" HorizontalAlignment="Right" Margin="0,455,51,0" VerticalAlignment="Top" Width="99" Foreground="White" Padding="0" Height="18" HorizontalContentAlignment="Right" VerticalContentAlignment="Center" FontSize="13"/>
                 <Label x:Name="lblWPRouteDistance" Content="0 m" HorizontalAlignment="Right" Margin="0,455,4,0" VerticalAlignment="Top" Width="42" Foreground="White" HorizontalContentAlignment="Right" VerticalContentAlignment="Center" Padding="0" FontSize="13"/>
                 <Label x:Name="label4_Copy14" Content="/" HorizontalAlignment="Right" Margin="0,504,29,0" VerticalAlignment="Top" Width="7" Foreground="White" Height="20" HorizontalContentAlignment="Right" Padding="0" VerticalContentAlignment="Center" FontSize="13"/>
                 <Label x:Name="lblWPCountNC" Content="##" HorizontalAlignment="Right" Margin="0,507,2,0" VerticalAlignment="Top" Width="25" Foreground="White" Padding="0" Height="16" FontSize="13"/>
                 <Label x:Name="label4_Copy15" Content="active WP" HorizontalAlignment="Right" Margin="0,504,61,0" VerticalAlignment="Top" Width="65" Foreground="White" Height="21" HorizontalContentAlignment="Right" Padding="0" VerticalContentAlignment="Center" FontSize="13"/>
                 <Label x:Name="label4_Copy32" Content="Simulation" HorizontalAlignment="Left" Margin="619,0,0,43" VerticalAlignment="Bottom" Width="74" Foreground="White" Height="26"/>
                 <Label x:Name="label4_Copy35" Content="distance next WP" HorizontalAlignment="Right" Margin="0,470,51,0" VerticalAlignment="Top" Width="118" Foreground="White" Height="21" HorizontalContentAlignment="Right" Padding="0" VerticalContentAlignment="Center" FontSize="13"/>
                 <Label x:Name="lblWPRouteDistanceWP" Content="0 m" HorizontalAlignment="Right" Margin="0,472,4,0" VerticalAlignment="Top" Width="42" Foreground="White" HorizontalContentAlignment="Right" VerticalContentAlignment="Center" Padding="0" FontSize="13"/>
                 <Label x:Name="label4_Copy36" Content="hold time" HorizontalAlignment="Right" Margin="0,487,51,0" VerticalAlignment="Top" Width="118" Foreground="White" Height="21" HorizontalContentAlignment="Right" Padding="0" VerticalContentAlignment="Center" FontSize="13"/>
                 <Label x:Name="lblWPHoldTime" Content="0 s" HorizontalAlignment="Right" Margin="0,489,10,0" VerticalAlignment="Top" Width="36" Foreground="White" HorizontalContentAlignment="Right" VerticalContentAlignment="Center" Padding="0" FontSize="13"/>
+                <CheckBox x:Name="checkBoxShowWPStatus" Content="show statusbar" HorizontalAlignment="Right" Height="22" Margin="0,428,4,0" VerticalAlignment="Top" Width="100" Foreground="#FFFFFEFE" Click="checkBoxShowWPStatus_Click"/>
             </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">
                     <Label.RenderTransform>
                         <TransformGroup>
                         </Style>
                     </TextBox.Resources>
                 </TextBox>
                 <TextBox x:Name="tbSideBarGPXLog" Height="19" Margin="1,0,0,4" Text="GPX" Width="21" Background="Transparent" Foreground="#FFD3D2D2" AllowDrop="False" BorderThickness="0.6" ToolTip="GPX-Log active" IsUndoEnabled="False" MaxLines="1" BorderBrush="#FFD3D2D2" UndoLimit="0" FontSize="10" VerticalAlignment="Bottom" HorizontalAlignment="Left" HorizontalContentAlignment="Stretch" VerticalContentAlignment="Center" Padding="-1.5,0,0,0"/>
             </Grid>
+            <Grid x:Name="WPStatus" HorizontalAlignment="Left" Height="37" Margin="295,37,0,0" VerticalAlignment="Top" Width="313" Background="#7F000000" Style="{StaticResource GridVisibility}" Tag="{Binding ElementName=checkBoxShowWPStatus}">
+                <Canvas Margin="225,2,40,4">
-            <Grid x:Name="WPStatus" HorizontalAlignment="Left" Height="192" Margin="339,36,0,0" VerticalAlignment="Top" Width="329" Background="#7F808080" Visibility="Collapsed">
+                    <Label x:Name="label4_Copy38" Content="WP" HorizontalAlignment="Center" VerticalAlignment="Top" Width="86" Foreground="White" Height="31" Padding="4,1,1,1" VerticalContentAlignment="Center" FontSize="14" BorderBrush="#FFDBDFE6" BorderThickness="0.5" ToolTip="active WP index"/>
-                <Label x:Name="label4_Copy37" Content="/" HorizontalAlignment="Right" Margin="0,112,116,0" VerticalAlignment="Top" Width="7" Foreground="White" Height="20" HorizontalContentAlignment="Right" Padding="0" VerticalContentAlignment="Center" FontSize="13"/>
+                    <Label x:Name="label4_Copy37" Content="/" HorizontalAlignment="Right" VerticalAlignment="Top" Width="7" Foreground="White" Height="20" HorizontalContentAlignment="Right" Padding="0" VerticalContentAlignment="Center" FontSize="14" Canvas.Left="50" Canvas.Top="5"/>
-                <Label x:Name="lblWPCountNC_Copy" Content="##" HorizontalAlignment="Right" Margin="0,115,89,0" VerticalAlignment="Top" Width="25" Foreground="White" Padding="0" Height="16" FontSize="13"/>
+                    <Label x:Name="lblWPStatusIndexNC" Content="##" HorizontalAlignment="Right" VerticalAlignment="Top" Width="25" Foreground="White" HorizontalContentAlignment="Right" Padding="0" Height="31" FontSize="14" Canvas.Left="25" VerticalContentAlignment="Center"/>
-                <Label x:Name="label4_Copy38" Content="active WP" HorizontalAlignment="Right" Margin="0,112,148,0" VerticalAlignment="Top" Width="65" Foreground="White" Height="21" HorizontalContentAlignment="Right" Padding="0" VerticalContentAlignment="Center" FontSize="13"/>
+                    <Label x:Name="lblWPStatusCountNC" Content="##" HorizontalAlignment="Right" VerticalAlignment="Center" Width="25" Foreground="White" Padding="0" Height="31" FontSize="14" Canvas.Left="59" VerticalContentAlignment="Center"/>
+                </Canvas>
+                <Canvas Margin="79,3,189,158" ToolTip="distance next WP">
-                <Label x:Name="lblWPIndexNC_Copy" Content="##" HorizontalAlignment="Right" Margin="0,115,123,0" VerticalAlignment="Top" Width="25" Foreground="White" HorizontalContentAlignment="Right" Padding="0" Height="16" FontSize="13"/>
+                    <TextBox x:Name="tbWPStatusDistanceWP" HorizontalAlignment="Left" Height="31" TextWrapping="Wrap" Text="0 m" VerticalAlignment="Top" Width="61" BorderBrush="#FFDBDFE6" FontSize="14" Background="#00000000" Padding="4,1,1,1" Foreground="White" ToolTip="distance next WP" BorderThickness="0.5" AllowDrop="False" IsHitTestVisible="False" IsTabStop="False" IsReadOnly="True" IsUndoEnabled="False" Canvas.Left="-5"/>
+                    <ed:LineArrow Fill="#FFF4F4F5" HorizontalAlignment="Left" Height="1" Stroke="White" VerticalAlignment="Bottom" Width="49" EndArrow="StealthArrow" ArrowSize="4" Canvas.Top="25" StrokeThickness="2" Canvas.Left="1"/>
-                <Label x:Name="label4_Copy39" Content="distance next WP" HorizontalAlignment="Right" Margin="0,78,138,0" VerticalAlignment="Top" Width="118" Foreground="White" Height="21" HorizontalContentAlignment="Right" Padding="0" VerticalContentAlignment="Center" FontSize="13"/>
+                </Canvas>
+                <Canvas Margin="2,3,257,0" ToolTip="hold time">
+                    <TextBox x:Name="tbWPStatusHoldTime" HorizontalAlignment="Left" Height="31" TextWrapping="Wrap" Text="0 s" VerticalAlignment="Top" Width="69" BorderBrush="#FFE4E4E4" FontSize="14" VerticalContentAlignment="Center" Background="#00000000" Padding="4,1,1,1" Foreground="White" ToolTip="flight time since take off" BorderThickness="0.5" AllowDrop="False" IsHitTestVisible="False" IsTabStop="False" IsReadOnly="True" IsUndoEnabled="False"/>
+                    <Image x:Name="imageFlightTime1" Height="25.583" VerticalAlignment="Top" UseLayoutRounding="False" Source="Images/flighttime.png" HorizontalAlignment="Left" Width="25.375" Canvas.Left="40" Canvas.Top="2.333"/>
-                <Label x:Name="lblWPRouteDistanceWP_Copy" Content="0 m" HorizontalAlignment="Right" Margin="0,80,91,0" VerticalAlignment="Top" Width="42" Foreground="White" HorizontalContentAlignment="Right" VerticalContentAlignment="Center" Padding="0" FontSize="13"/>
+                </Canvas>
+                <Canvas Margin="161,2,114,4" ToolTip="WP height">
-                <Label x:Name="label4_Copy40" Content="hold time" HorizontalAlignment="Right" Margin="0,95,138,0" VerticalAlignment="Top" Width="118" Foreground="White" Height="21" HorizontalContentAlignment="Right" Padding="0" VerticalContentAlignment="Center" FontSize="13"/>
+                    <TextBox x:Name="tbWPStatusHeight" HorizontalAlignment="Left" Height="31" TextWrapping="Wrap" Text="0 m" VerticalAlignment="Top" Width="61" BorderBrush="#FFE4E4E4" FontSize="14" VerticalContentAlignment="Center" Background="#00000000" Padding="4,1,1,1" Foreground="White" ToolTip="height" BorderThickness="0.5" AllowDrop="False" IsHitTestVisible="False" IsTabStop="False" IsReadOnly="True" IsUndoEnabled="False"/>
+                    <Image x:Name="imageFlightTime_Copy1" Height="23" VerticalAlignment="Top" UseLayoutRounding="False" Source="Images/Altitude.png" HorizontalAlignment="Left" Width="8.25" Canvas.Left="48.688" Canvas.Top="4"/>
-                <Label x:Name="lblWPHoldTime_Copy" Content="0 s" HorizontalAlignment="Right" Margin="0,97,97,0" VerticalAlignment="Top" Width="36" Foreground="White" HorizontalContentAlignment="Right" VerticalContentAlignment="Center" Padding="0" FontSize="13"/>
+                </Canvas>
             </Grid>
             <!--<Rectangle x:Name="rctConnection" Fill="#FFF4F4F5" Height="16" Margin="0,10,7,0" Stroke="Black" VerticalAlignment="Top" HorizontalAlignment="Right" Width="15"/>-->
         </Grid>
-        <Label x:Name="labelSwitchToNavi" Content="The communication is set to FlightControl&#xD;&#xA;The necessary data can ONLY be accessed &#xD;&#xA;by the NaviControl!&#xD;&#xA;Please switch to NaviControl in the settings tab" HorizontalAlignment="Left" Height="161" Margin="347,147,0,0" VerticalAlignment="Top" Width="574" Foreground="White" FontSize="26.667" Style="{StaticResource HideSwitchNCLabel}" Tag="{Binding ElementName=tbCtrl}" >
+        <Label x:Name="labelSwitchToNavi" Content="The communication is set to FlightControl&#xA;The necessary data can ONLY be accessed &#xA;by the NaviControl!&#xA;Please switch to NaviControl in the settings tab" HorizontalAlignment="Left" Height="161" Margin="347,147,0,0" VerticalAlignment="Top" Width="574" Foreground="White" FontSize="26.667" Style="{StaticResource HideSwitchNCLabel}" Tag="{Binding ElementName=tbCtrl}" >
             <Label.Background>
                 <LinearGradientBrush EndPoint="0.5,1" MappingMode="RelativeToBoundingBox" StartPoint="0.5,0">
                     <GradientStop Color="#B2FF2121" Offset="0.457"/>
                     <GradientStop Color="Red" Offset="1"/>
                 </LinearGradientBrush>

Subversion Repositories Projects

(root)/MKLiveView/v1.0/Source/MainWindow.xaml @ 2401 - Rev 2399 → 2401