From 32e9ba56a216d3562893dfff3064ec3251631ade Mon Sep 17 00:00:00 2001 From: Lars Brubaker Date: Tue, 2 Mar 2021 17:08:23 -0800 Subject: [PATCH 1/5] Adding a suppress rebuild attribute --- .../Attributes/SupressRebuildAttribute.cs | 40 +++++++++++++++++++ 1 file changed, 40 insertions(+) create mode 100644 MatterControlLib/DesignTools/Attributes/SupressRebuildAttribute.cs diff --git a/MatterControlLib/DesignTools/Attributes/SupressRebuildAttribute.cs b/MatterControlLib/DesignTools/Attributes/SupressRebuildAttribute.cs new file mode 100644 index 000000000..e6347745a --- /dev/null +++ b/MatterControlLib/DesignTools/Attributes/SupressRebuildAttribute.cs @@ -0,0 +1,40 @@ +/* +Copyright (c) 2018, Lars Brubaker, John Lewin +All rights reserved. + +Redistribution and use in source and binary forms, with or without +modification, are permitted provided that the following conditions are met: + +1. Redistributions of source code must retain the above copyright notice, this + list of conditions and the following disclaimer. +2. Redistributions in binary form must reproduce the above copyright notice, + this list of conditions and the following disclaimer in the documentation + and/or other materials provided with the distribution. + +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND +ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED +WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE +DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR +ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES +(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; +LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND +ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS +SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +The views and conclusions contained in the software and documentation are those +of the authors and should not be interpreted as representing official policies, +either expressed or implied, of the FreeBSD Project. +*/ + +using System; + +namespace MatterHackers.MatterControl.DesignTools +{ + public class SupressRebuildAttribute : Attribute + { + public SupressRebuildAttribute() + { + } + } +} \ No newline at end of file From bca3a4ec0ceceda983455265e25886ccfe061afe Mon Sep 17 00:00:00 2001 From: Lars Brubaker Date: Tue, 2 Mar 2021 17:50:57 -0800 Subject: [PATCH 2/5] Improve description of offsets --- MatterControl.Printing/Settings/SliceSettingsFields.cs | 6 +++--- .../SlicerConfiguration/UIFields/BoundsField.cs | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/MatterControl.Printing/Settings/SliceSettingsFields.cs b/MatterControl.Printing/Settings/SliceSettingsFields.cs index 03eb6599b..515ed13ee 100644 --- a/MatterControl.Printing/Settings/SliceSettingsFields.cs +++ b/MatterControl.Printing/Settings/SliceSettingsFields.cs @@ -2273,7 +2273,7 @@ namespace MatterHackers.MatterControl.SlicerConfiguration { SlicerConfigName = SettingsKey.sla_printable_area_inset, PresentationName = "Printable Area Inset".Localize(), - HelpText = "The inset amount from the edges of the bed. Defines the printable area of the bed. Leave as 0s if the entire bed can be printed to.".Localize(), + HelpText = "The inset amount from the edges of the bed. Defines the printable area of the bed. Leave as 0s if the entire bed can be printed to (Left, Front, Right, Back).".Localize(), DataEditType = DataEditTypes.BOUNDS, RequiredDisplayDetail = DisplayDetailRequired.Advanced, DefaultValue = "" @@ -2282,7 +2282,7 @@ namespace MatterHackers.MatterControl.SlicerConfiguration { SlicerConfigName = SettingsKey.t0_inset, PresentationName = "Nozzle 1 Inset".Localize(), - HelpText = "The inset amount for nozzle 1 from the bed".Localize(), + HelpText = "The inset amount for nozzle 1 from the bed (Left, Front, Right, Back).".Localize(), DataEditType = DataEditTypes.BOUNDS, RequiredDisplayDetail = DisplayDetailRequired.Advanced, ShowIfSet = "extruder_count>1", @@ -2292,7 +2292,7 @@ namespace MatterHackers.MatterControl.SlicerConfiguration { SlicerConfigName = SettingsKey.t1_inset, PresentationName = "Nozzle 2 Inset".Localize(), - HelpText = "The inset amount for nozzle 2 from the bed".Localize(), + HelpText = "The inset amount for nozzle 2 from the bed (Left, Front, Right, Back).".Localize(), DataEditType = DataEditTypes.BOUNDS, RequiredDisplayDetail = DisplayDetailRequired.Advanced, ShowIfSet = "extruder_count>1", diff --git a/MatterControlLib/SlicerConfiguration/UIFields/BoundsField.cs b/MatterControlLib/SlicerConfiguration/UIFields/BoundsField.cs index eefd95067..cc15d6b27 100644 --- a/MatterControlLib/SlicerConfiguration/UIFields/BoundsField.cs +++ b/MatterControlLib/SlicerConfiguration/UIFields/BoundsField.cs @@ -34,7 +34,7 @@ namespace MatterHackers.MatterControl.SlicerConfiguration public BoundsField(ThemeConfig theme) : base (theme) { - Labels = new[] { 'L', 'B', 'R', 'T' }; + Labels = new[] { 'L', 'F', 'R', 'B' }; } } } From 699cee2d9be75b8b8afaaac69bafc911919e5489 Mon Sep 17 00:00:00 2001 From: Lars Brubaker Date: Tue, 2 Mar 2021 17:51:14 -0800 Subject: [PATCH 3/5] adding permission required attribute --- .../RequiresPermissionsAttribute.cs | 41 +++++++++++++++++++ 1 file changed, 41 insertions(+) create mode 100644 MatterControlLib/DesignTools/Attributes/RequiresPermissionsAttribute.cs diff --git a/MatterControlLib/DesignTools/Attributes/RequiresPermissionsAttribute.cs b/MatterControlLib/DesignTools/Attributes/RequiresPermissionsAttribute.cs new file mode 100644 index 000000000..4c4e76fda --- /dev/null +++ b/MatterControlLib/DesignTools/Attributes/RequiresPermissionsAttribute.cs @@ -0,0 +1,41 @@ +/* +Copyright (c) 2018, Lars Brubaker, John Lewin +All rights reserved. + +Redistribution and use in source and binary forms, with or without +modification, are permitted provided that the following conditions are met: + +1. Redistributions of source code must retain the above copyright notice, this + list of conditions and the following disclaimer. +2. Redistributions in binary form must reproduce the above copyright notice, + this list of conditions and the following disclaimer in the documentation + and/or other materials provided with the distribution. + +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND +ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED +WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE +DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR +ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES +(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; +LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND +ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS +SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +The views and conclusions contained in the software and documentation are those +of the authors and should not be interpreted as representing official policies, +either expressed or implied, of the FreeBSD Project. +*/ + +using System; + +namespace MatterHackers.MatterControl.DesignTools +{ + [AttributeUsage(AttributeTargets.Class)] + public class RequiresPermissionsAttribute : Attribute + { + public RequiresPermissionsAttribute() + { + } + } +} \ No newline at end of file From 2b89cb2c11cfcd0814f0e8dcaccbbb963a7d59bf Mon Sep 17 00:00:00 2001 From: Lars Brubaker Date: Tue, 2 Mar 2021 17:57:19 -0800 Subject: [PATCH 4/5] Adding lockable items that external to persist able --- .../DesignTools/PublicPropertyEditor.cs | 62 +++++++------------ 1 file changed, 23 insertions(+), 39 deletions(-) diff --git a/MatterControlLib/DesignTools/PublicPropertyEditor.cs b/MatterControlLib/DesignTools/PublicPropertyEditor.cs index e937087d7..4e5a9a481 100644 --- a/MatterControlLib/DesignTools/PublicPropertyEditor.cs +++ b/MatterControlLib/DesignTools/PublicPropertyEditor.cs @@ -59,7 +59,7 @@ namespace MatterHackers.MatterControl.DesignTools { typeof(double), typeof(int), typeof(char), typeof(string), typeof(bool), typeof(Color), - typeof(Vector2), typeof(Vector3), typeof(Vector4), + typeof(Vector2), typeof(Vector3), typeof(DirectionVector), typeof(DirectionAxis), typeof(SelectedChildren), typeof(ImageBuffer), @@ -421,29 +421,6 @@ namespace MatterHackers.MatterControl.DesignTools rowContainer = CreateSettingsColumn(property, field); } - else if (propertyValue is Vector4 vector4) - { - var field = new Vector4Field(theme); - if (property.PropertyInfo.GetCustomAttributes(true).OfType().FirstOrDefault() is VectorFieldLabelsAttribute vectorFieldLabels) - { - field.Labels = vectorFieldLabels.Labels; - } - - field.Initialize(0); - field.Vector4 = vector4; - field.ClearUndoHistory(); - - RegisterValueChanged( - field, - (valueString) => Vector4.Parse(valueString), - (value) => - { - var s = ((Vector4)value).ToString(); - return s.Substring(1, s.Length - 2); - }); - - rowContainer = CreateSettingsColumn(property, field); - } else if (propertyValue is DirectionVector directionVector) { var field = new DirectionVectorField(theme); @@ -523,7 +500,8 @@ namespace MatterHackers.MatterControl.DesignTools } else if (propertyValue is SelectedChildren childSelector) { - if (property.PropertyInfo.GetCustomAttributes(true).OfType().FirstOrDefault() is ShowAsListAttribute showAsList) + var showAsList = property.PropertyInfo.GetCustomAttributes(true).OfType().FirstOrDefault() != null; + if (showAsList) { UIField field = new ChildrenSelectorListField(property, theme); @@ -966,7 +944,14 @@ namespace MatterHackers.MatterControl.DesignTools public static void AddUnlockLinkIfRequired(IObject3D item, GuiWidget editControlsContainer, ThemeConfig theme) { - if (!item.Persistable) + (string url, GuiWidget markdownWidget)? unlockdata = null; + + if (item.GetType().GetCustomAttributes(typeof(RequiresPermissionsAttribute), true).FirstOrDefault() is RequiresPermissionsAttribute unlockLink + && !ApplicationController.Instance.UserHasPermission(item)) + { + unlockdata = ApplicationController.Instance.GetUnlockData?.Invoke(item, theme); + } + else if (!item.Persistable) { // find the first self or child that is not authorized var permission = item.DescendantsAndSelf() @@ -975,21 +960,20 @@ namespace MatterHackers.MatterControl.DesignTools if (permission.Any()) { var unlockItem = permission.First(); - var unlockdata = ApplicationController.Instance.GetUnlockData?.Invoke(unlockItem, theme); - - if (unlockdata != null - && !string.IsNullOrEmpty(unlockdata.Value.url)) - { - if (unlockdata.Value.markdownWidget != null) - { - unlockdata.Value.markdownWidget.VAnchor = VAnchor.Fit; - editControlsContainer.AddChild(unlockdata.Value.markdownWidget); - } - - editControlsContainer.AddChild(GetUnlockRow(theme, unlockdata.Value.url)); - } + unlockdata = ApplicationController.Instance.GetUnlockData?.Invoke(unlockItem, theme); } } + + if (unlockdata != null && !string.IsNullOrEmpty(unlockdata.Value.url)) + { + if (unlockdata.Value.markdownWidget != null) + { + unlockdata.Value.markdownWidget.VAnchor = VAnchor.Fit; + editControlsContainer.AddChild(unlockdata.Value.markdownWidget); + } + + editControlsContainer.AddChild(GetUnlockRow(theme, unlockdata.Value.url)); + } } public static GuiWidget GetUnlockRow(ThemeConfig theme, string url) From 776f5aba90c1012157f4bbf1d5e4a56716ea7a85 Mon Sep 17 00:00:00 2001 From: LarsBrubaker Date: Wed, 3 Mar 2021 08:15:18 -0800 Subject: [PATCH 5/5] adding default icon image --- .../Thumbnails/7222987963278056759-256x256.png | Bin 0 -> 9419 bytes 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 StaticData/Images/Thumbnails/7222987963278056759-256x256.png diff --git a/StaticData/Images/Thumbnails/7222987963278056759-256x256.png b/StaticData/Images/Thumbnails/7222987963278056759-256x256.png new file mode 100644 index 0000000000000000000000000000000000000000..73f0689d650d4032a37bf1987d50750b75146a77 GIT binary patch literal 9419 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 literal 0 HcmV?d00001