Merge pull request #109 from arup-group/bugfix/OGH-26-GSAGH-476-Issue…

…-with-search-in-CreateProfile-component OGH-26-GSAGH-476-Issue-with-search-in-CreateProfile-component
arup-group · Mar 27, 2024 · 12093aa · 12093aa
2 parents 24b8cd5 + 80b90ae
commit 12093aa
Show file tree

Hide file tree

Showing 6 changed files with 28 additions and 9 deletions.
diff --git a/ExampleFiles/CreateOasysProfile.gh b/ExampleFiles/CreateOasysProfile.gh
diff --git a/GH_UnitNumber/GH_UnitNumber.csproj b/GH_UnitNumber/GH_UnitNumber.csproj
@@ -10,7 +10,7 @@
     <RepositoryUrl>https://github.com/arup-group/OasysGH</RepositoryUrl>
     <PackageReadmeFile>README.md</PackageReadmeFile>
     <PackageIcon>UnitNumberLogo64.png</PackageIcon>
-    <Version>1.0.3</Version>
+    <Version>1.0.4</Version>
     <PackageLicenseExpression>MIT</PackageLicenseExpression>
     <BaseOutputPath>bin\</BaseOutputPath>
     <AutoGenerateBindingRedirects>True</AutoGenerateBindingRedirects>

diff --git a/IntegrationTests/CreateOasysProfileTest.cs b/IntegrationTests/CreateOasysProfileTest.cs
@@ -42,7 +42,7 @@ private static GH_Document OpenDocument() {
     [InlineData("Trapezoid", "STD TR(cm) 500 100 10")]
     [InlineData("T Section", "STD T(cm) 500 100 10 20")]
     [InlineData("IPE100", "CAT BSI-IPE IPE100")]
-    [InlineData("HE200AA", "CAT BSI-HE HE200AA")]
+    [InlineData("HE200AA", "CAT HE HE200.AA")]
     public void AssertOutput(string groupIdentifier, string expectedOutput) {
       IGH_Param param = DocumentHelper.FindParameter(Document, groupIdentifier);
       var output = (GH_String)param.VolatileData.get_Branch(0)[0];

diff --git a/OasysGH/Components/CreateOasysProfile.cs b/OasysGH/Components/CreateOasysProfile.cs
@@ -133,9 +133,13 @@ public override bool Read(GH_IReader reader) {
       _lengthUnit = (LengthUnit)UnitsHelper.Parse(typeof(LengthUnit), reader.GetString("lengthUnit"));
       _catalogueIndex = reader.GetInt32("catalogueIndex");
       _typeIndex = reader.GetInt32("typeIndex");
+      reader.TryGetBoolean("inclSS", ref _inclSS);
 
       bool flag = base.Read(reader);
       Params.Output[0].Access = GH_ParamAccess.tree;
+
+      UpdateSecionList();
+
       return flag;
     }
 
@@ -821,6 +825,7 @@ public override bool Write(GH_IWriter writer) {
       writer.SetString("lengthUnit", _lengthUnit.ToString());
       writer.SetInt32("catalogueIndex", _catalogueIndex);
       writer.SetInt32("typeIndex", _typeIndex);
+      writer.SetBoolean("inclSS", _inclSS);
       return base.Write(writer);
     }
 
@@ -974,13 +979,13 @@ protected List<IProfile> SolveInstanceForCatalogueProfile(IGH_DataAccess da) {
       if (da.GetData(1, ref incl)) {
         if (_inclSS != incl) {
           _inclSS = incl;
-          UpdateTypeData();
-          _sectionList = SqlReader.Instance.GetSectionsDataFromSQLite(_typeNumbers, DataSource, _inclSS);
+          _typeIndex = -1;
+          UpdateSecionList();
 
-          _selectedItems[2] = _typeNames[0];
+          _selectedItems[2] = "All";
           _dropDownItems[2] = _typeNames;
 
-          _selectedItems[3] = _sectionList[0];
+          _selectedItems[3] = "All";
           _dropDownItems[3] = _sectionList;
 
           base.UpdateUI();
@@ -1421,6 +1426,20 @@ private void UpdateProfileDescriptions() {
         _profileDescriptions = new List<string>() { "CAT " + _selectedItems[3] };
     }
 
+    private void UpdateSecionList() {
+      UpdateTypeData();
+      var types = new List<int> { -1 };
+      if (_typeIndex != -1) {
+        types = new List<int> { _typeIndex };
+      } else if (_catalogueIndex != -1) {
+        types = _typeNumbers.ToList();
+        types.RemoveAt(0);
+      }
+
+      _sectionList = SqlReader.Instance.GetSectionsDataFromSQLite(types, DataSource, _inclSS);
+    }
+
+
     private void UpdateTypeData() {
       _typeData = GetTypesDataFromSQLite(_catalogueIndex, DataSource, _inclSS);
       _typeNames = _typeData.Item1;

diff --git a/OasysGH/OasysGH.csproj b/OasysGH/OasysGH.csproj
@@ -9,12 +9,12 @@
     <PackageProjectUrl>https://github.com/arup-group/OasysGH</PackageProjectUrl>
     <RepositoryUrl>https://github.com/arup-group/OasysGH</RepositoryUrl>
     <PackageReadmeFile>README.md</PackageReadmeFile>
-    <Version>1.0.3</Version>
+    <Version>1.0.4</Version>
     <PackageLicenseExpression>MIT</PackageLicenseExpression>
     <PackageRequireLicenseAcceptance>false</PackageRequireLicenseAcceptance>
     <LangVersion>8.0</LangVersion>
     <Description>OasysGH is a library with shared content for Oasys Grasshopper plugins.</Description>
-    <PackageReleaseNotes>This is a release of OasysGH 1.0.3.</PackageReleaseNotes>
+    <PackageReleaseNotes>This is a release of OasysGH 1.0.4.</PackageReleaseNotes>
     <PackageTags>oasys;grasshopper</PackageTags>
   </PropertyGroup>
   <ItemGroup>

diff --git a/OasysGH/OasysPluginInfo.cs b/OasysGH/OasysPluginInfo.cs
@@ -5,7 +5,7 @@ public static class OasysGHVersion {
     public const bool IsBeta = false;
     // this is the one place to set the version in VS:
     // also update the version manually in OasysGH.csproj
-    public const string Version = "1.0.3";
+    public const string Version = "1.0.4";
   }
 
   public class OasysPluginInfo {