This commit is contained in:
ShrlAlgo
2025-08-20 12:10:35 +08:00
parent fcd306b0f7
commit 955a01f564
962 changed files with 7893 additions and 127784 deletions

View File

@@ -1,4 +1,4 @@
<ui:FluentWindowEx
<ui:NeoWindow
MinHeight="300"
SizeToContent="Height"
Title="保温层"
@@ -10,7 +10,7 @@
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:local="clr-namespace:ShrlAlgoToolkit.RevitAddins.RvMEP"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:ui="https://github.com/ShrlAlgo/WPFluent"
xmlns:ui="https://github.com/ShrlAlgo/NeoUI"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
<Window.Resources>
<ResourceDictionary Source="pack://application:,,,/ShrlAlgoToolkit.RevitAddins;component/WPFUI.xaml" />
@@ -30,7 +30,7 @@
IsEnabled="{Binding AddToPipe, Mode=TwoWay}"
Margin="5"
Spacing="5">
<ui:ComboBoxEx
<ComboBox
DisplayMemberPath="Name"
Header="管道系统类型"
ItemsSource="{Binding PipingSystemTypes}"
@@ -71,17 +71,17 @@
IsEnabled="{Binding AddToDuct, Mode=TwoWay}"
Margin="5"
Spacing="5">
<ui:ComboBoxEx
<ComboBox
DisplayMemberPath="Name"
Header="风管系统类型:"
ItemsSource="{Binding DuctSystemTypes}"
SelectedItem="{Binding SelectedDuctSystem}" />
<ui:ComboBoxEx
<ComboBox
DisplayMemberPath="Name"
Header="保温层类型:"
ItemsSource="{Binding DuctInsulationTypes}"
SelectedItem="{Binding DuctInsulationItem.DuctInsulationType}" />
<ui:TextBoxEx Header="保温层厚度:" Text="{Binding DuctInsulationItem.Thickness, UpdateSourceTrigger=PropertyChanged}" />
<TextBox Header="保温层厚度:" Text="{Binding DuctInsulationItem.Thickness, UpdateSourceTrigger=PropertyChanged}" />
</ui:StackPanel>
<StackPanel
Grid.Column="1"
@@ -105,4 +105,4 @@
HorizontalAlignment="Right" />
</StackPanel>
</Grid>
</ui:FluentWindowEx>
</ui:NeoWindow>

View File

@@ -1,4 +1,4 @@
<ui:FluentWindowEx
<ui:NeoWindow
Height="350"
MinHeight="350"
SizeToContent="Height"
@@ -12,16 +12,16 @@
xmlns:local="clr-namespace:ShrlAlgoToolkit.RevitAddins.RvMEP"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:system="clr-namespace:System;assembly=mscorlib"
xmlns:ui="https://github.com/ShrlAlgo/WPFluent"
xmlns:ui="https://github.com/ShrlAlgo/NeoUI"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
<Window.Resources>
<ResourceDictionary Source="pack://application:,,,/ShrlAlgoToolkit.RevitAddins;component/WPFUI.xaml" />
</Window.Resources>
<ui:StackPanel Margin="5" Spacing="5">
<ui:InfoBar
<!--<ui:InfoBar
IsOpen="{Binding ActiveSnackbar, Mode=OneWay}"
Message="{Binding Message}"
VerticalAlignment="Top" />
VerticalAlignment="Top" />-->
<GroupBox Header="角度" ToolTip="平行或垂直连接时生效">
<UniformGrid Columns="3">
<RadioButton Content="默认" ToolTip="根据当前位置自动连接">
@@ -106,10 +106,10 @@
ToolTip="矩形框框选" />
</UniformGrid>
</GroupBox>
<ui:Button
<Button
Command="{Binding ConnectCommand}"
Content="连接管线"
HorizontalAlignment="Stretch"
Icon="{ui:SymbolIcon Connector24}" />
ui:ButtonAssist.Icon="PlugConnect" />
</ui:StackPanel>
</ui:FluentWindowEx>
</ui:NeoWindow>

View File

@@ -39,7 +39,7 @@ public partial class AnyConnectViewModel : ObservableValidator
private double angle = 90;
[ObservableProperty]
private WPFluent.Controls.InfoBar messageQueue = new();
private NeoUI.Controls.InfoBar messageQueue = new();
[ObservableProperty]
private string message;

View File

