From 34b5d070cb4fc64504bbf642a950fb6423f80bc6 Mon Sep 17 00:00:00 2001 From: Lars Brubaker Date: Mon, 11 Jun 2018 15:23:39 -0700 Subject: [PATCH] Default the update button to be hiden --- ...eUpdateButtonAttribute.cs => ShowUpdateButtonAttribute.cs} | 4 ++-- DesignTools/Operations/Align3D.cs | 1 - DesignTools/Operations/FitToBounds3D.cs | 1 - DesignTools/Primitives/ConeObject3D.cs | 1 - DesignTools/Primitives/CubeObject3D.cs | 1 - DesignTools/Primitives/CylinderObject3D.cs | 1 - DesignTools/Primitives/HalfCylinderObject3D.cs | 1 - DesignTools/Primitives/HalfSphereObject3D.cs | 1 - DesignTools/Primitives/HalfWedgeObject3D.cs | 1 - DesignTools/Primitives/PyramidObject3D.cs | 1 - DesignTools/Primitives/RingObject3D.cs | 1 - DesignTools/Primitives/SphereObject3D.cs | 1 - DesignTools/Primitives/TorusObject3D.cs | 1 - DesignTools/Primitives/WedgeObject3D.cs | 1 - DesignTools/PublicPropertyEditor.cs | 4 ++-- MatterControl.csproj | 2 +- PartPreviewWindow/SelectedObjectPanel.cs | 1 - .../View3D/Actions/SubtractAndReplaceObject3D.cs | 1 + PartPreviewWindow/View3D/Actions/SubtractObject3D.cs | 1 + Submodules/agg-sharp | 2 +- 20 files changed, 8 insertions(+), 20 deletions(-) rename DesignTools/Attributes/{HideUpdateButtonAttribute.cs => ShowUpdateButtonAttribute.cs} (94%) diff --git a/DesignTools/Attributes/HideUpdateButtonAttribute.cs b/DesignTools/Attributes/ShowUpdateButtonAttribute.cs similarity index 94% rename from DesignTools/Attributes/HideUpdateButtonAttribute.cs rename to DesignTools/Attributes/ShowUpdateButtonAttribute.cs index 9e6e98edf..5455a0e5b 100644 --- a/DesignTools/Attributes/HideUpdateButtonAttribute.cs +++ b/DesignTools/Attributes/ShowUpdateButtonAttribute.cs @@ -32,9 +32,9 @@ using System; namespace MatterHackers.MatterControl.DesignTools { [AttributeUsage(AttributeTargets.Class)] - public class HideUpdateButtonAttribute : Attribute + public class ShowUpdateButtonAttribute : Attribute { - public HideUpdateButtonAttribute() + public ShowUpdateButtonAttribute() { } } diff --git a/DesignTools/Operations/Align3D.cs b/DesignTools/Operations/Align3D.cs index d4e524e4b..6953fec46 100644 --- a/DesignTools/Operations/Align3D.cs +++ b/DesignTools/Operations/Align3D.cs @@ -177,7 +177,6 @@ namespace MatterHackers.MatterControl.DesignTools.Operations } } - [HideUpdateButtonAttribute] public class Align3D : Object3D, IPublicPropertyObject, IPropertyGridModifier { // We need to serialize this so we can remove the arrange and get back to the objects before arranging diff --git a/DesignTools/Operations/FitToBounds3D.cs b/DesignTools/Operations/FitToBounds3D.cs index 4b0f1bf6c..5a0045a88 100644 --- a/DesignTools/Operations/FitToBounds3D.cs +++ b/DesignTools/Operations/FitToBounds3D.cs @@ -45,7 +45,6 @@ namespace MatterHackers.MatterControl.DesignTools.Operations public enum MaintainRatio { None, X_Y, X_Y_Z } - [HideUpdateButtonAttribute] public class FitToBounds3D : Object3D, IPublicPropertyObject, IEditorDraw, IPropertyGridModifier { [Description("Set the shape the part will be fit into.")] diff --git a/DesignTools/Primitives/ConeObject3D.cs b/DesignTools/Primitives/ConeObject3D.cs index cf62b474c..481ea2d2c 100644 --- a/DesignTools/Primitives/ConeObject3D.cs +++ b/DesignTools/Primitives/ConeObject3D.cs @@ -39,7 +39,6 @@ using MatterHackers.VectorMath; namespace MatterHackers.MatterControl.DesignTools { - [HideUpdateButtonAttribute] public class ConeObject3D : Object3D, IPublicPropertyObject { public ConeObject3D() diff --git a/DesignTools/Primitives/CubeObject3D.cs b/DesignTools/Primitives/CubeObject3D.cs index 0dd9cc666..87b99b2b0 100644 --- a/DesignTools/Primitives/CubeObject3D.cs +++ b/DesignTools/Primitives/CubeObject3D.cs @@ -35,7 +35,6 @@ using MatterHackers.PolygonMesh; namespace MatterHackers.MatterControl.DesignTools { - [HideUpdateButtonAttribute] public class CubeObject3D : Object3D, IPublicPropertyObject { public CubeObject3D() diff --git a/DesignTools/Primitives/CylinderObject3D.cs b/DesignTools/Primitives/CylinderObject3D.cs index cd7d05c10..fd0581656 100644 --- a/DesignTools/Primitives/CylinderObject3D.cs +++ b/DesignTools/Primitives/CylinderObject3D.cs @@ -39,7 +39,6 @@ using MatterHackers.VectorMath; namespace MatterHackers.MatterControl.DesignTools { - [HideUpdateButtonAttribute] public class CylinderObject3D : Object3D, IPublicPropertyObject, IPropertyGridModifier { public CylinderObject3D() diff --git a/DesignTools/Primitives/HalfCylinderObject3D.cs b/DesignTools/Primitives/HalfCylinderObject3D.cs index 7e675e5bf..ea6b86761 100644 --- a/DesignTools/Primitives/HalfCylinderObject3D.cs +++ b/DesignTools/Primitives/HalfCylinderObject3D.cs @@ -38,7 +38,6 @@ using MatterHackers.VectorMath; namespace MatterHackers.MatterControl.DesignTools { - [HideUpdateButtonAttribute] public class HalfCylinderObject3D : Object3D, IPublicPropertyObject { public HalfCylinderObject3D() diff --git a/DesignTools/Primitives/HalfSphereObject3D.cs b/DesignTools/Primitives/HalfSphereObject3D.cs index 2c8011110..1a46a4e57 100644 --- a/DesignTools/Primitives/HalfSphereObject3D.cs +++ b/DesignTools/Primitives/HalfSphereObject3D.cs @@ -38,7 +38,6 @@ using MatterHackers.VectorMath; namespace MatterHackers.MatterControl.DesignTools { - [HideUpdateButtonAttribute] public class HalfSphereObject3D : Object3D, IPublicPropertyObject { public HalfSphereObject3D() diff --git a/DesignTools/Primitives/HalfWedgeObject3D.cs b/DesignTools/Primitives/HalfWedgeObject3D.cs index 54627b524..f1999f113 100644 --- a/DesignTools/Primitives/HalfWedgeObject3D.cs +++ b/DesignTools/Primitives/HalfWedgeObject3D.cs @@ -38,7 +38,6 @@ using MatterHackers.VectorMath; namespace MatterHackers.MatterControl.DesignTools { - [HideUpdateButtonAttribute] public class HalfWedgeObject3D : Object3D, IPublicPropertyObject { public HalfWedgeObject3D() diff --git a/DesignTools/Primitives/PyramidObject3D.cs b/DesignTools/Primitives/PyramidObject3D.cs index 5cde11dcb..6548c8a7a 100644 --- a/DesignTools/Primitives/PyramidObject3D.cs +++ b/DesignTools/Primitives/PyramidObject3D.cs @@ -37,7 +37,6 @@ using MatterHackers.VectorMath; namespace MatterHackers.MatterControl.DesignTools { - [HideUpdateButtonAttribute] public class PyramidObject3D : Object3D, IPublicPropertyObject { public PyramidObject3D() diff --git a/DesignTools/Primitives/RingObject3D.cs b/DesignTools/Primitives/RingObject3D.cs index fb4710898..e4d31b59a 100644 --- a/DesignTools/Primitives/RingObject3D.cs +++ b/DesignTools/Primitives/RingObject3D.cs @@ -40,7 +40,6 @@ using MatterHackers.VectorMath; namespace MatterHackers.MatterControl.DesignTools { - [HideUpdateButtonAttribute] public class RingObject3D : Object3D, IPublicPropertyObject, IPropertyGridModifier { public RingObject3D() diff --git a/DesignTools/Primitives/SphereObject3D.cs b/DesignTools/Primitives/SphereObject3D.cs index 9428a8ceb..2ff8a6bb7 100644 --- a/DesignTools/Primitives/SphereObject3D.cs +++ b/DesignTools/Primitives/SphereObject3D.cs @@ -38,7 +38,6 @@ using MatterHackers.VectorMath; namespace MatterHackers.MatterControl.DesignTools { - [HideUpdateButtonAttribute] public class SphereObject3D : Object3D, IPublicPropertyObject, IPropertyGridModifier { public SphereObject3D() diff --git a/DesignTools/Primitives/TorusObject3D.cs b/DesignTools/Primitives/TorusObject3D.cs index b9e7e5de8..db38bafeb 100644 --- a/DesignTools/Primitives/TorusObject3D.cs +++ b/DesignTools/Primitives/TorusObject3D.cs @@ -36,7 +36,6 @@ using MatterHackers.VectorMath; namespace MatterHackers.MatterControl.DesignTools { - [HideUpdateButtonAttribute] public class TorusObject3D : Object3D, IPublicPropertyObject, IPropertyGridModifier { public TorusObject3D() diff --git a/DesignTools/Primitives/WedgeObject3D.cs b/DesignTools/Primitives/WedgeObject3D.cs index 0e2b7b1ce..12a8a72b6 100644 --- a/DesignTools/Primitives/WedgeObject3D.cs +++ b/DesignTools/Primitives/WedgeObject3D.cs @@ -39,7 +39,6 @@ using MatterHackers.VectorMath; namespace MatterHackers.MatterControl.DesignTools { - [HideUpdateButtonAttribute] public class WedgeObject3D : Object3D, IPublicPropertyObject { public WedgeObject3D() diff --git a/DesignTools/PublicPropertyEditor.cs b/DesignTools/PublicPropertyEditor.cs index 953a5eb77..714d0a0f7 100644 --- a/DesignTools/PublicPropertyEditor.cs +++ b/DesignTools/PublicPropertyEditor.cs @@ -146,8 +146,8 @@ namespace MatterHackers.MatterControl.DesignTools } // add in an Update button if applicable - var hideUpdate = context.item.GetType().GetCustomAttributes(typeof(HideUpdateButtonAttribute), true).FirstOrDefault() as HideUpdateButtonAttribute; - if (hideUpdate == null) + var showUpdate = context.item.GetType().GetCustomAttributes(typeof(ShowUpdateButtonAttribute), true).FirstOrDefault() as ShowUpdateButtonAttribute; + if (showUpdate != null) { var updateButton = theme.ButtonFactory.Generate("Update".Localize()); updateButton.Margin = new BorderDouble(5); diff --git a/MatterControl.csproj b/MatterControl.csproj index efe403504..749b92544 100644 --- a/MatterControl.csproj +++ b/MatterControl.csproj @@ -88,6 +88,7 @@ + @@ -141,7 +142,6 @@ - diff --git a/PartPreviewWindow/SelectedObjectPanel.cs b/PartPreviewWindow/SelectedObjectPanel.cs index aaf132ac6..48cdbfc66 100644 --- a/PartPreviewWindow/SelectedObjectPanel.cs +++ b/PartPreviewWindow/SelectedObjectPanel.cs @@ -42,7 +42,6 @@ using MatterHackers.VectorMath; namespace MatterHackers.MatterControl.PartPreviewWindow { - [HideUpdateButtonAttribute] public class SelectedObjectPanel : FlowLayoutWidget, IContentStore { private IObject3D item = new Object3D(); diff --git a/PartPreviewWindow/View3D/Actions/SubtractAndReplaceObject3D.cs b/PartPreviewWindow/View3D/Actions/SubtractAndReplaceObject3D.cs index c63dbddc3..0cb446e80 100644 --- a/PartPreviewWindow/View3D/Actions/SubtractAndReplaceObject3D.cs +++ b/PartPreviewWindow/View3D/Actions/SubtractAndReplaceObject3D.cs @@ -42,6 +42,7 @@ using MatterHackers.PolygonMesh; namespace MatterHackers.MatterControl.PartPreviewWindow.View3D { + [ShowUpdateButtonAttribute] public class SubtractAndReplaceObject3D : MeshWrapperObject3D, IPublicPropertyObject { public SubtractAndReplaceObject3D() diff --git a/PartPreviewWindow/View3D/Actions/SubtractObject3D.cs b/PartPreviewWindow/View3D/Actions/SubtractObject3D.cs index eb90375b7..3243c9e64 100644 --- a/PartPreviewWindow/View3D/Actions/SubtractObject3D.cs +++ b/PartPreviewWindow/View3D/Actions/SubtractObject3D.cs @@ -42,6 +42,7 @@ using System.Threading.Tasks; namespace MatterHackers.MatterControl.PartPreviewWindow.View3D { + [ShowUpdateButtonAttribute] public class SubtractObject3D : MeshWrapperObject3D, IPublicPropertyObject { public SubtractObject3D() diff --git a/Submodules/agg-sharp b/Submodules/agg-sharp index ff2b0c012..4a69f0ae9 160000 --- a/Submodules/agg-sharp +++ b/Submodules/agg-sharp @@ -1 +1 @@ -Subproject commit ff2b0c012a0f2e3cec4c27e8c7a4e1bbe004e36f +Subproject commit 4a69f0ae9b14876c8c4226d8d0d94a3d1283edbf