Merge pull request #468 from Autodesk/release_22.x.x_update_22.5

Various bugfixes and improvements for the 22.5
Autodesk · Jun 22, 2022 · bebcb8e · bebcb8e
2 parents e7edfdb + 7cec234
commit bebcb8e
Show file tree

Hide file tree

Showing 12 changed files with 2,685 additions and 2,489 deletions.
diff --git a/Install/Program Files to Install/IFC Shared Parameters-RevitIFCBuiltIn-Type_ALL.txt b/Install/Program Files to Install/IFC Shared Parameters-RevitIFCBuiltIn-Type_ALL.txt
diff --git a/Install/Program Files to Install/IFC Shared Parameters-RevitIFCBuiltIn_ALL.txt b/Install/Program Files to Install/IFC Shared Parameters-RevitIFCBuiltIn_ALL.txt
diff --git a/Install/Program Files to Install/IFC2X2_ADD1.exp b/Install/Program Files to Install/IFC2X2_ADD1.exp
@@ -4064,12 +4064,8 @@ ENTITY IfcElement
  INVERSE
 	FillsVoids : SET [0:1] OF IfcRelFillsElement FOR RelatedBuildingElement;
 	ConnectedTo : SET [0:?] OF IfcRelConnectsElements FOR RelatingElement;
-	HasCoverings : SET [0:?] OF IfcRelCoversBldgElements FOR RelatingBuildingElement;
-	HasProjections : SET [0:?] OF IfcRelProjectsElement FOR RelatingElement;
 	HasPorts : SET [0:?] OF IfcRelConnectsPortToElement FOR RelatedElement;
 	HasOpenings : SET [0:?] OF IfcRelVoidsElement FOR RelatingBuildingElement;
-	IsConnectionRealization : SET [0:?] OF IfcRelConnectsWithRealizingElements FOR RealizingElements;
-	ProvidesBoundaries : SET [0:?] OF IfcRelSpaceBoundary FOR RelatedBuildingElement;
 	ConnectedFrom : SET [0:?] OF IfcRelConnectsElements FOR RelatedElement;
 	ContainedInStructure : SET [0:1] OF IfcRelContainedInSpatialStructure FOR RelatedElements;
 END_ENTITY;
@@ -5110,7 +5106,6 @@ ENTITY IfcObject
  INVERSE
 	IsDefinedBy : SET [0:?] OF IfcRelDefines FOR RelatedObjects;
 	HasAssociations : SET [0:?] OF IfcRelAssociates FOR RelatedObjects;
-	HasAssignments : SET [0:?] OF IfcRelAssigns FOR RelatedObjects;
 	Decomposes : SET [0:1] OF IfcRelDecomposes FOR RelatedObjects;
 	IsDecomposedBy : SET [0:?] OF IfcRelDecomposes FOR RelatingObject;
  WHERE
@@ -5122,6 +5117,7 @@ ENTITY IfcObjectPlacement
 	(IfcGridPlacement
 	,IfcLocalPlacement));
  INVERSE
+	PlacesObject : SET [0:?] OF IfcProduct FOR ObjectPlacement;
 	ReferencedByPlacements : SET [0:?] OF IfcLocalPlacement FOR PlacementRelTo;
 END_ENTITY;
 
@@ -5709,10 +5705,6 @@ ENTITY IfcProperty
 	,IfcSimpleProperty));
 	Name : IfcIdentifier;
 	Description : OPTIONAL IfcText;
- INVERSE
-	PropertyForDependance : SET [0:?] OF IfcPropertyDependencyRelationship FOR DependingProperty;
-	PropertyDependsOn : SET [0:?] OF IfcPropertyDependencyRelationship FOR DependantProperty;
-	PartOfComplex : SET [0:1] OF IfcComplexProperty FOR HasProperties;
 END_ENTITY;
 
 ENTITY IfcPropertyBoundedValue
@@ -6446,8 +6438,6 @@ ENTITY IfcRepresentation
 	RepresentationIdentifier : OPTIONAL IfcLabel;
 	RepresentationType : OPTIONAL IfcLabel;
 	Items : SET [1:?] OF IfcRepresentationItem;
