From d85fce0713d3fa15c27fc8173c73a8d1002e25a4 Mon Sep 17 00:00:00 2001 From: LarsBrubaker Date: Sun, 2 Aug 2020 08:44:28 -0700 Subject: [PATCH] fix arrange all sorting --- MatterControlLib/PartPreviewWindow/PlatingHelper.cs | 8 ++++---- Submodules/agg-sharp | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/MatterControlLib/PartPreviewWindow/PlatingHelper.cs b/MatterControlLib/PartPreviewWindow/PlatingHelper.cs index 201c8d624..6920500aa 100644 --- a/MatterControlLib/PartPreviewWindow/PlatingHelper.cs +++ b/MatterControlLib/PartPreviewWindow/PlatingHelper.cs @@ -85,7 +85,7 @@ namespace MatterHackers.MatterControl } // sort them by size - object3DList.Sort(SortOnSize); + object3DList.Sort(SortOnBigToLittle); double ratioPerMeshGroup = 1.0 / object3DList.Count; double currentRatioDone = 0; @@ -120,10 +120,10 @@ namespace MatterHackers.MatterControl } } - private static int SortOnSize(IObject3D x, IObject3D y) + private static int SortOnBigToLittle(IObject3D a, IObject3D b) { - AxisAlignedBoundingBox xAABB = x.GetAxisAlignedBoundingBox(); - AxisAlignedBoundingBox yAABB = y.GetAxisAlignedBoundingBox(); + AxisAlignedBoundingBox xAABB = b.GetAxisAlignedBoundingBox(); + AxisAlignedBoundingBox yAABB = a.GetAxisAlignedBoundingBox(); return Math.Max(xAABB.XSize, xAABB.YSize).CompareTo(Math.Max(yAABB.XSize, yAABB.YSize)); } diff --git a/Submodules/agg-sharp b/Submodules/agg-sharp index 7834d4be4..20b80608e 160000 --- a/Submodules/agg-sharp +++ b/Submodules/agg-sharp @@ -1 +1 @@ -Subproject commit 7834d4be42bdab27d48be505721c1cf4ba3d8dfe +Subproject commit 20b80608ebe7c06b30feb2823e7f7224437f1259