Merge pull request #261 from hrntsm/develop

Update v2.4.1
hrntsm · Aug 27, 2023 · 22cf7d7 · 22cf7d7
2 parents 2ed46b4 + 6e8b520
commit 22cf7d7
Show file tree

Hide file tree

Showing 14 changed files with 29 additions and 17 deletions.
diff --git a/.github/FUNDING.yml b/.github/FUNDING.yml
@@ -9,4 +9,3 @@ community_bridge: # Replace with a single Community Bridge project-name e.g., cl
 liberapay: # Replace with a single Liberapay username
 issuehunt: # Replace with a single IssueHunt username
 otechie: # Replace with a single Otechie username
-custom: ['https://hiron.fanbox.cc/']
diff --git a/.github/workflows/test-build-document.yml b/.github/workflows/test-build-document.yml
@@ -8,7 +8,7 @@ on:
 
 jobs:
   test-build:
-    runs-on: ubuntu-18.04
+    runs-on: ubuntu-latest
     defaults:
       run:
         working-directory: website
@@ -35,4 +35,4 @@ jobs:
         curl -X POST \
             -H "Authorization: token ${GITHUB_TOKEN}" \
             -d "{\"body\": \"$(cat comments)\"}" \
-            ${URL}
+            ${URL}
diff --git a/.vscode/settings.json b/.vscode/settings.json
@@ -0,0 +1,3 @@
+{
+    "dotnet.defaultSolution": "HoaryFox.sln"
+}
diff --git a/HoaryFox/RH6/HoaryFoxRH6.csproj b/HoaryFox/RH6/HoaryFoxRH6.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <TargetFramework>net48</TargetFramework>
-    <Version>2.4.0</Version>
+    <Version>2.4.1</Version>
     <Title>HoaryFox</Title>
     <Description>This Component read ST-Bridge file(.stb) and display its model data.</Description>
     <TargetExt>.gha</TargetExt>

diff --git a/HoaryFox/RH7/Component/Filter/FilterByMaterials.cs b/HoaryFox/RH7/Component/Filter/FilterByMaterials.cs
@@ -35,6 +35,7 @@ protected override void RegisterOutputParams(GH_OutputParamManager pManager)
             pManager.AddBrepParameter("S", "S", "output S geometry", GH_ParamAccess.tree);
             pManager.AddBrepParameter("SRC", "SRC", "output SRC geometry", GH_ParamAccess.tree);
             pManager.AddBrepParameter("CFT", "CFT", "output CFT geometry", GH_ParamAccess.tree);
+            pManager.AddBrepParameter("PC", "PC", "output PC geometry", GH_ParamAccess.tree);
         }
 
         protected override void SolveInstance(IGH_DataAccess dataAccess)
@@ -49,15 +50,15 @@ protected override void SolveInstance(IGH_DataAccess dataAccess)
                 return;
             }
 
-            var filteredBreps = new GH_Structure<GH_Brep>[4];
-            for (var i = 0; i < 4; i++)
+            var filteredBreps = new GH_Structure<GH_Brep>[5];
+            for (var i = 0; i < 5; i++)
             {
                 filteredBreps[i] = new GH_Structure<GH_Brep>();
             }
 
             FilterValue(breps, stories, materials, filteredBreps);
 
-            for (var i = 0; i < 4; i++)
+            for (var i = 0; i < 5; i++)
             {
                 dataAccess.SetDataTree(i, filteredBreps[i]);
             }
@@ -93,6 +94,9 @@ private bool SetMaterialFilteredBrep(IReadOnlyList<GH_Structure<GH_Brep>> result
                     case "CFT":
                         results[3].Append(brep.DuplicateBrep(), path);
                         break;
+                    case "PC":
+                        results[4].Append(brep.DuplicateBrep(), path);
+                        break;
                     default:
                         AddRuntimeMessage(GH_RuntimeMessageLevel.Error, "Unknown material type");
                         return true;

diff --git a/HoaryFox/RH7/Component/Filter/MaterialType.cs b/HoaryFox/RH7/Component/Filter/MaterialType.cs
@@ -16,7 +16,7 @@ namespace HoaryFox.Component.Filter
     public class MaterialType : GH_Component
     {
         private ST_BRIDGE _stBridge;
-        private readonly GH_Structure<GH_String>[] _materialTypeList = new GH_Structure<GH_String>[7];
+        private readonly GH_Structure<GH_String>[] _materialTypeList = new GH_Structure<GH_String>[9];
 
         public override GH_Exposure Exposure => GH_Exposure.primary;
 
@@ -41,6 +41,8 @@ protected override void RegisterOutputParams(GH_OutputParamManager pManager)
             pManager.AddTextParameter("Braces", "Brc", "output StbBrace material types", GH_ParamAccess.tree);
             pManager.AddTextParameter("Slabs", "Slb", "output StbSlab material types", GH_ParamAccess.tree);
             pManager.AddTextParameter("Walls", "Wl", "output StbWall material types", GH_ParamAccess.tree);
+            pManager.AddTextParameter("Piles", "Pil", "output StbPile material types", GH_ParamAccess.tree);
+            pManager.AddTextParameter("Footings", "Ftg", "output StbFooting material types", GH_ParamAccess.tree);
         }
 
         protected override void SolveInstance(IGH_DataAccess dataAccess)
@@ -54,12 +56,13 @@ protected override void SolveInstance(IGH_DataAccess dataAccess)
                 var materialTypes = new GH_Structure<GH_String>();
                 foreach ((Dictionary<string, string> info, int itemIndex) in infoDict.Select((dict, itemIndex) => (dict, itemIndex)))
                 {
-                    materialTypes.Append(new GH_String(info["kind_structure"]), new GH_Path(0, itemIndex));
+                    var materialType = info["stb_element_type"] == "StbFooting" ? "RC" : info["kind_structure"];
+                    materialTypes.Append(new GH_String(materialType), new GH_Path(0, itemIndex));
                 }
                 _materialTypeList[index] = materialTypes;
             }
 
