整理代码

2025-10-10 11:19:58 +08:00
parent 4722a4c881
commit 9d40762f03
111 changed files with 3238 additions and 3112 deletions
--- a/ShrlAlgoToolkit.RevitAddins/RvCivil/BricksFinishesView.xaml
+++ b/ShrlAlgoToolkit.RevitAddins/RvCivil/BricksFinishesView.xaml
@@ -1,55 +1,56 @@
 <ui:NeoWindow
-    Height="500"
-    MinHeight="500"
-    Title="铺贴"
-    Width="180"
-    d:DataContext="{d:DesignInstance rvCivil:BricksFinishesViewModel}"
-    mc:Ignorable="d"
    x:Class="ShrlAlgoToolkit.RevitAddins.RvCivil.BricksFinishesView"
    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:rvCivil="clr-namespace:ShrlAlgoToolkit.RevitAddins.RvCivil"
    xmlns:ui="https://github.com/ShrlAlgo/NeoUI"
-    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+    Title="铺贴"
+    Width="180"
+    Height="500"
+    MinHeight="500"
+    d:DataContext="{d:DesignInstance rvCivil:BricksFinishesViewModel}"
+    Icon="{DynamicResource RevitIcon}"
+    mc:Ignorable="d">
    <Window.Resources>
        <ResourceDictionary Source="pack://application:,,,/ShrlAlgoToolkit.RevitAddins;component/WPFUI.xaml" />
    </Window.Resources>
    <ui:Grid ChildMargin="5" Columns="*">
        <TextBox
-            InputMethod.IsInputMethodEnabled="False"
+            x:Name="TbPavementLength"
            ui:InputAssist.Prefix="砖长："
            ui:InputAssist.Suffix="mm"
-            Text="{Binding PavementLength, StringFormat={}{0:F2}, UpdateSourceTrigger=PropertyChanged}"
-            x:Name="TbPavementLength" />
-        <TextBox
            InputMethod.IsInputMethodEnabled="False"
+            Text="{Binding PavementLength, StringFormat={}{0:F2}, UpdateSourceTrigger=PropertyChanged}" />
+        <TextBox
+            x:Name="TbPavementWidth"
            ui:InputAssist.Prefix="砖宽："
            ui:InputAssist.Suffix="mm"
-            Text="{Binding PavementWidth, StringFormat={}{0:F2}, UpdateSourceTrigger=PropertyChanged}"
-            x:Name="TbPavementWidth" />
-        <TextBox
            InputMethod.IsInputMethodEnabled="False"
+            Text="{Binding PavementWidth, StringFormat={}{0:F2}, UpdateSourceTrigger=PropertyChanged}" />
+        <TextBox
+            x:Name="TbPavementGap"
            ui:InputAssist.Prefix="砖缝："
            ui:InputAssist.Suffix="mm"
-            Text="{Binding PavementGap, StringFormat={}{0:F2}, UpdateSourceTrigger=PropertyChanged}"
-            x:Name="TbPavementGap" />
-        <TextBox
            InputMethod.IsInputMethodEnabled="False"
+            Text="{Binding PavementGap, StringFormat={}{0:F2}, UpdateSourceTrigger=PropertyChanged}" />
+        <TextBox
+            x:Name="TbPavementThickness"
            ui:InputAssist.Prefix="砖厚："
            ui:InputAssist.Suffix="mm"
-            Text="{Binding PavementThickness, StringFormat={}{0:F2}, UpdateSourceTrigger=PropertyChanged}"
-            x:Name="TbPavementThickness" />
-        <TextBox
            InputMethod.IsInputMethodEnabled="False"
+            Text="{Binding PavementThickness, StringFormat={}{0:F2}, UpdateSourceTrigger=PropertyChanged}" />
+        <TextBox
+            x:Name="TbPavementBaseOffset"
            ui:InputAssist.Prefix="墙砖底标高："
            ui:InputAssist.Suffix="mm"
-            Text="{Binding WallBaseOffset, StringFormat={}{0:F2}, UpdateSourceTrigger=PropertyChanged}"
-            x:Name="TbPavementBaseOffset" />
+            InputMethod.IsInputMethodEnabled="False"
+            Text="{Binding WallBaseOffset, StringFormat={}{0:F2}, UpdateSourceTrigger=PropertyChanged}" />
        <TextBox
+            x:Name="TbPavementName"
            ui:InputAssist.Prefix="铺砖名(类型名)："