@@ -1,4 +1,4 @@
<ui:FluentWindowEx
<ui:NeoWindow
MinHeight="180"
SizeToContent="Height"
Title="整理管线"
@@ -10,7 +10,7 @@
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:local="clr-namespace:ShrlAlgoToolkit.RevitAddins.RvMEP"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:ui="https://github.com/ShrlAlgo/WPFluent"
xmlns:ui="https://github.com/ShrlAlgo/NeoUI"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
<Window.Resources>
<ResourceDictionary Source="pack://application:,,,/ShrlAlgoToolkit.RevitAddins;component/WPFUI.xaml" />
@@ -22,9 +22,9 @@
<RadioButton Content="垂直方向" IsChecked="{Binding IsHorizon, Converter={StaticResource InvertBooleanConverter}}" />
</UniformGrid>
</GroupBox>
<ui:TextBoxEx
Prefix="间距:"
Suffix="mm"
<TextBox
ui:InputAssist.Prefix="间距:"
ui:InputAssist.Suffix="mm"
Text="{Binding Gap, UpdateSourceTrigger=PropertyChanged}" />
<UniformGrid Rows="1">
<RadioButton
@@ -41,4 +41,4 @@
Content="整理"
HorizontalAlignment="Stretch" />
</ui:StackPanel>
</ui:FluentWindowEx>
</ui:NeoWindow>

View File

@@ -1,4 +1,4 @@
<ui:FluentWindowEx
<ui:NeoWindow
Height="200"
MinWidth="220"
Title="线缆布置"
@@ -11,32 +11,32 @@
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:electricDesign="clr-namespace:ShrlAlgoToolkit.RevitAddins.RvMEP"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:ui="https://github.com/ShrlAlgo/WPFluent"
xmlns:ui="https://github.com/ShrlAlgo/NeoUI"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
<Window.Resources>
<ResourceDictionary Source="pack://application:,,,/ShrlAlgoToolkit.RevitAddins;component/WPFUI.xaml" />
</Window.Resources>
<ui:StackPanel Margin="5" Spacing="5">
<ui:ComboBoxEx
<ComboBox
ItemTemplate="{StaticResource MultiDisplayMemberPath}"
ItemsSource="{Binding Specifications}"
PlaceholderText="线缆型号"
ui:InputAssist.Placeholder="线缆型号"
SelectedItem="{Binding SelectedConduitType, UpdateSourceTrigger=PropertyChanged}">
<b:Interaction.Triggers>
<b:EventTrigger EventName="SelectionChanged">
<b:InvokeCommandAction Command="{Binding SelectionTypeCommand}" />
</b:EventTrigger>
</b:Interaction.Triggers>
</ui:ComboBoxEx>
<ui:ComboBoxEx
</ComboBox>
<ComboBox
DisplayMemberPath="Key"
ItemsSource="{Binding Sizes}"
PlaceholderText="线缆线径"
ui:InputAssist.Placeholder="线缆线径"
SelectedValue="{Binding Size, UpdateSourceTrigger=PropertyChanged}"
SelectedValuePath="Value" />
<ui:TextBox
<TextBox
InputMethod.IsInputMethodEnabled="False"
PlaceholderText="线缆数量"
ui:InputAssist.Placeholder="线缆数量"
Text="{Binding Count, UpdateSourceTrigger=PropertyChanged}" />
<Button Content="布置" HorizontalAlignment="Stretch">
<b:Interaction.Triggers>
@@ -46,4 +46,4 @@
</b:Interaction.Triggers>
</Button>
</ui:StackPanel>
</ui:FluentWindowEx>
</ui:NeoWindow>

View File

@@ -1,4 +1,4 @@
<ui:FluentWindowEx
<ui:NeoWindow
Height="450"
MinHeight="450"
Title="碰撞报告"
@@ -11,7 +11,7 @@
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:local="clr-namespace:ShrlAlgoToolkit.RevitAddins.RvMEP"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:ui="https://github.com/ShrlAlgo/WPFluent"
xmlns:ui="https://github.com/ShrlAlgo/NeoUI"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
<Window.Resources>
<ResourceDictionary>
@@ -20,7 +20,7 @@
</ResourceDictionary.MergedDictionaries>
</ResourceDictionary>
</Window.Resources>
<ui:AutoGrid
<ui:Grid
ChildMargin="5"
Columns="*"
Rows="*,Auto">
@@ -137,5 +137,5 @@
Content="刷新"
Width="75" />
</ui:StackPanel>
</ui:AutoGrid>
</ui:FluentWindowEx>
</ui:Grid>
</ui:NeoWindow>

View File

