From 88d31439fea3a23c66d2083f1a19f3d3f94c5dfc Mon Sep 17 00:00:00 2001 From: "HALUK\\thomas.corrie" Date: Tue, 15 Jan 2019 18:01:46 +0000 Subject: [PATCH 1/4] Temp changes to Namespace to avoid conflicts --- .../PackingService/PackContainer.cs | 34 +++++++++---------- .../PackingService/PackContainers.cs | 4 +-- .../PackContainersWithGroups.cs | 4 +-- .../PackContainersWithGroupsContinuously.cs | 4 +-- Miscellany/{List/List.cs => Lists/Lists.cs} | 2 +- Miscellany/{Math => Maths}/Functions.cs | 2 +- Miscellany/Miscellany.Migrations.xml | 19 +++++++++++ Miscellany/Miscellany.csproj | 8 +++-- Miscellany/Miscellany_DynamoCustomization.xml | 17 ++++++---- 9 files changed, 60 insertions(+), 34 deletions(-) rename Miscellany/{List/List.cs => Lists/Lists.cs} (96%) rename Miscellany/{Math => Maths}/Functions.cs (98%) create mode 100644 Miscellany/Miscellany.Migrations.xml diff --git a/Miscellany/ContainerPacking/PackingService/PackContainer.cs b/Miscellany/ContainerPacking/PackingService/PackContainer.cs index 0309902..54bdbac 100644 --- a/Miscellany/ContainerPacking/PackingService/PackContainer.cs +++ b/Miscellany/ContainerPacking/PackingService/PackContainer.cs @@ -55,8 +55,8 @@ public static Dictionary PackContainer(Miscellany.ContainerPacki AlgorithmPackingResult algorithmPackingResult = containerPackingResult.AlgorithmPackingResults.FirstOrDefault(); bool IsCompletePack = algorithmPackingResult.IsCompletePack; int PackTimeInMilliseconds = Convert.ToInt32(algorithmPackingResult.PackTimeInMilliseconds); //Max limit of int32 for milliseconds is596 hours - double PercentContainerVolumePacked = Miscellany.Math.Functions.ToDouble(algorithmPackingResult.PercentContainerVolumePacked); - double PercentItemVolumePacked = Miscellany.Math.Functions.ToDouble(algorithmPackingResult.PercentItemVolumePacked); + double PercentContainerVolumePacked = Miscellany.Maths.Functions.ToDouble(algorithmPackingResult.PercentContainerVolumePacked); + double PercentItemVolumePacked = Miscellany.Maths.Functions.ToDouble(algorithmPackingResult.PercentItemVolumePacked); //int BestFitOrientation = algorithmPackingResult.best //Convert CromulentBisgetti items to Miscellany Items @@ -94,9 +94,9 @@ public static Dictionary PackContainer(Miscellany.ContainerPacki //Convert a CromulentBisgetti Item to a Miscellany Item private static Miscellany.ContainerPacking.Entities.Item ItemToMiscellany(Item i) { - double ddim1 = Miscellany.Math.Functions.ToDouble(i.Dim1); - double ddim2 = Miscellany.Math.Functions.ToDouble(i.Dim2); - double ddim3 = Miscellany.Math.Functions.ToDouble(i.Dim3); + double ddim1 = Miscellany.Maths.Functions.ToDouble(i.Dim1); + double ddim2 = Miscellany.Maths.Functions.ToDouble(i.Dim2); + double ddim3 = Miscellany.Maths.Functions.ToDouble(i.Dim3); //Create Item Miscellany.ContainerPacking.Entities.Item mItem = new Miscellany.ContainerPacking.Entities.Item(i.ID, ddim1, ddim2, ddim3, i.Quantity); //Add packed information @@ -104,12 +104,12 @@ private static Miscellany.ContainerPacking.Entities.Item ItemToMiscellany(Item i if (i.IsPacked) { //Swap Y and Z values to shift from the CromulentBisgetti coordinate system and Dynamo - mItem.PackDimX = Miscellany.Math.Functions.ToDouble(i.PackDimX); - mItem.PackDimY = Miscellany.Math.Functions.ToDouble(i.PackDimZ); - mItem.PackDimZ = Miscellany.Math.Functions.ToDouble(i.PackDimY); - mItem.CoordX = Miscellany.Math.Functions.ToDouble(i.CoordX); - mItem.CoordY = Miscellany.Math.Functions.ToDouble(i.CoordZ); - mItem.CoordZ = Miscellany.Math.Functions.ToDouble(i.CoordY); + mItem.PackDimX = Miscellany.Maths.Functions.ToDouble(i.PackDimX); + mItem.PackDimY = Miscellany.Maths.Functions.ToDouble(i.PackDimZ); + mItem.PackDimZ = Miscellany.Maths.Functions.ToDouble(i.PackDimY); + mItem.CoordX = Miscellany.Maths.Functions.ToDouble(i.CoordX); + mItem.CoordY = Miscellany.Maths.Functions.ToDouble(i.CoordZ); + mItem.CoordZ = Miscellany.Maths.Functions.ToDouble(i.CoordY); } return mItem; } @@ -117,9 +117,9 @@ private static Miscellany.ContainerPacking.Entities.Item ItemToMiscellany(Item i //Convert Miscellany Container to CromulentBisgetti Container private static Container ContainerToCB(Miscellany.ContainerPacking.Entities.Container c) { - decimal dLength = Miscellany.Math.Functions.ToDecimal(c.Length); - decimal dWidth = Miscellany.Math.Functions.ToDecimal(c.Width); - decimal dHeight = Miscellany.Math.Functions.ToDecimal(c.Height); + decimal dLength = Miscellany.Maths.Functions.ToDecimal(c.Length); + decimal dWidth = Miscellany.Maths.Functions.ToDecimal(c.Width); + decimal dHeight = Miscellany.Maths.Functions.ToDecimal(c.Height); Container cbContainer = new Container(c.ID,dLength,dWidth,dHeight); return cbContainer; } @@ -127,9 +127,9 @@ private static Container ContainerToCB(Miscellany.ContainerPacking.Entities.Cont //Convert Miscellany Item to CromulentBisgetti Item private static Item ItemToCB(Miscellany.ContainerPacking.Entities.Item i) { - decimal ddim1 = Miscellany.Math.Functions.ToDecimal(i.Dim1); - decimal ddim2 = Miscellany.Math.Functions.ToDecimal(i.Dim2); - decimal ddim3 = Miscellany.Math.Functions.ToDecimal(i.Dim3); + decimal ddim1 = Miscellany.Maths.Functions.ToDecimal(i.Dim1); + decimal ddim2 = Miscellany.Maths.Functions.ToDecimal(i.Dim2); + decimal ddim3 = Miscellany.Maths.Functions.ToDecimal(i.Dim3); Item cbItem = new Item(i.ID, ddim1, ddim2, ddim3, i.Quantity); return cbItem; } diff --git a/Miscellany/ContainerPacking/PackingService/PackContainers.cs b/Miscellany/ContainerPacking/PackingService/PackContainers.cs index 2ea9c24..9f3e74f 100644 --- a/Miscellany/ContainerPacking/PackingService/PackContainers.cs +++ b/Miscellany/ContainerPacking/PackingService/PackContainers.cs @@ -73,8 +73,8 @@ public static Dictionary PackContainers(List PackContainersWithGroups(List PackContainersWithGroupsContinuously(Li } PackTimeInMilliseconds.Add(Convert.ToInt32(algorithmPackingResult.PackTimeInMilliseconds)); TotalPackTimeInMilliseconds += Convert.ToInt32(algorithmPackingResult.PackTimeInMilliseconds); - PercentContainerVolumePacked.Add(Miscellany.Math.Functions.ToDouble(algorithmPackingResult.PercentContainerVolumePacked)); - PercentItemVolumePacked.Add(Miscellany.Math.Functions.ToDouble(algorithmPackingResult.PercentItemVolumePacked)); + PercentContainerVolumePacked.Add(Miscellany.Maths.Functions.ToDouble(algorithmPackingResult.PercentContainerVolumePacked)); + PercentItemVolumePacked.Add(Miscellany.Maths.Functions.ToDouble(algorithmPackingResult.PercentItemVolumePacked)); } diff --git a/Miscellany/List/List.cs b/Miscellany/Lists/Lists.cs similarity index 96% rename from Miscellany/List/List.cs rename to Miscellany/Lists/Lists.cs index 600f317..1f3d415 100644 --- a/Miscellany/List/List.cs +++ b/Miscellany/Lists/Lists.cs @@ -6,7 +6,7 @@ namespace Miscellany /// /// Modify /// - public static class List + public static class Lists { /// /// Pairs items in a list: [a,b,c,d] > [[a,b],[b,c],[c,d]] diff --git a/Miscellany/Math/Functions.cs b/Miscellany/Maths/Functions.cs similarity index 98% rename from Miscellany/Math/Functions.cs rename to Miscellany/Maths/Functions.cs index b699a2e..832b5bc 100644 --- a/Miscellany/Math/Functions.cs +++ b/Miscellany/Maths/Functions.cs @@ -4,7 +4,7 @@ using System.Text; using System.Threading.Tasks; -namespace Miscellany.Math +namespace Miscellany.Maths { /// /// Functions diff --git a/Miscellany/Miscellany.Migrations.xml b/Miscellany/Miscellany.Migrations.xml new file mode 100644 index 0000000..4a18c1e --- /dev/null +++ b/Miscellany/Miscellany.Migrations.xml @@ -0,0 +1,19 @@ + + + + Miscellany.List.PairItems + Miscellany.Lists.PairItems + + + Miscellany.Math.ToDecimal + Miscellany.Maths.ToDecimal + + + Miscellany.Math.ToDouble + Miscellany.Maths.ToDouble + + + Miscellany.Math.RunningTotal + Miscellany.Maths.RunningTotal + + diff --git a/Miscellany/Miscellany.csproj b/Miscellany/Miscellany.csproj index 4f67c94..d603b1d 100644 --- a/Miscellany/Miscellany.csproj +++ b/Miscellany/Miscellany.csproj @@ -76,8 +76,8 @@ - - + + @@ -88,8 +88,12 @@ + + Always + Always + Designer diff --git a/Miscellany/Miscellany_DynamoCustomization.xml b/Miscellany/Miscellany_DynamoCustomization.xml index e2fb7a5..bdffb1b 100644 --- a/Miscellany/Miscellany_DynamoCustomization.xml +++ b/Miscellany/Miscellany_DynamoCustomization.xml @@ -7,16 +7,16 @@ Miscellany - + + + Miscellany.ListChabbers - - Miscellany.List - - + Miscellany.Math - + + + + \ No newline at end of file From 0872d64dbcc85dd842a549861c947d92ab6f7968 Mon Sep 17 00:00:00 2001 From: "HALUK\\thomas.corrie" Date: Thu, 17 Jan 2019 11:30:47 +0000 Subject: [PATCH 2/4] Start of class renaming to avoid conflicts with core nodes and other packages when using DesignScript --- .../PackingService/PackContainer.cs | 34 ++-- .../PackingService/PackContainers.cs | 4 +- .../PackContainersWithGroups.cs | 4 +- .../PackContainersWithGroupsContinuously.cs | 4 +- .../Geometry/{Abstract => }/Abstract.cs | 28 ++-- Miscellany/Lists/Lists.cs | 2 +- Miscellany/Maths/Functions.cs | 8 +- Miscellany/Miscellany.Migrations.xml | 16 +- Miscellany/Miscellany.csproj | 122 ++++++++++---- Miscellany/Miscellany_DynamoCustomization.xml | 20 +-- ...bstract.CoordinateSystemDisplay.Large.png} | Bin ....Geometry.Abstract.PlaneDisplay.Large.png} | Bin ...Geometry.Abstract.VectorDisplay.Large.png} | Bin ...bstract.CoordinateSystemDisplay.Small.png} | Bin ....Geometry.Abstract.PlaneDisplay.Small.png} | Bin ...Geometry.Abstract.VectorDisplay.Small.png} | Bin .../Resources/MiscellanyImages.resources | Bin 97012 -> 97000 bytes Miscellany/Resources/MiscellanyImages.resx | 154 +++++++++--------- Miscellany/packages.config | 11 +- 19 files changed, 222 insertions(+), 185 deletions(-) rename Miscellany/Geometry/{Abstract => }/Abstract.cs (89%) rename Miscellany/Resources/Images/Large/{Miscellany.Geometry.Abstract.CoordinateSystem.Display.Large.png => Miscellany.Geometry.Abstract.CoordinateSystemDisplay.Large.png} (100%) rename Miscellany/Resources/Images/Large/{Miscellany.Geometry.Abstract.Plane.Display.Large.png => Miscellany.Geometry.Abstract.PlaneDisplay.Large.png} (100%) rename Miscellany/Resources/Images/Large/{Miscellany.Geometry.Abstract.Vector.Display.Large.png => Miscellany.Geometry.Abstract.VectorDisplay.Large.png} (100%) rename Miscellany/Resources/Images/Small/{Miscellany.Geometry.Abstract.CoordinateSystem.Display.Small.png => Miscellany.Geometry.Abstract.CoordinateSystemDisplay.Small.png} (100%) rename Miscellany/Resources/Images/Small/{Miscellany.Geometry.Abstract.Plane.Display.Small.png => Miscellany.Geometry.Abstract.PlaneDisplay.Small.png} (100%) rename Miscellany/Resources/Images/Small/{Miscellany.Geometry.Abstract.Vector.Display.Small.png => Miscellany.Geometry.Abstract.VectorDisplay.Small.png} (100%) diff --git a/Miscellany/ContainerPacking/PackingService/PackContainer.cs b/Miscellany/ContainerPacking/PackingService/PackContainer.cs index 54bdbac..0309902 100644 --- a/Miscellany/ContainerPacking/PackingService/PackContainer.cs +++ b/Miscellany/ContainerPacking/PackingService/PackContainer.cs @@ -55,8 +55,8 @@ public static Dictionary PackContainer(Miscellany.ContainerPacki AlgorithmPackingResult algorithmPackingResult = containerPackingResult.AlgorithmPackingResults.FirstOrDefault(); bool IsCompletePack = algorithmPackingResult.IsCompletePack; int PackTimeInMilliseconds = Convert.ToInt32(algorithmPackingResult.PackTimeInMilliseconds); //Max limit of int32 for milliseconds is596 hours - double PercentContainerVolumePacked = Miscellany.Maths.Functions.ToDouble(algorithmPackingResult.PercentContainerVolumePacked); - double PercentItemVolumePacked = Miscellany.Maths.Functions.ToDouble(algorithmPackingResult.PercentItemVolumePacked); + double PercentContainerVolumePacked = Miscellany.Math.Functions.ToDouble(algorithmPackingResult.PercentContainerVolumePacked); + double PercentItemVolumePacked = Miscellany.Math.Functions.ToDouble(algorithmPackingResult.PercentItemVolumePacked); //int BestFitOrientation = algorithmPackingResult.best //Convert CromulentBisgetti items to Miscellany Items @@ -94,9 +94,9 @@ public static Dictionary PackContainer(Miscellany.ContainerPacki //Convert a CromulentBisgetti Item to a Miscellany Item private static Miscellany.ContainerPacking.Entities.Item ItemToMiscellany(Item i) { - double ddim1 = Miscellany.Maths.Functions.ToDouble(i.Dim1); - double ddim2 = Miscellany.Maths.Functions.ToDouble(i.Dim2); - double ddim3 = Miscellany.Maths.Functions.ToDouble(i.Dim3); + double ddim1 = Miscellany.Math.Functions.ToDouble(i.Dim1); + double ddim2 = Miscellany.Math.Functions.ToDouble(i.Dim2); + double ddim3 = Miscellany.Math.Functions.ToDouble(i.Dim3); //Create Item Miscellany.ContainerPacking.Entities.Item mItem = new Miscellany.ContainerPacking.Entities.Item(i.ID, ddim1, ddim2, ddim3, i.Quantity); //Add packed information @@ -104,12 +104,12 @@ private static Miscellany.ContainerPacking.Entities.Item ItemToMiscellany(Item i if (i.IsPacked) { //Swap Y and Z values to shift from the CromulentBisgetti coordinate system and Dynamo - mItem.PackDimX = Miscellany.Maths.Functions.ToDouble(i.PackDimX); - mItem.PackDimY = Miscellany.Maths.Functions.ToDouble(i.PackDimZ); - mItem.PackDimZ = Miscellany.Maths.Functions.ToDouble(i.PackDimY); - mItem.CoordX = Miscellany.Maths.Functions.ToDouble(i.CoordX); - mItem.CoordY = Miscellany.Maths.Functions.ToDouble(i.CoordZ); - mItem.CoordZ = Miscellany.Maths.Functions.ToDouble(i.CoordY); + mItem.PackDimX = Miscellany.Math.Functions.ToDouble(i.PackDimX); + mItem.PackDimY = Miscellany.Math.Functions.ToDouble(i.PackDimZ); + mItem.PackDimZ = Miscellany.Math.Functions.ToDouble(i.PackDimY); + mItem.CoordX = Miscellany.Math.Functions.ToDouble(i.CoordX); + mItem.CoordY = Miscellany.Math.Functions.ToDouble(i.CoordZ); + mItem.CoordZ = Miscellany.Math.Functions.ToDouble(i.CoordY); } return mItem; } @@ -117,9 +117,9 @@ private static Miscellany.ContainerPacking.Entities.Item ItemToMiscellany(Item i //Convert Miscellany Container to CromulentBisgetti Container private static Container ContainerToCB(Miscellany.ContainerPacking.Entities.Container c) { - decimal dLength = Miscellany.Maths.Functions.ToDecimal(c.Length); - decimal dWidth = Miscellany.Maths.Functions.ToDecimal(c.Width); - decimal dHeight = Miscellany.Maths.Functions.ToDecimal(c.Height); + decimal dLength = Miscellany.Math.Functions.ToDecimal(c.Length); + decimal dWidth = Miscellany.Math.Functions.ToDecimal(c.Width); + decimal dHeight = Miscellany.Math.Functions.ToDecimal(c.Height); Container cbContainer = new Container(c.ID,dLength,dWidth,dHeight); return cbContainer; } @@ -127,9 +127,9 @@ private static Container ContainerToCB(Miscellany.ContainerPacking.Entities.Cont //Convert Miscellany Item to CromulentBisgetti Item private static Item ItemToCB(Miscellany.ContainerPacking.Entities.Item i) { - decimal ddim1 = Miscellany.Maths.Functions.ToDecimal(i.Dim1); - decimal ddim2 = Miscellany.Maths.Functions.ToDecimal(i.Dim2); - decimal ddim3 = Miscellany.Maths.Functions.ToDecimal(i.Dim3); + decimal ddim1 = Miscellany.Math.Functions.ToDecimal(i.Dim1); + decimal ddim2 = Miscellany.Math.Functions.ToDecimal(i.Dim2); + decimal ddim3 = Miscellany.Math.Functions.ToDecimal(i.Dim3); Item cbItem = new Item(i.ID, ddim1, ddim2, ddim3, i.Quantity); return cbItem; } diff --git a/Miscellany/ContainerPacking/PackingService/PackContainers.cs b/Miscellany/ContainerPacking/PackingService/PackContainers.cs index 9f3e74f..2ea9c24 100644 --- a/Miscellany/ContainerPacking/PackingService/PackContainers.cs +++ b/Miscellany/ContainerPacking/PackingService/PackContainers.cs @@ -73,8 +73,8 @@ public static Dictionary PackContainers(List PackContainersWithGroups(List PackContainersWithGroupsContinuously(Li } PackTimeInMilliseconds.Add(Convert.ToInt32(algorithmPackingResult.PackTimeInMilliseconds)); TotalPackTimeInMilliseconds += Convert.ToInt32(algorithmPackingResult.PackTimeInMilliseconds); - PercentContainerVolumePacked.Add(Miscellany.Maths.Functions.ToDouble(algorithmPackingResult.PercentContainerVolumePacked)); - PercentItemVolumePacked.Add(Miscellany.Maths.Functions.ToDouble(algorithmPackingResult.PercentItemVolumePacked)); + PercentContainerVolumePacked.Add(Miscellany.Math.Functions.ToDouble(algorithmPackingResult.PercentContainerVolumePacked)); + PercentItemVolumePacked.Add(Miscellany.Math.Functions.ToDouble(algorithmPackingResult.PercentItemVolumePacked)); } diff --git a/Miscellany/Geometry/Abstract/Abstract.cs b/Miscellany/Geometry/Abstract.cs similarity index 89% rename from Miscellany/Geometry/Abstract/Abstract.cs rename to Miscellany/Geometry/Abstract.cs index b598c1d..8b342c3 100644 --- a/Miscellany/Geometry/Abstract/Abstract.cs +++ b/Miscellany/Geometry/Abstract.cs @@ -5,13 +5,14 @@ using System.Threading.Tasks; using Autodesk.DesignScript.Runtime; using Autodesk.DesignScript.Geometry; +using Dynamo.Graph.Nodes; -namespace Miscellany.Geometry.Abstract +namespace Miscellany.Geometry { /// /// CoordinateSystem /// - public static class CoordinateSystem + public static class Abstract { /// /// Shows scalable lines representing the CoordinateSystem axes and rectangles for the planes @@ -26,8 +27,9 @@ public static class CoordinateSystem /// Plane /// Plane /// Plane + [NodeCategory("Query")] [MultiReturn(new[] { "Display", "Origin", "XAxis", "YAxis", "ZAxis", "XYPlane", "YZPlane", "ZXPlane" })] - public static Dictionary Display(Autodesk.DesignScript.Geometry.CoordinateSystem coordinateSystem, double length = 1000) + public static Dictionary CoordinateSystemDisplay(Autodesk.DesignScript.Geometry.CoordinateSystem coordinateSystem, double length = 1000) { //Avoid zero length if (length == 0) @@ -63,13 +65,7 @@ public static Dictionary Display(Autodesk.DesignScript.Geometry. d.Add("ZXPlane", coordinateSystem.ZXPlane); return d; } - } - /// - /// Plane - /// - public static class Plane - { /// /// Shows scalable lines representing the axes and a rectangle for the Plane /// @@ -80,8 +76,9 @@ public static class Plane /// Vector /// Vector /// Vector + [NodeCategory("Query")] [MultiReturn(new[] { "Display", "Origin", "XAxis", "YAxis", "Normal" })] - public static Dictionary Display(Autodesk.DesignScript.Geometry.Plane plane, double length = 1000) + public static Dictionary PlaneDisplay(Autodesk.DesignScript.Geometry.Plane plane, double length = 1000) { //Avoid zero length if (length == 0) @@ -114,13 +111,7 @@ public static Dictionary Display(Autodesk.DesignScript.Geometry. d.Add("Normal", plane.Normal); return d; } - } - - /// - /// Vector - /// - public static class Vector - { + /// /// Shows a scalable line representing a Vector from a chosen starting point /// @@ -132,8 +123,9 @@ public static class Vector /// double /// double /// double + [NodeCategory("Query")] [MultiReturn(new[] { "Display", "x", "y", "z", "Length" })] - public static Dictionary Display(Autodesk.DesignScript.Geometry.Vector vector, Autodesk.DesignScript.Geometry.Point startPoint, double scale = 1000) + public static Dictionary VectorDisplay(Autodesk.DesignScript.Geometry.Vector vector, Autodesk.DesignScript.Geometry.Point startPoint, double scale = 1000) { //Avoid zero length if (scale == 0) diff --git a/Miscellany/Lists/Lists.cs b/Miscellany/Lists/Lists.cs index 1f3d415..22c051a 100644 --- a/Miscellany/Lists/Lists.cs +++ b/Miscellany/Lists/Lists.cs @@ -6,7 +6,7 @@ namespace Miscellany /// /// Modify /// - public static class Lists + public static class MiscLists { /// /// Pairs items in a list: [a,b,c,d] > [[a,b],[b,c],[c,d]] diff --git a/Miscellany/Maths/Functions.cs b/Miscellany/Maths/Functions.cs index 832b5bc..53faa46 100644 --- a/Miscellany/Maths/Functions.cs +++ b/Miscellany/Maths/Functions.cs @@ -4,13 +4,17 @@ using System.Text; using System.Threading.Tasks; -namespace Miscellany.Maths +namespace Miscellany.Math { /// /// Functions /// - public static class Functions + public class Functions { + private Functions() + { + + } /// /// Converts a double to a decimal. If the double is above or below the maximum range for a decimal then the number is bounded to theos limits /// diff --git a/Miscellany/Miscellany.Migrations.xml b/Miscellany/Miscellany.Migrations.xml index 4a18c1e..62c0ec9 100644 --- a/Miscellany/Miscellany.Migrations.xml +++ b/Miscellany/Miscellany.Migrations.xml @@ -1,19 +1,15 @@  - Miscellany.List.PairItems - Miscellany.Lists.PairItems + Miscellany.Geometry.Abstract.CoordinateSystem.Display + Miscellany.Geometry.Abstract.CoordinateSystemDisplay - Miscellany.Math.ToDecimal - Miscellany.Maths.ToDecimal + Miscellany.Geometry.Abstract.Plane.Display + Miscellany.Geometry.Abstract.PlaneDisplay - Miscellany.Math.ToDouble - Miscellany.Maths.ToDouble - - - Miscellany.Math.RunningTotal - Miscellany.Maths.RunningTotal + Miscellany.Geometry.Abstract.Vector.Display + Miscellany.Geometry.Abstract.VectorDisplay diff --git a/Miscellany/Miscellany.csproj b/Miscellany/Miscellany.csproj index d603b1d..7b1914b 100644 --- a/Miscellany/Miscellany.csproj +++ b/Miscellany/Miscellany.csproj @@ -9,8 +9,9 @@ Properties Miscellany Miscellany - v4.6.2 + v4.7.2 512 + true @@ -31,42 +32,105 @@ 4 - - ..\packages\DynamoVisualProgramming.DynamoCoreNodes.2.0.1.5055\lib\net45\Analysis.dll - False + + ..\packages\DynamoVisualProgramming.DynamoCoreNodes.2.1.0.7451\lib\net47\Analysis.dll ..\..\..\3DContainerPacking\src\CromulentBisgetti.ContainerPacking\bin\Debug\CromulentBisgetti.dll - - ..\packages\DynamoVisualProgramming.DynamoCoreNodes.2.0.1.5055\lib\net45\DSCoreNodes.dll + + ..\packages\DynamoVisualProgramming.Core.2.1.0.7451\lib\net47\DesignScriptBuiltin.dll + False + + + ..\packages\DynamoVisualProgramming.DynamoCoreNodes.2.1.0.7451\lib\net47\DSCoreNodes.dll + False + + + ..\packages\DynamoVisualProgramming.Core.2.1.0.7451\lib\net47\DSIronPython.dll + False + + + ..\packages\DynamoVisualProgramming.Core.2.1.0.7451\lib\net47\DynamoApplications.dll + False + + + ..\packages\DynamoVisualProgramming.Core.2.1.0.7451\lib\net47\DynamoCore.dll False - - ..\packages\DynamoVisualProgramming.DynamoServices.2.0.1.5055\lib\net45\DynamoServices.dll + + ..\packages\DynamoVisualProgramming.Core.2.1.0.7451\lib\net47\DynamoInstallDetective.dll False - - ..\packages\DynamoVisualProgramming.ZeroTouchLibrary.2.0.1.5055\lib\net45\DynamoUnits.dll + + ..\packages\DynamoVisualProgramming.DynamoServices.2.1.0.7451\lib\net47\DynamoServices.dll False - - ..\packages\DynamoVisualProgramming.DynamoCoreNodes.2.0.1.5055\lib\net45\GeometryColor.dll + + ..\packages\DynamoVisualProgramming.Core.2.1.0.7451\lib\net47\DynamoShapeManager.dll False - - ..\packages\DynamoVisualProgramming.ZeroTouchLibrary.2.0.1.5055\lib\net45\ProtoGeometry.dll + + ..\packages\DynamoVisualProgramming.ZeroTouchLibrary.2.1.0.7451\lib\net47\DynamoUnits.dll + False + + + ..\packages\DynamoVisualProgramming.Core.2.1.0.7451\lib\net47\DynamoUtilities.dll + False + + + ..\packages\DynamoVisualProgramming.DynamoCoreNodes.2.1.0.7451\lib\net47\GeometryColor.dll + False + + + ..\packages\Prism.4.1.0.0\lib\NET40\Microsoft.Expression.Interactions.dll + False + + + ..\packages\Prism.4.1.0.0\lib\NET40\Microsoft.Practices.Prism.dll + False + + + ..\packages\Prism.4.1.0.0\lib\NET40\Microsoft.Practices.Prism.Interactivity.dll + False + + + ..\packages\CommonServiceLocator.1.0\lib\NET35\Microsoft.Practices.ServiceLocation.dll + False + + + ..\packages\Newtonsoft.Json.8.0.3\lib\net45\Newtonsoft.Json.dll + False + + + ..\packages\NUnit.2.6.3\lib\nunit.framework.dll + False + + + ..\packages\DynamoVisualProgramming.Core.2.1.0.7451\lib\net47\ProtoCore.dll + False + + + ..\packages\DynamoVisualProgramming.ZeroTouchLibrary.2.1.0.7451\lib\net47\ProtoGeometry.dll False + + ..\packages\Prism.4.1.0.0\lib\NET40\System.Windows.Interactivity.dll + False + + + ..\packages\DynamoVisualProgramming.Core.2.1.0.7451\lib\net47\VMDataBridge.dll + False + @@ -78,18 +142,17 @@ - + - - Designer - + Always + Designer Always @@ -109,7 +172,6 @@ - @@ -135,15 +197,6 @@ - - - - - - - - - @@ -156,20 +209,19 @@ - - + - - - - - + + + + + diff --git a/Miscellany/Miscellany_DynamoCustomization.xml b/Miscellany/Miscellany_DynamoCustomization.xml index bdffb1b..bcb7926 100644 --- a/Miscellany/Miscellany_DynamoCustomization.xml +++ b/Miscellany/Miscellany_DynamoCustomization.xml @@ -7,29 +7,17 @@ Miscellany - - - Miscellany.ListChabbers + + Miscellany.Geometry - + Miscellany.Math - - - - \ No newline at end of file diff --git a/Miscellany/Resources/Images/Large/Miscellany.Geometry.Abstract.CoordinateSystem.Display.Large.png b/Miscellany/Resources/Images/Large/Miscellany.Geometry.Abstract.CoordinateSystemDisplay.Large.png similarity index 100% rename from Miscellany/Resources/Images/Large/Miscellany.Geometry.Abstract.CoordinateSystem.Display.Large.png rename to Miscellany/Resources/Images/Large/Miscellany.Geometry.Abstract.CoordinateSystemDisplay.Large.png diff --git a/Miscellany/Resources/Images/Large/Miscellany.Geometry.Abstract.Plane.Display.Large.png b/Miscellany/Resources/Images/Large/Miscellany.Geometry.Abstract.PlaneDisplay.Large.png similarity index 100% rename from Miscellany/Resources/Images/Large/Miscellany.Geometry.Abstract.Plane.Display.Large.png rename to Miscellany/Resources/Images/Large/Miscellany.Geometry.Abstract.PlaneDisplay.Large.png diff --git a/Miscellany/Resources/Images/Large/Miscellany.Geometry.Abstract.Vector.Display.Large.png b/Miscellany/Resources/Images/Large/Miscellany.Geometry.Abstract.VectorDisplay.Large.png similarity index 100% rename from Miscellany/Resources/Images/Large/Miscellany.Geometry.Abstract.Vector.Display.Large.png rename to Miscellany/Resources/Images/Large/Miscellany.Geometry.Abstract.VectorDisplay.Large.png diff --git a/Miscellany/Resources/Images/Small/Miscellany.Geometry.Abstract.CoordinateSystem.Display.Small.png b/Miscellany/Resources/Images/Small/Miscellany.Geometry.Abstract.CoordinateSystemDisplay.Small.png similarity index 100% rename from Miscellany/Resources/Images/Small/Miscellany.Geometry.Abstract.CoordinateSystem.Display.Small.png rename to Miscellany/Resources/Images/Small/Miscellany.Geometry.Abstract.CoordinateSystemDisplay.Small.png diff --git a/Miscellany/Resources/Images/Small/Miscellany.Geometry.Abstract.Plane.Display.Small.png b/Miscellany/Resources/Images/Small/Miscellany.Geometry.Abstract.PlaneDisplay.Small.png similarity index 100% rename from Miscellany/Resources/Images/Small/Miscellany.Geometry.Abstract.Plane.Display.Small.png rename to Miscellany/Resources/Images/Small/Miscellany.Geometry.Abstract.PlaneDisplay.Small.png diff --git a/Miscellany/Resources/Images/Small/Miscellany.Geometry.Abstract.Vector.Display.Small.png b/Miscellany/Resources/Images/Small/Miscellany.Geometry.Abstract.VectorDisplay.Small.png similarity index 100% rename from Miscellany/Resources/Images/Small/Miscellany.Geometry.Abstract.Vector.Display.Small.png rename to Miscellany/Resources/Images/Small/Miscellany.Geometry.Abstract.VectorDisplay.Small.png diff --git a/Miscellany/Resources/MiscellanyImages.resources b/Miscellany/Resources/MiscellanyImages.resources index 2bc07ee006a21a0b3154c4185bd9a171d2df6045..a9d9a96a3f2b76237637599f6c07cb5f02280add 100644 GIT binary patch delta 344 zcmezJmG#9})(r-X3L>hjH@Q@P-)wfhXUnn!8e3D|N$ojyW&fTCk>h)+Ql{*k?7`?T zc><#YN4CueJIBUl+2E&}m$W(I~F5SE{u$ZWkil=-h1 zW69)$yke6l$f!*2l~S0zUP=y4l<}OhB%ly&H#oShD3%uhSbS@((;Vh#1G0y fv)UUnG9*Ct7y!+cVzn_v5@|jpv;B|^qfs0HLMUOm delta 369 zcmaFymG#S4)(r-X5?Kc}uJQPxwoXKK^(L3f@0-o8_iR~qKx6CV07eH6*UhB@>4)qD zCr@B>n0$lL!E74q#TpZ}d$ny$3=BVkm>Y;EFfuUMi83%O6JcP8m1JP}Cc(h4go}Zp zlaGNxkeh))gm1DRlak&MpcK0l14A)C1H(U{)N`Oz9S~mKRJ=vdUGiAUopnA$p?AGChwD0ncOR-z^FGlKt`H%sS+aty7+5p>B$b# sEQ|?I^?FdXzcm>dki}k0%QGgy&0HnJ16GGA1~jkvg3R^{GK>;&07X<}0RR91 diff --git a/Miscellany/Resources/MiscellanyImages.resx b/Miscellany/Resources/MiscellanyImages.resx index 5567348..ab95fef 100644 --- a/Miscellany/Resources/MiscellanyImages.resx +++ b/Miscellany/Resources/MiscellanyImages.resx @@ -120,81 +120,81 @@ - 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 @@ -1447,7 +1447,7 @@ ULCeAAAAAElFTkSuQmCC - + iVBORw0KGgoAAAANSUhEUgAAAIAAAACACAYAAADDPmHLAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAL EgAACxIB0t1+/AAABEZJREFUeF7t3e1R21AQhWGXQAmUQAn+m5n8SAmUkBIogRIoISVABy7BJdCBs1c2 @@ -1471,7 +1471,7 @@ YCh1YCh1YCh1YCh1YCh1YCh1YCh1YChVHDZ/ARvOWzMmPAVRAAAAAElFTkSuQmCC - + iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAC xAAAAsQBW5GdCwAAAQ5JREFUWEft1bENglAUBdDX0FlpY8kIDGCirYlxBkZgBEdwBEbB3oLCAdzk+y4B @@ -1482,7 +1482,7 @@ rkJggg== - + iVBORw0KGgoAAAANSUhEUgAAAIAAAACACAYAAADDPmHLAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAL EgAACxIB0t1+/AAABkNJREFUeF7t3b9uXFUQx/GtqShpLPEAKejduEWi4BH8CDxCSrqksaBMRUMBwg2i @@ -1515,7 +1515,7 @@ KBndwJQAAAAASUVORK5CYII= - + iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAC xAAAAsQBW5GdCwAAAvxJREFUWEfFlc1LVFEYxu+fILWSimT6gCxBcBFBCylCjCyiSAhatHIVtBNaWBvJ @@ -1534,7 +1534,7 @@ IYFQalSqAAAAAElFTkSuQmCC - + iVBORw0KGgoAAAANSUhEUgAAAIAAAACACAYAAADDPmHLAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAL EgAACxIB0t1+/AAAAz5JREFUeF7t2sFRFEEARuEJgRC86Nk0rPJACJiBdw8aAiEQAiFgBoZgCB69YQ+w @@ -1554,7 +1554,7 @@ Ke6nPza+dNqhkD1XAAAAAElFTkSuQmCC - + iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAC xAAAAsQBW5GdCwAAAOtJREFUWEfF0bENglAQh/FrLLQy2riA1mygrYlD6AaM4AiOwAAWjqCJvSs4ghs8 diff --git a/Miscellany/packages.config b/Miscellany/packages.config index 88c2498..843381d 100644 --- a/Miscellany/packages.config +++ b/Miscellany/packages.config @@ -1,6 +1,11 @@  - - - + + + + + + + + \ No newline at end of file From fd052808f4c831ce2cdd76529144db839862c802 Mon Sep 17 00:00:00 2001 From: "HALUK\\thomas.corrie" Date: Fri, 18 Jan 2019 15:08:06 +0000 Subject: [PATCH 3/4] Completed review of class names to avoid conflict with core nodes and other packages in DesignScript --- Miscellany/About.cs | 2 ++ .../PackingService/PackContainer.cs | 34 +++++++++--------- .../PackingService/PackContainers.cs | 4 +-- .../PackContainersWithGroups.cs | 4 +-- .../PackContainersWithGroupsContinuously.cs | 4 +-- Miscellany/Lists/Lists.cs | 6 ++-- Miscellany/Maths/{Functions.cs => Maths.cs} | 8 ++--- Miscellany/Miscellany.Migrations.xml | 4 +++ Miscellany/Miscellany.csproj | 18 +++++----- Miscellany/Miscellany_DynamoCustomization.xml | 12 +++---- ...cellany.List.Modifies.PairItems.Large.png} | Bin ...> Miscellany.Maths.RunningTotal.Large.png} | Bin ...g => Miscellany.Maths.ToDecimal.Large.png} | Bin ...ng => Miscellany.Maths.ToDouble.Large.png} | Bin ...cellany.List.Modifies.PairItems.Small.png} | Bin ...> Miscellany.Maths.RunningTotal.Small.png} | Bin ...g => Miscellany.Maths.ToDecimal.Small.png} | Bin ...ng => Miscellany.Maths.ToDouble.Small.png} | Bin .../Resources/MiscellanyImages.resources | Bin 97000 -> 96928 bytes Miscellany/Resources/MiscellanyImages.resx | 16 ++++----- 20 files changed, 57 insertions(+), 55 deletions(-) rename Miscellany/Maths/{Functions.cs => Maths.cs} (95%) rename Miscellany/Resources/Images/Large/{Miscellany.List.PairItems.Large.png => Miscellany.List.Modifies.PairItems.Large.png} (100%) rename Miscellany/Resources/Images/Large/{Miscellany.Math.Functions.RunningTotal.Large.png => Miscellany.Maths.RunningTotal.Large.png} (100%) rename Miscellany/Resources/Images/Large/{Miscellany.Math.Functions.ToDecimal.Large.png => Miscellany.Maths.ToDecimal.Large.png} (100%) rename Miscellany/Resources/Images/Large/{Miscellany.Math.Functions.ToDouble.Large.png => Miscellany.Maths.ToDouble.Large.png} (100%) rename Miscellany/Resources/Images/Small/{Miscellany.List.PairItems.Small.png => Miscellany.List.Modifies.PairItems.Small.png} (100%) rename Miscellany/Resources/Images/Small/{Miscellany.Math.Functions.RunningTotal.Small.png => Miscellany.Maths.RunningTotal.Small.png} (100%) rename Miscellany/Resources/Images/Small/{Miscellany.Math.Functions.ToDecimal.Small.png => Miscellany.Maths.ToDecimal.Small.png} (100%) rename Miscellany/Resources/Images/Small/{Miscellany.Math.Functions.ToDouble.Small.png => Miscellany.Maths.ToDouble.Small.png} (100%) diff --git a/Miscellany/About.cs b/Miscellany/About.cs index 5b4c1b0..944f28e 100644 --- a/Miscellany/About.cs +++ b/Miscellany/About.cs @@ -3,6 +3,7 @@ using System.Linq; using System.Text; using System.Threading.Tasks; +using Dynamo.Graph.Nodes; namespace Miscellany { @@ -18,6 +19,7 @@ public static class About /// /// Miscellany /// + [NodeCategory("Create")] public static string Miscellany() { string version = System.Reflection.Assembly.GetExecutingAssembly().GetName().Version.Major.ToString() + "." + System.Reflection.Assembly.GetExecutingAssembly().GetName().Version.Minor.ToString() + "." + System.Reflection.Assembly.GetExecutingAssembly().GetName().Version.Build.ToString(); diff --git a/Miscellany/ContainerPacking/PackingService/PackContainer.cs b/Miscellany/ContainerPacking/PackingService/PackContainer.cs index 0309902..11c36f5 100644 --- a/Miscellany/ContainerPacking/PackingService/PackContainer.cs +++ b/Miscellany/ContainerPacking/PackingService/PackContainer.cs @@ -55,8 +55,8 @@ public static Dictionary PackContainer(Miscellany.ContainerPacki AlgorithmPackingResult algorithmPackingResult = containerPackingResult.AlgorithmPackingResults.FirstOrDefault(); bool IsCompletePack = algorithmPackingResult.IsCompletePack; int PackTimeInMilliseconds = Convert.ToInt32(algorithmPackingResult.PackTimeInMilliseconds); //Max limit of int32 for milliseconds is596 hours - double PercentContainerVolumePacked = Miscellany.Math.Functions.ToDouble(algorithmPackingResult.PercentContainerVolumePacked); - double PercentItemVolumePacked = Miscellany.Math.Functions.ToDouble(algorithmPackingResult.PercentItemVolumePacked); + double PercentContainerVolumePacked = Miscellany.Maths.ToDouble(algorithmPackingResult.PercentContainerVolumePacked); + double PercentItemVolumePacked = Miscellany.Maths.ToDouble(algorithmPackingResult.PercentItemVolumePacked); //int BestFitOrientation = algorithmPackingResult.best //Convert CromulentBisgetti items to Miscellany Items @@ -94,9 +94,9 @@ public static Dictionary PackContainer(Miscellany.ContainerPacki //Convert a CromulentBisgetti Item to a Miscellany Item private static Miscellany.ContainerPacking.Entities.Item ItemToMiscellany(Item i) { - double ddim1 = Miscellany.Math.Functions.ToDouble(i.Dim1); - double ddim2 = Miscellany.Math.Functions.ToDouble(i.Dim2); - double ddim3 = Miscellany.Math.Functions.ToDouble(i.Dim3); + double ddim1 = Miscellany.Maths.ToDouble(i.Dim1); + double ddim2 = Miscellany.Maths.ToDouble(i.Dim2); + double ddim3 = Miscellany.Maths.ToDouble(i.Dim3); //Create Item Miscellany.ContainerPacking.Entities.Item mItem = new Miscellany.ContainerPacking.Entities.Item(i.ID, ddim1, ddim2, ddim3, i.Quantity); //Add packed information @@ -104,12 +104,12 @@ private static Miscellany.ContainerPacking.Entities.Item ItemToMiscellany(Item i if (i.IsPacked) { //Swap Y and Z values to shift from the CromulentBisgetti coordinate system and Dynamo - mItem.PackDimX = Miscellany.Math.Functions.ToDouble(i.PackDimX); - mItem.PackDimY = Miscellany.Math.Functions.ToDouble(i.PackDimZ); - mItem.PackDimZ = Miscellany.Math.Functions.ToDouble(i.PackDimY); - mItem.CoordX = Miscellany.Math.Functions.ToDouble(i.CoordX); - mItem.CoordY = Miscellany.Math.Functions.ToDouble(i.CoordZ); - mItem.CoordZ = Miscellany.Math.Functions.ToDouble(i.CoordY); + mItem.PackDimX = Miscellany.Maths.ToDouble(i.PackDimX); + mItem.PackDimY = Miscellany.Maths.ToDouble(i.PackDimZ); + mItem.PackDimZ = Miscellany.Maths.ToDouble(i.PackDimY); + mItem.CoordX = Miscellany.Maths.ToDouble(i.CoordX); + mItem.CoordY = Miscellany.Maths.ToDouble(i.CoordZ); + mItem.CoordZ = Miscellany.Maths.ToDouble(i.CoordY); } return mItem; } @@ -117,9 +117,9 @@ private static Miscellany.ContainerPacking.Entities.Item ItemToMiscellany(Item i //Convert Miscellany Container to CromulentBisgetti Container private static Container ContainerToCB(Miscellany.ContainerPacking.Entities.Container c) { - decimal dLength = Miscellany.Math.Functions.ToDecimal(c.Length); - decimal dWidth = Miscellany.Math.Functions.ToDecimal(c.Width); - decimal dHeight = Miscellany.Math.Functions.ToDecimal(c.Height); + decimal dLength = Miscellany.Maths.ToDecimal(c.Length); + decimal dWidth = Miscellany.Maths.ToDecimal(c.Width); + decimal dHeight = Miscellany.Maths.ToDecimal(c.Height); Container cbContainer = new Container(c.ID,dLength,dWidth,dHeight); return cbContainer; } @@ -127,9 +127,9 @@ private static Container ContainerToCB(Miscellany.ContainerPacking.Entities.Cont //Convert Miscellany Item to CromulentBisgetti Item private static Item ItemToCB(Miscellany.ContainerPacking.Entities.Item i) { - decimal ddim1 = Miscellany.Math.Functions.ToDecimal(i.Dim1); - decimal ddim2 = Miscellany.Math.Functions.ToDecimal(i.Dim2); - decimal ddim3 = Miscellany.Math.Functions.ToDecimal(i.Dim3); + decimal ddim1 = Miscellany.Maths.ToDecimal(i.Dim1); + decimal ddim2 = Miscellany.Maths.ToDecimal(i.Dim2); + decimal ddim3 = Miscellany.Maths.ToDecimal(i.Dim3); Item cbItem = new Item(i.ID, ddim1, ddim2, ddim3, i.Quantity); return cbItem; } diff --git a/Miscellany/ContainerPacking/PackingService/PackContainers.cs b/Miscellany/ContainerPacking/PackingService/PackContainers.cs index 2ea9c24..35f3553 100644 --- a/Miscellany/ContainerPacking/PackingService/PackContainers.cs +++ b/Miscellany/ContainerPacking/PackingService/PackContainers.cs @@ -73,8 +73,8 @@ public static Dictionary PackContainers(List PackContainersWithGroups(List PackContainersWithGroupsContinuously(Li } PackTimeInMilliseconds.Add(Convert.ToInt32(algorithmPackingResult.PackTimeInMilliseconds)); TotalPackTimeInMilliseconds += Convert.ToInt32(algorithmPackingResult.PackTimeInMilliseconds); - PercentContainerVolumePacked.Add(Miscellany.Math.Functions.ToDouble(algorithmPackingResult.PercentContainerVolumePacked)); - PercentItemVolumePacked.Add(Miscellany.Math.Functions.ToDouble(algorithmPackingResult.PercentItemVolumePacked)); + PercentContainerVolumePacked.Add(Miscellany.Maths.ToDouble(algorithmPackingResult.PercentContainerVolumePacked)); + PercentItemVolumePacked.Add(Miscellany.Maths.ToDouble(algorithmPackingResult.PercentItemVolumePacked)); } diff --git a/Miscellany/Lists/Lists.cs b/Miscellany/Lists/Lists.cs index 22c051a..47c4b43 100644 --- a/Miscellany/Lists/Lists.cs +++ b/Miscellany/Lists/Lists.cs @@ -1,12 +1,12 @@ using System.Collections.Generic; using System.Collections; //Need this to handle non-specific IList as opposed to IList -namespace Miscellany +namespace Miscellany.List { /// - /// Modify + /// Modifies /// - public static class MiscLists + public static class Modifies { /// /// Pairs items in a list: [a,b,c,d] > [[a,b],[b,c],[c,d]] diff --git a/Miscellany/Maths/Functions.cs b/Miscellany/Maths/Maths.cs similarity index 95% rename from Miscellany/Maths/Functions.cs rename to Miscellany/Maths/Maths.cs index 53faa46..c4dab75 100644 --- a/Miscellany/Maths/Functions.cs +++ b/Miscellany/Maths/Maths.cs @@ -4,17 +4,13 @@ using System.Text; using System.Threading.Tasks; -namespace Miscellany.Math +namespace Miscellany { /// /// Functions /// - public class Functions + public static class Maths { - private Functions() - { - - } /// /// Converts a double to a decimal. If the double is above or below the maximum range for a decimal then the number is bounded to theos limits /// diff --git a/Miscellany/Miscellany.Migrations.xml b/Miscellany/Miscellany.Migrations.xml index 62c0ec9..eea26ac 100644 --- a/Miscellany/Miscellany.Migrations.xml +++ b/Miscellany/Miscellany.Migrations.xml @@ -12,4 +12,8 @@ Miscellany.Geometry.Abstract.Vector.Display Miscellany.Geometry.Abstract.VectorDisplay + + Miscellany.Math.Functions.ToDecimal + Miscellany.Maths.ToDecimal + diff --git a/Miscellany/Miscellany.csproj b/Miscellany/Miscellany.csproj index 7b1914b..6e3843d 100644 --- a/Miscellany/Miscellany.csproj +++ b/Miscellany/Miscellany.csproj @@ -141,7 +141,7 @@ - + @@ -158,6 +158,12 @@ Always Designer + + + + + + @@ -196,7 +202,6 @@ - @@ -209,14 +214,9 @@ - - - - - - + - + diff --git a/Miscellany/Miscellany_DynamoCustomization.xml b/Miscellany/Miscellany_DynamoCustomization.xml index bcb7926..bf86227 100644 --- a/Miscellany/Miscellany_DynamoCustomization.xml +++ b/Miscellany/Miscellany_DynamoCustomization.xml @@ -7,17 +7,17 @@ Miscellany - - Miscellany.Geometry - - - Miscellany.Math - Miscellany.ContainerPacking Miscellany.ContainerPacking.Entities + + Miscellany.Geometry + + + Miscellany.List + \ No newline at end of file diff --git a/Miscellany/Resources/Images/Large/Miscellany.List.PairItems.Large.png b/Miscellany/Resources/Images/Large/Miscellany.List.Modifies.PairItems.Large.png similarity index 100% rename from Miscellany/Resources/Images/Large/Miscellany.List.PairItems.Large.png rename to Miscellany/Resources/Images/Large/Miscellany.List.Modifies.PairItems.Large.png diff --git a/Miscellany/Resources/Images/Large/Miscellany.Math.Functions.RunningTotal.Large.png b/Miscellany/Resources/Images/Large/Miscellany.Maths.RunningTotal.Large.png similarity index 100% rename from Miscellany/Resources/Images/Large/Miscellany.Math.Functions.RunningTotal.Large.png rename to Miscellany/Resources/Images/Large/Miscellany.Maths.RunningTotal.Large.png diff --git a/Miscellany/Resources/Images/Large/Miscellany.Math.Functions.ToDecimal.Large.png b/Miscellany/Resources/Images/Large/Miscellany.Maths.ToDecimal.Large.png similarity index 100% rename from Miscellany/Resources/Images/Large/Miscellany.Math.Functions.ToDecimal.Large.png rename to Miscellany/Resources/Images/Large/Miscellany.Maths.ToDecimal.Large.png diff --git a/Miscellany/Resources/Images/Large/Miscellany.Math.Functions.ToDouble.Large.png b/Miscellany/Resources/Images/Large/Miscellany.Maths.ToDouble.Large.png similarity index 100% rename from Miscellany/Resources/Images/Large/Miscellany.Math.Functions.ToDouble.Large.png rename to Miscellany/Resources/Images/Large/Miscellany.Maths.ToDouble.Large.png diff --git a/Miscellany/Resources/Images/Small/Miscellany.List.PairItems.Small.png b/Miscellany/Resources/Images/Small/Miscellany.List.Modifies.PairItems.Small.png similarity index 100% rename from Miscellany/Resources/Images/Small/Miscellany.List.PairItems.Small.png rename to Miscellany/Resources/Images/Small/Miscellany.List.Modifies.PairItems.Small.png diff --git a/Miscellany/Resources/Images/Small/Miscellany.Math.Functions.RunningTotal.Small.png b/Miscellany/Resources/Images/Small/Miscellany.Maths.RunningTotal.Small.png similarity index 100% rename from Miscellany/Resources/Images/Small/Miscellany.Math.Functions.RunningTotal.Small.png rename to Miscellany/Resources/Images/Small/Miscellany.Maths.RunningTotal.Small.png diff --git a/Miscellany/Resources/Images/Small/Miscellany.Math.Functions.ToDecimal.Small.png b/Miscellany/Resources/Images/Small/Miscellany.Maths.ToDecimal.Small.png similarity index 100% rename from Miscellany/Resources/Images/Small/Miscellany.Math.Functions.ToDecimal.Small.png rename to Miscellany/Resources/Images/Small/Miscellany.Maths.ToDecimal.Small.png diff --git a/Miscellany/Resources/Images/Small/Miscellany.Math.Functions.ToDouble.Small.png b/Miscellany/Resources/Images/Small/Miscellany.Maths.ToDouble.Small.png similarity index 100% rename from Miscellany/Resources/Images/Small/Miscellany.Math.Functions.ToDouble.Small.png rename to Miscellany/Resources/Images/Small/Miscellany.Maths.ToDouble.Small.png diff --git a/Miscellany/Resources/MiscellanyImages.resources b/Miscellany/Resources/MiscellanyImages.resources index a9d9a96a3f2b76237637599f6c07cb5f02280add..e6efc178ac32629bca2ddc8e5464c28dfa9cb4f1 100644 GIT binary patch delta 327 zcmaFym36^a)(r)W2CZ8!{#pKH-rw(s)BatxdGOz3-CmYe5!GxqVDWfuRnFF9|R(xC=5c@B+nlNHQ=qNi#4Um7Y9}Non!{CI_hqRt5%JpwJJX^hF^1 zIWq%84iKxzPfldE-W-G(FBW{u`wE zs{hGOUcjipG5hs1waP>8>XQ#JI`9 - + iVBORw0KGgoAAAANSUhEUgAAAIAAAACACAYAAADDPmHLAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAL EgAACxIB0t1+/AAAA5xJREFUeF7t28FRVEEUhWFCIARDMARcWuXCkIjBCAzBEDADt+6IgCKDsdseLGj+ @@ -1585,7 +1585,7 @@ NB0YTQdG04HRdGA0HRhNB0bTgdF0YDQdGE0HRtOB0XRgNBWHq1+ulH4Ep8wIAwAAAABJRU5ErkJggg== - + iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAC xAAAAsQBW5GdCwAAANpJREFUWEft0s0JwkAQQOGUkBJSSjwKFmMJKUGsKHbg1VsqCOlgnYEZ2MNbs5fM @@ -1595,7 +1595,7 @@ AAAAAElFTkSuQmCC - + iVBORw0KGgoAAAANSUhEUgAAAIAAAACACAYAAADDPmHLAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAL EgAACxIB0t1+/AAABKJJREFUeF7t3NFV20wUBGBaoAVaoALOoYW0QAu0wHPeaIEWaIEG8kALtODMzdGF @@ -1621,7 +1621,7 @@ b3jWWTUgLqgAAAAASUVORK5CYII= - + iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAC xAAAAsQBW5GdCwAAAWNJREFUWEfFlcttwzAQBd1CWnALriBAWnAtbiHn3NyCW3ALbiAHt5AWlDfErkDE @@ -1633,7 +1633,7 @@ YmUnVvax7H4B9NuYjaLBY+gAAAAASUVORK5CYII= - + iVBORw0KGgoAAAANSUhEUgAAAIAAAACACAYAAADDPmHLAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAL EgAACxIB0t1+/AAABW1JREFUeF7t3bFu1FgUBmAeAd4A5QmQeAFWSrPSFjT0VKnp0m5JudqObutU9Gmg @@ -1662,7 +1662,7 @@ oKHkQUPJg4aSBw0lDxpKHjSULHbP/gfECirB4BdaxwAAAABJRU5ErkJggg== - + iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAC xAAAAsQBW5GdCwAAAUZJREFUWEft1TFKA0EUh/EcIXuFPUEgvSikEWztrazTbWnK1GKTztrK3ib2KWwt @@ -1673,7 +1673,7 @@ MNbQwE1kH4PZ0L4EYw0NbGX414zvD9cEoyeMnjB6wugJoyeMfsLkC68ZsW333pfBAAAAAElFTkSuQmCC - + iVBORw0KGgoAAAANSUhEUgAAAIAAAACACAYAAADDPmHLAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAL EgAACxIB0t1+/AAABYxJREFUeF7t3TFuG0cUxnEfIb6BoRME8AUcQE2AFG7cp1KdTm1Kl0E6d65VpVfj @@ -1703,7 +1703,7 @@ jtsAAAAASUVORK5CYII= - + iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAC xAAAAsQBW5GdCwAAAVNJREFUWEfF1TFKA0EUh/EcIbmB7AkC6UUhjWDrFazttk2ZUsQmnbWVvSCxT5HW From 7ae55149a87b8f6228c10f45a20f5257141c37f1 Mon Sep 17 00:00:00 2001 From: "HALUK\\thomas.corrie" Date: Fri, 18 Jan 2019 17:16:44 +0000 Subject: [PATCH 4/4] Updated migrations --- Miscellany/Miscellany.Migrations.xml | 12 ++++++++++++ Miscellany/Miscellany.csproj | 1 + Miscellany/pkg.json | 4 ++-- 3 files changed, 15 insertions(+), 2 deletions(-) diff --git a/Miscellany/Miscellany.Migrations.xml b/Miscellany/Miscellany.Migrations.xml index eea26ac..1f2cab3 100644 --- a/Miscellany/Miscellany.Migrations.xml +++ b/Miscellany/Miscellany.Migrations.xml @@ -12,8 +12,20 @@ Miscellany.Geometry.Abstract.Vector.Display Miscellany.Geometry.Abstract.VectorDisplay + + Miscellany.Math.Functions.RunningTotal + Miscellany.Maths.RunningTotal + Miscellany.Math.Functions.ToDecimal Miscellany.Maths.ToDecimal + + Miscellany.Math.Functions.ToDouble + Miscellany.Maths.ToDouble + + + Miscellany.List.PairItems + Miscellany.List.Modifies.PairItems + diff --git a/Miscellany/Miscellany.csproj b/Miscellany/Miscellany.csproj index 6e3843d..e5d6c8f 100644 --- a/Miscellany/Miscellany.csproj +++ b/Miscellany/Miscellany.csproj @@ -34,6 +34,7 @@ ..\packages\DynamoVisualProgramming.DynamoCoreNodes.2.1.0.7451\lib\net47\Analysis.dll + False ..\..\..\3DContainerPacking\src\CromulentBisgetti.ContainerPacking\bin\Debug\CromulentBisgetti.dll diff --git a/Miscellany/pkg.json b/Miscellany/pkg.json index f3cfb7d..a652996 100644 --- a/Miscellany/pkg.json +++ b/Miscellany/pkg.json @@ -3,7 +3,7 @@ "file_hash": null, "name": "Miscellany", "version": "1.2.0", -"description": "Miscellaneous nodes for Dynamo", +"description": "Miscellaneous nodes for Dynamo. Includes an implementation of David Chapman's 3DContainerPacking library. Miscellany is authored and maintained by Thomas Corrie", "group": "", "keywords": [ "3DContainerPacking", @@ -12,7 +12,7 @@ ], "dependencies": [], "contents": "", -"engine_version": "2.0.1.5055", +"engine_version": "2.0.2.6826", "engine": "dynamo", "engine_metadata": "", "site_url": "http://www.thomascorrie.com",