整理代码

2025-10-10 11:19:58 +08:00
parent 4722a4c881
commit 9d40762f03
111 changed files with 3238 additions and 3112 deletions
--- a/ShrlAlgoToolkit.RevitAddins/RvView/AlignTagsView.xaml
+++ b/ShrlAlgoToolkit.RevitAddins/RvView/AlignTagsView.xaml
@@ -1,30 +1,37 @@
 <ui:NeoWindow
-    Height="150"
-    MinHeight="150"
-    Title="整理标记"
-    Width="200"
-    d:DataContext="{d:DesignInstance Type=rvDrawing:AlignTagsViewModel}"
-    mc:Ignorable="d"
    x:Class="ShrlAlgoToolkit.RevitAddins.RvView.AlignTagsView"
    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
    xmlns:rvDrawing="clr-namespace:ShrlAlgoToolkit.RevitAddins.RvView"
    xmlns:ui="https://github.com/ShrlAlgo/NeoUI"
-    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+    Title="整理标记"
+    Width="200"
+    Height="150"
+    MinHeight="150"
+    d:DataContext="{d:DesignInstance Type=rvDrawing:AlignTagsViewModel}"
+    Icon="{DynamicResource RevitIcon}"
+    mc:Ignorable="d">
    <Window.Resources>
        <ResourceDictionary Source="pack://application:,,,/ShrlAlgoToolkit.RevitAddins;component/WPFUI.xaml" />
    </Window.Resources>
    <ui:StackPanel Margin="5" Spacing="5">
        <UniformGrid Rows="1">
-            <RadioButton Content="手动" IsChecked="{Binding IsAutomatic, Converter={StaticResource InvertBooleanConverter}}" />
-            <RadioButton Content="自动" IsChecked="{Binding IsAutomatic, UpdateSourceTrigger=PropertyChanged}" />
+            <RadioButton
+                Content="手动"
+                IsChecked="{Binding IsAutomatic, Converter={StaticResource InvertBooleanConverter}}"
+                ToolTip="手动选择成组的标记" />
+            <RadioButton
+                Content="自动"
+                IsChecked="{Binding IsAutomatic, UpdateSourceTrigger=PropertyChanged}"
+                ToolTip="根据标记间的距离自动整理成组" />
        </UniformGrid>
        <TextBox ui:InputAssist.Prefix="间距:" ui:InputAssist.Suffix="mm" />
        <Button
+            HorizontalAlignment="Stretch"
            Command="{Binding ArrangeCommand}"
            Content="整理"
-            Cursor="Hand"
-            HorizontalAlignment="Stretch" />
+            Cursor="Hand" />
    </ui:StackPanel>
 </ui:NeoWindow>
--- a/ShrlAlgoToolkit.RevitAddins/RvView/ElementControlDock.xaml
+++ b/ShrlAlgoToolkit.RevitAddins/RvView/ElementControlDock.xaml
@@ -5,7 +5,7 @@
    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
    xmlns:ui="https://github.com/ShrlAlgo/NeoUI"
-    Background="{DynamicResource WindowBackground}"
+    Background="{DynamicResource BackgroundLayoutBrush}"
    mc:Ignorable="d">
    <Page.Resources>
        <ResourceDictionary Source="pack://application:,,,/ShrlAlgoToolkit.RevitAddins;component/WPFUI.xaml" />
--- a/ShrlAlgoToolkit.RevitAddins/RvView/QuickViewSectionView.xaml
+++ b/ShrlAlgoToolkit.RevitAddins/RvView/QuickViewSectionView.xaml
@@ -1,17 +1,18 @@
 <ui:NeoWindow
-    Height="180"
-    SizeToContent="Height"
-    Title="快速剖面"
-    Width="250"
-    d:DataContext="{d:DesignInstance Type=local:QuickViewSectionViewModel}"
-    mc:Ignorable="d"
    x:Class="ShrlAlgoToolkit.RevitAddins.RvView.QuickViewSectionView"
    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
    xmlns:local="clr-namespace:ShrlAlgoToolkit.RevitAddins.RvView"
    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
    xmlns:ui="https://github.com/ShrlAlgo/NeoUI"
