diff --git a/GsaGH/Components/5_Results/Helpers/ExtremaHelper.cs b/GsaGH/Components/5_Results/Helpers/ExtremaHelper.cs index f92122304..f43b8fe98 100644 --- a/GsaGH/Components/5_Results/Helpers/ExtremaHelper.cs +++ b/GsaGH/Components/5_Results/Helpers/ExtremaHelper.cs @@ -202,33 +202,33 @@ internal static readonly ReadOnlyCollection SteelUtilisations = new ReadOnlyCollection(new[] { "All", "Max Overall", - "Max LocalCombined", - "Max BucklingCombined", - "Max LocalAxial", - "Max LocalShearU", - "Max LocalShearV", - "Max LocalTorsion", - "Max LocalMajorMoment", - "Max LocalMinorMoment", - "Max MajorBuckling", - "Max MinorBuckling", - "Max LateralTorsionalBuckling", - "Max TorsionalBuckling", - "Max FlexuralBuckling", + "Max |Local|", + "Max |B|", + "Max Ax", + "Max Su", + "Max Sv", + "Max T", + "Max Muu", + "Max Mvv", + "Max FBuu", + "Max FBvv", + "Max LTB", + "Max TB", + "Max FB", "Min Overall", - "Min LocalCombined", - "Min BucklingCombined", - "Min LocalAxial", - "Min LocalShearU", - "Min LocalShearV", - "Min LocalTorsion", - "Min LocalMajorMoment", - "Min LocalMinorMoment", - "Min MajorBuckling", - "Min MinorBuckling", - "Min LateralTorsionalBuckling", - "Min TorsionalBuckling", - "Min FlexuralBuckling", + "Min |Local|", + "Min |B|", + "Min Ax", + "Min Su", + "Min Sv", + "Min T", + "Min Muu", + "Min Mvv", + "Min FBuu", + "Min FBv", + "Min LTB", + "Min TB", + "Min FB", }); internal static U FootfallExtremaKey( @@ -550,33 +550,33 @@ internal static Entity0dExtremaKey SteelUtilisationsExtremaKey( IEntity0dResultSubset resultSet, string key) { return key switch { "Max Overall" => resultSet.Max.Overall, - "Max LocalCombined" => resultSet.Max.LocalCombined, - "Max BucklingCombined" => resultSet.Max.BucklingCombined, - "Max LocalAxial" => resultSet.Max.LocalAxial, - "Max LocalShearU" => resultSet.Max.LocalShearU, - "Max LocalShearV" => resultSet.Max.LocalShearV, - "Max LocalTorsion" => resultSet.Max.LocalTorsion, - "Max LocalMajorMoment" => resultSet.Max.LocalMajorMoment, - "Max LocalMinorMoment" => resultSet.Max.LocalMinorMoment, - "Max MajorBuckling" => resultSet.Max.MajorBuckling, - "Max MinorBuckling" => resultSet.Max.MinorBuckling, - "Max LateralTorsionalBuckling" => resultSet.Max.LateralTorsionalBuckling, - "Max TorsionalBuckling" => resultSet.Max.TorsionalBuckling, - "Max FlexuralBuckling" => resultSet.Max.FlexuralBuckling, + "Max |Local|" => resultSet.Max.LocalCombined, + "Max |B|" => resultSet.Max.BucklingCombined, + "Max Ax" => resultSet.Max.LocalAxial, + "Max Su" => resultSet.Max.LocalShearU, + "Max Sv" => resultSet.Max.LocalShearV, + "Max T" => resultSet.Max.LocalTorsion, + "Max Muu" => resultSet.Max.LocalMajorMoment, + "Max Mvv" => resultSet.Max.LocalMinorMoment, + "Max FBuu" => resultSet.Max.MajorBuckling, + "Max FBvv" => resultSet.Max.MinorBuckling, + "Max LTB" => resultSet.Max.LateralTorsionalBuckling, + "Max TB" => resultSet.Max.TorsionalBuckling, + "Max FB" => resultSet.Max.FlexuralBuckling, "Min Overall" => resultSet.Min.Overall, - "Min LocalCombined" => resultSet.Min.LocalCombined, - "Min BucklingCombined" => resultSet.Min.BucklingCombined, - "Min LocalAxial" => resultSet.Min.LocalAxial, - "Min LocalShearU" => resultSet.Min.LocalShearU, - "Min LocalShearV" => resultSet.Min.LocalShearV, - "Min LocalTorsion" => resultSet.Min.LocalTorsion, - "Min LocalMajorMoment" => resultSet.Min.LocalMajorMoment, - "Min LocalMinorMoment" => resultSet.Min.LocalMinorMoment, - "Min MajorBuckling" => resultSet.Min.MajorBuckling, - "Min MinorBuckling" => resultSet.Min.MinorBuckling, - "Min LateralTorsionalBuckling" => resultSet.Min.LateralTorsionalBuckling, - "Min TorsionalBuckling" => resultSet.Min.TorsionalBuckling, - "Min FlexuralBuckling" => resultSet.Min.FlexuralBuckling, + "Min |Local|" => resultSet.Min.LocalCombined, + "Min |B|" => resultSet.Min.BucklingCombined, + "Min Ax" => resultSet.Min.LocalAxial, + "Min Su" => resultSet.Min.LocalShearU, + "Min Sv" => resultSet.Min.LocalShearV, + "Min T" => resultSet.Min.LocalTorsion, + "Min Muu" => resultSet.Min.LocalMajorMoment, + "Min Mvv" => resultSet.Min.LocalMinorMoment, + "Min FBuu" => resultSet.Min.MajorBuckling, + "Min FBv" => resultSet.Min.MinorBuckling, + "Min LTB" => resultSet.Min.LateralTorsionalBuckling, + "Min TB" => resultSet.Min.TorsionalBuckling, + "Min FB" => resultSet.Min.FlexuralBuckling, _ => throw new ArgumentException("Extrema case not found"), }; } diff --git a/GsaGH/Properties/Icons/SteelUtilisation.png b/GsaGH/Properties/Icons/SteelUtilisations.png similarity index 100% rename from GsaGH/Properties/Icons/SteelUtilisation.png rename to GsaGH/Properties/Icons/SteelUtilisations.png diff --git a/GsaGH/Properties/Resources.resx b/GsaGH/Properties/Resources.resx index f458784a8..ebb03bce2 100644 --- a/GsaGH/Properties/Resources.resx +++ b/GsaGH/Properties/Resources.resx @@ -686,6 +686,6 @@ Icons\AssemblyResults.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - Icons\SteelUtilisation.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + Icons\SteelUtilisations.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a \ No newline at end of file diff --git a/GsaGHTests/3_Components/ComponentsTests.cs b/GsaGHTests/3_Components/ComponentsTests.cs index 03f59fd90..556107873 100644 --- a/GsaGHTests/3_Components/ComponentsTests.cs +++ b/GsaGHTests/3_Components/ComponentsTests.cs @@ -159,7 +159,7 @@ public void WhenInitialiseDropdowns_ThenDropDownItems_ShouldBeNull(Type t) { [InlineData(typeof(SelectResult), "AnalysisCase", "Combination")] [InlineData(typeof(SpringReactionForces), "kN", "tf", 1)] [InlineData(typeof(SteelDesignEffectiveLength), "mm", "ft", 1)] - [InlineData(typeof(SteelUtilisations), "All", "Min FlexuralBuckling")] + [InlineData(typeof(SteelUtilisations), "All", "Min FB")] [InlineData(typeof(TotalLoadsAndReactions), "kN", "tf")] [InlineData(typeof(Member1dDisplacements), "All", "Min |R|")] [InlineData(typeof(Member1dForcesAndMoments), "All", "Min |Myz|")]