Merge pull request #827 from Autodesk/babio/25_4

IFC 25.4 for Revit 2025
Autodesk · Dec 4, 2024 · 29da6b1 · 29da6b1
2 parents 21dbdf6 + d06e3d3
commit 29da6b1
Show file tree

Hide file tree

Showing 43 changed files with 688 additions and 262 deletions.
diff --git a/Install/Program Files to Install/Autodesk.SteelConnections.ASIFC.dll b/Install/Program Files to Install/Autodesk.SteelConnections.ASIFC.dll
diff --git a/Install/Program Files to Install/bundle/Contents/Resources/ADSKIFCExporterHelp.htm b/Install/Program Files to Install/bundle/Contents/Resources/ADSKIFCExporterHelp.htm
@@ -236,6 +236,33 @@ <h3>Support Information</h3>
 <p>or if you have an inquiry specific to this add-in, send us an e-mail to: <a href="mailto:Revit.apps@autodesk.com">Revit.apps@autodesk.com</a></p>
 <h2 id="VersionHistory" name="VersionHistory">Version History</h2>
 
+<div class="version">25.4.0.27</div><div class="versioninfo-bullet">
+      <br><p>
+         General:
+			<ul>
+				<li>This is the major release of IFC Exporter 25.4 for Revit 2025. 
+				<li>It contains a various improvements and bug fixes for the previous 25.2 version. 
+			</ul>	
+       </p>
+	   <br>
+	   <p>
+         Improvements:
+			<ul>
+				<li>Added option that allows to export ceiling grids.
+				<li>Implemented the ability to add type properties to instance properties for user-defined property sets.
+			</ul>
+		</p>
+		<br>
+		<p>
+         Bug Fixes:
+			<ul>
+				<li>Restored the functionality of the IFC Export As parameter when using the IFC Exporter version lower than Revit.
+			</ul>
+		</p>
+		<br>
+	</div>
+	<br>
+
 <div class="version">25.2.0.5</div><div class="versioninfo-bullet">
       <br><p>
          General:

diff --git a/Install/Program Files to Install/bundle/PackageContents.xml b/Install/Program Files to Install/bundle/PackageContents.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
-<ApplicationPackage SchemaVersion="1.0" AutodeskProduct="Revit" ProductType="Application" Name="IFC Exporter for Revit" AppVersion="25.2.0.5" Description="This application seamlessly replaces the built-in IFC export capabilities of Revit 2025. " Author="Autodesk" Icon=".\Contents\Resources\IFCExporter.png" AppNameSpace="appstore.exchange.autodesk.com" OnlineDocumentation="http://www.autodesk.com" HelpFile=".\Contents\Resources\ADSKIFCExporterHelp.htm" ProductCode="{F1A1177D-4CE7-4AAA-B4E6-EC318112D7B4}" UpgradeCode="{1A9C2C21-24B8-42D2-0000-992E73C11B3F}" SupportedLocales="Enu">
+<ApplicationPackage SchemaVersion="1.0" AutodeskProduct="Revit" ProductType="Application" Name="IFC Exporter for Revit" AppVersion="25.4.0.27" Description="This application seamlessly replaces the built-in IFC export capabilities of Revit 2025. " Author="Autodesk" Icon=".\Contents\Resources\IFCExporter.png" AppNameSpace="appstore.exchange.autodesk.com" OnlineDocumentation="http://www.autodesk.com" HelpFile=".\Contents\Resources\ADSKIFCExporterHelp.htm" ProductCode="{F1A1177D-4CE7-4AAA-B4E6-EC318112D7B4}" UpgradeCode="{1A9C2C21-24B8-42D2-0000-992E73C11B3F}" SupportedLocales="Enu">
   <CompanyDetails Name="Autodesk, Inc." Phone=" " Url="http://www.autodesk.com" Email="Revit.apps@autodesk.com" />
   <RuntimeRequirements OS="Win64" Platform="Revit" SeriesMin="R2025" SeriesMax="R2025" />
   <Components Description="2025">
     <RuntimeRequirements OS="Win64" Platform="Revit" SeriesMin="R2025" SeriesMax="R2025" />
