Skip to content

Commit

Permalink
Merge pull request #632 from Autodesk/babio/24.1_Update
Browse files Browse the repository at this point in the history
IFC Extension 24.1 update
  • Loading branch information
o-babii committed Apr 28, 2023
2 parents 1f76067 + 53b20d6 commit 7cfd66f
Show file tree
Hide file tree
Showing 146 changed files with 21,465 additions and 16,729 deletions.
Binary file modified Install/Program Files to Install/Adsk_sidebar_501x314.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified Install/Program Files to Install/Autodesk Logo.bmp
Binary file not shown.
Binary file not shown.
12,444 changes: 6,272 additions & 6,172 deletions Install/Program Files to Install/IFC Shared Parameters-RevitIFCBuiltIn-Type_ALL.txt

Large diffs are not rendered by default.

12,444 changes: 6,272 additions & 6,172 deletions Install/Program Files to Install/IFC Shared Parameters-RevitIFCBuiltIn_ALL.txt

Large diffs are not rendered by default.

Original file line number Diff line number Diff line change
Expand Up @@ -582,7 +582,32 @@
"Pset_WasteTerminalTypeWasteDisposalUnit",
"Pset_WasteTerminalTypeWasteTrap",
"Pset_WindowCommon",
"Pset_ZoneCommon"
"Pset_ZoneCommon",
"Qto_BeamBaseQuantities",
"Qto_BuildingBaseQuantities",
"Qto_BuildingStoreyBaseQuantities",
"Qto_CableCarrierFittingBaseQuantities",
"Qto_CableCarrierSegmentBaseQuantities",
"Qto_CableSegmentBaseQuantities",
"Qto_ColumnBaseQuantities",
"Qto_CoveringBaseQuantities",
"Qto_CurtainWallQuantities",
"Qto_DoorBaseQuantities",
"Qto_DuctFittingBaseQuantities",
"Qto_ElectricApplianceBaseQuantities",
"Qto_MemberBaseQuantities",
"Qto_OpeningElementBaseQuantities",
"Qto_PileBaseQuantities",
"Qto_PlateBaseQuantities",
"Qto_RailingBaseQuantities",
"Qto_RampFlightBaseQuantities",
"Qto_RoofBaseQuantities",
"Qto_SiteBaseQuantities",
"Qto_SlabBaseQuantities",
"Qto_SpaceBaseQuantities",
"Qto_StairFlightBaseQuantities",
"Qto_WallBaseQuantities",
"Qto_WindowBaseQuantities"
]
},
"IFC4RV" : {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<RevitAddIns>
<AddIn Type="Application">
<Name>IFC override</Name>
<Assembly>.\IFCExportUIOverride.dll</Assembly>
<Assembly>.\IFCExporterUIOverride.dll</Assembly>
<AddInId>6DC299D6-F746-47BE-AE93-F00DDC714257</AddInId>
<FullClassName>BIM.IFC.Export.UI.IFCCommandOverrideApplication</FullClassName>
<VendorId>ADSK</VendorId>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -236,6 +236,75 @@ <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.0.22</div><div class="versioninfo-bullet">
<br><p>
General:
<ul>
<li>This is the first version of IFC Exporter for Revit 2024.
<li>It contains a various improvements and bug fixes for the basic Revit 2024.
</ul>
</p>
<br>
<p>
Improvements:
<ul>
<li>Added IFC2x3 Qto sets.
<li>Added material shared parameters export.
<li>Added the BarRole attribute when exporting IfcReinforcingBars to IFC.
<li>Added type entities for rebar and assemblies when exporting to IFC.
<li>Added support for exporting predefined types when exporting spaces to IFC4+.
<li>Added support of new measure units.
<li>Allowed export of rebar with slightly invalid transforms to IFC.
<li>Implemented exporting user defined parameters of 'Real' type as IfcReal with Revit display values.
<li>Implemented exporting of IfcRailingType entity.
<li>Implemented support of all 4 Revit velocity data types on export.
<li>Improved display of openings when export or linking in IFC files.
<li>Improved calculation of the linked levels elevation.
<li>Improved export of IfcPropertyEnumeratedValue.
<li>Improved export of insulation and lining as anything.
<li>Improved export of projects to IFC that contained family instances with invalid placements.
<li>Improved how classifications are viewed in certain older external applications when exporting to IFC.
<li>Improved list/bounded/table user defined properties values export for Instances and Types.
<li>Improved placement of federated (and some separate) links.
<li>Improved processing of representation items.
<li>Improved support for exporting advanced BReps to IFC if the unofficial IFC4 Design Transfer View is used.
<li>Improved the behavior for export of elements split by levels.
<li>Improved user defined property set mapping, especially for IFC2x3 entities that previously had no type entity exported.
<li>Updated 4x3 enums according to IFC4.3.1.0 Documentation.
</ul>
</p>
<br>
<p>
Bug Fixes:
<ul>
<li>Corrected the value for many MEP parameters exported to IFC.
<li>Fixed colour for exported pipe fitting.
<li>Fixed inconsistent IfcMaterialConstituent naming.
<li>Fixed export of a user-defined structural element type.
<li>Fixed export of IfcFurnitureType.AssemblyPlace attribute.
<li>Fixed export of IFC properties associated with the top-level IfcProject entity.
<li>Fixed export of materials from hosted wall sweep.
<li>Fixed export of material layer parameters of a ceiling element.
<li>Fixed export of user defined properties for roofs.
<li>Fixed export of some assemblies to IFC that resulted in orphaned entities.
<li>Fixed export of stairs layer name.
<li>Fixed IFC Classification export.
<li>Fixed IFCMEASUREWITHUNIT.
<li>Fixed log file creation for linking.
<li>Fixed the calculation of the height parameter for some railings in metric projects when a previous value had been calculated that wasn't applicable to this railing.
<li>Fixed the issue when IfcCovering sill's body was exported as Brep instead of SweptSolid.
<li>Fixed the processing of openings when exporting a wall as shape aspects (components).
<li>Fixed the slope common property set parameter calculation when exporting some stringers to IFC.
<li>Fixed issue with IfcCountMeasure value in IFC4x3.
<li>Fixed Revit Data types export.
<li>Fixed window opening misalignment.
<li>Removed the use of several Revit built-in parameters when exporting IFC properties that have the same name but are different.
</ul>
</p>
<br>
</div>
<br>

<div class="versionset">
<div class="version">24.0.0.0</div><div class="versioninfo-bullet">
<br><p>
Expand Down
4 changes: 2 additions & 2 deletions Install/Program Files to Install/bundle/PackageContents.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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.0.0" ModuleName="./Contents/2024/IFCExporterUIOverride.addin" AppDescription="IFC For Revit 2024" />
<ComponentEntry AppName="IFC For Revit 2024" Version="24.0.0" ModuleName="./Contents/2024/Revit.IFC.addin" AppDescription="IFC For Revit 2024" />
<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" />
</Components>
</ApplicationPackage>
16 changes: 8 additions & 8 deletions Install/RevitIFCSetupWix/Product.wxs
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi"
xmlns:util="http://schemas.microsoft.com/wix/UtilExtension">

<Product Id="F1A1177D-4CE7-4AAA-B4E6-EC318112D7B4" Name="Revit IFC 2024" Language="1033" Version="24.0.0.0" Manufacturer="Autodesk" UpgradeCode="1A9C2C21-24B8-42D2-0000-992E73C11B3F">
<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">
<Package InstallerVersion="200" Compressed="yes" InstallScope="perMachine" />

<MajorUpgrade DowngradeErrorMessage="A newer version of [ProductName] is already installed." />
Expand Down Expand Up @@ -106,10 +106,10 @@
<File Id ="FILE_Ifc_Import_Sig" Name="Revit.IFC.Import.sig" Source="$(var.ProjectDir)..\Program Files to Install\Revit.IFC.Import.sig" KeyPath="yes" />
</Component>
<Component Id = "COMP_IFC_ExternalUI_Sig" Guid="3159B919-CD50-469D-8DDE-FE339CEBBC1C">
<File Id ="FILE_Ifc_ExternalUI_Sig" Name="IFCExportUIOverride.sig" Source="$(var.ProjectDir)..\Program Files to Install\IFCExportUIOverride.sig" KeyPath="yes" />
<File Id ="FILE_Ifc_ExternalUI_Sig" Name="IFCExporterUIOverride.sig" Source="$(var.ProjectDir)..\Program Files to Install\IFCExporterUIOverride.sig" KeyPath="yes" />
</Component>
<Component Id = "COMP_IFC_ExternalUI_DLL" Guid="D7F89B58-029F-4062-B226-6F3D2EB7FE5D">
<File Id ="FILE_Ifc_ExternalUI_DLL" Name="IFCExportUIOverride.dll" Source="$(var.ProjectDir)..\Program Files to Install\IFCExportUIOverride.dll" KeyPath="yes" />
<File Id ="FILE_Ifc_ExternalUI_DLL" Name="IFCExporterUIOverride.dll" Source="$(var.ProjectDir)..\Program Files to Install\IFCExporterUIOverride.dll" KeyPath="yes" />
</Component>
<Component Id = "COMP_IFC_Common_DLL" Guid="C7ED4A2C-DCB1-457E-968F-2DDE9993C1B6">
<File Id ="FILE_Ifc_Common_DLL" Name="Revit.IFC.Common.dll" Source="$(var.Revit.IFC.Common.TargetDir)Revit.IFC.Common.dll" KeyPath="yes" />
Expand All @@ -125,7 +125,7 @@
<File Id ="FILE_Ifc_Import_DLL" Name="Revit.IFC.Import.dll" Source="$(var.Revit.IFC.Import.TargetDir)Revit.IFC.Import.dll" KeyPath="yes" />
</Component>
<Component Id = "COMP_IFC_ExternalUI_DLL" Guid="D7F89B58-029F-4062-B226-6F3D2EB7FE5D">
<File Id ="FILE_Ifc_ExternalUI_DLL" Name="IFCExportUIOverride.dll" Source="$(var.IFCExporterUIOverride.TargetDir)IFCExportUIOverride.dll" KeyPath="yes" />
<File Id ="FILE_Ifc_ExternalUI_DLL" Name="IFCExporterUIOverride.dll" Source="$(var.IFCExporterUIOverride.TargetDir)IFCExporterUIOverride.dll" KeyPath="yes" />
</Component>
<Component Id = "COMP_IFC_Common_DLL" Guid="C7ED4A2C-DCB1-457E-968F-2DDE9993C1B6">
<File Id ="FILE_Ifc_Common_DLL" Name="Revit.IFC.Common.dll" Source="$(var.Revit.IFC.Common.TargetDir)Revit.IFC.Common.dll" KeyPath="yes" />
Expand Down Expand Up @@ -237,12 +237,12 @@

<ComponentGroup Id="ProductFRFiles" Directory="INSTALLFRUI">
<Component Id = "COMP_IFC_ResourceFR_DLL" Guid="ACC9C313-F8EF-4DBB-A0DE-55D662E4857D">
<File Id ="FILE_Ifc_ResourceFR_DLL" Name="IFCExportUIOverride.resources.dll" Source="$(var.IFCExporterUIOverride.TargetDir)fr\IFCExportUIOverride.resources.dll" KeyPath="yes" />
<File Id ="FILE_Ifc_ResourceFR_DLL" Name="IFCExporterUIOverride.resources.dll" Source="$(var.IFCExporterUIOverride.TargetDir)fr\IFCExporterUIOverride.resources.dll" KeyPath="yes" />
</Component>
</ComponentGroup>
<ComponentGroup Id="ProductDEFiles" Directory="INSTALLDEUI">
<Component Id = "COMP_IFC_ResourceDE_DLL" Guid="23BD267A-652F-473A-8DF6-6302C7D14D54">
<File Id ="FILE_Ifc_ResourceDE_DLL" Name="IFCExportUIOverride.resources.dll" Source="$(var.IFCExporterUIOverride.TargetDir)de\IFCExportUIOverride.resources.dll" KeyPath="yes" />
<File Id ="FILE_Ifc_ResourceDE_DLL" Name="IFCExporterUIOverride.resources.dll" Source="$(var.IFCExporterUIOverride.TargetDir)de\IFCExporterUIOverride.resources.dll" KeyPath="yes" />
</Component>
</ComponentGroup>

Expand Down Expand Up @@ -270,7 +270,7 @@
<util:XmlFile Id="SetKeyUI"
Action="setValue"
ElementPath="RevitAddIns/AddIn[\[]position()=1[\]]/Assembly"
Value="[INSTALLDIR]IFCExportUIOverride.dll"
Value="[INSTALLDIR]IFCExporterUIOverride.dll"
File="[#FILE_UI_manifest]"
SelectionLanguage="XPath"
Sequence="1" />
Expand All @@ -285,7 +285,7 @@
<util:XmlFile Id="SetKeyUI_LT"
Action="setValue"
ElementPath="RevitAddIns/AddIn[\[]position()=1[\]]/Assembly"
Value="[INSTALLDIR]IFCExportUIOverride.dll"
Value="[INSTALLDIR]IFCExporterUIOverride.dll"
File="[DIR_Addins_LT]IFCExporterUIOverride.addin"
SelectionLanguage="XPath"
Sequence="1" />
Expand Down
2 changes: 1 addition & 1 deletion Install/RevitIFCSetupWix/RevitIFCSetupWix.wixproj
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<ProductVersion>3.8</ProductVersion>
<ProjectGuid>7dfbd495-c588-4c7b-b8f6-5b793adb06f2</ProjectGuid>
<SchemaVersion>2.0</SchemaVersion>
<OutputName>IFC for Revit 2024.0.0.0</OutputName>
<OutputName>IFC for Revit 2024.1.0.22</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>
Expand Down
8 changes: 4 additions & 4 deletions Install/RevitIFCSetupWix/buildInstaller.bat
Original file line number Diff line number Diff line change
Expand Up @@ -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.msi product.wixobj -ext WixUIExtension
light.exe -ext WixUtilExtension -out RevitIFC2024.1.0.msi product.wixobj -ext WixUIExtension

copy RevitIFC2024.msi %1..\Releasex64
del RevitIFC2024.msi
copy RevitIFC2024.1.0.msi %1..\Releasex64
del RevitIFC2024.1.0.msi

echo %1..\Releasex64\RevitIFC2024.msi
echo %1..\Releasex64\RevitIFC2024.1.0.msi
17 changes: 10 additions & 7 deletions Source/IFCExporterUIOverride/IFCAddressInformationUI.xaml.cs
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,7 @@ public partial class IFCAddressInformation : ChildWindow
private IFCAddress m_newAddress = new IFCAddress();
private IFCAddressItem m_newAddressItem = new IFCAddressItem();
private IFCAddressItem m_savedAddressItem = new IFCAddressItem();
private IFCExportConfiguration m_parentConfiguration = null;

private string getUserDefinedStringFromIFCPurposeList()
{
Expand All @@ -59,8 +60,11 @@ private string getUserDefinedStringFromIFCPurposeList()
public IFCAddressInformation(IFCExportConfiguration configuration)
{
InitializeComponent();
m_parentConfiguration = configuration;

m_newAddressItem = configuration.ProjectAddress;
if ((configuration.ProjectAddress.HasData() && !m_newAddressItem.HasData())
|| (configuration.ProjectAddress.HasData() && m_newAddressItem.HasData() && !configuration.ProjectAddress.isUnchanged(m_newAddressItem)))
m_newAddressItem = configuration.ProjectAddress;

// This is a short list, so we just do an O(n) search.
int numItems = ifcPurposeList.Count();
Expand All @@ -73,11 +77,10 @@ public IFCAddressInformation(IFCExportConfiguration configuration)
}
}

// Initialize options from the m_newAddressItem
Checkbox_AssignToBuilding.IsChecked = m_newAddressItem.AssignAddressToBuilding;
Checkbox_AssignToSite.IsChecked = m_newAddressItem.AssignAddressToSite;
UpdateProjInfocheckBox.IsChecked = m_newAddressItem.UpdateProjectInformation;

// Initialize options from the configuration
Checkbox_AssignToBuilding.IsChecked = configuration.ProjectAddress.AssignAddressToBuilding;
Checkbox_AssignToSite.IsChecked = configuration.ProjectAddress.AssignAddressToSite;
UpdateProjInfocheckBox.IsChecked = configuration.ProjectAddress.UpdateProjectInformation;
}

private void OnInit(object sender, RoutedEventArgs e)
Expand Down Expand Up @@ -212,7 +215,7 @@ private void buttonOK_Click(object sender, RoutedEventArgs args)

transaction.Commit();
}

m_parentConfiguration.ProjectAddress = m_newAddressItem;
Close();
}

Expand Down
Loading

0 comments on commit 7cfd66f

Please sign in to comment.