Subversion Repositories Projects

Compare Revisions

Ignore whitespace Rev 2374 → Rev 2376

/MKLiveView/v1.0/Source/MainWindow.xaml
1187,12 → 1187,12
<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="Collapsed">
<Grid x:Name="GridWP" Margin="23,36,25,0" Background="#7F000000" Height="526" VerticalAlignment="Top" Visibility="Hidden">
<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">
<Border Margin="10,458,0,1" BorderBrush="White" BorderThickness="0.5" CornerRadius="5" HorizontalAlignment="Left" Width="640">
<Grid Margin="-0.5,-0.5,-0.5,4.5">
<Rectangle HorizontalAlignment="Left" Width="94" Stroke="#FFE4E4E4" StrokeThickness="0.5" Margin="111,0,0,-1" Height="40" VerticalAlignment="Bottom">
<Rectangle.Style>
1298,7 → 1298,7
<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,340,0,75" BorderBrush="White" BorderThickness="0.5" CornerRadius="5" HorizontalAlignment="Left" Width="831">
<Border Margin="10,338,0,73" BorderBrush="White" BorderThickness="0.5" CornerRadius="5" HorizontalAlignment="Left" Width="831">
<Grid Margin="-0.5,-0.5,-0.5,4.5">
<ComboBox x:Name="cbWPEditType" HorizontalAlignment="Left" Height="22" Margin="10,24,0,0" VerticalAlignment="Top" Width="66">
<ComboBoxItem Content="WP"/>
1391,9 → 1391,26
</Button.Background>
</Button>
<Label x:Name="label4_Copy30" Content="delete WP" HorizontalAlignment="Left" Margin="111,0,0,34" VerticalAlignment="Bottom" Width="96" Foreground="White" Height="26"/>
<Rectangle HorizontalAlignment="Left" Width="94" Stroke="#FFE4E4E4" StrokeThickness="0.5" Margin="566,0,0,-2" Height="40" VerticalAlignment="Bottom" RenderTransformOrigin="0.5,0.525">
<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="567,0,0,-1" 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="564,0,0,34" VerticalAlignment="Bottom" Width="96" Foreground="White" Height="26"/>
</Grid>
</Border>
<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 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="Type" Binding="{Binding Path=Type, Converter={StaticResource wpConvert}, ConverterParameter= Type}"/>
1418,7 → 1435,7
<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 HorizontalAlignment="Left" Width="94" Stroke="#FFE4E4E4" StrokeThickness="0.5" Margin="857,0,0,136" Height="40" VerticalAlignment="Bottom">
<Rectangle.Style>
<Style TargetType="{x:Type Rectangle}">
<Style.Triggers>
1429,17 → 1446,27
</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="btnWPAddCurrentPos_Click">
<Button x:Name="btnWPEditAddCurrentPos" Content="" HorizontalAlignment="Left" Height="36" Margin="858,0,0,137" 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>
</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">
<Label x:Name="label4_Copy28" Content="add current Pos" HorizontalAlignment="Left" Margin="855,0,-1,172" VerticalAlignment="Bottom" Width="107" Foreground="White" Height="26"/>
<Rectangle x:Name="rectSimulate" HorizontalAlignment="Left" Width="59" Stroke="#FFE4E4E4" StrokeThickness="0.5" Margin="892,0,0,72" Height="43" VerticalAlignment="Bottom" Visibility="Hidden">
<Rectangle.Fill>
<LinearGradientBrush EndPoint="0,1" StartPoint="0,0">
<GradientStop Color="#FFCEFFC6"/>
<GradientStop Color="#FF9BFFC4" Offset="0.18"/>
<GradientStop Color="#FF70E2AF" Offset="0.39"/>
<GradientStop Color="#FF4FCF8F" Offset="1"/>
</LinearGradientBrush>
</Rectangle.Fill>
</Rectangle>
<Rectangle HorizontalAlignment="Left" Width="59" Stroke="#FFE4E4E4" StrokeThickness="0.5" Margin="892,0,0,72" Height="43" 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=btnWPSimulateStart}" Value="True">
<Setter Property="Fill" Value="{DynamicResource PressedItemBrush}"/>
</DataTrigger>
</Style.Triggers>
1446,12 → 1473,12
</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 x:Name="btnWPSimulateStart" Content="" HorizontalAlignment="Left" Height="36" Margin="893,0,0,76" VerticalAlignment="Bottom" Width="58" ToolTip="Start/stop simulationmode on copter" BorderBrush="#FFBDBDBD" Style="{DynamicResource ButtonWithoutEffectStyle}" Click="btnWPSimulateStart_Click">
<Button.Background>
<ImageBrush ImageSource="Images/Blitz.png" Stretch="Uniform"/>
<ImageBrush ImageSource="Images/Test.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"/>
<Label x:Name="label4_Copy32" Content="Simulation" HorizontalAlignment="Left" Margin="888,0,-1,111" VerticalAlignment="Bottom" Width="74" 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
151,6 → 151,7
bool _bConnErr = false;
bool _bFollowCopter = false;
bool _bGPXLog = false;
bool _Simulate = false;
 
