This commit is contained in:
ShrlAlgo
2025-07-11 09:20:23 +08:00
parent c7b104f44f
commit 4d35cadb56
840 changed files with 102347 additions and 11595 deletions

View File

@@ -246,9 +246,7 @@ public partial class AnyConnectViewModel : ObservableValidator
//var c1 = unboundLine1.Intersect(line2);//第一个是第二个的SuperSet超集
//距离最近的两个连接件
var originConnectors = ConnectorAssist.GetNearestConnectors(
originMEPCurve1,
originMEPCurve2
var originConnectors = originMEPCurve1.GetNearestConnectors(originMEPCurve2
);
if (c == SetComparisonResult.Subset)
@@ -309,13 +307,11 @@ public partial class AnyConnectViewModel : ObservableValidator
doc.Regenerate();
var conns1 = ConnectorAssist.GetNearestConnectors(
originMEPCurve1,
var conns1 = originMEPCurve1.GetNearestConnectors(
copyMepCurve
);
var conns2 = ConnectorAssist.GetNearestConnectors(
originMEPCurve2,
var conns2 = originMEPCurve2.GetNearestConnectors(
copyMepCurve
);
//同向原管线和复制转弯管线的夹角一定是大于等于90度单位向量等价于余弦值
@@ -832,13 +828,13 @@ public partial class AnyConnectViewModel : ObservableValidator
originMEPCurve1.SetLocationCurve(extendLine);
var extendLine2 = line2.ExtendLine(intersection);
originMEPCurve2.SetLocationCurve(extendLine2);
var conns = ConnectorAssist.GetNearestConnectors(originMEPCurve1, originMEPCurve2);
var conns = originMEPCurve1.GetNearestConnectors( originMEPCurve2);
if (line3.IsInsideEx(intersection, 0.5))
{
var newBranchId = originMEPCurve3.BreakByPoint(intersection);
var newBranchMEPCurve = doc.GetElement(newBranchId);
var conns2 = ConnectorAssist.GetNearestConnectors(originMEPCurve3, newBranchMEPCurve);
var conns2 = originMEPCurve3.GetNearestConnectors(newBranchMEPCurve);
doc.Create.NewCrossFitting(conns[0], conns[1], conns2[0], conns2[1]);
}
else
@@ -880,8 +876,8 @@ public partial class AnyConnectViewModel : ObservableValidator
originMEPCurve3.SetLocationCurve(extendLine3);
var extendLine4 = line4.ExtendLine(intersection);
originMEPCurve4.SetLocationCurve(extendLine4);
var conns = ConnectorAssist.GetNearestConnectors(originMEPCurve1, originMEPCurve2);
var conns2 = ConnectorAssist.GetNearestConnectors(originMEPCurve3, originMEPCurve4);
var conns = originMEPCurve1.GetNearestConnectors(originMEPCurve2);
var conns2 = originMEPCurve3.GetNearestConnectors(originMEPCurve4);
//Debug.WriteLine(string.Format("{0}-{1}", originConnectors[0].Origin, originConnectors[0].CoordinateSystem.BasisZ));
//Debug.WriteLine(string.Format("{0}-{1}", originConnectors[1].Origin, originConnectors[1].CoordinateSystem.BasisZ));
//Debug.WriteLine(string.Format("{0}-{1}", conns2[0].Origin, conns2[0].CoordinateSystem.BasisZ));
@@ -947,7 +943,7 @@ public partial class AnyConnectViewModel : ObservableValidator
private static void MergeParallelMEPCurve(MEPCurve originMEPCurve1, MEPCurve originMEPCurve2)
{
var doc = originMEPCurve1.Document;
var conns = ConnectorAssist.GetFarthestConnectors(originMEPCurve1, originMEPCurve2, false);
var conns = originMEPCurve1.GetFarthestConnectors(originMEPCurve2, false);
var flag = false;
//判断大小管
switch (conns[0].Shape)