Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add support for future ETABS versions #399

Merged
merged 6 commits into from
Jan 20, 2022
Merged

Add support for future ETABS versions #399

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
8cdef66
Rename ETABS18Adapter to ETABSAdapter
IsakNaslundBh Jan 18, 2022
df3c04e
simplyfy pre-compiler
IsakNaslundBh Jan 18, 2022
8a11362
Fixing constructore, adding additional checks and making sure the ada…
IsakNaslundBh Jan 18, 2022
944c181
Add Versioning
IsakNaslundBh Jan 18, 2022
2aec562
Create altConfigs.txt
IsakNaslundBh Jan 18, 2022
f624121
Adding descriptions to class and constructor
IsakNaslundBh Jan 18, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 8 additions & 8 deletions Etabs_Adapter/AdapterActions/Execute.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,23 +29,23 @@
using BH.oM.Adapter.Commands;
using BH.oM.Structure.Loads;

#if Debug17 || Release17
#if Debug16 || Release16
using ETABS2016;
#elif Debug17 || Release17
using ETABSv17;
#elif Debug18 || Release18
using ETABSv1;
#else
using ETABS2016;
using ETABSv1;
#endif


namespace BH.Adapter.ETABS
{
#if Debug17 || Release17
#if Debug16 || Release16
public partial class ETABS2016Adapter
#elif Debug17 || Release17
public partial class ETABS17Adapter
#elif Debug18 || Release18
public partial class ETABS18Adapter
#else
public partial class ETABS2016Adapter
public partial class ETABSAdapter
#endif
{
/***************************************************/
Expand Down
20 changes: 7 additions & 13 deletions Etabs_Adapter/CRUD/Create/Bar.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,22 +34,16 @@
using BH.oM.Geometry;
using BH.oM.Structure.Constraints;
using BH.Engine.Base;
#if Debug17 || Release17
using ETABSv17;
#elif Debug18 || Release18
using ETABSv1;
#else
using ETABS2016;
#endif


namespace BH.Adapter.ETABS
{
#if Debug17 || Release17
public partial class ETABS17Adapter : BHoMAdapter
#elif Debug18 || Release18
public partial class ETABS18Adapter : BHoMAdapter
#else
#if Debug16 || Release16
public partial class ETABS2016Adapter : BHoMAdapter
#elif Debug17 || Release17
public partial class ETABS17Adapter : BHoMAdapter
#else
public partial class ETABSAdapter : BHoMAdapter
#endif
{
/***************************************************/
Expand Down Expand Up @@ -126,7 +120,7 @@ private bool SetObject(Bar bhBar)
string name = GetAdapterId<string>(bhBar);

// Needed rigth after create as well as AddByPoint flipps the Bar if it feels like it
#if Debug17 || Release17 || Debug18 || Release18
#if Debug16 == false && Release16 == false
m_model.EditFrame.ChangeConnectivity(name, GetAdapterId<string>(bhBar.StartNode), GetAdapterId<string>(bhBar.EndNode));
#endif

Expand Down
17 changes: 5 additions & 12 deletions Etabs_Adapter/CRUD/Create/Diaphragm.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,22 +26,15 @@
using BH.oM.Adapters.ETABS;
using BH.oM.Adapters.ETABS.Elements;

#if Debug17 || Release17
using ETABSv17;
#elif Debug18 || Release18
using ETABSv1;
#else
using ETABS2016;
#endif

namespace BH.Adapter.ETABS
{
#if Debug17 || Release17
public partial class ETABS17Adapter : BHoMAdapter
#elif Debug18 || Release18
public partial class ETABS18Adapter : BHoMAdapter
#else
#if Debug16 || Release16
public partial class ETABS2016Adapter : BHoMAdapter
#elif Debug17 || Release17
public partial class ETABS17Adapter : BHoMAdapter
#else
public partial class ETABSAdapter : BHoMAdapter
#endif
{
/***************************************************/
Expand Down
18 changes: 6 additions & 12 deletions Etabs_Adapter/CRUD/Create/Error.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,22 +25,16 @@
using BH.Engine.Adapter;
using BH.oM.Adapters.ETABS;
using System;
#if Debug17 || Release17
using ETABSv17;
#elif Debug18 || Release18
using ETABSv1;
#else
using ETABS2016;
#endif


namespace BH.Adapter.ETABS
{
#if Debug17 || Release17
public partial class ETABS17Adapter : BHoMAdapter
#elif Debug18 || Release18
public partial class ETABS18Adapter : BHoMAdapter
#else
#if Debug16 || Release16
public partial class ETABS2016Adapter : BHoMAdapter
#elif Debug17 || Release17
public partial class ETABS17Adapter : BHoMAdapter
#else
public partial class ETABSAdapter : BHoMAdapter
#endif
{
/***************************************************/
Expand Down
18 changes: 6 additions & 12 deletions Etabs_Adapter/CRUD/Create/Level.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,22 +27,16 @@
using BH.Engine.Adapters.ETABS;
using BH.oM.Adapters.ETABS;
using BH.oM.Spatial.SettingOut;
#if Debug17 || Release17
using ETABSv17;
#elif Debug18 || Release18
using ETABSv1;
#else
using ETABS2016;
#endif


namespace BH.Adapter.ETABS
{
#if Debug17 || Release17
public partial class ETABS17Adapter : BHoMAdapter
#elif Debug18 || Release18
public partial class ETABS18Adapter : BHoMAdapter
#else
#if Debug16 || Release16
public partial class ETABS2016Adapter : BHoMAdapter
#elif Debug17 || Release17
public partial class ETABS17Adapter : BHoMAdapter
#else
public partial class ETABSAdapter : BHoMAdapter
#endif
{
/***************************************************/
Expand Down
18 changes: 6 additions & 12 deletions Etabs_Adapter/CRUD/Create/Link.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,22 +28,16 @@
using BH.oM.Structure.Constraints;
using BH.Engine.Structure;
using BH.Engine.Adapters.ETABS;
#if Debug17 || Release17
using ETABSv17;
#elif Debug18 || Release18
using ETABSv1;
#else
using ETABS2016;
#endif


namespace BH.Adapter.ETABS
{
#if Debug17 || Release17
public partial class ETABS17Adapter : BHoMAdapter
#elif Debug18 || Release18
public partial class ETABS18Adapter : BHoMAdapter
#else
#if Debug16 || Release16
public partial class ETABS2016Adapter : BHoMAdapter
#elif Debug17 || Release17
public partial class ETABS17Adapter : BHoMAdapter
#else
public partial class ETABSAdapter : BHoMAdapter
#endif
{
/***************************************************/
Expand Down
18 changes: 6 additions & 12 deletions Etabs_Adapter/CRUD/Create/Load.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,22 +30,16 @@
using BH.Engine.Spatial;
using BH.Engine.Adapters.ETABS;

#if Debug17 || Release17
using ETABSv17;
#elif Debug18 || Release18
using ETABSv1;
#else
using ETABS2016;
#endif


namespace BH.Adapter.ETABS
{
#if Debug17 || Release17
public partial class ETABS17Adapter : BHoMAdapter
#elif Debug18 || Release18
public partial class ETABS18Adapter : BHoMAdapter
#else
#if Debug16 || Release16
public partial class ETABS2016Adapter : BHoMAdapter
#elif Debug17 || Release17
public partial class ETABS17Adapter : BHoMAdapter
#else
public partial class ETABSAdapter : BHoMAdapter
#endif
{
/***************************************************/
Expand Down
18 changes: 9 additions & 9 deletions Etabs_Adapter/CRUD/Create/Loadcase.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,22 +27,22 @@
using System;
using BH.oM.Structure.Loads;

#if Debug17 || Release17
#if Debug16 || Release16
using ETABS2016;
#elif Debug17 || Release17
using ETABSv17;
#elif Debug18 || Release18
using ETABSv1;
#else
using ETABS2016;
using ETABSv1;
#endif

namespace BH.Adapter.ETABS
{
#if Debug17 || Release17
public partial class ETABS17Adapter : BHoMAdapter
#elif Debug18 || Release18
public partial class ETABS18Adapter : BHoMAdapter
#else
#if Debug16 || Release16
public partial class ETABS2016Adapter : BHoMAdapter
#elif Debug17 || Release17
public partial class ETABS17Adapter : BHoMAdapter
#else
public partial class ETABSAdapter : BHoMAdapter
#endif
{
/***************************************************/
Expand Down
18 changes: 9 additions & 9 deletions Etabs_Adapter/CRUD/Create/Material.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,22 +30,22 @@
using System.ComponentModel;
using System;

#if Debug17 || Release17
#if Debug16 || Release16
using ETABS2016;
#elif Debug17 || Release17
using ETABSv17;
#elif Debug18 || Release18
using ETABSv1;
#else
using ETABS2016;
using ETABSv1;
#endif

namespace BH.Adapter.ETABS
{
#if Debug17 || Release17
public partial class ETABS17Adapter : BHoMAdapter
#elif Debug18 || Release18
public partial class ETABS18Adapter : BHoMAdapter
#else
#if Debug16 || Release16
public partial class ETABS2016Adapter : BHoMAdapter
#elif Debug17 || Release17
public partial class ETABS17Adapter : BHoMAdapter
#else
public partial class ETABSAdapter : BHoMAdapter
#endif
{
/***************************************************/
Expand Down
10 changes: 5 additions & 5 deletions Etabs_Adapter/CRUD/Create/Node.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,12 +32,12 @@

namespace BH.Adapter.ETABS
{
#if Debug17 || Release17
public partial class ETABS17Adapter : BHoMAdapter
#elif Debug18 || Release18
public partial class ETABS18Adapter : BHoMAdapter
#else
#if Debug16 || Release16
public partial class ETABS2016Adapter : BHoMAdapter
#elif Debug17 || Release17
public partial class ETABS17Adapter : BHoMAdapter
#else
public partial class ETABSAdapter : BHoMAdapter
#endif
{
/***************************************************/
Expand Down
17 changes: 5 additions & 12 deletions Etabs_Adapter/CRUD/Create/Panel.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,22 +32,15 @@
using BH.oM.Adapters.ETABS.Elements;
using BH.oM.Geometry;

#if Debug17 || Release17
using ETABSv17;
#elif Debug18 || Release18
using ETABSv1;
#else
using ETABS2016;
#endif

namespace BH.Adapter.ETABS
{
#if Debug17 || Release17
public partial class ETABS17Adapter : BHoMAdapter
#elif Debug18 || Release18
public partial class ETABS18Adapter : BHoMAdapter
#else
#if Debug16 || Release16
public partial class ETABS2016Adapter : BHoMAdapter
#elif Debug17 || Release17
public partial class ETABS17Adapter : BHoMAdapter
#else
public partial class ETABSAdapter : BHoMAdapter
#endif
{
/***************************************************/
Expand Down
15 changes: 5 additions & 10 deletions Etabs_Adapter/CRUD/Create/SectionProperty.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,20 +34,15 @@
using BH.Engine.Base;
using System;

#if Debug17 || Release17
using ETABSv17;
#else
using ETABS2016;
#endif

namespace BH.Adapter.ETABS
{
#if Debug17 || Release17
public partial class ETABS17Adapter : BHoMAdapter
#elif Debug18 || Release18
public partial class ETABS18Adapter : BHoMAdapter
#else
#if Debug16 || Release16
public partial class ETABS2016Adapter : BHoMAdapter
#elif Debug17 || Release17
public partial class ETABS17Adapter : BHoMAdapter
#else
public partial class ETABSAdapter : BHoMAdapter
#endif
{

Expand Down
18 changes: 9 additions & 9 deletions Etabs_Adapter/CRUD/Create/SurfaceProperty.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,22 +29,22 @@
using BH.Engine.Adapter;
using BH.oM.Adapters.ETABS.Fragments;

#if Debug17 || Release17
#if Debug16 || Release16
using ETABS2016;
#elif Debug17 || Release17
using ETABSv17;
#elif Debug18 || Release18
using ETABSv1;
#else
using ETABS2016;
using ETABSv1;
#endif

namespace BH.Adapter.ETABS
{
#if Debug17 || Release17
public partial class ETABS17Adapter : BHoMAdapter
#elif Debug18 || Release18
public partial class ETABS18Adapter : BHoMAdapter
#else
#if Debug16 || Release16
public partial class ETABS2016Adapter : BHoMAdapter
#elif Debug17 || Release17
public partial class ETABS17Adapter : BHoMAdapter
#else
public partial class ETABSAdapter : BHoMAdapter
#endif
{
/***************************************************/
Expand Down
Loading