Change inheritance for PierForce (#455)

BHoM · Aug 16, 2024 · 112887e · 112887e
2 parents b55e0ae + a15f155
commit 112887e
Show file tree

Hide file tree

Showing 3 changed files with 48 additions and 10 deletions.
diff --git a/ETABS_oM/ETABS_oM.csproj b/ETABS_oM/ETABS_oM.csproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
@@ -33,22 +33,27 @@
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="BHoM">
-      <HintPath>C:\ProgramData\BHoM\Assemblies\BHoM.dll</HintPath>
+      <HintPath>$(ProgramData)\BHoM\Assemblies\BHoM.dll</HintPath>
       <Private>False</Private>
       <SpecificVersion>False</SpecificVersion>
     </Reference>
     <Reference Include="Data_oM">
-      <HintPath>C:\ProgramData\BHoM\Assemblies\Data_oM.dll</HintPath>
+      <HintPath>$(ProgramData)\BHoM\Assemblies\Data_oM.dll</HintPath>
       <Private>False</Private>
       <SpecificVersion>False</SpecificVersion>
     </Reference>
     <Reference Include="Geometry_oM">
-      <HintPath>C:\ProgramData\BHoM\Assemblies\Geometry_oM.dll</HintPath>
+      <HintPath>$(ProgramData)\BHoM\Assemblies\Geometry_oM.dll</HintPath>
       <Private>False</Private>
       <SpecificVersion>False</SpecificVersion>
     </Reference>
+    <Reference Include="Quantities_oM">
+      <HintPath>$(ProgramData)\BHoM\Assemblies\Quantities_oM.dll</HintPath>
+	  <Private>False</Private>
+	  <SpecificVersion>False</SpecificVersion>
+    </Reference>
     <Reference Include="Structure_oM">
-      <HintPath>C:\ProgramData\BHoM\Assemblies\Structure_oM.dll</HintPath>
+      <HintPath>$(ProgramData)\BHoM\Assemblies\Structure_oM.dll</HintPath>
       <Private>False</Private>
       <SpecificVersion>False</SpecificVersion>
     </Reference>
@@ -99,4 +104,4 @@ xcopy "$(TargetDir)$(TargetFileName)"  "C:\ProgramData\BHoM\Assemblies" /Y
   <Target Name="AfterBuild">
   </Target>
   -->
-</Project>
+</Project>
diff --git a/ETABS_oM/Results/PierForce.cs b/ETABS_oM/Results/PierForce.cs
@@ -26,11 +26,14 @@
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
+using BH.oM.Structure.Results;
 using BH.oM.Base;
+using BH.oM.Quantities.Attributes;
+using System.ComponentModel;
 
 namespace BH.oM.Adapters.ETABS.Results
 {
-    public class PierForce : Structure.Results.BarForce, IImmutable
+    public class PierForce : BarResult, IImmutable
     {
         /***************************************************/
         /**** Public Properties                         ****/
@@ -39,14 +42,44 @@ public class PierForce : Structure.Results.BarForce, IImmutable
         //Just using this for the name
         public virtual string Location { get; } = "";
 
+        [Force]
+        [Description("Axial force along the local x-axis. Positive for tension, negative for compression.")]
+        public virtual double FX { get; }
+
+        [Force]
+        [Description("Shear force along the local y-axis. Generally minor axis shear force.")]
+        public virtual double FY { get; }
+
+        [Force]
+        [Description("Shear force along the local z-axis. Generally major axis shear force.")]
+        public virtual double FZ { get; }
+
+        [Moment]
+        [Description("Torsional moment.")]
+        public virtual double MX { get; }
+
+        [Moment]
+        [Description("Bending moment about the local y-axis. Generally major axis bending moment.")]
+        public virtual double MY { get; }
+
+        [Moment]
+        [Description("Bending moment about the local z-axis. Generally minor axis bending moment.")]
+        public virtual double MZ { get; }
+
         /***************************************************/
         /**** Constructors                              ****/
         /***************************************************/
 
         public PierForce(IComparable objectId, IComparable resultCase, string location, int modeNumber, double timeStep, double position, int divisions, double fx, double fy, double fz, double mx, double my, double mz)
-            : base(objectId, resultCase, modeNumber, timeStep, position, divisions, fx, fy, fz, mx, my, mz)
+            : base(objectId, resultCase, modeNumber, timeStep, position, divisions)
         {
             Location = location;
+            FX = fx;
+            FY = fy;
+            FZ = fz;
+            MX = mx;
+            MY = my;
+            MZ = mz;
         }
 
         /***************************************************/

diff --git a/Etabs_Adapter/Etabs_Adapter.csproj b/Etabs_Adapter/Etabs_Adapter.csproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
@@ -427,4 +427,4 @@ xcopy "$(TargetDir)CSiAPIv1.dll"  "C:\ProgramData\BHoM\Assemblies" /Y
   <Target Name="AfterBuild">
   </Target>
   -->
-</Project>
+</Project>