Skip to content

Commit 1781786

Browse files
o-babiio-babii
authored
Merge pull request #835 from Autodesk/babio/24_3_2_update
IFC 24.3.20 update
2 parents 72084d7 + 3c53104 commit 1781786

27 files changed

+138
-49
lines changed

‎Install/Program Files to Install/Autodesk.SteelConnections.ASIFC.dll

-8 Bytes
Binary file not shown.

‎Install/Program Files to Install/bundle/Contents/Resources/ADSKIFCExporterHelp.htm

+20
Original file line numberDiff line numberDiff line change
@@ -236,6 +236,26 @@ <h3>Support Information</h3>
236236
<p>or if you have an inquiry specific to this add-in, send us an e-mail to: <a href="mailto:[email protected]">[email protected]</a></p>
237237
<h2 id="VersionHistory" name="VersionHistory">Version History</h2>
238238

239+
<div class="version">24.3.20.0</div><div class="versioninfo-bullet">
240+
<br><p>
241+
General:
242+
<ul>
243+
<li>This is the minor update of IFC Exporter for Revit 2024.
244+
</ul>
245+
</p>
246+
<br>
247+
<p>
248+
Improvements:
249+
<ul>
250+
<li>Fixed an unexpected export error using RCE.
251+
<li>Implemented an option that allows to export type properties along with instance properties.
252+
<li>Newtonsoft.Json version updated.
253+
</ul>
254+
</p>
255+
<br>
256+
</div>
257+
<br>
258+
239259
<div class="version">24.2.20.0</div><div class="versioninfo-bullet">
240260
<br><p>
241261
General:

‎Install/Program Files to Install/bundle/PackageContents.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<RuntimeRequirements OS="Win64" Platform="Revit" SeriesMin="R2024" SeriesMax="R2024" />
55
<Components Description="2024">
66
<RuntimeRequirements OS="Win64" Platform="Revit" SeriesMin="R2024" SeriesMax="R2024" />
7-
<ComponentEntry AppName="IFC For Revit 2024" Version="24.2.20" ModuleName="./Contents/2024/IFCExporterUIOverride.addin" AppDescription="IFC For Revit 2024" />
8-
<ComponentEntry AppName="IFC For Revit 2024" Version="24.2.20" ModuleName="./Contents/2024/Revit.IFC.addin" AppDescription="IFC For Revit 2024" />
7+
<ComponentEntry AppName="IFC For Revit 2024" Version="24.3.20" ModuleName="./Contents/2024/IFCExporterUIOverride.addin" AppDescription="IFC For Revit 2024" />
8+
<ComponentEntry AppName="IFC For Revit 2024" Version="24.3.20" ModuleName="./Contents/2024/Revit.IFC.addin" AppDescription="IFC For Revit 2024" />
99
</Components>
1010
</ApplicationPackage>

‎Install/RevitIFCSetupWix/Product.wxs

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi"
33
xmlns:util="http://schemas.microsoft.com/wix/UtilExtension">
44

5-
<Product Id="1A9C2C21-2422-42D2-0000-992E73C12400" Name="Revit IFC 2024" Language="1033" Version="24.2.20.0" Manufacturer="Autodesk" UpgradeCode="1A9C2C21-24B8-42D2-0000-992E73C11B3F">
5+
<Product Id="1A9C2C21-2432-42D2-0000-992E73C12400" Name="Revit IFC 2024" Language="1033" Version="24.3.20.0" Manufacturer="Autodesk" UpgradeCode="1A9C2C21-24B8-42D2-0000-992E73C11B3F">
66
<Package InstallerVersion="200" Compressed="yes" InstallScope="perMachine" />
77

88
<MajorUpgrade DowngradeErrorMessage="A newer version of [ProductName] is already installed." />