- INVERSE
-	OfProductRepresentation : SET [0:1] OF IfcProductRepresentation FOR Representations;
 END_ENTITY;
 
 ENTITY IfcRepresentationContext
@@ -6465,6 +6455,8 @@ ENTITY IfcRepresentationItem
 	,IfcMappedItem
 	,IfcStyledItem
 	,IfcTopologicalRepresentationItem));
+ INVERSE
+	StyledByItem : SET [0:1] OF IfcStyledItem FOR Item;
 END_ENTITY;
 
 ENTITY IfcRepresentationMap;
@@ -6634,8 +6626,6 @@ END_ENTITY;
 
 ENTITY IfcShapeRepresentation
  SUBTYPE OF (IfcRepresentation);
- INVERSE
-	OfShapeAspect : SET [0:1] OF IfcShapeAspect FOR ShapeRepresentations;
  WHERE
 	WR21 : 'IFC2X2_FINAL.IFCGEOMETRICREPRESENTATIONCONTEXT' 
              IN TYPEOF(SELF\IfcRepresentation.ContextOfItems);

diff --git a/Install/Program Files to Install/bundle/Contents/Resources/ADSKIFCExporterHelp.htm b/Install/Program Files to Install/bundle/Contents/Resources/ADSKIFCExporterHelp.htm
@@ -256,6 +256,8 @@ <h2 id="VersionHistory" name="VersionHistory">Version History</h2>
             <li>Improved linking of extrusions with slivery outlines.
             <li>Added support for linking IFC files with the IfcBlock entity.
             <li>Added non-optional attributes export for generic type.
+            <li>Updated addin version visualization.
+            <li>Updated param naming.
 			</ul>	
 		</p>
       <br><p>
@@ -275,7 +277,8 @@ <h2 id="VersionHistory" name="VersionHistory">Version History</h2>
  			   <li>Improved export of curved railings material.
  			   <li>Corrected units for some properties of rooms and spaces in schedules exported to IFC as property sets.
  			   <li>Fixed the center line location of beams with trimmed ends exported to IFC 2x3.
- 			   <li>Fix for Column family geometry export. 
+ 			   <li>Fix for Column family geometry export.
+ 			   <li>Fixed bug with elements placing after export into 2x2.
  			   <li>Improved export of some clipped structural beams to IFC.
  			   <li>Improved export of walls containing adjacent openings to IFC.
  			   <li>Improved the export of walls with extensions cut by wall sweeps to IFC.
@@ -301,6 +304,7 @@ <h2 id="VersionHistory" name="VersionHistory">Version History</h2>
  			   <li>Fixed linking of some triangulated face sets.
  			   <li>Improved support for linking some invalid IFC files
  			   <li>Improved linking of IFC files that contained geometry with degenerate faces.
+ 			   <li>Fixed linking errors for usage with old Revit versions.
 			</ul>	
 		</p>
 	</div>

diff --git a/Source/IFCExporterUIOverride/IFCExport.xaml b/Source/IFCExporterUIOverride/IFCExport.xaml
@@ -14,7 +14,7 @@
                   SaveWindowSettings="True"
                   Closing="Window_Closing" 
                   Height="390" 
-                  Width="730" MinWidth="550" MinHeight="300">
+                  Width="730" MinWidth="550" MinHeight="305">
    <Grid Margin="10,0" RenderTransformOrigin="0,0">
       <Label Content="{x:Static p:Resources.FileName}" HorizontalAlignment="Left" Margin="0,12,0,0" x:Name="label_FileName" Height="28" VerticalAlignment="Top" Width="202" VerticalContentAlignment="Top" RenderTransformOrigin="0.462,0.478"/>
       <TextBox Height="23" Margin="210,12,125,0" Name="textBoxSetupFileName" VerticalAlignment="Top" IsEnabled="True"  TextWrapping="NoWrap" VerticalContentAlignment="Center"/>
