From 17d5848c5e4485674e7e28616e23d5fbfb6707ab Mon Sep 17 00:00:00 2001 From: BHoMBot Date: Fri, 22 Dec 2023 14:16:47 +0000 Subject: [PATCH 01/25] Upgrade AssemblyFileVersion to 7.1.0.0 --- .ci/code/UI_Test/Properties/AssemblyInfo.cs | 2 +- BHoM_UI/Properties/AssemblyInfo.cs | 2 +- UI_Engine/Properties/AssemblyInfo.cs | 2 +- UI_oM/Properties/AssemblyInfo.cs | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.ci/code/UI_Test/Properties/AssemblyInfo.cs b/.ci/code/UI_Test/Properties/AssemblyInfo.cs index 9350912..035f9a7 100644 --- a/.ci/code/UI_Test/Properties/AssemblyInfo.cs +++ b/.ci/code/UI_Test/Properties/AssemblyInfo.cs @@ -55,5 +55,5 @@ // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] [assembly: AssemblyVersion("7.0.0.0")] -[assembly: AssemblyFileVersion("7.0.0.0")] +[assembly: AssemblyFileVersion("7.1.0.0")] diff --git a/BHoM_UI/Properties/AssemblyInfo.cs b/BHoM_UI/Properties/AssemblyInfo.cs index 3af873c..9f5ef55 100644 --- a/BHoM_UI/Properties/AssemblyInfo.cs +++ b/BHoM_UI/Properties/AssemblyInfo.cs @@ -55,7 +55,7 @@ // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] [assembly: AssemblyVersion("7.0.0.0")] -[assembly: AssemblyFileVersion("7.0.0.0")] +[assembly: AssemblyFileVersion("7.1.0.0")] diff --git a/UI_Engine/Properties/AssemblyInfo.cs b/UI_Engine/Properties/AssemblyInfo.cs index 1d3a0a0..c2273e2 100644 --- a/UI_Engine/Properties/AssemblyInfo.cs +++ b/UI_Engine/Properties/AssemblyInfo.cs @@ -55,7 +55,7 @@ // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] [assembly: AssemblyVersion("7.0.0.0")] -[assembly: AssemblyFileVersion("7.0.0.0")] +[assembly: AssemblyFileVersion("7.1.0.0")] diff --git a/UI_oM/Properties/AssemblyInfo.cs b/UI_oM/Properties/AssemblyInfo.cs index b70bf91..91716af 100644 --- a/UI_oM/Properties/AssemblyInfo.cs +++ b/UI_oM/Properties/AssemblyInfo.cs @@ -55,7 +55,7 @@ // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] [assembly: AssemblyVersion("7.0.0.0")] -[assembly: AssemblyFileVersion("7.0.0.0")] +[assembly: AssemblyFileVersion("7.1.0.0")] From 022657df99a7f8655b2973be15d2270a53e7e0c7 Mon Sep 17 00:00:00 2001 From: BHoMBot Date: Tue, 2 Jan 2024 14:21:00 +0000 Subject: [PATCH 02/25] Uptick copyright headers to 2024 --- .ci/code/UI_Test/Helpers/InstantiateCaller.cs | 3 ++- .ci/code/UI_Test/Helpers/PossibleComponentItems.cs | 3 ++- .ci/code/UI_Test/Objects/DummyAccessor.cs | 3 ++- .ci/code/UI_Test/Objects/DummyCaller.cs | 3 ++- .ci/code/UI_Test/Properties/AssemblyInfo.cs | 3 ++- .ci/code/UI_Test/Verify/ComponentInstantiation.cs | 3 ++- .ci/code/UI_Test/Verify/ComponentReadWriteCycle.cs | 3 ++- .ci/code/UI_Test/Verify/ComponentRunCycle.cs | 3 ++- BHoM_UI/Caller/AddToMenu.cs | 3 ++- BHoM_UI/Caller/Compile.cs | 3 ++- BHoM_UI/Caller/Core.cs | 3 ++- BHoM_UI/Caller/IO_CRUD.cs | 3 ++- BHoM_UI/Caller/Read.cs | 3 ++- BHoM_UI/Caller/Run.cs | 3 ++- BHoM_UI/Caller/SetComponentDetails.cs | 3 ++- BHoM_UI/Caller/SetInputs.cs | 3 ++- BHoM_UI/Caller/SetItem.cs | 3 ++- BHoM_UI/Caller/SetOutputs.cs | 3 ++- BHoM_UI/Caller/SetParamSelectionMenu.cs | 3 ++- BHoM_UI/Caller/Write.cs | 3 ++- BHoM_UI/CallerTemplates/MultiChoiceCaller.cs | 3 ++- BHoM_UI/Components/Adapter/CreateAdapter.cs | 3 ++- BHoM_UI/Components/Adapter/CreateRequest.cs | 3 ++- BHoM_UI/Components/Adapter/Execute.cs | 3 ++- BHoM_UI/Components/Adapter/Move.cs | 3 ++- BHoM_UI/Components/Adapter/Pull.cs | 3 ++- BHoM_UI/Components/Adapter/Push.cs | 3 ++- BHoM_UI/Components/Adapter/Remove.cs | 3 ++- BHoM_UI/Components/Engine/Compute.cs | 3 ++- BHoM_UI/Components/Engine/Convert.cs | 3 ++- BHoM_UI/Components/Engine/Explode.cs | 3 ++- BHoM_UI/Components/Engine/External.cs | 3 ++- BHoM_UI/Components/Engine/FromJson.cs | 3 ++- BHoM_UI/Components/Engine/GetEvents.cs | 3 ++- BHoM_UI/Components/Engine/GetInfo.cs | 3 ++- BHoM_UI/Components/Engine/GetProperty.cs | 3 ++- BHoM_UI/Components/Engine/Modify.cs | 3 ++- BHoM_UI/Components/Engine/Query.cs | 3 ++- BHoM_UI/Components/Engine/SetProperty.cs | 3 ++- BHoM_UI/Components/Engine/ToJson.cs | 3 ++- BHoM_UI/Components/UI/FalseStartToggle.cs | 5 +++-- BHoM_UI/Components/UI/UnitTest.cs | 3 ++- BHoM_UI/Components/oM/CreateCustom.cs | 3 ++- BHoM_UI/Components/oM/CreateData.cs | 3 ++- BHoM_UI/Components/oM/CreateDictionary.cs | 3 ++- BHoM_UI/Components/oM/CreateEnum.cs | 3 ++- BHoM_UI/Components/oM/CreateObject.cs | 3 ++- BHoM_UI/Components/oM/CreateType.cs | 3 ++- BHoM_UI/Global/DocumentListener.cs | 3 ++- BHoM_UI/Global/GlobalSearch.cs | 3 ++- BHoM_UI/Global/Initialisation.cs | 3 ++- BHoM_UI/Global/SearchMenu.cs | 3 ++- BHoM_UI/Global/SearchMenu_WinForm.cs | 3 ++- BHoM_UI/Global/SearchMenu_Wpf.cs | 3 ++- BHoM_UI/Menus/IItemSelectorMenu.cs | 3 ++- BHoM_UI/Menus/ItemSelector.cs | 3 ++- BHoM_UI/Menus/ItemSelectorMenu.cs | 3 ++- BHoM_UI/Menus/ItemSelectorMenu_WinForm.cs | 3 ++- BHoM_UI/Menus/ItemSelectorMenu_Wpf.cs | 3 ++- BHoM_UI/Menus/ParamSelectorMenu.cs | 3 ++- BHoM_UI/Properties/AssemblyInfo.cs | 3 ++- BHoM_UI/Properties/Resources.Designer.cs | 3 ++- UI_Engine/Compute/Constructor.cs | 3 ++- UI_Engine/Compute/ConstructorText.cs | 3 ++- UI_Engine/Compute/LoadAssemblies.cs | 3 ++- UI_Engine/Compute/LogUsage.cs | 3 ++- UI_Engine/Compute/Organise.cs | 3 ++- UI_Engine/Compute/RecordError.cs | 3 ++- UI_Engine/Compute/SaveSettings.cs | 3 ++- UI_Engine/Compute/SetProjectID.cs | 3 ++- UI_Engine/Create/InputAccessor.cs | 3 ++- UI_Engine/Create/OutputAccessor.cs | 3 ++- UI_Engine/Create/ParamInfo.cs | 3 ++- UI_Engine/Objects/DocumentLoading.cs | 3 ++- UI_Engine/Properties/AssemblyInfo.cs | 3 ++- UI_Engine/Query/AreMatching.cs | 3 ++- UI_Engine/Query/Changes.cs | 3 ++- UI_Engine/Query/Depth.cs | 3 ++- UI_Engine/Query/Hits.cs | 3 ++- UI_Engine/Query/Information.cs | 5 +++-- UI_Engine/Query/Items.cs | 3 ++- UI_Engine/Query/MatchWith.cs | 3 ++- UI_Engine/Query/OutputParams.cs | 3 ++- UI_Engine/Query/SelectionIndex.cs | 3 ++- UI_Engine/Query/Settings.cs | 3 ++- UI_Engine/Query/SubType.cs | 3 ++- UI_Engine/Query/ToText.cs | 3 ++- UI_Engine/Query/UsageLogFileName.cs | 3 ++- UI_Engine/Query/UsageLogFolder.cs | 3 ++- UI_Engine/Query/Weight.cs | 3 ++- UI_oM/BHoMInformation.cs | 5 +++-- UI_oM/ComponentRequest.cs | 3 ++- UI_oM/CustomItem.cs | 3 ++- UI_oM/Interfaces/IDataAccessor.cs | 3 ++- UI_oM/Interfaces/IInitialisationSettings.cs | 3 ++- UI_oM/Interfaces/IParamUpdate.cs | 3 ++- UI_oM/Interfaces/IUpdate.cs | 3 ++- UI_oM/ParamInfo.cs | 3 ++- UI_oM/ParamKind.cs | 3 ++- UI_oM/ParamOldIndexFragment.cs | 3 ++- UI_oM/PreviousNamesFragment.cs | 3 ++- UI_oM/ProjectIDEvent.cs | 3 ++- UI_oM/Properties/AssemblyInfo.cs | 3 ++- UI_oM/SearchConfig.cs | 3 ++- UI_oM/SearchItem.cs | 3 ++- UI_oM/TriggerLogUsageArgs.cs | 3 ++- UI_oM/Updates/CallerUpdate.cs | 3 ++- UI_oM/Updates/CallerUpdateCause.cs | 3 ++- UI_oM/Updates/ComponentUpdate.cs | 3 ++- UI_oM/Updates/InputsUpdate.cs | 3 ++- UI_oM/Updates/OutputsUpdate.cs | 3 ++- UI_oM/Updates/ParamAdded.cs | 3 ++- UI_oM/Updates/ParamMoved.cs | 3 ++- UI_oM/Updates/ParamRemoved.cs | 3 ++- UI_oM/Updates/ParamReplaced.cs | 3 ++- UI_oM/UsageLogEntry.cs | 3 ++- 116 files changed, 235 insertions(+), 119 deletions(-) diff --git a/.ci/code/UI_Test/Helpers/InstantiateCaller.cs b/.ci/code/UI_Test/Helpers/InstantiateCaller.cs index a08507e..b316450 100644 --- a/.ci/code/UI_Test/Helpers/InstantiateCaller.cs +++ b/.ci/code/UI_Test/Helpers/InstantiateCaller.cs @@ -1,6 +1,6 @@ /* * This file is part of the Buildings and Habitats object Model (BHoM) - * Copyright (c) 2015 - 2023, the respective contributors. All rights reserved. + * Copyright (c) 2015 - 2024, the respective contributors. All rights reserved. * * Each contributor holds copyright over their respective contributions. * The project versioning (Git) records all such contribution source information. @@ -92,3 +92,4 @@ public static Caller InstantiateCaller(Type type) } + diff --git a/.ci/code/UI_Test/Helpers/PossibleComponentItems.cs b/.ci/code/UI_Test/Helpers/PossibleComponentItems.cs index a038920..73c7d4f 100644 --- a/.ci/code/UI_Test/Helpers/PossibleComponentItems.cs +++ b/.ci/code/UI_Test/Helpers/PossibleComponentItems.cs @@ -1,6 +1,6 @@ /* * This file is part of the Buildings and Habitats object Model (BHoM) - * Copyright (c) 2015 - 2023, the respective contributors. All rights reserved. + * Copyright (c) 2015 - 2024, the respective contributors. All rights reserved. * * Each contributor holds copyright over their respective contributions. * The project versioning (Git) records all such contribution source information. @@ -47,3 +47,4 @@ public static List PossibleComponentItems() } + diff --git a/.ci/code/UI_Test/Objects/DummyAccessor.cs b/.ci/code/UI_Test/Objects/DummyAccessor.cs index 52c5293..0d26041 100644 --- a/.ci/code/UI_Test/Objects/DummyAccessor.cs +++ b/.ci/code/UI_Test/Objects/DummyAccessor.cs @@ -1,6 +1,6 @@ /* * This file is part of the Buildings and Habitats object Model (BHoM) - * Copyright (c) 2015 - 2023, the respective contributors. All rights reserved. + * Copyright (c) 2015 - 2024, the respective contributors. All rights reserved. * * Each contributor holds copyright over their respective contributions. * The project versioning (Git) records all such contribution source information. @@ -130,3 +130,4 @@ private T GetDummyObject() + diff --git a/.ci/code/UI_Test/Objects/DummyCaller.cs b/.ci/code/UI_Test/Objects/DummyCaller.cs index ee757c7..4ff5a1a 100644 --- a/.ci/code/UI_Test/Objects/DummyCaller.cs +++ b/.ci/code/UI_Test/Objects/DummyCaller.cs @@ -1,6 +1,6 @@ /* * This file is part of the Buildings and Habitats object Model (BHoM) - * Copyright (c) 2015 - 2023, the respective contributors. All rights reserved. + * Copyright (c) 2015 - 2024, the respective contributors. All rights reserved. * * Each contributor holds copyright over their respective contributions. * The project versioning (Git) records all such contribution source information. @@ -76,3 +76,4 @@ public override object Run(List inputs) + diff --git a/.ci/code/UI_Test/Properties/AssemblyInfo.cs b/.ci/code/UI_Test/Properties/AssemblyInfo.cs index 035f9a7..d9d5e28 100644 --- a/.ci/code/UI_Test/Properties/AssemblyInfo.cs +++ b/.ci/code/UI_Test/Properties/AssemblyInfo.cs @@ -1,6 +1,6 @@ /* * This file is part of the Buildings and Habitats object Model (BHoM) - * Copyright (c) 2015 - 2023, the respective contributors. All rights reserved. + * Copyright (c) 2015 - 2024, the respective contributors. All rights reserved. * * Each contributor holds copyright over their respective contributions. * The project versioning (Git) records all such contribution source information. @@ -57,3 +57,4 @@ [assembly: AssemblyVersion("7.0.0.0")] [assembly: AssemblyFileVersion("7.1.0.0")] + diff --git a/.ci/code/UI_Test/Verify/ComponentInstantiation.cs b/.ci/code/UI_Test/Verify/ComponentInstantiation.cs index 3070f56..1375818 100644 --- a/.ci/code/UI_Test/Verify/ComponentInstantiation.cs +++ b/.ci/code/UI_Test/Verify/ComponentInstantiation.cs @@ -1,6 +1,6 @@ /* * This file is part of the Buildings and Habitats object Model (BHoM) - * Copyright (c) 2015 - 2023, the respective contributors. All rights reserved. + * Copyright (c) 2015 - 2024, the respective contributors. All rights reserved. * * Each contributor holds copyright over their respective contributions. * The project versioning (Git) records all such contribution source information. @@ -87,3 +87,4 @@ public static TestResult ComponentInstantiation(SearchItem item) } + diff --git a/.ci/code/UI_Test/Verify/ComponentReadWriteCycle.cs b/.ci/code/UI_Test/Verify/ComponentReadWriteCycle.cs index f281f26..8352960 100644 --- a/.ci/code/UI_Test/Verify/ComponentReadWriteCycle.cs +++ b/.ci/code/UI_Test/Verify/ComponentReadWriteCycle.cs @@ -1,6 +1,6 @@ /* * This file is part of the Buildings and Habitats object Model (BHoM) - * Copyright (c) 2015 - 2023, the respective contributors. All rights reserved. + * Copyright (c) 2015 - 2024, the respective contributors. All rights reserved. * * Each contributor holds copyright over their respective contributions. * The project versioning (Git) records all such contribution source information. @@ -133,3 +133,4 @@ public static TestResult ComponentReadWriteCycle(SearchItem item) } + diff --git a/.ci/code/UI_Test/Verify/ComponentRunCycle.cs b/.ci/code/UI_Test/Verify/ComponentRunCycle.cs index d6dd75f..e55c708 100644 --- a/.ci/code/UI_Test/Verify/ComponentRunCycle.cs +++ b/.ci/code/UI_Test/Verify/ComponentRunCycle.cs @@ -1,6 +1,6 @@ /* * This file is part of the Buildings and Habitats object Model (BHoM) - * Copyright (c) 2015 - 2023, the respective contributors. All rights reserved. + * Copyright (c) 2015 - 2024, the respective contributors. All rights reserved. * * Each contributor holds copyright over their respective contributions. * The project versioning (Git) records all such contribution source information. @@ -145,3 +145,4 @@ public static TestResult ComponentRunCycle(SearchItem item) } + diff --git a/BHoM_UI/Caller/AddToMenu.cs b/BHoM_UI/Caller/AddToMenu.cs index 6458edb..df71abb 100644 --- a/BHoM_UI/Caller/AddToMenu.cs +++ b/BHoM_UI/Caller/AddToMenu.cs @@ -1,6 +1,6 @@ /* * This file is part of the Buildings and Habitats object Model (BHoM) - * Copyright (c) 2015 - 2023, the respective contributors. All rights reserved. + * Copyright (c) 2015 - 2024, the respective contributors. All rights reserved. * * Each contributor holds copyright over their respective contributions. * The project versioning (Git) records all such contribution source information. @@ -82,3 +82,4 @@ public void SetSelectorMenu(ItemSelectorMenu selectorMenu) + diff --git a/BHoM_UI/Caller/Compile.cs b/BHoM_UI/Caller/Compile.cs index 54c3229..54fda34 100644 --- a/BHoM_UI/Caller/Compile.cs +++ b/BHoM_UI/Caller/Compile.cs @@ -1,6 +1,6 @@ /* * This file is part of the Buildings and Habitats object Model (BHoM) - * Copyright (c) 2015 - 2023, the respective contributors. All rights reserved. + * Copyright (c) 2015 - 2024, the respective contributors. All rights reserved. * * Each contributor holds copyright over their respective contributions. * The project versioning (Git) records all such contribution source information. @@ -93,3 +93,4 @@ protected virtual void CompileMethod() + diff --git a/BHoM_UI/Caller/Core.cs b/BHoM_UI/Caller/Core.cs index 0fd95ef..adaf128 100644 --- a/BHoM_UI/Caller/Core.cs +++ b/BHoM_UI/Caller/Core.cs @@ -1,6 +1,6 @@ /* * This file is part of the Buildings and Habitats object Model (BHoM) - * Copyright (c) 2015 - 2023, the respective contributors. All rights reserved. + * Copyright (c) 2015 - 2024, the respective contributors. All rights reserved. * * Each contributor holds copyright over their respective contributions. * The project versioning (Git) records all such contribution source information. @@ -189,3 +189,4 @@ protected void MarkAsModified(CallerUpdate update) + diff --git a/BHoM_UI/Caller/IO_CRUD.cs b/BHoM_UI/Caller/IO_CRUD.cs index 0c0b2d4..bf33a84 100644 --- a/BHoM_UI/Caller/IO_CRUD.cs +++ b/BHoM_UI/Caller/IO_CRUD.cs @@ -1,6 +1,6 @@ /* * This file is part of the Buildings and Habitats object Model (BHoM) - * Copyright (c) 2015 - 2023, the respective contributors. All rights reserved. + * Copyright (c) 2015 - 2024, the respective contributors. All rights reserved. * * Each contributor holds copyright over their respective contributions. * The project versioning (Git) records all such contribution source information. @@ -197,3 +197,4 @@ public virtual bool CanUpdateInput(int index, string name) + diff --git a/BHoM_UI/Caller/Read.cs b/BHoM_UI/Caller/Read.cs index 162820b..39916e8 100644 --- a/BHoM_UI/Caller/Read.cs +++ b/BHoM_UI/Caller/Read.cs @@ -1,6 +1,6 @@ /* * This file is part of the Buildings and Habitats object Model (BHoM) - * Copyright (c) 2015 - 2023, the respective contributors. All rights reserved. + * Copyright (c) 2015 - 2024, the respective contributors. All rights reserved. * * Each contributor holds copyright over their respective contributions. * The project versioning (Git) records all such contribution source information. @@ -222,3 +222,4 @@ protected object OldCreateMethodToType(string json, List inputParams, + diff --git a/BHoM_UI/Caller/Run.cs b/BHoM_UI/Caller/Run.cs index 384151e..55e3ec7 100644 --- a/BHoM_UI/Caller/Run.cs +++ b/BHoM_UI/Caller/Run.cs @@ -1,6 +1,6 @@ /* * This file is part of the Buildings and Habitats object Model (BHoM) - * Copyright (c) 2015 - 2023, the respective contributors. All rights reserved. + * Copyright (c) 2015 - 2024, the respective contributors. All rights reserved. * * Each contributor holds copyright over their respective contributions. * The project versioning (Git) records all such contribution source information. @@ -320,3 +320,4 @@ protected virtual bool ShouldCalculateNewResult(List inputs, ref object + diff --git a/BHoM_UI/Caller/SetComponentDetails.cs b/BHoM_UI/Caller/SetComponentDetails.cs index 6df059c..e9bdd45 100644 --- a/BHoM_UI/Caller/SetComponentDetails.cs +++ b/BHoM_UI/Caller/SetComponentDetails.cs @@ -1,6 +1,6 @@ /* * This file is part of the Buildings and Habitats object Model (BHoM) - * Copyright (c) 2015 - 2023, the respective contributors. All rights reserved. + * Copyright (c) 2015 - 2024, the respective contributors. All rights reserved. * * Each contributor holds copyright over their respective contributions. * The project versioning (Git) records all such contribution source information. @@ -88,3 +88,4 @@ protected virtual void SetComponentDetails(object item) + diff --git a/BHoM_UI/Caller/SetInputs.cs b/BHoM_UI/Caller/SetInputs.cs index c15d1ce..a67037f 100644 --- a/BHoM_UI/Caller/SetInputs.cs +++ b/BHoM_UI/Caller/SetInputs.cs @@ -1,6 +1,6 @@ /* * This file is part of the Buildings and Habitats object Model (BHoM) - * Copyright (c) 2015 - 2023, the respective contributors. All rights reserved. + * Copyright (c) 2015 - 2024, the respective contributors. All rights reserved. * * Each contributor holds copyright over their respective contributions. * The project versioning (Git) records all such contribution source information. @@ -116,3 +116,4 @@ protected virtual void SetInputs(object item) + diff --git a/BHoM_UI/Caller/SetItem.cs b/BHoM_UI/Caller/SetItem.cs index 52cf944..d5c7430 100644 --- a/BHoM_UI/Caller/SetItem.cs +++ b/BHoM_UI/Caller/SetItem.cs @@ -1,6 +1,6 @@ /* * This file is part of the Buildings and Habitats object Model (BHoM) - * Copyright (c) 2015 - 2023, the respective contributors. All rights reserved. + * Copyright (c) 2015 - 2024, the respective contributors. All rights reserved. * * Each contributor holds copyright over their respective contributions. * The project versioning (Git) records all such contribution source information. @@ -120,3 +120,4 @@ protected virtual object FromGeneric(object item) + diff --git a/BHoM_UI/Caller/SetOutputs.cs b/BHoM_UI/Caller/SetOutputs.cs index 3861363..d3c5fe7 100644 --- a/BHoM_UI/Caller/SetOutputs.cs +++ b/BHoM_UI/Caller/SetOutputs.cs @@ -1,6 +1,6 @@ /* * This file is part of the Buildings and Habitats object Model (BHoM) - * Copyright (c) 2015 - 2023, the respective contributors. All rights reserved. + * Copyright (c) 2015 - 2024, the respective contributors. All rights reserved. * * Each contributor holds copyright over their respective contributions. * The project versioning (Git) records all such contribution source information. @@ -124,3 +124,4 @@ protected virtual void SetOutputs(object item) + diff --git a/BHoM_UI/Caller/SetParamSelectionMenu.cs b/BHoM_UI/Caller/SetParamSelectionMenu.cs index d069bac..9f06a56 100644 --- a/BHoM_UI/Caller/SetParamSelectionMenu.cs +++ b/BHoM_UI/Caller/SetParamSelectionMenu.cs @@ -1,6 +1,6 @@ /* * This file is part of the Buildings and Habitats object Model (BHoM) - * Copyright (c) 2015 - 2023, the respective contributors. All rights reserved. + * Copyright (c) 2015 - 2024, the respective contributors. All rights reserved. * * Each contributor holds copyright over their respective contributions. * The project versioning (Git) records all such contribution source information. @@ -89,3 +89,4 @@ protected virtual void SetOutputSelectionMenu() + diff --git a/BHoM_UI/Caller/Write.cs b/BHoM_UI/Caller/Write.cs index 9aada9d..66a256f 100644 --- a/BHoM_UI/Caller/Write.cs +++ b/BHoM_UI/Caller/Write.cs @@ -1,6 +1,6 @@ /* * This file is part of the Buildings and Habitats object Model (BHoM) - * Copyright (c) 2015 - 2023, the respective contributors. All rights reserved. + * Copyright (c) 2015 - 2024, the respective contributors. All rights reserved. * * Each contributor holds copyright over their respective contributions. * The project versioning (Git) records all such contribution source information. @@ -64,3 +64,4 @@ public virtual string Write() + diff --git a/BHoM_UI/CallerTemplates/MultiChoiceCaller.cs b/BHoM_UI/CallerTemplates/MultiChoiceCaller.cs index afa8d7b..35f8417 100644 --- a/BHoM_UI/CallerTemplates/MultiChoiceCaller.cs +++ b/BHoM_UI/CallerTemplates/MultiChoiceCaller.cs @@ -1,6 +1,6 @@ /* * This file is part of the Buildings and Habitats object Model (BHoM) - * Copyright (c) 2015 - 2023, the respective contributors. All rights reserved. + * Copyright (c) 2015 - 2024, the respective contributors. All rights reserved. * * Each contributor holds copyright over their respective contributions. * The project versioning (Git) records all such contribution source information. @@ -141,3 +141,4 @@ private void EnumValueSelected(object sender, object e) + diff --git a/BHoM_UI/Components/Adapter/CreateAdapter.cs b/BHoM_UI/Components/Adapter/CreateAdapter.cs index 7619ea9..7a1d493 100644 --- a/BHoM_UI/Components/Adapter/CreateAdapter.cs +++ b/BHoM_UI/Components/Adapter/CreateAdapter.cs @@ -1,6 +1,6 @@ /* * This file is part of the Buildings and Habitats object Model (BHoM) - * Copyright (c) 2015 - 2023, the respective contributors. All rights reserved. + * Copyright (c) 2015 - 2024, the respective contributors. All rights reserved. * * Each contributor holds copyright over their respective contributions. * The project versioning (Git) records all such contribution source information. @@ -65,3 +65,4 @@ public CreateAdapterCaller() : base() + diff --git a/BHoM_UI/Components/Adapter/CreateRequest.cs b/BHoM_UI/Components/Adapter/CreateRequest.cs index fbce313..c9d09f3 100644 --- a/BHoM_UI/Components/Adapter/CreateRequest.cs +++ b/BHoM_UI/Components/Adapter/CreateRequest.cs @@ -1,6 +1,6 @@ /* * This file is part of the Buildings and Habitats object Model (BHoM) - * Copyright (c) 2015 - 2023, the respective contributors. All rights reserved. + * Copyright (c) 2015 - 2024, the respective contributors. All rights reserved. * * Each contributor holds copyright over their respective contributions. * The project versioning (Git) records all such contribution source information. @@ -69,3 +69,4 @@ public CreateRequestCaller() : base() + diff --git a/BHoM_UI/Components/Adapter/Execute.cs b/BHoM_UI/Components/Adapter/Execute.cs index 233cc9a..24b645e 100644 --- a/BHoM_UI/Components/Adapter/Execute.cs +++ b/BHoM_UI/Components/Adapter/Execute.cs @@ -1,6 +1,6 @@ /* * This file is part of the Buildings and Habitats object Model (BHoM) - * Copyright (c) 2015 - 2023, the respective contributors. All rights reserved. + * Copyright (c) 2015 - 2024, the respective contributors. All rights reserved. * * Each contributor holds copyright over their respective contributions. * The project versioning (Git) records all such contribution source information. @@ -112,3 +112,4 @@ public static Output, bool> Execute(BHoMAdapter adapter, IExecuteCo + diff --git a/BHoM_UI/Components/Adapter/Move.cs b/BHoM_UI/Components/Adapter/Move.cs index 724c844..ff5cf46 100644 --- a/BHoM_UI/Components/Adapter/Move.cs +++ b/BHoM_UI/Components/Adapter/Move.cs @@ -1,6 +1,6 @@ /* * This file is part of the Buildings and Habitats object Model (BHoM) - * Copyright (c) 2015 - 2023, the respective contributors. All rights reserved. + * Copyright (c) 2015 - 2024, the respective contributors. All rights reserved. * * Each contributor holds copyright over their respective contributions. * The project versioning (Git) records all such contribution source information. @@ -122,3 +122,4 @@ public static bool Move(BHoMAdapter source, BHoMAdapter target, object request = + diff --git a/BHoM_UI/Components/Adapter/Pull.cs b/BHoM_UI/Components/Adapter/Pull.cs index ea49f56..f59967b 100644 --- a/BHoM_UI/Components/Adapter/Pull.cs +++ b/BHoM_UI/Components/Adapter/Pull.cs @@ -1,6 +1,6 @@ /* * This file is part of the Buildings and Habitats object Model (BHoM) - * Copyright (c) 2015 - 2023, the respective contributors. All rights reserved. + * Copyright (c) 2015 - 2024, the respective contributors. All rights reserved. * * Each contributor holds copyright over their respective contributions. * The project versioning (Git) records all such contribution source information. @@ -133,3 +133,4 @@ public static IEnumerable Pull(BHoMAdapter adapter, object request = nul + diff --git a/BHoM_UI/Components/Adapter/Push.cs b/BHoM_UI/Components/Adapter/Push.cs index ee4e6b7..68cf45f 100644 --- a/BHoM_UI/Components/Adapter/Push.cs +++ b/BHoM_UI/Components/Adapter/Push.cs @@ -1,6 +1,6 @@ /* * This file is part of the Buildings and Habitats object Model (BHoM) - * Copyright (c) 2015 - 2023, the respective contributors. All rights reserved. + * Copyright (c) 2015 - 2024, the respective contributors. All rights reserved. * * Each contributor holds copyright over their respective contributions. * The project versioning (Git) records all such contribution source information. @@ -121,3 +121,4 @@ public static Output, bool> Push(BHoMAdapter adapter, IEnumerable objects = null) + diff --git a/BHoM_UI/Components/Engine/External.cs b/BHoM_UI/Components/Engine/External.cs index cd04729..d799d5e 100644 --- a/BHoM_UI/Components/Engine/External.cs +++ b/BHoM_UI/Components/Engine/External.cs @@ -1,6 +1,6 @@ /* * This file is part of the Buildings and Habitats object Model (BHoM) - * Copyright (c) 2015 - 2023, the respective contributors. All rights reserved. + * Copyright (c) 2015 - 2024, the respective contributors. All rights reserved. * * Each contributor holds copyright over their respective contributions. * The project versioning (Git) records all such contribution source information. @@ -63,3 +63,4 @@ public ExternalCaller() : base() + diff --git a/BHoM_UI/Components/Engine/FromJson.cs b/BHoM_UI/Components/Engine/FromJson.cs index 444e475..445ac9b 100644 --- a/BHoM_UI/Components/Engine/FromJson.cs +++ b/BHoM_UI/Components/Engine/FromJson.cs @@ -1,6 +1,6 @@ /* * This file is part of the Buildings and Habitats object Model (BHoM) - * Copyright (c) 2015 - 2023, the respective contributors. All rights reserved. + * Copyright (c) 2015 - 2024, the respective contributors. All rights reserved. * * Each contributor holds copyright over their respective contributions. * The project versioning (Git) records all such contribution source information. @@ -57,3 +57,4 @@ public FromJsonCaller() : base(typeof(BH.Engine.Serialiser.Convert).GetMethod("F + diff --git a/BHoM_UI/Components/Engine/GetEvents.cs b/BHoM_UI/Components/Engine/GetEvents.cs index 5008d5b..6d99687 100644 --- a/BHoM_UI/Components/Engine/GetEvents.cs +++ b/BHoM_UI/Components/Engine/GetEvents.cs @@ -1,6 +1,6 @@ /* * This file is part of the Buildings and Habitats object Model (BHoM) - * Copyright (c) 2015 - 2023, the respective contributors. All rights reserved. + * Copyright (c) 2015 - 2024, the respective contributors. All rights reserved. * * Each contributor holds copyright over their respective contributions. * The project versioning (Git) records all such contribution source information. @@ -99,3 +99,4 @@ public static Output, List, List, List> GetEven + diff --git a/BHoM_UI/Components/Engine/GetInfo.cs b/BHoM_UI/Components/Engine/GetInfo.cs index 3d8f756..62434ff 100644 --- a/BHoM_UI/Components/Engine/GetInfo.cs +++ b/BHoM_UI/Components/Engine/GetInfo.cs @@ -1,6 +1,6 @@ /* * This file is part of the Buildings and Habitats object Model (BHoM) - * Copyright (c) 2015 - 2023, the respective contributors. All rights reserved. + * Copyright (c) 2015 - 2024, the respective contributors. All rights reserved. * * Each contributor holds copyright over their respective contributions. * The project versioning (Git) records all such contribution source information. @@ -104,3 +104,4 @@ public static Output, List, List(IEnumerable list) + diff --git a/BHoM_UI/Components/Engine/ToJson.cs b/BHoM_UI/Components/Engine/ToJson.cs index e14a1cc..0d656c7 100644 --- a/BHoM_UI/Components/Engine/ToJson.cs +++ b/BHoM_UI/Components/Engine/ToJson.cs @@ -1,6 +1,6 @@ /* * This file is part of the Buildings and Habitats object Model (BHoM) - * Copyright (c) 2015 - 2023, the respective contributors. All rights reserved. + * Copyright (c) 2015 - 2024, the respective contributors. All rights reserved. * * Each contributor holds copyright over their respective contributions. * The project versioning (Git) records all such contribution source information. @@ -58,3 +58,4 @@ public ToJsonCaller() : base(typeof(BH.Engine.Serialiser.Convert).GetMethod("ToJ + diff --git a/BHoM_UI/Components/UI/FalseStartToggle.cs b/BHoM_UI/Components/UI/FalseStartToggle.cs index 27de83c..8cd3f38 100644 --- a/BHoM_UI/Components/UI/FalseStartToggle.cs +++ b/BHoM_UI/Components/UI/FalseStartToggle.cs @@ -1,6 +1,6 @@ -/* +/* * This file is part of the Buildings and Habitats object Model (BHoM) - * Copyright (c) 2015 - 2023, the respective contributors. All rights reserved. + * Copyright (c) 2015 - 2024, the respective contributors. All rights reserved. * * Each contributor holds copyright over their respective contributions. * The project versioning (Git) records all such contribution source information. @@ -111,3 +111,4 @@ public override object Run(List inputs) } } + diff --git a/BHoM_UI/Components/UI/UnitTest.cs b/BHoM_UI/Components/UI/UnitTest.cs index 1719d8a..8bf54ca 100644 --- a/BHoM_UI/Components/UI/UnitTest.cs +++ b/BHoM_UI/Components/UI/UnitTest.cs @@ -1,6 +1,6 @@ /* * This file is part of the Buildings and Habitats object Model (BHoM) - * Copyright (c) 2015 - 2023, the respective contributors. All rights reserved. + * Copyright (c) 2015 - 2024, the respective contributors. All rights reserved. * * Each contributor holds copyright over their respective contributions. * The project versioning (Git) records all such contribution source information. @@ -146,3 +146,4 @@ private List SeparateOutputs(object returnObject) + diff --git a/BHoM_UI/Components/oM/CreateCustom.cs b/BHoM_UI/Components/oM/CreateCustom.cs index 0981506..2dd7142 100644 --- a/BHoM_UI/Components/oM/CreateCustom.cs +++ b/BHoM_UI/Components/oM/CreateCustom.cs @@ -1,6 +1,6 @@ /* * This file is part of the Buildings and Habitats object Model (BHoM) - * Copyright (c) 2015 - 2023, the respective contributors. All rights reserved. + * Copyright (c) 2015 - 2024, the respective contributors. All rights reserved. * * Each contributor holds copyright over their respective contributions. * The project versioning (Git) records all such contribution source information. @@ -142,3 +142,4 @@ public override bool RemoveInput(string name) + diff --git a/BHoM_UI/Components/oM/CreateData.cs b/BHoM_UI/Components/oM/CreateData.cs index feb4ad7..bf60a31 100644 --- a/BHoM_UI/Components/oM/CreateData.cs +++ b/BHoM_UI/Components/oM/CreateData.cs @@ -1,6 +1,6 @@ /* * This file is part of the Buildings and Habitats object Model (BHoM) - * Copyright (c) 2015 - 2023, the respective contributors. All rights reserved. + * Copyright (c) 2015 - 2024, the respective contributors. All rights reserved. * * Each contributor holds copyright over their respective contributions. * The project versioning (Git) records all such contribution source information. @@ -181,3 +181,4 @@ private void AddSourceLinkToMenu(object menu) + diff --git a/BHoM_UI/Components/oM/CreateDictionary.cs b/BHoM_UI/Components/oM/CreateDictionary.cs index 68acdae..4fb167c 100644 --- a/BHoM_UI/Components/oM/CreateDictionary.cs +++ b/BHoM_UI/Components/oM/CreateDictionary.cs @@ -1,6 +1,6 @@ /* * This file is part of the Buildings and Habitats object Model (BHoM) - * Copyright (c) 2015 - 2023, the respective contributors. All rights reserved. + * Copyright (c) 2015 - 2024, the respective contributors. All rights reserved. * * Each contributor holds copyright over their respective contributions. * The project versioning (Git) records all such contribution source information. @@ -91,3 +91,4 @@ public static IDictionary CreateDictionary(List keys, List value + diff --git a/BHoM_UI/Components/oM/CreateEnum.cs b/BHoM_UI/Components/oM/CreateEnum.cs index 79a03f4..0e68726 100644 --- a/BHoM_UI/Components/oM/CreateEnum.cs +++ b/BHoM_UI/Components/oM/CreateEnum.cs @@ -1,6 +1,6 @@ /* * This file is part of the Buildings and Habitats object Model (BHoM) - * Copyright (c) 2015 - 2023, the respective contributors. All rights reserved. + * Copyright (c) 2015 - 2024, the respective contributors. All rights reserved. * * Each contributor holds copyright over their respective contributions. * The project versioning (Git) records all such contribution source information. @@ -110,3 +110,4 @@ public override List GetChoiceNames() + diff --git a/BHoM_UI/Components/oM/CreateObject.cs b/BHoM_UI/Components/oM/CreateObject.cs index 07c903c..1d0a592 100644 --- a/BHoM_UI/Components/oM/CreateObject.cs +++ b/BHoM_UI/Components/oM/CreateObject.cs @@ -1,6 +1,6 @@ /* * This file is part of the Buildings and Habitats object Model (BHoM) - * Copyright (c) 2015 - 2023, the respective contributors. All rights reserved. + * Copyright (c) 2015 - 2024, the respective contributors. All rights reserved. * * Each contributor holds copyright over their respective contributions. * The project versioning (Git) records all such contribution source information. @@ -74,3 +74,4 @@ public CreateObjectCaller() : base() + diff --git a/BHoM_UI/Components/oM/CreateType.cs b/BHoM_UI/Components/oM/CreateType.cs index cc7605d..453afe6 100644 --- a/BHoM_UI/Components/oM/CreateType.cs +++ b/BHoM_UI/Components/oM/CreateType.cs @@ -1,6 +1,6 @@ /* * This file is part of the Buildings and Habitats object Model (BHoM) - * Copyright (c) 2015 - 2023, the respective contributors. All rights reserved. + * Copyright (c) 2015 - 2024, the respective contributors. All rights reserved. * * Each contributor holds copyright over their respective contributions. * The project versioning (Git) records all such contribution source information. @@ -121,3 +121,4 @@ public override void AddToMenu(object menu) + diff --git a/BHoM_UI/Global/DocumentListener.cs b/BHoM_UI/Global/DocumentListener.cs index 4224b6a..153b269 100644 --- a/BHoM_UI/Global/DocumentListener.cs +++ b/BHoM_UI/Global/DocumentListener.cs @@ -1,6 +1,6 @@ /* * This file is part of the Buildings and Habitats object Model (BHoM) - * Copyright (c) 2015 - 2023, the respective contributors. All rights reserved. + * Copyright (c) 2015 - 2024, the respective contributors. All rights reserved. * * Each contributor holds copyright over their respective contributions. * The project versioning (Git) records all such contribution source information. @@ -226,3 +226,4 @@ private static Label GetCell(string text) + diff --git a/BHoM_UI/Global/GlobalSearch.cs b/BHoM_UI/Global/GlobalSearch.cs index 6401b6c..df522d8 100644 --- a/BHoM_UI/Global/GlobalSearch.cs +++ b/BHoM_UI/Global/GlobalSearch.cs @@ -1,6 +1,6 @@ /* * This file is part of the Buildings and Habitats object Model (BHoM) - * Copyright (c) 2015 - 2023, the respective contributors. All rights reserved. + * Copyright (c) 2015 - 2024, the respective contributors. All rights reserved. * * Each contributor holds copyright over their respective contributions. * The project versioning (Git) records all such contribution source information. @@ -189,3 +189,4 @@ private static void ShowWithConstraint(SearchConfig config) + diff --git a/BHoM_UI/Global/Initialisation.cs b/BHoM_UI/Global/Initialisation.cs index 0d8b5c7..bbc4034 100644 --- a/BHoM_UI/Global/Initialisation.cs +++ b/BHoM_UI/Global/Initialisation.cs @@ -1,6 +1,6 @@ /* * This file is part of the Buildings and Habitats object Model (BHoM) - * Copyright (c) 2015 - 2023, the respective contributors. All rights reserved. + * Copyright (c) 2015 - 2024, the respective contributors. All rights reserved. * * Each contributor holds copyright over their respective contributions. * The project versioning (Git) records all such contribution source information. @@ -145,3 +145,4 @@ private static bool InitialiseToolkit(IInitialisationSettings settings) + diff --git a/BHoM_UI/Global/SearchMenu.cs b/BHoM_UI/Global/SearchMenu.cs index 59399f7..5fe12b8 100644 --- a/BHoM_UI/Global/SearchMenu.cs +++ b/BHoM_UI/Global/SearchMenu.cs @@ -1,6 +1,6 @@ /* * This file is part of the Buildings and Habitats object Model (BHoM) - * Copyright (c) 2015 - 2023, the respective contributors. All rights reserved. + * Copyright (c) 2015 - 2024, the respective contributors. All rights reserved. * * Each contributor holds copyright over their respective contributions. * The project versioning (Git) records all such contribution source information. @@ -333,3 +333,4 @@ protected List GetComponentItems() + diff --git a/BHoM_UI/Global/SearchMenu_WinForm.cs b/BHoM_UI/Global/SearchMenu_WinForm.cs index 1c163a2..543437a 100644 --- a/BHoM_UI/Global/SearchMenu_WinForm.cs +++ b/BHoM_UI/Global/SearchMenu_WinForm.cs @@ -1,6 +1,6 @@ /* * This file is part of the Buildings and Habitats object Model (BHoM) - * Copyright (c) 2015 - 2023, the respective contributors. All rights reserved. + * Copyright (c) 2015 - 2024, the respective contributors. All rights reserved. * * Each contributor holds copyright over their respective contributions. * The project versioning (Git) records all such contribution source information. @@ -254,3 +254,4 @@ protected override void RefreshSearchResults(List hits) + diff --git a/BHoM_UI/Global/SearchMenu_Wpf.cs b/BHoM_UI/Global/SearchMenu_Wpf.cs index bed9bd0..dcf88bf 100644 --- a/BHoM_UI/Global/SearchMenu_Wpf.cs +++ b/BHoM_UI/Global/SearchMenu_Wpf.cs @@ -1,6 +1,6 @@ /* * This file is part of the Buildings and Habitats object Model (BHoM) - * Copyright (c) 2015 - 2023, the respective contributors. All rights reserved. + * Copyright (c) 2015 - 2024, the respective contributors. All rights reserved. * * Each contributor holds copyright over their respective contributions. * The project versioning (Git) records all such contribution source information. @@ -260,3 +260,4 @@ public static ImageSource GetImage(Bitmap bmp) + diff --git a/BHoM_UI/Menus/IItemSelectorMenu.cs b/BHoM_UI/Menus/IItemSelectorMenu.cs index 89493ca..167ac71 100644 --- a/BHoM_UI/Menus/IItemSelectorMenu.cs +++ b/BHoM_UI/Menus/IItemSelectorMenu.cs @@ -1,6 +1,6 @@ /* * This file is part of the Buildings and Habitats object Model (BHoM) - * Copyright (c) 2015 - 2023, the respective contributors. All rights reserved. + * Copyright (c) 2015 - 2024, the respective contributors. All rights reserved. * * Each contributor holds copyright over their respective contributions. * The project versioning (Git) records all such contribution source information. @@ -40,3 +40,4 @@ public interface IItemSelectorMenu + diff --git a/BHoM_UI/Menus/ItemSelector.cs b/BHoM_UI/Menus/ItemSelector.cs index 8eea69e..742ecdd 100644 --- a/BHoM_UI/Menus/ItemSelector.cs +++ b/BHoM_UI/Menus/ItemSelector.cs @@ -1,6 +1,6 @@ /* * This file is part of the Buildings and Habitats object Model (BHoM) - * Copyright (c) 2015 - 2023, the respective contributors. All rights reserved. + * Copyright (c) 2015 - 2024, the respective contributors. All rights reserved. * * Each contributor holds copyright over their respective contributions. * The project versioning (Git) records all such contribution source information. @@ -127,3 +127,4 @@ private void M_Menu_ItemSelected(object sender, object e) + diff --git a/BHoM_UI/Menus/ItemSelectorMenu.cs b/BHoM_UI/Menus/ItemSelectorMenu.cs index 2176610..0153945 100644 --- a/BHoM_UI/Menus/ItemSelectorMenu.cs +++ b/BHoM_UI/Menus/ItemSelectorMenu.cs @@ -1,6 +1,6 @@ /* * This file is part of the Buildings and Habitats object Model (BHoM) - * Copyright (c) 2015 - 2023, the respective contributors. All rights reserved. + * Copyright (c) 2015 - 2024, the respective contributors. All rights reserved. * * Each contributor holds copyright over their respective contributions. * The project versioning (Git) records all such contribution source information. @@ -112,3 +112,4 @@ protected void ReturnSelectedItem(object item) + diff --git a/BHoM_UI/Menus/ItemSelectorMenu_WinForm.cs b/BHoM_UI/Menus/ItemSelectorMenu_WinForm.cs index 0b4bad2..f4ed17b 100644 --- a/BHoM_UI/Menus/ItemSelectorMenu_WinForm.cs +++ b/BHoM_UI/Menus/ItemSelectorMenu_WinForm.cs @@ -1,6 +1,6 @@ /* * This file is part of the Buildings and Habitats object Model (BHoM) - * Copyright (c) 2015 - 2023, the respective contributors. All rights reserved. + * Copyright (c) 2015 - 2024, the respective contributors. All rights reserved. * * Each contributor holds copyright over their respective contributions. * The project versioning (Git) records all such contribution source information. @@ -176,3 +176,4 @@ protected void Search_TextChanged(object sender, EventArgs e) + diff --git a/BHoM_UI/Menus/ItemSelectorMenu_Wpf.cs b/BHoM_UI/Menus/ItemSelectorMenu_Wpf.cs index 9e25cc5..e5cb618 100644 --- a/BHoM_UI/Menus/ItemSelectorMenu_Wpf.cs +++ b/BHoM_UI/Menus/ItemSelectorMenu_Wpf.cs @@ -1,6 +1,6 @@ /* * This file is part of the Buildings and Habitats object Model (BHoM) - * Copyright (c) 2015 - 2023, the respective contributors. All rights reserved. + * Copyright (c) 2015 - 2024, the respective contributors. All rights reserved. * * Each contributor holds copyright over their respective contributions. * The project versioning (Git) records all such contribution source information. @@ -186,3 +186,4 @@ private void Menu_SizeChanged(object sender, SizeChangedEventArgs e) + diff --git a/BHoM_UI/Menus/ParamSelectorMenu.cs b/BHoM_UI/Menus/ParamSelectorMenu.cs index 758b654..4444a25 100644 --- a/BHoM_UI/Menus/ParamSelectorMenu.cs +++ b/BHoM_UI/Menus/ParamSelectorMenu.cs @@ -1,6 +1,6 @@ /* * This file is part of the Buildings and Habitats object Model (BHoM) - * Copyright (c) 2015 - 2023, the respective contributors. All rights reserved. + * Copyright (c) 2015 - 2024, the respective contributors. All rights reserved. * * Each contributor holds copyright over their respective contributions. * The project versioning (Git) records all such contribution source information. @@ -232,3 +232,4 @@ protected string ParamLabel() + diff --git a/BHoM_UI/Properties/AssemblyInfo.cs b/BHoM_UI/Properties/AssemblyInfo.cs index 9f5ef55..0a2d1d6 100644 --- a/BHoM_UI/Properties/AssemblyInfo.cs +++ b/BHoM_UI/Properties/AssemblyInfo.cs @@ -1,6 +1,6 @@ /* * This file is part of the Buildings and Habitats object Model (BHoM) - * Copyright (c) 2015 - 2023, the respective contributors. All rights reserved. + * Copyright (c) 2015 - 2024, the respective contributors. All rights reserved. * * Each contributor holds copyright over their respective contributions. * The project versioning (Git) records all such contribution source information. @@ -60,3 +60,4 @@ + diff --git a/BHoM_UI/Properties/Resources.Designer.cs b/BHoM_UI/Properties/Resources.Designer.cs index 6b688f1..b5f6719 100644 --- a/BHoM_UI/Properties/Resources.Designer.cs +++ b/BHoM_UI/Properties/Resources.Designer.cs @@ -1,6 +1,6 @@ /* * This file is part of the Buildings and Habitats object Model (BHoM) - * Copyright (c) 2015 - 2023, the respective contributors. All rights reserved. + * Copyright (c) 2015 - 2024, the respective contributors. All rights reserved. * * Each contributor holds copyright over their respective contributions. * The project versioning (Git) records all such contribution source information. @@ -657,3 +657,4 @@ internal static System.Drawing.Icon BHoM_Icon + diff --git a/UI_Engine/Compute/Constructor.cs b/UI_Engine/Compute/Constructor.cs index 670ae5a..c175bdc 100644 --- a/UI_Engine/Compute/Constructor.cs +++ b/UI_Engine/Compute/Constructor.cs @@ -1,6 +1,6 @@ /* * This file is part of the Buildings and Habitats object Model (BHoM) - * Copyright (c) 2015 - 2023, the respective contributors. All rights reserved. + * Copyright (c) 2015 - 2024, the respective contributors. All rights reserved. * * Each contributor holds copyright over their respective contributions. * The project versioning (Git) records all such contribution source information. @@ -70,3 +70,4 @@ public static Func Constructor(Type type, List para + diff --git a/UI_Engine/Compute/ConstructorText.cs b/UI_Engine/Compute/ConstructorText.cs index 8bf2880..58e9042 100644 --- a/UI_Engine/Compute/ConstructorText.cs +++ b/UI_Engine/Compute/ConstructorText.cs @@ -1,6 +1,6 @@ /* * This file is part of the Buildings and Habitats object Model (BHoM) - * Copyright (c) 2015 - 2023, the respective contributors. All rights reserved. + * Copyright (c) 2015 - 2024, the respective contributors. All rights reserved. * * Each contributor holds copyright over their respective contributions. * The project versioning (Git) records all such contribution source information. @@ -90,3 +90,4 @@ public static string ConstructorText(this Type type, int maxParams = 5, int maxC + diff --git a/UI_Engine/Compute/LoadAssemblies.cs b/UI_Engine/Compute/LoadAssemblies.cs index a6449b8..b1d888e 100644 --- a/UI_Engine/Compute/LoadAssemblies.cs +++ b/UI_Engine/Compute/LoadAssemblies.cs @@ -1,6 +1,6 @@ /* * This file is part of the Buildings and Habitats object Model (BHoM) - * Copyright (c) 2015 - 2023, the respective contributors. All rights reserved. + * Copyright (c) 2015 - 2024, the respective contributors. All rights reserved. * * Each contributor holds copyright over their respective contributions. * The project versioning (Git) records all such contribution source information. @@ -62,3 +62,4 @@ public static void LoadAssemblies() + diff --git a/UI_Engine/Compute/LogUsage.cs b/UI_Engine/Compute/LogUsage.cs index 2567ca0..030771a 100644 --- a/UI_Engine/Compute/LogUsage.cs +++ b/UI_Engine/Compute/LogUsage.cs @@ -1,6 +1,6 @@ /* * This file is part of the Buildings and Habitats object Model (BHoM) - * Copyright (c) 2015 - 2023, the respective contributors. All rights reserved. + * Copyright (c) 2015 - 2024, the respective contributors. All rights reserved. * * Each contributor holds copyright over their respective contributions. * The project versioning (Git) records all such contribution source information. @@ -224,3 +224,4 @@ private static void TriggerUIEndOpening() + diff --git a/UI_Engine/Compute/Organise.cs b/UI_Engine/Compute/Organise.cs index 3bde5bd..4a4bb39 100644 --- a/UI_Engine/Compute/Organise.cs +++ b/UI_Engine/Compute/Organise.cs @@ -1,6 +1,6 @@ /* * This file is part of the Buildings and Habitats object Model (BHoM) - * Copyright (c) 2015 - 2023, the respective contributors. All rights reserved. + * Copyright (c) 2015 - 2024, the respective contributors. All rights reserved. * * Each contributor holds copyright over their respective contributions. * The project versioning (Git) records all such contribution source information. @@ -133,3 +133,4 @@ private static Output, Tree> OrganiseObjects(this List< + diff --git a/UI_Engine/Compute/RecordError.cs b/UI_Engine/Compute/RecordError.cs index 85f520b..b5db393 100644 --- a/UI_Engine/Compute/RecordError.cs +++ b/UI_Engine/Compute/RecordError.cs @@ -1,6 +1,6 @@ /* * This file is part of the Buildings and Habitats object Model (BHoM) - * Copyright (c) 2015 - 2023, the respective contributors. All rights reserved. + * Copyright (c) 2015 - 2024, the respective contributors. All rights reserved. * * Each contributor holds copyright over their respective contributions. * The project versioning (Git) records all such contribution source information. @@ -81,3 +81,4 @@ public static void RecordExecutionError(Exception e) + diff --git a/UI_Engine/Compute/SaveSettings.cs b/UI_Engine/Compute/SaveSettings.cs index 8cf9254..7af8cd1 100644 --- a/UI_Engine/Compute/SaveSettings.cs +++ b/UI_Engine/Compute/SaveSettings.cs @@ -1,6 +1,6 @@ /* * This file is part of the Buildings and Habitats object Model (BHoM) - * Copyright (c) 2015 - 2023, the respective contributors. All rights reserved. + * Copyright (c) 2015 - 2024, the respective contributors. All rights reserved. * * Each contributor holds copyright over their respective contributions. * The project versioning (Git) records all such contribution source information. @@ -75,3 +75,4 @@ public static bool SaveSettings(ISettings settings) + diff --git a/UI_Engine/Compute/SetProjectID.cs b/UI_Engine/Compute/SetProjectID.cs index c995e33..d21ea59 100644 --- a/UI_Engine/Compute/SetProjectID.cs +++ b/UI_Engine/Compute/SetProjectID.cs @@ -1,6 +1,6 @@ /* * This file is part of the Buildings and Habitats object Model (BHoM) - * Copyright (c) 2015 - 2023, the respective contributors. All rights reserved. + * Copyright (c) 2015 - 2024, the respective contributors. All rights reserved. * * Each contributor holds copyright over their respective contributions. * The project versioning (Git) records all such contribution source information. @@ -65,3 +65,4 @@ public static bool SetProjectID(string projectID) + diff --git a/UI_Engine/Create/InputAccessor.cs b/UI_Engine/Create/InputAccessor.cs index a08fa75..ac4c47f 100644 --- a/UI_Engine/Create/InputAccessor.cs +++ b/UI_Engine/Create/InputAccessor.cs @@ -1,6 +1,6 @@ /* * This file is part of the Buildings and Habitats object Model (BHoM) - * Copyright (c) 2015 - 2023, the respective contributors. All rights reserved. + * Copyright (c) 2015 - 2024, the respective contributors. All rights reserved. * * Each contributor holds copyright over their respective contributions. * The project versioning (Git) records all such contribution source information. @@ -98,3 +98,4 @@ public static Func InputAccessor(Type accessorType, + diff --git a/UI_Engine/Create/OutputAccessor.cs b/UI_Engine/Create/OutputAccessor.cs index 2387b10..6c579bd 100644 --- a/UI_Engine/Create/OutputAccessor.cs +++ b/UI_Engine/Create/OutputAccessor.cs @@ -1,6 +1,6 @@ /* * This file is part of the Buildings and Habitats object Model (BHoM) - * Copyright (c) 2015 - 2023, the respective contributors. All rights reserved. + * Copyright (c) 2015 - 2024, the respective contributors. All rights reserved. * * Each contributor holds copyright over their respective contributions. * The project versioning (Git) records all such contribution source information. @@ -62,3 +62,4 @@ public static Func OutputAccessor(Type accesso + diff --git a/UI_Engine/Create/ParamInfo.cs b/UI_Engine/Create/ParamInfo.cs index dde2d80..4c495e0 100644 --- a/UI_Engine/Create/ParamInfo.cs +++ b/UI_Engine/Create/ParamInfo.cs @@ -1,6 +1,6 @@ /* * This file is part of the Buildings and Habitats object Model (BHoM) - * Copyright (c) 2015 - 2023, the respective contributors. All rights reserved. + * Copyright (c) 2015 - 2024, the respective contributors. All rights reserved. * * Each contributor holds copyright over their respective contributions. * The project versioning (Git) records all such contribution source information. @@ -105,3 +105,4 @@ public static ParamInfo ParamInfo(this ParameterInfo parameter, string descripti + diff --git a/UI_Engine/Objects/DocumentLoading.cs b/UI_Engine/Objects/DocumentLoading.cs index 597af21..2657968 100644 --- a/UI_Engine/Objects/DocumentLoading.cs +++ b/UI_Engine/Objects/DocumentLoading.cs @@ -1,6 +1,6 @@ /* * This file is part of the Buildings and Habitats object Model (BHoM) - * Copyright (c) 2015 - 2023, the respective contributors. All rights reserved. + * Copyright (c) 2015 - 2024, the respective contributors. All rights reserved. * * Each contributor holds copyright over their respective contributions. * The project versioning (Git) records all such contribution source information. @@ -42,3 +42,4 @@ public static void SetDocumentOpeningState(bool state) } } + diff --git a/UI_Engine/Properties/AssemblyInfo.cs b/UI_Engine/Properties/AssemblyInfo.cs index c2273e2..20492e0 100644 --- a/UI_Engine/Properties/AssemblyInfo.cs +++ b/UI_Engine/Properties/AssemblyInfo.cs @@ -1,6 +1,6 @@ /* * This file is part of the Buildings and Habitats object Model (BHoM) - * Copyright (c) 2015 - 2023, the respective contributors. All rights reserved. + * Copyright (c) 2015 - 2024, the respective contributors. All rights reserved. * * Each contributor holds copyright over their respective contributions. * The project versioning (Git) records all such contribution source information. @@ -60,3 +60,4 @@ + diff --git a/UI_Engine/Query/AreMatching.cs b/UI_Engine/Query/AreMatching.cs index 64521e1..435fb12 100644 --- a/UI_Engine/Query/AreMatching.cs +++ b/UI_Engine/Query/AreMatching.cs @@ -1,6 +1,6 @@ /* * This file is part of the Buildings and Habitats object Model (BHoM) - * Copyright (c) 2015 - 2023, the respective contributors. All rights reserved. + * Copyright (c) 2015 - 2024, the respective contributors. All rights reserved. * * Each contributor holds copyright over their respective contributions. * The project versioning (Git) records all such contribution source information. @@ -60,3 +60,4 @@ public static bool AreMatching(List props, List oldList + diff --git a/UI_Engine/Query/Changes.cs b/UI_Engine/Query/Changes.cs index ddb844f..b4096a7 100644 --- a/UI_Engine/Query/Changes.cs +++ b/UI_Engine/Query/Changes.cs @@ -1,6 +1,6 @@ /* * This file is part of the Buildings and Habitats object Model (BHoM) - * Copyright (c) 2015 - 2023, the respective contributors. All rights reserved. + * Copyright (c) 2015 - 2024, the respective contributors. All rights reserved. * * Each contributor holds copyright over their respective contributions. * The project versioning (Git) records all such contribution source information. @@ -114,3 +114,4 @@ private static void Move(this List list, int from, int to) + diff --git a/UI_Engine/Query/Depth.cs b/UI_Engine/Query/Depth.cs index 406e146..ccd1bd4 100644 --- a/UI_Engine/Query/Depth.cs +++ b/UI_Engine/Query/Depth.cs @@ -1,6 +1,6 @@ /* * This file is part of the Buildings and Habitats object Model (BHoM) - * Copyright (c) 2015 - 2023, the respective contributors. All rights reserved. + * Copyright (c) 2015 - 2024, the respective contributors. All rights reserved. * * Each contributor holds copyright over their respective contributions. * The project versioning (Git) records all such contribution source information. @@ -48,3 +48,4 @@ public static int Depth(this ParamInfo info) + diff --git a/UI_Engine/Query/Hits.cs b/UI_Engine/Query/Hits.cs index 1be57a4..91deb19 100644 --- a/UI_Engine/Query/Hits.cs +++ b/UI_Engine/Query/Hits.cs @@ -1,6 +1,6 @@ /* * This file is part of the Buildings and Habitats object Model (BHoM) - * Copyright (c) 2015 - 2023, the respective contributors. All rights reserved. + * Copyright (c) 2015 - 2024, the respective contributors. All rights reserved. * * Each contributor holds copyright over their respective contributions. * The project versioning (Git) records all such contribution source information. @@ -60,3 +60,4 @@ public static List Hits(this List items, string search, + diff --git a/UI_Engine/Query/Information.cs b/UI_Engine/Query/Information.cs index 6162eb4..b24ba09 100644 --- a/UI_Engine/Query/Information.cs +++ b/UI_Engine/Query/Information.cs @@ -1,6 +1,6 @@ -/* +/* * This file is part of the Buildings and Habitats object Model (BHoM) - * Copyright (c) 2015 - 2023, the respective contributors. All rights reserved. + * Copyright (c) 2015 - 2024, the respective contributors. All rights reserved. * * Each contributor holds copyright over their respective contributions. * The project versioning (Git) records all such contribution source information. @@ -107,3 +107,4 @@ public static BHoMInformation Information() } } } + diff --git a/UI_Engine/Query/Items.cs b/UI_Engine/Query/Items.cs index 3b76b0e..399fe85 100644 --- a/UI_Engine/Query/Items.cs +++ b/UI_Engine/Query/Items.cs @@ -1,6 +1,6 @@ /* * This file is part of the Buildings and Habitats object Model (BHoM) - * Copyright (c) 2015 - 2023, the respective contributors. All rights reserved. + * Copyright (c) 2015 - 2024, the respective contributors. All rights reserved. * * Each contributor holds copyright over their respective contributions. * The project versioning (Git) records all such contribution source information. @@ -192,3 +192,4 @@ public static List ExternalItems() + diff --git a/UI_Engine/Query/MatchWith.cs b/UI_Engine/Query/MatchWith.cs index 8381f9d..2a1a3a2 100644 --- a/UI_Engine/Query/MatchWith.cs +++ b/UI_Engine/Query/MatchWith.cs @@ -1,6 +1,6 @@ /* * This file is part of the Buildings and Habitats object Model (BHoM) - * Copyright (c) 2015 - 2023, the respective contributors. All rights reserved. + * Copyright (c) 2015 - 2024, the respective contributors. All rights reserved. * * Each contributor holds copyright over their respective contributions. * The project versioning (Git) records all such contribution source information. @@ -102,3 +102,4 @@ private static bool IsMatchingName(this ParamInfo param, string name) + diff --git a/UI_Engine/Query/OutputParams.cs b/UI_Engine/Query/OutputParams.cs index f7df8df..ce8b4dd 100644 --- a/UI_Engine/Query/OutputParams.cs +++ b/UI_Engine/Query/OutputParams.cs @@ -1,6 +1,6 @@ /* * This file is part of the Buildings and Habitats object Model (BHoM) - * Copyright (c) 2015 - 2023, the respective contributors. All rights reserved. + * Copyright (c) 2015 - 2024, the respective contributors. All rights reserved. * * Each contributor holds copyright over their respective contributions. * The project versioning (Git) records all such contribution source information. @@ -183,3 +183,4 @@ private static void CollectOutputTypes(Type type, ref Dictionary parameters, int index) + diff --git a/UI_Engine/Query/Settings.cs b/UI_Engine/Query/Settings.cs index 900af02..9a019f2 100644 --- a/UI_Engine/Query/Settings.cs +++ b/UI_Engine/Query/Settings.cs @@ -1,6 +1,6 @@ /* * This file is part of the Buildings and Habitats object Model (BHoM) - * Copyright (c) 2015 - 2023, the respective contributors. All rights reserved. + * Copyright (c) 2015 - 2024, the respective contributors. All rights reserved. * * Each contributor holds copyright over their respective contributions. * The project versioning (Git) records all such contribution source information. @@ -108,3 +108,4 @@ public static ISettings Settings(string toolkitName) + diff --git a/UI_Engine/Query/SubType.cs b/UI_Engine/Query/SubType.cs index b93bdb5..4ab6fe4 100644 --- a/UI_Engine/Query/SubType.cs +++ b/UI_Engine/Query/SubType.cs @@ -1,6 +1,6 @@ /* * This file is part of the Buildings and Habitats object Model (BHoM) - * Copyright (c) 2015 - 2023, the respective contributors. All rights reserved. + * Copyright (c) 2015 - 2024, the respective contributors. All rights reserved. * * Each contributor holds copyright over their respective contributions. * The project versioning (Git) records all such contribution source information. @@ -48,3 +48,4 @@ public static Type SubType(this ParamInfo info) + diff --git a/UI_Engine/Query/ToText.cs b/UI_Engine/Query/ToText.cs index 6bcd442..b66229a 100644 --- a/UI_Engine/Query/ToText.cs +++ b/UI_Engine/Query/ToText.cs @@ -1,6 +1,6 @@ /* * This file is part of the Buildings and Habitats object Model (BHoM) - * Copyright (c) 2015 - 2023, the respective contributors. All rights reserved. + * Copyright (c) 2015 - 2024, the respective contributors. All rights reserved. * * Each contributor holds copyright over their respective contributions. * The project versioning (Git) records all such contribution source information. @@ -102,3 +102,4 @@ private static string ToText(IParamUpdate update) + diff --git a/UI_Engine/Query/UsageLogFileName.cs b/UI_Engine/Query/UsageLogFileName.cs index 6951d91..b56988f 100644 --- a/UI_Engine/Query/UsageLogFileName.cs +++ b/UI_Engine/Query/UsageLogFileName.cs @@ -1,6 +1,6 @@ /* * This file is part of the Buildings and Habitats object Model (BHoM) - * Copyright (c) 2015 - 2023, the respective contributors. All rights reserved. + * Copyright (c) 2015 - 2024, the respective contributors. All rights reserved. * * Each contributor holds copyright over their respective contributions. * The project versioning (Git) records all such contribution source information. @@ -54,3 +54,4 @@ public static string UsageLogFileName(string uiName) } } + diff --git a/UI_Engine/Query/UsageLogFolder.cs b/UI_Engine/Query/UsageLogFolder.cs index 72171c4..3d9a1d5 100644 --- a/UI_Engine/Query/UsageLogFolder.cs +++ b/UI_Engine/Query/UsageLogFolder.cs @@ -1,6 +1,6 @@ /* * This file is part of the Buildings and Habitats object Model (BHoM) - * Copyright (c) 2015 - 2023, the respective contributors. All rights reserved. + * Copyright (c) 2015 - 2024, the respective contributors. All rights reserved. * * Each contributor holds copyright over their respective contributions. * The project versioning (Git) records all such contribution source information. @@ -48,3 +48,4 @@ public static string UsageLogFolder() } } + diff --git a/UI_Engine/Query/Weight.cs b/UI_Engine/Query/Weight.cs index cef8a7d..8780f53 100644 --- a/UI_Engine/Query/Weight.cs +++ b/UI_Engine/Query/Weight.cs @@ -1,6 +1,6 @@ /* * This file is part of the Buildings and Habitats object Model (BHoM) - * Copyright (c) 2015 - 2023, the respective contributors. All rights reserved. + * Copyright (c) 2015 - 2024, the respective contributors. All rights reserved. * * Each contributor holds copyright over their respective contributions. * The project versioning (Git) records all such contribution source information. @@ -242,3 +242,4 @@ private static Type TryGetPropertyType(this PropertyInfo property) + diff --git a/UI_oM/BHoMInformation.cs b/UI_oM/BHoMInformation.cs index 7ee295f..982052c 100644 --- a/UI_oM/BHoMInformation.cs +++ b/UI_oM/BHoMInformation.cs @@ -1,6 +1,6 @@ -/* +/* * This file is part of the Buildings and Habitats object Model (BHoM) - * Copyright (c) 2015 - 2023, the respective contributors. All rights reserved. + * Copyright (c) 2015 - 2024, the respective contributors. All rights reserved. * * Each contributor holds copyright over their respective contributions. * The project versioning (Git) records all such contribution source information. @@ -39,3 +39,4 @@ public class BHoMInformation : BHoMObject public virtual List Assemblies { get; set; } } } + diff --git a/UI_oM/ComponentRequest.cs b/UI_oM/ComponentRequest.cs index 3f6a093..b2e2360 100644 --- a/UI_oM/ComponentRequest.cs +++ b/UI_oM/ComponentRequest.cs @@ -1,6 +1,6 @@ /* * This file is part of the Buildings and Habitats object Model (BHoM) - * Copyright (c) 2015 - 2023, the respective contributors. All rights reserved. + * Copyright (c) 2015 - 2024, the respective contributors. All rights reserved. * * Each contributor holds copyright over their respective contributions. * The project versioning (Git) records all such contribution source information. @@ -49,3 +49,4 @@ public class ComponentRequest : BHoMObject + diff --git a/UI_oM/CustomItem.cs b/UI_oM/CustomItem.cs index 561fae0..1896484 100644 --- a/UI_oM/CustomItem.cs +++ b/UI_oM/CustomItem.cs @@ -1,6 +1,6 @@ /* * This file is part of the Buildings and Habitats object Model (BHoM) - * Copyright (c) 2015 - 2023, the respective contributors. All rights reserved. + * Copyright (c) 2015 - 2024, the respective contributors. All rights reserved. * * Each contributor holds copyright over their respective contributions. * The project versioning (Git) records all such contribution source information. @@ -49,3 +49,4 @@ public class CustomItem : BHoMObject + diff --git a/UI_oM/Interfaces/IDataAccessor.cs b/UI_oM/Interfaces/IDataAccessor.cs index 75f1921..d6e31b8 100644 --- a/UI_oM/Interfaces/IDataAccessor.cs +++ b/UI_oM/Interfaces/IDataAccessor.cs @@ -1,6 +1,6 @@ /* * This file is part of the Buildings and Habitats object Model (BHoM) - * Copyright (c) 2015 - 2023, the respective contributors. All rights reserved. + * Copyright (c) 2015 - 2024, the respective contributors. All rights reserved. * * Each contributor holds copyright over their respective contributions. * The project versioning (Git) records all such contribution source information. @@ -67,3 +67,4 @@ public interface IDataAccessor : IObject /*************************************/ } } + diff --git a/UI_oM/Interfaces/IInitialisationSettings.cs b/UI_oM/Interfaces/IInitialisationSettings.cs index fe2361e..575a7f3 100644 --- a/UI_oM/Interfaces/IInitialisationSettings.cs +++ b/UI_oM/Interfaces/IInitialisationSettings.cs @@ -1,6 +1,6 @@ /* * This file is part of the Buildings and Habitats object Model (BHoM) - * Copyright (c) 2015 - 2023, the respective contributors. All rights reserved. + * Copyright (c) 2015 - 2024, the respective contributors. All rights reserved. * * Each contributor holds copyright over their respective contributions. * The project versioning (Git) records all such contribution source information. @@ -47,3 +47,4 @@ public interface IInitialisationSettings : IImmutable + diff --git a/UI_oM/Interfaces/IParamUpdate.cs b/UI_oM/Interfaces/IParamUpdate.cs index 7b56447..1b1300e 100644 --- a/UI_oM/Interfaces/IParamUpdate.cs +++ b/UI_oM/Interfaces/IParamUpdate.cs @@ -1,6 +1,6 @@ /* * This file is part of the Buildings and Habitats object Model (BHoM) - * Copyright (c) 2015 - 2023, the respective contributors. All rights reserved. + * Copyright (c) 2015 - 2024, the respective contributors. All rights reserved. * * Each contributor holds copyright over their respective contributions. * The project versioning (Git) records all such contribution source information. @@ -41,3 +41,4 @@ public interface IParamUpdate : IUpdate, IObject /***************************************************/ } } + diff --git a/UI_oM/Interfaces/IUpdate.cs b/UI_oM/Interfaces/IUpdate.cs index 707fe13..5f20ce5 100644 --- a/UI_oM/Interfaces/IUpdate.cs +++ b/UI_oM/Interfaces/IUpdate.cs @@ -1,6 +1,6 @@ /* * This file is part of the Buildings and Habitats object Model (BHoM) - * Copyright (c) 2015 - 2023, the respective contributors. All rights reserved. + * Copyright (c) 2015 - 2024, the respective contributors. All rights reserved. * * Each contributor holds copyright over their respective contributions. * The project versioning (Git) records all such contribution source information. @@ -35,3 +35,4 @@ public interface IUpdate : IObject } } + diff --git a/UI_oM/ParamInfo.cs b/UI_oM/ParamInfo.cs index 778502b..78a95d9 100644 --- a/UI_oM/ParamInfo.cs +++ b/UI_oM/ParamInfo.cs @@ -1,6 +1,6 @@ /* * This file is part of the Buildings and Habitats object Model (BHoM) - * Copyright (c) 2015 - 2023, the respective contributors. All rights reserved. + * Copyright (c) 2015 - 2024, the respective contributors. All rights reserved. * * Each contributor holds copyright over their respective contributions. * The project versioning (Git) records all such contribution source information. @@ -58,3 +58,4 @@ public class ParamInfo : BHoMObject + diff --git a/UI_oM/ParamKind.cs b/UI_oM/ParamKind.cs index f0aa638..610ced4 100644 --- a/UI_oM/ParamKind.cs +++ b/UI_oM/ParamKind.cs @@ -1,6 +1,6 @@ /* * This file is part of the Buildings and Habitats object Model (BHoM) - * Copyright (c) 2015 - 2023, the respective contributors. All rights reserved. + * Copyright (c) 2015 - 2024, the respective contributors. All rights reserved. * * Each contributor holds copyright over their respective contributions. * The project versioning (Git) records all such contribution source information. @@ -39,3 +39,4 @@ public enum ParamKind + diff --git a/UI_oM/ParamOldIndexFragment.cs b/UI_oM/ParamOldIndexFragment.cs index 1870667..7294714 100644 --- a/UI_oM/ParamOldIndexFragment.cs +++ b/UI_oM/ParamOldIndexFragment.cs @@ -1,6 +1,6 @@ /* * This file is part of the Buildings and Habitats object Model (BHoM) - * Copyright (c) 2015 - 2023, the respective contributors. All rights reserved. + * Copyright (c) 2015 - 2024, the respective contributors. All rights reserved. * * Each contributor holds copyright over their respective contributions. * The project versioning (Git) records all such contribution source information. @@ -45,3 +45,4 @@ public class ParamOldIndexFragment : IFragment + diff --git a/UI_oM/PreviousNamesFragment.cs b/UI_oM/PreviousNamesFragment.cs index 23df3c7..764fcda 100644 --- a/UI_oM/PreviousNamesFragment.cs +++ b/UI_oM/PreviousNamesFragment.cs @@ -1,6 +1,6 @@ /* * This file is part of the Buildings and Habitats object Model (BHoM) - * Copyright (c) 2015 - 2023, the respective contributors. All rights reserved. + * Copyright (c) 2015 - 2024, the respective contributors. All rights reserved. * * Each contributor holds copyright over their respective contributions. * The project versioning (Git) records all such contribution source information. @@ -45,3 +45,4 @@ public class PreviousNamesFragment : IFragment + diff --git a/UI_oM/ProjectIDEvent.cs b/UI_oM/ProjectIDEvent.cs index fe72dcf..38021f6 100644 --- a/UI_oM/ProjectIDEvent.cs +++ b/UI_oM/ProjectIDEvent.cs @@ -1,6 +1,6 @@ /* * This file is part of the Buildings and Habitats object Model (BHoM) - * Copyright (c) 2015 - 2023, the respective contributors. All rights reserved. + * Copyright (c) 2015 - 2024, the respective contributors. All rights reserved. * * Each contributor holds copyright over their respective contributions. * The project versioning (Git) records all such contribution source information. @@ -49,3 +49,4 @@ public class ProjectIDEvent : Event + diff --git a/UI_oM/Properties/AssemblyInfo.cs b/UI_oM/Properties/AssemblyInfo.cs index 91716af..0a7f59a 100644 --- a/UI_oM/Properties/AssemblyInfo.cs +++ b/UI_oM/Properties/AssemblyInfo.cs @@ -1,6 +1,6 @@ /* * This file is part of the Buildings and Habitats object Model (BHoM) - * Copyright (c) 2015 - 2023, the respective contributors. All rights reserved. + * Copyright (c) 2015 - 2024, the respective contributors. All rights reserved. * * Each contributor holds copyright over their respective contributions. * The project versioning (Git) records all such contribution source information. @@ -60,3 +60,4 @@ + diff --git a/UI_oM/SearchConfig.cs b/UI_oM/SearchConfig.cs index 24d7847..134a2d1 100644 --- a/UI_oM/SearchConfig.cs +++ b/UI_oM/SearchConfig.cs @@ -1,6 +1,6 @@ /* * This file is part of the Buildings and Habitats object Model (BHoM) - * Copyright (c) 2015 - 2023, the respective contributors. All rights reserved. + * Copyright (c) 2015 - 2024, the respective contributors. All rights reserved. * * Each contributor holds copyright over their respective contributions. * The project versioning (Git) records all such contribution source information. @@ -47,3 +47,4 @@ public class SearchConfig : BHoMObject + diff --git a/UI_oM/SearchItem.cs b/UI_oM/SearchItem.cs index 0f0e5cf..05dad27 100644 --- a/UI_oM/SearchItem.cs +++ b/UI_oM/SearchItem.cs @@ -1,6 +1,6 @@ /* * This file is part of the Buildings and Habitats object Model (BHoM) - * Copyright (c) 2015 - 2023, the respective contributors. All rights reserved. + * Copyright (c) 2015 - 2024, the respective contributors. All rights reserved. * * Each contributor holds copyright over their respective contributions. * The project versioning (Git) records all such contribution source information. @@ -54,3 +54,4 @@ public class SearchItem : BHoMObject + diff --git a/UI_oM/TriggerLogUsageArgs.cs b/UI_oM/TriggerLogUsageArgs.cs index a6217c0..c2a3edd 100644 --- a/UI_oM/TriggerLogUsageArgs.cs +++ b/UI_oM/TriggerLogUsageArgs.cs @@ -1,6 +1,6 @@ /* * This file is part of the Buildings and Habitats object Model (BHoM) - * Copyright (c) 2015 - 2023, the respective contributors. All rights reserved. + * Copyright (c) 2015 - 2024, the respective contributors. All rights reserved. * * Each contributor holds copyright over their respective contributions. * The project versioning (Git) records all such contribution source information. @@ -41,3 +41,4 @@ public class TriggerLogUsageArgs : EventArgs, IObject } } + diff --git a/UI_oM/Updates/CallerUpdate.cs b/UI_oM/Updates/CallerUpdate.cs index c998176..8367e3c 100644 --- a/UI_oM/Updates/CallerUpdate.cs +++ b/UI_oM/Updates/CallerUpdate.cs @@ -1,6 +1,6 @@ /* * This file is part of the Buildings and Habitats object Model (BHoM) - * Copyright (c) 2015 - 2023, the respective contributors. All rights reserved. + * Copyright (c) 2015 - 2024, the respective contributors. All rights reserved. * * Each contributor holds copyright over their respective contributions. * The project versioning (Git) records all such contribution source information. @@ -51,3 +51,4 @@ public class CallerUpdate : BHoMObject, IUpdate + diff --git a/UI_oM/Updates/CallerUpdateCause.cs b/UI_oM/Updates/CallerUpdateCause.cs index 4ca93a4..f6378b1 100644 --- a/UI_oM/Updates/CallerUpdateCause.cs +++ b/UI_oM/Updates/CallerUpdateCause.cs @@ -1,6 +1,6 @@ /* * This file is part of the Buildings and Habitats object Model (BHoM) - * Copyright (c) 2015 - 2023, the respective contributors. All rights reserved. + * Copyright (c) 2015 - 2024, the respective contributors. All rights reserved. * * Each contributor holds copyright over their respective contributions. * The project versioning (Git) records all such contribution source information. @@ -46,3 +46,4 @@ public enum CallerUpdateCause + diff --git a/UI_oM/Updates/ComponentUpdate.cs b/UI_oM/Updates/ComponentUpdate.cs index a155b47..057d2bd 100644 --- a/UI_oM/Updates/ComponentUpdate.cs +++ b/UI_oM/Updates/ComponentUpdate.cs @@ -1,6 +1,6 @@ /* * This file is part of the Buildings and Habitats object Model (BHoM) - * Copyright (c) 2015 - 2023, the respective contributors. All rights reserved. + * Copyright (c) 2015 - 2024, the respective contributors. All rights reserved. * * Each contributor holds copyright over their respective contributions. * The project versioning (Git) records all such contribution source information. @@ -47,3 +47,4 @@ public class ComponentUpdate : BHoMObject, IUpdate + diff --git a/UI_oM/Updates/InputsUpdate.cs b/UI_oM/Updates/InputsUpdate.cs index 18ac3a1..96ae6ef 100644 --- a/UI_oM/Updates/InputsUpdate.cs +++ b/UI_oM/Updates/InputsUpdate.cs @@ -1,6 +1,6 @@ /* * This file is part of the Buildings and Habitats object Model (BHoM) - * Copyright (c) 2015 - 2023, the respective contributors. All rights reserved. + * Copyright (c) 2015 - 2024, the respective contributors. All rights reserved. * * Each contributor holds copyright over their respective contributions. * The project versioning (Git) records all such contribution source information. @@ -45,3 +45,4 @@ public class InputsUpdate : BHoMObject, IUpdate + diff --git a/UI_oM/Updates/OutputsUpdate.cs b/UI_oM/Updates/OutputsUpdate.cs index 739dfc3..e67c42e 100644 --- a/UI_oM/Updates/OutputsUpdate.cs +++ b/UI_oM/Updates/OutputsUpdate.cs @@ -1,6 +1,6 @@ /* * This file is part of the Buildings and Habitats object Model (BHoM) - * Copyright (c) 2015 - 2023, the respective contributors. All rights reserved. + * Copyright (c) 2015 - 2024, the respective contributors. All rights reserved. * * Each contributor holds copyright over their respective contributions. * The project versioning (Git) records all such contribution source information. @@ -45,3 +45,4 @@ public class OutputsUpdate : BHoMObject, IUpdate + diff --git a/UI_oM/Updates/ParamAdded.cs b/UI_oM/Updates/ParamAdded.cs index e460f06..91c7d4f 100644 --- a/UI_oM/Updates/ParamAdded.cs +++ b/UI_oM/Updates/ParamAdded.cs @@ -1,6 +1,6 @@ /* * This file is part of the Buildings and Habitats object Model (BHoM) - * Copyright (c) 2015 - 2023, the respective contributors. All rights reserved. + * Copyright (c) 2015 - 2024, the respective contributors. All rights reserved. * * Each contributor holds copyright over their respective contributions. * The project versioning (Git) records all such contribution source information. @@ -47,3 +47,4 @@ public class ParamAdded : BHoMObject, IParamUpdate + diff --git a/UI_oM/Updates/ParamMoved.cs b/UI_oM/Updates/ParamMoved.cs index f98e662..9eff4f4 100644 --- a/UI_oM/Updates/ParamMoved.cs +++ b/UI_oM/Updates/ParamMoved.cs @@ -1,6 +1,6 @@ /* * This file is part of the Buildings and Habitats object Model (BHoM) - * Copyright (c) 2015 - 2023, the respective contributors. All rights reserved. + * Copyright (c) 2015 - 2024, the respective contributors. All rights reserved. * * Each contributor holds copyright over their respective contributions. * The project versioning (Git) records all such contribution source information. @@ -47,3 +47,4 @@ public class ParamMoved : BHoMObject, IParamUpdate + diff --git a/UI_oM/Updates/ParamRemoved.cs b/UI_oM/Updates/ParamRemoved.cs index f6c64d0..a912eb9 100644 --- a/UI_oM/Updates/ParamRemoved.cs +++ b/UI_oM/Updates/ParamRemoved.cs @@ -1,6 +1,6 @@ /* * This file is part of the Buildings and Habitats object Model (BHoM) - * Copyright (c) 2015 - 2023, the respective contributors. All rights reserved. + * Copyright (c) 2015 - 2024, the respective contributors. All rights reserved. * * Each contributor holds copyright over their respective contributions. * The project versioning (Git) records all such contribution source information. @@ -45,3 +45,4 @@ public class ParamRemoved : BHoMObject, IParamUpdate + diff --git a/UI_oM/Updates/ParamReplaced.cs b/UI_oM/Updates/ParamReplaced.cs index 5236294..903c3b3 100644 --- a/UI_oM/Updates/ParamReplaced.cs +++ b/UI_oM/Updates/ParamReplaced.cs @@ -1,6 +1,6 @@ /* * This file is part of the Buildings and Habitats object Model (BHoM) - * Copyright (c) 2015 - 2023, the respective contributors. All rights reserved. + * Copyright (c) 2015 - 2024, the respective contributors. All rights reserved. * * Each contributor holds copyright over their respective contributions. * The project versioning (Git) records all such contribution source information. @@ -47,3 +47,4 @@ public class ParamUpdated : BHoMObject, IParamUpdate + diff --git a/UI_oM/UsageLogEntry.cs b/UI_oM/UsageLogEntry.cs index af28c0a..3731406 100644 --- a/UI_oM/UsageLogEntry.cs +++ b/UI_oM/UsageLogEntry.cs @@ -1,6 +1,6 @@ /* * This file is part of the Buildings and Habitats object Model (BHoM) - * Copyright (c) 2015 - 2023, the respective contributors. All rights reserved. + * Copyright (c) 2015 - 2024, the respective contributors. All rights reserved. * * Each contributor holds copyright over their respective contributions. * The project versioning (Git) records all such contribution source information. @@ -66,3 +66,4 @@ public class UsageLogEntry : BHoMObject + From 69695c0f144e2835cf639e9c10d27420b98bad9a Mon Sep 17 00:00:00 2001 From: adecler Date: Thu, 4 Jan 2024 16:45:45 +0000 Subject: [PATCH 03/25] Solving the slow execution of CollectOutputTypes on Custom objects --- UI_Engine/Query/OutputParams.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/UI_Engine/Query/OutputParams.cs b/UI_Engine/Query/OutputParams.cs index ce8b4dd..9a0fa0b 100644 --- a/UI_Engine/Query/OutputParams.cs +++ b/UI_Engine/Query/OutputParams.cs @@ -148,7 +148,7 @@ private static void CollectOutputTypes(IEnumerable objects, ref Dic private static void CollectOutputTypes(IEnumerable objects, ref Dictionary> properties) { - foreach (KeyValuePair prop in objects.SelectMany(x => x.CustomData).Distinct()) + foreach (KeyValuePair prop in objects.SelectMany(x => x.CustomData)) { if (!properties.ContainsKey(prop.Key)) properties[prop.Key] = new List(); From c86ac03d2c1ef05bd77c220ccd12ce74800a5b77 Mon Sep 17 00:00:00 2001 From: Fraser Greenroyd Date: Wed, 14 Feb 2024 17:38:48 +0000 Subject: [PATCH 04/25] Move IInitialisationSettings up to BHoM --- UI_oM/Interfaces/IInitialisationSettings.cs | 50 --------------------- UI_oM/UI_oM.csproj | 1 - 2 files changed, 51 deletions(-) delete mode 100644 UI_oM/Interfaces/IInitialisationSettings.cs diff --git a/UI_oM/Interfaces/IInitialisationSettings.cs b/UI_oM/Interfaces/IInitialisationSettings.cs deleted file mode 100644 index 575a7f3..0000000 --- a/UI_oM/Interfaces/IInitialisationSettings.cs +++ /dev/null @@ -1,50 +0,0 @@ -/* - * This file is part of the Buildings and Habitats object Model (BHoM) - * Copyright (c) 2015 - 2024, the respective contributors. All rights reserved. - * - * Each contributor holds copyright over their respective contributions. - * The project versioning (Git) records all such contribution source information. - * - * - * The BHoM is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License as published by - * the Free Software Foundation, either version 3.0 of the License, or - * (at your option) any later version. - * - * The BHoM is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public License - * along with this code. If not, see . - */ - -using BH.oM.Base; -using System; -using System.Collections.Generic; -using System.ComponentModel; -using System.Linq; -using System.Reflection; -using System.Text; -using System.Threading.Tasks; - -namespace BH.oM.UI -{ - [Description("Toolkit Settings that contain an initialisation method to be ran when the UI starts.")] - public interface IInitialisationSettings : IImmutable - { - /***************************************************/ - /**** Properties ****/ - /***************************************************/ - - string InitialisationMethod { get; } - - /***************************************************/ - } -} - - - - - diff --git a/UI_oM/UI_oM.csproj b/UI_oM/UI_oM.csproj index 12edf1a..a15fd5e 100644 --- a/UI_oM/UI_oM.csproj +++ b/UI_oM/UI_oM.csproj @@ -67,7 +67,6 @@ - From 80084ee0bfc941fa374b25fb0c29c9678c034e6c Mon Sep 17 00:00:00 2001 From: Fraser Greenroyd Date: Wed, 14 Feb 2024 19:40:36 +0000 Subject: [PATCH 05/25] Promote UsageLogEntry to BHoM --- UI_oM/UI_oM.csproj | 1 - UI_oM/UsageLogEntry.cs | 69 ------------------------------------------ 2 files changed, 70 deletions(-) delete mode 100644 UI_oM/UsageLogEntry.cs diff --git a/UI_oM/UI_oM.csproj b/UI_oM/UI_oM.csproj index a15fd5e..362ccaf 100644 --- a/UI_oM/UI_oM.csproj +++ b/UI_oM/UI_oM.csproj @@ -68,7 +68,6 @@ - diff --git a/UI_oM/UsageLogEntry.cs b/UI_oM/UsageLogEntry.cs deleted file mode 100644 index 3731406..0000000 --- a/UI_oM/UsageLogEntry.cs +++ /dev/null @@ -1,69 +0,0 @@ -/* - * This file is part of the Buildings and Habitats object Model (BHoM) - * Copyright (c) 2015 - 2024, the respective contributors. All rights reserved. - * - * Each contributor holds copyright over their respective contributions. - * The project versioning (Git) records all such contribution source information. - * - * - * The BHoM is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License as published by - * the Free Software Foundation, either version 3.0 of the License, or - * (at your option) any later version. - * - * The BHoM is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public License - * along with this code. If not, see . - */ - -using BH.oM.Base; -using BH.oM.Base.Debugging; -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace BH.oM.UI -{ - public class UsageLogEntry : BHoMObject - { - /***************************************************/ - /**** Properties ****/ - /***************************************************/ - - public virtual DateTime Time { get; set; } = DateTime.UtcNow; - - public virtual string UI { get; set; } = ""; - - public virtual string UiVersion { get; set; } = ""; - - public virtual string BHoMVersion { get; set; } = ""; - - public virtual Guid ComponentId { get; set; } = Guid.Empty; - - public virtual string CallerName { get; set; } = ""; - - public virtual object SelectedItem { get; set; } = null; - - public virtual string FileId { get; set; } = ""; - - public virtual string FileName { get; set; } = ""; - - public virtual string ProjectID { get; set; } = ""; - - public virtual List Errors { get; set; } = new List(); - - - /***************************************************/ - } -} - - - - - From 1a661ae800f43626a58d6b96a441b530e0e7177e Mon Sep 17 00:00:00 2001 From: Fraser Greenroyd Date: Mon, 19 Feb 2024 11:02:32 +0000 Subject: [PATCH 06/25] Add calls to the before/after actions added in BHoM_Adapter --- BHoM_UI/Components/Adapter/Execute.cs | 9 +++++++++ BHoM_UI/Components/Adapter/Move.cs | 13 ++++++++++++- BHoM_UI/Components/Adapter/Pull.cs | 13 ++++++++++++- BHoM_UI/Components/Adapter/Push.cs | 9 +++++++++ BHoM_UI/Components/Adapter/Remove.cs | 13 ++++++++++++- 5 files changed, 54 insertions(+), 3 deletions(-) diff --git a/BHoM_UI/Components/Adapter/Execute.cs b/BHoM_UI/Components/Adapter/Execute.cs index 24b645e..7d9fe80 100644 --- a/BHoM_UI/Components/Adapter/Execute.cs +++ b/BHoM_UI/Components/Adapter/Execute.cs @@ -100,8 +100,17 @@ public static Output, bool> Execute(BHoMAdapter adapter, IExecuteCo return result; } + if(!adapter.BeforeExecute(command, executeConfig)) + { + BH.Engine.Base.Compute.RecordError($"An error occurred within the setup actions for the Execute. Please rectify those issues to use the Execute component."); + return result; + } + result = adapter.Execute(command, executeConfig); // Item1 is the result of the Execute; Item2 the `success` bool. + if (!adapter.AfterExecute(command, executeConfig)) + BH.Engine.Base.Compute.RecordWarning($"An error occurred during the tear down operation for the Execute. Please take note of any additional warnings/errors received from the Execute component."); + return result != null ? result : new Output, bool>() { Item1 = null, Item2 = false }; } diff --git a/BHoM_UI/Components/Adapter/Move.cs b/BHoM_UI/Components/Adapter/Move.cs index ff5cf46..b2561d9 100644 --- a/BHoM_UI/Components/Adapter/Move.cs +++ b/BHoM_UI/Components/Adapter/Move.cs @@ -111,8 +111,19 @@ public static bool Move(BHoMAdapter source, BHoMAdapter target, object request = return false; } + if(!source.BeforeMove(target, actualRequest, pullType, pullCfg, pushType, pushCfg)) + { + BH.Engine.Base.Compute.RecordError($"An error occurred within the setup actions for the Move. Please rectify those issues to use the Move component."); + return false; + } + + + bool result = source.Move(target, actualRequest, pullType, pullCfg, pushType, pushCfg); + + if(!source.AfterMove(target, actualRequest, pullType, pullCfg, pushType, pushCfg)) + BH.Engine.Base.Compute.RecordWarning($"An error occurred during the tear down operation for the Move. Please take note of any additional warnings/errors received from the Move component."); - return source.Move(target, actualRequest, pullType, pullCfg, pushType, pushCfg); + return result; } /*************************************/ diff --git a/BHoM_UI/Components/Adapter/Pull.cs b/BHoM_UI/Components/Adapter/Pull.cs index f59967b..d45f0f8 100644 --- a/BHoM_UI/Components/Adapter/Pull.cs +++ b/BHoM_UI/Components/Adapter/Pull.cs @@ -117,7 +117,18 @@ public static IEnumerable Pull(BHoMAdapter adapter, object request = nul return null; } - return adapter.Pull(actualRequest, pullType, pullConfig); + if(!adapter.BeforePull(actualRequest, pullType, pullConfig)) + { + BH.Engine.Base.Compute.RecordError($"An error occurred within the setup actions for the Pull. Please rectify those issues to use the Pull component."); + return null; + } + + IEnumerable result = adapter.Pull(actualRequest, pullType, pullConfig); + + if(!adapter.AfterPull(actualRequest, pullType, pullConfig)) + BH.Engine.Base.Compute.RecordWarning($"An error occurred during the tear down operation for the Pull. Please take note of any additional warnings/errors received from the Pull component."); + + return result; } /*************************************/ diff --git a/BHoM_UI/Components/Adapter/Push.cs b/BHoM_UI/Components/Adapter/Push.cs index 68cf45f..2921164 100644 --- a/BHoM_UI/Components/Adapter/Push.cs +++ b/BHoM_UI/Components/Adapter/Push.cs @@ -109,8 +109,17 @@ public static Output, bool> Push(BHoMAdapter adapter, IEnumerable result = adapter.Push(objects, tag, pt, pushConfig); + if(!adapter.AfterPush(objects, tag, pt, pushConfig)) + BH.Engine.Base.Compute.RecordWarning($"An error occurred during the tear down operation for the Push. Please take note of any additional warnings/errors received from the Push component."); + return BH.Engine.Base.Create.Output(result, objects?.Count() == result?.Count()); } diff --git a/BHoM_UI/Components/Adapter/Remove.cs b/BHoM_UI/Components/Adapter/Remove.cs index a2b4980..6e7120d 100644 --- a/BHoM_UI/Components/Adapter/Remove.cs +++ b/BHoM_UI/Components/Adapter/Remove.cs @@ -94,7 +94,18 @@ public static int Remove(BHoMAdapter adapter, object request = null, ActionConfi return 0; } - return adapter.Remove(actualRequest, removeConfig); + if(!adapter.BeforeRemove(actualRequest, removeConfig)) + { + BH.Engine.Base.Compute.RecordError($"An error occurred within the setup actions for the Remove. Please rectify those issues to use the Remove component."); + return 0; + } + + int result = adapter.Remove(actualRequest, removeConfig); + + if(!adapter.AfterRemove(actualRequest, removeConfig)) + BH.Engine.Base.Compute.RecordWarning($"An error occurred during the tear down operation for the Remove. Please take note of any additional warnings/errors received from the Remove component."); + + return result; } /*************************************/ From 5ceec84304f5735af917ca64ba78e4fb1245163c Mon Sep 17 00:00:00 2001 From: Fraser Greenroyd Date: Fri, 23 Feb 2024 11:07:08 +0000 Subject: [PATCH 07/25] Add settings object for search settings within the UI --- UI_oM/Settings/SearchSettings.cs | 43 +++++++++++++++++++++++++++++ UI_oM/Settings/ToolkitSelectItem.cs | 20 ++++++++++++++ 2 files changed, 63 insertions(+) create mode 100644 UI_oM/Settings/SearchSettings.cs create mode 100644 UI_oM/Settings/ToolkitSelectItem.cs diff --git a/UI_oM/Settings/SearchSettings.cs b/UI_oM/Settings/SearchSettings.cs new file mode 100644 index 0000000..7ea0202 --- /dev/null +++ b/UI_oM/Settings/SearchSettings.cs @@ -0,0 +1,43 @@ +/* + * This file is part of the Buildings and Habitats object Model (BHoM) + * Copyright (c) 2015 - 2024, the respective contributors. All rights reserved. + * + * Each contributor holds copyright over their respective contributions. + * The project versioning (Git) records all such contribution source information. + * + * + * The BHoM is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as published by + * the Free Software Foundation, either version 3.0 of the License, or + * (at your option) any later version. + * + * The BHoM is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with this code. If not, see . + */ + +using BH.oM.Base; +using System; +using System.Collections.Generic; +using System.Drawing; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace BH.oM.UI +{ + public class SearchSettings : ISettings + { + /***************************************************/ + /**** Properties ****/ + /***************************************************/ + + public virtual List Toolkits { get; set; } + + /***************************************************/ + } +} \ No newline at end of file diff --git a/UI_oM/Settings/ToolkitSelectItem.cs b/UI_oM/Settings/ToolkitSelectItem.cs new file mode 100644 index 0000000..dbe0bd8 --- /dev/null +++ b/UI_oM/Settings/ToolkitSelectItem.cs @@ -0,0 +1,20 @@ +using BH.oM.Base; +using System; +using System.Collections.Generic; +using System.ComponentModel; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace BH.oM.UI +{ + [Description("For each toolkit in BHoM, allocate a boolean flag for whether it should appear in search results or not.")] + public class ToolkitSelectItem : BHoMObject + { + [Description("The name of the toolkit that this item refers to.")] + public virtual string Toolkit { get; set; } + + [Description("Determine whether to include the toolkit in search results or not.")] + public virtual bool Include { get; set; } = true; + } +} \ No newline at end of file From 31d1d4f7ae6fbfcf34b21a919826480f991979de Mon Sep 17 00:00:00 2001 From: Fraser Greenroyd Date: Fri, 23 Feb 2024 15:17:34 +0000 Subject: [PATCH 08/25] Add objects for search settings --- UI_oM/Settings/SearchSettings.cs | 2 +- UI_oM/UI_oM.csproj | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/UI_oM/Settings/SearchSettings.cs b/UI_oM/Settings/SearchSettings.cs index 7ea0202..c190952 100644 --- a/UI_oM/Settings/SearchSettings.cs +++ b/UI_oM/Settings/SearchSettings.cs @@ -36,7 +36,7 @@ public class SearchSettings : ISettings /**** Properties ****/ /***************************************************/ - public virtual List Toolkits { get; set; } + public virtual List Toolkits { get; set; } = new List(); /***************************************************/ } diff --git a/UI_oM/UI_oM.csproj b/UI_oM/UI_oM.csproj index 362ccaf..bb287e0 100644 --- a/UI_oM/UI_oM.csproj +++ b/UI_oM/UI_oM.csproj @@ -55,6 +55,8 @@ + + From 4d07764f47d009d73dd2e8f194607f5dae4402c5 Mon Sep 17 00:00:00 2001 From: Fraser Greenroyd Date: Fri, 23 Feb 2024 15:17:59 +0000 Subject: [PATCH 09/25] Add Window UI project for containing and handling custom UIs for BHoM implementation --- BHoM_UI.sln | 10 +- BHoM_Windows_UI/BHoM_Windows_UI.csproj | 94 ++++++++++++ BHoM_Windows_UI/Properties/AssemblyInfo.cs | 36 +++++ .../Properties/Resources.Designer.cs | 73 +++++++++ BHoM_Windows_UI/Properties/Resources.resx | 124 +++++++++++++++ BHoM_Windows_UI/Resources/BHoM_Logo.png | Bin 0 -> 43497 bytes .../Settings/SearchSettingsWindow.xaml | 72 +++++++++ .../Settings/SearchSettingsWindow.xaml.cs | 142 ++++++++++++++++++ .../ViewModel/ToolkitSelectItemModel.cs | 53 +++++++ 9 files changed, 602 insertions(+), 2 deletions(-) create mode 100644 BHoM_Windows_UI/BHoM_Windows_UI.csproj create mode 100644 BHoM_Windows_UI/Properties/AssemblyInfo.cs create mode 100644 BHoM_Windows_UI/Properties/Resources.Designer.cs create mode 100644 BHoM_Windows_UI/Properties/Resources.resx create mode 100644 BHoM_Windows_UI/Resources/BHoM_Logo.png create mode 100644 BHoM_Windows_UI/Settings/SearchSettingsWindow.xaml create mode 100644 BHoM_Windows_UI/Settings/SearchSettingsWindow.xaml.cs create mode 100644 BHoM_Windows_UI/ViewModel/ToolkitSelectItemModel.cs diff --git a/BHoM_UI.sln b/BHoM_UI.sln index 26a9ac5..373ae8f 100644 --- a/BHoM_UI.sln +++ b/BHoM_UI.sln @@ -1,7 +1,7 @@  Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio 15 -VisualStudioVersion = 15.0.28307.1169 +# Visual Studio Version 17 +VisualStudioVersion = 17.9.34616.47 MinimumVisualStudioVersion = 10.0.40219.1 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BHoM_UI", "BHoM_UI\BHoM_UI.csproj", "{69F4F042-E23A-4673-AB32-3D787CFA976C}" EndProject @@ -12,6 +12,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UI_Engine", "UI_Engine\UI_E {50D4C1ED-C16C-4365-A742-938BF49EC4B0} = {50D4C1ED-C16C-4365-A742-938BF49EC4B0} EndProjectSection EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BHoM_Windows_UI", "BHoM_Windows_UI\BHoM_Windows_UI.csproj", "{9BA156D1-851D-4267-A94F-6F238D17B634}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -30,6 +32,10 @@ Global {565DDBD0-5C04-4BE9-B57D-CE54C2124ABB}.Debug|Any CPU.Build.0 = Debug|Any CPU {565DDBD0-5C04-4BE9-B57D-CE54C2124ABB}.Release|Any CPU.ActiveCfg = Release|Any CPU {565DDBD0-5C04-4BE9-B57D-CE54C2124ABB}.Release|Any CPU.Build.0 = Release|Any CPU + {9BA156D1-851D-4267-A94F-6F238D17B634}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {9BA156D1-851D-4267-A94F-6F238D17B634}.Debug|Any CPU.Build.0 = Debug|Any CPU + {9BA156D1-851D-4267-A94F-6F238D17B634}.Release|Any CPU.ActiveCfg = Release|Any CPU + {9BA156D1-851D-4267-A94F-6F238D17B634}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/BHoM_Windows_UI/BHoM_Windows_UI.csproj b/BHoM_Windows_UI/BHoM_Windows_UI.csproj new file mode 100644 index 0000000..317a6c0 --- /dev/null +++ b/BHoM_Windows_UI/BHoM_Windows_UI.csproj @@ -0,0 +1,94 @@ + + + + + Debug + AnyCPU + {9BA156D1-851D-4267-A94F-6F238D17B634} + Library + Properties + BH.UI.Base.Windows + BHoM_Windows_UI + v4.7.2 + 512 + true + + + true + full + false + ..\Build\ + DEBUG;TRACE + prompt + 4 + + + pdbonly + true + bin\Release\ + TRACE + prompt + 4 + + + + ..\..\..\..\..\..\..\ProgramData\BHoM\Assemblies\BHoM.dll + + + ..\..\..\..\..\..\..\ProgramData\BHoM\Assemblies\BHoM_Engine.dll + + + + + ..\..\..\..\..\..\..\ProgramData\BHoM\Assemblies\Settings_Engine.dll + + + + + + + + + + + + + + + + + True + True + Resources.resx + + + SearchSettingsWindow.xaml + + + + + + Designer + MSBuild:Compile + + + + + {50d4c1ed-c16c-4365-a742-938bf49ec4b0} + UI_oM + + + + + ResXFileCodeGenerator + Resources.Designer.cs + + + + + + + + xcopy "$(TargetDir)$(TargetFileName)" "$(ProgramData)\BHoM\Assemblies" /Y + + \ No newline at end of file diff --git a/BHoM_Windows_UI/Properties/AssemblyInfo.cs b/BHoM_Windows_UI/Properties/AssemblyInfo.cs new file mode 100644 index 0000000..6b18ab6 --- /dev/null +++ b/BHoM_Windows_UI/Properties/AssemblyInfo.cs @@ -0,0 +1,36 @@ +using System.Reflection; +using System.Runtime.CompilerServices; +using System.Runtime.InteropServices; + +// General Information about an assembly is controlled through the following +// set of attributes. Change these attribute values to modify the information +// associated with an assembly. +[assembly: AssemblyTitle("BHoM_Windows_UI")] +[assembly: AssemblyDescription("")] +[assembly: AssemblyConfiguration("")] +[assembly: AssemblyCompany("BuroHappold Engineering")] +[assembly: AssemblyProduct("BHoM_Windows_UI")] +[assembly: AssemblyCopyright("Copyright © BuroHappold Engineering 2024")] +[assembly: AssemblyTrademark("")] +[assembly: AssemblyCulture("")] + +// Setting ComVisible to false makes the types in this assembly not visible +// to COM components. If you need to access a type in this assembly from +// COM, set the ComVisible attribute to true on that type. +[assembly: ComVisible(false)] + +// The following GUID is for the ID of the typelib if this project is exposed to COM +[assembly: Guid("9ba156d1-851d-4267-a94f-6f238d17b634")] + +// Version information for an assembly consists of the following four values: +// +// Major Version +// Minor Version +// Build Number +// Revision +// +// You can specify all the values or you can default the Build and Revision Numbers +// by using the '*' as shown below: +// [assembly: AssemblyVersion("1.0.*")] +[assembly: AssemblyVersion("1.0.0.0")] +[assembly: AssemblyFileVersion("1.0.0.0")] diff --git a/BHoM_Windows_UI/Properties/Resources.Designer.cs b/BHoM_Windows_UI/Properties/Resources.Designer.cs new file mode 100644 index 0000000..f85ea6a --- /dev/null +++ b/BHoM_Windows_UI/Properties/Resources.Designer.cs @@ -0,0 +1,73 @@ +//------------------------------------------------------------------------------ +// +// This code was generated by a tool. +// Runtime Version:4.0.30319.42000 +// +// Changes to this file may cause incorrect behavior and will be lost if +// the code is regenerated. +// +//------------------------------------------------------------------------------ + +namespace BH.UI.Base.Windows.Properties { + using System; + + + /// + /// A strongly-typed resource class, for looking up localized strings, etc. + /// + // This class was auto-generated by the StronglyTypedResourceBuilder + // class via a tool like ResGen or Visual Studio. + // To add or remove a member, edit your .ResX file then rerun ResGen + // with the /str option, or rebuild your VS project. + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "17.0.0.0")] + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] + internal class Resources { + + private static global::System.Resources.ResourceManager resourceMan; + + private static global::System.Globalization.CultureInfo resourceCulture; + + [global::System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")] + internal Resources() { + } + + /// + /// Returns the cached ResourceManager instance used by this class. + /// + [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)] + internal static global::System.Resources.ResourceManager ResourceManager { + get { + if (object.ReferenceEquals(resourceMan, null)) { + global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("BH.UI.Base.Windows.Properties.Resources", typeof(Resources).Assembly); + resourceMan = temp; + } + return resourceMan; + } + } + + /// + /// Overrides the current thread's CurrentUICulture property for all + /// resource lookups using this strongly typed resource class. + /// + [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)] + internal static global::System.Globalization.CultureInfo Culture { + get { + return resourceCulture; + } + set { + resourceCulture = value; + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + internal static System.Drawing.Bitmap BHoM_Logo { + get { + object obj = ResourceManager.GetObject("BHoM_Logo", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + } +} diff --git a/BHoM_Windows_UI/Properties/Resources.resx b/BHoM_Windows_UI/Properties/Resources.resx new file mode 100644 index 0000000..cefdf13 --- /dev/null +++ b/BHoM_Windows_UI/Properties/Resources.resx @@ -0,0 +1,124 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + + ..\Resources\BHoM_Logo.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + \ No newline at end of file diff --git a/BHoM_Windows_UI/Resources/BHoM_Logo.png b/BHoM_Windows_UI/Resources/BHoM_Logo.png new file mode 100644 index 0000000000000000000000000000000000000000..e38b7ccde0ec55c60fc2fa12ede35c224ee307e5 GIT binary patch literal 43497 zcmeFac{ta5*Eam65k*BBkOoqQ=7D6`O+Vt`(xL>uKnEC{XEC>zQ_B=z4x(?&ChrE3~Q~=TIV{~`uXZ=tBvNJ z%*!y$=(XyrHZaW4M1~o*XXJ2vVtV&_DgMXhv_WkJ6aPr`6Mh-G?KiF880O{)zFw5u`bH;);m@c4xI$$3MeyP9&6;Yfn11><;!b1`J{hrht=8%hHKT+^ii_m;$4E0w z)W)@|e$(G?-t=ZfR(S23uC_*Nzmt-IW5(r=+I?M`G1U`wkGUYc2B3Nd!KuSUs%wWOwZ2!*%k>|l~s)sN@twg z0Hv%jAEzxS)jn<1=@MC9TfkerJK9ls|9aiiwY( zql|k-h`a5P|D5%uCRmPJnCaKZ;Vzo#VoB3DxdR{IpR+UnyT2M37#U3n$1Nsna=7uo zsn3SW(i0YF{da$jj%J6&Fe%6W50^^cz|73d4R7B*iHi^K_F5+hDPx$TMgQGjZ$xKg zWONN>n8yqLf4TszIu*CZTHNUd=kB_^rF=zZ(+ZxFPZM`#ZuKjI;#Z4-CBP;GtX*8{c92Xtg+^<^&zdj zUrK$V^dj$lUTeN+(V`>YzkiqKIyoN8W*}+FmAa_P?Th!~7sfMUGg~sO9xi@4DkeU| zR?;waN6@3+j!0~koYwd$GMryPrFYN%-nPQLlpW7%BCSt(4Lhkd@Q586x%%UxZ@t>= zpV)R!#HhxgFhHy}GIi;ed&gQUol3nAe!jD`x7pq^W>s85cHc4&4dIax?>c^nougd2 zO=|P4*GHdRQS&JdlJY5>a!@vGPcBc0nbAf+Bj38Wv31IER|1wvSGrWWSLX?+j9OZ` zXXPuWQl*tIh-72&B z7N2L|mv9-Cfb;fu)7xv$c=mPIb~4O3nnC?`g~#WCtVK4*zjWQOgBZHrJX7~RnX}P+z%57no z$M;WGzLKZ^2p7^DSATT0h;Yl@o|ckft;J40{9-kcjIJ`h(Po73;|;~`>x`lutQ$leG7ObC<=>eQF!F{Zo1O}Pb_)dov5L+oGfd&$G}H~ldqVC1%ou3N*BuHC#jf0Wp=McVa2 zqAD71KN_yFztds3zyC*P?JBvB&s8eDeVy3?ukEwlO)p&wJlXLjynlJ6<9#^?@6+42 zZy(vw(c!>7RR-25x}j*siBZ`0tJR<5Bj#)@-&yH|CrV66 z5#RsrP<3694nNZ6gJCSb# zb$ZzPU}35L^vnCpz6ai3e77~1FQnFc?X00*)5jz-H>593&Fr;bSy6G@-XcBbQ?-vc zzf4@p2GeVk--mnll??l=qtu~qY?oSABhA!>VzDK$ojXjRXn8?8%9FHJetgv^nl2U- zo20S->k~B@wWF_L2aLF;dSYg?W{>qrX-fZaG31ZHe4(eISr_J|e{Oku@UvXAzX(&L zf{mUf);341_=lm9sl)0nERm_g(=~Q>iGL2SF5ebDdXrtMfhm_)@Ai({W6TdWr?&Ah zD~xxi*GsGUB;9DTpSEt!e(jc`*;i%+$WIS*|5omBdGc_6(TTe=K3ylCF(iR@eh|)EjPu?E^WHK z+re8l&&ng+a!ek|MG#7d)=KR+6L)wZd z`#wIt)P4)XvwT53qk0Pi)ZH+h|BH0`2kG>YZa+F+o{*{A*j{?1s_)zF>aWjqPRKAP z#h{V8%WB?aHNL%bFb!vL?#XE@Yj{`B-<h{OE6**$MQ*9>J+NzrJA z>l~kSTJ(Q^nfUfVW5Ia8mc%@MKB(`AnHC#oQP@u%HT$lzW;Ie|&pg=$o`QU|dUDZGZ!}*VnR#bH3PTbL-k3KYrW_ z%iEA!W>IxJJe)~y0!ip!gt5Nq4tCde{JCjf!ce=`GRI@ z@rpz1`#m(3dwlBp5(2~&4KGgEXniWNE>N>C+}^$C+i1Jjx8mH)S6R4s7`(C$(#l;a zpd@7E7j@~z-LY-#Gam8eDHFnjW5ReLYa|}BZR9Ey4B4T)E-WRN+kw>#i z*So`3O|NcN7fi5-jZHl|OxSp8?455FR&VybjB^uNV6Fb~={3#Xl!<{iZoe?u>HX5e zQz>5P1f4$tW4M`XwOw_UYn{iNITVaf4=~cZzK+Mp+|@?@o!5|DKbiQ6IB3ljcte|J zX|7nkvmhoP$5-y1&bK10(d=r(xifM3{ykj}?LG9$s||+o$))I~RUZ{u@!`>hT3+TV z_LO;7wYTBOZ~@M%vUU1ty!|V;bnH;K1pjywNVLozc-XvxJ;4E zd=;>);Rd|Q4mgY?>Q!4KFF5n|G$reVB{d%wP#(E0%wf&Md6ufLu;#gOx8I(N+TLL| z#kKBKA|(B&$B*v@&Nh-N0a24GA#Y&plN=leQ4#ueQgC33TJ0t#CbW- zt*cdo(J)tUeX+^DK&QPPs~FQ%qTwN$-BmDGI`ry?)tS!Cxt{%;^(Xq3yb#m znH!V07U=jjUvPQL)AKpovpyhdc~&a_`25lk~>BhmhJPCDQ~UV znczKoY2`f810OGiTv%)K6>@I$cKF%KFCq2!KOOw~aeevx;Y`_dSk|@a`4>F9igi53 zy|D27A#amcbZSPPhD@B$6zE^t26Ni_rE)V16~hmQ zETOGXAN)9ZTd926i+o?fJPcecKBFNzEjRnz{4Hzh<*Qq(^A>gwzen2viI8nFzT3wf=@N&pi^}(th^NCA$o0?i_&w)=tQO&#^Pp_s0ius5-s!v?BT^Gx> zkKM14#{IQ0vI4LZ$Mu?*e|xpX>hS0#BR}8m*==gIdwF+VkX7ruKdWKSu$GVG%`(@C zI}M#0&N(I{D+4W4K3zY5FUmRaf)RGjrVG!i<$c%&v*Gh_$!pn4*AEvQBt<-04~ri; zzVxlUHZ$)td#{USh*5iOX)ga+Sb}Tg6qNhAYSUI|!f%>j1=nu$(zpA!m=+&}_oFpy zL_`_J%19CS21|?v~h<{BTJ%tfimK1OHFYB7H76SIjnreQ~(2(K@$D>|djQ5LP!t^W=SL*Px9_D=!}l%nT1ucz;Gd zq!f>x%u4WAN&Bao0i)mUduit2{o*O)YEQ9b=nYy zhi$hjmTXx1X0KlTlxSIX=ZZJvc9ke|@l8E1I&G*|pyN_41+jxoH`}6?1SU>5H!w=d zvkNtI=7CW8%B1eAbSOlWx?KVKJnKTzy-Wkcjgq@ko~&`us6uEu=3A9#zx;ZwXVj>hn*rPXfRR>M-tb!cbHYB=Z7`Z;J=AncME%g3B!&4uHUL{Z!E zeD_X>i}!thnSIY!HXSRT3u&7W`PDA_$2Tna`-?b)bS+=+&a`vWcnNiyu=U}&@lr|e z;Y08(-1^`Ty^JMq_C9-@?({*PE2k1O^Lje_K7TBQvRp%k=g(FmQ=JAUr*@Sv+&E1- z+)n6aEZf&0v;<-0&zm%JG@LV@=OTs>xvqU-vQ$z7y!QC=IkH@QUhl`zika4!yNTGP ztj9nQ-;N6}O7azyIvSI3cbWF5iv6|6Yq1Do>>^0E6uh|W-jmq(y|Hk%5*uQ4Rr}Pg zdU0Xji;Zow%`|0it}?cbx(3TxMVN+0!ob)io3V=rJX3M%px z3geZpMGC7Jan>Wk^0fJZPhG(mVPz$iPZ^Q#s28byTyL4M`F<<==|e5!SqI$a?vR)w zm2Y*0w_qCY%~o=@thaEC?Eo*8`LF89F>H+KWMn6zY^ouo|{|@fWA3Aj#9goekgEx9yhiPqQ7XW{b(g|0_F1}SY z9yRyQ*9~qOI&uM7+$U97SAR9XF)5YKr|%!HoTw3WHT1vVWmdzVQ%Q!3_o`;-9NfAi z`%XYZS8JXCyLpj&pErDvWx6>B`H+}18P3gj%)l+={NlbCJ^dRP&OZTQnN93mJtf;%@10weYRIf$$w zF@{_*7TF$czFCcx=}vAMh1+eU-9y zUD;F3xfc$+bN_I`g_KGWN`;wy&N>ctOLTL{b@2O^Ynxl##@ee1qVpnLWp@D z+Q!*Iy*e>tUuf=PMfhO?u>4-*kPv5pImtDCqrJyBxH>Xf13JK zL&h61WT9`?r%GW+z3pMxC zVdib)$Y#}{j$FRE`H^4CrvLtUneA9{7;i0}9gEhDNU~f=(uY|UB*)$)~4M7$H zfRA+W`gHPdg`OiY5)QYWp|Ivv+@{;|rxsIWOCFY9#%{<1n(qMI7m^-(K4n z&UQD;*vmuUL|D-|pgsyD(b}K7u>!USvi`E4nmOl`4m#s7RfG#dQ4$+ft}+}YDnG9Y zkcWeYQPRSB>G@*JIgSd+a>+QreanxmFy4O2JL}ZE!`O}#a*gG$#k^3F8Zf*$EUI`a z&SV*UQR!*^yNq%8}`EUkJ8t`Ade$OPY0;uYw$O>r5%83e&)?qii5t1kqf{Ck-@CfD(5m-J3jvB>- z@E@CVG~RZ7vjCRr5Pg9lrY3--4%4*=Pv{jr1Ei-$E@oW41Q)*o{PxCktqFHTKL`uUVq40hr7Q z!5tHq?cGknzF=fU8lsEby5gYPq0B?F*}pTn@wFO#9mlFNaw$GmZ2h-|LZ-T4C-V$6i!NP5gg$+9^i?%`6Jr`*f{CbX;A+3_knpp;P-Cwn`l=-cRI6!FsdNYnUHnjPSNs z+2hA!8X6mGhpHNmGE965?!hCym)Ipa6m7=Y5ue31-+rj9*Dl8+V*sqW z%<pwJukM@2g|wD-EkIK>jtkPig_V8!OZfqjr411NhYK|MGJT-jZiVd>opf$%1* z&Y|RJ_lIzmN+blVnp0l}$hd{peQ<2g-jei1TGPm)xA%jJOXqkd4hcGDRupo3-VU|* z3TBH0_N2EUYpOUeFHR+7C8D@q>jLhHOKxCWKvkw660#@*IcoF+=`^@ z@Sv*U7V?e|+pB9@Ep7;qt`*LuP5b4xXF4iMSx}b25I@*-oG;WpM&3rvG4dJaXW^Q+ zFH-wLjjgL>b;rq-{5&U?x2qdNoN8^IfndoHbX7K$PK_-iUi5b~#3XE8ww&x)HG$>i zew)q?hjo!BaK9Qujcd}re|ZSM{M4XnLSCEUW_djwo7nee(zdX%@F1_r+mzbI#BtE# zJbuOekoH#)rra;3D&n{Bh_pZ@&+pH|r9(dtQB9>_UEldp6IRm-$Ag39!9X*0KxFP| z@6YXAabk*6jjhAziSr_o8l}@CW8nrmEIv3>>zoj!)c_=MfC&~znsB(k#UFkw>F1a_K1^a9CJGwNTvCjWumjf@rJ{-#1v{0aw9|yF5<{M9{~Z+{+_BllKo0k!+xYMjv!pk#{&@S zF&dB>1PRF>BK^pEb(w3d#x ztFZoj{|y2zsou5|o}&=P$QAx44t5D^U%~f@0 zYsm?Bst|5gcf7PnsBBDqu;6~a&dwPM!uugbhBXyP^O^FfzRB3n zSS#9;b561Nd_9i4%z1VdDQST!KYBU^vimv`^6t;gHuY88c4434jf8}RrWeuI=a^+2 z!3lpWDNnk)UlEz1JteavkKi0x;&H+)qo*Y^@08k^zm^F6#K_sY z-fY|n5}e16AM2*)eS(CuXiEJL7X1lL6~)kbo8J#{#e*d18) zW!;=9IxVV~m(#gTq3qLq877I9P_-P}v(}xv+nuvv-SWr#$@-oqJf^GBqJOdxC*i@o zH*u8GcMRKAndac&eR=Zy&8sFZw$;bsd24Xnmx_CISxIibL&nSdvI1U_cXr!F?A{H6 zN1%~A-`;^+YJ~)FeAdkqo4W}QCJzd-vxF>1N)e7GY5R6J=s*px>*-3@4u6Z@%PIC! z!=}C-c#ACyDH!7j$m5%vHO8puN}b)|;!QJ20|9Cmoz5sPwogq-qKvgw-qC{D+4tb0 z4<9{QNNU#UI;{;9)aiA9h2y*K;&KJ;V1q4Nw%By4Z)}FiswNan?~B~su9^@F&D4{< z3!7kXPw0I)F0P_XX+ej}i)CSWs!wm)&9gJ%j=p@J$oHq z0XCNIUtZ^l^(e1Hew2wLU}B_VQ{qZmZ_{b_12gXfp`32cb&?OZfQj3B@7N?OWN{PR zG@W|_wOro1ZmUm==!)G)p-AXB% zw3dv<8eUG+rD~uRu6!q{QL6k$?JJWEk~fc@*HwnoYp`g-1G!dag997{A96)20ZKY} z+nxh2;??#m$8-M}JHzybfGYXB%+;;XHI^a(SHhyJDY>*pI&QW?w1Q(@Q6hzO$Ox#! zbF1EEFP7$!g^T4dQGSmlC1*vAc8o4n>NF)(F89w7;-bp^y5vb*I#jMHcd*nQOfP*hxH~*r8_-4=svcuryG!BFJpl zec9x7^0mhn<{q20utti}m8DHt+=+CVKKBEhuoGBU`BB&;mFm~znS>mS4>a4wqU^)G zHUr6FijKja&20i+6(Y8JZBf#dk5!-mth6Gec$58|eJq}jYl(zY6b3v9H;>Ls~TVdt-w5aAoHnfPDPTSkN|QW>o!0oOfZ$I?F|}R7*RXi(pYWv=WHUZqw(4rFCg&v} zoSW$<&*tRLh1(v*t_p`c66;tur~JY`r1E_b{z(OeW@kf0Ltfn~o_YQV!hNHFk(7w9 zh7$czHH7IhqIr6s%8#w{hy{>a>pA2Jw0ROGZuUTleCB5NF7PPbOW9~jeMF0nsKmyv zOfbJgk(TsLIi6j`lFdwx3+=|NShyTVaGEMnG*yixnMb{XmVk1XB^fB02}wX%A663* z21eIILX31LH^06Oa7*18zkC6##zZWFWn&RcuczvYmgz`qny?bL1GyUn`FSAXY$qIt zxmFE(z+$1QJ76A8>aZW;sjAAfmceT(Tr4SC9k~6~pHqK&WD#rhmYLS@58N&k_{M18zI_fF zKDhib`2dW@wC38wJP;1fNM_SuDb>YX)AjeN|2ZE7q&{82Q-Hq>yz%!LM+UFNHmiED z)A}8MpPJ1+_fOngG?%1q!yaEn4!=WnHak(m6?A#=5|;F#Iy(&u(N2e3gplpn#B=A) z0jQcccVKjyl|lO#!)uhs9w3!~Yo5M6RNp7VY*%83`Sax~D!A?sYhfNAz?~7R$=J`c zDG5I3b{_f6-Wad+Q0E-SLy8;+fBUH|0SYs}B4V3aWr&1Sml2oK+-A+nX26APwoaF~ z1wZz(OFay;7#JU|WjAO1JE{(WuEKd7=7_Lp;2OMsaN_v;z#RW^;`{j^Bt(4q+rrFo z7~$0$eg4Psu1ecAC#HxI`6;sZ0Fe1SmnJ%B@Lv%>iDezvk5h&47?9n}* zSs5^sOPYwh5PdiK(J~oPD~M{Es$vn85r--Z~U?ou-c96 z!e^xnIZgVS!QKuZz{`y_Xv;|~DJ>Jx%8DgnfV%r>!v_8ihjQSZzuZJqWe;GXi!@cv znEr8~zuZJyKX8*~<={jA(@j5z2UgVJNSpo|KBn~oha0j{k0-M;DFB_#$T&jou#Mfr2ZdrM=#*~J%IpTR8f9e$=8zT-khw(nWHOH}kJfqLLCYOHB^z?f%ggAqr|EJacIRI80 z*|%Gz+Pz+qLb9AiE6(~JLWbu!Hj(o_E4)v46uaAHtj|CYPc%Vt5s7qik8|OmK3=(m zB>I6Rg+Jh3vxd`5avh=hLTvnEMFSl8J8eIqUCb<`xd%V|3drx&rKt{l z_;W}h&N=6R(1S2Lny&1J9!w&u348(=dV&6Y+kA_dY~pVCXQ`gC9b4 z2G)RFgu(gzd=>5ZzuwlgW1xRB zrA}9ni@pRz-r-y__?Im7tX(DNE9oTDoqfKyDqN)4!oK~b((S-(@#3n`^i#dbSxz4w zIeZ7ZU>_g3%;%D|FD&y$R&%bl(~C;+En_b@+?!O5@H0Tr_3yCzRLk|&zTfDr=KQ|g0n*EE>Q(KW%YQ(sShkovq3BrtGarPF^Hh+tJ9=~d^ z6-Id?=Brs{4uzU}9?#z}A2hSax9zLsZ4P@GC<5I#mj`vUc4z@H6AAY(@XdlWCl$kg znYu4v%!XCufRP8J+F)9vJ(f0|yzi6C6ccAnC;cYxXT!D;!mAg#fB%Z$C1nXdRlgu+ zEOd&*hI28O|8&w3^3OR>C1XU=eDx8(te^UTGE+L-T0@KeS6BXhFr-eL zfi__=NzX__yq@!5BzP067Ew+|PF_BXeByRnTR*rT73_eVE!Qt{wt!K?163Pv_jcL} zB3rZbIKC81@bho%lcUdHsFW`+8FbRA`snG^wU_Lx?jpT0Sg3UBIx0qv0zJ+5H9`Dc zaoc>EGWV4|!$>iYO-Y`lVQ!f1?3x?M zIa|6SK4SgOzdaq+Y4Alq?~FDXN?!cHoWN*jSoRjPp`L)bhvex;MHleP!YAfjZZo_KsD*-@lhG+ImI}%kA^AKfr6Ioqi+|1ih%T0n zb!5~HDijk<-|-J#^>f`re);i#V;H|I^Dq1T&*A~+dT{!j4cwQUJvMyP!=L$6!md~c zG{QL0;=AC?b-;mB;Cg&T>5KN&Y9tzX?i}n4&|9)-AnNr^Auh`Eva*7x?{lCgi3lSL zcq||N8uaeu{}oApCbnf#VVe^izh$t5u;k(hOq8`ZZX_A*X8( zGaQE?YHiQROPC1fPm@`(tK#lWi6k`>`>V-Lbhww*Ie_>coXYC#vt zX8ij~{Ntirh9C16E-~7?4|#_ z=9lH?W#2TLw#=Iy80SZJCxS`Za)0@eohRWI8?0EtV~uMfD_5K+Pv=-}a%)wkpDM4A z|A}{;BzD$GzX2PiD?0caX-omDCcixB>YX8k=>7X2Sjpv#3$8Yk!ujzZ$E7~FT@(#n z&HZ@|z$onQe=!Y?Akf(+O=~%@Y`=WU+Ida(0#Gs+_Oh{9*Akg7DoGA4pEYu2X!R}1h{ex^5z8KXu63?Q#8gwtO7|8YqnB#ay@WdyShYy`)= z(WeG4Z`r*@IZ1|vGd+qGD&2iMKHt^&^;e5`7xQDNJZ12`(M~{vIiPZMyfE$6EQ(cc zz^P@JGZXMqdPojLn(;#^ITJkx0}mJzID*(c;Jpe^vRqRxRloix~))LKxcW|s`?LoM2GE+z!}9M0^L~VV!3`O;v=ia5x-GNmY3*B`@z)6 zBPM5j`ulTxDBYvA^v$Bw{UPceW|Ehjks%^71zUtkHP&fhSLC4-#X=!)B(s`qfPs|d zDI+3wQRz-st$6>$nc88-<<)!px6xTr# zf8PGqcU?*hTl*40!OBI6u^$Un`W%Qmm_?7e?y2?0^XFVI2@%`M#B53OnGs*PF+HC#bmm$Jb}o#6g)|Yp@x4 z>CuP>T=!!O^N5*Q?mL{>NT7lD49m7~s!J9{MG7k-l{-U3$JcpEbRN8b99%V$h0&Fr zA>Z!oV_MB%z9RMvmF+7BZ`RaRkmVcBjtmsrYKy-j8FDd3I-Sa<&Z7bF|lUoOTeb8>)eVh8z!{ zH#gA#O_12G!IZY?Ft5F2h^y0v#JDYaWqG(nWSClj=*ILfelKoQ>KXN}U|q<#2F+lu zu7xu5g6Y$)KF2y6WT#wI`->APFij&>BC|5^jj_P;R#ju*2uLaG6YwPz04jU}ash0? zanD(lenzHgn7lA^c~cT_yDmVMQ76nwC_v1(;B?mbgiDvE^>&wf@)J-Sb5*YUpeHK~ z)~P#cRb&uU_Fw112yk&oQ^w?lTi4Y;lCho3V^n;>n3#}MrHKi>AmIy()Kb# zyKjZ80G10Iv}H;;|{Hxt+cXc_0VxtWO}k*N^rteuKQl zWR6_L_I@w4dB<|vrX?(MZko6otkOhmI(T55dMHsYnQ*pg0~lQ1VCvo*-#*9Jn24jq zH8th(I!&Q`?%2e3$@JJCRCx`4(&?Uf-dPIT`%#Z^#K6dGF{+inbn|jCv%)Biy6OcX zmZl&gRo}Q0;3p%r9(B&rnT?dQ0$YYH9NN>AQ{q#%zZ~U248`1>{-|gX~l%VrToHW#4{3jttjOQHND%AOH#c zSvsul?X~(Gr8(#Au1u3ZC0YC^=KSuADBU(`p7oHT>O&)@j4WOLWu2rk>SZ^zJ$rF# zRlLM@Nrxq_S1j5IqATstz7B)8uopBSUp;5IU*#|_@Fx8iNoE>Qrw92{Q+S*2omWhIUV`F64eyh-=dE9vsJk7rT!${_VFB}eaZ&;W{ zar+HDI)S(29-f&$L%aWFn6hTT8p-~#ec=y2CD&`&&k?YGtrmkcy&^*mo!+H=eEPAP_xu&}%F zhtB)2libeNz3j#DdCLEOK_Lp{h#s;BOMfq9vqnn`DA>ull(RNUnvpIb!{>694m6S+ zKiT22){(2*r4K}OqyjH%KYEuKknz@fNmo8E&FjW9}xHB+wE*Qtt<@*H5Z%%lgPSj zSU(7?3+yErTAOL@$55D*XyS8;dURDglw7P+ZwgRsnMlOYn{;V@!&lgozm}6ZIx>klaMvBh-W6X$3Q=aC{%jqopPyaHcFw zqb}6-rJxvoAx5skhNT5M9_>LTn_7})DohE@db1mZn9>L9(`7Z@?#=*AZ8Y6F&hBP` zuvL)O5??`TvcjbN4zB6~wv|OmK%LxSsstvkZw;?gpy}3ZASMPa^E3k{ym*Q;U_52^ zrI-?JoRyXrFQ97u?7@SkNmsTLWtD1TQFr_UtY1EoVyzj5?WgmtKZr6CG`9D}0zjNg z=0wW6LKKK}KewNvq9#9_7?12jSV)k7mH>Ed&C)P0Jrd1=;y z)8B+L&Bb^2WPJpwMY?l6Syu;1B@hrj$llcqRh>jqxCn&e1WHbzq~Q0q>O3DGDxHqk zl?#&6;U_9}7YM*L8V8b`O~6|Fm3-f|gND7Ik_s|7^MYVla2-p&^I-snaA+%TeIvprJ+uul8q#Muf5ZXVU)u zPcrw~sh!Wl`xddak<;ah&9c*9g%uhBr1;b$MxIM|CPi>g*H91?a{pTh5k~ZDR0>m;JzY>v3+0+Sx3*XgnMzp&#>obfe?lj<15t_(nL+L6 z6;SHQ#FCUZuo$<#ku8YWNE+Z4NwVUGpzDO5-36yd3UhXso}m^e#Hj}N1iV4yjY}@K zocDZ^@;!UUAg~|Vt6@Gm%v6YH^>fhpsNob+?&Znb_M%oV43Dw*tKl5#}tU?SV1ZuNnLeorb%I(@`WWIY_B@v=PY-`N0Otv zWndhH`exSLJ1%16`X_(+62gJdP(t3o$T4)=xSPzZ5wzL%2sLG!9B=kWt5E3(%ZxF2 zNpV)!P}L`-A#O3US;yskr%{zhSWyOLHmC^#-Z^dM(R?Y!kIdA&O>t;;(uOVv69ZR` zZLd8lvilF6vXCsXWYR6}h$0$O-xX>E!*Y#MgG@(h-@Tf;WjE?*MhzLke@u`8SDTAz z6{nKOOGp`F^HQ9@JU&2#Q)*&S5S4+(DRCIqsj`QCYut7(9_%8Z=W$$2aS1w<%+l7C zWt)$51{?f@m$l9>k;_6^w*z;d0i4A=itHmRC{nlWd#QS#5`)z+iO2Lh!XTE_A5{8X z!`_>LqCB(3W5~Pyaf$C$b1q{7$nprV%_5MflRqU@EFw#do8%2j$p9>Qy(?M%Au2rC zRs_t{KEdW-`G7m+4hUbBc`4*<0m(A8+y1ybVCG3mr*70(J4v?@_D>26Vg$1 zweChIl?$($q6GGRTT}-1u7X;!iG+0;TRQp6LJV^#$qJUPhj^WsoXFu8Y#kAEbn98caSepZySTO#Zl_@rCkq>D4XsCvAi&{p@C|6xg-7{DO&IWmE3+hb!H}9JAp}@&|%o@qU!rshYUn_3?uB< zkC<6godOk)&pMidkra?*om7CrTewZ9?iwa6%i(=m=?!^uFHi7_kcVP>oqvzPi51mB`R<8#e_dZ#TA%+^}oCCG@ui-_aN|i1Bo?iO%O~{T= zlO0s2V}amd=8aw9^*gySMOVozDxca$;i^vAmtv`K(kX&Qrv@1sTX}b_x+s_YU;&nJ zrq0E`wqu5ym)5S5ON$edS_LA%)$l?Ij&# z543Ysb^;&ySe5M=X1k48$Y^!pFX);~yhN(-*Dj;ZB;KfXk< zT7Hx>;SgP`rd%8QJJIUNhTtgFr&Z~HlIBobqt{I3BX8H7(c_a%R5hlWXnm!GJKs#Y zNbrWLt|x`)Rm0Kc+kCr9S^1O{ssndZ5oK8P2b}Gwco(8t;vCOKu;yL*o7naf({+}h zl?n8)_)aP#MCe71=T|iHIwGC*IkJ4Xz!cH%)a;`@g5V66C5n7&geb{g-xZ>QXJM`| zd=f{6sz<-HSzujsGV%EaO_)AvLPn;KW09>V7z$Gz62DzV*VDywol%E{ml98ZKlLra zb=~Mi>Sf=7WZJ#R3JuKj#RZKA=V@VyEv{YG!S-kvG~Vb@=XpP0$=Db0*j(jPHi%Gn z7z3=VWi5&;dw$0d`+oVC2MggBP+c{JzYf!5i2mNC?+!W}2@i?%nJdKfRxUGyNaW4+ zX!DmpwHk<|W7nSo9yoWugT0mub`3nRCp4P}PY4wZx3v#<|Hft(1vff9U$18HcJkSy zaB$~72vdOPEkwa%j;Iol!fJFYIj(0%h5sB+W@DgfN;XBlQQuo|z+#yu(TE?ccl7O{ zD&NQo#k!L#bJ+@DLkX+-u0yOQ2ZjfsU}z`o%@9)N&wJrKqF|Xwr4;PctP+;^%>j}O z9&cp0$FeN)9=Rh%(N5icM$R&e_M{L(HQ561!C83*|_DJ>!-J!`{1Iu-(qoR{}PanKt{O z|7$@a?Vpi%Kp@3&7Pl&3NAd`o4j!#0wom^Ru-MvFsT8zWVUqrO2a>){=VG4HVf9!R zMTVu7o8AT99%qh1%uAmAeW+(C2d2g9cjVVB^q^qN5Ak>r+Lx_8D6_bbZe|SgIFdGu z%GFS690$`@eZsSMOW4zp%6;FE9YLqIBsRl$3+*A4gX|BBpox=Bs5Y4^-Z&eCV|-L# z%i?=$b=qsZOuQE|$h3gZu$l^y+5S_r6-j@ogOPr~_@~PPx9pm(@KE2-$HMx&V= zCg^$+tLxjyW==$vTUgQ#;*(LX0`)D6Yk2#mH9b#I^8u>ZEf~0d`*;K#R$Z^F`h+8Q zHK4Zy+gwudV5NVDr=e^WRvs<6Nm2%p0_7x3Em*YCVR&?bOiN=Q(-^jpvVA88x3$up?`@F%*5 zq306}q-)5QsMM39;j#Z#q^4Sf*^I`*n}nIDwZF)quB6)Kr+YKsO~~$A4G2!AMk8H9 zZP;8)Be6s}CO@R2hiV!Z+?Uns-XaIPRBm0h2<2$ft}@kdZp0&ZH6owY^%;_YuAHRC zF$GJp4HQq^aV*q7U1LxKs$2ZVEbgh9v{NQ;#;S>qy@-HD-lmFzb&?sjF&c{8(@fS; z-iGS=>!1EWYVKayuKgb``A93~GHgF)CMAQq*EVH+dBg&3GUcI_!$L%(sE|j-(-ak! zHBtqM)S-}!IF&xLIQL@3!0?4CKR)TK9KTzhD}tecMAx9KcBD#gwSbJ(bRG0@F)#P+ zK=Hc4iWlTLsuV}oU5tT8xp+A`msx>U@<&X$Q$tkbQQ)rgfu(qo_1D)zVIj3StO=f5 z%%_5Ws<54gZ=cIkE@|zz)E&=e60BW~Px(oP`a z#8(ntx4jybOa{KP6q3~kwp}}IBJFWbj=*pEwtPXE!l|Fpm?#kj-G`bl?^wdR<4ez! z0{4q&au>@2KiS?-R=3x*2jXPS0tY<__WvMrCZ)xIN-l)mTjZzH^s z&53M(xi6PT>PX*@o z)hGexQ=8&yP3pzw|2l2mi-$F#EuCh)ox7lv_9(V&8p2}H-G5$G>_HG!Q67V6V-cGh z?sjj!TxRiQJ}~N%CGWCC{?S{zGZT15fS{_YWN5I|*qL%j@WnR?O-5Tv)7kNLqmLE8 z3|ebRZE5nb?W|Umh@%DUGwKXx5Kt-^s4_D%O&GSM|Ho<5nN_JfUnZj5`3R~K@3z~$ z%Q+NM>NmAq?sTQh5@beE)BksN`#>Eo5@q46F< zmnAGmEt=ZBl!&xbNRzhWtVFh_G9s>Z_XetPr|v7hd6W8WQ0qPFCQ1ho9rNf_CT90>l#0sm}0i)<_N)Mb`HQOBZaMTjahe9x< zQ|^O%2(I-#_qAM@dna8@hLd^*KBT501 zBd$jOk{szSyQUfX80JC#x3+a>7f33HumRYMxJ@9l!ctD8%(pz(Mh8@~Q-?u0?ebLe z<>7QJr%FT0ZaF`YbU8z@b$p!;4hP8`u9MW(Jxbj}>MpS`xs#^P<&rtodk-~_tv=MK z6K#8~DfvvfYJ}+ylHq^3?xtPj6;dxqw&)&M+C2kXJ6JXrexz=eEw$sBayI0ZA<``c zBx&$gYk5-_AbFDr*wqKs6)IS>edPSrX}3FP!m&(pv|H_1uK4L7`cvcqftf-bERbYl z$*3nc6~Bq0W@41*{;1_Wo7lbN{^b(*4A1TYieSswm+ma)j|~Uu)9U!*7bB^59i5cX zLTL=^F97{FXt~SnMT}uah@4xt#FX4}jqR5@Br;#mK{+&);Ti<+bE^{PmEoPiBS+1V z>y5424YP3Oy?;p6AuI}=9R5Sr4Y94mc;=}AXX_+f#!5`E<<3$0$!8$lOwaayun}!n zRw90e-}%?siPf_n@RLUsxG~D(8LLO$%G0431Sb2Bf>|x0^eDMVE}ZY`@L@)U2#CK7gXpZ&B_!GLC?g3E+v#=paD;U9X#~?j(rTk|*@>McnItk49iY^{-VVEY5iXxD5#(Vd2qjQ{NJe zf&-&D=XCncn5Ok1P@nKUu-inl<+qqYKaKLDeD4FihEaoRmMMkrW3c|e_+1$P^C&Fn z{~KR2^1oQve}j4{YsY>$0gCX@N+6exa%2Q>bP<;c837{NJ-)f6P~K)GTuWjvgiRHp z#I3$(981MPqa1%hG(-7M?V1QBBg{<-;n;Nlp|UsR2GL#S|KRIJuxtwmmi(W4|F^%X z<$sp${{zY4e0$3;C0}gMTsZn@VMhFZwwsuAI8|`baf?a-5HEQNwfYR>M~~Ysfk2P5Dj@;rCF^ky2>T;t3ApOJaV-f*JLKLCQ`r0PIxi7^o3j0Xmg* z_QoX$2+3pZ+R;oM)gmt*kcR&-q#CpV)*qvKyIQat7 zZC`PC#x$jstjN-!2Ayu74_5K1iM#JbGadq-sM8oFI6orW&}+^xsf5evuN`-T{2WRF zmaM;nESC%su{_S%5e=1sH0m5IGrtkeB@&B?D<$u7F;_{`x34B>xvRX?L-->4VYdPX z@S&EFOP@5nrc|93wRWq#a7J{5GEmh#>Vcv%jJZL1nuzhJ&Xx*0&=5t$!BME-A4R>I zdaoLzDQ)$h{IP0B*i0|4hWQ^)t{v)p*s%>rrrayM|qa_1L{>M0yB z8eV*UT#$dfJ=`kdASDu%go3&P9WD-e?J+lfU4T5IJx=GTrD%qEEIe4pF>IdiehNR) z(PT^#I^;-UITo#Kzjc@LtCZK-{4iTRV8YDxpW%s)M&F!7zA7#+L#lp!aE%(u!#>ZX zsGLpbg?Oe?z6+txTx!2&g*0ib=+dDawr`FLxfTSUuwQFHe5te&7ivJt_NSSGL|YFbk9&hw)G zODVmJm^7+8?9jxV{XP%s^KW|TG&S7oLl-}z0HIru^LTFJps20|(^Z9+`0FePI!z{U zhIeuQ654!IE)Ls7V;e{#@l9WE-j~V@eB)4j$C%po&|lX8E8>Bz41?^=b=s&WSAy9k; z>;hUt(PG3yuUZj=$z#?wBtYJ`!A@kqG=$p2#-ChTe5#aMQ;4Fz9-%V}KF>wdA((c`eq9cwnD3$>Q6;T2rq7hW2=ujjy6GA{h zP^zI0s7MF(QxHTf2_Vv>SCKB#EEJ`PbOR_1Qj{Ws^de`i@c-tVi*tMK&XvDk4B30X z`+Zk=*0Y`^Tm+PNMPgL%=wHb30rk5tJh{e@hxZL^BCr8=;t&K;ChY|56_(zI=_INI=7ZhSVFnsy6S(MRt)A_b;v{`0iBPyKllSgHT= z4sA5PD=ExFC{G>rDfJ6poRj5edc2>Wm#-iA;#3sfHqhz*p=97` z+v1&%kSR23jsaalLfpi%_^R@atLTx}r{n*DlzQG=9G z5G$klIM`zIkIycAlMH~AM#u?3?Y8%oT!iY1t5-qo10^1Ca+9w3EkJWBfx~UsQH?6X zRiluIExAYO$y*v71P)QJ0V9EB25QC0i-P+!!|n;ym7Q~8i{fAkz-ST9W3+>2CTgB)!{6%ZvxB@*WjUM}4eqWA>jB8$!YOPT zIkV0^xA#@T*F!cE&d_*}KaZp6LXDl($+P2_(nF%EZ*)a3{?gOZJ76i==yH+ZQKg|v zn)H~Ly=w{Km#6xJD+tj#c-!xRr6~kXU5BWMZ6c_kgJmB^qMIh5Tu`{x?>ICIW+I90 z`8NMJlzs|{D+ns_U>JEU@2hONji^Gx0``)O$drSoUc#e($e(#D5HSX!L;dh~exNv* zn@|3oAhwqq47(We8Aomvo_I$$257)V8VY=*rcSI$e7xYd!}*G@dp_$2P~d`$)~<+& z;RiEw0m%qBD)Ty^@y)JSvRQzB zXRX`y&QSTPgvOVMz>T)BYyDB5VA84@+tQ zhT?%)fFs7QBJf}1T1R+WlKy-Srm00!&5_R-cw@uyxB0K6x`9)Sv|th7W<*&D#8Feq z5&ZU84}E`}zZ$+b0dZ(z^HESQxC_krqd-r4WEExvg&S)eVnaOg9tcR=x@Ib6sa%9{ zZFsxAhWX@vz&vzPoPb$&PT~Z}sWPo*VxL0Hfio$oHWAT_!`2O{EMdPDF~50MttL3z z1J)Cay!M33xB11u7c!9sH9gXs&?~s}5c^>Y!~qW`PjDm5GSh_3X)x=o01EIW@wg(MchR$>cwhIAhN_!=Q56wajD+_Ag41A3zIS3|Sy&#|}Us8+vc z2q<{El5?5pGf`)oIp~Nc511ZFs|daKaTyb!1R@1xn<(nydf-kWpEFTeqvrkb8hY`O zYB+2xRf3WbUf#GJ^lh4we?eu9-f=u^2T9wj80^0js8+?(d@y82G6n1$w>a22&igtP zKECA|LJkNHRS+FafI{yWL{>>OQ{bJZMHa3GeKx#>$l(*QsA8HhSDl}Q>U*Mt3;=x* zc21=E;JnaWo4zV@!dsE9Co6nAXJG_Ll);kXX4 zt|ut?E|7+qNb&Ll{)Z5!Hw#sX2NW?5*H!pos_~w)^~x^*}m)hqzq0B0{g8S+wdMJo5}PvVoN<( zHA9aLT!h(JTnbA#i{!YuIn@0_*-tX59mkfhSH9@P_`Ic^SWbls>(}kX` z3}q9Gv}XdS2ptTd2EHxMQ3(Q~m@?GibyK7LguRbKH6UW6+Ze<#q~0&tz@ION@PWCJ zaBmIXqAb$UNU50`QYECIw~vAOygO*n7OIwHcxGOFW(N!nf(ETop%pHbr2N^UfX`~p za9aob=|g<+oEtL$!_}1Rjb|8Zisarp2pYZs?5LIEjcmO3Am~L@z^@u3AZcTLzNG^) zmI&3}7AOvesZKVf>ZN^zpjVfRAfSck@HLpjbJLHzuu6;PmE5bBPj&#RKCB&JIrrhx zahyH(wIxkoprs!BgMikfe!IB3IxW3CRaTY{^vF0@#FPQP0lbbz|6<$nV+M$e!c3{X zV3F?QLmnW-zC`V|CjVj-cyCPh#wLhc5jCp`3vyr>@2#6W@C+dyup`>Hiv>aY7uD9` zPJlg+iy(q`atpO*aU@T|9L8DZ5SkGwt3a&@UhG*YbvOP-xVQ&??Ze;LJP0=gtkwsr z{1ssAnW~dHkbETZ5k8!T_Y(6@={PGhp0aoX3Xu$D3bJV!G)43|BL8#CZ;rq%Ljzi) zf2=DsaGAkrAhuKi)H%8r^vqUpE(1M~>Tz?h-PRxbBSLDQoa++sA9PX_(EUN|ps|*4 zky)KC+?~oeQEv>Qjtw9;!VDNf!4xcpii(8}OMOIU2l>NzwqQ9>^TMeL7Hdv9LIy)@ zIE@|@gJ@!2F_OEk)~of`!aLpGwa_oCn;MKXHuGTlkd2nIe|NuxW*A8-*G?&ZgXjxy z@9k=U*pwM#jD})9?NDYy(gc_!;Gl30%#(^+h6RT!3=6vg>nFn3ZxgMVGqGlq;09|N=l7(SA=SUPZHkBQ^O3fO`6dP@)XiyF8(`*cyZItwejeyptrQA#iC`Ka$j9v*j{fncU0w}TLUe81 z*t@>txIuF7*#d`8W`Lw=qJO|=)B4&l8cG4e&%oky}6hIs)H9B^W64Bn99oj3gsYG*dqH(-RO z+88oOq1%X$BWQ#eI=1g1C19cqI=S!S?FPATHDDhz&^S${R|;QNZzY)8jV(4u5<=RbQSVl#LsbM){Th=?vCK=d*}xt+MW=Ffc!77- zTn(Au@dUL2ZOB&4VTm$W=TTrdgJ1-mEsb%69~B&@hhU)@zQYzZk^CfSYph&#&9xR# zQ=_5&B&&Cg#d=<^xa4X7_&gL=n}&-UpsA&O3^&`@A2tQ%9lS0`xO^t<8E`*GGK z#aqXw(%YinYo&BqN-}j4+PQrCu?ng&_NE);h+`pyB%Un9Bm*pX=*HY)5C&F-;+Sr= zAIvDL;G{TiAbDk7j_LtSLzAhv4>)Q7Ti3&PNuee$qKqNbMeLi@a#AqN=l%g3{w_}8 ztII96GwK1+cO$vO5}7zf7iLwdkdBQe3mTBz2%Y(v_7SH*$sZfBrjv*F2(FiA=x*Yw;I{CN*%lsvbg>6;t3-w z_N*gz^MU0<`4hyN$~~`YB<&k@CI&^wrQ2(ZE6y1 zZt%?U)<1jUTk?d#uGp&a925E-gDb5=H#?GKW7uNP6mD<@9@0Hefta|T_E^T=48&&h zT6Rqy0^8R9^HO7c;mnYs6H{fB5g17<$wtE57Ytg_*4L3#^9RQSyJl3sJ9yB} zH_$%2%Jn$@6*pI~b$67zQ!B4sT+_;9`LENX_q7fE$(poUd|LX;hVR_D%EtW>xHYR$ zUlYLT(u{Ydb3ciGHcG5F!~k;o1;uU079yG1&c}Tisg-Rk?Y-?!4bpo_Mo~DRdH7D6^_>G<63jHTq zDWy1i;cQt4Yc#Y7%@z)1P41nM$;8$mP-K6Ky$9hd`rB)5%3mhMx__*XZBKHf1(zM{ zxj&FSJv`X3;C^I51^6SDc;^QZ-iSngu>A= z+L_a$AM}8A0`Wp}-v@}g4f%}g1?9`qk-mNxra3Tu>q!eE$x)XnG}+HmsftA>dNQtW zfBpHQWAUbzpHJ@&Zds$6*Oh4<&8NDHV+L)?#nXW>-sfGU$F@+>$RD?YnvKrk$*a(| zo=9=CQ278*+#{+}1kCe#|K@uA`1oUr{6E)|zq`7Y3y(hb`o8IsYz)g!Jrcabg1%+sBZUMGk6!o??=CFe>{&2i-mDn1#{WtDr2vjCofw=0XcT zzAx2dhp_a;zr!t}YBqS44K*ZxzpOm6xI@HVvX*lNTXxG*%j(V;nDn=<<-JNcoUx|g zf3{cvaL$W(mH&kQU^@>o=tD(WU*7=7t0|Dil%zu7&s?L#S+Vlb7A&)<&LYJl#apH z)0X?yvmcXkE>#3ziOu$72J^!ipnI3<{arMw()oA&u;!wrb>KN~4cKMzQ)9`SjYv#% z*Clpxv^cD0IKh^JAN}!d#1$PjU==VFEaq}rCPL1DyQ+~ZLO=2FX!U^sd{INmaooIM zVHO_$r1Ea2*NIe*?Sj(1c_eia&aM$WcwXrQoOnPg030-yd*~;Xd1a{8333{lVhbc# zK@mRPRF&M1QzW3Emq_!(-U&>wM8&eQzKCcSA55K(;2*2@C#gUE-Az8#LrAzK=Rj~6 zZE2kq+8J&qNW&oVM{+3IE$ruP{M}TUZel5`@f}#+j6|nwpDF;mA5z_z{|u-3gveXt zupwql{AzjKqO;HDlI9~Xv97XR-lsVP4{H0VotQlp9&duN@h-@|VGIV7x@al;!m^_d zt3sqVoo~r6yMXnd1p)!_k1BzAsMCYWCgi@XN&#Eucz-Px27_WO6doO&zc)4dYmZs8 zALGF(SKG^QhzqC2as<*aUQ@b&7{vO*`#*G%klG0@CkrBhq(A$W>A!GvLLqTCnrUR= zP{ld3af7NY5k;2wi=jmc3AAJiOV8hPNqZVVoPS<7H=|ePrdghr@70RPnAjaGts)-F z6fj3h4aF$ywgHPkHMsymg0@^9ks7unm-o^68NCph^Hl-i8GU^yV zkJt@hhRr6SS}r-}z!TFIkLJYIF)u4Ux3~N?S66!BZ-8IbiJFg&&nLeA;v*#OL=Cqv z!PMjCA#9C>4G35qG>XT#Jex-a6c$;uZaf7?7|_T2zO62dURoF!1B)w};CvREpfpPA z8~~%&5fMusFby0$pr&%-%=^rfdkPf(X!#TzXHesef4tls*AIZ#L zu#X)x9d>_+eO57!Aj83O8ND@ufCH7%WkOmY&I(cO!$ztEKK>7;LU#vC6$4zSZ;(!= zlqeiZE!q*6ZnpyS$Gg{hW z31Qkl!3}E;>VR2L9vc|n{|rhHBFJrIR!bBa#0;Z82I+dlyz40%?};Nl->Vu|X^p%n zigho4lt+EYiP`yE0l@5mX#CEj!#^iO>xPv^kfJz-?dkcGDR;1n>IwkdmvGysw=rC2 zd;SUP+bH2AYoujFeZ>3s5|bZT^>7Ps$Spm(`y?ENHyP<;@oULwdE9gI3q?4@q?V%7phK*4uBP3||>|}UdG$ff7*vx@h^5H(2lC@8J z>uo7KO9#hGlD+54{hv6-ubtVaQ~XCuiH^VP=o`|jPAa~Y&`$?sLEwQoo&a&i*r!qN z0vFpJ^!Ql#bdNs@3K_a`$-hA4BYE>JH^p=XBd04U5RSIVs@f4?F9yxTbhcW*@i*tM zbys8OMmFtMEq=VWThVoLG{-UCb2JVv#VHnrW+<>BvM`5Oma*3du^z-ni$Rzp@6CH; zb+!gPIf27YM+g(p$6f_QV}4Laa&zC)g+(W@lY&%8h+NvU=fQfx^{mQ^athYprIHV> z`K(#LRkYO@PhkRQG$gd1Je<#{o>o}>e*UGnlhpTSQ0{)U=yvw4#+@iW@XUhNsZ=o;Q@sbdyus04}_ZA!S(`2Q;%;z z>9k*We(FI`%}m}BicEPOkbNT_zqD7bdjW7f%@ohAN-X=d@`jKe|3U*{-5z8J5Ch42EGj;Rr4|JHYhx_#Q&Oe@j#?*V%S(Hd%tXfYR`kC%d z_37Iz`Q`md%HnJb@kcagBUR^rv@aUT=NPO%t9Kg_qce(~pG_~l+mI!d2CsEbP|URh z^XBFDyzvCdZdspznJ>QlGx}(-o3lsK*y54!o+azfTxQ!uz}gtQO-i9C1xY+~_~Q+` z8d*|vjCHL0t5K?Nh_3u%qyK=3)@>h5ILM<-8;4r-7nKYyBcsAz?-LM^8h?*=hjU=# zHy>IDA=~H|E%Wt0a;a*OTcypd!hN@pENy7KiXvuA!2?Sy@Yff4*iuvMCyQ*US^g$? zQv&cPMw;QhFUFSk$gPnm^2)Kp1}f6^)iV}mG~QW8`OI1d*Wmeyu;gFe5$y>p77(HQ zK+2Z1W{;S$NB+ZKHE~w)CANzMqr;TxFDnB0xhZ)&Xt-_j0p_vp^|`cPy^a2Sqlv4o zkY-rPzZSyz-{Mjx9`at8!2qG>YT2a_bv{qPe6p~vjUAk%H`Ze`sjv{A79H?$1Jzd&3{&(ip-hFm32=J}?HQ+@wFp zcN;n70SH$KCJjn`x~SEKRFi}rP7@_89(nEH#qs83AvgNS5mM)KomltR+rY;{ z-F=HSs;a{?{BEnr(?a>1{g}Ume@5jZC?wrRlft;A%9#KMZ1ERH1O3brBl-Ok-#cw*fV7uF7$%9;{4oh~h2It3kbj_O#Llcm+dv4C&L1M@2 zN1qO2O{=nK^u>s+$uT$rw)I1?Za}m70{zeG@SKfIwo#tdQNjD$!;ed*Dh_rv*XzJe zc&P|R%*ZCqH@hvj7(1^}vkFP|BOe_4Bh!CFZUYb(hN(Akj3u-$+_Q@DPF?c2QvR5H z*?E|)FXHWC%TtHY+7GGh%?508I>2Zh0Wn*~K@p;4O5roQ(vgD5BTdw7E?emPA@+3v zeO&;dMe-T7zx>n|en}CPy!GZyw@POp(+`jUuGX(W%)?MZ3mZ2^&fAq1+gWPSsp(*5 z>4hyPr-~OrFlYy`%mDXcMRw@rZZ>C@*V@p0#wCo_5O3L~4V?{5`d|#<2_gCd&ea1| zwN?jcsfLoy{!0=PRP3BJ0QJOJkYq!B^@-mk?ZGf*!5JvWW2yNI#37RNuY8c93iMPK ziL5Srz{UTvBv|ctPw|`m7%zmaguvd8!zS55`h{TeSp^-J#0JzQEL^^;C`&^AiQt_h$G?A+#I5(Q1T9d zDNmJszmaH@3td(o<9i83~R%rdylxBKJO8_eo? zih&N1?{ah=+hZ#^>=n`aY?d4E2BnRRMIYdMoCDo9j%6!|d7I6; zjAiHaXRmpjzyjCh9R37FNn?q>WkKWeBZB4t-)aOa-H?~w)1zMSj=I}Nh<{9V)^Rq2 zX4GA8i5lEY2?-;8Fpe|1uHgipTAYhMa_j{VEUO?Bh!C2!W4E$_ zBG&A%wU(!I_fv)K|BWIjsx6B;w_PU+nK64@I>g1Tg;}SL5&us(cBbC2z~Nj`-QTET z2*#v`cl2(HH0zyMLv9~ThY-Hh<+KmTCB;Fo zomYj*Hbp9b16OMdK$jNh2I4dFceZ})ivcI1((PQvCYHy6AOov+B#Hu0dVS2x*jj#r zW_VZq#&jD?zgJfwJ*5kH8VbSG^OUIv_Fo=1=^3$Q%Ir4RLUv_3e_}gyHIH1OAN_sD z@!YB7^HGG_#Fyd)gRc~WT)Q2KC*KX1oTGVRxGf_M6`9DwbvfKoMQen{i zo}RmYRNwJb6CeHZ+;2oyAnZqiuXEA2@BX(BB*m;Po~D$a3ywc?0Ky&uq1v{xHu={- znM9@8mi(HKdz>$iyIcHS{`+Jp zLraM9{469tf6(?KeOhs|^aUzU1=d61HQJ<;Mp<@4wIF^a_8qD6Jc2nDP+L2-TNv9D7&J@4Icx0hfV4bouhh z3Wtsc`TDr#&ZIqCUJo_(e2rJdG_Ty5il?0KIERr$&E7uahi{Enki-sv$tMu{e!L#y zYf4HYEWBA`E}~i*dP;ivX8Z!o#5HQ-p#{hMbrbM+nuCh0K5Fj9&@yuM3U+=p# z*wW)2g*KcZRy=4+KmTeVrPQReeiP@$DyG9X8~i9V@sU^`u)Kf90LFm7N_{D@ne!U? zJHmoR6dr|f{V)yMzJrpHcxM0dHAg=2HWFqu0hxwO=cd{6HSHXO;dw5V{PY&!U*2|R z9s?yLf`b0Zb*7vv-lR)@4cK_m|0-ww&iIT5tFP?-Nn1C^A;=J7K2~}?Sp9N9Ku%$O zfC}dYX9dk3UGH0e1Zi6Y!leEO)3;A{Rc^Ud5zARIGeNms@ZXlGuuo`a17g2#lP*D_ zZN_X%>GGZ04(9sX9O3T1q!ksux&kZzgqY`vS{f_Q-_?8^_3tMfGdtBNlJ(AvuM7=D`2W(C(T)?o%sW z70>j+s0gR$CM;kV1kl*xNz+IhbOooQTOABFW<})lGW$P+0t6rQ*l7?IkzNTca7N@y zqrh85+F}w@7-&3~vDlqZC<{aa?B}Oe2jARcCC#f}e-FlgKVw+%EBT9+Ps7F;6WZG6N&wW-N?q?Xl{AVdYhO+It{ z3+Rvp1fOs-prv=9G&0DIw*r2oAowUN zEE-u_&|sVK;>Rh*D$nH;Nm4rLv&-+6f%5XEDo6%DU{GcD)PTl0J9dGRxC>MGCw?w( z!Y6tm-YOSp)xn zxAK+n$#t^}BUHk#w1iOqi|1;^PcQFrJ#jvX%UUaDGUmx6~7(LFTtKTp~;0ieStRr9vx@fJ&M}h({836`x`q|;ldq2ds zio3j8w$?-tw+Q`f$iHT6!-&WWA5rdZ;noq#jI%!H&)p`@9$xROqbFk` z5fq@o`G`T2F_8lUD)wsNCg<>u8#w0qyV&az%-*Sp(8Z@_^_O3HU)D=czM=GRu0PmQ zugGIkvdcDIoK@GRB@&bU?l^;H$9b#OmXCuP3E{^1kuHIgR52OOhUv?;3-#9v)d1UH zX{&nqV)TD)f3&@O(h5>$wTxF|^31XU*S72!U+CFjdU}Y?XOt0rYHZmsN9%hKuzCSj!&Gx&6uzyCXS4USJWYu6*yN1yksTt2fD)6_7rFREKgle=pw5u*{8@Fk zAl?}nYw^FiMe_+KO@gM9J~_DrJ|->UkVoDH_2p+QTko!tp5@GQ=9FoNm|0;|_GK@hZN`IBh0DKmoVAHJJ;UVMYn!G-2Hn(>vtp#^BSmUnJ>o<_{mNAvD21t}%5B;VuKsJR7b<k6V57tXq|Nv{T$e|Bq@Nqw^M_u<|BRJzGx zzNvC1t8vw(Q=A7irP0kSt+x@g!ZuZ>Nnz6ifnZuWm!{I!mZY3p5P7fuS#K<*a7weU zWh>{{_)6KnX^9&zIxG_MHEeHp^kvv7Wr}jZU13}=L`aF?>vkb;bDZ-RH$KyE5B8o9 z`Cg;i$2;I^;;GIt0AczeXT`TRkR|jjw8#Qv;LMmWpu}vQ|Swatmwd zebC4JtKl)kkvx0a(;0PTzbVFbDUNj^{A|DeQ?0M(;qJRLbmfExdl@_#Mk;;J7h@Yo z=lSeA;?+y{bABoJKV(sHHBUM50pU&3K1C$;6v^x}v;&IrJu!}nYx_4Ze~;U3Hu9!g4bClJWJny?#CrTb@S|HGl*=pz&V4#K^rfhl%DC=^ z**U~^&$_uN$40|o`_1R`hg7^Ci5m|TJ~o=VfwND~=y*5?vdR{Ao84$>Ty-;--A*Zt z^C_2cc$|*N3PgV$hcs0B!Vkxde;HNHwSByo_@A3w(lcVyj9uK7L$w(XLJ+D2;^IZU z+h6B{*lT<;vz){Cw8@;cok~rUFUa_GNPUrWR%7ndO=QGnBZXO)f&&cf{(;K#{yc+` zFS>=}Nqpx*H6J!3Umd)%q)}Z?4V_Xrq|fJdHN50_V5RM+7f@4Qm<-Je<_%gtB*j3J z5?53>D&7_?nB@>mQvb`Y)Pd$umOM4~_I*ig7U${i$=YUYg!gs3+Hqbb{e^LO{DD@3 zW8!U5e5@MnH2cv#!pmRN_iDXUExA>-?~X`p_MMzi!)9`ga$oEwn}Pckx6+c-$CtOH zTdR9(=64UfO-}U*IlS(sj7JlMpUS~~R>B{=t3>%a9EV+AEuRb}zFfxP`Iu=rA3oNv zeah+ir`&y|EN-;KI#+z76lN?9uWZkWz1KP30AYgf?spDioep2vM(Z34cba9|i}X8& z3iTeYlO0;j9SWfoj>IM}d{6h+YE$REhdf%yI#OHccgSUfM_eWf*4nbm_uy2?p+zrEVq;x^Vk z|HSzdn^O4mf&b|6wuUEO?)PF-Xx8dq+^k;uu5f~iZamF6^qkAt{RI(2WMUFDcd8V* zg#4+ih(oWjq*A{1zL$;wWb)+M`(E;lhmr5bxJLk0b^`ie0#g{6trzW}dlG_Q@5Q+a zz%s+B-Y6w<7Z5H8%u(7E6p_5hvrgUD)>Hxn5!Ki!c*KT=eK-jV9Hlb=eKfuWq5{E) z?ZHb{fQmvz#VCFix2%^tCI(RXLg+quV-qra|jr?9;r`cHb)eRfbM=0Zf+ z+cj~vt9E>5-EVzY01>O$sImY4M$`XrrIqp_B;cuZp_Y7&_1dH;`?K&HxkYpfFcQx1Xz+F zs`$Ypfm(3|@G;?$YO0yoE0C~o^!xKKh~AMI-=PD?+%%P7OGE%D0+dQ%k+AesI+d3R zONWwl7Z!QEC$&C!u*R|WK<=#)c@IIexLjK!IZt_s zba8pQKQR0>>ia~t81F1uQMVk&FBCDFM1CpQwAK{yiKwX@5e)W}>iNXGyYg;yNr3Hm z^F*cTORk?P`}2Pculy<}MJYO&l|9^;<47HDJ!bYuRHU?Anw!bVTcLr$mSwUM_OH?b zj>{svJ;JdughGxDA?$4997jSg5_92TaEhe_!aZBgrYATrTQsGo|NoEwUo6=6z!{$f Xw^Ixs1!g_0K0#eYTlwj!^Vk0uWhgTa literal 0 HcmV?d00001 diff --git a/BHoM_Windows_UI/Settings/SearchSettingsWindow.xaml b/BHoM_Windows_UI/Settings/SearchSettingsWindow.xaml new file mode 100644 index 0000000..0f61412 --- /dev/null +++ b/BHoM_Windows_UI/Settings/SearchSettingsWindow.xaml @@ -0,0 +1,72 @@ + + + + + + + + + + + + + + + + + + + The Buildings and + + Habitats object Model + + + SUSTAINABLE CODE AT SCALE + + + + + + + + + + + +