‎Install/RevitIFCSetupWix/RevitIFCSetupWix.wixproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<ProductVersion>3.8</ProductVersion>
77
<ProjectGuid>7dfbd495-c588-4c7b-b8f6-5b793adb06f2</ProjectGuid>
88
<SchemaVersion>2.0</SchemaVersion>
9-
<OutputName>IFC for Revit 2024.2.20.0</OutputName>
9+
<OutputName>IFC for Revit 2024.3.20.0</OutputName>
1010
<OutputType>Package</OutputType>
1111
<WixTargetsPath Condition=" '$(WixTargetsPath)' == '' AND '$(MSBuildExtensionsPath32)' != '' ">$(MSBuildExtensionsPath32)\Microsoft\WiX\v3.x\Wix.targets</WixTargetsPath>
1212
<WixTargetsPath Condition=" '$(WixTargetsPath)' == '' ">$(MSBuildExtensionsPath)\Microsoft\WiX\v3.x\Wix.targets</WixTargetsPath>

‎Install/RevitIFCSetupWix/buildInstaller.bat

+4-4
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,9 @@ rem It is necessary to add the Wix bin directory to the system path temporarily
1111
SET PATH=%PATH%;%WixRoot%
1212

1313
candle.exe -dProjectDir=%2 -ext WixUtilExtension %2Product.wxs
14-
light.exe -ext WixUtilExtension -out RevitIFC2024.2.20.msi product.wixobj -ext WixUIExtension
14+
light.exe -ext WixUtilExtension -out RevitIFC2024.3.20.msi product.wixobj -ext WixUIExtension
1515

16-
copy RevitIFC2024.2.20.msi %1..\Releasex64
17-
del RevitIFC2024.2.20.msi
16+
copy RevitIFC2024.3.20.msi %1..\Releasex64
17+
del RevitIFC2024.3.20.msi
1818

19-
echo %1..\Releasex64\RevitIFC2024.2.20.msi
19+
echo %1..\Releasex64\RevitIFC2024.3.20.msi

‎Source/IFCExporterUIOverride/IFCExportConfiguration.cs

+7
Original file line numberDiff line numberDiff line change
@@ -196,6 +196,11 @@ public KnownERNames ExchangeRequirement
196196
/// </summary>
197197
public string ExportUserDefinedPsetsFileName { get; set; } = "";
198198