@@ -1,4 +1,4 @@
<ui:FluentWindowEx
<ui:NeoWindow
Height="450"
MinHeight="480"
MinWidth="320"
@@ -14,7 +14,7 @@
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:rvMep="clr-namespace:ShrlAlgoToolkit.RevitAddins.RvMEP"
xmlns:sys="clr-namespace:System;assembly=mscorlib"
xmlns:ui="https://github.com/ShrlAlgo/WPFluent"
xmlns:ui="https://github.com/ShrlAlgo/NeoUI"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
<b:Interaction.Triggers>
<b:EventTrigger EventName="Closing">
@@ -114,9 +114,9 @@
<RadioButton Content="右" IsChecked="{Binding AdjustDirection, ConverterParameter={x:Static rvMep:AdjustDirection.Right}, Converter={StaticResource ComparisonConverter}}" />
</UniformGrid>
</GroupBox>
<ui:TextBoxEx
Prefix="偏移量:"
Suffix="mm"
<TextBox
ui:InputAssist.Prefix="偏移量:"
ui:InputAssist.Suffix="mm"
Text="{Binding Offset, UpdateSourceTrigger=PropertyChanged}"
ui:StackPanel.Fill="Fill" />
<Button
@@ -125,4 +125,4 @@
HorizontalAlignment="Stretch"
ui:StackPanel.Fill="Fill" />
</ui:StackPanel>
</ui:FluentWindowEx>
</ui:NeoWindow>

View File

@@ -1,4 +1,4 @@
<ui:FluentWindowEx
<ui:NeoWindow
Height="800"
Title="净空检查"
Width="400"
@@ -10,7 +10,7 @@
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:local="clr-namespace:ShrlAlgoToolkit.RevitAddins.RvMEP"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:ui="https://github.com/ShrlAlgo/WPFluent"
xmlns:ui="https://github.com/ShrlAlgo/NeoUI"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
<Window.Resources>
<ResourceDictionary Source="pack://application:,,,/ShrlAlgoToolkit.RevitAddins;component/WPFUI.xaml" />
@@ -98,31 +98,31 @@
HorizontalAlignment="Right"
VerticalAlignment="Center"
Text="排除高度低的管线(mm)" />-->
<ui:TextBoxEx
<TextBox
Header="排除高度低的管线:"
HeaderPlacement="Left"
MinWidth="120"
Suffix="mm"
ui:InputAssist.Suffix="mm"
Text="1000" />
<!--<TextBlock
HorizontalAlignment="Right"
VerticalAlignment="Center"
Text="排除长度短的管线(mm)" />-->
<ui:TextBoxEx
<TextBox
Header="排除长度短的管线:"
HeaderPlacement="Left"
MinWidth="120"
Suffix="mm"
ui:InputAssist.Suffix="mm"
Text="500" />
<!--<TextBlock
HorizontalAlignment="Right"
VerticalAlignment="Center"
Text="净高要求高度(mm)" />-->
<ui:TextBoxEx
<TextBox
Header="净高要求高度:"
HeaderPlacement="Left"
MinWidth="120"
Suffix="mm"
ui:InputAssist.Suffix="mm"
Text="2600" />
<Button
Command="{Binding AnalysisHeadroomCommand}"
@@ -145,4 +145,4 @@
ToolTip="生成三维房间实体" />
</ui:StackPanel>
</Grid>
</ui:FluentWindowEx>
</ui:NeoWindow>

View File

@@ -1,4 +1,4 @@
<ui:FluentWindowEx
<ui:NeoWindow
Height="310"
MinHeight="310"
MinWidth="250"
@@ -12,7 +12,7 @@
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:local="clr-namespace:ShrlAlgoToolkit.RevitAddins.RvMEP"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:ui="https://github.com/ShrlAlgo/WPFluent"
xmlns:ui="https://github.com/ShrlAlgo/NeoUI"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
<b:Interaction.Triggers>
<b:EventTrigger EventName="Closing">
@@ -38,9 +38,9 @@
<RadioButton Content="参考" />
</UniformGrid>
</GroupBox>
<ui:TextBoxEx
Prefix="距离/间距:"
Suffix="mm"
<TextBox
ui:InputAssist.Prefix="距离/间距:"
ui:InputAssist.Suffix="mm"
Text="{Binding Distance}"
ToolTip="上下移动的距离(需要区分正负)或与参考的间距" />
<ui:StackPanel Orientation="Horizontal" Spacing="5">
@@ -56,4 +56,4 @@
ui:StackPanel.Fill="Fill" />
</ui:StackPanel>
</ui:StackPanel>
</ui:FluentWindowEx>
</ui:NeoWindow>

View File

@@ -1,4 +1,4 @@
<ui:FluentWindowEx
<ui:NeoWindow
Height="280"
MinHeight="280"
MinWidth="250"
@@ -15,7 +15,7 @@
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:md="http://materialdesigninxaml.net/winfx/xaml/themes"
xmlns:rvMep="clr-namespace:ShrlAlgoToolkit.RevitAddins.RvMEP"
xmlns:ui="https://github.com/ShrlAlgo/WPFluent"
xmlns:ui="https://github.com/ShrlAlgo/NeoUI"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
<Window.Resources>
<ResourceDictionary Source="pack://application:,,,/ShrlAlgoToolkit.RevitAddins;component/WPFUI.xaml" />
@@ -98,4 +98,4 @@
HorizontalAlignment="Stretch"
ToolTip="当选中构件时,则直接旋转,未选中时,则根据选项决定是多选还是单选" />
</ui:StackPanel>
</ui:FluentWindowEx>
</ui:NeoWindow>

