日志将写到配置所在文件夹（通过CONFIG_HERE或者CONFIG_UP来指定），而非固定在程序目录下；修复了配置文件所在目录为程序目录时，关闭程序时出错的BUG；【地图画板】紧凑列表选项移动到视图选择同一行，减小占用面积

Author: f-shake

MapBoard.Core/Parameters.cs

@@ -20,6 +20,7 @@ static Parameters()
                 TileDownloadPath = "Download";
                 BackupPath = "Backup";
                 RecordsPath = "Record";
+                LogsPath = "Logs";
             }
             else if (File.Exists(Path.Combine(appPath, ConfigUp)))
             {
@@ -29,6 +30,7 @@ static Parameters()
                 TileDownloadPath = "../Download";
                 BackupPath = "../Backup";
                 RecordsPath = "../Record";
+                LogsPath = "../Logs";
             }
             else
             {
@@ -39,6 +41,7 @@ static Parameters()
                 TileDownloadPath = Path.Combine(folder, AppName, "Download");
                 BackupPath = Path.Combine(folder, AppName, "Backup");
                 RecordsPath = Path.Combine(folder, AppName, "Record");
+                LogsPath  = Path.Combine(folder, AppName, "Logs");
             }
         }
 
@@ -58,6 +61,7 @@ static Parameters()
         public static readonly string TileDownloadPath;
         public static readonly string BackupPath;
         public static readonly string RecordsPath;
+        public static readonly string LogsPath;
 
         public static TimeSpan AnimationDuration { get; set; } = TimeSpan.FromSeconds(0.5);
         public static TimeSpan LoadTimeout { get; set; } = TimeSpan.FromSeconds(5);

MapBoard.UI/App.xaml.cs

@@ -16,6 +16,7 @@
 using System.Windows.Media;
 using MapBoard.UI.GpxToolbox;
 using MapBoard.UI.TileDownloader;
+using log4net.Appender;
 
 [assembly: log4net.Config.XmlConfigurator(ConfigFile = "log4net.config", Watch = true)]
 