bool _bSaveWinStateNormal = true;
bool _bSaveWinStateFull = true;
2254,7 → 2255,7
for (int i = iStart; i < dtWaypoints.Rows.Count; i++)
{
k = iStart > 0 ? k : -1;
_sendWayPoint(dtWaypoints.Rows[i], k, 'w');
_sendWayPoint(dtWaypoints.Rows[i], k, 'w',false);
 
_iWPCount = -1;
iTimeout = 0;
2277,7 → 2278,7
Log(LogMsgType.Error, "NOT CONNECTED!");
 
}
bool _sendWayPoint(DataRow dr, int index, char command)
bool _sendWayPoint(DataRow dr, int index, char command,bool bSim)
{
 
if (serialPortCtrl.Port.IsOpen)
2313,8 → 2314,11
bData[9] = (byte)((iVal >> 8) & 0xff);
bData[10] = (byte)((iVal >> 16) & 0xff);
bData[11] = (byte)(iVal >> 24);
if(bSim)
bData[12] = 3; //Status 'SIMULATE'
//Status 'NEWDATA'
bData[12] = 1;
else
bData[12] = 1;
//heading
iVal = Convert.ToInt16(dr[6]);
bData[13] = (byte)(iVal & 0xff);
3445,22 → 3449,6
});
 
}
private void comboBoxWPColor_DropDownClosed(object sender, EventArgs e)
{
_MarkerColorSelection(sender, 0);
}
private void comboBoxPOIColor_DropDownClosed(object sender, EventArgs e)
{
_MarkerColorSelection(sender, 1);
}
private void comboBoxFSColor_DropDownClosed(object sender, EventArgs e)
{
_MarkerColorSelection(sender, 2);
}
private void comboBoxLandingColor_DropDownClosed(object sender, EventArgs e)
{
_MarkerColorSelection(sender,3);
}
void _MarkerColorSelection(object sender,int type)
{
Dispatcher.Invoke(() =>
3482,8 → 3470,24
}
});
}
private void comboBoxCopterColor_DropDownClosed(object sender, EventArgs e)
private void comboBoxWPColor_DropDownClosed(object sender, EventArgs e)
{
_MarkerColorSelection(sender, 0);
}
private void comboBoxPOIColor_DropDownClosed(object sender, EventArgs e)
{
_MarkerColorSelection(sender, 1);
}
private void comboBoxFSColor_DropDownClosed(object sender, EventArgs e)
{
_MarkerColorSelection(sender, 2);
}
private void comboBoxLandingColor_DropDownClosed(object sender, EventArgs e)
{
_MarkerColorSelection(sender,3);
}
private void comboBoxCopterColor_DropDownClosed(object sender, EventArgs e)
{
Dispatcher.Invoke(() => {
if (comboBoxCopterColor.SelectionBoxItem != null)
{
3553,9 → 3557,9
if (dgvWP.SelectedIndex > -1 && dgvWP.SelectedIndex < dtWaypoints.Rows.Count)
{
if (_wpCount > 0)
_sendWayPoint(dtWaypoints.Rows[dgvWP.SelectedIndex], -1, 's');
_sendWayPoint(dtWaypoints.Rows[dgvWP.SelectedIndex], -1, 's',false);
else
_sendWayPoint(dtWaypoints.Rows[dgvWP.SelectedIndex], 1, 's');
_sendWayPoint(dtWaypoints.Rows[dgvWP.SelectedIndex], 1, 's',false);
 
//int index = dgvWP.SelectedIndex;
//Thread t = new Thread(() => _sendWPList(index));
3569,16 → 3573,27
row.Background = new SolidColorBrush(Colors.Transparent);
row.BorderBrush = new SolidColorBrush(Colors.Transparent);
row.BorderThickness = new Thickness(0);
dgvWP.UpdateLayout();
}
_wpEdit = dgvWP.SelectedIndex;
row = (DataGridRow)dgvWP.ItemContainerGenerator.ContainerFromIndex(_wpEdit);
row.Background = new SolidColorBrush(Color.FromArgb(80, 0, 255, 100));
row.BorderBrush = new SolidColorBrush(Colors.SpringGreen);
row.BorderThickness = new Thickness(2);
dgvWP.UpdateLayout();
//_wpEdit = dgvWP.SelectedIndex;
//row = (DataGridRow)dgvWP.ItemContainerGenerator.ContainerFromIndex(_wpEdit);
//row.Background = new SolidColorBrush(Color.FromArgb(80, 0, 255, 100));
//row.BorderBrush = new SolidColorBrush(Colors.SpringGreen);
//row.BorderThickness = new Thickness(2);
});
}
}
private void btnWPSimulateStart_Click(object sender, RoutedEventArgs e)
{
_Simulate = !_Simulate;
if (dtWaypoints.Rows.Count > 0)
{
DataRow dr = dtWaypoints.Rows[0];
dr[13] = _Simulate ? 3 : 0;
_sendWayPoint(dr, 1, 's', true);
rectSimulate.Visibility = _Simulate ? Visibility.Visible : Visibility.Hidden;
}
}
private void dgvWP_MouseUp(object sender, MouseButtonEventArgs e)
{
_dgvWPselectEditRow();
4078,6 → 4093,7
}
}
 
 
private void btnLoadGPXLog_Click(object sender, RoutedEventArgs e)
{
_loadGPXLog();