Merge branch 'dev'

OpenMEP.sln

@@ -11,6 +11,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "SolutionItems", "SolutionIt
 		CHANGELOG.md = CHANGELOG.md
 		docs\OpenMEP_DynamoCustomization.xml = docs\OpenMEP_DynamoCustomization.xml
 		docs\OpenMEPSandbox_DynamoCustomization.xml = docs\OpenMEPSandbox_DynamoCustomization.xml
+		docs\sandbox\pkg.json = docs\sandbox\pkg.json
 	EndProjectSection
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DeployInstaller", "DeployInstaller\DeployInstaller.csproj", "{C7835EFE-E1C7-48B2-90D0-E943D43A905D}"
@@ -28,6 +29,7 @@ Global
 								Debug R22|Any CPU = Debug R22|Any CPU
 								Debug R23|Any CPU = Debug R23|Any CPU
 								Debug R23.1|Any CPU = Debug R23.1|Any CPU
+								Debug R24|Any CPU = Debug R24|Any CPU
 								Release R20|Any CPU = Release R20|Any CPU
 								Release R21|Any CPU = Release R21|Any CPU
 								Release R22|Any CPU = Release R22|Any CPU
@@ -56,6 +58,8 @@ Global
 		{A7FE0286-8CEA-4C63-9603-22D79E98EAB1}.Debug R23.1|Any CPU.Build.0 = Debug R23.1|Any CPU
 		{A7FE0286-8CEA-4C63-9603-22D79E98EAB1}.Release R23.1|Any CPU.ActiveCfg = Release R23.1|Any CPU
 		{A7FE0286-8CEA-4C63-9603-22D79E98EAB1}.Release R23.1|Any CPU.Build.0 = Release R23.1|Any CPU
+		{A7FE0286-8CEA-4C63-9603-22D79E98EAB1}.Debug R24|Any CPU.ActiveCfg = Debug R24|Any CPU
+		{A7FE0286-8CEA-4C63-9603-22D79E98EAB1}.Debug R24|Any CPU.Build.0 = Debug R24|Any CPU
 		{C7835EFE-E1C7-48B2-90D0-E943D43A905D}.Debug R21|Any CPU.ActiveCfg = Debug|Any CPU
 		{C7835EFE-E1C7-48B2-90D0-E943D43A905D}.Debug R22|Any CPU.ActiveCfg = Debug|Any CPU
 		{C7835EFE-E1C7-48B2-90D0-E943D43A905D}.Debug R23|Any CPU.ActiveCfg = Debug|Any CPU
@@ -110,5 +114,7 @@ Global
 		{5FDD66F2-49B5-4896-B6FB-79B1CC457904}.Release R23|Any CPU.Build.0 = Release R23|Any CPU
 		{5FDD66F2-49B5-4896-B6FB-79B1CC457904}.Release R23.1|Any CPU.ActiveCfg = Release R23.1|Any CPU
 		{5FDD66F2-49B5-4896-B6FB-79B1CC457904}.Release R23.1|Any CPU.Build.0 = Release R23.1|Any CPU
+		{5FDD66F2-49B5-4896-B6FB-79B1CC457904}.Debug R24|Any CPU.ActiveCfg = Debug R24|Any CPU
+		{5FDD66F2-49B5-4896-B6FB-79B1CC457904}.Debug R24|Any CPU.Build.0 = Debug R24|Any CPU
 	EndGlobalSection
 EndGlobal

OpenMEP/Element/Family/FamilyParameter.cs

