整理代码

2025-10-10 11:19:58 +08:00
parent 4722a4c881
commit 9d40762f03
111 changed files with 3238 additions and 3112 deletions
--- a/ShrlAlgoToolkit.RevitAddins/RvIndependent/MetroGauges/GaugesModelView.xaml
+++ b/ShrlAlgoToolkit.RevitAddins/RvIndependent/MetroGauges/GaugesModelView.xaml
@@ -1,14 +1,14 @@
 <ui:NeoWindow
-    Height="462"
-    MinHeight="580"
-    MinWidth="1000"
-    Title="模型创建"
-    Width="625"
-    WindowStartupLocation="CenterScreen"
    x:Class="ShrlAlgoToolkit.RevitAddins.RvIndependent.MetroGauges.GaugesModelView"
    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
    xmlns:ui="https://github.com/ShrlAlgo/NeoUI"
-    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+    Title="模型创建"
+    Width="625"
+    Height="462"
+    MinWidth="1000"
+    MinHeight="580"
+    WindowStartupLocation="CenterScreen">
    <Window.Resources>
        <ResourceDictionary Source="pack://application:,,,/ShrlAlgoToolkit.RevitAddins;component/WPFUI.xaml" />
    </Window.Resources>
@@ -17,27 +17,27 @@
        Columns="*,Auto"
        Rows="*,*">
        <GroupBox
-            Grid.ColumnSpan="2"
            Grid.Row="0"
+            Grid.ColumnSpan="2"
            Header="平曲线">
            <DataGrid
+                x:Name="DgHorizon"
                CanUserSortColumns="False"
                IsReadOnly="True"
                ItemsSource="{Binding}"
                LoadingRow="DGHorizon_LoadingRow"
-                MinColumnWidth="100"
-                x:Name="DgHorizon" />
+                MinColumnWidth="100" />
        </GroupBox>
        <GroupBox
-            Grid.Column="0"
            Grid.Row="1"
+            Grid.Column="0"
            Header="竖曲线">
            <DataGrid
+                x:Name="DgVertical"
                CanUserSortColumns="False"
                IsReadOnly="True"
                ItemsSource="{Binding}"
-                LoadingRow="DGVertical_LoadingRow"
-                x:Name="DgVertical" />
+                LoadingRow="DGVertical_LoadingRow" />
        </GroupBox>
        <Grid>
            <Grid.RowDefinitions>
@@ -46,11 +46,11 @@
            </Grid.RowDefinitions>
            <GroupBox Header="横断面">
                <DataGrid
+                    x:Name="DgCross"
                    AutoGenerateColumns="False"
                    CanUserSortColumns="False"
                    ItemsSource="{Binding}"
-                    LoadingRow="DGCross_LoadingRow"
-                    x:Name="DgCross">
+                    LoadingRow="DGCross_LoadingRow">
                    <DataGrid.Columns>
                        <DataGridTextColumn Binding="{Binding StartStation, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" Header="起点桩号" />
                        <DataGridTextColumn Binding="{Binding EndStation, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" Header="终点桩号" />
@@ -59,10 +59,10 @@
                            <DataGridTemplateColumn.CellTemplate>
                                <DataTemplate>
                                    <Button
-                                        Click="BtnStartLoad_Click"
-                                        Content="{Binding FileNameStart, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"
+                                        x:Name="BtnLoad"
                                        MinWidth="60"
-                                        x:Name="BtnLoad" />
+                                        Click="BtnStartLoad_Click"
+                                        Content="{Binding FileNameStart, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" />
                                </DataTemplate>
                            </DataGridTemplateColumn.CellTemplate>
                        </DataGridTemplateColumn>
@@ -70,10 +70,10 @@
                            <DataGridTemplateColumn.CellTemplate>
                                <DataTemplate>
                                    <Button
-                                        Click="BtnEndLoad_Click"
-                                        Content="{Binding FileNameEnd, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"
+                                        x:Name="BtnLoad"
                                        MinWidth="60"
