ShrlAlgo/SzmediTools
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-23 11:21:51 +08:00
parent 3650f8550e
commit 6beb8b5be9
24 changed files with 694 additions and 1975 deletions
Download Patch File Download Diff File Expand all files Collapse all files

0
Szmedi.RvKits/Controls/MaterialWindow.cs → Szmedi.RvKits/Controls/MaterialWindow.xaml.cs
View File

2
Szmedi.RvKits/MEPTools/FacilityInfoProcessView.xaml
View File

@@ -55,7 +55,7 @@
<Setter Property="Background" Value="Transparent" />
<Style.Triggers>
<DataTrigger Binding="{Binding ErrorMessage, Converter={StaticResource NullOrEmptyToBooleanConverter}}" Value="True">
<Setter Property="Background" Value="Red" />
<Setter Property="Background" Value="IndianRed" />
</DataTrigger>
</Style.Triggers>
</Style>

8
Szmedi.RvKits/MEPTools/FacilityInfoProcessViewModel.cs
View File

@@ -63,7 +63,8 @@ namespace Szmedi.RvKits.MEPTools
AppDomain.CurrentDomain.AssemblyResolve += ResolveHelper.ResolveAssembly;
try
{
Items = package.ToList<FacilityItem>(1, configuration => configuration.SkipCastingErrors());
var resultList = package.ToList<FacilityItem>(1, configuration => configuration.SkipCastingErrors());
Items = resultList.Where(f => !string.IsNullOrEmpty(f.Name)).ToList();
}
catch (EPPlus.Core.Extensions.Exceptions.ExcelValidationException ex)
{
@@ -207,7 +208,10 @@ namespace Szmedi.RvKits.MEPTools
foreach (var item in Items)
{
double minRatio = 30;
if(string.IsNullOrEmpty(item.Name))
{
continue;
}
foreach (var family in Families)
{
var famName = family.Name;

BIN
Szmedi.RvKits/Setup/SzmediTools2.2.3.83.exe → Szmedi.RvKits/Setup/SzmediTools2.2.3.84.exe
View File

Binary file not shown.

2
Szmedi.RvKits/Szmedi.RvKits.csproj
View File

@@ -16,7 +16,7 @@
<AssemblyName>Szmedi.RvKits</AssemblyName>
<RootNamespace>$(AssemblyName)</RootNamespace>
<Company>Szmedi</Company>
<AssemblyVersion>2.2.3.83</AssemblyVersion>
<AssemblyVersion>2.2.3.84</AssemblyVersion>
<ProductVersion>$(AssemblyVersion)</ProductVersion>
<FileVersion>$(AssemblyVersion)</FileVersion>
</PropertyGroup>

2
Szmedi.RvKits/Szmedi.Rvkits.iss
View File

@@ -4,7 +4,7 @@
; 定义应用程序的名称
#define MyAppName "SzmediTools"
; 定义应用程序的版本号
#define MyAppVersion "2.2.3.83"
#define MyAppVersion "2.2.3.84"
; 定义应用程序的发布者
#define MyAppPublisher "SZMEDI"
; 定义应用程序的网址

1
Szmedi.RvKits/WPFUI.xaml
View File

@@ -8,7 +8,6 @@
xmlns:editor="clr-namespace:RoslynPad.Editor;assembly=RoslynPad.Editor.Windows"
xmlns:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes">
<ResourceDictionary.MergedDictionaries>
<!--<ResourceDictionary Source="pack://application:,,,/Szmedi.RvKits;component/Controls/MaterialWindow.xaml" />-->
<!--<ResourceDictionary Source="pack://application:,,,/MaterialDesignThemes.Wpf;component/Themes/Internal/MaterialDesignTheme.BaseThemeColors.xaml" />-->
<!--<ResourceDictionary Source="pack://application:,,,/MaterialDesignThemes.Wpf;component/Themes/MaterialDesignTheme.Dark.xaml" />-->