-            Text="{Binding PanelName, UpdateSourceTrigger=PropertyChanged}"
-            x:Name="TbPavementName" />
+            Text="{Binding PanelName, UpdateSourceTrigger=PropertyChanged}" />
        <GroupBox Grid.Row="1" Header="铺设方式">
            <UniformGrid Rows="1">
                <RadioButton Content="房间" IsChecked="{Binding ByRoom, UpdateSourceTrigger=PropertyChanged}" />
@@ -58,10 +59,10 @@
        </GroupBox>
        <CheckBox Content="边界留缝" IsChecked="{Binding IsEdgeExistGap, UpdateSourceTrigger=PropertyChanged}" />
        <Button
+            x:Name="BtnByFace"
+            HorizontalAlignment="Stretch"
            Command="{Binding PlaceBricksCommand}"
            Content="铺设"
-            HorizontalAlignment="Stretch"
-            IsEnabled="{Binding HasErrors, Mode=OneWay, Converter={StaticResource InvertBooleanConverter}, UpdateSourceTrigger=PropertyChanged}"
-            x:Name="BtnByFace" />
+            IsEnabled="{Binding HasErrors, Mode=OneWay, Converter={StaticResource InvertBooleanConverter}, UpdateSourceTrigger=PropertyChanged}" />
    </ui:Grid>
 </ui:NeoWindow>
--- a/ShrlAlgoToolkit.RevitAddins/RvCivil/CreateOpeningsView.xaml
+++ b/ShrlAlgoToolkit.RevitAddins/RvCivil/CreateOpeningsView.xaml
@@ -1,17 +1,18 @@
 <ui:NeoWindow
-    Height="220"
-    Title="开洞设置"
-    Width="200"
-    d:DataContext="{d:DesignInstance Type={x:Type rvCivil1:CreateOpeningsViewModel}}"
-    mc:Ignorable="d"
    x:Class="ShrlAlgoToolkit.RevitAddins.RvCivil.CreateOpeningsView"
    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:rvCivil="clr-namespace:ShrlAlgoToolkit.RevitAddins.RvCivil"
    xmlns:rvCivil1="clr-namespace:ShrlAlgoToolkit.RevitAddins.RvCivil"
    xmlns:ui="https://github.com/ShrlAlgo/NeoUI"
-    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+    Title="开洞设置"
+    Width="200"
+    Height="220"
+    d:DataContext="{d:DesignInstance Type={x:Type rvCivil1:CreateOpeningsViewModel}}"
+    Icon="{DynamicResource RevitIcon}"
+    mc:Ignorable="d">
    <Window.Resources>
        <ResourceDictionary Source="pack://application:,,,/ShrlAlgoToolkit.RevitAddins;component/WPFUI.xaml" />
    </Window.Resources>
@@ -26,9 +27,9 @@
            ui:InputAssist.Suffix="mm"
            Text="{Binding Distance, StringFormat={}{0:N2}}" />
        <CheckBox
+            x:Name="CbAddCasing"
            Content="添加套管"
-            IsChecked="{Binding AddCasing}"
-            x:Name="CbAddCasing" />
+            IsChecked="{Binding AddCasing}" />
        <ComboBox
            DisplayMemberPath="Name"
            IsEnabled="{Binding IsChecked, ElementName=CbAddCasing}"
@@ -36,10 +37,10 @@
            SelectedItem="{Binding SelectedCasing}" />
        <!--  Command="{Binding DataContext.CloseWinCommand, RelativeSource={RelativeSource AncestorType={x:Type Window}, Mode=FindAncestor}}"  -->
        <Button
+            HorizontalAlignment="Stretch"
+            ui:Grid.RowHeightOverride="Auto"
            Command="{Binding CreateOpeningsCommand}"
            Content="开洞"
-            HorizontalAlignment="Stretch"
-            ToolTip="选择添加套管则使用套管开洞"
-            ui:Grid.RowHeightOverride="Auto" />
+            ToolTip="选择添加套管则使用套管开洞" />
    </ui:Grid>
 </ui:NeoWindow>
--- a/ShrlAlgoToolkit.RevitAddins/RvCivil/FloorFinishesView.xaml
+++ b/ShrlAlgoToolkit.RevitAddins/RvCivil/FloorFinishesView.xaml
@@ -1,18 +1,19 @@
 <ui:NeoWindow