@@ -42,6 +43,18 @@ public App()
         private async void Application_Startup(object sender, StartupEventArgs e)
         {
             Log = LogManager.GetLogger(GetType());
+            var h = (log4net.Repository.Hierarchy.Hierarchy)LogManager.GetRepository();
+            foreach (IAppender a in h.Root.Appenders)
+            {
+                if (a is FileAppender)
+                {
+                    FileAppender fa = (FileAppender)a;
+                    fa.File = System.IO.Path.Combine(Parameters.LogsPath, "MapBoard.log");
+                    fa.ActivateOptions();
+                    break;
+                }
+            }
+
             Log.Info("程序启动");
 
 #if (DEBUG)

MapBoard.UI/Config.cs

@@ -397,7 +397,8 @@ public bool UseCompactLayerList
 
         public void Save()
         {
-            if (!Directory.Exists(Path.GetDirectoryName(path)))
+            string dir = Path.GetDirectoryName(path);
+            if (!string.IsNullOrWhiteSpace(dir)&& !Directory.Exists(dir))
             {
                 Directory.CreateDirectory(Path.GetDirectoryName(path));
             }

MapBoard.UI/UI/LayerListPanel.xaml

@@ -51,10 +51,7 @@
                         </DataTemplate>
                     </ItemsControl.ItemTemplate>
                 </ItemsControl>
-                <ui:ToggleSwitch
-                    IsOn="{Binding Source={x:Static m:Config.Instance}, Path=UseCompactLayerList}"
-                    OffContent="使用普通图层列表视图"
-                    OnContent="使用简略图层列表视图" />
+
             </ui:SimpleStackPanel>
         </Border>
 
@@ -216,17 +213,6 @@
             <RowDefinition Height="*" />
         </Grid.RowDefinitions>
         <ContentControl x:Name="groupContent" />
-        <Button
-            x:Name="btnGroups"
-            Grid.Row="2"
-            Margin="0,0,8,0"
-            HorizontalAlignment="Right"
-            Background="Transparent">
-            <ui:FontIcon Glyph="&#xF168;" />
-            <ui:FlyoutService.Flyout>
-                <ui:Flyout x:Name="flyoutGroups" />
-            </ui:FlyoutService.Flyout>
-        </Button>
         <ListView
             x:Name="dataGrid"
             Grid.Row="4"
@@ -239,28 +225,55 @@
             ScrollViewer.CanContentScroll="False"
             SelectionChanged="SelectedLayerChanged"
             SelectionMode="Extended" />
-        <ListView
-            x:Name="lvwViewTypes"
+        <Grid
             Grid.Row="2"
-            HorizontalAlignment="Center"
-            SelectedIndex="{Binding ViewType}">
-            <ListView.ItemsPanel>
-                <ItemsPanelTemplate>
-                    <WrapPanel
-                        VerticalAlignment="Top"
-                        Orientation="Horizontal" />
-                </ItemsPanelTemplate>
-            </ListView.ItemsPanel>
-            <ListView.ItemContainerStyle>
-                <Style
-                    BasedOn="{StaticResource DefaultListViewItemStyle}"
-                    TargetType="{x:Type ListViewItem}">
-                    <Setter Property="MinWidth" Value="10" />
-                </Style>
-            </ListView.ItemContainerStyle>
-            <sys:String>顺序</sys:String>
-            <sys:String>组别</sys:String>
-            <sys:String>类型</sys:String>
-        </ListView>
+            Margin="4,0,0,0">
+            <Grid.ColumnDefinitions>
+                <ColumnDefinition Width="Auto" />
+                <ColumnDefinition Width="*" />
+                <ColumnDefinition Width="Auto" />
+                <ColumnDefinition Width="8" />
+                <ColumnDefinition Width="Auto" />
+            </Grid.ColumnDefinitions>
+            <ListView
+                x:Name="lvwViewTypes"
+                HorizontalAlignment="Left"
+                SelectedIndex="{Binding ViewType}">
+                <ListView.ItemsPanel>
+                    <ItemsPanelTemplate>
+                        <WrapPanel
+                            VerticalAlignment="Top"
+                            Orientation="Horizontal" />
+                    </ItemsPanelTemplate>
+                </ListView.ItemsPanel>
+                <ListView.ItemContainerStyle>
+                    <Style
+                        BasedOn="{StaticResource DefaultListViewItemStyle}"
+                        TargetType="{x:Type ListViewItem}">
+                        <Setter Property="MinWidth" Value="10" />
+                    </Style>
+                </ListView.ItemContainerStyle>
+                <sys:String>顺序</sys:String>
+                <sys:String>组别</sys:String>
+                <sys:String>类型</sys:String>
+            </ListView>
+            <CheckBox
+                Grid.Column="2"
+                Margin="0,0,-48,0"
+                HorizontalAlignment="Right"
+                Content="紧凑"
+                FocusVisualStyle="{x:Null}"
+                IsChecked="{Binding Source={x:Static m:Config.Instance}, Path=UseCompactLayerList}" />
+            <Button
+                x:Name="btnGroups"
+                Grid.Column="4"
+                Background="Transparent">
+                <ui:FontIcon Glyph="&#xF168;" />
+                <ui:FlyoutService.Flyout>
+                    <ui:Flyout x:Name="flyoutGroups" />
+                </ui:FlyoutService.Flyout>
+            </Button>
+
+        </Grid>
     </Grid>
 </local:UserControlBase>

MapBoard.UI/UI/LayerListPanel.xaml.cs

@@ -66,7 +66,7 @@ private void SetListDataTemplate()
         private void UpdateLayout(double height)
         {
             var r = FindResource("bdGroups") as Border;
-            if (height < 1050)
+            if (height < 800)
             {
                 lvwViewTypes.HorizontalAlignment = HorizontalAlignment.Left;
                 btnGroups.Visibility = Visibility.Visible;

日志.md

@@ -1640,4 +1640,12 @@ Url DataGrid修改为ListBox+文本框，方便修改
 
 【地图画板】使用了更精确的缓冲区建立方式
 
-【地图画板】支持对选中的图形新建缓冲区
+【地图画板】支持对选中的图形新建缓冲区
+
+## 20211214
+
+日志将写到配置所在文件夹（通过CONFIG_HERE或者CONFIG_UP来指定），而非固定在程序目录下
+
+修复了配置文件所在目录为程序目录时，关闭程序时出错的BUG
+
+【地图画板】紧凑列表选项移动到视图选择同一行，减小占用面积