diff --git a/ExcelUI_Engine/Compute/ParseEnum.cs b/ExcelUI_Engine/Compute/ParseEnum.cs index ea57cb35..6b25d002 100644 --- a/ExcelUI_Engine/Compute/ParseEnum.cs +++ b/ExcelUI_Engine/Compute/ParseEnum.cs @@ -1,6 +1,6 @@ /* * This file is part of the Buildings and Habitats object Model (BHoM) - * Copyright (c) 2015 - 2025, the respective contributors. All rights reserved. + * Copyright (c) 2015 - 2026, 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,6 +39,9 @@ public static partial class Compute /**** Public Methods ****/ /*******************************************/ + [Description("Parses a string value to the specified enum type, matching either the enum member name or its description attribute.")] + [Input("value", "The string to parse into an enum value of type T.")] + [Output("enum", "The parsed enum value of type T, or the default value if no match is found.")] public static T ParseEnum(string value) { return (T)ParseEnum(typeof(T), value); @@ -46,6 +49,10 @@ public static T ParseEnum(string value) /*******************************************/ + [Description("Parses a string value to the specified enum type, matching either the enum member name or its description attribute.")] + [Input("enumType", "The enum type to parse the string value into.")] + [Input("value", "The string to parse into an enum value.")] + [Output("enum", "The parsed enum value, or null if no match is found.")] public static object ParseEnum(Type enumType, string value) { if (Enum.IsDefined(enumType, value)) @@ -69,3 +76,4 @@ public static object ParseEnum(Type enumType, string value) + diff --git a/ExcelUI_Engine/ExcelUI_Engine.csproj b/ExcelUI_Engine/ExcelUI_Engine.csproj index 313a4133..ad709eeb 100644 --- a/ExcelUI_Engine/ExcelUI_Engine.csproj +++ b/ExcelUI_Engine/ExcelUI_Engine.csproj @@ -1,35 +1,20 @@ - - - + - Debug - AnyCPU - {56039ED6-FBD5-4F45-936B-2116399AEEC3} +net472 Library - Properties BH.Engine.Excel - ExcelUI_Engine - v4.7.2 - 512 - true - - - true - full - false - ..\Build\ - DEBUG;TRACE - prompt - 4 - - - pdbonly - true ..\Build\ - TRACE - prompt - 4 + false + ExcelUI_Engine + https://github.com/BHoM/Excel_UI + BHoM + Copyright � https://github.com/BHoM + 9.0.0.0 + 9.1.0.0 + + + $(ProgramData)\BHoM\Assemblies\BHoM.dll @@ -46,23 +31,7 @@ False False - - - - - - - - + + - - - - - - - - - xcopy "$(TargetPath)" "$(ProgramData)\BHoM\Assemblies" /Y - diff --git a/ExcelUI_Engine/Properties/AssemblyInfo.cs b/ExcelUI_Engine/Properties/AssemblyInfo.cs deleted file mode 100644 index a72e3d6f..00000000 --- a/ExcelUI_Engine/Properties/AssemblyInfo.cs +++ /dev/null @@ -1,64 +0,0 @@ -/* - * This file is part of the Buildings and Habitats object Model (BHoM) - * Copyright (c) 2015 - 2025, 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 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("ExcelUI_Engine")] -[assembly: AssemblyDescription("https://github.com/BHoM/Excel_UI")] -[assembly: AssemblyConfiguration("")] -[assembly: AssemblyCompany("")] -[assembly: AssemblyProduct("BHoM")] -[assembly: AssemblyCopyright("Copyright © https://github.com/BHoM")] -[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("119988e5-0e23-4a5a-a2fa-c0336b2e68e9")] - -// 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("9.0.0.0")] -[assembly: AssemblyFileVersion("9.0.0.0")] - - - - - - diff --git a/ExcelUI_Engine/Query/ExcelUIWiki.cs b/ExcelUI_Engine/Query/ExcelUIWiki.cs index ee9cb93f..d0703b0e 100644 --- a/ExcelUI_Engine/Query/ExcelUIWiki.cs +++ b/ExcelUI_Engine/Query/ExcelUIWiki.cs @@ -1,6 +1,6 @@ /* * This file is part of the Buildings and Habitats object Model (BHoM) - * Copyright (c) 2015 - 2025, the respective contributors. All rights reserved. + * Copyright (c) 2015 - 2026, the respective contributors. All rights reserved. * * Each contributor holds copyright over their respective contributions. * The project versioning (Git) records all such contribution source information. @@ -50,3 +50,4 @@ public static string ExcelUIWiki(string page = null) } } + diff --git a/ExcelUI_Engine/Query/Explode.cs b/ExcelUI_Engine/Query/Explode.cs index 1f94b35f..87430b22 100644 --- a/ExcelUI_Engine/Query/Explode.cs +++ b/ExcelUI_Engine/Query/Explode.cs @@ -1,6 +1,6 @@ /* * This file is part of the Buildings and Habitats object Model (BHoM) - * Copyright (c) 2015 - 2025, the respective contributors. All rights reserved. + * Copyright (c) 2015 - 2026, the respective contributors. All rights reserved. * * Each contributor holds copyright over their respective contributions. * The project versioning (Git) records all such contribution source information. @@ -140,3 +140,4 @@ private static void GetPropertyDictionary(ref Dictionary dict, o + diff --git a/Excel_UI.sln b/Excel_UI.sln index fedbcea7..79283802 100644 --- a/Excel_UI.sln +++ b/Excel_UI.sln @@ -1,11 +1,11 @@ - + Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio Version 17 VisualStudioVersion = 17.0.32126.317 MinimumVisualStudioVersion = 10.0.40219.1 -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Excel_UI", "Excel_UI\Excel_UI.csproj", "{0FAF6FEB-80C3-474A-92BB-C886424CCBC8}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Excel_UI", "Excel_UI\Excel_UI.csproj", "{0FAF6FEB-80C3-474A-92BB-C886424CCBC8}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ExcelUI_Engine", "ExcelUI_Engine\ExcelUI_Engine.csproj", "{56039ED6-FBD5-4F45-936B-2116399AEEC3}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ExcelUI_Engine", "ExcelUI_Engine\ExcelUI_Engine.csproj", "{56039ED6-FBD5-4F45-936B-2116399AEEC3}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution diff --git a/Excel_UI/Addin/AddIn.cs b/Excel_UI/Addin/AddIn.cs index 7c885402..b9ab4a65 100644 --- a/Excel_UI/Addin/AddIn.cs +++ b/Excel_UI/Addin/AddIn.cs @@ -1,6 +1,6 @@ /* * This file is part of the Buildings and Habitats object Model (BHoM) - * Copyright (c) 2015 - 2025, the respective contributors. All rights reserved. + * Copyright (c) 2015 - 2026, the respective contributors. All rights reserved. * * Each contributor holds copyright over their respective contributions. * The project versioning (Git) records all such contribution source information. @@ -96,3 +96,4 @@ public static CallerFormula InstantiateCaller(string callerName, object selected + diff --git a/Excel_UI/Addin/AddIn_BackwardCompatibility.cs b/Excel_UI/Addin/AddIn_BackwardCompatibility.cs index cf3496e5..6d433694 100644 --- a/Excel_UI/Addin/AddIn_BackwardCompatibility.cs +++ b/Excel_UI/Addin/AddIn_BackwardCompatibility.cs @@ -1,6 +1,6 @@ /* * This file is part of the Buildings and Habitats object Model (BHoM) - * Copyright (c) 2015 - 2025, the respective contributors. All rights reserved. + * Copyright (c) 2015 - 2026, the respective contributors. All rights reserved. * * Each contributor holds copyright over their respective contributions. * The project versioning (Git) records all such contribution source information. @@ -77,15 +77,15 @@ private static List> Old_GetFormulas() string callerType = ""; try { - Range cell = row.Cells[1, 2]; + Range cell = (Range)row.Cells[1, 2]; callerType = cell.Value.ToString(); int col = 3; - cell = row.Cells[1, col++]; + cell = (Range)row.Cells[1, col++]; while (cell.Value != null && cell.Value is string && (cell.Value as string).Length > 0) { str += cell.Value; - cell = row.Cells[1, col++]; + cell = (Range)row.Cells[1, col++]; } } catch { } @@ -106,3 +106,4 @@ private static List> Old_GetFormulas() + diff --git a/Excel_UI/Addin/AddIn_Converts.cs b/Excel_UI/Addin/AddIn_Converts.cs index 5912f138..74eda1b6 100644 --- a/Excel_UI/Addin/AddIn_Converts.cs +++ b/Excel_UI/Addin/AddIn_Converts.cs @@ -1,6 +1,6 @@ /* * This file is part of the Buildings and Habitats object Model (BHoM) - * Copyright (c) 2015 - 2025, the respective contributors. All rights reserved. + * Copyright (c) 2015 - 2026, the respective contributors. All rights reserved. * * Each contributor holds copyright over their respective contributions. * The project versioning (Git) records all such contribution source information. @@ -177,3 +177,4 @@ public static object[] ToExcel(object[] input) + diff --git a/Excel_UI/Addin/AddIn_Formulas.cs b/Excel_UI/Addin/AddIn_Formulas.cs index 801f7c28..a36cafe3 100644 --- a/Excel_UI/Addin/AddIn_Formulas.cs +++ b/Excel_UI/Addin/AddIn_Formulas.cs @@ -1,6 +1,6 @@ /* * This file is part of the Buildings and Habitats object Model (BHoM) - * Copyright (c) 2015 - 2025, the respective contributors. All rights reserved. + * Copyright (c) 2015 - 2026, 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,9 +104,9 @@ public static void RestoreFormulas() for (int i = 2; i < 10000; i++) { // Recover the information about the formula - string formulaName = sheet.Cells[i, 1].Value as string; - string callerJson = sheet.Cells[i, 2].Value as string; - string oldFunction = sheet.Cells[i, 3].Value as string; + string formulaName = ((Range)sheet.Cells[i, 1]).Value as string; + string callerJson = ((Range)sheet.Cells[i, 2]).Value as string; + string oldFunction = ((Range)sheet.Cells[i, 3]).Value as string; if (formulaName == null || formulaName.Length == 0 || callerJson == null || callerJson.Length == 0) break; @@ -169,13 +169,13 @@ private static void UpdateEnumValues(string collectionName) { try { - string name = choicesSheet.Cells[i, 1].Value as string; + string name = ((Range)choicesSheet.Cells[i, 1]).Value as string; if (string.IsNullOrEmpty(name)) { // Need to add the choices here - this should not be needed on loading a sheet, but as a safety net - choicesSheet.Cells[i, 1].Value = collectionName; + ((Range)choicesSheet.Cells[i, 1]).Value = collectionName; for (int j = 0; j < enumChoices.Length; j++) - choicesSheet.Cells[i, j + 2].Value = enumChoices.GetValue(j).ToString(); + ((Range)choicesSheet.Cells[i, j + 2]).Value = enumChoices.GetValue(j).ToString(); break; } else @@ -247,11 +247,11 @@ private static void SaveCallerToHiddenSheet(CallerFormula caller) lock(m_Mutex) { // Get teh sheet ID - string sheetId = sheet.Cells[1, 1].Value as string; + string sheetId = ((Range)sheet.Cells[1, 1]).Value as string; if (sheetId == null) { sheetId = ToString(Guid.NewGuid()); - sheet.Cells[1, 1].Value = sheetId; + ((Range)sheet.Cells[1, 1]).Value = sheetId; } // Make sure there is a list of saved callers for this worksheet @@ -264,9 +264,9 @@ private static void SaveCallerToHiddenSheet(CallerFormula caller) m_SavedOnWorkbook[sheetId].Add(caller.Function); int row = m_SavedOnWorkbook[sheetId].Count + 1; - sheet.Cells[row, 1].Value = caller.Caller.GetType().Name; - sheet.Cells[row, 2].Value = caller.Caller.Write(); - sheet.Cells[row, 3].Value = caller.Function; + ((Range)sheet.Cells[row, 1]).Value = caller.Caller.GetType().Name; + ((Range)sheet.Cells[row, 2]).Value = caller.Caller.Write(); + ((Range)sheet.Cells[row, 3]).Value = caller.Function; } } }); @@ -309,3 +309,4 @@ private static void UpgradeCellsFormula(CallerFormula formula, string oldFunctio + diff --git a/Excel_UI/Addin/AddIn_GlobalSearch.cs b/Excel_UI/Addin/AddIn_GlobalSearch.cs index 4250cc67..636fe368 100644 --- a/Excel_UI/Addin/AddIn_GlobalSearch.cs +++ b/Excel_UI/Addin/AddIn_GlobalSearch.cs @@ -1,6 +1,6 @@ /* * This file is part of the Buildings and Habitats object Model (BHoM) - * Copyright (c) 2015 - 2025, the respective contributors. All rights reserved. + * Copyright (c) 2015 - 2026, the respective contributors. All rights reserved. * * Each contributor holds copyright over their respective contributions. * The project versioning (Git) records all such contribution source information. @@ -96,3 +96,4 @@ protected void GlobalSearch_ItemSelected(object sender, oM.UI.ComponentRequest e + diff --git a/Excel_UI/Addin/AddIn_Internalise.cs b/Excel_UI/Addin/AddIn_Internalise.cs index d0d831f0..ee149ef7 100644 --- a/Excel_UI/Addin/AddIn_Internalise.cs +++ b/Excel_UI/Addin/AddIn_Internalise.cs @@ -1,6 +1,6 @@ /* * This file is part of the Buildings and Habitats object Model (BHoM) - * Copyright (c) 2015 - 2025, the respective contributors. All rights reserved. + * Copyright (c) 2015 - 2026, 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,7 +107,7 @@ private static void WriteJsonToSheet(string sheetName, Dictionary ReadJsonFromSheet(string sheetName) { try { - string segment = sheet.Cells[i, 1].Value as string; + string segment = ((Range)sheet.Cells[i, 1]).Value as string; if (string.IsNullOrEmpty(segment)) break; else @@ -170,3 +170,4 @@ private static Dictionary ReadJsonFromSheet(string sheetName) + diff --git a/Excel_UI/Addin/AddIn_Objects.cs b/Excel_UI/Addin/AddIn_Objects.cs index b24dbc5e..69820dd8 100644 --- a/Excel_UI/Addin/AddIn_Objects.cs +++ b/Excel_UI/Addin/AddIn_Objects.cs @@ -1,6 +1,6 @@ /* * This file is part of the Buildings and Habitats object Model (BHoM) - * Copyright (c) 2015 - 2025, the respective contributors. All rights reserved. + * Copyright (c) 2015 - 2026, 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 static string ToString(Guid id) + diff --git a/Excel_UI/Addin/AddIn_OpenClose.cs b/Excel_UI/Addin/AddIn_OpenClose.cs index 7e570f83..e0b646ef 100644 --- a/Excel_UI/Addin/AddIn_OpenClose.cs +++ b/Excel_UI/Addin/AddIn_OpenClose.cs @@ -1,6 +1,6 @@ /* * This file is part of the Buildings and Habitats object Model (BHoM) - * Copyright (c) 2015 - 2025, the respective contributors. All rights reserved. + * Copyright (c) 2015 - 2026, the respective contributors. All rights reserved. * * Each contributor holds copyright over their respective contributions. * The project versioning (Git) records all such contribution source information. @@ -173,3 +173,4 @@ public void App_WorkbookClosed(Workbook workbook, ref bool cancel) + diff --git a/Excel_UI/Addin/AddIn_Workbook.cs b/Excel_UI/Addin/AddIn_Workbook.cs index 432f3c65..299a808b 100644 --- a/Excel_UI/Addin/AddIn_Workbook.cs +++ b/Excel_UI/Addin/AddIn_Workbook.cs @@ -1,6 +1,6 @@ /* * This file is part of the Buildings and Habitats object Model (BHoM) - * Copyright (c) 2015 - 2025, the respective contributors. All rights reserved. + * Copyright (c) 2015 - 2026, 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,12 +66,12 @@ public static Worksheet Sheet(string name, bool addIfMissing = true, bool isHidd // Look for the sheet in the active workbook Worksheet sheet = null; if (workbook.Sheets.OfType().Any(x => x.Name == name)) - sheet = workbook.Sheets[name]; + sheet = (Worksheet)workbook.Sheets[name]; // If sheet doesn't exist, create it if requested if (sheet == null && addIfMissing) { - sheet = workbook.Sheets.Add(); + sheet = (Worksheet)workbook.Sheets.Add(); sheet.Name = name; if (isHidden) @@ -155,7 +155,7 @@ public static string WorkbookId(Workbook workbook = null) if (workbook == null) return null; - DocumentProperties properties = workbook.CustomDocumentProperties; + DocumentProperties properties = (DocumentProperties)workbook.CustomDocumentProperties; foreach (DocumentProperty prop in properties) { if (prop.Name == "BHoM_Guid") @@ -209,3 +209,4 @@ public static List ReadData(string name) + diff --git a/Excel_UI/BHoM_UI_Overrides/Explode.cs b/Excel_UI/BHoM_UI_Overrides/Explode.cs index 09d51baf..7b8ba6f1 100644 --- a/Excel_UI/BHoM_UI_Overrides/Explode.cs +++ b/Excel_UI/BHoM_UI_Overrides/Explode.cs @@ -1,6 +1,6 @@ /* * This file is part of the Buildings and Habitats object Model (BHoM) - * Copyright (c) 2015 - 2025, the respective contributors. All rights reserved. + * Copyright (c) 2015 - 2026, the respective contributors. All rights reserved. * * Each contributor holds copyright over their respective contributions. * The project versioning (Git) records all such contribution source information. @@ -72,3 +72,4 @@ public ExplodeCaller() : base(typeof(Engine.Excel.Query).GetMethod("Explode")) { + diff --git a/Excel_UI/BHoM_UI_Overrides/SelectorMenu_RibbonXml.cs b/Excel_UI/BHoM_UI_Overrides/SelectorMenu_RibbonXml.cs index e2897fa4..512792d2 100644 --- a/Excel_UI/BHoM_UI_Overrides/SelectorMenu_RibbonXml.cs +++ b/Excel_UI/BHoM_UI_Overrides/SelectorMenu_RibbonXml.cs @@ -1,6 +1,6 @@ /* * This file is part of the Buildings and Habitats object Model (BHoM) - * Copyright (c) 2015 - 2025, the respective contributors. All rights reserved. + * Copyright (c) 2015 - 2026, 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,7 +66,12 @@ public void Select(string id) public object GetItem(string id) { if (m_ItemLinks.ContainsKey(id)) - return m_ItemLinks[id]; + { + SearchItem searchItem = m_ItemLinks[id]; + if (searchItem.Item == null && !string.IsNullOrEmpty(searchItem.Json)) + searchItem.Item = BH.Engine.Serialiser.Convert.FromJson(searchItem.Json); + return searchItem.Item; + } else return null; } @@ -83,14 +88,14 @@ protected override void AddSearchBox(XmlElement menu, List itemList) /*******************************************/ - protected override void AddTree(XmlElement menu, Tree itemTree) + protected override void AddTree(XmlElement menu, Tree itemTree) { AppendMenuTree(itemTree, menu); } /*******************************************/ - private void AppendMenuTree(Tree tree, XmlElement menu) + private void AppendMenuTree(Tree tree, XmlElement menu) { XmlDocument document = menu.OwnerDocument; XmlElement element; @@ -98,12 +103,12 @@ private void AppendMenuTree(Tree tree, XmlElement menu) if (tree.Children.Count > 0) { element = document.CreateElement("menu"); - foreach (Tree childTree in tree.Children.Values.OrderBy(x => x.Name)) + foreach (Tree childTree in tree.Children.Values.OrderBy(x => x.Name)) AppendMenuTree(childTree, element); } else { - object method = tree.Value; + SearchItem method = tree.Value; element = document.CreateElement("button"); element.SetAttribute("onAction", "FillFormula"); string description = method.IDescription(); @@ -126,7 +131,7 @@ private void AppendMenuTree(Tree tree, XmlElement menu) /**** Private Fields ****/ /*******************************************/ - private Dictionary m_ItemLinks = new Dictionary(); + private Dictionary m_ItemLinks = new Dictionary(); /*******************************************/ } @@ -137,3 +142,4 @@ private void AppendMenuTree(Tree tree, XmlElement menu) + diff --git a/Excel_UI/Caller/CallerFormula.cs b/Excel_UI/Caller/CallerFormula.cs index 39d54ad5..88d5fd60 100644 --- a/Excel_UI/Caller/CallerFormula.cs +++ b/Excel_UI/Caller/CallerFormula.cs @@ -1,6 +1,6 @@ /* * This file is part of the Buildings and Habitats object Model (BHoM) - * Copyright (c) 2015 - 2025, the respective contributors. All rights reserved. + * Copyright (c) 2015 - 2026, 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 @@ public virtual string GetName() + diff --git a/Excel_UI/Caller/CallerFormula_FillFormula.cs b/Excel_UI/Caller/CallerFormula_FillFormula.cs index c513d37a..f4561582 100644 --- a/Excel_UI/Caller/CallerFormula_FillFormula.cs +++ b/Excel_UI/Caller/CallerFormula_FillFormula.cs @@ -1,6 +1,6 @@ /* * This file is part of the Buildings and Habitats object Model (BHoM) - * Copyright (c) 2015 - 2025, the respective contributors. All rights reserved. + * Copyright (c) 2015 - 2026, 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 @@ protected virtual void Fill(ExcelReference cell) + diff --git a/Excel_UI/Caller/CallerFormula_MethodCall.cs b/Excel_UI/Caller/CallerFormula_MethodCall.cs index 1457590c..5d2a2c69 100644 --- a/Excel_UI/Caller/CallerFormula_MethodCall.cs +++ b/Excel_UI/Caller/CallerFormula_MethodCall.cs @@ -1,6 +1,6 @@ /* * This file is part of the Buildings and Habitats object Model (BHoM) - * Copyright (c) 2015 - 2025, the respective contributors. All rights reserved. + * Copyright (c) 2015 - 2026, the respective contributors. All rights reserved. * * Each contributor holds copyright over their respective contributions. * The project versioning (Git) records all such contribution source information. @@ -163,3 +163,4 @@ protected virtual List GetArgumentAttributes(List(FormulaDataAccessor accessor, int index) + diff --git a/Excel_UI/Components/oM/CreateData.cs b/Excel_UI/Components/oM/CreateData.cs index 4d489a9c..98241391 100644 --- a/Excel_UI/Components/oM/CreateData.cs +++ b/Excel_UI/Components/oM/CreateData.cs @@ -1,6 +1,6 @@ /* * This file is part of the Buildings and Habitats object Model (BHoM) - * Copyright (c) 2015 - 2025, the respective contributors. All rights reserved. + * Copyright (c) 2015 - 2026, 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 override string GetName() + diff --git a/Excel_UI/Components/oM/CreateDictionary.cs b/Excel_UI/Components/oM/CreateDictionary.cs index 5ddabec9..498ce2dd 100644 --- a/Excel_UI/Components/oM/CreateDictionary.cs +++ b/Excel_UI/Components/oM/CreateDictionary.cs @@ -1,6 +1,6 @@ /* * This file is part of the Buildings and Habitats object Model (BHoM) - * Copyright (c) 2015 - 2025, the respective contributors. All rights reserved. + * Copyright (c) 2015 - 2026, 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 class CreateDictionaryFormula : CallerFormula + diff --git a/Excel_UI/Components/oM/CreateEnum.cs b/Excel_UI/Components/oM/CreateEnum.cs index f0dca218..4ceff098 100644 --- a/Excel_UI/Components/oM/CreateEnum.cs +++ b/Excel_UI/Components/oM/CreateEnum.cs @@ -1,6 +1,6 @@ /* * This file is part of the Buildings and Habitats object Model (BHoM) - * Copyright (c) 2015 - 2025, the respective contributors. All rights reserved. + * Copyright (c) 2015 - 2026, 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 override string GetName() + diff --git a/Excel_UI/Components/oM/CreateObject.cs b/Excel_UI/Components/oM/CreateObject.cs index bc35a7da..9e51eff0 100644 --- a/Excel_UI/Components/oM/CreateObject.cs +++ b/Excel_UI/Components/oM/CreateObject.cs @@ -1,6 +1,6 @@ /* * This file is part of the Buildings and Habitats object Model (BHoM) - * Copyright (c) 2015 - 2025, the respective contributors. All rights reserved. + * Copyright (c) 2015 - 2026, the respective contributors. All rights reserved. * * Each contributor holds copyright over their respective contributions. * The project versioning (Git) records all such contribution source information. @@ -84,3 +84,4 @@ public override string GetName() + diff --git a/Excel_UI/Components/oM/CreateType.cs b/Excel_UI/Components/oM/CreateType.cs index 34730092..582d2eac 100644 --- a/Excel_UI/Components/oM/CreateType.cs +++ b/Excel_UI/Components/oM/CreateType.cs @@ -1,6 +1,6 @@ /* * This file is part of the Buildings and Habitats object Model (BHoM) - * Copyright (c) 2015 - 2025, the respective contributors. All rights reserved. + * Copyright (c) 2015 - 2026, 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 override string GetName() + diff --git a/Excel_UI/Excel_UI.csproj b/Excel_UI/Excel_UI.csproj index fdafdab0..6eacb90a 100644 --- a/Excel_UI/Excel_UI.csproj +++ b/Excel_UI/Excel_UI.csproj @@ -1,37 +1,23 @@ - - - + - Debug - AnyCPU - {0FAF6FEB-80C3-474A-92BB-C886424CCBC8} +net472 Library - Properties BH.UI.Excel - Excel_UI - v4.7.2 - 512 - - - - - - true - full - false - ..\Build\ - DEBUG;TRACE - prompt - 4 - - - pdbonly - true + true + true + true ..\Build\ - TRACE - prompt - 4 + false + en-US + true + https://github.com/BHoM/Excel_UI + Copyright © https://github.com/BHoM + 9.0.0.0 + 9.1.0.0 + + + $(ProgramData)\BHoM\Assemblies\Adapter_Engine.dll @@ -68,25 +54,6 @@ $(ProgramData)\BHoM\Assemblies\Data_oM.dll False - - ..\packages\ExcelDna.Integration.1.5.1\lib\net452\ExcelDna.Integration.dll - - - ..\packages\ExcelDna.IntelliSense.1.1.0\lib\net40\ExcelDna.IntelliSense.dll - - - ..\packages\ExcelDna.Registration.0.34.7\lib\net40\ExcelDna.Registration.dll - - - ..\packages\Microsoft.Office.Interop.Excel.15.0.4795.1000\lib\net20\Microsoft.Office.Interop.Excel.dll - True - - - False - True - ..\libs\office.dll - - False $(ProgramData)\BHoM\Assemblies\Reflection_Engine.dll @@ -97,16 +64,6 @@ $(ProgramData)\BHoM\Assemblies\Serialiser_Engine.dll False - - - - - - - - - - False $(ProgramData)\BHoM\Assemblies\UI_Engine.dll @@ -122,134 +79,32 @@ $(ProgramData)\BHoM\Assemblies\Versioning_oM.dll False + + ..\libs\office.dll + False + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - True - True - Resources.resx - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - ResXFileCodeGenerator - Resources.Designer.cs - - - - - - - - {56039ed6-fbd5-4f45-936b-2116399aeec3} - ExcelUI_Engine - + - - - xcopy "$(TargetPath)" "$(ProgramData)\BHoM\Assemblies" /Y - -xcopy "$(TargetDir)*.xll" "$(ProgramData)\BHoM\Assemblies" /Y -xcopy "$(TargetDir)*.dna" "$(ProgramData)\BHoM\Assemblies" /Y -xcopy "$(TargetDir)ExcelDna.IntelliSense.dll" "$(ProgramData)\BHoM\Assemblies" /Y -xcopy "$(TargetDir)ExcelDna.Registration.dll" "$(ProgramData)\BHoM\Assemblies" /Y - -call "$(DevEnvDir)..\..\VC\Auxiliary\Build\vcvarsall.bat" x86 -call "$(DevEnvDir)..\Tools\VsDevCmd.bat" -xcopy "$(ProjectDir)..\packages\ExcelDna.Integration.1.5.1\lib\net452\ExcelDna.Integration.dll" "$(ProgramData)\BHoM\Assemblies" /Y -tlbexp.exe "$(ProgramData)\BHoM\Assemblies\$(TargetName)$(TargetExt)" /out:"$(ProgramData)\BHoM\Assemblies\$(TargetName).tlb" -del "$(ProgramData)\BHoM\Assemblies\ExcelDna.Integration.dll" - - Program C:\Program Files\Microsoft Office\root\Office16\EXCEL.EXE - false - - - en-US C:\Program Files\Microsoft Office\root\Office16\EXCEL.EXE Program - false - - - - This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. - - - diff --git a/Excel_UI/Helpers/RunBestComMethod.cs b/Excel_UI/Helpers/RunBestComMethod.cs index 7f5a47da..8fb28ba8 100644 --- a/Excel_UI/Helpers/RunBestComMethod.cs +++ b/Excel_UI/Helpers/RunBestComMethod.cs @@ -1,6 +1,6 @@ /* * This file is part of the Buildings and Habitats object Model (BHoM) - * Copyright (c) 2015 - 2025, the respective contributors. All rights reserved. + * Copyright (c) 2015 - 2026, 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 List CastList(List list, T first) + diff --git a/Excel_UI/Properties/AssemblyInfo.cs b/Excel_UI/Properties/AssemblyInfo.cs deleted file mode 100644 index 37a490fb..00000000 --- a/Excel_UI/Properties/AssemblyInfo.cs +++ /dev/null @@ -1,64 +0,0 @@ -/* - * This file is part of the Buildings and Habitats object Model (BHoM) - * Copyright (c) 2015 - 2025, 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 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("Excel_UI")] -[assembly: AssemblyDescription("https://github.com/BHoM/Excel_UI")] -[assembly: AssemblyConfiguration("")] -[assembly: AssemblyCompany("")] -[assembly: AssemblyProduct("BHoM")] -[assembly: AssemblyCopyright("Copyright © https://github.com/BHoM")] -[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("0faf6feb-80c3-474a-92bb-c886424ccbc8")] - -// 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("9.0.0.0")] -[assembly: AssemblyFileVersion("9.0.0.0")] - - - - - - diff --git a/Excel_UI/Properties/Resources.Designer.cs b/Excel_UI/Properties/Resources.Designer.cs index ddd5ec30..6e5f1918 100644 --- a/Excel_UI/Properties/Resources.Designer.cs +++ b/Excel_UI/Properties/Resources.Designer.cs @@ -1,6 +1,6 @@ /* * This file is part of the Buildings and Habitats object Model (BHoM) - * Copyright (c) 2015 - 2025, the respective contributors. All rights reserved. + * Copyright (c) 2015 - 2026, 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 @@ internal static System.Drawing.Bitmap BHoM_Logo { + diff --git a/Excel_UI/Properties/launchSettings.json b/Excel_UI/Properties/launchSettings.json new file mode 100644 index 00000000..fd6dca43 --- /dev/null +++ b/Excel_UI/Properties/launchSettings.json @@ -0,0 +1,9 @@ +{ + "profiles": { + "Excel": { + "commandName": "Executable", + "executablePath": "C:\\Program Files\\Microsoft Office\\root\\Office16\\EXCEL.EXE", + "commandLineArgs": "/x \"BHoM-AddIn64.xll\"" + } + } +} \ No newline at end of file diff --git a/Excel_UI/Ribbon/Ribbon.cs b/Excel_UI/Ribbon/Ribbon.cs index 92ca46c3..30edd8f6 100644 --- a/Excel_UI/Ribbon/Ribbon.cs +++ b/Excel_UI/Ribbon/Ribbon.cs @@ -1,6 +1,6 @@ /* * This file is part of the Buildings and Habitats object Model (BHoM) - * Copyright (c) 2015 - 2025, the respective contributors. All rights reserved. + * Copyright (c) 2015 - 2026, 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 void OpenLink(IRibbonControl control) + diff --git a/Excel_UI/Ribbon/Ribbon_Condense.cs b/Excel_UI/Ribbon/Ribbon_Condense.cs index 2e1a55f6..74655f61 100644 --- a/Excel_UI/Ribbon/Ribbon_Condense.cs +++ b/Excel_UI/Ribbon/Ribbon_Condense.cs @@ -1,6 +1,6 @@ /* * This file is part of the Buildings and Habitats object Model (BHoM) - * Copyright (c) 2015 - 2025, the respective contributors. All rights reserved. + * Copyright (c) 2015 - 2026, 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 object Condense(object item) + diff --git a/Excel_UI/Ribbon/Ribbon_Expand.cs b/Excel_UI/Ribbon/Ribbon_Expand.cs index 6813d9ad..b2d9c561 100644 --- a/Excel_UI/Ribbon/Ribbon_Expand.cs +++ b/Excel_UI/Ribbon/Ribbon_Expand.cs @@ -1,6 +1,6 @@ /* * This file is part of the Buildings and Habitats object Model (BHoM) - * Copyright (c) 2015 - 2025, the respective contributors. All rights reserved. + * Copyright (c) 2015 - 2026, 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 @@ public static object Expand(object item, bool transpose = false, bool onlyExpand + diff --git a/Excel_UI/Ribbon/Ribbon_Internalise.cs b/Excel_UI/Ribbon/Ribbon_Internalise.cs index 5570a243..b1777bda 100644 --- a/Excel_UI/Ribbon/Ribbon_Internalise.cs +++ b/Excel_UI/Ribbon/Ribbon_Internalise.cs @@ -1,6 +1,6 @@ /* * This file is part of the Buildings and Habitats object Model (BHoM) - * Copyright (c) 2015 - 2025, the respective contributors. All rights reserved. + * Copyright (c) 2015 - 2026, the respective contributors. All rights reserved. * * Each contributor holds copyright over their respective contributions. * The project versioning (Git) records all such contribution source information. @@ -55,3 +55,4 @@ public void Internalise(IRibbonControl control) + diff --git a/Excel_UI/Templates/CallerValueListFormula.cs b/Excel_UI/Templates/CallerValueListFormula.cs index eb1af8f9..e837b9e4 100644 --- a/Excel_UI/Templates/CallerValueListFormula.cs +++ b/Excel_UI/Templates/CallerValueListFormula.cs @@ -1,6 +1,6 @@ /* * This file is part of the Buildings and Habitats object Model (BHoM) - * Copyright (c) 2015 - 2025, the respective contributors. All rights reserved. + * Copyright (c) 2015 - 2026, the respective contributors. All rights reserved. * * Each contributor holds copyright over their respective contributions. * The project versioning (Git) records all such contribution source information. @@ -137,13 +137,13 @@ protected string GetChoicesFormula(string collectionName, List choices) { try { - string name = sheet.Cells[i,1].Value as string; + string name = ((Range)sheet.Cells[i,1]).Value as string; if (string.IsNullOrEmpty(name)) { // Need to add the choices here - sheet.Cells[i, 1].Value = collectionName; + ((Range)sheet.Cells[i, 1]).Value = collectionName; for (int j = 0; j < choices.Count; j++) - sheet.Cells[i, j + 2].Value = choices[j]; + ((Range)sheet.Cells[i, j + 2]).Value = choices[j]; break; } else if (collectionName == name) @@ -170,3 +170,4 @@ protected string GetChoicesFormula(string collectionName, List choices) + diff --git a/Excel_UI/Templates/FormulaDataAccessor.cs b/Excel_UI/Templates/FormulaDataAccessor.cs index 3fa8781b..ade9dd52 100644 --- a/Excel_UI/Templates/FormulaDataAccessor.cs +++ b/Excel_UI/Templates/FormulaDataAccessor.cs @@ -1,6 +1,6 @@ /* * This file is part of the Buildings and Habitats object Model (BHoM) - * Copyright (c) 2015 - 2025, the respective contributors. All rights reserved. + * Copyright (c) 2015 - 2026, the respective contributors. All rights reserved. * * Each contributor holds copyright over their respective contributions. * The project versioning (Git) records all such contribution source information. @@ -280,3 +280,4 @@ private T CastItem(object item) + diff --git a/Excel_UI/VBA/Adapter.cs b/Excel_UI/VBA/Adapter.cs index a1e0d3c0..f71b63c8 100644 --- a/Excel_UI/VBA/Adapter.cs +++ b/Excel_UI/VBA/Adapter.cs @@ -1,6 +1,6 @@ /* * This file is part of the Buildings and Habitats object Model (BHoM) - * Copyright (c) 2015 - 2025, the respective contributors. All rights reserved. + * Copyright (c) 2015 - 2026, the respective contributors. All rights reserved. * * Each contributor holds copyright over their respective contributions. * The project versioning (Git) records all such contribution source information. @@ -166,3 +166,4 @@ public int Remove(Object request, Object actionConfig = null) + diff --git a/Excel_UI/VBA/Collection.cs b/Excel_UI/VBA/Collection.cs index 9ee89468..7ac88722 100644 --- a/Excel_UI/VBA/Collection.cs +++ b/Excel_UI/VBA/Collection.cs @@ -1,6 +1,6 @@ /* * This file is part of the Buildings and Habitats object Model (BHoM) - * Copyright (c) 2015 - 2025, the respective contributors. All rights reserved. + * Copyright (c) 2015 - 2026, the respective contributors. All rights reserved. * * Each contributor holds copyright over their respective contributions. * The project versioning (Git) records all such contribution source information. @@ -123,3 +123,4 @@ public bool Remove(object item) + diff --git a/Excel_UI/VBA/ComConverter.cs b/Excel_UI/VBA/ComConverter.cs index 186c386c..bc2f6263 100644 --- a/Excel_UI/VBA/ComConverter.cs +++ b/Excel_UI/VBA/ComConverter.cs @@ -1,6 +1,6 @@ /* * This file is part of the Buildings and Habitats object Model (BHoM) - * Copyright (c) 2015 - 2025, the respective contributors. All rights reserved. + * Copyright (c) 2015 - 2026, the respective contributors. All rights reserved. * * Each contributor holds copyright over their respective contributions. * The project versioning (Git) records all such contribution source information. @@ -275,3 +275,4 @@ private static object TransferData(IList source, IList target) + diff --git a/Excel_UI/VBA/Dictionary.cs b/Excel_UI/VBA/Dictionary.cs index 4939d3df..9ddb4bd9 100644 --- a/Excel_UI/VBA/Dictionary.cs +++ b/Excel_UI/VBA/Dictionary.cs @@ -1,6 +1,6 @@ /* * This file is part of the Buildings and Habitats object Model (BHoM) - * Copyright (c) 2015 - 2025, the respective contributors. All rights reserved. + * Copyright (c) 2015 - 2026, the respective contributors. All rights reserved. * * Each contributor holds copyright over their respective contributions. * The project versioning (Git) records all such contribution source information. @@ -139,3 +139,4 @@ public bool ContainsKey(string key) + diff --git a/Excel_UI/VBA/Enum.cs b/Excel_UI/VBA/Enum.cs index 6171656a..48eab8ac 100644 --- a/Excel_UI/VBA/Enum.cs +++ b/Excel_UI/VBA/Enum.cs @@ -1,6 +1,6 @@ /* * This file is part of the Buildings and Habitats object Model (BHoM) - * Copyright (c) 2015 - 2025, the respective contributors. All rights reserved. + * Copyright (c) 2015 - 2026, the respective contributors. All rights reserved. * * Each contributor holds copyright over their respective contributions. * The project versioning (Git) records all such contribution source information. @@ -148,3 +148,4 @@ public string[] GetPossibleValues() + diff --git a/Excel_UI/VBA/Object.cs b/Excel_UI/VBA/Object.cs index 4ed07b57..619a643d 100644 --- a/Excel_UI/VBA/Object.cs +++ b/Excel_UI/VBA/Object.cs @@ -1,6 +1,6 @@ /* * This file is part of the Buildings and Habitats object Model (BHoM) - * Copyright (c) 2015 - 2025, the respective contributors. All rights reserved. + * Copyright (c) 2015 - 2026, the respective contributors. All rights reserved. * * Each contributor holds copyright over their respective contributions. * The project versioning (Git) records all such contribution source information. @@ -229,3 +229,4 @@ public Type GetCSharpType() + diff --git a/Excel_UI/VBA/PushType.cs b/Excel_UI/VBA/PushType.cs index 4554c5f2..9c480920 100644 --- a/Excel_UI/VBA/PushType.cs +++ b/Excel_UI/VBA/PushType.cs @@ -1,6 +1,6 @@ /* * This file is part of the Buildings and Habitats object Model (BHoM) - * Copyright (c) 2015 - 2025, the respective contributors. All rights reserved. + * Copyright (c) 2015 - 2026, the respective contributors. All rights reserved. * * Each contributor holds copyright over their respective contributions. * The project versioning (Git) records all such contribution source information. @@ -61,3 +61,4 @@ public enum PushType + diff --git a/Excel_UI/VBA/Server.cs b/Excel_UI/VBA/Server.cs index a7bab8c6..1127a30e 100644 --- a/Excel_UI/VBA/Server.cs +++ b/Excel_UI/VBA/Server.cs @@ -1,6 +1,6 @@ /* * This file is part of the Buildings and Habitats object Model (BHoM) - * Copyright (c) 2015 - 2025, the respective contributors. All rights reserved. + * Copyright (c) 2015 - 2026, the respective contributors. All rights reserved. * * Each contributor holds copyright over their respective contributions. * The project versioning (Git) records all such contribution source information. @@ -163,3 +163,4 @@ public Adapter CreateAdapter(string adapterName, string filePath, Object toolkit + diff --git a/Excel_UI/packages.config b/Excel_UI/packages.config deleted file mode 100644 index e5232f55..00000000 --- a/Excel_UI/packages.config +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - - - \ No newline at end of file