Merge branch 'main' into bugfix/GSAGH-486-1D-member-loading-through-t…

…he-lists-not-working
arup-group · Apr 8, 2024 · a6fb09f · a6fb09f
2 parents 88d94cf + 40e1b23
commit a6fb09f
Show file tree

Hide file tree

Showing 8 changed files with 6 additions and 22 deletions.
diff --git a/GsaGH/Components/6_Display/AssemblyResults.cs b/GsaGH/Components/6_Display/AssemblyResults.cs
@@ -4,6 +4,7 @@
 using System.Collections.ObjectModel;
 using System.Drawing;
 using System.Linq;
+using System.Threading.Tasks;
 using System.Windows.Forms;
 using GH_IO.Serialization;
 using Grasshopper;
@@ -292,18 +293,6 @@ private enum FoldMode {
     }
 
     public override void VariableParameterMaintenance() {
-      if (Params.Input.Count != 6) {
-        var scale = (Param_Number)Params.Input[4];
-        Params.UnregisterInputParameter(Params.Input[4], false);
-        Params.RegisterInputParam(new Param_Interval());
-        Params.Input[4].Name = "Min/Max Domain";
-        Params.Input[4].NickName = "I";
-        Params.Input[4].Description = "Optional Domain for custom Min to Max contour colours";
-        Params.Input[4].Optional = true;
-        Params.Input[4].Access = GH_ParamAccess.item;
-        Params.RegisterInputParam(scale);
-      }
-
       switch (_mode) {
         case FoldMode.Displacement when (int)_disp < 4:
           Params.Output[2].Name = "Values [" + Length.GetAbbreviation(_lengthResultUnit) + "]";
@@ -752,9 +741,7 @@ private enum FoldMode {
 
       var resultLines = new DataTree<LineResultGoo>();
 
-      //Parallel.ForEach(elems, element => {
-
-      foreach (KeyValuePair<int, Assembly> assembly in filteredAssemblies) {
+      Parallel.ForEach(assemblies, assembly => {
         Node topology1 = nodes[assembly.Value.Topology1];
         Node topology2 = nodes[assembly.Value.Topology2];
 
@@ -834,8 +821,7 @@ private enum FoldMode {
               new GH_Path(key));
           }
         }
-      }
-      //});
+      });
 
       int gripheight = _legend.Height / ghGradient.GripCount;
       _legendValues = new List<string>();

diff --git a/GsaGH/Properties/Icons/AssemblyResultDiagrams.png b/GsaGH/Properties/Icons/AssemblyResultDiagrams.png
diff --git a/GsaGH/Properties/Icons/AssemblyResults.png b/GsaGH/Properties/Icons/AssemblyResults.png
diff --git a/...s/1_BaseParameters/5_Results/Collections/RegressionValues/SteelDesignEffectiveLengthA1.cs b/...s/1_BaseParameters/5_Results/Collections/RegressionValues/SteelDesignEffectiveLengthA1.cs
@@ -3,7 +3,7 @@
 using OasysGH.Parameters;
 using System.Collections.Generic;
 
-namespace GsaGHTests._1_BaseParameters._5_Results.Collections.RegressionValues {
+namespace GsaGHTests.Parameters.Results {
   public class SteelDesignEffectiveLengthA1 {
     // these are regression tests, the values are taken directly from GSA results
     // "BasicFrame.gwb" for member id=46,47,48 for analysis case A1

diff --git a/...1_BaseParameters/5_Results/Collections/RegressionValues/SteelDesignEffectiveLengthC1p1.cs b/...1_BaseParameters/5_Results/Collections/RegressionValues/SteelDesignEffectiveLengthC1p1.cs
@@ -3,7 +3,7 @@
 using OasysGH.Parameters;
 using System.Collections.Generic;
 
-namespace GsaGHTests._1_BaseParameters._5_Results.Collections.RegressionValues {
+namespace GsaGHTests.Parameters.Results {
   public class SteelDesignEffectiveLengthC1P1 {
     //results are taken directly from GSA results
     // "BasicFrame.gwb" for member id=46,47,48 for analysis case C1P1

diff --git a/...Tests/1_BaseParameters/5_Results/Collections/RegressionValues/TotalLoadsAndReactionsA3.cs b/...Tests/1_BaseParameters/5_Results/Collections/RegressionValues/TotalLoadsAndReactionsA3.cs
@@ -1,6 +1,6 @@
 using System.Collections.Generic;
 
-namespace GsaGHTests._1_BaseParameters._5_Results.Collections.RegressionValues {
+namespace GsaGHTests.Parameters.Results {
   public class TotalLoadsAndReactionsA3 {
     // these are regression tests, the values are taken directly from GSA results
     // "Steel_Design_Complex.gwb" for all nodes for analysis case A3

diff --git a/GsaGHTests/1_BaseParameters/5_Results/Collections/TotalLoadsAndReactionsTests.cs b/GsaGHTests/1_BaseParameters/5_Results/Collections/TotalLoadsAndReactionsTests.cs
@@ -1,7 +1,6 @@
 using System.Collections.Generic;
 using GsaGH.Helpers.GsaApi;
 using GsaGH.Parameters.Results;
-using GsaGHTests._1_BaseParameters._5_Results.Collections.RegressionValues;
 using GsaGHTests.Helper;
 using OasysUnits;
 using OasysUnits.Units;

diff --git a/GsaGHTests/3_Components/5_Results/SteelDesignEffectiveLengthTests.cs b/GsaGHTests/3_Components/5_Results/SteelDesignEffectiveLengthTests.cs
@@ -6,7 +6,6 @@
 using GsaGH.Helpers.GsaApi;
 using GsaGH.Parameters;
 using GsaGH.Parameters.Results;
-using GsaGHTests._1_BaseParameters._5_Results.Collections.RegressionValues;
 using GsaGHTests.Helper;
 using GsaGHTests.Helpers;
 using GsaGHTests.Parameters.Results;