diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml deleted file mode 100644 index 2a523a93..00000000 --- a/.github/workflows/codeql-analysis.yml +++ /dev/null @@ -1,71 +0,0 @@ -# For most projects, this workflow file will not need changing; you simply need -# to commit it to your repository. -# -# You may wish to alter this file to override the set of languages analyzed, -# or to provide custom queries or build logic. -# -# ******** NOTE ******** -# We have attempted to detect the languages in your repository. Please check -# the `language` matrix defined below to confirm you have the correct set of -# supported CodeQL languages. -# -name: "CodeQL" - -on: - push: - branches: [ develop, main ] - pull_request: - # The branches below must be a subset of the branches above - branches: [ develop ] - schedule: - - cron: '16 22 * * 3' - -jobs: - analyze: - name: Analyze - runs-on: ubuntu-latest - permissions: - actions: read - contents: read - security-events: write - - strategy: - fail-fast: false - matrix: - language: [ 'csharp', 'javascript' ] - # CodeQL supports [ 'cpp', 'csharp', 'go', 'java', 'javascript', 'python' ] - # Learn more: - # https://docs.github.com/en/free-pro-team@latest/github/finding-security-vulnerabilities-and-errors-in-your-code/configuring-code-scanning#changing-the-languages-that-are-analyzed - - steps: - - name: Checkout repository - uses: actions/checkout@v2 - - # Initializes the CodeQL tools for scanning. - - name: Initialize CodeQL - uses: github/codeql-action/init@v1 - with: - languages: ${{ matrix.language }} - # If you wish to specify custom queries, you can do so here or in a config file. - # By default, queries listed here will override any specified in a config file. - # Prefix the list here with "+" to use these queries and those in the config file. - # queries: ./path/to/local/query, your-org/your-repo/queries@main - - # Autobuild attempts to build any compiled languages (C/C++, C#, or Java). - # If this step fails, then you should remove it and run the build manually (see below) - - name: Autobuild - uses: github/codeql-action/autobuild@v1 - - # ℹ️ Command-line programs to run using the OS shell. - # 📚 https://git.io/JvXDl - - # ✏️ If the Autobuild fails above, remove it and uncomment the following three lines - # and modify them (or add more) to build your code if your project - # uses a compiled language - - #- run: | - # make bootstrap - # make release - - - name: Perform CodeQL Analysis - uses: github/codeql-action/analyze@v1 diff --git a/.github/workflows/dotnet-grasshopper.yml b/.github/workflows/dotnet-grasshopper.yml index 11c28f92..d13fdfa5 100644 --- a/.github/workflows/dotnet-grasshopper.yml +++ b/.github/workflows/dotnet-grasshopper.yml @@ -21,8 +21,6 @@ jobs: env: Solution_Name: HoaryFox.sln Plugin_File_Name: HoaryFox - Debug_File_Path: '.\HoaryFox\bin\' - Release_File_Path: '.\HoaryFox\release\' steps: - name: Checkout @@ -46,13 +44,12 @@ jobs: env: Configuration: ${{ matrix.configuration }} - - name: Copy karambaConnect and samples to /HoaryFox/bin dir + - name: Copy Samples & License to /HoaryFox/bin dir if: ${{ matrix.configuration == 'Release' }} # Only upload gha from a release build shell: powershell run: | - cp ./KarambaConnect/bin/Release/net48/KarambaConnect.gha ./HoaryFox/bin/Release/net48/KarambaConnect.gha - cp ./Samples ./HoaryFox/bin/Release/net48/Samples -recurse - cp ./LICENSE ./HoaryFox/bin/Release/net48/LICENSE + cp ./Samples ./Release/Samples -recurse + cp ./LICENSE ./Release/LICENSE - name: Upload release build of plugin as artefact if: ${{ matrix.configuration == 'Release' }} # Only upload gha from a release build @@ -60,8 +57,4 @@ jobs: with: name: HoaryFox path: | - ./HoaryFox/bin/Release/net48/HoaryFox.gha - ./HoaryFox/bin/Release/net48/KarambaConnect.gha - ./HoaryFox/bin/Release/net48/STBDotNet.dll - ./HoaryFox/bin/Release/net48/Samples/ - ./HoaryFox/bin/Release/net48/LICENSE + ./Release diff --git a/HoaryFox.sln b/HoaryFox.sln index 35de60ed..83739a2d 100644 --- a/HoaryFox.sln +++ b/HoaryFox.sln @@ -3,33 +3,83 @@ Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio Version 16 VisualStudioVersion = 16.0.30711.63 MinimumVisualStudioVersion = 10.0.40219.1 -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HoaryFox", "HoaryFox\HoaryFox.csproj", "{9637855D-D144-4448-9F56-A391A3575DAC}" -EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "karambaConnect", "KarambaConnect\karambaConnect.csproj", "{CD5D3228-2B3E-4112-9B42-C82615673DFE}" -EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{A6D8895B-AD85-4160-A082-039DB8766CC9}" ProjectSection(SolutionItems) = preProject .editorconfig = .editorconfig EndProjectSection EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "HoaryFox", "HoaryFox", "{B4279383-2C6A-4302-BA63-68D496644360}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "HoaryFoxCommon", "HoaryFox\Common\HoaryFoxCommon.csproj", "{5BDAF6C4-1471-4C20-B3EF-52E07023D63D}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "HoaryFoxRH6", "HoaryFox\RH6\HoaryFoxRH6.csproj", "{A583EA84-5964-4BBA-9DC8-55E620233807}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "HoaryFoxRH7", "HoaryFox\RH7\HoaryFoxRH7.csproj", "{6E000875-7563-4983-A64D-F270D3EC2A17}" +EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "KarambaConnect", "KarambaConnect", "{C00C1886-E284-41C6-ACC4-76BC225C9178}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "KarambaConnectCommon", "KarambaConnect\Common\KarambaConnectCommon.csproj", "{E6241903-54B8-42A9-BD55-052F1D1B35FD}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "karambaConnectRH6K1", "KarambaConnect\RH6K1\karambaConnectRH6K1.csproj", "{D3B3F92E-513B-4C33-82F5-B7F9D3463F16}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "karambaConnectRH6K2", "KarambaConnect\RH6K2\karambaConnectRH6K2.csproj", "{A3A37FBC-B7FC-4F4A-92E7-09F19704E840}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "karambaConnectRH7K1", "KarambaConnect\RH7K1\karambaConnectRH7K1.csproj", "{CE8BFA92-E7F4-48DD-A548-9569ED587A51}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "karambaConnectRH7K2", "KarambaConnect\RH7K2\karambaConnectRH7K2.csproj", "{98FB69EA-C92D-443A-9649-ADF837BC6AB2}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU Release|Any CPU = Release|Any CPU EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution - {9637855D-D144-4448-9F56-A391A3575DAC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {9637855D-D144-4448-9F56-A391A3575DAC}.Debug|Any CPU.Build.0 = Debug|Any CPU - {9637855D-D144-4448-9F56-A391A3575DAC}.Release|Any CPU.ActiveCfg = Release|Any CPU - {9637855D-D144-4448-9F56-A391A3575DAC}.Release|Any CPU.Build.0 = Release|Any CPU - {CD5D3228-2B3E-4112-9B42-C82615673DFE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {CD5D3228-2B3E-4112-9B42-C82615673DFE}.Debug|Any CPU.Build.0 = Debug|Any CPU - {CD5D3228-2B3E-4112-9B42-C82615673DFE}.Release|Any CPU.ActiveCfg = Release|Any CPU - {CD5D3228-2B3E-4112-9B42-C82615673DFE}.Release|Any CPU.Build.0 = Release|Any CPU + {5BDAF6C4-1471-4C20-B3EF-52E07023D63D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {5BDAF6C4-1471-4C20-B3EF-52E07023D63D}.Debug|Any CPU.Build.0 = Debug|Any CPU + {5BDAF6C4-1471-4C20-B3EF-52E07023D63D}.Release|Any CPU.ActiveCfg = Release|Any CPU + {5BDAF6C4-1471-4C20-B3EF-52E07023D63D}.Release|Any CPU.Build.0 = Release|Any CPU + {A583EA84-5964-4BBA-9DC8-55E620233807}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {A583EA84-5964-4BBA-9DC8-55E620233807}.Debug|Any CPU.Build.0 = Debug|Any CPU + {A583EA84-5964-4BBA-9DC8-55E620233807}.Release|Any CPU.ActiveCfg = Release|Any CPU + {A583EA84-5964-4BBA-9DC8-55E620233807}.Release|Any CPU.Build.0 = Release|Any CPU + {6E000875-7563-4983-A64D-F270D3EC2A17}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {6E000875-7563-4983-A64D-F270D3EC2A17}.Debug|Any CPU.Build.0 = Debug|Any CPU + {6E000875-7563-4983-A64D-F270D3EC2A17}.Release|Any CPU.ActiveCfg = Release|Any CPU + {6E000875-7563-4983-A64D-F270D3EC2A17}.Release|Any CPU.Build.0 = Release|Any CPU + {E6241903-54B8-42A9-BD55-052F1D1B35FD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {E6241903-54B8-42A9-BD55-052F1D1B35FD}.Debug|Any CPU.Build.0 = Debug|Any CPU + {E6241903-54B8-42A9-BD55-052F1D1B35FD}.Release|Any CPU.ActiveCfg = Release|Any CPU + {E6241903-54B8-42A9-BD55-052F1D1B35FD}.Release|Any CPU.Build.0 = Release|Any CPU + {CE8BFA92-E7F4-48DD-A548-9569ED587A51}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {CE8BFA92-E7F4-48DD-A548-9569ED587A51}.Debug|Any CPU.Build.0 = Debug|Any CPU + {CE8BFA92-E7F4-48DD-A548-9569ED587A51}.Release|Any CPU.ActiveCfg = Release|Any CPU + {CE8BFA92-E7F4-48DD-A548-9569ED587A51}.Release|Any CPU.Build.0 = Release|Any CPU + {98FB69EA-C92D-443A-9649-ADF837BC6AB2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {98FB69EA-C92D-443A-9649-ADF837BC6AB2}.Debug|Any CPU.Build.0 = Debug|Any CPU + {98FB69EA-C92D-443A-9649-ADF837BC6AB2}.Release|Any CPU.ActiveCfg = Release|Any CPU + {98FB69EA-C92D-443A-9649-ADF837BC6AB2}.Release|Any CPU.Build.0 = Release|Any CPU + {D3B3F92E-513B-4C33-82F5-B7F9D3463F16}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {D3B3F92E-513B-4C33-82F5-B7F9D3463F16}.Debug|Any CPU.Build.0 = Debug|Any CPU + {D3B3F92E-513B-4C33-82F5-B7F9D3463F16}.Release|Any CPU.ActiveCfg = Release|Any CPU + {D3B3F92E-513B-4C33-82F5-B7F9D3463F16}.Release|Any CPU.Build.0 = Release|Any CPU + {A3A37FBC-B7FC-4F4A-92E7-09F19704E840}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {A3A37FBC-B7FC-4F4A-92E7-09F19704E840}.Debug|Any CPU.Build.0 = Debug|Any CPU + {A3A37FBC-B7FC-4F4A-92E7-09F19704E840}.Release|Any CPU.ActiveCfg = Release|Any CPU + {A3A37FBC-B7FC-4F4A-92E7-09F19704E840}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE EndGlobalSection + GlobalSection(NestedProjects) = preSolution + {5BDAF6C4-1471-4C20-B3EF-52E07023D63D} = {B4279383-2C6A-4302-BA63-68D496644360} + {A583EA84-5964-4BBA-9DC8-55E620233807} = {B4279383-2C6A-4302-BA63-68D496644360} + {6E000875-7563-4983-A64D-F270D3EC2A17} = {B4279383-2C6A-4302-BA63-68D496644360} + {E6241903-54B8-42A9-BD55-052F1D1B35FD} = {C00C1886-E284-41C6-ACC4-76BC225C9178} + {CE8BFA92-E7F4-48DD-A548-9569ED587A51} = {C00C1886-E284-41C6-ACC4-76BC225C9178} + {98FB69EA-C92D-443A-9649-ADF837BC6AB2} = {C00C1886-E284-41C6-ACC4-76BC225C9178} + {D3B3F92E-513B-4C33-82F5-B7F9D3463F16} = {C00C1886-E284-41C6-ACC4-76BC225C9178} + {A3A37FBC-B7FC-4F4A-92E7-09F19704E840} = {C00C1886-E284-41C6-ACC4-76BC225C9178} + EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {F686E206-FA27-4450-9506-1707B276FCF0} EndGlobalSection diff --git a/HoaryFox/Common/HoaryFoxCommon.csproj b/HoaryFox/Common/HoaryFoxCommon.csproj new file mode 100644 index 00000000..b6b98f05 --- /dev/null +++ b/HoaryFox/Common/HoaryFoxCommon.csproj @@ -0,0 +1,27 @@ + + + + net48 + + + + + True + True + Resource.resx + + + + + + PublicResXFileCodeGenerator + Resource.Designer.cs + + + + + none + false + + + diff --git a/HoaryFox/Properties/Resource.Designer.cs b/HoaryFox/Common/Properties/Resource.Designer.cs similarity index 86% rename from HoaryFox/Properties/Resource.Designer.cs rename to HoaryFox/Common/Properties/Resource.Designer.cs index 5547634a..b0d5a84c 100644 --- a/HoaryFox/Properties/Resource.Designer.cs +++ b/HoaryFox/Common/Properties/Resource.Designer.cs @@ -8,7 +8,7 @@ // //------------------------------------------------------------------------------ -namespace HoaryFox.Properties { +namespace HoaryFoxCommon.Properties { using System; @@ -22,7 +22,7 @@ namespace HoaryFox.Properties { [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "16.0.0.0")] [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] - internal class Resource { + public class Resource { private static global::System.Resources.ResourceManager resourceMan; @@ -36,10 +36,10 @@ internal Resource() { /// このクラスで使用されているキャッシュされた ResourceManager インスタンスを返します。 /// [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)] - internal static global::System.Resources.ResourceManager ResourceManager { + public static global::System.Resources.ResourceManager ResourceManager { get { if (object.ReferenceEquals(resourceMan, null)) { - global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("HoaryFox.Properties.Resource", typeof(Resource).Assembly); + global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("HoaryFoxCommon.Properties.Resource", typeof(Resource).Assembly); resourceMan = temp; } return resourceMan; @@ -51,7 +51,7 @@ internal Resource() { /// 現在のスレッドの CurrentUICulture プロパティをオーバーライドします。 /// [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)] - internal static global::System.Globalization.CultureInfo Culture { + public static global::System.Globalization.CultureInfo Culture { get { return resourceCulture; } @@ -63,7 +63,7 @@ internal Resource() { /// /// 型 System.Drawing.Bitmap のローカライズされたリソースを検索します。 /// - internal static System.Drawing.Bitmap Axis { + public static System.Drawing.Bitmap Axis { get { object obj = ResourceManager.GetObject("Axis", resourceCulture); return ((System.Drawing.Bitmap)(obj)); @@ -73,7 +73,7 @@ internal static System.Drawing.Bitmap Axis { /// /// 型 System.Drawing.Bitmap のローカライズされたリソースを検索します。 /// - internal static System.Drawing.Bitmap BeamName { + public static System.Drawing.Bitmap BeamName { get { object obj = ResourceManager.GetObject("BeamName", resourceCulture); return ((System.Drawing.Bitmap)(obj)); @@ -83,7 +83,7 @@ internal static System.Drawing.Bitmap BeamName { /// /// 型 System.Drawing.Bitmap のローカライズされたリソースを検索します。 /// - internal static System.Drawing.Bitmap BeamSection { + public static System.Drawing.Bitmap BeamSection { get { object obj = ResourceManager.GetObject("BeamSection", resourceCulture); return ((System.Drawing.Bitmap)(obj)); @@ -93,7 +93,7 @@ internal static System.Drawing.Bitmap BeamSection { /// /// 型 System.Drawing.Bitmap のローカライズされたリソースを検索します。 /// - internal static System.Drawing.Bitmap BraceName { + public static System.Drawing.Bitmap BraceName { get { object obj = ResourceManager.GetObject("BraceName", resourceCulture); return ((System.Drawing.Bitmap)(obj)); @@ -103,7 +103,7 @@ internal static System.Drawing.Bitmap BraceName { /// /// 型 System.Drawing.Bitmap のローカライズされたリソースを検索します。 /// - internal static System.Drawing.Bitmap BraceSection { + public static System.Drawing.Bitmap BraceSection { get { object obj = ResourceManager.GetObject("BraceSection", resourceCulture); return ((System.Drawing.Bitmap)(obj)); @@ -113,7 +113,7 @@ internal static System.Drawing.Bitmap BraceSection { /// /// 型 System.Drawing.Bitmap のローカライズされたリソースを検索します。 /// - internal static System.Drawing.Bitmap Brep { + public static System.Drawing.Bitmap Brep { get { object obj = ResourceManager.GetObject("Brep", resourceCulture); return ((System.Drawing.Bitmap)(obj)); @@ -123,7 +123,7 @@ internal static System.Drawing.Bitmap Brep { /// /// 型 System.Drawing.Bitmap のローカライズされたリソースを検索します。 /// - internal static System.Drawing.Bitmap ColumnName { + public static System.Drawing.Bitmap ColumnName { get { object obj = ResourceManager.GetObject("ColumnName", resourceCulture); return ((System.Drawing.Bitmap)(obj)); @@ -133,7 +133,7 @@ internal static System.Drawing.Bitmap ColumnName { /// /// 型 System.Drawing.Bitmap のローカライズされたリソースを検索します。 /// - internal static System.Drawing.Bitmap ColumnSection { + public static System.Drawing.Bitmap ColumnSection { get { object obj = ResourceManager.GetObject("ColumnSection", resourceCulture); return ((System.Drawing.Bitmap)(obj)); @@ -143,7 +143,7 @@ internal static System.Drawing.Bitmap ColumnSection { /// /// 型 System.Drawing.Bitmap のローカライズされたリソースを検索します。 /// - internal static System.Drawing.Bitmap FilterByMaterial { + public static System.Drawing.Bitmap FilterByMaterial { get { object obj = ResourceManager.GetObject("FilterByMaterial", resourceCulture); return ((System.Drawing.Bitmap)(obj)); @@ -153,7 +153,7 @@ internal static System.Drawing.Bitmap FilterByMaterial { /// /// 型 System.Drawing.Bitmap のローカライズされたリソースを検索します。 /// - internal static System.Drawing.Bitmap GirderName { + public static System.Drawing.Bitmap GirderName { get { object obj = ResourceManager.GetObject("GirderName", resourceCulture); return ((System.Drawing.Bitmap)(obj)); @@ -163,7 +163,7 @@ internal static System.Drawing.Bitmap GirderName { /// /// 型 System.Drawing.Bitmap のローカライズされたリソースを検索します。 /// - internal static System.Drawing.Bitmap GirderSection { + public static System.Drawing.Bitmap GirderSection { get { object obj = ResourceManager.GetObject("GirderSection", resourceCulture); return ((System.Drawing.Bitmap)(obj)); @@ -173,7 +173,7 @@ internal static System.Drawing.Bitmap GirderSection { /// /// 型 System.Drawing.Bitmap のローカライズされたリソースを検索します。 /// - internal static System.Drawing.Bitmap InfoIcon { + public static System.Drawing.Bitmap InfoIcon { get { object obj = ResourceManager.GetObject("InfoIcon", resourceCulture); return ((System.Drawing.Bitmap)(obj)); @@ -183,7 +183,7 @@ internal static System.Drawing.Bitmap InfoIcon { /// /// 型 System.Drawing.Bitmap のローカライズされたリソースを検索します。 /// - internal static System.Drawing.Bitmap Line { + public static System.Drawing.Bitmap Line { get { object obj = ResourceManager.GetObject("Line", resourceCulture); return ((System.Drawing.Bitmap)(obj)); @@ -193,7 +193,7 @@ internal static System.Drawing.Bitmap Line { /// /// 型 System.Drawing.Bitmap のローカライズされたリソースを検索します。 /// - internal static System.Drawing.Bitmap LoadStb { + public static System.Drawing.Bitmap LoadStb { get { object obj = ResourceManager.GetObject("LoadStb", resourceCulture); return ((System.Drawing.Bitmap)(obj)); @@ -203,7 +203,7 @@ internal static System.Drawing.Bitmap LoadStb { /// /// 型 System.Drawing.Bitmap のローカライズされたリソースを検索します。 /// - internal static System.Drawing.Bitmap MaterialType { + public static System.Drawing.Bitmap MaterialType { get { object obj = ResourceManager.GetObject("MaterialType", resourceCulture); return ((System.Drawing.Bitmap)(obj)); @@ -213,7 +213,7 @@ internal static System.Drawing.Bitmap MaterialType { /// /// 型 System.Drawing.Bitmap のローカライズされたリソースを検索します。 /// - internal static System.Drawing.Bitmap PostName { + public static System.Drawing.Bitmap PostName { get { object obj = ResourceManager.GetObject("PostName", resourceCulture); return ((System.Drawing.Bitmap)(obj)); @@ -223,7 +223,7 @@ internal static System.Drawing.Bitmap PostName { /// /// 型 System.Drawing.Bitmap のローカライズされたリソースを検索します。 /// - internal static System.Drawing.Bitmap PostSection { + public static System.Drawing.Bitmap PostSection { get { object obj = ResourceManager.GetObject("PostSection", resourceCulture); return ((System.Drawing.Bitmap)(obj)); @@ -233,7 +233,7 @@ internal static System.Drawing.Bitmap PostSection { /// /// 型 System.Drawing.Bitmap のローカライズされたリソースを検索します。 /// - internal static System.Drawing.Bitmap SlabName { + public static System.Drawing.Bitmap SlabName { get { object obj = ResourceManager.GetObject("SlabName", resourceCulture); return ((System.Drawing.Bitmap)(obj)); @@ -243,7 +243,7 @@ internal static System.Drawing.Bitmap SlabName { /// /// 型 System.Drawing.Bitmap のローカライズされたリソースを検索します。 /// - internal static System.Drawing.Bitmap SlabSection { + public static System.Drawing.Bitmap SlabSection { get { object obj = ResourceManager.GetObject("SlabSection", resourceCulture); return ((System.Drawing.Bitmap)(obj)); @@ -253,7 +253,7 @@ internal static System.Drawing.Bitmap SlabSection { /// /// 型 System.Drawing.Bitmap のローカライズされたリソースを検索します。 /// - internal static System.Drawing.Bitmap Story { + public static System.Drawing.Bitmap Story { get { object obj = ResourceManager.GetObject("Story", resourceCulture); return ((System.Drawing.Bitmap)(obj)); @@ -263,7 +263,7 @@ internal static System.Drawing.Bitmap Story { /// /// 型 System.Drawing.Bitmap のローカライズされたリソースを検索します。 /// - internal static System.Drawing.Bitmap WallName { + public static System.Drawing.Bitmap WallName { get { object obj = ResourceManager.GetObject("WallName", resourceCulture); return ((System.Drawing.Bitmap)(obj)); @@ -273,7 +273,7 @@ internal static System.Drawing.Bitmap WallName { /// /// 型 System.Drawing.Bitmap のローカライズされたリソースを検索します。 /// - internal static System.Drawing.Bitmap WallSection { + public static System.Drawing.Bitmap WallSection { get { object obj = ResourceManager.GetObject("WallSection", resourceCulture); return ((System.Drawing.Bitmap)(obj)); diff --git a/HoaryFox/Properties/Resource.resx b/HoaryFox/Common/Properties/Resource.resx similarity index 100% rename from HoaryFox/Properties/Resource.resx rename to HoaryFox/Common/Properties/Resource.resx diff --git a/HoaryFox/Properties/launchSettings.json b/HoaryFox/Common/Properties/launchSettings.json similarity index 100% rename from HoaryFox/Properties/launchSettings.json rename to HoaryFox/Common/Properties/launchSettings.json diff --git a/HoaryFox/Resources/Axis.png b/HoaryFox/Common/Resources/Axis.png similarity index 100% rename from HoaryFox/Resources/Axis.png rename to HoaryFox/Common/Resources/Axis.png diff --git a/HoaryFox/Resources/Axis.svg b/HoaryFox/Common/Resources/Axis.svg similarity index 100% rename from HoaryFox/Resources/Axis.svg rename to HoaryFox/Common/Resources/Axis.svg diff --git a/HoaryFox/Resources/BeamName.png b/HoaryFox/Common/Resources/BeamName.png similarity index 100% rename from HoaryFox/Resources/BeamName.png rename to HoaryFox/Common/Resources/BeamName.png diff --git a/HoaryFox/Resources/BeamSection.png b/HoaryFox/Common/Resources/BeamSection.png similarity index 100% rename from HoaryFox/Resources/BeamSection.png rename to HoaryFox/Common/Resources/BeamSection.png diff --git a/HoaryFox/Resources/BraceName.png b/HoaryFox/Common/Resources/BraceName.png similarity index 100% rename from HoaryFox/Resources/BraceName.png rename to HoaryFox/Common/Resources/BraceName.png diff --git a/HoaryFox/Resources/BraceSection.png b/HoaryFox/Common/Resources/BraceSection.png similarity index 100% rename from HoaryFox/Resources/BraceSection.png rename to HoaryFox/Common/Resources/BraceSection.png diff --git a/HoaryFox/Resources/Brep.afdesign b/HoaryFox/Common/Resources/Brep.afdesign similarity index 100% rename from HoaryFox/Resources/Brep.afdesign rename to HoaryFox/Common/Resources/Brep.afdesign diff --git a/HoaryFox/Resources/Brep.png b/HoaryFox/Common/Resources/Brep.png similarity index 100% rename from HoaryFox/Resources/Brep.png rename to HoaryFox/Common/Resources/Brep.png diff --git a/HoaryFox/Resources/ColumnName.png b/HoaryFox/Common/Resources/ColumnName.png similarity index 100% rename from HoaryFox/Resources/ColumnName.png rename to HoaryFox/Common/Resources/ColumnName.png diff --git a/HoaryFox/Resources/ColumnSection.png b/HoaryFox/Common/Resources/ColumnSection.png similarity index 100% rename from HoaryFox/Resources/ColumnSection.png rename to HoaryFox/Common/Resources/ColumnSection.png diff --git a/HoaryFox/Resources/FilterByMaterial.png b/HoaryFox/Common/Resources/FilterByMaterial.png similarity index 100% rename from HoaryFox/Resources/FilterByMaterial.png rename to HoaryFox/Common/Resources/FilterByMaterial.png diff --git a/HoaryFox/Resources/FilterByMaterial.svg b/HoaryFox/Common/Resources/FilterByMaterial.svg similarity index 100% rename from HoaryFox/Resources/FilterByMaterial.svg rename to HoaryFox/Common/Resources/FilterByMaterial.svg diff --git a/HoaryFox/Resources/GirderName.png b/HoaryFox/Common/Resources/GirderName.png similarity index 100% rename from HoaryFox/Resources/GirderName.png rename to HoaryFox/Common/Resources/GirderName.png diff --git a/HoaryFox/Resources/GirderSection.png b/HoaryFox/Common/Resources/GirderSection.png similarity index 100% rename from HoaryFox/Resources/GirderSection.png rename to HoaryFox/Common/Resources/GirderSection.png diff --git a/HoaryFox/Resources/InfoIcon.afdesign b/HoaryFox/Common/Resources/InfoIcon.afdesign similarity index 100% rename from HoaryFox/Resources/InfoIcon.afdesign rename to HoaryFox/Common/Resources/InfoIcon.afdesign diff --git a/HoaryFox/Resources/InfoIcon.png b/HoaryFox/Common/Resources/InfoIcon.png similarity index 100% rename from HoaryFox/Resources/InfoIcon.png rename to HoaryFox/Common/Resources/InfoIcon.png diff --git a/HoaryFox/Resources/InfoIcon_Info.txt b/HoaryFox/Common/Resources/InfoIcon_Info.txt similarity index 100% rename from HoaryFox/Resources/InfoIcon_Info.txt rename to HoaryFox/Common/Resources/InfoIcon_Info.txt diff --git a/HoaryFox/Resources/Line.afdesign b/HoaryFox/Common/Resources/Line.afdesign similarity index 100% rename from HoaryFox/Resources/Line.afdesign rename to HoaryFox/Common/Resources/Line.afdesign diff --git a/HoaryFox/Resources/Line.png b/HoaryFox/Common/Resources/Line.png similarity index 100% rename from HoaryFox/Resources/Line.png rename to HoaryFox/Common/Resources/Line.png diff --git a/HoaryFox/Resources/LoadStb.png b/HoaryFox/Common/Resources/LoadStb.png similarity index 100% rename from HoaryFox/Resources/LoadStb.png rename to HoaryFox/Common/Resources/LoadStb.png diff --git a/HoaryFox/Resources/LoadStb.xcf b/HoaryFox/Common/Resources/LoadStb.xcf similarity index 100% rename from HoaryFox/Resources/LoadStb.xcf rename to HoaryFox/Common/Resources/LoadStb.xcf diff --git a/HoaryFox/Resources/MaterialType.png b/HoaryFox/Common/Resources/MaterialType.png similarity index 100% rename from HoaryFox/Resources/MaterialType.png rename to HoaryFox/Common/Resources/MaterialType.png diff --git a/HoaryFox/Resources/MaterialType.svg b/HoaryFox/Common/Resources/MaterialType.svg similarity index 100% rename from HoaryFox/Resources/MaterialType.svg rename to HoaryFox/Common/Resources/MaterialType.svg diff --git a/HoaryFox/Resources/Name.afdesign b/HoaryFox/Common/Resources/Name.afdesign similarity index 100% rename from HoaryFox/Resources/Name.afdesign rename to HoaryFox/Common/Resources/Name.afdesign diff --git a/HoaryFox/Resources/PostName.png b/HoaryFox/Common/Resources/PostName.png similarity index 100% rename from HoaryFox/Resources/PostName.png rename to HoaryFox/Common/Resources/PostName.png diff --git a/HoaryFox/Resources/PostSection.png b/HoaryFox/Common/Resources/PostSection.png similarity index 100% rename from HoaryFox/Resources/PostSection.png rename to HoaryFox/Common/Resources/PostSection.png diff --git a/HoaryFox/Resources/Section.afdesign b/HoaryFox/Common/Resources/Section.afdesign similarity index 100% rename from HoaryFox/Resources/Section.afdesign rename to HoaryFox/Common/Resources/Section.afdesign diff --git a/HoaryFox/Resources/Slab.svg b/HoaryFox/Common/Resources/Slab.svg similarity index 100% rename from HoaryFox/Resources/Slab.svg rename to HoaryFox/Common/Resources/Slab.svg diff --git a/HoaryFox/Resources/SlabName.png b/HoaryFox/Common/Resources/SlabName.png similarity index 100% rename from HoaryFox/Resources/SlabName.png rename to HoaryFox/Common/Resources/SlabName.png diff --git a/HoaryFox/Resources/SlabSection.png b/HoaryFox/Common/Resources/SlabSection.png similarity index 100% rename from HoaryFox/Resources/SlabSection.png rename to HoaryFox/Common/Resources/SlabSection.png diff --git a/HoaryFox/Resources/Story.png b/HoaryFox/Common/Resources/Story.png similarity index 100% rename from HoaryFox/Resources/Story.png rename to HoaryFox/Common/Resources/Story.png diff --git a/HoaryFox/Resources/Story.svg b/HoaryFox/Common/Resources/Story.svg similarity index 100% rename from HoaryFox/Resources/Story.svg rename to HoaryFox/Common/Resources/Story.svg diff --git a/HoaryFox/Resources/Wall.svg b/HoaryFox/Common/Resources/Wall.svg similarity index 100% rename from HoaryFox/Resources/Wall.svg rename to HoaryFox/Common/Resources/Wall.svg diff --git a/HoaryFox/Resources/WallName.png b/HoaryFox/Common/Resources/WallName.png similarity index 100% rename from HoaryFox/Resources/WallName.png rename to HoaryFox/Common/Resources/WallName.png diff --git a/HoaryFox/Resources/WallSection.png b/HoaryFox/Common/Resources/WallSection.png similarity index 100% rename from HoaryFox/Resources/WallSection.png rename to HoaryFox/Common/Resources/WallSection.png diff --git a/HoaryFox/HoaryFox.csproj b/HoaryFox/HoaryFox.csproj deleted file mode 100644 index e123cd2d..00000000 --- a/HoaryFox/HoaryFox.csproj +++ /dev/null @@ -1,41 +0,0 @@ - - - net48 - 1.0 - HoaryFox - Description of HoaryFox - .gha - hrntsm - true - true - true - - - - - - - - - - - True - True - Resource.resx - - - - - - ResXFileCodeGenerator - Resource.Designer.cs - - - - - C:\Program Files\Rhino 6\System\Rhino.exe - - Program - - - \ No newline at end of file diff --git a/HoaryFox/RH6/HoaryFoxRH6.csproj b/HoaryFox/RH6/HoaryFoxRH6.csproj new file mode 100644 index 00000000..383d571d --- /dev/null +++ b/HoaryFox/RH6/HoaryFoxRH6.csproj @@ -0,0 +1,44 @@ + + + net48 + 2.0.2 + HoaryFox + This Component read ST-Bridge file(.stb) and display its model data. + .gha + hrntsm + true + HoaryFox + false + HoaryFox + + + + + + + + + + + + + + + + + + C:\Program Files\Rhino 6\System\Rhino.exe + + Program + + + + none + false + + + + + + + \ No newline at end of file diff --git a/HoaryFox/HoaryFoxInfo.cs b/HoaryFox/RH6/HoaryFoxRH6Info.cs similarity index 78% rename from HoaryFox/HoaryFoxInfo.cs rename to HoaryFox/RH6/HoaryFoxRH6Info.cs index e08a08ac..5994fe53 100644 --- a/HoaryFox/HoaryFoxInfo.cs +++ b/HoaryFox/RH6/HoaryFoxRH6Info.cs @@ -4,11 +4,11 @@ namespace HoaryFox { - public class HoaryFoxInfo : GH_AssemblyInfo + public class HoaryFoxRH6Info : GH_AssemblyInfo { public override string Name => "HoaryFox"; - public override Bitmap Icon => Properties.Resource.InfoIcon; + public override Bitmap Icon => HoaryFoxCommon.Properties.Resource.InfoIcon; public override string Description => "This Component read ST-Bridge file(.stb) and display its model data."; diff --git a/HoaryFox/Component/Check/FilterByMaterials.cs b/HoaryFox/RH7/Component/Check/FilterByMaterials.cs similarity index 99% rename from HoaryFox/Component/Check/FilterByMaterials.cs rename to HoaryFox/RH7/Component/Check/FilterByMaterials.cs index 46faa804..57472c7d 100644 --- a/HoaryFox/Component/Check/FilterByMaterials.cs +++ b/HoaryFox/RH7/Component/Check/FilterByMaterials.cs @@ -4,7 +4,7 @@ using Grasshopper.Kernel; using Grasshopper.Kernel.Data; using Grasshopper.Kernel.Types; -using HoaryFox.Properties; +using HoaryFoxCommon.Properties; namespace HoaryFox.Component.Check { diff --git a/HoaryFox/Component/Check/MaterialType.cs b/HoaryFox/RH7/Component/Check/MaterialType.cs similarity index 98% rename from HoaryFox/Component/Check/MaterialType.cs rename to HoaryFox/RH7/Component/Check/MaterialType.cs index 8844e535..7eadabf2 100644 --- a/HoaryFox/Component/Check/MaterialType.cs +++ b/HoaryFox/RH7/Component/Check/MaterialType.cs @@ -5,7 +5,7 @@ using Grasshopper.Kernel; using Grasshopper.Kernel.Data; using Grasshopper.Kernel.Types; -using HoaryFox.Properties; +using HoaryFoxCommon.Properties; using STBDotNet.v202; namespace HoaryFox.Component.Check diff --git a/HoaryFox/Component/Check/Story.cs b/HoaryFox/RH7/Component/Check/Story.cs similarity index 99% rename from HoaryFox/Component/Check/Story.cs rename to HoaryFox/RH7/Component/Check/Story.cs index 56440f09..456ae000 100644 --- a/HoaryFox/Component/Check/Story.cs +++ b/HoaryFox/RH7/Component/Check/Story.cs @@ -5,7 +5,7 @@ using Grasshopper.Kernel; using Grasshopper.Kernel.Data; using Grasshopper.Kernel.Types; -using HoaryFox.Properties; +using HoaryFoxCommon.Properties; using STBDotNet.v202; namespace HoaryFox.Component.Check diff --git a/HoaryFox/Component/Geometry/Axes.cs b/HoaryFox/RH7/Component/Geometry/Axes.cs similarity index 99% rename from HoaryFox/Component/Geometry/Axes.cs rename to HoaryFox/RH7/Component/Geometry/Axes.cs index d94556c9..9d067b89 100644 --- a/HoaryFox/Component/Geometry/Axes.cs +++ b/HoaryFox/RH7/Component/Geometry/Axes.cs @@ -3,7 +3,7 @@ using System.Drawing; using System.Linq; using Grasshopper.Kernel; -using HoaryFox.Properties; +using HoaryFoxCommon.Properties; using Rhino.Geometry; using STBDotNet.v202; diff --git a/HoaryFox/Component/Geometry/Stb2Brep.cs b/HoaryFox/RH7/Component/Geometry/Stb2Brep.cs similarity index 99% rename from HoaryFox/Component/Geometry/Stb2Brep.cs rename to HoaryFox/RH7/Component/Geometry/Stb2Brep.cs index a56a2686..7df079e9 100644 --- a/HoaryFox/Component/Geometry/Stb2Brep.cs +++ b/HoaryFox/RH7/Component/Geometry/Stb2Brep.cs @@ -6,7 +6,7 @@ using Grasshopper.Kernel.Data; using Grasshopper.Kernel.Types; using HoaryFox.Component.Utils.Geometry; -using HoaryFox.Properties; +using HoaryFoxCommon.Properties; using Rhino; using Rhino.DocObjects; using Rhino.Geometry; diff --git a/HoaryFox/Component/Geometry/Stb2Line.cs b/HoaryFox/RH7/Component/Geometry/Stb2Line.cs similarity index 99% rename from HoaryFox/Component/Geometry/Stb2Line.cs rename to HoaryFox/RH7/Component/Geometry/Stb2Line.cs index 37ee7279..eb69c6ed 100644 --- a/HoaryFox/Component/Geometry/Stb2Line.cs +++ b/HoaryFox/RH7/Component/Geometry/Stb2Line.cs @@ -6,7 +6,7 @@ using Grasshopper.Kernel.Data; using Grasshopper.Kernel.Types; using HoaryFox.Component.Utils.Geometry; -using HoaryFox.Properties; +using HoaryFoxCommon.Properties; using Rhino; using Rhino.DocObjects; using Rhino.Geometry; diff --git a/HoaryFox/Component/IO/StbLoader.cs b/HoaryFox/RH7/Component/IO/StbLoader.cs similarity index 92% rename from HoaryFox/Component/IO/StbLoader.cs rename to HoaryFox/RH7/Component/IO/StbLoader.cs index aeb0d718..324083ef 100644 --- a/HoaryFox/Component/IO/StbLoader.cs +++ b/HoaryFox/RH7/Component/IO/StbLoader.cs @@ -1,5 +1,6 @@ using System; using Grasshopper.Kernel; +using HoaryFoxCommon.Properties; using STBDotNet.v202; namespace HoaryFox.Component.IO @@ -35,7 +36,7 @@ protected override void SolveInstance(IGH_DataAccess dataAccess) dataAccess.SetData(0, stbData); } - protected override System.Drawing.Bitmap Icon => Properties.Resource.LoadStb; + protected override System.Drawing.Bitmap Icon => Resource.LoadStb; public override Guid ComponentGuid => new Guid("C1E1CD82-9AC0-479C-A22F-DB7C44F3C77D"); } } diff --git a/HoaryFox/Component/Tag/Name/BeamNameTag.cs b/HoaryFox/RH7/Component/Tag/Name/BeamNameTag.cs similarity index 96% rename from HoaryFox/Component/Tag/Name/BeamNameTag.cs rename to HoaryFox/RH7/Component/Tag/Name/BeamNameTag.cs index b7fdb77b..ccd8435f 100644 --- a/HoaryFox/Component/Tag/Name/BeamNameTag.cs +++ b/HoaryFox/RH7/Component/Tag/Name/BeamNameTag.cs @@ -6,6 +6,7 @@ using Grasshopper.Kernel.Data; using Grasshopper.Kernel.Types; using HoaryFox.Component.Utils; +using HoaryFoxCommon.Properties; using Rhino.Geometry; using STBDotNet.v202; @@ -73,7 +74,7 @@ public override void DrawViewportWires(IGH_PreviewArgs args) } } - protected override Bitmap Icon => Properties.Resource.BeamName; + protected override Bitmap Icon => Resource.BeamName; public override Guid ComponentGuid => new Guid("FDC62C6D-7C03-412D-8FF8-B76439197730"); } diff --git a/HoaryFox/Component/Tag/Name/BraceNameTag.cs b/HoaryFox/RH7/Component/Tag/Name/BraceNameTag.cs similarity index 96% rename from HoaryFox/Component/Tag/Name/BraceNameTag.cs rename to HoaryFox/RH7/Component/Tag/Name/BraceNameTag.cs index 483663c5..591e1954 100644 --- a/HoaryFox/Component/Tag/Name/BraceNameTag.cs +++ b/HoaryFox/RH7/Component/Tag/Name/BraceNameTag.cs @@ -6,6 +6,7 @@ using Grasshopper.Kernel.Data; using Grasshopper.Kernel.Types; using HoaryFox.Component.Utils; +using HoaryFoxCommon.Properties; using Rhino.Geometry; using STBDotNet.v202; @@ -73,7 +74,7 @@ public override void DrawViewportWires(IGH_PreviewArgs args) } } - protected override Bitmap Icon => Properties.Resource.BraceName; + protected override Bitmap Icon => Resource.BraceName; public override Guid ComponentGuid => new Guid("21F7885E-6321-4C0D-8974-BC40769AAEAE"); } diff --git a/HoaryFox/Component/Tag/Name/ColumnNameTag.cs b/HoaryFox/RH7/Component/Tag/Name/ColumnNameTag.cs similarity index 96% rename from HoaryFox/Component/Tag/Name/ColumnNameTag.cs rename to HoaryFox/RH7/Component/Tag/Name/ColumnNameTag.cs index 6770c20a..c841e6b2 100644 --- a/HoaryFox/Component/Tag/Name/ColumnNameTag.cs +++ b/HoaryFox/RH7/Component/Tag/Name/ColumnNameTag.cs @@ -6,6 +6,7 @@ using Grasshopper.Kernel.Data; using Grasshopper.Kernel.Types; using HoaryFox.Component.Utils; +using HoaryFoxCommon.Properties; using Rhino.Geometry; using STBDotNet.v202; @@ -72,7 +73,7 @@ public override void DrawViewportWires(IGH_PreviewArgs args) } } - protected override Bitmap Icon => Properties.Resource.ColumnName; + protected override Bitmap Icon => Resource.ColumnName; public override Guid ComponentGuid => new Guid("AB439AE1-A56F-4764-BC36-F3752D30461A"); } diff --git a/HoaryFox/Component/Tag/Name/GirderNameTag.cs b/HoaryFox/RH7/Component/Tag/Name/GirderNameTag.cs similarity index 96% rename from HoaryFox/Component/Tag/Name/GirderNameTag.cs rename to HoaryFox/RH7/Component/Tag/Name/GirderNameTag.cs index 0d83da4f..94a0dedd 100644 --- a/HoaryFox/Component/Tag/Name/GirderNameTag.cs +++ b/HoaryFox/RH7/Component/Tag/Name/GirderNameTag.cs @@ -6,6 +6,7 @@ using Grasshopper.Kernel.Data; using Grasshopper.Kernel.Types; using HoaryFox.Component.Utils; +using HoaryFoxCommon.Properties; using Rhino.Geometry; using STBDotNet.v202; @@ -73,7 +74,7 @@ public override void DrawViewportWires(IGH_PreviewArgs args) } } - protected override Bitmap Icon => Properties.Resource.GirderName; + protected override Bitmap Icon => Resource.GirderName; public override Guid ComponentGuid => new Guid("31664B98-E1F0-4635-A718-18C8FDE14A14"); } diff --git a/HoaryFox/Component/Tag/Name/PostNameTag.cs b/HoaryFox/RH7/Component/Tag/Name/PostNameTag.cs similarity index 96% rename from HoaryFox/Component/Tag/Name/PostNameTag.cs rename to HoaryFox/RH7/Component/Tag/Name/PostNameTag.cs index 45078822..01927e98 100644 --- a/HoaryFox/Component/Tag/Name/PostNameTag.cs +++ b/HoaryFox/RH7/Component/Tag/Name/PostNameTag.cs @@ -6,6 +6,7 @@ using Grasshopper.Kernel.Data; using Grasshopper.Kernel.Types; using HoaryFox.Component.Utils; +using HoaryFoxCommon.Properties; using Rhino.Geometry; using STBDotNet.v202; @@ -73,7 +74,7 @@ public override void DrawViewportWires(IGH_PreviewArgs args) } } - protected override Bitmap Icon => Properties.Resource.PostName; + protected override Bitmap Icon => Resource.PostName; public override Guid ComponentGuid => new Guid("AD517629-4CD1-4109-B071-653D80DC6B70"); } diff --git a/HoaryFox/Component/Tag/Name/SlabNameTag.cs b/HoaryFox/RH7/Component/Tag/Name/SlabNameTag.cs similarity index 99% rename from HoaryFox/Component/Tag/Name/SlabNameTag.cs rename to HoaryFox/RH7/Component/Tag/Name/SlabNameTag.cs index cdff54ef..e1fdd296 100644 --- a/HoaryFox/Component/Tag/Name/SlabNameTag.cs +++ b/HoaryFox/RH7/Component/Tag/Name/SlabNameTag.cs @@ -5,7 +5,7 @@ using Grasshopper.Kernel; using Grasshopper.Kernel.Data; using Grasshopper.Kernel.Types; -using HoaryFox.Properties; +using HoaryFoxCommon.Properties; using Rhino.Geometry; using STBDotNet.v202; diff --git a/HoaryFox/Component/Tag/Name/WallNameTag.cs b/HoaryFox/RH7/Component/Tag/Name/WallNameTag.cs similarity index 98% rename from HoaryFox/Component/Tag/Name/WallNameTag.cs rename to HoaryFox/RH7/Component/Tag/Name/WallNameTag.cs index dfecd3b4..8f0f6d99 100644 --- a/HoaryFox/Component/Tag/Name/WallNameTag.cs +++ b/HoaryFox/RH7/Component/Tag/Name/WallNameTag.cs @@ -5,7 +5,7 @@ using Grasshopper.Kernel; using Grasshopper.Kernel.Data; using Grasshopper.Kernel.Types; -using HoaryFox.Properties; +using HoaryFoxCommon.Properties; using Rhino.Geometry; using STBDotNet.v202; diff --git a/HoaryFox/Component/Tag/Section/BeamSecTag.cs b/HoaryFox/RH7/Component/Tag/Section/BeamSecTag.cs similarity index 99% rename from HoaryFox/Component/Tag/Section/BeamSecTag.cs rename to HoaryFox/RH7/Component/Tag/Section/BeamSecTag.cs index 3acd383a..109ab056 100644 --- a/HoaryFox/Component/Tag/Section/BeamSecTag.cs +++ b/HoaryFox/RH7/Component/Tag/Section/BeamSecTag.cs @@ -6,7 +6,7 @@ using Grasshopper.Kernel.Data; using Grasshopper.Kernel.Types; using HoaryFox.Component.Utils; -using HoaryFox.Properties; +using HoaryFoxCommon.Properties; using Rhino.Geometry; using STBDotNet.v202; diff --git a/HoaryFox/Component/Tag/Section/BraceSecTag.cs b/HoaryFox/RH7/Component/Tag/Section/BraceSecTag.cs similarity index 99% rename from HoaryFox/Component/Tag/Section/BraceSecTag.cs rename to HoaryFox/RH7/Component/Tag/Section/BraceSecTag.cs index 88333ac1..76a61ae8 100644 --- a/HoaryFox/Component/Tag/Section/BraceSecTag.cs +++ b/HoaryFox/RH7/Component/Tag/Section/BraceSecTag.cs @@ -6,7 +6,7 @@ using Grasshopper.Kernel.Data; using Grasshopper.Kernel.Types; using HoaryFox.Component.Utils; -using HoaryFox.Properties; +using HoaryFoxCommon.Properties; using Rhino.Geometry; using STBDotNet.v202; diff --git a/HoaryFox/Component/Tag/Section/ColumnSecTag.cs b/HoaryFox/RH7/Component/Tag/Section/ColumnSecTag.cs similarity index 99% rename from HoaryFox/Component/Tag/Section/ColumnSecTag.cs rename to HoaryFox/RH7/Component/Tag/Section/ColumnSecTag.cs index 7f21153d..215f1464 100644 --- a/HoaryFox/Component/Tag/Section/ColumnSecTag.cs +++ b/HoaryFox/RH7/Component/Tag/Section/ColumnSecTag.cs @@ -6,7 +6,7 @@ using Grasshopper.Kernel.Data; using Grasshopper.Kernel.Types; using HoaryFox.Component.Utils; -using HoaryFox.Properties; +using HoaryFoxCommon.Properties; using Rhino.Geometry; using STBDotNet.v202; diff --git a/HoaryFox/Component/Tag/Section/GirderSecTag.cs b/HoaryFox/RH7/Component/Tag/Section/GirderSecTag.cs similarity index 99% rename from HoaryFox/Component/Tag/Section/GirderSecTag.cs rename to HoaryFox/RH7/Component/Tag/Section/GirderSecTag.cs index a77e88ba..1ecadc73 100644 --- a/HoaryFox/Component/Tag/Section/GirderSecTag.cs +++ b/HoaryFox/RH7/Component/Tag/Section/GirderSecTag.cs @@ -6,7 +6,7 @@ using Grasshopper.Kernel.Data; using Grasshopper.Kernel.Types; using HoaryFox.Component.Utils; -using HoaryFox.Properties; +using HoaryFoxCommon.Properties; using Rhino.Geometry; using STBDotNet.v202; diff --git a/HoaryFox/Component/Tag/Section/PostSecTag.cs b/HoaryFox/RH7/Component/Tag/Section/PostSecTag.cs similarity index 99% rename from HoaryFox/Component/Tag/Section/PostSecTag.cs rename to HoaryFox/RH7/Component/Tag/Section/PostSecTag.cs index e306e0e1..0dd1a4d6 100644 --- a/HoaryFox/Component/Tag/Section/PostSecTag.cs +++ b/HoaryFox/RH7/Component/Tag/Section/PostSecTag.cs @@ -6,7 +6,7 @@ using Grasshopper.Kernel.Data; using Grasshopper.Kernel.Types; using HoaryFox.Component.Utils; -using HoaryFox.Properties; +using HoaryFoxCommon.Properties; using Rhino.Geometry; using STBDotNet.v202; diff --git a/HoaryFox/Component/Tag/Section/SlabSecTag.cs b/HoaryFox/RH7/Component/Tag/Section/SlabSecTag.cs similarity index 99% rename from HoaryFox/Component/Tag/Section/SlabSecTag.cs rename to HoaryFox/RH7/Component/Tag/Section/SlabSecTag.cs index 43827818..ca3d3ec1 100644 --- a/HoaryFox/Component/Tag/Section/SlabSecTag.cs +++ b/HoaryFox/RH7/Component/Tag/Section/SlabSecTag.cs @@ -6,7 +6,7 @@ using Grasshopper.Kernel.Data; using Grasshopper.Kernel.Types; using HoaryFox.Component.Utils; -using HoaryFox.Properties; +using HoaryFoxCommon.Properties; using Rhino.Geometry; using STBDotNet.v202; diff --git a/HoaryFox/Component/Tag/Section/WallSecTag.cs b/HoaryFox/RH7/Component/Tag/Section/WallSecTag.cs similarity index 99% rename from HoaryFox/Component/Tag/Section/WallSecTag.cs rename to HoaryFox/RH7/Component/Tag/Section/WallSecTag.cs index 3c22c802..2df4f829 100644 --- a/HoaryFox/Component/Tag/Section/WallSecTag.cs +++ b/HoaryFox/RH7/Component/Tag/Section/WallSecTag.cs @@ -6,7 +6,7 @@ using Grasshopper.Kernel.Data; using Grasshopper.Kernel.Types; using HoaryFox.Component.Utils; -using HoaryFox.Properties; +using HoaryFoxCommon.Properties; using Rhino.Geometry; using STBDotNet.v202; diff --git a/HoaryFox/Component/Utils/Geometry/BrepMaker/Brace.cs b/HoaryFox/RH7/Component/Utils/Geometry/BrepMaker/Brace.cs similarity index 100% rename from HoaryFox/Component/Utils/Geometry/BrepMaker/Brace.cs rename to HoaryFox/RH7/Component/Utils/Geometry/BrepMaker/Brace.cs diff --git a/HoaryFox/Component/Utils/Geometry/BrepMaker/Column.cs b/HoaryFox/RH7/Component/Utils/Geometry/BrepMaker/Column.cs similarity index 100% rename from HoaryFox/Component/Utils/Geometry/BrepMaker/Column.cs rename to HoaryFox/RH7/Component/Utils/Geometry/BrepMaker/Column.cs diff --git a/HoaryFox/Component/Utils/Geometry/BrepMaker/Girder.cs b/HoaryFox/RH7/Component/Utils/Geometry/BrepMaker/Girder.cs similarity index 100% rename from HoaryFox/Component/Utils/Geometry/BrepMaker/Girder.cs rename to HoaryFox/RH7/Component/Utils/Geometry/BrepMaker/Girder.cs diff --git a/HoaryFox/Component/Utils/Geometry/BrepMaker/GirderFigureToCurveList.cs b/HoaryFox/RH7/Component/Utils/Geometry/BrepMaker/GirderFigureToCurveList.cs similarity index 100% rename from HoaryFox/Component/Utils/Geometry/BrepMaker/GirderFigureToCurveList.cs rename to HoaryFox/RH7/Component/Utils/Geometry/BrepMaker/GirderFigureToCurveList.cs diff --git a/HoaryFox/Component/Utils/Geometry/BrepMaker/Slab.cs b/HoaryFox/RH7/Component/Utils/Geometry/BrepMaker/Slab.cs similarity index 100% rename from HoaryFox/Component/Utils/Geometry/BrepMaker/Slab.cs rename to HoaryFox/RH7/Component/Utils/Geometry/BrepMaker/Slab.cs diff --git a/HoaryFox/Component/Utils/Geometry/BrepMaker/SteelSections.cs b/HoaryFox/RH7/Component/Utils/Geometry/BrepMaker/SteelSections.cs similarity index 100% rename from HoaryFox/Component/Utils/Geometry/BrepMaker/SteelSections.cs rename to HoaryFox/RH7/Component/Utils/Geometry/BrepMaker/SteelSections.cs diff --git a/HoaryFox/Component/Utils/Geometry/BrepMaker/Utils.cs b/HoaryFox/RH7/Component/Utils/Geometry/BrepMaker/Utils.cs similarity index 100% rename from HoaryFox/Component/Utils/Geometry/BrepMaker/Utils.cs rename to HoaryFox/RH7/Component/Utils/Geometry/BrepMaker/Utils.cs diff --git a/HoaryFox/Component/Utils/Geometry/BrepMaker/Wall.cs b/HoaryFox/RH7/Component/Utils/Geometry/BrepMaker/Wall.cs similarity index 100% rename from HoaryFox/Component/Utils/Geometry/BrepMaker/Wall.cs rename to HoaryFox/RH7/Component/Utils/Geometry/BrepMaker/Wall.cs diff --git a/HoaryFox/Component/Utils/Geometry/CreateLineFromStb.cs b/HoaryFox/RH7/Component/Utils/Geometry/CreateLineFromStb.cs similarity index 100% rename from HoaryFox/Component/Utils/Geometry/CreateLineFromStb.cs rename to HoaryFox/RH7/Component/Utils/Geometry/CreateLineFromStb.cs diff --git a/HoaryFox/Component/Utils/Geometry/CreateMemberBrepListFromStb.cs b/HoaryFox/RH7/Component/Utils/Geometry/CreateMemberBrepListFromStb.cs similarity index 100% rename from HoaryFox/Component/Utils/Geometry/CreateMemberBrepListFromStb.cs rename to HoaryFox/RH7/Component/Utils/Geometry/CreateMemberBrepListFromStb.cs diff --git a/HoaryFox/Component/Utils/Geometry/GeometryBaker.cs b/HoaryFox/RH7/Component/Utils/Geometry/GeometryBaker.cs similarity index 100% rename from HoaryFox/Component/Utils/Geometry/GeometryBaker.cs rename to HoaryFox/RH7/Component/Utils/Geometry/GeometryBaker.cs diff --git a/HoaryFox/Component/Utils/Geometry/SectionCornerPoints.cs b/HoaryFox/RH7/Component/Utils/Geometry/SectionCornerPoints.cs similarity index 100% rename from HoaryFox/Component/Utils/Geometry/SectionCornerPoints.cs rename to HoaryFox/RH7/Component/Utils/Geometry/SectionCornerPoints.cs diff --git a/HoaryFox/Component/Utils/TagUtils.cs b/HoaryFox/RH7/Component/Utils/TagUtils.cs similarity index 100% rename from HoaryFox/Component/Utils/TagUtils.cs rename to HoaryFox/RH7/Component/Utils/TagUtils.cs diff --git a/HoaryFox/RH7/HoaryFoxRH7.csproj b/HoaryFox/RH7/HoaryFoxRH7.csproj new file mode 100644 index 00000000..b93428f6 --- /dev/null +++ b/HoaryFox/RH7/HoaryFoxRH7.csproj @@ -0,0 +1,39 @@ + + + net48 + 2.0.2 + HoaryFox + This Component read ST-Bridge file(.stb) and display its model data. + .gha + hrntsm + true + HoaryFox + false + HoaryFox + + + + + + + + + + + + + C:\Program Files\Rhino 7\System\Rhino.exe + + Program + + + + none + false + + + + + + + \ No newline at end of file diff --git a/HoaryFox/RH7/HoaryFoxRH7Info.cs b/HoaryFox/RH7/HoaryFoxRH7Info.cs new file mode 100644 index 00000000..52f2d184 --- /dev/null +++ b/HoaryFox/RH7/HoaryFoxRH7Info.cs @@ -0,0 +1,21 @@ +using System; +using System.Drawing; +using Grasshopper.Kernel; + +namespace HoaryFox +{ + public class HoaryFoxRH7Info : GH_AssemblyInfo + { + public override string Name => "HoaryFox"; + + public override Bitmap Icon => HoaryFoxCommon.Properties.Resource.InfoIcon; + + public override string Description => "This Component read ST-Bridge file(.stb) and display its model data."; + + public override Guid Id => new Guid("093de648-746b-4b0b-85ef-495c6fb4514f"); + + public override string AuthorName => "hrntsm"; + + public override string AuthorContact => "contact@hrntsm.com"; + } +} diff --git a/KarambaConnect/Common/KarambaConnectCommon.csproj b/KarambaConnect/Common/KarambaConnectCommon.csproj new file mode 100644 index 00000000..86dbe8b4 --- /dev/null +++ b/KarambaConnect/Common/KarambaConnectCommon.csproj @@ -0,0 +1,26 @@ + + + + net48 + + + + + True + True + Resource.resx + + + + + + PublicResXFileCodeGenerator + Resource.Designer.cs + + + + + none + false + + diff --git a/KarambaConnect/Common/Library/RH6_Karamba1/karamba.gha b/KarambaConnect/Common/Library/RH6_Karamba1/karamba.gha new file mode 100644 index 00000000..102beb4e Binary files /dev/null and b/KarambaConnect/Common/Library/RH6_Karamba1/karamba.gha differ diff --git a/KarambaConnect/Common/Library/RH6_Karamba1/karambaCommon.dll b/KarambaConnect/Common/Library/RH6_Karamba1/karambaCommon.dll new file mode 100644 index 00000000..6055ae47 Binary files /dev/null and b/KarambaConnect/Common/Library/RH6_Karamba1/karambaCommon.dll differ diff --git a/KarambaConnect/Common/Library/RH6_Karamba2/GH_IO.dll b/KarambaConnect/Common/Library/RH6_Karamba2/GH_IO.dll new file mode 100644 index 00000000..87145a31 Binary files /dev/null and b/KarambaConnect/Common/Library/RH6_Karamba2/GH_IO.dll differ diff --git a/KarambaConnect/Common/Library/RH6_Karamba2/Grasshopper.dll b/KarambaConnect/Common/Library/RH6_Karamba2/Grasshopper.dll new file mode 100644 index 00000000..e44427e0 Binary files /dev/null and b/KarambaConnect/Common/Library/RH6_Karamba2/Grasshopper.dll differ diff --git a/KarambaConnect/Common/Library/RH6_Karamba2/RhinoCommon.dll b/KarambaConnect/Common/Library/RH6_Karamba2/RhinoCommon.dll new file mode 100644 index 00000000..f29ca579 Binary files /dev/null and b/KarambaConnect/Common/Library/RH6_Karamba2/RhinoCommon.dll differ diff --git a/KarambaConnect/Common/Library/RH6_Karamba2/karamba.gha b/KarambaConnect/Common/Library/RH6_Karamba2/karamba.gha new file mode 100644 index 00000000..f2563529 Binary files /dev/null and b/KarambaConnect/Common/Library/RH6_Karamba2/karamba.gha differ diff --git a/KarambaConnect/Common/Library/RH6_Karamba2/karambaCommon.dll b/KarambaConnect/Common/Library/RH6_Karamba2/karambaCommon.dll new file mode 100644 index 00000000..2bca1fc6 Binary files /dev/null and b/KarambaConnect/Common/Library/RH6_Karamba2/karambaCommon.dll differ diff --git a/KarambaConnect/Common/Library/RH7_Karamba1/karamba.gha b/KarambaConnect/Common/Library/RH7_Karamba1/karamba.gha new file mode 100644 index 00000000..5f80363e Binary files /dev/null and b/KarambaConnect/Common/Library/RH7_Karamba1/karamba.gha differ diff --git a/KarambaConnect/Common/Library/RH7_Karamba1/karambaCommon.dll b/KarambaConnect/Common/Library/RH7_Karamba1/karambaCommon.dll new file mode 100644 index 00000000..6055ae47 Binary files /dev/null and b/KarambaConnect/Common/Library/RH7_Karamba1/karambaCommon.dll differ diff --git a/KarambaConnect/Common/Library/RH7_Karamba2/karamba.gha b/KarambaConnect/Common/Library/RH7_Karamba2/karamba.gha new file mode 100644 index 00000000..67aeb1a7 Binary files /dev/null and b/KarambaConnect/Common/Library/RH7_Karamba2/karamba.gha differ diff --git a/KarambaConnect/Common/Library/RH7_Karamba2/karambaCommon.dll b/KarambaConnect/Common/Library/RH7_Karamba2/karambaCommon.dll new file mode 100644 index 00000000..4c6c9826 Binary files /dev/null and b/KarambaConnect/Common/Library/RH7_Karamba2/karambaCommon.dll differ diff --git a/KarambaConnect/Properties/Resource.Designer.cs b/KarambaConnect/Common/Properties/Resource.Designer.cs similarity index 88% rename from KarambaConnect/Properties/Resource.Designer.cs rename to KarambaConnect/Common/Properties/Resource.Designer.cs index 2b3479cd..84e589c7 100644 --- a/KarambaConnect/Properties/Resource.Designer.cs +++ b/KarambaConnect/Common/Properties/Resource.Designer.cs @@ -8,7 +8,7 @@ // //------------------------------------------------------------------------------ -namespace KarambaConnect.Properties { +namespace KarambaConnectCommon.Properties { using System; @@ -22,7 +22,7 @@ namespace KarambaConnect.Properties { [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "16.0.0.0")] [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] - internal class Resource { + public class Resource { private static global::System.Resources.ResourceManager resourceMan; @@ -36,10 +36,10 @@ internal Resource() { /// このクラスで使用されているキャッシュされた ResourceManager インスタンスを返します。 /// [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)] - internal static global::System.Resources.ResourceManager ResourceManager { + public static global::System.Resources.ResourceManager ResourceManager { get { if (object.ReferenceEquals(resourceMan, null)) { - global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("KarambaConnect.Properties.Resource", typeof(Resource).Assembly); + global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("KarambaConnectCommon.Properties.Resource", typeof(Resource).Assembly); resourceMan = temp; } return resourceMan; @@ -51,7 +51,7 @@ internal Resource() { /// 現在のスレッドの CurrentUICulture プロパティをオーバーライドします。 /// [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)] - internal static global::System.Globalization.CultureInfo Culture { + public static global::System.Globalization.CultureInfo Culture { get { return resourceCulture; } @@ -63,7 +63,7 @@ internal Resource() { /// /// 型 System.Drawing.Bitmap のローカライズされたリソースを検索します。 /// - internal static System.Drawing.Bitmap AxisBuilder { + public static System.Drawing.Bitmap AxisBuilder { get { object obj = ResourceManager.GetObject("AxisBuilder", resourceCulture); return ((System.Drawing.Bitmap)(obj)); @@ -73,7 +73,7 @@ internal static System.Drawing.Bitmap AxisBuilder { /// /// 型 System.Drawing.Bitmap のローカライズされたリソースを検索します。 /// - internal static System.Drawing.Bitmap ExportStb { + public static System.Drawing.Bitmap ExportStb { get { object obj = ResourceManager.GetObject("ExportStb", resourceCulture); return ((System.Drawing.Bitmap)(obj)); @@ -83,7 +83,7 @@ internal static System.Drawing.Bitmap ExportStb { /// /// 型 System.Drawing.Bitmap のローカライズされたリソースを検索します。 /// - internal static System.Drawing.Bitmap FrameBuilder { + public static System.Drawing.Bitmap FrameBuilder { get { object obj = ResourceManager.GetObject("FrameBuilder", resourceCulture); return ((System.Drawing.Bitmap)(obj)); @@ -93,7 +93,7 @@ internal static System.Drawing.Bitmap FrameBuilder { /// /// 型 System.Drawing.Bitmap のローカライズされたリソースを検索します。 /// - internal static System.Drawing.Bitmap NodeBuilder { + public static System.Drawing.Bitmap NodeBuilder { get { object obj = ResourceManager.GetObject("NodeBuilder", resourceCulture); return ((System.Drawing.Bitmap)(obj)); @@ -103,7 +103,7 @@ internal static System.Drawing.Bitmap NodeBuilder { /// /// 型 System.Drawing.Bitmap のローカライズされたリソースを検索します。 /// - internal static System.Drawing.Bitmap SetFamilyName { + public static System.Drawing.Bitmap SetFamilyName { get { object obj = ResourceManager.GetObject("SetFamilyName", resourceCulture); return ((System.Drawing.Bitmap)(obj)); @@ -113,7 +113,7 @@ internal static System.Drawing.Bitmap SetFamilyName { /// /// 型 System.Drawing.Bitmap のローカライズされたリソースを検索します。 /// - internal static System.Drawing.Bitmap StoryBuilder { + public static System.Drawing.Bitmap StoryBuilder { get { object obj = ResourceManager.GetObject("StoryBuilder", resourceCulture); return ((System.Drawing.Bitmap)(obj)); @@ -123,7 +123,7 @@ internal static System.Drawing.Bitmap StoryBuilder { /// /// 型 System.Drawing.Bitmap のローカライズされたリソースを検索します。 /// - internal static System.Drawing.Bitmap ToKaramba { + public static System.Drawing.Bitmap ToKaramba { get { object obj = ResourceManager.GetObject("ToKaramba", resourceCulture); return ((System.Drawing.Bitmap)(obj)); diff --git a/KarambaConnect/Properties/Resource.resx b/KarambaConnect/Common/Properties/Resource.resx similarity index 100% rename from KarambaConnect/Properties/Resource.resx rename to KarambaConnect/Common/Properties/Resource.resx diff --git a/KarambaConnect/Properties/launchSettings.json b/KarambaConnect/Common/Properties/launchSettings.json similarity index 100% rename from KarambaConnect/Properties/launchSettings.json rename to KarambaConnect/Common/Properties/launchSettings.json diff --git a/KarambaConnect/Resources/AxisBuilder.png b/KarambaConnect/Common/Resources/AxisBuilder.png similarity index 100% rename from KarambaConnect/Resources/AxisBuilder.png rename to KarambaConnect/Common/Resources/AxisBuilder.png diff --git a/KarambaConnect/Resources/AxisBuilder.svg b/KarambaConnect/Common/Resources/AxisBuilder.svg similarity index 100% rename from KarambaConnect/Resources/AxisBuilder.svg rename to KarambaConnect/Common/Resources/AxisBuilder.svg diff --git a/KarambaConnect/Resources/ExportStb.png b/KarambaConnect/Common/Resources/ExportStb.png similarity index 100% rename from KarambaConnect/Resources/ExportStb.png rename to KarambaConnect/Common/Resources/ExportStb.png diff --git a/KarambaConnect/Resources/ExportStb.xcf b/KarambaConnect/Common/Resources/ExportStb.xcf similarity index 100% rename from KarambaConnect/Resources/ExportStb.xcf rename to KarambaConnect/Common/Resources/ExportStb.xcf diff --git a/KarambaConnect/Resources/FrameBuilder.png b/KarambaConnect/Common/Resources/FrameBuilder.png similarity index 100% rename from KarambaConnect/Resources/FrameBuilder.png rename to KarambaConnect/Common/Resources/FrameBuilder.png diff --git a/KarambaConnect/Resources/FrameBuilder.svg b/KarambaConnect/Common/Resources/FrameBuilder.svg similarity index 100% rename from KarambaConnect/Resources/FrameBuilder.svg rename to KarambaConnect/Common/Resources/FrameBuilder.svg diff --git a/KarambaConnect/Resources/NodeBuilder.png b/KarambaConnect/Common/Resources/NodeBuilder.png similarity index 100% rename from KarambaConnect/Resources/NodeBuilder.png rename to KarambaConnect/Common/Resources/NodeBuilder.png diff --git a/KarambaConnect/Resources/NodeBuilder.svg b/KarambaConnect/Common/Resources/NodeBuilder.svg similarity index 100% rename from KarambaConnect/Resources/NodeBuilder.svg rename to KarambaConnect/Common/Resources/NodeBuilder.svg diff --git a/KarambaConnect/Resources/SetFamilyName.png b/KarambaConnect/Common/Resources/SetFamilyName.png similarity index 100% rename from KarambaConnect/Resources/SetFamilyName.png rename to KarambaConnect/Common/Resources/SetFamilyName.png diff --git a/KarambaConnect/Resources/SetFamilyName.svg b/KarambaConnect/Common/Resources/SetFamilyName.svg similarity index 100% rename from KarambaConnect/Resources/SetFamilyName.svg rename to KarambaConnect/Common/Resources/SetFamilyName.svg diff --git a/KarambaConnect/Resources/StoryBuilder.png b/KarambaConnect/Common/Resources/StoryBuilder.png similarity index 100% rename from KarambaConnect/Resources/StoryBuilder.png rename to KarambaConnect/Common/Resources/StoryBuilder.png diff --git a/KarambaConnect/Resources/StoryBuilder.svg b/KarambaConnect/Common/Resources/StoryBuilder.svg similarity index 100% rename from KarambaConnect/Resources/StoryBuilder.svg rename to KarambaConnect/Common/Resources/StoryBuilder.svg diff --git a/KarambaConnect/Resources/ToKaramba.png b/KarambaConnect/Common/Resources/ToKaramba.png similarity index 100% rename from KarambaConnect/Resources/ToKaramba.png rename to KarambaConnect/Common/Resources/ToKaramba.png diff --git a/KarambaConnect/Library/karamba132/karamba.gha b/KarambaConnect/Library/karamba132/karamba.gha deleted file mode 100644 index 4d64f821..00000000 Binary files a/KarambaConnect/Library/karamba132/karamba.gha and /dev/null differ diff --git a/KarambaConnect/Library/karamba132/karambaCommon.dll b/KarambaConnect/Library/karamba132/karambaCommon.dll deleted file mode 100644 index 007a79a0..00000000 Binary files a/KarambaConnect/Library/karamba132/karambaCommon.dll and /dev/null differ diff --git a/KarambaConnect/RH6K1/karambaConnectRH6K1.csproj b/KarambaConnect/RH6K1/karambaConnectRH6K1.csproj new file mode 100644 index 00000000..9261b7f6 --- /dev/null +++ b/KarambaConnect/RH6K1/karambaConnectRH6K1.csproj @@ -0,0 +1,60 @@ + + + + net48 + 2.0.2 + karambaConnect + HoaryFox karamba connect extension + .gha + hrntsm + false + false + true + false + karambaConnect + karambaConnect + karambaConnect + TRACE;karamba1 + + + + + + + + + + + + + + ..\Common\Library\RH6_Karamba1\karambaCommon.dll + false + + + ..\Common\Library\RH6_Karamba1\karamba.gha + false + + + + + + + + + + C:\Program Files\Rhino 6\System\Rhino.exe + + Program + + + + none + false + + + + + + + diff --git a/KarambaConnect/karambaConnectInfo.cs b/KarambaConnect/RH6K1/karambaConnectRHK1Info.cs similarity index 89% rename from KarambaConnect/karambaConnectInfo.cs rename to KarambaConnect/RH6K1/karambaConnectRHK1Info.cs index dfdd6b18..38114ee0 100644 --- a/KarambaConnect/karambaConnectInfo.cs +++ b/KarambaConnect/RH6K1/karambaConnectRHK1Info.cs @@ -4,7 +4,7 @@ namespace KarambaConnect { - public class KarambaConnectInfo : GH_AssemblyInfo + public class KarambaConnectRH7K1Info : GH_AssemblyInfo { public override string Name => "HoaryFox(karambaConnect)"; diff --git a/KarambaConnect/RH6K2/karambaConnectRH6K2.csproj b/KarambaConnect/RH6K2/karambaConnectRH6K2.csproj new file mode 100644 index 00000000..e6070165 --- /dev/null +++ b/KarambaConnect/RH6K2/karambaConnectRH6K2.csproj @@ -0,0 +1,76 @@ + + + + net48 + 2.0.2 + karambaConnect + HoaryFox karamba connect extension + .gha + hrntsm + false + false + true + false + karambaConnect + karambaConnect + karambaConnect + TRACE;karamba2 + + + + + + + + + + + + + ..\Common\Library\RH6_Karamba2\karambaCommon.dll + false + + + ..\Common\Library\RH6_Karamba2\karamba.gha + false + + + ..\Common\Library\RH6_Karamba2\GH_IO.dll + false + + + ..\Common\Library\RH6_Karamba2\Grasshopper.dll + false + + + ..\Common\Library\RH6_Karamba2\RhinoCommon.dll + false + + + + + + + + + + C:\Program Files\Rhino 6\System\Rhino.exe + + Program + + + + x64 + + + + x64 + none + false + + + + + + + diff --git a/KarambaConnect/RH6K2/karambaConnectRH6K2Info.cs b/KarambaConnect/RH6K2/karambaConnectRH6K2Info.cs new file mode 100644 index 00000000..38114ee0 --- /dev/null +++ b/KarambaConnect/RH6K2/karambaConnectRH6K2Info.cs @@ -0,0 +1,21 @@ +using System; +using System.Drawing; +using Grasshopper.Kernel; + +namespace KarambaConnect +{ + public class KarambaConnectRH7K1Info : GH_AssemblyInfo + { + public override string Name => "HoaryFox(karambaConnect)"; + + public override Bitmap Icon => null; + + public override string Description => "HoaryFox karamba connect extension"; + + public override Guid Id => new Guid("ffa60c17-4050-4232-96db-011eccbd402d"); + + public override string AuthorName => "hrntsm"; + + public override string AuthorContact => "contact@hrntsm.com"; + } +} diff --git a/KarambaConnect/RH7K1/karambaConnectRH7K1.csproj b/KarambaConnect/RH7K1/karambaConnectRH7K1.csproj new file mode 100644 index 00000000..99d531ad --- /dev/null +++ b/KarambaConnect/RH7K1/karambaConnectRH7K1.csproj @@ -0,0 +1,55 @@ + + + + net48 + 2.0.2 + karambaConnect + HoaryFox karamba connect extension + .gha + hrntsm + false + false + true + false + karambaConnect + karambaConnect + karambaConnect + TRACE;karamba1 + + + + + + + + + + + + + + ..\Common\Library\RH7_Karamba1\karambaCommon.dll + false + + + ..\Common\Library\RH7_Karamba1\karamba.gha + false + + + + + + + + + + C:\Program Files\Rhino 7\System\Rhino.exe + + Program + + + + + + + diff --git a/KarambaConnect/RH7K1/karambaConnectRH7K1Info.cs b/KarambaConnect/RH7K1/karambaConnectRH7K1Info.cs new file mode 100644 index 00000000..38114ee0 --- /dev/null +++ b/KarambaConnect/RH7K1/karambaConnectRH7K1Info.cs @@ -0,0 +1,21 @@ +using System; +using System.Drawing; +using Grasshopper.Kernel; + +namespace KarambaConnect +{ + public class KarambaConnectRH7K1Info : GH_AssemblyInfo + { + public override string Name => "HoaryFox(karambaConnect)"; + + public override Bitmap Icon => null; + + public override string Description => "HoaryFox karamba connect extension"; + + public override Guid Id => new Guid("ffa60c17-4050-4232-96db-011eccbd402d"); + + public override string AuthorName => "hrntsm"; + + public override string AuthorContact => "contact@hrntsm.com"; + } +} diff --git a/KarambaConnect/Component/IO/Convert2Karamba.cs b/KarambaConnect/RH7K2/Component/IO/Convert2Karamba.cs similarity index 98% rename from KarambaConnect/Component/IO/Convert2Karamba.cs rename to KarambaConnect/RH7K2/Component/IO/Convert2Karamba.cs index 81d8b1a6..cb6f91e9 100644 --- a/KarambaConnect/Component/IO/Convert2Karamba.cs +++ b/KarambaConnect/RH7K2/Component/IO/Convert2Karamba.cs @@ -7,8 +7,8 @@ using Karamba.Elements; using Karamba.GHopper.CrossSections; using Karamba.GHopper.Elements; -using KarambaConnect.Properties; using KarambaConnect.S2K; +using KarambaConnectCommon.Properties; using STBDotNet.v202; namespace KarambaConnect.Component.IO diff --git a/KarambaConnect/Component/IO/Export.cs b/KarambaConnect/RH7K2/Component/IO/Export.cs similarity index 99% rename from KarambaConnect/Component/IO/Export.cs rename to KarambaConnect/RH7K2/Component/IO/Export.cs index 2c96ed4c..1439b077 100644 --- a/KarambaConnect/Component/IO/Export.cs +++ b/KarambaConnect/RH7K2/Component/IO/Export.cs @@ -2,7 +2,7 @@ using System.Collections.Generic; using System.Drawing; using Grasshopper.Kernel; -using KarambaConnect.Properties; +using KarambaConnectCommon.Properties; using STBDotNet.Serialization; using STBDotNet.v202; diff --git a/KarambaConnect/Component/IO/SetFamilyName.cs b/KarambaConnect/RH7K2/Component/IO/SetFamilyName.cs similarity index 98% rename from KarambaConnect/Component/IO/SetFamilyName.cs rename to KarambaConnect/RH7K2/Component/IO/SetFamilyName.cs index a5a60775..07e5e91e 100644 --- a/KarambaConnect/Component/IO/SetFamilyName.cs +++ b/KarambaConnect/RH7K2/Component/IO/SetFamilyName.cs @@ -1,8 +1,8 @@ using System; using System.Drawing; using Grasshopper.Kernel; -using KarambaConnect.Properties; using KarambaConnect.S2K; +using KarambaConnectCommon.Properties; namespace KarambaConnect.Component.IO { diff --git a/KarambaConnect/Component/StbBuilder/AxisBuilder.cs b/KarambaConnect/RH7K2/Component/StbBuilder/AxisBuilder.cs similarity index 97% rename from KarambaConnect/Component/StbBuilder/AxisBuilder.cs rename to KarambaConnect/RH7K2/Component/StbBuilder/AxisBuilder.cs index 17619046..bf785069 100644 --- a/KarambaConnect/Component/StbBuilder/AxisBuilder.cs +++ b/KarambaConnect/RH7K2/Component/StbBuilder/AxisBuilder.cs @@ -3,6 +3,7 @@ using System.Drawing; using System.Linq; using Grasshopper.Kernel; +using KarambaConnectCommon.Properties; using STBDotNet.v202; namespace KarambaConnect.Component.StbBuilder @@ -104,7 +105,7 @@ private static StbParallelAxis CreateParallelAxis(int count, IReadOnlyList Properties.Resource.AxisBuilder; + protected override Bitmap Icon => Resource.AxisBuilder; public override Guid ComponentGuid => new Guid("A09E1BF4-90FD-436D-8142-092894CE5D86"); } } diff --git a/KarambaConnect/Component/StbBuilder/FrameBuilderByAngle.cs b/KarambaConnect/RH7K2/Component/StbBuilder/FrameBuilderByAngle.cs similarity index 97% rename from KarambaConnect/Component/StbBuilder/FrameBuilderByAngle.cs rename to KarambaConnect/RH7K2/Component/StbBuilder/FrameBuilderByAngle.cs index 275474f8..b47b2843 100644 --- a/KarambaConnect/Component/StbBuilder/FrameBuilderByAngle.cs +++ b/KarambaConnect/RH7K2/Component/StbBuilder/FrameBuilderByAngle.cs @@ -3,6 +3,7 @@ using System.Linq; using Grasshopper.Kernel; using Karamba.GHopper.Models; +using KarambaConnectCommon.Properties; using Rhino.Geometry; using STBDotNet.v202; using Model = Karamba.Models.Model; @@ -51,7 +52,7 @@ protected override void SolveInstance(IGH_DataAccess dataAccess) dataAccess.SetData(1, _sModel.StbSections); } - protected override Bitmap Icon => Properties.Resource.FrameBuilder; + protected override Bitmap Icon => Resource.FrameBuilder; public override Guid ComponentGuid => new Guid("38296D06-E47A-403F-BFE8-00E873A99CF8"); public override void DrawViewportWires(IGH_PreviewArgs args) diff --git a/KarambaConnect/Component/StbBuilder/NodeBuilder.cs b/KarambaConnect/RH7K2/Component/StbBuilder/NodeBuilder.cs similarity index 93% rename from KarambaConnect/Component/StbBuilder/NodeBuilder.cs rename to KarambaConnect/RH7K2/Component/StbBuilder/NodeBuilder.cs index 0de98099..4602d89b 100644 --- a/KarambaConnect/Component/StbBuilder/NodeBuilder.cs +++ b/KarambaConnect/RH7K2/Component/StbBuilder/NodeBuilder.cs @@ -2,6 +2,7 @@ using System.Drawing; using Grasshopper.Kernel; using Karamba.GHopper.Models; +using KarambaConnectCommon.Properties; using Model = Karamba.Models.Model; namespace KarambaConnect.Component.StbBuilder @@ -39,7 +40,7 @@ protected override void SolveInstance(IGH_DataAccess dataAccess) dataAccess.SetDataList(0, kModel.nodes.ToStb()); } - protected override Bitmap Icon => Properties.Resource.NodeBuilder; + protected override Bitmap Icon => Resource.NodeBuilder; public override Guid ComponentGuid => new Guid("D3FCFB17-E6C4-47D4-852A-24D92EC1EFEE"); } } diff --git a/KarambaConnect/Component/StbBuilder/StoryBuilder.cs b/KarambaConnect/RH7K2/Component/StbBuilder/StoryBuilder.cs similarity index 96% rename from KarambaConnect/Component/StbBuilder/StoryBuilder.cs rename to KarambaConnect/RH7K2/Component/StbBuilder/StoryBuilder.cs index f059d881..55ee6f7b 100644 --- a/KarambaConnect/Component/StbBuilder/StoryBuilder.cs +++ b/KarambaConnect/RH7K2/Component/StbBuilder/StoryBuilder.cs @@ -3,6 +3,7 @@ using System.Drawing; using System.Linq; using Grasshopper.Kernel; +using KarambaConnectCommon.Properties; using STBDotNet.v202; namespace KarambaConnect.Component.StbBuilder @@ -82,7 +83,7 @@ private static void CheckNodeIdsNull(StbNodeId[] nodeIds) } } - protected override Bitmap Icon => Properties.Resource.StoryBuilder; + protected override Bitmap Icon => Resource.StoryBuilder; public override Guid ComponentGuid => new Guid("438FB2A2-5EA8-474C-8897-5244AD00A188"); } } diff --git a/KarambaConnect/Convert.cs b/KarambaConnect/RH7K2/Convert.cs similarity index 100% rename from KarambaConnect/Convert.cs rename to KarambaConnect/RH7K2/Convert.cs diff --git a/KarambaConnect/K2S/K2SSecSteelItems.cs b/KarambaConnect/RH7K2/K2S/K2SSecSteelItems.cs similarity index 100% rename from KarambaConnect/K2S/K2SSecSteelItems.cs rename to KarambaConnect/RH7K2/K2S/K2SSecSteelItems.cs diff --git a/KarambaConnect/K2S/K2StbMemberItems.cs b/KarambaConnect/RH7K2/K2S/K2StbMemberItems.cs similarity index 100% rename from KarambaConnect/K2S/K2StbMemberItems.cs rename to KarambaConnect/RH7K2/K2S/K2StbMemberItems.cs diff --git a/KarambaConnect/K2S/K2StbModel.cs b/KarambaConnect/RH7K2/K2S/K2StbModel.cs similarity index 97% rename from KarambaConnect/K2S/K2StbModel.cs rename to KarambaConnect/RH7K2/K2S/K2StbModel.cs index 0cada688..3c6216d3 100644 --- a/KarambaConnect/K2S/K2StbModel.cs +++ b/KarambaConnect/RH7K2/K2S/K2StbModel.cs @@ -2,7 +2,6 @@ using System.Collections.Generic; using System.Linq; using Karamba.Elements; -using Karamba.GHopper.Geometry; using Rhino.Geometry; using STBDotNet.v202; @@ -48,7 +47,9 @@ public StbModel SetByAngle(double colMaxAngle) { continue; } - var elemLine = new Line(_kModel.nodes[elem.node_inds[0]].pos.Convert(), _kModel.nodes[elem.node_inds[1]].pos.Convert()); + Karamba.Geometry.Point3 to = _kModel.nodes[elem.node_inds[0]].pos; + Karamba.Geometry.Point3 from = _kModel.nodes[elem.node_inds[1]].pos; + var elemLine = new Line(new Point3d(to.X, to.Y, to.Z), new Point3d(from.X, from.Y, from.Z)); double pAngle = Vector3d.VectorAngle(elemLine.Direction, Vector3d.ZAxis); double nAngle = Vector3d.VectorAngle(elemLine.Direction, -Vector3d.ZAxis); diff --git a/KarambaConnect/K2S/K2StbSecSteel.cs b/KarambaConnect/RH7K2/K2S/K2StbSecSteel.cs similarity index 100% rename from KarambaConnect/K2S/K2StbSecSteel.cs rename to KarambaConnect/RH7K2/K2S/K2StbSecSteel.cs diff --git a/KarambaConnect/K2S/K2StbSections.cs b/KarambaConnect/RH7K2/K2S/K2StbSections.cs similarity index 100% rename from KarambaConnect/K2S/K2StbSections.cs rename to KarambaConnect/RH7K2/K2S/K2StbSections.cs diff --git a/KarambaConnect/S2K/CroSecFamilyName.cs b/KarambaConnect/RH7K2/S2K/CroSecFamilyName.cs similarity index 100% rename from KarambaConnect/S2K/CroSecFamilyName.cs rename to KarambaConnect/RH7K2/S2K/CroSecFamilyName.cs diff --git a/KarambaConnect/S2K/CrossSection.cs b/KarambaConnect/RH7K2/S2K/CrossSection.cs similarity index 99% rename from KarambaConnect/S2K/CrossSection.cs rename to KarambaConnect/RH7K2/S2K/CrossSection.cs index e65575dd..39a90e79 100644 --- a/KarambaConnect/S2K/CrossSection.cs +++ b/KarambaConnect/RH7K2/S2K/CrossSection.cs @@ -35,7 +35,11 @@ public static List GetCroSec(StbSections sections, CroSecFamilyName fami { // TODO: 材軸の回転は未設定 var k3dCroSec = new List(); +#if karamba1 var sn400 = new FemMaterial_Isotrop("Steel", "SN400", 20500_0000, 8076_0000, 8076_0000, 78.5, 23_5000, 1.20E-05, Color.Brown); +#elif karamba2 + var sn400 = new FemMaterial_Isotrop("Steel", "SN400", 20500_0000, 8076_0000, 8076_0000, 78.5, 23_5000, 23_5000, FemMaterial.FlowHypothesis.mises, 1.20E-05, Color.Brown); +#endif k3dCroSec.AddRange(StbSecColumnRcToK3dCroSec(sections.StbSecColumn_RC)); k3dCroSec.AddRange(StbSecBeamRcToK3dCroSec(sections.StbSecBeam_RC)); diff --git a/KarambaConnect/S2K/ElementBuilder.cs b/KarambaConnect/RH7K2/S2K/ElementBuilder.cs similarity index 100% rename from KarambaConnect/S2K/ElementBuilder.cs rename to KarambaConnect/RH7K2/S2K/ElementBuilder.cs diff --git a/KarambaConnect/S2K/Material.cs b/KarambaConnect/RH7K2/S2K/Material.cs similarity index 62% rename from KarambaConnect/S2K/Material.cs rename to KarambaConnect/RH7K2/S2K/Material.cs index bbf30582..b27f7802 100644 --- a/KarambaConnect/S2K/Material.cs +++ b/KarambaConnect/RH7K2/S2K/Material.cs @@ -11,6 +11,7 @@ public static FemMaterial_Isotrop[] DefaultRcMaterialArray() // TODO: せん断弾性係数あってる？ return new FemMaterial_Isotrop[] { +#if karamba1 new FemMaterial_Isotrop("Concrete", "Fc18", RcYoungsModulus(18, 23.0), RcShareModulus(18, 23.0, 0.2), RcShareModulus(18, 23.0, 0.2), 24.0, 18_0000, 1.00E-05, Color.Gray), new FemMaterial_Isotrop("Concrete", "Fc21", RcYoungsModulus(21, 23.0), RcShareModulus(21, 23.0, 0.2), RcShareModulus(21, 23.0, 0.2), 24.0, 21_0000, 1.00E-05, Color.Gray), new FemMaterial_Isotrop("Concrete", "Fc24", RcYoungsModulus(24, 23.0), RcShareModulus(24, 23.0, 0.2), RcShareModulus(24, 23.0, 0.2), 24.0, 24_0000, 1.00E-05, Color.Gray), @@ -24,6 +25,21 @@ public static FemMaterial_Isotrop[] DefaultRcMaterialArray() new FemMaterial_Isotrop("Concrete", "Fc50", RcYoungsModulus(50, 24.0), RcShareModulus(50, 24.0, 0.2), RcShareModulus(50, 24.0, 0.2), 25.0, 50_0000, 1.00E-05, Color.Gray), new FemMaterial_Isotrop("Concrete", "Fc55", RcYoungsModulus(55, 24.0), RcShareModulus(55, 24.0, 0.2), RcShareModulus(55, 24.0, 0.2), 25.0, 55_0000, 1.00E-05, Color.Gray), new FemMaterial_Isotrop("Concrete", "Fc60", RcYoungsModulus(60, 24.0), RcShareModulus(60, 24.0, 0.2), RcShareModulus(60, 24.0, 0.2), 25.0, 60_0000, 1.00E-05, Color.Gray), +#elif karamba2 + new FemMaterial_Isotrop("Concrete", "Fc18", RcYoungsModulus(18, 23.0), RcShareModulus(18, 23.0, 0.2), RcShareModulus(18, 23.0, 0.2), 24.0, 18_0000, 1_8000, FemMaterial.FlowHypothesis.mises, 1.00E-05, Color.Gray), + new FemMaterial_Isotrop("Concrete", "Fc21", RcYoungsModulus(21, 23.0), RcShareModulus(21, 23.0, 0.2), RcShareModulus(21, 23.0, 0.2), 24.0, 21_0000, 2_1000, FemMaterial.FlowHypothesis.mises, 1.00E-05, Color.Gray), + new FemMaterial_Isotrop("Concrete", "Fc24", RcYoungsModulus(24, 23.0), RcShareModulus(24, 23.0, 0.2), RcShareModulus(24, 23.0, 0.2), 24.0, 24_0000, 2_4000, FemMaterial.FlowHypothesis.mises, 1.00E-05, Color.Gray), + new FemMaterial_Isotrop("Concrete", "Fc27", RcYoungsModulus(27, 23.0), RcShareModulus(27, 23.0, 0.2), RcShareModulus(27, 23.0, 0.2), 24.0, 27_0000, 2_7000, FemMaterial.FlowHypothesis.mises, 1.00E-05, Color.Gray), + new FemMaterial_Isotrop("Concrete", "Fc30", RcYoungsModulus(30, 23.0), RcShareModulus(30, 23.0, 0.2), RcShareModulus(30, 23.0, 0.2), 24.0, 30_0000, 3_0000, FemMaterial.FlowHypothesis.mises, 1.00E-05, Color.Gray), + new FemMaterial_Isotrop("Concrete", "Fc33", RcYoungsModulus(33, 23.0), RcShareModulus(33, 23.0, 0.2), RcShareModulus(33, 23.0, 0.2), 24.0, 33_0000, 3_3000, FemMaterial.FlowHypothesis.mises, 1.00E-05, Color.Gray), + new FemMaterial_Isotrop("Concrete", "Fc36", RcYoungsModulus(36, 23.0), RcShareModulus(36, 23.0, 0.2), RcShareModulus(36, 23.0, 0.2), 24.0, 36_0000, 3_6000, FemMaterial.FlowHypothesis.mises, 1.00E-05, Color.Gray), + new FemMaterial_Isotrop("Concrete", "Fc40", RcYoungsModulus(40, 23.5), RcShareModulus(40, 23.5, 0.2), RcShareModulus(40, 23.5, 0.2), 24.5, 40_0000, 4_0000, FemMaterial.FlowHypothesis.mises, 1.00E-05, Color.Gray), + new FemMaterial_Isotrop("Concrete", "Fc42", RcYoungsModulus(42, 23.5), RcShareModulus(42, 23.5, 0.2), RcShareModulus(42, 23.5, 0.2), 24.5, 42_0000, 4_2000, FemMaterial.FlowHypothesis.mises, 1.00E-05, Color.Gray), + new FemMaterial_Isotrop("Concrete", "Fc45", RcYoungsModulus(45, 23.5), RcShareModulus(45, 23.5, 0.2), RcShareModulus(45, 23.5, 0.2), 24.5, 45_0000, 4_5000, FemMaterial.FlowHypothesis.mises, 1.00E-05, Color.Gray), + new FemMaterial_Isotrop("Concrete", "Fc50", RcYoungsModulus(50, 24.0), RcShareModulus(50, 24.0, 0.2), RcShareModulus(50, 24.0, 0.2), 25.0, 50_0000, 5_0000, FemMaterial.FlowHypothesis.mises, 1.00E-05, Color.Gray), + new FemMaterial_Isotrop("Concrete", "Fc55", RcYoungsModulus(55, 24.0), RcShareModulus(55, 24.0, 0.2), RcShareModulus(55, 24.0, 0.2), 25.0, 55_0000, 5_5000, FemMaterial.FlowHypothesis.mises, 1.00E-05, Color.Gray), + new FemMaterial_Isotrop("Concrete", "Fc60", RcYoungsModulus(60, 24.0), RcShareModulus(60, 24.0, 0.2), RcShareModulus(60, 24.0, 0.2), 25.0, 60_0000, 6_0000, FemMaterial.FlowHypothesis.mises, 1.00E-05, Color.Gray), +#endif }; } @@ -92,9 +108,15 @@ public static FemMaterial_Isotrop StbToRcFemMaterial(string stbStrengthFc) break; } +#if karamba1 return new FemMaterial_Isotrop("Concrete", stbStrengthFc, RcYoungsModulus(fc, gamma), RcShareModulus(fc, gamma, Nu), RcShareModulus(fc, gamma, Nu), gamma + 1, fc * 1000, 1.00E-05, Color.Gray); +#elif karamba2 + return new FemMaterial_Isotrop("Concrete", stbStrengthFc, + RcYoungsModulus(fc, gamma), RcShareModulus(fc, gamma, Nu), RcShareModulus(fc, gamma, Nu), + gamma + 1, fc * 1000, fc * 100, FemMaterial.FlowHypothesis.mises, 1.00E-05, Color.Gray); +#endif } private static double RcYoungsModulus(double fc, double gamma) diff --git a/KarambaConnect/RH7K2/karambaConnectRH7K2.csproj b/KarambaConnect/RH7K2/karambaConnectRH7K2.csproj new file mode 100644 index 00000000..88f55db1 --- /dev/null +++ b/KarambaConnect/RH7K2/karambaConnectRH7K2.csproj @@ -0,0 +1,60 @@ + + + + net48 + 2.0.2 + karambaConnect + HoaryFox karamba connect extension + .gha + hrntsm + false + false + true + false + karambaConnect + karambaConnect + karambaConnect + TRACE;karamba2 + + + + + + + + + + + + + + ..\Common\Library\RH7_Karamba2\karambaCommon.dll + false + + + ..\Common\Library\RH7_Karamba2\karamba.gha + false + + + + + C:\Program Files\Rhino 7\System\Rhino.exe + + Program + + + + x64 + + + + x64 + none + false + + + + + + + diff --git a/KarambaConnect/RH7K2/karambaConnectRH7K2Info.cs b/KarambaConnect/RH7K2/karambaConnectRH7K2Info.cs new file mode 100644 index 00000000..03ef28d9 --- /dev/null +++ b/KarambaConnect/RH7K2/karambaConnectRH7K2Info.cs @@ -0,0 +1,21 @@ +using System; +using System.Drawing; +using Grasshopper.Kernel; + +namespace KarambaConnect +{ + public class KarambaConnectRH7K2Info : GH_AssemblyInfo + { + public override string Name => "HoaryFox(karambaConnect)"; + + public override Bitmap Icon => null; + + public override string Description => "HoaryFox karamba connect extension"; + + public override Guid Id => new Guid("ffa60c17-4050-4232-96db-011eccbd402d"); + + public override string AuthorName => "hrntsm"; + + public override string AuthorContact => "contact@hrntsm.com"; + } +} diff --git a/KarambaConnect/karambaConnect.csproj b/KarambaConnect/karambaConnect.csproj deleted file mode 100644 index 9d4a19a4..00000000 --- a/KarambaConnect/karambaConnect.csproj +++ /dev/null @@ -1,38 +0,0 @@ - - - - net48 - 1.0 - karambaConnect - Description of karambaConnect - .gha - hrntsm - true - true - true - - - - - - - - - - - Library\karamba132\karambaCommon.dll - false - - - Library\karamba132\karamba.gha - false - - - - - C:\Program Files\Rhino 6\System\Rhino.exe - - Program - - -