Merge pull request #5400 from larsbrubaker/main

main

MatterControlLib/ApplicationView/SceneOperations.cs

@@ -353,7 +353,7 @@ namespace MatterHackers.MatterControl
 				{
 					var scene = sceneContext.Scene;
 					var sceneItem = scene.SelectedItem;
-					if (sceneItem is IObject3D imageObject)
+					if (sceneItem is IImageProvider imageObject)
 					{
 						// TODO: make it look like this (and get rid of all the other stuff)
 						// scene.Replace(sceneItem, new ImageToPathObject3D_2(sceneItem.Clone()));
@@ -373,7 +373,7 @@ namespace MatterHackers.MatterControl
 				},
 				Icon = (theme) => StaticData.Instance.LoadIcon("image_to_path.png", 16, 16).SetToColor(theme.TextColor).SetPreMultiply(),
 				HelpTextGetter = () => "An image must be selected".Localize().Stars(),
-				IsEnabled = (sceneContext) => sceneContext.Scene.SelectedItem != null && sceneContext.Scene.SelectedItem is ImageObject3D,
+				IsEnabled = (sceneContext) => sceneContext.Scene.SelectedItem != null && sceneContext.Scene.SelectedItem is IImageProvider,
 			};
 		}
 

MatterControlLib/DesignTools/EditorTools/LithophanePlugin.cs

@@ -80,14 +80,14 @@ namespace MatterHackers.MatterControl.Plugins.Lithophane
 					{
 						var scene = sceneContext.Scene;
 						var sceneItem = scene.SelectedItem;
-						if (sceneItem is IObject3D imageObject)
+						if (sceneItem is IImageProvider imageObject)
 						{
 							WrapWith(sceneItem, new LithophaneObject3D(), scene);
 						}
 					},
-					IsEnabled = (sceneContext) => sceneContext?.Scene?.SelectedItem is ImageObject3D,
+					IsEnabled = (sceneContext) => sceneContext?.Scene?.SelectedItem is IImageProvider,
 					HelpTextGetter = () => "An image must be selected".Localize().Stars(),
-					ShowInModifyMenu = (sceneContext) => sceneContext?.Scene?.SelectedItem is ImageObject3D,
+					ShowInModifyMenu = (sceneContext) => sceneContext?.Scene?.SelectedItem is IImageProvider,
 					Icon = (theme) => StaticData.Instance.LoadIcon("lithophane.png", 16, 16).SetToColor(theme.TextColor)
 				},
 				"Image");

MatterControlLib/DesignTools/LithophaneObject3D.cs

@@ -53,7 +53,7 @@ namespace MatterHackers.MatterControl.Plugins.Lithophane
 		}
 
 		[JsonIgnore]
-		public ImageObject3D ImageChild => this.Children.OfType<ImageObject3D>().FirstOrDefault();
+		public IImageProvider ImageChild => this.Children.OfType<IImageProvider>().FirstOrDefault();
 
 		[DisplayName("Pixels Per mm"), Range(0.5, 3, ErrorMessage = "Value for {0} must be between {1} and {2}.")]
 		public double PixelsPerMM { get; set; } = 1.5;

MatterControlLib/DesignTools/Operations/Path/LinearExtrudeObject3D.cs

@@ -30,21 +30,17 @@ either expressed or implied, of the FreeBSD Project.
 using System;
 using System.Collections.Generic;
 using System.ComponentModel;
-using System.Linq;
 using System.Threading;
 using System.Threading.Tasks;
-using MatterHackers.Agg;
 using MatterHackers.Agg.UI;
 using MatterHackers.Agg.VertexSource;
 using MatterHackers.DataConverters3D;
 using MatterHackers.DataConverters3D.UndoCommands;
 using MatterHackers.Localizations;
 using MatterHackers.MatterControl.PartPreviewWindow;
-using MatterHackers.Plugins.EditorTools;
 using MatterHackers.PolygonMesh;
 using MatterHackers.PolygonMesh.Processors;
 using MatterHackers.VectorMath;
-using Newtonsoft.Json;
 
 namespace MatterHackers.MatterControl.DesignTools.Operations
 {
@@ -62,18 +58,17 @@ namespace MatterHackers.MatterControl.DesignTools.Operations
 		[Description("Bevel the top of the extrusion")]
 		public bool BevelTop { get; set; } = false;
 
-		[Description("The amount to inset the bevel")]
+		[EnumDisplay(Mode = EnumDisplayAttribute.PresentationMode.Buttons)]
-		public DoubleOrExpression BevelInset { get; set; } = 2;
+		public ExpandStyles Style { get; set; } = ExpandStyles.Sharp;
 
-		/// <summary>
+        [Slider(0, 20, Easing.EaseType.Quadratic, snapDistance: .1)]
-		[Description("The height the bevel will start")]
+        public DoubleOrExpression Radius { get; set; } = 3;
-		/// </summary>
-		public DoubleOrExpression BevelStart { get; set; } = 4;
 
-		public IntOrExpression BevelSteps { get; set; } = 1;
+        [Slider(1, 20, Easing.EaseType.Quadratic, snapDistance: 1)]
+        public IntOrExpression Segments { get; set; } = 9;
 #endif
 
-		public override bool CanApply => true;
+        public override bool CanApply => true;
 
         public override IVertexSource GetVertexSource()
 		{
@@ -131,6 +126,11 @@ namespace MatterHackers.MatterControl.DesignTools.Operations
 			}
 		}
 
