From b2080c58d8dc07b288ca5174dee3ced45da4f0fa Mon Sep 17 00:00:00 2001 From: hrntsm Date: Sun, 11 Jun 2023 20:53:31 +0900 Subject: [PATCH 1/5] Update donation --- .github/FUNDING.yml | 1 - website/docs/donation.md | 1 - 2 files changed, 2 deletions(-) diff --git a/.github/FUNDING.yml b/.github/FUNDING.yml index 956d6a07..1ad8e4e7 100644 --- 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/website/docs/donation.md b/website/docs/donation.md index b0bb769f..43ea9f2b 100644 --- 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/) お読みくださりありがとうございました。 From 9d7bf2f3c82179b2dac0285a4dc0101fd7c3f672 Mon Sep 17 00:00:00 2001 From: hrntsm Date: Fri, 4 Aug 2023 16:13:04 +0900 Subject: [PATCH 2/5] Update test-build-document.yml Fix ci test build error --- .github/workflows/test-build-document.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/test-build-document.yml b/.github/workflows/test-build-document.yml index 409db955..780109d0 100644 --- 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} \ No newline at end of file + ${URL} From e50d029511b564496a894c13afe46a70fe52a864 Mon Sep 17 00:00:00 2001 From: hrntsm Date: Thu, 17 Aug 2023 21:26:46 +0900 Subject: [PATCH 3/5] Fix filter error --- HoaryFox/RH7/Component/Filter/FilterByMaterials.cs | 10 +++++++--- HoaryFox/RH7/Component/Filter/MaterialType.cs | 9 ++++++--- HoaryFox/RH7/Component/Filter/Story.cs | 4 ++++ 3 files changed, 17 insertions(+), 6 deletions(-) diff --git a/HoaryFox/RH7/Component/Filter/FilterByMaterials.cs b/HoaryFox/RH7/Component/Filter/FilterByMaterials.cs index 33293059..cbb95b6f 100644 --- 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[4]; - for (var i = 0; i < 4; i++) + var filteredBreps = new GH_Structure[5]; + for (var i = 0; i < 5; i++) { filteredBreps[i] = new GH_Structure(); } 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> 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 index b0fa4e71..20601063 100644 --- 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[] _materialTypeList = new GH_Structure[7]; + private readonly GH_Structure[] _materialTypeList = new GH_Structure[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(); foreach ((Dictionary 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 index 47f88c9f..c32d77a0 100644 --- 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[] infoDict, int index) in infoArray.Select((dict, index) => (dict, index))) { + if (index > 6) + { + break; + } var decisionNode = new List(); var result = new GH_Structure(); GetFloorDecisionNode(infoDict, decisionNode); From 33be8d1b59b7378f92d14a101d3441e69c7c284a Mon Sep 17 00:00:00 2001 From: hrntsm Date: Thu, 17 Aug 2023 21:30:52 +0900 Subject: [PATCH 4/5] Update version info --- HoaryFox/RH6/HoaryFoxRH6.csproj | 2 +- HoaryFox/RH7/HoaryFoxRH7.csproj | 2 +- KarambaConnect/RH6K1/karambaConnectRH6K1.csproj | 2 +- KarambaConnect/RH6K2/karambaConnectRH6K2.csproj | 2 +- KarambaConnect/RH7K1/karambaConnectRH7K1.csproj | 2 +- KarambaConnect/RH7K2/karambaConnectRH7K2.csproj | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/HoaryFox/RH6/HoaryFoxRH6.csproj b/HoaryFox/RH6/HoaryFoxRH6.csproj index 6e693941..74a987cf 100644 --- a/HoaryFox/RH6/HoaryFoxRH6.csproj +++ b/HoaryFox/RH6/HoaryFoxRH6.csproj @@ -1,7 +1,7 @@  net48 - 2.4.0 + 2.4.1 HoaryFox This Component read ST-Bridge file(.stb) and display its model data. .gha diff --git a/HoaryFox/RH7/HoaryFoxRH7.csproj b/HoaryFox/RH7/HoaryFoxRH7.csproj index 01162241..f68f575f 100644 --- a/HoaryFox/RH7/HoaryFoxRH7.csproj +++ b/HoaryFox/RH7/HoaryFoxRH7.csproj @@ -1,7 +1,7 @@  net48 - 2.4.0 + 2.4.1 HoaryFox This Component read ST-Bridge file(.stb) and display its model data. .gha diff --git a/KarambaConnect/RH6K1/karambaConnectRH6K1.csproj b/KarambaConnect/RH6K1/karambaConnectRH6K1.csproj index 2dac9405..7756e3fa 100644 --- a/KarambaConnect/RH6K1/karambaConnectRH6K1.csproj +++ b/KarambaConnect/RH6K1/karambaConnectRH6K1.csproj @@ -2,7 +2,7 @@ net48 - 2.4.0 + 2.4.1 karambaConnect HoaryFox karamba connect extension .gha diff --git a/KarambaConnect/RH6K2/karambaConnectRH6K2.csproj b/KarambaConnect/RH6K2/karambaConnectRH6K2.csproj index 6a5a059b..86f76168 100644 --- a/KarambaConnect/RH6K2/karambaConnectRH6K2.csproj +++ b/KarambaConnect/RH6K2/karambaConnectRH6K2.csproj @@ -2,7 +2,7 @@ net48 - 2.4.0 + 2.4.1 karambaConnect HoaryFox karamba connect extension .gha diff --git a/KarambaConnect/RH7K1/karambaConnectRH7K1.csproj b/KarambaConnect/RH7K1/karambaConnectRH7K1.csproj index c51fcda7..3a938eb2 100644 --- a/KarambaConnect/RH7K1/karambaConnectRH7K1.csproj +++ b/KarambaConnect/RH7K1/karambaConnectRH7K1.csproj @@ -2,7 +2,7 @@ net48 - 2.4.0 + 2.4.1 karambaConnect HoaryFox karamba connect extension .gha diff --git a/KarambaConnect/RH7K2/karambaConnectRH7K2.csproj b/KarambaConnect/RH7K2/karambaConnectRH7K2.csproj index 9a1f6b0d..09b386ee 100644 --- a/KarambaConnect/RH7K2/karambaConnectRH7K2.csproj +++ b/KarambaConnect/RH7K2/karambaConnectRH7K2.csproj @@ -2,7 +2,7 @@ net48 - 2.4.0 + 2.4.1 karambaConnect HoaryFox karamba connect extension .gha From 6e8b52006c562a44fdbf9ff3d0f28c3f2d2d68e0 Mon Sep 17 00:00:00 2001 From: hrntsm Date: Sun, 27 Aug 2023 12:35:14 +0900 Subject: [PATCH 5/5] Update version in package.json --- .vscode/settings.json | 3 +++ website/package.json | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) create mode 100644 .vscode/settings.json diff --git a/.vscode/settings.json b/.vscode/settings.json new file mode 100644 index 00000000..722e783a --- /dev/null +++ b/.vscode/settings.json @@ -0,0 +1,3 @@ +{ + "dotnet.defaultSolution": "HoaryFox.sln" +} \ No newline at end of file diff --git a/website/package.json b/website/package.json index c305fc34..66a68cde 100644 --- 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",