Merge pull request #663 from Autodesk/babio/24.1.1_Update

24_1_1 Code update
Autodesk · Jul 31, 2023 · 039f48a · 039f48a
2 parents 7cfd66f + ccc7069
commit 039f48a
Show file tree

Hide file tree

Showing 67 changed files with 1,580 additions and 941 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/DefaultUserDefinedParameterSets.txt b/Install/Program Files to Install/DefaultUserDefinedParameterSets.txt
@@ -14,6 +14,10 @@
 #	Pressure, Ratio, Real, Text, ThermalTransmittance, ThermodynamicTemperature, Volume, 
 #	VolumetricFlowRate
 # 
+# Since 24.1.0, type properties are not exported in case they are not specified in the user-defined property sets file.
+#	To export type properties for the IFCElement, for example, 
+#	a user should include "IFCElementType" in the proper .txt file.
+#
 # Example property set definition for COBie:
 #
 #PropertySet:	COBie_Specification	T	IfcElementType

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,34 @@ <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">24.1.1.6</div><div class="versioninfo-bullet">
+      <br><p>
+         General:
+			<ul>
+				<li>This is the minor update of IFC Exporter for Revit 2024. 
+				<li>It contains a various improvements and bug fixes for the basic Revit 2024. 
+			</ul>	
+       </p>
+	   <br>
+	   <p>
+	    Bug Fixes:
+			<ul>
+				<li>The default import processor has been changed to Hybrid
+			</ul>
+		</p>
+		<br>
+		<p>
+         Bug Fixes:
+			<ul>
+				<li>Fixed a bunch of potential bugs related to the compatibility with older Revit versions.
+				<li>Fix sketch-based openings in sloped slabs.
+				<li>Fixed placement of some specific wall sweep elements.
+			</ul>
+		</p>
+		<br>
+	</div>
+	<br>
+
 <div class="version">24.1.0.22</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
@@ -4,7 +4,7 @@
   <RuntimeRequirements OS="Win64" Platform="Revit" SeriesMin="R2024" SeriesMax="R2024" />
   <Components Description="2024">
     <RuntimeRequirements OS="Win64" Platform="Revit" SeriesMin="R2024" SeriesMax="R2024" />
-    <ComponentEntry AppName="IFC For Revit 2024" Version="24.1.0" ModuleName="./Contents/2024/IFCExporterUIOverride.addin" AppDescription="IFC For Revit 2024" />
-    <ComponentEntry AppName="IFC For Revit 2024" Version="24.1.0" ModuleName="./Contents/2024/Revit.IFC.addin" AppDescription="IFC For Revit 2024" />
+    <ComponentEntry AppName="IFC For Revit 2024" Version="24.1.1" ModuleName="./Contents/2024/IFCExporterUIOverride.addin" AppDescription="IFC For Revit 2024" />
+    <ComponentEntry AppName="IFC For Revit 2024" Version="24.1.1" ModuleName="./Contents/2024/Revit.IFC.addin" AppDescription="IFC For Revit 2024" />
   </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-24B8-42D2-0000-992E73C12400" Name="Revit IFC 2024" Language="1033" Version="24.1.0.22" Manufacturer="Autodesk" UpgradeCode="1A9C2C21-24B8-42D2-0000-992E73C11B3F">
+   <Product Id="1A9C2C21-2411-42D2-0000-992E73C12400" Name="Revit IFC 2024" Language="1033" Version="24.1.1.0" Manufacturer="Autodesk" UpgradeCode="1A9C2C21-24B8-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 2024.1.0.22</OutputName>
+    <OutputName>IFC for Revit 2024.1.1.6</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 RevitIFC2024.1.0.msi product.wixobj -ext WixUIExtension
+light.exe -ext WixUtilExtension -out RevitIFC2024.1.1.msi product.wixobj -ext WixUIExtension
 
-copy RevitIFC2024.1.0.msi %1..\Releasex64
-del RevitIFC2024.1.0.msi
+copy RevitIFC2024.1.1.msi %1..\Releasex64
+del RevitIFC2024.1.1.msi
 
