Revert pluralisation changes

BHoM · Dec 9, 2019 · f2b8b47 · f2b8b47
1 parent b9f51b3
commit f2b8b47
Show file tree

Hide file tree

Showing 6 changed files with 19 additions and 16 deletions.
diff --git a/Etabs_Adapter/Etabs_Adapter.csproj b/Etabs_Adapter/Etabs_Adapter.csproj
@@ -41,7 +41,7 @@
     <OutputType>Library</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>BH.Adapter.ETABS</RootNamespace>
-    <AssemblyName>ETABS_Adapter</AssemblyName>
+    <AssemblyName>ETABS17_Adapter</AssemblyName>
     <TargetFrameworkVersion>v4.5.2</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
   </PropertyGroup>

diff --git a/Etabs_Adapter/Read/Bar.cs b/Etabs_Adapter/Read/Bar.cs
@@ -49,11 +49,11 @@ public partial class ETABS2016Adapter : BHoMAdapter
     {
         /***************************************************/
 
-        private List<Bar> ReadBars(List<string> ids = null)
+        private List<Bar> ReadBar(List<string> ids = null)
         {
             List<Bar> barList = new List<Bar>();
-            Dictionary<string, Node> bhomNodes = ReadNodes().ToDictionary(x => x.CustomData[AdapterId].ToString());
-            Dictionary<string, ISectionProperty> bhomSections = ReadSectionProperties().ToDictionary(x => x.CustomData[AdapterId].ToString());
+            Dictionary<string, Node> bhomNodes = ReadNode().ToDictionary(x => x.CustomData[AdapterId].ToString());
+            Dictionary<string, ISectionProperty> bhomSections = ReadSectionProperty().ToDictionary(x => x.CustomData[AdapterId].ToString());
 
             int nameCount = 0;
             string[] names = { };
@@ -121,7 +121,7 @@ private List<Bar> ReadBars(List<string> ids = null)
 
         /***************************************************/
 
-        private List<ISectionProperty> ReadSectionProperties(List<string> ids = null)
+        private List<ISectionProperty> ReadSectionProperty(List<string> ids = null)
         {
             List<ISectionProperty> propList = new List<ISectionProperty>();
             Dictionary<String, IMaterialFragment> bhomMaterials = ReadMaterial().ToDictionary(x => x.Name);
@@ -290,8 +290,10 @@ private List<ISectionProperty> ReadSectionProperties(List<string> ids = null)
                         break;
                 }
                 if (dimensions == null)
+                {
                     Engine.Reflection.Compute.RecordNote(propertyType.ToString() + " properties are not implemented in ETABS adapter. An empty section has been returned.");
-                constructSelector = "explicit";
+                    constructSelector = "explicit";
+                }
                 #endregion
 
 

diff --git a/Etabs_Adapter/Read/Link.cs b/Etabs_Adapter/Read/Link.cs
@@ -94,7 +94,7 @@ private List<RigidLink> ReadRigidLink(List<string> ids = null)
                     string endId = "";
                     m_model.LinkObj.GetPoints(kvp.Key, ref startId, ref endId);
 
-                    List<Node> endNodes = ReadNodes(new List<string> { startId, endId });
+                    List<Node> endNodes = ReadNode(new List<string> { startId, endId });
                     bhLink.MasterNode = endNodes[0];
                     bhLink.SlaveNodes = new List<Node>() { endNodes[1] };
                 }
@@ -117,7 +117,7 @@ private List<RigidLink> ReadRigidLink(List<string> ids = null)
                         nodeIdsToRead.Add(endId);
                     }
 
-                    List<Node> endNodes = ReadNodes(nodeIdsToRead);
+                    List<Node> endNodes = ReadNode(nodeIdsToRead);
                     bhLink.MasterNode = endNodes[0];
                     endNodes.RemoveAt(0);
                     bhLink.SlaveNodes = endNodes;

diff --git a/Etabs_Adapter/Read/Load.cs b/Etabs_Adapter/Read/Load.cs
@@ -157,7 +157,7 @@ private List<ILoad> ReadPointLoad(List<Loadcase> loadcases)
         {
             List<ILoad> bhLoads = new List<ILoad>();
 
-            Dictionary<string, Node> bhomNodes = ReadNodes().ToDictionary(x => x.CustomData[AdapterId].ToString());
+            Dictionary<string, Node> bhomNodes = ReadNode().ToDictionary(x => x.CustomData[AdapterId].ToString());
 
             string[] names = null;
             string[] loadcase = null;
@@ -201,7 +201,7 @@ private List<ILoad> ReadBarLoad(List<Loadcase> loadcases)
         {
             List<ILoad> bhLoads = new List<ILoad>();
 
-            Dictionary<string, Bar> bhomBars = ReadBars().ToDictionary(x => x.CustomData[AdapterId].ToString());
+            Dictionary<string, Bar> bhomBars = ReadBar().ToDictionary(x => x.CustomData[AdapterId].ToString());
 
             string[] names = null;
             string[] loadcase = null;

diff --git a/Etabs_Adapter/Read/Node.cs b/Etabs_Adapter/Read/Node.cs
@@ -42,7 +42,7 @@
 using BH.oM.Geometry;
 using BH.Engine.Geometry;
 using BH.Engine.Reflection;
-using BH.oM.Architecture.Elements;
+using BH.oM.Geometry.SettingOut;
 using BH.oM.Adapters.ETABS.Elements;
 
 namespace BH.Adapter.ETABS
@@ -55,7 +55,7 @@ public partial class ETABS2016Adapter : BHoMAdapter
     {
         /***************************************************/
 
-        private List<Node> ReadNodes(List<string> ids = null)
+        private List<Node> ReadNode(List<string> ids = null)
         {
             List<Node> nodeList = new List<Node>();
 

diff --git a/Etabs_Adapter/Read/_Read.cs b/Etabs_Adapter/Read/_Read.cs
@@ -42,6 +42,7 @@
 using BH.oM.Geometry;
 using BH.Engine.Geometry;
 using BH.Engine.Reflection;
+using BH.oM.Geometry.SettingOut;
 using BH.oM.Architecture.Elements;
 using BH.oM.Adapters.ETABS.Elements;
 
@@ -60,11 +61,11 @@ public partial class ETABS2016Adapter : BHoMAdapter
         protected override IEnumerable<IBHoMObject> Read(Type type, IList ids)
         {
             if (type == typeof(Node))
-                return ReadNodes(ids as dynamic);
+                return ReadNode(ids as dynamic);
             else if (type == typeof(Bar))
-                return ReadBars(ids as dynamic);
+                return ReadBar(ids as dynamic);
             else if (type == typeof(ISectionProperty) || type.GetInterfaces().Contains(typeof(ISectionProperty)))
-                return ReadSectionProperties(ids as dynamic);
+                return ReadSectionProperty(ids as dynamic);
             else if (type == typeof(IMaterialFragment))
                 return ReadMaterial(ids as dynamic);
             else if (type == typeof(Panel))
@@ -81,7 +82,7 @@ protected override IEnumerable<IBHoMObject> Read(Type type, IList ids)
                 return ReadRigidLink(ids as dynamic);
             else if (type == typeof(LinkConstraint))
                 return ReadLinkConstraints(ids as dynamic);
-            else if (type == typeof(Level))
+            else if (type == typeof(oM.Geometry.SettingOut.Level) || type == typeof(oM.Architecture.Elements.Level))
                 return ReadLevel(ids as dynamic);
             else if (type == typeof(FEMesh))
                 return ReadMesh(ids as dynamic);