Skip to content

Commit afffb1e

Browse files
o-babiio-babii
authored
Merge pull request #454 from Autodesk/23.1_Update_fixes
Various fixes for 23.1
2 parents 90015cf + 690fe31 commit afffb1e

11 files changed

+11869
-4426
lines changed

‎Install/Program Files to Install/IFC Shared Parameters-RevitIFCBuiltIn-Type_ALL.txt

+5,917-2,172
Large diffs are not rendered by default.

‎Install/Program Files to Install/IFC Shared Parameters-RevitIFCBuiltIn_ALL.txt

+5,915-2,232
Large diffs are not rendered by default.

‎Install/Program Files to Install/IFCExporterUIOverride.addin

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<RevitAddIns>
33
<AddIn Type="Application">
44
<Name>IFC override</Name>
5-
<Assembly>.\IFCExportUIOverride.dll</Assembly>
5+
<Assembly>.\IFCExporterUIOverride.dll</Assembly>
66
<AddInId>6DC299D6-F746-47BE-AE93-F00DDC714257</AddInId>
77
<FullClassName>BIM.IFC.Export.UI.IFCCommandOverrideApplication</FullClassName>
88
<VendorId>ADSK</VendorId>

‎Install/RevitIFCSetupWix/Product.wxs

+8-8
Original file line numberDiff line numberDiff line change
@@ -106,10 +106,10 @@
106106
<File Id ="FILE_Ifc_Import_Sig" Name="Revit.IFC.Import.sig" Source="$(var.ProjectDir)..\Program Files to Install\Revit.IFC.Import.sig" KeyPath="yes" />
107107
</Component>
108108
<Component Id = "COMP_IFC_ExternalUI_Sig" Guid="3159B919-CD50-469D-8DDE-FE339CEBBC1C">
109-
<File Id ="FILE_Ifc_ExternalUI_Sig" Name="IFCExportUIOverride.sig" Source="$(var.ProjectDir)..\Program Files to Install\IFCExportUIOverride.sig" KeyPath="yes" />
109+
<File Id ="FILE_Ifc_ExternalUI_Sig" Name="IFCExporterUIOverride.sig" Source="$(var.ProjectDir)..\Program Files to Install\IFCExporterUIOverride.sig" KeyPath="yes" />
110110
</Component>
111111
<Component Id = "COMP_IFC_ExternalUI_DLL" Guid="D7F89B58-029F-4062-B226-6F3D2EB7FE5D">
112-
<File Id ="FILE_Ifc_ExternalUI_DLL" Name="IFCExportUIOverride.dll" Source="$(var.ProjectDir)..\Program Files to Install\IFCExportUIOverride.dll" KeyPath="yes" />
112+
<File Id ="FILE_Ifc_ExternalUI_DLL" Name="IFCExporterUIOverride.dll" Source="$(var.ProjectDir)..\Program Files to Install\IFCExporterUIOverride.dll" KeyPath="yes" />
113113
</Component>
114114
<Component Id = "COMP_IFC_Common_DLL" Guid="C7ED4A2C-DCB1-457E-968F-2DDE9993C1B6">
115115
<File Id ="FILE_Ifc_Common_DLL" Name="Revit.IFC.Common.dll" Source="$(var.ProjectDir)..\Program Files to Install\Revit.IFC.Common.dll" KeyPath="yes" />
@@ -122,7 +122,7 @@
122122
<File Id ="FILE_Ifc_Import_DLL" Name="Revit.IFC.Import.dll" Source="$(var.Revit.IFC.Import.TargetDir)Revit.IFC.Import.dll" KeyPath="yes" />
123123
</Component>
124124
<Component Id = "COMP_IFC_ExternalUI_DLL" Guid="D7F89B58-029F-4062-B226-6F3D2EB7FE5D">
125-
<File Id ="FILE_Ifc_ExternalUI_DLL" Name="IFCExportUIOverride.dll" Source="$(var.IFCExporterUIOverride.TargetDir)IFCExportUIOverride.dll" KeyPath="yes" />
125+
<File Id ="FILE_Ifc_ExternalUI_DLL" Name="IFCExporterUIOverride.dll" Source="$(var.IFCExporterUIOverride.TargetDir)IFCExporterUIOverride.dll" KeyPath="yes" />
126126
</Component>
127127
<Component Id = "COMP_IFC_Common_DLL" Guid="C7ED4A2C-DCB1-457E-968F-2DDE9993C1B6">
128128
<File Id ="FILE_Ifc_Common_DLL" Name="Revit.IFC.Common.dll" Source="$(var.Revit.IFC.Common.TargetDir)Revit.IFC.Common.dll" KeyPath="yes" />
@@ -151,7 +151,7 @@
151151
<Component Id = "COMP_Antlr4Runtime_DLL" Guid="EA19D64B-491C-47AD-A019-57E581734481">
152152
<File Id ="FILE_Antlr4Runtime_DLL" Name="Antlr4.Runtime.dll" Source="$(var.Revit.IFC.Export.TargetDir)Antlr4.Runtime.dll" KeyPath="yes" />
153153
</Component>
154-
<Component Id = "COMP_GeometryGymIFC_DLL" Guid="467589B7-945B-4B06-89D1-668DFFAFD074">
154+
<Component Id = "COMP_GeometryGymIFC_DLL" Guid="467589B7-945B-4B06-89D1-668DFFAFD074">
155155
<File Id ="FILE_GeometryGymIFC_DLL" Name="GeometryGymIFC.dll" Source="$(var.Revit.IFC.Export.TargetDir)GeometryGymIFC.dll" KeyPath="yes" />
156156
</Component>
157157
<Component Id = "COMP_IFC2X2ADD1_EXP" Guid="03084C2B-FD44-48C8-AA91-71A9EB199181">
@@ -222,12 +222,12 @@
222222

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

