From d8e782b9f2bb9de76850922f84527f3f77555b60 Mon Sep 17 00:00:00 2001 From: connorivy <43247197+connorivy@users.noreply.github.com> Date: Tue, 30 Aug 2022 04:19:11 -0400 Subject: [PATCH] Fix: remove converter references for CSI (#1547) * receive now works * sending now works Co-authored-by: Connor Ivy Co-authored-by: Alan Rynne --- ConnectorCSI/ConnectorCSI.sln | 34 ++++++++----------- .../ConnectorCSIBridge.csproj | 1 - .../ConnectorETABS/ConnectorETABS.csproj | 1 - .../ConnectorSAFE/ConnectorSAFE.csproj | 1 - .../ConnectorSAP2000/ConnectorSAP2000.csproj | 9 ----- .../ConverterCSIShared/ConverterCSI.cs | 2 ++ .../Partial Classes/Geometry/ConvertFrame.cs | 2 +- .../Properties/Convert1DProperty.cs | 2 +- .../ConverterSAP2000/ConverterSAP2000.csproj | 4 +-- 9 files changed, 21 insertions(+), 35 deletions(-) diff --git a/ConnectorCSI/ConnectorCSI.sln b/ConnectorCSI/ConnectorCSI.sln index 746000041d..ab4578ac63 100644 --- a/ConnectorCSI/ConnectorCSI.sln +++ b/ConnectorCSI/ConnectorCSI.sln @@ -1,7 +1,7 @@  Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio Version 16 -VisualStudioVersion = 16.0.31624.102 +# Visual Studio Version 17 +VisualStudioVersion = 17.2.32616.157 MinimumVisualStudioVersion = 10.0.40219.1 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ConnectorETABS", "ConnectorETABS\ConnectorETABS.csproj", "{81299D15-5788-414D-A962-1A568C251323}" EndProject @@ -42,23 +42,6 @@ EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DriverPluginCSharp", "DriverPluginCSharp\DriverPluginCSharp.csproj", "{C59939F6-D383-44E3-A7EF-4E160E3DFB73}" EndProject Global - GlobalSection(SharedMSBuildProjectFiles) = preSolution - ..\Objects\Converters\ConverterCSI\ConverterCSIShared\ConverterCSIShared.projitems*{14d40a8a-9f8f-44f6-b256-21b7f5cc4fb6}*SharedItemsImports = 5 - ConnectorCSIShared\ConnectorCSIShared.projitems*{23be6e54-96c1-4373-89f3-e18a1c9807fd}*SharedItemsImports = 4 - ..\Objects\Converters\ConverterCSI\ConverterCSIShared\ConverterCSIShared.projitems*{23be6e54-96c1-4373-89f3-e18a1c9807fd}*SharedItemsImports = 4 - ConnectorCSIShared\ConnectorCSIShared.projitems*{31e0c098-6813-4571-ab96-a245e0fc1c23}*SharedItemsImports = 4 - ..\Objects\Converters\ConverterCSI\ConverterCSIShared\ConverterCSIShared.projitems*{31e0c098-6813-4571-ab96-a245e0fc1c23}*SharedItemsImports = 4 - ..\Objects\Converters\ConverterCSI\ConverterCSIShared\ConverterCSIShared.projitems*{5bbde14e-50f8-4d6e-8e35-747667ad4a09}*SharedItemsImports = 13 - ConnectorCSIShared\ConnectorCSIShared.projitems*{61374cd0-e774-4dcd-bfab-6356b0931283}*SharedItemsImports = 13 - ..\Objects\Converters\ConverterCSI\ConverterCSIShared\ConverterCSIShared.projitems*{7572e400-c007-48e4-98fc-614fdee0b572}*SharedItemsImports = 5 - ConnectorCSIShared\ConnectorCSIShared.projitems*{81299d15-5788-414d-a962-1a568c251323}*SharedItemsImports = 4 - ..\Objects\Converters\ConverterCSI\ConverterCSIShared\ConverterCSIShared.projitems*{81299d15-5788-414d-a962-1a568c251323}*SharedItemsImports = 4 - ..\Objects\Converters\ConverterCSI\ConverterCSIShared\ConverterCSIShared.projitems*{8431e383-838b-4f0a-8065-979c3dae9ccb}*SharedItemsImports = 5 - ConnectorCSIShared\ConnectorCSIShared.projitems*{9d188843-8841-4a76-a844-efbe8e32ee05}*SharedItemsImports = 4 - ..\Objects\Converters\ConverterCSI\ConverterCSIShared\ConverterCSIShared.projitems*{9d188843-8841-4a76-a844-efbe8e32ee05}*SharedItemsImports = 4 - ConnectorCSIShared\ConnectorCSIShared.projitems*{c091e499-597d-4077-b83f-08e069091090}*SharedItemsImports = 4 - ..\Objects\Converters\ConverterCSI\ConverterCSIShared\ConverterCSIShared.projitems*{c95c0d85-50c2-46d1-9e27-f86d0d40058c}*SharedItemsImports = 5 - EndGlobalSection GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU Release|Any CPU = Release|Any CPU @@ -146,4 +129,17 @@ Global GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {61234D5B-1E5E-4C97-89A1-FA97E4B63D95} EndGlobalSection + GlobalSection(SharedMSBuildProjectFiles) = preSolution + ..\Objects\Converters\ConverterCSI\ConverterCSIShared\ConverterCSIShared.projitems*{14d40a8a-9f8f-44f6-b256-21b7f5cc4fb6}*SharedItemsImports = 5 + ConnectorCSIShared\ConnectorCSIShared.projitems*{23be6e54-96c1-4373-89f3-e18a1c9807fd}*SharedItemsImports = 4 + ConnectorCSIShared\ConnectorCSIShared.projitems*{31e0c098-6813-4571-ab96-a245e0fc1c23}*SharedItemsImports = 4 + ..\Objects\Converters\ConverterCSI\ConverterCSIShared\ConverterCSIShared.projitems*{5bbde14e-50f8-4d6e-8e35-747667ad4a09}*SharedItemsImports = 13 + ConnectorCSIShared\ConnectorCSIShared.projitems*{61374cd0-e774-4dcd-bfab-6356b0931283}*SharedItemsImports = 13 + ..\Objects\Converters\ConverterCSI\ConverterCSIShared\ConverterCSIShared.projitems*{7572e400-c007-48e4-98fc-614fdee0b572}*SharedItemsImports = 5 + ConnectorCSIShared\ConnectorCSIShared.projitems*{81299d15-5788-414d-a962-1a568c251323}*SharedItemsImports = 4 + ..\Objects\Converters\ConverterCSI\ConverterCSIShared\ConverterCSIShared.projitems*{8431e383-838b-4f0a-8065-979c3dae9ccb}*SharedItemsImports = 5 + ConnectorCSIShared\ConnectorCSIShared.projitems*{9d188843-8841-4a76-a844-efbe8e32ee05}*SharedItemsImports = 4 + ConnectorCSIShared\ConnectorCSIShared.projitems*{c091e499-597d-4077-b83f-08e069091090}*SharedItemsImports = 4 + ..\Objects\Converters\ConverterCSI\ConverterCSIShared\ConverterCSIShared.projitems*{c95c0d85-50c2-46d1-9e27-f86d0d40058c}*SharedItemsImports = 5 + EndGlobalSection EndGlobal diff --git a/ConnectorCSI/ConnectorCSIBridge/ConnectorCSIBridge.csproj b/ConnectorCSI/ConnectorCSIBridge/ConnectorCSIBridge.csproj index d673d46a99..cbcbe834e1 100644 --- a/ConnectorCSI/ConnectorCSIBridge/ConnectorCSIBridge.csproj +++ b/ConnectorCSI/ConnectorCSIBridge/ConnectorCSIBridge.csproj @@ -114,6 +114,5 @@ - \ No newline at end of file diff --git a/ConnectorCSI/ConnectorETABS/ConnectorETABS.csproj b/ConnectorCSI/ConnectorETABS/ConnectorETABS.csproj index 54ad238d96..075e3d3ef7 100644 --- a/ConnectorCSI/ConnectorETABS/ConnectorETABS.csproj +++ b/ConnectorCSI/ConnectorETABS/ConnectorETABS.csproj @@ -107,7 +107,6 @@ 1.3.6 - \ No newline at end of file diff --git a/ConnectorCSI/ConnectorSAFE/ConnectorSAFE.csproj b/ConnectorCSI/ConnectorSAFE/ConnectorSAFE.csproj index faf11854c7..bbe95fccad 100644 --- a/ConnectorCSI/ConnectorSAFE/ConnectorSAFE.csproj +++ b/ConnectorCSI/ConnectorSAFE/ConnectorSAFE.csproj @@ -108,6 +108,5 @@ - \ No newline at end of file diff --git a/ConnectorCSI/ConnectorSAP2000/ConnectorSAP2000.csproj b/ConnectorCSI/ConnectorSAP2000/ConnectorSAP2000.csproj index 52a8c020d1..843e9c41ae 100644 --- a/ConnectorCSI/ConnectorSAP2000/ConnectorSAP2000.csproj +++ b/ConnectorCSI/ConnectorSAP2000/ConnectorSAP2000.csproj @@ -62,14 +62,6 @@ {0c1b9ae4-1d21-4c02-bdac-287e9660b5f6} DesktopUI2 - - {bf1a4f95-acf7-4353-b60a-4d79c2f44651} - PolygonMesher - - - {f6f813fc-153b-49fe-9b33-25152be85ba8} - Objects - {c091e499-597d-4077-b83f-08e069091090} DriverCSharp @@ -107,7 +99,6 @@ 1.3.6 - \ No newline at end of file diff --git a/Objects/Converters/ConverterCSI/ConverterCSIShared/ConverterCSI.cs b/Objects/Converters/ConverterCSI/ConverterCSIShared/ConverterCSI.cs index 7cd185bf8c..57616e4865 100644 --- a/Objects/Converters/ConverterCSI/ConverterCSIShared/ConverterCSI.cs +++ b/Objects/Converters/ConverterCSI/ConverterCSIShared/ConverterCSI.cs @@ -75,6 +75,8 @@ public bool CanConvertToNative(Base @object) public bool CanConvertToSpeckle(object @object) { + if (@object == null) + return false; foreach (var type in Enum.GetNames(typeof(ConverterCSI.CSIAPIUsableTypes))) { if (type == @object.ToString()) diff --git a/Objects/Converters/ConverterCSI/ConverterCSIShared/Partial Classes/Geometry/ConvertFrame.cs b/Objects/Converters/ConverterCSI/ConverterCSIShared/Partial Classes/Geometry/ConvertFrame.cs index 161bbed0a8..3fa19ebb44 100644 --- a/Objects/Converters/ConverterCSI/ConverterCSIShared/Partial Classes/Geometry/ConvertFrame.cs +++ b/Objects/Converters/ConverterCSI/ConverterCSIShared/Partial Classes/Geometry/ConvertFrame.cs @@ -44,7 +44,7 @@ public object FrameToNative(Element1D element1D) string units = ModelUnits(); string newFrame = ""; Line baseline = element1D.baseLine; - string[] properties = null; + string[] properties = new string[] { }; int number = 0; Model.PropFrame.GetNameList(ref number, ref properties); if (!properties.Contains(element1D.property.name)) diff --git a/Objects/Converters/ConverterCSI/ConverterCSIShared/Partial Classes/Properties/Convert1DProperty.cs b/Objects/Converters/ConverterCSI/ConverterCSIShared/Partial Classes/Properties/Convert1DProperty.cs index c0dcd91cc9..9b740f6207 100644 --- a/Objects/Converters/ConverterCSI/ConverterCSIShared/Partial Classes/Properties/Convert1DProperty.cs +++ b/Objects/Converters/ConverterCSI/ConverterCSIShared/Partial Classes/Properties/Convert1DProperty.cs @@ -15,7 +15,7 @@ public partial class ConverterCSI public object Property1DToNative(Property1D property1D) { int numbMaterial = 0; - string[] materials = null; + string[] materials = new string[] { }; Model.PropFrame.GetNameList(ref numbMaterial, ref materials); if (property1D.material != null) { diff --git a/Objects/Converters/ConverterCSI/ConverterSAP2000/ConverterSAP2000.csproj b/Objects/Converters/ConverterCSI/ConverterSAP2000/ConverterSAP2000.csproj index a3f0a0784d..be88bd3e9c 100644 --- a/Objects/Converters/ConverterCSI/ConverterSAP2000/ConverterSAP2000.csproj +++ b/Objects/Converters/ConverterCSI/ConverterSAP2000/ConverterSAP2000.csproj @@ -36,8 +36,8 @@ true - - + +