From 9fd1fd8266a304a2e5c5adf522ae0320a6960c19 Mon Sep 17 00:00:00 2001 From: Serghei Cebotari Date: Thu, 9 Nov 2023 23:34:52 +0300 Subject: [PATCH] Implement Couplings Calculator --- RhSolutions.AddIn/AddIn/RhSolutionsAddIn.cs | 7 ++- .../Controllers/RibbonController.cs | 5 +- .../Services/CouplingsCalculator.cs | 62 ++++++++++++++++++- .../Services/FittingsCalculatorFactory.cs | 21 +++++++ RhSolutions.AddIn/Tools/EventsUtil.cs | 1 + RhSolutions.AddIn/Tools/FittingsTool.cs | 25 ++++++++ RhSolutions.AddIn/Tools/SleevesTool.cs | 22 ------- RhSolutions.AddIn/Tools/ToolFactory.cs | 5 +- 8 files changed, 119 insertions(+), 29 deletions(-) create mode 100644 RhSolutions.AddIn/Services/FittingsCalculatorFactory.cs create mode 100644 RhSolutions.AddIn/Tools/FittingsTool.cs delete mode 100644 RhSolutions.AddIn/Tools/SleevesTool.cs diff --git a/RhSolutions.AddIn/AddIn/RhSolutionsAddIn.cs b/RhSolutions.AddIn/AddIn/RhSolutionsAddIn.cs index a7f6796..38cea15 100644 --- a/RhSolutions.AddIn/AddIn/RhSolutionsAddIn.cs +++ b/RhSolutions.AddIn/AddIn/RhSolutionsAddIn.cs @@ -25,7 +25,6 @@ public sealed class RhSolutionsAddIn : IExcelAddIn .AddSingleton() .AddSingleton() .AddSingleton() - .AddSingleton() .AddTransient(); Services.AddSingleton(); @@ -42,6 +41,12 @@ public sealed class RhSolutionsAddIn : IExcelAddIn Services.AddTransient() .AddTransient(s => s.GetService()); + Services.AddSingleton(); + Services.AddTransient() + .AddTransient(s => s.GetService()); + Services.AddTransient() + .AddTransient(s => s.GetService()); + Services.AddSingleton(); ServiceProvider = Services.BuildServiceProvider(); diff --git a/RhSolutions.AddIn/Controllers/RibbonController.cs b/RhSolutions.AddIn/Controllers/RibbonController.cs index 6d234e8..deb56b0 100644 --- a/RhSolutions.AddIn/Controllers/RibbonController.cs +++ b/RhSolutions.AddIn/Controllers/RibbonController.cs @@ -29,7 +29,8 @@ public class RibbonController : ExcelRibbon