修复了Gpx工具箱中文件列表中选择文件和点击菜单可能出现闪退的BUG

Author: f-shake

MapBoard.UI/UI/GpxToolbox/GpxWindow.xaml

@@ -408,24 +408,8 @@
                                 ItemsSource="{Binding Tracks}"
                                 PreviewKeyDown="ListViewItemPreviewDeleteKeyDown"
                                 SelectionChanged="FileSelectionChanged"
+                                PreviewMouseRightButtonDown="lvwFiles_PreviewMouseRightButtonDown"
                                 SelectionMode="Extended">
-
-                                <ListView.ContextMenu>
-                                    <ContextMenu>
-                                        <MenuItem
-                                            Click="RemoveTrackFileMenuClick"
-                                            Header="删除" />
-                                        <MenuItem
-                                            Click="LinkTrackMenuClick"
-                                            Header="连接" />
-                                        <MenuItem
-                                            Click="ZoomToTrackButtonClick"
-                                            Header="缩放到轨迹" />
-                                        <MenuItem
-                                            Click="BrowseButtonClick"
-                                            Header="浏览" />
-                                    </ContextMenu>
-                                </ListView.ContextMenu>
                                 <ListView.View>
                                     <GridView>
                                         <GridViewColumn

MapBoard.UI/UI/GpxToolbox/GpxWindow.xaml.cs

@@ -122,48 +122,60 @@ private void ListViewItemPreviewDeleteKeyDown(object sender, KeyEventArgs e)
         {
             if (e == null || e.Key == Key.Delete)
             {
-                foreach (var item in lvwFiles.SelectedItems.Cast<TrackInfo>().ToArray())
-                {
-                    arcMap.GraphicsOverlays.Remove(item.Overlay);
-                    Tracks.Remove(item);
-                }
+                RemoveSelectedGpxs();
             }
         }
 
-        private async void FileSelectionChanged(object sender, SelectionChangedEventArgs e)
+        private void RemoveSelectedGpxs()
         {
-            if (arcMap.SelectedTrack != null)
-            {
-                arcMap.SelectedTrack.Overlay.Renderer = null;
-                arcMap.SelectedTrack.Overlay.Renderer = NormalRenderer;
-            }
-            if (lvwFiles.SelectedItem == null)
+            foreach (var item in lvwFiles.SelectedItems.Cast<TrackInfo>().ToArray())
             {
-                arcMap.SelectedTrack = null;
-                Gpx = null;
-                GpxTrack = null;
-                chartHelper.Initialize();
-                return;
+                arcMap.GraphicsOverlays.Remove(item.Overlay);
+                Tracks.Remove(item);
             }
+        }
 
-            if (lvwFiles.SelectedItems.Count > 1)
+        private async void FileSelectionChanged(object sender, SelectionChangedEventArgs e)
+        {
+            try
             {
-                arcMap.SelectedTrack = null;
-                Gpx = null;
-                GpxTrack = null;
+                if (arcMap.SelectedTrack != null)
+                {
+                    arcMap.SelectedTrack.Overlay.Renderer = null;
+                    arcMap.SelectedTrack.Overlay.Renderer = NormalRenderer;
+                }
+                if (lvwFiles.SelectedItem == null)
+                {
+                    arcMap.SelectedTrack = null;
+                    Gpx = null;
+                    GpxTrack = null;
+                    chartHelper.Initialize();
+                    return;
+                }
 
-                chartHelper.Initialize();
-            }
-            else
-            {
-                arcMap.SelectedTrack = lvwFiles.SelectedItem as TrackInfo;
+                if (lvwFiles.SelectedItems.Count > 1)
+                {
+                    arcMap.SelectedTrack = null;
+                    Gpx = null;
+                    GpxTrack = null;
 
-                arcMap.SelectedTrack.Overlay.Renderer = CurrentRenderer;
-                //arcMap.SelectedTrack.Overlay.Graphics[0].Symbol = CurrentLineSymbol;
+                    chartHelper.Initialize();
+                }
+                else
+                {
+                    arcMap.SelectedTrack = lvwFiles.SelectedItem as TrackInfo;
+
+                    arcMap.SelectedTrack.Overlay.Renderer = CurrentRenderer;
+                    //arcMap.SelectedTrack.Overlay.Graphics[0].Symbol = CurrentLineSymbol;
 
-                Gpx = arcMap.SelectedTrack.Gpx;
-                GpxTrack = arcMap.SelectedTrack.Track;
-                await Task.WhenAll(ZoomToTrackAsync(), UpdateUI());
+                    Gpx = arcMap.SelectedTrack.Gpx;
+                    GpxTrack = arcMap.SelectedTrack.Track;
+                    await Task.WhenAll(ZoomToTrackAsync(), UpdateUI());
+                }
+            }
+            catch(Exception ex)
+            {
+                App.Log.Error("选择Gpx文件时出现错误",ex);
             }
         }
 