@@ -255,7 +255,7 @@
255255
<util:XmlFile Id="SetKeyUI"
256256
Action="setValue"
257257
ElementPath="RevitAddIns/AddIn[\[]position()=1[\]]/Assembly"
258-
Value="[INSTALLDIR]IFCExportUIOverride.dll"
258+
Value="[INSTALLDIR]IFCExporterUIOverride.dll"
259259
File="[#FILE_UI_manifest]"
260260
SelectionLanguage="XPath"
261261
Sequence="1" />
@@ -270,7 +270,7 @@
270270
<util:XmlFile Id="SetKeyUI_LT"
271271
Action="setValue"
272272
ElementPath="RevitAddIns/AddIn[\[]position()=1[\]]/Assembly"
273-
Value="[INSTALLDIR]IFCExportUIOverride.dll"
273+
Value="[INSTALLDIR]IFCExporterUIOverride.dll"
274274
File="[DIR_Addins_LT]IFCExporterUIOverride.addin"
275275
SelectionLanguage="XPath"
276276
Sequence="1" />

‎Source/IFCExporterUIOverride/IFCExport.xaml

+6-3
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
SaveWindowSettings="True"
1515
Closing="Window_Closing"
1616
Height="438"
17-
Width="730" MinWidth="550" MinHeight="300">
17+
Width="730" MinWidth="550" MinHeight="305">
1818
<Grid Margin="10,0" RenderTransformOrigin="0,0">
1919
<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"/>
2020
<TextBox Height="23" Margin="210,12,125,0" Name="textBoxSetupFileName" VerticalAlignment="Top" IsEnabled="True" TextWrapping="NoWrap" VerticalContentAlignment="Center"/>
@@ -34,8 +34,11 @@
3434
VerticalContentAlignment="Center"
3535
Background="Transparent"/>
3636
<Label Content="{x:Static p:Resources.ProjectToExport}" HorizontalAlignment="Left" Margin="0,171,0,0" x:Name="label1_Copy" Height="28" VerticalAlignment="Top" Width="666" />
37-
<ListView Margin="0,204,11,50" ScrollViewer.VerticalScrollBarVisibility="Auto" x:Name="listViewDocuments"/>
38-
<TextBlock VerticalAlignment="Bottom" Margin="0,0,0,10" Height="23" HorizontalAlignment="Left" Width="515">
37+
<ListView Margin="0,204,11,55" ScrollViewer.VerticalScrollBarVisibility="Auto" x:Name="listViewDocuments"/>
38+
<TextBlock VerticalAlignment="Bottom" Margin="0,0,0,40" Height="15" HorizontalAlignment="Left">
39+
<Label Name="versionLabel" FontSize="10" Padding="0" Opacity="0.5"/>
40+
</TextBlock>
41+
<TextBlock VerticalAlignment="Bottom" Margin="0,0,0,10" Height="20" HorizontalAlignment="Left" Width="515">
3942
<Hyperlink Click="OnHelpClick">
4043
<Run Text="{x:Static p:Resources.Help}" x:Uid="LearnMoreHyperlink" />
4144
</Hyperlink>

‎Source/IFCExporterUIOverride/IFCExport.xaml.cs

