Finalize relase 20.3.0.0

Wawan Solihin · Wawan Solihin · commit e1643242eeca · 2021-01-22T02:44:15.000+08:00
diff --git a/Install/Program Files to Install/bundle/Contents/Resources/ADSKIFCExporterHelp.htm b/Install/Program Files to Install/bundle/Contents/Resources/ADSKIFCExporterHelp.htm
@@ -241,10 +241,10 @@ <h2 id="VersionHistory" name="VersionHistory">Version History</h2>
       <br>
 	<div class="row">
 		<div class="column">
-			<img width=300 src="Software Certifcation Certificate Revit - Architectural export ER.png" alt=Icon>
+			<img width=300 src="Software Certification Certificate Revit - Architectural export ER.png" alt=Icon>
 		</div>
 		<div class="column">
-			<img width=300 src="Software Certifcation Certificate Revit - Structural export ER.png" alt=Icon>
+			<img width=300 src="Software Certification Certificate Revit - Structural export ER.png" alt=Icon>
 		</div>
 	</div>
 
diff --git a/Install/Program Files to Install/bundle/Contents/Resources/Software Certification Certificate Revit - Architectural export ER.png b/Install/Program Files to Install/bundle/Contents/Resources/Software Certification Certificate Revit - Architectural export ER.png
diff --git a/Install/Program Files to Install/bundle/Contents/Resources/Software Certification Certificate Revit - Structural export ER.png b/Install/Program Files to Install/bundle/Contents/Resources/Software Certification Certificate Revit - Structural export ER.png
diff --git a/Install/RevitIFCSetupWix/Product.wxs b/Install/RevitIFCSetupWix/Product.wxs
@@ -202,6 +202,12 @@
          <Component Id = "COMP_IFC_16_PNG" Guid="E6CF83A5-A19C-4190-9A88-D54C390A6971">
             <File Id ="FILE_IFC_16_PNG" Name="IFCExporter_16.png" Source="$(var.ProjectDir)..\Program Files to Install\bundle\Contents\Resources\IFCExporter_16.png" KeyPath="yes" />
          </Component>
+         <Component Id = "COMP_IFC4RV_A_CERT" Guid="EDC0912A-5AA0-44D6-8272-E8BBB4A99B3B">
+            <File Id ="FILE_IFC4RV_A_CERT" Name="Software Certification Certificate Revit - Architectural export ER.png" Source="$(var.ProjectDir)..\Program Files to Install\bundle\Contents\Resources\Software Certification Certificate Revit - Architectural export ER.png" KeyPath="yes" />
+         </Component>
+         <Component Id = "COMP_IFC4RV_S_CERT" Guid="0D2A0278-2D37-4C20-89C0-5D68AD4A06B3">
+            <File Id ="FILE_IFC4RV_S_CERT" Name="Software Certification Certificate Revit - Structural export ER.png" Source="$(var.ProjectDir)..\Program Files to Install\bundle\Contents\Resources\Software Certification Certificate Revit - Structural export ER.png" KeyPath="yes" />
+         </Component>
       </ComponentGroup>
 
       <ComponentGroup Id="ProductFRFiles" Directory="INSTALLFRUI">
diff --git a/Source/Revit.IFC.Common/Utility/IfcSchemaEntityNode.cs b/Source/Revit.IFC.Common/Utility/IfcSchemaEntityNode.cs
@@ -144,7 +144,7 @@ public bool IsSubTypeOf(string superTypeName, bool strict = true)
                if (superTypeName.Equals(node.superType.Name, StringComparison.InvariantCultureIgnoreCase))
                {
                   return true;
-            }
+               }
             }
             else
             {
diff --git a/Source/Revit.IFC.Export/Exporter/Exporter.cs b/Source/Revit.IFC.Export/Exporter/Exporter.cs
@@ -238,10 +238,10 @@ protected void ExportAdvanceSteelElements(ExporterIFC exporterIFC, Autodesk.Revi
          {
             try
             {
-               Assembly assembly = Assembly.LoadFrom(AppDomain.CurrentDomain.BaseDirectory + @"\Addins\SteelConnections\Autodesk.SteelConnections.ASIFC.dll");
+               Assembly assembly = Assembly.LoadFrom(AppDomain.CurrentDomain.BaseDirectory + @"\Addins\SteelConnections\RvtAS_IFC.dll");
                if (assembly != null)
                {
-                  Type type = assembly.GetType("Autodesk.SteelConnections.ASIFC.ASExporter");
+                  Type type = assembly.GetType("RvtAS_IFC.ASExporter");
                   if (type != null)
                   {
                      MethodInfo method = type.GetMethod("ExportASElements");
@@ -578,7 +578,7 @@ protected virtual bool CanExportElement(ExporterIFC exporterIFC, Autodesk.Revit.
                   if (graphicsCell != null) // Concrete elements with cell that have HasGraphics set to true, must be handled by Revit exporter.
                      hasGraphics = (bool)graphicsCell.GetValue(cell, null);
 
-                  if (hasGraphics)
+                  if (!hasGraphics)
                      return false;
                }
             }

Original file line number	Diff line number	Diff line change
`@@ -144,7 +144,7 @@ public bool IsSubTypeOf(string superTypeName, bool strict = true)`
`144`	`144`	`if (superTypeName.Equals(node.superType.Name, StringComparison.InvariantCultureIgnoreCase))`
`145`	`145`	`{`
`146`	`146`	`return true;`
`147`		`- }`
	`147`	`+ }`
`148`	`148`	`}`
`149`	`149`	`else`
`150`	`150`	`{`
Original file line number	Diff line number	Diff line change
`@@ -238,10 +238,10 @@ protected void ExportAdvanceSteelElements(ExporterIFC exporterIFC, Autodesk.Revi`
`238`	`238`	`{`
`239`	`239`	`try`
`240`	`240`	`{`
`241`		`- Assembly assembly = Assembly.LoadFrom(AppDomain.CurrentDomain.BaseDirectory + @"\Addins\SteelConnections\Autodesk.SteelConnections.ASIFC.dll");`
	`241`	`+ Assembly assembly = Assembly.LoadFrom(AppDomain.CurrentDomain.BaseDirectory + @"\Addins\SteelConnections\RvtAS_IFC.dll");`
`242`	`242`	`if (assembly != null)`
`243`	`243`	`{`
`244`		`- Type type = assembly.GetType("Autodesk.SteelConnections.ASIFC.ASExporter");`
	`244`	`+ Type type = assembly.GetType("RvtAS_IFC.ASExporter");`
`245`	`245`	`if (type != null)`
`246`	`246`	`{`
`247`	`247`	`MethodInfo method = type.GetMethod("ExportASElements");`
`@@ -578,7 +578,7 @@ protected virtual bool CanExportElement(ExporterIFC exporterIFC, Autodesk.Revit.`
`578`	`578`	`if (graphicsCell != null) // Concrete elements with cell that have HasGraphics set to true, must be handled by Revit exporter.`
`579`	`579`	`hasGraphics = (bool)graphicsCell.GetValue(cell, null);`
`580`	`580`
`581`		`- if (hasGraphics)`
	`581`	`+ if (!hasGraphics)`
`582`	`582`	`return false;`
`583`	`583`	`}`
`584`	`584`	`}`