Merge pull request #1136 from mcneel/1.22

1.22
mcneel · Jul 3, 2024 · 1311cda · 1311cda
2 parents dece6aa + 6eaf3c6
commit 1311cda
Show file tree

Hide file tree

Showing 10 changed files with 11 additions and 13 deletions.
diff --git a/src/Product.targets b/src/Product.targets
@@ -18,10 +18,8 @@ If `ReleaseVersion` contains "wip" the product expires.
     <ProductMetaVersion></ProductMetaVersion>
     <ProductMajorVersion>1</ProductMajorVersion>
     <ProductMinorVersion>23</ProductMinorVersion>
-    <!--
-    <ProductBuildVersion></ProductBuildVersion>
-    <ProductRevisionVersion></ProductRevisionVersion>
-    -->
+    <ProductBuildVersion Condition="$(Configuration.Contains('Debug'))">0</ProductBuildVersion>
+    <ProductRevisionVersion Condition="$(Configuration.Contains('Debug'))">0</ProductRevisionVersion>
   </PropertyGroup>
 
   <PropertyGroup>

diff --git a/src/RhinoInside.Revit.GH/Components/Element/Ceiling/ByOutline.cs b/src/RhinoInside.Revit.GH/Components/Element/Ceiling/ByOutline.cs
@@ -85,7 +85,7 @@ void ReconstructCeilingByOutline
         )
           ThrowArgumentException(nameof(boundary), "Boundary loop curves should be a set of valid horizontal, coplanar and closed curves.");
 
-        boundary[index] = loop.Simplify(CurveSimplifyOptions.All, tol.VertexTolerance, tol.AngleTolerance) ?? loop;
+        boundary[index] = loop.Simplify(CurveSimplifyOptions.All & ~CurveSimplifyOptions.Merge, tol.VertexTolerance, tol.AngleTolerance) ?? loop;
 
         using (var properties = AreaMassProperties.Compute(loop, tol.VertexTolerance))
         {

diff --git a/src/RhinoInside.Revit.GH/Components/Element/Floor/AddFloor.cs b/src/RhinoInside.Revit.GH/Components/Element/Floor/AddFloor.cs
@@ -136,7 +136,7 @@ protected override void TrySolveInstance(IGH_DataAccess DA)
             )
               throw new RuntimeArgumentException(nameof(boundary), "Boundary loop curves should be a set of valid horizontal, coplanar and closed curves.", boundary);
 
-            boundary[index] = loop.Simplify(CurveSimplifyOptions.All, tol.VertexTolerance, tol.AngleTolerance) ?? loop;
+            boundary[index] = loop.Simplify(CurveSimplifyOptions.All & ~CurveSimplifyOptions.Merge, tol.VertexTolerance, tol.AngleTolerance) ?? loop;
 
             using (var properties = AreaMassProperties.Compute(loop, tol.VertexTolerance))
             {

diff --git a/src/RhinoInside.Revit.GH/Components/Element/Railing/ByCurve.cs b/src/RhinoInside.Revit.GH/Components/Element/Railing/ByCurve.cs
@@ -51,7 +51,7 @@ [Optional] bool flipped
         Vector3d.ZAxis
       );
       curve = Curve.ProjectToPlane(curve, levelPlane);
-      curve = curve.Simplify(CurveSimplifyOptions.All, tol.VertexTolerance, tol.AngleTolerance) ?? curve;
+      curve = curve.Simplify(CurveSimplifyOptions.All & ~CurveSimplifyOptions.Merge, tol.VertexTolerance, tol.AngleTolerance) ?? curve;
 
       // Type
       ChangeElementTypeId(ref railing, type.Value.Id);

diff --git a/src/RhinoInside.Revit.GH/Components/Element/Roof/ByOutline.cs b/src/RhinoInside.Revit.GH/Components/Element/Roof/ByOutline.cs
@@ -83,7 +83,7 @@ boundary is null ||
 
       SolveOptionalLevel(document, boundary, ref level, out var bbox);
 
-      boundary = boundary.Simplify(CurveSimplifyOptions.All, tol.VertexTolerance, tol.AngleTolerance) ?? boundary;
+      boundary = boundary.Simplify(CurveSimplifyOptions.All & ~CurveSimplifyOptions.Merge, tol.VertexTolerance, tol.AngleTolerance) ?? boundary;
 
       var orientation = boundary.ClosedCurveOrientation(Plane.WorldXY);
       if (orientation == CurveOrientation.CounterClockwise)