@@ -34,8 +34,11 @@
                VerticalContentAlignment="Center" 
                Background="Transparent"/>
       <Label Content="{x:Static p:Resources.ProjectToExport}" HorizontalAlignment="Left" Margin="0,144,0,0" x:Name="label1_Copy" Height="28" VerticalAlignment="Top" Width="666" />
-      <ListView Margin="0,170,11,50" ScrollViewer.VerticalScrollBarVisibility="Auto" x:Name="listViewDocuments"/>
-      <TextBlock VerticalAlignment="Bottom"  Margin="0,0,0,10" Height="23" HorizontalAlignment="Left" Width="515">
+      <ListView Margin="0,170,11,55" ScrollViewer.VerticalScrollBarVisibility="Auto" x:Name="listViewDocuments"/>
+      <TextBlock VerticalAlignment="Bottom" Margin="0,0,0,40" Height="15" HorizontalAlignment="Left">
+         <Label Name="versionLabel" FontSize="10" Padding="0" Opacity="0.5"/>
+      </TextBlock>
+      <TextBlock VerticalAlignment="Bottom"  Margin="0,0,0,10" Height="20" HorizontalAlignment="Left" Width="515">
          <Hyperlink Click="OnHelpClick">
             <Run Text="{x:Static p:Resources.Help}" x:Uid="LearnMoreHyperlink" />
          </Hyperlink>

diff --git a/Source/IFCExporterUIOverride/IFCExport.xaml.cs b/Source/IFCExporterUIOverride/IFCExport.xaml.cs
@@ -244,12 +244,11 @@ public IFCExport(Autodesk.Revit.UI.UIApplication app, IFCExportConfigurationsMap
          UpdateCurrentSelectedSetupCombo(selectedConfigName);
          UpdateOpenedProjectsListView(app);
 
-#if IFC_OPENSOURCE
-         Title = Properties.Resources.ExportIFC + " (" + IFCUISettings.GetAssemblyVersionForUI() + ")";
-#else
          Title = Properties.Resources.ExportIFC;
+#if IFC_OPENSOURCE
+         versionLabel.Content = IFCUISettings.GetAssemblyVersionForUI();
 #endif
-         
+
          TheDocument = UpdateOpenedProject(app);
 
          int docToExport = GetDocumentExportCount();

diff --git a/Source/Revit.IFC.Common/Utility/IFCAnyHandleUtil.cs b/Source/Revit.IFC.Common/Utility/IFCAnyHandleUtil.cs
@@ -1254,6 +1254,7 @@ public static void SetAttribute(IFCAnyHandle handle, string name, IFCData value)
          }
          catch
          {
+            return default(T);
          }
 
          T aggregateAttribute = default(T);

