ShrlAlgo/Shrlalgo.RvKits
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

清理代码

Browse Source
This commit is contained in:
GG Z
2026-02-20 16:47:26 +08:00
parent 9f121cfc7f
commit 97c0b18dc7
98 changed files with 435 additions and 1017 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
ShrlAlgoToolkit.RevitAddins/Assists/RevitFileAssist.cs → ShrlAlgoToolkit.Revit/Assists/RevitFileAssist.cs
View File

@@ -7,7 +7,7 @@ using System.Text;
using System.Windows.Media.Imaging;
using System.Xml;
namespace ShrlAlgoToolkit.RevitAddins.Assists
namespace ShrlAlgoToolkit.Revit.Assists
{
/// <summary>
/// 直接读取文件的信息（不依赖RevitAPI）

1
ShrlAlgoToolkit.Revit/ShrlAlgoToolkit.Revit.projitems
View File

@@ -10,6 +10,7 @@
</PropertyGroup>
<ItemGroup>
<Compile Include="$(MSBuildThisFileDirectory)Assists\PublishAssist.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Assists\RevitFileAssist.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Extensions\CategoryExtension.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Assists\ColorAssist.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Assists\DuplicateTypeNamesHandler.cs" />

21
ShrlAlgoToolkit.RevitAddins/Assists/EnumAssist.cs
View File

@@ -1,21 +0,0 @@
using System.Reflection;
using ShrlAlgoToolkit.Core.Assists;
using ShrlAlgoToolkit;
using ShrlAlgoToolkit.Core;
namespace ShrlAlgoToolkit.RevitAddins.Assists;
public static class EnumAssist
{
/// <summary>
/// 获取当前枚举值的描述，没有描述则返回空字符串
/// </summary>
/// <param name="value"></param>
/// <returns></returns>
public static T GetAttribute<T>(this Enum value) where T : Attribute
{
var fieldInfo = value.GetType().GetField(value.ToString());
return fieldInfo.GetCustomAttribute<T>();
}
}

12
ShrlAlgoToolkit.RevitAddins/Assists/ImageAssist.cs
View File

@@ -1,23 +1,13 @@
using System;
using System.Collections.Generic;
using System.Diagnostics;
using System.Drawing;
using System.Drawing;
using System.Drawing.Text;
using System.Globalization;
using System.IO;
using System.Linq;
using System.Reflection;
using System.Text;
using System.Threading.Tasks;
using System.Windows;
using System.Windows.Interop;
using System.Windows.Media;
using System.Windows.Media.Imaging;
using ShrlAlgoToolkit.Core.Assists;
using ShrlAlgoToolkit;
using ShrlAlgoToolkit.Core;
namespace ShrlAlgoToolkit.RevitAddins.Assists;
public static class ImageAssist

4
ShrlAlgoToolkit.RevitAddins/Assists/LogAssist.cs
View File

@@ -2,10 +2,6 @@
using System.IO;
using System.Text;
using ShrlAlgoToolkit.Core.Assists;
using ShrlAlgoToolkit;
using ShrlAlgoToolkit.Core;
namespace ShrlAlgoToolkit.RevitAddins.Assists;
public static class LogAssist

4
ShrlAlgoToolkit.RevitAddins/Assists/SingletonViewAssist.cs
View File

@@ -1,9 +1,5 @@
using System.Windows;
using ShrlAlgoToolkit.Core.Assists;
using ShrlAlgoToolkit;
using ShrlAlgoToolkit.Core;
namespace ShrlAlgoToolkit.RevitAddins.Assists;
public sealed record SingletonViewAssist<T>

339
ShrlAlgoToolkit.RevitAddins/Assists/StringAssist.cs
View File

@@ -1,339 +0,0 @@
using System.Text;
using System.Text.RegularExpressions;
using ShrlAlgoToolkit.Core.Assists;
using ShrlAlgoToolkit;
using ShrlAlgoToolkit.Core;
namespace ShrlAlgoToolkit.RevitAddins.Assists;
public class StringAssist
{
/// <summary>
/// 获取大写字母列表
/// </summary>
/// <param name="n"></param>
/// <returns></returns>
public List<string> GetChar(int n)
{
var list = new List<string>();
if (n > 26)
{
n = 26;
}
for (var i = 0; i < n; i++)
{
var c = ((char)(i + 65)).ToString();
list.Add(c);
}
return list;
}
/// <summary>
/// 取得中文字符
/// </summary>
/// <param name="oriText"></param>
/// <returns></returns>
public static string GetChineseWord(string oriText)
{
var x = @"[\u4E00-\u9FFF]+";
var matches = Regex.Matches(oriText, x, RegexOptions.IgnoreCase);
var sb = new StringBuilder();
foreach (Match nextMatch in matches)
{
sb.Append(nextMatch.Value);
}
return sb.ToString();
}
/// <summary>
/// 固定间隔插入字符
/// </summary>
/// <param name="input">源字符串</param>
/// <param name="interval">间隔</param>
/// <param name="value">插入字符</param>
/// <returns></returns>
public static string InsertFormat(string input, int interval, string value)
{
for (var i = interval - 1; i < input.Length; i += interval + 1)
{
input = input.Insert(i, value);
}
return input;
}
/// <summary>
/// 判断更严谨，包含的有空串("")、空白符(空格""，" "，制表符"\t"，回车符"\r"，"\n"等)以及null值；
/// </summary>
/// <param name="str"></param>
/// <returns></returns>
public static bool IsBlank(string str)
{
int strLen;
if (str == null || (strLen = str.Length) == 0)
{
return true;
}
for (var i = 0; i < strLen; i++)
{
if (char.IsWhiteSpace(str.ElementAt(i)) == false)
{
return false;
}
}
return true;
}
/// <summary>
/// 是否为Double类型
/// </summary>
/// <param name="expression"></param>
/// <returns></returns>
public static bool IsDouble(object expression)
{
return expression != null && Regex.IsMatch(expression.ToString(), @"^([0-9])[0-9]*(\.\w*)?$");
}
/// <summary>
/// 判断对象是否为Int32类型的数字
/// </summary>
/// <param name="expression">The expression<see cref="string" /></param>
/// <returns></returns>
public static bool IsNumeric(string expression)
{
if (expression != null)
{
var str = expression;
if (str.Length > 0 && str.Length <= 11 && Regex.IsMatch(str, @"^[-]?[0-9]*[.]?[0-9]*$"))
{
if (str.Length < 10 || (str.Length == 10 && str[0] == '1') || (str.Length == 11 && str[0] == '-' && str[1] == '1'))
{
return true;
}
}
}
return false;
}
/// <summary>
/// 比较字符串相似度
/// </summary>
/// <param name="str1"></param>
/// <param name="str2"></param>
/// <returns></returns>
public static float Levenshtein(string str1, string str2)
{
var len1 = str1.Length;
var len2 = str2.Length;
var dif = new int[len1 + 1, len2 + 1];
for (var a = 0; a <= len1; a++)
{
dif[a, 0] = a;
}
for (var a = 0; a <= len2; a++)
{
dif[0, a] = a;
}
int temp;
for (var i = 1; i <= len1; i++)
{
for (var j = 1; j <= len2; j++)
{
temp = str1.ElementAt(i - 1) == str2.ElementAt(j - 1) ? 0 : 1;
dif[i, j] = Min(dif[i - 1, j - 1] + temp, dif[i, j - 1] + 1, dif[i - 1, j] + 1);
}
}
var similarity = 1 - ((float)dif[len1, len2] / Math.Max(len1, len2));
return similarity;
}
/// <summary>
/// 获取最短长度
/// </summary>
/// <param name="arr"></param>
/// <returns></returns>
private static int Min(params int[] arr)
{
var min = int.MaxValue;
foreach (var i in arr)
{
if (min > i)
{
min = i;
}
}
return min;
}
/// <summary>
/// 数字转字母
/// </summary>
/// <param name="index"></param>
/// <returns></returns>
public static string NumberToLetter(int index)
{
var str = string.Empty;
if (index >= "ABCDEFGHIJKLMNOPQRSTUVWXYZ".Length)
{
var num = index / "ABCDEFGHIJKLMNOPQRSTUVWXYZ".Length;
index %= "ABCDEFGHIJKLMNOPQRSTUVWXYZ".Length;
str += num.ToString();
}
return str + "ABCDEFGHIJKLMNOPQRSTUVWXYZ"[index];
}
/// <summary>
/// 指定字符串的固定长度，如果字符串小于固定长度，
/// 则在字符串的前面补足零，可设置的固定长度最大为9位
/// </summary>
/// <param name="text">原始字符串</param>
/// <param name="limitedLength">字符串的固定长度</param>
/// <returns>The <see cref="string" /></returns>
public static string RepairZero(string text, int limitedLength)
{
//补足0的字符串
var temp = string.Empty;
//补足0
for (var i = 0; i < limitedLength - text.Length; i++)
{
temp += "0";
}
//连接text
temp += text;
//返回补足0的字符串
return temp;
}
/// <summary>
/// 使用指定字符集将string转换成byte[]
/// </summary>
/// <param name="text">要转换的字符串</param>
/// <param name="encoding">字符编码</param>
public static byte[] StringToBytes(string text, Encoding encoding)
{
return encoding.GetBytes(text);
}
/// <summary>
/// string型转换为decimal型
/// </summary>
/// <param name="expression">The expression<see cref="string" /></param>
/// <param name="defValue">缺省值</param>
/// <returns>转换后的decimal类型结果</returns>
public static decimal StrToDecimal(string expression, decimal defValue)
{
if (expression == null || expression.Length > 10)
{
return defValue;
}
var intValue = defValue;
{
var isDecimal = Regex.IsMatch(expression, @"^([-]|[0-9])[0-9]*(\.\w*)?$");
if (isDecimal)
{
decimal.TryParse(expression, out intValue);
}
}
return intValue;
}
/// <summary>
/// string型转换为float型
/// </summary>
/// <param name="expression">The expression<see cref="string" /></param>
/// <param name="defValue">缺省值</param>
/// <returns>转换后的int类型结果</returns>
public static float StrToFloat(string expression, float defValue)
{
if (expression == null || expression.Length > 10)
{
return defValue;
}
var intValue = defValue;
{
var isFloat = Regex.IsMatch(expression, @"^([-]|[0-9])[0-9]*(\.\w*)?$");
if (isFloat)
{
float.TryParse(expression, out intValue);
}
}
return intValue;
}
/// <summary>
/// 将字符串转换为Int32类型
/// </summary>
/// <param name="expression">要转换的字符串</param>
/// <param name="defValue">缺省值</param>
/// <returns>转换后的int类型结果</returns>
public static int StrToInt(string expression, int defValue)
{
return string.IsNullOrEmpty(expression) || expression.Trim().Length >= 11 || !Regex.IsMatch(expression.Trim(), @"^([-]|[0-9])[0-9]*(\.\w*)?$")
? defValue
: int.TryParse(expression, out var rv)
? rv
: Convert.ToInt32(StrToFloat(expression, defValue));
}
#region 格式化
//StringFormat={}{0:C} $123.46
//StringFormat={}{0:C1} $123.5
//StringFormat=单价：{0:C} 单价：$123.46
//StringFormat={}{0}元 123.45678元
//StringFormat={}{0:D6} 086723
//StringFormat={}{0:F4} 28768234.9329
//StringFormat={}{0:N3} 28,768,234.933
//StringFormat={}{0:P1} 78.9 %
//StringFormat={}{0:0000.00} 0123.46
//StringFormat={}{0:####.##} 123.46
//StringFormat={}{0:d} 5/4/2015
//StringFormat={}{0:D} Monday, May 04, 2015
//StringFormat={}{0:f} Monday, May 04, 2015 5:46 PM
//StringFormat={}{0:F} Monday, May 04, 2015 5:46:56 PM
//StringFormat={}{0:g} 5/4/2015 5:46 PM
//StringFormat={}{0:G} 5/4/2015 5:46:56 PM
//StringFormat={}{0:m} May 04
//StringFormat={}{0:Distinct} May 04
//StringFormat={}{0:t} 5:46 PM
//StringFormat={}{0:Command} 5:46:56 PM
//StringFormat={}{0:yyyy年MM月dd日} 2015年05月04日
//StringFormat={}{0:yyyy-MM-dd} 2015-05-04
//StringFormat={}{0:yyyy-MM-dd HH:mm} 2015-05-04 17:46
//StringFormat={}{0:yyyy-MM-dd HH:mm:ss},,ConverterCulture=zh-CN||StringFormat='yyyy:MM:dd HH:mm:ss',,ConverterCulture=zh-CN 2015-05-04 17:46:56
//< TextBox.Text >
// < MultiBinding StringFormat = "姓名：{0}&#x09;{1}" >
// < Binding Path = "FristName" />
// < Binding Path = "LastName" />
// </ MultiBinding >
//</ TextBox.Text >
// < !--
// \a &#x07; BEL
// \b &#x08; BS - Backspace
// \f &#x0c; FF - Formfeed
// \n &#x0a; LF, NL - Linefeed, New Line
// \r &#x0d; CR - Carriage return
// \t &#x09; HT - Tab, Horizontal Tabelator
// \v &#x0b; VT - Vertical Tabelator
#endregion
}

6
ShrlAlgoToolkit.RevitAddins/Assists/ThumbnailOptions.cs
View File

@@ -1,8 +1,4 @@
using ShrlAlgoToolkit.Core.Assists;
using ShrlAlgoToolkit;
using ShrlAlgoToolkit.Core;
namespace ShrlAlgoToolkit.RevitAddins.Assists;
namespace ShrlAlgoToolkit.RevitAddins.Assists;
public enum ThumbnailOptions
{

4
ShrlAlgoToolkit.RevitAddins/Assists/ValidatorAssist.cs
View File

@@ -2,10 +2,6 @@
using System.Text;
using System.Text.RegularExpressions;
using ShrlAlgoToolkit.Core.Assists;
using ShrlAlgoToolkit;
using ShrlAlgoToolkit.Core;
namespace ShrlAlgoToolkit.RevitAddins.Assists;
/// <summary>

2
ShrlAlgoToolkit.RevitAddins/Assists/WinDialogAssist.cs
View File

@@ -11,8 +11,6 @@ using CommunityToolkit.Mvvm.ComponentModel;
using Microsoft.Win32;
using ShrlAlgoToolkit.Core.Assists;
namespace ShrlAlgoToolkit.RevitAddins.Assists;
public static class WinDialogAssist

4
ShrlAlgoToolkit.RevitAddins/Assists/WindowsThumbnailProvider.cs
View File

@@ -3,10 +3,6 @@ using System.Drawing.Imaging;
using System.IO;
using System.Runtime.InteropServices;
using ShrlAlgoToolkit.Core.Assists;
using ShrlAlgoToolkit;
using ShrlAlgoToolkit.Core;
namespace ShrlAlgoToolkit.RevitAddins.Assists;
/// <summary>

2
ShrlAlgoToolkit.RevitAddins/Attributes/GreaterThanAttribute.cs
View File

@@ -1,6 +1,6 @@
using System.ComponentModel.DataAnnotations;
namespace ShrlAlgoToolkit.Mvvm.Attributes;
namespace ShrlAlgoToolkit.RevitAddins.Attributes;
[AttributeUsage(AttributeTargets.Property | AttributeTargets.Field | AttributeTargets.Parameter)]
public sealed class GreaterThanAttribute : ValidationAttribute

2
ShrlAlgoToolkit.RevitAddins/Attributes/IsNumericAttribute.cs
View File

@@ -1,7 +1,7 @@
using System.ComponentModel.DataAnnotations;
using System.Globalization;
namespace ShrlAlgoToolkit.Mvvm.Attributes;
namespace ShrlAlgoToolkit.RevitAddins.Attributes;
[AttributeUsage(AttributeTargets.Property | AttributeTargets.Field | AttributeTargets.Parameter)]
public sealed class IsNumericAttribute : ValidationAttribute

2
ShrlAlgoToolkit.RevitAddins/Attributes/MaximumAttribute.cs
View File

@@ -1,6 +1,6 @@
using System.ComponentModel.DataAnnotations;
namespace ShrlAlgoToolkit.Mvvm.Attributes;
namespace ShrlAlgoToolkit.RevitAddins.Attributes;
[AttributeUsage(AttributeTargets.Property | AttributeTargets.Field | AttributeTargets.Parameter)]
public sealed class MaximumAttribute : ValidationAttribute

2
ShrlAlgoToolkit.RevitAddins/Attributes/MinimumAttribute.cs
View File

@@ -1,6 +1,6 @@
using System.ComponentModel.DataAnnotations;
namespace ShrlAlgoToolkit.Mvvm.Attributes;
namespace ShrlAlgoToolkit.RevitAddins.Attributes;
[AttributeUsage(AttributeTargets.Property | AttributeTargets.Field | AttributeTargets.Parameter)]
public sealed class MinimumAttribute : ValidationAttribute

2
ShrlAlgoToolkit.RevitAddins/Attributes/NotNullOrEmptyAttribute.cs
View File

@@ -1,6 +1,6 @@
using System.ComponentModel.DataAnnotations;
namespace ShrlAlgoToolkit.Mvvm.Attributes;
namespace ShrlAlgoToolkit.RevitAddins.Attributes;
[AttributeUsage(AttributeTargets.Property | AttributeTargets.Field | AttributeTargets.Parameter)]
public sealed class NotNullOrEmptyAttribute : ValidationAttribute

2
ShrlAlgoToolkit.RevitAddins/Attributes/UndefinedCharAttribute.cs
View File

@@ -1,6 +1,6 @@
using System.ComponentModel.DataAnnotations;
namespace ShrlAlgoToolkit.Mvvm.Attributes
namespace ShrlAlgoToolkit.RevitAddins.Attributes
{
[AttributeUsage(AttributeTargets.Property | AttributeTargets.Field | AttributeTargets.Parameter)]
public class UndefinedCharAttribute : ValidationAttribute

7
ShrlAlgoToolkit.RevitAddins/Converters/BooleanConverter.cs
View File

@@ -1,11 +1,6 @@
using System;
using System.Globalization;
using System.Globalization;
using System.Windows.Data;
using ShrlAlgoToolkit.RevitAddins.Converters;
using ShrlAlgoToolkit;
using ShrlAlgoToolkit.Mvvm;
namespace ShrlAlgoToolkit.RevitAddins.Converters;
public class BooleanConverter<T> : IValueConverter

8
ShrlAlgoToolkit.RevitAddins/Converters/BooleanToVisConverter.cs
View File

@@ -1,10 +1,4 @@
using System;
using System.Linq;
using System.Windows;
using ShrlAlgoToolkit.RevitAddins.Converters;
using ShrlAlgoToolkit;
using ShrlAlgoToolkit.Mvvm;
using System.Windows;
namespace ShrlAlgoToolkit.RevitAddins.Converters;

4
ShrlAlgoToolkit.RevitAddins/Converters/ColorToBrushConverter.cs
View File

@@ -2,10 +2,6 @@
using System.Windows.Data;
using System.Windows.Media;
using ShrlAlgoToolkit.RevitAddins.Converters;
using ShrlAlgoToolkit;
using ShrlAlgoToolkit.Mvvm;
namespace ShrlAlgoToolkit.RevitAddins.Converters;
public class ColorToBrushConverter : IValueConverter

4
ShrlAlgoToolkit.RevitAddins/Converters/ComparisonConverter.cs
View File

@@ -1,10 +1,6 @@
using System.Globalization;
using System.Windows.Data;
using ShrlAlgoToolkit.RevitAddins.Converters;
using ShrlAlgoToolkit;
using ShrlAlgoToolkit.Mvvm;
namespace ShrlAlgoToolkit.RevitAddins.Converters;
public class ComparisonConverter : IValueConverter

8
ShrlAlgoToolkit.RevitAddins/Converters/EnumDescriptionExtension.cs
View File

@@ -1,12 +1,6 @@
using System;
using System.ComponentModel;
using System.Linq;
using System.ComponentModel;
using System.Windows.Markup;
using ShrlAlgoToolkit.RevitAddins.Converters;
using ShrlAlgoToolkit;
using ShrlAlgoToolkit.Mvvm;
namespace ShrlAlgoToolkit.RevitAddins.Converters
{
public class EnumDescriptionExtension : MarkupExtension

4
ShrlAlgoToolkit.RevitAddins/Converters/EnumDescriptionTypeConverter.cs
View File

@@ -2,10 +2,6 @@
using System.Globalization;
using System.Reflection;
using ShrlAlgoToolkit.RevitAddins.Converters;
using ShrlAlgoToolkit;
using ShrlAlgoToolkit.Mvvm;
namespace ShrlAlgoToolkit.RevitAddins.Converters;
/// <summary>

4
ShrlAlgoToolkit.RevitAddins/Converters/EnumSourceAndConverter.cs
View File

@@ -4,10 +4,6 @@ using System.Globalization;
using System.Reflection;
using System.Windows.Data;
using ShrlAlgoToolkit.RevitAddins.Converters;
using ShrlAlgoToolkit;
using ShrlAlgoToolkit.Mvvm;
namespace ShrlAlgoToolkit.RevitAddins.Converters;
/// <summary>

4
ShrlAlgoToolkit.RevitAddins/Converters/InvertBooleanConverter.cs
View File

@@ -1,10 +1,6 @@
using System.Globalization;
using System.Windows.Data;
using ShrlAlgoToolkit.RevitAddins.Converters;
using ShrlAlgoToolkit;
using ShrlAlgoToolkit.Mvvm;
namespace ShrlAlgoToolkit.RevitAddins.Converters;
public class InvertBooleanConverter : IValueConverter

4
ShrlAlgoToolkit.RevitAddins/Converters/InverterBooleanToVisConverter.cs
View File

@@ -1,9 +1,5 @@
using System.Windows;
using ShrlAlgoToolkit.RevitAddins.Converters;
using ShrlAlgoToolkit;
using ShrlAlgoToolkit.Mvvm;
namespace ShrlAlgoToolkit.RevitAddins.Converters;
public class InverterBooleanToVisConverter : Converters.BooleanConverter<Visibility>

3
ShrlAlgoToolkit.RevitAddins/Converters/MarkupConverters.cs
View File

@@ -1,5 +1,4 @@
using System;
using System.Globalization;
using System.Globalization;
using System.Windows;
using System.Windows.Data;
using System.Windows.Markup;

8
ShrlAlgoToolkit.RevitAddins/Converters/NotNullToVisibilityConverter.cs
View File

@@ -1,13 +1,7 @@
using System;
using System.Globalization;
using System.Linq;
using System.Globalization;
using System.Windows;
using System.Windows.Data;
using ShrlAlgoToolkit.RevitAddins.Converters;
using ShrlAlgoToolkit;
using ShrlAlgoToolkit.Mvvm;
namespace ShrlAlgoToolkit.RevitAddins.Converters
{
/// <summary>

4
ShrlAlgoToolkit.RevitAddins/Converters/SearchValueConverter.cs
View File

@@ -1,9 +1,5 @@
using System.Windows.Data;
using ShrlAlgoToolkit.RevitAddins.Converters;
using ShrlAlgoToolkit;
using ShrlAlgoToolkit.Mvvm;
namespace ShrlAlgoToolkit.RevitAddins.Converters;
public class SearchValueConverter : IMultiValueConverter

18
ShrlAlgoToolkit.RevitAddins/Extensions/CommonExtensions.cs Normal file
View File

@@ -0,0 +1,18 @@
using System.Reflection;
namespace ShrlAlgoToolkit.RevitAddins.Extensions
{
public static class CommonExtensions
{
/// <summary>
/// 获取当前枚举值的描述，没有描述则返回空字符串
/// </summary>
/// <param name="value"></param>
/// <returns></returns>
public static T GetAttribute<T>(this Enum value) where T : Attribute
{
var fieldInfo = value.GetType().GetField(value.ToString());
return fieldInfo.GetCustomAttribute<T>();
}
}
}

4
ShrlAlgoToolkit.RevitAddins/Extensions/DistinctExtensions.cs
View File

@@ -1,6 +1,4 @@
using ShrlAlgoToolkit.RevitAddins.Extensions;
namespace ShrlAlgoToolkit.RevitAddins.Extensions;
namespace ShrlAlgoToolkit.RevitAddins.Extensions;
/// <summary>
/// 自定义Distinct扩展方法

300
ShrlAlgoToolkit.RevitAddins/Extensions/StringExtensions.cs Normal file
View File

@@ -0,0 +1,300 @@
using System.Text;
using System.Text.RegularExpressions;
namespace ShrlAlgoToolkit.RevitAddins.Extensions;
#region 格式化
//StringFormat={}{0:C} $123.46
//StringFormat={}{0:C1} $123.5
//StringFormat=单价：{0:C} 单价：$123.46
//StringFormat={}{0}元 123.45678元
//StringFormat={}{0:D6} 086723
//StringFormat={}{0:F4} 28768234.9329
//StringFormat={}{0:N3} 28,768,234.933
//StringFormat={}{0:P1} 78.9 %
//StringFormat={}{0:0000.00} 0123.46
//StringFormat={}{0:####.##} 123.46
//StringFormat={}{0:d} 5/4/2015
//StringFormat={}{0:D} Monday, May 04, 2015
//StringFormat={}{0:f} Monday, May 04, 2015 5:46 PM
//StringFormat={}{0:F} Monday, May 04, 2015 5:46:56 PM
//StringFormat={}{0:g} 5/4/2015 5:46 PM
//StringFormat={}{0:G} 5/4/2015 5:46:56 PM
//StringFormat={}{0:m} May 04
//StringFormat={}{0:Distinct} May 04
//StringFormat={}{0:t} 5:46 PM
//StringFormat={}{0:Command} 5:46:56 PM
//StringFormat={}{0:yyyy年MM月dd日} 2015年05月04日
//StringFormat={}{0:yyyy-MM-dd} 2015-05-04
//StringFormat={}{0:yyyy-MM-dd HH:mm} 2015-05-04 17:46
//StringFormat={}{0:yyyy-MM-dd HH:mm:ss},,ConverterCulture=zh-CN||StringFormat='yyyy:MM:dd HH:mm:ss',,ConverterCulture=zh-CN 2015-05-04 17:46:56
//< TextBox.Text >
// < MultiBinding StringFormat = "姓名：{0}&#x09;{1}" >
// < Binding Path = "FristName" />
// < Binding Path = "LastName" />
// </ MultiBinding >
//</ TextBox.Text >
// < !--
// \a &#x07; BEL
// \b &#x08; BS - Backspace
// \f &#x0c; FF - Formfeed
// \n &#x0a; LF, NL - Linefeed, New Line
// \r &#x0d; CR - Carriage return
// \t &#x09; HT - Tab, Horizontal Tabelator
// \v &#x0b; VT - Vertical Tabelator
#endregion
public static class StringExtensions
{
/// <summary>
/// 取得中文字符
/// </summary>
/// <param name="oriText"></param>
/// <returns></returns>
public static string GetChineseWord(this string oriText)
{
var x = @"[\u4E00-\u9FFF]+";
var matches = Regex.Matches(oriText, x, RegexOptions.IgnoreCase);
var sb = new StringBuilder();
foreach (Match nextMatch in matches)
{
sb.Append(nextMatch.Value);
}
return sb.ToString();
}
/// <summary>
/// 固定间隔插入字符
/// </summary>
/// <param name="input">源字符串</param>
/// <param name="interval">间隔</param>
/// <param name="value">插入字符</param>
/// <returns></returns>
public static string InsertFormat(this string input, int interval, string value)
{
for (var i = interval - 1; i < input.Length; i += interval + 1)
{
input = input.Insert(i, value);
}
return input;
}
/// <summary>
/// 判断更严谨，包含的有空串("")、空白符(空格""，" "，制表符"\t"，回车符"\r"，"\n"等)以及null值；
/// </summary>
/// <param name="str"></param>
/// <returns></returns>
public static bool IsBlank(this string str)
{
int strLen;
if (str == null || (strLen = str.Length) == 0)
{
return true;
}
for (var i = 0; i < strLen; i++)
{
if (char.IsWhiteSpace(str.ElementAt(i)) == false)
{
return false;
}
}
return true;
}
/// <summary>
/// 是否为Double类型
/// </summary>
/// <param name="expression"></param>
/// <returns></returns>
public static bool IsDouble(this string expression)
{
return expression != null && Regex.IsMatch(expression.ToString(), @"^([0-9])[0-9]*(\.\w*)?$");
}
/// <summary>
/// 判断对象是否为Int32类型的数字
/// </summary>
/// <param name="expression">The expression<see cref="string" /></param>
/// <returns></returns>
public static bool IsNumeric(this string expression)
{
if (expression != null)
{
var str = expression;
if (str.Length > 0 && str.Length <= 11 && Regex.IsMatch(str, @"^[-]?[0-9]*[.]?[0-9]*$"))
{
if (str.Length < 10 || (str.Length == 10 && str[0] == '1') || (str.Length == 11 && str[0] == '-' && str[1] == '1'))
{
return true;
}
}
}
return false;
}
/// <summary>
/// 比较字符串相似度
/// </summary>
/// <param name="str1"></param>
/// <param name="str2"></param>
/// <returns></returns>
public static float Levenshtein(this string str1, string str2)
{
var len1 = str1.Length;
var len2 = str2.Length;
var dif = new int[len1 + 1, len2 + 1];
for (var a = 0; a <= len1; a++)
{
dif[a, 0] = a;
}
for (var a = 0; a <= len2; a++)
{
dif[0, a] = a;
}
int temp;
for (var i = 1; i <= len1; i++)
{
for (var j = 1; j <= len2; j++)
{
temp = str1.ElementAt(i - 1) == str2.ElementAt(j - 1) ? 0 : 1;
dif[i, j] = Min(dif[i - 1, j - 1] + temp, dif[i, j - 1] + 1, dif[i - 1, j] + 1);
}
}
var similarity = 1 - ((float)dif[len1, len2] / Math.Max(len1, len2));
return similarity;
}
/// <summary>
/// 获取最短长度
/// </summary>
/// <param name="arr"></param>
/// <returns></returns>
private static int Min(params int[] arr)
{
var min = int.MaxValue;
foreach (var i in arr)
{
if (min > i)
{
min = i;
}
}
return min;
}
/// <summary>
/// 数字转字母
/// </summary>
/// <param name="index"></param>
/// <returns></returns>
public static string NumberToLetter(int index)
{
var str = string.Empty;
if (index >= "ABCDEFGHIJKLMNOPQRSTUVWXYZ".Length)
{
var num = index / "ABCDEFGHIJKLMNOPQRSTUVWXYZ".Length;
index %= "ABCDEFGHIJKLMNOPQRSTUVWXYZ".Length;
str += num.ToString();
}
return str + "ABCDEFGHIJKLMNOPQRSTUVWXYZ"[index];
}
/// <summary>
/// 指定字符串的固定长度，如果字符串小于固定长度，
/// 则在字符串的前面补足零，可设置的固定长度最大为9位
/// </summary>
/// <param name="text">原始字符串</param>
/// <param name="limitedLength">字符串的固定长度</param>
/// <returns>The <see cref="string" /></returns>
public static string RepairZero(this string text, int limitedLength)
{
return text.PadRight(limitedLength, '0');
}
/// <summary>
/// 使用指定字符集将string转换成byte[]
/// </summary>
/// <param name="text">要转换的字符串</param>
/// <param name="encoding">字符编码</param>
public static byte[] StringToBytes(this string text, Encoding encoding)
{
return encoding.GetBytes(text);
}
/// <summary>
/// string型转换为decimal型
/// </summary>
/// <param name="expression">The expression<see cref="string" /></param>
/// <param name="defValue">缺省值</param>
/// <returns>转换后的decimal类型结果</returns>
public static decimal StrToDecimal(this string expression, decimal defValue)
{
if (expression == null || expression.Length > 10)
{
return defValue;
}
var intValue = defValue;
{
var isDecimal = Regex.IsMatch(expression, @"^([-]|[0-9])[0-9]*(\.\w*)?$");
if (isDecimal)
{
decimal.TryParse(expression, out intValue);
}
}
return intValue;
}
/// <summary>
/// string型转换为float型
/// </summary>
/// <param name="expression">The expression<see cref="string" /></param>
/// <param name="defValue">缺省值</param>
/// <returns>转换后的int类型结果</returns>
public static float StrToFloat(this string expression, float defValue)
{
if (expression == null || expression.Length > 10)
{
return defValue;
}
var intValue = defValue;
{
var isFloat = Regex.IsMatch(expression, @"^([-]|[0-9])[0-9]*(\.\w*)?$");
if (isFloat)
{
float.TryParse(expression, out intValue);
}
}
return intValue;
}
/// <summary>
/// 将字符串转换为Int32类型
/// </summary>
/// <param name="expression">要转换的字符串</param>
/// <param name="defValue">缺省值</param>
/// <returns>转换后的int类型结果</returns>
public static int StrToInt(this string expression, int defValue)
{
return string.IsNullOrEmpty(expression) || expression.Trim().Length >= 11 || !Regex.IsMatch(expression.Trim(), @"^([-]|[0-9])[0-9]*(\.\w*)?$")
? defValue
: int.TryParse(expression, out var rv)
? rv
: Convert.ToInt32(StrToFloat(expression, defValue));
}
}

6
ShrlAlgoToolkit.RevitAddins/GlobalUsings.cs
View File

@@ -1,4 +1,4 @@
global using ShrlAlgoToolkit.Revit.Assists;
global using ShrlAlgoToolkit.Revit.Extensions;
global using Autodesk.Revit.UI;
global using JetBrains.Annotations;
global using Autodesk.Revit.UI;
global using ShrlAlgoToolkit.Revit.Assists;
global using ShrlAlgoToolkit.Revit.Extensions;

2
ShrlAlgoToolkit.RevitAddins/ModelManager/CorrectReferLevelExecutes.cs
View File

@@ -2,8 +2,6 @@
using Autodesk.Revit.DB.Electrical;
using Autodesk.Revit.DB.Mechanical;
using Autodesk.Revit.DB.Plumbing;
using Autodesk.Revit.UI;
using ShrlAlgoToolkit.RevitAddins.Windows;
namespace ShrlAlgoToolkit.RevitAddins.ModelManager;

1
ShrlAlgoToolkit.RevitAddins/ModelManager/ModelCheckCmd.cs
View File

@@ -1,7 +1,6 @@
using Autodesk.Revit.Attributes;
using Nice3point.Revit.Toolkit.External;
using ShrlAlgoToolkit.Core.Assists;
using ShrlAlgoToolkit.RevitAddins.Assists;
namespace ShrlAlgoToolkit.RevitAddins.ModelManager;

8
ShrlAlgoToolkit.RevitAddins/ModelManager/ModelCheckView.xaml.cs
View File

@@ -1,8 +1,4 @@
using System.Windows;
using Melskin.Appearance;
namespace ShrlAlgoToolkit.RevitAddins.ModelManager
namespace ShrlAlgoToolkit.RevitAddins.ModelManager
{
/// <summary>
/// ModelCheckView.xaml 的交互逻辑
@@ -11,9 +7,7 @@ namespace ShrlAlgoToolkit.RevitAddins.ModelManager
{
public ModelCheckView()
{
//this.Style = (Style)this.FindResource("MelWindowStyle");
InitializeComponent();
//ThemeManager.ApplyResourcesToElement(this);
}
}
}

10
ShrlAlgoToolkit.RevitAddins/ModelManager/ModelCheckViewModel.cs
View File

@@ -5,22 +5,12 @@ using Autodesk.Revit.DB.Architecture;
using Autodesk.Revit.DB.Electrical;
using Autodesk.Revit.DB.Mechanical;
using Autodesk.Revit.DB.Plumbing;
using Autodesk.Revit.UI;
using CommunityToolkit.Mvvm.ComponentModel;
using CommunityToolkit.Mvvm.Input;
using JetBrains.Annotations;
using Microsoft.Win32;
using Nice3point.Revit.Toolkit.External.Handlers;
using ShrlAlgoToolkit.Core.Assists;
using ShrlAlgoToolkit.RevitAddins.Assists;
using ShrlAlgoToolkit.RevitAddins.Windows;
using ShrlAlgoToolkit.RevitAddins.Assists;
using ShrlAlgoToolkit;
using ShrlAlgoToolkit.RevitAddins;
using ShrlAlgoToolkit.RevitAddins.Assists;
using ShrlAlgoToolkit;
using ShrlAlgoToolkit.RevitAddins;
namespace ShrlAlgoToolkit.RevitAddins.ModelManager;

1
ShrlAlgoToolkit.RevitAddins/ModelManager/SeparateModelCmd.cs
View File

@@ -1,6 +1,5 @@
using Autodesk.Revit.Attributes;
using Nice3point.Revit.Toolkit.External;
using ShrlAlgoToolkit.Core.Assists;
using ShrlAlgoToolkit.RevitAddins.Assists;
namespace ShrlAlgoToolkit.RevitAddins.ModelManager;

10
ShrlAlgoToolkit.RevitAddins/ModelManager/SeparateModelViewModel.cs
View File

@@ -1,13 +1,9 @@
using Autodesk.Revit.DB;
using System.IO;
using System.Windows;
using Autodesk.Revit.DB;
using CommunityToolkit.Mvvm.ComponentModel;
using CommunityToolkit.Mvvm.Input;
using Nice3point.Revit.Toolkit.External.Handlers;
using System.IO;
using System.Windows;
using UIFrameworkServices;
namespace ShrlAlgoToolkit.RevitAddins.ModelManager

9
ShrlAlgoToolkit.RevitAddins/RvCivil/BricksFinishesCmd.cs
View File

@@ -9,13 +9,6 @@ public class BricksFinishesCmd : ExternalCommand
{
public override void Execute()
{
WinDialogAssist.ShowModeless<BricksFinishesView>(new BricksFinishesViewModel());
//var fl = SingletonViewHelpers<BricksFinishesView>.GetInstance(out var isNewCreate);
//if (isNewCreate)
//{
// fl.DataContext = new BricksFinishesViewModel();
// fl.ShowAhead();
//}
//fl.Activate();
WinDialogAssist.ShowOrActivate<BricksFinishesView, BricksFinishesViewModel>();
}
}

31
ShrlAlgoToolkit.RevitAddins/RvCivil/BricksFinishesViewModel.cs
View File

@@ -1,19 +1,12 @@
using Autodesk.Revit.DB;
using System.ComponentModel.DataAnnotations;
using System.Windows;
using Autodesk.Revit.DB;
using Autodesk.Revit.DB.Architecture;
using Autodesk.Revit.UI;
using Autodesk.Revit.UI.Selection;
using CommunityToolkit.Mvvm.ComponentModel;
using CommunityToolkit.Mvvm.Input;
using Nice3point.Revit.Toolkit.External.Handlers;
using ShrlAlgoToolkit.Mvvm.Attributes;
using System.ComponentModel.DataAnnotations;
using System.Windows;
namespace ShrlAlgoToolkit.RevitAddins.RvCivil;
@@ -49,8 +42,8 @@ public partial class BricksFinishesViewModel : ObservableValidator
public partial bool IsEdgeExistGap { get; set; }
[Required(ErrorMessage = "不可为空")]
[IsNumeric]
[Minimum(10.0)]
[Attributes.IsNumeric]
[Attributes.Minimum(10.0)]
[ObservableProperty]
[NotifyDataErrorInfo]
public partial double PavementWidth { get; set; }
@@ -62,7 +55,7 @@ public partial class BricksFinishesViewModel : ObservableValidator
//}
[Required(ErrorMessage = "不可为空")]
[IsNumeric]
[Attributes.IsNumeric]
[ObservableProperty]
[NotifyDataErrorInfo]
public partial double WallBaseOffset { get; set; }
@@ -74,8 +67,8 @@ public partial class BricksFinishesViewModel : ObservableValidator
//}
[Required(ErrorMessage = "不可为空")]
[IsNumeric]
[Minimum(1.0)]
[Attributes.IsNumeric]
[Attributes.Minimum(1.0)]
[ObservableProperty]
[NotifyDataErrorInfo]
public partial double PavementThickness { get; set; }
@@ -87,8 +80,8 @@ public partial class BricksFinishesViewModel : ObservableValidator
//}
[Required(ErrorMessage = "不可为空")]
[IsNumeric]
[Minimum(10.0)]
[Attributes.IsNumeric]
[Attributes.Minimum(10.0)]
[ObservableProperty]
[NotifyDataErrorInfo]
public partial double PavementLength { get; set; }
@@ -100,8 +93,8 @@ public partial class BricksFinishesViewModel : ObservableValidator
//}
[Required(ErrorMessage = "不可为空")]
[IsNumeric]
[Minimum(1.0)]
[Attributes.IsNumeric]
[Attributes.Minimum(1.0)]
[ObservableProperty]
[NotifyDataErrorInfo]
public partial double PavementGap { get; set; }

7
ShrlAlgoToolkit.RevitAddins/RvCivil/CivilConnectionCmd.cs
View File

@@ -1,14 +1,7 @@
using System.Windows;
using Autodesk.Revit.Attributes;
using Nice3point.Revit.Toolkit.External;
using ShrlAlgoToolkit.Core.Assists;
using ShrlAlgoToolkit.RevitAddins.Assists;
using ShrlAlgoToolkit.RevitAddins.Assists;
using ShrlAlgoToolkit;
using ShrlAlgoToolkit.RevitAddins;
using ShrlAlgoToolkit.RevitAddins.Assists;
using ShrlAlgoToolkit;
using ShrlAlgoToolkit.RevitAddins;
namespace ShrlAlgoToolkit.RevitAddins.RvCivil;

1
ShrlAlgoToolkit.RevitAddins/RvCivil/CreateOpeningsCmd.cs
View File

@@ -1,6 +1,5 @@
using Autodesk.Revit.Attributes;
using Nice3point.Revit.Toolkit.External;
using ShrlAlgoToolkit.Core.Assists;
using ShrlAlgoToolkit.RevitAddins.Assists;
namespace ShrlAlgoToolkit.RevitAddins.RvCivil;

7
ShrlAlgoToolkit.RevitAddins/RvCivil/CreateOpeningsViewModel.cs
View File

@@ -1,18 +1,11 @@
using System.IO;
using System.Windows;
using Autodesk.Revit.DB;
using Autodesk.Revit.UI;
using Autodesk.Revit.UI.Selection;
using CommunityToolkit.Mvvm.ComponentModel;
using CommunityToolkit.Mvvm.Input;
using Nice3point.Revit.Toolkit.External.Handlers;
using ShrlAlgoToolkit.Core.Assists;
using ShrlAlgoToolkit.RevitAddins.Assists;
using ShrlAlgoToolkit;
using ShrlAlgoToolkit.RevitAddins;
using ShrlAlgoToolkit.RevitAddins.Assists;
using ShrlAlgoToolkit;
using ShrlAlgoToolkit.RevitAddins;
namespace ShrlAlgoToolkit.RevitAddins.RvCivil
{

1
ShrlAlgoToolkit.RevitAddins/RvCivil/FloorFinishesViewModel.cs
View File

@@ -1,7 +1,6 @@
using System.ComponentModel.DataAnnotations;
using Autodesk.Revit.DB;
using Autodesk.Revit.DB.Architecture;
using Autodesk.Revit.UI;
using CommunityToolkit.Mvvm.ComponentModel;
using CommunityToolkit.Mvvm.Input;
using Nice3point.Revit.Toolkit.External.Handlers;

1
ShrlAlgoToolkit.RevitAddins/RvCivil/ModelSplitterCmd.cs
View File

@@ -3,7 +3,6 @@ using System.Text;
using System.Windows;
using Autodesk.Revit.Attributes;
using Autodesk.Revit.DB;
using Autodesk.Revit.UI;
using Nice3point.Revit.Toolkit.External;

1
ShrlAlgoToolkit.RevitAddins/RvCivil/ResolveCivilConnectViewModel.cs
View File

@@ -1,6 +1,5 @@
using System.Windows;
using Autodesk.Revit.DB;
using Autodesk.Revit.UI;
using CommunityToolkit.Mvvm.ComponentModel;
using CommunityToolkit.Mvvm.Input;
using Nice3point.Revit.Toolkit.External.Handlers;

20
ShrlAlgoToolkit.RevitAddins/RvCivil/WallFinishesViewModel.cs
View File

@@ -1,30 +1,10 @@
using System.Windows;
using Autodesk.Revit.DB;
using Autodesk.Revit.DB.Architecture;
using Autodesk.Revit.UI;
using Autodesk.Revit.UI.Selection;
using CommunityToolkit.Mvvm.ComponentModel;
using CommunityToolkit.Mvvm.Input;
using Nice3point.Revit.Toolkit.External.Handlers;
using ShrlAlgoToolkit.Core.Assists;
using ShrlAlgoToolkit.RevitAddins.Assists;
using ShrlAlgoToolkit;
using ShrlAlgoToolkit.RevitAddins;
using ShrlAlgoToolkit.RevitAddins.Assists;
using ShrlAlgoToolkit;
using ShrlAlgoToolkit.RevitAddins;
using ShrlAlgoToolkit.RevitAddins.Assists;
using ShrlAlgoToolkit;
using ShrlAlgoToolkit.RevitAddins;
using ShrlAlgoToolkit.RevitAddins.Assists;
using ShrlAlgoToolkit;
using ShrlAlgoToolkit.RevitAddins;
using ShrlAlgoToolkit.RevitAddins.Assists;
using ShrlAlgoToolkit;
using ShrlAlgoToolkit.RevitAddins;
using ShrlAlgoToolkit.RevitAddins.Assists;
using ShrlAlgoToolkit;
using ShrlAlgoToolkit.RevitAddins;
namespace ShrlAlgoToolkit.RevitAddins.RvCivil;

1
ShrlAlgoToolkit.RevitAddins/RvCommon/AutoSaveCmd.cs
View File

@@ -1,5 +1,4 @@
using Autodesk.Revit.Attributes;
using Autodesk.Revit.UI;
using Nice3point.Revit.Toolkit.External;
namespace ShrlAlgoToolkit.RevitAddins.RvCommon;

1
ShrlAlgoToolkit.RevitAddins/RvCommon/DetailSelectFiltersViewModel.cs
View File

@@ -3,7 +3,6 @@ using System.ComponentModel;
using System.Windows;
using System.Windows.Data;
using Autodesk.Revit.DB;
using Autodesk.Revit.UI;
using CommunityToolkit.Mvvm.ComponentModel;
using CommunityToolkit.Mvvm.Input;
using Nice3point.Revit.Toolkit.External.Handlers;

15
ShrlAlgoToolkit.RevitAddins/RvCommon/InstanceCreatorViewModel.cs
View File

@@ -1,27 +1,12 @@
using System.Windows;
using System.Windows.Input;
using System.Windows.Media.Imaging;
using Autodesk.Revit.DB;
using Autodesk.Revit.DB.Structure;
using Autodesk.Revit.UI;
using Autodesk.Revit.UI.Selection;
using CommunityToolkit.Mvvm.ComponentModel;
using CommunityToolkit.Mvvm.Input;
using Microsoft.Xaml.Behaviors;
using Nice3point.Revit.Toolkit.External.Handlers;
using ShrlAlgoToolkit.RevitAddins.Extensions;
using ShrlAlgoToolkit;
using ShrlAlgoToolkit.RevitAddins;
using ShrlAlgoToolkit.RevitAddins.Extensions;
using ShrlAlgoToolkit;
using ShrlAlgoToolkit.RevitAddins;
// ReSharper disable ConditionIsAlwaysTrueOrFalse

4
ShrlAlgoToolkit.RevitAddins/RvCommon/MergeSharedParametersCmd.cs
View File

@@ -1,8 +1,4 @@
using Autodesk.Revit.Attributes;
using Autodesk.Revit.DB;
using Autodesk.Revit.UI;
using Autodesk.Revit.UI.Selection;
using Nice3point.Revit.Toolkit.External;
namespace ShrlAlgoToolkit.RevitAddins.RvCommon;

33
ShrlAlgoToolkit.RevitAddins/RvCommon/ModelByCurveCreatorViewModel.cs
View File

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

8
ShrlAlgoToolkit.RevitAddins/RvCommon/MoveElementByRelationshipCmd.cs
View File

@@ -1,10 +1,4 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using Autodesk.Revit.Attributes;
using Autodesk.Revit.Attributes;
using Autodesk.Revit.DB;
using Nice3point.Revit.Toolkit.External;

7
ShrlAlgoToolkit.RevitAddins/RvCommon/PipesCreatorViewModel.cs
View File

@@ -7,13 +7,6 @@ using Autodesk.Revit.UI.Selection;
using CommunityToolkit.Mvvm.ComponentModel;
using CommunityToolkit.Mvvm.Input;
using Nice3point.Revit.Toolkit.External.Handlers;
using ShrlAlgoToolkit.Core.Assists;
using ShrlAlgoToolkit.RevitAddins.Assists;
using ShrlAlgoToolkit;
using ShrlAlgoToolkit.RevitAddins;
using ShrlAlgoToolkit.RevitAddins.Assists;
using ShrlAlgoToolkit;
using ShrlAlgoToolkit.RevitAddins;
namespace ShrlAlgoToolkit.RevitAddins.RvCommon;

5
ShrlAlgoToolkit.RevitAddins/RvCommon/PlaceInstanceByCircleCmd.cs
View File

@@ -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;

8
ShrlAlgoToolkit.RevitAddins/RvCommon/SplitImportInstanceCmd.cs
View File

@@ -1,10 +1,4 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using Autodesk.Revit.Attributes;
using Autodesk.Revit.Attributes;
using Autodesk.Revit.DB;
using Nice3point.Revit.Toolkit.External;

3
ShrlAlgoToolkit.RevitAddins/RvFamily/CutGeologyByLoopCmd.cs
View File

@@ -1,5 +1,4 @@
using System.Linq;
using System.Windows;
using System.Windows;
using Autodesk.Revit.Attributes;
using Autodesk.Revit.DB;

1
ShrlAlgoToolkit.RevitAddins/RvFamily/ExplodeDwgCmd.cs
View File

@@ -3,7 +3,6 @@ using System.Windows;
using Autodesk.Revit.Attributes;
using Autodesk.Revit.DB;
using Autodesk.Revit.UI;
using Autodesk.Revit.UI.Selection;
namespace ShrlAlgoToolkit.RevitAddins.RvFamily;

22
ShrlAlgoToolkit.RevitAddins/RvFamily/FamilyLibrary/FamilyLibraryViewModel.cs
View File

@@ -2,34 +2,14 @@
using System.IO;
using System.Windows;
using System.Windows.Controls;
using Autodesk.Revit.DB;
using CommunityToolkit.Mvvm.ComponentModel;
using CommunityToolkit.Mvvm.Input;
using FuzzySharp;
using Nice3point.Revit.Toolkit.External.Handlers;
using ShrlAlgoToolkit.Core.Assists;
using ShrlAlgoToolkit.RevitAddins.Assists;
using static ShrlAlgoToolkit.RevitAddins.Assists.RevitFileAssist;
using static ShrlAlgoToolkit.Revit.Assists.RevitFileAssist;
using Settings = ShrlAlgoToolkit.RevitAddins.Properties.Settings;
using ShrlAlgoToolkit.RevitAddins.Assists;
using ShrlAlgoToolkit;
using ShrlAlgoToolkit.RevitAddins;
using ShrlAlgoToolkit.RevitAddins.Assists;
using ShrlAlgoToolkit;
using ShrlAlgoToolkit.RevitAddins;
using ShrlAlgoToolkit.RevitAddins.Assists;
using ShrlAlgoToolkit;
using ShrlAlgoToolkit.RevitAddins;
using ShrlAlgoToolkit.RevitAddins.Assists;
using ShrlAlgoToolkit;
using ShrlAlgoToolkit.RevitAddins;
namespace ShrlAlgoToolkit.RevitAddins.RvFamily.FamilyLibrary;

16
ShrlAlgoToolkit.RevitAddins/RvFamily/FamilyLibrary/FamilyModel.cs
View File

@@ -1,19 +1,9 @@
using Autodesk.Revit.DB;
using Autodesk.Revit.UI;
using System.IO;
using System.Windows.Media.Imaging;
using Autodesk.Revit.DB;
using CommunityToolkit.Mvvm.ComponentModel;
using CommunityToolkit.Mvvm.Input;
using ShrlAlgoToolkit.Core.Assists;
using System.IO;
using System.Windows.Media.Imaging;
using ShrlAlgoToolkit.RevitAddins.Assists;
using ShrlAlgoToolkit;
using ShrlAlgoToolkit.RevitAddins;
using ShrlAlgoToolkit.RevitAddins.Assists;
using ShrlAlgoToolkit;
using ShrlAlgoToolkit.RevitAddins;
namespace ShrlAlgoToolkit.RevitAddins.RvFamily.FamilyLibrary;

1
ShrlAlgoToolkit.RevitAddins/RvFamily/FamilyLibrary/LoadedFamilyDropHandler.cs
View File

@@ -1,5 +1,4 @@
using Autodesk.Revit.DB;
using Autodesk.Revit.UI;
namespace ShrlAlgoToolkit.RevitAddins.RvFamily.FamilyLibrary
{

21
ShrlAlgoToolkit.RevitAddins/RvFamily/FamilyProcessorViewModel.cs
View File

@@ -1,23 +1,12 @@
using Autodesk.Revit.DB;
using Autodesk.Revit.UI;
using CommunityToolkit.Mvvm.ComponentModel;
using CommunityToolkit.Mvvm.Input;
using Nice3point.Revit.Toolkit.External.Handlers;
using ShrlAlgoToolkit.Core.Assists;
using System.Collections;
using System.Collections;
using System.IO;
using System.Text;
using System.Windows;
using Autodesk.Revit.DB;
using CommunityToolkit.Mvvm.ComponentModel;
using CommunityToolkit.Mvvm.Input;
using Nice3point.Revit.Toolkit.External.Handlers;
using ShrlAlgoToolkit.RevitAddins.Assists;
using ShrlAlgoToolkit;
using ShrlAlgoToolkit.RevitAddins;
using ShrlAlgoToolkit.RevitAddins.Assists;
using ShrlAlgoToolkit;
using ShrlAlgoToolkit.RevitAddins;
namespace ShrlAlgoToolkit.RevitAddins.RvFamily;

3
ShrlAlgoToolkit.RevitAddins/RvFamily/RenameFamilyItem.cs
View File

@@ -1,6 +1,5 @@
using Autodesk.Revit.DB;
using CommunityToolkit.Mvvm.ComponentModel;
using ShrlAlgoToolkit.Mvvm.Attributes;
namespace ShrlAlgoToolkit.RevitAddins.RvFamily;
@@ -10,7 +9,7 @@ public partial class RenameFamilyItem : ObservableValidator
public partial bool IsSelected { get; set; }
[ObservableProperty]
[UndefinedChar]
[Attributes.UndefinedChar]
[NotifyDataErrorInfo]
public partial string NewFamilyName { get; set; }

82
ShrlAlgoToolkit.RevitAddins/RvFamily/RenameFamilyView.xaml
View File

@@ -1,7 +1,12 @@
<ui:MelWindow
Height="600"
Icon="{DynamicResource RevitIcon}"
Title="重命名族"
Width="900"
d:DataContext="{d:DesignInstance local:RenameFamilyViewModel}"
mc:Ignorable="d"
x:Class="ShrlAlgoToolkit.RevitAddins.RvFamily.RenameFamilyView"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:b="http://schemas.microsoft.com/xaml/behaviors"
xmlns:conv="clr-namespace:ShrlAlgoToolkit.RevitAddins.Converters"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
@@ -10,12 +15,7 @@
xmlns:mvvm="clr-namespace:ShrlAlgoToolkit.RevitAddins.Assists"
xmlns:ui="https://github.com/ShrlAlgo/Melskin"
xmlns:validationRules="clr-namespace:ShrlAlgoToolkit.Mvvm.ValidationRules"
Title="重命名族"
Width="900"
Height="600"
d:DataContext="{d:DesignInstance local:RenameFamilyViewModel}"
Icon="{DynamicResource RevitIcon}"
mc:Ignorable="d">
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
<Window.Resources>
<ResourceDictionary Source="pack://application:,,,/ShrlAlgoToolkit.RevitAddins;component/WPFUI.xaml" />
</Window.Resources>
@@ -24,17 +24,17 @@
Columns="250,*,*,*"
Rows="*,Auto">
<ui:Grid
Grid.RowSpan="2"
Columns="*"
Grid.RowSpan="2"
Rows="*,Auto,Auto">
<GroupBox Header="族类别">
<ListBox
x:Name="LbCategories"
d:ItemsSource="{d:SampleData ItemCount=5}"
DisplayMemberPath="Key"
ItemsSource="{Binding Collection, Mode=OneWay}"
SelectionMode="Multiple"
Style="{StaticResource ChipListBoxStyle}">
Style="{StaticResource ChipListBoxStyle}"
d:ItemsSource="{d:SampleData ItemCount=5}"
x:Name="LbCategories">
<b:Interaction.Triggers>
<b:EventTrigger EventName="SelectionChanged">
<b:InvokeCommandAction Command="{Binding GetRenameItemsCommand}" CommandParameter="{Binding SelectedItems, RelativeSource={RelativeSource AncestorType={x:Type ListBox}, Mode=FindAncestor}}" />
@@ -55,23 +55,23 @@
</CheckBox>
<TextBlock
HorizontalAlignment="Right"
VerticalAlignment="Center"
Text="{Binding CategoryCount, StringFormat=类别数：{}{0:D}}" />
Text="{Binding CategoryCount, StringFormat=类别数：{}{0:D}}"
VerticalAlignment="Center" />
</DockPanel>
<TextBox ui:InputAssist.PlaceholderText="过滤族类别" Text="{Binding SearchText, UpdateSourceTrigger=PropertyChanged}" />
<TextBox Text="{Binding SearchText, UpdateSourceTrigger=PropertyChanged}" ui:InputAssist.PlaceholderText="过滤族类别" />
</ui:Grid>
<DataGrid
x:Name="DgRename"
Grid.Row="0"
Grid.Column="1"
Grid.ColumnSpan="3"
mvvm:TextSearchAssist.SearchValue="{Binding Text, ElementName=TbFound, UpdateSourceTrigger=PropertyChanged}"
AutoGenerateColumns="False"
CanUserAddRows="False"
Grid.Column="1"
Grid.ColumnSpan="3"
Grid.Row="0"
HeadersVisibility="Column"
IsEnabled="{Binding CanInput}"
ItemsSource="{Binding RenameItems}"
SelectionUnit="Cell">
SelectionUnit="Cell"
mvvm:TextSearchAssist.SearchValue="{Binding Text, ElementName=TbFound, UpdateSourceTrigger=PropertyChanged}"
x:Name="DgRename">
<DataGrid.Resources>
<Style BasedOn="{StaticResource DefaultDataGridCellStyle}" TargetType="{x:Type DataGridCell}">
<!-- <Setter Property="HorizontalAlignment" Value="Center" />
@@ -80,7 +80,7 @@
<Setter.Value>
<MultiBinding Converter="{x:Static conv:SearchFamilyValueConverter.Instance}">
<Binding Path="Content.Text" RelativeSource="{RelativeSource Mode=Self}" />
<Binding Path="(attach:TextSearchAssist.SearchValue)" RelativeSource="{RelativeSource Mode=Self}" />
<Binding Path="(mvvm:TextSearchAssist.SearchValue)" RelativeSource="{RelativeSource Mode=Self}" />
<Binding RelativeSource="{RelativeSource Mode=Self}" />
</MultiBinding>
</Setter.Value>
@@ -99,15 +99,15 @@
</DataGrid.ColumnHeaderStyle>
<DataGrid.Columns>
<DataGridCheckBoxColumn
MinWidth="80"
Binding="{Binding IsSelected, UpdateSourceTrigger=PropertyChanged}"
EditingElementStyle="{StaticResource DataGridCheckBoxStyle}"
ElementStyle="{StaticResource DataGridCheckBoxStyle}">
ElementStyle="{StaticResource DataGridCheckBoxStyle}"
MinWidth="80">
<DataGridCheckBoxColumn.Header>
<Border Background="Transparent">
<CheckBox
HorizontalAlignment="Center"
Content="全选"
HorizontalAlignment="Center"
IsChecked="{Binding DataContext.IsAllItemsSelected, RelativeSource={RelativeSource AncestorType={x:Type DataGrid}}}" />
</Border>
</DataGridCheckBoxColumn.Header>
@@ -118,10 +118,10 @@
</DataGridCheckBoxColumn.HeaderStyle>-->
</DataGridCheckBoxColumn>
<DataGridTextColumn
MinWidth="80"
Binding="{Binding CategoryName}"
Header="族类别"
IsReadOnly="True">
IsReadOnly="True"
MinWidth="80">
<DataGridTextColumn.ElementStyle>
<Style TargetType="{x:Type TextBlock}">
<Setter Property="HorizontalAlignment" Value="Center" />
@@ -130,10 +130,10 @@
</DataGridTextColumn.ElementStyle>
</DataGridTextColumn>
<DataGridTextColumn
MinWidth="80"
Binding="{Binding OldFamilyName}"
Header="族名称"
IsReadOnly="True">
IsReadOnly="True"
MinWidth="80">
<DataGridTextColumn.ElementStyle>
<Style TargetType="{x:Type TextBlock}">
<Setter Property="HorizontalAlignment" Value="Center" />
@@ -142,10 +142,10 @@
</DataGridTextColumn.ElementStyle>
</DataGridTextColumn>
<DataGridTextColumn
MinWidth="80"
Binding="{Binding NewFamilyName, UpdateSourceTrigger=PropertyChanged}"
EditingElementStyle="{StaticResource DefaultTextBoxStyle}"
Header="新族名称">
Header="新族名称"
MinWidth="80">
<DataGridTextColumn.ElementStyle>
<Style TargetType="{x:Type TextBlock}">
<Setter Property="HorizontalAlignment" Value="Center" />
@@ -158,9 +158,9 @@
<GroupBox Header="前/后缀">
<UniformGrid Columns="1">
<TextBox
IsEnabled="{Binding CanInput}"
Margin="5"
ui:InputAssist.PlaceholderText="前缀"
IsEnabled="{Binding CanInput}">
ui:InputAssist.PlaceholderText="前缀">
<Binding Path="PrefixText" UpdateSourceTrigger="PropertyChanged">
<Binding.ValidationRules>
<validationRules:UndefinedCharRules ValidatesOnTargetUpdated="True" />
@@ -180,9 +180,9 @@
</TextBox.Text>
</TextBox>-->
<TextBox
IsEnabled="{Binding CanInput}"
Margin="5"
ui:InputAssist.PlaceholderText="后缀"
IsEnabled="{Binding CanInput}">
ui:InputAssist.PlaceholderText="后缀">
<Binding Path="SuffixText" UpdateSourceTrigger="PropertyChanged">
<Binding.ValidationRules>
<validationRules:UndefinedCharRules ValidatesOnTargetUpdated="True" />
@@ -194,10 +194,10 @@
<GroupBox Header="查找/替换">
<StackPanel>
<TextBox
x:Name="TbFound"
IsEnabled="{Binding CanInput}"
Margin="5"
ui:InputAssist.PlaceholderText="查找"
IsEnabled="{Binding CanInput}">
x:Name="TbFound">
<Binding Path="FoundText" UpdateSourceTrigger="PropertyChanged">
<Binding.ValidationRules>
<validationRules:UndefinedCharRules ValidatesOnTargetUpdated="True" />
@@ -205,10 +205,10 @@
</Binding>
</TextBox>
<TextBox
x:Name="TbReplace"
IsEnabled="{Binding CanInput}"
Margin="5"
ui:InputAssist.PlaceholderText="替换"
IsEnabled="{Binding CanInput}">
x:Name="TbReplace">
<Binding Path="ReplaceText" UpdateSourceTrigger="PropertyChanged">
<Binding.ValidationRules>
<validationRules:UndefinedCharRules ValidatesOnTargetUpdated="True" />
@@ -223,7 +223,7 @@
<RowDefinition />
</Grid.RowDefinitions>
<GroupBox Grid.Row="0" Header="连接符">
<TextBox x:Name="TbSeparator" IsEnabled="{Binding CanInput}">
<TextBox IsEnabled="{Binding CanInput}" x:Name="TbSeparator">
<Binding Path="Separator" UpdateSourceTrigger="PropertyChanged">
<Binding.ValidationRules>
<validationRules:UndefinedCharRules ValidatesOnTargetUpdated="True" />
@@ -232,10 +232,10 @@
</TextBox>
</GroupBox>
<Button
Grid.Row="1"
HorizontalAlignment="Stretch"
Command="{Binding ModifyNameCommand}"
Content="修改名称"
Grid.Row="1"
HorizontalAlignment="Stretch"
ToolTip="勾选要修改的项进行修改" />
</Grid>
</ui:Grid>

1
ShrlAlgoToolkit.RevitAddins/RvFamily/RenameFamilyViewModel.cs
View File

@@ -1,6 +1,5 @@
using System.Collections;
using Autodesk.Revit.DB;
using Autodesk.Revit.UI;
using CommunityToolkit.Mvvm.ComponentModel;
using CommunityToolkit.Mvvm.Input;

3
ShrlAlgoToolkit.RevitAddins/RvFamily/RenameTypeItem.cs
View File

@@ -1,6 +1,5 @@
using Autodesk.Revit.DB;
using CommunityToolkit.Mvvm.ComponentModel;
using ShrlAlgoToolkit.Mvvm.Attributes;
namespace ShrlAlgoToolkit.RevitAddins.RvFamily;
@@ -10,7 +9,7 @@ public partial class RenameTypeItem : ObservableValidator
public partial bool IsSelected { get; set; }
[ObservableProperty]
[UndefinedChar]
[Attributes.UndefinedChar]
[NotifyDataErrorInfo]
public partial string NewTypeName { get; set; }

1
ShrlAlgoToolkit.RevitAddins/RvFamily/RenameTypeViewModel.cs
View File

@@ -1,6 +1,5 @@
using System.Collections;
using Autodesk.Revit.DB;
using Autodesk.Revit.UI;
using CommunityToolkit.Mvvm.ComponentModel;
using CommunityToolkit.Mvvm.Input;

1
ShrlAlgoToolkit.RevitAddins/RvFamily/ReplaceInstanceCmd.cs
View File

@@ -1,7 +1,6 @@
using Autodesk.Revit.Attributes;
using Autodesk.Revit.DB;
using Autodesk.Revit.DB.Structure;
using Autodesk.Revit.UI;
using Nice3point.Revit.Toolkit.External;

4
ShrlAlgoToolkit.RevitAddins/RvFamily/UpgradeFamilyCmd.cs
View File

@@ -2,12 +2,10 @@
using System.Text.RegularExpressions;
using Autodesk.Revit.Attributes;
using Autodesk.Revit.DB;
using Autodesk.Revit.UI;
using Melskin.Controls;
using Microsoft.Win32;
using Nice3point.Revit.Toolkit.External;
using ShrlAlgoToolkit.RevitAddins.Windows;
using Melskin.Controls;
using TaskDialog = Autodesk.Revit.UI.TaskDialog;
namespace ShrlAlgoToolkit.RevitAddins.RvFamily;

1
ShrlAlgoToolkit.RevitAddins/RvMEP/BloomConnectorCmd.cs
View File

@@ -3,7 +3,6 @@ using Autodesk.Revit.DB;
using Autodesk.Revit.DB.Electrical;
using Autodesk.Revit.DB.Mechanical;
using Autodesk.Revit.DB.Plumbing;
using Autodesk.Revit.UI;
using Autodesk.Revit.UI.Selection;
using Nice3point.Revit.Toolkit.External;

1
ShrlAlgoToolkit.RevitAddins/RvMEP/CableLayoutViewModel.cs
View File

@@ -1,5 +1,4 @@
using System.ComponentModel.DataAnnotations;
using System.Windows;
using Autodesk.Revit.DB;
using Autodesk.Revit.DB.Electrical;
using CommunityToolkit.Mvvm.ComponentModel;

1
ShrlAlgoToolkit.RevitAddins/RvMEP/ClashReportViewModel.cs
View File

@@ -4,7 +4,6 @@ using System.Net;
using System.Windows;
using System.Windows.Controls;
using Autodesk.Revit.DB;
using Autodesk.Revit.UI;
using CommunityToolkit.Mvvm.ComponentModel;
using CommunityToolkit.Mvvm.Input;
using HtmlAgilityPack;

28
ShrlAlgoToolkit.RevitAddins/RvMEP/ClashResolveViewModel.cs
View File

@@ -1,33 +1,11 @@
using Autodesk.Revit.DB;
using System.Diagnostics;
using System.Windows;
using Autodesk.Revit.DB;
using Autodesk.Revit.UI.Selection;
using CommunityToolkit.Mvvm.ComponentModel;
using CommunityToolkit.Mvvm.Input;
using Nice3point.Revit.Toolkit.External.Handlers;
using ShrlAlgoToolkit.Core.Assists;
using System.Diagnostics;
using System.Windows;
using ShrlAlgoToolkit.RevitAddins.Assists;
using ShrlAlgoToolkit;
using ShrlAlgoToolkit.RevitAddins;
using ShrlAlgoToolkit.RevitAddins.Assists;
using ShrlAlgoToolkit;
using ShrlAlgoToolkit.RevitAddins;
using ShrlAlgoToolkit.RevitAddins.Assists;
using ShrlAlgoToolkit;
using ShrlAlgoToolkit.RevitAddins;
using ShrlAlgoToolkit.RevitAddins.Assists;
using ShrlAlgoToolkit;
using ShrlAlgoToolkit.RevitAddins;
using ShrlAlgoToolkit.RevitAddins.Assists;
using ShrlAlgoToolkit;
using ShrlAlgoToolkit.RevitAddins;
using ShrlAlgoToolkit.RevitAddins.Assists;
using ShrlAlgoToolkit;
using ShrlAlgoToolkit.RevitAddins;
namespace ShrlAlgoToolkit.RevitAddins.RvMEP;

2
ShrlAlgoToolkit.RevitAddins/RvMEP/HeadroomCheckViewModel.cs
View File

@@ -1,7 +1,5 @@
using Autodesk.Revit.DB;
using Autodesk.Revit.DB.Architecture;
using Autodesk.Revit.UI;
using CommunityToolkit.Mvvm.ComponentModel;
using CommunityToolkit.Mvvm.Input;

3
ShrlAlgoToolkit.RevitAddins/RvMEP/InsulationItem.cs
View File

@@ -2,12 +2,11 @@
using Autodesk.Revit.DB.Mechanical;
using Autodesk.Revit.DB.Plumbing;
using CommunityToolkit.Mvvm.ComponentModel;
using ShrlAlgoToolkit.Mvvm.Attributes;
namespace ShrlAlgoToolkit.RevitAddins.RvMEP;
public partial class InsulationItem : ObservableValidator
{
[GreaterThan(nameof(MinDiameter))]
[Attributes.GreaterThan(nameof(MinDiameter))]
[Range(15, 1000)]
public double MaxDiameter
{

4
ShrlAlgoToolkit.RevitAddins/RvMEP/MoveMEPCurveViewModel.cs
View File

@@ -3,8 +3,6 @@ using Autodesk.Revit.UI.Selection;
using CommunityToolkit.Mvvm.ComponentModel;
using CommunityToolkit.Mvvm.Input;
using Nice3point.Revit.Toolkit.External.Handlers;
using ShrlAlgoToolkit.Mvvm.Attributes;
namespace ShrlAlgoToolkit.RevitAddins.RvMEP;
@@ -19,7 +17,7 @@ public partial class MoveMEPCurveViewModel : ObservableValidator
private readonly ActionEventHandler moveHandler = new();
[IsNumeric]
[Attributes.IsNumeric]
[ObservableProperty]
[NotifyDataErrorInfo]
public partial double Distance { get; set; }

3
ShrlAlgoToolkit.RevitAddins/RvMEP/RevitCommandEndedMonitor.cs
View File

@@ -1,5 +1,4 @@
using Autodesk.Revit.UI;
using Autodesk.Revit.UI.Events;
using Autodesk.Revit.UI.Events;
namespace ShrlAlgoToolkit.RevitAddins.RvMEP;

1
ShrlAlgoToolkit.RevitAddins/RvView/ArrangeTagsCmd.cs
View File

@@ -1,7 +1,6 @@
using System.Windows;
using Autodesk.Revit.Attributes;
using Autodesk.Revit.DB;
using Autodesk.Revit.UI;
using Nice3point.Revit.Toolkit.External;
namespace ShrlAlgoToolkit.RevitAddins.RvView;

19
ShrlAlgoToolkit.RevitAddins/RvView/CivilViewFilterCmd.cs
View File

@@ -1,27 +1,8 @@
using System.Windows;
using Autodesk.Revit.Attributes;
using Autodesk.Revit.DB;
using Autodesk.Revit.UI;
using Nice3point.Revit.Toolkit.External;
using ShrlAlgoToolkit.Core.Assists;
using ShrlAlgoToolkit.RevitAddins.Assists;
using ShrlAlgoToolkit;
using ShrlAlgoToolkit.RevitAddins;
using ShrlAlgoToolkit.RevitAddins.Assists;
using ShrlAlgoToolkit;
using ShrlAlgoToolkit.RevitAddins;
using ShrlAlgoToolkit.RevitAddins.Assists;
using ShrlAlgoToolkit;
using ShrlAlgoToolkit.RevitAddins;
using ShrlAlgoToolkit.RevitAddins.Assists;
using ShrlAlgoToolkit;
using ShrlAlgoToolkit.RevitAddins;
using ShrlAlgoToolkit.RevitAddins.Assists;
using ShrlAlgoToolkit;
using ShrlAlgoToolkit.RevitAddins;
using ShrlAlgoToolkit.RevitAddins.Assists;
using ShrlAlgoToolkit;
using ShrlAlgoToolkit.RevitAddins;
namespace ShrlAlgoToolkit.RevitAddins.RvView;

2
ShrlAlgoToolkit.RevitAddins/RvView/ElementControlDock.xaml.cs
View File

@@ -2,8 +2,6 @@
using System.Windows.Controls;
using Autodesk.Revit.DB;
using Autodesk.Revit.UI;
using Nice3point.Revit.Toolkit.External.Handlers;

10
ShrlAlgoToolkit.RevitAddins/RvView/ElementsControlCmd.cs
View File

@@ -1,17 +1,7 @@
using Autodesk.Revit.Attributes;
using Autodesk.Revit.DB;
using Autodesk.Revit.UI;
using Nice3point.Revit.Toolkit.External;
using ShrlAlgoToolkit.Core.Assists;
using ShrlAlgoToolkit.RevitAddins.Assists;
using ShrlAlgoToolkit;
using ShrlAlgoToolkit.RevitAddins;
using ShrlAlgoToolkit.RevitAddins.Assists;
using ShrlAlgoToolkit;
using ShrlAlgoToolkit.RevitAddins;
namespace ShrlAlgoToolkit.RevitAddins.RvView;

6
ShrlAlgoToolkit.RevitAddins/RvView/ExportSchedulesCmd.cs
View File

@@ -1,10 +1,8 @@
using System.IO;
using Autodesk.Revit.DB;
using Autodesk.Revit.UI;
using Nice3point.Revit.Toolkit.External;
using ShrlAlgoToolkit.RevitAddins.Assists;
using Melskin.Controls;
using Nice3point.Revit.Toolkit.External;
using ShrlAlgoToolkit.RevitAddins.Assists;
namespace ShrlAlgoToolkit.RevitAddins.RvView;

1
ShrlAlgoToolkit.RevitAddins/RvView/PanelScheduleCmd.cs
View File

@@ -1,6 +1,5 @@
using Autodesk.Revit.Attributes;
using Autodesk.Revit.DB;
using Autodesk.Revit.UI;
namespace ShrlAlgoToolkit.RevitAddins.RvView

2
ShrlAlgoToolkit.RevitAddins/RvView/SectionBoxControllerViewModel.cs
View File

@@ -2,8 +2,6 @@
using System.Windows;
using Autodesk.Revit.DB;
using Autodesk.Revit.UI;
using CommunityToolkit.Mvvm.ComponentModel;
using CommunityToolkit.Mvvm.Input;

1
ShrlAlgoToolkit.RevitAddins/RvView/SystemDisplayViewModel.cs
View File

@@ -1,5 +1,4 @@
using Autodesk.Revit.DB;
using Autodesk.Revit.UI;
using CommunityToolkit.Mvvm.ComponentModel;
using CommunityToolkit.Mvvm.Input;
using CommunityToolkit.Mvvm.Messaging;

34
ShrlAlgoToolkit.RevitAddins/RvView/ViewManagerViewModel.cs
View File

@@ -3,41 +3,11 @@ using System.Diagnostics;
using System.Windows;
using System.Windows.Data;
using Autodesk.Revit.DB;
using Autodesk.Revit.UI;
using CommunityToolkit.Mvvm.ComponentModel;
using CommunityToolkit.Mvvm.Input;
using Nice3point.Revit.Toolkit.External.Handlers;
using ShrlAlgoToolkit.Core.Assists;
using ShrlAlgoToolkit.RevitAddins.Assists;
using ShrlAlgoToolkit;
using ShrlAlgoToolkit.RevitAddins;
using ShrlAlgoToolkit.RevitAddins.Assists;
using ShrlAlgoToolkit;
using ShrlAlgoToolkit.RevitAddins;
using ShrlAlgoToolkit.RevitAddins.Assists;
using ShrlAlgoToolkit;
using ShrlAlgoToolkit.RevitAddins;
using ShrlAlgoToolkit.RevitAddins.Assists;
using ShrlAlgoToolkit;
using ShrlAlgoToolkit.RevitAddins;
using ShrlAlgoToolkit.RevitAddins.Assists;
using ShrlAlgoToolkit;
using ShrlAlgoToolkit.RevitAddins;
using ShrlAlgoToolkit.RevitAddins.Assists;
using ShrlAlgoToolkit;
using ShrlAlgoToolkit.RevitAddins;
using ShrlAlgoToolkit.RevitAddins.Assists;
using ShrlAlgoToolkit;
using ShrlAlgoToolkit.RevitAddins;
using ShrlAlgoToolkit.RevitAddins.Assists;
using ShrlAlgoToolkit;
using ShrlAlgoToolkit.RevitAddins;
using ShrlAlgoToolkit.RevitAddins.Assists;
using ShrlAlgoToolkit;
using ShrlAlgoToolkit.RevitAddins;
using ShrlAlgoToolkit.RevitAddins.Assists;
using ShrlAlgoToolkit;
using ShrlAlgoToolkit.RevitAddins;
using ShrlAlgoToolkit.RevitAddins.Extensions;
namespace ShrlAlgoToolkit.RevitAddins.RvView;
@@ -341,7 +311,7 @@ public partial class ViewManagerViewModel : ObservableObject
return true;
}
var item = o as ViewManagerModel;
return item.Name.Contains(SearchText) || Assists.EnumAssist.GetAttribute<DescriptionAttribute>(item.UserViewType).Description.Contains(SearchText);
return item.Name.Contains(SearchText) || item.UserViewType.GetAttribute<DescriptionAttribute>().Description.Contains(SearchText);
};
}

1
ShrlAlgoToolkit.RevitAddins/RvView/VisibilityViewModel.cs
View File

@@ -1,6 +1,5 @@
using System.Windows;
using Autodesk.Revit.DB;
using Autodesk.Revit.UI;
using CommunityToolkit.Mvvm.ComponentModel;
using CommunityToolkit.Mvvm.Input;
using Nice3point.Revit.Toolkit.External.Handlers;

1
ShrlAlgoToolkit.RevitAddins/UIRibbon/DrawingViewApp.cs
View File

@@ -1,5 +1,4 @@
using System.Windows;
using Autodesk.Revit.UI;
using Autodesk.Windows;
using Nice3point.Revit.Toolkit.External.Handlers;

14
ShrlAlgoToolkit.RevitAddins/UIRibbon/FamilyApp.cs
View File

@@ -1,22 +1,12 @@
using System.Collections;
using System.Collections.ObjectModel;
using System.Collections.ObjectModel;
using System.Reflection;
using System.Resources;
using System.Windows;
using Autodesk.Revit.DB;
using Autodesk.Revit.UI;
using Autodesk.Windows;
using ShrlAlgoToolkit.RevitAddins.Extensions;
using ShrlAlgoToolkit.RevitAddins.Properties;
using ShrlAlgoToolkit.RevitAddins.RvFamily;
using ShrlAlgoToolkit.RevitAddins.RvFamily.FamilyLibrary;
using ShrlAlgoToolkit.RevitAddins.Extensions;
using ShrlAlgoToolkit;
using ShrlAlgoToolkit.RevitAddins;
using ShrlAlgoToolkit.RevitAddins.Extensions;
using ShrlAlgoToolkit;
using ShrlAlgoToolkit.RevitAddins;
namespace ShrlAlgoToolkit.RevitAddins.UIRibbon;

125
ShrlAlgoToolkit.RevitAddins/UIRibbon/ModifyTabApp.cs
View File

@@ -1,136 +1,13 @@
using System.ComponentModel;
using System.Windows.Controls;
using Autodesk.Revit.DB;
using Autodesk.Revit.UI;
using Autodesk.Windows;
using CommunityToolkit.Mvvm.Input;
using Nice3point.Revit.Toolkit.External.Handlers;
using ShrlAlgoToolkit.Core.Assists;
using ShrlAlgoToolkit.RevitAddins.Assists;
using ShrlAlgoToolkit.RevitAddins.Extensions;
using ShrlAlgoToolkit.RevitAddins.Properties;
using ShrlAlgoToolkit.RevitAddins.RvCommon;
using ShrlAlgoToolkit.RevitAddins.Extensions;
using ShrlAlgoToolkit;
using ShrlAlgoToolkit.RevitAddins;
using ShrlAlgoToolkit.RevitAddins.Extensions;
using ShrlAlgoToolkit;
using ShrlAlgoToolkit.RevitAddins;
using ShrlAlgoToolkit.RevitAddins.Extensions;
using ShrlAlgoToolkit;
using ShrlAlgoToolkit.RevitAddins;
using ShrlAlgoToolkit.RevitAddins.Extensions;
using ShrlAlgoToolkit;
using ShrlAlgoToolkit.RevitAddins;
using ShrlAlgoToolkit.RevitAddins.Extensions;
using ShrlAlgoToolkit;
using ShrlAlgoToolkit.RevitAddins;
using ShrlAlgoToolkit.RevitAddins.Extensions;
using ShrlAlgoToolkit;
using ShrlAlgoToolkit.RevitAddins;
using ShrlAlgoToolkit.RevitAddins.Extensions;
using ShrlAlgoToolkit;
using ShrlAlgoToolkit.RevitAddins;
using ShrlAlgoToolkit.RevitAddins.Extensions;
using ShrlAlgoToolkit;
using ShrlAlgoToolkit.RevitAddins;
using ShrlAlgoToolkit.RevitAddins.Extensions;
using ShrlAlgoToolkit;
using ShrlAlgoToolkit.RevitAddins;
using ShrlAlgoToolkit.RevitAddins.Extensions;
using ShrlAlgoToolkit;
using ShrlAlgoToolkit.RevitAddins;
using ShrlAlgoToolkit.RevitAddins.Extensions;
using ShrlAlgoToolkit;
using ShrlAlgoToolkit.RevitAddins;
using ShrlAlgoToolkit.RevitAddins.Extensions;
using ShrlAlgoToolkit;
using ShrlAlgoToolkit.RevitAddins;
using ShrlAlgoToolkit.RevitAddins.Extensions;
using ShrlAlgoToolkit;
using ShrlAlgoToolkit.RevitAddins;
using ShrlAlgoToolkit.RevitAddins.Extensions;
using ShrlAlgoToolkit;
using ShrlAlgoToolkit.RevitAddins;
using ShrlAlgoToolkit.RevitAddins.Extensions;
using ShrlAlgoToolkit;
using ShrlAlgoToolkit.RevitAddins;
using ShrlAlgoToolkit.RevitAddins.Extensions;
using ShrlAlgoToolkit;
using ShrlAlgoToolkit.RevitAddins;
using ShrlAlgoToolkit.RevitAddins.Extensions;
using ShrlAlgoToolkit;
using ShrlAlgoToolkit.RevitAddins;
using ShrlAlgoToolkit.RevitAddins.Extensions;
using ShrlAlgoToolkit;
using ShrlAlgoToolkit.RevitAddins;
using ShrlAlgoToolkit.RevitAddins.Extensions;
using ShrlAlgoToolkit;
using ShrlAlgoToolkit.RevitAddins;
using ShrlAlgoToolkit.RevitAddins.Extensions;
using ShrlAlgoToolkit;
using ShrlAlgoToolkit.RevitAddins;
using ShrlAlgoToolkit.RevitAddins.Extensions;
using ShrlAlgoToolkit;
using ShrlAlgoToolkit.RevitAddins;
using ShrlAlgoToolkit.RevitAddins.Extensions;
using ShrlAlgoToolkit;
using ShrlAlgoToolkit.RevitAddins;
using ShrlAlgoToolkit.RevitAddins.Extensions;
using ShrlAlgoToolkit;
using ShrlAlgoToolkit.RevitAddins;
using ShrlAlgoToolkit.RevitAddins.Extensions;
using ShrlAlgoToolkit;
using ShrlAlgoToolkit.RevitAddins;
using ShrlAlgoToolkit.RevitAddins.Extensions;
using ShrlAlgoToolkit;
using ShrlAlgoToolkit.RevitAddins;
using ShrlAlgoToolkit.RevitAddins.Extensions;
using ShrlAlgoToolkit;
using ShrlAlgoToolkit.RevitAddins;
using ShrlAlgoToolkit.RevitAddins.Extensions;
using ShrlAlgoToolkit;
using ShrlAlgoToolkit.RevitAddins;
using ShrlAlgoToolkit.RevitAddins.Extensions;
using ShrlAlgoToolkit;
using ShrlAlgoToolkit.RevitAddins;
using ShrlAlgoToolkit.RevitAddins.Extensions;
using ShrlAlgoToolkit;
using ShrlAlgoToolkit.RevitAddins;
using ShrlAlgoToolkit.RevitAddins.Extensions;
using ShrlAlgoToolkit;
using ShrlAlgoToolkit.RevitAddins;
using ShrlAlgoToolkit.RevitAddins.Extensions;
using ShrlAlgoToolkit;
using ShrlAlgoToolkit.RevitAddins;
using ShrlAlgoToolkit.RevitAddins.Extensions;
using ShrlAlgoToolkit;
using ShrlAlgoToolkit.RevitAddins;
using ShrlAlgoToolkit.RevitAddins.Extensions;
using ShrlAlgoToolkit;
using ShrlAlgoToolkit.RevitAddins;
using ShrlAlgoToolkit.RevitAddins.Extensions;
using ShrlAlgoToolkit;
using ShrlAlgoToolkit.RevitAddins;
using ShrlAlgoToolkit.RevitAddins.Extensions;
using ShrlAlgoToolkit;
using ShrlAlgoToolkit.RevitAddins;
using ShrlAlgoToolkit.RevitAddins.Extensions;
using ShrlAlgoToolkit;
using ShrlAlgoToolkit.RevitAddins;
using ShrlAlgoToolkit.RevitAddins.Extensions;
using ShrlAlgoToolkit;
using ShrlAlgoToolkit.RevitAddins;
using ShrlAlgoToolkit.RevitAddins.Extensions;
using ShrlAlgoToolkit;
using ShrlAlgoToolkit.RevitAddins;
using ShrlAlgoToolkit.RevitAddins.Assists;
using ShrlAlgoToolkit;
using ShrlAlgoToolkit.RevitAddins;
using ShrlAlgoToolkit.RevitAddins.Assists;
using ShrlAlgoToolkit;
using ShrlAlgoToolkit.RevitAddins;
namespace ShrlAlgoToolkit.RevitAddins.UIRibbon;

10
ShrlAlgoToolkit.RevitAddins/UIRibbon/RvApp.cs
View File

@@ -1,14 +1,6 @@
using System.Diagnostics;
using System.Reflection;
using System.Windows;
using System.Windows.Media;
using Autodesk.Revit.UI;
using System.Windows;
using Nice3point.Revit.Toolkit.External;
using Nice3point.Revit.Toolkit.External.Handlers;
using ShrlAlgoToolkit.Core.Assists;
using ShrlAlgoToolkit.RevitAddins.Fonts;
using ShrlAlgoToolkit.RevitAddins.ModelManager;
using ShrlAlgoToolkit.RevitAddins.Properties;
using ShrlAlgoToolkit.RevitAddins.RvCivil;

17
ShrlAlgoToolkit.RevitAddins/UIRibbon/TabManagerApp.cs
View File

@@ -1,19 +1,6 @@
using Autodesk.Revit.UI;
using Autodesk.Windows;
using Autodesk.Windows;
using ShrlAlgoToolkit.RevitAddins.Extensions;
using ShrlAlgoToolkit.RevitAddins.Properties;
using ShrlAlgoToolkit.RevitAddins.Extensions;
using ShrlAlgoToolkit;
using ShrlAlgoToolkit.RevitAddins;
using ShrlAlgoToolkit.RevitAddins.Extensions;
using ShrlAlgoToolkit;
using ShrlAlgoToolkit.RevitAddins;
using ShrlAlgoToolkit.RevitAddins.Extensions;
using ShrlAlgoToolkit;
using ShrlAlgoToolkit.RevitAddins;
using ShrlAlgoToolkit.RevitAddins.Extensions;
using ShrlAlgoToolkit;
using ShrlAlgoToolkit.RevitAddins;
namespace ShrlAlgoToolkit.RevitAddins.UIRibbon;

2
ShrlAlgoToolkit.RevitAddins/Variables.cs
View File

@@ -1,8 +1,6 @@
using System.IO;
using System.Reflection;
using Autodesk.Revit.UI;
namespace ShrlAlgoToolkit.RevitAddins;

1
ShrlAlgoToolkit.RevitAddins/Windows/MessageViewModel.cs
View File

@@ -1,5 +1,4 @@
using Autodesk.Revit.DB;
using Autodesk.Revit.UI;
using CommunityToolkit.Mvvm.ComponentModel;
using CommunityToolkit.Mvvm.Input;
using Nice3point.Revit.Toolkit.External.Handlers;

1
ShrlAlgoToolkit.RevitAddins/Windows/NavigateViewViewModel.cs
View File

@@ -1,5 +1,4 @@
using Autodesk.Revit.DB;
using Autodesk.Revit.UI;
using CommunityToolkit.Mvvm.ComponentModel;
using CommunityToolkit.Mvvm.Input;

8
ShrlAlgoToolkit.RevitAddins/Windows/ProcessEventHandler.cs
View File

@@ -1,12 +1,4 @@
using Autodesk.Revit.DB;
using Autodesk.Revit.UI;
using ShrlAlgoToolkit.Core.Assists;
using ShrlAlgoToolkit.RevitAddins.Assists;
using ShrlAlgoToolkit;
using ShrlAlgoToolkit.RevitAddins;
using ShrlAlgoToolkit.RevitAddins.Assists;
using ShrlAlgoToolkit;
using ShrlAlgoToolkit.RevitAddins;
namespace ShrlAlgoToolkit.RevitAddins.Windows
{

1
ShrlAlgoToolkit.RevitAddins/Windows/ProgressBarManager.cs
View File

@@ -1,5 +1,4 @@
using Autodesk.Revit.DB;
using Autodesk.Revit.UI;
namespace ShrlAlgoToolkit.RevitAddins.Windows
{