From 6e1d7b44d7062763ab83563110493f2d87c28bd4 Mon Sep 17 00:00:00 2001 From: Jedd Morgan <45512892+JR-Morgan@users.noreply.github.com> Date: Tue, 24 Oct 2023 07:58:23 +0100 Subject: [PATCH] Csharpier CSI (#2999) * Renamed project to avoid spaces in directory path * Csharpier format --- .../ConverterCSIShared.projitems | 78 +++++++++--------- .../Models/DatabaseTableWrapper.cs | 22 ++++- .../Models/ETABSGridLineDefinitionTable.cs | 80 ++++++++++++------- .../Analysis/ConvertModel.cs | 0 .../Analysis/ConvertModelInfo.cs | 0 .../Analysis/ConvertModelSettings.cs | 0 .../Analysis/ConvertModelUnits.cs | 0 .../Geometry/ConvertArea.cs | 0 .../Geometry/ConvertBeam.cs | 0 .../Geometry/ConvertBraces.cs | 0 .../Geometry/ConvertBuiltElement.cs | 0 .../Geometry/ConvertColumn.cs | 0 .../Geometry/ConvertFloor.cs | 0 .../Geometry/ConvertFrame.cs | 0 .../Geometry/ConvertGridLines.cs | 1 + .../Geometry/ConvertLine.cs | 0 .../Geometry/ConvertLinks.cs | 0 .../Geometry/ConvertPier.cs | 0 .../Geometry/ConvertPoint.cs | 0 .../Geometry/ConvertSpandrel.cs | 0 .../Geometry/ConvertStories.cs | 0 .../Geometry/ConvertTendon.cs | 0 .../Geometry/ConvertWall.cs | 0 .../Loading/ConvertLoadPattern.cs | 0 .../Loading/Loading1DElements.cs | 0 .../Loading/Loading2DElements.cs | 0 .../Loading/LoadingNode.cs | 0 .../Materials/ConvertMaterials.cs | 0 .../Properties/Convert1DProperty.cs | 0 .../Properties/Convert2DProperty.cs | 0 .../Properties/Convert2DPropertyFloor.cs | 0 .../Properties/Convert2DPropertyWall.cs | 0 .../Properties/ConvertDiaphragm.cs | 0 .../Properties/ConvertLinkProperty.cs | 0 .../Properties/ConvertSectionProfile.cs | 0 .../Properties/ConvertSpring.cs | 0 .../Properties/ConvertTendonProperty.cs | 0 .../Results/ConvertResultGlobal.cs | 0 .../Results/ConvertResultNodes.cs | 0 .../Results/ConvertResultSet1D.cs | 0 .../Results/ConvertResultSet2D.cs | 0 .../Results/ConvertResults.cs | 0 42 files changed, 110 insertions(+), 71 deletions(-) rename Objects/Converters/ConverterCSI/ConverterCSIShared/{Partial Classes => PartialClasses}/Analysis/ConvertModel.cs (100%) rename Objects/Converters/ConverterCSI/ConverterCSIShared/{Partial Classes => PartialClasses}/Analysis/ConvertModelInfo.cs (100%) rename Objects/Converters/ConverterCSI/ConverterCSIShared/{Partial Classes => PartialClasses}/Analysis/ConvertModelSettings.cs (100%) rename Objects/Converters/ConverterCSI/ConverterCSIShared/{Partial Classes => PartialClasses}/Analysis/ConvertModelUnits.cs (100%) rename Objects/Converters/ConverterCSI/ConverterCSIShared/{Partial Classes => PartialClasses}/Geometry/ConvertArea.cs (100%) rename Objects/Converters/ConverterCSI/ConverterCSIShared/{Partial Classes => PartialClasses}/Geometry/ConvertBeam.cs (100%) rename Objects/Converters/ConverterCSI/ConverterCSIShared/{Partial Classes => PartialClasses}/Geometry/ConvertBraces.cs (100%) rename Objects/Converters/ConverterCSI/ConverterCSIShared/{Partial Classes => PartialClasses}/Geometry/ConvertBuiltElement.cs (100%) rename Objects/Converters/ConverterCSI/ConverterCSIShared/{Partial Classes => PartialClasses}/Geometry/ConvertColumn.cs (100%) rename Objects/Converters/ConverterCSI/ConverterCSIShared/{Partial Classes => PartialClasses}/Geometry/ConvertFloor.cs (100%) rename Objects/Converters/ConverterCSI/ConverterCSIShared/{Partial Classes => PartialClasses}/Geometry/ConvertFrame.cs (100%) rename Objects/Converters/ConverterCSI/ConverterCSIShared/{Partial Classes => PartialClasses}/Geometry/ConvertGridLines.cs (99%) rename Objects/Converters/ConverterCSI/ConverterCSIShared/{Partial Classes => PartialClasses}/Geometry/ConvertLine.cs (100%) rename Objects/Converters/ConverterCSI/ConverterCSIShared/{Partial Classes => PartialClasses}/Geometry/ConvertLinks.cs (100%) rename Objects/Converters/ConverterCSI/ConverterCSIShared/{Partial Classes => PartialClasses}/Geometry/ConvertPier.cs (100%) rename Objects/Converters/ConverterCSI/ConverterCSIShared/{Partial Classes => PartialClasses}/Geometry/ConvertPoint.cs (100%) rename Objects/Converters/ConverterCSI/ConverterCSIShared/{Partial Classes => PartialClasses}/Geometry/ConvertSpandrel.cs (100%) rename Objects/Converters/ConverterCSI/ConverterCSIShared/{Partial Classes => PartialClasses}/Geometry/ConvertStories.cs (100%) rename Objects/Converters/ConverterCSI/ConverterCSIShared/{Partial Classes => PartialClasses}/Geometry/ConvertTendon.cs (100%) rename Objects/Converters/ConverterCSI/ConverterCSIShared/{Partial Classes => PartialClasses}/Geometry/ConvertWall.cs (100%) rename Objects/Converters/ConverterCSI/ConverterCSIShared/{Partial Classes => PartialClasses}/Loading/ConvertLoadPattern.cs (100%) rename Objects/Converters/ConverterCSI/ConverterCSIShared/{Partial Classes => PartialClasses}/Loading/Loading1DElements.cs (100%) rename Objects/Converters/ConverterCSI/ConverterCSIShared/{Partial Classes => PartialClasses}/Loading/Loading2DElements.cs (100%) rename Objects/Converters/ConverterCSI/ConverterCSIShared/{Partial Classes => PartialClasses}/Loading/LoadingNode.cs (100%) rename Objects/Converters/ConverterCSI/ConverterCSIShared/{Partial Classes => PartialClasses}/Materials/ConvertMaterials.cs (100%) rename Objects/Converters/ConverterCSI/ConverterCSIShared/{Partial Classes => PartialClasses}/Properties/Convert1DProperty.cs (100%) rename Objects/Converters/ConverterCSI/ConverterCSIShared/{Partial Classes => PartialClasses}/Properties/Convert2DProperty.cs (100%) rename Objects/Converters/ConverterCSI/ConverterCSIShared/{Partial Classes => PartialClasses}/Properties/Convert2DPropertyFloor.cs (100%) rename Objects/Converters/ConverterCSI/ConverterCSIShared/{Partial Classes => PartialClasses}/Properties/Convert2DPropertyWall.cs (100%) rename Objects/Converters/ConverterCSI/ConverterCSIShared/{Partial Classes => PartialClasses}/Properties/ConvertDiaphragm.cs (100%) rename Objects/Converters/ConverterCSI/ConverterCSIShared/{Partial Classes => PartialClasses}/Properties/ConvertLinkProperty.cs (100%) rename Objects/Converters/ConverterCSI/ConverterCSIShared/{Partial Classes => PartialClasses}/Properties/ConvertSectionProfile.cs (100%) rename Objects/Converters/ConverterCSI/ConverterCSIShared/{Partial Classes => PartialClasses}/Properties/ConvertSpring.cs (100%) rename Objects/Converters/ConverterCSI/ConverterCSIShared/{Partial Classes => PartialClasses}/Properties/ConvertTendonProperty.cs (100%) rename Objects/Converters/ConverterCSI/ConverterCSIShared/{Partial Classes => PartialClasses}/Results/ConvertResultGlobal.cs (100%) rename Objects/Converters/ConverterCSI/ConverterCSIShared/{Partial Classes => PartialClasses}/Results/ConvertResultNodes.cs (100%) rename Objects/Converters/ConverterCSI/ConverterCSIShared/{Partial Classes => PartialClasses}/Results/ConvertResultSet1D.cs (100%) rename Objects/Converters/ConverterCSI/ConverterCSIShared/{Partial Classes => PartialClasses}/Results/ConvertResultSet2D.cs (100%) rename Objects/Converters/ConverterCSI/ConverterCSIShared/{Partial Classes => PartialClasses}/Results/ConvertResults.cs (100%) diff --git a/Objects/Converters/ConverterCSI/ConverterCSIShared/ConverterCSIShared.projitems b/Objects/Converters/ConverterCSI/ConverterCSIShared/ConverterCSIShared.projitems index f0f03983ad..26af5f4eab 100644 --- a/Objects/Converters/ConverterCSI/ConverterCSIShared/ConverterCSIShared.projitems +++ b/Objects/Converters/ConverterCSI/ConverterCSIShared/ConverterCSIShared.projitems @@ -18,45 +18,45 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/Objects/Converters/ConverterCSI/ConverterCSIShared/Models/DatabaseTableWrapper.cs b/Objects/Converters/ConverterCSI/ConverterCSIShared/Models/DatabaseTableWrapper.cs index b95f3a624c..a594c75cdf 100644 --- a/Objects/Converters/ConverterCSI/ConverterCSIShared/Models/DatabaseTableWrapper.cs +++ b/Objects/Converters/ConverterCSI/ConverterCSIShared/Models/DatabaseTableWrapper.cs @@ -21,6 +21,7 @@ protected DatabaseTableWrapper(cSapModel cSapModel, ToNativeScalingService toNat this.toNativeScalingService = toNativeScalingService; this.tableData = new List(GetTableData()); } + private string[] GetTableData() { var tableData = Array.Empty(); @@ -39,7 +40,9 @@ protected void AddRow(params string[] arguments) { if (arguments.Length != fieldKeysIncluded.Length) { - throw new ArgumentException($"Method {nameof(AddRow)} was passed an array of length {arguments.Length}, but was expecting an array of length {fieldKeysIncluded.Length}"); + throw new ArgumentException( + $"Method {nameof(AddRow)} was passed an array of length {arguments.Length}, but was expecting an array of length {fieldKeysIncluded.Length}" + ); } tableData.AddRange(arguments); numRecords++; @@ -48,14 +51,27 @@ protected void AddRow(params string[] arguments) public void ApplyEditedTables() { var tableDataArray = tableData.ToArray(); - cSapModel.DatabaseTables.SetTableForEditingArray(TableKey, ref tableVersion, ref fieldKeysIncluded, numRecords, ref tableDataArray); + cSapModel.DatabaseTables.SetTableForEditingArray( + TableKey, + ref tableVersion, + ref fieldKeysIncluded, + numRecords, + ref tableDataArray + ); int numFatalErrors = 0; int numWarnMsgs = 0; int numInfoMsgs = 0; int numErrorMsgs = 0; string importLog = ""; - cSapModel.DatabaseTables.ApplyEditedTables(false, ref numFatalErrors, ref numErrorMsgs, ref numWarnMsgs, ref numInfoMsgs, ref importLog); + cSapModel.DatabaseTables.ApplyEditedTables( + false, + ref numFatalErrors, + ref numErrorMsgs, + ref numWarnMsgs, + ref numInfoMsgs, + ref importLog + ); } } } diff --git a/Objects/Converters/ConverterCSI/ConverterCSIShared/Models/ETABSGridLineDefinitionTable.cs b/Objects/Converters/ConverterCSI/ConverterCSIShared/Models/ETABSGridLineDefinitionTable.cs index 36ee8566e9..c509e0773c 100644 --- a/Objects/Converters/ConverterCSI/ConverterCSIShared/Models/ETABSGridLineDefinitionTable.cs +++ b/Objects/Converters/ConverterCSI/ConverterCSIShared/Models/ETABSGridLineDefinitionTable.cs @@ -16,20 +16,23 @@ internal class ETABSGridLineDefinitionTable : DatabaseTableWrapper { private const double gridTolerance = .001; // .05 degrees as radians public override string TableKey => "Grid Definitions - Grid Lines"; - public static string?[] DefaultRow => new string?[] { - null, // Name : Grid System name - null, // LineType - null, // Id : Grid name - null, // Ordinate : Offset in the positive direction - null, // Angle : clockwise offset in degrees for polar (cylindrical) coordinates - null, // X1 - null, // Y1 - null, // X2 - null, // Y2 - "Start", // BubbleLoc - "Yes", // Visible - }; - public ETABSGridLineDefinitionTable(cSapModel cSapModel, ToNativeScalingService toNativeScalingService) + public static string?[] DefaultRow => + new string?[] + { + null, // Name : Grid System name + null, // LineType + null, // Id : Grid name + null, // Ordinate : Offset in the positive direction + null, // Angle : clockwise offset in degrees for polar (cylindrical) coordinates + null, // X1 + null, // Y1 + null, // X2 + null, // Y2 + "Start", // BubbleLoc + "Yes", // Visible + }; + + public ETABSGridLineDefinitionTable(cSapModel cSapModel, ToNativeScalingService toNativeScalingService) : base(cSapModel, toNativeScalingService) { } public const string XGridLineType = "X (Cartesian)"; @@ -47,9 +50,9 @@ public ETABSGridLineDefinitionTable(cSapModel cSapModel, ToNativeScalingService /// /// public void AddCartesian( - string gridSystemName, - string gridLineType, - string gridName, + string gridSystemName, + string gridLineType, + string gridName, double location, string visible = "Yes" ) @@ -102,18 +105,24 @@ public void AddCartesian(GridLine gridLine) if (newUx < gridTolerance) { lineType = XGridLineType; - gridLineOffset = toNativeScalingService - .ScaleLength(transformedLine.start.x, transformedLine.units ?? transformedLine.start.units); + gridLineOffset = toNativeScalingService.ScaleLength( + transformedLine.start.x, + transformedLine.units ?? transformedLine.start.units + ); } else if (newUy < gridTolerance) { lineType = YGridLineType; - gridLineOffset = toNativeScalingService - .ScaleLength(transformedLine.start.y, transformedLine.units ?? transformedLine.start.units); + gridLineOffset = toNativeScalingService.ScaleLength( + transformedLine.start.y, + transformedLine.units ?? transformedLine.start.units + ); } else { - throw new SpeckleException($"Error in transforming line from global coordinates to grid system with rotation {gridSystem.Rotation} and x,y offsets {gridSystem.XOrigin}, {gridSystem.YOrigin}"); + throw new SpeckleException( + $"Error in transforming line from global coordinates to grid system with rotation {gridSystem.Rotation} and x,y offsets {gridSystem.XOrigin}, {gridSystem.YOrigin}" + ); } AddCartesian(gridSystem.Name, lineType, gridLine.label, gridLineOffset); @@ -137,7 +146,7 @@ private static double GetAngleOffsetFromGlobalCoordinateSystem(Line line) } /// - /// Find a GridSystem in the CSi model whose local x axis is either parallel or perpendicular to the provided + /// Find a GridSystem in the CSi model whose local x axis is either parallel or perpendicular to the provided /// grid angle. /// /// Rotation counter-clockwise from the global x axis in radians @@ -198,7 +207,7 @@ private string GetUniqueGridSystemName() var gridSystemNamePrefix = "SpeckleGridSystem"; foreach (var gridSysName in gridSysNames) { - // test if this grid system is one that we already created. If it is, then we need to adjust our + // test if this grid system is one that we already created. If it is, then we need to adjust our // numberOfGridSystems so that if we do end up creating a new one, it doesn't override an existing one. if (!gridSysName.StartsWith(gridSystemNamePrefix)) { @@ -210,7 +219,8 @@ private string GetUniqueGridSystemName() numberOfGridSystems = Math.Max(numberOfGridSystems, gridSysNum + 1); } } - return $"{gridSystemNamePrefix}{numberOfGridSystems}"; ; + return $"{gridSystemNamePrefix}{numberOfGridSystems}"; + ; } private static Transform GetTransformFromGridSystem(GridSystemRepresentation sys) @@ -218,10 +228,22 @@ private static Transform GetTransformFromGridSystem(GridSystemRepresentation sys return new Transform( new double[] { - Math.Cos(sys.Rotation), -Math.Sin(sys.Rotation), 0, sys.XOrigin, - Math.Sin(sys.Rotation), Math.Cos(sys.Rotation), 0, sys.YOrigin, - 0, 0, 1, 0, - 0, 0, 0, 1 + Math.Cos(sys.Rotation), + -Math.Sin(sys.Rotation), + 0, + sys.XOrigin, + Math.Sin(sys.Rotation), + Math.Cos(sys.Rotation), + 0, + sys.YOrigin, + 0, + 0, + 1, + 0, + 0, + 0, + 0, + 1 } ); } diff --git a/Objects/Converters/ConverterCSI/ConverterCSIShared/Partial Classes/Analysis/ConvertModel.cs b/Objects/Converters/ConverterCSI/ConverterCSIShared/PartialClasses/Analysis/ConvertModel.cs similarity index 100% rename from Objects/Converters/ConverterCSI/ConverterCSIShared/Partial Classes/Analysis/ConvertModel.cs rename to Objects/Converters/ConverterCSI/ConverterCSIShared/PartialClasses/Analysis/ConvertModel.cs diff --git a/Objects/Converters/ConverterCSI/ConverterCSIShared/Partial Classes/Analysis/ConvertModelInfo.cs b/Objects/Converters/ConverterCSI/ConverterCSIShared/PartialClasses/Analysis/ConvertModelInfo.cs similarity index 100% rename from Objects/Converters/ConverterCSI/ConverterCSIShared/Partial Classes/Analysis/ConvertModelInfo.cs rename to Objects/Converters/ConverterCSI/ConverterCSIShared/PartialClasses/Analysis/ConvertModelInfo.cs diff --git a/Objects/Converters/ConverterCSI/ConverterCSIShared/Partial Classes/Analysis/ConvertModelSettings.cs b/Objects/Converters/ConverterCSI/ConverterCSIShared/PartialClasses/Analysis/ConvertModelSettings.cs similarity index 100% rename from Objects/Converters/ConverterCSI/ConverterCSIShared/Partial Classes/Analysis/ConvertModelSettings.cs rename to Objects/Converters/ConverterCSI/ConverterCSIShared/PartialClasses/Analysis/ConvertModelSettings.cs diff --git a/Objects/Converters/ConverterCSI/ConverterCSIShared/Partial Classes/Analysis/ConvertModelUnits.cs b/Objects/Converters/ConverterCSI/ConverterCSIShared/PartialClasses/Analysis/ConvertModelUnits.cs similarity index 100% rename from Objects/Converters/ConverterCSI/ConverterCSIShared/Partial Classes/Analysis/ConvertModelUnits.cs rename to Objects/Converters/ConverterCSI/ConverterCSIShared/PartialClasses/Analysis/ConvertModelUnits.cs diff --git a/Objects/Converters/ConverterCSI/ConverterCSIShared/Partial Classes/Geometry/ConvertArea.cs b/Objects/Converters/ConverterCSI/ConverterCSIShared/PartialClasses/Geometry/ConvertArea.cs similarity index 100% rename from Objects/Converters/ConverterCSI/ConverterCSIShared/Partial Classes/Geometry/ConvertArea.cs rename to Objects/Converters/ConverterCSI/ConverterCSIShared/PartialClasses/Geometry/ConvertArea.cs diff --git a/Objects/Converters/ConverterCSI/ConverterCSIShared/Partial Classes/Geometry/ConvertBeam.cs b/Objects/Converters/ConverterCSI/ConverterCSIShared/PartialClasses/Geometry/ConvertBeam.cs similarity index 100% rename from Objects/Converters/ConverterCSI/ConverterCSIShared/Partial Classes/Geometry/ConvertBeam.cs rename to Objects/Converters/ConverterCSI/ConverterCSIShared/PartialClasses/Geometry/ConvertBeam.cs diff --git a/Objects/Converters/ConverterCSI/ConverterCSIShared/Partial Classes/Geometry/ConvertBraces.cs b/Objects/Converters/ConverterCSI/ConverterCSIShared/PartialClasses/Geometry/ConvertBraces.cs similarity index 100% rename from Objects/Converters/ConverterCSI/ConverterCSIShared/Partial Classes/Geometry/ConvertBraces.cs rename to Objects/Converters/ConverterCSI/ConverterCSIShared/PartialClasses/Geometry/ConvertBraces.cs diff --git a/Objects/Converters/ConverterCSI/ConverterCSIShared/Partial Classes/Geometry/ConvertBuiltElement.cs b/Objects/Converters/ConverterCSI/ConverterCSIShared/PartialClasses/Geometry/ConvertBuiltElement.cs similarity index 100% rename from Objects/Converters/ConverterCSI/ConverterCSIShared/Partial Classes/Geometry/ConvertBuiltElement.cs rename to Objects/Converters/ConverterCSI/ConverterCSIShared/PartialClasses/Geometry/ConvertBuiltElement.cs diff --git a/Objects/Converters/ConverterCSI/ConverterCSIShared/Partial Classes/Geometry/ConvertColumn.cs b/Objects/Converters/ConverterCSI/ConverterCSIShared/PartialClasses/Geometry/ConvertColumn.cs similarity index 100% rename from Objects/Converters/ConverterCSI/ConverterCSIShared/Partial Classes/Geometry/ConvertColumn.cs rename to Objects/Converters/ConverterCSI/ConverterCSIShared/PartialClasses/Geometry/ConvertColumn.cs diff --git a/Objects/Converters/ConverterCSI/ConverterCSIShared/Partial Classes/Geometry/ConvertFloor.cs b/Objects/Converters/ConverterCSI/ConverterCSIShared/PartialClasses/Geometry/ConvertFloor.cs similarity index 100% rename from Objects/Converters/ConverterCSI/ConverterCSIShared/Partial Classes/Geometry/ConvertFloor.cs rename to Objects/Converters/ConverterCSI/ConverterCSIShared/PartialClasses/Geometry/ConvertFloor.cs diff --git a/Objects/Converters/ConverterCSI/ConverterCSIShared/Partial Classes/Geometry/ConvertFrame.cs b/Objects/Converters/ConverterCSI/ConverterCSIShared/PartialClasses/Geometry/ConvertFrame.cs similarity index 100% rename from Objects/Converters/ConverterCSI/ConverterCSIShared/Partial Classes/Geometry/ConvertFrame.cs rename to Objects/Converters/ConverterCSI/ConverterCSIShared/PartialClasses/Geometry/ConvertFrame.cs diff --git a/Objects/Converters/ConverterCSI/ConverterCSIShared/Partial Classes/Geometry/ConvertGridLines.cs b/Objects/Converters/ConverterCSI/ConverterCSIShared/PartialClasses/Geometry/ConvertGridLines.cs similarity index 99% rename from Objects/Converters/ConverterCSI/ConverterCSIShared/Partial Classes/Geometry/ConvertGridLines.cs rename to Objects/Converters/ConverterCSI/ConverterCSIShared/PartialClasses/Geometry/ConvertGridLines.cs index b11fd91f98..cbe6be0b91 100644 --- a/Objects/Converters/ConverterCSI/ConverterCSIShared/Partial Classes/Geometry/ConvertGridLines.cs +++ b/Objects/Converters/ConverterCSI/ConverterCSIShared/PartialClasses/Geometry/ConvertGridLines.cs @@ -11,6 +11,7 @@ public partial class ConverterCSI { private ETABSGridLineDefinitionTable gridLineDefinitionTable; private ETABSGridLineDefinitionTable GridLineDefinitionTable => gridLineDefinitionTable ??= new(Model, new(Model)); + public void GridLineToNative(GridLine gridline) { GridLineDefinitionTable.AddCartesian(gridline); diff --git a/Objects/Converters/ConverterCSI/ConverterCSIShared/Partial Classes/Geometry/ConvertLine.cs b/Objects/Converters/ConverterCSI/ConverterCSIShared/PartialClasses/Geometry/ConvertLine.cs similarity index 100% rename from Objects/Converters/ConverterCSI/ConverterCSIShared/Partial Classes/Geometry/ConvertLine.cs rename to Objects/Converters/ConverterCSI/ConverterCSIShared/PartialClasses/Geometry/ConvertLine.cs diff --git a/Objects/Converters/ConverterCSI/ConverterCSIShared/Partial Classes/Geometry/ConvertLinks.cs b/Objects/Converters/ConverterCSI/ConverterCSIShared/PartialClasses/Geometry/ConvertLinks.cs similarity index 100% rename from Objects/Converters/ConverterCSI/ConverterCSIShared/Partial Classes/Geometry/ConvertLinks.cs rename to Objects/Converters/ConverterCSI/ConverterCSIShared/PartialClasses/Geometry/ConvertLinks.cs diff --git a/Objects/Converters/ConverterCSI/ConverterCSIShared/Partial Classes/Geometry/ConvertPier.cs b/Objects/Converters/ConverterCSI/ConverterCSIShared/PartialClasses/Geometry/ConvertPier.cs similarity index 100% rename from Objects/Converters/ConverterCSI/ConverterCSIShared/Partial Classes/Geometry/ConvertPier.cs rename to Objects/Converters/ConverterCSI/ConverterCSIShared/PartialClasses/Geometry/ConvertPier.cs diff --git a/Objects/Converters/ConverterCSI/ConverterCSIShared/Partial Classes/Geometry/ConvertPoint.cs b/Objects/Converters/ConverterCSI/ConverterCSIShared/PartialClasses/Geometry/ConvertPoint.cs similarity index 100% rename from Objects/Converters/ConverterCSI/ConverterCSIShared/Partial Classes/Geometry/ConvertPoint.cs rename to Objects/Converters/ConverterCSI/ConverterCSIShared/PartialClasses/Geometry/ConvertPoint.cs diff --git a/Objects/Converters/ConverterCSI/ConverterCSIShared/Partial Classes/Geometry/ConvertSpandrel.cs b/Objects/Converters/ConverterCSI/ConverterCSIShared/PartialClasses/Geometry/ConvertSpandrel.cs similarity index 100% rename from Objects/Converters/ConverterCSI/ConverterCSIShared/Partial Classes/Geometry/ConvertSpandrel.cs rename to Objects/Converters/ConverterCSI/ConverterCSIShared/PartialClasses/Geometry/ConvertSpandrel.cs diff --git a/Objects/Converters/ConverterCSI/ConverterCSIShared/Partial Classes/Geometry/ConvertStories.cs b/Objects/Converters/ConverterCSI/ConverterCSIShared/PartialClasses/Geometry/ConvertStories.cs similarity index 100% rename from Objects/Converters/ConverterCSI/ConverterCSIShared/Partial Classes/Geometry/ConvertStories.cs rename to Objects/Converters/ConverterCSI/ConverterCSIShared/PartialClasses/Geometry/ConvertStories.cs diff --git a/Objects/Converters/ConverterCSI/ConverterCSIShared/Partial Classes/Geometry/ConvertTendon.cs b/Objects/Converters/ConverterCSI/ConverterCSIShared/PartialClasses/Geometry/ConvertTendon.cs similarity index 100% rename from Objects/Converters/ConverterCSI/ConverterCSIShared/Partial Classes/Geometry/ConvertTendon.cs rename to Objects/Converters/ConverterCSI/ConverterCSIShared/PartialClasses/Geometry/ConvertTendon.cs diff --git a/Objects/Converters/ConverterCSI/ConverterCSIShared/Partial Classes/Geometry/ConvertWall.cs b/Objects/Converters/ConverterCSI/ConverterCSIShared/PartialClasses/Geometry/ConvertWall.cs similarity index 100% rename from Objects/Converters/ConverterCSI/ConverterCSIShared/Partial Classes/Geometry/ConvertWall.cs rename to Objects/Converters/ConverterCSI/ConverterCSIShared/PartialClasses/Geometry/ConvertWall.cs diff --git a/Objects/Converters/ConverterCSI/ConverterCSIShared/Partial Classes/Loading/ConvertLoadPattern.cs b/Objects/Converters/ConverterCSI/ConverterCSIShared/PartialClasses/Loading/ConvertLoadPattern.cs similarity index 100% rename from Objects/Converters/ConverterCSI/ConverterCSIShared/Partial Classes/Loading/ConvertLoadPattern.cs rename to Objects/Converters/ConverterCSI/ConverterCSIShared/PartialClasses/Loading/ConvertLoadPattern.cs diff --git a/Objects/Converters/ConverterCSI/ConverterCSIShared/Partial Classes/Loading/Loading1DElements.cs b/Objects/Converters/ConverterCSI/ConverterCSIShared/PartialClasses/Loading/Loading1DElements.cs similarity index 100% rename from Objects/Converters/ConverterCSI/ConverterCSIShared/Partial Classes/Loading/Loading1DElements.cs rename to Objects/Converters/ConverterCSI/ConverterCSIShared/PartialClasses/Loading/Loading1DElements.cs diff --git a/Objects/Converters/ConverterCSI/ConverterCSIShared/Partial Classes/Loading/Loading2DElements.cs b/Objects/Converters/ConverterCSI/ConverterCSIShared/PartialClasses/Loading/Loading2DElements.cs similarity index 100% rename from Objects/Converters/ConverterCSI/ConverterCSIShared/Partial Classes/Loading/Loading2DElements.cs rename to Objects/Converters/ConverterCSI/ConverterCSIShared/PartialClasses/Loading/Loading2DElements.cs diff --git a/Objects/Converters/ConverterCSI/ConverterCSIShared/Partial Classes/Loading/LoadingNode.cs b/Objects/Converters/ConverterCSI/ConverterCSIShared/PartialClasses/Loading/LoadingNode.cs similarity index 100% rename from Objects/Converters/ConverterCSI/ConverterCSIShared/Partial Classes/Loading/LoadingNode.cs rename to Objects/Converters/ConverterCSI/ConverterCSIShared/PartialClasses/Loading/LoadingNode.cs diff --git a/Objects/Converters/ConverterCSI/ConverterCSIShared/Partial Classes/Materials/ConvertMaterials.cs b/Objects/Converters/ConverterCSI/ConverterCSIShared/PartialClasses/Materials/ConvertMaterials.cs similarity index 100% rename from Objects/Converters/ConverterCSI/ConverterCSIShared/Partial Classes/Materials/ConvertMaterials.cs rename to Objects/Converters/ConverterCSI/ConverterCSIShared/PartialClasses/Materials/ConvertMaterials.cs diff --git a/Objects/Converters/ConverterCSI/ConverterCSIShared/Partial Classes/Properties/Convert1DProperty.cs b/Objects/Converters/ConverterCSI/ConverterCSIShared/PartialClasses/Properties/Convert1DProperty.cs similarity index 100% rename from Objects/Converters/ConverterCSI/ConverterCSIShared/Partial Classes/Properties/Convert1DProperty.cs rename to Objects/Converters/ConverterCSI/ConverterCSIShared/PartialClasses/Properties/Convert1DProperty.cs diff --git a/Objects/Converters/ConverterCSI/ConverterCSIShared/Partial Classes/Properties/Convert2DProperty.cs b/Objects/Converters/ConverterCSI/ConverterCSIShared/PartialClasses/Properties/Convert2DProperty.cs similarity index 100% rename from Objects/Converters/ConverterCSI/ConverterCSIShared/Partial Classes/Properties/Convert2DProperty.cs rename to Objects/Converters/ConverterCSI/ConverterCSIShared/PartialClasses/Properties/Convert2DProperty.cs diff --git a/Objects/Converters/ConverterCSI/ConverterCSIShared/Partial Classes/Properties/Convert2DPropertyFloor.cs b/Objects/Converters/ConverterCSI/ConverterCSIShared/PartialClasses/Properties/Convert2DPropertyFloor.cs similarity index 100% rename from Objects/Converters/ConverterCSI/ConverterCSIShared/Partial Classes/Properties/Convert2DPropertyFloor.cs rename to Objects/Converters/ConverterCSI/ConverterCSIShared/PartialClasses/Properties/Convert2DPropertyFloor.cs diff --git a/Objects/Converters/ConverterCSI/ConverterCSIShared/Partial Classes/Properties/Convert2DPropertyWall.cs b/Objects/Converters/ConverterCSI/ConverterCSIShared/PartialClasses/Properties/Convert2DPropertyWall.cs similarity index 100% rename from Objects/Converters/ConverterCSI/ConverterCSIShared/Partial Classes/Properties/Convert2DPropertyWall.cs rename to Objects/Converters/ConverterCSI/ConverterCSIShared/PartialClasses/Properties/Convert2DPropertyWall.cs diff --git a/Objects/Converters/ConverterCSI/ConverterCSIShared/Partial Classes/Properties/ConvertDiaphragm.cs b/Objects/Converters/ConverterCSI/ConverterCSIShared/PartialClasses/Properties/ConvertDiaphragm.cs similarity index 100% rename from Objects/Converters/ConverterCSI/ConverterCSIShared/Partial Classes/Properties/ConvertDiaphragm.cs rename to Objects/Converters/ConverterCSI/ConverterCSIShared/PartialClasses/Properties/ConvertDiaphragm.cs diff --git a/Objects/Converters/ConverterCSI/ConverterCSIShared/Partial Classes/Properties/ConvertLinkProperty.cs b/Objects/Converters/ConverterCSI/ConverterCSIShared/PartialClasses/Properties/ConvertLinkProperty.cs similarity index 100% rename from Objects/Converters/ConverterCSI/ConverterCSIShared/Partial Classes/Properties/ConvertLinkProperty.cs rename to Objects/Converters/ConverterCSI/ConverterCSIShared/PartialClasses/Properties/ConvertLinkProperty.cs diff --git a/Objects/Converters/ConverterCSI/ConverterCSIShared/Partial Classes/Properties/ConvertSectionProfile.cs b/Objects/Converters/ConverterCSI/ConverterCSIShared/PartialClasses/Properties/ConvertSectionProfile.cs similarity index 100% rename from Objects/Converters/ConverterCSI/ConverterCSIShared/Partial Classes/Properties/ConvertSectionProfile.cs rename to Objects/Converters/ConverterCSI/ConverterCSIShared/PartialClasses/Properties/ConvertSectionProfile.cs diff --git a/Objects/Converters/ConverterCSI/ConverterCSIShared/Partial Classes/Properties/ConvertSpring.cs b/Objects/Converters/ConverterCSI/ConverterCSIShared/PartialClasses/Properties/ConvertSpring.cs similarity index 100% rename from Objects/Converters/ConverterCSI/ConverterCSIShared/Partial Classes/Properties/ConvertSpring.cs rename to Objects/Converters/ConverterCSI/ConverterCSIShared/PartialClasses/Properties/ConvertSpring.cs diff --git a/Objects/Converters/ConverterCSI/ConverterCSIShared/Partial Classes/Properties/ConvertTendonProperty.cs b/Objects/Converters/ConverterCSI/ConverterCSIShared/PartialClasses/Properties/ConvertTendonProperty.cs similarity index 100% rename from Objects/Converters/ConverterCSI/ConverterCSIShared/Partial Classes/Properties/ConvertTendonProperty.cs rename to Objects/Converters/ConverterCSI/ConverterCSIShared/PartialClasses/Properties/ConvertTendonProperty.cs diff --git a/Objects/Converters/ConverterCSI/ConverterCSIShared/Partial Classes/Results/ConvertResultGlobal.cs b/Objects/Converters/ConverterCSI/ConverterCSIShared/PartialClasses/Results/ConvertResultGlobal.cs similarity index 100% rename from Objects/Converters/ConverterCSI/ConverterCSIShared/Partial Classes/Results/ConvertResultGlobal.cs rename to Objects/Converters/ConverterCSI/ConverterCSIShared/PartialClasses/Results/ConvertResultGlobal.cs diff --git a/Objects/Converters/ConverterCSI/ConverterCSIShared/Partial Classes/Results/ConvertResultNodes.cs b/Objects/Converters/ConverterCSI/ConverterCSIShared/PartialClasses/Results/ConvertResultNodes.cs similarity index 100% rename from Objects/Converters/ConverterCSI/ConverterCSIShared/Partial Classes/Results/ConvertResultNodes.cs rename to Objects/Converters/ConverterCSI/ConverterCSIShared/PartialClasses/Results/ConvertResultNodes.cs diff --git a/Objects/Converters/ConverterCSI/ConverterCSIShared/Partial Classes/Results/ConvertResultSet1D.cs b/Objects/Converters/ConverterCSI/ConverterCSIShared/PartialClasses/Results/ConvertResultSet1D.cs similarity index 100% rename from Objects/Converters/ConverterCSI/ConverterCSIShared/Partial Classes/Results/ConvertResultSet1D.cs rename to Objects/Converters/ConverterCSI/ConverterCSIShared/PartialClasses/Results/ConvertResultSet1D.cs diff --git a/Objects/Converters/ConverterCSI/ConverterCSIShared/Partial Classes/Results/ConvertResultSet2D.cs b/Objects/Converters/ConverterCSI/ConverterCSIShared/PartialClasses/Results/ConvertResultSet2D.cs similarity index 100% rename from Objects/Converters/ConverterCSI/ConverterCSIShared/Partial Classes/Results/ConvertResultSet2D.cs rename to Objects/Converters/ConverterCSI/ConverterCSIShared/PartialClasses/Results/ConvertResultSet2D.cs diff --git a/Objects/Converters/ConverterCSI/ConverterCSIShared/Partial Classes/Results/ConvertResults.cs b/Objects/Converters/ConverterCSI/ConverterCSIShared/PartialClasses/Results/ConvertResults.cs similarity index 100% rename from Objects/Converters/ConverterCSI/ConverterCSIShared/Partial Classes/Results/ConvertResults.cs rename to Objects/Converters/ConverterCSI/ConverterCSIShared/PartialClasses/Results/ConvertResults.cs