From bbb914ac62d8fb646492872f5fabf9ddfd5dd05f Mon Sep 17 00:00:00 2001
From: duheng <2784771470@qq.com>
Date: 星期二, 14 一月 2025 20:50:49 +0800
Subject: [PATCH] 匹配提交
---
WinFrmUI/HStation.WinFrmUI.Xhs.Core/02-project/01-import/00-core/ImportXhsProjectHelper.cs | 6 +++---
WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/07-matching/00-core/AssetsMatchingHelper.cs | 3 ++-
WinFrmUI/HStation.WinFrmUI.Assets.Core/03-valve/04-curve/AssetsValveCurveViewDlg.resx | 4 ++--
WinFrmUI/HStation.WinFrmUI.Assets.Core/03-valve/04-curve/AssetsValveCurveViewDlg.Designer.cs | 24 ++++++++++++------------
WinFrmUI/HStation.WinFrmUI.Assets.Core/03-valve/04-curve/AssetsValveCurveViewDlg.cs | 2 +-
5 files changed, 20 insertions(+), 19 deletions(-)
diff --git a/WinFrmUI/HStation.WinFrmUI.Assets.Core/03-valve/04-curve/AssetsValveCurveViewDlg.Designer.cs b/WinFrmUI/HStation.WinFrmUI.Assets.Core/03-valve/04-curve/AssetsValveCurveViewDlg.Designer.cs
index 280c688..14aa05e 100644
--- a/WinFrmUI/HStation.WinFrmUI.Assets.Core/03-valve/04-curve/AssetsValveCurveViewDlg.Designer.cs
+++ b/WinFrmUI/HStation.WinFrmUI.Assets.Core/03-valve/04-curve/AssetsValveCurveViewDlg.Designer.cs
@@ -28,25 +28,25 @@
/// </summary>
private void InitializeComponent()
{
- universalChartViewCtrl1 = new UniversalChartViewCtrl();
+ valveChartViewCtrl1 = new ValveChartViewCtrl();
SuspendLayout();
//
- // universalChartViewCtrl1
+ // valveChartViewCtrl1
//
- universalChartViewCtrl1.Dock = DockStyle.Fill;
- universalChartViewCtrl1.Location = new Point(0, 0);
- universalChartViewCtrl1.Margin = new Padding(2, 2, 2, 2);
- universalChartViewCtrl1.Name = "universalChartViewCtrl1";
- universalChartViewCtrl1.Size = new Size(860, 511);
- universalChartViewCtrl1.TabIndex = 0;
+ valveChartViewCtrl1.Dock = DockStyle.Fill;
+ valveChartViewCtrl1.Location = new Point(0, 0);
+ valveChartViewCtrl1.Margin = new Padding(2, 2, 2, 2);
+ valveChartViewCtrl1.Name = "valveChartViewCtrl1";
+ valveChartViewCtrl1.Size = new Size(860, 511);
+ valveChartViewCtrl1.TabIndex = 0;
//
- // AssetsValveCurveQLViewDlg
+ // AssetsValveCurveViewDlg
//
AutoScaleDimensions = new SizeF(7F, 14F);
AutoScaleMode = AutoScaleMode.Font;
ClientSize = new Size(860, 511);
- Controls.Add(universalChartViewCtrl1);
- Name = "AssetsValveCurveQLViewDlg";
+ Controls.Add(valveChartViewCtrl1);
+ Name = "AssetsValveCurveViewDlg";
StartPosition = FormStartPosition.CenterParent;
Text = "姘村ご鎹熷け鏇茬嚎";
ResumeLayout(false);
@@ -54,6 +54,6 @@
#endregion
- private UniversalChartViewCtrl universalChartViewCtrl1;
+ private ValveChartViewCtrl valveChartViewCtrl1;
}
}
\ No newline at end of file
diff --git a/WinFrmUI/HStation.WinFrmUI.Assets.Core/03-valve/04-curve/AssetsValveCurveViewDlg.cs b/WinFrmUI/HStation.WinFrmUI.Assets.Core/03-valve/04-curve/AssetsValveCurveViewDlg.cs
index 524dfdc..926e5af 100644
--- a/WinFrmUI/HStation.WinFrmUI.Assets.Core/03-valve/04-curve/AssetsValveCurveViewDlg.cs
+++ b/WinFrmUI/HStation.WinFrmUI.Assets.Core/03-valve/04-curve/AssetsValveCurveViewDlg.cs
@@ -34,7 +34,7 @@
/// </summary>
public void SetBindingData(Yw.Vmo.PhartDiagramExGraphListVmo vmo)
{
- this.universalChartViewCtrl1.SetBindingData(vmo);
+ this.valveChartViewCtrl1.SetBindingData(vmo);
}
}
}
\ No newline at end of file
diff --git a/WinFrmUI/HStation.WinFrmUI.Assets.Core/03-valve/04-curve/AssetsValveCurveViewDlg.resx b/WinFrmUI/HStation.WinFrmUI.Assets.Core/03-valve/04-curve/AssetsValveCurveViewDlg.resx
index af32865..8b2ff64 100644
--- a/WinFrmUI/HStation.WinFrmUI.Assets.Core/03-valve/04-curve/AssetsValveCurveViewDlg.resx
+++ b/WinFrmUI/HStation.WinFrmUI.Assets.Core/03-valve/04-curve/AssetsValveCurveViewDlg.resx
@@ -1,7 +1,7 @@
锘�<?xml version="1.0" encoding="utf-8"?>
<root>
<!--
- Microsoft ResX Schema
+ Microsoft ResX Schema
Version 2.0
@@ -48,7 +48,7 @@
value : The object must be serialized with
: System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
: and then encoded with base64 encoding.
-
+
mimetype: application/x-microsoft.net.object.soap.base64
value : The object must be serialized with
: System.Runtime.Serialization.Formatters.Soap.SoapFormatter
diff --git a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/02-project/01-import/00-core/ImportXhsProjectHelper.cs b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/02-project/01-import/00-core/ImportXhsProjectHelper.cs
index 9c8b3e7..9804ad6 100644
--- a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/02-project/01-import/00-core/ImportXhsProjectHelper.cs
+++ b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/02-project/01-import/00-core/ImportXhsProjectHelper.cs
@@ -334,7 +334,7 @@
}
//var bimfaceId = await Yw.WinFrmUI.BimfaceHelper.UploadFile(rvtFileInfo.FullName);//姝ｅ紡浠ｇ爜
- var bimfaceId = 10000896755736;//娴嬭瘯鐢ㄤ緥 10000884893369 10000894297457 10000895957527 10000896316958 10000896755736
+ var bimfaceId = 10000899666805;//娴嬭瘯鐢ㄤ緥 10000884893369 10000894297457 10000895957527 10000896316958 10000896755736
if (bimfaceId < 1)
{
feedBackMsg?.Invoke("Revit妯″瀷鏂囦欢涓婁紶澶辫触锛侊紒锛�", Color.Red);
@@ -404,8 +404,8 @@
feedBackProgress?.Invoke(100, 60);
feedBackMsg?.Invoke("姝ｅ湪杩涜妯″瀷杞婚噺鍖�...", Color.Black);
- //var bimfaceTranslateStatus = await Yw.WinFrmUI.BimfaceHelper.TranslateRvtFile(bimfaceId);//鍙戣捣杞崲
- var bimfaceTranslateStatus = Yw.BIMFace.eTranslateStatus.Processing;//娴嬭瘯浠ｇ爜
+ var bimfaceTranslateStatus = await Yw.WinFrmUI.BimfaceHelper.TranslateRvtFile(bimfaceId);//鍙戣捣杞崲
+ //var bimfaceTranslateStatus = Yw.BIMFace.eTranslateStatus.Processing;//娴嬭瘯浠ｇ爜
if (bimfaceTranslateStatus != Yw.BIMFace.eTranslateStatus.Success)
{
diff --git a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/07-matching/00-core/AssetsMatchingHelper.cs b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/07-matching/00-core/AssetsMatchingHelper.cs
index 0baaaf4..e455e43 100644
--- a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/07-matching/00-core/AssetsMatchingHelper.cs
+++ b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/07-matching/00-core/AssetsMatchingHelper.cs
@@ -384,7 +384,7 @@
}
//鏍囩
- int flagWeight = 1;
+ int flagWeight = 1000;//涓存椂淇敼,涔嬪墠涓�1
foreach (var item in valveMainVmos)
{
if (item.Flags != null && item.Flags.Count > 0)
@@ -417,6 +417,7 @@
{
input.MatchingValveSetting = valve.ValveSetting;
}
+ input.MatchingValveType = eValveType.TCV;
if (input.CurveDbId == null)
{
var list = Task.Run(async () =>
--
Gitblit v1.9.3