@@ -89,10 +89,11 @@ public static void MakeType(Autodesk.Revit.DB.Document doc, Autodesk.Revit.DB.Fa
     /// <returns name="forgeTypeId">forgeTypeId</returns>
     public static dynamic GetUnitTypeId(Autodesk.Revit.DB.FamilyParameter familyParameter)
     {
-#if R22 || R23
-            dynamic? displayUnitType = familyParameter.GetUnitTypeId();
-#elif R21 || R20
+#if R20 || R21
         dynamic? displayUnitType = familyParameter.DisplayUnitType;
+
+#else
+        dynamic? displayUnitType = familyParameter.GetUnitTypeId();
 #endif
         return displayUnitType;
     }

OpenMEP/OpenMEP.csproj

@@ -12,7 +12,7 @@
         <AssemblyName>OpenMEP</AssemblyName>
         <PlatformTarget>x64</PlatformTarget>
         <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
-        <Configurations>Debug R20;Debug R21;Debug R22;Debug R23;Debug R23.1</Configurations>
+        <Configurations>Debug R20;Debug R21;Debug R22;Debug R23;Debug R23.1;Debug R24</Configurations>
         <Configurations>$(Configurations);Release R20;Release R21;Release R22;Release R23;Release R23.1</Configurations>
         <NoWarn>CS1591;CS0168;CS8618;CS1591;CS0419;MSB3277</NoWarn>
     </PropertyGroup>
@@ -86,6 +86,12 @@
         <RevitVersion>2023</RevitVersion>
         <DefineConstants>$(DefineConstants);R23</DefineConstants>
     </PropertyGroup>
+    <PropertyGroup Condition="$(Configuration.Contains('Debug R24'))">
+        <DynamoVersion>2.16</DynamoVersion>
+        <DynamoOutput>2.16</DynamoOutput>
+        <RevitVersion>2024</RevitVersion>
+        <DefineConstants>$(DefineConstants);R24</DefineConstants>
+    </PropertyGroup>
     <PropertyGroup>
         <DynVersion>$(DynamoVersion)</DynVersion>
         <BuildOutput>$(DynamoOutput)</BuildOutput>

OpenMEPSandbox/Geometry/Point.cs

@@ -97,13 +97,13 @@ public static bool IsOnPlane(Autodesk.DesignScript.Geometry.Point point, Autodes
         };
     }
 
-
-    //TODO : Got some bug from G-Shark Library
+    //
+    // //TODO : Got some bug from G-Shark Library
     // /// <summary>
     // /// Tests whether a point is inside, outside, or coincident with a polygon.
     // /// </summary>
     // /// <returns name="double">Returns -1 if point is outside the polygon, 0 if it is coincident with a polygon edge, or 1 if it is inside the polygon.</returns>
-    // public static double IsInPolygon(Autodesk.DesignScript.Geometry.Point point,Autodesk.DesignScript.Geometry.Polygon polygon)
+    // public static double IsInPolygon2(Autodesk.DesignScript.Geometry.Point point,Autodesk.DesignScript.Geometry.Polygon polygon)
     // {
     //     if (point == null) throw new ArgumentNullException(nameof(point));
     //     if (polygon == null) throw new ArgumentNullException(nameof(polygon));