diff --git a/Source/Revit.IFC.Export/Exporter/WallExporter.cs b/Source/Revit.IFC.Export/Exporter/WallExporter.cs
@@ -1150,7 +1150,6 @@ public static IFCAnyHandle ExportWallBase(ExporterIFC exporterIFC, string ifcEnu
 
                            if (isCurtainPanel)
                            {
-                              bodyExporterOptions.ExtrusionLocalCoordinateSystem = orientationTrf;
                               bodyExporterOptions.TryToExportAsExtrusion = true;
                               extraParams.PossibleExtrusionAxes = IFCExtrusionAxes.TryXYZ;
                            }

diff --git a/Source/Revit.IFC.Import/Data/IFCPhysicalSimpleQuantity.cs b/Source/Revit.IFC.Import/Data/IFCPhysicalSimpleQuantity.cs
@@ -165,7 +165,14 @@ public override void Create(Document doc, Element element, Category category, IF
             baseValue;
 
          Parameter existingParameter = null;
-         string originalParameterName = Name + "(" + propertySetName + ")";
+
+         // Navisworks uses this engine and needs support for the old naming.
+         // We use the API-only UseStreamlinedOptions as a proxy for knowing this.
+         string originalParameterName =
+            IFCImportFile.TheFile.Options.UseStreamlinedOptions ?
+            Name + "(" + propertySetName + ")" :
+            propertySetName + "." + Name;
+
          string parameterName = originalParameterName;
 
          if (!parameterGroupMap.TryFindParameter(parameterName, out existingParameter))

diff --git a/Source/Revit.IFC.Import/Data/IFCProperty.cs b/Source/Revit.IFC.Import/Data/IFCProperty.cs
@@ -241,7 +241,14 @@ public void Create(Document doc, Element element, Category category, IFCObjectDe
          Parameter existingParameter = null;
          bool elementIsType = (element is ElementType);
          string typeString = elementIsType ? " " + Resources.IFCTypeSchedule : string.Empty;
-         string originalParameterName = Name + "(" + propertySetName + typeString + ")";
+
+         // Navisworks uses this engine and needs support for the old naming.
+         // We use the API-only UseStreamlinedOptions as a proxy for knowing this.
+         string originalParameterName =
+            IFCImportFile.TheFile.Options.UseStreamlinedOptions ?
+            Name + "(" + propertySetName + typeString + ")" :
+            propertySetName + "." + Name + typeString;
+
          string parameterName = originalParameterName;
 
          if (parameterGroupMap.TryFindParameter(parameterName, out existingParameter))

diff --git a/Source/RevitIFCTools/IFC2X2_ADD1.exp b/Source/RevitIFCTools/IFC2X2_ADD1.exp
@@ -4064,12 +4064,8 @@ ENTITY IfcElement
  INVERSE
 	FillsVoids : SET [0:1] OF IfcRelFillsElement FOR RelatedBuildingElement;
 	ConnectedTo : SET [0:?] OF IfcRelConnectsElements FOR RelatingElement;
-	HasCoverings : SET [0:?] OF IfcRelCoversBldgElements FOR RelatingBuildingElement;
-	HasProjections : SET [0:?] OF IfcRelProjectsElement FOR RelatingElement;
 	HasPorts : SET [0:?] OF IfcRelConnectsPortToElement FOR RelatedElement;
 	HasOpenings : SET [0:?] OF IfcRelVoidsElement FOR RelatingBuildingElement;
-	IsConnectionRealization : SET [0:?] OF IfcRelConnectsWithRealizingElements FOR RealizingElements;
-	ProvidesBoundaries : SET [0:?] OF IfcRelSpaceBoundary FOR RelatedBuildingElement;
 	ConnectedFrom : SET [0:?] OF IfcRelConnectsElements FOR RelatedElement;
 	ContainedInStructure : SET [0:1] OF IfcRelContainedInSpatialStructure FOR RelatedElements;
 END_ENTITY;
@@ -5110,7 +5106,6 @@ ENTITY IfcObject
  INVERSE
 	IsDefinedBy : SET [0:?] OF IfcRelDefines FOR RelatedObjects;
 	HasAssociations : SET [0:?] OF IfcRelAssociates FOR RelatedObjects;
-	HasAssignments : SET [0:?] OF IfcRelAssigns FOR RelatedObjects;
 	Decomposes : SET [0:1] OF IfcRelDecomposes FOR RelatedObjects;
 	IsDecomposedBy : SET [0:?] OF IfcRelDecomposes FOR RelatingObject;
  WHERE
@@ -5122,6 +5117,7 @@ ENTITY IfcObjectPlacement
 	(IfcGridPlacement
 	,IfcLocalPlacement));
  INVERSE
+	PlacesObject : SET [0:?] OF IfcProduct FOR ObjectPlacement;
 	ReferencedByPlacements : SET [0:?] OF IfcLocalPlacement FOR PlacementRelTo;
 END_ENTITY;
 
@@ -5709,10 +5705,6 @@ ENTITY IfcProperty
 	,IfcSimpleProperty));
 	Name : IfcIdentifier;
 	Description : OPTIONAL IfcText;
- INVERSE
-	PropertyForDependance : SET [0:?] OF IfcPropertyDependencyRelationship FOR DependingProperty;
-	PropertyDependsOn : SET [0:?] OF IfcPropertyDependencyRelationship FOR DependantProperty;
-	PartOfComplex : SET [0:1] OF IfcComplexProperty FOR HasProperties;
 END_ENTITY;
 
 ENTITY IfcPropertyBoundedValue
