maintain new api R24

chuongmep · Aug 23, 2023 · d4da6c5 · d4da6c5
1 parent 58fb71e
commit d4da6c5
Show file tree

Hide file tree

Showing 11 changed files with 72 additions and 4 deletions.
diff --git a/OpenMEPRevit/Application/Database.cs b/OpenMEPRevit/Application/Database.cs
@@ -52,7 +52,13 @@ public static string SnoopElementById(List<string> id)
         List<global::Revit.Elements.Element> elements = new List<global::Revit.Elements.Element>();
         foreach (string s in id)
         {
+#if R20 || R21 || R22 || R23
             ElementId elementId = new ElementId(int.Parse(s));
+
+#else
+            ElementId elementId = new ElementId(long.Parse(s));
+
+#endif
             global::Revit.Elements.Element element = document.GetElement(elementId).ToDynamoType();
             elements.Add(element);
         }

diff --git a/OpenMEPRevit/Element/Element.cs b/OpenMEPRevit/Element/Element.cs
@@ -268,8 +268,13 @@ private Element()
             {
                 levelId = levelPara.AsElementId();
             }
-
+#if R20 || R21 || R22 || R23
             if (levelId.IntegerValue == -1)
+
+#else
+            if (levelId.Value == -1)
+
+#endif
             {
                 // General get level method
                 var bbox = element.get_BoundingBox(null);

diff --git a/OpenMEPRevit/Element/Family/FamilyParameter.cs b/OpenMEPRevit/Element/Family/FamilyParameter.cs
@@ -122,7 +122,12 @@ public static Autodesk.Revit.DB.Definition Definition(Autodesk.Revit.DB.FamilyPa
     {
         Definition? definition = familyParameter?.Definition;
         string? formula = familyParameter?.Formula;
+#if R20 || R21 || R22 || R23
         int? id = familyParameter?.Id.IntegerValue;
+#else
+        long? id = familyParameter?.Id.Value;
+
+#endif
         ParameterSet? parameterSet = familyParameter?.AssociatedParameters;
         List<global::Revit.Elements.Parameter?> associatedParameters = new List<global::Revit.Elements.Parameter?>();
         bool? isInstance = familyParameter?.IsInstance;

diff --git a/OpenMEPRevit/Element/MEPCurve.cs b/OpenMEPRevit/Element/MEPCurve.cs
@@ -137,7 +137,11 @@ private static void AdjustMepCurve(Autodesk.Revit.DB.Element mepCurve, XYZ p1, X
             {
                 Connector? current = enumerator.Current as Autodesk.Revit.DB.Connector;
                 if (current == null) continue;
+#if R20 || R21 || R22 || R23
                 if (current.Owner.Id.IntegerValue == mepCurve1.Id) continue;
+#else
+                if (current.Owner.Id.Value == mepCurve1.Id) continue;
+#endif
                 if (current.Owner is Autodesk.Revit.DB.Plumbing.PipingSystem) continue;
                 global::Revit.Elements.Element? dynamoType = current.Owner.ToDynamoType();
                 return dynamoType;

diff --git a/OpenMEPRevit/Element/Pipe.cs b/OpenMEPRevit/Element/Pipe.cs
@@ -803,7 +803,13 @@ public static double GetRoughness(global::Revit.Elements.Element pipe)
         Autodesk.Revit.DB.Plumbing.Pipe? pipeInternalElement = pipe.InternalElement as Autodesk.Revit.DB.Plumbing.Pipe;
         Autodesk.Revit.DB.Document doc = DocumentManager.Instance.CurrentDBDocument;
         TransactionManager.Instance.EnsureInTransaction(doc);
+#if R20 || R21 || R22 || R23
         pipeInternalElement?.SetSystemType(new ElementId(systemTypeId));
+
+#else
+        pipeInternalElement?.SetSystemType(new ElementId((long)systemTypeId));
+
+#endif
         TransactionManager.Instance.TransactionTaskDone();
         return pipe;
     }

diff --git a/OpenMEPRevit/Helpers/Convert.cs b/OpenMEPRevit/Helpers/Convert.cs
@@ -69,7 +69,13 @@ internal static class Convert
         internal static dynCategory? ToDynamoType(this rvtCategory item)
         {
             if (item == null) throw new ArgumentNullException(nameof(item));
+#if R20 || R21 || R22 || R23
             return dynCategory.ById(item.Id.IntegerValue);
+
+#else
+            return dynCategory.ById(item.Id.Value);
+
+#endif
         }
 
         /// <summary>
@@ -175,7 +181,12 @@ internal static rvtCategory ToRevitType(
         internal static dynElement ToDynamoType(this ElementId item)
         {
             if (item == null) throw new ArgumentNullException(nameof(item));
+#if R20 || R21 || R22 || R23
             return dynElementSelector.ByElementId(item.IntegerValue);
+#else
+            return dynElementSelector.ByElementId(item.Value);
+
+#endif
         }
 
         /// <summary>

diff --git a/OpenMEPRevit/OpenMEPRevit.csproj b/OpenMEPRevit/OpenMEPRevit.csproj
@@ -93,7 +93,7 @@
         <DefineConstants>$(DefineConstants);R24</DefineConstants>
     </PropertyGroup>
     <PropertyGroup Condition="$(Configuration.Contains('Release R24'))">
-        <DynamoVersion>2.16</DynamoVersion>
+        <DynamoVersion>2.17</DynamoVersion>
         <DynamoOutput>2.17</DynamoOutput>
         <RevitVersion>2024</RevitVersion>
         <DefineConstants>$(DefineConstants);R24</DefineConstants>

diff --git a/OpenMEPRevit/Parameter/Parameter.cs b/OpenMEPRevit/Parameter/Parameter.cs
@@ -85,7 +85,12 @@ private Parameter()
         var SpecType = parameter.SpecType;
         string StorageType = parameter.StorageType;
         var UnitType = parameter.Unit;
+#if R20 || R21 || R22 || R23
         int Id = parameter.Id;
+#else
+        long Id = parameter.Id;
+
+#endif
         object Value = parameter.Value;
         bool IsReadOnly = parameter.IsReadOnly;
         bool HasValue = parameter.HasValue;
@@ -169,7 +174,13 @@ private Parameter()
         if (parameter == null) throw new ArgumentNullException(nameof(parameter));
         if (elementid == null) throw new ArgumentNullException(nameof(elementid));
         Autodesk.Revit.DB.Parameter? revitParameter = parameter?.ToRevitType();
+#if R20 || R21 || R22 || R23
         bool? flag = revitParameter?.CanBeAssociatedWithGlobalParameter(new ElementId((int) elementid));
+
+#else
+        bool? flag = revitParameter?.CanBeAssociatedWithGlobalParameter(new ElementId((long)elementid));
+
+#endif
         return flag;
     }
 

diff --git a/OpenMEPRevit/Parameter/SharedParameter.cs b/OpenMEPRevit/Parameter/SharedParameter.cs
@@ -55,9 +55,16 @@ FilteredElementCollector collector
         #else
         string? versionGuid = sharedParameterElement?.VersionGuid.ToString();
 #endif
+#if R20 || R21 || R22 || R23
         int? groupId = sharedParameterElement?.GroupId.IntegerValue;
-        string? name = sharedParameterElement?.Name;
         int? id = sharedParameterElement?.Id?.IntegerValue;
+
+#else
+        long? groupId = sharedParameterElement?.GroupId.Value;
+        long? id = sharedParameterElement?.Id?.Value;
+
+#endif
+        string? name = sharedParameterElement?.Name;
         string? uniqueId = sharedParameterElement?.UniqueId;
         bool? pinned = sharedParameterElement?.Pinned;
         bool? shouldHideWhenNoValue = sharedParameterElement?.ShouldHideWhenNoValue();

diff --git a/OpenMEPRevit/Utils/FamilyUtils.cs b/OpenMEPRevit/Utils/FamilyUtils.cs
@@ -30,7 +30,13 @@ public static void ConvertFamilyToFaceHostBased(Autodesk.Revit.DB.Document doc,i
     {
         using Transaction tran = new Autodesk.Revit.DB.Transaction (doc, "convert");
         tran.Start();
+#if R20 || R21 || R22 || R23
         Autodesk.Revit.DB.FamilyUtils.ConvertFamilyToFaceHostBased(doc,new ElementId(familyId));
+
+#else
+        Autodesk.Revit.DB.FamilyUtils.ConvertFamilyToFaceHostBased(doc, new ElementId((long)familyId));
+
+#endif
         tran.Commit();
     }
 
@@ -50,7 +56,13 @@ public static bool FamilyCanConvertToFaceHostBased(Autodesk.Revit.DB.Document do
     {
         using Transaction tran = new Autodesk.Revit.DB.Transaction (doc, "convert");
         tran.Start();
+#if R20 || R21 || R22 || R23
         bool result = Autodesk.Revit.DB.FamilyUtils.FamilyCanConvertToFaceHostBased(doc,new ElementId(familyId));
+
+#else
+        bool result = Autodesk.Revit.DB.FamilyUtils.FamilyCanConvertToFaceHostBased(doc, new ElementId((long)familyId));
+
+#endif
         tran.Commit();
         return result;
     }

diff --git a/OpenMEPViewExtension/OpenMEPViewExtension.cs b/OpenMEPViewExtension/OpenMEPViewExtension.cs
@@ -63,7 +63,8 @@ public void Loaded(ViewLoadedParams viewLoadedParams)
             // string direction = Regex.Replace(NodeEndPoint, pattern2, "_");
             //MessageBox.Show(direction);
             // Open a new window
-            string url = $"https://chuongmep.github.io/OpenMEP";///api/{MainNameSpace}.html#{direction}";
+            string url = $"https://chuongmep.github.io/OpenMEP";
+            //api/{MainNameSpace}.html#{direction}";
             Process.Start(url);
         };
 #if R20 || R21