diff --git a/All.sln b/All.sln index 0b60654940..5e1fe75b15 100644 --- a/All.sln +++ b/All.sln @@ -366,6 +366,10 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ConverterTeklaStructures202 EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TestsPerformance", "Core\TestsPerformance\TestsPerformance.csproj", "{4D1C70D7-FFD5-4518-A374-2A23E020D416}" EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ConnectorAdvanceSteel2024", "ConnectorAutocadCivil\ConnectorAdvanceSteel2024\ConnectorAdvanceSteel2024.csproj", "{3B9189B9-E485-448A-8793-9B9587A36791}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ConverterAdvanceSteel2024", "Objects\Converters\ConverterAutocadCivil\ConverterAdvanceSteel2024\ConverterAdvanceSteel2024.csproj", "{737D5567-7B1F-410D-9B7B-BAE8065ED15B}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug Mac|Any CPU = Debug Mac|Any CPU @@ -2003,6 +2007,38 @@ Global {4D1C70D7-FFD5-4518-A374-2A23E020D416}.Release|Any CPU.Build.0 = Release|Any CPU {4D1C70D7-FFD5-4518-A374-2A23E020D416}.Release|x64.ActiveCfg = Release|Any CPU {4D1C70D7-FFD5-4518-A374-2A23E020D416}.Release|x64.Build.0 = Release|Any CPU + {3B9189B9-E485-448A-8793-9B9587A36791}.Debug Mac|Any CPU.ActiveCfg = Debug|Any CPU + {3B9189B9-E485-448A-8793-9B9587A36791}.Debug Mac|Any CPU.Build.0 = Debug|Any CPU + {3B9189B9-E485-448A-8793-9B9587A36791}.Debug Mac|x64.ActiveCfg = Debug|Any CPU + {3B9189B9-E485-448A-8793-9B9587A36791}.Debug Mac|x64.Build.0 = Debug|Any CPU + {3B9189B9-E485-448A-8793-9B9587A36791}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {3B9189B9-E485-448A-8793-9B9587A36791}.Debug|Any CPU.Build.0 = Debug|Any CPU + {3B9189B9-E485-448A-8793-9B9587A36791}.Debug|x64.ActiveCfg = Debug|Any CPU + {3B9189B9-E485-448A-8793-9B9587A36791}.Debug|x64.Build.0 = Debug|Any CPU + {3B9189B9-E485-448A-8793-9B9587A36791}.Release Mac|Any CPU.ActiveCfg = Release|Any CPU + {3B9189B9-E485-448A-8793-9B9587A36791}.Release Mac|Any CPU.Build.0 = Release|Any CPU + {3B9189B9-E485-448A-8793-9B9587A36791}.Release Mac|x64.ActiveCfg = Release|Any CPU + {3B9189B9-E485-448A-8793-9B9587A36791}.Release Mac|x64.Build.0 = Release|Any CPU + {3B9189B9-E485-448A-8793-9B9587A36791}.Release|Any CPU.ActiveCfg = Release|Any CPU + {3B9189B9-E485-448A-8793-9B9587A36791}.Release|Any CPU.Build.0 = Release|Any CPU + {3B9189B9-E485-448A-8793-9B9587A36791}.Release|x64.ActiveCfg = Release|Any CPU + {3B9189B9-E485-448A-8793-9B9587A36791}.Release|x64.Build.0 = Release|Any CPU + {737D5567-7B1F-410D-9B7B-BAE8065ED15B}.Debug Mac|Any CPU.ActiveCfg = Debug|Any CPU + {737D5567-7B1F-410D-9B7B-BAE8065ED15B}.Debug Mac|Any CPU.Build.0 = Debug|Any CPU + {737D5567-7B1F-410D-9B7B-BAE8065ED15B}.Debug Mac|x64.ActiveCfg = Debug|Any CPU + {737D5567-7B1F-410D-9B7B-BAE8065ED15B}.Debug Mac|x64.Build.0 = Debug|Any CPU + {737D5567-7B1F-410D-9B7B-BAE8065ED15B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {737D5567-7B1F-410D-9B7B-BAE8065ED15B}.Debug|Any CPU.Build.0 = Debug|Any CPU + {737D5567-7B1F-410D-9B7B-BAE8065ED15B}.Debug|x64.ActiveCfg = Debug|Any CPU + {737D5567-7B1F-410D-9B7B-BAE8065ED15B}.Debug|x64.Build.0 = Debug|Any CPU + {737D5567-7B1F-410D-9B7B-BAE8065ED15B}.Release Mac|Any CPU.ActiveCfg = Release|Any CPU + {737D5567-7B1F-410D-9B7B-BAE8065ED15B}.Release Mac|Any CPU.Build.0 = Release|Any CPU + {737D5567-7B1F-410D-9B7B-BAE8065ED15B}.Release Mac|x64.ActiveCfg = Release|Any CPU + {737D5567-7B1F-410D-9B7B-BAE8065ED15B}.Release Mac|x64.Build.0 = Release|Any CPU + {737D5567-7B1F-410D-9B7B-BAE8065ED15B}.Release|Any CPU.ActiveCfg = Release|Any CPU + {737D5567-7B1F-410D-9B7B-BAE8065ED15B}.Release|Any CPU.Build.0 = Release|Any CPU + {737D5567-7B1F-410D-9B7B-BAE8065ED15B}.Release|x64.ActiveCfg = Release|Any CPU + {737D5567-7B1F-410D-9B7B-BAE8065ED15B}.Release|x64.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -2157,6 +2193,8 @@ Global {511C2FB0-9C73-4AC9-BA59-C8A84C089C59} = {18C8730C-0173-4987-9416-46F86EC20541} {EB52E451-9ED8-460E-9EE4-6717BFB12EAB} = {5D988C50-8E85-402A-9020-A4AB0565F0C9} {4D1C70D7-FFD5-4518-A374-2A23E020D416} = {8AA78EE8-C33B-4BC5-992A-E5DE7AB0BEC7} + {3B9189B9-E485-448A-8793-9B9587A36791} = {7B7C4CB1-3D60-4A5B-9902-C812521A24B3} + {737D5567-7B1F-410D-9B7B-BAE8065ED15B} = {BE521908-7944-46F3-98BF-B47D34509934} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {1D43D91B-4F01-4A78-8250-CC6F9BD93A14} @@ -2180,6 +2218,7 @@ Global Objects\Converters\ConverterRevit\ConverterRevitShared\ConverterRevitShared.projitems*{2dcd648d-dca5-4d2a-8b14-ad2cb85d24b0}*SharedItemsImports = 13 ConnectorBentley\ConnectorBentleyShared\ConnectorBentleyShared.projitems*{372d9f0f-ede9-4050-bf8c-758911c5c2e0}*SharedItemsImports = 13 ConnectorTeklaStructures\ConnectorTeklaStructuresShared\ConnectorTeklaStructuresShared.projitems*{3af1ef30-0906-4926-a02c-4e3ad666352a}*SharedItemsImports = 5 + ConnectorAutocadCivil\ConnectorAutocadCivil\ConnectorAutocadCivilShared.projitems*{3b9189b9-e485-448a-8793-9b9587a36791}*SharedItemsImports = 5 Objects\Converters\ConverterRhinoGh\ConverterRhinoGhShared\ConverterRhinoGhShared.projitems*{3cdef4cc-2cfa-4939-8427-3ed00fa9db55}*SharedItemsImports = 5 Objects\Converters\ConverterDynamo\ConverterDynamoShared\ConverterDynamoShared.projitems*{3df12639-78b6-41b3-a046-a675035369be}*SharedItemsImports = 5 ConnectorAutocadCivil\ConnectorAutocadCivil\ConnectorAutocadCivilShared.projitems*{3e30d170-3cb4-4728-97d5-887c5019da9b}*SharedItemsImports = 5 @@ -2207,6 +2246,7 @@ Global ConnectorTeklaStructures\ConnectorTeklaStructuresShared\ConnectorTeklaStructuresShared.projitems*{67157264-aaa5-46a8-a38b-16254b49b892}*SharedItemsImports = 5 Objects\Converters\ConverterDynamo\ConverterDynamoShared\ConverterDynamoShared.projitems*{67a463d3-e98b-4b16-b069-d7bbb05386a1}*SharedItemsImports = 5 Objects\Converters\ConverterRevit\ConverterRevitShared\ConverterRevitShared.projitems*{67a463d3-e98b-4b16-b069-d7bbb05386a1}*SharedItemsImports = 5 + Objects\Converters\ConverterAutocadCivil\ConverterAutocadCivilShared\ConverterAutocadCivilShared.projitems*{737d5567-7b1f-410d-9b7b-bae8065ed15b}*SharedItemsImports = 5 ConnectorNavisworks\ConnectorNavisworks\ConnectorNavisworks.Shared.projitems*{74e39841-b2fa-494d-ac40-a6e505de6b33}*SharedItemsImports = 5 Objects\Converters\ConverterRevit\ConverterRevitShared\ConverterRevitShared.projitems*{76937388-bc9e-4083-9d6e-59cc627e3804}*SharedItemsImports = 5 ConnectorNavisworks\ConnectorNavisworks\ConnectorNavisworks.Shared.projitems*{77d4f346-aca5-42c8-8522-5ef176f3adf1}*SharedItemsImports = 5 diff --git a/ConnectorAutocadCivil/ConnectorAdvanceSteel.slnf b/ConnectorAutocadCivil/ConnectorAdvanceSteel.slnf index 1f800a7fa8..365a290f91 100644 --- a/ConnectorAutocadCivil/ConnectorAdvanceSteel.slnf +++ b/ConnectorAutocadCivil/ConnectorAdvanceSteel.slnf @@ -4,7 +4,9 @@ "projects": [ "ConnectorAutocadCivil\\AdvanceSteelAddinRegistrator\\AdvanceSteelAddinRegistrator.csproj", "ConnectorAutocadCivil\\ConnectorAdvanceSteel2023\\ConnectorAdvanceSteel2023.csproj", + "ConnectorAutocadCivil\\ConnectorAdvanceSteel2024\\ConnectorAdvanceSteel2024.csproj", "ConnectorAutocadCivil\\ConnectorAutocad2023\\ConnectorAutocad2023.csproj", + "ConnectorAutocadCivil\\ConnectorAutocad2024\\ConnectorAutocad2024.csproj", "ConnectorAutocadCivil\\ConnectorAutocadCivil\\ConnectorAutocadCivilShared.shproj", "Core\\Core\\Core.csproj", "Core\\Tests\\TestsUnit.csproj", @@ -12,7 +14,9 @@ "DesktopUI2\\AvaloniaHwndHost\\AvaloniaHwndHost.csproj", "DesktopUI2\\DesktopUI2\\DesktopUI2.csproj", "Objects\\Converters\\ConverterAutocadCivil\\ConverterAdvanceSteel2023\\ConverterAdvanceSteel2023.csproj", + "Objects\\Converters\\ConverterAutocadCivil\\ConverterAdvanceSteel2024\\ConverterAdvanceSteel2024.csproj", "Objects\\Converters\\ConverterAutocadCivil\\ConverterAutocad2023\\ConverterAutocad2023.csproj", + "Objects\\Converters\\ConverterAutocadCivil\\ConverterAutocad2024\\ConverterAutocad2024.csproj", "Objects\\Converters\\ConverterAutocadCivil\\ConverterAutocadCivilShared\\ConverterAutocadCivilShared.shproj", "Objects\\Objects\\Objects.csproj", "Objects\\Tests\\Tests.csproj" diff --git a/ConnectorAutocadCivil/ConnectorAdvanceSteel2023/ConnectorAdvanceSteel2023.csproj b/ConnectorAutocadCivil/ConnectorAdvanceSteel2023/ConnectorAdvanceSteel2023.csproj index a36819fcaf..f7b63a6de1 100644 --- a/ConnectorAutocadCivil/ConnectorAdvanceSteel2023/ConnectorAdvanceSteel2023.csproj +++ b/ConnectorAutocadCivil/ConnectorAdvanceSteel2023/ConnectorAdvanceSteel2023.csproj @@ -6,7 +6,7 @@ ConnectorAdvanceSteel2023 ConnectorAdvanceSteel2023 x64 - $(DefineConstants);ADVANCESTEEL2023 + $(DefineConstants);ADVANCESTEEL;ADVANCESTEEL2023 false Pedro Henrique Liberato diff --git a/ConnectorAutocadCivil/ConnectorAdvanceSteel2024/ConnectorAdvanceSteel2024.csproj b/ConnectorAutocadCivil/ConnectorAdvanceSteel2024/ConnectorAdvanceSteel2024.csproj new file mode 100644 index 0000000000..898f68ee64 --- /dev/null +++ b/ConnectorAutocadCivil/ConnectorAdvanceSteel2024/ConnectorAdvanceSteel2024.csproj @@ -0,0 +1,64 @@ + + + Speckle.ConnectorAdvanceSteel + SpeckleConnectorAdvanceSteel + net48 + ConnectorAdvanceSteel2024 + ConnectorAdvanceSteel2024 + x64 + $(DefineConstants);ADVANCESTEEL;ADVANCESTEEL2024 + false + Pedro Henrique Liberato + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/ConnectorAutocadCivil/ConnectorAdvanceSteel2024/MyAddons.xml b/ConnectorAutocadCivil/ConnectorAdvanceSteel2024/MyAddons.xml new file mode 100644 index 0000000000..d4af375593 --- /dev/null +++ b/ConnectorAutocadCivil/ConnectorAdvanceSteel2024/MyAddons.xml @@ -0,0 +1,9 @@ + + + + + Speckle + $PATH$ + + + \ No newline at end of file diff --git a/ConnectorAutocadCivil/ConnectorAdvanceSteel2024/Properties/launchSettings.json b/ConnectorAutocadCivil/ConnectorAdvanceSteel2024/Properties/launchSettings.json new file mode 100644 index 0000000000..74a79ccc0e --- /dev/null +++ b/ConnectorAutocadCivil/ConnectorAdvanceSteel2024/Properties/launchSettings.json @@ -0,0 +1,9 @@ +{ + "profiles": { + "Debug AdvanceSteel": { + "commandName": "Executable", + "executablePath": "C:\\Program Files\\Autodesk\\AutoCAD 2024\\acad.exe", + "commandLineArgs": "/language \"en-US\" /product \"ADVS\" /p \"<>\"" + } + } +} \ No newline at end of file diff --git a/ConnectorAutocadCivil/ConnectorAutocadCivil.sln b/ConnectorAutocadCivil/ConnectorAutocadCivil.sln index d19e92cfdd..e122c2b1bd 100644 --- a/ConnectorAutocadCivil/ConnectorAutocadCivil.sln +++ b/ConnectorAutocadCivil/ConnectorAutocadCivil.sln @@ -53,13 +53,17 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ConnectorAdvanceSteel2023", EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AdvanceSteelAddinRegistrator", "AdvanceSteelAddinRegistrator\AdvanceSteelAddinRegistrator.csproj", "{4A9E92FD-CFF2-494F-AFA8-6AA2FE8BA761}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ConverterCivil2024", "..\Objects\Converters\ConverterAutocadCivil\ConverterCivil2024\ConverterCivil2024.csproj", "{5484584C-9B0B-4313-B25E-E52D8D3741CA}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ConverterCivil2024", "..\Objects\Converters\ConverterAutocadCivil\ConverterCivil2024\ConverterCivil2024.csproj", "{5484584C-9B0B-4313-B25E-E52D8D3741CA}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ConverterAutocad2024", "..\Objects\Converters\ConverterAutocadCivil\ConverterAutocad2024\ConverterAutocad2024.csproj", "{79E41261-3078-4F38-A71E-4B4020CF8F57}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ConverterAutocad2024", "..\Objects\Converters\ConverterAutocadCivil\ConverterAutocad2024\ConverterAutocad2024.csproj", "{79E41261-3078-4F38-A71E-4B4020CF8F57}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ConnectorAutocad2024", "ConnectorAutocad2024\ConnectorAutocad2024.csproj", "{54779824-3887-458D-A241-684518D77464}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ConnectorAutocad2024", "ConnectorAutocad2024\ConnectorAutocad2024.csproj", "{54779824-3887-458D-A241-684518D77464}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ConnectorCivil2024", "ConnectorCivil2024\ConnectorCivil2024.csproj", "{23478901-5C29-4D54-A66A-AE9FEA6118C7}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ConnectorCivil2024", "ConnectorCivil2024\ConnectorCivil2024.csproj", "{23478901-5C29-4D54-A66A-AE9FEA6118C7}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ConverterAdvanceSteel2024", "..\Objects\Converters\ConverterAutocadCivil\ConverterAdvanceSteel2024\ConverterAdvanceSteel2024.csproj", "{C7F4DFA0-18FE-4C0B-A9DC-DAD74D5E6E13}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ConnectorAdvanceSteel2024", "ConnectorAdvanceSteel2024\ConnectorAdvanceSteel2024.csproj", "{572B1D77-83BA-4E96-A70A-7D000D2AC220}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution @@ -155,6 +159,14 @@ Global {23478901-5C29-4D54-A66A-AE9FEA6118C7}.Debug|Any CPU.Build.0 = Debug|Any CPU {23478901-5C29-4D54-A66A-AE9FEA6118C7}.Release|Any CPU.ActiveCfg = Release|Any CPU {23478901-5C29-4D54-A66A-AE9FEA6118C7}.Release|Any CPU.Build.0 = Release|Any CPU + {C7F4DFA0-18FE-4C0B-A9DC-DAD74D5E6E13}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {C7F4DFA0-18FE-4C0B-A9DC-DAD74D5E6E13}.Debug|Any CPU.Build.0 = Debug|Any CPU + {C7F4DFA0-18FE-4C0B-A9DC-DAD74D5E6E13}.Release|Any CPU.ActiveCfg = Release|Any CPU + {C7F4DFA0-18FE-4C0B-A9DC-DAD74D5E6E13}.Release|Any CPU.Build.0 = Release|Any CPU + {572B1D77-83BA-4E96-A70A-7D000D2AC220}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {572B1D77-83BA-4E96-A70A-7D000D2AC220}.Debug|Any CPU.Build.0 = Debug|Any CPU + {572B1D77-83BA-4E96-A70A-7D000D2AC220}.Release|Any CPU.ActiveCfg = Release|Any CPU + {572B1D77-83BA-4E96-A70A-7D000D2AC220}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -182,23 +194,31 @@ Global {79E41261-3078-4F38-A71E-4B4020CF8F57} = {8AFDB1E6-D3E7-45EA-BCDC-F3554BDDEF1E} {54779824-3887-458D-A241-684518D77464} = {A07071D5-E197-487D-B543-28639AC3C719} {23478901-5C29-4D54-A66A-AE9FEA6118C7} = {A07071D5-E197-487D-B543-28639AC3C719} + {C7F4DFA0-18FE-4C0B-A9DC-DAD74D5E6E13} = {8AFDB1E6-D3E7-45EA-BCDC-F3554BDDEF1E} + {572B1D77-83BA-4E96-A70A-7D000D2AC220} = {A07071D5-E197-487D-B543-28639AC3C719} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {EAFBA51C-7222-435F-8BDF-8C15B27A34C8} EndGlobalSection GlobalSection(SharedMSBuildProjectFiles) = preSolution ..\Objects\Converters\ConverterAutocadCivil\ConverterAutocadCivilShared\ConverterAutocadCivilShared.projitems*{0a736319-40f8-4a30-868a-69e856a849e3}*SharedItemsImports = 5 + ConnectorAutocadCivil\ConnectorAutocadCivilShared.projitems*{23478901-5c29-4d54-a66a-ae9fea6118c7}*SharedItemsImports = 5 ConnectorAutocadCivil\ConnectorAutocadCivilShared.projitems*{2639e37d-80d3-415a-b4d1-20d7f321f27f}*SharedItemsImports = 5 ..\Objects\Converters\ConverterAutocadCivil\ConverterAutocadCivilShared\ConverterAutocadCivilShared.projitems*{2d0f9f8a-2e89-4780-978a-cd92d6d7b843}*SharedItemsImports = 13 ..\Objects\Converters\ConverterAutocadCivil\ConverterAutocadCivilShared\ConverterAutocadCivilShared.projitems*{361b45eb-dc3f-42bb-93ee-21f31a05fa68}*SharedItemsImports = 5 ConnectorAutocadCivil\ConnectorAutocadCivilShared.projitems*{464f2220-d7d9-4d8c-bb3d-b93a1c603469}*SharedItemsImports = 5 + ConnectorAutocadCivil\ConnectorAutocadCivilShared.projitems*{54779824-3887-458d-a241-684518d77464}*SharedItemsImports = 5 + ..\Objects\Converters\ConverterAutocadCivil\ConverterAutocadCivilShared\ConverterAutocadCivilShared.projitems*{5484584c-9b0b-4313-b25e-e52d8d3741ca}*SharedItemsImports = 5 + ConnectorAutocadCivil\ConnectorAutocadCivilShared.projitems*{572b1d77-83ba-4e96-a70a-7d000d2ac220}*SharedItemsImports = 5 ..\Objects\Converters\ConverterAutocadCivil\ConverterAutocadCivilShared\ConverterAutocadCivilShared.projitems*{575293fb-158c-4f91-abc1-18b60f310b32}*SharedItemsImports = 5 ..\Objects\Converters\ConverterAutocadCivil\ConverterAutocadCivilShared\ConverterAutocadCivilShared.projitems*{57a28a09-c64e-47f6-b602-b6d58b19f1d5}*SharedItemsImports = 5 ConnectorAutocadCivil\ConnectorAutocadCivilShared.projitems*{58a88f1a-7489-46d2-949d-2fc3f68c8d84}*SharedItemsImports = 5 + ..\Objects\Converters\ConverterAutocadCivil\ConverterAutocadCivilShared\ConverterAutocadCivilShared.projitems*{79e41261-3078-4f38-a71e-4b4020cf8f57}*SharedItemsImports = 5 ..\Objects\Converters\ConverterAutocadCivil\ConverterAutocadCivilShared\ConverterAutocadCivilShared.projitems*{8cfc7609-f640-4683-bf13-fe144d3dc50b}*SharedItemsImports = 5 ..\Objects\Converters\ConverterAutocadCivil\ConverterAutocadCivilShared\ConverterAutocadCivilShared.projitems*{9a11c16b-790f-437a-9e04-7e0d3ecdc06b}*SharedItemsImports = 5 ConnectorAutocadCivil\ConnectorAutocadCivilShared.projitems*{ad10c167-937f-4706-9eb5-c99f86c35e8f}*SharedItemsImports = 5 ConnectorAutocadCivil\ConnectorAutocadCivilShared.projitems*{b47492d9-2eda-4016-a930-7fa708c85c3d}*SharedItemsImports = 13 + ..\Objects\Converters\ConverterAutocadCivil\ConverterAutocadCivilShared\ConverterAutocadCivilShared.projitems*{c7f4dfa0-18fe-4c0b-a9dc-dad74d5e6e13}*SharedItemsImports = 5 ..\Objects\Converters\ConverterAutocadCivil\ConverterAutocadCivilShared\ConverterAutocadCivilShared.projitems*{d6731414-a695-4f89-aea1-ae2141a1dac1}*SharedItemsImports = 5 ConnectorAutocadCivil\ConnectorAutocadCivilShared.projitems*{f4aa033f-4f85-4990-afe9-86be00abe973}*SharedItemsImports = 5 ConnectorAutocadCivil\ConnectorAutocadCivilShared.projitems*{f4bfb155-7ba9-4e46-8240-9c825060c904}*SharedItemsImports = 5 diff --git a/ConnectorAutocadCivil/ConnectorAutocadCivil.slnf b/ConnectorAutocadCivil/ConnectorAutocadCivil.slnf index 38e498ad3c..72900fe54e 100644 --- a/ConnectorAutocadCivil/ConnectorAutocadCivil.slnf +++ b/ConnectorAutocadCivil/ConnectorAutocadCivil.slnf @@ -5,10 +5,12 @@ "ConnectorAutocadCivil\\ConnectorAutocad2021\\ConnectorAutocad2021.csproj", "ConnectorAutocadCivil\\ConnectorAutocad2022\\ConnectorAutocad2022.csproj", "ConnectorAutocadCivil\\ConnectorAutocad2023\\ConnectorAutocad2023.csproj", + "ConnectorAutocadCivil\\ConnectorAutocad2024\\ConnectorAutocad2024.csproj", "ConnectorAutocadCivil\\ConnectorAutocadCivil\\ConnectorAutocadCivilShared.shproj", "ConnectorAutocadCivil\\ConnectorCivil2021\\ConnectorCivil2021.csproj", "ConnectorAutocadCivil\\ConnectorCivil2022\\ConnectorCivil2022.csproj", "ConnectorAutocadCivil\\ConnectorCivil2023\\ConnectorCivil2023.csproj", + "ConnectorAutocadCivil\\ConnectorCivil2024\\ConnectorCivil2024.csproj", "Core\\Core\\Core.csproj", "Core\\Tests\\TestsUnit.csproj", "Core\\Transports\\DiskTransport\\DiskTransport.csproj", @@ -17,10 +19,12 @@ "Objects\\Converters\\ConverterAutocadCivil\\ConverterAutocad2021\\ConverterAutocad2021.csproj", "Objects\\Converters\\ConverterAutocadCivil\\ConverterAutocad2022\\ConverterAutocad2022.csproj", "Objects\\Converters\\ConverterAutocadCivil\\ConverterAutocad2023\\ConverterAutocad2023.csproj", + "Objects\\Converters\\ConverterAutocadCivil\\ConverterAutocad2024\\ConverterAutocad2024.csproj", "Objects\\Converters\\ConverterAutocadCivil\\ConverterAutocadCivilShared\\ConverterAutocadCivilShared.shproj", "Objects\\Converters\\ConverterAutocadCivil\\ConverterCivil2021\\ConverterCivil2021.csproj", "Objects\\Converters\\ConverterAutocadCivil\\ConverterCivil2022\\ConverterCivil2022.csproj", "Objects\\Converters\\ConverterAutocadCivil\\ConverterCivil2023\\ConverterCivil2023.csproj", + "Objects\\Converters\\ConverterAutocadCivil\\ConverterCivil2024\\ConverterCivil2024.csproj", "Objects\\Objects\\Objects.csproj", "Objects\\Tests\\Tests.csproj" ] diff --git a/ConnectorAutocadCivil/ConnectorAutocadCivil/DocumentUtils/TransactionContext.cs b/ConnectorAutocadCivil/ConnectorAutocadCivil/DocumentUtils/TransactionContext.cs index 773b30bb17..3677f82e52 100644 --- a/ConnectorAutocadCivil/ConnectorAutocadCivil/DocumentUtils/TransactionContext.cs +++ b/ConnectorAutocadCivil/ConnectorAutocadCivil/DocumentUtils/TransactionContext.cs @@ -1,10 +1,10 @@ -using System; +using System; using System.Collections.Generic; using System.Text; using Autodesk.AutoCAD.ApplicationServices; using Document = Autodesk.AutoCAD.ApplicationServices.Document; -#if ADVANCESTEEL2023 +#if ADVANCESTEEL using Autodesk.AdvanceSteel.DocumentManagement; #else using Autodesk.AutoCAD.DatabaseServices; @@ -12,7 +12,7 @@ namespace Speckle.ConnectorAutocadCivil.DocumentUtils { -#if ADVANCESTEEL2023 +#if ADVANCESTEEL public class TransactionContext : IDisposable { private bool DocumentLocked = false; diff --git a/ConnectorAutocadCivil/ConnectorAutocadCivil/Entry/App.cs b/ConnectorAutocadCivil/ConnectorAutocadCivil/Entry/App.cs index 2b40cb8bd0..432fe3ce29 100644 --- a/ConnectorAutocadCivil/ConnectorAutocadCivil/Entry/App.cs +++ b/ConnectorAutocadCivil/ConnectorAutocadCivil/Entry/App.cs @@ -11,13 +11,13 @@ using Speckle.Core.Logging; using Forms = System.Windows.Forms; -#if ADVANCESTEEL2023 +#if ADVANCESTEEL using Autodesk.AdvanceSteel.Runtime; #else using Autodesk.AutoCAD.Runtime; #endif -#if ADVANCESTEEL2023 +#if ADVANCESTEEL [assembly: ExtensionApplication(typeof(Speckle.ConnectorAutocadCivil.Entry.App))] #endif @@ -34,7 +34,7 @@ public void Initialize() { //Advance Steel addon is initialized after ribbon creation bool advanceSteel = false; -#if ADVANCESTEEL2023 +#if ADVANCESTEEL advanceSteel = true; #endif @@ -150,7 +150,7 @@ private RibbonTab FindOrMakeTab(string name) ribbon.Tabs.Add(tab); } -#if !ADVANCESTEEL2023 +#if !ADVANCESTEEL tab.IsActive = true; // optional debug: set ribbon tab active #endif return tab; diff --git a/ConnectorAutocadCivil/ConnectorAutocadCivil/Entry/SpeckleAutocadCommand.cs b/ConnectorAutocadCivil/ConnectorAutocadCivil/Entry/SpeckleAutocadCommand.cs index 895a19ce5e..9bb9b077d9 100644 --- a/ConnectorAutocadCivil/ConnectorAutocadCivil/Entry/SpeckleAutocadCommand.cs +++ b/ConnectorAutocadCivil/ConnectorAutocadCivil/Entry/SpeckleAutocadCommand.cs @@ -6,7 +6,7 @@ using Autodesk.AutoCAD.ApplicationServices; -#if ADVANCESTEEL2023 +#if ADVANCESTEEL using Autodesk.AdvanceSteel.Runtime; #else using Autodesk.AutoCAD.Runtime; @@ -23,7 +23,7 @@ using DesktopUI2.Views; using Speckle.ConnectorAutocadCivil.UI; -#if ADVANCESTEEL2023 +#if ADVANCESTEEL [assembly: CommandClass(typeof(Speckle.ConnectorAutocadCivil.Entry.SpeckleAutocadCommand))] #endif diff --git a/ConnectorAutocadCivil/ConnectorAutocadCivil/UI/ConnectorBindingsAutocadCivil.Events.cs b/ConnectorAutocadCivil/ConnectorAutocadCivil/UI/ConnectorBindingsAutocadCivil.Events.cs index dc26a65dd1..2c149e17d8 100644 --- a/ConnectorAutocadCivil/ConnectorAutocadCivil/UI/ConnectorBindingsAutocadCivil.Events.cs +++ b/ConnectorAutocadCivil/ConnectorAutocadCivil/UI/ConnectorBindingsAutocadCivil.Events.cs @@ -4,7 +4,7 @@ using DesktopUI2.ViewModels; using Speckle.ConnectorAutocadCivil.Entry; -#if ADVANCESTEEL2023 +#if ADVANCESTEEL using ASFilerObject = Autodesk.AdvanceSteel.CADAccess.FilerObject; #endif diff --git a/ConnectorAutocadCivil/ConnectorAutocadCivil/UI/ConnectorBindingsAutocadCivil.Previews.cs b/ConnectorAutocadCivil/ConnectorAutocadCivil/UI/ConnectorBindingsAutocadCivil.Previews.cs index a742e0027e..c7222de601 100644 --- a/ConnectorAutocadCivil/ConnectorAutocadCivil/UI/ConnectorBindingsAutocadCivil.Previews.cs +++ b/ConnectorAutocadCivil/ConnectorAutocadCivil/UI/ConnectorBindingsAutocadCivil.Previews.cs @@ -8,7 +8,7 @@ using Speckle.Core.Kits; using Speckle.Core.Models; -#if ADVANCESTEEL2023 +#if ADVANCESTEEL using ASFilerObject = Autodesk.AdvanceSteel.CADAccess.FilerObject; #endif @@ -62,7 +62,7 @@ public override async void PreviewSend(StreamState state, ProgressViewModel prog } else { -#if ADVANCESTEEL2023 +#if ADVANCESTEEL UpdateASObject(appObj, obj); #endif appObj.Update( diff --git a/ConnectorAutocadCivil/ConnectorAutocadCivil/UI/ConnectorBindingsAutocadCivil.Receive.cs b/ConnectorAutocadCivil/ConnectorAutocadCivil/UI/ConnectorBindingsAutocadCivil.Receive.cs index 048d97c5a3..0c16fb83a8 100644 --- a/ConnectorAutocadCivil/ConnectorAutocadCivil/UI/ConnectorBindingsAutocadCivil.Receive.cs +++ b/ConnectorAutocadCivil/ConnectorAutocadCivil/UI/ConnectorBindingsAutocadCivil.Receive.cs @@ -17,7 +17,7 @@ using Speckle.Core.Models.GraphTraversal; using static Speckle.ConnectorAutocadCivil.Utils; -#if ADVANCESTEEL2023 +#if ADVANCESTEEL using ASFilerObject = Autodesk.AdvanceSteel.CADAccess.FilerObject; #endif diff --git a/ConnectorAutocadCivil/ConnectorAutocadCivil/UI/ConnectorBindingsAutocadCivil.Selection.cs b/ConnectorAutocadCivil/ConnectorAutocadCivil/UI/ConnectorBindingsAutocadCivil.Selection.cs index fde1384bce..d28057ef05 100644 --- a/ConnectorAutocadCivil/ConnectorAutocadCivil/UI/ConnectorBindingsAutocadCivil.Selection.cs +++ b/ConnectorAutocadCivil/ConnectorAutocadCivil/UI/ConnectorBindingsAutocadCivil.Selection.cs @@ -7,7 +7,7 @@ using DesktopUI2.Models.Filters; using Speckle.Core.Kits; -#if ADVANCESTEEL2023 +#if ADVANCESTEEL using ASFilerObject = Autodesk.AdvanceSteel.CADAccess.FilerObject; #endif diff --git a/ConnectorAutocadCivil/ConnectorAutocadCivil/UI/ConnectorBindingsAutocadCivil.Send.cs b/ConnectorAutocadCivil/ConnectorAutocadCivil/UI/ConnectorBindingsAutocadCivil.Send.cs index 3037fd5fea..2527d5e2e3 100644 --- a/ConnectorAutocadCivil/ConnectorAutocadCivil/UI/ConnectorBindingsAutocadCivil.Send.cs +++ b/ConnectorAutocadCivil/ConnectorAutocadCivil/UI/ConnectorBindingsAutocadCivil.Send.cs @@ -15,7 +15,7 @@ using Speckle.Core.Transports; using static Speckle.ConnectorAutocadCivil.Utils; -#if ADVANCESTEEL2023 +#if ADVANCESTEEL using ASFilerObject = Autodesk.AdvanceSteel.CADAccess.FilerObject; #endif @@ -193,7 +193,7 @@ ref int convertedCount if (!converter.CanConvertToSpeckle(obj)) { -#if ADVANCESTEEL2023 +#if ADVANCESTEEL UpdateASObject(reportObj, obj); #endif reportObj.Update( @@ -322,7 +322,7 @@ bool isOldApplicationId(string appId) } } -#if ADVANCESTEEL2023 +#if ADVANCESTEEL private void UpdateASObject(ApplicationObject applicationObject, DBObject obj) { if (!CheckAdvanceSteelObject(obj)) diff --git a/ConnectorAutocadCivil/ConnectorAutocadCivil/UI/ConnectorBindingsAutocadCivil.cs b/ConnectorAutocadCivil/ConnectorAutocadCivil/UI/ConnectorBindingsAutocadCivil.cs index 8d14fbbefa..bdce3c2653 100644 --- a/ConnectorAutocadCivil/ConnectorAutocadCivil/UI/ConnectorBindingsAutocadCivil.cs +++ b/ConnectorAutocadCivil/ConnectorAutocadCivil/UI/ConnectorBindingsAutocadCivil.cs @@ -9,7 +9,7 @@ using Speckle.Core.Kits; using Speckle.Core.Models; -#if ADVANCESTEEL2023 +#if ADVANCESTEEL using ASFilerObject = Autodesk.AdvanceSteel.CADAccess.FilerObject; #endif diff --git a/ConnectorAutocadCivil/ConnectorAutocadCivil/Utils.cs b/ConnectorAutocadCivil/ConnectorAutocadCivil/Utils.cs index 146362e0cb..00cad83e85 100644 --- a/ConnectorAutocadCivil/ConnectorAutocadCivil/Utils.cs +++ b/ConnectorAutocadCivil/ConnectorAutocadCivil/Utils.cs @@ -18,7 +18,7 @@ using Autodesk.Aec.PropertyData.DatabaseServices; #endif -#if ADVANCESTEEL2023 +#if ADVANCESTEEL using ASObjectId = Autodesk.AdvanceSteel.CADLink.Database.ObjectId; using ASFilerObject = Autodesk.AdvanceSteel.CADAccess.FilerObject; using Autodesk.AdvanceSteel.Connection; @@ -66,6 +66,10 @@ public static class Utils public static string VersionedAppName = HostApplications.AdvanceSteel.GetVersion(HostAppVersion.v2023); public static string AppName = HostApplications.AdvanceSteel.Name; public static string Slug = HostApplications.AdvanceSteel.Slug; +#elif ADVANCESTEEL2024 + public static string VersionedAppName = HostApplications.AdvanceSteel.GetVersion(HostAppVersion.v2024); + public static string AppName = HostApplications.AdvanceSteel.Name; + public static string Slug = HostApplications.AdvanceSteel.Slug; #endif public static string invalidChars = @"<>/\:;""?*|=,‘"; @@ -109,7 +113,7 @@ public static List GetHandles(this SelectionSet selection) DBObject obj = tr.GetObject(selObj.ObjectId, OpenMode.ForRead); if (obj != null && obj.Visible()) { -#if ADVANCESTEEL2023 +#if ADVANCESTEEL if (CheckAdvanceSteelObject(obj)) { @@ -701,7 +705,7 @@ public static string RemoveInvalidChars(string str) return Regex.Replace(cleanDelimiter, $"[{invalidChars}]", string.Empty); } -#if ADVANCESTEEL2023 +#if ADVANCESTEEL public static T GetFilerObjectByEntity(DBObject @object) where T : ASFilerObject { diff --git a/ConnectorGrasshopper/ConnectorGrasshopperShared/Objects/DeconstructSpeckleObjectTaskComponent.cs b/ConnectorGrasshopper/ConnectorGrasshopperShared/Objects/DeconstructSpeckleObjectTaskComponent.cs index fbf74bbd20..372fabea3f 100644 --- a/ConnectorGrasshopper/ConnectorGrasshopperShared/Objects/DeconstructSpeckleObjectTaskComponent.cs +++ b/ConnectorGrasshopper/ConnectorGrasshopperShared/Objects/DeconstructSpeckleObjectTaskComponent.cs @@ -199,7 +199,7 @@ private bool OutputMismatch() { var isDetached = t.StartsWith("@"); var name = isDetached ? t.Substring(1) : t; - var nickChange = Params.Output[i].NickName != t; + var nickChange = Params.Output[i].NickName != name; var detachChange = (Params.Output[i] as GenericAccessParam).Detachable != isDetached; return nickChange || detachChange; } @@ -244,46 +244,50 @@ private void AutoCreateOutputs() renameParam.Name = cleanName; renameParam.Description = $"Data from property: {cleanName}"; (renameParam as GenericAccessParam).Detachable = isDetached; - return; } - // Check what params must be deleted, and do so when safe. - var remove = Params.Output - .Select( - (p, i) => - { - var res = outputList.Find(o => o == p.Name); - return res == null ? i : -1; - } - ) - .ToList(); - remove.Reverse(); - remove.ForEach(b => + else { - if (b != -1 && Params.Output[b].Recipients.Count == 0) - Params.UnregisterOutputParameter(Params.Output[b]); - }); + // Check what params must be deleted, and do so when safe. + var remove = Params.Output + .Select( + (p, i) => + { + var res = outputList.Find(o => o == p.Name); + return res == null ? i : -1; + } + ) + .ToList(); + remove.Reverse(); + remove.ForEach(b => + { + if (b != -1 && Params.Output[b].Recipients.Count == 0) + Params.UnregisterOutputParameter(Params.Output[b]); + }); - outputList.Sort(); - outputList.ForEach(s => - { - var isDetached = s.StartsWith("@"); - var name = isDetached ? s.Substring(1) : s; - var param = Params.Output.Find(p => p.Name == name); - if (param == null) + outputList.Sort(); + outputList.ForEach(s => { - var newParam = CreateParameter(GH_ParameterSide.Output, Params.Output.Count) as GenericAccessParam; - newParam.Name = name; - newParam.NickName = name; - newParam.Description = $"Data from property: {name}"; - newParam.MutableNickName = false; - newParam.Access = GH_ParamAccess.list; - newParam.Detachable = isDetached; - newParam.Optional = false; - Params.RegisterOutputParam(newParam); - } - if (param is GenericAccessParam srParam) - srParam.Detachable = isDetached; - }); + var isDetached = s.StartsWith("@"); + var name = isDetached ? s.Substring(1) : s; + var param = Params.Output.Find(p => p.Name == name); + if (param == null) + { + var newParam = CreateParameter(GH_ParameterSide.Output, Params.Output.Count) as GenericAccessParam; + newParam.Name = name; + newParam.NickName = name; + newParam.Description = $"Data from property: {name}"; + newParam.MutableNickName = false; + newParam.Access = GH_ParamAccess.list; + newParam.Detachable = isDetached; + newParam.Optional = false; + Params.RegisterOutputParam(newParam); + } + if (param is GenericAccessParam srParam) + srParam.Detachable = isDetached; + }); + } + + // Regardless of the type of change, we should always sort the params again var paramNames = Params.Output.Select(p => p.Name).ToList(); paramNames.Sort(); var sortOrder = Params.Output.Select(p => paramNames.IndexOf(p.Name)).ToArray(); diff --git a/ConnectorRevit/ConnectorRevit/ConnectorRevit.projitems b/ConnectorRevit/ConnectorRevit/ConnectorRevit.projitems index 28433dd394..601a93eddd 100644 --- a/ConnectorRevit/ConnectorRevit/ConnectorRevit.projitems +++ b/ConnectorRevit/ConnectorRevit/ConnectorRevit.projitems @@ -51,7 +51,7 @@ - + diff --git a/ConnectorRevit/ConnectorRevit/UI/ConnectorBindingsRevit .Settings.cs b/ConnectorRevit/ConnectorRevit/UI/ConnectorBindingsRevit.Settings.cs similarity index 85% rename from ConnectorRevit/ConnectorRevit/UI/ConnectorBindingsRevit .Settings.cs rename to ConnectorRevit/ConnectorRevit/UI/ConnectorBindingsRevit.Settings.cs index 17534430f4..26bdc46035 100644 --- a/ConnectorRevit/ConnectorRevit/UI/ConnectorBindingsRevit .Settings.cs +++ b/ConnectorRevit/ConnectorRevit/UI/ConnectorBindingsRevit.Settings.cs @@ -83,18 +83,18 @@ public override List GetSettings() new ListBoxSetting { Slug = "direct-shape-strategy", - Name = "Convert received objects to DirectShape", + Name = "Fallback to DirectShape on receive", Icon = "Link", Values = new List { "Always", "On Error", "Never" }, Selection = "On Error", - Description = "Determines when to attempt conversion of an element into a DirectShape" + Description = "Determines when to fallback to DirectShape on receive.\n\nAways: all objects will be received as DirectShapes\nOn Error: only objects that fail or whose types are missing\nNever: disables the fallback behavior" }, new MultiSelectBoxSetting { Slug = "disallow-join", Name = "Disallow Join For Elements", Icon = "CallSplit", - Description = "Determine which objects should not be allowed to join by default when receiving", + Description = "Determines which objects should not be allowed to join by default when receiving", Values = new List() { ArchitecturalWalls, StructuralWalls, StructuralFraming } }, new ListBoxSetting @@ -109,10 +109,10 @@ public override List GetSettings() new MappingSetting { Slug = "receive-mappings", - Name = "Custom Type Mapping", + Name = "Missing Type Mapping", Icon = "LocationSearching", Values = mappingOptions, - Description = "Determine how incoming object types are mapped to object types in the host application" + Description = "Determines when the missing types dialog is shown\n\nNever: the dialog is never shown\nAlways: the dialog is always shown, useful to edit existing mappings\nFor New Types: the dialog is only shown if there are new unmapped types" }, }; } diff --git a/ConnectorRhino/ConnectorRhino/ConnectorRhinoShared/UI/ConnectorBindingsRhino.Receive.cs b/ConnectorRhino/ConnectorRhino/ConnectorRhinoShared/UI/ConnectorBindingsRhino.Receive.cs index f5abbb3348..bf808fad9a 100644 --- a/ConnectorRhino/ConnectorRhino/ConnectorRhinoShared/UI/ConnectorBindingsRhino.Receive.cs +++ b/ConnectorRhino/ConnectorRhino/ConnectorRhinoShared/UI/ConnectorBindingsRhino.Receive.cs @@ -37,6 +37,7 @@ public override async Task ReceiveStream(StreamState state, Progres converter.ReceiveMode = state.ReceiveMode; // set converter settings + bool settingsChanged = CurrentSettings != state.Settings; CurrentSettings = state.Settings; var settings = GetSettingsDict(CurrentSettings); converter.SetConverterSettings(settings); @@ -44,7 +45,7 @@ public override async Task ReceiveStream(StreamState state, Progres Commit commit = await ConnectorHelpers.GetCommitFromState(state, progress.CancellationToken); state.LastCommit = commit; - if (SelectedReceiveCommit != commit.id) + if (SelectedReceiveCommit != commit.id || settingsChanged) // clear storage if receiving a new commit, or if settings have changed!! { ClearStorage(); SelectedReceiveCommit = commit.id; @@ -69,7 +70,6 @@ public override async Task ReceiveStream(StreamState state, Progres () => { RhinoDoc.ActiveDoc.Notes += "%%%" + commitLayerName; // give converter a way to access commit layer info - // create preview objects if they don't already exist if (Preview.Count == 0) { @@ -143,7 +143,7 @@ public override async Task ReceiveStream(StreamState state, Progres var containers = Preview .Select(o => o.Container) .Distinct() - .ToList() + .Where(o => !string.IsNullOrEmpty(o)) .OrderBy(path => path.Count(c => c == ':')) .ToList(); // if on create mode, make sure the parent commit layer is created first @@ -219,8 +219,8 @@ public override async Task ReceiveStream(StreamState state, Progres // Check converter (ViewToNative and LevelToNative) to make sure these names correspond! var name = state.ReceiveMode == ReceiveMode.Create - ? $"{commitLayerName} - {previewObj.applicationId}" - : previewObj.applicationId; + ? $"{commitLayerName} - {StoredObjects[previewObj.OriginalId]["name"] as string}" + : StoredObjects[previewObj.OriginalId]["name"] as string; var viewId = Doc.NamedViews.FindByName(name); var planeId = Doc.NamedConstructionPlanes.Find(name); if (viewId != -1) @@ -335,17 +335,14 @@ ApplicationObject CreateApplicationObject(Base current, string containerId) ApplicationObject NewAppObj() { var speckleType = current.speckle_type - .Split(new[] { ':' }, StringSplitOptions.RemoveEmptyEntries) + .Split(new[] { '.' }, StringSplitOptions.RemoveEmptyEntries) .LastOrDefault(); - // get the application id and container - // special cases for views and levels, since we are searching for them by name instead of application id - var applicationId = - speckleType.Contains("View") || speckleType.Contains("Level") - ? current["name"] as string - : current.applicationId; - var container = speckleType.Contains("View") || speckleType.Contains("Level") ? null : containerId; - return new ApplicationObject(current.id, speckleType) { applicationId = applicationId, Container = container }; + return new ApplicationObject(current.id, speckleType) + { + applicationId = current.applicationId, + Container = containerId + }; } // skip if it is the base commit collection diff --git a/DesktopUI2/DesktopUI2/Views/Windows/Dialogs/MissingIncomingTypesDialog.xaml b/DesktopUI2/DesktopUI2/Views/Windows/Dialogs/MissingIncomingTypesDialog.xaml index adedc1f575..ac853f333c 100644 --- a/DesktopUI2/DesktopUI2/Views/Windows/Dialogs/MissingIncomingTypesDialog.xaml +++ b/DesktopUI2/DesktopUI2/Views/Windows/Dialogs/MissingIncomingTypesDialog.xaml @@ -5,7 +5,7 @@ xmlns:d="http://schemas.microsoft.com/expression/blend/2008" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" mc:Ignorable="d"> - + + diff --git a/DesktopUI2/DesktopUI2/Views/Windows/Dialogs/NewStreamDialog.xaml b/DesktopUI2/DesktopUI2/Views/Windows/Dialogs/NewStreamDialog.xaml index dfbfb5b50a..4600977be0 100644 --- a/DesktopUI2/DesktopUI2/Views/Windows/Dialogs/NewStreamDialog.xaml +++ b/DesktopUI2/DesktopUI2/Views/Windows/Dialogs/NewStreamDialog.xaml @@ -9,11 +9,11 @@ @@ -73,9 +73,8 @@ - - + Margin="15"/> + netstandard2.0 Objects.Converter.AdvanceSteel2023 Objects.Converter.AdvanceSteel - $(DefineConstants);ADVANCESTEEL2023 + $(DefineConstants);ADVANCESTEEL;ADVANCESTEEL2023 Speckle.Objects.Converter.AdvanceSteel2023 Speckle Speckle diff --git a/Objects/Converters/ConverterAutocadCivil/ConverterAdvanceSteel2024/ConverterAdvanceSteel2024.csproj b/Objects/Converters/ConverterAutocadCivil/ConverterAdvanceSteel2024/ConverterAdvanceSteel2024.csproj new file mode 100644 index 0000000000..8a12efce9f --- /dev/null +++ b/Objects/Converters/ConverterAutocadCivil/ConverterAdvanceSteel2024/ConverterAdvanceSteel2024.csproj @@ -0,0 +1,41 @@ + + + + netstandard2.0 + Objects.Converter.AdvanceSteel2024 + Objects.Converter.AdvanceSteel + $(DefineConstants);ADVANCESTEEL;ADVANCESTEEL2024 + Speckle.Objects.Converter.AdvanceSteel2024 + Speckle + Speckle + Objects.Converter.AdvanceSteel2024 + Converter for Advance Steel 2024 + $(PackageTags) objects converter advancesteel + true + true + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/Objects/Converters/ConverterAutocadCivil/ConverterAdvanceSteel2024/Properties/launchSettings.json b/Objects/Converters/ConverterAutocadCivil/ConverterAdvanceSteel2024/Properties/launchSettings.json new file mode 100644 index 0000000000..ae349cc670 --- /dev/null +++ b/Objects/Converters/ConverterAutocadCivil/ConverterAdvanceSteel2024/Properties/launchSettings.json @@ -0,0 +1,9 @@ +{ + "profiles": { + "ConverterAutocad2024": { + "commandName": "Executable", + "executablePath": "C:\\Program Files\\Autodesk\\AutoCAD 2024\\acad.exe", + "commandLineArgs": "/language \"en-US\" /product \"ADVS\" /p \"<>\"" + } + } +} \ No newline at end of file diff --git a/Objects/Converters/ConverterAutocadCivil/ConverterAutocadCivilShared/AdvanceSteel/ConverterAutocadCivil.ASGeometry.cs b/Objects/Converters/ConverterAutocadCivil/ConverterAutocadCivilShared/AdvanceSteel/ConverterAutocadCivil.ASGeometry.cs index 4e9cb334a5..20a1118c94 100644 --- a/Objects/Converters/ConverterAutocadCivil/ConverterAutocadCivilShared/AdvanceSteel/ConverterAutocadCivil.ASGeometry.cs +++ b/Objects/Converters/ConverterAutocadCivil/ConverterAutocadCivilShared/AdvanceSteel/ConverterAutocadCivil.ASGeometry.cs @@ -1,4 +1,4 @@ -#if ADVANCESTEEL2023 +#if ADVANCESTEEL using System; using System.Collections; using System.Collections.Generic; diff --git a/Objects/Converters/ConverterAutocadCivil/ConverterAutocadCivilShared/AdvanceSteel/ConverterAutocadCivil.AdvanceSteel.cs b/Objects/Converters/ConverterAutocadCivil/ConverterAutocadCivilShared/AdvanceSteel/ConverterAutocadCivil.AdvanceSteel.cs index 55361fc5be..c2fdc9c95e 100644 --- a/Objects/Converters/ConverterAutocadCivil/ConverterAutocadCivilShared/AdvanceSteel/ConverterAutocadCivil.AdvanceSteel.cs +++ b/Objects/Converters/ConverterAutocadCivil/ConverterAutocadCivilShared/AdvanceSteel/ConverterAutocadCivil.AdvanceSteel.cs @@ -1,4 +1,4 @@ -#if ADVANCESTEEL2023 +#if ADVANCESTEEL using System; using System.Collections.Generic; using System.Linq; diff --git a/Objects/Converters/ConverterAutocadCivil/ConverterAutocadCivilShared/AdvanceSteel/ConverterAutocadCivil.Beams.cs b/Objects/Converters/ConverterAutocadCivil/ConverterAutocadCivilShared/AdvanceSteel/ConverterAutocadCivil.Beams.cs index ec5cc40aa9..713734944b 100644 --- a/Objects/Converters/ConverterAutocadCivil/ConverterAutocadCivilShared/AdvanceSteel/ConverterAutocadCivil.Beams.cs +++ b/Objects/Converters/ConverterAutocadCivil/ConverterAutocadCivilShared/AdvanceSteel/ConverterAutocadCivil.Beams.cs @@ -1,4 +1,4 @@ -#if ADVANCESTEEL2023 +#if ADVANCESTEEL using System; using System.Collections.Generic; using System.Linq; diff --git a/Objects/Converters/ConverterAutocadCivil/ConverterAutocadCivilShared/AdvanceSteel/ConverterAutocadCivil.Bolts.cs b/Objects/Converters/ConverterAutocadCivil/ConverterAutocadCivilShared/AdvanceSteel/ConverterAutocadCivil.Bolts.cs index c08daa97f3..6f136bd1e6 100644 --- a/Objects/Converters/ConverterAutocadCivil/ConverterAutocadCivilShared/AdvanceSteel/ConverterAutocadCivil.Bolts.cs +++ b/Objects/Converters/ConverterAutocadCivil/ConverterAutocadCivilShared/AdvanceSteel/ConverterAutocadCivil.Bolts.cs @@ -1,4 +1,4 @@ -#if ADVANCESTEEL2023 +#if ADVANCESTEEL using System; using System.Collections.Generic; using Objects.BuiltElements.AdvanceSteel; diff --git a/Objects/Converters/ConverterAutocadCivil/ConverterAutocadCivilShared/AdvanceSteel/ConverterAutocadCivil.DxfNames.cs b/Objects/Converters/ConverterAutocadCivil/ConverterAutocadCivilShared/AdvanceSteel/ConverterAutocadCivil.DxfNames.cs index ffc230032c..c164c5c4d2 100644 --- a/Objects/Converters/ConverterAutocadCivil/ConverterAutocadCivilShared/AdvanceSteel/ConverterAutocadCivil.DxfNames.cs +++ b/Objects/Converters/ConverterAutocadCivil/ConverterAutocadCivilShared/AdvanceSteel/ConverterAutocadCivil.DxfNames.cs @@ -1,4 +1,4 @@ -#if ADVANCESTEEL2023 +#if ADVANCESTEEL using System.Collections.Generic; using System; diff --git a/Objects/Converters/ConverterAutocadCivil/ConverterAutocadCivilShared/AdvanceSteel/ConverterAutocadCivil.Gratings.cs b/Objects/Converters/ConverterAutocadCivil/ConverterAutocadCivilShared/AdvanceSteel/ConverterAutocadCivil.Gratings.cs index 87ba766b98..76e0c2668c 100644 --- a/Objects/Converters/ConverterAutocadCivil/ConverterAutocadCivilShared/AdvanceSteel/ConverterAutocadCivil.Gratings.cs +++ b/Objects/Converters/ConverterAutocadCivil/ConverterAutocadCivilShared/AdvanceSteel/ConverterAutocadCivil.Gratings.cs @@ -1,4 +1,4 @@ -#if ADVANCESTEEL2023 +#if ADVANCESTEEL using System.Collections.Generic; using Objects.BuiltElements.AdvanceSteel; diff --git a/Objects/Converters/ConverterAutocadCivil/ConverterAutocadCivilShared/AdvanceSteel/ConverterAutocadCivil.Plates.cs b/Objects/Converters/ConverterAutocadCivil/ConverterAutocadCivilShared/AdvanceSteel/ConverterAutocadCivil.Plates.cs index e0cd11972b..840dd66eb1 100644 --- a/Objects/Converters/ConverterAutocadCivil/ConverterAutocadCivilShared/AdvanceSteel/ConverterAutocadCivil.Plates.cs +++ b/Objects/Converters/ConverterAutocadCivil/ConverterAutocadCivilShared/AdvanceSteel/ConverterAutocadCivil.Plates.cs @@ -1,4 +1,4 @@ -#if ADVANCESTEEL2023 +#if ADVANCESTEEL using System.Collections.Generic; using Objects.BuiltElements.AdvanceSteel; using ASPlate = Autodesk.AdvanceSteel.Modelling.Plate; diff --git a/Objects/Converters/ConverterAutocadCivil/ConverterAutocadCivilShared/AdvanceSteel/ConverterAutocadCivil.Slabs.cs b/Objects/Converters/ConverterAutocadCivil/ConverterAutocadCivilShared/AdvanceSteel/ConverterAutocadCivil.Slabs.cs index ef62ff36d4..5a3688dd4b 100644 --- a/Objects/Converters/ConverterAutocadCivil/ConverterAutocadCivilShared/AdvanceSteel/ConverterAutocadCivil.Slabs.cs +++ b/Objects/Converters/ConverterAutocadCivil/ConverterAutocadCivilShared/AdvanceSteel/ConverterAutocadCivil.Slabs.cs @@ -1,4 +1,4 @@ -#if ADVANCESTEEL2023 +#if ADVANCESTEEL using System.Collections.Generic; using Objects.BuiltElements.AdvanceSteel; using ASSlab = Autodesk.AdvanceSteel.Modelling.Slab; diff --git a/Objects/Converters/ConverterAutocadCivil/ConverterAutocadCivilShared/AdvanceSteel/ConverterAutocadCivil.SpecialParts.cs b/Objects/Converters/ConverterAutocadCivil/ConverterAutocadCivilShared/AdvanceSteel/ConverterAutocadCivil.SpecialParts.cs index 2331be538b..79c2eaa555 100644 --- a/Objects/Converters/ConverterAutocadCivil/ConverterAutocadCivilShared/AdvanceSteel/ConverterAutocadCivil.SpecialParts.cs +++ b/Objects/Converters/ConverterAutocadCivil/ConverterAutocadCivilShared/AdvanceSteel/ConverterAutocadCivil.SpecialParts.cs @@ -1,4 +1,4 @@ -#if ADVANCESTEEL2023 +#if ADVANCESTEEL using System.Collections.Generic; using Objects.BuiltElements.AdvanceSteel; using ASSpecialPart = Autodesk.AdvanceSteel.Modelling.SpecialPart; diff --git a/Objects/Converters/ConverterAutocadCivil/ConverterAutocadCivilShared/AdvanceSteel/Properties/ASBaseProperties.cs b/Objects/Converters/ConverterAutocadCivil/ConverterAutocadCivilShared/AdvanceSteel/Properties/ASBaseProperties.cs index 7f9fe236f6..5ca6f6e49c 100644 --- a/Objects/Converters/ConverterAutocadCivil/ConverterAutocadCivilShared/AdvanceSteel/Properties/ASBaseProperties.cs +++ b/Objects/Converters/ConverterAutocadCivil/ConverterAutocadCivilShared/AdvanceSteel/Properties/ASBaseProperties.cs @@ -1,4 +1,4 @@ -#if ADVANCESTEEL2023 +#if ADVANCESTEEL using System; using System.Collections.Generic; using System.Reflection; diff --git a/Objects/Converters/ConverterAutocadCivil/ConverterAutocadCivilShared/AdvanceSteel/Properties/ASPropertiesCache.cs b/Objects/Converters/ConverterAutocadCivil/ConverterAutocadCivilShared/AdvanceSteel/Properties/ASPropertiesCache.cs index 6df078fe9f..b0e22c0af1 100644 --- a/Objects/Converters/ConverterAutocadCivil/ConverterAutocadCivilShared/AdvanceSteel/Properties/ASPropertiesCache.cs +++ b/Objects/Converters/ConverterAutocadCivil/ConverterAutocadCivilShared/AdvanceSteel/Properties/ASPropertiesCache.cs @@ -1,4 +1,4 @@ -#if ADVANCESTEEL2023 +#if ADVANCESTEEL using System; using System.Collections.Generic; using System.Linq; diff --git a/Objects/Converters/ConverterAutocadCivil/ConverterAutocadCivilShared/AdvanceSteel/Properties/ASProperty.cs b/Objects/Converters/ConverterAutocadCivil/ConverterAutocadCivilShared/AdvanceSteel/Properties/ASProperty.cs index e186b5ad9f..375ddc2f12 100644 --- a/Objects/Converters/ConverterAutocadCivil/ConverterAutocadCivilShared/AdvanceSteel/Properties/ASProperty.cs +++ b/Objects/Converters/ConverterAutocadCivil/ConverterAutocadCivilShared/AdvanceSteel/Properties/ASProperty.cs @@ -1,4 +1,4 @@ -#if ADVANCESTEEL2023 +#if ADVANCESTEEL using System; using System.Collections.Generic; using System.Reflection; diff --git a/Objects/Converters/ConverterAutocadCivil/ConverterAutocadCivilShared/AdvanceSteel/Properties/ASPropertyMethods.cs b/Objects/Converters/ConverterAutocadCivil/ConverterAutocadCivilShared/AdvanceSteel/Properties/ASPropertyMethods.cs index 28c33c2fa6..a143d8eeef 100644 --- a/Objects/Converters/ConverterAutocadCivil/ConverterAutocadCivilShared/AdvanceSteel/Properties/ASPropertyMethods.cs +++ b/Objects/Converters/ConverterAutocadCivil/ConverterAutocadCivilShared/AdvanceSteel/Properties/ASPropertyMethods.cs @@ -1,4 +1,4 @@ -#if ADVANCESTEEL2023 +#if ADVANCESTEEL using System; using System.Collections.Generic; using System.Reflection; diff --git a/Objects/Converters/ConverterAutocadCivil/ConverterAutocadCivilShared/AdvanceSteel/Properties/ASTypeData.cs b/Objects/Converters/ConverterAutocadCivil/ConverterAutocadCivilShared/AdvanceSteel/Properties/ASTypeData.cs index 5a87b0ff15..5bf182e07a 100644 --- a/Objects/Converters/ConverterAutocadCivil/ConverterAutocadCivilShared/AdvanceSteel/Properties/ASTypeData.cs +++ b/Objects/Converters/ConverterAutocadCivil/ConverterAutocadCivilShared/AdvanceSteel/Properties/ASTypeData.cs @@ -1,4 +1,4 @@ -#if ADVANCESTEEL2023 +#if ADVANCESTEEL using System; using System.Collections.Generic; using System.Linq; diff --git a/Objects/Converters/ConverterAutocadCivil/ConverterAutocadCivilShared/AdvanceSteel/Properties/IASProperties.cs b/Objects/Converters/ConverterAutocadCivil/ConverterAutocadCivilShared/AdvanceSteel/Properties/IASProperties.cs index b77b776472..eb514ac8c7 100644 --- a/Objects/Converters/ConverterAutocadCivil/ConverterAutocadCivilShared/AdvanceSteel/Properties/IASProperties.cs +++ b/Objects/Converters/ConverterAutocadCivil/ConverterAutocadCivilShared/AdvanceSteel/Properties/IASProperties.cs @@ -1,4 +1,4 @@ -#if ADVANCESTEEL2023 +#if ADVANCESTEEL using System; using System.Collections.Generic; using System.Text; diff --git a/Objects/Converters/ConverterAutocadCivil/ConverterAutocadCivilShared/AdvanceSteel/Properties/PropertySets/AtomicElementProperties.cs b/Objects/Converters/ConverterAutocadCivil/ConverterAutocadCivilShared/AdvanceSteel/Properties/PropertySets/AtomicElementProperties.cs index 945a9b1ea5..4ac98afec8 100644 --- a/Objects/Converters/ConverterAutocadCivil/ConverterAutocadCivilShared/AdvanceSteel/Properties/PropertySets/AtomicElementProperties.cs +++ b/Objects/Converters/ConverterAutocadCivil/ConverterAutocadCivilShared/AdvanceSteel/Properties/PropertySets/AtomicElementProperties.cs @@ -1,4 +1,4 @@ -#if ADVANCESTEEL2023 +#if ADVANCESTEEL using System; using System.Collections.Generic; using System.Reflection; diff --git a/Objects/Converters/ConverterAutocadCivil/ConverterAutocadCivilShared/AdvanceSteel/Properties/PropertySets/BeamProperties.cs b/Objects/Converters/ConverterAutocadCivil/ConverterAutocadCivilShared/AdvanceSteel/Properties/PropertySets/BeamProperties.cs index 5d1625aae0..1961152075 100644 --- a/Objects/Converters/ConverterAutocadCivil/ConverterAutocadCivilShared/AdvanceSteel/Properties/PropertySets/BeamProperties.cs +++ b/Objects/Converters/ConverterAutocadCivil/ConverterAutocadCivilShared/AdvanceSteel/Properties/PropertySets/BeamProperties.cs @@ -1,4 +1,4 @@ -#if ADVANCESTEEL2023 +#if ADVANCESTEEL using System; using System.Collections.Generic; using System.Reflection; diff --git a/Objects/Converters/ConverterAutocadCivil/ConverterAutocadCivilShared/AdvanceSteel/Properties/PropertySets/BoltPatternProperties.cs b/Objects/Converters/ConverterAutocadCivil/ConverterAutocadCivilShared/AdvanceSteel/Properties/PropertySets/BoltPatternProperties.cs index 575c0604ee..dc51540c30 100644 --- a/Objects/Converters/ConverterAutocadCivil/ConverterAutocadCivilShared/AdvanceSteel/Properties/PropertySets/BoltPatternProperties.cs +++ b/Objects/Converters/ConverterAutocadCivil/ConverterAutocadCivilShared/AdvanceSteel/Properties/PropertySets/BoltPatternProperties.cs @@ -1,4 +1,4 @@ -#if ADVANCESTEEL2023 +#if ADVANCESTEEL using System; using System.Collections.Generic; using System.Reflection; diff --git a/Objects/Converters/ConverterAutocadCivil/ConverterAutocadCivilShared/AdvanceSteel/Properties/PropertySets/ConstructionElementProperties.cs b/Objects/Converters/ConverterAutocadCivil/ConverterAutocadCivilShared/AdvanceSteel/Properties/PropertySets/ConstructionElementProperties.cs index 09b9bd3f26..a083d1081b 100644 --- a/Objects/Converters/ConverterAutocadCivil/ConverterAutocadCivilShared/AdvanceSteel/Properties/PropertySets/ConstructionElementProperties.cs +++ b/Objects/Converters/ConverterAutocadCivil/ConverterAutocadCivilShared/AdvanceSteel/Properties/PropertySets/ConstructionElementProperties.cs @@ -1,4 +1,4 @@ -#if ADVANCESTEEL2023 +#if ADVANCESTEEL using System; using System.Collections.Generic; using System.Reflection; diff --git a/Objects/Converters/ConverterAutocadCivil/ConverterAutocadCivilShared/AdvanceSteel/Properties/PropertySets/FilerObjectProperties.cs b/Objects/Converters/ConverterAutocadCivil/ConverterAutocadCivilShared/AdvanceSteel/Properties/PropertySets/FilerObjectProperties.cs index 40ea4e4152..f245927180 100644 --- a/Objects/Converters/ConverterAutocadCivil/ConverterAutocadCivilShared/AdvanceSteel/Properties/PropertySets/FilerObjectProperties.cs +++ b/Objects/Converters/ConverterAutocadCivil/ConverterAutocadCivilShared/AdvanceSteel/Properties/PropertySets/FilerObjectProperties.cs @@ -1,4 +1,4 @@ -#if ADVANCESTEEL2023 +#if ADVANCESTEEL using System; using System.Collections.Generic; using System.Reflection; diff --git a/Objects/Converters/ConverterAutocadCivil/ConverterAutocadCivilShared/AdvanceSteel/Properties/PropertySets/MainAliasProperties.cs b/Objects/Converters/ConverterAutocadCivil/ConverterAutocadCivilShared/AdvanceSteel/Properties/PropertySets/MainAliasProperties.cs index abd9f77b35..92523d5673 100644 --- a/Objects/Converters/ConverterAutocadCivil/ConverterAutocadCivilShared/AdvanceSteel/Properties/PropertySets/MainAliasProperties.cs +++ b/Objects/Converters/ConverterAutocadCivil/ConverterAutocadCivilShared/AdvanceSteel/Properties/PropertySets/MainAliasProperties.cs @@ -1,4 +1,4 @@ -#if ADVANCESTEEL2023 +#if ADVANCESTEEL using System; using System.Collections.Generic; using System.Reflection; diff --git a/Objects/Converters/ConverterAutocadCivil/ConverterAutocadCivilShared/AdvanceSteel/Properties/PropertySets/PolybeamProperties.cs b/Objects/Converters/ConverterAutocadCivil/ConverterAutocadCivilShared/AdvanceSteel/Properties/PropertySets/PolybeamProperties.cs index 2e9a024238..267a7e901d 100644 --- a/Objects/Converters/ConverterAutocadCivil/ConverterAutocadCivilShared/AdvanceSteel/Properties/PropertySets/PolybeamProperties.cs +++ b/Objects/Converters/ConverterAutocadCivil/ConverterAutocadCivilShared/AdvanceSteel/Properties/PropertySets/PolybeamProperties.cs @@ -1,4 +1,4 @@ -#if ADVANCESTEEL2023 +#if ADVANCESTEEL using System; using System.Collections.Generic; using System.Reflection; diff --git a/Objects/Converters/ConverterAutocadCivil/ConverterAutocadCivilShared/AdvanceSteel/Properties/PropertySets/ScrewBoltPatternProperties.cs b/Objects/Converters/ConverterAutocadCivil/ConverterAutocadCivilShared/AdvanceSteel/Properties/PropertySets/ScrewBoltPatternProperties.cs index 0c9c4f82ea..3f0d9f8c18 100644 --- a/Objects/Converters/ConverterAutocadCivil/ConverterAutocadCivilShared/AdvanceSteel/Properties/PropertySets/ScrewBoltPatternProperties.cs +++ b/Objects/Converters/ConverterAutocadCivil/ConverterAutocadCivilShared/AdvanceSteel/Properties/PropertySets/ScrewBoltPatternProperties.cs @@ -1,4 +1,4 @@ -#if ADVANCESTEEL2023 +#if ADVANCESTEEL using System; using System.Collections.Generic; using System.Reflection; diff --git a/Objects/Converters/ConverterAutocadCivil/ConverterAutocadCivilShared/AdvanceSteel/Properties/StructureUtils.cs b/Objects/Converters/ConverterAutocadCivil/ConverterAutocadCivilShared/AdvanceSteel/Properties/StructureUtils.cs index a5a895b2e8..dbec949937 100644 --- a/Objects/Converters/ConverterAutocadCivil/ConverterAutocadCivilShared/AdvanceSteel/Properties/StructureUtils.cs +++ b/Objects/Converters/ConverterAutocadCivil/ConverterAutocadCivilShared/AdvanceSteel/Properties/StructureUtils.cs @@ -1,4 +1,4 @@ -#if ADVANCESTEEL2023 +#if ADVANCESTEEL using System; using System.Collections.Generic; using System.Linq; diff --git a/Objects/Converters/ConverterAutocadCivil/ConverterAutocadCivilShared/ConverterAutocadCivil.cs b/Objects/Converters/ConverterAutocadCivil/ConverterAutocadCivilShared/ConverterAutocadCivil.cs index 102a00f57c..5c2613702a 100644 --- a/Objects/Converters/ConverterAutocadCivil/ConverterAutocadCivilShared/ConverterAutocadCivil.cs +++ b/Objects/Converters/ConverterAutocadCivil/ConverterAutocadCivilShared/ConverterAutocadCivil.cs @@ -53,6 +53,8 @@ public partial class ConverterAutocadCivil : ISpeckleConverter public static string AutocadAppName = HostApplications.Civil.GetVersion(HostAppVersion.v2024); #elif ADVANCESTEEL2023 public static string AutocadAppName = HostApplications.AdvanceSteel.GetVersion(HostAppVersion.v2023); +#elif ADVANCESTEEL2024 + public static string AutocadAppName = HostApplications.AdvanceSteel.GetVersion(HostAppVersion.v2024); #endif public ConverterAutocadCivil() @@ -215,7 +217,7 @@ public Base ConvertToSpeckle(object @object) @base = SurfaceToSpeckle(o); break; -#elif ADVANCESTEEL2023 +#elif ADVANCESTEEL default: try @@ -486,10 +488,10 @@ public bool CanConvertToSpeckle(object @object) default: { -#if ADVANCESTEEL2023 +#if ADVANCESTEEL return CanConvertASToSpeckle(o); #else - return false; + return false; #endif } } diff --git a/Objects/Converters/ConverterRevit/ConverterRevitShared/Partial Classes/ConvertDisplayableObject.cs b/Objects/Converters/ConverterRevit/ConverterRevitShared/Partial Classes/ConvertDisplayableObject.cs index e708aa1faa..e5446779be 100644 --- a/Objects/Converters/ConverterRevit/ConverterRevitShared/Partial Classes/ConvertDisplayableObject.cs +++ b/Objects/Converters/ConverterRevit/ConverterRevitShared/Partial Classes/ConvertDisplayableObject.cs @@ -1,4 +1,4 @@ -using System; +using System; using System.Collections.Generic; using System.Linq; using Autodesk.Revit.DB; @@ -54,38 +54,43 @@ public ApplicationObject DisplayableObjectToNative(Base obj) public RevitCategory GetSpeckleObjectCategory(Base @object) { - switch (@object) + if (Enum.TryParse(@object["category"] as string, out RevitCategory category)) + return category; + else { - case BE.Beam _: - case BE.Brace _: - case BE.TeklaStructures.TeklaContourPlate _: - return RevitCategory.StructuralFraming; - case BE.TeklaStructures.Bolts _: - return RevitCategory.StructConnectionBolts; - case BE.TeklaStructures.Welds _: - return RevitCategory.StructConnectionWelds; - case BE.Floor _: - return RevitCategory.Floors; - case BE.Ceiling _: - return RevitCategory.Ceilings; - case BE.Column _: - return RevitCategory.Columns; - case BE.Pipe _: - return RevitCategory.PipeSegments; - case BE.Rebar _: - return RevitCategory.Rebar; - case BE.Topography _: - return RevitCategory.Topography; - case BE.Wall _: - return RevitCategory.Walls; - case BE.Roof _: - return RevitCategory.Roofs; - case BE.Duct _: - return RevitCategory.DuctSystem; - case BE.CableTray _: - return RevitCategory.CableTray; - default: - return RevitCategory.GenericModel; + switch (@object) + { + case BE.Beam _: + case BE.Brace _: + case BE.TeklaStructures.TeklaContourPlate _: + return RevitCategory.StructuralFraming; + case BE.TeklaStructures.Bolts _: + return RevitCategory.StructConnectionBolts; + case BE.TeklaStructures.Welds _: + return RevitCategory.StructConnectionWelds; + case BE.Floor _: + return RevitCategory.Floors; + case BE.Ceiling _: + return RevitCategory.Ceilings; + case BE.Column _: + return RevitCategory.Columns; + case BE.Pipe _: + return RevitCategory.PipeSegments; + case BE.Rebar _: + return RevitCategory.Rebar; + case BE.Topography _: + return RevitCategory.Topography; + case BE.Wall _: + return RevitCategory.Walls; + case BE.Roof _: + return RevitCategory.Roofs; + case BE.Duct _: + return RevitCategory.DuctSystem; + case BE.CableTray _: + return RevitCategory.CableTray; + default: + return RevitCategory.GenericModel; + } } } } diff --git a/Objects/Converters/ConverterRhinoGh/ConverterRhinoGhShared/ConverterRhinoGh.BuiltElements.cs b/Objects/Converters/ConverterRhinoGh/ConverterRhinoGhShared/ConverterRhinoGh.BuiltElements.cs index 396ab7495a..785db3d1fc 100644 --- a/Objects/Converters/ConverterRhinoGh/ConverterRhinoGhShared/ConverterRhinoGh.BuiltElements.cs +++ b/Objects/Converters/ConverterRhinoGh/ConverterRhinoGhShared/ConverterRhinoGh.BuiltElements.cs @@ -17,6 +17,14 @@ namespace Objects.Converter.RhinoGh; public partial class ConverterRhinoGh { + // parameters + public Tuple ParameterToNative(RV.Parameter parameter) + { + var name = parameter.name; + var val = parameter.value?.ToString() ?? string.Empty; + return new Tuple(name, val); + } + // views public View3D ViewToSpeckle(ViewInfo view) { diff --git a/Objects/Converters/ConverterRhinoGh/ConverterRhinoGhShared/ConverterRhinoGh.Other.cs b/Objects/Converters/ConverterRhinoGh/ConverterRhinoGhShared/ConverterRhinoGh.Other.cs index 435e45de7d..5db065c0d3 100644 --- a/Objects/Converters/ConverterRhinoGh/ConverterRhinoGhShared/ConverterRhinoGh.Other.cs +++ b/Objects/Converters/ConverterRhinoGh/ConverterRhinoGhShared/ConverterRhinoGh.Other.cs @@ -24,7 +24,7 @@ namespace Objects.Converter.RhinoGh; public partial class ConverterRhinoGh { - // display, render, and parameters + // display, render public RH.ObjectAttributes DisplayStyleToNative(DisplayStyle display) { var attributes = new RH.ObjectAttributes(); @@ -241,13 +241,6 @@ public Other.RenderMaterial RenderMaterialToSpeckle(Rhino.Render.RenderMaterial return renderMaterial; } - public Tuple ParameterToNative(Objects.BuiltElements.Revit.Parameter parameter) - { - var name = parameter.name; - var val = parameter.value.ToString(); - return new Tuple(name, val); - } - // hatch public Hatch[] HatchToNative(Other.Hatch hatch) { diff --git a/Objects/Converters/ConverterRhinoGh/ConverterRhinoGhShared/ConverterRhinoGh.cs b/Objects/Converters/ConverterRhinoGh/ConverterRhinoGhShared/ConverterRhinoGh.cs index f42dc4a9d6..97539977cd 100644 --- a/Objects/Converters/ConverterRhinoGh/ConverterRhinoGhShared/ConverterRhinoGh.cs +++ b/Objects/Converters/ConverterRhinoGh/ConverterRhinoGhShared/ConverterRhinoGh.cs @@ -94,12 +94,11 @@ public void SetConverterSettings(object settings) { if (settings is Dictionary temp) Settings = temp; - // TODO: Both settings bellow are here for backwards compatibility and should be removed after consolidating settings + else if (settings is MeshSettings meshSettings) + SelectedMeshSettings = meshSettings; if (Settings.TryGetValue("preprocessGeometry", out string setting)) bool.TryParse(setting, out PreprocessGeometry); - var s = (MeshSettings)settings; - SelectedMeshSettings = s; } public void SetContextDocument(object doc) @@ -671,7 +670,6 @@ public bool CanConvertToNative(Base @object) #else // This types are not supported in GH! case Pointcloud _: - case Collection _: case ModelCurve _: case DirectShape _: case View3D _: @@ -680,7 +678,9 @@ public bool CanConvertToNative(Base @object) case Level _: case Text _: case Dimension _: + case Collection c when !c.collectionType.ToLower().Contains("model"): return true; + #endif default: diff --git a/Objects/Objects.sln b/Objects/Objects.sln index c8d19e43fb..2236905fcf 100644 --- a/Objects/Objects.sln +++ b/Objects/Objects.sln @@ -85,7 +85,8 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ConverterGrasshopper7", "Co EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ConverterDxf", "Converters\ConverterDxf\ConverterDxf\ConverterDxf.csproj", "{C6E9DE1F-2CFF-44AC-9B9A-E71783DF6633}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ConverterRhinoGhTests", "Converters\ConverterRhinoGhTests\ConverterRhinoGhTests.csproj", "{230D85EF-0D0E-404E-A647-B9B4CB30BF47}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ConverterRhinoGhTests", "Converters\ConverterRhinoGhTests\ConverterRhinoGhTests.csproj", "{230D85EF-0D0E-404E-A647-B9B4CB30BF47}" +EndProject Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "ConverterNavisworks", "Converters\ConverterNavisworks\ConverterNavisworks\ConverterNavisworks.shproj", "{C3232EF3-2000-44C6-A330-B94531C9CC83}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ConverterNavisworks", "ConverterNavisworks", "{A2F9F9A0-0479-4FE0-83B3-AB38A9402821}" @@ -108,6 +109,24 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ConverterOpenRail", "Conver EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ConverterOpenRoads", "Converters\ConverterBentley\ConverterOpenRoads\ConverterOpenRoads.csproj", "{651F0278-3DE2-4371-8586-70D3732F9770}" EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ConverterAdvanceSteel2023", "Converters\ConverterAutocadCivil\ConverterAdvanceSteel2023\ConverterAdvanceSteel2023.csproj", "{0AF5BA0F-0FEA-463B-9877-F063892EA7DE}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ConverterAdvanceSteel2024", "Converters\ConverterAutocadCivil\ConverterAdvanceSteel2024\ConverterAdvanceSteel2024.csproj", "{6D1265B2-31FB-4096-9EC9-DD937A349B9C}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ConverterRevit2023", "Converters\ConverterRevit\ConverterRevit2023\ConverterRevit2023.csproj", "{A2A18669-F9FC-49C7-B2C3-C3620066E888}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ConverterRevit2024", "Converters\ConverterRevit\ConverterRevit2024\ConverterRevit2024.csproj", "{73D708CA-E956-455A-BE62-785B0CC79264}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ConverterAutocad2023", "Converters\ConverterAutocadCivil\ConverterAutocad2023\ConverterAutocad2023.csproj", "{1F0BA5E1-E665-4774-AFC1-47CD1A6ECCC3}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ConverterAutocad2024", "Converters\ConverterAutocadCivil\ConverterAutocad2024\ConverterAutocad2024.csproj", "{461B54C0-F71F-4EC2-801D-5594ED046035}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ConverterCivil2023", "Converters\ConverterAutocadCivil\ConverterCivil2023\ConverterCivil2023.csproj", "{D6814B75-3C4F-433E-9BE8-A9CD3A476C55}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ConverterCivil2024", "Converters\ConverterAutocadCivil\ConverterCivil2024\ConverterCivil2024.csproj", "{C43EEDA1-2DBB-40B5-8C52-12BCBDA34D43}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ConverterNavisworks2024", "Converters\ConverterNavisworks\ConverterNavisworks2024\ConverterNavisworks2024.csproj", "{BFBD40D4-BF2A-47B2-8F35-4371149DD1B6}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -313,12 +332,16 @@ Global {C6E9DE1F-2CFF-44AC-9B9A-E71783DF6633}.Debug|x64.Build.0 = Debug|Any CPU {C6E9DE1F-2CFF-44AC-9B9A-E71783DF6633}.Release|Any CPU.ActiveCfg = Release|Any CPU {C6E9DE1F-2CFF-44AC-9B9A-E71783DF6633}.Release|Any CPU.Build.0 = Release|Any CPU + {C6E9DE1F-2CFF-44AC-9B9A-E71783DF6633}.Release|x64.ActiveCfg = Release|Any CPU + {C6E9DE1F-2CFF-44AC-9B9A-E71783DF6633}.Release|x64.Build.0 = Release|Any CPU {230D85EF-0D0E-404E-A647-B9B4CB30BF47}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {230D85EF-0D0E-404E-A647-B9B4CB30BF47}.Debug|Any CPU.Build.0 = Debug|Any CPU + {230D85EF-0D0E-404E-A647-B9B4CB30BF47}.Debug|x64.ActiveCfg = Debug|Any CPU + {230D85EF-0D0E-404E-A647-B9B4CB30BF47}.Debug|x64.Build.0 = Debug|Any CPU {230D85EF-0D0E-404E-A647-B9B4CB30BF47}.Release|Any CPU.ActiveCfg = Release|Any CPU {230D85EF-0D0E-404E-A647-B9B4CB30BF47}.Release|Any CPU.Build.0 = Release|Any CPU - {C6E9DE1F-2CFF-44AC-9B9A-E71783DF6633}.Release|x64.ActiveCfg = Release|Any CPU - {C6E9DE1F-2CFF-44AC-9B9A-E71783DF6633}.Release|x64.Build.0 = Release|Any CPU + {230D85EF-0D0E-404E-A647-B9B4CB30BF47}.Release|x64.ActiveCfg = Release|Any CPU + {230D85EF-0D0E-404E-A647-B9B4CB30BF47}.Release|x64.Build.0 = Release|Any CPU {74081536-2A3E-447D-8F53-BDC5DCB5D98B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {74081536-2A3E-447D-8F53-BDC5DCB5D98B}.Debug|Any CPU.Build.0 = Debug|Any CPU {74081536-2A3E-447D-8F53-BDC5DCB5D98B}.Debug|x64.ActiveCfg = Debug|x64 @@ -383,6 +406,78 @@ Global {651F0278-3DE2-4371-8586-70D3732F9770}.Release|Any CPU.Build.0 = Release|Any CPU {651F0278-3DE2-4371-8586-70D3732F9770}.Release|x64.ActiveCfg = Release|Any CPU {651F0278-3DE2-4371-8586-70D3732F9770}.Release|x64.Build.0 = Release|Any CPU + {0AF5BA0F-0FEA-463B-9877-F063892EA7DE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {0AF5BA0F-0FEA-463B-9877-F063892EA7DE}.Debug|Any CPU.Build.0 = Debug|Any CPU + {0AF5BA0F-0FEA-463B-9877-F063892EA7DE}.Debug|x64.ActiveCfg = Debug|Any CPU + {0AF5BA0F-0FEA-463B-9877-F063892EA7DE}.Debug|x64.Build.0 = Debug|Any CPU + {0AF5BA0F-0FEA-463B-9877-F063892EA7DE}.Release|Any CPU.ActiveCfg = Release|Any CPU + {0AF5BA0F-0FEA-463B-9877-F063892EA7DE}.Release|Any CPU.Build.0 = Release|Any CPU + {0AF5BA0F-0FEA-463B-9877-F063892EA7DE}.Release|x64.ActiveCfg = Release|Any CPU + {0AF5BA0F-0FEA-463B-9877-F063892EA7DE}.Release|x64.Build.0 = Release|Any CPU + {6D1265B2-31FB-4096-9EC9-DD937A349B9C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {6D1265B2-31FB-4096-9EC9-DD937A349B9C}.Debug|Any CPU.Build.0 = Debug|Any CPU + {6D1265B2-31FB-4096-9EC9-DD937A349B9C}.Debug|x64.ActiveCfg = Debug|Any CPU + {6D1265B2-31FB-4096-9EC9-DD937A349B9C}.Debug|x64.Build.0 = Debug|Any CPU + {6D1265B2-31FB-4096-9EC9-DD937A349B9C}.Release|Any CPU.ActiveCfg = Release|Any CPU + {6D1265B2-31FB-4096-9EC9-DD937A349B9C}.Release|Any CPU.Build.0 = Release|Any CPU + {6D1265B2-31FB-4096-9EC9-DD937A349B9C}.Release|x64.ActiveCfg = Release|Any CPU + {6D1265B2-31FB-4096-9EC9-DD937A349B9C}.Release|x64.Build.0 = Release|Any CPU + {A2A18669-F9FC-49C7-B2C3-C3620066E888}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {A2A18669-F9FC-49C7-B2C3-C3620066E888}.Debug|Any CPU.Build.0 = Debug|Any CPU + {A2A18669-F9FC-49C7-B2C3-C3620066E888}.Debug|x64.ActiveCfg = Debug|Any CPU + {A2A18669-F9FC-49C7-B2C3-C3620066E888}.Debug|x64.Build.0 = Debug|Any CPU + {A2A18669-F9FC-49C7-B2C3-C3620066E888}.Release|Any CPU.ActiveCfg = Release|Any CPU + {A2A18669-F9FC-49C7-B2C3-C3620066E888}.Release|Any CPU.Build.0 = Release|Any CPU + {A2A18669-F9FC-49C7-B2C3-C3620066E888}.Release|x64.ActiveCfg = Release|Any CPU + {A2A18669-F9FC-49C7-B2C3-C3620066E888}.Release|x64.Build.0 = Release|Any CPU + {73D708CA-E956-455A-BE62-785B0CC79264}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {73D708CA-E956-455A-BE62-785B0CC79264}.Debug|Any CPU.Build.0 = Debug|Any CPU + {73D708CA-E956-455A-BE62-785B0CC79264}.Debug|x64.ActiveCfg = Debug|Any CPU + {73D708CA-E956-455A-BE62-785B0CC79264}.Debug|x64.Build.0 = Debug|Any CPU + {73D708CA-E956-455A-BE62-785B0CC79264}.Release|Any CPU.ActiveCfg = Release|Any CPU + {73D708CA-E956-455A-BE62-785B0CC79264}.Release|Any CPU.Build.0 = Release|Any CPU + {73D708CA-E956-455A-BE62-785B0CC79264}.Release|x64.ActiveCfg = Release|Any CPU + {73D708CA-E956-455A-BE62-785B0CC79264}.Release|x64.Build.0 = Release|Any CPU + {1F0BA5E1-E665-4774-AFC1-47CD1A6ECCC3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {1F0BA5E1-E665-4774-AFC1-47CD1A6ECCC3}.Debug|Any CPU.Build.0 = Debug|Any CPU + {1F0BA5E1-E665-4774-AFC1-47CD1A6ECCC3}.Debug|x64.ActiveCfg = Debug|Any CPU + {1F0BA5E1-E665-4774-AFC1-47CD1A6ECCC3}.Debug|x64.Build.0 = Debug|Any CPU + {1F0BA5E1-E665-4774-AFC1-47CD1A6ECCC3}.Release|Any CPU.ActiveCfg = Release|Any CPU + {1F0BA5E1-E665-4774-AFC1-47CD1A6ECCC3}.Release|Any CPU.Build.0 = Release|Any CPU + {1F0BA5E1-E665-4774-AFC1-47CD1A6ECCC3}.Release|x64.ActiveCfg = Release|Any CPU + {1F0BA5E1-E665-4774-AFC1-47CD1A6ECCC3}.Release|x64.Build.0 = Release|Any CPU + {461B54C0-F71F-4EC2-801D-5594ED046035}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {461B54C0-F71F-4EC2-801D-5594ED046035}.Debug|Any CPU.Build.0 = Debug|Any CPU + {461B54C0-F71F-4EC2-801D-5594ED046035}.Debug|x64.ActiveCfg = Debug|Any CPU + {461B54C0-F71F-4EC2-801D-5594ED046035}.Debug|x64.Build.0 = Debug|Any CPU + {461B54C0-F71F-4EC2-801D-5594ED046035}.Release|Any CPU.ActiveCfg = Release|Any CPU + {461B54C0-F71F-4EC2-801D-5594ED046035}.Release|Any CPU.Build.0 = Release|Any CPU + {461B54C0-F71F-4EC2-801D-5594ED046035}.Release|x64.ActiveCfg = Release|Any CPU + {461B54C0-F71F-4EC2-801D-5594ED046035}.Release|x64.Build.0 = Release|Any CPU + {D6814B75-3C4F-433E-9BE8-A9CD3A476C55}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {D6814B75-3C4F-433E-9BE8-A9CD3A476C55}.Debug|Any CPU.Build.0 = Debug|Any CPU + {D6814B75-3C4F-433E-9BE8-A9CD3A476C55}.Debug|x64.ActiveCfg = Debug|Any CPU + {D6814B75-3C4F-433E-9BE8-A9CD3A476C55}.Debug|x64.Build.0 = Debug|Any CPU + {D6814B75-3C4F-433E-9BE8-A9CD3A476C55}.Release|Any CPU.ActiveCfg = Release|Any CPU + {D6814B75-3C4F-433E-9BE8-A9CD3A476C55}.Release|Any CPU.Build.0 = Release|Any CPU + {D6814B75-3C4F-433E-9BE8-A9CD3A476C55}.Release|x64.ActiveCfg = Release|Any CPU + {D6814B75-3C4F-433E-9BE8-A9CD3A476C55}.Release|x64.Build.0 = Release|Any CPU + {C43EEDA1-2DBB-40B5-8C52-12BCBDA34D43}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {C43EEDA1-2DBB-40B5-8C52-12BCBDA34D43}.Debug|Any CPU.Build.0 = Debug|Any CPU + {C43EEDA1-2DBB-40B5-8C52-12BCBDA34D43}.Debug|x64.ActiveCfg = Debug|Any CPU + {C43EEDA1-2DBB-40B5-8C52-12BCBDA34D43}.Debug|x64.Build.0 = Debug|Any CPU + {C43EEDA1-2DBB-40B5-8C52-12BCBDA34D43}.Release|Any CPU.ActiveCfg = Release|Any CPU + {C43EEDA1-2DBB-40B5-8C52-12BCBDA34D43}.Release|Any CPU.Build.0 = Release|Any CPU + {C43EEDA1-2DBB-40B5-8C52-12BCBDA34D43}.Release|x64.ActiveCfg = Release|Any CPU + {C43EEDA1-2DBB-40B5-8C52-12BCBDA34D43}.Release|x64.Build.0 = Release|Any CPU + {BFBD40D4-BF2A-47B2-8F35-4371149DD1B6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {BFBD40D4-BF2A-47B2-8F35-4371149DD1B6}.Debug|Any CPU.Build.0 = Debug|Any CPU + {BFBD40D4-BF2A-47B2-8F35-4371149DD1B6}.Debug|x64.ActiveCfg = Debug|x64 + {BFBD40D4-BF2A-47B2-8F35-4371149DD1B6}.Debug|x64.Build.0 = Debug|x64 + {BFBD40D4-BF2A-47B2-8F35-4371149DD1B6}.Release|Any CPU.ActiveCfg = Release|Any CPU + {BFBD40D4-BF2A-47B2-8F35-4371149DD1B6}.Release|Any CPU.Build.0 = Release|Any CPU + {BFBD40D4-BF2A-47B2-8F35-4371149DD1B6}.Release|x64.ActiveCfg = Release|x64 + {BFBD40D4-BF2A-47B2-8F35-4371149DD1B6}.Release|x64.Build.0 = Release|x64 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -437,6 +532,15 @@ Global {C3903B4E-7B1C-4508-ADEB-023FEE156D3D} = {B539797D-13E9-4932-A2CF-05C5485F3AA4} {40148F0A-30D3-4919-B45E-4464A5987129} = {B539797D-13E9-4932-A2CF-05C5485F3AA4} {651F0278-3DE2-4371-8586-70D3732F9770} = {B539797D-13E9-4932-A2CF-05C5485F3AA4} + {0AF5BA0F-0FEA-463B-9877-F063892EA7DE} = {5419488F-6509-4F16-A342-BB2BE2689E00} + {6D1265B2-31FB-4096-9EC9-DD937A349B9C} = {5419488F-6509-4F16-A342-BB2BE2689E00} + {A2A18669-F9FC-49C7-B2C3-C3620066E888} = {1987848E-D753-4791-B89E-F74EDF136CB3} + {73D708CA-E956-455A-BE62-785B0CC79264} = {1987848E-D753-4791-B89E-F74EDF136CB3} + {1F0BA5E1-E665-4774-AFC1-47CD1A6ECCC3} = {5419488F-6509-4F16-A342-BB2BE2689E00} + {461B54C0-F71F-4EC2-801D-5594ED046035} = {5419488F-6509-4F16-A342-BB2BE2689E00} + {D6814B75-3C4F-433E-9BE8-A9CD3A476C55} = {5419488F-6509-4F16-A342-BB2BE2689E00} + {C43EEDA1-2DBB-40B5-8C52-12BCBDA34D43} = {5419488F-6509-4F16-A342-BB2BE2689E00} + {BFBD40D4-BF2A-47B2-8F35-4371149DD1B6} = {A2F9F9A0-0479-4FE0-83B3-AB38A9402821} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {DA57EC2E-0A9E-4F59-B1F7-A65F76A74B74} @@ -444,14 +548,17 @@ Global GlobalSection(SharedMSBuildProjectFiles) = preSolution Converters\ConverterNavisworks\ConverterNavisworks\ConverterNavisworksShared.projitems*{05ff1d88-1b2d-4a25-bf65-2895d4e6746d}*SharedItemsImports = 5 Converters\ConverterTeklaStructures\ConverterTeklaStructuresShared\ConverterTeklaStructuresShared.projitems*{08ee146e-9f7a-4c82-b790-688fe4532ca7}*SharedItemsImports = 5 + Converters\ConverterAutocadCivil\ConverterAutocadCivilShared\ConverterAutocadCivilShared.projitems*{0af5ba0f-0fea-463b-9877-f063892ea7de}*SharedItemsImports = 5 Converters\ConverterAutocadCivil\ConverterAutocadCivilShared\ConverterAutocadCivilShared.projitems*{13f93c20-793c-4f2d-b836-68d7744063df}*SharedItemsImports = 5 Converters\ConverterAutocadCivil\ConverterAutocadCivilShared\ConverterAutocadCivilShared.projitems*{156ff86c-8531-46d0-aa23-97db326bc591}*SharedItemsImports = 5 Converters\ConverterRhinoGh\ConverterRhinoGhShared\ConverterRhinoGhShared.projitems*{1dc0a8f4-1f14-47e8-8456-9d8e9c0e6cff}*SharedItemsImports = 5 + Converters\ConverterAutocadCivil\ConverterAutocadCivilShared\ConverterAutocadCivilShared.projitems*{1f0ba5e1-e665-4774-afc1-47cd1a6eccc3}*SharedItemsImports = 5 Converters\ConverterAutocadCivil\ConverterAutocadCivilShared\ConverterAutocadCivilShared.projitems*{2c68e80f-38f4-41d0-9b38-473031d1b541}*SharedItemsImports = 5 Converters\ConverterAutocadCivil\ConverterAutocadCivilShared\ConverterAutocadCivilShared.projitems*{2d0f9f8a-2e89-4780-978a-cd92d6d7b843}*SharedItemsImports = 13 Converters\ConverterRevit\ConverterRevitShared\ConverterRevitShared.projitems*{2dcd648d-dca5-4d2a-8b14-ad2cb85d24b0}*SharedItemsImports = 13 Converters\ConverterBentley\ConverterBentleyShared\ConverterBentleyShared.projitems*{40148f0a-30d3-4919-b45e-4464a5987129}*SharedItemsImports = 5 Converters\ConverterBentley\ConverterBentleyShared\ConverterBentleyShared.projitems*{425f0d00-6608-4bd2-a1e0-2730c9f2bfd3}*SharedItemsImports = 13 + Converters\ConverterAutocadCivil\ConverterAutocadCivilShared\ConverterAutocadCivilShared.projitems*{461b54c0-f71f-4ec2-801d-5594ed046035}*SharedItemsImports = 5 Converters\ConverterDynamo\ConverterDynamoShared\ConverterDynamoShared.projitems*{4f16a993-7d11-4565-a2a5-910899919e00}*SharedItemsImports = 5 Converters\ConverterRevit\ConverterRevitShared\ConverterRevitShared.projitems*{4f16a993-7d11-4565-a2a5-910899919e00}*SharedItemsImports = 5 Converters\ConverterRhinoGh\ConverterRhinoGhShared\ConverterRhinoGhShared.projitems*{5a7671d6-57a1-4422-9ebb-79f3c724c0ba}*SharedItemsImports = 5 @@ -461,17 +568,23 @@ Global Converters\ConverterCSI\ConverterCSIShared\ConverterCSIShared.projitems*{62e992b6-2e65-4714-ad37-42f34f9bd5da}*SharedItemsImports = 5 Converters\ConverterRhinoGh\ConverterRhinoGhShared\ConverterRhinoGhShared.projitems*{63b3f901-7c14-4530-8a6f-ccad68586664}*SharedItemsImports = 5 Converters\ConverterBentley\ConverterBentleyShared\ConverterBentleyShared.projitems*{651f0278-3de2-4371-8586-70d3732f9770}*SharedItemsImports = 5 + Converters\ConverterAutocadCivil\ConverterAutocadCivilShared\ConverterAutocadCivilShared.projitems*{6d1265b2-31fb-4096-9ec9-dd937a349b9c}*SharedItemsImports = 5 + Converters\ConverterRevit\ConverterRevitShared\ConverterRevitShared.projitems*{73d708ca-e956-455a-be62-785b0cc79264}*SharedItemsImports = 5 Converters\ConverterNavisworks\ConverterNavisworks\ConverterNavisworksShared.projitems*{74081536-2a3e-447d-8f53-bdc5dcb5d98b}*SharedItemsImports = 5 Converters\ConverterCSI\ConverterCSIShared\ConverterCSIShared.projitems*{79aa475d-7cde-4501-90ce-9a0d9d0db023}*SharedItemsImports = 5 Converters\ConverterTeklaStructures\ConverterTeklaStructuresShared\ConverterTeklaStructuresShared.projitems*{7ffdab72-145d-4490-9892-fac5f1d72b17}*SharedItemsImports = 13 Converters\ConverterRevit\ConverterRevitShared\ConverterRevitShared.projitems*{90362309-466a-482b-814a-adb1ce227607}*SharedItemsImports = 5 + Converters\ConverterRevit\ConverterRevitShared\ConverterRevitShared.projitems*{a2a18669-f9fc-49c7-b2c3-c3620066e888}*SharedItemsImports = 5 Converters\ConverterTeklaStructures\ConverterTeklaStructuresShared\ConverterTeklaStructuresShared.projitems*{adc53dc0-0592-4f13-b456-65adcb2164a1}*SharedItemsImports = 5 Converters\ConverterRhinoGh\ConverterRhinoGhShared\ConverterRhinoGhShared.projitems*{b74cb8c1-187b-46a6-b20b-92b8c129f3ee}*SharedItemsImports = 13 Converters\ConverterRhinoGh\ConverterRhinoGhShared\ConverterRhinoGhShared.projitems*{b9649e07-f7b4-4fcc-9e44-076993621d0a}*SharedItemsImports = 5 Converters\ConverterDynamo\ConverterDynamoShared\ConverterDynamoShared.projitems*{bc110327-3c61-4c15-ae4c-daae7ca82a7b}*SharedItemsImports = 5 Converters\ConverterRevit\ConverterRevitShared\ConverterRevitShared.projitems*{bf5515b4-c97c-4fb9-9f93-1740d2b615b3}*SharedItemsImports = 5 + Converters\ConverterNavisworks\ConverterNavisworks\ConverterNavisworksShared.projitems*{bfbd40d4-bf2a-47b2-8f35-4371149dd1b6}*SharedItemsImports = 5 Converters\ConverterNavisworks\ConverterNavisworks\ConverterNavisworksShared.projitems*{c3232ef3-2000-44c6-a330-b94531c9cc83}*SharedItemsImports = 13 Converters\ConverterBentley\ConverterBentleyShared\ConverterBentleyShared.projitems*{c3903b4e-7b1c-4508-adeb-023fee156d3d}*SharedItemsImports = 5 + Converters\ConverterAutocadCivil\ConverterAutocadCivilShared\ConverterAutocadCivilShared.projitems*{c43eeda1-2dbb-40b5-8c52-12bcbda34d43}*SharedItemsImports = 5 + Converters\ConverterAutocadCivil\ConverterAutocadCivilShared\ConverterAutocadCivilShared.projitems*{d6814b75-3c4f-433e-9be8-a9cd3a476c55}*SharedItemsImports = 5 Converters\ConverterAutocadCivil\ConverterAutocadCivilShared\ConverterAutocadCivilShared.projitems*{dd4add16-65f9-46e0-a610-2b7908a966b3}*SharedItemsImports = 5 Converters\ConverterCSI\ConverterCSIShared\ConverterCSIShared.projitems*{df4d24c3-2be8-476c-8d40-33892be07b1d}*SharedItemsImports = 5 Converters\ConverterRevit\ConverterRevitShared\ConverterRevitShared.projitems*{e4006179-462f-4133-9481-219279138b93}*SharedItemsImports = 5