diff --git a/MidasCivil_Adapter/Convert/ToBHoM/Properties/ToBarRelease.cs b/MidasCivil_Adapter/Convert/ToBHoM/Properties/ToBarRelease.cs index d410548a..1d3342cc 100644 --- a/MidasCivil_Adapter/Convert/ToBHoM/Properties/ToBarRelease.cs +++ b/MidasCivil_Adapter/Convert/ToBHoM/Properties/ToBarRelease.cs @@ -48,8 +48,8 @@ public static BarRelease ToBarRelease(string release, int count) for (int i = 0; i < 6; i++) { - bhomStartFixity.Add(FromFixity(startFixity.Substring(i, 1))); - bhomEndFixity.Add(FromFixity(endFixity.Substring(i, 1))); + bhomStartFixity.Add(FromFixity(startFixity.Substring(i, 1),true)); + bhomEndFixity.Add(FromFixity(endFixity.Substring(i, 1), true)); } Constraint6DOF startConstraint = Engine.Structure.Create.Constraint6DOF(bhomStartFixity[0], bhomStartFixity[1], bhomStartFixity[2], diff --git a/MidasCivil_Adapter/Convert/ToMidasCivil/Properties/FromFixity.cs b/MidasCivil_Adapter/Convert/ToMidasCivil/Properties/FromFixity.cs index 468b2145..380a9971 100644 --- a/MidasCivil_Adapter/Convert/ToMidasCivil/Properties/FromFixity.cs +++ b/MidasCivil_Adapter/Convert/ToMidasCivil/Properties/FromFixity.cs @@ -28,15 +28,26 @@ public static partial class Convert /**** Public Methods ****/ /***************************************************/ - internal static bool FromFixity(string number) + internal static bool FromFixity(string number, bool release = false) { bool fixity = true; - if (int.Parse(number) == 1) + if(release) { - fixity = false; + // For bar releases + if (int.Parse(number.Trim()) == 1) + { + fixity = false; + } + } + else + { + // For constraints, rigid links etc. + if (int.Parse(number.Trim()) == 0) + { + fixity = false; + } } - return fixity; }