修改命名空间

This commit is contained in:
GG Z
2026-02-21 16:31:24 +08:00
parent 97c0b18dc7
commit 2ad3d0fde0
188 changed files with 783 additions and 2710 deletions

View File

@@ -1,6 +1,6 @@
using Autodesk.Revit.Attributes;
using Nice3point.Revit.Toolkit.External;
using ShrlAlgoToolkit.RevitAddins.Assists;
using ShrlAlgoToolkit.RevitAddins.Common.Assists;
namespace ShrlAlgoToolkit.RevitAddins.RvFamily.FamilyLibrary;
@@ -9,6 +9,6 @@ public class FamilyLibraryCmd : ExternalCommand
{
public override void Execute()
{
WinDialogAssist.ShowModeless<FamilyLibraryView>(new FamilyLibraryViewModel());
Common.Assists.WinDialogAssist.ShowOrActivate<FamilyLibraryView, FamilyLibraryViewModel>();
}
}

View File

@@ -40,14 +40,10 @@
Grid.Row="0"
Margin="5"
HorizontalAlignment="Stretch"
ui:ControlAssist.Icon="{ui:Icon SymbolValue=Folder}"
Command="{Binding SelectPathCommand}"
Content="打开族目录"
FontFamily="{StaticResource BoxIcons}"
ToolTip="{Binding FamilyPath, Mode=OneWay, StringFormat=族目录:{}{0}}">
<ui:ControlAssist.Icon>
<ui:IconElement FontFamily="{StaticResource BoxIcons}" Glyph="&#xEADF;" />
</ui:ControlAssist.Icon>
</Button>
ToolTip="{Binding FamilyPath, Mode=OneWay, StringFormat=族目录:{}{0}}" />
<TreeView
x:Name="FolderTreeView"
Grid.Row="1"
@@ -193,17 +189,17 @@
</StackPanel.Style>
<Button
ui:ControlAssist.AppearanceType="Primary"
ui:ControlAssist.Icon="{ui:Icon SymbolValue=ImportContacts}"
Command="{Binding DataContext.ImportFamilyCommand, RelativeSource={RelativeSource AncestorType={x:Type Window}, Mode=FindAncestor}}"
CommandParameter="{Binding}"
Content="&#xEDB7;载入"
FontFamily="{StaticResource BoxIcons}"
Content="载入"
ToolTip="将族载入到当前项目" />
<Button
ui:ControlAssist.AppearanceType="Primary"
ui:ControlAssist.Icon="{ui:Icon SymbolValue=LocationChip}"
Command="{Binding DataContext.LocationFamilyFileCommand, RelativeSource={RelativeSource AncestorType={x:Type Window}, Mode=FindAncestor}}"
CommandParameter="{Binding}"
Content="&#xEA90;定位"
FontFamily="{StaticResource BoxIcons}"
ToolTip="在资源管理器中浏览文件" />
<!--
CommandParameter="{Binding SelectedItem, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=ListView}}"
@@ -296,7 +292,7 @@
ui:StackPanel.Fill="Auto"
Command="{Binding ImportFamilySymbolCommand}"
Content="&#xEB1F;"
FontFamily="{StaticResource BoxIcons}"
ui:ControlAssist.Icon="{ui:Icon SymbolValue=FrontLoader}"
ToolTip="载入类型" />
</ui:StackPanel>
<TextBlock

View File

@@ -7,8 +7,8 @@ using CommunityToolkit.Mvvm.ComponentModel;
using CommunityToolkit.Mvvm.Input;
using FuzzySharp;
using Nice3point.Revit.Toolkit.External.Handlers;
using ShrlAlgoToolkit.RevitAddins.Assists;
using static ShrlAlgoToolkit.Revit.Assists.RevitFileAssist;
using ShrlAlgoToolkit.RevitAddins.Common.Assists;
using static ShrlAlgoToolkit.RevitCore.Assists.RevitFileAssist;
using Settings = ShrlAlgoToolkit.RevitAddins.Properties.Settings;
namespace ShrlAlgoToolkit.RevitAddins.RvFamily.FamilyLibrary;
@@ -308,14 +308,9 @@ public partial class FamilyLibraryViewModel : ObservableObject
[RelayCommand]
private static void LocationFamilyFile(object obj)
{
//System.Windows.Controls.Button btn = obj as System.Windows.Controls.Button;
if (obj is FamilyModel familyInfo)
{
var proc = new System.Diagnostics.Process();
proc.StartInfo.FileName = "explorer";
//打开资源管理器
proc.StartInfo.Arguments = "/select," + familyInfo.Path;
proc.Start();
Common.Assists.WinDialogAssist.OpenFolderAndSelectFile(familyInfo.Path);
}
}

View File

@@ -3,7 +3,7 @@ using System.Windows.Media.Imaging;
using Autodesk.Revit.DB;
using CommunityToolkit.Mvvm.ComponentModel;
using CommunityToolkit.Mvvm.Input;
using ShrlAlgoToolkit.RevitAddins.Assists;
using ShrlAlgoToolkit.RevitAddins.Common.Assists;
namespace ShrlAlgoToolkit.RevitAddins.RvFamily.FamilyLibrary;
@@ -12,7 +12,7 @@ public partial class FamilyModel : ObservableObject
/// <summary>
/// 族库缩略图
/// </summary>
public BitmapSource ImageData => Assists.ImageAssist.LoadFileImage(Path, 128, 128);
public BitmapSource ImageData => Common.Assists.ImageAssist.LoadFileImage(Path, 128, 128);
/// <summary>
/// 最近使用面板