-    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+    Title="快速剖面"
+    Width="300"
+    Height="180"
+    d:DataContext="{d:DesignInstance Type=local:QuickViewSectionViewModel}"
+    Icon="{DynamicResource RevitIcon}"
+    SizeToContent="Height"
+    mc:Ignorable="d">
    <Window.Resources>
        <ResourceDictionary Source="pack://application:,,,/ShrlAlgoToolkit.RevitAddins;component/WPFUI.xaml" />
    </Window.Resources>
@@ -19,27 +20,27 @@
        <GroupBox Header="剖面线">
            <UniformGrid Rows="1">
                <RadioButton
-                    Content="平行"
                    HorizontalAlignment="Center"
+                    Content="平行"
                    IsChecked="{Binding IsParallel}" />
                <RadioButton
-                    Content="正交"
+                    x:Name="Perpendicular"
                    HorizontalAlignment="Center"
-                    IsChecked="{Binding IsParallel, Converter={StaticResource InvertBooleanConverter}}"
-                    x:Name="Perpendicular" />
+                    Content="正交"
+                    IsChecked="{Binding IsParallel, Converter={StaticResource InvertBooleanConverter}}" />
            </UniformGrid>
        </GroupBox>
        <UniformGrid Rows="1">
            <Button
-                Command="{Binding CreateViewSectionCommand}"
-                Content="创建"
+                Margin="5"
                HorizontalAlignment="Stretch"
-                Margin="5" />
+                Command="{Binding CreateViewSectionCommand}"
+                Content="创建" />
            <Button
+                Margin="5"
+                HorizontalAlignment="Stretch"
                Command="{Binding DeleteViewSectionCommand}"
                Content="删除"
-                HorizontalAlignment="Stretch"
-                Margin="5"
                ToolTip="删除全部在当前窗口打开时（本次）创建的快速剖面" />
        </UniformGrid>
    </ui:StackPanel>
--- a/ShrlAlgoToolkit.RevitAddins/RvView/SectionBoxControllerView.xaml
+++ b/ShrlAlgoToolkit.RevitAddins/RvView/SectionBoxControllerView.xaml
@@ -1,19 +1,20 @@
 <ui:NeoWindow
-    Height="360"
-    MinHeight="360"
-    MinWidth="340"
-    Title="剖面框"
-    Width="340"
-    d:DataContext="{d:DesignInstance Type=rvManager:SectionBoxControllerViewModel}"
-    mc:Ignorable="d"
    x:Class="ShrlAlgoToolkit.RevitAddins.RvView.SectionBoxControllerView"
    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
    xmlns:rvManager="clr-namespace:ShrlAlgoToolkit.RevitAddins.RvView"
    xmlns:rvView="clr-namespace:ShrlAlgoToolkit.RevitAddins.RvView"
    xmlns:ui="https://github.com/ShrlAlgo/NeoUI"
-    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+    Title="剖面框"
+    Width="340"
+    Height="360"
+    MinWidth="340"
+    MinHeight="360"
+    d:DataContext="{d:DesignInstance Type=rvManager:SectionBoxControllerViewModel}"
+    Icon="{DynamicResource RevitIcon}"
+    mc:Ignorable="d">
    <Window.Resources>
        <ResourceDictionary Source="pack://application:,,,/ShrlAlgoToolkit.RevitAddins;component/WPFUI.xaml" />
    </Window.Resources>
@@ -29,14 +30,14 @@
                </StackPanel>
            </GroupBox.Header>
            <ListBox
-                DisplayMemberPath="Name"
+                x:Name="HistoryListBox"
                HorizontalContentAlignment="Center"
-                ItemsSource="{Binding BoundingBoxes}"
-                SelectedValuePath="Bounding"
                d:ItemsSource="{d:SampleData ItemCount=5}"
-                x:Name="HistoryListBox" />
+                DisplayMemberPath="Name"
+                ItemsSource="{Binding BoundingBoxes}"
+                SelectedValuePath="Bounding" />
        </GroupBox>
-        <Grid Grid.ColumnSpan="2" Grid.Row="1">
+        <Grid Grid.Row="1" Grid.ColumnSpan="2">
            <Grid.ColumnDefinitions>
                <ColumnDefinition Width="*" />
                <ColumnDefinition Width="auto" />
@@ -58,46 +59,46 @@
                </UniformGrid>
            </GroupBox>
            <CheckBox
-                Content="是否延展"
                Grid.Column="1"
