Merge pull request #1251 from mcneel/kike/1.x

Added 'Structural Member' parameter.

src/RhinoInside.Revit.GH/Components/Structure/AddAnalyticalElement-Model.cs

@@ -29,9 +29,9 @@ public class AddAnalyticalElementByModel : AddAnalyticalElement
 #endif
     public AddAnalyticalElementByModel() : base
     (
-      name: "Add Analytical Element (Model)",
+      name: "Add Analytical Element",
       nickname: "ME-Analytical",
-      description: "Given a model element, it extracts its analytical element to the active Revit document",
+      description: "Given a model element, it adds an analytical element representation to the active Revit document",
       category: "Revit",
       subCategory: "Structure"
     )
@@ -92,28 +92,39 @@ protected override void TrySolveInstance(IGH_DataAccess DA)
       var structuralRole = ARDB.Structure.AnalyticalStructuralRole.Unset;
       switch (element)
       {
-        case Types.StructuralMember member:
-
-          switch (member.Value.StructuralType)
+        case Types.StructuralInstance structural:
+        {
+          if (Types.StructuralInstance.IsStructuralFraming(structural.Value))
           {
-            case ARDB.Structure.StructuralType.Beam:
-              structuralRole = ARDB.Structure.AnalyticalStructuralRole.StructuralRoleBeam;
-              typeId = member.Value.GetTypeId();
-              materialId = member.Value.StructuralMaterialId;
-              break;
-            case ARDB.Structure.StructuralType.Brace:
-              structuralRole = ARDB.Structure.AnalyticalStructuralRole.StructuralRoleGirder;
-              typeId = member.Value.GetTypeId();
-              materialId = member.Value.StructuralMaterialId;
-              break;
-            case ARDB.Structure.StructuralType.Column:
-              structuralRole = ARDB.Structure.AnalyticalStructuralRole.StructuralRoleColumn;
-              typeId = member.Value.GetTypeId();
-              materialId = member.Value.StructuralMaterialId;
-              break;
+            switch (structural)
+            {
+              case Types.StructuralBeam beam:
+                structuralRole = ARDB.Structure.AnalyticalStructuralRole.StructuralRoleBeam;
+                typeId = beam.Value.GetTypeId();
+                materialId = beam.Value.StructuralMaterialId;
+                break;
+
+              case Types.StructuralBrace brace:
+                structuralRole = ARDB.Structure.AnalyticalStructuralRole.StructuralRoleGirder;
+                typeId = brace.Value.GetTypeId();
+                materialId = brace.Value.StructuralMaterialId;
+                break;
+
+              case Types.StructuralColumn column:
+                structuralRole = ARDB.Structure.AnalyticalStructuralRole.StructuralRoleColumn;
+                typeId = column.Value.GetTypeId();
+                materialId = column.Value.StructuralMaterialId;
+                break;
+
+              case Types.StructuralFraming framing:
+                structuralRole = ARDB.Structure.AnalyticalStructuralRole.StructuralRoleMember;
+                typeId = framing.Value.GetTypeId();
+                materialId = framing.Value.StructuralMaterialId;
+                break;
+            }
           }
-
-          break;
+        }
+        break;
 
         case Types.Wall wall:
           boundary = wall.TrimmedSurface;
@@ -140,13 +151,7 @@ protected override void TrySolveInstance(IGH_DataAccess DA)
           (
             doc.Value, _AnalyticalElement_, analyticalMember =>
             {
-              analyticalMember = Reconstruct
-              (
-                analyticalMember,
-                doc.Value,
-                element.Curve.ToCurve()
-              );
-
+              analyticalMember = Reconstruct(analyticalMember, doc.Value, element.Curve.ToCurve());
               analyticalMember.StructuralRole = structuralRole;
               analyticalMember.SectionTypeId = typeId;
               analyticalMember.MaterialId = materialId;
@@ -160,13 +165,7 @@ protected override void TrySolveInstance(IGH_DataAccess DA)
           (
             doc.Value, _AnalyticalElement_, analyticalMember =>
             {
-              analyticalMember = Reconstruct
-              (
-                analyticalMember,
-                doc.Value,
-                element.Curve.ToCurve()
-              );
-
+              analyticalMember = Reconstruct(analyticalMember, doc.Value, element.Curve.ToCurve());
               analyticalMember.StructuralRole = structuralRole;
               analyticalMember.SectionTypeId = typeId;
               analyticalMember.MaterialId = materialId;
@@ -180,13 +179,22 @@ protected override void TrySolveInstance(IGH_DataAccess DA)
           (
             doc.Value, _AnalyticalElement_, analyticalMember =>
             {
-              analyticalMember = Reconstruct
-              (
-                analyticalMember,
-                doc.Value,
-                element.Curve.ToCurve()
-              );
+              analyticalMember = Reconstruct(analyticalMember, doc.Value, element.Curve.ToCurve());
+              analyticalMember.StructuralRole = structuralRole;
+              analyticalMember.SectionTypeId = typeId;
+              analyticalMember.MaterialId = materialId;
+              DA.SetData(_AnalyticalElement_, analyticalMember);
+              return analyticalMember;
+            }
+          );
+          break;
 
+        case ARDB.Structure.AnalyticalStructuralRole.StructuralRoleMember:
+          ReconstructElement<ARDB_AnalyticalMember>
+          (
+            doc.Value, _AnalyticalElement_, analyticalMember =>
+            {
+              analyticalMember = Reconstruct(analyticalMember, doc.Value, element.Curve.ToCurve());
               analyticalMember.StructuralRole = structuralRole;
               analyticalMember.SectionTypeId = typeId;
               analyticalMember.MaterialId = materialId;

src/RhinoInside.Revit.GH/Components/Structure/AddFoundation-Isolated.cs

@@ -88,7 +88,7 @@ public AddFoundationIsolated() : base
     {
       new ParamDefinition
       (
-        new Parameters.FamilyInstance()
+        new Parameters.StructuralInstance()
         {
           Name = _Foundation_,
           NickName = _Foundation_.Substring(0, 1),

src/RhinoInside.Revit.GH/Components/Structure/AddModelElement-Analytical.cs

@@ -38,9 +38,9 @@ public class AddModelElementByAnalytical : ElementTrackerComponent
 #endif
     public AddModelElementByAnalytical() : base
     (
-      name: "Add Model Element (Analytical)",
+      name: "Add Model Element",
       nickname: "AE-Model",
-      description: "Given an analytical element, it adds a model element to the active Revit document",
+      description: "Given an analytical element, it adds a model element representation to the active Revit document",
       category: "Revit",
       subCategory: "Structure"
     )

src/RhinoInside.Revit.GH/Components/Structure/AddStructuralBeam.cs

@@ -78,7 +78,7 @@ public AddStructuralBeam() : base
     {
       new ParamDefinition
       (
-        new Parameters.FamilyInstance()
+        new Parameters.StructuralInstance()
         {
           Name = _Beam_,
           NickName = _Beam_.Substring(0, 1),

src/RhinoInside.Revit.GH/Components/Structure/AddStructuralBrace.cs

@@ -79,7 +79,7 @@ public AddStructuralBrace() : base
     {
       new ParamDefinition
       (
-        new Parameters.FamilyInstance()
+        new Parameters.StructuralInstance()
         {
           Name = _Brace,
           NickName = _Brace.Substring(0, 1),

src/RhinoInside.Revit.GH/Components/Structure/AddStructuralColumn.cs

@@ -89,7 +89,7 @@ public AddStructuralColumn() : base
     {
       new ParamDefinition
       (
-        new Parameters.FamilyInstance()
+        new Parameters.StructuralInstance()
         {
           Name = _Column_,
           NickName = _Column_.Substring(0, 1),

src/RhinoInside.Revit.GH/Parameters/Structure/StructuralInstance.cs

@@ -0,0 +1,18 @@
+using System;
+using Grasshopper.Kernel;
+using ARDB = Autodesk.Revit.DB;
+
+namespace RhinoInside.Revit.GH.Parameters
+{
+  [ComponentVersion(introduced: "1.27")]
+  public class StructuralInstance : GraphicalElement<Types.IGH_StructuralInstance, ARDB.FamilyInstance>
+  {
+    public override GH_Exposure Exposure => GH_Exposure.secondary | GH_Exposure.obscure;
+    public override Guid ComponentGuid => new Guid("54C68928-F012-42B0-94DC-DC9FC00FAE31");
+    protected override string IconTag => "SC";
+
+    public StructuralInstance() : base("Structural Component", "Structural Component", "Contains a collection of Revit Structural Component elements", "Params", "Revit Elements") { }
+
+    public override bool AllowElement(ARDB.Element elem) => base.AllowElement(elem) && Types.StructuralInstance.IsValidElement(elem);
+  }
+}

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

@@ -786,7 +786,7 @@ static class ElementJoins
           return ARDB.WallUtils.IsWallJoinAllowedAtEnd(wall, end);
 
         case ARDB.FamilyInstance instance:
-          if (StructuralMember.IsStructuralFraming(instance))
+          if (StructuralInstance.IsStructuralFraming(instance))
             return ARDB.Structure.StructuralFramingUtils.IsJoinAllowedAtEnd(instance, end);
 
           break;
@@ -808,7 +808,7 @@ static void AllowJoinAtEnd(ARDB.Element element, int end, bool? allow)
             return;
 
           case ARDB.FamilyInstance instance:
-            if (StructuralMember.IsStructuralFraming(instance))
+            if (StructuralInstance.IsStructuralFraming(instance))
             {
               if (allow.Value) ARDB.Structure.StructuralFramingUtils.AllowJoinAtEnd(instance, end);
               else ARDB.Structure.StructuralFramingUtils.DisallowJoinAtEnd(instance, end);

src/RhinoInside.Revit.GH/Types/Structure/StructuralMember.cs → src/RhinoInside.Revit.GH/Types/Structure/StructuralInstance.cs

@@ -6,17 +6,20 @@ namespace RhinoInside.Revit.GH.Types
   using Convert.Geometry;
   using External.DB.Extensions;
 
-  [Kernel.Attributes.Name("Structural Member")]
-  public class StructuralMember : FamilyInstance
+  [Kernel.Attributes.Name("Structural Component")]
+  public interface IGH_StructuralInstance : IGH_FamilyInstance { }
+
+  [Kernel.Attributes.Name("Structural Component")]
+  public class StructuralInstance : FamilyInstance, IGH_StructuralInstance
   {
     protected override bool SetValue(ARDB.Element element) => IsValidElement(element) && base.SetValue(element);
     public static new bool IsValidElement(ARDB.Element element)
     {
       return ((element as ARDB.FamilyInstance)?.StructuralType) != ARDB.Structure.StructuralType.NonStructural;
     }
 
-    public StructuralMember() { }
-    public StructuralMember(ARDB.FamilyInstance value) : base(value) { }
+    public StructuralInstance() { }
+    public StructuralInstance(ARDB.FamilyInstance value) : base(value) { }
 
     #region Joins
     public static bool IsStructuralFraming(ARDB.FamilyInstance frame) =>
@@ -109,7 +112,7 @@ public bool? IsJoinAllowedAtEnd
   }
 
   [Kernel.Attributes.Name("Structural Beam")]
-  public class StructuralBeam : StructuralMember
+  public class StructuralBeam : StructuralInstance
   {
     protected override bool SetValue(ARDB.Element element) => IsValidElement(element) && base.SetValue(element);
     public static new bool IsValidElement(ARDB.Element element)
@@ -156,7 +159,7 @@ public override void SetCurve(Curve curve, bool keepJoins = false)
   }
 
   [Kernel.Attributes.Name("Structural Brace")]
-  public class StructuralBrace : StructuralMember
+  public class StructuralBrace : StructuralInstance
   {
     protected override bool SetValue(ARDB.Element element) => IsValidElement(element) && base.SetValue(element);
     public static new bool IsValidElement(ARDB.Element element)
@@ -169,7 +172,7 @@ public StructuralBrace(ARDB.FamilyInstance value) : base(value) { }
   }
 
   [Kernel.Attributes.Name("Structural Column")]
-  public class StructuralColumn : StructuralMember
+  public class StructuralColumn : StructuralInstance
   {
     protected override bool SetValue(ARDB.Element element) => IsValidElement(element) && base.SetValue(element);
     public static new bool IsValidElement(ARDB.Element element)
@@ -217,7 +220,7 @@ public override void SetCurve(Curve curve, bool keepJoins = false)
   }
 
   [Kernel.Attributes.Name("Structural Foundation")]
-  public class StructuralFooting : StructuralMember
+  public class StructuralFooting : StructuralInstance
   {
     protected override bool SetValue(ARDB.Element element) => IsValidElement(element) && base.SetValue(element);
     public static new bool IsValidElement(ARDB.Element element)
@@ -230,7 +233,7 @@ public StructuralFooting(ARDB.FamilyInstance value) : base(value) { }
   }
 
   [Kernel.Attributes.Name("Structural Framing")]
-  public class StructuralFraming : StructuralMember
+  public class StructuralFraming : StructuralInstance
   {
     protected override bool SetValue(ARDB.Element element) => IsValidElement(element) && base.SetValue(element);
     public static new bool IsValidElement(ARDB.Element element)