diff --git a/src/RhinoInside.Revit.GH/Components/Element/Wall/ByProfile.cs b/src/RhinoInside.Revit.GH/Components/Element/Wall/ByProfile.cs
@@ -199,7 +199,7 @@ loop is null ||
           ThrowArgumentException(nameof(profile), "Profile should be a list of planar vertical surfaces.", loop);
 #endif
 
-        loops[index] = loop.Simplify(CurveSimplifyOptions.All, tol.VertexTolerance, tol.AngleTolerance) ?? loop;
+        loops[index] = loop.Simplify(CurveSimplifyOptions.All & ~CurveSimplifyOptions.Merge, tol.VertexTolerance, tol.AngleTolerance) ?? loop;
 
         using (var properties = AreaMassProperties.Compute(loop, tol.VertexTolerance))
         {

diff --git a/src/RhinoInside.Revit.GH/Components/Site/AddToposolid.cs b/src/RhinoInside.Revit.GH/Components/Site/AddToposolid.cs
@@ -131,7 +131,7 @@ protected override void TrySolveInstance(IGH_DataAccess DA)
                 throw new RuntimeArgumentException(nameof(boundary), "Boundary loop curves should be a set of valid horizontal, coplanar and closed curves.", boundary);
 
               boundaryElevation = Interval.FromUnion(boundaryElevation, new Interval(plane.OriginZ, plane.OriginZ));
-              boundary[index] = loop.Simplify(CurveSimplifyOptions.All, tol.VertexTolerance, tol.AngleTolerance) ?? loop;
+              boundary[index] = loop.Simplify(CurveSimplifyOptions.All & ~CurveSimplifyOptions.Merge, tol.VertexTolerance, tol.AngleTolerance) ?? loop;
 
               using (var properties = AreaMassProperties.Compute(loop, tol.VertexTolerance))
               {

diff --git a/src/RhinoInside.Revit.GH/Components/Site/AddToposolidSubDivision.cs b/src/RhinoInside.Revit.GH/Components/Site/AddToposolidSubDivision.cs
@@ -105,7 +105,7 @@ protected override void TrySolveInstance(IGH_DataAccess DA)
                 throw new RuntimeArgumentException(nameof(boundary), "Boundary loop curves should be a set of valid horizontal, coplanar and closed curves.", boundary);
 
               boundaryElevation = Interval.FromUnion(boundaryElevation, new Interval(plane.OriginZ, plane.OriginZ));
-              boundary[index] = loop.Simplify(CurveSimplifyOptions.All, tol.VertexTolerance, tol.AngleTolerance) ?? loop;
+              boundary[index] = loop.Simplify(CurveSimplifyOptions.All & ~CurveSimplifyOptions.Merge, tol.VertexTolerance, tol.AngleTolerance) ?? loop;
 
               using (var properties = AreaMassProperties.Compute(loop, tol.VertexTolerance))
               {

diff --git a/src/RhinoInside.Revit.GH/Components/Structure/AddFoundation-Slab.cs b/src/RhinoInside.Revit.GH/Components/Structure/AddFoundation-Slab.cs
@@ -137,7 +137,7 @@ protected override void TrySolveInstance(IGH_DataAccess DA)
             )
               throw new RuntimeArgumentException(nameof(boundary), "Boundary loop curves should be a set of valid horizontal, coplanar and closed curves.", boundary);
 
-            boundary[index] = loop.Simplify(CurveSimplifyOptions.All, tol.VertexTolerance, tol.AngleTolerance) ?? loop;
+            boundary[index] = loop.Simplify(CurveSimplifyOptions.All & ~CurveSimplifyOptions.Merge, tol.VertexTolerance, tol.AngleTolerance) ?? loop;
 
             using (var properties = AreaMassProperties.Compute(loop, tol.VertexTolerance))
             {

diff --git a/src/RhinoInside.Revit.GH/Types/Reference.cs b/src/RhinoInside.Revit.GH/Types/Reference.cs
@@ -266,7 +266,7 @@ protected internal T GetElement<T>(T element) where T : Element
         if (IsLinked && Document.IsEquivalent(element.Document))
           return (T) Element.FromLinkElement(ReferenceDocument.GetElement(ReferenceId) as ARDB.RevitLinkInstance, element);
 
-        if (!ReferenceDocument.IsEquivalent(element.Document))
+        if (element.Document is object && !ReferenceDocument.IsEquivalent(element.Document))
           throw new Exceptions.RuntimeArgumentException(nameof(element), $"Invalid Document");
 
         return element;