-echo %1..\Releasex64\RevitIFC2024.1.0.msi
+echo %1..\Releasex64\RevitIFC2024.1.1.msi
diff --git a/Source/IFCExporterUIOverride/IFCAddressInformationUI.xaml b/Source/IFCExporterUIOverride/IFCAddressInformationUI.xaml
@@ -28,7 +28,7 @@
         </Grid.ColumnDefinitions>
         <Label Content="{x:Static p:Resources.Purpose}" Height="28" HorizontalAlignment="Left" Margin="21,10,0,0" x:Name="labelPurpose" VerticalAlignment="Top" Width="147"/>
         <Label Content="{x:Static p:Resources.UserDefinedPurpose}" Height="28" HorizontalAlignment="Left" Margin="21,43,0,0" x:Name="labelUserDefinedPurpose" VerticalAlignment="Top" Width="195" />
-        <TextBox Text="{Binding UserDefinedPurpose, UpdateSourceTrigger=PropertyChanged}" LostFocus="UserDefinedPurposeTextBox_LostFocus" Height="23" Margin="14,45,10,0" x:Name="UserDefinedPurposeTextBox" VerticalAlignment="Top" VerticalContentAlignment="Center" ToolTip="Entering value here will reset Purpose to &quot;USERDEFINED&quot;" Grid.Column="1"/>
+        <TextBox Text="{Binding UserDefinedPurpose, UpdateSourceTrigger=PropertyChanged}" LostFocus="UserDefinedPurposeTextBox_LostFocus" Height="23" Margin="14,45,10,0" x:Name="UserDefinedPurposeTextBox" VerticalAlignment="Top" VerticalContentAlignment="Center" ToolTip="{x:Static p:Resources.AddressInformationTooltip}" Grid.Column="1"/>
         <Label Content="{x:Static p:Resources.Description}" Height="28" HorizontalAlignment="Left" Margin="21,75,0,0" x:Name="labelDescription" VerticalAlignment="Top" Width="152"/>
         <TextBox Text="{Binding Description, UpdateSourceTrigger=PropertyChanged}" Height="23" HorizontalAlignment="Stretch" Margin="15,80,10,0" x:Name="DescriptionTextBox" VerticalAlignment="Top" VerticalContentAlignment="Center" Grid.Column="1"/>
         <Label Content="{x:Static p:Resources.AddressLine1}" Height="28" HorizontalAlignment="Left" Margin="21,110,0,0" x:Name="labelAddressLine1" VerticalAlignment="Top" Width="152"/>

diff --git a/Source/IFCExporterUIOverride/IFCExporterUIWindow.xaml b/Source/IFCExporterUIOverride/IFCExporterUIWindow.xaml
@@ -81,9 +81,9 @@
                     <CheckBox Content="{x:Static p:Resources.IncludeIfcSiteElevation}" Height="16" HorizontalAlignment="Left" Margin="10,112,0,0" x:Name="checkboxIncludeIfcSiteElevation" VerticalAlignment="Top" Checked="checkboxIfcSiteElevation_Checked" Unchecked="checkboxIfcSiteElevation_Checked" Width="569" Grid.ColumnSpan="2" />
                     <CheckBox Content="{x:Static p:Resources.StoreIFCGUID}" Height="16" HorizontalAlignment="Left" Margin="10,133,0,0" x:Name="checkboxStoreIFCGUID" VerticalAlignment="Top" Checked="checkboxStoreIFCGUID_Checked" Unchecked="checkboxStoreIFCGUID_Checked" Width="569" Grid.ColumnSpan="2"  />
                     <CheckBox Content="{x:Static p:Resources.ExportBoundingBox}" Height="16" HorizontalAlignment="Left" Margin="10,154,0,0" Name="checkboxExportBoundingBox" VerticalAlignment="Top" Checked="checkboxExportBoundingBox_Checked" Unchecked="checkboxExportBoundingBox_Checked" Width="569" Grid.ColumnSpan="2" />