-                HorizontalAlignment="Center"
-                IsChecked="{Binding NeedExtend}"
                Margin="5"
+                HorizontalAlignment="Center"
+                Content="是否延展"
+                IsChecked="{Binding NeedExtend}"
                ToolTip="是否延展剖面框边界" />
        </Grid>
        <Button
+            Grid.Row="2"
+            Grid.Column="0"
+            HorizontalAlignment="Stretch"
+            ui:ButtonAssist.Icon="{ui:Icon SymbolValue=Add}"
            Command="{Binding RecordSectionBoxCommand}"
            Content="临时记录"
-            Grid.Column="0"
-            Grid.Row="2"
-            HorizontalAlignment="Stretch"
-            ToolTip="记录剖面框，以便复用"
-            ui:ButtonAssist.Icon="{ui:Icon SymbolValue=Add}" />
+            ToolTip="记录剖面框，以便复用" />
        <Button
+            Grid.Row="2"
+            Grid.Column="1"
+            HorizontalAlignment="Stretch"
+            ui:ButtonAssist.Icon="{ui:Icon SymbolValue=Delete}"
            Command="{Binding RemoveSectionBoxCommand}"
            CommandParameter="{Binding SelectedItem, ElementName=HistoryListBox}"
            Content="删除记录"
-            Grid.Column="1"
-            Grid.Row="2"
-            HorizontalAlignment="Stretch"
-            ToolTip="删除已记录的剖面框"
-            ui:ButtonAssist.Icon="{ui:Icon SymbolValue=Delete}" />
+            ToolTip="删除已记录的剖面框" />
        <Button
+            Grid.Row="3"
+            Grid.Column="0"
+            HorizontalAlignment="Stretch"
+            ui:ButtonAssist.Icon="{ui:Icon SymbolValue=KeyboardReturn}"
            Command="{Binding UpdateSectionBoxCommand}"
            CommandParameter="{Binding SelectedValue, ElementName=HistoryListBox}"
            Content="恢复剖面框"
-            Grid.Column="0"
-            Grid.Row="3"
-            HorizontalAlignment="Stretch"
-            ToolTip="返回历史记录的剖面框"
-            ui:ButtonAssist.Icon="{ui:Icon SymbolValue=KeyboardReturn}" />
+            ToolTip="返回历史记录的剖面框" />
        <Button
+            Grid.Row="3"
+            Grid.Column="1"
+            HorizontalAlignment="Stretch"
+            ui:ButtonAssist.Icon="{ui:Icon SymbolValue=Box}"
            Command="{Binding ResetSectionBoxCommand}"
            Content="设置剖面框"
-            Grid.Column="1"
-            Grid.Row="3"
-            HorizontalAlignment="Stretch"
-            ToolTip="重新设置新的剖面框"
-            ui:ButtonAssist.Icon="{ui:Icon SymbolValue=Box}" />
+            ToolTip="重新设置新的剖面框" />
    </ui:Grid>
 </ui:NeoWindow>
--- a/ShrlAlgoToolkit.RevitAddins/RvView/SystemDisplayView.xaml
+++ b/ShrlAlgoToolkit.RevitAddins/RvView/SystemDisplayView.xaml
@@ -1,12 +1,7 @@
 <ui:NeoWindow
-    Height="450"
-    MinWidth="550"
-    Title="系统设置"
-    Width="550"
-    d:DataContext="{d:DesignInstance Type=local:SystemDisplayViewModel}"
-    mc:Ignorable="d"
    x:Class="ShrlAlgoToolkit.RevitAddins.RvView.SystemDisplayView"
    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
    xmlns:converters="clr-namespace:ShrlAlgoToolkit.Mvvm.Converters;assembly=ShrlAlgoToolkit.Mvvm"
    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
    xmlns:local="clr-namespace:ShrlAlgoToolkit.RevitAddins.RvView"
@@ -14,13 +9,19 @@
    xmlns:mep="clr-namespace:ShrlAlgoToolkit.RevitAddins.RvMEP"
    xmlns:rvMep="clr-namespace:ShrlAlgoToolkit.RevitAddins.RvMEP"
    xmlns:ui="https://github.com/ShrlAlgo/NeoUI"