-    Height="500"
-    MinHeight="500"
-    MinWidth="275"
-    Title="房间饰面"
-    Width="200"
-    d:DataContext="{d:DesignInstance Type=rvCivil:FloorFinishesViewModel}"
-    mc:Ignorable="d"
    x:Class="ShrlAlgoToolkit.RevitAddins.RvCivil.FloorFinishesView"
    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:rvCivil="clr-namespace:ShrlAlgoToolkit.RevitAddins.RvCivil"
    xmlns:ui="https://github.com/ShrlAlgo/NeoUI"
-    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+    Title="房间饰面"
+    Width="200"
+    Height="500"
+    MinWidth="275"
+    MinHeight="500"
+    d:DataContext="{d:DesignInstance Type=rvCivil:FloorFinishesViewModel}"
+    Icon="{DynamicResource RevitIcon}"
+    mc:Ignorable="d">
    <Window.Resources>
        <ResourceDictionary Source="pack://application:,,,/ShrlAlgoToolkit.RevitAddins;component/WPFUI.xaml" />
        <!--<ResourceDictionary>
@@ -32,18 +33,18 @@
        </GroupBox>
        <GroupBox
            Grid.Row="1"
-            Header="楼板类型"
-            VerticalAlignment="Stretch">
+            VerticalAlignment="Stretch"
+            Header="楼板类型">
            <ListBox
+                x:Name="LbFloorType"
                DisplayMemberPath="Name"
                ItemsSource="{Binding FloorTypes}"
-                SelectedValue="{Binding SelectedFloorType, UpdateSourceTrigger=PropertyChanged}"
-                x:Name="LbFloorType" />
+                SelectedValue="{Binding SelectedFloorType, UpdateSourceTrigger=PropertyChanged}" />
        </GroupBox>
        <TextBox
            Grid.Row="2"
-            InputMethod.IsInputMethodEnabled="False"
            ui:InputAssist.Placeholder="楼板偏移"
+            InputMethod.IsInputMethodEnabled="False"
            Text="{Binding FloorOffset, StringFormat={}{0:N2}, UpdateSourceTrigger=PropertyChanged}" />
        <!--<TextBox
                Grid.Row="2"
@@ -65,12 +66,14 @@
                </TextBox.Text>
            </TextBox>-->
        <Button
-            Command="{Binding PlaceFloorCommand}"
-            Content="布置"
            Grid.Row="3"
-            HorizontalAlignment="Stretch" 
-            ui:ButtonAssist.Icon="{ui:Icon Glyph=&#xEAB9;, FontFamily={StaticResource BoxIcons}, Size=16}"/>
-            <!--<ui:ButtonAssist.Icon>
+            HorizontalAlignment="Stretch"
+            ui:ButtonAssist.Icon="{ui:Icon Glyph=&#xEAB9;,
+                                           FontFamily={StaticResource BoxIcons},
+                                           Size=16}"
+            Command="{Binding PlaceFloorCommand}"
+            Content="布置" />
+        <!--<ui:ButtonAssist.Icon>
                <ui:IconElement />
            </ui:ButtonAssist.Icon>-->

--- a/ShrlAlgoToolkit.RevitAddins/RvCivil/ResolveCivilConnectView.xaml
+++ b/ShrlAlgoToolkit.RevitAddins/RvCivil/ResolveCivilConnectView.xaml
@@ -1,17 +1,18 @@
 <ui:NeoWindow
-    Height="600"
-    MinHeight="600"
-    Title="土建构件连接"
-    Width="250"
-    d:DataContext="{d:DesignInstance Type=rvCivil:ResolveCivilConnectViewModel}"
-    mc:Ignorable="d"
    x:Class="ShrlAlgoToolkit.RevitAddins.RvCivil.ResolveCivilConnectView"
    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:rvCivil="clr-namespace:ShrlAlgoToolkit.RevitAddins.RvCivil"
    xmlns:ui="https://github.com/ShrlAlgo/NeoUI"
-    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+    Title="土建构件连接"
+    Width="300"
+    Height="600"
+    MinHeight="600"
+    d:DataContext="{d:DesignInstance Type=rvCivil:ResolveCivilConnectViewModel}"
+    Icon="{DynamicResource RevitIcon}"
+    mc:Ignorable="d">
    <Window.Resources>
        <ResourceDictionary>
            <ResourceDictionary.MergedDictionaries>
@@ -24,8 +25,8 @@
        Columns="*"
        Rows="*,Auto,Auto">
        <GroupBox
-            Grid.Column="0"
            Grid.Row="0"
+            Grid.Column="0"
            Header="扣减选项">
            <StackPanel>
                <CheckBox