+        private (double x, double y) GetOffset(double radius, double xRatio, double yRatio)
+		{
+            return (radius * Math.Cos(xRatio * MathHelper.Tau / 4), radius * Math.Sin(yRatio * MathHelper.Tau / 4));
+        }
+
 		public override Task Rebuild()
 		{
 			this.DebugDepth("Rebuild");
@@ -140,10 +140,10 @@ namespace MatterHackers.MatterControl.DesignTools.Operations
 
 			var height = Height.Value(this);
 #if DEBUG
-			var bevelSteps = BevelSteps.ClampIfNotCalculated(this, 1, 32, ref valuesChanged);
+			var segments = Segments.ClampIfNotCalculated(this, 1, 32, ref valuesChanged);
-			var bevelStart = BevelStart.ClampIfNotCalculated(this, 0, height, ref valuesChanged);
+            var aabb = this.GetAxisAlignedBoundingBox();
-			var aabb = this.GetAxisAlignedBoundingBox();
+            var radius = Radius.ClampIfNotCalculated(this, 0, Math.Min(aabb.XSize, Math.Min(aabb.YSize, aabb.ZSize)) / 2, ref valuesChanged);
-			var bevelInset = BevelInset.ClampIfNotCalculated(this, 0, Math.Min(aabb.XSize /2, aabb.YSize / 2), ref valuesChanged);
+            var bevelStart = height - radius;
 #endif
 
 			// now create a long running task to do the extrusion
@@ -157,20 +157,17 @@ namespace MatterHackers.MatterControl.DesignTools.Operations
 #if DEBUG
 					if (BevelTop)
 					{
-						bevel = new List<(double height, double inset)>();
+                        bevel = new List<(double, double)>();
-                        for (int i = 0; i < bevelSteps; i++)
+                        for (int i = 0; i < segments; i++)
 						{
-							var heightRatio = i / (double)bevelSteps;
+                            (double x, double y) = GetOffset(radius, (i + 1) / (double)segments, i / (double)segments);
-                            var height2 = heightRatio * (height - bevelStart) + bevelStart;
+							bevel.Add((bevelStart + y, -radius+x));
-							var insetRatio = (i + 1) / (double)bevelSteps;
-							var inset = Easing.Sinusoidal.In(insetRatio) * -bevelInset;
-							bevel.Add((height2, inset));
 						}
-					}
+                    }
 #endif
-					if (this.GetVertexSource() != null)
+                    if (this.GetVertexSource() != null)
 					{
-						Mesh = VertexSourceToMesh.Extrude(this.GetVertexSource(), height, bevel);
+						Mesh = VertexSourceToMesh.Extrude(this.GetVertexSource(), height, bevel, InflatePathObject3D.GetJoinType(Style));
 						if (Mesh.Vertices.Count == 0)
 						{
 							Mesh = null;
@@ -196,9 +193,9 @@ namespace MatterHackers.MatterControl.DesignTools.Operations
 #if DEBUG
 		public void UpdateControls(PublicPropertyChange change)
 		{
-			change.SetRowVisible(nameof(BevelStart), () => BevelTop);
+			change.SetRowVisible(nameof(Radius), () => BevelTop);
-			change.SetRowVisible(nameof(BevelInset), () => BevelTop);
+			change.SetRowVisible(nameof(Segments), () => BevelTop);
-			change.SetRowVisible(nameof(BevelSteps), () => BevelTop);
+			change.SetRowVisible(nameof(Style), () => BevelTop);
 		}
 #endif
 	}

MatterControlLib/DesignTools/Primitives/ComponentObject3D.cs

@@ -153,7 +153,7 @@ namespace MatterHackers.MatterControl.DesignTools
 					if (firtSheet != null)
 					{
 						// We don't have any cache of the cell content, get the current content
-						double.TryParse(firtSheet.SheetData.EvaluateExpression(cellId2), out double value);
+						double.TryParse(firtSheet.SheetData.GetCellValue(cellId2), out double value);
 						cellData2 = value.ToString();
 					}
 				}

MatterControlLib/DesignTools/Primitives/CubeObject3D.cs

@@ -67,7 +67,7 @@ namespace MatterHackers.MatterControl.DesignTools
 
 		public bool Round { get; set; }
 
-		[Slider(0, 30, Easing.EaseType.Quadratic, snapDistance: .1)]
+		[Slider(0, 20, Easing.EaseType.Quadratic, snapDistance: .1)]
 		public DoubleOrExpression Radius { get; set; } = 3;
 
 		[Slider(1, 20, Easing.EaseType.Quadratic, snapDistance: 1)]

