Merge pull request #1445 from mcneel/kike/1.36

Kike/1.36

Author: kike-garbo

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

@@ -1527,11 +1527,19 @@ public static bool Scale(this RhinoViewport viewport, double scaleFactor)
       return true;
     }
   }
+}
 
+namespace Rhino.Render
+{
   static class RenderMaterialExtension
   {
 #if !RHINO_8
-    public static DocObjects.Material ToMaterial(this Render.RenderMaterial material, Render.RenderTexture.TextureGeneration generation)
+    public static RenderMaterial Find(this RenderMaterialTable table, Guid id)
+    {
+      return table.FirstOrDefault(x => x.Id == id);
+    }
+
+    public static DocObjects.Material ToMaterial(this RenderMaterial material, RenderTexture.TextureGeneration generation)
     {
       return material.SimulatedMaterial(generation);
     }

src/RhinoInside.Revit.GH/Extensions/System.Collections.Generic.cs

@@ -54,15 +54,54 @@ public static IEnumerable<int> IndexOf<T>(this IEnumerable<T> values, T value, i
       if (index > 0)
         values = values.Skip(index);
 
+      var comparer = EqualityComparer<T>.Default;
       foreach (var item in values)
       {
-        if (item.Equals(value))
+        if (comparer.Equals(item, value))
           yield return index;
 
         index++;
       }
     }
 
+    public static IEnumerable<T> TakeButLast<T>(this IEnumerable<T> source, out T last) where T : class
+    {
+      if (source == null) throw new ArgumentNullException(nameof(source));
+
+      last = default;
+      using var e = source.GetEnumerator();
+      if (!e.MoveNext()) Array.Empty<T>();
+
+      var count = (source as IList)?.Count - 1 ?? 0;
+      var queue = new Queue<T>(count);
+      last = e.Current;
+      while (e.MoveNext())
+      {
+        queue.Enqueue(last);
+        last = e.Current;
+      }
+      return queue;
+    }
+
+    public static IEnumerable<T> TakeButLast<T>(this IEnumerable<T> source, out T? last) where T : struct
+    {
+      if (source == null) throw new ArgumentNullException(nameof(source));
+
+      last = default;
+      using var e = source.GetEnumerator();
+      if (!e.MoveNext()) Array.Empty<T>();
+
+      var count = (source as IList)?.Count - 1 ?? 0;
+      var queue = new Queue<T>(count);
+      last = e.Current;
+      while (e.MoveNext())
+      {
+        queue.Enqueue(last.Value);
+        last = e.Current;
+      }
+      return queue;
+    }
+
     public static IEnumerable<TResult> ZipOrLast<TFirst, TSecond, TResult>(this IEnumerable<TFirst> first, IEnumerable<TSecond> second, Func<TFirst, TSecond, TResult> resultSelector)
     {
       if (first is null) throw new ArgumentNullException(nameof(first));

src/RhinoInside.Revit.GH/Types/Enums.cs

@@ -83,10 +83,10 @@ public CategoryType(ARDB.CategoryType value) : base(value) { }
     public override bool IsEmpty => Value == ARDB.CategoryType.Invalid;
     public static new IReadOnlyDictionary<int, string> NamedValues { get; } = new Dictionary<int, string>
     {
-      { (int) ARDB.CategoryType.Model,            "Model"       },
-      { (int) ARDB.CategoryType.Annotation,       "Annotation"  },
-      { (int) ARDB.CategoryType.Internal,         "Internal"    },
-      { (int) ARDB.CategoryType.AnalyticalModel,  "Analytical"  },
+      { (int) ARDB.CategoryType.Model,            "Model"             },
+      { (int) ARDB.CategoryType.Annotation,       "Annotation"        },
+      { (int) ARDB.CategoryType.Internal,         "Internal"          },
+      { (int) ARDB.CategoryType.AnalyticalModel,  "Analytical Model"  },
     };
   }
 

src/RhinoInside.Revit.GH/Types/ObjectStyles/LinePatternElement.cs

@@ -110,40 +110,19 @@ out Guid guid
 
       if (Id == ARDB.LinePatternElement.GetSolidPatternId())
       {
-        idMap.Add(Id, guid = new Guid("{3999bed5-78ee-4d73-a059-032224c6fd55}"));
+        idMap.Add(Id, guid = new Guid("{3999BED5-78EE-4D73-A059-032224C6FD55}"));
         return true;
       }
       else if (Value is ARDB.LinePatternElement linePattern)
       {
         // 2. Check if already exist
         var index = doc.Linetypes.Find(linePattern.Name);
-        var linetype = index < 0 ?
-          new Linetype() { Name = linePattern.Name } :
-          doc.Linetypes[index];
+        var linetype = index < 0 ? null : doc.Linetypes[index];
 
         // 3. Update if necessary
         if (index < 0 || overwrite)
         {
-          using (var pattern = linePattern.GetLinePattern())
-          {
-            linetype.SetSegments
-            (
-              pattern.GetSegments().Select
-              (
-                x =>
-                {
-                  switch (x.Type)
-                  {
-                    case ARDB.LinePatternSegmentType.Dash:  return UnitScale.Convert(+x.Length, UnitScale.Internal, UnitScale.Millimeters);
-                    case ARDB.LinePatternSegmentType.Space: return UnitScale.Convert(-x.Length, UnitScale.Internal, UnitScale.Millimeters);
-                    case ARDB.LinePatternSegmentType.Dot:   return 0.0;
-                    default: throw new ArgumentOutOfRangeException();
-                  }
-                }
-              )
-            );
-          }
-
+          linetype = ToLinetype(linetype);
           if (index < 0) { index = doc.Linetypes.Add(linetype); linetype = doc.Linetypes[index]; }
           else if (overwrite) doc.Linetypes.Modify(linetype, index, true);
         }
@@ -195,6 +174,38 @@ internal ModelContent ToModelContent(IDictionary<ARDB.ElementId, ModelContent> i
       return null;
     }
 #endif
+
+    internal Linetype ToLinetype(Linetype linetype = null)
+    {
+      if (Value is ARDB.LinePatternElement linePattern)
+      {
+        linetype ??= new Linetype() { Name = linePattern.Name };
+
+        using (var pattern = linePattern.GetLinePattern())
+        {
+          linetype.SetSegments
+          (
+            pattern.GetSegments().Select
+            (
+              x =>
+              {
+                switch (x.Type)
+                {
+                  case ARDB.LinePatternSegmentType.Dash: return UnitScale.Convert(+x.Length, UnitScale.Internal, UnitScale.Millimeters);
+                  case ARDB.LinePatternSegmentType.Space: return UnitScale.Convert(-x.Length, UnitScale.Internal, UnitScale.Millimeters);
+                  case ARDB.LinePatternSegmentType.Dot: return 0.0;
+                  default: throw new ArgumentOutOfRangeException();
+                }
+              }
+            )
+          );
+        }
+
+        return linetype;
+      }
+
+      return null;
+    }
     #endregion
 
     #region Properties