-    <ComponentEntry AppName="IFC For Revit 2025" Version="25.2.0" ModuleName="./Contents/2025/IFCExporterUIOverride.addin" AppDescription="IFC For Revit 2025" />
-    <ComponentEntry AppName="IFC For Revit 2025" Version="25.2.0" ModuleName="./Contents/2025/Revit.IFC.addin" AppDescription="IFC For Revit 2025" />
+    <ComponentEntry AppName="IFC For Revit 2025" Version="25.4.0" ModuleName="./Contents/2025/IFCExporterUIOverride.addin" AppDescription="IFC For Revit 2025" />
+    <ComponentEntry AppName="IFC For Revit 2025" Version="25.4.0" ModuleName="./Contents/2025/Revit.IFC.addin" AppDescription="IFC For Revit 2025" />
   </Components>
 </ApplicationPackage>
diff --git a/Install/RevitIFCSetupWix/Product.wxs b/Install/RevitIFCSetupWix/Product.wxs
@@ -2,7 +2,7 @@
 <Wix xmlns="http://schemas.microsoft.com/wix/2006/wi"
      xmlns:util="http://schemas.microsoft.com/wix/UtilExtension">
 
-   <Product Id="1A9C2C21-2520-42D2-0000-992E73C12500" Name="Revit IFC 2025" Language="1033" Version="25.2.0.5" Manufacturer="Autodesk" UpgradeCode="1A9C2C21-25B8-42D2-0000-992E73C11B3F">
+   <Product Id="1A9C2C21-2540-42D2-0000-992E73C12500" Name="Revit IFC 2025" Language="1033" Version="25.4.0.27" Manufacturer="Autodesk" UpgradeCode="1A9C2C21-25B8-42D2-0000-992E73C11B3F">
       <Package InstallerVersion="200" Compressed="yes" InstallScope="perMachine" />
 
       <MajorUpgrade DowngradeErrorMessage="A newer version of [ProductName] is already installed." />

diff --git a/Install/RevitIFCSetupWix/RevitIFCSetupWix.wixproj b/Install/RevitIFCSetupWix/RevitIFCSetupWix.wixproj
@@ -6,7 +6,7 @@
     <ProductVersion>3.8</ProductVersion>
     <ProjectGuid>7dfbd495-c588-4c7b-b8f6-5b793adb06f2</ProjectGuid>
     <SchemaVersion>2.0</SchemaVersion>
-    <OutputName>IFC for Revit 2025.2.0.5</OutputName>
+    <OutputName>IFC for Revit 2025.4.0.27</OutputName>
     <OutputType>Package</OutputType>
     <WixTargetsPath Condition=" '$(WixTargetsPath)' == '' AND '$(MSBuildExtensionsPath32)' != '' ">$(MSBuildExtensionsPath32)\Microsoft\WiX\v3.x\Wix.targets</WixTargetsPath>
     <WixTargetsPath Condition=" '$(WixTargetsPath)' == '' ">$(MSBuildExtensionsPath)\Microsoft\WiX\v3.x\Wix.targets</WixTargetsPath>

diff --git a/Install/RevitIFCSetupWix/buildInstaller.bat b/Install/RevitIFCSetupWix/buildInstaller.bat
@@ -11,9 +11,9 @@ rem It is necessary to add the Wix bin directory to the system path temporarily
 SET PATH=%PATH%;%WixRoot%
 
 candle.exe -dProjectDir=%2 -ext WixUtilExtension %2Product.wxs 
-light.exe -ext WixUtilExtension -out RevitIFC2025.2.0.msi product.wixobj -ext WixUIExtension
+light.exe -ext WixUtilExtension -out RevitIFC2025.4.0.msi product.wixobj -ext WixUIExtension
 