View File

@@ -1,4 +1,4 @@
<ui:FluentWindowEx
<ui:NeoWindow
Height="320"
MinHeight="320"
MinWidth="300"
@@ -14,7 +14,7 @@
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:rvMep="clr-namespace:ShrlAlgoToolkit.RevitAddins.RvMEP"
xmlns:ui="https://github.com/ShrlAlgo/WPFluent"
xmlns:ui="https://github.com/ShrlAlgo/NeoUI"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
<b:Interaction.Triggers>
<!--<b:EventTrigger EventName="Deactivated">
@@ -47,44 +47,44 @@
IsChecked="{Binding IsConduit}"
x:Name="RbConduit" />
</UniformGrid>
<ui:StackPanel Spacing="5" Visibility="{Binding IsPipe, Converter={StaticResource BooleanToVisConverter}}">
<ui:ComboBoxEx
<ui:StackPanel Spacing="5" Visibility="{Binding IsPipe, Converter={x:Static ui:BooleanToVisibilityConverter.CollapsedInstance}}">
<ComboBox
ItemTemplate="{StaticResource MultiDisplayMemberPath}"
ItemsSource="{Binding PipeTypes}"
PlaceholderText="&lt;管道类型&gt;"
ui:InputAssist.Placeholder="&lt;管道类型&gt;"
SelectedItem="{Binding SelectedPipeType}" />
<ui:ComboBoxEx
<ComboBox
DisplayMemberPath="Name"
ItemsSource="{Binding PipeSystemTypes}"
PlaceholderText="&lt;系统类型&gt;"
ui:InputAssist.Placeholder="&lt;系统类型&gt;"
SelectedItem="{Binding SelectedPipeSystemType}" />
</ui:StackPanel>
<ui:StackPanel Spacing="5" Visibility="{Binding IsDuct, Converter={StaticResource BooleanToVisConverter}}">
<ui:ComboBoxEx
<ui:StackPanel Spacing="5" Visibility="{Binding IsDuct, Converter={x:Static ui:BooleanToVisibilityConverter.CollapsedInstance}}">
<ComboBox
ItemTemplate="{StaticResource MultiDisplayMemberPath}"
ItemsSource="{Binding DuctTypes}"
PlaceholderText="&lt;风管类型&gt;"
ui:InputAssist.Placeholder="&lt;风管类型&gt;"
SelectedItem="{Binding SelectedDuctType}" />
<ui:ComboBoxEx
<ComboBox
DisplayMemberPath="Name"
ItemsSource="{Binding DuctSystemTypes}"
PlaceholderText="&lt;系统类型&gt;"
ui:InputAssist.Placeholder="&lt;系统类型&gt;"
SelectedItem="{Binding SelectedDuctSystemType}" />
</ui:StackPanel>
<ui:ComboBoxEx
<ComboBox
ItemTemplate="{StaticResource MultiDisplayMemberPath}"
ItemsSource="{Binding ConduitTypes}"
PlaceholderText="&lt;线管类型&gt;"
ui:InputAssist.Placeholder="&lt;线管类型&gt;"
SelectedItem="{Binding SelectedConduitType}"
Visibility="{Binding IsConduit, Converter={StaticResource BooleanToVisConverter}}" />
<ui:ComboBoxEx
Visibility="{Binding IsConduit, Converter={x:Static ui:BooleanToVisibilityConverter.CollapsedInstance}}" />
<ComboBox
ItemTemplate="{StaticResource MultiDisplayMemberPath}"
ItemsSource="{Binding CableTrayTypes}"
PlaceholderText="&lt;桥架类型&gt;"
ui:InputAssist.Placeholder="&lt;桥架类型&gt;"
SelectedItem="{Binding SelectedCableTrayType}"
Visibility="{Binding IsCableTray, Converter={StaticResource BooleanToVisConverter}}" />
Visibility="{Binding IsCableTray, Converter={x:Static ui:BooleanToVisibilityConverter.CollapsedInstance}}" />
</ui:StackPanel>
<Button
Command="{Binding CreateMepCurveCommand}"
@@ -93,4 +93,4 @@
HorizontalAlignment="Stretch"
VerticalAlignment="Bottom" />
</ui:StackPanel>
</ui:FluentWindowEx>
</ui:NeoWindow>