-                                        x:Name="BtnLoad" />
+                                        Click="BtnEndLoad_Click"
+                                        Content="{Binding FileNameEnd, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" />
                                </DataTemplate>
                            </DataGridTemplateColumn.CellTemplate>
                        </DataGridTemplateColumn>
@@ -82,13 +82,13 @@
                                <DataTemplate>
                                    <StackPanel Orientation="Horizontal">
                                        <Button
+                                            x:Name="BtnAdd"
                                            Click="BtnAdd_Click"
-                                            Content="添加"
-                                            x:Name="BtnAdd" />
+                                            Content="添加" />
                                        <Button
+                                            x:Name="BtnDelete"
                                            Click="BtnDelete_Click"
-                                            Content="删除"
-                                            x:Name="BtnDelete" />
+                                            Content="删除" />
                                    </StackPanel>
                                </DataTemplate>
                            </DataGridTemplateColumn.CellTemplate>
@@ -98,23 +98,23 @@
            </GroupBox>
            <StackPanel Grid.Row="1" Orientation="Horizontal">
                <CheckBox
+                    x:Name="CbSolid"
                    Content="实体"
-                    IsChecked="True"
-                    x:Name="CbSolid" />
+                    IsChecked="True" />
                <Button Click="LoadLandXml_Click" Content="加载XML" />
                <Button
+                    x:Name="btnSetByCurve"
                    Click="BtnSetByCurve_Click"
                    Content="曲线类型分割"
-                    Cursor="Hand"
-                    x:Name="btnSetByCurve" />
+                    Cursor="Hand" />
                <Button
+                    x:Name="btnCreateGauges"
                    Click="CreateGaugesModel_Click"
-                    Content="限界体量"
-                    x:Name="btnCreateGauges" />
+                    Content="限界体量" />
                <Button
+                    x:Name="btnCreateForm"
                    Click="CreateFrom_Click"
-                    Content="创建体量"
-                    x:Name="btnCreateForm" />
+                    Content="创建体量" />
            </StackPanel>
        </Grid>
    </ui:Grid>
--- a/ShrlAlgoToolkit.RevitAddins/RvIndependent/MetroTunnel/MetroTunnelView.xaml
+++ b/ShrlAlgoToolkit.RevitAddins/RvIndependent/MetroTunnel/MetroTunnelView.xaml
@@ -1,18 +1,19 @@
 <ui:NeoWindow
-    Height="280"
-    MinWidth="300"
-    Title="简易盾构区间"
-    Width="500"
-    d:DataContext="{d:DesignInstance Type=metroTunnel1:MetroTunnelViewModel}"
-    mc:Ignorable="d"
    x:Class="ShrlAlgoToolkit.RevitAddins.RvIndependent.MetroTunnel.MetroTunnelView"
    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:metroTunnel="clr-namespace:ShrlAlgoToolkit.RevitAddins.RvIndependent"
    xmlns:metroTunnel1="clr-namespace:ShrlAlgoToolkit.RevitAddins.RvIndependent.MetroTunnel"
    xmlns:ui="https://github.com/ShrlAlgo/NeoUI"
-    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+    Title="简易盾构区间"
+    Width="500"
+    Height="280"
+    MinWidth="300"
+    d:DataContext="{d:DesignInstance Type=metroTunnel1:MetroTunnelViewModel}"
+    Icon="{DynamicResource RevitIcon}"
+    mc:Ignorable="d">
    <Window.Resources>
        <ResourceDictionary Source="pack://application:,,,/ShrlAlgoToolkit.RevitAddins;component/WPFUI.xaml" />
    </Window.Resources>
--- a/ShrlAlgoToolkit.RevitAddins/RvIndependent/NetworkCreator/NetworkCreatorView.xaml
+++ b/ShrlAlgoToolkit.RevitAddins/RvIndependent/NetworkCreator/NetworkCreatorView.xaml
@@ -1,15 +1,16 @@
 <ui:NeoWindow
