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

更新

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files

20
ShrlAlgoToolkit.RevitAddins/RvMEP/AnyConnectViewModel.cs
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)

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

@@ -90,7 +90,7 @@ public class CableLayoutCmd : ExternalCommand
var conduit = conduits[j];
var conduit1 = conduits[j + 1];
var list = ConnectorAssist.GetNearestConnectors(conduit, conduit1);
var list = ConnectorExtensions.GetNearestConnectors(conduit, conduit1);
if (list[0] != null && list[1] != null)
{
Document.Create.NewElbowFitting(list[0], list[1]);

2
ShrlAlgoToolkit.RevitAddins/RvMEP/ClashReportView.xaml
View File

@@ -39,7 +39,7 @@
<ControlTemplate>
<Border
Background="{TemplateBinding Background}"
BorderBrush="{TemplateBinding ControlBorderBrush}"
BorderBrush="{TemplateBinding BorderBrush}"
BorderThickness="{TemplateBinding BorderThickness}"
Padding="{TemplateBinding Padding}"
SnapsToDevicePixels="True">

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

@@ -306,13 +306,13 @@ public partial class ClashResolveViewModel : ObservableObject
}
var conn1 = ConnectorAssist.GetNearestConnectors(
var conn1 = ConnectorExtensions.GetNearestConnectors(
baseMepCurve1,
angleMepCurve
);
doc.Create.NewElbowFitting(conn1[0], conn1[1]);
var conn2 = ConnectorAssist.GetNearestConnectors(
var conn2 = ConnectorExtensions.GetNearestConnectors(
angleMepCurve,
baseMepCurve2
);
@@ -419,12 +419,12 @@ public partial class ClashResolveViewModel : ObservableObject
doc.Regenerate();
try
{
var connectors1 = ConnectorAssist.GetNearestConnectors(
var connectors1 = ConnectorExtensions.GetNearestConnectors(
baseMepCurve1,
firstMepCurve
);
doc.Create.NewElbowFitting(connectors1[0], connectors1[1]);
var connectors4 = ConnectorAssist.GetNearestConnectors(
var connectors4 = ConnectorExtensions.GetNearestConnectors(
thirdMepCurve,
baseMepCurve2
);
@@ -440,12 +440,12 @@ public partial class ClashResolveViewModel : ObservableObject
}
try
{
var connectors2 = ConnectorAssist.GetNearestConnectors(
var connectors2 = ConnectorExtensions.GetNearestConnectors(
firstMepCurve,
secondMepCurve
);
doc.Create.NewElbowFitting(connectors2[0], connectors2[1]);
var connectors3 = ConnectorAssist.GetNearestConnectors(
var connectors3 = ConnectorExtensions.GetNearestConnectors(
secondMepCurve,
thirdMepCurve
);

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

@@ -39,7 +39,7 @@ public class MoveConnectCmd : ExternalCommand
}
var baseElement = Document.GetElement(baseReference);
var elementToMove = Document.GetElement(moveReference);
var list = ConnectorAssist.GetNearestDomainConnectors(baseElement, elementToMove);
var list = baseElement.GetNearestDomainConnectors(elementToMove);
if (list.Count != 2)
{
MessageBox.Show("缺少可连接的连接件", "提示");