Rev 2328 | Go to most recent revision | Show entire file | Ignore whitespace | Details | Blame | Last modification | View Log | RSS feed
| Rev 2328 | Rev 2333 | ||
|---|---|---|---|
| Line 1807... | Line 1807... | ||
| 1807 | Dispatcher.Invoke(() => lblWPCount.Content = data[0].ToString()); |
1807 | Dispatcher.Invoke(() => lblWPCount.Content = data[0].ToString()); |
| 1808 | if (_bGetWP) |
1808 | if (_bGetWP) |
| 1809 | { |
1809 | { |
| 1810 | if (data[1] == 1) |
1810 | if (data[1] == 1) |
| 1811 | { |
1811 | { |
| 1812 | wpList.Clear(); |
- | |
| 1813 | if(mRouteWP != null) |
1812 | if(mRouteWP != null) |
| 1814 | MainMap.Markers.Remove(mRouteWP); |
1813 | Dispatcher.Invoke(() => MainMap.Markers.Remove(mRouteWP)); |
| - | 1814 | wpList.Clear(); |
|
| Line 1815... | Line 1815... | ||
| 1815 | 1815 | ||
| 1816 | Dispatcher.Invoke(() => lblWPRouteDistance.Content = "0 m"); |
1816 | Dispatcher.Invoke(() => lblWPRouteDistance.Content = "0 m"); |
| 1817 | dtWaypoints.Rows.Clear(); |
1817 | dtWaypoints.Rows.Clear(); |
| - | 1818 | Dispatcher.Invoke(() => |
|
| 1818 | Dispatcher.Invoke(() => { |
1819 | { |
| 1819 | for (int k = 0; k < MainMap.Markers.Count;) |
1820 | for (int k = 0; k < MainMap.Markers.Count;) |
| 1820 | { |
1821 | { |
| 1821 | GMapMarker p = MainMap.Markers[k]; |
1822 | GMapMarker p = MainMap.Markers[k]; |
| 1822 | if (p.Shape.GetType() == typeof(CustomMarkerWP)) |
1823 | if (p.Shape.GetType() == typeof(CustomMarkerWP)) |
| Line 1830... | Line 1831... | ||
| 1830 | dr = Waypoints.toDataRow(data, dr); |
1831 | dr = Waypoints.toDataRow(data, dr); |
| 1831 | dtWaypoints.Rows.Add(dr); |
1832 | dtWaypoints.Rows.Add(dr); |
| 1832 | Dispatcher.Invoke(() => { |
1833 | Dispatcher.Invoke(() => { |
| 1833 | GMapMarker wp = new GMapMarker(new PointLatLng((double)dr[3], (double)dr[4])); |
1834 | GMapMarker wp = new GMapMarker(new PointLatLng((double)dr[3], (double)dr[4])); |
| 1834 | wp.Shape = new CustomMarkerWP(this, wp, (string)dr[2],(int)dr[1]); |
1835 | wp.Shape = new CustomMarkerWP(this, wp, (string)dr[2],(int)dr[1]); |
| - | 1836 | wp.Offset = new System.Windows.Point(-11.5, -11.5); |
|
| 1835 | _setMarkerColor(wp, (int)dr[1]); |
1837 | _setMarkerColor(wp, (int)dr[1]); |
| 1836 | MainMap.Markers.Add(wp); |
1838 | MainMap.Markers.Add(wp); |
| 1837 | }); |
1839 | }); |
| 1838 | Dispatcher.Invoke(() => dgvWP.Items.Refresh()); |
1840 | Dispatcher.Invoke(() => dgvWP.Items.Refresh()); |
| 1839 | Dispatcher.Invoke(() => _iWPIndex = data[1]); |
1841 | Dispatcher.Invoke(() => _iWPIndex = data[1]); |
| Line 1855... | Line 1857... | ||
| 1855 | 1857 | ||
| 1856 | if (_bShowWPRoute) |
1858 | if (_bShowWPRoute) |
| 1857 | MainMap.Markers.Add(mRouteWP); |
1859 | MainMap.Markers.Add(mRouteWP); |
| 1858 | }); |
1860 | }); |
| 1859 | MapRoute mr = new MapRoute(wpList, "WPList"); |
1861 | MapRoute mr = new MapRoute(wpList, "WPList"); |
| 1860 | Dispatcher.Invoke(() => lblWPRouteDistance.Content = (mr.Distance / 1000).ToString("0 m")); |
1862 | Dispatcher.Invoke(() => lblWPRouteDistance.Content = (mr.Distance * 1000).ToString("0 m")); |
| Line 1861... | Line 1863... | ||
| 1861 | } |
1863 | } |
| 1862 | 1864 | ||
| 1863 | } |
1865 | } |