多项功能优化

This commit is contained in:
GG Z
2024-12-22 10:26:12 +08:00
parent 77655c9ef5
commit 83b846f15f
66 changed files with 5424 additions and 2927 deletions

View File

@@ -7,7 +7,7 @@ using System.ComponentModel;
namespace Sai.RvKits.RvMEP
{
public class SystemModel : ObservableObject
public partial class SystemModel : ObservableObject
{
public SystemModel(MEPSystemType systemType)
{
@@ -19,75 +19,28 @@ namespace Sai.RvKits.RvMEP
FillColor = systemType.FillColor;
Abbreviation = systemType.Abbreviation;
}
private string abbreviation;
[ObservableProperty]
private System.Windows.Media.Brush backgroundColor;
[ObservableProperty]
private Color fillColor;
private Color lineColor;
private MEPSystemClassification mepSystemClassification;
[ObservableProperty]
private MEPSystemClassification mEPSystemClassification;
[ObservableProperty]
private string name;
[ObservableProperty]
private PipeSystemType pipeSystemType;
//系统类型
[ObservableProperty]
private MEPSystemType systemType;
public Color LineColor
{
get => lineColor;
set => SetProperty(ref lineColor, value);
}
public string Abbreviation
{
get => abbreviation;
set => SetProperty(ref abbreviation, value);
}
public Color FillColor
{
get => fillColor;
set => SetProperty(ref fillColor, value);
}
public PipeSystemType PipeSystemType
{
get => pipeSystemType;
set => SetProperty(ref pipeSystemType, value);
}
/// <summary>
/// 系统类型
/// </summary>
public MEPSystemType SystemType
{
get => systemType;
set => SetProperty(ref systemType, value);
}
public MEPSystemClassification MEPSystemClassification
{
get => mepSystemClassification;
set => SetProperty(ref mepSystemClassification, value);
}
public string Name
{
get => name;
set => SetProperty(ref name, value);
}
public System.Windows.Media.Brush BackgroundColor
{
get => backgroundColor;
//if (fillColor.IsValid)
//{
// return backgroundColor = new System.Windows.Media.SolidColorBrush(System.Windows.Media.SelectedColor.FromRgb(fillColor.Red, fillColor.Green, fillColor.Blue));
//}
//return backgroundColor = new System.Windows.Media.SolidColorBrush();
set => SetProperty(ref backgroundColor, value);
}
[ObservableProperty]
private Color lineColor;
[ObservableProperty]
private string abbreviation;
}
public enum MEPSystemClassification