-copy RevitIFC2025.2.0.msi %1..\Releasex64
-del RevitIFC2025.2.0.msi
+copy RevitIFC2025.4.0.msi %1..\Releasex64
+del RevitIFC2025.4.0.msi
 
-echo %1..\Releasex64\RevitIFC2025.2.0.msi
+echo %1..\Releasex64\RevitIFC2025.4.0.msi
diff --git a/Source/IFCExporterUIOverride/IFCExportConfiguration.cs b/Source/IFCExporterUIOverride/IFCExportConfiguration.cs
@@ -209,6 +209,11 @@ public Enum FacilityPredefinedType
       /// </summary>
       public bool ExportBaseQuantities { get; set; } = false;
 
+      /// <summary>
+      /// Whether or not to include ceilings grids for ceilings in the export data. 
+      /// </summary>
+      public bool ExportCeilingGrids { get; set; } = false;
+
       /// <summary>
       /// True to include the material property sets. 
       /// False to exclude them.
@@ -237,6 +242,11 @@ public Enum FacilityPredefinedType
       /// </summary>
       public string ExportUserDefinedPsetsFileName { get; set; } = "";
 
+      /// <summary>
+      /// Whether or not to include type property to the user defined property sets. 
+      /// </summary>
+      public bool UseTypePropertiesInInstacePSets { get; set; } = false;
+
       /// <summary>
       /// True if the User decides to use the Parameter Mapping Table
       /// False if the user decides to ignore it
@@ -338,6 +348,12 @@ public Enum FacilityPredefinedType
       /// Use Author field in Project Information to set IfcOwnerHistory LastModified attribute
       /// </summary>
       public bool OwnerHistoryLastModified { get; set; } = false;
+
+      /// <summary>
+      /// Use this field in Project Information to set how will be bars in uniform sets exported in IFC.
+      /// </summary>
+      public bool ExportBarsInUniformSetsAsSeparateIFCEntities { get; set; } = false;
+
       /// <summary>
       /// Value indicating whether the IFC Entity Name will use visible Revit Name
       /// </summary>
@@ -478,6 +494,7 @@ public static IFCExportConfiguration CreateBuiltInConfiguration(IFCVersion ifcVe
                                  bool materialPsets,
                                  bool schedulesAsPSets,
                                  bool userDefinedPSets,
+                                 bool useTypePropertiesInInstacePSets,
                                  bool userDefinedParameterMapping,
                                  bool PlanElems2D,
                                  bool exportBoundingBox,
@@ -487,7 +504,8 @@ public static IFCExportConfiguration CreateBuiltInConfiguration(IFCVersion ifcVe
                                  KnownERNames exchangeRequirement = KnownERNames.NotDefined,
                                  string customName = null,
                                  KnownFacilityTypes facilityType = KnownFacilityTypes.NotDefined,
-                                 Enum facilityPredefinedType = null)
+                                 Enum facilityPredefinedType = null,
+                                 bool exportCeilingGrids = false)
       {
          IFCExportConfiguration configuration = new IFCExportConfiguration();
 
@@ -512,13 +530,15 @@ public static IFCExportConfiguration CreateBuiltInConfiguration(IFCVersion ifcVe
          // Items from Additional Content Tab
          configuration.Export2DElements = PlanElems2D;
          configuration.ExportLinkedFiles = exportLinkedFiles;
+         configuration.ExportCeilingGrids = exportCeilingGrids;
 
          // Items from Property Sets Tab
          configuration.ExportInternalRevitPropertySets = internalSets;
          configuration.ExportBaseQuantities = exportBaseQuantities;
          configuration.ExportMaterialPsets = materialPsets;
          configuration.ExportSchedulesAsPsets = schedulesAsPSets;
          configuration.ExportUserDefinedPsets = userDefinedPSets;
+         configuration.UseTypePropertiesInInstacePSets = useTypePropertiesInInstacePSets;
          configuration.ExportUserDefinedPsetsFileName = System.IO.Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location) + @"\" + configuration.Name + @".txt";
          configuration.ExportUserDefinedParameterMapping = userDefinedParameterMapping;