Merge pull request #1453 from mcneel/kike/1.36

Kike/1.36

Author: kike-garbo

docs/pages/_en/1.0/reference/release-notes.md

@@ -11,7 +11,10 @@ group: Deployment & Configs
 ### WIP
 
 ### RC
-
+- Added 'Add Revit Link' component.
+- Added 'Link IFC File' component.
+- Added 'Link CAD File' component.
+- Added 'Query CAD Models' component.
 
 {% endcapture %}
 

src/RhinoInside.Revit.External/DB/Extensions/FilteredElementCollector.cs

@@ -286,6 +286,15 @@ public static FilteredElementCollector WhereParameterEqualsTo(this FilteredEleme
         return collector.WherePasses(filter);
     }
 
+    public static FilteredElementCollector WhereParameterEqualsTo(this FilteredElementCollector collector, BuiltInParameter paramId, double value, double tolerance = Numerical.Constant.DefaultTolerance)
+    {
+      using (var provider = new ParameterValueProvider(new ElementId(paramId)))
+      using (var evaluator = new FilterNumericEquals())
+      using (var rule = new FilterDoubleRule(provider, evaluator, value, tolerance))
+      using (var filter = new ElementParameterFilter(rule))
+        return collector.WherePasses(filter);
+    }
+
     public static FilteredElementCollector WhereParameterEqualsTo(this FilteredElementCollector collector, BuiltInParameter paramId, string value)
     {
       if (value is null) return collector;

src/RhinoInside.Revit.External/DB/Extensions/GeometryObject.cs

@@ -666,17 +666,16 @@ public int GetHashCode(GeometryObject value)
 
   public static class GeometryObjectExtension
   {
-    internal static bool IsValid(this GeometryObject geometry) => geometry?.IsValidObject() ?? false;
-
-    internal static bool IsValidObject(this GeometryObject geometry)
+    internal static bool IsEmpty(this GeometryObject geometry)
     {
-#if REVIT_2021
-      try { return geometry.Id >= 0; }
-#else
-      // TODO : Test this, type by type, and use a faster fail check.
-      try { return geometry.TryGetLocation(out var _, out var _, out var _);}
-#endif
-      catch { return false; }
+      switch (geometry)
+      {
+        case PolyLine pline: return pline.NumberOfCoordinates == 0;
+        case Mesh mesh: return mesh.NumTriangles == 0;
+        case Solid solid: return solid.Faces.IsEmpty;
+      }
+
+      return false;
     }
 
     public static bool AlmostEquals<G>(this G left, G right)

src/RhinoInside.Revit.External/Extensions/RhinoCommon.cs

@@ -777,6 +777,25 @@ internal static bool TryGetHermiteSpline(this Curve curve, out IList<Point3d> po
     /// <param name="angleToleranceRadians">Tolerance to use when checking for kinks, in radians.</param>
     /// <returns>true if the curve has kinks within tolerance and results into a PolyCurve.</returns>
     public static bool TryGetPolyCurve(this Curve curve, out PolyCurve polyCurve, double angleToleranceRadians)
+    {
+      if (GetSubCurves(curve, angleToleranceRadians) is Curve[] segments)
+      {
+        polyCurve = new PolyCurve();
+        foreach (var segment in segments)
+          polyCurve.AppendSegment(segment);
+
+        return true;
+      }
+
+      polyCurve = default;
+      return false;
+    }
+
+#if !RHINO_8
+    public static Curve[] GetSubCurves(this Curve curve) => GetSubCurves(curve).ToArray();
+#endif
+
+    private static Curve[] GetSubCurves(Curve curve, double angleToleranceRadians = Math.PI / 180.0)
     {
       var kinks = default(List<double>);
 
@@ -792,16 +811,9 @@ public static bool TryGetPolyCurve(this Curve curve, out PolyCurve polyCurve, do
       }
 
       if (kinks is object && kinks.Count > (curve.IsClosed ? 1 : 0) && curve.Split(kinks) is Curve[] segments)
-      {
-        polyCurve = new PolyCurve();
-        foreach (var segment in segments)
-          polyCurve.AppendSegment(segment);
+        return curve.Split(kinks);
 
-        return true;
-      }
-
-      polyCurve = default;
-      return false;
+      return null;
     }
 
     static bool TryEvaluateCurvature

src/RhinoInside.Revit.External/Extensions/System.IO.cs

@@ -3,9 +3,63 @@
 
 namespace System.IO
 {
-#pragma warning disable CA1060 // Move pinvokes to native methods class
   static class PathExtension
   {
+    internal static readonly StringComparer Comparer = new PathComparer();
+
+    private class PathComparer : StringComparer
+    {
+      private static readonly StringComparer StringComparer = OrdinalIgnoreCase;
+
+      public PathComparer() { }
+
+      private static string Normalize(string path) => Path.GetFullPath(path);
+
+      internal static string Canonicalize(string path) => new FileInfo(path).FullName;
+
+      public override int Compare(string x, string y)
+      {
+        var comparison = StringComparer.Compare(x, y);
+        if (comparison == 0) return 0;
+
+        try
+        {
+          if (StringComparer.Compare(Normalize(x), Normalize(y)) == 0) return 0;
+          return StringComparer.Compare(Canonicalize(x), Canonicalize(y));
+        }
+        catch { return comparison; }
+      }
+
+      public override bool Equals(string x, string y)
+      {
+        if (StringComparer.Equals(x, y)) return true;
+        try
+        {
+          if (StringComparer.Equals(Normalize(x), Normalize(y))) return true;
+          return StringComparer.Equals(Canonicalize(x), Canonicalize(y));
+        }
+        catch { return false; }
+      }
+
+      public override int GetHashCode(string obj)
+      {
+        try { return obj is null ? 0 : StringComparer.GetHashCode(Canonicalize(obj)); }
+        catch { return int.MinValue; }
+      }
+    }
+
+    public static bool TryGetFullyQualifiedPath(ref string path)
+    {
+      if (string.IsNullOrWhiteSpace(path)) return false;
+      if (!IsFullyQualifiedPath(path)) return false;
+      try
+      {
+        path = PathComparer.Canonicalize(path);
+        return true;
+      }
+      catch { return false; }
+    }
+
     public static bool IsFullyQualifiedPath(this string path)
     {
       if (path == null) return false;
@@ -29,17 +83,20 @@ public static bool IsFullyQualifiedPath(this string path)
 #endif
     }
 
-    [DllImport("SHLWAPI", CharSet = CharSet.Unicode)]
-    static extern bool PathCompactPathExW([Out] Text.StringBuilder pszOut, string szPath, int cchMax, int dwFlags);
     internal static string TripleDotPath(this string path, int maxLength)
     {
       if (path is null) return null;
       var builder = new Text.StringBuilder(maxLength + 1);
-      PathCompactPathExW(builder, path, maxLength, 0);
+      SafeNativeMethods.PathCompactPathExW(builder, path, maxLength, 0);
       return builder.ToString();
     }
+
+    static class SafeNativeMethods
+    {
+      [DllImport("SHLWAPI", CharSet = CharSet.Unicode)]
+      public static extern bool PathCompactPathExW([Out] Text.StringBuilder pszOut, string szPath, int cchMax, int dwFlags);
+    }
   }
-#pragma warning restore CA1060 // Move pinvokes to native methods class
 
   internal static class DirectoryInfoExtension
   {

src/RhinoInside.Revit.GH/Components/Documents/DocumentSave.cs

@@ -18,7 +18,7 @@ public class DocumentSave : ZuiComponent
     public DocumentSave() : base
     (
       name: "Save Document",
-      nickname: "Save",
+      nickname: "D-Save",
       description: "Saves a document to a given file path",
       category: "Revit",
       subCategory: "Document"
@@ -104,7 +104,7 @@ protected override void TrySolveInstance(IGH_DataAccess DA)
           if (filePath.Last() == Path.DirectorySeparatorChar)
             filePath = Path.Combine(filePath, doc.Title);
 
-          if (filePath.IsFullyQualifiedPath())
+          if (PathExtension.TryGetFullyQualifiedPath(ref filePath))
           {
             if (!Path.HasExtension(filePath))
             {

src/RhinoInside.Revit.GH/Components/Element/HostObject/ElementHost.cs

@@ -48,23 +48,8 @@ protected override void TrySolveInstance(IGH_DataAccess DA)
         return;
       }
 
-      var hostId = default(ARDB.ElementId);
-
-      if (element.Value is ARDB.Structure.Rebar rebar) hostId = rebar.GetHostId();
-      else if (element.Value is ARDB.Structure.RebarInSystem rebarInSystem) hostId = rebarInSystem.GetHostId();
-      else if (element.Value is ARDB.Structure.RebarContainer rebarContainer) hostId = rebarContainer.GetHostId();
-      else if (element.Value is ARDB.Structure.AreaReinforcement areaReinforcement) hostId = areaReinforcement.GetHostId();
-      else if (element.Value is ARDB.Structure.PathReinforcement pathReinforcement) hostId = pathReinforcement.GetHostId();
-      else if (element.Value is ARDB.Structure.FabricSheet fabricSheet) hostId = fabricSheet.HostId;
-      else if (element.Value is ARDB.FabricationPart fabricationPart)
-      {
-        using (var hostedInfo = fabricationPart.GetHostedInfo())
-          hostId = hostedInfo.HostId;
-      }
-      else hostId = element.Value.get_Parameter(ARDB.BuiltInParameter.HOST_ID_PARAM)?.AsElementId();
-
       // Default to Level if hostId is null
-      DA.SetData("Host", element.GetElement<Types.GraphicalElement>(hostId ?? element.LevelId));
+      DA.SetData("Host", element.GetElement<Types.GraphicalElement>(element.Level));
     }
   }
 }

src/RhinoInside.Revit.GH/Components/Family/New.cs

@@ -650,7 +650,7 @@ static string GetDefaultTemplatePath(ARDB.Document doc, ARDB.ElementId categoryI
 
     static bool FindTemplatePath(ARDB.Document doc, ref string templatePath, out bool pathWasRelative)
     {
-      pathWasRelative = !templatePath.IsFullyQualifiedPath();
+      pathWasRelative = !PathExtension.TryGetFullyQualifiedPath(ref templatePath);
 
       // Validate input
       foreach (var invalid in Path.GetInvalidPathChars())

src/RhinoInside.Revit.GH/Components/Family/Save.cs

@@ -126,7 +126,7 @@ protected override void TrySolveInstance(IGH_DataAccess DA)
       if (!Path.HasExtension(filePath))
         filePath += ".rfa";
 
-      if (!filePath.IsFullyQualifiedPath())
+      if (!PathExtension.TryGetFullyQualifiedPath(ref filePath))
       {
         filePath = Path.Combine(Types.Document.FromValue(family.Document).SwapFolder.Directory.FullName, "Families", filePath);
         Directory.CreateDirectory(Path.GetDirectoryName(filePath));

src/RhinoInside.Revit.GH/Components/Import/IFCImportOptions.cs

@@ -6,17 +6,17 @@
 namespace RhinoInside.Revit.GH.Components.Insert
 {
   [ComponentVersion(introduced: "1.36")]
-  public class IFCImportOptions : ZuiComponent
+  public class IFCReadOptions : ZuiComponent
   {
     public override Guid ComponentGuid => new Guid("A8F3E5C1-9D4B-4E2A-B8F1-3C5D6E7F8A9B");
     public override GH_Exposure Exposure => GH_Exposure.secondary;
     protected override string IconTag => string.Empty;
 
-    public IFCImportOptions() : base
+    public IFCReadOptions() : base
     (
-      name: "IFC Import Options",
-      nickname: "IFCOpt",
-      description: "Configure options for IFC file import or link operations",
+      name: "IFC Read Options",
+      nickname: "IFC-Read",
+      description: "Configure options to read IFC files.",
       category: "Revit",
       subCategory: "Insert"
     )
@@ -128,7 +128,7 @@ public IFCImportOptions() : base
           NickName = "AC",
           Description = "Autocorrect off-axis lines enabled",
           Access = GH_ParamAccess.item
-        }
+        }, ParamRelevance.Secondary
       )
     };
 
@@ -162,10 +162,10 @@ protected override void TrySolveInstance(IGH_DataAccess DA)
 
       if (options != null)
       {
-        DA.SetData("Intent", (int)options.Intent);
-        DA.SetData("Action", (int)options.Action);
-        DA.SetData("Auto Join", options.AutoJoin);
-        DA.SetData("Autocorrect Off Axis Lines", options.AutocorrectOffAxisLines);
+        Params.TrySetData(DA, "Intent", () => (int)options.Intent);
+        Params.TrySetData(DA, "Action", () => (int)options.Action);
+        Params.TrySetData(DA, "Auto Join", () => options.AutoJoin);
+        Params.TrySetData(DA, "Autocorrect Off Axis Lines", () => options.AutocorrectOffAxisLines);
       }
     }
   }