From 85403d78f69ddfeb5ec9bfee8e2b817badc676c3 Mon Sep 17 00:00:00 2001 From: Lars Brubaker Date: Wed, 15 Aug 2018 17:01:12 -0700 Subject: [PATCH] make set color work on types with source object issue: MatterHackers/MCCentral#3985 Changing color on a Scale node makes it go away --- DesignTools/Operations/ArrayAdvancedObject3D.cs | 13 ------------- DesignTools/Operations/ArrayLinearObject3D.cs | 13 ------------- DesignTools/Operations/ArrayRadialObject3D.cs | 13 ------------- DesignTools/Operations/RotateObject3D_2.cs | 13 ------------- DesignTools/Operations/ScaleObject3D.cs | 13 ------------- DesignTools/Operations/TranslateObject3D.cs | 13 ------------- 6 files changed, 78 deletions(-) diff --git a/DesignTools/Operations/ArrayAdvancedObject3D.cs b/DesignTools/Operations/ArrayAdvancedObject3D.cs index c97bd4512..ee0689688 100644 --- a/DesignTools/Operations/ArrayAdvancedObject3D.cs +++ b/DesignTools/Operations/ArrayAdvancedObject3D.cs @@ -73,19 +73,6 @@ namespace MatterHackers.MatterControl.DesignTools.Operations { Rebuild(null); } - else if (invalidateType.InvalidateType == InvalidateType.Color) - { - var sourceItem = OperationSourceObject3D.GetOrCreateSourceContainer(this).Children.FirstOrDefault(); - foreach (var item in Children) - { - if (item != sourceItem) - { - item.Color = sourceItem.Color; - } - } - - base.OnInvalidate(invalidateType); - } else if (invalidateType.InvalidateType == InvalidateType.Properties && invalidateType.Source == this) { diff --git a/DesignTools/Operations/ArrayLinearObject3D.cs b/DesignTools/Operations/ArrayLinearObject3D.cs index f586f23d3..3194762df 100644 --- a/DesignTools/Operations/ArrayLinearObject3D.cs +++ b/DesignTools/Operations/ArrayLinearObject3D.cs @@ -66,19 +66,6 @@ namespace MatterHackers.MatterControl.DesignTools.Operations { Rebuild(null); } - else if(invalidateType.InvalidateType == InvalidateType.Color) - { - var sourceItem = OperationSourceObject3D.GetOrCreateSourceContainer(this).Children.FirstOrDefault(); - foreach (var item in Children) - { - if (item != sourceItem) - { - item.Color = sourceItem.Color; - } - } - - base.OnInvalidate(invalidateType); - } else if (invalidateType.InvalidateType == InvalidateType.Properties && invalidateType.Source == this) { diff --git a/DesignTools/Operations/ArrayRadialObject3D.cs b/DesignTools/Operations/ArrayRadialObject3D.cs index 19dd17cef..e0f4b4b3d 100644 --- a/DesignTools/Operations/ArrayRadialObject3D.cs +++ b/DesignTools/Operations/ArrayRadialObject3D.cs @@ -82,19 +82,6 @@ namespace MatterHackers.MatterControl.DesignTools.Operations { Rebuild(null); } - else if (invalidateType.InvalidateType == InvalidateType.Color) - { - var sourceItem = OperationSourceObject3D.GetOrCreateSourceContainer(this).Children.FirstOrDefault(); - foreach (var item in Children) - { - if (item != sourceItem) - { - item.Color = sourceItem.Color; - } - } - - base.OnInvalidate(invalidateType); - } else if (invalidateType.InvalidateType == InvalidateType.Properties && invalidateType.Source == this) { diff --git a/DesignTools/Operations/RotateObject3D_2.cs b/DesignTools/Operations/RotateObject3D_2.cs index 82aa4e56f..a1d4b04b3 100644 --- a/DesignTools/Operations/RotateObject3D_2.cs +++ b/DesignTools/Operations/RotateObject3D_2.cs @@ -113,19 +113,6 @@ namespace MatterHackers.MatterControl.DesignTools.Operations { Rebuild(null); } - else if (invalidateType.InvalidateType == InvalidateType.Color) - { - var sourceItem = OperationSourceObject3D.GetOrCreateSourceContainer(this).Children.FirstOrDefault(); - foreach (var item in Children) - { - if (item != sourceItem) - { - item.Color = sourceItem.Color; - } - } - - base.OnInvalidate(invalidateType); - } else if (invalidateType.InvalidateType == InvalidateType.Properties && invalidateType.Source == this) { diff --git a/DesignTools/Operations/ScaleObject3D.cs b/DesignTools/Operations/ScaleObject3D.cs index 082530370..b79c158fa 100644 --- a/DesignTools/Operations/ScaleObject3D.cs +++ b/DesignTools/Operations/ScaleObject3D.cs @@ -198,19 +198,6 @@ namespace MatterHackers.MatterControl.DesignTools.Operations { Rebuild(null); } - else if (invalidateType.InvalidateType == InvalidateType.Color) - { - var sourceItem = OperationSourceObject3D.GetOrCreateSourceContainer(this).Children.FirstOrDefault(); - foreach (var item in Children) - { - if (item != sourceItem) - { - item.Color = sourceItem.Color; - } - } - - base.OnInvalidate(invalidateType); - } else if (invalidateType.InvalidateType == InvalidateType.Properties && invalidateType.Source == this) { diff --git a/DesignTools/Operations/TranslateObject3D.cs b/DesignTools/Operations/TranslateObject3D.cs index 122130648..b2e9e0c09 100644 --- a/DesignTools/Operations/TranslateObject3D.cs +++ b/DesignTools/Operations/TranslateObject3D.cs @@ -90,19 +90,6 @@ namespace MatterHackers.MatterControl.DesignTools.Operations { Rebuild(null); } - else if (invalidateType.InvalidateType == InvalidateType.Color) - { - var sourceItem = OperationSourceObject3D.GetOrCreateSourceContainer(this).Children.FirstOrDefault(); - foreach (var item in Children) - { - if (item != sourceItem) - { - item.Color = sourceItem.Color; - } - } - - base.OnInvalidate(invalidateType); - } else if (invalidateType.InvalidateType == InvalidateType.Properties && invalidateType.Source == this) {