-                    <CheckBox Content="{x:Static p:Resources.UseOnlyTriangulation}" Margin="10,175,0,0" x:Name="checkBox_TriangulationOnly" Checked="checkBox_TriangulationOnly_Checked" Unchecked="checkBox_TriangulationOnly_Unchecked" ToolTip="Use this option if any tessellated geometry should remain as triangulated faces, or if the export performance is affected" HorizontalAlignment="Left" Width="588" Height="15" VerticalAlignment="Top"/>
-                    <CheckBox Content="{x:Static p:Resources.UseTypeNameOnlyForIfcType}" Margin="10,196,0,0" x:Name="checkbox_UseTypeNameOnly" Checked="Checkbox_UseTypeNameOnly_Checked" Unchecked="Checkbox_UseTypeNameOnly_Unchecked" ToolTip="Use this option to export IfcType name to use only Revit type name without the family name" HorizontalAlignment="Left" Width="588" Height="15" VerticalAlignment="Top"/>
-                    <CheckBox Content="{x:Static p:Resources.UseVisibleRevitNameAsEntityName}" Margin="10,217,0,0" x:Name="checkbox_UseVisibleRevitNameAsEntityName" Checked="Checkbox_UseVisibleRevitName_Checked" Unchecked="Checkbox_UseVisibleRevitName_Unchecked" ToolTip="Use this option to export Ifc Entity name to use visible Revit name " Height="19" VerticalAlignment="Top" HorizontalAlignment="Left" Width="588"/>
+                    <CheckBox Content="{x:Static p:Resources.UseOnlyTriangulation}" Margin="10,175,0,0" x:Name="checkBox_TriangulationOnly" Checked="checkBox_TriangulationOnly_Checked" Unchecked="checkBox_TriangulationOnly_Unchecked" ToolTip="{x:Static p:Resources.TriangulationOnlyTooltip}" HorizontalAlignment="Left" Width="588" Height="15" VerticalAlignment="Top"/>
+                    <CheckBox Content="{x:Static p:Resources.UseTypeNameOnlyForIfcType}" Margin="10,196,0,0" x:Name="checkbox_UseTypeNameOnly" Checked="Checkbox_UseTypeNameOnly_Checked" Unchecked="Checkbox_UseTypeNameOnly_Unchecked" ToolTip="{x:Static p:Resources.UseTypeNameOnlyTooltip}" HorizontalAlignment="Left" Width="588" Height="15" VerticalAlignment="Top"/>
+                    <CheckBox Content="{x:Static p:Resources.UseVisibleRevitNameAsEntityName}" Margin="10,217,0,0" x:Name="checkbox_UseVisibleRevitNameAsEntityName" Checked="Checkbox_UseVisibleRevitName_Checked" Unchecked="Checkbox_UseVisibleRevitName_Unchecked" ToolTip="{x:Static p:Resources.UseVisibleRevitNameTooltip}" Height="19" VerticalAlignment="Top" HorizontalAlignment="Left" Width="588"/>
                     <Button x:Name="button_ExcludeElement" Content="{x:Static p:Resources.ExcludeEntitySelection}" Margin="16,0,0,12" Height="23" VerticalAlignment="Bottom" HorizontalAlignment="Left" Padding="5,0,5,0" Click="button_ExcludeElement_Click"/>
                 </Grid>
             </TabItem>

diff --git a/Source/IFCExporterUIOverride/Properties/AssemblyInfo.cs b/Source/IFCExporterUIOverride/Properties/AssemblyInfo.cs
@@ -66,6 +66,6 @@
 // The following information is used in the Open Source version as the release version number.
 // The number will show up in the Title bar of the export dialog as well as at the IFC header file
 // This number must be manually updated prior to releasing the new version
-[assembly: AssemblyVersion("24.1.0.22")]
-[assembly: AssemblyFileVersion("24.1.0.22")]
+[assembly: AssemblyVersion("24.1.1.6")]
+[assembly: AssemblyFileVersion("24.1.1.6")]
 #endif
diff --git a/Source/IFCExporterUIOverride/Properties/Resources.Designer.cs b/Source/IFCExporterUIOverride/Properties/Resources.Designer.cs
diff --git a/Source/IFCExporterUIOverride/Properties/Resources.resx b/Source/IFCExporterUIOverride/Properties/Resources.resx
@@ -959,4 +959,19 @@
   <data name="IFCSG" xml:space="preserve">
     <value>IFC-SG Regulatory Requirements View</value>
   </data>
