Merge branch 'dev'

chuongmep · Feb 28, 2023 · 58f2bfc · 58f2bfc
2 parents 0b38b5d + 39b7d58
commit 58f2bfc
Show file tree

Hide file tree

Showing 18 changed files with 883 additions and 223 deletions.
diff --git a/.idea/.idea.OpenMEP/.idea/.name b/.idea/.idea.OpenMEP/.idea/.name
diff --git a/OpenMEP/ConnectorManager/Connector.cs b/OpenMEP/ConnectorManager/Connector.cs
@@ -126,7 +126,12 @@ public static double Radius(Autodesk.Revit.DB.Connector connector)
                 .ConnectorManager?
                 .Connectors;
         }
-
+        if (e is FabricationPart)
+        {
+            return ((FabricationPart) e)?
+                .ConnectorManager?
+                .Connectors;
+        }
         return null;
     }
 
@@ -300,7 +305,7 @@ public static double Radius(Autodesk.Revit.DB.Connector connector)
     public static List<Autodesk.Revit.DB.Connector?> GetUsedConnectors(Revit.Elements.Element? element)
     {
         if (element == null) throw new ArgumentNullException(nameof(element));
-        if (GetConnectors(element).Any()) return new List<Autodesk.Revit.DB.Connector?>();
+        if (!GetConnectors(element).Any()) return new List<Autodesk.Revit.DB.Connector?>();
         return GetConnectors(element).Where(x => x!.IsConnected).ToList();
     }
 
@@ -883,4 +888,60 @@ public static Autodesk.Revit.DB.Connector ConnectTo(Autodesk.Revit.DB.Connector
         CoordinateSystem coordinateSystem = Autodesk.DesignScript.Geometry.CoordinateSystem.ByOriginVectors(point, X, Y, Z);
         return OpenMEPSandbox.Geometry.CoordinateSystem.Display(coordinateSystem,length);
     }
+
+    /// <summary>
+    /// Identifies if the connector is connected to the specified connector.
+    /// </summary>
+    /// <param name="connector">the connector to check</param>
+    /// <param name="connectorOther">the second connector to identifies</param>
+    /// <returns name="bool">true if connector is connected to other</returns>
+    public static bool IsConnectedTo(Autodesk.Revit.DB.Connector connector,Autodesk.Revit.DB.Connector connectorOther)
+    {
+        return connector.IsConnectedTo(connectorOther);
+    }
+
+    // /// <summary>Gets fabrication connectivity information.</summary>
+    // /// <para name="connector">the connector</para>
+    // /// <since>2016</since>
+    // [MultiReturn("BodyConnectorId", "DoubleWallConnectorId", "FabricationIndex", "IsBodyConnectorLocked",
+    //     "IsDoubleWallConnectorLocked", "HasDoubleWallConnector", "IsValid")]
+    // public static Dictionary<string, object?> GetFabricationConnectorInfo(Autodesk.Revit.DB.Connector connector)
+    // {
+    //     if (connector == null) throw new ArgumentException(nameof(connector));
+    //     FabricationConnectorInfo fabricationConnectorInfo = connector.GetFabricationConnectorInfo();
+    //     if (fabricationConnectorInfo == null)
+    //     {
+    //         return new Dictionary<string, object?>
+    //         {
+    //             {"BodyConnectorId", null},
+    //             {"DoubleWallConnectorId", null},
+    //             {"FabricationIndex", null},
+    //             {"IsBodyConnectorLocked", null},
+    //             {"IsDoubleWallConnectorLocked", null},
+    //             {"HasDoubleWallConnector", null},
+    //             {"IsValid", null}
+    //         };
+    //     }
+    //     int? DoubleWallConnectorId = null;
+    //     bool? IsDoubleWallConnectorLocked = null;
+    //     try
+    //     {
+    //         DoubleWallConnectorId = fabricationConnectorInfo.DoubleWallConnectorId;
+    //         IsDoubleWallConnectorLocked = fabricationConnectorInfo.IsDoubleWallConnectorLocked;
+    //     }
+    //     catch (Exception e)
+    //     {
+    //         //TODO: no things
+    //     }
+    //     return new Dictionary<string, object?>
+    //     {
+    //         {"BodyConnectorId", fabricationConnectorInfo.BodyConnectorId},
+    //         {"DoubleWallConnectorId",DoubleWallConnectorId },
+    //         {"FabricationIndex", fabricationConnectorInfo.FabricationIndex},
+    //         {"IsBodyConnectorLocked", fabricationConnectorInfo.IsBodyConnectorLocked},
+    //         {"IsDoubleWallConnectorLocked",IsDoubleWallConnectorLocked },
+    //         {"HasDoubleWallConnector", fabricationConnectorInfo.HasDoubleWallConnector()},
+    //         {"IsValid", fabricationConnectorInfo.IsValid()},
+    //     };
+    // }
 }
