diff --git a/ShrlAlgo.RvKits/GlobalUsings.cs b/ShrlAlgo.RvKits/GlobalUsings.cs deleted file mode 100644 index 3c715a1..0000000 --- a/ShrlAlgo.RvKits/GlobalUsings.cs +++ /dev/null @@ -1,4 +0,0 @@ -global using ShrlAlgo.Toolkit.Core.Heplers; -global using ShrlAlgo.Toolkit.Mvvm.Attributes; -global using ShrlAlgo.Toolkit.Revit.Assist; -global using ShrlAlgo.Toolkit.Revit.Helpers; \ No newline at end of file diff --git a/ShrlAlgo.Toolkit.Revit/Helpers/DwgBlockSelection.cs b/ShrlAlgo.Toolkit.Revit/Helpers/DwgBlockSelection.cs new file mode 100644 index 0000000..5c6a821 --- /dev/null +++ b/ShrlAlgo.Toolkit.Revit/Helpers/DwgBlockSelection.cs @@ -0,0 +1,51 @@ +namespace ShrlAlgo.Toolkit.Revit.Helpers; + +/// +/// dwg块选择过滤 +/// +public class DwgBlockSelection : ISelectionFilter +{ + private Element e; + + public bool AllowElement(Element elem) + { + e = elem; + return e.Document.GetElement(e.GetTypeId()) is CADLinkType; + } + + public bool AllowReference(Reference reference, XYZ position) + { + //块 + var instance = e.GetGeometryObjectFromReference(reference) as GeometryInstance; + if (instance == null) + { + return false; + } + ////dwg + //foreach (var dwgIns in e.get_Geometry(new Options())) + //{ + // if (dwgIns is not GeometryInstance item) continue; + // //遍历dwg包含的所有内容 + // foreach (var obj in item.SymbolGeometry) + // { + // return obj is GeometryInstance ins && !ins.SymbolGeometry.Any(); + // } + //} + + //if (selectBlock == null) + //{ + // return false; + //} + //块是否包含子块 + //foreach (var item in instance.SymbolGeometry) + //{ + // if (item is GeometryInstance) + // { + // return false; + // } + //} + //var isNest = selectBlock.SymbolGeometry.OfType().Any(); + return /*!isNest &&*/ reference.ElementReferenceType == ElementReferenceType.REFERENCE_TYPE_INSTANCE + && instance.GraphicsStyleId != ElementId.InvalidElementId; + } +} \ No newline at end of file diff --git a/ShrlAlgo.Toolkit.Revit/Helpers/ElementInLinkOrCurrentDocument.cs b/ShrlAlgo.Toolkit.Revit/Helpers/ElementInLinkOrCurrentDocument.cs new file mode 100644 index 0000000..ceb3297 --- /dev/null +++ b/ShrlAlgo.Toolkit.Revit/Helpers/ElementInLinkOrCurrentDocument.cs @@ -0,0 +1,44 @@ +namespace ShrlAlgo.Toolkit.Revit.Helpers; + +/// +/// 获取当前模型或链接模型的实体元素 +/// +public class ElementInLinkOrCurrentDocument : ISelectionFilter +{ + public ElementInLinkOrCurrentDocument(Document doc) + { + this.doc = doc; + } + + private readonly Document doc; + + public bool LastCheckedWasFromLink => null != LinkedDocument; + + public Document LinkedDocument { get; private set; } + + public bool AllowElement(Element e) + { + return true; + } + + public bool AllowReference(Reference r, XYZ p) + { + LinkedDocument = null; + + var e = doc.GetElement(r); + + if (e is RevitLinkInstance li) + { + LinkedDocument = li.GetLinkDocument(); + + e = LinkedDocument.GetElement(r.LinkedElementId); + } + + return e != null + && e.CanHaveTypeAssigned() + && e.HasPhases() + && e.get_BoundingBox(null) != null + && e.Category is { Parent: null } + && e is not Panel; + } +} \ No newline at end of file diff --git a/ShrlAlgo.Toolkit.Revit/Helpers/EnableAssist.cs b/ShrlAlgo.Toolkit.Revit/Helpers/EnableAssist.cs deleted file mode 100644 index 1261097..0000000 --- a/ShrlAlgo.Toolkit.Revit/Helpers/EnableAssist.cs +++ /dev/null @@ -1,71 +0,0 @@ -using Autodesk.Revit.DB; -using Autodesk.Revit.UI; - -namespace ShrlAlgo.Toolkit.Revit.Helpers; -/// -/// 已经打开文档 -/// -public class HasActiveDocument : IExternalCommandAvailability -{ - public bool IsCommandAvailable(UIApplication applicationData, CategorySet selectedCategories) => applicationData.ActiveUIDocument != null; -} - -/// -/// 命令在平面视图可用 -/// -public class EnableInViewPlan : IExternalCommandAvailability -{ - public bool IsCommandAvailable(UIApplication applicationData, CategorySet selectedCategories) - { - return applicationData.ActiveUIDocument?.Document.ActiveView is ViewPlan - && applicationData.ActiveUIDocument?.Document.IsFamilyDocument == false; - } -} -/// -/// 项目文档可用 -/// -public class OnProjectDocument : IExternalCommandAvailability -{ - public bool IsCommandAvailable(UIApplication applicationData, CategorySet selectedCategories) - { - var doc = applicationData?.ActiveUIDocument?.Document; - if (doc != null) { return !doc.IsFamilyDocument; } - return false; - - } -} -/// -/// 图纸视图可用 -/// -internal class EnableInViewSheet : IExternalCommandAvailability -{ - public bool IsCommandAvailable(UIApplication applicationData, CategorySet selectedCategories) => - applicationData.ActiveUIDocument?.Document.ActiveView is ViewSheet && applicationData.ActiveUIDocument?.Document.IsFamilyDocument == false; -} - -/// -/// 三维视图可用 -/// -internal class EnableInView3D : IExternalCommandAvailability -{ - public bool IsCommandAvailable(UIApplication applicationData, CategorySet selectedCategories) => - applicationData.ActiveUIDocument?.Document.ActiveView is View3D && applicationData.ActiveUIDocument?.Document.IsFamilyDocument == false; -} - -/// -/// 命令在剖面、立面可用 -/// -internal class EnableInViewSection : IExternalCommandAvailability -{ - public bool IsCommandAvailable(UIApplication applicationData, CategorySet selectedCategories) => - applicationData.ActiveUIDocument?.Document.IsFamilyDocument == false && applicationData.ActiveUIDocument.Document.ActiveView is ViewSection; -} - -/// -/// 族文档可用 -/// -internal class EnableInFamilyDocument : IExternalCommandAvailability -{ - public bool IsCommandAvailable(UIApplication applicationData, CategorySet selectedCategories) => - applicationData.ActiveUIDocument?.Document.IsFamilyDocument == true; -} diff --git a/ShrlAlgo.Toolkit.Revit/Helpers/EnableInFamilyDocument.cs b/ShrlAlgo.Toolkit.Revit/Helpers/EnableInFamilyDocument.cs new file mode 100644 index 0000000..ab6e895 --- /dev/null +++ b/ShrlAlgo.Toolkit.Revit/Helpers/EnableInFamilyDocument.cs @@ -0,0 +1,10 @@ +namespace ShrlAlgo.Toolkit.Revit.Helpers; + +/// +/// 族文档可用 +/// +internal class EnableInFamilyDocument : IExternalCommandAvailability +{ + public bool IsCommandAvailable(UIApplication applicationData, CategorySet selectedCategories) => + applicationData.ActiveUIDocument?.Document.IsFamilyDocument == true; +} \ No newline at end of file diff --git a/ShrlAlgo.Toolkit.Revit/Helpers/EnableInView3D.cs b/ShrlAlgo.Toolkit.Revit/Helpers/EnableInView3D.cs new file mode 100644 index 0000000..848ce77 --- /dev/null +++ b/ShrlAlgo.Toolkit.Revit/Helpers/EnableInView3D.cs @@ -0,0 +1,10 @@ +namespace ShrlAlgo.Toolkit.Revit.Helpers; + +/// +/// 三维视图可用 +/// +internal class EnableInView3D : IExternalCommandAvailability +{ + public bool IsCommandAvailable(UIApplication applicationData, CategorySet selectedCategories) => + applicationData.ActiveUIDocument?.Document.ActiveView is View3D && applicationData.ActiveUIDocument?.Document.IsFamilyDocument == false; +} \ No newline at end of file diff --git a/ShrlAlgo.Toolkit.Revit/Helpers/EnableInViewPlan.cs b/ShrlAlgo.Toolkit.Revit/Helpers/EnableInViewPlan.cs new file mode 100644 index 0000000..dceff36 --- /dev/null +++ b/ShrlAlgo.Toolkit.Revit/Helpers/EnableInViewPlan.cs @@ -0,0 +1,13 @@ +namespace ShrlAlgo.Toolkit.Revit.Helpers; + +/// +/// 命令在平面视图可用 +/// +public class EnableInViewPlan : IExternalCommandAvailability +{ + public bool IsCommandAvailable(UIApplication applicationData, CategorySet selectedCategories) + { + return applicationData.ActiveUIDocument?.Document.ActiveView is ViewPlan + && applicationData.ActiveUIDocument?.Document.IsFamilyDocument == false; + } +} \ No newline at end of file diff --git a/ShrlAlgo.Toolkit.Revit/Helpers/EnableInViewSection.cs b/ShrlAlgo.Toolkit.Revit/Helpers/EnableInViewSection.cs new file mode 100644 index 0000000..118359d --- /dev/null +++ b/ShrlAlgo.Toolkit.Revit/Helpers/EnableInViewSection.cs @@ -0,0 +1,10 @@ +namespace ShrlAlgo.Toolkit.Revit.Helpers; + +/// +/// 命令在剖面、立面可用 +/// +internal class EnableInViewSection : IExternalCommandAvailability +{ + public bool IsCommandAvailable(UIApplication applicationData, CategorySet selectedCategories) => + applicationData.ActiveUIDocument?.Document.IsFamilyDocument == false && applicationData.ActiveUIDocument.Document.ActiveView is ViewSection; +} \ No newline at end of file diff --git a/ShrlAlgo.Toolkit.Revit/Helpers/EnableInViewSheet.cs b/ShrlAlgo.Toolkit.Revit/Helpers/EnableInViewSheet.cs new file mode 100644 index 0000000..b836a70 --- /dev/null +++ b/ShrlAlgo.Toolkit.Revit/Helpers/EnableInViewSheet.cs @@ -0,0 +1,10 @@ +namespace ShrlAlgo.Toolkit.Revit.Helpers; + +/// +/// 图纸视图可用 +/// +internal class EnableInViewSheet : IExternalCommandAvailability +{ + public bool IsCommandAvailable(UIApplication applicationData, CategorySet selectedCategories) => + applicationData.ActiveUIDocument?.Document.ActiveView is ViewSheet && applicationData.ActiveUIDocument?.Document.IsFamilyDocument == false; +} \ No newline at end of file diff --git a/ShrlAlgo.Toolkit.Revit/Helpers/Filters.cs b/ShrlAlgo.Toolkit.Revit/Helpers/Filters.cs deleted file mode 100644 index 7b07aa3..0000000 --- a/ShrlAlgo.Toolkit.Revit/Helpers/Filters.cs +++ /dev/null @@ -1,133 +0,0 @@ -using Autodesk.Revit.DB; -using Autodesk.Revit.UI.Selection; - -namespace ShrlAlgo.Toolkit.Revit.Helpers; - -/// -/// 任意选择过滤器 -/// -public class FuncFilter(Func allowElement, Func allowReference = null) - : ISelectionFilter -{ - private readonly Func elementFunc = allowElement; - private readonly Func referenceFunc = allowReference; - - public bool AllowElement(Element elem) - { - return elementFunc(elem); - } - - public bool AllowReference(Reference reference, XYZ position) - { - return referenceFunc == null || referenceFunc(reference, position); - } -} - -/// -/// 类型过滤 -/// -/// -public class GenericFilter : ISelectionFilter -{ - public bool AllowElement(Element elem) - { - return elem is T; - } - - public bool AllowReference(Reference reference, XYZ position) - { - return true; - } -} - -/// -/// 获取当前模型或链接模型的实体元素 -/// -public class ElementInLinkOrCurrentDocument : ISelectionFilter -{ - public ElementInLinkOrCurrentDocument(Document doc) - { - this.doc = doc; - } - - private readonly Document doc; - - public bool LastCheckedWasFromLink => null != LinkedDocument; - - public Document LinkedDocument { get; private set; } - - public bool AllowElement(Element e) - { - return true; - } - - public bool AllowReference(Reference r, XYZ p) - { - LinkedDocument = null; - - var e = doc.GetElement(r); - - if (e is RevitLinkInstance li) - { - LinkedDocument = li.GetLinkDocument(); - - e = LinkedDocument.GetElement(r.LinkedElementId); - } - - return e != null - && e.CanHaveTypeAssigned() - && e.HasPhases() - && e.get_BoundingBox(null) != null - && e.Category is { Parent: null } - && e is not Panel; - } -} -/// -/// dwg块选择过滤 -/// -public class DwgBlockSelection : ISelectionFilter -{ - private Element e; - - public bool AllowElement(Element elem) - { - e = elem; - return e.Document.GetElement(e.GetTypeId()) is CADLinkType; - } - - public bool AllowReference(Reference reference, XYZ position) - { - //块 - var instance = e.GetGeometryObjectFromReference(reference) as GeometryInstance; - if (instance == null) - { - return false; - } - ////dwg - //foreach (var dwgIns in e.get_Geometry(new Options())) - //{ - // if (dwgIns is not GeometryInstance item) continue; - // //遍历dwg包含的所有内容 - // foreach (var obj in item.SymbolGeometry) - // { - // return obj is GeometryInstance ins && !ins.SymbolGeometry.Any(); - // } - //} - - //if (selectBlock == null) - //{ - // return false; - //} - //块是否包含子块 - //foreach (var item in instance.SymbolGeometry) - //{ - // if (item is GeometryInstance) - // { - // return false; - // } - //} - //var isNest = selectBlock.SymbolGeometry.OfType().Any(); - return /*!isNest &&*/ reference.ElementReferenceType == ElementReferenceType.REFERENCE_TYPE_INSTANCE - && instance.GraphicsStyleId != ElementId.InvalidElementId; - } -} diff --git a/ShrlAlgo.Toolkit.Revit/Helpers/FuncFilter.cs b/ShrlAlgo.Toolkit.Revit/Helpers/FuncFilter.cs new file mode 100644 index 0000000..8859ed2 --- /dev/null +++ b/ShrlAlgo.Toolkit.Revit/Helpers/FuncFilter.cs @@ -0,0 +1,24 @@ +using Autodesk.Revit.DB; +using Autodesk.Revit.UI.Selection; + +namespace ShrlAlgo.Toolkit.Revit.Helpers; + +/// +/// 任意选择过滤器 +/// +public class FuncFilter(Func allowElement, Func allowReference = null) + : ISelectionFilter +{ + private readonly Func elementFunc = allowElement; + private readonly Func referenceFunc = allowReference; + + public bool AllowElement(Element elem) + { + return elementFunc(elem); + } + + public bool AllowReference(Reference reference, XYZ position) + { + return referenceFunc == null || referenceFunc(reference, position); + } +} \ No newline at end of file diff --git a/ShrlAlgo.Toolkit.Revit/Helpers/GenericFilter.cs b/ShrlAlgo.Toolkit.Revit/Helpers/GenericFilter.cs new file mode 100644 index 0000000..afa4db8 --- /dev/null +++ b/ShrlAlgo.Toolkit.Revit/Helpers/GenericFilter.cs @@ -0,0 +1,18 @@ +namespace ShrlAlgo.Toolkit.Revit.Helpers; + +/// +/// 类型过滤 +/// +/// +public class GenericFilter : ISelectionFilter +{ + public bool AllowElement(Element elem) + { + return elem is T; + } + + public bool AllowReference(Reference reference, XYZ position) + { + return true; + } +} \ No newline at end of file diff --git a/ShrlAlgo.Toolkit.Revit/Helpers/HasActiveDocument.cs b/ShrlAlgo.Toolkit.Revit/Helpers/HasActiveDocument.cs new file mode 100644 index 0000000..b6f27b4 --- /dev/null +++ b/ShrlAlgo.Toolkit.Revit/Helpers/HasActiveDocument.cs @@ -0,0 +1,11 @@ +using Autodesk.Revit.DB; +using Autodesk.Revit.UI; + +namespace ShrlAlgo.Toolkit.Revit.Helpers; +/// +/// 已经打开文档 +/// +public class HasActiveDocument : IExternalCommandAvailability +{ + public bool IsCommandAvailable(UIApplication applicationData, CategorySet selectedCategories) => applicationData.ActiveUIDocument != null; +} \ No newline at end of file diff --git a/ShrlAlgo.Toolkit.Revit/Helpers/NativeModule.cs b/ShrlAlgo.Toolkit.Revit/Helpers/NativeModule.cs new file mode 100644 index 0000000..2b09977 --- /dev/null +++ b/ShrlAlgo.Toolkit.Revit/Helpers/NativeModule.cs @@ -0,0 +1,49 @@ +namespace ShrlAlgo.Toolkit.Revit.Helpers; + +public class NativeModule +{ + /// + /// 获取RevitAPI程序集Module内的方法名称. + /// + /// + /// + public static MethodInfo GetApiModuleMethod(string name) + { + var module = GetApiModule(); + + var rs = module.GetMethods(BindingFlags.NonPublic | BindingFlags.Static).Where(m => m.Name == name).ToList(); + + return !rs.Any() ? null : rs.First(); + } + + /// + /// 获取RevitAPIUI程序集Module内的方法名称. + /// + /// + /// + public static MethodInfo GetUiModuleMethod(string name) + { + var module = GetUiModule(); + + var rs = module.GetMethods(BindingFlags.NonPublic | BindingFlags.Static).Where(m => m.Name == name).ToList(); + return !rs.Any() ? null : rs.First(); + } + + /// + /// 获取RevitAPI Modules. + /// + /// + internal static Module GetApiModule() + { + return typeof(Document).Assembly.Modules.First(); + } + + /// + /// 获取RevitAPIUI Modules. + /// + /// + internal static Module GetUiModule() + { + return typeof(UIDocument).Assembly.Modules.First(); + } +} \ No newline at end of file diff --git a/ShrlAlgo.Toolkit.Revit/Helpers/OnProjectDocument.cs b/ShrlAlgo.Toolkit.Revit/Helpers/OnProjectDocument.cs new file mode 100644 index 0000000..4371575 --- /dev/null +++ b/ShrlAlgo.Toolkit.Revit/Helpers/OnProjectDocument.cs @@ -0,0 +1,15 @@ +namespace ShrlAlgo.Toolkit.Revit.Helpers; + +/// +/// 项目文档可用 +/// +public class OnProjectDocument : IExternalCommandAvailability +{ + public bool IsCommandAvailable(UIApplication applicationData, CategorySet selectedCategories) + { + var doc = applicationData?.ActiveUIDocument?.Document; + if (doc != null) { return !doc.IsFamilyDocument; } + return false; + + } +} \ No newline at end of file diff --git a/ShrlAlgo.Toolkit.Revit/Helpers/ParameterExtension.cs b/ShrlAlgo.Toolkit.Revit/Helpers/ParameterExtension.cs new file mode 100644 index 0000000..bb169b2 --- /dev/null +++ b/ShrlAlgo.Toolkit.Revit/Helpers/ParameterExtension.cs @@ -0,0 +1,43 @@ +namespace ShrlAlgo.Toolkit.Revit.Helpers; + +public static class ParameterExtension +{ + /// + /// 设置参数对象对用户是否可见. + /// + /// + /// + /// + public static bool SetVisibility(this Parameter parameter, bool visible) + { + var parameterIntPtr = parameter.ToParamDef(); + + if (parameterIntPtr == IntPtr.Zero) + { + return false; + } + + var result = EncryptParameters.InvokeModule("ParamDef.setUserVisible", new object[] { parameterIntPtr, visible }); + + return result; + } + + /// + /// 将参数对象转为非托管指针. + /// + /// + /// + public static IntPtr ToParamDef(this Parameter parameter) + { + try + { + var m = typeof(Parameter).GetMethod("getParamDef", BindingFlags.NonPublic | BindingFlags.Instance); + + return (m?.Invoke(parameter, null) as Pointer).ToIntPtr(); + } + catch + { + return IntPtr.Zero; + } + } +} \ No newline at end of file diff --git a/ShrlAlgo.Toolkit.Revit/Helpers/PointerExtension.cs b/ShrlAlgo.Toolkit.Revit/Helpers/PointerExtension.cs new file mode 100644 index 0000000..b767737 --- /dev/null +++ b/ShrlAlgo.Toolkit.Revit/Helpers/PointerExtension.cs @@ -0,0 +1,15 @@ +namespace ShrlAlgo.Toolkit.Revit.Helpers; + +public static class PointerExtension +{ + /// 将指针转为句柄. + /// + /// 将指针转为句柄. + /// + /// + /// + public static IntPtr ToIntPtr(this Pointer p) + { + return (IntPtr)p.GetType().GetMethod("GetPointerValue", BindingFlags.NonPublic | BindingFlags.Instance)?.Invoke(p, null)!; + } +} \ No newline at end of file diff --git a/ShrlAlgo.Toolkit.Revit/Helpers/Updater.cs b/ShrlAlgo.Toolkit.Revit/Helpers/Updater.cs new file mode 100644 index 0000000..e86c069 --- /dev/null +++ b/ShrlAlgo.Toolkit.Revit/Helpers/Updater.cs @@ -0,0 +1,106 @@ +namespace ShrlAlgo.Toolkit.Revit.Helpers; + +public class Updater : IUpdater +{ + /// + /// 应用程序范围的动态模型更新 + /// + /// + /// + /// + /// true:只在本次生效，下次需要重新注册（不会发出警告） + /// + public Updater(UIApplication UiApplication, Guid guid, Action execute, bool isOptional = true, string updateInfo = "DynamicModelUpdate") + { + updaterId = new UpdaterId(UiApplication.ActiveAddInId, guid); + this.action = execute; + this.updateInfo = updateInfo; + if (!UpdaterRegistry.IsUpdaterRegistered(updaterId)) + { + UpdaterRegistry.RegisterUpdater(this, isOptional); + + /* + * 对FamilyInstance元素的增加和删除监听 + * + * 如果需要关注某些有自己程序创建出来的Element，可以把每个Element附上扩展数据 + * 然后使用ExtensibleStorageFilter过滤器注册DMU即可 + * + * DUM对用户的Ctrl + Z 无效, 可以在DocumentChanged事件中完善该机制 + */ + } + } + + private readonly Action action; + private readonly string updateInfo; + private readonly UpdaterId updaterId; + /// + /// 当注册的元素发生ChangeType触发时，回调的函数 + /// + /// + public void Execute(UpdaterData data) + { + //var rvtDoc = data.GetDocument(); + + //var idsModified = data.GetModifiedElementIds(); + //var idsDeleted = data.GetDeletedElementIds(); + //var idsAdded = data.GetAddedElementIds(); + //可以根据类型、元素Id、过滤器等等，分情况执行更新的操作 + action(data); + } + + public void Enable() + { + UpdaterRegistry.EnableUpdater(updaterId); + } + public void Disable() + { + if (UpdaterRegistry.IsUpdaterEnabled(updaterId)) + { + UpdaterRegistry.DisableUpdater(updaterId); + } + } + #region 接口实现 + public string GetAdditionalInformation() + { + return updateInfo; + } + + public ChangePriority GetChangePriority() + { + return ChangePriority.FreeStandingComponents; + } + + public UpdaterId GetUpdaterId() + { + return updaterId; + } + + public string GetUpdaterName() + { + return updateInfo; + } + #endregion + public void RemoveAllTriggers() + { + UpdaterRegistry.RemoveAllTriggers(updaterId); + } + /// + /// 添加动态更新的对象和修改的类型的触发器 + /// + /// 元素类型 + /// 修改的类型 + public void AddClassTrigger(ChangeType change) + { + var filter = new ElementClassFilter(typeof(T)); + UpdaterRegistry.AddTrigger(updaterId, filter, change); + } + public void AddFilterTrigger(ElementFilter filter, ChangeType change) + { + UpdaterRegistry.AddTrigger(updaterId, filter, change); + } + + public void UnRegister() + { + UpdaterRegistry.UnregisterUpdater(updaterId); + } +} \ No newline at end of file diff --git a/ShrlAlgo.Toolkit.Core/Extensions/DataTableExtensions.cs b/ShrlAlgoToolkit.Core/Extensions/DataTableExtensions.cs similarity index 100% rename from ShrlAlgo.Toolkit.Core/Extensions/DataTableExtensions.cs rename to ShrlAlgoToolkit.Core/Extensions/DataTableExtensions.cs diff --git a/ShrlAlgo.Toolkit.Core/Extensions/DistinctExtensions.cs b/ShrlAlgoToolkit.Core/Extensions/DistinctExtensions.cs similarity index 100% rename from ShrlAlgo.Toolkit.Core/Extensions/DistinctExtensions.cs rename to ShrlAlgoToolkit.Core/Extensions/DistinctExtensions.cs diff --git a/ShrlAlgo.Toolkit.Core/Extensions/ImageExtensions.cs b/ShrlAlgoToolkit.Core/Extensions/ImageExtensions.cs similarity index 97% rename from ShrlAlgo.Toolkit.Core/Extensions/ImageExtensions.cs rename to ShrlAlgoToolkit.Core/Extensions/ImageExtensions.cs index 590837e..4d65d5f 100644 --- a/ShrlAlgo.Toolkit.Core/Extensions/ImageExtensions.cs +++ b/ShrlAlgoToolkit.Core/Extensions/ImageExtensions.cs @@ -1,4 +1,6 @@ -using System.Drawing; +using ShrlAlgo.Toolkit.Core.Assist; + +using System.Drawing; using System.Drawing.Imaging; using System.IO; using System.Reflection; diff --git a/ShrlAlgoToolkit.Core/ShrlAlgoToolkit.Core.csproj b/ShrlAlgoToolkit.Core/ShrlAlgoToolkit.Core.csproj new file mode 100644 index 0000000..b54889b --- /dev/null +++ b/ShrlAlgoToolkit.Core/ShrlAlgoToolkit.Core.csproj @@ -0,0 +1,21 @@ + + + net472 + Library + false + Debug;Release + 13.0 + enable + True + false + false + ShrlAlgo.Toolkit.Core + + + + + + + + + \ No newline at end of file diff --git a/ShrlAlgo.RvKits/App.config b/ShrlAlgoToolkit.RevitAddins/App.config similarity index 88% rename from ShrlAlgo.RvKits/App.config rename to ShrlAlgoToolkit.RevitAddins/App.config index ca05e34..1e3cc07 100644 --- a/ShrlAlgo.RvKits/App.config +++ b/ShrlAlgoToolkit.RevitAddins/App.config @@ -2,7 +2,7 @@ -
+
- + C:\ProgramData\Autodesk\RVT 2020\Libraries\China @@ -62,6 +62,6 @@ True - + \ No newline at end of file diff --git a/ShrlAlgo.RvKits/Converters/Rv2WinColorConverter.cs b/ShrlAlgoToolkit.RevitAddins/Converters/Rv2WinColorConverter.cs similarity index 95% rename from ShrlAlgo.RvKits/Converters/Rv2WinColorConverter.cs rename to ShrlAlgoToolkit.RevitAddins/Converters/Rv2WinColorConverter.cs index 260e65d..48fd950 100644 --- a/ShrlAlgo.RvKits/Converters/Rv2WinColorConverter.cs +++ b/ShrlAlgoToolkit.RevitAddins/Converters/Rv2WinColorConverter.cs @@ -3,7 +3,7 @@ using System.Globalization; using System.Windows.Data; using Color = System.Windows.Media.Color; -namespace ShrlAlgo.Toolkit.Mvvm.Converters; +namespace Sai.RvKits.Converters; /// /// Autodesk颜色转Windows系统颜色 diff --git a/ShrlAlgo.RvKits/Converters/SearchTypeValueConverter.cs b/ShrlAlgoToolkit.RevitAddins/Converters/SearchTypeValueConverter.cs similarity index 97% rename from ShrlAlgo.RvKits/Converters/SearchTypeValueConverter.cs rename to ShrlAlgoToolkit.RevitAddins/Converters/SearchTypeValueConverter.cs index aecfc59..cf49290 100644 --- a/ShrlAlgo.RvKits/Converters/SearchTypeValueConverter.cs +++ b/ShrlAlgoToolkit.RevitAddins/Converters/SearchTypeValueConverter.cs @@ -1,7 +1,7 @@ using System.Windows.Controls; using System.Windows.Data; -namespace ShrlAlgo.Toolkit.Mvvm.Converters +namespace Sai.RvKits.Converters { public class SearchTypeValueConverter : IMultiValueConverter { diff --git a/ShrlAlgo.RvKits/DWGAssist.cs b/ShrlAlgoToolkit.RevitAddins/DWGAssist.cs similarity index 100% rename from ShrlAlgo.RvKits/DWGAssist.cs rename to ShrlAlgoToolkit.RevitAddins/DWGAssist.cs diff --git a/ShrlAlgo.RvKits/Fonts/AwesomeBrandsRegular.cs b/ShrlAlgoToolkit.RevitAddins/Fonts/AwesomeBrandsRegular.cs similarity index 100% rename from ShrlAlgo.RvKits/Fonts/AwesomeBrandsRegular.cs rename to ShrlAlgoToolkit.RevitAddins/Fonts/AwesomeBrandsRegular.cs diff --git a/ShrlAlgo.RvKits/Fonts/AwesomeFreeRegular.cs b/ShrlAlgoToolkit.RevitAddins/Fonts/AwesomeFreeRegular.cs similarity index 100% rename from ShrlAlgo.RvKits/Fonts/AwesomeFreeRegular.cs rename to ShrlAlgoToolkit.RevitAddins/Fonts/AwesomeFreeRegular.cs diff --git a/ShrlAlgo.RvKits/Fonts/AwesomeFreeSolid.cs b/ShrlAlgoToolkit.RevitAddins/Fonts/AwesomeFreeSolid.cs similarity index 100% rename from ShrlAlgo.RvKits/Fonts/AwesomeFreeSolid.cs rename to ShrlAlgoToolkit.RevitAddins/Fonts/AwesomeFreeSolid.cs diff --git a/ShrlAlgo.RvKits/Fonts/BoxIconFont.cs b/ShrlAlgoToolkit.RevitAddins/Fonts/BoxIconFont.cs similarity index 100% rename from ShrlAlgo.RvKits/Fonts/BoxIconFont.cs rename to ShrlAlgoToolkit.RevitAddins/Fonts/BoxIconFont.cs diff --git a/ShrlAlgo.RvKits/Fonts/Font Awesome 6 Brands-Regular-400.otf b/ShrlAlgoToolkit.RevitAddins/Fonts/Font Awesome 6 Brands-Regular-400.otf similarity index 100% rename from ShrlAlgo.RvKits/Fonts/Font Awesome 6 Brands-Regular-400.otf rename to ShrlAlgoToolkit.RevitAddins/Fonts/Font Awesome 6 Brands-Regular-400.otf diff --git a/ShrlAlgo.RvKits/Fonts/Font Awesome 6 Free-Regular-400.otf b/ShrlAlgoToolkit.RevitAddins/Fonts/Font Awesome 6 Free-Regular-400.otf similarity index 100% rename from ShrlAlgo.RvKits/Fonts/Font Awesome 6 Free-Regular-400.otf rename to ShrlAlgoToolkit.RevitAddins/Fonts/Font Awesome 6 Free-Regular-400.otf diff --git a/ShrlAlgo.RvKits/Fonts/Font Awesome 6 Free-Solid-900.otf b/ShrlAlgoToolkit.RevitAddins/Fonts/Font Awesome 6 Free-Solid-900.otf similarity index 100% rename from ShrlAlgo.RvKits/Fonts/Font Awesome 6 Free-Solid-900.otf rename to ShrlAlgoToolkit.RevitAddins/Fonts/Font Awesome 6 Free-Solid-900.otf diff --git a/ShrlAlgo.RvKits/Fonts/Segoe Fluent Icons.ttf b/ShrlAlgoToolkit.RevitAddins/Fonts/Segoe Fluent Icons.ttf similarity index 100% rename from ShrlAlgo.RvKits/Fonts/Segoe Fluent Icons.ttf rename to ShrlAlgoToolkit.RevitAddins/Fonts/Segoe Fluent Icons.ttf diff --git a/ShrlAlgo.RvKits/Fonts/SourceHanSansSC-Regular.otf b/ShrlAlgoToolkit.RevitAddins/Fonts/SourceHanSansSC-Regular.otf similarity index 100% rename from ShrlAlgo.RvKits/Fonts/SourceHanSansSC-Regular.otf rename to ShrlAlgoToolkit.RevitAddins/Fonts/SourceHanSansSC-Regular.otf diff --git a/ShrlAlgo.RvKits/Fonts/boxicons.ttf b/ShrlAlgoToolkit.RevitAddins/Fonts/boxicons.ttf similarity index 100% rename from ShrlAlgo.RvKits/Fonts/boxicons.ttf rename to ShrlAlgoToolkit.RevitAddins/Fonts/boxicons.ttf diff --git a/ShrlAlgo.RvKits/Fonts/iconfont.ttf b/ShrlAlgoToolkit.RevitAddins/Fonts/iconfont.ttf similarity index 100% rename from ShrlAlgo.RvKits/Fonts/iconfont.ttf rename to ShrlAlgoToolkit.RevitAddins/Fonts/iconfont.ttf diff --git a/ShrlAlgoToolkit.RevitAddins/GlobalUsings.cs b/ShrlAlgoToolkit.RevitAddins/GlobalUsings.cs new file mode 100644 index 0000000..09120c6 --- /dev/null +++ b/ShrlAlgoToolkit.RevitAddins/GlobalUsings.cs @@ -0,0 +1,2 @@ +global using ShrlAlgo.Toolkit.Revit.Assist; +global using ShrlAlgo.Toolkit.Revit.Helpers; \ No newline at end of file diff --git a/ShrlAlgo.RvKits/Libraries/2020/Casing/刚性防水套管.rfa b/ShrlAlgoToolkit.RevitAddins/Libraries/2020/Casing/刚性防水套管.rfa similarity index 100% rename from ShrlAlgo.RvKits/Libraries/2020/Casing/刚性防水套管.rfa rename to ShrlAlgoToolkit.RevitAddins/Libraries/2020/Casing/刚性防水套管.rfa diff --git a/ShrlAlgo.RvKits/Libraries/2020/Casing/圆形风管套管-带密闭肋.rfa b/ShrlAlgoToolkit.RevitAddins/Libraries/2020/Casing/圆形风管套管-带密闭肋.rfa similarity index 100% rename from ShrlAlgo.RvKits/Libraries/2020/Casing/圆形风管套管-带密闭肋.rfa rename to ShrlAlgoToolkit.RevitAddins/Libraries/2020/Casing/圆形风管套管-带密闭肋.rfa diff --git a/ShrlAlgo.RvKits/Libraries/2020/Casing/套管伸缩节.rfa b/ShrlAlgoToolkit.RevitAddins/Libraries/2020/Casing/套管伸缩节.rfa similarity index 100% rename from ShrlAlgo.RvKits/Libraries/2020/Casing/套管伸缩节.rfa rename to ShrlAlgoToolkit.RevitAddins/Libraries/2020/Casing/套管伸缩节.rfa diff --git a/ShrlAlgo.RvKits/Libraries/2020/Casing/柔性密闭套管.rfa b/ShrlAlgoToolkit.RevitAddins/Libraries/2020/Casing/柔性密闭套管.rfa similarity index 100% rename from ShrlAlgo.RvKits/Libraries/2020/Casing/柔性密闭套管.rfa rename to ShrlAlgoToolkit.RevitAddins/Libraries/2020/Casing/柔性密闭套管.rfa diff --git a/ShrlAlgo.RvKits/Libraries/2020/Casing/柔性防水套管.rfa b/ShrlAlgoToolkit.RevitAddins/Libraries/2020/Casing/柔性防水套管.rfa similarity index 100% rename from ShrlAlgo.RvKits/Libraries/2020/Casing/柔性防水套管.rfa rename to ShrlAlgoToolkit.RevitAddins/Libraries/2020/Casing/柔性防水套管.rfa diff --git a/ShrlAlgo.RvKits/Libraries/2020/Casing/柔性防水套管（A型） (2).rfa b/ShrlAlgoToolkit.RevitAddins/Libraries/2020/Casing/柔性防水套管（A型） (2).rfa similarity index 100% rename from ShrlAlgo.RvKits/Libraries/2020/Casing/柔性防水套管（A型） (2).rfa rename to ShrlAlgoToolkit.RevitAddins/Libraries/2020/Casing/柔性防水套管（A型） (2).rfa diff --git a/ShrlAlgo.RvKits/Libraries/2020/Casing/柔性防水套管（A型）.rfa b/ShrlAlgoToolkit.RevitAddins/Libraries/2020/Casing/柔性防水套管（A型）.rfa similarity index 100% rename from ShrlAlgo.RvKits/Libraries/2020/Casing/柔性防水套管（A型）.rfa rename to ShrlAlgoToolkit.RevitAddins/Libraries/2020/Casing/柔性防水套管（A型）.rfa diff --git a/ShrlAlgo.RvKits/Libraries/2020/Casing/柔性防水套管（B型）.rfa b/ShrlAlgoToolkit.RevitAddins/Libraries/2020/Casing/柔性防水套管（B型）.rfa similarity index 100% rename from ShrlAlgo.RvKits/Libraries/2020/Casing/柔性防水套管（B型）.rfa rename to ShrlAlgoToolkit.RevitAddins/Libraries/2020/Casing/柔性防水套管（B型）.rfa diff --git a/ShrlAlgo.RvKits/Libraries/2020/Casing/电缆桥架套管-带密闭肋.rfa b/ShrlAlgoToolkit.RevitAddins/Libraries/2020/Casing/电缆桥架套管-带密闭肋.rfa similarity index 100% rename from ShrlAlgo.RvKits/Libraries/2020/Casing/电缆桥架套管-带密闭肋.rfa rename to ShrlAlgoToolkit.RevitAddins/Libraries/2020/Casing/电缆桥架套管-带密闭肋.rfa diff --git a/ShrlAlgo.RvKits/Libraries/2020/Casing/矩形风管套管.rfa b/ShrlAlgoToolkit.RevitAddins/Libraries/2020/Casing/矩形风管套管.rfa similarity index 100% rename from ShrlAlgo.RvKits/Libraries/2020/Casing/矩形风管套管.rfa rename to ShrlAlgoToolkit.RevitAddins/Libraries/2020/Casing/矩形风管套管.rfa diff --git a/ShrlAlgo.RvKits/Libraries/2020/Casing/钢套管.rfa b/ShrlAlgoToolkit.RevitAddins/Libraries/2020/Casing/钢套管.rfa similarity index 100% rename from ShrlAlgo.RvKits/Libraries/2020/Casing/钢套管.rfa rename to ShrlAlgoToolkit.RevitAddins/Libraries/2020/Casing/钢套管.rfa diff --git a/ShrlAlgo.RvKits/Libraries/2020/Casing/防火板防火封堵.rfa b/ShrlAlgoToolkit.RevitAddins/Libraries/2020/Casing/防火板防火封堵.rfa similarity index 100% rename from ShrlAlgo.RvKits/Libraries/2020/Casing/防火板防火封堵.rfa rename to ShrlAlgoToolkit.RevitAddins/Libraries/2020/Casing/防火板防火封堵.rfa diff --git a/ShrlAlgo.RvKits/Libraries/2020/Opening/圆形洞口.rfa b/ShrlAlgoToolkit.RevitAddins/Libraries/2020/Opening/圆形洞口.rfa similarity index 100% rename from ShrlAlgo.RvKits/Libraries/2020/Opening/圆形洞口.rfa rename to ShrlAlgoToolkit.RevitAddins/Libraries/2020/Opening/圆形洞口.rfa diff --git a/ShrlAlgo.RvKits/Libraries/2020/Opening/矩形洞口.rfa b/ShrlAlgoToolkit.RevitAddins/Libraries/2020/Opening/矩形洞口.rfa similarity index 100% rename from ShrlAlgo.RvKits/Libraries/2020/Opening/矩形洞口.rfa rename to ShrlAlgoToolkit.RevitAddins/Libraries/2020/Opening/矩形洞口.rfa diff --git a/ShrlAlgo.RvKits/Libraries/2020/Other/盾构管片.rfa b/ShrlAlgoToolkit.RevitAddins/Libraries/2020/Other/盾构管片.rfa similarity index 100% rename from ShrlAlgo.RvKits/Libraries/2020/Other/盾构管片.rfa rename to ShrlAlgoToolkit.RevitAddins/Libraries/2020/Other/盾构管片.rfa diff --git a/ShrlAlgo.RvKits/Libraries/2020/Well/D-弱电井.rfa b/ShrlAlgoToolkit.RevitAddins/Libraries/2020/Well/D-弱电井.rfa similarity index 100% rename from ShrlAlgo.RvKits/Libraries/2020/Well/D-弱电井.rfa rename to ShrlAlgoToolkit.RevitAddins/Libraries/2020/Well/D-弱电井.rfa diff --git a/ShrlAlgo.RvKits/Libraries/2020/Well/J-检查井.rfa b/ShrlAlgoToolkit.RevitAddins/Libraries/2020/Well/J-检查井.rfa similarity index 100% rename from ShrlAlgo.RvKits/Libraries/2020/Well/J-检查井.rfa rename to ShrlAlgoToolkit.RevitAddins/Libraries/2020/Well/J-检查井.rfa diff --git a/ShrlAlgo.RvKits/Libraries/2020/Well/L-直通型电力井.rfa b/ShrlAlgoToolkit.RevitAddins/Libraries/2020/Well/L-直通型电力井.rfa similarity index 100% rename from ShrlAlgo.RvKits/Libraries/2020/Well/L-直通型电力井.rfa rename to ShrlAlgoToolkit.RevitAddins/Libraries/2020/Well/L-直通型电力井.rfa diff --git a/ShrlAlgo.RvKits/Libraries/2020/Well/LD-电气检查井.rfa b/ShrlAlgoToolkit.RevitAddins/Libraries/2020/Well/LD-电气检查井.rfa similarity index 100% rename from ShrlAlgo.RvKits/Libraries/2020/Well/LD-电气检查井.rfa rename to ShrlAlgoToolkit.RevitAddins/Libraries/2020/Well/LD-电气检查井.rfa diff --git a/ShrlAlgo.RvKits/Libraries/2020/Well/R-检修井.rfa b/ShrlAlgoToolkit.RevitAddins/Libraries/2020/Well/R-检修井.rfa similarity index 100% rename from ShrlAlgo.RvKits/Libraries/2020/Well/R-检修井.rfa rename to ShrlAlgoToolkit.RevitAddins/Libraries/2020/Well/R-检修井.rfa diff --git a/ShrlAlgo.RvKits/Libraries/2020/Well/W-污水检查井.rfa b/ShrlAlgoToolkit.RevitAddins/Libraries/2020/Well/W-污水检查井.rfa similarity index 100% rename from ShrlAlgo.RvKits/Libraries/2020/Well/W-污水检查井.rfa rename to ShrlAlgoToolkit.RevitAddins/Libraries/2020/Well/W-污水检查井.rfa diff --git a/ShrlAlgo.RvKits/Libraries/2020/Well/Y-检查井.rfa b/ShrlAlgoToolkit.RevitAddins/Libraries/2020/Well/Y-检查井.rfa similarity index 100% rename from ShrlAlgo.RvKits/Libraries/2020/Well/Y-检查井.rfa rename to ShrlAlgoToolkit.RevitAddins/Libraries/2020/Well/Y-检查井.rfa diff --git a/ShrlAlgo.RvKits/Libraries/2021/Casing/刚性防水套管.rfa b/ShrlAlgoToolkit.RevitAddins/Libraries/2021/Casing/刚性防水套管.rfa similarity index 100% rename from ShrlAlgo.RvKits/Libraries/2021/Casing/刚性防水套管.rfa rename to ShrlAlgoToolkit.RevitAddins/Libraries/2021/Casing/刚性防水套管.rfa diff --git a/ShrlAlgo.RvKits/Libraries/2021/Casing/圆形风管套管-带密闭肋.rfa b/ShrlAlgoToolkit.RevitAddins/Libraries/2021/Casing/圆形风管套管-带密闭肋.rfa similarity index 100% rename from ShrlAlgo.RvKits/Libraries/2021/Casing/圆形风管套管-带密闭肋.rfa rename to ShrlAlgoToolkit.RevitAddins/Libraries/2021/Casing/圆形风管套管-带密闭肋.rfa diff --git a/ShrlAlgo.RvKits/Libraries/2021/Casing/套管伸缩节.rfa b/ShrlAlgoToolkit.RevitAddins/Libraries/2021/Casing/套管伸缩节.rfa similarity index 100% rename from ShrlAlgo.RvKits/Libraries/2021/Casing/套管伸缩节.rfa rename to ShrlAlgoToolkit.RevitAddins/Libraries/2021/Casing/套管伸缩节.rfa diff --git a/ShrlAlgo.RvKits/Libraries/2021/Casing/柔性密闭套管.rfa b/ShrlAlgoToolkit.RevitAddins/Libraries/2021/Casing/柔性密闭套管.rfa similarity index 100% rename from ShrlAlgo.RvKits/Libraries/2021/Casing/柔性密闭套管.rfa rename to ShrlAlgoToolkit.RevitAddins/Libraries/2021/Casing/柔性密闭套管.rfa diff --git a/ShrlAlgo.RvKits/Libraries/2021/Casing/柔性防水套管.rfa b/ShrlAlgoToolkit.RevitAddins/Libraries/2021/Casing/柔性防水套管.rfa similarity index 100% rename from ShrlAlgo.RvKits/Libraries/2021/Casing/柔性防水套管.rfa rename to ShrlAlgoToolkit.RevitAddins/Libraries/2021/Casing/柔性防水套管.rfa diff --git a/ShrlAlgo.RvKits/Libraries/2021/Casing/柔性防水套管（A型） (2).rfa b/ShrlAlgoToolkit.RevitAddins/Libraries/2021/Casing/柔性防水套管（A型） (2).rfa similarity index 100% rename from ShrlAlgo.RvKits/Libraries/2021/Casing/柔性防水套管（A型） (2).rfa rename to ShrlAlgoToolkit.RevitAddins/Libraries/2021/Casing/柔性防水套管（A型） (2).rfa diff --git a/ShrlAlgo.RvKits/Libraries/2021/Casing/柔性防水套管（A型）.rfa b/ShrlAlgoToolkit.RevitAddins/Libraries/2021/Casing/柔性防水套管（A型）.rfa similarity index 100% rename from ShrlAlgo.RvKits/Libraries/2021/Casing/柔性防水套管（A型）.rfa rename to ShrlAlgoToolkit.RevitAddins/Libraries/2021/Casing/柔性防水套管（A型）.rfa diff --git a/ShrlAlgo.RvKits/Libraries/2021/Casing/柔性防水套管（B型）.rfa b/ShrlAlgoToolkit.RevitAddins/Libraries/2021/Casing/柔性防水套管（B型）.rfa similarity index 100% rename from ShrlAlgo.RvKits/Libraries/2021/Casing/柔性防水套管（B型）.rfa rename to ShrlAlgoToolkit.RevitAddins/Libraries/2021/Casing/柔性防水套管（B型）.rfa diff --git a/ShrlAlgo.RvKits/Libraries/2021/Casing/电缆桥架套管-带密闭肋.rfa b/ShrlAlgoToolkit.RevitAddins/Libraries/2021/Casing/电缆桥架套管-带密闭肋.rfa similarity index 100% rename from ShrlAlgo.RvKits/Libraries/2021/Casing/电缆桥架套管-带密闭肋.rfa rename to ShrlAlgoToolkit.RevitAddins/Libraries/2021/Casing/电缆桥架套管-带密闭肋.rfa diff --git a/ShrlAlgo.RvKits/Libraries/2021/Casing/矩形风管套管.rfa b/ShrlAlgoToolkit.RevitAddins/Libraries/2021/Casing/矩形风管套管.rfa similarity index 100% rename from ShrlAlgo.RvKits/Libraries/2021/Casing/矩形风管套管.rfa rename to ShrlAlgoToolkit.RevitAddins/Libraries/2021/Casing/矩形风管套管.rfa diff --git a/ShrlAlgo.RvKits/Libraries/2021/Casing/钢套管.rfa b/ShrlAlgoToolkit.RevitAddins/Libraries/2021/Casing/钢套管.rfa similarity index 100% rename from ShrlAlgo.RvKits/Libraries/2021/Casing/钢套管.rfa rename to ShrlAlgoToolkit.RevitAddins/Libraries/2021/Casing/钢套管.rfa diff --git a/ShrlAlgo.RvKits/Libraries/2021/Casing/防火板防火封堵.rfa b/ShrlAlgoToolkit.RevitAddins/Libraries/2021/Casing/防火板防火封堵.rfa similarity index 100% rename from ShrlAlgo.RvKits/Libraries/2021/Casing/防火板防火封堵.rfa rename to ShrlAlgoToolkit.RevitAddins/Libraries/2021/Casing/防火板防火封堵.rfa diff --git a/ShrlAlgo.RvKits/Libraries/2021/Openings/圆形洞口.rfa b/ShrlAlgoToolkit.RevitAddins/Libraries/2021/Openings/圆形洞口.rfa similarity index 100% rename from ShrlAlgo.RvKits/Libraries/2021/Openings/圆形洞口.rfa rename to ShrlAlgoToolkit.RevitAddins/Libraries/2021/Openings/圆形洞口.rfa diff --git a/ShrlAlgo.RvKits/Libraries/2021/Openings/矩形洞口.rfa b/ShrlAlgoToolkit.RevitAddins/Libraries/2021/Openings/矩形洞口.rfa similarity index 100% rename from ShrlAlgo.RvKits/Libraries/2021/Openings/矩形洞口.rfa rename to ShrlAlgoToolkit.RevitAddins/Libraries/2021/Openings/矩形洞口.rfa diff --git a/ShrlAlgo.RvKits/Libraries/2021/Others/盾构管片.rfa b/ShrlAlgoToolkit.RevitAddins/Libraries/2021/Others/盾构管片.rfa similarity index 100% rename from ShrlAlgo.RvKits/Libraries/2021/Others/盾构管片.rfa rename to ShrlAlgoToolkit.RevitAddins/Libraries/2021/Others/盾构管片.rfa diff --git a/ShrlAlgo.RvKits/ModelManager/CorrectReferLevelExecutes.cs b/ShrlAlgoToolkit.RevitAddins/ModelManager/CorrectReferLevelExecutes.cs similarity index 100% rename from ShrlAlgo.RvKits/ModelManager/CorrectReferLevelExecutes.cs rename to ShrlAlgoToolkit.RevitAddins/ModelManager/CorrectReferLevelExecutes.cs diff --git a/ShrlAlgo.RvKits/ModelManager/ModelCheckCmd.cs b/ShrlAlgoToolkit.RevitAddins/ModelManager/ModelCheckCmd.cs similarity index 89% rename from ShrlAlgo.RvKits/ModelManager/ModelCheckCmd.cs rename to ShrlAlgoToolkit.RevitAddins/ModelManager/ModelCheckCmd.cs index b86e329..dd90333 100644 --- a/ShrlAlgo.RvKits/ModelManager/ModelCheckCmd.cs +++ b/ShrlAlgoToolkit.RevitAddins/ModelManager/ModelCheckCmd.cs @@ -1,6 +1,8 @@ using Autodesk.Revit.Attributes; using Nice3point.Revit.Toolkit.External; +using ShrlAlgo.Toolkit.Core.Assist; +using ShrlAlgoToolkit.Core.Assist; namespace ShrlAlgo.RvKits.ModelManager; diff --git a/ShrlAlgo.RvKits/ModelManager/ModelCheckView.xaml b/ShrlAlgoToolkit.RevitAddins/ModelManager/ModelCheckView.xaml similarity index 93% rename from ShrlAlgo.RvKits/ModelManager/ModelCheckView.xaml rename to ShrlAlgoToolkit.RevitAddins/ModelManager/ModelCheckView.xaml index a038f29..73408c6 100644 --- a/ShrlAlgo.RvKits/ModelManager/ModelCheckView.xaml +++ b/ShrlAlgoToolkit.RevitAddins/ModelManager/ModelCheckView.xaml @@ -18,7 +18,7 @@ - + - @@ -142,11 +142,6 @@ - + + + - + \ No newline at end of file diff --git a/WPFluent.Gallery/Pages/Buttons.xaml.cs b/WPFluent.Gallery/Pages/ButtonPage.xaml.cs similarity index 100% rename from WPFluent.Gallery/Pages/Buttons.xaml.cs rename to WPFluent.Gallery/Pages/ButtonPage.xaml.cs