Skip to content

Commit cd9303b

Browse files
ZiyunShangZiyunShang
authored
Fix issue - Joined geometry does not convert correctly (#2466)
* Fix issue - Joined geometry does not convert correctly * fix comments * Simplify Class structure
1 parent 8c4b607 commit cd9303b

7 files changed

Lines changed: 176 additions & 129 deletions

File tree

‎CHANGELOG.md‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
* Fix issue - Joined geometry does not convert correctly
2+
13
## 0.1.13
24
* update DynamoCore to 2.5.0.7186
35

‎src/Libraries/RevitNodes/GeometryConversion/CurveLoopPartition.cs‎

Lines changed: 147 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,147 @@
1+
using System;
2+
using System.Collections.Generic;
3+
using System.Linq;
4+
using Autodesk.DesignScript.Runtime;
5+
using Autodesk.Revit.DB;
6+
using BoundingBox = Autodesk.DesignScript.Geometry.BoundingBox;
7+
using PolyCurve = Autodesk.DesignScript.Geometry.PolyCurve;
8+
9+
namespace Revit.GeometryConversion
10+
{
11+
12+
[SupressImportIntoVM]
13+
internal static class CurveLoopPartition
14+
{
15+
public static List<CurvePartition> ByCurveLoops(List<List<Curve>> curveLoops)
16+
{
17+
if (curveLoops.Count == 1)
18+
return new List<CurvePartition>()
19+
{
20+
new CurvePartition(){ OuterCurves = curveLoops[0] }
21+
};
22+
23+
var tesselatedCurveLoops = new List<Tuple<BoundingBox, List<XYZ>, List<Curve>>>();
24+
foreach (var curveLoop in curveLoops)
25+
{
26+
var verts = TesselateCurveLoop(curveLoop).ToList();
27+
List<Autodesk.DesignScript.Geometry.Curve> curves =
28+
new List<Autodesk.DesignScript.Geometry.Curve>();
29+
foreach (var curve in curveLoop)
30+
{
31+
curves.Add(curve.ToProtoType(false));
32+
}
33+
var geom = new List<Autodesk.DesignScript.Geometry.Geometry>();
34+
geom.Add(PolyCurve.ByJoinedCurves(curves));
35+
tesselatedCurveLoops.Add(new Tuple<BoundingBox, List<XYZ>, List<Curve>>(BoundingBox.ByGeometry(geom), verts, curveLoop));
36+
curves.ForEach(x => x.Dispose());
37+
curves.Clear();
38+
geom.ForEach(x => x.Dispose());
39+
geom.Clear();
40+
}
41+
42+
var outerCurveLoops = new List<Tuple<BoundingBox, List<XYZ>, List<Curve>>>();
43+
var innerCurveLoops = new List<Tuple<BoundingBox, List<XYZ>, List<Curve>>>();
44+
45+
// collect the outer loops, which are not contained in any other loop
46+
for (int i = 0, j = tesselatedCurveLoops.Count - 1; i < tesselatedCurveLoops.Count; j = i++)
47+
{
48+
var curveLoop = tesselatedCurveLoops[i];
49+
var isOuter = tesselatedCurveLoops.Where((_, l) => i != l)
50+
.All(bound => !curveLoop.Item2.IsContainedIn(bound.Item1));
51+
52+
if (isOuter)
53+
{
54+
outerCurveLoops.Add(curveLoop);
55+
}
56+
else
57+
{
58+
innerCurveLoops.Add(curveLoop);
59+
}
60+
}
61+
62+
var curvesPartitions = new List<CurvePartition>();
63+
64+
// for each outer loop, collect the loops that are inside of it
65+
// forming the partitions of the original curve loop set
66+
foreach (var outerLoop in outerCurveLoops)
67+
{
68+
var comp = new List<List<Curve>> { outerLoop.Item3 };
69+
var mask = new List<bool>();
70+
var curvePatition = new CurvePartition();
71+
curvePatition.OuterCurves.AddRange(outerLoop.Item3);
72+
foreach (var innerLoop in innerCurveLoops)
73+
{
74+
if (innerLoop.Item2.IsContainedIn(outerLoop.Item1))
75+
{
76+
mask.Add(false);
77+
comp.Add(innerLoop.Item3);
78+
curvePatition.InnerCurves.Add(innerLoop.Item3);
79+
}
80+
else
81+
{
82+
mask.Add(true);
83+
}
84+
}
85+
// remove innerEdge loops that have already been added to a partition
86+
innerCurveLoops = innerCurveLoops.Where((_, j) => mask[j]).ToList();
87+
// add the new partition
88+
curvesPartitions.Add(curvePatition);
89+
}
90+
91+
return curvesPartitions;
92+
}
93+
94+
public static List<List<Autodesk.Revit.DB.Curve>> GetAllCurveloopsFromRevitFace(Face face)
95+
{
96+
var curveLoops = face.GetEdgesAsCurveLoops();
97+
List<List<Autodesk.Revit.DB.Curve>> curves = new List<List<Curve>>();
98+
foreach (var curveloop in curveLoops)
99+
{
100+
var a = curveloop.GetCurveLoopIterator();
101+
bool hasItems = false;
102+
List<Curve> curve = new List<Curve>();
103+
do
104+
{
105+
hasItems = a.MoveNext();
106+
if (hasItems)
107+
{
108+
var item = a.Current;
109+
curve.Add(item);
110+
}
111+
} while (hasItems);
112+
curves.Add(curve);
113+
}
114+
return curves;
115+
}
116+
117+
private static IEnumerable<Autodesk.Revit.DB.XYZ> TesselateCurveLoop(IEnumerable<Autodesk.Revit.DB.Curve> curveLoop)
118+
{
119+
return curveLoop.SelectMany(x => x.Tessellate().TakeAllButLast());
120+
}
121+
122+
private static bool IsContainedIn(this IEnumerable<XYZ> curveLoop, BoundingBox boundingBox)
123+
{
124+
return curveLoop.All(x => boundingBox.Contains(x.ToPoint(false)));
125+
}
126+
}
127+
128+
public class CurvePartition
129+
{
130+
public List<Curve> OuterCurves;
131+
public List<List<Curve>> InnerCurves;
132+
133+
public CurvePartition()
134+
{
135+
OuterCurves = new List<Curve>();
136+
InnerCurves = new List<List<Curve>>();
137+
}
138+
139+
public List<List<Curve>> GetAllCurves()
140+
{
141+
var allCurves = new List<List<Curve>>();
142+
allCurves.Add(OuterCurves);
143+
allCurves.AddRange(InnerCurves);
144+
return allCurves;
145+
}
146+
}
147+
}

‎src/Libraries/RevitNodes/GeometryConversion/EdgeLoopPartition.cs‎

Lines changed: 0 additions & 106 deletions
This file was deleted.

‎src/Libraries/RevitNodes/GeometryConversion/GeometryObjectConverter.cs‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,12 @@ public static object Convert(this Autodesk.Revit.DB.GeometryObject geom, Autodes
2828
try
2929
{
3030
protoGeom = InternalConvert(dynGeom);
31+
// if protoGeom is null, Transform will be ambiguous between
32+
// IEnumerable<Autodesk.DesignScript.Geometry.Geometry> Transform(IEnumerable<Autodesk.DesignScript.Geometry.Geometry> geom, CoordinateSystem coordinateSystem)
33+
// and
34+
// Autodesk.DesignScript.Geometry.Geometry Transform(Autodesk.DesignScript.Geometry.Geometry geom, CoordinateSystem coordinateSystem)
35+
if (protoGeom is null)
36+
throw new ArgumentNullException();
3137
return Tag(Transform(protoGeom, transform), reference);
3238
}
3339
catch (Exception e)

‎src/Libraries/RevitNodes/GeometryConversion/RevitToProtoFace.cs‎

Lines changed: 19 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
using Autodesk.Revit.DB;
66
using Revit.GeometryReferences;
77

8-
using Edge = Autodesk.Revit.DB.Edge;
8+
using Curve = Autodesk.Revit.DB.Curve;
99
using Face = Autodesk.Revit.DB.Face;
1010
using Surface = Autodesk.DesignScript.Geometry.Surface;
1111

@@ -19,42 +19,42 @@ public static IEnumerable<Surface> ToProtoType(this Autodesk.Revit.DB.Face revit
1919
{
2020
if (revitFace == null) throw new ArgumentNullException("revitFace");
2121

22-
var revitEdgeLoops = EdgeLoopPartition.GetAllEdgeLoopsFromRevitFace(revitFace);
23-
var partitionedRevitEdgeLoops = EdgeLoopPartition.ByEdgeLoopsAndFace(revitFace, revitEdgeLoops);
22+
var revitCurveLoops = CurveLoopPartition.GetAllCurveloopsFromRevitFace(revitFace);
23+
var partitionedRevitCurveLoops = CurveLoopPartition.ByCurveLoops(revitCurveLoops);
2424

2525
var listSurface = new List<Surface>();
2626

27-
foreach (var edgeloopPartition in partitionedRevitEdgeLoops)
27+
foreach (var curveloopPartition in partitionedRevitCurveLoops)
2828
{
2929
// convert the trimming curves
30-
var edgeLoops = EdgeLoopsAsPolyCurves(revitFace, edgeloopPartition);
30+
var curveLoops = CurveLoopsAsPolyCurves(revitFace, curveloopPartition.GetAllCurves());
3131

3232
// convert the underrlying surface
3333
var dyFace = (dynamic)revitFace;
34-
Surface untrimmedSrf = SurfaceExtractor.ExtractSurface(dyFace, edgeLoops);
34+
Surface untrimmedSrf = SurfaceExtractor.ExtractSurface(dyFace, curveLoops);
3535
if (untrimmedSrf == null)
3636
{
37-
edgeLoops.ForEach(x => x.Dispose());
38-
edgeLoops.Clear();
37+
curveLoops.ForEach(x => x.Dispose());
38+
curveLoops.Clear();
3939
throw new Exception("Failed to extract surface");
4040
}
4141

4242
// trim the surface
4343
Surface converted;
4444
try
4545
{
46-
converted = untrimmedSrf.TrimWithEdgeLoops(edgeLoops);
46+
converted = untrimmedSrf.TrimWithEdgeLoops(curveLoops);
4747
}
4848
catch (Exception e)
4949
{
50-
edgeLoops.ForEach(x => x.Dispose());
51-
edgeLoops.Clear();
50+
curveLoops.ForEach(x => x.Dispose());
51+
curveLoops.Clear();
5252
untrimmedSrf.Dispose();
5353
throw e;
5454
}
5555

56-
edgeLoops.ForEach(x => x.Dispose());
57-
edgeLoops.Clear();
56+
curveLoops.ForEach(x => x.Dispose());
57+
curveLoops.Clear();
5858
untrimmedSrf.Dispose();
5959

6060
// perform unit conversion if necessary
@@ -71,25 +71,23 @@ public static IEnumerable<Surface> ToProtoType(this Autodesk.Revit.DB.Face revit
7171
return listSurface;
7272
}
7373

74-
private static List<PolyCurve> EdgeLoopsAsPolyCurves(Face face,
75-
IEnumerable<IEnumerable<Edge>> edgeLoops)
74+
private static List<PolyCurve> CurveLoopsAsPolyCurves(Face face,
75+
IEnumerable<IEnumerable<Autodesk.Revit.DB.Curve>> curveLoops)
7676
{
7777
List<PolyCurve> result = new List<PolyCurve>();
78-
foreach (var edgeLoop in edgeLoops)
78+
foreach(var curveLoop in curveLoops)
7979
{
80-
List<Autodesk.DesignScript.Geometry.Curve> curves =
80+
List<Autodesk.DesignScript.Geometry.Curve> curves =
8181
new List<Autodesk.DesignScript.Geometry.Curve>();
82-
foreach (var edge in edgeLoop)
82+
foreach (var curve in curveLoop)
8383
{
84-
var dbCurve = edge.AsCurveFollowingFace(face);
85-
curves.Add(dbCurve.ToProtoType(false));
84+
curves.Add(curve.ToProtoType(false));
8685
}
8786
result.Add(PolyCurve.ByJoinedCurves(curves));
8887
curves.ForEach(x => x.Dispose());
8988
curves.Clear();
9089
}
9190
return result;
9291
}
93-
9492
}
9593
}

‎src/Libraries/RevitNodes/RevitNodes.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -142,7 +142,7 @@
142142
<Compile Include="Elements\LinePatternElement.cs" />
143143
<Compile Include="Filter\OverrideGraphicSettings.cs" />
144144
<Compile Include="Filter\ParameterFilterElement.cs" />
145-
<Compile Include="GeometryConversion\EdgeLoopPartition.cs" />
145+
<Compile Include="GeometryConversion\CurveLoopPartition.cs" />
146146
<Compile Include="GeometryConversion\EnumerableExtensions.cs" />
147147
<Compile Include="GeometryConversion\GeometryDebugging.cs" />
148148
<Compile Include="GeometryConversion\CurveUtils.cs" />

‎test/Libraries/RevitIntegrationTests/SampleTests.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1217,7 +1217,7 @@ public void Geometry_Surfaces()
12171217

12181218
}
12191219

1220-
[Test, Category("SmokeTests")]
1220+
[Test, Ignore, Category("Failure")] // This dyn file should connect nodes manully
12211221
[TestModel(@".\empty.rfa")]
12221222
public void Basics_Basic01()
12231223
{

0 commit comments

Comments
 (0)