-    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+    Title="系统设置"
+    Width="550"
+    Height="450"
+    MinWidth="550"
+    d:DataContext="{d:DesignInstance Type=local:SystemDisplayViewModel}"
+    Icon="{DynamicResource RevitIcon}"
+    mc:Ignorable="d">
    <Window.Resources>
        <ResourceDictionary>
            <ResourceDictionary.MergedDictionaries>
                <ResourceDictionary Source="pack://application:,,,/ShrlAlgoToolkit.RevitAddins;component/WPFUI.xaml" />
            </ResourceDictionary.MergedDictionaries>
-            <converters:EnumItemsSourceAndConverter Type="{x:Type rvMep:MEPSystemClassification}" x:Key="SystemClassificationConverter" />
+            <converters:EnumItemsSourceAndConverter x:Key="SystemClassificationConverter" Type="{x:Type rvMep:MEPSystemClassification}" />
        </ResourceDictionary>
    </Window.Resources>
    <Grid>
@@ -28,20 +29,20 @@
            <RowDefinition Height="Auto" />
            <RowDefinition Height="*" />
        </Grid.RowDefinitions>
-        <GroupBox Header="配置方式" Margin="5">
+        <GroupBox Margin="5" Header="配置方式">
            <UniformGrid HorizontalAlignment="Center" Rows="1">
-                <RadioButton Content="过滤器" Margin="5" />
-                <RadioButton Content="材质" Margin="5" />
+                <RadioButton Margin="5" Content="过滤器" />
+                <RadioButton Margin="5" Content="材质" />
            </UniformGrid>
        </GroupBox>
        <DataGrid
+            Grid.Row="1"
+            Margin="5"
+            d:ItemsSource="{d:SampleData}"
            AutoGenerateColumns="False"
            EnableRowVirtualization="True"
            FrozenColumnCount="2"
-            Grid.Row="1"
-            ItemsSource="{Binding SystemsCollection}"
-            Margin="5"
-            d:ItemsSource="{d:SampleData}">
+            ItemsSource="{Binding SystemsCollection}">
            <DataGrid.Columns>
                <!--<DataGridCheckBoxColumn
                        Binding="{Binding IsSelected, UpdateSourceTrigger=PropertyChanged}"
@@ -75,7 +76,6 @@
                        <DataTemplate>
                            <Border>
                                <Button
-                                    Background="{Binding BackgroundColor}"
                                    Command="{Binding DataContext.OpenColorPickerCommand, RelativeSource={RelativeSource AncestorType={x:Type Window}}}"
                                    CommandParameter="{Binding}"
                                    Content="编辑" />
--- a/ShrlAlgoToolkit.RevitAddins/RvView/ViewManagerView.xaml
+++ b/ShrlAlgoToolkit.RevitAddins/RvView/ViewManagerView.xaml
@@ -1,5 +1,6 @@
 <ui:NeoWindow
    Height="450"
+    Icon="{DynamicResource RevitIcon}"
    Title="视图管理"
    Width="800"
    d:DataContext="{d:DesignInstance Type=local:ViewManagerViewModel}"
--- a/ShrlAlgoToolkit.RevitAddins/RvView/VisibilityView.xaml
+++ b/ShrlAlgoToolkit.RevitAddins/RvView/VisibilityView.xaml
@@ -1,20 +1,21 @@
 <ui:NeoWindow
-    Height="100"
-    MinHeight="100"
-    MinWidth="400"
-    SizeToContent="Width"
-    Title="可见性控制"
-    Width="370"
-    d:DataContext="{d:DesignInstance local:VisibilityViewModel}"
-    mc:Ignorable="d"
    x:Class="ShrlAlgoToolkit.RevitAddins.RvView.VisibilityView"
    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
    xmlns:b="http://schemas.microsoft.com/xaml/behaviors"
    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
    xmlns:local="clr-namespace:ShrlAlgoToolkit.RevitAddins.RvView"
    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
    xmlns:ui="https://github.com/ShrlAlgo/NeoUI"
-    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+    Title="可见性控制"
+    Width="370"
+    Height="100"
+    MinWidth="400"
+    MinHeight="100"
+    d:DataContext="{d:DesignInstance local:VisibilityViewModel}"
+    Icon="{DynamicResource RevitIcon}"
+    SizeToContent="Width"
+    mc:Ignorable="d">
    <b:Interaction.Triggers>
        <b:EventTrigger EventName="Closing">
            <b:InvokeCommandAction Command="{Binding ClosingCommand}" />