diff --git a/OpenMEP/ConnectorManager/ConnectorManager.cs b/OpenMEP/ConnectorManager/ConnectorManager.cs
@@ -14,7 +14,7 @@ private ConnectorManager()
     /// return connector manager of element
     /// </summary>
     /// <param name="element">element</param>
-    /// <returns name="ConnectorManager">ConnectorManager</returns>
+    /// <returns name="ConnectorManager">Autodesk.Revit.DB.ConnectorManager</returns>
     public static Autodesk.Revit.DB.ConnectorManager? GetConnectorManager( Revit.Elements.Element? element)
     {
         Autodesk.Revit.DB.Element? internalElement = element?.InternalElement;
@@ -32,6 +32,10 @@ private ConnectorManager()
         {
             return mepCurve.ConnectorManager;
         }
+        if(internalElement is Autodesk.Revit.DB.FabricationPart fabricationPart)
+        {
+            return fabricationPart.ConnectorManager;
+        }
 
         return null;
     }
@@ -71,15 +75,14 @@ public static Revit.Elements.Element Owner( Autodesk.Revit.DB.ConnectorManager c
     /// </summary>
     /// <param name="connectorManager">connector manager</param>
     /// <returns name="connectors">a collections of connector manager</returns>
-    public static List<Autodesk.Revit.DB.Connector> Connectors( Autodesk.Revit.DB.ConnectorManager? connectorManager)
+    public static List<Autodesk.Revit.DB.Connector?> Connectors( Autodesk.Revit.DB.ConnectorManager? connectorManager)
     {
-        List<Autodesk.Revit.DB.Connector> connectors = new List<Autodesk.Revit.DB.Connector>();
-        ConnectorSet connectorSet = connectorManager.Connectors;
-        foreach (Autodesk.Revit.DB.Connector connector in connectorSet)
+        List<Autodesk.Revit.DB.Connector?> connectors = new List<Autodesk.Revit.DB.Connector?>();
+        ConnectorSet? connectorSet = connectorManager?.Connectors;
+        foreach (Autodesk.Revit.DB.Connector connector in connectorSet!)
         {
             connectors.Add(connector);
         }
-
         return connectors;
     }
 

diff --git a/OpenMEP/Element/Element.cs b/OpenMEP/Element/Element.cs
@@ -2,6 +2,7 @@
 using Autodesk.Revit.DB;
 using Dynamo.Graph.Nodes;
 using OpenMEP.Helpers;
+using Revit.Elements;
 using Revit.GeometryConversion;
 using Point = Autodesk.DesignScript.Geometry.Point;
 
@@ -20,6 +21,7 @@ private Element()
     /// <returns></returns>
     public static Point? LocationCenter(Revit.Elements.Element? element)
     {
+
         if(element == null)
             throw new ArgumentNullException(nameof(element));
         if (element.InternalElement.Location is LocationPoint)

diff --git a/OpenMEP/Element/FabricationPart.cs b/OpenMEP/Element/FabricationPart.cs
@@ -0,0 +1,10 @@
+namespace OpenMEP.Element;
+
+public class FabricationPart
+{
+    private FabricationPart()
+    {
+
+    }
+
+}
diff --git a/docs/OpenMEPPage/connectormanager/connector.md b/docs/OpenMEPPage/connectormanager/connector.md
@@ -587,4 +587,4 @@
 /// <returns name="ZXPlane">Plane(Blue-Red color)</returns>
 ```
 
-![](dyn/pic/Connector.Display.png)
+![](dyn/pic/Connector.Display.gif)