Rev 2324 | Go to most recent revision | Show entire file | Ignore whitespace | Details | Blame | Last modification | View Log | RSS feed
| Rev 2324 | Rev 2327 | ||
|---|---|---|---|
| Line 462... | Line 462... | ||
| 462 | { |
462 | { |
| 463 | Dispatcher.Invoke(() => imageConn.Source = new BitmapImage(new Uri("Images/Data_G.png", UriKind.Relative))); |
463 | Dispatcher.Invoke(() => imageConn.Source = new BitmapImage(new Uri("Images/Data_G.png", UriKind.Relative))); |
| 464 | // Dispatcher.Invoke((Action)(() => rctConnection.Fill = Brushes.LightGreen)); |
464 | // Dispatcher.Invoke((Action)(() => rctConnection.Fill = Brushes.LightGreen)); |
| 465 | _iLifeCounter = 0; |
465 | _iLifeCounter = 0; |
| 466 | _bConnErr = false; |
466 | _bConnErr = false; |
| 467 | // if(_bAirborne && _bGPXLog) |
467 | if(_bAirborne && _bGPXLog) |
| 468 | { |
468 | { |
| 469 | drGPX[0] = dtGPX.Rows.Count; |
469 | drGPX[0] = dtGPX.Rows.Count; |
| 470 | dtGPX.Rows.Add(new object[] { drGPX[0], drGPX[1], drGPX[2], drGPX[3], drGPX[4] }); |
470 | dtGPX.Rows.Add(new object[] { drGPX[0], drGPX[1], drGPX[2], drGPX[3], drGPX[4] }); |
| 471 | } |
471 | } |
| 472 | Dispatcher.Invoke((Action)(() => tbSideBarGPXLog.Background = (_bGPXLog && _bToggle) ? new SolidColorBrush(Colors.LightSeaGreen) : new SolidColorBrush(Colors.Transparent))); |
472 | Dispatcher.Invoke((Action)(() => tbSideBarGPXLog.Background = (_bAirborne && _bGPXLog && _bToggle) ? new SolidColorBrush(Colors.LightSeaGreen) : new SolidColorBrush(Colors.Transparent))); |
| 473 | Dispatcher.Invoke((Action)(() => tbSideBarGPXLog.Foreground = (_bGPXLog) ? new SolidColorBrush(Colors.White) : new SolidColorBrush(Color.FromArgb(255, 211, 210, 210)))); |
473 | Dispatcher.Invoke((Action)(() => tbSideBarGPXLog.Foreground = (_bAirborne && _bGPXLog) ? new SolidColorBrush(Colors.White) : new SolidColorBrush(Color.FromArgb(255, 211, 210, 210)))); |
| 474 | Dispatcher.Invoke((Action)(() => tbSideBarGPXLog.BorderBrush = (_bGPXLog) ? new SolidColorBrush(Colors.White) : new SolidColorBrush(Color.FromArgb(255, 211, 210, 210)))); |
474 | Dispatcher.Invoke((Action)(() => tbSideBarGPXLog.BorderBrush = (_bAirborne && _bGPXLog) ? new SolidColorBrush(Colors.White) : new SolidColorBrush(Color.FromArgb(255, 211, 210, 210)))); |
| 475 | _bToggle = !_bToggle; |
475 | _bToggle = !_bToggle; |
| 476 | } |
476 | } |
| 477 | else |
477 | else |
| 478 | { |
478 | { |
| 479 | if (!_bConnErr) |
479 | if (!_bConnErr) |
| Line 2651... | Line 2651... | ||
| 2651 | string wp; |
2651 | string wp; |
| 2652 | int i; |
2652 | int i; |
| 2653 | NumberFormatInfo nfi = new NumberFormatInfo(); |
2653 | NumberFormatInfo nfi = new NumberFormatInfo(); |
| 2654 | nfi.NumberDecimalSeparator = "."; |
2654 | nfi.NumberDecimalSeparator = "."; |
| 2655 | dtWaypoints.Rows.Clear(); |
2655 | dtWaypoints.Rows.Clear(); |
| 2656 | for(int k = 0; k < MainMap.Markers.Count;) |
2656 | //for(int k = 0; k < MainMap.Markers.Count;) |
| 2657 | { |
2657 | //{ |
| 2658 | GMapMarker p = MainMap.Markers[k]; |
2658 | // GMapMarker p = MainMap.Markers[k]; |
| 2659 | if (p.Shape.GetType() == typeof(CustomMarkerWP)) |
2659 | // if (p.Shape.GetType() == typeof(CustomMarkerWP)) |
| 2660 | MainMap.Markers.Remove(p); |
2660 | // MainMap.Markers.Remove(p); |
| 2661 | else |
2661 | // else |
| 2662 | k++; |
2662 | // k++; |
| 2663 | } |
2663 | //} |
| - | 2664 | _clearMapMarkers(typeof(CustomMarkerWP)); |
|
| 2664 | for (int k = 1; k <= wpnum; k++) |
2665 | for (int k = 1; k <= wpnum; k++) |
| 2665 | { |
2666 | { |
| 2666 | DataRow dr = dtWaypoints.NewRow(); |
2667 | DataRow dr = dtWaypoints.NewRow(); |
| 2667 | dr.ItemArray = new object[16]; |
2668 | dr.ItemArray = new object[16]; |
| 2668 | object[] o = new object[16]; |
2669 | object[] o = new object[16]; |
| Line 2945... | Line 2946... | ||
| 2945 | private void btnLoadGPXLog_Click(object sender, RoutedEventArgs e) |
2946 | private void btnLoadGPXLog_Click(object sender, RoutedEventArgs e) |
| 2946 | { |
2947 | { |
| 2947 | _loadGPXLog(); |
2948 | _loadGPXLog(); |
| 2948 | } |
2949 | } |
| Line -... | Line 2950... | ||
| - | 2950 | ||
| - | 2951 | private void btnClearRoute_Click(object sender, RoutedEventArgs e) |
|
| - | 2952 | { |
|
| - | 2953 | _clearMapMarkers(typeof(GMapRoute)); |
|
| - | 2954 | } |
|
| - | 2955 | void _clearMapMarkers(Type markerType) |
|
| - | 2956 | { |
|
| - | 2957 | for (int k = 0; k < MainMap.Markers.Count;) |
|
| - | 2958 | { |
|
| - | 2959 | GMapMarker p = MainMap.Markers[k]; |
|
| - | 2960 | if (p.GetType() == markerType | p.Shape.GetType() == markerType) |
|
| - | 2961 | MainMap.Markers.Remove(p); |
|
| - | 2962 | else |
|
| - | 2963 | k++; |
|
| - | 2964 | } |
|
| - | 2965 | ||
| 2949 | 2966 | } |
|
| 2950 | void _loadGPXLog() |
2967 | void _loadGPXLog() |
| Line 2951... | Line 2968... | ||
| 2951 | { |
2968 | { |
| 2952 | 2969 | ||
| Line 2992... | Line 3009... | ||
| 2992 | } |
3009 | } |
| Line 2993... | Line 3010... | ||
| 2993 | 3010 | ||
| 2994 | } |
3011 | } |
| 2995 | if(wpl.Count() > 0) |
3012 | if(wpl.Count() > 0) |
| - | 3013 | { |
|
| 2996 | { |
3014 | _clearMapMarkers(typeof(GMapRoute)); |
| 2997 | for (int k = 0; k < MainMap.Markers.Count;) |
3015 | //for (int k = 0; k < MainMap.Markers.Count;) |
| 2998 | { |
3016 | //{ |
| 2999 | GMapMarker p = MainMap.Markers[k]; |
3017 | // GMapMarker p = MainMap.Markers[k]; |
| 3000 | if (p.Shape.GetType() == typeof(GMapRoute)) |
3018 | // if (p.Shape.GetType() == typeof(GMapRoute)) |
| 3001 | MainMap.Markers.Remove(p); |
3019 | // MainMap.Markers.Remove(p); |
| 3002 | else |
3020 | // else |
| 3003 | k++; |
3021 | // k++; |
| 3004 | } |
3022 | //} |
| Line 3005... | Line 3023... | ||
| 3005 | MapRoute mr = new MapRoute(wpl, "flying"); |
3023 | MapRoute mr = new MapRoute(wpl, "flying"); |
| 3006 | 3024 | ||
| 3007 | GMapRoute mRoute = new GMapRoute(mr.Points); |
3025 | GMapRoute mRoute = new GMapRoute(mr.Points); |