+  <data name="AddressInformationTooltip" xml:space="preserve">
+    <value>Entering a value here will reset the Purpose field to "USERDEFINED".</value>
+  </data>
+  <data name="ExportHostAsSingleEntityTooltip" xml:space="preserve">
+    <value>If this option is checked, don't create a container for floors and roofs unless exporting parts.</value>
+  </data>
+  <data name="TriangulationOnlyTooltip" xml:space="preserve">
+    <value>Use this option if any tessellated geometry should remain as triangulated faces, or if the export performance is affected.</value>
+  </data>
+  <data name="UseTypeNameOnlyTooltip" xml:space="preserve">
+    <value>Use this option to export the IFC type name as the Revit type name without the family name.</value>
+  </data>
+  <data name="UseVisibleRevitNameTooltip" xml:space="preserve">
+    <value>Use this option to export IFC entity name as the visible Revit name.</value>
+  </data>
 </root>
diff --git a/Source/Revit.IFC.Common/Enums/IFC4x3EntityType.cs b/Source/Revit.IFC.Common/Enums/IFC4x3EntityType.cs
@@ -1,8 +1,3 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-
 namespace Revit.IFC.Common.Enums.IFC4x3
 {
    /// <summary>

diff --git a/Source/Revit.IFC.Common/Enums/IFCEntityType.cs b/Source/Revit.IFC.Common/Enums/IFCEntityType.cs
@@ -1,9 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-
-namespace Revit.IFC.Common.Enums
+namespace Revit.IFC.Common.Enums
 {
    /// <summary>
    /// IFC entity types. Combining IFC2x2_ADD1, IFC2x3_TC1, IFC4 (Add2) and IFC4x entities, which are non-abstract 
@@ -478,7 +473,6 @@ public enum IFCEntityType
       IfcInventory,
       IfcIrregularTimeSeries,
       IfcIrregularTimeSeriesValue,
-      IfcIshapeProfileDef,
       IfcIShapeProfileDef,
       IfcJunctionBox,
       IfcJunctionBoxType,

diff --git a/Source/Revit.IFC.Common/Properties/AssemblyInfo.cs b/Source/Revit.IFC.Common/Properties/AssemblyInfo.cs
@@ -13,8 +13,8 @@
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
 
-[assembly: AssemblyVersion("24.1.0.22")]
-[assembly: AssemblyFileVersion("24.1.0.22")]
+[assembly: AssemblyVersion("24.1.1.6")]
+[assembly: AssemblyFileVersion("24.1.1.6")]
 #endif
 
 

diff --git a/Source/Revit.IFC.Export/Exporter/HostedSweepExporter.cs b/Source/Revit.IFC.Export/Exporter/HostedSweepExporter.cs
@@ -46,7 +46,7 @@ public static void Export(ExporterIFC exporterIFC, HostedSweep hostedSweep, Geom
          if (catId == new ElementId(BuiltInCategory.OST_Gutter))
             ExportGutter(exporterIFC, hostedSweep, geometryElement, productWrapper);
          else
-            ProxyElementExporter.Export(exporterIFC, hostedSweep, geometryElement, productWrapper);
+            GenericElementExporter.ExportElement(exporterIFC, hostedSweep, geometryElement, productWrapper);
       }
 
       /// <summary>

diff --git a/Source/Revit.IFC.Export/Exporter/WallSweepExporter.cs b/Source/Revit.IFC.Export/Exporter/WallSweepExporter.cs
@@ -46,7 +46,7 @@ public static void Export(ExporterIFC exporterIFC, WallSweep wallSweep, Geometry
          if (wallSweepInfo.WallSweepType == WallSweepType.Reveal)
             return;
 
-         if (!ProxyElementExporter.Export(exporterIFC, wallSweep, geometryElement, productWrapper))
+         if (!GenericElementExporter.ExportElement(exporterIFC, wallSweep, geometryElement, productWrapper))
             return;
 
          HostObjectExporter.ExportHostObjectMaterials(exporterIFC, wallSweep, productWrapper.GetAnElement(),

diff --git a/Source/Revit.IFC.Export/Properties/AssemblyInfo.cs b/Source/Revit.IFC.Export/Properties/AssemblyInfo.cs
@@ -14,8 +14,8 @@
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
 
-[assembly: AssemblyVersion("24.1.0.22")]
-[assembly: AssemblyFileVersion("24.1.0.22")]
+[assembly: AssemblyVersion("24.1.1.6")]
+[assembly: AssemblyFileVersion("24.1.1.6")]
 
 #endif