-            for (var i = 0; i < 7; i++)
+            for (var i = 0; i < 9; i++)
             {
                 dataAccess.SetDataTree(i, _materialTypeList[i]);
             }

diff --git a/HoaryFox/RH7/Component/Filter/Story.cs b/HoaryFox/RH7/Component/Filter/Story.cs
@@ -51,6 +51,10 @@ protected override void SolveInstance(IGH_DataAccess dataAccess)
 
             foreach ((Dictionary<string, string>[] infoDict, int index) in infoArray.Select((dict, index) => (dict, index)))
             {
+                if (index > 6)
+                {
+                    break;
+                }
                 var decisionNode = new List<string>();
                 var result = new GH_Structure<GH_Integer>();
                 GetFloorDecisionNode(infoDict, decisionNode);

diff --git a/HoaryFox/RH7/HoaryFoxRH7.csproj b/HoaryFox/RH7/HoaryFoxRH7.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <TargetFramework>net48</TargetFramework>
-    <Version>2.4.0</Version>
+    <Version>2.4.1</Version>
     <Title>HoaryFox</Title>
     <Description>This Component read ST-Bridge file(.stb) and display its model data.</Description>
     <TargetExt>.gha</TargetExt>

diff --git a/KarambaConnect/RH6K1/karambaConnectRH6K1.csproj b/KarambaConnect/RH6K1/karambaConnectRH6K1.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <TargetFramework>net48</TargetFramework>
-    <Version>2.4.0</Version>
+    <Version>2.4.1</Version>
     <Title>karambaConnect</Title>
     <Description>HoaryFox karamba connect extension</Description>
     <TargetExt>.gha</TargetExt>

diff --git a/KarambaConnect/RH6K2/karambaConnectRH6K2.csproj b/KarambaConnect/RH6K2/karambaConnectRH6K2.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <TargetFramework>net48</TargetFramework>
-    <Version>2.4.0</Version>
+    <Version>2.4.1</Version>
     <Title>karambaConnect</Title>
     <Description>HoaryFox karamba connect extension</Description>
     <TargetExt>.gha</TargetExt>

diff --git a/KarambaConnect/RH7K1/karambaConnectRH7K1.csproj b/KarambaConnect/RH7K1/karambaConnectRH7K1.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <TargetFramework>net48</TargetFramework>
-    <Version>2.4.0</Version>
+    <Version>2.4.1</Version>
     <Title>karambaConnect</Title>
     <Description>HoaryFox karamba connect extension</Description>
     <TargetExt>.gha</TargetExt>

diff --git a/KarambaConnect/RH7K2/karambaConnectRH7K2.csproj b/KarambaConnect/RH7K2/karambaConnectRH7K2.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <TargetFramework>net48</TargetFramework>
-    <Version>2.4.0</Version>
+    <Version>2.4.1</Version>
     <Title>karambaConnect</Title>
     <Description>HoaryFox karamba connect extension</Description>
     <TargetExt>.gha</TargetExt>

diff --git a/website/docs/donation.md b/website/docs/donation.md
@@ -12,6 +12,5 @@ HoaryFox をダウンロード頂きありがとうございます。
 支援先一覧：
 
 - [ko-fi](https://ko-fi.com/hrntsm)
-- [pixivFANBOX](https://hiron.fanbox.cc/)
 
 お読みくださりありがとうございました。
diff --git a/website/package.json b/website/package.json
@@ -1,6 +1,6 @@
 {
   "name": "hoaryfox-website",
-  "version": "2.4.0",
+  "version": "2.4.1",
   "private": true,
   "scripts": {
     "docusaurus": "docusaurus",