-    Height="150"
-    MinHeight="110"
-    Title="物探管网"
-    Width="500"
-    mc:Ignorable="d"
    x:Class="ShrlAlgoToolkit.RevitAddins.RvIndependent.NetworkCreator.NetworkCreatorView"
    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:ui="https://github.com/ShrlAlgo/NeoUI"
-    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+    Title="物探管网"
+    Width="500"
+    Height="150"
+    MinHeight="110"
+    Icon="{DynamicResource RevitIcon}"
+    mc:Ignorable="d">
    <Window.Resources>
        <ResourceDictionary Source="pack://application:,,,/ShrlAlgoToolkit.RevitAddins;component/WPFUI.xaml" />
    </Window.Resources>
@@ -18,58 +19,58 @@
        Columns="*,Auto,Auto,Auto"
        Rows="Auto,Auto">
        <TextBox
+            x:Name="TbXlsxPath"
+            Grid.Row="0"
            Grid.Column="0"
-            Grid.Row="0"
-            IsReadOnly="True"
            ui:InputAssist.Placeholder="Excel文件"
+            IsReadOnly="True"
            TextWrapping="NoWrap"
-            ToolTip="双击选择文件"
-            x:Name="TbXlsxPath" />
+            ToolTip="双击选择文件" />
        <Button
-            Click="BtnExcelSelect_Click"
-            Content="选择文件"
-            Grid.Column="1"
+            x:Name="ExcelSelectBtn"
            Grid.Row="0"
-            x:Name="ExcelSelectBtn" />
+            Grid.Column="1"
+            Click="BtnExcelSelect_Click"
+            Content="选择文件" />
        <TextBox
+            x:Name="TbParaName"
+            Grid.Row="0"
            Grid.Column="2"
            Grid.ColumnSpan="2"
-            Grid.Row="0"
            ui:InputAssist.Placeholder="参数名"
-            TextWrapping="Wrap"
-            x:Name="TbParaName" />
+            TextWrapping="Wrap" />
        <TextBox
-            Cursor="Arrow"
-            Grid.Column="0"
+            x:Name="TbFamilyPath"
            Grid.Row="1"
+            Grid.Column="0"
+            VerticalAlignment="Center"
+            ui:InputAssist.Placeholder="族文件"
+            Cursor="Arrow"
            IsReadOnly="True"
            MouseDoubleClick="TbFamilyPath_MouseDoubleClick"
-            ui:InputAssist.Placeholder="族文件"
            TextWrapping="NoWrap"
-            ToolTip="双击选择文件"
-            VerticalAlignment="Center"
-            x:Name="TbFamilyPath" />
+            ToolTip="双击选择文件" />
        <Button
-            Content="选择族"
-            Cursor="Hand"
+            x:Name="BtnFamilyInit"
+            Grid.Row="1"
            Grid.Column="1"
-            Grid.Row="1"
-            x:Name="BtnFamilyInit" />
+            Content="选择族"
+            Cursor="Hand" />
        <ComboBox
-            DisplayMemberPath="Name"
-            Grid.Column="2"
+            x:Name="CbSheetName"
            Grid.Row="1"
+            Grid.Column="2"
+            Width="120"
+            DisplayMemberPath="Name"
            SelectedValuePath="Index"
            SelectionChanged="CBSheetName_SelectionChanged"
-            Text="表名"
-            Width="120"
-            x:Name="CbSheetName" />
+            Text="表名" />
        <Button
+            x:Name="BtnApple"
+            Grid.Row="1"
+            Grid.Column="3"
            Click="BtnApply_Click"
            Content="创建"
-            Grid.Column="3"
-            Grid.Row="1"
-            ToolTip="创建模型"
-            x:Name="BtnApple" />
+            ToolTip="创建模型" />
    </ui:Grid>
 </ui:NeoWindow>