199+
/// <summary>
200+
/// Whether or not to include type property to the user defined property sets.
201+
/// </summary>
202+
public bool UseTypePropertiesInInstacePSets { get; set; } = false;
203+
199204
/// <summary>
200205
/// True if the User decides to use the Parameter Mapping Table
201206
/// False if the user decides to ignore it
@@ -437,6 +442,7 @@ public static IFCExportConfiguration CreateBuiltInConfiguration(IFCVersion ifcVe
437442
bool materialPsets,
438443
bool schedulesAsPSets,
439444
bool userDefinedPSets,
445+
bool useTypePropertiesInInstacePSets,
440446
bool userDefinedParameterMapping,
441447
bool PlanElems2D,
442448
bool exportBoundingBox,
@@ -474,6 +480,7 @@ public static IFCExportConfiguration CreateBuiltInConfiguration(IFCVersion ifcVe
474480
configuration.ExportMaterialPsets = materialPsets;
475481
configuration.ExportSchedulesAsPsets = schedulesAsPSets;
476482
configuration.ExportUserDefinedPsets = userDefinedPSets;
483+
configuration.UseTypePropertiesInInstacePSets = useTypePropertiesInInstacePSets;
477484
configuration.ExportUserDefinedPsetsFileName = System.IO.Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location) + @"\" + configuration.Name + @".txt";
478485
configuration.ExportUserDefinedParameterMapping = userDefinedParameterMapping;
479486

‎Source/IFCExporterUIOverride/IFCExportConfigurationsMap.cs

+16-12
Original file line numberDiff line numberDiff line change
@@ -76,21 +76,21 @@ public void AddBuiltInConfigurations()
7676

7777
// These are the built-in configurations. Provide a more extensible means of storage.
7878
// Order of construction: name, version, space boundaries, QTO, split walls, internal sets, 2d elems, boundingBox
79-
AddOrReplace(IFCExportConfiguration.CreateBuiltInConfiguration(IFCVersion.IFC2x3CV2, 0, false, false, false, false, false, false, false, false, false, linkedFileExportAs, includeSteelElements: true));
80-
AddOrReplace(IFCExportConfiguration.CreateBuiltInConfiguration(IFCVersion.IFC2x3, 1, false, false, true, false, false, false, false, true, false, linkedFileExportAs, includeSteelElements: true));
81-
AddOrReplace(IFCExportConfiguration.CreateBuiltInConfiguration(IFCVersion.IFCCOBIE, 2, true, true, true, false, false, false, false, true, true, linkedFileExportAs, includeSteelElements: true));
82-
AddOrReplace(IFCExportConfiguration.CreateBuiltInConfiguration(IFCVersion.IFC2x3BFM, 1, true, true, false, false, false, false, false, true, false, linkedFileExportAs, includeSteelElements: true));
83-
AddOrReplace(IFCExportConfiguration.CreateBuiltInConfiguration(IFCVersion.IFC2x2, 1, false, false, true, false, false, false, false, false, false, linkedFileExportAs));
84-
AddOrReplace(IFCExportConfiguration.CreateBuiltInConfiguration(IFCVersion.IFC2x3FM, 1, true, false, false, false, true, true, false, true, true, linkedFileExportAs, includeSteelElements: true));
85-
AddOrReplace(IFCExportConfiguration.CreateBuiltInConfiguration(IFCVersion.IFC4RV, 0, true, false, false, false, false, false, false, false, false, linkedFileExportAs, includeSteelElements: true,
79+
AddOrReplace(IFCExportConfiguration.CreateBuiltInConfiguration(IFCVersion.IFC2x3CV2, 0, false, false, false, false, false, false, false, false, false, false, linkedFileExportAs, includeSteelElements: true));
80+
AddOrReplace(IFCExportConfiguration.CreateBuiltInConfiguration(IFCVersion.IFC2x3, 1, false, false, true, false, false, false, false, false, true, false, linkedFileExportAs, includeSteelElements: true));
81+
AddOrReplace(IFCExportConfiguration.CreateBuiltInConfiguration(IFCVersion.IFCCOBIE, 2, true, true, true, false, false, false, false, false, true, true, linkedFileExportAs, includeSteelElements: true));
82+
AddOrReplace(IFCExportConfiguration.CreateBuiltInConfiguration(IFCVersion.IFC2x3BFM, 1, true, true, false, false, false, false, false, false, true, false, linkedFileExportAs, includeSteelElements: true));
83+
AddOrReplace(IFCExportConfiguration.CreateBuiltInConfiguration(IFCVersion.IFC2x2, 1, false, false, true, false, false, false, false, false, false, false, linkedFileExportAs));
84+
AddOrReplace(IFCExportConfiguration.CreateBuiltInConfiguration(IFCVersion.IFC2x3FM, 1, true, false, false, false, true, true, false, false, true, true, linkedFileExportAs, includeSteelElements: true));
85+
AddOrReplace(IFCExportConfiguration.CreateBuiltInConfiguration(IFCVersion.IFC4RV, 0, true, false, false, false, false, false, false, false, false, false, linkedFileExportAs, includeSteelElements: true,
8686
exchangeRequirement:KnownERNames.Architecture));
87-
AddOrReplace(IFCExportConfiguration.CreateBuiltInConfiguration(IFCVersion.IFC4RV, 0, true, false, false, false, false, false, false, false, false, linkedFileExportAs, includeSteelElements: true,
87+
AddOrReplace(IFCExportConfiguration.CreateBuiltInConfiguration(IFCVersion.IFC4RV, 0, true, false, false, false, false, false, false, false, false, false, linkedFileExportAs, includeSteelElements: true,
8888
exchangeRequirement:KnownERNames.Structural));
89-
AddOrReplace(IFCExportConfiguration.CreateBuiltInConfiguration(IFCVersion.IFC4RV, 0, true, false, false, false, false, false, false, false, false, linkedFileExportAs, includeSteelElements: true,
89+
AddOrReplace(IFCExportConfiguration.CreateBuiltInConfiguration(IFCVersion.IFC4RV, 0, true, false, false, false, false, false, false, false, false, false, linkedFileExportAs, includeSteelElements: true,
9090
exchangeRequirement:KnownERNames.BuildingService));
91-
AddOrReplace(IFCExportConfiguration.CreateBuiltInConfiguration(IFCVersion.IFC4DTV, 0, true, false, false, false, false, false, false, false, false, linkedFileExportAs, includeSteelElements: true));
92-
AddOrReplace(IFCExportConfiguration.CreateBuiltInConfiguration(IFCVersion.IFC4x3, 0, true, false, false, false, false, false, false, false, false, linkedFileExportAs, includeSteelElements: true));
93-
AddOrReplace(IFCExportConfiguration.CreateBuiltInConfiguration(IFCVersion.IFCSG, 1, true, true, false, false, false, true, false, true, false, linkedFileExportAs, includeSteelElements: true));
91+
AddOrReplace(IFCExportConfiguration.CreateBuiltInConfiguration(IFCVersion.IFC4DTV, 0, true, false, false, false, false, false, false, false, false, false, linkedFileExportAs, includeSteelElements: true));
92+
AddOrReplace(IFCExportConfiguration.CreateBuiltInConfiguration(IFCVersion.IFC4x3, 0, true, false, false, false, false, false, false, false, false, false, linkedFileExportAs, includeSteelElements: true));
93+
AddOrReplace(IFCExportConfiguration.CreateBuiltInConfiguration(IFCVersion.IFCSG, 1, true, true, false, false, false, true, false, false, true, false, linkedFileExportAs, includeSteelElements: true));
9494
}
9595

9696
private LinkedFileExportAs ParseLinkedFilesAs(string val,
@@ -162,6 +162,9 @@ public void AddSavedConfigurations()
162162
Field fieldExportUserDefinedPsetsFileName = m_OldSchema.GetField(s_setupExportUserDefinedPsetsFileName);
163163
if (fieldExportUserDefinedPsetsFileName != null)
164164
configuration.ExportUserDefinedPsetsFileName = configEntity.Get<string>(s_setupExportUserDefinedPsetsFileName);
165+
Field fieldUseTypePropertiesInInstacePSets = m_OldSchema.GetField(s_setupUseTypePropertiesInInstacePSets);
166+
if (fieldExportUserDefinedPsets != null)
167+
configuration.UseTypePropertiesInInstacePSets = configEntity.Get<bool>(s_setupUseTypePropertiesInInstacePSets);
165168

166169
Field fieldExportUserDefinedParameterMapingTable = m_OldSchema.GetField(s_setupExportUserDefinedParameterMapping);
167170
if (fieldExportUserDefinedParameterMapingTable != null)
@@ -388,6 +391,7 @@ public void AddSavedConfigurations()
388391
private const string s_setupExportUserDefinedPsetsFileName = "ExportUserDefinedPsetsFileName";
389392
private const string s_setupExportUserDefinedParameterMapping = "ExportUserDefinedParameterMapping";
390393
private const string s_setupExportUserDefinedParameterMappingFileName = "ExportUserDefinedParameterMappingFileName";
394+
private const string s_setupUseTypePropertiesInInstacePSets = "UseTypePropertiesInInstacePSets";
391395
private const string s_setupExportLinkedFiles = "ExportLinkedFiles";
392396
private const string s_setupIncludeSiteElevation = "IncludeSiteElevation";
393397
private const string s_setupTessellationLevelOfDetail = "TessellationLevelOfDetail";

‎Source/IFCExporterUIOverride/IFCExporterUIWindow.xaml

+6-5
Original file line numberDiff line numberDiff line change
@@ -57,11 +57,12 @@
5757
<CheckBox Content="{x:Static p:Resources.ExportSchedulesAsPropertySets}" Margin="10,91,0,0" x:Name="checkboxExportSchedulesAsPsets" VerticalAlignment="Top" Checked="checkboxExportSchedulesAsPsets_Checked" Unchecked="checkboxExportSchedulesAsPsets_Checked" Height="16" HorizontalAlignment="Left" Width="588" Grid.ColumnSpan="2" />
5858
<CheckBox Content="{x:Static p:Resources.ExportSpecificSchedules}" Margin="30,112,0,0" x:Name="checkBoxExportSpecificSchedules" VerticalAlignment="Top" Checked="checkBoxExportSpecificSchedules_Checked" Unchecked="checkBoxExportSpecificSchedules_Checked" Height="16" HorizontalAlignment="Left" Width="568" Grid.ColumnSpan="2" />
5959
<CheckBox Content="{x:Static p:Resources.ExportUserDefinedPropertySets}" Margin="10,141,0,0" Height="16" x:Name="checkboxExportUserDefinedPset" VerticalAlignment="Top" Checked="checkboxExportUserDefinedPset_Checked" Unchecked="checkboxExportUserDefinedPset_Checked" HorizontalAlignment="Left" Width="588" Grid.ColumnSpan="2"/>
60-
<TextBox Height="23" Margin="30,162,0,0" x:Name="userDefinedPropertySetFileName" VerticalAlignment="Top" HorizontalAlignment="Left" Width="436" Grid.ColumnSpan="2" />
61-
<Button Content="{x:Static p:Resources.Browse}" x:Name="buttonBrowse" Width="107" IsDefault="True" Click="buttonBrowse_Click" Height="23" VerticalAlignment="Top" Margin="0,162,20,0" HorizontalAlignment="Right" Grid.Column="1"/>
62-
<CheckBox Content="{x:Static p:Resources.ExportUserDefinedParameterMappingTable}" Height="16" Margin="10,201,0,0" x:Name="checkBoxExportUserDefinedParameterMapping" VerticalAlignment="Top" Checked="checkBoxExportUserDefinedParameterMapping_Checked" Unchecked="checkBoxExportUserDefinedParameterMapping_Checked" HorizontalAlignment="Left" Width="588" Grid.ColumnSpan="2"/>
63-
<TextBox Height="23" Margin="30,222,0,0" x:Name="userDefinedParameterMappingTable" VerticalAlignment="Top" HorizontalAlignment="Left" Width="436" Grid.ColumnSpan="2"/>
64-
<Button Content="{x:Static p:Resources.Browse}" Margin="0,222,20,0" x:Name="buttonParameterMappingBrowse" Click="buttonParameterMappingBrowse_Click" Width="107" IsDefault="True" Height="23" VerticalAlignment="Top" HorizontalAlignment="Right" Grid.Column="1"/>
60+
<CheckBox Content="{x:Static p:Resources.UseTypePropertiesInInstacePSets}" Margin="30,162,0,0" x:Name="checkboxUseTypePropertiesInInstacePSets" VerticalAlignment="Top" Checked="checkboxUseTypePropertiesInInstacePSets_Checked" Unchecked="checkboxUseTypePropertiesInInstacePSets_Checked" HorizontalAlignment="Left" Width="568" Height="16" />
61+
<TextBox Height="23" Margin="30,183,0,0" x:Name="userDefinedPropertySetFileName" VerticalAlignment="Top" HorizontalAlignment="Left" Width="436" Grid.ColumnSpan="2" />
62+
<Button Content="{x:Static p:Resources.Browse}" x:Name="buttonBrowse" Width="107" IsDefault="True" Click="buttonBrowse_Click" Height="23" VerticalAlignment="Top" Margin="0,183,20,0" HorizontalAlignment="Right" Grid.Column="1"/>
63+
<CheckBox Content="{x:Static p:Resources.ExportUserDefinedParameterMappingTable}" Height="16" Margin="10,222,0,0" x:Name="checkBoxExportUserDefinedParameterMapping" VerticalAlignment="Top" Checked="checkBoxExportUserDefinedParameterMapping_Checked" Unchecked="checkBoxExportUserDefinedParameterMapping_Checked" HorizontalAlignment="Left" Width="588" Grid.ColumnSpan="2"/>
64+
<TextBox Height="23" Margin="30,243,0,0" x:Name="userDefinedParameterMappingTable" VerticalAlignment="Top" HorizontalAlignment="Left" Width="436" Grid.ColumnSpan="2"/>
65+
<Button Content="{x:Static p:Resources.Browse}" Margin="0,243,20,0" x:Name="buttonParameterMappingBrowse" Click="buttonParameterMappingBrowse_Click" Width="107" IsDefault="True" Height="23" VerticalAlignment="Top" HorizontalAlignment="Right" Grid.Column="1"/>
6566
<Button Content="{x:Static p:Resources.Classification}" Margin="10,0,0,10" Name="classificationButton" Click="buttonClassification_Click" Height="23" VerticalAlignment="Bottom" HorizontalAlignment="Left" Width="231"/>
6667
</Grid>
6768
</TabItem>

0 commit comments

Comments
 (0)