@@ -591,10 +603,7 @@ private void ResetTrackButtonClick(object sender, RoutedEventArgs e)
             };
         }
 
-        private void RemoveTrackFileMenuClick(object sender, RoutedEventArgs e)
-        {
-            ListViewItemPreviewDeleteKeyDown(null, null);
-        }
+
 
         private async void LinkTrackMenuClick(object sender, RoutedEventArgs e)
         {
@@ -783,10 +792,6 @@ private async void CaptureScreenButtonClick(object sender, RoutedEventArgs e)
             }
         }
 
-        private async void ZoomToTrackButtonClick(object sender, RoutedEventArgs e)
-        {
-            await ZoomToTrackAsync();
-        }
 
         private Task ZoomToTrackAsync(int time = 500)
         {
@@ -797,10 +802,38 @@ private Task ZoomToTrackAsync(int time = 500)
             return arcMap.SetViewpointAsync(new Viewpoint(GpxTrack.Points.Extent), TimeSpan.FromMilliseconds(time)); ;
         }
 
-        private void BrowseButtonClick(object sender, RoutedEventArgs e)
+
+        private void lvwFiles_PreviewMouseRightButtonDown(object sender, MouseButtonEventArgs e)
         {
-            GpxBrowseWindow window = new GpxBrowseWindow(lvwFiles.SelectedItem as TrackInfo);
-            window.Show();
+            ContextMenu menu = new ContextMenu
+            {
+                PlacementTarget = sender as UIElement
+            };
+
+            if (lvwFiles.SelectedItems.Count > 0)
+            {
+                var menuRemove = new MenuItem() { Header = "移除" };
+                menuRemove.Click += (s, e) => RemoveSelectedGpxs();
+                menu.Items.Add(menuRemove);
+
+                if (lvwFiles.SelectedItems.Count > 1)
+                {
+                    var menuLink = new MenuItem() { Header = "连接" };
+                    menuLink.Click += LinkTrackMenuClick;
+                    menu.Items.Add(menuLink);
+                }
+            }
+            if (GpxTrack != null)
+            {
+                var menuZoom = new MenuItem() { Header = "缩放到轨迹" };
+                menuZoom.Click += async (s, e) => await ZoomToTrackAsync();
+                menu.Items.Add(menuZoom);
+
+                var menuBrowse = new MenuItem() { Header = "浏览" };
+                menuBrowse.Click += (s, e) => new GpxBrowseWindow(lvwFiles.SelectedItem as TrackInfo).Show();
+                menu.Items.Add(menuBrowse);
+            }
+            menu.IsOpen = true;
         }
     }
 }

日志.md

@@ -1652,4 +1652,6 @@ Url DataGrid修改为ListBox+文本框，方便修改
 
 ## 20211219
 
-将所有的文件对话框设置了父窗口，避免弹出的对话框在其他窗口之上的BUG
+将所有的文件对话框设置了父窗口，避免弹出的对话框在其他窗口之上的BUG
+
+修复了Gpx工具箱中文件列表中选择文件和点击菜单可能出现闪退的BUG