MatterControlLib/DesignTools/Primitives/IEditorWidgetModifier.cs

@@ -0,0 +1,39 @@
+/*
+Copyright (c) 2022 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;
+using MatterHackers.Agg.UI;
+
+namespace MatterHackers.MatterControl.DesignTools
+{
+    public interface IEditorWidgetModifier
+	{
+		void ModifyEditorWidget(GuiWidget widget, ThemeConfig theme, Action requestWidgetUpdate);
+	}
+}

MatterControlLib/DesignTools/Primitives/IImageProvider.cs

@@ -0,0 +1,38 @@
+/*
+Copyright (c) 2022 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 MatterHackers.Agg.Image;
+
+namespace MatterHackers.MatterControl.DesignTools
+{
+    public interface IImageProvider
+	{
+		ImageBuffer Image { get; }
+	}
+}

MatterControlLib/DesignTools/Primitives/ImageObject3D.cs

@@ -46,17 +46,8 @@ using Newtonsoft.Json;
 
 namespace MatterHackers.MatterControl.DesignTools
 {
-	public interface IEditorWidgetModifier
-	{
-		void ModifyEditorWidget(GuiWidget widget, ThemeConfig theme, Action requestWidgetUpdate);
-	}
 
-	public interface IImageProvider
+    [HideMeterialAndColor]
-	{
-		ImageBuffer Image { get; }
-	}
-
-	[HideMeterialAndColor]
 	public class ImageObject3D : AssetObject3D, IImageProvider, IObject3DControlsProvider, IEditorWidgetModifier
 	{
 		private const double DefaultSizeMm = 60;

MatterControlLib/DesignTools/Primitives/QrCodeObject3D.cs

@@ -0,0 +1,530 @@
+/*
+Copyright (c) 2022 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;
+using System.ComponentModel;
+using System.IO;
+using System.Threading.Tasks;
+using MatterHackers.Agg;
+using MatterHackers.Agg.Image;
+using MatterHackers.Agg.ImageProcessing;
+using MatterHackers.Agg.Platform;
+using MatterHackers.Agg.UI;
+using MatterHackers.DataConverters3D;
+using MatterHackers.Localizations;
+using MatterHackers.MatterControl.DataStorage;
+using MatterHackers.MatterControl.PartPreviewWindow;
+using MatterHackers.PolygonMesh;
+using Newtonsoft.Json;
+using QRCoder;
+
+namespace MatterHackers.MatterControl.DesignTools
+{
+    [HideMeterialAndColor]
+	public class QrCodeObject3D : Object3D, IImageProvider, IObject3DControlsProvider, IPropertyGridModifier
+	{
+		private const double DefaultSizeMm = 60;
+
+		private ImageBuffer _image;
+
+		private bool _invert;
+
+		public QrCodeObject3D()
+		{
+			Name = "QR Code".Localize();
+		}
+
+		public static async Task<QrCodeObject3D> Create()
+		{
+			var item = new QrCodeObject3D();
+			await item.Rebuild();
+			return item;
+		}
+
+		public override bool CanApply => false;
+
+        public enum QrCodeTypes
+		{
+            Text,
+            WiFi
+		}
+
+        [EnumDisplay(Mode = EnumDisplayAttribute.PresentationMode.Buttons)]
+        public QrCodeTypes OutputOption { get; set; } = QrCodeTypes.Text;
+
+
+		// WIFI:S:<SSID>;T:<WEP|WPA|blank>;P:<PASSWORD>;H:<true|false|blank>;;
+		[Description("The name of the WiFi network")]
+        public StringOrExpression SSID { get; set; } = "";
+
+        [Description("The password of the WiFi network")]
+        public StringOrExpression Password { get; set; } = "";
+
+        public enum SecurityTypes
+		{
+            WEP,
+            WPA,
+            None
+        }
+
+		[EnumDisplay(Mode = EnumDisplayAttribute.PresentationMode.Buttons)]
+		public SecurityTypes Security { get; set; } = SecurityTypes.WPA;
+
+        public StringOrExpression Text { get; set; } = "https://www.matterhackers.com";
+
+        [DisplayName("")]
+		[JsonIgnore]
+		[ImageDisplay(Margin = new int[] { 9, 3, 9, 3 }, MaxXSize = 400, Stretch = true)]
+		public ImageBuffer Image
+		{
+			get
+			{
+				if (_image == null)
+                {
+                    RebuildImage();
+
+                    // send the invalidate on image change
+                    this.CancelAllParentBuilding();
+                    Parent?.Invalidate(new InvalidateArgs(this, InvalidateType.Image));
+                    Invalidate(InvalidateType.DisplayValues);
+                }
+
+                return _image;
+			}
+
+			set
+			{
+			}
+		}
+
+        private void RebuildImage()
+        {
+            // set a temp image so we don't have any problems with threading
+            var image = this.BuildImage();
+
+            if (image != null)
+            {
+                if (this.Invert)
+                {
+                    image = InvertLightness.DoInvertLightness(image);
+                }
+            }
+            else // bad load
+            {
+                image = new ImageBuffer(200, 100);
+                var graphics2D = image.NewGraphics2D();
+                graphics2D.Clear(Color.White);
+                graphics2D.DrawString("Image Missing".Localize(), image.Width / 2, image.Height / 2, 20, Agg.Font.Justification.Center, Agg.Font.Baseline.BoundsCenter);
+            }
+
+            // we don't want to invalidate on the mesh change
+            using (RebuildLock())
+            {
+                base.Mesh = this.InitMesh(image) ?? PlatonicSolids.CreateCube(100, 100, 0.2);
+            }
+
+			if (_image == null)
+			{
+				_image = image;
+			}
+            else
+            {
+				_image.CopyFrom(image);
+            }
+        }
+
+        public bool Invert
+		{
+			get => _invert;
+			set
+			{
+				if (_invert != value)
+				{
+					_invert = value;
+					RebuildImage();
+					Invalidate(InvalidateType.Image);
+				}
+			}
+		}
+
+		public override async void OnInvalidate(InvalidateArgs invalidateArgs)
+		{
+			if ((invalidateArgs.InvalidateType.HasFlag(InvalidateType.Properties) && invalidateArgs.Source == this))
+			{
+				RebuildImage();
+				await Rebuild();
+			}
+			else if (SheetObject3D.NeedsRebuild(this, invalidateArgs))
+			{
+				RebuildImage();
+				await Rebuild();
+			}
+			else
+			{
+				base.OnInvalidate(invalidateArgs);
+			}
+		}
+
+		public static string GetFileOrAsset(string file)
+		{
+			if (!File.Exists(file))
+			{
+				var path = Path.Combine(ApplicationDataStorage.Instance.LibraryAssetsPath, file);
+				if (File.Exists(path))
+				{
+					return path;
+				}
+
+				// can't find a real file
+				return null;
+			}
+
+			return file;
+		}
+
+
+		public static bool FilesAreEqual(string first, string second)
+		{
+			if (string.IsNullOrEmpty(first)
+				|| string.IsNullOrEmpty(second))
+			{
+				return false;
+			}
+
+			var diskFirst = GetFileOrAsset(first);
+			var diskSecond = GetFileOrAsset(second);
+			if (File.Exists(diskFirst) && File.Exists(diskSecond))
+			{
+				return FilesAreEqual(new FileInfo(diskFirst), new FileInfo(diskSecond));
+			}
+
+			return false;
+		}
+
+		public static bool FilesAreEqual(FileInfo first, FileInfo second)
+		{
+			if (first.Length != second.Length)
+			{
+				return false;
+			}
+
+			if (string.Equals(first.FullName, second.FullName, StringComparison.OrdinalIgnoreCase))
+			{
+				return true;
+			}
+
+			int readSize = 1 << 16;
+			int numReads = (int)Math.Ceiling((double)first.Length / readSize);
+
+			using (var firstFs = first.OpenRead())
+			{
+				using (var secondFs = second.OpenRead())
+				{
+					byte[] one = new byte[readSize];
+					byte[] two = new byte[readSize];
+
+					for (int i = 0; i < numReads; i++)
+					{
+						firstFs.Read(one, 0, readSize);
+						secondFs.Read(two, 0, readSize);
+
+						for (int j = 0; j < readSize; j++)
+						{
+							if (one[j] != two[j])
+							{
+								return false;
+							}
+						}
+					}
+				}
+			}
+
+			return true;
+		}
+		public void AddObject3DControls(Object3DControlsLayer object3DControlsLayer)
+		{
+			object3DControlsLayer.AddControls(ControlTypes.Standard2D);
+		}
+
+		private ImageBuffer BuildImage()
+		{
+			var text = Text.Value(this);
+
+			if (OutputOption == QrCodeTypes.WiFi)
+			{
+				var ssid = SSID.Value(this).Replace(":", "\\:");
+				var security = "";
+				switch(Security)
+				{
+					case SecurityTypes.WPA:
+						security = "WPA";
+						break;
+					case SecurityTypes.WEP:
+						security = "WEP";
+						break;
+				}
+				var password = Password.Value(this).Replace(":", "\\:");
+
+				text = $"WIFI:S:{ssid};T:{security};P:{password};H:;;";
+			}
+
+            QRCodeGenerator qrGenerator = new QRCodeGenerator();
+			QRCodeData qrCodeData = qrGenerator.CreateQrCode(text, QRCodeGenerator.ECCLevel.Q);
+			QRCode qrCode = new QRCode(qrCodeData);
+            System.Drawing.Bitmap qrCodeImage = qrCode.GetGraphic(16);
+
+			var destImage = new ImageBuffer();
+			ConvertBitmapToImage(destImage, qrCodeImage);
+			return destImage;
+		}
+
+		public bool ConvertBitmapToImage(ImageBuffer destImage, System.Drawing.Bitmap bitmap)
+		{
+			if (bitmap != null)
+			{
+				switch (bitmap.PixelFormat)
+				{
+					case System.Drawing.Imaging.PixelFormat.Format32bppArgb:
+						{
+							destImage.Allocate(bitmap.Width, bitmap.Height, bitmap.Width * 4, 32);
+							if (destImage.GetRecieveBlender() == null)
+							{
+								destImage.SetRecieveBlender(new BlenderBGRA());
+							}
+
+                            System.Drawing.Imaging.BitmapData bitmapData = bitmap.LockBits(
+								new System.Drawing.Rectangle(0, 0, bitmap.Width, bitmap.Height), System.Drawing.Imaging.ImageLockMode.ReadWrite, bitmap.PixelFormat);
+							int sourceIndex = 0;
+							int destIndex = 0;
+							unsafe
+							{
+								byte[] destBuffer = destImage.GetBuffer(out int offset);
+								byte* pSourceBuffer = (byte*)bitmapData.Scan0;
+								for (int y = 0; y < destImage.Height; y++)
+								{
+									destIndex = destImage.GetBufferOffsetXY(0, destImage.Height - 1 - y);
+									for (int x = 0; x < destImage.Width; x++)
+									{
+#if true
+										destBuffer[destIndex++] = pSourceBuffer[sourceIndex++];
+										destBuffer[destIndex++] = pSourceBuffer[sourceIndex++];
+										destBuffer[destIndex++] = pSourceBuffer[sourceIndex++];
+										destBuffer[destIndex++] = pSourceBuffer[sourceIndex++];
+#else
+                                            Color notPreMultiplied = new Color(pSourceBuffer[sourceIndex + 0], pSourceBuffer[sourceIndex + 1], pSourceBuffer[sourceIndex + 2], pSourceBuffer[sourceIndex + 3]);
+                                            sourceIndex += 4;
+                                            Color preMultiplied = notPreMultiplied.ToColorF().premultiply().ToColor();
+                                            destBuffer[destIndex++] = preMultiplied.blue;
+                                            destBuffer[destIndex++] = preMultiplied.green;
+                                            destBuffer[destIndex++] = preMultiplied.red;
+                                            destBuffer[destIndex++] = preMultiplied.alpha;
+#endif
+									}
+								}
+							}
+
+							bitmap.UnlockBits(bitmapData);
+
+							return true;
+						}
+
+					case System.Drawing.Imaging.PixelFormat.Format24bppRgb:
+						{
+							destImage.Allocate(bitmap.Width, bitmap.Height, bitmap.Width * 4, 32);
+							if (destImage.GetRecieveBlender() == null)
+							{
+								destImage.SetRecieveBlender(new BlenderBGRA());
+							}
+
+                            System.Drawing.Imaging.BitmapData bitmapData = bitmap.LockBits(new System.Drawing.Rectangle(0, 0, bitmap.Width, bitmap.Height), System.Drawing.Imaging.ImageLockMode.ReadWrite, bitmap.PixelFormat);
+							int sourceIndex = 0;
+							int destIndex = 0;
+							unsafe
+							{
+								byte[] destBuffer = destImage.GetBuffer(out int offset);
+								byte* pSourceBuffer = (byte*)bitmapData.Scan0;
+								for (int y = 0; y < destImage.Height; y++)
+								{
+									sourceIndex = y * bitmapData.Stride;
+									destIndex = destImage.GetBufferOffsetXY(0, destImage.Height - 1 - y);
+									for (int x = 0; x < destImage.Width; x++)
+									{
+										destBuffer[destIndex++] = pSourceBuffer[sourceIndex++];
+										destBuffer[destIndex++] = pSourceBuffer[sourceIndex++];
+										destBuffer[destIndex++] = pSourceBuffer[sourceIndex++];
+										destBuffer[destIndex++] = 255;
+									}
+								}
+							}
+
+							bitmap.UnlockBits(bitmapData);
+							return true;
+						}
+
+					default:
+						// let this code fall through and return false
+						break;
+				}
+			}
+
+			return false;
+		}
+
+		public override Mesh Mesh
+		{
+			get
+			{
+				if (base.Mesh == null || base.Mesh.FaceTextures.Count <= 0)
+				{
+					using (this.RebuildLock())
+					{
+						// TODO: Revise fallback mesh
+						base.Mesh = this.InitMesh(this.Image) ?? PlatonicSolids.CreateCube(100, 100, 0.2);
+					}
+				}
+
+				return base.Mesh;
+			}
+		}
+
+		public double ScaleMmPerPixels { get; private set; }
+
+		public override Task Rebuild()
+		{
+			InitMesh(this.Image);
+
+			UiThread.RunOnIdle(() => Parent?.Invalidate(new InvalidateArgs(this, InvalidateType.Image)));
+
+			return base.Rebuild();
+		}
+
+		private Mesh InitMesh(ImageBuffer imageBuffer)
+		{
+			if (imageBuffer != null)
+			{
+				ScaleMmPerPixels = Math.Min(DefaultSizeMm / imageBuffer.Width, DefaultSizeMm / imageBuffer.Height);
+
+				// Create texture mesh
+				double width = ScaleMmPerPixels * imageBuffer.Width;
+				double height = ScaleMmPerPixels * imageBuffer.Height;
+
+				Mesh textureMesh = PlatonicSolids.CreateCube(width, height, 0.2);
+				textureMesh.PlaceTextureOnFaces(0, imageBuffer);
+
+				return textureMesh;
+			}
+
+			return null;
+		}
+
+		public static void ModifyImageObjectEditorWidget(ImageObject3D imageObject, GuiWidget widget, ThemeConfig theme, Action requestWidgetUpdate)
+		{
+			widget.Click += (s, e) =>
+			{
+				if (e.Button == MouseButtons.Left)
+				{
+					ShowOpenDialog(imageObject);
+				}
+
+				if (e.Button == MouseButtons.Right)
+				{
+					var popupMenu = new PopupMenu(theme);
+
+					var openMenu = popupMenu.CreateMenuItem("Open".Localize());
+					openMenu.Click += (s2, e2) =>
+					{
+						popupMenu.Close();
+						ShowOpenDialog(imageObject);
+					};
+
+					popupMenu.CreateSeparator();
+
+					var copyMenu = popupMenu.CreateMenuItem("Copy".Localize());
+					copyMenu.Click += (s2, e2) =>
+					{
+						Clipboard.Instance.SetImage(imageObject.Image);
+					};
+
+					var pasteMenu = popupMenu.CreateMenuItem("Paste".Localize());
+					pasteMenu.Click += (s2, e2) =>
+					{
+						var activeImage = Clipboard.Instance.GetImage();
+
+						// Persist
+						string filePath = ApplicationDataStorage.Instance.GetNewLibraryFilePath(".png");
+						ImageIO.SaveImageData(
+							filePath,
+							activeImage);
+
+						imageObject.AssetPath = filePath;
+						imageObject.Mesh = null;
+
+						requestWidgetUpdate();
+
+						imageObject.Invalidate(InvalidateType.Image);
+					};
+
+					pasteMenu.Enabled = Clipboard.Instance.ContainsImage;
+
+					popupMenu.ShowMenu(widget, e);
+				}
+			};
+		}
+
+		public static void ShowOpenDialog(IAssetObject assetObject)
+		{
+			UiThread.RunOnIdle(() =>
+			{
+				// we do this using to make sure that the stream is closed before we try and insert the Picture
+				AggContext.FileDialogs.OpenFileDialog(
+					new OpenFileDialogParams(
+						"Select an image file|*.jpg;*.png;*.bmp;*.gif;*.pdf",
+						multiSelect: false,
+						title: "Add Image".Localize()),
+						(openParams) =>
+						{
+							if (!File.Exists(openParams.FileName))
+							{
+								return;
+							}
+
+							assetObject.AssetPath = openParams.FileName;
+						});
+			});
+		}
+
+        public void UpdateControls(PublicPropertyChange change)
+        {
+            change.SetRowVisible(nameof(Text), () => OutputOption == QrCodeTypes.Text);
+            change.SetRowVisible(nameof(SSID), () => OutputOption == QrCodeTypes.WiFi);
+            change.SetRowVisible(nameof(Password), () => OutputOption == QrCodeTypes.WiFi);
+            change.SetRowVisible(nameof(Security), () => OutputOption == QrCodeTypes.WiFi);
+        }
+    }
+}

MatterControlLib/DesignTools/Sheets/SheetData.cs

@@ -32,6 +32,7 @@ using org.mariuszgromada.math.mxparser;
 using Newtonsoft.Json;
 using System.Linq;
 using System;
+using g3;
 
 namespace MatterHackers.MatterControl.DesignTools
 {
@@ -54,7 +55,37 @@ namespace MatterHackers.MatterControl.DesignTools
 			}
 		}
 
-		public string EvaluateExpression(string expression)
+		public string GetCellValue(string cellId)
+		{
+            lock (locker)
+            {
+                if (!tabelCalculated)
+                {
+                    BuildTableConstants();
+                }
+
+                var cell = this[cellId];
+
+				var expression = cell.Expression;
+
+                if (expression.StartsWith("="))
+				{
+                    expression = expression.Substring(1);
+                    var evaluator = new Expression(expression.ToLower());
+                    AddConstants(evaluator);
+                    var value = evaluator.calculate();
+
+                    return value.ToString();
+                }
+                else
+				{
+					// return the expression without evaluation
+					return expression;
+				}
+            }
+        }
+
+        public string EvaluateExpression(string expression)
 		{
 			lock (locker)
 			{
@@ -65,9 +96,21 @@ namespace MatterHackers.MatterControl.DesignTools
 
 				if(expression.StartsWith("="))
 				{
-					expression = expression.Substring(1);
+					expression = expression.Substring(1).Trim();
-				}
+
-				var evaluator = new Expression(expression.ToLower());
+                    // if it is a direct cell reference than return that cells value
+                    if (expression.Length == 2)
+                    {
+						var column = (uint)expression.Substring(0, 1).ToUpper()[0] - 'A';
+						var row = (uint)expression.Substring(1, 1)[0] - '1';
+						if (column < Width && row < Height)
+						{
+							return GetCellValue(CellId((int)column, (int)row));
+						}
+                    }
+                }
+
+                var evaluator = new Expression(expression.ToLower());
 				AddConstants(evaluator);
 				var value = evaluator.calculate();
 
@@ -83,6 +126,12 @@ namespace MatterHackers.MatterControl.DesignTools
 			}
 		}
 
+        /// <summary>
+		/// Return the cell at the given position
+		/// </summary>
+		/// <param name="x">The x index</param>
+		/// <param name="y">The y index</param>
+		/// <returns>The TableCell</returns>
 		public TableCell this[int x, int y]
 		{
 			get
@@ -102,6 +151,11 @@ namespace MatterHackers.MatterControl.DesignTools
 			}
 		}
 
+        /// <summary>
+		/// Get the Table cell for the given cellId
+		/// </summary>
+		/// <param name="cellId"></param>
+		/// <returns>The table cell for the id</returns>
 		public TableCell this[string cellId]
 		{
 			get

MatterControlLib/DesignTools/Sheets/SheetObject3D.cs

@@ -479,15 +479,34 @@ namespace MatterHackers.MatterControl.DesignTools
 
 			inputExpression = ReplaceConstantsWithValues(owner, inputExpression);
 
-			// check if the expression is not an equation (does not start with "=")
+			// check if the expression is an equation (starts with "=")
-			if (inputExpression.Length > 0 && inputExpression[0] != '=')
+			if (inputExpression.Length > 0 && inputExpression[0] == '=')
+			{
+				// look through all the parents
+				var sheet = FindFirstSheet(owner);
+				if (sheet != null)
+				{
+					// try to manage the cell into the correct data type
+					string value = sheet.SheetData.EvaluateExpression(inputExpression);
+					return CastResult<T>(value, inputExpression);
+				}
+
+				// could not find a sheet, try to evaluate the expression directly
+				var evaluator = new Expression(inputExpression.ToLower());
+				if (evaluator.checkSyntax())
+				{
+					Debug.WriteLine(evaluator.getErrorMessage());
+				}
+
+				return CastResult<T>(evaluator.calculate().ToString(), inputExpression);
+			}
+			else // not an equation so try to parse it directly
 			{
 				if (typeof(T) == typeof(string))
 				{
 					return (T)(object)inputExpression;
 				}
 
-				// not an equation so try to parse it directly
 				if (double.TryParse(inputExpression, out var result))
 				{
 					if (typeof(T) == typeof(double))
@@ -499,41 +518,9 @@ namespace MatterHackers.MatterControl.DesignTools
 						return (T)(object)(int)Math.Round(result);
 					}
 				}
-				else
-				{
-					if (typeof(T) == typeof(double))
-					{
-						return (T)(object)0.0;
-					}
-					if (typeof(T) == typeof(int))
-					{
-						return (T)(object)0;
-					}
-				}
-			}
-			
-			if (inputExpression.Length > 0 && inputExpression[0] == '=')
-			{
-				inputExpression = inputExpression.Substring(1);
-			}
 
-			// look through all the parents
+				return (T)(object)0;
-			var sheet = FindFirstSheet(owner);
-			if (sheet != null)
-			{
-				// try to manage the cell into the correct data type
-				string value = sheet.SheetData.EvaluateExpression(inputExpression);
-				return CastResult<T>(value, inputExpression);
 			}
-
-			// could not find a sheet, try to evaluate the expression directly
-			var evaluator = new Expression(inputExpression.ToLower());
-			if(evaluator.checkSyntax())
-			{
-				Debug.WriteLine(evaluator.getErrorMessage());
-			}
-
-			return CastResult<T>(evaluator.calculate().ToString(), inputExpression);
 		}
 
 		/// <summary>

MatterControlLib/Library/Providers/MatterControl/PrimitivesContainer.cs

@@ -120,6 +120,10 @@ namespace MatterHackers.MatterControl.Library
 					"Dual Contouring".Localize(),
 					async () => await DualContouringObject3D.Create())
 					{ DateCreated = new DateTime(index++) },
+				new GeneratorItem(
+					"QR Code".Localize(),
+					async () => await QrCodeObject3D.Create())
+					{ DateCreated = new DateTime(index++) },
 #endif
 				new GeneratorItem(
 					"Image Converter".Localize(),

MatterControlLib/MatterControlLib.csproj

@@ -4,6 +4,7 @@
     <TargetFramework>net6.0-windows</TargetFramework>
     <Company>MatterHackers Inc.</Company>
     <ReleaseVersion>2.20.12</ReleaseVersion>
+    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
   </PropertyGroup>
 
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
@@ -104,6 +105,7 @@
     <PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="6.0.0" />
     <PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
     <PackageReference Include="PDFsharpNetStandard2" Version="1.51.4845" />
+    <PackageReference Include="QRCoder" Version="1.4.3" />
     <PackageReference Include="SocketIOSharp" Version="2.0.3" />
     <PackageReference Include="System.ComponentModel.Annotations" Version="5.0.0" />
     <PackageReference Include="System.IO.Packaging" Version="6.0.0" />

MatterControlLib/PartPreviewWindow/View3D/Actions/SheetFieldWidget.cs

@@ -80,15 +80,7 @@ namespace MatterHackers.MatterControl.DesignTools
 
 		private void UpdateContents()
 		{
-			var expression = SheetData[x, y].Expression;
+            content.Text = SheetData.GetCellValue(SheetData.CellId(x, y));
-			if (expression.StartsWith("="))
-			{
-				content.Text = SheetData.EvaluateExpression(expression);
-			}
-			else
-			{
-				content.Text = expression;
-			}
 		}
 
 		public override void OnKeyPress(KeyPressEventArgs keyPressEvent)

MatterControlLib/SlicerConfiguration/UIFields/EnumDisplayField.cs

@@ -453,7 +453,8 @@ namespace MatterHackers.MatterControl.SlicerConfiguration
 			{
 				Padding = PopupMenu.MenuPadding,
 				VAnchor = VAnchor.Center,
-			};
+                Margin = new BorderDouble(8, 1),
+            };
 
 			return popupMenu.CreateButtonSelectMenuItem(textWidget, text, buttonKvps, startingValue, setter, minSpacerWidth);
 		}
@@ -468,7 +469,8 @@ namespace MatterHackers.MatterControl.SlicerConfiguration
 			{
 				Padding = PopupMenu.MenuPadding,
 				VAnchor = VAnchor.Center,
-			};
+                Margin = new BorderDouble(8, 1),
+            };
 
 			return popupMenu.CreateButtonMenuItem(textWidget, text, buttonKvps, minSpacerWidth);
 		}

StaticData/Translations/Master.txt

@@ -3415,6 +3415,9 @@ Translated:Output
 English:Output only the first layer of the print. Especially useful for outputting gcode data for applications like engraving or cutting.
 Translated:Output only the first layer of the print. Especially useful for outputting gcode data for applications like engraving or cutting.
 
+English:Output Option
+Translated:Output Option
+
 English:Output Resolution
 Translated:Output Resolution
 
@@ -3916,6 +3919,9 @@ Translated:px
 English:Pyramid
 Translated:Pyramid
 
+English:QR Code
+Translated:QR Code
+
 English:Quality
 Translated:Quality
 
@@ -4420,6 +4426,12 @@ Translated:seconds
 English:Sections
 Translated:Sections
 
+English:Security
+Translated:Security
+
+English:Segments
+Translated:Segments
+
 English:Select
 Translated:Select
 
@@ -4855,6 +4867,9 @@ Translated:Split
 English:Split Mesh
 Translated:Split Mesh
 
+English:SSID
+Translated:SSID
+
 English:Stable
 Translated:Stable
 

Submodules/MatterSlice

@@ -1 +1 @@
-Subproject commit 7e79fdb5d6d0ff90eb5d24f84716c62e5fb048df
+Subproject commit fe32884d5958d2666f3912615f90234271b2471f

Submodules/agg-sharp

@@ -1 +1 @@
-Subproject commit 94727927b558c1a93025d97c0e33f5eff7d4d289
+Subproject commit 5d6079f193aadd944321af96244700691d84e0f9

Tests/MatterControl.AutomationTests/DesignTools/SheetTests.cs

@@ -16,6 +16,45 @@ using TestInvoker;
 
 namespace MatterHackers.MatterControl.Tests.Automation
 {
+    [TestFixture]
+	public class SheetDataTests
+    {
+        [Test]
+		public void Calculations()
+        {
+			var sheetData = new SheetData(4, 4);
+
+            void Test(string cell, string expression, string expected)
+            {
+                sheetData[cell].Expression = expression;
+                sheetData.Recalculate();
+                Assert.AreEqual(expected, sheetData.GetCellValue(cell));
+            }
+
+            // simple multiply retrived upper and lower case
+            Test("A1", "=4*2", "8");
+            Test("a1", "=4*2", "8");
+
+            // make sure functions are working, max in this case
+            Test("a2", "=max(4, 5)", "5");
+
+            // make sure cell references are working
+            Test("a3", "=a1+a2", "13");
+
+            // complex formulas are working
+            Test("a4", "=((4+5)/3+7)/5", "2");
+
+            // complex formulas with references are working
+            Test("b1", "=(a4+a3)*.5", "7.5");
+
+            // constants work, like pi
+            Test("b2", "=pi", "3.141592653589793");
+
+            // check that we get string data back unmodified
+            Test("b3", "hello", "hello");
+        }
+    }
+
 	[TestFixture, Category("MatterControl.UI.Automation"), Parallelizable(ParallelScope.Children)]
 	public class PrimitiveAndSheetsTests
 	{