@@ -81,10 +82,10 @@
            </UniformGrid>
        </GroupBox>
        <Button
-            Command="{Binding ModifyModelCommand}"
-            Content="修改"
            Grid.Row="2"
            HorizontalAlignment="Stretch"
+            Command="{Binding ModifyModelCommand}"
+            Content="修改"
            ToolTip="相交的图元才会被修改" />
    </ui:Grid>
 </ui:NeoWindow>
--- a/ShrlAlgoToolkit.RevitAddins/RvCivil/WallFinishesView.xaml
+++ b/ShrlAlgoToolkit.RevitAddins/RvCivil/WallFinishesView.xaml
@@ -1,17 +1,18 @@
 <ui:NeoWindow
-    Height="500"
-    MinHeight="300"
-    Title="墙饰面"
-    Width="250"
-    d:DataContext="{d:DesignInstance rvCivil:WallFinishesViewModel}"
-    mc:Ignorable="d"
    x:Class="ShrlAlgoToolkit.RevitAddins.RvCivil.WallFinishesView"
    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:rvCivil="clr-namespace:ShrlAlgoToolkit.RevitAddins.RvCivil"
    xmlns:ui="https://github.com/ShrlAlgo/NeoUI"
-    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+    Title="墙饰面"
+    Width="250"
+    Height="500"
+    MinHeight="300"
+    d:DataContext="{d:DesignInstance rvCivil:WallFinishesViewModel}"
+    Icon="{DynamicResource RevitIcon}"
+    mc:Ignorable="d">
    <Window.Resources>
        <ResourceDictionary>
            <ResourceDictionary.MergedDictionaries>
@@ -24,45 +25,45 @@
        Columns="*"
        Rows="*,Auto,Auto,Auto,Auto">
        <GroupBox
-            Header="饰面类型"
            Height="300"
-            VerticalAlignment="Stretch">
+            VerticalAlignment="Stretch"
+            Header="饰面类型">
            <ListBox
+                x:Name="CbbWallTypes"
                DisplayMemberPath="Name"
                ItemsSource="{Binding WallTypes}"
-                SelectedValue="{Binding SelectedWallType, UpdateSourceTrigger=PropertyChanged}"
-                x:Name="CbbWallTypes" />
+                SelectedValue="{Binding SelectedWallType, UpdateSourceTrigger=PropertyChanged}" />
        </GroupBox>
        <TextBox
+            x:Name="TbWallHeight"
            Grid.Row="1"
-            InputMethod.IsInputMethodEnabled="False"
            ui:InputAssist.Prefix="饰面总高度："
            ui:InputAssist.Suffix="mm"
-            Text="{Binding WallHeight, StringFormat=\{0:F2\}, UpdateSourceTrigger=PropertyChanged}"
-            x:Name="TbWallHeight" />
-        <TextBox
-            Grid.Row="2"
            InputMethod.IsInputMethodEnabled="False"
+            Text="{Binding WallHeight, StringFormat=\{0:F2\}, UpdateSourceTrigger=PropertyChanged}" />
+        <TextBox
+            x:Name="TbWallBase"
+            Grid.Row="2"
            ui:InputAssist.Prefix="饰面底部离地高度："
            ui:InputAssist.Suffix="mm"
-            Text="{Binding WallBaseOffset, StringFormat=\{0:F2\}, UpdateSourceTrigger=PropertyChanged}"
-            x:Name="TbWallBase" />
+            InputMethod.IsInputMethodEnabled="False"
+            Text="{Binding WallBaseOffset, StringFormat=\{0:F2\}, UpdateSourceTrigger=PropertyChanged}" />
        <ComboBox
+            x:Name="CbbPlaceType"
            Grid.Row="3"
            IsSynchronizedWithCurrentItem="True"
            SelectedIndex="0"
-            Text="布置方式"
-            x:Name="CbbPlaceType">
+            Text="布置方式">
            <ComboBoxItem Content="墙面" />
            <ComboBoxItem Content="房间" />
            <ComboBoxItem Content="整墙" />
        </ComboBox>
        <Button
-            Command="{Binding PlaceWallCommand}"
-            Content="布置"
+            x:Name="BtnPlace"
            Grid.Row="4"
            HorizontalAlignment="Stretch"
            VerticalAlignment="Center"
-            x:Name="BtnPlace" />
+            Command="{Binding PlaceWallCommand}"
+            Content="布置" />
    </ui:Grid>
 </ui:NeoWindow>