From 0ba966cef28e3788901debf05b272ba71f45ea87 Mon Sep 17 00:00:00 2001 From: ShrlAlgo Date: Tue, 24 Feb 2026 11:34:18 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B8=85=E7=90=86=E5=A4=9A=E4=BD=99=E5=BC=95?= =?UTF-8?q?=E7=94=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Melskin/Utilities/RelayCommand.cs | 18 +-- Melskin/Utilities/RelayCommand{T}.cs | 22 ++-- .../ArchStru/CivilConnectionCmd.cs | 2 +- .../ArchStru/CreateOpeningsCmd.cs | 2 +- .../ArchStru/ResolveCivilConnectViewModel.cs | 2 +- .../ArchStru/SplitComsByLevelCmd.cs | 2 +- .../ArchStru/WallFinishesCmd.cs | 2 +- .../ArchStru/WallFinishesViewModel.cs | 8 +- .../Checker/ModelCheckCmd.cs | 2 +- .../Common/Assists/DWGAssist.cs | 4 - .../Common/Assists/ImageAssist.cs | 2 +- .../Common/Assists/LogAssist.cs | 16 +-- .../Common/Assists/SingletonViewAssist.cs | 4 - .../Common/Assists/TextSearchAssist.cs | 8 +- .../Common/Assists/ThumbnailOptions.cs | 6 +- .../Common/Assists/ValidatorAssist.cs | 4 - .../Common/Assists/WinDialogAssist.cs | 124 +++++------------- .../Assists/WindowsThumbnailProvider.cs | 28 ++-- .../Common/Attributes/GreaterThanAttribute.cs | 4 - .../Common/Attributes/MaximumAttribute.cs | 4 - .../Common/Attributes/MinimumAttribute.cs | 4 - .../Attributes/NotNullOrEmptyAttribute.cs | 4 - .../Attributes/UndefinedCharAttribute.cs | 4 - .../Common/Controls/ProgressManager.cs | 9 +- .../Common/Controls/ProgressReporter.cs | 11 +- .../Common/Controls/ProgressWindow.xaml.cs | 15 +-- .../Converters/BooleanToVisConverter.cs | 3 - .../Converters/ColorToBrushConverter.cs | 7 +- .../Common/Converters/ComparisonConverter.cs | 5 - .../Converters/EnumDescriptionExtension.cs | 5 - .../EnumDescriptionTypeConverter.cs | 5 - .../Converters/EnumSourceAndConverter.cs | 5 - .../Converters/InvertBooleanConverter.cs | 5 - .../InverterBooleanToVisConverter.cs | 3 - .../Common/Converters/MarkupConverters.cs | 5 - .../Common/Converters/Rv2WinColorConverter.cs | 3 - .../Converters/SearchFamilyValueConverter.cs | 7 +- .../Converters/SearchTypeValueConverter.cs | 7 +- .../Common/Converters/SearchValueConverter.cs | 5 - .../Common/Extensions/DistinctExtensions.cs | 4 +- .../Common/Extensions/ImageExtensions.cs | 2 +- .../Common/Extensions/MiniExcelExtensions.cs | 10 +- .../Deco/BricksFinishesCmd.cs | 2 +- .../Deco/FloorFinishesCmd.cs | 2 +- .../Deco/FloorFinishesViewModel.cs | 4 +- .../DrawSheet/AdaptiveMEPTagCmd.cs | 8 +- .../DrawSheet/AlignTagsCmd.cs | 5 +- .../DrawSheet/AlignTagsView.xaml.cs | 6 +- .../DrawSheet/AlignTagsViewModel.cs | 31 +++-- .../DrawSheet/ArrangeTagsCmd.cs | 34 +++-- .../DrawSheet/CivilViewFilterCmd.cs | 13 +- .../DrawSheet/DimensionBy2LineCmd.cs | 4 - .../DrawSheet/ElementControlDock.xaml.cs | 4 - .../DrawSheet/ElementsControlCmd.cs | 3 - .../DrawSheet/ExportSchedulesCmd.cs | 7 +- .../DrawSheet/PanelScheduleCmd.cs | 4 - .../DrawSheet/QuickViewSectionCmd.cs | 5 +- .../DrawSheet/QuickViewSectionView.xaml.cs | 6 +- .../DrawSheet/QuickViewSectionViewModel.cs | 4 - .../DrawSheet/SectionBoxControllerCmd.cs | 4 +- .../SectionBoxControllerView.xaml.cs | 4 - .../SectionBoxControllerViewModel.cs | 6 +- .../DrawSheet/SwitchBackgroundCmd.cs | 4 - .../DrawSheet/SystemDisplayView.xaml.cs | 6 +- .../DrawSheet/SystemDisplayViewModel.cs | 3 - .../DrawSheet/ViewManagerCmd.cs | 5 +- .../DrawSheet/ViewManagerModel.cs | 2 - .../DrawSheet/ViewManagerView.xaml.cs | 6 +- .../DrawSheet/ViewManagerViewModel.cs | 33 +++-- .../DrawSheet/VisibilityControlCmd.cs | 5 +- .../DrawSheet/VisibilityView.xaml.cs | 4 - .../DrawSheet/VisibilityViewModel.cs | 4 - .../Entry/DrawingViewApp.cs | 5 +- .../Entry/FamilyApp.cs | 3 +- .../Entry/ModifyTabApp.cs | 4 +- ShrlAlgoToolkit.RevitAddins/Entry/RvApp.cs | 10 +- .../Entry/TabManagerApp.cs | 10 +- .../FamMaster/ExplodeDwgCmd.cs | 4 - .../FamMaster/FamilyLibraryCmd.cs | 6 +- .../FamMaster/FamilyLibraryView.xaml.cs | 7 +- .../FamMaster/FamilyLibraryViewModel.cs | 5 +- .../FamMaster/FamilyModel.cs | 2 +- .../FamMaster/FamilyProcessorCmd.cs | 3 - .../FamMaster/FamilyProcessorView.xaml.cs | 6 +- .../FamMaster/FamilyProcessorViewModel.cs | 13 +- .../FamMaster/LoadedFamilyDropHandler.cs | 5 - .../FamMaster/ModelByCurveCreatorView.xaml.cs | 6 +- .../FamMaster/ModelByCurveCreatorViewModel.cs | 6 +- .../FamMaster/MoveElementByRelationshipCmd.cs | 4 - .../FamMaster/PlaceInstanceByCircleCmd.cs | 4 - .../FamMaster/ReplaceInstanceCmd.cs | 4 - .../FamMaster/SplitImportInstanceCmd.cs | 4 - .../FamMaster/UpgradeFamilyCmd.cs | 9 +- .../General/AlignModelElement.cs | 4 - .../General/AlignType.cs | 4 - .../General/AutoSaveCmd.cs | 12 +- .../General/AutoSaveView.xaml.cs | 4 - .../General/AutoSaveViewModel.cs | 10 +- .../General/DetailSelectFiltersView.xaml.cs | 4 - .../General/PureModelCmd.cs | 8 +- .../General/SeparateModelCmd.cs | 5 +- .../General/SeparateModelViewModel.cs | 4 - .../General/SeparateModelWin.xaml.cs | 4 - .../Mep/AddInsulationCmd.cs | 5 +- .../Mep/AddInsulationView.xaml.cs | 6 +- .../Mep/AddInsulationViewModel.cs | 14 +- .../Mep/AlignMEPCurvesToSlabCmd.cs | 3 - .../Mep/AnyConnectCmd.cs | 4 +- .../Mep/AnyConnectView.xaml.cs | 6 +- .../Mep/AnyConnectViewModel.cs | 4 +- .../Mep/ArrangeMEPCurveCmd.cs | 5 +- .../Mep/ArrangeMEPCurveView.xaml.cs | 6 +- .../Mep/ArrangeMEPCurveViewModel.cs | 8 +- .../Mep/AutoConnectOptionsView.xaml.cs | 6 +- .../Mep/BloomConnectorCmd.cs | 4 - .../Mep/BreakMEPCurveCmd.cs | 4 - .../Mep/CableLayoutCmd.cs | 4 - .../Mep/CableLayoutView.xaml.cs | 2 - .../Mep/ClashReportCmd.cs | 5 +- .../Mep/ClashReportView.xaml.cs | 6 +- .../Mep/ClashReportViewModel.cs | 6 +- .../Mep/ClashResolveCmd.cs | 4 +- .../Mep/ClashResolveView.xaml.cs | 6 +- .../Mep/ClashResolveViewModel.cs | 4 +- .../Mep/CorrectMEPCurveSlopeCmd.cs | 4 - .../Mep/DisconnectCmd.cs | 4 - .../Mep/FlipWorkplaneCmd.cs | 4 - .../Mep/ForceConnectCmd.cs | 4 - .../Mep/HeadroomCheckCmd.cs | 7 +- .../Mep/HeadroomCheckView.xaml.cs | 6 +- .../Mep/HeadroomCheckViewModel.cs | 2 - .../Mep/MappingSystemCmd.cs | 6 +- .../Mep/MoveConnectCmd.cs | 4 - ShrlAlgoToolkit.RevitAddins/Mep/MoveMEPCmd.cs | 4 +- .../Mep/MoveMEPCurveView.xaml.cs | 6 +- .../Mep/MoveMEPCurveViewModel.cs | 2 +- .../Mep/RotateInstanceCmd.cs | 5 +- .../Mep/RotateMEPView.xaml.cs | 6 +- .../Mep/RotateMEPViewModel.cs | 4 - .../Mep/RotationAngle.cs | 4 - .../Mep/StandMepCurveCmd.cs | 5 +- .../Mep/StandMepCurveView.xaml.cs | 6 +- .../Mep/StandMepCurveViewModel.cs | 26 ++-- .../Mep/TerminalConnectToDuctCmd.cs | 4 - .../Modeling/CADCurveToModelCurveCmd.cs | 5 +- .../Modeling/InstanceCreatorCmd.cs | 5 +- .../Modeling/InstanceCreatorView.xaml.cs | 6 +- .../Modeling/InstanceCreatorViewModel.cs | 7 +- .../Modeling/PipesCreatorCmd.cs | 5 +- .../Modeling/PipesCreatorView.xaml.cs | 6 +- .../Modeling/PipesCreatorViewModel.cs | 8 +- .../Standardizer/RenameFamilyNameCmd.cs | 8 +- .../Standardizer/RenameFamilyView.xaml.cs | 6 +- .../Standardizer/RenameFamilyViewModel.cs | 6 +- .../Standardizer/RenameTypeNameCmd.cs | 6 +- .../Standardizer/RenameTypeView.xaml.cs | 6 +- .../Standardizer/RenameTypeViewModel.cs | 4 +- .../Standardizer/TemplateManagerCmd.cs | 2 +- .../Standardizer/TemplateManagerViewModel.cs | 2 - .../Standardizer/WriteParametersCmd.cs | 4 - .../Standardizer/WriteParametersView.xaml.cs | 5 +- .../Standardizer/WriteParametersViewModel.cs | 2 - ShrlAlgoToolkit.RevitAddins/Variables.cs | 2 +- 163 files changed, 279 insertions(+), 840 deletions(-) diff --git a/Melskin/Utilities/RelayCommand.cs b/Melskin/Utilities/RelayCommand.cs index 2c94dc3..cc138ab 100644 --- a/Melskin/Utilities/RelayCommand.cs +++ b/Melskin/Utilities/RelayCommand.cs @@ -8,15 +8,11 @@ internal class RelayCommand : ICommand { private readonly Action execute; private readonly Predicate? canExecute; + /// - /// 当命令的可执行状态更改时发生的事件。 - /// 广播此事件通知UI，当命令的CanExecute方法返回值发生变化时，需要重新查询命令的状态。 + /// 当命令的可执行状态更改时发生的事件。 广播此事件通知UI，当命令的CanExecute方法返回值发生变化时，需要重新查询命令的状态。 /// - public event EventHandler? CanExecuteChanged - { - add => CommandManager.RequerySuggested += value; - remove => CommandManager.RequerySuggested -= value; - } + public event EventHandler? CanExecuteChanged; /// /// 初始化 RelayCommand 的新实例。 /// @@ -43,8 +39,12 @@ internal class RelayCommand : ICommand public void Execute(object? parameter) => execute(parameter); /// - /// 通知命令管理器重新查询此命令的 CanExecute 状态，手动更新，应对一些特殊场景，如倒计时功能结束，手动调用刷新按钮状态。 + /// 手动通知 UI 刷新此按钮的状态。 /// - public void RaiseCanExecuteChanged() => CommandManager.InvalidateRequerySuggested(); + public void RaiseCanExecuteChanged() + { + // 触发事件，通知订阅了此命令的 UI 控件 + CanExecuteChanged?.Invoke(this, EventArgs.Empty); + } } diff --git a/Melskin/Utilities/RelayCommand{T}.cs b/Melskin/Utilities/RelayCommand{T}.cs index ce2fa9a..f4a5e68 100644 --- a/Melskin/Utilities/RelayCommand{T}.cs +++ b/Melskin/Utilities/RelayCommand{T}.cs @@ -25,15 +25,10 @@ namespace Melskin.Utilities } /// - /// 当命令的可执行状态更改时触发的事件。 - /// 广播此事件允许UI元素订阅并响应命令可执行性变化，从而能够适时更新其状态（如启用或禁用按钮）。 + /// 当命令的可执行状态更改时触发的事件。 广播此事件允许UI元素订阅并响应命令可执行性变化，从而能够适时更新其状态（如启用或禁用按钮）。 /// 通过将此事件与CommandManager.RequerySuggested关联，可以确保每当应用程序中的命令状态可能改变时，UI都会自动检查命令是否仍然可执行。 /// - public event EventHandler? CanExecuteChanged - { - add => CommandManager.RequerySuggested += value; - remove => CommandManager.RequerySuggested -= value; - } + public event EventHandler? CanExecuteChanged; /// /// 判断命令是否可以执行。 @@ -45,8 +40,7 @@ namespace Melskin.Utilities if (canExecute == null) return true; // 使用安全的类型获取机制，防止 InvalidCastException - T? validParameter = GetSafeParameter(parameter); - return canExecute(validParameter); + return canExecute(GetSafeParameter(parameter)); } /// @@ -55,15 +49,17 @@ namespace Melskin.Utilities /// 传递给命令的参数。 public void Execute(object? parameter) { - T? validParameter = GetSafeParameter(parameter); - execute(validParameter); + execute(GetSafeParameter(parameter)); } /// /// 通知命令管理器重新查询此命令的CanExecute状态。 - /// 此方法用于在命令执行条件可能已更改时更新UI，手动更新，应对一些特殊场景，如倒计时功能结束，手动调用刷新按钮状态 + /// 此方法用于在命令执行条件可能已更改时更新UI /// - public void RaiseCanExecuteChanged() => CommandManager.InvalidateRequerySuggested(); + public void RaiseCanExecuteChanged() + { + CanExecuteChanged?.Invoke(this, EventArgs.Empty); + } /// /// 安全地将 object 参数转换为泛型 T。如果类型不匹配，则返回 T 的默认值。 /// diff --git a/ShrlAlgoToolkit.RevitAddins/ArchStru/CivilConnectionCmd.cs b/ShrlAlgoToolkit.RevitAddins/ArchStru/CivilConnectionCmd.cs index dc25801..50d7190 100644 --- a/ShrlAlgoToolkit.RevitAddins/ArchStru/CivilConnectionCmd.cs +++ b/ShrlAlgoToolkit.RevitAddins/ArchStru/CivilConnectionCmd.cs @@ -12,7 +12,7 @@ public class CivilConnectionCmd : ExternalCommand { try { - Common.Assists.WinDialogAssist.ShowOrActivate(UiDocument); + WinDialogAssist.ShowOrActivate(UiDocument); } catch (Exception ex) { diff --git a/ShrlAlgoToolkit.RevitAddins/ArchStru/CreateOpeningsCmd.cs b/ShrlAlgoToolkit.RevitAddins/ArchStru/CreateOpeningsCmd.cs index 8227d0b..dd28752 100644 --- a/ShrlAlgoToolkit.RevitAddins/ArchStru/CreateOpeningsCmd.cs +++ b/ShrlAlgoToolkit.RevitAddins/ArchStru/CreateOpeningsCmd.cs @@ -9,7 +9,7 @@ public class CreateOpeningsCmd : ExternalCommand { public override void Execute() { - Common.Assists.WinDialogAssist.ShowOrActivate(); + WinDialogAssist.ShowOrActivate(); } diff --git a/ShrlAlgoToolkit.RevitAddins/ArchStru/ResolveCivilConnectViewModel.cs b/ShrlAlgoToolkit.RevitAddins/ArchStru/ResolveCivilConnectViewModel.cs index e787f87..82cba1f 100644 --- a/ShrlAlgoToolkit.RevitAddins/ArchStru/ResolveCivilConnectViewModel.cs +++ b/ShrlAlgoToolkit.RevitAddins/ArchStru/ResolveCivilConnectViewModel.cs @@ -474,7 +474,7 @@ public partial class ResolveCivilConnectViewModel : ObservableObject if (elementsToSkip.Any()) { - Common.Assists.WinDialogAssist.ShowOrActivate(uidoc, elementsToSkip, "未解决构件"); + WinDialogAssist.ShowOrActivate(uidoc, elementsToSkip, "未解决构件"); } else { diff --git a/ShrlAlgoToolkit.RevitAddins/ArchStru/SplitComsByLevelCmd.cs b/ShrlAlgoToolkit.RevitAddins/ArchStru/SplitComsByLevelCmd.cs index be66590..69ae48f 100644 --- a/ShrlAlgoToolkit.RevitAddins/ArchStru/SplitComsByLevelCmd.cs +++ b/ShrlAlgoToolkit.RevitAddins/ArchStru/SplitComsByLevelCmd.cs @@ -134,7 +134,7 @@ public class SplitComsByLevelCmd : ExternalCommand if (errors.Any()) { - Common.Assists.WinDialogAssist.ShowOrActivate(UiDocument, errors, "未解决错误"); + WinDialogAssist.ShowOrActivate(UiDocument, errors, "未解决错误"); } else { diff --git a/ShrlAlgoToolkit.RevitAddins/ArchStru/WallFinishesCmd.cs b/ShrlAlgoToolkit.RevitAddins/ArchStru/WallFinishesCmd.cs index 52b88f2..f94bb67 100644 --- a/ShrlAlgoToolkit.RevitAddins/ArchStru/WallFinishesCmd.cs +++ b/ShrlAlgoToolkit.RevitAddins/ArchStru/WallFinishesCmd.cs @@ -12,7 +12,7 @@ namespace ShrlAlgoToolkit.RevitAddins.RvCivil public override void Execute() { var wallTypes = Document.OfCollector().OfClass(typeof(WallType)).Cast().ToList(); - Common.Assists.WinDialogAssist.ShowOrActivate(wallTypes); + WinDialogAssist.ShowOrActivate(wallTypes); } } } diff --git a/ShrlAlgoToolkit.RevitAddins/ArchStru/WallFinishesViewModel.cs b/ShrlAlgoToolkit.RevitAddins/ArchStru/WallFinishesViewModel.cs index a34d425..b7254ff 100644 --- a/ShrlAlgoToolkit.RevitAddins/ArchStru/WallFinishesViewModel.cs +++ b/ShrlAlgoToolkit.RevitAddins/ArchStru/WallFinishesViewModel.cs @@ -13,18 +13,18 @@ public partial class WallFinishesViewModel(List wallTypes) : Observabl private readonly ActionEventHandler wallFinishHandler = new (); [ObservableProperty] - [NotifyCanExecuteChangedFor(nameof(RevitAddins.RvCivil.WallFinishesViewModel.PlaceWallCommand))] + [NotifyCanExecuteChangedFor(nameof(PlaceWallCommand))] public partial double WallBaseOffset { get; set; } [ObservableProperty] - [NotifyCanExecuteChangedFor(nameof(RevitAddins.RvCivil.WallFinishesViewModel.PlaceWallCommand))] + [NotifyCanExecuteChangedFor(nameof(PlaceWallCommand))] private double wallHeight; [ObservableProperty] public partial List WallTypes { get; set; } = wallTypes; [ObservableProperty] - [NotifyCanExecuteChangedFor(nameof(RevitAddins.RvCivil.WallFinishesViewModel.PlaceWallCommand))] + [NotifyCanExecuteChangedFor(nameof(PlaceWallCommand))] private WallType selectedWallType; public PlacementType PlaceType { get; set; } @@ -58,7 +58,7 @@ public partial class WallFinishesViewModel(List wallTypes) : Observabl PlaceWallFinishesByFace(uiapp, SelectedWallType, wallWidth, WallHeight, WallBaseOffset); break; */ - WallFinishesViewModel.PlaceWallFinishesByFace(uidoc, SelectedWallType, wallWidth, WallHeight, WallBaseOffset); + PlaceWallFinishesByFace(uidoc, SelectedWallType, wallWidth, WallHeight, WallBaseOffset); break; case PlacementType.ByWall: PlaceWallFinishesByWall(uidoc, SelectedWallType, wallWidth, WallHeight, WallBaseOffset); diff --git a/ShrlAlgoToolkit.RevitAddins/Checker/ModelCheckCmd.cs b/ShrlAlgoToolkit.RevitAddins/Checker/ModelCheckCmd.cs index ddbcabb..3a194a1 100644 --- a/ShrlAlgoToolkit.RevitAddins/Checker/ModelCheckCmd.cs +++ b/ShrlAlgoToolkit.RevitAddins/Checker/ModelCheckCmd.cs @@ -9,5 +9,5 @@ namespace ShrlAlgoToolkit.RevitAddins.ModelManager; [UsedImplicitly] public class ModelCheckCmd : ExternalCommand { - public override void Execute() => Common.Assists.WinDialogAssist.ShowOrActivate(UiApplication);//ModelCheckView view = SingletonViewAssist.GetInstance(out var isNewCreate);//if (isNewCreate)//{// view.DataContext = new ModelCheckViewModel(uiApplication);// view.ShowAhead();//}//view.Activate(); + public override void Execute() => WinDialogAssist.ShowOrActivate(UiApplication);//ModelCheckView view = SingletonViewAssist.GetInstance(out var isNewCreate);//if (isNewCreate)//{// view.DataContext = new ModelCheckViewModel(uiApplication);// view.ShowAhead();//}//view.Activate(); } \ No newline at end of file diff --git a/ShrlAlgoToolkit.RevitAddins/Common/Assists/DWGAssist.cs b/ShrlAlgoToolkit.RevitAddins/Common/Assists/DWGAssist.cs index d8820b4..2c51cb6 100644 --- a/ShrlAlgoToolkit.RevitAddins/Common/Assists/DWGAssist.cs +++ b/ShrlAlgoToolkit.RevitAddins/Common/Assists/DWGAssist.cs @@ -3,10 +3,6 @@ using ACadSharp.Entities; using Autodesk.Revit.DB; -using ShrlAlgoToolkit.RevitAddins.Common.Assists; -using ShrlAlgoToolkit; -using ShrlAlgoToolkit.RevitAddins; - namespace ShrlAlgoToolkit.RevitAddins.Common.Assists; public static class DWGAssist diff --git a/ShrlAlgoToolkit.RevitAddins/Common/Assists/ImageAssist.cs b/ShrlAlgoToolkit.RevitAddins/Common/Assists/ImageAssist.cs index 4051ce3..2e0638a 100644 --- a/ShrlAlgoToolkit.RevitAddins/Common/Assists/ImageAssist.cs +++ b/ShrlAlgoToolkit.RevitAddins/Common/Assists/ImageAssist.cs @@ -86,7 +86,7 @@ public static class ImageAssist /// public static BitmapSource LoadFileImage(string filename, int width, int height) { - var bm = Assists.WindowsThumbnailProvider.GetThumbnail(filename, width, height, Assists.ThumbnailOptions.None); + var bm = WindowsThumbnailProvider.GetThumbnail(filename, width, height, ThumbnailOptions.None); return Imaging.CreateBitmapSourceFromHBitmap( bm.GetHbitmap(), IntPtr.Zero, diff --git a/ShrlAlgoToolkit.RevitAddins/Common/Assists/LogAssist.cs b/ShrlAlgoToolkit.RevitAddins/Common/Assists/LogAssist.cs index c84402a..e5bf8cb 100644 --- a/ShrlAlgoToolkit.RevitAddins/Common/Assists/LogAssist.cs +++ b/ShrlAlgoToolkit.RevitAddins/Common/Assists/LogAssist.cs @@ -2,10 +2,6 @@ using System.IO; using System.Text; -using ShrlAlgoToolkit.RevitAddins.Common.Assists; -using ShrlAlgoToolkit; -using ShrlAlgoToolkit.RevitAddins; - namespace ShrlAlgoToolkit.RevitAddins.Common.Assists; public static class LogAssist @@ -20,7 +16,7 @@ public static class LogAssist { if (logFolder == default) { - var assemblyPath = typeof(Assists.LogAssist).Assembly.Location; + var assemblyPath = typeof(LogAssist).Assembly.Location; var directory = Path.GetDirectoryName(assemblyPath); logFolder = Path.Combine(directory, "Logs"); } @@ -46,7 +42,7 @@ public static class LogAssist { if (logFolder == default) { - var assemblyPath = typeof(Assists.LogAssist).Assembly.Location; + var assemblyPath = typeof(LogAssist).Assembly.Location; var directory = Path.GetDirectoryName(assemblyPath); logFolder = $"{directory}\\Logs"; } @@ -81,7 +77,7 @@ public static class LogAssist { var filePath = Environment.GetFolderPath(Environment.SpecialFolder.Desktop) + $"\\{fileName}.txt"; File.WriteAllText(filePath, sb.ToString()); - System.Diagnostics.Process.Start(filePath); + Process.Start(filePath); } public static void WriteTextFile(this string lineContent, string filePath) @@ -132,10 +128,10 @@ public static class LogAssist } var t = ex.GetType(); - var currentUICulture = System.Threading.Thread.CurrentThread.CurrentUICulture; - System.Threading.Thread.CurrentThread.CurrentUICulture = new System.Globalization.CultureInfo("zh-CN"); + var currentUICulture = Thread.CurrentThread.CurrentUICulture; + Thread.CurrentThread.CurrentUICulture = new System.Globalization.CultureInfo("zh-CN"); var o = Activator.CreateInstance(t); - System.Threading.Thread.CurrentThread.CurrentUICulture = currentUICulture; + Thread.CurrentThread.CurrentUICulture = currentUICulture; return ((Exception)o).Message; } diff --git a/ShrlAlgoToolkit.RevitAddins/Common/Assists/SingletonViewAssist.cs b/ShrlAlgoToolkit.RevitAddins/Common/Assists/SingletonViewAssist.cs index 57041c1..531e57d 100644 --- a/ShrlAlgoToolkit.RevitAddins/Common/Assists/SingletonViewAssist.cs +++ b/ShrlAlgoToolkit.RevitAddins/Common/Assists/SingletonViewAssist.cs @@ -1,9 +1,5 @@ using System.Windows; -using ShrlAlgoToolkit.RevitAddins.Common.Assists; -using ShrlAlgoToolkit; -using ShrlAlgoToolkit.RevitAddins; - namespace ShrlAlgoToolkit.RevitAddins.Common.Assists; public sealed record SingletonViewAssist diff --git a/ShrlAlgoToolkit.RevitAddins/Common/Assists/TextSearchAssist.cs b/ShrlAlgoToolkit.RevitAddins/Common/Assists/TextSearchAssist.cs index ca856b4..cb4f68c 100644 --- a/ShrlAlgoToolkit.RevitAddins/Common/Assists/TextSearchAssist.cs +++ b/ShrlAlgoToolkit.RevitAddins/Common/Assists/TextSearchAssist.cs @@ -1,20 +1,16 @@ using System.Windows; -using ShrlAlgoToolkit.RevitAddins.Common.Assists; -using ShrlAlgoToolkit; -using ShrlAlgoToolkit.RevitAddins; - namespace ShrlAlgoToolkit.RevitAddins.Common.Assists { public class TextSearchAssist { // Using a DependencyProperty as the backing store for IsTextMatch. This enables animation, styling, binding, etc... public static readonly DependencyProperty IsTextMatchProperty = - DependencyProperty.RegisterAttached("IsTextMatch", typeof(bool), typeof(Assists.TextSearchAssist), new UIPropertyMetadata(false)); + DependencyProperty.RegisterAttached("IsTextMatch", typeof(bool), typeof(TextSearchAssist), new UIPropertyMetadata(false)); // Using a DependencyProperty as the backing store for SearchValue. This enables animation, styling, binding, etc... public static readonly DependencyProperty SearchValueProperty = - DependencyProperty.RegisterAttached("SearchValue", typeof(string), typeof(Assists.TextSearchAssist), + DependencyProperty.RegisterAttached("SearchValue", typeof(string), typeof(TextSearchAssist), new FrameworkPropertyMetadata(string.Empty, FrameworkPropertyMetadataOptions.Inherits)); public static bool GetIsTextMatch(DependencyObject obj) diff --git a/ShrlAlgoToolkit.RevitAddins/Common/Assists/ThumbnailOptions.cs b/ShrlAlgoToolkit.RevitAddins/Common/Assists/ThumbnailOptions.cs index 2f61da9..84abbb1 100644 --- a/ShrlAlgoToolkit.RevitAddins/Common/Assists/ThumbnailOptions.cs +++ b/ShrlAlgoToolkit.RevitAddins/Common/Assists/ThumbnailOptions.cs @@ -1,8 +1,4 @@ -using ShrlAlgoToolkit.RevitAddins.Common.Assists; -using ShrlAlgoToolkit; -using ShrlAlgoToolkit.RevitAddins; - -namespace ShrlAlgoToolkit.RevitAddins.Common.Assists; +namespace ShrlAlgoToolkit.RevitAddins.Common.Assists; public enum ThumbnailOptions { diff --git a/ShrlAlgoToolkit.RevitAddins/Common/Assists/ValidatorAssist.cs b/ShrlAlgoToolkit.RevitAddins/Common/Assists/ValidatorAssist.cs index e64c13d..91eb54e 100644 --- a/ShrlAlgoToolkit.RevitAddins/Common/Assists/ValidatorAssist.cs +++ b/ShrlAlgoToolkit.RevitAddins/Common/Assists/ValidatorAssist.cs @@ -2,10 +2,6 @@ using System.Text; using System.Text.RegularExpressions; -using ShrlAlgoToolkit.RevitAddins.Common.Assists; -using ShrlAlgoToolkit; -using ShrlAlgoToolkit.RevitAddins; - namespace ShrlAlgoToolkit.RevitAddins.Common.Assists; /// diff --git a/ShrlAlgoToolkit.RevitAddins/Common/Assists/WinDialogAssist.cs b/ShrlAlgoToolkit.RevitAddins/Common/Assists/WinDialogAssist.cs index 12aa254..f24862d 100644 --- a/ShrlAlgoToolkit.RevitAddins/Common/Assists/WinDialogAssist.cs +++ b/ShrlAlgoToolkit.RevitAddins/Common/Assists/WinDialogAssist.cs @@ -1,7 +1,6 @@ using System.Diagnostics; using System.IO; using System.Reflection; -using System.Runtime.InteropServices; using System.Windows; using System.Windows.Interop; @@ -43,32 +42,6 @@ public static class WinDialogAssist return dialog; //return $"{filterName}({str})|{str}"; } - /// - /// 释放命令行管理程序分配的ITEMIDLIST结构 - /// Frees an ITEMIDLIST structure allocated by the Shell. - /// - /// - [DllImport("shell32.dll", ExactSpelling = true)] - private static extern void ILFree(IntPtr pidlList); - /// - /// 返回与指定文件路径关联的ITEMIDLIST结构。 - /// Returns the ITEMIDLIST structure associated with a specified file path. - /// - /// - /// - [DllImport("shell32.dll", CharSet = CharSet.Unicode, ExactSpelling = true)] - private static extern IntPtr ILCreateFromPathW(string pszPath); - /// - /// 打开一个Windows资源管理器窗口，其中选择了特定文件夹中的指定项目。 - /// Opens a Windows Explorer window with specified items in a particular folder selected. - /// - /// - /// - /// - /// - /// - [DllImport("shell32.dll", ExactSpelling = true)] - private static extern int SHOpenFolderAndSelectItems(IntPtr pidlList, uint cild, IntPtr children, uint dwFlags); /// /// 打开或在现有目录并选中相应文件 @@ -82,7 +55,7 @@ public static class WinDialogAssist { throw new FileNotFoundException("指定的文件不存在", fileFullName); } - var proc = new System.Diagnostics.Process(); + var proc = new Process(); proc.StartInfo.FileName = "explorer"; //打开资源管理器 proc.StartInfo.Arguments = "/select," + fileFullName; @@ -102,7 +75,7 @@ public static class WinDialogAssist ////选中"notepad.exe"这个程序,即记事本 //proc.Start(); - System.Diagnostics.Process.Start("explorer.exe", $"/select,\"{fileOrFolderPath}\""); + Process.Start("explorer.exe", $"/select,\"{fileOrFolderPath}\""); } /// @@ -123,12 +96,12 @@ public static class WinDialogAssist dialog.SetFilter(title, extensions); return dialog.ShowDialog() == true ? dialog.FileName : null; } - public static void UpdateViewDisplay(Autodesk.Revit.UI.PreviewControl _currentPreviewControl, System.Windows.Controls.Grid PreviewContainer, Document _backgroundDoc, View view, ViewDetailLevel detailLevel, DisplayStyle displayStyle) + public static void UpdateViewDisplay(PreviewControl currentPreviewControl, System.Windows.Controls.Grid previewContainer, Document backgroundDoc, View view, ViewDetailLevel detailLevel, DisplayStyle displayStyle) { - if (_backgroundDoc == null || view == null) return; + if (backgroundDoc == null || view == null) return; - _backgroundDoc.Invoke( - ts => + backgroundDoc.Invoke( + _ => { try { @@ -142,48 +115,25 @@ public static class WinDialogAssist }); // 2. 销毁旧控件 - if (_currentPreviewControl != null) + if (currentPreviewControl != null) { - PreviewContainer.Children.Clear(); - _currentPreviewControl.Dispose(); - _currentPreviewControl = null; + previewContainer.Children.Clear(); + currentPreviewControl.Dispose(); + currentPreviewControl = null; } // 3. 创建新控件并加入 UI - _currentPreviewControl = new Autodesk.Revit.UI.PreviewControl(_backgroundDoc, view.Id); - PreviewContainer.Children.Add(_currentPreviewControl); + currentPreviewControl = new PreviewControl(backgroundDoc, view.Id); + previewContainer.Children.Add(currentPreviewControl); } - ///// - ///// 单选文件夹路径 - ///// - ///// - //public static string GetSelectedFolderPath() - //{ - // var dialog = new Ookii.Dialogs.Wpf.VistaFolderBrowserDialog { Multiselect = false }; - - // var folderPath = dialog.ShowDialog() == true ? dialog.SelectedPath : null; - - // return folderPath; - //} - - ///// - ///// 多选文件夹路径 - ///// - ///// - //public static string[] GetSelectedFolderPaths() - //{ - // var dialog = new Ookii.Dialogs.Wpf.VistaFolderBrowserDialog { Multiselect = true }; - - // return dialog.ShowDialog() == true ? dialog.SelectedPaths : null; - //} - + /// /// 打开窗口，非模态窗口置顶显示，默认非模态 /// /// private static void ShowAhead(this Window window) { - _ = new WindowInteropHelper(window) { Owner = System.Diagnostics.Process.GetCurrentProcess().MainWindowHandle }; + _ = new WindowInteropHelper(window) { Owner = Process.GetCurrentProcess().MainWindowHandle }; window.Show(); } @@ -191,7 +141,7 @@ public static class WinDialogAssist where T : Window, new() { AppDomain.CurrentDomain.AssemblyResolve += CurrentDomain_AssemblyResolve; - var view = Assists.SingletonViewAssist.GetInstance(out var isNewCreate); + var view = SingletonViewAssist.GetInstance(out var isNewCreate); if (isNewCreate) { view.DataContext = viewModel; @@ -201,36 +151,29 @@ public static class WinDialogAssist AppDomain.CurrentDomain.AssemblyResolve -= CurrentDomain_AssemblyResolve; } - private static readonly Dictionary _windows = []; + private static readonly Dictionary Windows = []; public static void ShowOrActivate(params object[] viewModelParams) where TView : Window,new() where TViewModel : class { var windowType = typeof(TView); - if (!_windows.ContainsKey(windowType) || _windows[windowType] == null) + if (!Windows.ContainsKey(windowType) || Windows[windowType] == null) { //CloseAllWindowsExcept(windowType); AppDomain.CurrentDomain.AssemblyResolve += CurrentDomain_AssemblyResolve; - _windows[windowType] = new TView(); - _windows[windowType].Closed += WindowClosed; - _windows[windowType].Closed += (_, _) => _windows[windowType] = null; - if (_windows[windowType].DataContext == null || !(_windows[windowType].DataContext is TViewModel)) + Windows[windowType] = new TView(); + Windows[windowType].Closed += WindowClosed; + Windows[windowType].Closed += (_, _) => Windows[windowType] = null; + if (Windows[windowType].DataContext == null || !(Windows[windowType].DataContext is TViewModel)) { - if (viewModelParams.Length == 0) - { - _windows[windowType].DataContext = Activator.CreateInstance(typeof(TViewModel)); - } - else - { - _windows[windowType].DataContext = Activator.CreateInstance(typeof(TViewModel), viewModelParams); - } + Windows[windowType].DataContext = viewModelParams.Length == 0 ? Activator.CreateInstance(typeof(TViewModel)) : Activator.CreateInstance(typeof(TViewModel), viewModelParams); } - _ = new WindowInteropHelper(_windows[windowType]) { Owner = Process.GetCurrentProcess().MainWindowHandle }; - _windows[windowType].Show(); + _ = new WindowInteropHelper(Windows[windowType]) { Owner = Process.GetCurrentProcess().MainWindowHandle }; + Windows[windowType].Show(); } else { - _windows[windowType].Activate(); + Windows[windowType].Activate(); } } private static void WindowClosed(object sender, EventArgs e) @@ -242,16 +185,11 @@ public static class WinDialogAssist where TWindow : Window, new() where TViewModel : class { - var window = new TWindow(); - if (viewModelParams.Length == 0) + var window = new TWindow { - window.DataContext = Activator.CreateInstance(typeof(TViewModel)); - } - else - { - window.DataContext = Activator.CreateInstance(typeof(TViewModel), viewModelParams); - } - _ = new WindowInteropHelper(window) { Owner = System.Diagnostics.Process.GetCurrentProcess().MainWindowHandle }; + DataContext = viewModelParams.Length == 0 ? Activator.CreateInstance(typeof(TViewModel)) : Activator.CreateInstance(typeof(TViewModel), viewModelParams) + }; + _ = new WindowInteropHelper(window) { Owner = Process.GetCurrentProcess().MainWindowHandle }; window.ShowDialog(); } private static Assembly CurrentDomain_AssemblyResolve(object sender, ResolveEventArgs args) @@ -264,9 +202,9 @@ public static class WinDialogAssist string name = new AssemblyName(args.Name).Name; List list = new List(); - for (int i = 0; i < frames.Length; i++) + foreach (var t in frames) { - MethodBase method = frames[i].GetMethod(); + MethodBase method = t.GetMethod(); if ((object)method.DeclaringType == null) { continue; diff --git a/ShrlAlgoToolkit.RevitAddins/Common/Assists/WindowsThumbnailProvider.cs b/ShrlAlgoToolkit.RevitAddins/Common/Assists/WindowsThumbnailProvider.cs index fbc449c..0c3d76f 100644 --- a/ShrlAlgoToolkit.RevitAddins/Common/Assists/WindowsThumbnailProvider.cs +++ b/ShrlAlgoToolkit.RevitAddins/Common/Assists/WindowsThumbnailProvider.cs @@ -3,10 +3,6 @@ using System.Drawing.Imaging; using System.IO; using System.Runtime.InteropServices; -using ShrlAlgoToolkit.RevitAddins.Common.Assists; -using ShrlAlgoToolkit; -using ShrlAlgoToolkit.RevitAddins; - namespace ShrlAlgoToolkit.RevitAddins.Common.Assists; /// @@ -20,7 +16,7 @@ public class WindowsThumbnailProvider { var result = new Bitmap(srcBitmap.Width, srcBitmap.Height, targetPixelFormat); - var bmpBounds = new System.Drawing.Rectangle(0, 0, srcBitmap.Width, srcBitmap.Height); + var bmpBounds = new Rectangle(0, 0, srcBitmap.Width, srcBitmap.Height); var srcData = srcBitmap.LockBits(bmpBounds, ImageLockMode.ReadOnly, srcBitmap.PixelFormat); @@ -32,7 +28,7 @@ public class WindowsThumbnailProvider { for (var x = 0; x <= srcData.Width - 1; x++) { - var pixelColor = System.Drawing.Color.FromArgb(Marshal.ReadInt32(srcData.Scan0, (srcData.Stride * y) + (4 * x))); + var pixelColor = Color.FromArgb(Marshal.ReadInt32(srcData.Scan0, (srcData.Stride * y) + (4 * x))); if ((pixelColor.A > 0) & (pixelColor.A < 255)) { @@ -58,7 +54,7 @@ public class WindowsThumbnailProvider return Image.GetPixelFormatSize(bmp.PixelFormat) < 32 ? bmp : CreateAlphaBitmap(bmp, PixelFormat.Format32bppArgb); } - public static Bitmap GetThumbnail(string fileName, int width, int height, Assists.ThumbnailOptions options) + public static Bitmap GetThumbnail(string fileName, int width, int height, ThumbnailOptions options) { var hBitmap = GetHBitmap(Path.GetFullPath(fileName), width, height, options); @@ -84,10 +80,10 @@ public class WindowsThumbnailProvider // The following parameter is not used - binding context. IntPtr pbc, ref Guid riid, - [MarshalAs(UnmanagedType.Interface)] out Assists.WindowsThumbnailProvider.IShellItem shellItem + [MarshalAs(UnmanagedType.Interface)] out IShellItem shellItem ); - private static IntPtr GetHBitmap(string fileName, int width, int height, Assists.ThumbnailOptions options) + private static IntPtr GetHBitmap(string fileName, int width, int height, ThumbnailOptions options) { var shellItem2Guid = new Guid(ShellItem2Guid); var retCode = SHCreateItemFromParsingName(fileName, IntPtr.Zero, ref shellItem2Guid, out var nativeShellItem); @@ -97,13 +93,13 @@ public class WindowsThumbnailProvider throw Marshal.GetExceptionForHR(retCode); } - var nativeSize = new Assists.WindowsThumbnailProvider.NativeSize { Width = width, Height = height }; + var nativeSize = new NativeSize { Width = width, Height = height }; - var hr = ((Assists.WindowsThumbnailProvider.IShellItemImageFactory)nativeShellItem).GetImage(nativeSize, options, out var hBitmap); + var hr = ((IShellItemImageFactory)nativeShellItem).GetImage(nativeSize, options, out var hBitmap); Marshal.ReleaseComObject(nativeShellItem); - return hr == Assists.WindowsThumbnailProvider.HResult.Ok ? hBitmap : throw Marshal.GetExceptionForHR((int)hr); + return hr == HResult.Ok ? hBitmap : throw Marshal.GetExceptionForHR((int)hr); } internal enum HResult @@ -130,13 +126,13 @@ public class WindowsThumbnailProvider { void BindToHandler(IntPtr pbc, [MarshalAs(UnmanagedType.LPStruct)] Guid bhid, [MarshalAs(UnmanagedType.LPStruct)] Guid riid, out IntPtr ppv); - void Compare(Assists.WindowsThumbnailProvider.IShellItem psi, uint hint, out int piOrder); + void Compare(IShellItem psi, uint hint, out int piOrder); void GetAttributes(uint sfgaoMask, out uint psfgaoAttribs); - void GetDisplayName(Assists.WindowsThumbnailProvider.SIGDN sigdnName, out IntPtr ppszName); + void GetDisplayName(SIGDN sigdnName, out IntPtr ppszName); - void GetParent(out Assists.WindowsThumbnailProvider.IShellItem ppsi); + void GetParent(out IShellItem ppsi); } [ComImport] @@ -145,7 +141,7 @@ public class WindowsThumbnailProvider internal interface IShellItemImageFactory { [PreserveSig] - Assists.WindowsThumbnailProvider.HResult GetImage([In] [MarshalAs(UnmanagedType.Struct)] Assists.WindowsThumbnailProvider.NativeSize size, [In] Assists.ThumbnailOptions flags, [Out] out IntPtr phbm); + HResult GetImage([In] [MarshalAs(UnmanagedType.Struct)] NativeSize size, [In] ThumbnailOptions flags, [Out] out IntPtr phbm); } [StructLayout(LayoutKind.Sequential)] diff --git a/ShrlAlgoToolkit.RevitAddins/Common/Attributes/GreaterThanAttribute.cs b/ShrlAlgoToolkit.RevitAddins/Common/Attributes/GreaterThanAttribute.cs index d06c588..4db9a91 100644 --- a/ShrlAlgoToolkit.RevitAddins/Common/Attributes/GreaterThanAttribute.cs +++ b/ShrlAlgoToolkit.RevitAddins/Common/Attributes/GreaterThanAttribute.cs @@ -1,9 +1,5 @@ using System.ComponentModel.DataAnnotations; -using ShrlAlgoToolkit.RevitAddins.Common.Attributes; -using ShrlAlgoToolkit; -using ShrlAlgoToolkit.RevitAddins; - namespace ShrlAlgoToolkit.RevitAddins.Common.Attributes; [AttributeUsage(AttributeTargets.Property | AttributeTargets.Field | AttributeTargets.Parameter)] diff --git a/ShrlAlgoToolkit.RevitAddins/Common/Attributes/MaximumAttribute.cs b/ShrlAlgoToolkit.RevitAddins/Common/Attributes/MaximumAttribute.cs index b8d1d16..0f21d62 100644 --- a/ShrlAlgoToolkit.RevitAddins/Common/Attributes/MaximumAttribute.cs +++ b/ShrlAlgoToolkit.RevitAddins/Common/Attributes/MaximumAttribute.cs @@ -1,9 +1,5 @@ using System.ComponentModel.DataAnnotations; -using ShrlAlgoToolkit.RevitAddins.Common.Attributes; -using ShrlAlgoToolkit; -using ShrlAlgoToolkit.RevitAddins; - namespace ShrlAlgoToolkit.RevitAddins.Common.Attributes; [AttributeUsage(AttributeTargets.Property | AttributeTargets.Field | AttributeTargets.Parameter)] diff --git a/ShrlAlgoToolkit.RevitAddins/Common/Attributes/MinimumAttribute.cs b/ShrlAlgoToolkit.RevitAddins/Common/Attributes/MinimumAttribute.cs index 1a2cbe1..16a6dc6 100644 --- a/ShrlAlgoToolkit.RevitAddins/Common/Attributes/MinimumAttribute.cs +++ b/ShrlAlgoToolkit.RevitAddins/Common/Attributes/MinimumAttribute.cs @@ -1,9 +1,5 @@ using System.ComponentModel.DataAnnotations; -using ShrlAlgoToolkit.RevitAddins.Common.Attributes; -using ShrlAlgoToolkit; -using ShrlAlgoToolkit.RevitAddins; - namespace ShrlAlgoToolkit.RevitAddins.Common.Attributes; [AttributeUsage(AttributeTargets.Property | AttributeTargets.Field | AttributeTargets.Parameter)] diff --git a/ShrlAlgoToolkit.RevitAddins/Common/Attributes/NotNullOrEmptyAttribute.cs b/ShrlAlgoToolkit.RevitAddins/Common/Attributes/NotNullOrEmptyAttribute.cs index dbb1ed7..6fa7941 100644 --- a/ShrlAlgoToolkit.RevitAddins/Common/Attributes/NotNullOrEmptyAttribute.cs +++ b/ShrlAlgoToolkit.RevitAddins/Common/Attributes/NotNullOrEmptyAttribute.cs @@ -1,9 +1,5 @@ using System.ComponentModel.DataAnnotations; -using ShrlAlgoToolkit.RevitAddins.Common.Attributes; -using ShrlAlgoToolkit; -using ShrlAlgoToolkit.RevitAddins; - namespace ShrlAlgoToolkit.RevitAddins.Common.Attributes; [AttributeUsage(AttributeTargets.Property | AttributeTargets.Field | AttributeTargets.Parameter)] diff --git a/ShrlAlgoToolkit.RevitAddins/Common/Attributes/UndefinedCharAttribute.cs b/ShrlAlgoToolkit.RevitAddins/Common/Attributes/UndefinedCharAttribute.cs index 9058568..a9a4b28 100644 --- a/ShrlAlgoToolkit.RevitAddins/Common/Attributes/UndefinedCharAttribute.cs +++ b/ShrlAlgoToolkit.RevitAddins/Common/Attributes/UndefinedCharAttribute.cs @@ -1,9 +1,5 @@ using System.ComponentModel.DataAnnotations; -using ShrlAlgoToolkit.RevitAddins.Common.Attributes; -using ShrlAlgoToolkit; -using ShrlAlgoToolkit.RevitAddins; - namespace ShrlAlgoToolkit.RevitAddins.Common.Attributes { [AttributeUsage(AttributeTargets.Property | AttributeTargets.Field | AttributeTargets.Parameter)] diff --git a/ShrlAlgoToolkit.RevitAddins/Common/Controls/ProgressManager.cs b/ShrlAlgoToolkit.RevitAddins/Common/Controls/ProgressManager.cs index 8541d85..3370ffa 100644 --- a/ShrlAlgoToolkit.RevitAddins/Common/Controls/ProgressManager.cs +++ b/ShrlAlgoToolkit.RevitAddins/Common/Controls/ProgressManager.cs @@ -1,9 +1,4 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; -using System.Windows.Threading; +using System.Windows.Threading; namespace ShrlAlgoToolkit.RevitAddins.Common.Controls @@ -53,7 +48,7 @@ namespace ShrlAlgoToolkit.RevitAddins.Common.Controls } catch (Exception ex) { - Autodesk.Revit.UI.TaskDialog.Show("Task Error", ex.Message); + TaskDialog.Show("Task Error", ex.Message); } finally { diff --git a/ShrlAlgoToolkit.RevitAddins/Common/Controls/ProgressReporter.cs b/ShrlAlgoToolkit.RevitAddins/Common/Controls/ProgressReporter.cs index e991865..6a16d11 100644 --- a/ShrlAlgoToolkit.RevitAddins/Common/Controls/ProgressReporter.cs +++ b/ShrlAlgoToolkit.RevitAddins/Common/Controls/ProgressReporter.cs @@ -1,13 +1,4 @@ -using System; -using System.Collections.Generic; -using System.ComponentModel; -using System.Linq; -using System.Runtime.CompilerServices; -using System.Text; -using System.Threading.Tasks; -using System.Windows.Threading; - -namespace ShrlAlgoToolkit.RevitAddins.Common.Controls +namespace ShrlAlgoToolkit.RevitAddins.Common.Controls { // 用于给外界调用的报告器 public class ProgressReporter diff --git a/ShrlAlgoToolkit.RevitAddins/Common/Controls/ProgressWindow.xaml.cs b/ShrlAlgoToolkit.RevitAddins/Common/Controls/ProgressWindow.xaml.cs index b18aa63..950dc1c 100644 --- a/ShrlAlgoToolkit.RevitAddins/Common/Controls/ProgressWindow.xaml.cs +++ b/ShrlAlgoToolkit.RevitAddins/Common/Controls/ProgressWindow.xaml.cs @@ -1,17 +1,6 @@ -using System; -using System.Collections.Generic; -using System.ComponentModel; -using System.Linq; -using System.Text; -using System.Threading.Tasks; +using System.ComponentModel; using System.Windows; using System.Windows.Controls; -using System.Windows.Data; -using System.Windows.Documents; -using System.Windows.Input; -using System.Windows.Media; -using System.Windows.Media.Imaging; -using System.Windows.Shapes; namespace ShrlAlgoToolkit.RevitAddins.Common.Controls @@ -36,7 +25,7 @@ namespace ShrlAlgoToolkit.RevitAddins.Common.Controls private void BtnCancel_Click(object sender, RoutedEventArgs e) { _viewModel.Cancel(); - (sender as System.Windows.Controls.Button).IsEnabled = false; + (sender as Button).IsEnabled = false; } // 屏蔽系统的 Alt+F4 关闭，强制必须等主线程任务结束 diff --git a/ShrlAlgoToolkit.RevitAddins/Common/Converters/BooleanToVisConverter.cs b/ShrlAlgoToolkit.RevitAddins/Common/Converters/BooleanToVisConverter.cs index 58c7fb2..0a34fa5 100644 --- a/ShrlAlgoToolkit.RevitAddins/Common/Converters/BooleanToVisConverter.cs +++ b/ShrlAlgoToolkit.RevitAddins/Common/Converters/BooleanToVisConverter.cs @@ -1,9 +1,6 @@ using System.Windows; using ShrlAlgoToolkit.RevitAddins.UI.Converters; -using ShrlAlgoToolkit; -using ShrlAlgoToolkit.RevitAddins; -using ShrlAlgoToolkit.RevitAddins.UI; namespace ShrlAlgoToolkit.RevitAddins.Common.Converters; diff --git a/ShrlAlgoToolkit.RevitAddins/Common/Converters/ColorToBrushConverter.cs b/ShrlAlgoToolkit.RevitAddins/Common/Converters/ColorToBrushConverter.cs index 908aa22..f022d63 100644 --- a/ShrlAlgoToolkit.RevitAddins/Common/Converters/ColorToBrushConverter.cs +++ b/ShrlAlgoToolkit.RevitAddins/Common/Converters/ColorToBrushConverter.cs @@ -2,11 +2,6 @@ using System.Windows.Data; using System.Windows.Media; -using ShrlAlgoToolkit.RevitAddins.UI.Converters; -using ShrlAlgoToolkit; -using ShrlAlgoToolkit.RevitAddins; -using ShrlAlgoToolkit.RevitAddins.UI; - namespace ShrlAlgoToolkit.RevitAddins.Common.Converters; public class ColorToBrushConverter : IValueConverter @@ -14,7 +9,7 @@ public class ColorToBrushConverter : IValueConverter public object Convert(object value, Type targetType, object parameter, CultureInfo culture) { //var color = (SelectedColor)value; - if (value is System.Windows.Media.Color color) + if (value is Color color) { return new SolidColorBrush(color); } diff --git a/ShrlAlgoToolkit.RevitAddins/Common/Converters/ComparisonConverter.cs b/ShrlAlgoToolkit.RevitAddins/Common/Converters/ComparisonConverter.cs index 527193a..637c859 100644 --- a/ShrlAlgoToolkit.RevitAddins/Common/Converters/ComparisonConverter.cs +++ b/ShrlAlgoToolkit.RevitAddins/Common/Converters/ComparisonConverter.cs @@ -1,11 +1,6 @@ using System.Globalization; using System.Windows.Data; -using ShrlAlgoToolkit.RevitAddins.UI.Converters; -using ShrlAlgoToolkit; -using ShrlAlgoToolkit.RevitAddins; -using ShrlAlgoToolkit.RevitAddins.UI; - namespace ShrlAlgoToolkit.RevitAddins.Common.Converters; public class ComparisonConverter : IValueConverter diff --git a/ShrlAlgoToolkit.RevitAddins/Common/Converters/EnumDescriptionExtension.cs b/ShrlAlgoToolkit.RevitAddins/Common/Converters/EnumDescriptionExtension.cs index 1a48a79..f68e473 100644 --- a/ShrlAlgoToolkit.RevitAddins/Common/Converters/EnumDescriptionExtension.cs +++ b/ShrlAlgoToolkit.RevitAddins/Common/Converters/EnumDescriptionExtension.cs @@ -1,11 +1,6 @@ using System.ComponentModel; using System.Windows.Markup; -using ShrlAlgoToolkit.RevitAddins.UI.Converters; -using ShrlAlgoToolkit; -using ShrlAlgoToolkit.RevitAddins; -using ShrlAlgoToolkit.RevitAddins.UI; - namespace ShrlAlgoToolkit.RevitAddins.Common.Converters { public class EnumDescriptionExtension : MarkupExtension diff --git a/ShrlAlgoToolkit.RevitAddins/Common/Converters/EnumDescriptionTypeConverter.cs b/ShrlAlgoToolkit.RevitAddins/Common/Converters/EnumDescriptionTypeConverter.cs index e17cf1c..fcd7eee 100644 --- a/ShrlAlgoToolkit.RevitAddins/Common/Converters/EnumDescriptionTypeConverter.cs +++ b/ShrlAlgoToolkit.RevitAddins/Common/Converters/EnumDescriptionTypeConverter.cs @@ -2,11 +2,6 @@ using System.Globalization; using System.Reflection; -using ShrlAlgoToolkit.RevitAddins.UI.Converters; -using ShrlAlgoToolkit; -using ShrlAlgoToolkit.RevitAddins; -using ShrlAlgoToolkit.RevitAddins.UI; - namespace ShrlAlgoToolkit.RevitAddins.Common.Converters; /// diff --git a/ShrlAlgoToolkit.RevitAddins/Common/Converters/EnumSourceAndConverter.cs b/ShrlAlgoToolkit.RevitAddins/Common/Converters/EnumSourceAndConverter.cs index c8fb259..2b760e7 100644 --- a/ShrlAlgoToolkit.RevitAddins/Common/Converters/EnumSourceAndConverter.cs +++ b/ShrlAlgoToolkit.RevitAddins/Common/Converters/EnumSourceAndConverter.cs @@ -4,11 +4,6 @@ using System.Globalization; using System.Reflection; using System.Windows.Data; -using ShrlAlgoToolkit.RevitAddins.UI.Converters; -using ShrlAlgoToolkit; -using ShrlAlgoToolkit.RevitAddins; -using ShrlAlgoToolkit.RevitAddins.UI; - namespace ShrlAlgoToolkit.RevitAddins.Common.Converters; /// diff --git a/ShrlAlgoToolkit.RevitAddins/Common/Converters/InvertBooleanConverter.cs b/ShrlAlgoToolkit.RevitAddins/Common/Converters/InvertBooleanConverter.cs index 32dec75..64cfe88 100644 --- a/ShrlAlgoToolkit.RevitAddins/Common/Converters/InvertBooleanConverter.cs +++ b/ShrlAlgoToolkit.RevitAddins/Common/Converters/InvertBooleanConverter.cs @@ -1,11 +1,6 @@ using System.Globalization; using System.Windows.Data; -using ShrlAlgoToolkit.RevitAddins.UI.Converters; -using ShrlAlgoToolkit; -using ShrlAlgoToolkit.RevitAddins; -using ShrlAlgoToolkit.RevitAddins.UI; - namespace ShrlAlgoToolkit.RevitAddins.Common.Converters; public class InvertBooleanConverter : IValueConverter diff --git a/ShrlAlgoToolkit.RevitAddins/Common/Converters/InverterBooleanToVisConverter.cs b/ShrlAlgoToolkit.RevitAddins/Common/Converters/InverterBooleanToVisConverter.cs index 1ce08fe..bc99e7f 100644 --- a/ShrlAlgoToolkit.RevitAddins/Common/Converters/InverterBooleanToVisConverter.cs +++ b/ShrlAlgoToolkit.RevitAddins/Common/Converters/InverterBooleanToVisConverter.cs @@ -1,9 +1,6 @@ using System.Windows; using ShrlAlgoToolkit.RevitAddins.UI.Converters; -using ShrlAlgoToolkit; -using ShrlAlgoToolkit.RevitAddins; -using ShrlAlgoToolkit.RevitAddins.UI; namespace ShrlAlgoToolkit.RevitAddins.Common.Converters; diff --git a/ShrlAlgoToolkit.RevitAddins/Common/Converters/MarkupConverters.cs b/ShrlAlgoToolkit.RevitAddins/Common/Converters/MarkupConverters.cs index 107905a..16d3832 100644 --- a/ShrlAlgoToolkit.RevitAddins/Common/Converters/MarkupConverters.cs +++ b/ShrlAlgoToolkit.RevitAddins/Common/Converters/MarkupConverters.cs @@ -3,11 +3,6 @@ using System.Windows; using System.Windows.Data; using System.Windows.Markup; -using ShrlAlgoToolkit.RevitAddins.UI.Converters; -using ShrlAlgoToolkit; -using ShrlAlgoToolkit.RevitAddins; -using ShrlAlgoToolkit.RevitAddins.UI; - namespace ShrlAlgoToolkit.RevitAddins.Common.Converters { [ValueConversion(typeof(bool), typeof(Visibility))] diff --git a/ShrlAlgoToolkit.RevitAddins/Common/Converters/Rv2WinColorConverter.cs b/ShrlAlgoToolkit.RevitAddins/Common/Converters/Rv2WinColorConverter.cs index 2163a62..f5c060f 100644 --- a/ShrlAlgoToolkit.RevitAddins/Common/Converters/Rv2WinColorConverter.cs +++ b/ShrlAlgoToolkit.RevitAddins/Common/Converters/Rv2WinColorConverter.cs @@ -1,8 +1,5 @@ using System.Globalization; using System.Windows.Data; - -using ShrlAlgoToolkit.RevitAddins.Common.Converters; - using Color = System.Windows.Media.Color; namespace ShrlAlgoToolkit.RevitAddins.Common.Converters; diff --git a/ShrlAlgoToolkit.RevitAddins/Common/Converters/SearchFamilyValueConverter.cs b/ShrlAlgoToolkit.RevitAddins/Common/Converters/SearchFamilyValueConverter.cs index 012034a..8a99f48 100644 --- a/ShrlAlgoToolkit.RevitAddins/Common/Converters/SearchFamilyValueConverter.cs +++ b/ShrlAlgoToolkit.RevitAddins/Common/Converters/SearchFamilyValueConverter.cs @@ -1,16 +1,11 @@ using System.Windows.Controls; using System.Windows.Data; -using ShrlAlgoToolkit.RevitAddins.UI.Converters; -using ShrlAlgoToolkit; -using ShrlAlgoToolkit.RevitAddins; -using ShrlAlgoToolkit.RevitAddins.UI; - namespace ShrlAlgoToolkit.RevitAddins.Common.Converters { public class SearchFamilyValueConverter : IMultiValueConverter { - public static Converters.SearchFamilyValueConverter Instance { get; } = new Converters.SearchFamilyValueConverter(); + public static SearchFamilyValueConverter Instance { get; } = new SearchFamilyValueConverter(); public object Convert(object[] values, Type targetType, object parameter, System.Globalization.CultureInfo culture) { var cellText = values[0] == null ? string.Empty : values[0].ToString(); diff --git a/ShrlAlgoToolkit.RevitAddins/Common/Converters/SearchTypeValueConverter.cs b/ShrlAlgoToolkit.RevitAddins/Common/Converters/SearchTypeValueConverter.cs index 231c2b7..499adb1 100644 --- a/ShrlAlgoToolkit.RevitAddins/Common/Converters/SearchTypeValueConverter.cs +++ b/ShrlAlgoToolkit.RevitAddins/Common/Converters/SearchTypeValueConverter.cs @@ -1,16 +1,11 @@ using System.Windows.Controls; using System.Windows.Data; -using ShrlAlgoToolkit.RevitAddins.UI.Converters; -using ShrlAlgoToolkit; -using ShrlAlgoToolkit.RevitAddins; -using ShrlAlgoToolkit.RevitAddins.UI; - namespace ShrlAlgoToolkit.RevitAddins.Common.Converters { public class SearchTypeValueConverter : IMultiValueConverter { - public static Converters.SearchTypeValueConverter Instance { get; } = new Converters.SearchTypeValueConverter(); + public static SearchTypeValueConverter Instance { get; } = new SearchTypeValueConverter(); public object Convert(object[] values, Type targetType, object parameter, System.Globalization.CultureInfo culture) { var cellText = values[0] == null ? string.Empty : values[0].ToString(); diff --git a/ShrlAlgoToolkit.RevitAddins/Common/Converters/SearchValueConverter.cs b/ShrlAlgoToolkit.RevitAddins/Common/Converters/SearchValueConverter.cs index 90e43cf..b9f0d68 100644 --- a/ShrlAlgoToolkit.RevitAddins/Common/Converters/SearchValueConverter.cs +++ b/ShrlAlgoToolkit.RevitAddins/Common/Converters/SearchValueConverter.cs @@ -1,10 +1,5 @@ using System.Windows.Data; -using ShrlAlgoToolkit.RevitAddins.UI.Converters; -using ShrlAlgoToolkit; -using ShrlAlgoToolkit.RevitAddins; -using ShrlAlgoToolkit.RevitAddins.UI; - namespace ShrlAlgoToolkit.RevitAddins.Common.Converters; public class SearchValueConverter : IMultiValueConverter diff --git a/ShrlAlgoToolkit.RevitAddins/Common/Extensions/DistinctExtensions.cs b/ShrlAlgoToolkit.RevitAddins/Common/Extensions/DistinctExtensions.cs index 6e2f508..61375a6 100644 --- a/ShrlAlgoToolkit.RevitAddins/Common/Extensions/DistinctExtensions.cs +++ b/ShrlAlgoToolkit.RevitAddins/Common/Extensions/DistinctExtensions.cs @@ -8,9 +8,9 @@ public static class DistinctExtensions public static IEnumerable Distinct( this IEnumerable source, Func comparer) where T : class - => source.Distinct(new Extensions.DistinctExtensions.DynamicEqualityComparer(comparer)); + => source.Distinct(new DynamicEqualityComparer(comparer)); public static IEnumerable Distinct(this IEnumerable source, Func keySelector) - => source.Distinct(new Extensions.DistinctExtensions.CommonEqualityComparer(keySelector)); + => source.Distinct(new CommonEqualityComparer(keySelector)); private sealed class DynamicEqualityComparer : IEqualityComparer where T : class { diff --git a/ShrlAlgoToolkit.RevitAddins/Common/Extensions/ImageExtensions.cs b/ShrlAlgoToolkit.RevitAddins/Common/Extensions/ImageExtensions.cs index d83f9cb..e32e67d 100644 --- a/ShrlAlgoToolkit.RevitAddins/Common/Extensions/ImageExtensions.cs +++ b/ShrlAlgoToolkit.RevitAddins/Common/Extensions/ImageExtensions.cs @@ -69,7 +69,7 @@ public static class ImageExtensions { using (MemoryStream memory = new MemoryStream()) { - bitmap.Save(memory, System.Drawing.Imaging.ImageFormat.Png); + bitmap.Save(memory, ImageFormat.Png); memory.Position = 0; BitmapImage bitmapImage = new BitmapImage(); bitmapImage.BeginInit(); diff --git a/ShrlAlgoToolkit.RevitAddins/Common/Extensions/MiniExcelExtensions.cs b/ShrlAlgoToolkit.RevitAddins/Common/Extensions/MiniExcelExtensions.cs index b2202e1..e8c3c30 100644 --- a/ShrlAlgoToolkit.RevitAddins/Common/Extensions/MiniExcelExtensions.cs +++ b/ShrlAlgoToolkit.RevitAddins/Common/Extensions/MiniExcelExtensions.cs @@ -12,9 +12,9 @@ namespace ShrlAlgoToolkit.RevitAddins.Common.Extensions /// /// 开始流式配置 Excel 写入 /// - public static Extensions.ExcelWriter AsExcel(this IEnumerable data) + public static ExcelWriter AsExcel(this IEnumerable data) { - return new Extensions.ExcelWriter(data); + return new ExcelWriter(data); } /// @@ -76,16 +76,16 @@ namespace ShrlAlgoToolkit.RevitAddins.Common.Extensions /// /// 设置 Sheet 名称 /// - public Extensions.ExcelWriter WithSheetName(string name) + public ExcelWriter WithSheetName(string name) { - sheetName = Extensions.MiniExcelExtensions.SanitizeSheetName(name); + sheetName = MiniExcelExtensions.SanitizeSheetName(name); return this; } /// /// 设置是否覆盖 /// - public Extensions.ExcelWriter Overwrite(bool canOverwrite = true) + public ExcelWriter Overwrite(bool canOverwrite = true) { overwrite = canOverwrite; return this; diff --git a/ShrlAlgoToolkit.RevitAddins/Deco/BricksFinishesCmd.cs b/ShrlAlgoToolkit.RevitAddins/Deco/BricksFinishesCmd.cs index 52d1d90..429d84e 100644 --- a/ShrlAlgoToolkit.RevitAddins/Deco/BricksFinishesCmd.cs +++ b/ShrlAlgoToolkit.RevitAddins/Deco/BricksFinishesCmd.cs @@ -9,6 +9,6 @@ public class BricksFinishesCmd : ExternalCommand { public override void Execute() { - Common.Assists.WinDialogAssist.ShowOrActivate(); + WinDialogAssist.ShowOrActivate(); } } diff --git a/ShrlAlgoToolkit.RevitAddins/Deco/FloorFinishesCmd.cs b/ShrlAlgoToolkit.RevitAddins/Deco/FloorFinishesCmd.cs index 385ff92..79a856e 100644 --- a/ShrlAlgoToolkit.RevitAddins/Deco/FloorFinishesCmd.cs +++ b/ShrlAlgoToolkit.RevitAddins/Deco/FloorFinishesCmd.cs @@ -12,6 +12,6 @@ public class FloorFinishesCmd : ExternalCommand public override void Execute() { var floorTypes = Document.OfClass().Cast().ToList(); - Common.Assists.WinDialogAssist.ShowOrActivate(floorTypes); + WinDialogAssist.ShowOrActivate(floorTypes); } } diff --git a/ShrlAlgoToolkit.RevitAddins/Deco/FloorFinishesViewModel.cs b/ShrlAlgoToolkit.RevitAddins/Deco/FloorFinishesViewModel.cs index 528ca7f..27d7daa 100644 --- a/ShrlAlgoToolkit.RevitAddins/Deco/FloorFinishesViewModel.cs +++ b/ShrlAlgoToolkit.RevitAddins/Deco/FloorFinishesViewModel.cs @@ -24,7 +24,7 @@ public partial class FloorFinishesViewModel : ObservableValidator [Required] [Range(-6000, 6000, ErrorMessage = "输入偏移量值范围有误")] - [NotifyCanExecuteChangedFor(nameof(RevitAddins.RvCivil.FloorFinishesViewModel.PlaceFloorCommand))] + [NotifyCanExecuteChangedFor(nameof(PlaceFloorCommand))] [NotifyDataErrorInfo] [ObservableProperty] public partial double FloorOffset { get; set; } @@ -56,7 +56,7 @@ public partial class FloorFinishesViewModel : ObservableValidator public partial bool RbAllRooms { get; set; } [ObservableProperty] - [NotifyCanExecuteChangedFor(nameof(RevitAddins.RvCivil.FloorFinishesViewModel.PlaceFloorCommand))] + [NotifyCanExecuteChangedFor(nameof(PlaceFloorCommand))] public partial FloorType SelectedFloorType { get; set; } private bool CanPlace => SelectedFloorType != null && !HasErrors; diff --git a/ShrlAlgoToolkit.RevitAddins/DrawSheet/AdaptiveMEPTagCmd.cs b/ShrlAlgoToolkit.RevitAddins/DrawSheet/AdaptiveMEPTagCmd.cs index 8423fbb..3db3d52 100644 --- a/ShrlAlgoToolkit.RevitAddins/DrawSheet/AdaptiveMEPTagCmd.cs +++ b/ShrlAlgoToolkit.RevitAddins/DrawSheet/AdaptiveMEPTagCmd.cs @@ -2,10 +2,6 @@ using Autodesk.Revit.DB; using Nice3point.Revit.Toolkit.External; -using ShrlAlgoToolkit.RevitAddins.RvView; -using ShrlAlgoToolkit; -using ShrlAlgoToolkit.RevitAddins; - namespace ShrlAlgoToolkit.RevitAddins.DrawSheet; [Transaction(TransactionMode.Manual)] @@ -31,7 +27,7 @@ public class AdaptiveMEPTagCmd : ExternalCommand if (loc.Curve is Line l) { var ra = l.Direction.AngleTo(XYZ.BasisX); - if (ra > Math.PI / 4 && ra < Math.PI / 4 * 3) + if (ra is > Math.PI / 4 and < Math.PI / 4 * 3) { toRotate.Add(tag); } @@ -53,7 +49,7 @@ public class AdaptiveMEPTagCmd : ExternalCommand } catch (Exception) { - + // ignored } } } \ No newline at end of file diff --git a/ShrlAlgoToolkit.RevitAddins/DrawSheet/AlignTagsCmd.cs b/ShrlAlgoToolkit.RevitAddins/DrawSheet/AlignTagsCmd.cs index f09c6ce..d7b822d 100644 --- a/ShrlAlgoToolkit.RevitAddins/DrawSheet/AlignTagsCmd.cs +++ b/ShrlAlgoToolkit.RevitAddins/DrawSheet/AlignTagsCmd.cs @@ -1,8 +1,5 @@ using Nice3point.Revit.Toolkit.External; using ShrlAlgoToolkit.RevitAddins.Common.Assists; -using ShrlAlgoToolkit.RevitAddins.RvView; -using ShrlAlgoToolkit; -using ShrlAlgoToolkit.RevitAddins; namespace ShrlAlgoToolkit.RevitAddins.DrawSheet; @@ -12,6 +9,6 @@ public class AlignTagsCmd : ExternalCommand { public override void Execute() { - Common.Assists.WinDialogAssist.ShowOrActivate(); + WinDialogAssist.ShowOrActivate(); } } diff --git a/ShrlAlgoToolkit.RevitAddins/DrawSheet/AlignTagsView.xaml.cs b/ShrlAlgoToolkit.RevitAddins/DrawSheet/AlignTagsView.xaml.cs index ec1dd7d..80afb39 100644 --- a/ShrlAlgoToolkit.RevitAddins/DrawSheet/AlignTagsView.xaml.cs +++ b/ShrlAlgoToolkit.RevitAddins/DrawSheet/AlignTagsView.xaml.cs @@ -1,8 +1,4 @@ -using ShrlAlgoToolkit.RevitAddins.RvView; -using ShrlAlgoToolkit; -using ShrlAlgoToolkit.RevitAddins; - -namespace ShrlAlgoToolkit.RevitAddins.DrawSheet +namespace ShrlAlgoToolkit.RevitAddins.DrawSheet { /// /// AlignTagsView.xaml 的交互逻辑 diff --git a/ShrlAlgoToolkit.RevitAddins/DrawSheet/AlignTagsViewModel.cs b/ShrlAlgoToolkit.RevitAddins/DrawSheet/AlignTagsViewModel.cs index 1d28968..16d9d06 100644 --- a/ShrlAlgoToolkit.RevitAddins/DrawSheet/AlignTagsViewModel.cs +++ b/ShrlAlgoToolkit.RevitAddins/DrawSheet/AlignTagsViewModel.cs @@ -3,10 +3,6 @@ using CommunityToolkit.Mvvm.ComponentModel; using CommunityToolkit.Mvvm.Input; using Nice3point.Revit.Toolkit.External.Handlers; -using ShrlAlgoToolkit.RevitAddins.RvView; -using ShrlAlgoToolkit; -using ShrlAlgoToolkit.RevitAddins; - namespace ShrlAlgoToolkit.RevitAddins.DrawSheet; public partial class AlignTagsViewModel : ObservableObject @@ -78,7 +74,7 @@ public partial class AlignTagsViewModel : ObservableObject } catch (Autodesk.Revit.Exceptions.OperationCanceledException) { - return; + } }); } @@ -116,12 +112,12 @@ public partial class AlignTagsViewModel : ObservableObject //ViewDirection 45°~135° if (view.ViewDirection.Y > 0 && view.ViewDirection.Y >= view.ViewDirection.X) { - orderedTags = tags.OrderBy(a => a.TagHeadPosition.Z).ThenBy(b => b.TagHeadPosition.X); + orderedTags = tags.OrderBy(a => a.TagHeadPosition.Z).ThenBy(b => b.TagHeadPosition.X); } //ViewDirection 135°~225° else if (view.ViewDirection.X < 0 && view.ViewDirection.Y > view.ViewDirection.X) { - orderedTags = tags.OrderBy(a => a.TagHeadPosition.Z).ThenBy(b => b.TagHeadPosition.Y); + orderedTags = tags.OrderBy(a => a.TagHeadPosition.Z).ThenBy(b => b.TagHeadPosition.Y); } //ViewDirection -45°~45° else if (view.ViewDirection.X > 0 && view.ViewDirection.Y < view.ViewDirection.X) @@ -134,7 +130,13 @@ public partial class AlignTagsViewModel : ObservableObject orderedTags = tags.OrderBy(a => a.TagHeadPosition.Z).ThenByDescending(b => b.TagHeadPosition.X); } - var baseTag = orderedTags.FirstOrDefault(); + if (orderedTags==null) + { + return; + } + var orderedTagList= orderedTags.ToList(); + var baseTag = orderedTagList.FirstOrDefault(); + if (baseTag == null)return; if (baseTag.LeaderEndCondition == LeaderEndCondition.Attached) { baseTag.LeaderEndCondition = LeaderEndCondition.Free; @@ -151,9 +153,9 @@ public partial class AlignTagsViewModel : ObservableObject ); #endif - for (var i = 1; i < orderedTags.Count(); i++) + for (var i = 1; i < orderedTagList.Count(); i++) { - var tag = orderedTags.ElementAt(i); + var tag = orderedTagList.ElementAt(i); if (tag.LeaderEndCondition == LeaderEndCondition.Attached) { tag.LeaderEndCondition = LeaderEndCondition.Free; @@ -238,9 +240,10 @@ public partial class AlignTagsViewModel : ObservableObject /// public static void ArrangePlaneTags(double distance, List tags) { - var orderedTags = tags.OrderBy(a => a.TagHeadPosition.Y).ThenByDescending(b => b.TagHeadPosition.X); + var orderedTags = tags.OrderBy(a => a.TagHeadPosition.Y).ThenByDescending(b => b.TagHeadPosition.X).ToList(); var baseTag = orderedTags.FirstOrDefault(); + if (baseTag == null)return; if (baseTag.LeaderEndCondition == LeaderEndCondition.Attached) { baseTag.LeaderEndCondition = LeaderEndCondition.Free; @@ -354,6 +357,10 @@ public partial class AlignTagsViewModel : ObservableObject var tagsToRemove = new List(); var baseTag = independentTags.FirstOrDefault(); + if (baseTag==null) + { + return groups; + } var loc = baseTag.TagHeadPosition; //tagsToRemove.Add(baseTag); foreach (var t in independentTags) @@ -363,7 +370,7 @@ public partial class AlignTagsViewModel : ObservableObject var pOnElevation = new XYZ(t.TagHeadPosition.X, t.TagHeadPosition.Y, t.TagHeadPosition.Z); //var pOnElevation1 = new XYZ(0, t.TagHeadPosition.Y, t.TagHeadPosition.Z); var view = t.Document.GetElement(t.OwnerViewId) as View; - if (view.ViewType is ViewType.FloorPlan or ViewType.CeilingPlan) + if (view!.ViewType is ViewType.FloorPlan or ViewType.CeilingPlan) { if (pOnPlane.DistanceTo(new XYZ(loc.X, loc.Y, 0)) < 1500 / 304.8) //距离小于1500合并成组 { diff --git a/ShrlAlgoToolkit.RevitAddins/DrawSheet/ArrangeTagsCmd.cs b/ShrlAlgoToolkit.RevitAddins/DrawSheet/ArrangeTagsCmd.cs index 77e6d57..df64c7f 100644 --- a/ShrlAlgoToolkit.RevitAddins/DrawSheet/ArrangeTagsCmd.cs +++ b/ShrlAlgoToolkit.RevitAddins/DrawSheet/ArrangeTagsCmd.cs @@ -3,10 +3,6 @@ using Autodesk.Revit.Attributes; using Autodesk.Revit.DB; using Nice3point.Revit.Toolkit.External; -using ShrlAlgoToolkit.RevitAddins.RvView; -using ShrlAlgoToolkit; -using ShrlAlgoToolkit.RevitAddins; - namespace ShrlAlgoToolkit.RevitAddins.DrawSheet; [Transaction(TransactionMode.Manual)] @@ -80,13 +76,13 @@ public class ArrangeTagsCmd : ExternalCommand tx.Start("整理标记"); //Create two lists of TagLeader - List leftTagLeaders = []; - List rightTagLeaders = []; + List leftTagLeaders = []; + List rightTagLeaders = []; foreach (var tag in independentTags) { - DrawSheet.TagLeader currentTag = new(tag, doc); - if (currentTag.Side == DrawSheet.ViewSides.Left) + TagLeader currentTag = new(tag, doc); + if (currentTag.Side == ViewSides.Left) { leftTagLeaders.Add(currentTag); } @@ -97,8 +93,8 @@ public class ArrangeTagsCmd : ExternalCommand } //Create a errorModels of potential location points for tag headers - var leftTagHeadPoints = DrawSheet.ArrangeTagsCmd.CreateTagPositionPoints(activeView, leftTagLeaders, DrawSheet.ViewSides.Left); - var rightTagHeadPoints = DrawSheet.ArrangeTagsCmd.CreateTagPositionPoints(activeView, rightTagLeaders, DrawSheet.ViewSides.Right); + var leftTagHeadPoints = CreateTagPositionPoints(activeView, leftTagLeaders, ViewSides.Left); + var rightTagHeadPoints = CreateTagPositionPoints(activeView, rightTagLeaders, ViewSides.Right); //按 Y 位置对标签排序 [..]集合解构是一种新的语法，用于表示范围（Range）操作。范围操作用于从集合或数组中选择一个连续的子集。 leftTagLeaders = [.. leftTagLeaders.OrderBy(x => x.LeaderEnd.X)]; @@ -116,7 +112,7 @@ public class ArrangeTagsCmd : ExternalCommand tx.Commit(); } - private static List CreateTagPositionPoints(View activeView, List tagLeaders, DrawSheet.ViewSides side) + private static List CreateTagPositionPoints(View activeView, List tagLeaders, ViewSides side) { List points = []; @@ -137,7 +133,7 @@ public class ArrangeTagsCmd : ExternalCommand //create sides points for (var i = max * 2; i > 0; i--) { - if (side == DrawSheet.ViewSides.Left) + if (side == ViewSides.Left) { //Add left point points.Add(baseLeft + new XYZ(0, step * i, 0)); @@ -170,7 +166,7 @@ public class ArrangeTagsCmd : ExternalCommand return nearestPoint; } - private void PlaceAndSort(List positionPoints, List tags) + private void PlaceAndSort(List positionPoints, List tags) { //place TagLeader foreach (var tag in tags) @@ -183,8 +179,8 @@ public class ArrangeTagsCmd : ExternalCommand } //unCross leaders (2 times) - DrawSheet.ArrangeTagsCmd.UnCross(tags); - DrawSheet.ArrangeTagsCmd.UnCross(tags); + UnCross(tags); + UnCross(tags); //update their position foreach (var tag in tags) @@ -193,7 +189,7 @@ public class ArrangeTagsCmd : ExternalCommand } } - private static void UnCross(List tags) + private static void UnCross(List tags) { foreach (var tag in tags) { @@ -234,7 +230,7 @@ internal class TagLeader //View center var viewCenter = (currentView.CropBox.Max + currentView.CropBox.Min) / 2; - Side = viewCenter.X > LeaderEnd.X ? DrawSheet.ViewSides.Left : DrawSheet.ViewSides.Right; + Side = viewCenter.X > LeaderEnd.X ? ViewSides.Left : ViewSides.Right; } GetTagDimension(); @@ -269,7 +265,7 @@ internal class TagLeader public Line BaseLine { get; private set; } - public DrawSheet.ViewSides Side { get; } + public ViewSides Side { get; } public XYZ ElbowPosition { get; private set; } @@ -331,7 +327,7 @@ internal class TagLeader { tag.LeaderEndCondition = LeaderEndCondition.Attached; - var offsetFromView = Side == DrawSheet.ViewSides.Left ? new XYZ((-Math.Abs(TagWidth) * 0.5) - 0.1, 0, 0) : new XYZ((Math.Abs(TagWidth) * 0.5) + 0.1, 0, 0); + var offsetFromView = Side == ViewSides.Left ? new XYZ((-Math.Abs(TagWidth) * 0.5) - 0.1, 0, 0) : new XYZ((Math.Abs(TagWidth) * 0.5) + 0.1, 0, 0); tag.TagHeadPosition = currentView.CropBox.Transform.OfPoint(headOffset + tagCenter + offsetFromView); #if REVIT2018 || REVIT2020 tag.LeaderElbow = currentView.CropBox.Transform.OfPoint(ElbowPosition); diff --git a/ShrlAlgoToolkit.RevitAddins/DrawSheet/CivilViewFilterCmd.cs b/ShrlAlgoToolkit.RevitAddins/DrawSheet/CivilViewFilterCmd.cs index 6f2bec0..0fc1d64 100644 --- a/ShrlAlgoToolkit.RevitAddins/DrawSheet/CivilViewFilterCmd.cs +++ b/ShrlAlgoToolkit.RevitAddins/DrawSheet/CivilViewFilterCmd.cs @@ -4,9 +4,6 @@ using Autodesk.Revit.DB; using Nice3point.Revit.Toolkit.External; using ShrlAlgoToolkit.RevitAddins.Common.Assists; -using ShrlAlgoToolkit.RevitAddins.RvView; -using ShrlAlgoToolkit; -using ShrlAlgoToolkit.RevitAddins; namespace ShrlAlgoToolkit.RevitAddins.DrawSheet; @@ -72,7 +69,7 @@ public class CivilViewFilterCmd : ExternalCommand catch (Exception e) { ErrorMessage = e.Message; - Common.Assists.LogAssist.ToLog(e.StackTrace); + LogAssist.ToLog(e.StackTrace); Result = Result.Failed; return; } @@ -116,7 +113,7 @@ public class CivilViewFilterCmd : ExternalCommand catch (Exception e) { ErrorMessage = e.Message; - Common.Assists.LogAssist.ToLog(e.StackTrace); + LogAssist.ToLog(e.StackTrace); Result = Result.Failed; return; } @@ -169,7 +166,7 @@ public class CivilViewFilterCmd : ExternalCommand catch (Exception e) { ErrorMessage = e.Message; - Common.Assists.LogAssist.ToLog(e.StackTrace); + LogAssist.ToLog(e.StackTrace); Result = Result.Failed; return; } @@ -199,7 +196,7 @@ public class CivilViewFilterCmd : ExternalCommand catch (Exception e) { MessageBox.Show(e.Message); - Common.Assists.LogAssist.ToLog(e.StackTrace); + LogAssist.ToLog(e.StackTrace); } #endif @@ -255,7 +252,7 @@ public class CivilViewFilterCmd : ExternalCommand catch (Exception e) { MessageBox.Show(e.Message); - Common.Assists.LogAssist.ToLog(e.StackTrace); + LogAssist.ToLog(e.StackTrace); } #elif REVIT2020 || REVIT2019 diff --git a/ShrlAlgoToolkit.RevitAddins/DrawSheet/DimensionBy2LineCmd.cs b/ShrlAlgoToolkit.RevitAddins/DrawSheet/DimensionBy2LineCmd.cs index 5d77c93..7e364e6 100644 --- a/ShrlAlgoToolkit.RevitAddins/DrawSheet/DimensionBy2LineCmd.cs +++ b/ShrlAlgoToolkit.RevitAddins/DrawSheet/DimensionBy2LineCmd.cs @@ -2,10 +2,6 @@ using Autodesk.Revit.UI.Selection; using Nice3point.Revit.Toolkit.External; -using ShrlAlgoToolkit.RevitAddins.RvView; -using ShrlAlgoToolkit; -using ShrlAlgoToolkit.RevitAddins; - namespace ShrlAlgoToolkit.RevitAddins.DrawSheet; [Autodesk.Revit.Attributes.Transaction(Autodesk.Revit.Attributes.TransactionMode.Manual)] diff --git a/ShrlAlgoToolkit.RevitAddins/DrawSheet/ElementControlDock.xaml.cs b/ShrlAlgoToolkit.RevitAddins/DrawSheet/ElementControlDock.xaml.cs index ba77eee..03fa8ff 100644 --- a/ShrlAlgoToolkit.RevitAddins/DrawSheet/ElementControlDock.xaml.cs +++ b/ShrlAlgoToolkit.RevitAddins/DrawSheet/ElementControlDock.xaml.cs @@ -4,10 +4,6 @@ using System.Windows.Controls; using Autodesk.Revit.DB; using Nice3point.Revit.Toolkit.External.Handlers; -using ShrlAlgoToolkit.RevitAddins.RvView; -using ShrlAlgoToolkit; -using ShrlAlgoToolkit.RevitAddins; - namespace ShrlAlgoToolkit.RevitAddins.DrawSheet; public partial class ElementsControlDock : IDockablePaneProvider diff --git a/ShrlAlgoToolkit.RevitAddins/DrawSheet/ElementsControlCmd.cs b/ShrlAlgoToolkit.RevitAddins/DrawSheet/ElementsControlCmd.cs index d12c957..ed764b2 100644 --- a/ShrlAlgoToolkit.RevitAddins/DrawSheet/ElementsControlCmd.cs +++ b/ShrlAlgoToolkit.RevitAddins/DrawSheet/ElementsControlCmd.cs @@ -2,9 +2,6 @@ using Autodesk.Revit.Attributes; using Nice3point.Revit.Toolkit.External; using ShrlAlgoToolkit.RevitAddins.Common.Assists; -using ShrlAlgoToolkit.RevitAddins.RvView; -using ShrlAlgoToolkit; -using ShrlAlgoToolkit.RevitAddins; namespace ShrlAlgoToolkit.RevitAddins.DrawSheet; diff --git a/ShrlAlgoToolkit.RevitAddins/DrawSheet/ExportSchedulesCmd.cs b/ShrlAlgoToolkit.RevitAddins/DrawSheet/ExportSchedulesCmd.cs index 31cf0d3..14bae1c 100644 --- a/ShrlAlgoToolkit.RevitAddins/DrawSheet/ExportSchedulesCmd.cs +++ b/ShrlAlgoToolkit.RevitAddins/DrawSheet/ExportSchedulesCmd.cs @@ -1,7 +1,5 @@ using System.IO; using System.Windows; -using System.Windows.Documents; - using Autodesk.Revit.DB; using Melskin.Controls; @@ -11,9 +9,6 @@ using MiniExcelLibs; using Nice3point.Revit.Toolkit.External; using ShrlAlgoToolkit.RevitAddins.Common.Assists; -using ShrlAlgoToolkit.RevitAddins.RvView; -using ShrlAlgoToolkit; -using ShrlAlgoToolkit.RevitAddins; namespace ShrlAlgoToolkit.RevitAddins.DrawSheet; @@ -43,7 +38,7 @@ public class ExportSchedulesCmd : ExternalCommand var path = $"{selectedPath}\\导出的明细表.xlsx"; ExportScheduleToExcel(list, path); - Common.Assists.WinDialogAssist.OpenFolderAndSelectFile(path); + WinDialogAssist.OpenFolderAndSelectFile(path); } public void ExportScheduleToExcel(List list,string path) diff --git a/ShrlAlgoToolkit.RevitAddins/DrawSheet/PanelScheduleCmd.cs b/ShrlAlgoToolkit.RevitAddins/DrawSheet/PanelScheduleCmd.cs index 6035c42..5a6dc12 100644 --- a/ShrlAlgoToolkit.RevitAddins/DrawSheet/PanelScheduleCmd.cs +++ b/ShrlAlgoToolkit.RevitAddins/DrawSheet/PanelScheduleCmd.cs @@ -1,10 +1,6 @@ using Autodesk.Revit.Attributes; using Autodesk.Revit.DB; -using ShrlAlgoToolkit.RevitAddins.RvView; -using ShrlAlgoToolkit; -using ShrlAlgoToolkit.RevitAddins; - namespace ShrlAlgoToolkit.RevitAddins.DrawSheet { [Transaction(TransactionMode.Manual)] diff --git a/ShrlAlgoToolkit.RevitAddins/DrawSheet/QuickViewSectionCmd.cs b/ShrlAlgoToolkit.RevitAddins/DrawSheet/QuickViewSectionCmd.cs index 0396145..aec6c5a 100644 --- a/ShrlAlgoToolkit.RevitAddins/DrawSheet/QuickViewSectionCmd.cs +++ b/ShrlAlgoToolkit.RevitAddins/DrawSheet/QuickViewSectionCmd.cs @@ -1,8 +1,5 @@ using Nice3point.Revit.Toolkit.External; using ShrlAlgoToolkit.RevitAddins.Common.Assists; -using ShrlAlgoToolkit.RevitAddins.RvView; -using ShrlAlgoToolkit; -using ShrlAlgoToolkit.RevitAddins; namespace ShrlAlgoToolkit.RevitAddins.DrawSheet; /// @@ -16,6 +13,6 @@ public class QuickViewSectionCmd : ExternalCommand { public override void Execute() { - Common.Assists.WinDialogAssist.ShowOrActivate(); + WinDialogAssist.ShowOrActivate(); } } diff --git a/ShrlAlgoToolkit.RevitAddins/DrawSheet/QuickViewSectionView.xaml.cs b/ShrlAlgoToolkit.RevitAddins/DrawSheet/QuickViewSectionView.xaml.cs index f257f2d..98e10a6 100644 --- a/ShrlAlgoToolkit.RevitAddins/DrawSheet/QuickViewSectionView.xaml.cs +++ b/ShrlAlgoToolkit.RevitAddins/DrawSheet/QuickViewSectionView.xaml.cs @@ -1,8 +1,4 @@ -using ShrlAlgoToolkit.RevitAddins.RvView; -using ShrlAlgoToolkit; -using ShrlAlgoToolkit.RevitAddins; - -namespace ShrlAlgoToolkit.RevitAddins.DrawSheet; +namespace ShrlAlgoToolkit.RevitAddins.DrawSheet; /// /// QuickViewSectionView.xaml 的交互逻辑 /// diff --git a/ShrlAlgoToolkit.RevitAddins/DrawSheet/QuickViewSectionViewModel.cs b/ShrlAlgoToolkit.RevitAddins/DrawSheet/QuickViewSectionViewModel.cs index 96aa977..3fc3f26 100644 --- a/ShrlAlgoToolkit.RevitAddins/DrawSheet/QuickViewSectionViewModel.cs +++ b/ShrlAlgoToolkit.RevitAddins/DrawSheet/QuickViewSectionViewModel.cs @@ -5,10 +5,6 @@ using CommunityToolkit.Mvvm.ComponentModel; using CommunityToolkit.Mvvm.Input; using Nice3point.Revit.Toolkit.External.Handlers; -using ShrlAlgoToolkit.RevitAddins.RvView; -using ShrlAlgoToolkit; -using ShrlAlgoToolkit.RevitAddins; - namespace ShrlAlgoToolkit.RevitAddins.DrawSheet { public partial class QuickViewSectionViewModel : ObservableObject diff --git a/ShrlAlgoToolkit.RevitAddins/DrawSheet/SectionBoxControllerCmd.cs b/ShrlAlgoToolkit.RevitAddins/DrawSheet/SectionBoxControllerCmd.cs index 9f9e0d5..f4d3406 100644 --- a/ShrlAlgoToolkit.RevitAddins/DrawSheet/SectionBoxControllerCmd.cs +++ b/ShrlAlgoToolkit.RevitAddins/DrawSheet/SectionBoxControllerCmd.cs @@ -1,8 +1,6 @@ using Nice3point.Revit.Toolkit.External; using ShrlAlgoToolkit.RevitAddins.Common.Assists; using ShrlAlgoToolkit.RevitAddins.RvView; -using ShrlAlgoToolkit; -using ShrlAlgoToolkit.RevitAddins; namespace ShrlAlgoToolkit.RevitAddins.DrawSheet; @@ -19,7 +17,7 @@ public class SectionBoxControllerCmd : ExternalCommand //} try { - Common.Assists.WinDialogAssist.ShowOrActivate(UiApplication); + WinDialogAssist.ShowOrActivate(UiApplication); } catch (Exception ex) { diff --git a/ShrlAlgoToolkit.RevitAddins/DrawSheet/SectionBoxControllerView.xaml.cs b/ShrlAlgoToolkit.RevitAddins/DrawSheet/SectionBoxControllerView.xaml.cs index c59dfeb..059606e 100644 --- a/ShrlAlgoToolkit.RevitAddins/DrawSheet/SectionBoxControllerView.xaml.cs +++ b/ShrlAlgoToolkit.RevitAddins/DrawSheet/SectionBoxControllerView.xaml.cs @@ -1,9 +1,5 @@ using Melskin.Controls; -using ShrlAlgoToolkit.RevitAddins.RvView; -using ShrlAlgoToolkit; -using ShrlAlgoToolkit.RevitAddins; - namespace ShrlAlgoToolkit.RevitAddins.DrawSheet { /// diff --git a/ShrlAlgoToolkit.RevitAddins/DrawSheet/SectionBoxControllerViewModel.cs b/ShrlAlgoToolkit.RevitAddins/DrawSheet/SectionBoxControllerViewModel.cs index abc9ec5..00b3e2d 100644 --- a/ShrlAlgoToolkit.RevitAddins/DrawSheet/SectionBoxControllerViewModel.cs +++ b/ShrlAlgoToolkit.RevitAddins/DrawSheet/SectionBoxControllerViewModel.cs @@ -44,7 +44,7 @@ public partial class SectionBoxControllerViewModel : ObservableObject } [ObservableProperty] - [NotifyCanExecuteChangedFor(nameof(RevitAddins.RvView.SectionBoxControllerViewModel.RecordSectionBoxCommand), nameof(RevitAddins.RvView.SectionBoxControllerViewModel.UpdateSectionBoxCommand))] + [NotifyCanExecuteChangedFor(nameof(RecordSectionBoxCommand), nameof(UpdateSectionBoxCommand))] public partial bool CanModify { get; set; } [ObservableProperty] @@ -62,7 +62,7 @@ public partial class SectionBoxControllerViewModel : ObservableObject private readonly UIApplication uiapp; private int index = 1; - [RelayCommand(CanExecute = nameof(RevitAddins.RvView.SectionBoxControllerViewModel.CanModify))] + [RelayCommand(CanExecute = nameof(CanModify))] private void RecordSectionBox() { if (uiapp.ActiveUIDocument.Document.ActiveView is View3D { IsSectionBoxActive: true } view3D) @@ -279,7 +279,7 @@ public partial class SectionBoxControllerViewModel : ObservableObject "重设(剖面)剖面框"); } } - [RelayCommand(CanExecute = nameof(RevitAddins.RvView.SectionBoxControllerViewModel.CanModify))] + [RelayCommand(CanExecute = nameof(CanModify))] private void UpdateSectionBox(object obj) { if (obj is BoundingBoxXYZ boundingBoxXyz) diff --git a/ShrlAlgoToolkit.RevitAddins/DrawSheet/SwitchBackgroundCmd.cs b/ShrlAlgoToolkit.RevitAddins/DrawSheet/SwitchBackgroundCmd.cs index 876d065..a7e3a1d 100644 --- a/ShrlAlgoToolkit.RevitAddins/DrawSheet/SwitchBackgroundCmd.cs +++ b/ShrlAlgoToolkit.RevitAddins/DrawSheet/SwitchBackgroundCmd.cs @@ -1,10 +1,6 @@ using Autodesk.Revit.DB; using Nice3point.Revit.Toolkit.External; -using ShrlAlgoToolkit.RevitAddins.RvView; -using ShrlAlgoToolkit; -using ShrlAlgoToolkit.RevitAddins; - namespace ShrlAlgoToolkit.RevitAddins.DrawSheet; [Autodesk.Revit.Attributes.Transaction(Autodesk.Revit.Attributes.TransactionMode.Manual)] diff --git a/ShrlAlgoToolkit.RevitAddins/DrawSheet/SystemDisplayView.xaml.cs b/ShrlAlgoToolkit.RevitAddins/DrawSheet/SystemDisplayView.xaml.cs index 8eb98f8..9cdc12c 100644 --- a/ShrlAlgoToolkit.RevitAddins/DrawSheet/SystemDisplayView.xaml.cs +++ b/ShrlAlgoToolkit.RevitAddins/DrawSheet/SystemDisplayView.xaml.cs @@ -1,8 +1,4 @@ -using ShrlAlgoToolkit.RevitAddins.RvView; -using ShrlAlgoToolkit; -using ShrlAlgoToolkit.RevitAddins; - -namespace ShrlAlgoToolkit.RevitAddins.DrawSheet +namespace ShrlAlgoToolkit.RevitAddins.DrawSheet { /// /// SystemDisplayView.xaml 的交互逻辑 diff --git a/ShrlAlgoToolkit.RevitAddins/DrawSheet/SystemDisplayViewModel.cs b/ShrlAlgoToolkit.RevitAddins/DrawSheet/SystemDisplayViewModel.cs index d6e3a5f..16bfa3a 100644 --- a/ShrlAlgoToolkit.RevitAddins/DrawSheet/SystemDisplayViewModel.cs +++ b/ShrlAlgoToolkit.RevitAddins/DrawSheet/SystemDisplayViewModel.cs @@ -1,10 +1,7 @@ using Autodesk.Revit.DB; using CommunityToolkit.Mvvm.ComponentModel; using CommunityToolkit.Mvvm.Input; -using CommunityToolkit.Mvvm.Messaging; - using ShrlAlgoToolkit.RevitAddins.RvMEP; -using ShrlAlgoToolkit.RevitAddins.Common.Controls; namespace ShrlAlgoToolkit.RevitAddins.RvView; diff --git a/ShrlAlgoToolkit.RevitAddins/DrawSheet/ViewManagerCmd.cs b/ShrlAlgoToolkit.RevitAddins/DrawSheet/ViewManagerCmd.cs index 7026917..87e1832 100644 --- a/ShrlAlgoToolkit.RevitAddins/DrawSheet/ViewManagerCmd.cs +++ b/ShrlAlgoToolkit.RevitAddins/DrawSheet/ViewManagerCmd.cs @@ -1,9 +1,6 @@ using Autodesk.Revit.Attributes; using Nice3point.Revit.Toolkit.External; using ShrlAlgoToolkit.RevitAddins.Common.Assists; -using ShrlAlgoToolkit.RevitAddins.RvView; -using ShrlAlgoToolkit; -using ShrlAlgoToolkit.RevitAddins; namespace ShrlAlgoToolkit.RevitAddins.DrawSheet; @@ -15,6 +12,6 @@ public class ViewManagerCmd : ExternalCommand { public override void Execute() { - Common.Assists.WinDialogAssist.ShowOrActivate(UiApplication); + WinDialogAssist.ShowOrActivate(UiApplication); } } diff --git a/ShrlAlgoToolkit.RevitAddins/DrawSheet/ViewManagerModel.cs b/ShrlAlgoToolkit.RevitAddins/DrawSheet/ViewManagerModel.cs index 85b4c81..c93e1b5 100644 --- a/ShrlAlgoToolkit.RevitAddins/DrawSheet/ViewManagerModel.cs +++ b/ShrlAlgoToolkit.RevitAddins/DrawSheet/ViewManagerModel.cs @@ -2,8 +2,6 @@ using CommunityToolkit.Mvvm.ComponentModel; using ShrlAlgoToolkit.RevitAddins.RvView; -using ShrlAlgoToolkit; -using ShrlAlgoToolkit.RevitAddins; namespace ShrlAlgoToolkit.RevitAddins.DrawSheet; diff --git a/ShrlAlgoToolkit.RevitAddins/DrawSheet/ViewManagerView.xaml.cs b/ShrlAlgoToolkit.RevitAddins/DrawSheet/ViewManagerView.xaml.cs index 677ee41..b7f36f5 100644 --- a/ShrlAlgoToolkit.RevitAddins/DrawSheet/ViewManagerView.xaml.cs +++ b/ShrlAlgoToolkit.RevitAddins/DrawSheet/ViewManagerView.xaml.cs @@ -1,8 +1,4 @@ -using ShrlAlgoToolkit.RevitAddins.RvView; -using ShrlAlgoToolkit; -using ShrlAlgoToolkit.RevitAddins; - -namespace ShrlAlgoToolkit.RevitAddins.DrawSheet +namespace ShrlAlgoToolkit.RevitAddins.DrawSheet { /// /// ViewManagerView.xaml 的交互逻辑 diff --git a/ShrlAlgoToolkit.RevitAddins/DrawSheet/ViewManagerViewModel.cs b/ShrlAlgoToolkit.RevitAddins/DrawSheet/ViewManagerViewModel.cs index 1c703c3..7ac9599 100644 --- a/ShrlAlgoToolkit.RevitAddins/DrawSheet/ViewManagerViewModel.cs +++ b/ShrlAlgoToolkit.RevitAddins/DrawSheet/ViewManagerViewModel.cs @@ -8,24 +8,21 @@ using CommunityToolkit.Mvvm.Input; using Nice3point.Revit.Toolkit.External.Handlers; using ShrlAlgoToolkit.RevitAddins.Common.Assists; using ShrlAlgoToolkit.RevitAddins.Common.Extensions; -using ShrlAlgoToolkit.RevitAddins.RvView; -using ShrlAlgoToolkit; -using ShrlAlgoToolkit.RevitAddins; namespace ShrlAlgoToolkit.RevitAddins.DrawSheet; public partial class ViewManagerViewModel : ObservableObject { [ObservableProperty] - [NotifyCanExecuteChangedFor(nameof(DrawSheet.ViewManagerViewModel.CopyAsDependentCommand))] + [NotifyCanExecuteChangedFor(nameof(CopyAsDependentCommand))] public partial bool CanCopyAsDependent { get; set; } [ObservableProperty] - [NotifyCanExecuteChangedFor(nameof(DrawSheet.ViewManagerViewModel.CopyOnlyCommand))] + [NotifyCanExecuteChangedFor(nameof(CopyOnlyCommand))] public partial bool CanCopyOnly { get; set; } [ObservableProperty] - [NotifyCanExecuteChangedFor(nameof(DrawSheet.ViewManagerViewModel.CopyWithDetailCommand))] + [NotifyCanExecuteChangedFor(nameof(CopyWithDetailCommand))] public partial bool CanCopyWidthDetail { get; set; } [ObservableProperty] @@ -121,13 +118,13 @@ public partial class ViewManagerViewModel : ObservableObject view.ViewTemplateId = ElementId.InvalidElementId; if (model.IsDisplayStyleEditable) { - view.DisplayStyle = (Autodesk.Revit.DB.DisplayStyle)model.DisplayStyle; + view.DisplayStyle = (DisplayStyle)model.DisplayStyle; } if (view.HasViewDiscipline()) { Debug.Assert(model.Discipline != null, "model.Discipline != null"); - view.Discipline = (Autodesk.Revit.DB.ViewDiscipline)model.Discipline; + view.Discipline = (ViewDiscipline)model.Discipline; } if (model.IsScaleEditable) @@ -138,7 +135,7 @@ public partial class ViewManagerViewModel : ObservableObject if (model.IsDetailLevelEditable) { Debug.Assert(model.DetailLevel != null, "model.DetailLevel != null"); - view.DetailLevel = (Autodesk.Revit.DB.ViewDetailLevel)model.DetailLevel; + view.DetailLevel = (ViewDetailLevel)model.DetailLevel; } if (model.ViewTemplate != null && view.IsValidViewTemplate(model.ViewTemplate.Id)) @@ -162,7 +159,7 @@ public partial class ViewManagerViewModel : ObservableObject }); } - [RelayCommand(CanExecute = nameof(DrawSheet.ViewManagerViewModel.CanCopyAsDependent))] + [RelayCommand(CanExecute = nameof(CanCopyAsDependent))] private void CopyAsDependent(System.Collections.IList items) { if (items == null || items.Count == 0) @@ -187,7 +184,7 @@ public partial class ViewManagerViewModel : ObservableObject } catch (Exception e) { - Common.Assists.LogAssist.ToLog(e.Message); + LogAssist.ToLog(e.Message); } }, "复制视图" @@ -195,7 +192,7 @@ public partial class ViewManagerViewModel : ObservableObject }); } - [RelayCommand(CanExecute = nameof(DrawSheet.ViewManagerViewModel.CanCopyOnly))] + [RelayCommand(CanExecute = nameof(CanCopyOnly))] private void CopyOnly(System.Collections.IList items) { if (items == null || items.Count == 0) @@ -220,7 +217,7 @@ public partial class ViewManagerViewModel : ObservableObject } catch (Exception e) { - Common.Assists.LogAssist.ToLog(e.Message); + LogAssist.ToLog(e.Message); } }, "复制视图" @@ -228,7 +225,7 @@ public partial class ViewManagerViewModel : ObservableObject }); } - [RelayCommand(CanExecute = nameof(DrawSheet.ViewManagerViewModel.CanCopyWidthDetail))] + [RelayCommand(CanExecute = nameof(CanCopyWidthDetail))] private void CopyWithDetail(System.Collections.IList items) { if (items == null || items.Count == 0) @@ -253,7 +250,7 @@ public partial class ViewManagerViewModel : ObservableObject } catch (Exception e) { - Common.Assists.LogAssist.ToLog(e.Message); + LogAssist.ToLog(e.Message); } }, "复制视图" @@ -393,13 +390,13 @@ public partial class ViewManagerViewModel : ObservableObject view.ViewTemplateId = ElementId.InvalidElementId; if (model.IsDisplayStyleEditable) { - view.DisplayStyle = (Autodesk.Revit.DB.DisplayStyle)model.DisplayStyle; + view.DisplayStyle = (DisplayStyle)model.DisplayStyle; } if (view.HasViewDiscipline()) { Debug.Assert(model.Discipline != null, "model.Discipline != null"); - view.Discipline = (Autodesk.Revit.DB.ViewDiscipline)model.Discipline; + view.Discipline = (ViewDiscipline)model.Discipline; } if (model.IsScaleEditable) @@ -410,7 +407,7 @@ public partial class ViewManagerViewModel : ObservableObject if (model.IsDetailLevelEditable) { Debug.Assert(model.DetailLevel != null, "model.DetailLevel != null"); - view.DetailLevel = (Autodesk.Revit.DB.ViewDetailLevel)model.DetailLevel; + view.DetailLevel = (ViewDetailLevel)model.DetailLevel; } if (model.ViewTemplate != null && view.IsValidViewTemplate(model.ViewTemplate.Id)) diff --git a/ShrlAlgoToolkit.RevitAddins/DrawSheet/VisibilityControlCmd.cs b/ShrlAlgoToolkit.RevitAddins/DrawSheet/VisibilityControlCmd.cs index 26f300c..33bfba8 100644 --- a/ShrlAlgoToolkit.RevitAddins/DrawSheet/VisibilityControlCmd.cs +++ b/ShrlAlgoToolkit.RevitAddins/DrawSheet/VisibilityControlCmd.cs @@ -3,9 +3,6 @@ using Autodesk.Revit.Attributes; using Autodesk.Revit.DB; using Nice3point.Revit.Toolkit.External; using ShrlAlgoToolkit.RevitAddins.Common.Assists; -using ShrlAlgoToolkit.RevitAddins.RvView; -using ShrlAlgoToolkit; -using ShrlAlgoToolkit.RevitAddins; namespace ShrlAlgoToolkit.RevitAddins.DrawSheet; @@ -19,7 +16,7 @@ public class VisibilityControlCmd : ExternalCommand { if (Document.ActiveView.ViewTemplateId == ElementId.InvalidElementId) { - Common.Assists.WinDialogAssist.ShowOrActivate(UiApplication); + WinDialogAssist.ShowOrActivate(UiApplication); } else { diff --git a/ShrlAlgoToolkit.RevitAddins/DrawSheet/VisibilityView.xaml.cs b/ShrlAlgoToolkit.RevitAddins/DrawSheet/VisibilityView.xaml.cs index ce9d100..93acd52 100644 --- a/ShrlAlgoToolkit.RevitAddins/DrawSheet/VisibilityView.xaml.cs +++ b/ShrlAlgoToolkit.RevitAddins/DrawSheet/VisibilityView.xaml.cs @@ -1,9 +1,5 @@ using Melskin.Controls; -using ShrlAlgoToolkit.RevitAddins.RvView; -using ShrlAlgoToolkit; -using ShrlAlgoToolkit.RevitAddins; - namespace ShrlAlgoToolkit.RevitAddins.DrawSheet; /// diff --git a/ShrlAlgoToolkit.RevitAddins/DrawSheet/VisibilityViewModel.cs b/ShrlAlgoToolkit.RevitAddins/DrawSheet/VisibilityViewModel.cs index 5f96be0..a956199 100644 --- a/ShrlAlgoToolkit.RevitAddins/DrawSheet/VisibilityViewModel.cs +++ b/ShrlAlgoToolkit.RevitAddins/DrawSheet/VisibilityViewModel.cs @@ -4,10 +4,6 @@ using CommunityToolkit.Mvvm.ComponentModel; using CommunityToolkit.Mvvm.Input; using Nice3point.Revit.Toolkit.External.Handlers; -using ShrlAlgoToolkit.RevitAddins.RvView; -using ShrlAlgoToolkit; -using ShrlAlgoToolkit.RevitAddins; - namespace ShrlAlgoToolkit.RevitAddins.DrawSheet; public partial class VisibilityViewModel : ObservableObject diff --git a/ShrlAlgoToolkit.RevitAddins/Entry/DrawingViewApp.cs b/ShrlAlgoToolkit.RevitAddins/Entry/DrawingViewApp.cs index e0e9350..5fc617a 100644 --- a/ShrlAlgoToolkit.RevitAddins/Entry/DrawingViewApp.cs +++ b/ShrlAlgoToolkit.RevitAddins/Entry/DrawingViewApp.cs @@ -4,13 +4,12 @@ using Nice3point.Revit.Toolkit.External.Handlers; using ShrlAlgoToolkit.RevitAddins.Properties; -using ShrlAlgoToolkit.RevitAddins.RvView; namespace ShrlAlgoToolkit.RevitAddins.Entry; public class DrawingViewApp { - private static readonly string TabName = RevitAddins.Properties.Settings.Default.TabName; + private static readonly string TabName = Settings.Default.TabName; public DrawingViewApp(UIControlledApplication application) { @@ -116,7 +115,7 @@ public class DrawingViewApp //ribbonPanel.AddPushButton("视图管理", Resources.view_manager_32px, "视图管理"); } - private void CreateToggleButton(Autodesk.Windows.RibbonTab rt, string panelName) + private void CreateToggleButton(RibbonTab rt, string panelName) { try { diff --git a/ShrlAlgoToolkit.RevitAddins/Entry/FamilyApp.cs b/ShrlAlgoToolkit.RevitAddins/Entry/FamilyApp.cs index 3daf8e0..5cfcd2d 100644 --- a/ShrlAlgoToolkit.RevitAddins/Entry/FamilyApp.cs +++ b/ShrlAlgoToolkit.RevitAddins/Entry/FamilyApp.cs @@ -4,7 +4,6 @@ using System.Windows; using Autodesk.Revit.DB; using Autodesk.Windows; using ShrlAlgoToolkit.RevitAddins.Properties; -using ShrlAlgoToolkit.RevitAddins.RvFamily; using ShrlAlgoToolkit.RevitAddins.RvFamily.FamilyLibrary; using ShrlAlgoToolkit.RevitAddins.Common.Extensions; @@ -54,7 +53,7 @@ public class FamilyApp private const string VbRecentPanelName = "最近使用"; //获取Ribbon类所在的通用类库目录 - private static readonly string TabName = RevitAddins.Properties.Settings.Default.TabName; + private static readonly string TabName = Properties.Settings.Default.TabName; private readonly UIApplication uiapp; public ObservableCollection Items { get; set; } diff --git a/ShrlAlgoToolkit.RevitAddins/Entry/ModifyTabApp.cs b/ShrlAlgoToolkit.RevitAddins/Entry/ModifyTabApp.cs index ab89bab..9af0491 100644 --- a/ShrlAlgoToolkit.RevitAddins/Entry/ModifyTabApp.cs +++ b/ShrlAlgoToolkit.RevitAddins/Entry/ModifyTabApp.cs @@ -364,7 +364,7 @@ public class ModifyTabApp alignSource.Items.Add(ribbonRowPanel); alignSource.Items.Add(ribbonRowPanel1); //新建面板 - Autodesk.Windows.RibbonPanel alignElemsPanel = new() { FloatingOrientation = System.Windows.Controls.Orientation.Vertical }; + Autodesk.Windows.RibbonPanel alignElemsPanel = new() { FloatingOrientation = Orientation.Vertical }; alignElemsPanel.Source = alignSource; tab.Panels.Add(alignElemsPanel); } @@ -375,7 +375,7 @@ public class ModifyTabApp private void SelectionPanel(RibbonTab tab) { //新建面板 - Autodesk.Windows.RibbonPanel ribbonPanel = new() { FloatingOrientation = System.Windows.Controls.Orientation.Vertical }; + Autodesk.Windows.RibbonPanel ribbonPanel = new() { FloatingOrientation = Orientation.Vertical }; //面板资源 RibbonPanelSource selSource = new() { Id = "ID_SSI_Panel", Title = "选择元素" }; diff --git a/ShrlAlgoToolkit.RevitAddins/Entry/RvApp.cs b/ShrlAlgoToolkit.RevitAddins/Entry/RvApp.cs index a272d37..8ce9fe3 100644 --- a/ShrlAlgoToolkit.RevitAddins/Entry/RvApp.cs +++ b/ShrlAlgoToolkit.RevitAddins/Entry/RvApp.cs @@ -11,7 +11,7 @@ namespace ShrlAlgoToolkit.RevitAddins.Entry; //[Obfuscation(Exclude = true, ApplyToMembers = true)] public class RvApp : ExternalApplication { - private static readonly string TabName = Properties.Settings.Default.TabName; + private static readonly string TabName = Settings.Default.TabName; private AsyncEventHandler saveHandler; readonly System.Timers.Timer saveTimer = Variables.AutoSaveTimer; private void OnTimedEvent(object source, System.Timers.ElapsedEventArgs e) @@ -46,7 +46,7 @@ public class RvApp : ExternalApplication public override void OnStartup() { saveHandler = new(); - UiApplication.CreateRibbonTab(Properties.Settings.Default.TabName); + UiApplication.CreateRibbonTab(Settings.Default.TabName); var versionNumber = UiApplication.Application.VersionNumber; var subVersionNumber = UiApplication.Application.SubVersionNumber; @@ -59,7 +59,7 @@ public class RvApp : ExternalApplication var ribbon = Autodesk.Windows.ComponentManager.Ribbon; - var rt = ribbon.Tabs.FirstOrDefault(tab => tab.Name == Properties.Settings.Default.TabName); + var rt = ribbon.Tabs.FirstOrDefault(tab => tab.Name == Settings.Default.TabName); ribbon.Tabs.Remove(rt); //foreach (var tab in ribbon.Tabs) //{ @@ -74,11 +74,11 @@ public class RvApp : ExternalApplication CivilApp(Application); MEPApp(Application); - _ = new Entry.ModifyTabApp(UiApplication); + _ = new ModifyTabApp(UiApplication); _ = new DrawingViewApp(Application); CreateCommonTools(Application); _ = new TabManagerApp(Application); - _ = new Entry.FamilyApp(Application, UiApplication); + _ = new FamilyApp(Application, UiApplication); if (Settings.Default.IsActiveAutoSave) { diff --git a/ShrlAlgoToolkit.RevitAddins/Entry/TabManagerApp.cs b/ShrlAlgoToolkit.RevitAddins/Entry/TabManagerApp.cs index 9c8bd7e..8122491 100644 --- a/ShrlAlgoToolkit.RevitAddins/Entry/TabManagerApp.cs +++ b/ShrlAlgoToolkit.RevitAddins/Entry/TabManagerApp.cs @@ -8,7 +8,7 @@ public class TabManagerApp { public TabManagerApp(UIControlledApplication application) { - var tab = RibbonControl.Tabs.First(t => t.Name == RevitAddins.Properties.Settings.Default.TabName); + var tab = RibbonControl.Tabs.First(t => t.Name == Settings.Default.TabName); SetTabControl(tab); application.ViewActivating += Application_ViewActivating; @@ -20,7 +20,7 @@ public class TabManagerApp private void InsertQuickAccessAndHidePanel() { - var tab = RibbonControl.FindTab(RevitAddins.Properties.Settings.Default.TabName); + var tab = RibbonControl.FindTab(Settings.Default.TabName); if (tab != null && addInManagerPanel != null) { @@ -63,7 +63,7 @@ public class TabManagerApp var ribbon = ComponentManager.Ribbon; foreach (var tab in ribbon.Tabs) { - if (tab.GetType() == typeof(RibbonTab) && tab.Title != RevitAddins.Properties.Settings.Default.TabName) + if (tab.GetType() == typeof(RibbonTab) && tab.Title != Settings.Default.TabName) { RibbonToggleButton ribbonToggleButton = new() @@ -132,7 +132,7 @@ public class TabManagerApp //如果是族文档，在激活视图时，隐藏面板 private void Application_ViewActivating(object sender, Autodesk.Revit.UI.Events.ViewActivatingEventArgs e) { - SetTabEnabled(RevitAddins.Properties.Settings.Default.TabName, !e.NewActiveView.Document.IsFamilyDocument); + SetTabEnabled(Settings.Default.TabName, !e.NewActiveView.Document.IsFamilyDocument); } private void ControlledApplication_ApplicationInitialized(object sender, Autodesk.Revit.DB.Events.ApplicationInitializedEventArgs e) @@ -145,7 +145,7 @@ public class TabManagerApp if (sender is RibbonToggleButton toggleButton) { var tabName = toggleButton.Name; - var tab = Entry.TabManagerApp.RibbonControl.FindTab(tabName); + var tab = RibbonControl.FindTab(tabName); tab.IsVisible = toggleButton.IsChecked; } } diff --git a/ShrlAlgoToolkit.RevitAddins/FamMaster/ExplodeDwgCmd.cs b/ShrlAlgoToolkit.RevitAddins/FamMaster/ExplodeDwgCmd.cs index e5e77fe..265b1f1 100644 --- a/ShrlAlgoToolkit.RevitAddins/FamMaster/ExplodeDwgCmd.cs +++ b/ShrlAlgoToolkit.RevitAddins/FamMaster/ExplodeDwgCmd.cs @@ -5,10 +5,6 @@ using Autodesk.Revit.Attributes; using Autodesk.Revit.DB; using Autodesk.Revit.UI.Selection; -using ShrlAlgoToolkit.RevitAddins.RvFamily; -using ShrlAlgoToolkit; -using ShrlAlgoToolkit.RevitAddins; - namespace ShrlAlgoToolkit.RevitAddins.FamMaster; /// /// 炸开族中的dwg或嵌套族图元 diff --git a/ShrlAlgoToolkit.RevitAddins/FamMaster/FamilyLibraryCmd.cs b/ShrlAlgoToolkit.RevitAddins/FamMaster/FamilyLibraryCmd.cs index 56c07e9..f535065 100644 --- a/ShrlAlgoToolkit.RevitAddins/FamMaster/FamilyLibraryCmd.cs +++ b/ShrlAlgoToolkit.RevitAddins/FamMaster/FamilyLibraryCmd.cs @@ -1,10 +1,6 @@ using Autodesk.Revit.Attributes; using Nice3point.Revit.Toolkit.External; using ShrlAlgoToolkit.RevitAddins.Common.Assists; -using ShrlAlgoToolkit.RevitAddins.RvFamily.FamilyLibrary; -using ShrlAlgoToolkit; -using ShrlAlgoToolkit.RevitAddins; -using ShrlAlgoToolkit.RevitAddins.RvFamily; namespace ShrlAlgoToolkit.RevitAddins.FamMaster; @@ -13,6 +9,6 @@ public class FamilyLibraryCmd : ExternalCommand { public override void Execute() { - Common.Assists.WinDialogAssist.ShowOrActivate(); + WinDialogAssist.ShowOrActivate(); } } diff --git a/ShrlAlgoToolkit.RevitAddins/FamMaster/FamilyLibraryView.xaml.cs b/ShrlAlgoToolkit.RevitAddins/FamMaster/FamilyLibraryView.xaml.cs index 18b23c0..74a32aa 100644 --- a/ShrlAlgoToolkit.RevitAddins/FamMaster/FamilyLibraryView.xaml.cs +++ b/ShrlAlgoToolkit.RevitAddins/FamMaster/FamilyLibraryView.xaml.cs @@ -1,9 +1,4 @@ -using ShrlAlgoToolkit.RevitAddins.RvFamily.FamilyLibrary; -using ShrlAlgoToolkit; -using ShrlAlgoToolkit.RevitAddins; -using ShrlAlgoToolkit.RevitAddins.RvFamily; - -namespace ShrlAlgoToolkit.RevitAddins.FamMaster +namespace ShrlAlgoToolkit.RevitAddins.FamMaster { /// /// LocalFamily.xaml 的交互逻辑. diff --git a/ShrlAlgoToolkit.RevitAddins/FamMaster/FamilyLibraryViewModel.cs b/ShrlAlgoToolkit.RevitAddins/FamMaster/FamilyLibraryViewModel.cs index b34ebeb..bc75511 100644 --- a/ShrlAlgoToolkit.RevitAddins/FamMaster/FamilyLibraryViewModel.cs +++ b/ShrlAlgoToolkit.RevitAddins/FamMaster/FamilyLibraryViewModel.cs @@ -11,9 +11,6 @@ using ShrlAlgoToolkit.RevitAddins.Common.Assists; using static ShrlAlgoToolkit.RevitCore.Assists.RevitFileAssist; using Settings = ShrlAlgoToolkit.RevitAddins.Properties.Settings; using ShrlAlgoToolkit.RevitAddins.RvFamily.FamilyLibrary; -using ShrlAlgoToolkit; -using ShrlAlgoToolkit.RevitAddins; -using ShrlAlgoToolkit.RevitAddins.RvFamily; namespace ShrlAlgoToolkit.RevitAddins.FamMaster; @@ -314,7 +311,7 @@ public partial class FamilyLibraryViewModel : ObservableObject { if (obj is FamilyModel familyInfo) { - Common.Assists.WinDialogAssist.OpenFolderAndSelectFile(familyInfo.Path); + WinDialogAssist.OpenFolderAndSelectFile(familyInfo.Path); } } diff --git a/ShrlAlgoToolkit.RevitAddins/FamMaster/FamilyModel.cs b/ShrlAlgoToolkit.RevitAddins/FamMaster/FamilyModel.cs index 46021fd..4ee08ed 100644 --- a/ShrlAlgoToolkit.RevitAddins/FamMaster/FamilyModel.cs +++ b/ShrlAlgoToolkit.RevitAddins/FamMaster/FamilyModel.cs @@ -12,7 +12,7 @@ public partial class FamilyModel : ObservableObject /// /// 族库缩略图 /// - public BitmapSource ImageData => Common.Assists.ImageAssist.LoadFileImage(Path, 128, 128); + public BitmapSource ImageData => ImageAssist.LoadFileImage(Path, 128, 128); /// /// 最近使用面板 diff --git a/ShrlAlgoToolkit.RevitAddins/FamMaster/FamilyProcessorCmd.cs b/ShrlAlgoToolkit.RevitAddins/FamMaster/FamilyProcessorCmd.cs index 20bde16..fc6c644 100644 --- a/ShrlAlgoToolkit.RevitAddins/FamMaster/FamilyProcessorCmd.cs +++ b/ShrlAlgoToolkit.RevitAddins/FamMaster/FamilyProcessorCmd.cs @@ -1,9 +1,6 @@ using Autodesk.Revit.Attributes; using Nice3point.Revit.Toolkit.External; using ShrlAlgoToolkit.RevitAddins.Common.Assists; -using ShrlAlgoToolkit.RevitAddins.RvFamily; -using ShrlAlgoToolkit; -using ShrlAlgoToolkit.RevitAddins; namespace ShrlAlgoToolkit.RevitAddins.FamMaster; diff --git a/ShrlAlgoToolkit.RevitAddins/FamMaster/FamilyProcessorView.xaml.cs b/ShrlAlgoToolkit.RevitAddins/FamMaster/FamilyProcessorView.xaml.cs index d2d1d76..3cabaf4 100644 --- a/ShrlAlgoToolkit.RevitAddins/FamMaster/FamilyProcessorView.xaml.cs +++ b/ShrlAlgoToolkit.RevitAddins/FamMaster/FamilyProcessorView.xaml.cs @@ -1,8 +1,4 @@ -using ShrlAlgoToolkit.RevitAddins.RvFamily; -using ShrlAlgoToolkit; -using ShrlAlgoToolkit.RevitAddins; - -namespace ShrlAlgoToolkit.RevitAddins.FamMaster +namespace ShrlAlgoToolkit.RevitAddins.FamMaster { /// /// WpfMassSaveFamilies.xaml 的交互逻辑 diff --git a/ShrlAlgoToolkit.RevitAddins/FamMaster/FamilyProcessorViewModel.cs b/ShrlAlgoToolkit.RevitAddins/FamMaster/FamilyProcessorViewModel.cs index 5ad5189..a4a24e9 100644 --- a/ShrlAlgoToolkit.RevitAddins/FamMaster/FamilyProcessorViewModel.cs +++ b/ShrlAlgoToolkit.RevitAddins/FamMaster/FamilyProcessorViewModel.cs @@ -7,9 +7,6 @@ using CommunityToolkit.Mvvm.ComponentModel; using CommunityToolkit.Mvvm.Input; using Nice3point.Revit.Toolkit.External.Handlers; using ShrlAlgoToolkit.RevitAddins.Common.Assists; -using ShrlAlgoToolkit.RevitAddins.RvFamily; -using ShrlAlgoToolkit; -using ShrlAlgoToolkit.RevitAddins; namespace ShrlAlgoToolkit.RevitAddins.FamMaster; @@ -38,7 +35,7 @@ public partial class FamilyProcessorViewModel : ObservableObject public partial int ModifyNameIndex { get; set; } [ObservableProperty] - [NotifyCanExecuteChangedFor(nameof(FamMaster.FamilyProcessorViewModel.SaveFamiliesCommand))] + [NotifyCanExecuteChangedFor(nameof(SaveFamiliesCommand))] public partial string PathToSaveFamily { get; set; } [ObservableProperty] @@ -48,14 +45,14 @@ public partial class FamilyProcessorViewModel : ObservableObject public partial string ReplaceStr { get; set; } [ObservableProperty] - [NotifyCanExecuteChangedFor(nameof(FamMaster.FamilyProcessorViewModel.TransmitFamilyCommand), nameof(FamMaster.FamilyProcessorViewModel.SaveFamiliesCommand))] + [NotifyCanExecuteChangedFor(nameof(TransmitFamilyCommand), nameof(SaveFamiliesCommand))] public partial Document SourceDoc { get; set; } [ObservableProperty] public partial string Suffix { get; set; } [ObservableProperty] - [NotifyCanExecuteChangedFor(nameof(FamMaster.FamilyProcessorViewModel.TransmitFamilyCommand))] + [NotifyCanExecuteChangedFor(nameof(TransmitFamilyCommand))] public partial Document TargetDoc { get; set; } //private readonly ExternalEvent saveEvent; @@ -284,7 +281,7 @@ public partial class FamilyProcessorViewModel : ObservableObject [RelayCommand] private static void Cancel(object obj) { - if (obj is System.Windows.Window window) + if (obj is Window window) { window.DialogResult = false; } @@ -324,7 +321,7 @@ public partial class FamilyProcessorViewModel : ObservableObject [RelayCommand(CanExecute = nameof(CanSaveFamilies))] private void SaveFamilies(object obj) { - var items = (System.Collections.IList)obj; + var items = (IList)obj; var collection = items.Cast(); var selectedItems = collection.ToList(); if (!selectedItems.Any()) diff --git a/ShrlAlgoToolkit.RevitAddins/FamMaster/LoadedFamilyDropHandler.cs b/ShrlAlgoToolkit.RevitAddins/FamMaster/LoadedFamilyDropHandler.cs index 2eaae2d..568f4cc 100644 --- a/ShrlAlgoToolkit.RevitAddins/FamMaster/LoadedFamilyDropHandler.cs +++ b/ShrlAlgoToolkit.RevitAddins/FamMaster/LoadedFamilyDropHandler.cs @@ -1,10 +1,5 @@ using Autodesk.Revit.DB; -using ShrlAlgoToolkit.RevitAddins.RvFamily.FamilyLibrary; -using ShrlAlgoToolkit; -using ShrlAlgoToolkit.RevitAddins; -using ShrlAlgoToolkit.RevitAddins.RvFamily; - namespace ShrlAlgoToolkit.RevitAddins.General { public class LoadedFamilyDropHandler : IDropHandler diff --git a/ShrlAlgoToolkit.RevitAddins/FamMaster/ModelByCurveCreatorView.xaml.cs b/ShrlAlgoToolkit.RevitAddins/FamMaster/ModelByCurveCreatorView.xaml.cs index 6b3df7a..84ddb04 100644 --- a/ShrlAlgoToolkit.RevitAddins/FamMaster/ModelByCurveCreatorView.xaml.cs +++ b/ShrlAlgoToolkit.RevitAddins/FamMaster/ModelByCurveCreatorView.xaml.cs @@ -1,8 +1,4 @@ -using ShrlAlgoToolkit.RevitAddins.RvCommon; -using ShrlAlgoToolkit; -using ShrlAlgoToolkit.RevitAddins; - -namespace ShrlAlgoToolkit.RevitAddins.FamMaster +namespace ShrlAlgoToolkit.RevitAddins.FamMaster { /// /// ModelByCurveCreatorView.xaml 的交互逻辑 diff --git a/ShrlAlgoToolkit.RevitAddins/FamMaster/ModelByCurveCreatorViewModel.cs b/ShrlAlgoToolkit.RevitAddins/FamMaster/ModelByCurveCreatorViewModel.cs index 6dffcc4..34b5dd6 100644 --- a/ShrlAlgoToolkit.RevitAddins/FamMaster/ModelByCurveCreatorViewModel.cs +++ b/ShrlAlgoToolkit.RevitAddins/FamMaster/ModelByCurveCreatorViewModel.cs @@ -31,7 +31,7 @@ namespace ShrlAlgoToolkit.RevitAddins.RvCommon public partial double InstanceOffsetY { get; set; } = 0; [ObservableProperty] - [NotifyCanExecuteChangedFor(nameof(RevitAddins.RvCommon.ModelByCurveCreatorViewModel.CreateTrackCommand))] + [NotifyCanExecuteChangedFor(nameof(CreateTrackCommand))] public partial bool IsRunning { get; set; } [ObservableProperty] @@ -62,14 +62,14 @@ namespace ShrlAlgoToolkit.RevitAddins.RvCommon public partial List ProfileFamilyTypes { get; set; } [ObservableProperty] - [NotifyCanExecuteChangedFor(nameof(RevitAddins.RvCommon.ModelByCurveCreatorViewModel.CreateTrackCommand))] + [NotifyCanExecuteChangedFor(nameof(CreateTrackCommand))] public partial FamilySymbol SelectedFamilyType { get; set; } [ObservableProperty] public partial Material SelectedMaterial { get; set; } [ObservableProperty] - [NotifyCanExecuteChangedFor(nameof(RevitAddins.RvCommon.ModelByCurveCreatorViewModel.CreateTrackCommand))] + [NotifyCanExecuteChangedFor(nameof(CreateTrackCommand))] public partial FamilySymbol SelectedProfileFamilyType { get; set; } [Required(ErrorMessage = "不可为空")] diff --git a/ShrlAlgoToolkit.RevitAddins/FamMaster/MoveElementByRelationshipCmd.cs b/ShrlAlgoToolkit.RevitAddins/FamMaster/MoveElementByRelationshipCmd.cs index 580e05b..44db942 100644 --- a/ShrlAlgoToolkit.RevitAddins/FamMaster/MoveElementByRelationshipCmd.cs +++ b/ShrlAlgoToolkit.RevitAddins/FamMaster/MoveElementByRelationshipCmd.cs @@ -3,10 +3,6 @@ using Autodesk.Revit.DB; using Nice3point.Revit.Toolkit.External; -using ShrlAlgoToolkit.RevitAddins.RvCommon; -using ShrlAlgoToolkit; -using ShrlAlgoToolkit.RevitAddins; - namespace ShrlAlgoToolkit.RevitAddins.General; /// /// 相对移动 diff --git a/ShrlAlgoToolkit.RevitAddins/FamMaster/PlaceInstanceByCircleCmd.cs b/ShrlAlgoToolkit.RevitAddins/FamMaster/PlaceInstanceByCircleCmd.cs index ea7ba95..8078e8d 100644 --- a/ShrlAlgoToolkit.RevitAddins/FamMaster/PlaceInstanceByCircleCmd.cs +++ b/ShrlAlgoToolkit.RevitAddins/FamMaster/PlaceInstanceByCircleCmd.cs @@ -4,10 +4,6 @@ using Autodesk.Revit.UI.Selection; using Nice3point.Revit.Toolkit.External; -using ShrlAlgoToolkit.RevitAddins.RvCommon; -using ShrlAlgoToolkit; -using ShrlAlgoToolkit.RevitAddins; - namespace ShrlAlgoToolkit.RevitAddins.Modeling; [Transaction(TransactionMode.Manual)] public class PlaceInstanceByCircleCmd : ExternalCommand diff --git a/ShrlAlgoToolkit.RevitAddins/FamMaster/ReplaceInstanceCmd.cs b/ShrlAlgoToolkit.RevitAddins/FamMaster/ReplaceInstanceCmd.cs index 4da59d5..856b73f 100644 --- a/ShrlAlgoToolkit.RevitAddins/FamMaster/ReplaceInstanceCmd.cs +++ b/ShrlAlgoToolkit.RevitAddins/FamMaster/ReplaceInstanceCmd.cs @@ -3,10 +3,6 @@ using Autodesk.Revit.DB; using Autodesk.Revit.DB.Structure; using Nice3point.Revit.Toolkit.External; -using ShrlAlgoToolkit.RevitAddins.RvFamily; -using ShrlAlgoToolkit; -using ShrlAlgoToolkit.RevitAddins; - namespace ShrlAlgoToolkit.RevitAddins.Modeling; /// diff --git a/ShrlAlgoToolkit.RevitAddins/FamMaster/SplitImportInstanceCmd.cs b/ShrlAlgoToolkit.RevitAddins/FamMaster/SplitImportInstanceCmd.cs index d4c6b24..209d1a0 100644 --- a/ShrlAlgoToolkit.RevitAddins/FamMaster/SplitImportInstanceCmd.cs +++ b/ShrlAlgoToolkit.RevitAddins/FamMaster/SplitImportInstanceCmd.cs @@ -3,10 +3,6 @@ using Autodesk.Revit.DB; using Nice3point.Revit.Toolkit.External; -using ShrlAlgoToolkit.RevitAddins.RvCommon; -using ShrlAlgoToolkit; -using ShrlAlgoToolkit.RevitAddins; - namespace ShrlAlgoToolkit.RevitAddins.General; /// diff --git a/ShrlAlgoToolkit.RevitAddins/FamMaster/UpgradeFamilyCmd.cs b/ShrlAlgoToolkit.RevitAddins/FamMaster/UpgradeFamilyCmd.cs index a564b81..7a35031 100644 --- a/ShrlAlgoToolkit.RevitAddins/FamMaster/UpgradeFamilyCmd.cs +++ b/ShrlAlgoToolkit.RevitAddins/FamMaster/UpgradeFamilyCmd.cs @@ -9,14 +9,7 @@ using Melskin.Controls; using Microsoft.Win32; using Nice3point.Revit.Toolkit.External; - -using ShrlAlgo.Addin.Test; - -using ShrlAlgoToolkit; -using ShrlAlgoToolkit.RevitAddins; using ShrlAlgoToolkit.RevitAddins.Common.Controls; -using ShrlAlgoToolkit.RevitAddins.RvFamily; - using TaskDialog = Autodesk.Revit.UI.TaskDialog; namespace ShrlAlgoToolkit.RevitAddins.General; @@ -136,7 +129,7 @@ public class UpgradeFamilyCmd : ExternalCommand private void UpdateFile(UIDocument uidoc, string filename) { - System.Threading.Thread.Sleep(50); + Thread.Sleep(50); if (File.GetAttributes(filename).ToString().IndexOf("ReadOnly", StringComparison.Ordinal) != -1) { diff --git a/ShrlAlgoToolkit.RevitAddins/General/AlignModelElement.cs b/ShrlAlgoToolkit.RevitAddins/General/AlignModelElement.cs index 7dbdc06..544ca65 100644 --- a/ShrlAlgoToolkit.RevitAddins/General/AlignModelElement.cs +++ b/ShrlAlgoToolkit.RevitAddins/General/AlignModelElement.cs @@ -1,9 +1,5 @@ using Autodesk.Revit.DB; -using ShrlAlgoToolkit.RevitAddins.RvCommon; -using ShrlAlgoToolkit; -using ShrlAlgoToolkit.RevitAddins; - namespace ShrlAlgoToolkit.RevitAddins.General; internal class AlignModelElement diff --git a/ShrlAlgoToolkit.RevitAddins/General/AlignType.cs b/ShrlAlgoToolkit.RevitAddins/General/AlignType.cs index ee904e5..aa5ccd8 100644 --- a/ShrlAlgoToolkit.RevitAddins/General/AlignType.cs +++ b/ShrlAlgoToolkit.RevitAddins/General/AlignType.cs @@ -1,9 +1,5 @@ using System.ComponentModel; -using ShrlAlgoToolkit.RevitAddins.RvCommon; -using ShrlAlgoToolkit; -using ShrlAlgoToolkit.RevitAddins; - namespace ShrlAlgoToolkit.RevitAddins.General; public enum AlignType diff --git a/ShrlAlgoToolkit.RevitAddins/General/AutoSaveCmd.cs b/ShrlAlgoToolkit.RevitAddins/General/AutoSaveCmd.cs index f2ce99c..696539f 100644 --- a/ShrlAlgoToolkit.RevitAddins/General/AutoSaveCmd.cs +++ b/ShrlAlgoToolkit.RevitAddins/General/AutoSaveCmd.cs @@ -2,8 +2,6 @@ using Nice3point.Revit.Toolkit.External; using ShrlAlgoToolkit.RevitAddins.RvCommon; -using ShrlAlgoToolkit; -using ShrlAlgoToolkit.RevitAddins; namespace ShrlAlgoToolkit.RevitAddins.General; @@ -20,18 +18,18 @@ public class AutoSaveCmd : ExternalCommand return; } AutoSaveViewModel viewModel = new(); - General.AutoSaveView view = new() + AutoSaveView view = new() { DataContext = viewModel }; view.ShowDialog(); - if (RevitAddins.Properties.Settings.Default.IsActiveAutoSave) + if (Properties.Settings.Default.IsActiveAutoSave) { - if (RevitAddins.Properties.Settings.Default.AutoSaveIntervalTime >= 1) + if (Properties.Settings.Default.AutoSaveIntervalTime >= 1) { - timer.Interval = RevitAddins.Properties.Settings.Default.AutoSaveIntervalTime * 60 * 1000; - RevitAddins.Properties.Settings.Default.Save(); + timer.Interval = Properties.Settings.Default.AutoSaveIntervalTime * 60 * 1000; + Properties.Settings.Default.Save(); } //timer.Enabled = Properties.Settings.Default.AutoSave; timer.Start(); diff --git a/ShrlAlgoToolkit.RevitAddins/General/AutoSaveView.xaml.cs b/ShrlAlgoToolkit.RevitAddins/General/AutoSaveView.xaml.cs index 64383b7..4cfa7f5 100644 --- a/ShrlAlgoToolkit.RevitAddins/General/AutoSaveView.xaml.cs +++ b/ShrlAlgoToolkit.RevitAddins/General/AutoSaveView.xaml.cs @@ -1,9 +1,5 @@ using Melskin.Controls; -using ShrlAlgoToolkit.RevitAddins.RvCommon; -using ShrlAlgoToolkit; -using ShrlAlgoToolkit.RevitAddins; - namespace ShrlAlgoToolkit.RevitAddins.General; /// diff --git a/ShrlAlgoToolkit.RevitAddins/General/AutoSaveViewModel.cs b/ShrlAlgoToolkit.RevitAddins/General/AutoSaveViewModel.cs index 5e8f5e4..f0402a0 100644 --- a/ShrlAlgoToolkit.RevitAddins/General/AutoSaveViewModel.cs +++ b/ShrlAlgoToolkit.RevitAddins/General/AutoSaveViewModel.cs @@ -9,8 +9,8 @@ public partial class AutoSaveViewModel : ObservableValidator { public AutoSaveViewModel() { - IsActiveAutoSave = RevitAddins.Properties.Settings.Default.IsActiveAutoSave; - IntervalTime = RevitAddins.Properties.Settings.Default.AutoSaveIntervalTime; + IsActiveAutoSave = Properties.Settings.Default.IsActiveAutoSave; + IntervalTime = Properties.Settings.Default.AutoSaveIntervalTime; } [ObservableProperty] public partial bool IsActiveAutoSave { get; set; } @@ -30,9 +30,9 @@ public partial class AutoSaveViewModel : ObservableValidator [RelayCommand] private void Closing() { - RevitAddins.Properties.Settings.Default.IsActiveAutoSave = IsActiveAutoSave; - RevitAddins.Properties.Settings.Default.AutoSaveIntervalTime = IntervalTime; - RevitAddins.Properties.Settings.Default.Save(); + Properties.Settings.Default.IsActiveAutoSave = IsActiveAutoSave; + Properties.Settings.Default.AutoSaveIntervalTime = IntervalTime; + Properties.Settings.Default.Save(); Variables.AutoSaveTimer.Interval = IntervalTime * 60 * 1000; } } \ No newline at end of file diff --git a/ShrlAlgoToolkit.RevitAddins/General/DetailSelectFiltersView.xaml.cs b/ShrlAlgoToolkit.RevitAddins/General/DetailSelectFiltersView.xaml.cs index 1ffe555..a54115f 100644 --- a/ShrlAlgoToolkit.RevitAddins/General/DetailSelectFiltersView.xaml.cs +++ b/ShrlAlgoToolkit.RevitAddins/General/DetailSelectFiltersView.xaml.cs @@ -1,9 +1,5 @@ using Melskin.Controls; -using ShrlAlgoToolkit.RevitAddins.RvCommon; -using ShrlAlgoToolkit; -using ShrlAlgoToolkit.RevitAddins; - namespace ShrlAlgoToolkit.RevitAddins.General { /// diff --git a/ShrlAlgoToolkit.RevitAddins/General/PureModelCmd.cs b/ShrlAlgoToolkit.RevitAddins/General/PureModelCmd.cs index 36e1503..146d0a8 100644 --- a/ShrlAlgoToolkit.RevitAddins/General/PureModelCmd.cs +++ b/ShrlAlgoToolkit.RevitAddins/General/PureModelCmd.cs @@ -5,10 +5,6 @@ using Autodesk.Revit.DB; using eTransmitForRevitDB; using Nice3point.Revit.Toolkit.External; -using ShrlAlgoToolkit.RevitAddins.RvCommon; -using ShrlAlgoToolkit; -using ShrlAlgoToolkit.RevitAddins; - namespace ShrlAlgoToolkit.RevitAddins.General; /// @@ -21,7 +17,7 @@ public class PureModelCmd : ExternalCommand { if (string.IsNullOrEmpty(Document.PathName)) { - System.Windows.MessageBox.Show("请先保存文件"); + MessageBox.Show("请先保存文件"); return; } var result = MessageBox.Show("是否清理项目中的所有未使用项", "询问", MessageBoxButton.YesNo, MessageBoxImage.Question); @@ -39,7 +35,7 @@ public class PureModelCmd : ExternalCommand { Purge(Document); Document.SaveAs(Document.PathName, options); - System.Windows.MessageBox.Show("清理完成", "提示"); + MessageBox.Show("清理完成", "提示"); } catch (Exception) { diff --git a/ShrlAlgoToolkit.RevitAddins/General/SeparateModelCmd.cs b/ShrlAlgoToolkit.RevitAddins/General/SeparateModelCmd.cs index 00c796e..0f71f71 100644 --- a/ShrlAlgoToolkit.RevitAddins/General/SeparateModelCmd.cs +++ b/ShrlAlgoToolkit.RevitAddins/General/SeparateModelCmd.cs @@ -1,9 +1,6 @@ using Autodesk.Revit.Attributes; using Nice3point.Revit.Toolkit.External; using ShrlAlgoToolkit.RevitAddins.Common.Assists; -using ShrlAlgoToolkit.RevitAddins.ModelManager; -using ShrlAlgoToolkit; -using ShrlAlgoToolkit.RevitAddins; namespace ShrlAlgoToolkit.RevitAddins.General; [Transaction(TransactionMode.Manual)] @@ -13,6 +10,6 @@ public class SeparateModelCmd : ExternalCommand { //var win = new SeparateModelWin(); //win.Show(); - Common.Assists.WinDialogAssist.ShowOrActivate(); + WinDialogAssist.ShowOrActivate(); } } \ No newline at end of file diff --git a/ShrlAlgoToolkit.RevitAddins/General/SeparateModelViewModel.cs b/ShrlAlgoToolkit.RevitAddins/General/SeparateModelViewModel.cs index 52a9180..0c16bd1 100644 --- a/ShrlAlgoToolkit.RevitAddins/General/SeparateModelViewModel.cs +++ b/ShrlAlgoToolkit.RevitAddins/General/SeparateModelViewModel.cs @@ -6,10 +6,6 @@ using CommunityToolkit.Mvvm.Input; using Nice3point.Revit.Toolkit.External.Handlers; using UIFrameworkServices; -using ShrlAlgoToolkit.RevitAddins.ModelManager; -using ShrlAlgoToolkit; -using ShrlAlgoToolkit.RevitAddins; - namespace ShrlAlgoToolkit.RevitAddins.General { public partial class SeparateModelViewModel : ObservableObject diff --git a/ShrlAlgoToolkit.RevitAddins/General/SeparateModelWin.xaml.cs b/ShrlAlgoToolkit.RevitAddins/General/SeparateModelWin.xaml.cs index dc34b80..85c4cd6 100644 --- a/ShrlAlgoToolkit.RevitAddins/General/SeparateModelWin.xaml.cs +++ b/ShrlAlgoToolkit.RevitAddins/General/SeparateModelWin.xaml.cs @@ -1,9 +1,5 @@ using Melskin.Controls; -using ShrlAlgoToolkit.RevitAddins.ModelManager; -using ShrlAlgoToolkit; -using ShrlAlgoToolkit.RevitAddins; - namespace ShrlAlgoToolkit.RevitAddins.General; /// /// SeparateModelWin.xaml 的交互逻辑 diff --git a/ShrlAlgoToolkit.RevitAddins/Mep/AddInsulationCmd.cs b/ShrlAlgoToolkit.RevitAddins/Mep/AddInsulationCmd.cs index 0ae7bec..7cb89b6 100644 --- a/ShrlAlgoToolkit.RevitAddins/Mep/AddInsulationCmd.cs +++ b/ShrlAlgoToolkit.RevitAddins/Mep/AddInsulationCmd.cs @@ -1,9 +1,6 @@ using Autodesk.Revit.Attributes; using Nice3point.Revit.Toolkit.External; using ShrlAlgoToolkit.RevitAddins.Common.Assists; -using ShrlAlgoToolkit.RevitAddins.RvMEP; -using ShrlAlgoToolkit; -using ShrlAlgoToolkit.RevitAddins; namespace ShrlAlgoToolkit.RevitAddins.Mep; [Transaction(TransactionMode.Manual)] @@ -11,6 +8,6 @@ public class AddInsulationCmd : ExternalCommand { public override void Execute() { - Common.Assists.WinDialogAssist.ShowOrActivate(Document); + WinDialogAssist.ShowOrActivate(Document); } } \ No newline at end of file diff --git a/ShrlAlgoToolkit.RevitAddins/Mep/AddInsulationView.xaml.cs b/ShrlAlgoToolkit.RevitAddins/Mep/AddInsulationView.xaml.cs index 6341143..10470c5 100644 --- a/ShrlAlgoToolkit.RevitAddins/Mep/AddInsulationView.xaml.cs +++ b/ShrlAlgoToolkit.RevitAddins/Mep/AddInsulationView.xaml.cs @@ -1,8 +1,4 @@ -using ShrlAlgoToolkit.RevitAddins.RvMEP; -using ShrlAlgoToolkit; -using ShrlAlgoToolkit.RevitAddins; - -namespace ShrlAlgoToolkit.RevitAddins.Mep; +namespace ShrlAlgoToolkit.RevitAddins.Mep; /// /// AddInsulationView.xaml 的交互逻辑 /// diff --git a/ShrlAlgoToolkit.RevitAddins/Mep/AddInsulationViewModel.cs b/ShrlAlgoToolkit.RevitAddins/Mep/AddInsulationViewModel.cs index 6df5fd1..df15a90 100644 --- a/ShrlAlgoToolkit.RevitAddins/Mep/AddInsulationViewModel.cs +++ b/ShrlAlgoToolkit.RevitAddins/Mep/AddInsulationViewModel.cs @@ -6,8 +6,6 @@ using CommunityToolkit.Mvvm.Input; using Nice3point.Revit.Toolkit.External.Handlers; using ShrlAlgoToolkit.RevitAddins.RvMEP; -using ShrlAlgoToolkit; -using ShrlAlgoToolkit.RevitAddins; namespace ShrlAlgoToolkit.RevitAddins.Mep { @@ -16,11 +14,11 @@ namespace ShrlAlgoToolkit.RevitAddins.Mep private readonly ActionEventHandler addInsulationHandler = new(); [ObservableProperty] - [NotifyCanExecuteChangedFor(nameof(Mep.AddInsulationViewModel.AddInsulationCommand))] + [NotifyCanExecuteChangedFor(nameof(AddInsulationCommand))] public partial bool AddToDuct { get; set; } [ObservableProperty] - [NotifyCanExecuteChangedFor(nameof(Mep.AddInsulationViewModel.AddInsulationCommand))] + [NotifyCanExecuteChangedFor(nameof(AddInsulationCommand))] public partial bool AddToPipe { get; set; } /// @@ -39,14 +37,14 @@ namespace ShrlAlgoToolkit.RevitAddins.Mep /// 选中的风管系统类型 /// [ObservableProperty] - [NotifyCanExecuteChangedFor(nameof(Mep.AddInsulationViewModel.AddInsulationCommand))] + [NotifyCanExecuteChangedFor(nameof(AddInsulationCommand))] private MechanicalSystemType selectedDuctSystem; /// /// 选中的管道系统类型 /// [ObservableProperty] - [NotifyCanExecuteChangedFor(nameof(Mep.AddInsulationViewModel.AddInsulationCommand))] + [NotifyCanExecuteChangedFor(nameof(AddInsulationCommand))] private PipingSystemType selectedPipingSystemType; public AddInsulationViewModel(Document doc) @@ -91,7 +89,7 @@ namespace ShrlAlgoToolkit.RevitAddins.Mep (elem is FamilyInstance instance && instance.Category.Id.IntegerValue == -2008010)) { - Autodesk.Revit.DB.Mechanical.DuctInsulation + DuctInsulation .Create( doc, elem.Id, @@ -145,7 +143,7 @@ namespace ShrlAlgoToolkit.RevitAddins.Mep { if (pipeInsulation != null) { - Autodesk.Revit.DB.Plumbing.PipeInsulation + PipeInsulation .Create( doc, elem.Id, diff --git a/ShrlAlgoToolkit.RevitAddins/Mep/AlignMEPCurvesToSlabCmd.cs b/ShrlAlgoToolkit.RevitAddins/Mep/AlignMEPCurvesToSlabCmd.cs index acc06b5..1f571b5 100644 --- a/ShrlAlgoToolkit.RevitAddins/Mep/AlignMEPCurvesToSlabCmd.cs +++ b/ShrlAlgoToolkit.RevitAddins/Mep/AlignMEPCurvesToSlabCmd.cs @@ -1,8 +1,5 @@ using Autodesk.Revit.Attributes; using Autodesk.Revit.DB; -using Autodesk.Revit.DB.Electrical; -using Autodesk.Revit.DB.Plumbing; -using Autodesk.Revit.UI; using Autodesk.Revit.UI.Selection; namespace ShrlAlgo.Addin.Test diff --git a/ShrlAlgoToolkit.RevitAddins/Mep/AnyConnectCmd.cs b/ShrlAlgoToolkit.RevitAddins/Mep/AnyConnectCmd.cs index 7137d6d..b973b97 100644 --- a/ShrlAlgoToolkit.RevitAddins/Mep/AnyConnectCmd.cs +++ b/ShrlAlgoToolkit.RevitAddins/Mep/AnyConnectCmd.cs @@ -2,8 +2,6 @@ using Nice3point.Revit.Toolkit.External; using ShrlAlgoToolkit.RevitAddins.Common.Assists; using ShrlAlgoToolkit.RevitAddins.RvMEP; -using ShrlAlgoToolkit; -using ShrlAlgoToolkit.RevitAddins; namespace ShrlAlgoToolkit.RevitAddins.Mep; @@ -13,7 +11,7 @@ public class AnyConnectCmd : ExternalCommand public override void Execute() { #if REVIT2018 - Common.Assists.WinDialogAssist.ShowOrActivate(); + WinDialogAssist.ShowOrActivate(); #elif REVIT2020 OptionsBarAssist.RegisterOptionsBar((AutoConnectOptionsView view, AnyConnectViewModel viewModel) => { diff --git a/ShrlAlgoToolkit.RevitAddins/Mep/AnyConnectView.xaml.cs b/ShrlAlgoToolkit.RevitAddins/Mep/AnyConnectView.xaml.cs index 3c3dd69..bddcbed 100644 --- a/ShrlAlgoToolkit.RevitAddins/Mep/AnyConnectView.xaml.cs +++ b/ShrlAlgoToolkit.RevitAddins/Mep/AnyConnectView.xaml.cs @@ -1,8 +1,4 @@ -using ShrlAlgoToolkit.RevitAddins.RvMEP; -using ShrlAlgoToolkit; -using ShrlAlgoToolkit.RevitAddins; - -namespace ShrlAlgoToolkit.RevitAddins.Mep +namespace ShrlAlgoToolkit.RevitAddins.Mep { /// /// AnyConnectView.xaml 的交互逻辑 diff --git a/ShrlAlgoToolkit.RevitAddins/Mep/AnyConnectViewModel.cs b/ShrlAlgoToolkit.RevitAddins/Mep/AnyConnectViewModel.cs index 85477a7..143b0d8 100644 --- a/ShrlAlgoToolkit.RevitAddins/Mep/AnyConnectViewModel.cs +++ b/ShrlAlgoToolkit.RevitAddins/Mep/AnyConnectViewModel.cs @@ -30,7 +30,7 @@ public partial class AnyConnectViewModel : ObservableValidator public partial bool IsMultiSelect { get; set; } = true; [ObservableProperty] - [NotifyCanExecuteChangedFor(nameof(RevitAddins.RvMEP.AnyConnectViewModel.ConnectCommand))] + [NotifyCanExecuteChangedFor(nameof(ConnectCommand))] public partial bool CanRunning { get; set; } = true; [ObservableProperty] @@ -54,7 +54,7 @@ public partial class AnyConnectViewModel : ObservableValidator KeyIntPtrHelper.RaiseEscTwice(); } - [RelayCommand(CanExecute = nameof(RevitAddins.RvMEP.AnyConnectViewModel.CanRunning))] + [RelayCommand(CanExecute = nameof(CanRunning))] private void Connect() { CanRunning = false; diff --git a/ShrlAlgoToolkit.RevitAddins/Mep/ArrangeMEPCurveCmd.cs b/ShrlAlgoToolkit.RevitAddins/Mep/ArrangeMEPCurveCmd.cs index 5bd4361..fe5deb5 100644 --- a/ShrlAlgoToolkit.RevitAddins/Mep/ArrangeMEPCurveCmd.cs +++ b/ShrlAlgoToolkit.RevitAddins/Mep/ArrangeMEPCurveCmd.cs @@ -1,9 +1,6 @@ using Autodesk.Revit.Attributes; using Nice3point.Revit.Toolkit.External; using ShrlAlgoToolkit.RevitAddins.Common.Assists; -using ShrlAlgoToolkit.RevitAddins.RvMEP; -using ShrlAlgoToolkit; -using ShrlAlgoToolkit.RevitAddins; namespace ShrlAlgoToolkit.RevitAddins.Mep; @@ -12,6 +9,6 @@ internal class ArrangeMEPCurveCmd : ExternalCommand { public override void Execute() { - Common.Assists.WinDialogAssist.ShowOrActivate(); + WinDialogAssist.ShowOrActivate(); } } diff --git a/ShrlAlgoToolkit.RevitAddins/Mep/ArrangeMEPCurveView.xaml.cs b/ShrlAlgoToolkit.RevitAddins/Mep/ArrangeMEPCurveView.xaml.cs index eb776a1..6a7d154 100644 --- a/ShrlAlgoToolkit.RevitAddins/Mep/ArrangeMEPCurveView.xaml.cs +++ b/ShrlAlgoToolkit.RevitAddins/Mep/ArrangeMEPCurveView.xaml.cs @@ -1,8 +1,4 @@ -using ShrlAlgoToolkit.RevitAddins.RvMEP; -using ShrlAlgoToolkit; -using ShrlAlgoToolkit.RevitAddins; - -namespace ShrlAlgoToolkit.RevitAddins.Mep; +namespace ShrlAlgoToolkit.RevitAddins.Mep; /// /// ArrangeMEPCurveView.xaml 的交互逻辑 /// diff --git a/ShrlAlgoToolkit.RevitAddins/Mep/ArrangeMEPCurveViewModel.cs b/ShrlAlgoToolkit.RevitAddins/Mep/ArrangeMEPCurveViewModel.cs index 09bab58..c5b32c2 100644 --- a/ShrlAlgoToolkit.RevitAddins/Mep/ArrangeMEPCurveViewModel.cs +++ b/ShrlAlgoToolkit.RevitAddins/Mep/ArrangeMEPCurveViewModel.cs @@ -7,10 +7,6 @@ using CommunityToolkit.Mvvm.ComponentModel; using CommunityToolkit.Mvvm.Input; using Nice3point.Revit.Toolkit.External.Handlers; -using ShrlAlgoToolkit.RevitAddins.RvMEP; -using ShrlAlgoToolkit; -using ShrlAlgoToolkit.RevitAddins; - namespace ShrlAlgoToolkit.RevitAddins.Mep { public partial class ArrangeMEPCurveViewModel : ObservableObject @@ -70,7 +66,7 @@ namespace ShrlAlgoToolkit.RevitAddins.Mep //移除基准 ids.Remove(baseId); - List arranges = []; + List arranges = []; foreach (var id in ids) { var elem = doc.GetElement(id); @@ -84,7 +80,7 @@ namespace ShrlAlgoToolkit.RevitAddins.Mep var project = baseLine.Project(l.Origin).XYZPoint; var vector = l.Origin.Flatten() - project.Flatten(); - var ae = new Mep.ArrangeElement + var ae = new ArrangeElement { ElementToMove = elem, //用来确定与基准管线的位置和方向 diff --git a/ShrlAlgoToolkit.RevitAddins/Mep/AutoConnectOptionsView.xaml.cs b/ShrlAlgoToolkit.RevitAddins/Mep/AutoConnectOptionsView.xaml.cs index 392e682..e5141fb 100644 --- a/ShrlAlgoToolkit.RevitAddins/Mep/AutoConnectOptionsView.xaml.cs +++ b/ShrlAlgoToolkit.RevitAddins/Mep/AutoConnectOptionsView.xaml.cs @@ -1,8 +1,4 @@ -using ShrlAlgoToolkit.RevitAddins.RvMEP; -using ShrlAlgoToolkit; -using ShrlAlgoToolkit.RevitAddins; - -namespace ShrlAlgoToolkit.RevitAddins.Mep; +namespace ShrlAlgoToolkit.RevitAddins.Mep; /// /// AutoConnectOptionsView.xaml 的交互逻辑 /// diff --git a/ShrlAlgoToolkit.RevitAddins/Mep/BloomConnectorCmd.cs b/ShrlAlgoToolkit.RevitAddins/Mep/BloomConnectorCmd.cs index 95def76..b330c64 100644 --- a/ShrlAlgoToolkit.RevitAddins/Mep/BloomConnectorCmd.cs +++ b/ShrlAlgoToolkit.RevitAddins/Mep/BloomConnectorCmd.cs @@ -6,10 +6,6 @@ using Autodesk.Revit.DB.Plumbing; using Autodesk.Revit.UI.Selection; using Nice3point.Revit.Toolkit.External; -using ShrlAlgoToolkit.RevitAddins.RvMEP; -using ShrlAlgoToolkit; -using ShrlAlgoToolkit.RevitAddins; - namespace ShrlAlgoToolkit.RevitAddins.Mep; [Autodesk.Revit.Attributes.Transaction(Autodesk.Revit.Attributes.TransactionMode.Manual)] diff --git a/ShrlAlgoToolkit.RevitAddins/Mep/BreakMEPCurveCmd.cs b/ShrlAlgoToolkit.RevitAddins/Mep/BreakMEPCurveCmd.cs index 1cceb37..7108c47 100644 --- a/ShrlAlgoToolkit.RevitAddins/Mep/BreakMEPCurveCmd.cs +++ b/ShrlAlgoToolkit.RevitAddins/Mep/BreakMEPCurveCmd.cs @@ -6,10 +6,6 @@ using Autodesk.Revit.DB.Plumbing; using Autodesk.Revit.UI.Selection; using Nice3point.Revit.Toolkit.External; -using ShrlAlgoToolkit.RevitAddins.RvMEP; -using ShrlAlgoToolkit; -using ShrlAlgoToolkit.RevitAddins; - namespace ShrlAlgoToolkit.RevitAddins.Mep; /// diff --git a/ShrlAlgoToolkit.RevitAddins/Mep/CableLayoutCmd.cs b/ShrlAlgoToolkit.RevitAddins/Mep/CableLayoutCmd.cs index 6ecf2ea..51cfda1 100644 --- a/ShrlAlgoToolkit.RevitAddins/Mep/CableLayoutCmd.cs +++ b/ShrlAlgoToolkit.RevitAddins/Mep/CableLayoutCmd.cs @@ -4,10 +4,6 @@ using Autodesk.Revit.DB.Electrical; using Autodesk.Revit.UI.Selection; using Nice3point.Revit.Toolkit.External; -using ShrlAlgoToolkit.RevitAddins.RvMEP; -using ShrlAlgoToolkit; -using ShrlAlgoToolkit.RevitAddins; - namespace ShrlAlgoToolkit.RevitAddins.Mep; [Transaction(TransactionMode.Manual)] diff --git a/ShrlAlgoToolkit.RevitAddins/Mep/CableLayoutView.xaml.cs b/ShrlAlgoToolkit.RevitAddins/Mep/CableLayoutView.xaml.cs index 7756f38..a7e8989 100644 --- a/ShrlAlgoToolkit.RevitAddins/Mep/CableLayoutView.xaml.cs +++ b/ShrlAlgoToolkit.RevitAddins/Mep/CableLayoutView.xaml.cs @@ -1,8 +1,6 @@ using Autodesk.Revit.DB; using ShrlAlgoToolkit.RevitAddins.RvMEP; -using ShrlAlgoToolkit; -using ShrlAlgoToolkit.RevitAddins; namespace ShrlAlgoToolkit.RevitAddins.Mep; diff --git a/ShrlAlgoToolkit.RevitAddins/Mep/ClashReportCmd.cs b/ShrlAlgoToolkit.RevitAddins/Mep/ClashReportCmd.cs index 346c6b0..07e1727 100644 --- a/ShrlAlgoToolkit.RevitAddins/Mep/ClashReportCmd.cs +++ b/ShrlAlgoToolkit.RevitAddins/Mep/ClashReportCmd.cs @@ -1,9 +1,6 @@ using Autodesk.Revit.Attributes; using Nice3point.Revit.Toolkit.External; using ShrlAlgoToolkit.RevitAddins.Common.Assists; -using ShrlAlgoToolkit.RevitAddins.RvMEP; -using ShrlAlgoToolkit; -using ShrlAlgoToolkit.RevitAddins; namespace ShrlAlgoToolkit.RevitAddins.Mep; @@ -15,6 +12,6 @@ public class ClashReportCmd : ExternalCommand { public override void Execute() { - Common.Assists.WinDialogAssist.ShowOrActivate(UiApplication); + WinDialogAssist.ShowOrActivate(UiApplication); } } diff --git a/ShrlAlgoToolkit.RevitAddins/Mep/ClashReportView.xaml.cs b/ShrlAlgoToolkit.RevitAddins/Mep/ClashReportView.xaml.cs index f405a94..e248fd5 100644 --- a/ShrlAlgoToolkit.RevitAddins/Mep/ClashReportView.xaml.cs +++ b/ShrlAlgoToolkit.RevitAddins/Mep/ClashReportView.xaml.cs @@ -1,8 +1,4 @@ -using ShrlAlgoToolkit.RevitAddins.RvMEP; -using ShrlAlgoToolkit; -using ShrlAlgoToolkit.RevitAddins; - -namespace ShrlAlgoToolkit.RevitAddins.Mep; +namespace ShrlAlgoToolkit.RevitAddins.Mep; /// /// ClashReportView.xaml 的交互逻辑 diff --git a/ShrlAlgoToolkit.RevitAddins/Mep/ClashReportViewModel.cs b/ShrlAlgoToolkit.RevitAddins/Mep/ClashReportViewModel.cs index 4601bbf..3c99f65 100644 --- a/ShrlAlgoToolkit.RevitAddins/Mep/ClashReportViewModel.cs +++ b/ShrlAlgoToolkit.RevitAddins/Mep/ClashReportViewModel.cs @@ -10,16 +10,12 @@ using HtmlAgilityPack; using Microsoft.Win32; using Nice3point.Revit.Toolkit.External.Handlers; -using ShrlAlgoToolkit.RevitAddins.RvMEP; -using ShrlAlgoToolkit; -using ShrlAlgoToolkit.RevitAddins; - namespace ShrlAlgoToolkit.RevitAddins.Mep; public partial class ClashReportViewModel(UIApplication uiapp) : ObservableObject { [ObservableProperty] - [NotifyCanExecuteChangedFor(nameof(Mep.ClashReportViewModel.RefreshCommand))] + [NotifyCanExecuteChangedFor(nameof(RefreshCommand))] public partial string FilePathName { get; set; } public UIApplication UiApp { get; set; } = uiapp; diff --git a/ShrlAlgoToolkit.RevitAddins/Mep/ClashResolveCmd.cs b/ShrlAlgoToolkit.RevitAddins/Mep/ClashResolveCmd.cs index aa25413..e277077 100644 --- a/ShrlAlgoToolkit.RevitAddins/Mep/ClashResolveCmd.cs +++ b/ShrlAlgoToolkit.RevitAddins/Mep/ClashResolveCmd.cs @@ -2,8 +2,6 @@ using Nice3point.Revit.Toolkit.External; using ShrlAlgoToolkit.RevitAddins.Common.Assists; using ShrlAlgoToolkit.RevitAddins.RvMEP; -using ShrlAlgoToolkit; -using ShrlAlgoToolkit.RevitAddins; namespace ShrlAlgoToolkit.RevitAddins.Mep; @@ -14,7 +12,7 @@ public class ClashResolveCmd : ExternalCommand { try { - Common.Assists.WinDialogAssist.ShowOrActivate(); + WinDialogAssist.ShowOrActivate(); } catch (Exception) { diff --git a/ShrlAlgoToolkit.RevitAddins/Mep/ClashResolveView.xaml.cs b/ShrlAlgoToolkit.RevitAddins/Mep/ClashResolveView.xaml.cs index 03ab1be..e36acd2 100644 --- a/ShrlAlgoToolkit.RevitAddins/Mep/ClashResolveView.xaml.cs +++ b/ShrlAlgoToolkit.RevitAddins/Mep/ClashResolveView.xaml.cs @@ -1,8 +1,4 @@ -using ShrlAlgoToolkit.RevitAddins.RvMEP; -using ShrlAlgoToolkit; -using ShrlAlgoToolkit.RevitAddins; - -namespace ShrlAlgoToolkit.RevitAddins.Mep +namespace ShrlAlgoToolkit.RevitAddins.Mep { /// /// ClashResolveView.xaml 的交互逻辑 diff --git a/ShrlAlgoToolkit.RevitAddins/Mep/ClashResolveViewModel.cs b/ShrlAlgoToolkit.RevitAddins/Mep/ClashResolveViewModel.cs index 395f9e4..6cb3ab1 100644 --- a/ShrlAlgoToolkit.RevitAddins/Mep/ClashResolveViewModel.cs +++ b/ShrlAlgoToolkit.RevitAddins/Mep/ClashResolveViewModel.cs @@ -21,7 +21,7 @@ public partial class ClashResolveViewModel : ObservableObject /// 正在执行命令 /// [ObservableProperty] - [NotifyCanExecuteChangedFor(nameof(RevitAddins.RvMEP.ClashResolveViewModel.ResolveCommand))] + [NotifyCanExecuteChangedFor(nameof(ResolveCommand))] public partial bool CanRunning { get; set; } = true; [ObservableProperty] @@ -44,7 +44,7 @@ public partial class ClashResolveViewModel : ObservableObject KeyIntPtrHelper.RaiseEscTwice(); } - [RelayCommand(CanExecute = nameof(RevitAddins.RvMEP.ClashResolveViewModel.CanRunning))] + [RelayCommand(CanExecute = nameof(CanRunning))] private void Resolve() { CanRunning = false; diff --git a/ShrlAlgoToolkit.RevitAddins/Mep/CorrectMEPCurveSlopeCmd.cs b/ShrlAlgoToolkit.RevitAddins/Mep/CorrectMEPCurveSlopeCmd.cs index aef5206..5539440 100644 --- a/ShrlAlgoToolkit.RevitAddins/Mep/CorrectMEPCurveSlopeCmd.cs +++ b/ShrlAlgoToolkit.RevitAddins/Mep/CorrectMEPCurveSlopeCmd.cs @@ -5,10 +5,6 @@ using Autodesk.Revit.DB.Mechanical; using Autodesk.Revit.DB.Plumbing; using Nice3point.Revit.Toolkit.External; -using ShrlAlgoToolkit.RevitAddins.RvMEP; -using ShrlAlgoToolkit; -using ShrlAlgoToolkit.RevitAddins; - namespace ShrlAlgoToolkit.RevitAddins.Mep; [Transaction(TransactionMode.Manual)] diff --git a/ShrlAlgoToolkit.RevitAddins/Mep/DisconnectCmd.cs b/ShrlAlgoToolkit.RevitAddins/Mep/DisconnectCmd.cs index cf684cc..5b852ce 100644 --- a/ShrlAlgoToolkit.RevitAddins/Mep/DisconnectCmd.cs +++ b/ShrlAlgoToolkit.RevitAddins/Mep/DisconnectCmd.cs @@ -2,10 +2,6 @@ using Autodesk.Revit.DB; using Nice3point.Revit.Toolkit.External; -using ShrlAlgoToolkit.RevitAddins.RvMEP; -using ShrlAlgoToolkit; -using ShrlAlgoToolkit.RevitAddins; - namespace ShrlAlgoToolkit.RevitAddins.Mep; [Transaction(TransactionMode.Manual)] diff --git a/ShrlAlgoToolkit.RevitAddins/Mep/FlipWorkplaneCmd.cs b/ShrlAlgoToolkit.RevitAddins/Mep/FlipWorkplaneCmd.cs index 49f4fd8..9d4a1b9 100644 --- a/ShrlAlgoToolkit.RevitAddins/Mep/FlipWorkplaneCmd.cs +++ b/ShrlAlgoToolkit.RevitAddins/Mep/FlipWorkplaneCmd.cs @@ -3,10 +3,6 @@ using Autodesk.Revit.DB; using Nice3point.Revit.Toolkit.External; -using ShrlAlgoToolkit.RevitAddins.RvMEP; -using ShrlAlgoToolkit; -using ShrlAlgoToolkit.RevitAddins; - namespace ShrlAlgoToolkit.RevitAddins.Mep { [Transaction(TransactionMode.Manual)] diff --git a/ShrlAlgoToolkit.RevitAddins/Mep/ForceConnectCmd.cs b/ShrlAlgoToolkit.RevitAddins/Mep/ForceConnectCmd.cs index 2db3b54..45db3bd 100644 --- a/ShrlAlgoToolkit.RevitAddins/Mep/ForceConnectCmd.cs +++ b/ShrlAlgoToolkit.RevitAddins/Mep/ForceConnectCmd.cs @@ -3,10 +3,6 @@ using Autodesk.Revit.DB; using Autodesk.Revit.DB.Plumbing; using Nice3point.Revit.Toolkit.External; -using ShrlAlgoToolkit.RevitAddins.RvMEP; -using ShrlAlgoToolkit; -using ShrlAlgoToolkit.RevitAddins; - namespace ShrlAlgoToolkit.RevitAddins.Mep; [Transaction(TransactionMode.Manual)] diff --git a/ShrlAlgoToolkit.RevitAddins/Mep/HeadroomCheckCmd.cs b/ShrlAlgoToolkit.RevitAddins/Mep/HeadroomCheckCmd.cs index e1fcb52..6d85d33 100644 --- a/ShrlAlgoToolkit.RevitAddins/Mep/HeadroomCheckCmd.cs +++ b/ShrlAlgoToolkit.RevitAddins/Mep/HeadroomCheckCmd.cs @@ -7,9 +7,6 @@ using Nice3point.Revit.Toolkit.External; using ShrlAlgoToolkit.RevitAddins.Common.Assists; using ShrlAlgoToolkit.RevitAddins.Common.Controls; -using ShrlAlgoToolkit.RevitAddins.RvMEP; -using ShrlAlgoToolkit; -using ShrlAlgoToolkit.RevitAddins; namespace ShrlAlgoToolkit.RevitAddins.Mep; @@ -117,12 +114,12 @@ public class HeadroomCheckCmd : ExternalCommand viewmodel.Footer = $"最低净高={Math.Round(minHeadroom * 304.8)}mm,元素：{element.Name},Id：{element.Id}"; UiDocument.Selection.SetElementIds(new List { element.Id }); } - Common.Assists.WinDialogAssist.ShowModeless(viewmodel); + WinDialogAssist.ShowModeless(viewmodel); } public override void Execute() { - Common.Assists.WinDialogAssist.ShowOrActivate(UiApplication); + WinDialogAssist.ShowOrActivate(UiApplication); //try //{ // InputMessageBox inputMessage = new("净高限制", "请输出净高要求高度（mm）"); diff --git a/ShrlAlgoToolkit.RevitAddins/Mep/HeadroomCheckView.xaml.cs b/ShrlAlgoToolkit.RevitAddins/Mep/HeadroomCheckView.xaml.cs index 1c7159d..cb17a95 100644 --- a/ShrlAlgoToolkit.RevitAddins/Mep/HeadroomCheckView.xaml.cs +++ b/ShrlAlgoToolkit.RevitAddins/Mep/HeadroomCheckView.xaml.cs @@ -1,8 +1,4 @@ -using ShrlAlgoToolkit.RevitAddins.RvMEP; -using ShrlAlgoToolkit; -using ShrlAlgoToolkit.RevitAddins; - -namespace ShrlAlgoToolkit.RevitAddins.Mep +namespace ShrlAlgoToolkit.RevitAddins.Mep { /// /// HeadroomCheckView.xaml 的交互逻辑 diff --git a/ShrlAlgoToolkit.RevitAddins/Mep/HeadroomCheckViewModel.cs b/ShrlAlgoToolkit.RevitAddins/Mep/HeadroomCheckViewModel.cs index 264faf4..6c83fe8 100644 --- a/ShrlAlgoToolkit.RevitAddins/Mep/HeadroomCheckViewModel.cs +++ b/ShrlAlgoToolkit.RevitAddins/Mep/HeadroomCheckViewModel.cs @@ -6,8 +6,6 @@ using CommunityToolkit.Mvvm.Input; using Nice3point.Revit.Toolkit.External.Handlers; using ShrlAlgoToolkit.RevitAddins.RvMEP; -using ShrlAlgoToolkit; -using ShrlAlgoToolkit.RevitAddins; //using RandomColorGenerator; diff --git a/ShrlAlgoToolkit.RevitAddins/Mep/MappingSystemCmd.cs b/ShrlAlgoToolkit.RevitAddins/Mep/MappingSystemCmd.cs index 1e7b364..3ff7898 100644 --- a/ShrlAlgoToolkit.RevitAddins/Mep/MappingSystemCmd.cs +++ b/ShrlAlgoToolkit.RevitAddins/Mep/MappingSystemCmd.cs @@ -1,11 +1,7 @@ -using System.Linq; - -using Autodesk.Revit.Attributes; +using Autodesk.Revit.Attributes; using Autodesk.Revit.DB; using Autodesk.Revit.DB.Mechanical; using Autodesk.Revit.DB.Plumbing; -using Autodesk.Revit.UI; -using Autodesk.Revit.UI.Selection; namespace Szmedi.Test { diff --git a/ShrlAlgoToolkit.RevitAddins/Mep/MoveConnectCmd.cs b/ShrlAlgoToolkit.RevitAddins/Mep/MoveConnectCmd.cs index e397cb9..8e11521 100644 --- a/ShrlAlgoToolkit.RevitAddins/Mep/MoveConnectCmd.cs +++ b/ShrlAlgoToolkit.RevitAddins/Mep/MoveConnectCmd.cs @@ -3,10 +3,6 @@ using Autodesk.Revit.Attributes; using Autodesk.Revit.DB; using Nice3point.Revit.Toolkit.External; -using ShrlAlgoToolkit.RevitAddins.RvMEP; -using ShrlAlgoToolkit; -using ShrlAlgoToolkit.RevitAddins; - namespace ShrlAlgoToolkit.RevitAddins.Mep; [Transaction(TransactionMode.Manual)] diff --git a/ShrlAlgoToolkit.RevitAddins/Mep/MoveMEPCmd.cs b/ShrlAlgoToolkit.RevitAddins/Mep/MoveMEPCmd.cs index 4fc03ae..1e4dabb 100644 --- a/ShrlAlgoToolkit.RevitAddins/Mep/MoveMEPCmd.cs +++ b/ShrlAlgoToolkit.RevitAddins/Mep/MoveMEPCmd.cs @@ -2,8 +2,6 @@ using Nice3point.Revit.Toolkit.External; using ShrlAlgoToolkit.RevitAddins.Common.Assists; using ShrlAlgoToolkit.RevitAddins.RvMEP; -using ShrlAlgoToolkit; -using ShrlAlgoToolkit.RevitAddins; namespace ShrlAlgoToolkit.RevitAddins.Mep; @@ -15,6 +13,6 @@ public class MoveMEPCmd : ExternalCommand { public override void Execute() { - Common.Assists.WinDialogAssist.ShowOrActivate(); + WinDialogAssist.ShowOrActivate(); } } diff --git a/ShrlAlgoToolkit.RevitAddins/Mep/MoveMEPCurveView.xaml.cs b/ShrlAlgoToolkit.RevitAddins/Mep/MoveMEPCurveView.xaml.cs index cc1929e..75387cc 100644 --- a/ShrlAlgoToolkit.RevitAddins/Mep/MoveMEPCurveView.xaml.cs +++ b/ShrlAlgoToolkit.RevitAddins/Mep/MoveMEPCurveView.xaml.cs @@ -1,8 +1,4 @@ -using ShrlAlgoToolkit.RevitAddins.RvMEP; -using ShrlAlgoToolkit; -using ShrlAlgoToolkit.RevitAddins; - -namespace ShrlAlgoToolkit.RevitAddins.Mep; +namespace ShrlAlgoToolkit.RevitAddins.Mep; /// /// MoveMEPCurveView.xaml 的交互逻辑 diff --git a/ShrlAlgoToolkit.RevitAddins/Mep/MoveMEPCurveViewModel.cs b/ShrlAlgoToolkit.RevitAddins/Mep/MoveMEPCurveViewModel.cs index eba7c44..42dbe96 100644 --- a/ShrlAlgoToolkit.RevitAddins/Mep/MoveMEPCurveViewModel.cs +++ b/ShrlAlgoToolkit.RevitAddins/Mep/MoveMEPCurveViewModel.cs @@ -32,7 +32,7 @@ public partial class MoveMEPCurveViewModel : ObservableValidator /// 正在执行命令 /// [ObservableProperty] - [NotifyCanExecuteChangedFor(nameof(RevitAddins.RvMEP.MoveMEPCurveViewModel.MoveCommand))] + [NotifyCanExecuteChangedFor(nameof(MoveCommand))] public partial bool CanRunning { get; set; } = true; [RelayCommand] diff --git a/ShrlAlgoToolkit.RevitAddins/Mep/RotateInstanceCmd.cs b/ShrlAlgoToolkit.RevitAddins/Mep/RotateInstanceCmd.cs index d6086d5..3b4bbf2 100644 --- a/ShrlAlgoToolkit.RevitAddins/Mep/RotateInstanceCmd.cs +++ b/ShrlAlgoToolkit.RevitAddins/Mep/RotateInstanceCmd.cs @@ -1,9 +1,6 @@ using Autodesk.Revit.Attributes; using Nice3point.Revit.Toolkit.External; using ShrlAlgoToolkit.RevitAddins.Common.Assists; -using ShrlAlgoToolkit.RevitAddins.RvMEP; -using ShrlAlgoToolkit; -using ShrlAlgoToolkit.RevitAddins; namespace ShrlAlgoToolkit.RevitAddins.Mep { @@ -12,7 +9,7 @@ namespace ShrlAlgoToolkit.RevitAddins.Mep { public override void Execute() { - Common.Assists.WinDialogAssist.ShowOrActivate(); + WinDialogAssist.ShowOrActivate(); } } } diff --git a/ShrlAlgoToolkit.RevitAddins/Mep/RotateMEPView.xaml.cs b/ShrlAlgoToolkit.RevitAddins/Mep/RotateMEPView.xaml.cs index 28402d7..63912b4 100644 --- a/ShrlAlgoToolkit.RevitAddins/Mep/RotateMEPView.xaml.cs +++ b/ShrlAlgoToolkit.RevitAddins/Mep/RotateMEPView.xaml.cs @@ -1,8 +1,4 @@ -using ShrlAlgoToolkit.RevitAddins.RvMEP; -using ShrlAlgoToolkit; -using ShrlAlgoToolkit.RevitAddins; - -namespace ShrlAlgoToolkit.RevitAddins.Mep +namespace ShrlAlgoToolkit.RevitAddins.Mep { /// /// RotateMEPView.xaml 的交互逻辑 diff --git a/ShrlAlgoToolkit.RevitAddins/Mep/RotateMEPViewModel.cs b/ShrlAlgoToolkit.RevitAddins/Mep/RotateMEPViewModel.cs index 6a5b187..909d8e3 100644 --- a/ShrlAlgoToolkit.RevitAddins/Mep/RotateMEPViewModel.cs +++ b/ShrlAlgoToolkit.RevitAddins/Mep/RotateMEPViewModel.cs @@ -6,10 +6,6 @@ using CommunityToolkit.Mvvm.Input; using Nice3point.Revit.Toolkit.External.Handlers; -using ShrlAlgoToolkit.RevitAddins.RvMEP; -using ShrlAlgoToolkit; -using ShrlAlgoToolkit.RevitAddins; - namespace ShrlAlgoToolkit.RevitAddins.Mep { public partial class RotateMEPViewModel : ObservableObject diff --git a/ShrlAlgoToolkit.RevitAddins/Mep/RotationAngle.cs b/ShrlAlgoToolkit.RevitAddins/Mep/RotationAngle.cs index 311251c..ecb082d 100644 --- a/ShrlAlgoToolkit.RevitAddins/Mep/RotationAngle.cs +++ b/ShrlAlgoToolkit.RevitAddins/Mep/RotationAngle.cs @@ -1,9 +1,5 @@ using System.ComponentModel; -using ShrlAlgoToolkit.RevitAddins.RvMEP; -using ShrlAlgoToolkit; -using ShrlAlgoToolkit.RevitAddins; - namespace ShrlAlgoToolkit.RevitAddins.Mep { public enum RotationAngle diff --git a/ShrlAlgoToolkit.RevitAddins/Mep/StandMepCurveCmd.cs b/ShrlAlgoToolkit.RevitAddins/Mep/StandMepCurveCmd.cs index c053190..de637dd 100644 --- a/ShrlAlgoToolkit.RevitAddins/Mep/StandMepCurveCmd.cs +++ b/ShrlAlgoToolkit.RevitAddins/Mep/StandMepCurveCmd.cs @@ -1,8 +1,5 @@ using Nice3point.Revit.Toolkit.External; using ShrlAlgoToolkit.RevitAddins.Common.Assists; -using ShrlAlgoToolkit.RevitAddins.RvMEP; -using ShrlAlgoToolkit; -using ShrlAlgoToolkit.RevitAddins; namespace ShrlAlgoToolkit.RevitAddins.Mep; @@ -12,6 +9,6 @@ public class StandMepCurveCmd : ExternalCommand { public override void Execute() { - Common.Assists.WinDialogAssist.ShowOrActivate(Document); + WinDialogAssist.ShowOrActivate(Document); } } diff --git a/ShrlAlgoToolkit.RevitAddins/Mep/StandMepCurveView.xaml.cs b/ShrlAlgoToolkit.RevitAddins/Mep/StandMepCurveView.xaml.cs index f264475..37b1e1b 100644 --- a/ShrlAlgoToolkit.RevitAddins/Mep/StandMepCurveView.xaml.cs +++ b/ShrlAlgoToolkit.RevitAddins/Mep/StandMepCurveView.xaml.cs @@ -1,8 +1,4 @@ -using ShrlAlgoToolkit.RevitAddins.RvMEP; -using ShrlAlgoToolkit; -using ShrlAlgoToolkit.RevitAddins; - -namespace ShrlAlgoToolkit.RevitAddins.Mep +namespace ShrlAlgoToolkit.RevitAddins.Mep { /// /// StandMepCurveView.xaml 的交互逻辑 diff --git a/ShrlAlgoToolkit.RevitAddins/Mep/StandMepCurveViewModel.cs b/ShrlAlgoToolkit.RevitAddins/Mep/StandMepCurveViewModel.cs index 82842bf..9950ebf 100644 --- a/ShrlAlgoToolkit.RevitAddins/Mep/StandMepCurveViewModel.cs +++ b/ShrlAlgoToolkit.RevitAddins/Mep/StandMepCurveViewModel.cs @@ -7,10 +7,6 @@ using CommunityToolkit.Mvvm.ComponentModel; using CommunityToolkit.Mvvm.Input; using Nice3point.Revit.Toolkit.External.Handlers; -using ShrlAlgoToolkit.RevitAddins.RvMEP; -using ShrlAlgoToolkit; -using ShrlAlgoToolkit.RevitAddins; - namespace ShrlAlgoToolkit.RevitAddins.Mep; public partial class StandMepCurveViewModel : ObservableObject @@ -37,23 +33,23 @@ public partial class StandMepCurveViewModel : ObservableObject public partial IEnumerable DuctSystemTypes { get; set; } [ObservableProperty] - [NotifyCanExecuteChangedFor(nameof(Mep.StandMepCurveViewModel.CreateMepCurveCommand))] + [NotifyCanExecuteChangedFor(nameof(CreateMepCurveCommand))] public partial IEnumerable DuctTypes { get; set; } [ObservableProperty] - [NotifyCanExecuteChangedFor(nameof(Mep.StandMepCurveViewModel.CreateMepCurveCommand))] + [NotifyCanExecuteChangedFor(nameof(CreateMepCurveCommand))] public partial bool? IsCableTray { get; set; } [ObservableProperty] - [NotifyCanExecuteChangedFor(nameof(Mep.StandMepCurveViewModel.CreateMepCurveCommand))] + [NotifyCanExecuteChangedFor(nameof(CreateMepCurveCommand))] public partial bool? IsConduit { get; set; } [ObservableProperty] - [NotifyCanExecuteChangedFor(nameof(Mep.StandMepCurveViewModel.CreateMepCurveCommand))] + [NotifyCanExecuteChangedFor(nameof(CreateMepCurveCommand))] public partial bool? IsDuct { get; set; } [ObservableProperty] - [NotifyCanExecuteChangedFor(nameof(Mep.StandMepCurveViewModel.CreateMepCurveCommand))] + [NotifyCanExecuteChangedFor(nameof(CreateMepCurveCommand))] public partial bool? IsPipe { get; set; } = true; [ObservableProperty] @@ -63,27 +59,27 @@ public partial class StandMepCurveViewModel : ObservableObject public partial IEnumerable PipeTypes { get; set; } [ObservableProperty] - [NotifyCanExecuteChangedFor(nameof(Mep.StandMepCurveViewModel.CreateMepCurveCommand))] + [NotifyCanExecuteChangedFor(nameof(CreateMepCurveCommand))] public partial CableTrayType SelectedCableTrayType { get; set; } [ObservableProperty] - [NotifyCanExecuteChangedFor(nameof(Mep.StandMepCurveViewModel.CreateMepCurveCommand))] + [NotifyCanExecuteChangedFor(nameof(CreateMepCurveCommand))] public partial ConduitType SelectedConduitType { get; set; } [ObservableProperty] - [NotifyCanExecuteChangedFor(nameof(Mep.StandMepCurveViewModel.CreateMepCurveCommand))] + [NotifyCanExecuteChangedFor(nameof(CreateMepCurveCommand))] public partial MechanicalSystemType SelectedDuctSystemType { get; set; } [ObservableProperty] - [NotifyCanExecuteChangedFor(nameof(Mep.StandMepCurveViewModel.CreateMepCurveCommand))] + [NotifyCanExecuteChangedFor(nameof(CreateMepCurveCommand))] public partial DuctType SelectedDuctType { get; set; } [ObservableProperty] - [NotifyCanExecuteChangedFor(nameof(Mep.StandMepCurveViewModel.CreateMepCurveCommand))] + [NotifyCanExecuteChangedFor(nameof(CreateMepCurveCommand))] public partial PipingSystemType SelectedPipeSystemType { get; set; } [ObservableProperty] - [NotifyCanExecuteChangedFor(nameof(Mep.StandMepCurveViewModel.CreateMepCurveCommand))] + [NotifyCanExecuteChangedFor(nameof(CreateMepCurveCommand))] public partial PipeType SelectedPipeType { get; set; } partial void OnSelectedPipeTypeChanged(PipeType value) diff --git a/ShrlAlgoToolkit.RevitAddins/Mep/TerminalConnectToDuctCmd.cs b/ShrlAlgoToolkit.RevitAddins/Mep/TerminalConnectToDuctCmd.cs index 77e5d95..03b5721 100644 --- a/ShrlAlgoToolkit.RevitAddins/Mep/TerminalConnectToDuctCmd.cs +++ b/ShrlAlgoToolkit.RevitAddins/Mep/TerminalConnectToDuctCmd.cs @@ -2,10 +2,6 @@ using Autodesk.Revit.DB.Mechanical; using Nice3point.Revit.Toolkit.External; -using ShrlAlgoToolkit.RevitAddins.RvMEP; -using ShrlAlgoToolkit; -using ShrlAlgoToolkit.RevitAddins; - namespace ShrlAlgoToolkit.RevitAddins.Mep; [Transaction(TransactionMode.Manual)] diff --git a/ShrlAlgoToolkit.RevitAddins/Modeling/CADCurveToModelCurveCmd.cs b/ShrlAlgoToolkit.RevitAddins/Modeling/CADCurveToModelCurveCmd.cs index 097b34e..23dbbbb 100644 --- a/ShrlAlgoToolkit.RevitAddins/Modeling/CADCurveToModelCurveCmd.cs +++ b/ShrlAlgoToolkit.RevitAddins/Modeling/CADCurveToModelCurveCmd.cs @@ -1,8 +1,5 @@ -using System; - -using Autodesk.Revit.Attributes; +using Autodesk.Revit.Attributes; using Autodesk.Revit.DB; -using Autodesk.Revit.UI; using Autodesk.Revit.UI.Selection; using Nice3point.Revit.Toolkit.External; diff --git a/ShrlAlgoToolkit.RevitAddins/Modeling/InstanceCreatorCmd.cs b/ShrlAlgoToolkit.RevitAddins/Modeling/InstanceCreatorCmd.cs index c664fbc..fbb44e9 100644 --- a/ShrlAlgoToolkit.RevitAddins/Modeling/InstanceCreatorCmd.cs +++ b/ShrlAlgoToolkit.RevitAddins/Modeling/InstanceCreatorCmd.cs @@ -1,9 +1,6 @@ using Autodesk.Revit.Attributes; using Nice3point.Revit.Toolkit.External; using ShrlAlgoToolkit.RevitAddins.Common.Assists; -using ShrlAlgoToolkit.RevitAddins.RvCommon; -using ShrlAlgoToolkit; -using ShrlAlgoToolkit.RevitAddins; namespace ShrlAlgoToolkit.RevitAddins.Modeling; @@ -15,6 +12,6 @@ public class InstanceCreatorCmd : ExternalCommand { public override void Execute() { - Common.Assists.WinDialogAssist.ShowOrActivate(UiDocument); + WinDialogAssist.ShowOrActivate(UiDocument); } } diff --git a/ShrlAlgoToolkit.RevitAddins/Modeling/InstanceCreatorView.xaml.cs b/ShrlAlgoToolkit.RevitAddins/Modeling/InstanceCreatorView.xaml.cs index 524c99c..a9cca2c 100644 --- a/ShrlAlgoToolkit.RevitAddins/Modeling/InstanceCreatorView.xaml.cs +++ b/ShrlAlgoToolkit.RevitAddins/Modeling/InstanceCreatorView.xaml.cs @@ -1,8 +1,4 @@ -using ShrlAlgoToolkit.RevitAddins.RvCommon; -using ShrlAlgoToolkit; -using ShrlAlgoToolkit.RevitAddins; - -namespace ShrlAlgoToolkit.RevitAddins.Modeling; +namespace ShrlAlgoToolkit.RevitAddins.Modeling; /// /// InstanceCreatorView.xaml 的交互逻辑 diff --git a/ShrlAlgoToolkit.RevitAddins/Modeling/InstanceCreatorViewModel.cs b/ShrlAlgoToolkit.RevitAddins/Modeling/InstanceCreatorViewModel.cs index b947fa6..9d03c84 100644 --- a/ShrlAlgoToolkit.RevitAddins/Modeling/InstanceCreatorViewModel.cs +++ b/ShrlAlgoToolkit.RevitAddins/Modeling/InstanceCreatorViewModel.cs @@ -8,9 +8,6 @@ using CommunityToolkit.Mvvm.Input; using Nice3point.Revit.Toolkit.External.Handlers; using ShrlAlgoToolkit.RevitAddins.Common.Extensions; -using ShrlAlgoToolkit.RevitAddins.RvCommon; -using ShrlAlgoToolkit; -using ShrlAlgoToolkit.RevitAddins; // ReSharper disable ConditionIsAlwaysTrueOrFalse @@ -88,7 +85,7 @@ public partial class InstanceCreatorViewModel : ObservableObject public partial BitmapSource Image { get; set; } [ObservableProperty] - [NotifyCanExecuteChangedFor(nameof(Modeling.InstanceCreatorViewModel.PlaceInstancesCommand))] + [NotifyCanExecuteChangedFor(nameof(PlaceInstancesCommand))] public partial bool CanPlaceInstance { get; set; } = true; private readonly Document document; @@ -100,7 +97,7 @@ public partial class InstanceCreatorViewModel : ObservableObject public partial Family SelectedFamily { get; set; } [ObservableProperty] - [NotifyCanExecuteChangedFor(nameof(Modeling.InstanceCreatorViewModel.PlaceInstancesCommand))] + [NotifyCanExecuteChangedFor(nameof(PlaceInstancesCommand))] private FamilySymbol selectedFamilySymbol; [ObservableProperty] diff --git a/ShrlAlgoToolkit.RevitAddins/Modeling/PipesCreatorCmd.cs b/ShrlAlgoToolkit.RevitAddins/Modeling/PipesCreatorCmd.cs index bc15be6..f632f7b 100644 --- a/ShrlAlgoToolkit.RevitAddins/Modeling/PipesCreatorCmd.cs +++ b/ShrlAlgoToolkit.RevitAddins/Modeling/PipesCreatorCmd.cs @@ -1,8 +1,5 @@ using Nice3point.Revit.Toolkit.External; using ShrlAlgoToolkit.RevitAddins.Common.Assists; -using ShrlAlgoToolkit.RevitAddins.RvCommon; -using ShrlAlgoToolkit; -using ShrlAlgoToolkit.RevitAddins; namespace ShrlAlgoToolkit.RevitAddins.Modeling; @@ -12,6 +9,6 @@ public class PipesCreatorCmd : ExternalCommand { public override void Execute() { - Common.Assists.WinDialogAssist.ShowOrActivate(Document); + WinDialogAssist.ShowOrActivate(Document); } } diff --git a/ShrlAlgoToolkit.RevitAddins/Modeling/PipesCreatorView.xaml.cs b/ShrlAlgoToolkit.RevitAddins/Modeling/PipesCreatorView.xaml.cs index 43bb890..ca6569a 100644 --- a/ShrlAlgoToolkit.RevitAddins/Modeling/PipesCreatorView.xaml.cs +++ b/ShrlAlgoToolkit.RevitAddins/Modeling/PipesCreatorView.xaml.cs @@ -1,8 +1,4 @@ -using ShrlAlgoToolkit.RevitAddins.RvCommon; -using ShrlAlgoToolkit; -using ShrlAlgoToolkit.RevitAddins; - -namespace ShrlAlgoToolkit.RevitAddins.Modeling +namespace ShrlAlgoToolkit.RevitAddins.Modeling { /// /// PipesCreatorView.xaml 的交互逻辑 diff --git a/ShrlAlgoToolkit.RevitAddins/Modeling/PipesCreatorViewModel.cs b/ShrlAlgoToolkit.RevitAddins/Modeling/PipesCreatorViewModel.cs index d5aa705..0899671 100644 --- a/ShrlAlgoToolkit.RevitAddins/Modeling/PipesCreatorViewModel.cs +++ b/ShrlAlgoToolkit.RevitAddins/Modeling/PipesCreatorViewModel.cs @@ -8,10 +8,6 @@ using CommunityToolkit.Mvvm.ComponentModel; using CommunityToolkit.Mvvm.Input; using Nice3point.Revit.Toolkit.External.Handlers; -using ShrlAlgoToolkit.RevitAddins.RvCommon; -using ShrlAlgoToolkit; -using ShrlAlgoToolkit.RevitAddins; - namespace ShrlAlgoToolkit.RevitAddins.Modeling; public partial class PipesCreatorViewModel : ObservableObject @@ -25,11 +21,11 @@ public partial class PipesCreatorViewModel : ObservableObject private readonly Document document; [ObservableProperty] - [NotifyCanExecuteChangedFor(nameof(Modeling.PipesCreatorViewModel.CreateCommand))] + [NotifyCanExecuteChangedFor(nameof(CreateCommand))] public partial PipeType SelectedPipeType { get; set; } [ObservableProperty] - [NotifyCanExecuteChangedFor(nameof(Modeling.PipesCreatorViewModel.CreateCommand))] + [NotifyCanExecuteChangedFor(nameof(CreateCommand))] public partial PipingSystemType SelectedPipingSystemType { get; set; } public IList PipeTypes => document.OfClass().Cast().ToList(); diff --git a/ShrlAlgoToolkit.RevitAddins/Standardizer/RenameFamilyNameCmd.cs b/ShrlAlgoToolkit.RevitAddins/Standardizer/RenameFamilyNameCmd.cs index d108ddb..3964c3a 100644 --- a/ShrlAlgoToolkit.RevitAddins/Standardizer/RenameFamilyNameCmd.cs +++ b/ShrlAlgoToolkit.RevitAddins/Standardizer/RenameFamilyNameCmd.cs @@ -1,10 +1,6 @@ using Autodesk.Revit.Attributes; using Nice3point.Revit.Toolkit.External; -using ShrlAlgoToolkit.RevitAddins.RvFamily; -using ShrlAlgoToolkit; -using ShrlAlgoToolkit.RevitAddins; - namespace ShrlAlgoToolkit.RevitAddins.Standardizer { /// @@ -15,8 +11,8 @@ namespace ShrlAlgoToolkit.RevitAddins.Standardizer { public override void Execute() { - Standardizer.RenameFamilyViewModel viewmodel = new(UiApplication); - Standardizer.RenameFamilyView win = new(viewmodel); + RenameFamilyViewModel viewmodel = new(UiApplication); + RenameFamilyView win = new(viewmodel); win.ShowDialog(); } } diff --git a/ShrlAlgoToolkit.RevitAddins/Standardizer/RenameFamilyView.xaml.cs b/ShrlAlgoToolkit.RevitAddins/Standardizer/RenameFamilyView.xaml.cs index 0712be7..3c03ed4 100644 --- a/ShrlAlgoToolkit.RevitAddins/Standardizer/RenameFamilyView.xaml.cs +++ b/ShrlAlgoToolkit.RevitAddins/Standardizer/RenameFamilyView.xaml.cs @@ -1,8 +1,4 @@ -using ShrlAlgoToolkit.RevitAddins.RvFamily; -using ShrlAlgoToolkit; -using ShrlAlgoToolkit.RevitAddins; - -namespace ShrlAlgoToolkit.RevitAddins.Standardizer +namespace ShrlAlgoToolkit.RevitAddins.Standardizer { /// /// RenameFamilyView.xaml 的交互逻辑 diff --git a/ShrlAlgoToolkit.RevitAddins/Standardizer/RenameFamilyViewModel.cs b/ShrlAlgoToolkit.RevitAddins/Standardizer/RenameFamilyViewModel.cs index 98a84fd..aa110e1 100644 --- a/ShrlAlgoToolkit.RevitAddins/Standardizer/RenameFamilyViewModel.cs +++ b/ShrlAlgoToolkit.RevitAddins/Standardizer/RenameFamilyViewModel.cs @@ -4,8 +4,6 @@ using CommunityToolkit.Mvvm.ComponentModel; using CommunityToolkit.Mvvm.Input; using ShrlAlgoToolkit.RevitAddins.RvFamily; -using ShrlAlgoToolkit; -using ShrlAlgoToolkit.RevitAddins; namespace ShrlAlgoToolkit.RevitAddins.Standardizer; @@ -49,7 +47,7 @@ public partial class RenameFamilyViewModel : ObservableObject /// 列表中元素 /// [ObservableProperty] - [NotifyCanExecuteChangedFor(nameof(Standardizer.RenameFamilyViewModel.ModifyNameCommand))] + [NotifyCanExecuteChangedFor(nameof(ModifyNameCommand))] public partial List RenameItems { get; set; } [ObservableProperty] @@ -237,7 +235,7 @@ public partial class RenameFamilyViewModel : ObservableObject renameItem.PropertyChanged += (_, args) => { //选中属性修改时，触发 - if (args.PropertyName == nameof(RevitAddins.RvFamily.RenameFamilyItem.IsSelected)) + if (args.PropertyName == nameof(RenameFamilyItem.IsSelected)) { OnPropertyChanged(nameof(IsAllItemsSelected)); ModifyNameCommand.NotifyCanExecuteChanged(); diff --git a/ShrlAlgoToolkit.RevitAddins/Standardizer/RenameTypeNameCmd.cs b/ShrlAlgoToolkit.RevitAddins/Standardizer/RenameTypeNameCmd.cs index be9e556..52d51d7 100644 --- a/ShrlAlgoToolkit.RevitAddins/Standardizer/RenameTypeNameCmd.cs +++ b/ShrlAlgoToolkit.RevitAddins/Standardizer/RenameTypeNameCmd.cs @@ -1,10 +1,6 @@ using Autodesk.Revit.Attributes; using Nice3point.Revit.Toolkit.External; -using ShrlAlgoToolkit.RevitAddins.RvFamily; -using ShrlAlgoToolkit; -using ShrlAlgoToolkit.RevitAddins; - namespace ShrlAlgoToolkit.RevitAddins.Standardizer { /// @@ -16,7 +12,7 @@ namespace ShrlAlgoToolkit.RevitAddins.Standardizer public override void Execute() { RenameTypeViewModel viewmodel = new(UiApplication); - Standardizer.RenameTypeView win = new(viewmodel); + RenameTypeView win = new(viewmodel); win.ShowDialog(); } } diff --git a/ShrlAlgoToolkit.RevitAddins/Standardizer/RenameTypeView.xaml.cs b/ShrlAlgoToolkit.RevitAddins/Standardizer/RenameTypeView.xaml.cs index 0bee423..773fe16 100644 --- a/ShrlAlgoToolkit.RevitAddins/Standardizer/RenameTypeView.xaml.cs +++ b/ShrlAlgoToolkit.RevitAddins/Standardizer/RenameTypeView.xaml.cs @@ -1,8 +1,4 @@ -using ShrlAlgoToolkit.RevitAddins.RvFamily; -using ShrlAlgoToolkit; -using ShrlAlgoToolkit.RevitAddins; - -namespace ShrlAlgoToolkit.RevitAddins.Standardizer +namespace ShrlAlgoToolkit.RevitAddins.Standardizer { /// /// RenameFamilyView.xaml 的交互逻辑 diff --git a/ShrlAlgoToolkit.RevitAddins/Standardizer/RenameTypeViewModel.cs b/ShrlAlgoToolkit.RevitAddins/Standardizer/RenameTypeViewModel.cs index bd50c0f..4032a6a 100644 --- a/ShrlAlgoToolkit.RevitAddins/Standardizer/RenameTypeViewModel.cs +++ b/ShrlAlgoToolkit.RevitAddins/Standardizer/RenameTypeViewModel.cs @@ -4,8 +4,6 @@ using CommunityToolkit.Mvvm.ComponentModel; using CommunityToolkit.Mvvm.Input; using ShrlAlgoToolkit.RevitAddins.RvFamily; -using ShrlAlgoToolkit; -using ShrlAlgoToolkit.RevitAddins; namespace ShrlAlgoToolkit.RevitAddins.Standardizer; @@ -227,7 +225,7 @@ public partial class RenameTypeViewModel : ObservableObject { renameItem.PropertyChanged += (_, args) => { - if (args.PropertyName == nameof(RevitAddins.RvFamily.RenameTypeItem.IsSelected)) + if (args.PropertyName == nameof(RenameTypeItem.IsSelected)) { OnPropertyChanged(nameof(IsAllItemsSelected)); //foreach (RenameTypeItem item in SelectedItems) diff --git a/ShrlAlgoToolkit.RevitAddins/Standardizer/TemplateManagerCmd.cs b/ShrlAlgoToolkit.RevitAddins/Standardizer/TemplateManagerCmd.cs index 0c8c74c..d280349 100644 --- a/ShrlAlgoToolkit.RevitAddins/Standardizer/TemplateManagerCmd.cs +++ b/ShrlAlgoToolkit.RevitAddins/Standardizer/TemplateManagerCmd.cs @@ -8,7 +8,7 @@ internal class TemplateManagerCmd : ExternalCommand { public override void Execute() { - var view = new TemplateManagerView() { DataContext = new Standardizer.TemplateManagerViewModel() }; + var view = new TemplateManagerView() { DataContext = new TemplateManagerViewModel() }; view.ShowDialog(); } } diff --git a/ShrlAlgoToolkit.RevitAddins/Standardizer/TemplateManagerViewModel.cs b/ShrlAlgoToolkit.RevitAddins/Standardizer/TemplateManagerViewModel.cs index 7baadae..e014d42 100644 --- a/ShrlAlgoToolkit.RevitAddins/Standardizer/TemplateManagerViewModel.cs +++ b/ShrlAlgoToolkit.RevitAddins/Standardizer/TemplateManagerViewModel.cs @@ -6,8 +6,6 @@ using CommunityToolkit.Mvvm.Input; using Nice3point.Revit.Toolkit.External.Handlers; using Nice3point.Revit.Toolkit.Options; -using Color = Autodesk.Revit.DB.Color; - namespace ShrlAlgoToolkit.RevitAddins.Standardizer; public partial class TemplateManagerViewModel : ObservableObject diff --git a/ShrlAlgoToolkit.RevitAddins/Standardizer/WriteParametersCmd.cs b/ShrlAlgoToolkit.RevitAddins/Standardizer/WriteParametersCmd.cs index 06f4d73..197805c 100644 --- a/ShrlAlgoToolkit.RevitAddins/Standardizer/WriteParametersCmd.cs +++ b/ShrlAlgoToolkit.RevitAddins/Standardizer/WriteParametersCmd.cs @@ -1,11 +1,7 @@ using Autodesk.Revit.Attributes; -using Autodesk.Revit.DB; -using Autodesk.Revit.DB.DirectContext3D; - using Nice3point.Revit.Toolkit.External; using ShrlAlgoToolkit.RevitAddins.Common.Assists; -using ShrlAlgoToolkit.RevitAddins.Standardizer; namespace ShrlAlgoToolkit.RevitAddins.Standardizer diff --git a/ShrlAlgoToolkit.RevitAddins/Standardizer/WriteParametersView.xaml.cs b/ShrlAlgoToolkit.RevitAddins/Standardizer/WriteParametersView.xaml.cs index 03f354d..775e654 100644 --- a/ShrlAlgoToolkit.RevitAddins/Standardizer/WriteParametersView.xaml.cs +++ b/ShrlAlgoToolkit.RevitAddins/Standardizer/WriteParametersView.xaml.cs @@ -1,7 +1,4 @@ -using System.Windows; -using System.Windows.Media; - -namespace ShrlAlgoToolkit.RevitAddins.Standardizer +namespace ShrlAlgoToolkit.RevitAddins.Standardizer { /// /// WriteParametersWin.xaml 的交互逻辑 diff --git a/ShrlAlgoToolkit.RevitAddins/Standardizer/WriteParametersViewModel.cs b/ShrlAlgoToolkit.RevitAddins/Standardizer/WriteParametersViewModel.cs index e934237..b203f03 100644 --- a/ShrlAlgoToolkit.RevitAddins/Standardizer/WriteParametersViewModel.cs +++ b/ShrlAlgoToolkit.RevitAddins/Standardizer/WriteParametersViewModel.cs @@ -17,8 +17,6 @@ using Microsoft.Win32; using MiniExcelLibs.Attributes; using Nice3point.Revit.Toolkit.External.Handlers; - -using ShrlAlgoToolkit.RevitAddins; using ShrlAlgoToolkit.RevitAddins.Common.Assists; using ShrlAlgoToolkit.RevitAddins.Common.Extensions; diff --git a/ShrlAlgoToolkit.RevitAddins/Variables.cs b/ShrlAlgoToolkit.RevitAddins/Variables.cs index e945505..9e7ce21 100644 --- a/ShrlAlgoToolkit.RevitAddins/Variables.cs +++ b/ShrlAlgoToolkit.RevitAddins/Variables.cs @@ -16,6 +16,6 @@ public static class Variables //public static readonly string DllPath = typeof(Variables).Assembly.Location; public static string DirAssembly { get; } = Path.GetDirectoryName(AddInPath); public static string FamilyFolder { get; } = Path.Combine(DirAssembly, "Libraries"); - public static DockablePaneId PaneId { get; } = new(new Guid(RevitAddins.Properties.Settings.Default.DockPaneGuid)); + public static DockablePaneId PaneId { get; } = new(new Guid(Properties.Settings.Default.DockPaneGuid)); public static System.Timers.Timer AutoSaveTimer { get; } = new() { Enabled = true }; }