@@ -115,7 +115,7 @@ public static bool IsOnPlane(Autodesk.DesignScript.Geometry.Point point, Autodes
     /// </summary>
     /// <param name="point">the point</param>
     /// <param name="polygon">the polygon</param>
-    /// <returns></returns>
+    /// <returns name="bool">true if point is in polygon</returns>
     /// <exception cref="ArgumentNullException"></exception>
     [NodeCategory("Query")]
     public static bool IsInPolygon(Autodesk.DesignScript.Geometry.Point point,
@@ -125,4 +125,26 @@ public static bool IsInPolygon(Autodesk.DesignScript.Geometry.Point point,
         if (polygon == null) throw new ArgumentNullException(nameof(polygon));
         return polygon.ContainmentTest(point);
     }
+
+    /// <summary>
+    ///     Gets a point with X,Y,Z = 0
+    /// </summary>
+    /// <returns name="point">point</returns>
+    public static Autodesk.DesignScript.Geometry.Point Origin()
+    {
+        return Autodesk.DesignScript.Geometry.Point.ByCoordinates(0,0,0);
+    }
+
+    /// <summary>
+    /// Offset a point by a distance and a direction
+    /// </summary>
+    /// <param name="point">point to offset</param>
+    /// <param name="distance">distance from start point to end point</param>
+    /// <param name="direction">direction to direct to</param>
+    /// <returns name="point">new point</returns>
+    public static Autodesk.DesignScript.Geometry.Point Offset(Autodesk.DesignScript.Geometry.Point point,double distance, Autodesk.DesignScript.Geometry.Vector direction)
+    {
+        return point.Add(direction.ToGSharkType().Amplify(distance).ToDynamoType());
+    }
+
 }

OpenMEPSandbox/OpenMEPSandbox.csproj

@@ -10,7 +10,7 @@
         <RootNamespace>OpenMEPSandbox</RootNamespace>
         <PlatformTarget>x64</PlatformTarget>
         <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
-        <Configurations>Debug R20;Debug R21;Debug R22;Debug R23;Debug R23.1</Configurations>
+        <Configurations>Debug R20;Debug R21;Debug R22;Debug R23;Debug R23.1;Debug R24</Configurations>
         <Configurations>$(Configurations);Release R20;Release R21;Release R22;Release R23;Release R23.1</Configurations>
         <NoWarn>CS1591;CS0168;CS8618;CS1591;CS0419;NU1701</NoWarn>
         <Platforms>AnyCPU</Platforms>
@@ -85,6 +85,12 @@
         <RevitVersion>2023</RevitVersion>
         <DefineConstants>$(DefineConstants);R23</DefineConstants>
     </PropertyGroup>
+    <PropertyGroup Condition="$(Configuration.Contains('Debug R24'))">
+        <DynamoVersion>2.16</DynamoVersion>
+        <DynamoOutput>2.18</DynamoOutput>
+        <RevitVersion>2023</RevitVersion>
+        <DefineConstants>$(DefineConstants);R23</DefineConstants>
+    </PropertyGroup>
     <PropertyGroup>
         <DynVersion>$(DynamoVersion)</DynVersion>
         <BuildOutput>$(DynamoOutput)</BuildOutput>
@@ -93,7 +99,7 @@
         <Copyright>MIT</Copyright>
         <PackageReadmeFile>README.md</PackageReadmeFile>
         <PackageTags>dynamo</PackageTags>
-        <FolderPackages>$(Appdata)\Dynamo\Dynamo Core\$(DynVersion)\packages\OpenMEP\</FolderPackages>
+        <FolderPackages>$(Appdata)\Dynamo\Dynamo Core\$(DynamoOutput)\packages\OpenMEP\</FolderPackages>
         <GenerateDocumentationFile>True</GenerateDocumentationFile>
     </PropertyGroup>
     <ItemGroup>
@@ -105,7 +111,7 @@
     <Target Name="CopyFiles" AfterTargets="CoreBuild">
         <ItemGroup>
             <AssemblyFiles Include="$(TargetDir)*.*" />
-            <PgkDefinition Include="$(SolutionDir)docs\pkg.json" />
+            <PgkDefinition Include="$(SolutionDir)docs\sandbox\pkg.json" />
             <XmlCustomization Include="$(SolutionDir)docs\*.xml" />
             <ExtralFiles Include="$(SolutionDir)docs\extra\*.*" />
             <DyfFiles Include="$(SolutionDir)docs\dyf\*.*" />

docs/OpenMEPPage/_toc.yml

@@ -9,13 +9,13 @@ options:
   numbered: True
 parts:
 - caption: Getting Started
-  maxdepth: 2
+  maxdepth: 3
   chapters:
   - file: tutorial/installation
   - file : tutorial/uninstall
   - file: tutorial/upgrade
 - caption: Tutorial
-  maxdepth: 2  # The displayed Table of Contents will only have two levels
+  maxdepth: 3  # The displayed Table of Contents will only have two levels
   chapters:
   - file: application/application
     sections:
@@ -40,8 +40,10 @@ parts:
       - file: element/family/familysizemanager
       - file: element/family/familytype
     - file: element/cabletray
+    - file: element/familyinstance
     - file: element/conduit
     - file: element/duct
+    - file: element/insulation
     - file: element/fitting
     - file: element/mepcurve
     - file: element/pipe
@@ -57,5 +59,5 @@ parts:
 - caption: Advanced
   maxdepth: 3
   chapters:
-  - file: createcustomnode
-  - file : python
+  - file: advanced/createcustomnode
+  - file : advanced/python

docs/OpenMEPPage/advanced/python.md

@@ -0,0 +1,43 @@
+# Python Script use OpenMEP
+
+OpenMEP allow us to use Python to create MEP elements. This is a very powerful feature that allows us to create MEP elements in a very flexible way. In this section, we will learn how to use Python to create MEP elements.
+## Getting Started with OpenMEP
+
+To get started with **OpenMEP**, we need to install OpenMEP package. OpenMEP package is available at [Latest Release](https://github.com/chuongmep/OpenMEP/releases/latest), and then let follow the instruction to install OpenMEP package at [How to install OpenMEP package](https://chuongmep.github.io/OpenMEP/tutorial/installation.html).
+
+
+Now, when we open Dynamo Revit, we can see **OpenMEP** package in the library, let start with the first example. We will try 
+
+```py
+# Load the Python Standard and DesignScript Libraries
+import sys
+import clr
+clr.AddReference('OpenMEP')
+import OpenMEP
+from OpenMEP.Element import Duct as d
+
+OUT =dir(d)
+```
+
+![](pic/ImportLibrary.png)
+
+Now, let try to create a **Pipe** with Python use **OpenMEP** package.
+
+```py
+
+# Load the Python Standard and DesignScript Libraries
+import sys
+import clr
+clr.AddReference('OpenMEP')
+import OpenMEP
+from OpenMEP.Element import Pipe as p
+systemType = IN[0]
+pipeType = IN[1]
+level = IN[2]
+line = IN[3]
+OUT = p.Create(systemType,pipeType,level,line)
+```
+
+![Create Pipe](pic/CreatePipe.png)
+
+

docs/OpenMEPPage/connectormanager/connectormanager.md

@@ -5,6 +5,9 @@
 
 ![](dyn/pic/ConnectorManager.png)
 
+```{contents}
+```
+
 ## GetConnectorManager
 
 ![](dyn/pic/ConnectorManager.GetConnectorManager.jpg)

docs/OpenMEPPage/document/document.md

@@ -2,3 +2,10 @@
 
 ```{tableofcontents}
 ```
+
+```{contents}
+```
+
+## Current
+
+

docs/OpenMEPPage/document/familydocument.md

@@ -1 +1,6 @@
-# Family Document
+# Family Document
+
+```{contents}
+```
+
+## FamilyManager

docs/OpenMEPPage/element/cabletray.md

@@ -1,2 +1,13 @@
 # Cable Tray
 
+```{contents}
+```
+## Create
+
+### Create By Two Point
+
+### Create By Two Connector
+
+### Create By Line
+
+

docs/OpenMEPPage/element/conduit.md

@@ -1 +1,9 @@
-# Conduit
+# Conduit
+
+## Create
+
+### Create By Two Point 
+
+### Create By Two Connector 
+
+### Create By Line 

docs/OpenMEPPage/element/duct.md

@@ -1 +1,32 @@
-# Duct
+# Duct
+
+```{contents}
+```
+
+## Create
+
+### Create By Two Point
+
+### Create By Two Connector
+
+### Create By Line
+
+### Create By Connector And End Point
+
+## CreatePlaceholder
+
+## SetDiameter
+
+### Rectangular
+
+### Round
+
+## GetDiameter
+
+## SetSystemType
+
+## Shape
+
+## IsHvacSystemTypeId
+
+## IsDuctTypeId

docs/OpenMEPPage/element/element.md

@@ -1,4 +1,12 @@
 # Element
 
 ```{tableofcontents}
-```
+```
+
+```{contents}
+```
+
+## LocationCenter
+
+## GetDocument
+

docs/OpenMEPPage/element/family/family.md

@@ -1 +1,13 @@
-# Family
+# Family
+
+```{tableofcontents}
+```
+
+```{contents}
+```
+
+## EditFamily
+
+## FamilyCategory
+
+## IsOwnerFamily

docs/OpenMEPPage/element/family/familymanager.md

@@ -1 +1,19 @@
-# Family Manager
+# Family Manager
+
+```{contents}
+```
+
+## Set
+
+## CurrentType
+
+## TypeExits
+
+## NewType
+
+## GetParameters
+
+## Types
+
+## GetParameter
+