修改命名空间

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

View File

@@ -21,7 +21,7 @@ namespace ShrlAlgoToolkit.RevitAddins.RvCommon
public partial bool IsCutting { get; set; }
[ObservableProperty]
public partial ObservableCollection<SelectionElement> Items { get; set; }
public partial ObservableCollection<ElementInfo> Items { get; set; }
[ObservableProperty]
public partial string SearchProp { get; set; }
@@ -46,7 +46,7 @@ namespace ShrlAlgoToolkit.RevitAddins.RvCommon
var element = doc.GetElement(elementId);
if (element.IsValidObject)
{
Items.Add(new SelectionElement(element));
Items.Add(new ElementInfo(element));
}
}
FilteredList = CollectionViewSource.GetDefaultView(Items);
@@ -61,7 +61,7 @@ namespace ShrlAlgoToolkit.RevitAddins.RvCommon
{
return true;
}
var item = o as SelectionElement;
var item = o as ElementInfo;
return (item?.Name != null && item.Name.Contains(SearchProp))
|| (item?.Number != null && item.Number.Contains(SearchProp))
|| (item?.Comment != null && item.Comment.Contains(SearchProp));
@@ -71,7 +71,7 @@ namespace ShrlAlgoToolkit.RevitAddins.RvCommon
[RelayCommand]
private void ShowElement(object obj)
{
if (obj is not SelectionElement selection) return;
if (obj is not ElementInfo selection) return;
var model = selection.Element;
var uidoc = uiapp.ActiveUIDocument;
if (model.IsValidObject)
@@ -127,7 +127,7 @@ namespace ShrlAlgoToolkit.RevitAddins.RvCommon
}
}
public class SelectionElement(Element element)
public class ElementInfo(Element element)
{
public string CategoryName => element.Category?.Name;

View File

@@ -1,6 +1,6 @@
using Autodesk.Revit.Attributes;
using Nice3point.Revit.Toolkit.External;
using ShrlAlgoToolkit.RevitAddins.Assists;
using ShrlAlgoToolkit.RevitAddins.Common.Assists;
namespace ShrlAlgoToolkit.RevitAddins.RvCommon;
@@ -12,6 +12,6 @@ public class InstanceCreatorCmd : ExternalCommand
{
public override void Execute()
{
WinDialogAssist.ShowModeless<InstanceCreatorView>(new InstanceCreatorViewModel(UiDocument));
Common.Assists.WinDialogAssist.ShowOrActivate<InstanceCreatorView, InstanceCreatorViewModel>(UiDocument);
}
}

View File

@@ -6,7 +6,8 @@ using Autodesk.Revit.UI.Selection;
using CommunityToolkit.Mvvm.ComponentModel;
using CommunityToolkit.Mvvm.Input;
using Nice3point.Revit.Toolkit.External.Handlers;
using ShrlAlgoToolkit.RevitAddins.Extensions;
using ShrlAlgoToolkit.RevitAddins.Common.Extensions;
// ReSharper disable ConditionIsAlwaysTrueOrFalse

View File

@@ -1,6 +1,6 @@
using Autodesk.Revit.Attributes;
using Nice3point.Revit.Toolkit.External;
using ShrlAlgoToolkit.RevitAddins.Assists;
using ShrlAlgoToolkit.RevitAddins.Common.Assists;
namespace ShrlAlgoToolkit.RevitAddins.RvCommon
{
@@ -9,7 +9,7 @@ namespace ShrlAlgoToolkit.RevitAddins.RvCommon
{
public override void Execute()
{
WinDialogAssist.ShowModeless<ModelByCurveCreatorView>(new ModelByCurveCreatorViewModel(Document));
Common.Assists.WinDialogAssist.ShowOrActivate<ModelByCurveCreatorView, ModelByCurveCreatorViewModel>(Document);
}
}
}

View File

@@ -5,7 +5,8 @@ using Autodesk.Revit.UI.Selection;
using CommunityToolkit.Mvvm.ComponentModel;
using CommunityToolkit.Mvvm.Input;
using Nice3point.Revit.Toolkit.External.Handlers;
using ShrlAlgoToolkit.RevitAddins.Assists;
using ShrlAlgoToolkit.RevitAddins.Common.Assists;
namespace ShrlAlgoToolkit.RevitAddins.RvCommon
{
@@ -20,13 +21,13 @@ namespace ShrlAlgoToolkit.RevitAddins.RvCommon
private readonly ActionEventHandler handler;
[Required(ErrorMessage = "不可为空")]
[Attributes.IsNumeric]
[Common.Attributes.IsNumeric]
[ObservableProperty]
public partial double InstanceOffsetX { get; set; } = 0;
[ObservableProperty]
[Required(ErrorMessage = "不可为空")]
[Attributes.IsNumeric]
[Common.Attributes.IsNumeric]
public partial double InstanceOffsetY { get; set; } = 0;
[ObservableProperty]
@@ -40,18 +41,18 @@ namespace ShrlAlgoToolkit.RevitAddins.RvCommon
public partial List<Material> Materials { get; set; }
[Required(ErrorMessage = "不可为空")]
[Attributes.IsNumeric]
[Common.Attributes.IsNumeric]
[ObservableProperty]
public partial double OffsetX { get; set; } = 0;
[ObservableProperty]
[Required(ErrorMessage = "不可为空")]
[Attributes.IsNumeric]
[Common.Attributes.IsNumeric]
public partial double OffsetY { get; set; } = 0;
[Required(ErrorMessage = "不可为空")]
[Attributes.IsNumeric]
[Attributes.Minimum(0.5)]
[Common.Attributes.IsNumeric]
[Common.Attributes.Minimum(0.5)]
[ObservableProperty]
[NotifyDataErrorInfo]
public partial double Precision { get; set; } = 1.0;
@@ -72,8 +73,8 @@ namespace ShrlAlgoToolkit.RevitAddins.RvCommon
public partial FamilySymbol SelectedProfileFamilyType { get; set; }
[Required(ErrorMessage = "不可为空")]
[Attributes.IsNumeric]
[Attributes.Minimum(100)]
[Common.Attributes.IsNumeric]
[Common.Attributes.Minimum(100)]
[NotifyDataErrorInfo]
[ObservableProperty]
public partial double Spacing { get; set; } = 100;

View File

@@ -1,5 +1,5 @@
using Nice3point.Revit.Toolkit.External;
using ShrlAlgoToolkit.RevitAddins.Assists;
using ShrlAlgoToolkit.RevitAddins.Common.Assists;
namespace ShrlAlgoToolkit.RevitAddins.RvCommon;
@@ -9,6 +9,6 @@ public class PipesCreatorCmd : ExternalCommand
{
public override void Execute()
{
WinDialogAssist.ShowModeless<PipesCreatorView>(new PipesCreatorViewModel(Document));
Common.Assists.WinDialogAssist.ShowOrActivate<PipesCreatorView, PipesCreatorViewModel>(Document);
}
}

View File

@@ -238,7 +238,7 @@ public partial class PipesCreatorViewModel : ObservableObject
//var filePath = Environment.GetFolderPath(Environment.SpecialFolder.Desktop) + "\\问题管线.txt";
//File.WriteAllText(filePath, sb.ToString());
//WinDialogAssist.OpenFolderAndSelectFile(filePath);
Assists.LogAssist.WriteTextFile("问题管线", sb.ToString());
Common.Assists.LogAssist.WriteTextFile("问题管线", sb.ToString());
}
//UiDocument.Selection.SetElementIds(ids);