Merge pull request #547 from Autodesk/2023_material_properties_export

2023 material properties export

Author: t-vasyi

Source/RevitIFCTools/GeneratePsetDefWin.xaml.cs

@@ -359,8 +359,8 @@ int WriteGeneratedCode(StreamWriter outF, ProcessPsetDefinition procPsetDef, str
                setDescription = "PropertySetDescription";
                break;
             case "Ifc":
-               initPsetOrQsets = "InitPredefinedPropertySets";
-               setDescription = "PropertySetDescription";
+               initPsetOrQsets = "InitPreDefinedPropertySets";
+               setDescription = "PreDefinedPropertySetDescription";
                break;
             case "Qto":
                initPsetOrQsets = "InitQtoSets";
@@ -404,10 +404,12 @@ int WriteGeneratedCode(StreamWriter outF, ProcessPsetDefinition procPsetDef, str
             string varName = null;
             string setsName = null;
             string psetName = psetDefEntry.Key;
+            string certificationCheckName = null;
             switch (whichCat)
             {
                case "Pset":
                   setsName = "commonPropertySets";
+                  certificationCheckName = "AllowPsetToBeCreated";
                   outF.WriteLine("      private static void Init" + psetName + "(IList<{0}> {1})", setDescription, setsName);
                   varName = psetDefEntry.Key.Replace("Pset_", "propertySet");
                   outF.WriteLine("      {");
@@ -417,15 +419,17 @@ int WriteGeneratedCode(StreamWriter outF, ProcessPsetDefinition procPsetDef, str
                   break;
                case "Ifc":
                   setsName = "commonPropertySets";
+                  certificationCheckName = "AllowPredefPsetToBeCreated";
                   outF.WriteLine("      private static void Init" + psetName + "(IList<{0}> {1})", setDescription, setsName);
                   varName = psetDefEntry.Key.Replace("Pset_", "propertySet");
                   outF.WriteLine("      {");
                   outF.WriteLine("         {0} {1} = new {0}();", setDescription, varName);
                   outF.WriteLine("         {0}.Name = \"{1}\";", varName, psetName);
-                  outF.WriteLine("         PropertySetEntry ifcPSE = null;");
+                  outF.WriteLine("         PreDefinedPropertySetEntry ifcPSE = null;");
                   break;
                case "Qto":
                   setsName = "quantitySets";
+                  certificationCheckName = "AllowPsetToBeCreated";
                   outF.WriteLine("      private static void Init" + psetName + "(IList<{0}> {1})", setDescription, setsName);
                   varName = psetDefEntry.Key.Replace("Qto_", "qtoSet");
                   outF.WriteLine("      {");
@@ -446,7 +450,7 @@ int WriteGeneratedCode(StreamWriter outF, ProcessPsetDefinition procPsetDef, str
 
                if (vspecPDef.IfcVersion.StartsWith("IFC2X2", StringComparison.CurrentCultureIgnoreCase))
                {
-                  outF.WriteLine("         if (ExporterCacheManager.ExportOptionsCache.ExportAs2x2 && certifiedEntityAndPsetList.AllowPsetToBeCreated(ExporterCacheManager.ExportOptionsCache.FileVersion.ToString().ToUpper(), \"" + psetName + "\"))");
+                  outF.WriteLine("         if (ExporterCacheManager.ExportOptionsCache.ExportAs2x2 && certifiedEntityAndPsetList." + certificationCheckName + "(ExporterCacheManager.ExportOptionsCache.FileVersion.ToString().ToUpper(), \"" + psetName + "\"))");
                   outF.WriteLine("         {");
                   foreach (string applEnt in vspecPDef.PropertySetDef.ApplicableClasses)
                   {
@@ -463,7 +467,7 @@ int WriteGeneratedCode(StreamWriter outF, ProcessPsetDefinition procPsetDef, str
                else if (vspecPDef.IfcVersion.StartsWith("IFC2X3", StringComparison.CurrentCultureIgnoreCase)
                   || vspecPDef.IfcVersion.Equals("IFC2X3_TC1", StringComparison.CurrentCultureIgnoreCase))
                {
-                  outF.WriteLine("         if (ExporterCacheManager.ExportOptionsCache.ExportAs2x3 && certifiedEntityAndPsetList.AllowPsetToBeCreated(ExporterCacheManager.ExportOptionsCache.FileVersion.ToString().ToUpper(), \"" + psetName + "\"))");
+                  outF.WriteLine("         if (ExporterCacheManager.ExportOptionsCache.ExportAs2x3 && certifiedEntityAndPsetList." + certificationCheckName + "(ExporterCacheManager.ExportOptionsCache.FileVersion.ToString().ToUpper(), \"" + psetName + "\"))");
                   outF.WriteLine("         {");
                   foreach (string applEnt in vspecPDef.PropertySetDef.ApplicableClasses)
                   {
@@ -479,7 +483,7 @@ int WriteGeneratedCode(StreamWriter outF, ProcessPsetDefinition procPsetDef, str
                }
                else if (vspecPDef.SchemaFileVersion.Equals("IFC4_ADD1", StringComparison.CurrentCultureIgnoreCase))
                {
-                  outF.WriteLine("         if (ExporterCacheManager.ExportOptionsCache.ExportAs4_ADD1 && certifiedEntityAndPsetList.AllowPsetToBeCreated(ExporterCacheManager.ExportOptionsCache.FileVersion.ToString().ToUpper(), \"" + psetName + "\"))");
+                  outF.WriteLine("         if (ExporterCacheManager.ExportOptionsCache.ExportAs4_ADD1 && certifiedEntityAndPsetList." + certificationCheckName + "(ExporterCacheManager.ExportOptionsCache.FileVersion.ToString().ToUpper(), \"" + psetName + "\"))");
                   outF.WriteLine("         {");
                   foreach (string applEnt in vspecPDef.PropertySetDef.ApplicableClasses)
                   {
@@ -495,7 +499,7 @@ int WriteGeneratedCode(StreamWriter outF, ProcessPsetDefinition procPsetDef, str
                }
                else if (vspecPDef.SchemaFileVersion.Equals("IFC4_ADD2", StringComparison.CurrentCultureIgnoreCase))
                {
-                  outF.WriteLine("         if (ExporterCacheManager.ExportOptionsCache.ExportAs4 && certifiedEntityAndPsetList.AllowPsetToBeCreated(ExporterCacheManager.ExportOptionsCache.FileVersion.ToString().ToUpper(), \"" + psetName + "\"))");
+                  outF.WriteLine("         if (ExporterCacheManager.ExportOptionsCache.ExportAs4 && certifiedEntityAndPsetList." + certificationCheckName + "(ExporterCacheManager.ExportOptionsCache.FileVersion.ToString().ToUpper(), \"" + psetName + "\"))");
                   outF.WriteLine("         {");
                   foreach (string applEnt in vspecPDef.PropertySetDef.ApplicableClasses)
                   {
@@ -511,7 +515,7 @@ int WriteGeneratedCode(StreamWriter outF, ProcessPsetDefinition procPsetDef, str
                }
                else if (vspecPDef.SchemaFileVersion.Equals("IFC4", StringComparison.CurrentCultureIgnoreCase))
                {
-                  outF.WriteLine("         if (ExporterCacheManager.ExportOptionsCache.ExportAs4 && certifiedEntityAndPsetList.AllowPsetToBeCreated(ExporterCacheManager.ExportOptionsCache.FileVersion.ToString().ToUpper(), \"" + psetName + "\"))");
+                  outF.WriteLine("         if (ExporterCacheManager.ExportOptionsCache.ExportAs4 && certifiedEntityAndPsetList." + certificationCheckName + "(ExporterCacheManager.ExportOptionsCache.FileVersion.ToString().ToUpper(), \"" + psetName + "\"))");
                   outF.WriteLine("         {");
                   foreach (string applEnt in vspecPDef.PropertySetDef.ApplicableClasses)
                   {