@@ -6446,8 +6438,6 @@ ENTITY IfcRepresentation
 	RepresentationIdentifier : OPTIONAL IfcLabel;
 	RepresentationType : OPTIONAL IfcLabel;
 	Items : SET [1:?] OF IfcRepresentationItem;
- INVERSE
-	OfProductRepresentation : SET [0:1] OF IfcProductRepresentation FOR Representations;
 END_ENTITY;
 
 ENTITY IfcRepresentationContext
@@ -6465,6 +6455,8 @@ ENTITY IfcRepresentationItem
 	,IfcMappedItem
 	,IfcStyledItem
 	,IfcTopologicalRepresentationItem));
+ INVERSE
+	StyledByItem : SET [0:1] OF IfcStyledItem FOR Item;
 END_ENTITY;
 
 ENTITY IfcRepresentationMap;
@@ -6634,8 +6626,6 @@ END_ENTITY;
 
 ENTITY IfcShapeRepresentation
  SUBTYPE OF (IfcRepresentation);
- INVERSE
-	OfShapeAspect : SET [0:1] OF IfcShapeAspect FOR ShapeRepresentations;
  WHERE
 	WR21 : 'IFC2X2_FINAL.IFCGEOMETRICREPRESENTATIONCONTEXT' 
              IN TYPEOF(SELF\IfcRepresentation.ContextOfItems);

diff --git a/Source/RevitIFCTools/RevitIFCTools.csproj b/Source/RevitIFCTools/RevitIFCTools.csproj
@@ -213,11 +213,11 @@
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <PropertyGroup>
-    <PostBuildEvent>xcopy "$(TargetPath)" "C:\ProgramData\Autodesk\ApplicationPlugins\IFC 2021.bundle\Contents\2021\" /F /R /Y /I
-xcopy "$(TargetDir)IFC*.xsd" "C:\ProgramData\Autodesk\ApplicationPlugins\IFC 2021.bundle\Contents\2021\" /F /R /Y /I
-xcopy "$(TargetDir)IFC*.exp" "C:\ProgramData\Autodesk\ApplicationPlugins\IFC 2021.bundle\Contents\2021\" /F /R /Y /I
-xcopy "$(TargetDir)IFC Shared Parameters*.txt" "C:\ProgramData\Autodesk\ApplicationPlugins\IFC 2021.bundle\Contents\2021\" /F /R /Y /I
-xcopy "$(TargetDir)IFCCertifiedEntitiesAndPSets.json" "C:\ProgramData\Autodesk\ApplicationPlugins\IFC 2021.bundle\Contents\2021\" /F /R /Y /I
+    <PostBuildEvent>xcopy "$(TargetPath)" "C:\ProgramData\Autodesk\ApplicationPlugins\IFC 2022.bundle\Contents\2022\" /F /R /Y /I
+xcopy "$(TargetDir)IFC*.xsd" "C:\ProgramData\Autodesk\ApplicationPlugins\IFC 2022.bundle\Contents\2022\" /F /R /Y /I
+xcopy "$(TargetDir)IFC*.exp" "C:\ProgramData\Autodesk\ApplicationPlugins\IFC 2022.bundle\Contents\2022\" /F /R /Y /I
+xcopy "$(TargetDir)IFC Shared Parameters*.txt" "C:\ProgramData\Autodesk\ApplicationPlugins\IFC 2022.bundle\Contents\2022\" /F /R /Y /I
+xcopy "$(TargetDir)IFCCertifiedEntitiesAndPSets.json" "C:\ProgramData\Autodesk\ApplicationPlugins\IFC 2022.bundle\Contents\2022\" /F /R /Y /I
 </PostBuildEvent>
   </PropertyGroup>
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it.
-Original file line number
+Diff line change
@@ Expand Up @@
              }
              catch
              {
+                return default(T);
              }
              T aggregateAttribute = default(T);
@@ Expand Down @@