+2-4
Original file line numberDiff line numberDiff line change
@@ -254,12 +254,10 @@ public IFCExport(Autodesk.Revit.UI.UIApplication app, IFCExportConfigurationsMap
254254
UpdateCurrentSelectedSetupCombo(selectedConfigName);
255255
UpdateOpenedProjectsListView(app);
256256

257-
#if IFC_OPENSOURCE
258-
Title = Properties.Resources.ExportIFC + " (" + IFCUISettings.GetAssemblyVersionForUI() + ")";
259-
#else
260257
Title = Properties.Resources.ExportIFC;
258+
#if IFC_OPENSOURCE
259+
versionLabel.Content = IFCUISettings.GetAssemblyVersionForUI();
261260
#endif
262-
263261
TheDocument = UpdateOpenedProject(app);
264262

265263
int docToExport = GetDocumentExportCount();

‎Source/IFCExporterUIOverride/IFCExporterUIOverride.csproj

+2-2
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
<OutputType>Library</OutputType>
1010
<AppDesignerFolder>Properties</AppDesignerFolder>
1111
<RootNamespace>BIM.IFC.Export.UI</RootNamespace>
12-
<AssemblyName>IFCExportUIOverride</AssemblyName>
12+
<AssemblyName>IFCExporterUIOverride</AssemblyName>
1313
<TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
1414
<TargetFrameworkProfile>
1515
</TargetFrameworkProfile>
@@ -259,4 +259,4 @@
259259
<Target Name="AfterBuild">
260260
</Target>
261261
-->
262-
</Project>
262+
</Project>

‎Source/Revit.IFC.Import/Data/IFCPhysicalSimpleQuantity.cs

+8-1
Original file line numberDiff line numberDiff line change
@@ -165,7 +165,14 @@ public override void Create(Document doc, Element element, Category category, IF
165165
baseValue;
166166

167167
Parameter existingParameter = null;
168-
string originalParameterName = propertySetName + "." + Name;
168+
169+
// Navisworks uses this engine and needs support for the old naming.
170+
// We use the API-only UseStreamlinedOptions as a proxy for knowing this.
171+
string originalParameterName =
172+
IFCImportFile.TheFile.Options.UseStreamlinedOptions ?
173+
Name + "(" + propertySetName + ")" :
174+
propertySetName + "." + Name;
175+
169176
string parameterName = originalParameterName;
170177

171178
if (!parameterGroupMap.TryFindParameter(parameterName, out existingParameter))

‎Source/Revit.IFC.Import/Data/IFCProperty.cs

+8-1
Original file line numberDiff line numberDiff line change
@@ -237,7 +237,14 @@ public void Create(Document doc, Element element, Category category, IFCObjectDe
237237
Parameter existingParameter = null;
238238
bool elementIsType = (element is ElementType);
239239
string typeString = elementIsType ? " " + Resources.IFCTypeSchedule : string.Empty;
240-
string originalParameterName = propertySetName + "." + Name + typeString;
240+
241+
// Navisworks uses this engine and needs support for the old naming.
242+
// We use the API-only UseStreamlinedOptions as a proxy for knowing this.
243+
string originalParameterName =
244+
IFCImportFile.TheFile.Options.UseStreamlinedOptions ?
245+
Name + "(" + propertySetName + typeString + ")" :
246+
propertySetName + "." + Name + typeString;
247+
241248
string parameterName = originalParameterName;
242249

243250
if (parameterGroupMap.TryFindParameter(parameterName, out existingParameter))

‎Source/Revit.IFC.Import/Revit.IFC.Import.csproj

+2-2
Original file line numberDiff line numberDiff line change
@@ -47,9 +47,9 @@
4747
<PlatformTarget>x64</PlatformTarget>
4848
</PropertyGroup>
4949
<ItemGroup>
50-
<Reference Include="ICSharpCode.SharpZipLib, Version=0.85.4.369, Culture=neutral, PublicKeyToken=9ea901ae1ee158aa, processorArchitecture=MSIL">
50+
<Reference Include="ICSharpCode.SharpZipLib, Version=1.3.3.11, Culture=neutral, PublicKeyToken=9ea901ae1ee158aa, processorArchitecture=MSIL">
5151
<SpecificVersion>False</SpecificVersion>
52-
<HintPath>..\ThirdParty\ICSharpCode\ICSharpCode.SharpZipLib.DLL</HintPath>
52+
<HintPath>..\ThirdParty\ICSharpCode\ICSharpCode.SharpZipLib.dll</HintPath>
5353
<Private>False</Private>
5454
</Reference>
5555
<Reference Include="RevitAPI, Version=23.0.0.0, Culture=neutral, processorArchitecture=AMD64">

‎Source/ThirdParty/ICSharpCode/ICSharpCode.SharpZipLib.DLL

23.6 KB
Binary file not shown.

0 commit comments

Comments
 (0)