Subversion Repositories Projects

Compare Revisions

Ignore whitespace Rev 2326 → Rev 2327

/MKLiveView/v1.0/Source/MainWindow.xaml
796,7 → 796,7
</TabItem>
<TabItem Header="Map" Height="20" VerticalAlignment="Top" Margin="7.193,0,-17.257,0">
<Grid x:Name="GridMapData" Margin="0,0,-3,-1" HorizontalAlignment="Left" Width="226">
<CheckBox x:Name="checkBoxFollowCopter" Content="follow copter" HorizontalAlignment="Left" Margin="7,533,0,0" Width="107" RenderTransformOrigin="0.783,27.263" Foreground="White" Click="checkBoxFollowCopter_Click" FontSize="14" VerticalContentAlignment="Center" Height="20" VerticalAlignment="Top" ToolTip="the map follows the copter - the copter is always centered"/>
<CheckBox x:Name="checkBoxFollowCopter" Content="follow copter" HorizontalAlignment="Left" Margin="8,510,0,0" Width="107" RenderTransformOrigin="0.783,27.263" Foreground="White" Click="checkBoxFollowCopter_Click" FontSize="14" VerticalContentAlignment="Center" Height="20" VerticalAlignment="Top" ToolTip="the map follows the copter - the copter is always centered"/>
<CheckBox x:Name="checkBoxAutoSetHP" Content="auto set HP" HorizontalAlignment="Left" Margin="92,422,0,0" Width="107" RenderTransformOrigin="0.783,27.263" Foreground="White" FontSize="14" VerticalContentAlignment="Center" Height="20" VerticalAlignment="Top" ToolTip="set HP automatically with first satfix" Click="checkBoxAutoSetHP_Click"/>
<TextBox Margin="6,24,10,0" x:Name="textBoxGeo" KeyUp="textBoxGeo_KeyUp" Foreground="Black" Height="22" VerticalAlignment="Top" VerticalContentAlignment="Center" Text="Landshut"/>
<Button x:Name="buttonGeoCoding" Content="Go To!" HorizontalAlignment="Left" Margin="6,47,0,0" VerticalAlignment="Top" Width="144" Height="26" Click="buttonGeoCoding_Click"/>
843,6 → 843,7
</Button.Background>
</Button>
<Label x:Name="label4_Copy8" Content="load GPX-Log" HorizontalAlignment="Left" Margin="122,511,0,0" VerticalAlignment="Top" Width="86" Foreground="White"/>
<Button x:Name="btnClearRoute" Content="clear route" Margin="128,542,18,0" Height="31" VerticalAlignment="Top" RenderTransformOrigin="0.5,0.6" Click="btnClearRoute_Click"/>
</Grid>
</TabItem>
<TabItem Header="Thresholds" Height="20" VerticalAlignment="Top" Margin="13,0,-13,0" HorizontalAlignment="Left" Width="70">
/MKLiveView/v1.0/Source/MainWindow.xaml.cs
464,14 → 464,14
// Dispatcher.Invoke((Action)(() => rctConnection.Fill = Brushes.LightGreen));
_iLifeCounter = 0;
_bConnErr = false;
// if(_bAirborne && _bGPXLog)
if(_bAirborne && _bGPXLog)
{
drGPX[0] = dtGPX.Rows.Count;
dtGPX.Rows.Add(new object[] { drGPX[0], drGPX[1], drGPX[2], drGPX[3], drGPX[4] });
}
Dispatcher.Invoke((Action)(() => tbSideBarGPXLog.Background = (_bGPXLog && _bToggle) ? new SolidColorBrush(Colors.LightSeaGreen) : new SolidColorBrush(Colors.Transparent)));
Dispatcher.Invoke((Action)(() => tbSideBarGPXLog.Foreground = (_bGPXLog) ? new SolidColorBrush(Colors.White) : new SolidColorBrush(Color.FromArgb(255, 211, 210, 210))));
Dispatcher.Invoke((Action)(() => tbSideBarGPXLog.BorderBrush = (_bGPXLog) ? new SolidColorBrush(Colors.White) : new SolidColorBrush(Color.FromArgb(255, 211, 210, 210))));
Dispatcher.Invoke((Action)(() => tbSideBarGPXLog.Background = (_bAirborne && _bGPXLog && _bToggle) ? new SolidColorBrush(Colors.LightSeaGreen) : new SolidColorBrush(Colors.Transparent)));
Dispatcher.Invoke((Action)(() => tbSideBarGPXLog.Foreground = (_bAirborne && _bGPXLog) ? new SolidColorBrush(Colors.White) : new SolidColorBrush(Color.FromArgb(255, 211, 210, 210))));
Dispatcher.Invoke((Action)(() => tbSideBarGPXLog.BorderBrush = (_bAirborne && _bGPXLog) ? new SolidColorBrush(Colors.White) : new SolidColorBrush(Color.FromArgb(255, 211, 210, 210))));
_bToggle = !_bToggle;
}
else
2653,14 → 2653,15
NumberFormatInfo nfi = new NumberFormatInfo();
nfi.NumberDecimalSeparator = ".";
dtWaypoints.Rows.Clear();
for(int k = 0; k < MainMap.Markers.Count;)
{
GMapMarker p = MainMap.Markers[k];
if (p.Shape.GetType() == typeof(CustomMarkerWP))
MainMap.Markers.Remove(p);
else
k++;
}
//for(int k = 0; k < MainMap.Markers.Count;)
//{
// GMapMarker p = MainMap.Markers[k];
// if (p.Shape.GetType() == typeof(CustomMarkerWP))
// MainMap.Markers.Remove(p);
// else
// k++;
//}
_clearMapMarkers(typeof(CustomMarkerWP));
for (int k = 1; k <= wpnum; k++)
{
DataRow dr = dtWaypoints.NewRow();
2947,6 → 2948,22
_loadGPXLog();
}
 
private void btnClearRoute_Click(object sender, RoutedEventArgs e)
{
_clearMapMarkers(typeof(GMapRoute));
}
void _clearMapMarkers(Type markerType)
{
for (int k = 0; k < MainMap.Markers.Count;)
{
GMapMarker p = MainMap.Markers[k];
if (p.GetType() == markerType | p.Shape.GetType() == markerType)
MainMap.Markers.Remove(p);
else
k++;
}
 
}
void _loadGPXLog()
{
 
2994,14 → 3011,15
}
if(wpl.Count() > 0)
{
for (int k = 0; k < MainMap.Markers.Count;)
{
GMapMarker p = MainMap.Markers[k];
if (p.Shape.GetType() == typeof(GMapRoute))
MainMap.Markers.Remove(p);
else
k++;
}
_clearMapMarkers(typeof(GMapRoute));
//for (int k = 0; k < MainMap.Markers.Count;)
//{
// GMapMarker p = MainMap.Markers[k];
// if (p.Shape.GetType() == typeof(GMapRoute))
// MainMap.Markers.Remove(p);
// else
// k++;
//}
MapRoute mr = new MapRoute(wpl, "flying");
 
GMapRoute mRoute = new GMapRoute(mr.Points);