Adding QRCode objec
Moving classes to new files Adding sheet data calculation tests
This commit is contained in:
parent
17dd2b256f
commit
dca3b4edf2
13 changed files with 598 additions and 18 deletions
|
|
@ -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,
|
||||
};
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -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");
|
||||
|
|
|
|||
|
|
@ -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;
|
||||
|
|
|
|||
|
|
@ -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);
|
||||
}
|
||||
}
|
||||
38
MatterControlLib/DesignTools/Primitives/IImageProvider.cs
Normal file
38
MatterControlLib/DesignTools/Primitives/IImageProvider.cs
Normal file
|
|
@ -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; }
|
||||
}
|
||||
}
|
||||
|
|
@ -46,15 +46,6 @@ using Newtonsoft.Json;
|
|||
|
||||
namespace MatterHackers.MatterControl.DesignTools
|
||||
{
|
||||
public interface IEditorWidgetModifier
|
||||
{
|
||||
void ModifyEditorWidget(GuiWidget widget, ThemeConfig theme, Action requestWidgetUpdate);
|
||||
}
|
||||
|
||||
public interface IImageProvider
|
||||
{
|
||||
ImageBuffer Image { get; }
|
||||
}
|
||||
|
||||
[HideMeterialAndColor]
|
||||
public class ImageObject3D : AssetObject3D, IImageProvider, IObject3DControlsProvider, IEditorWidgetModifier
|
||||
|
|
|
|||
475
MatterControlLib/DesignTools/Primitives/QrCodeObject3D.cs
Normal file
475
MatterControlLib/DesignTools/Primitives/QrCodeObject3D.cs
Normal file
|
|
@ -0,0 +1,475 @@
|
|||
/*
|
||||
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
|
||||
{
|
||||
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 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()
|
||||
{
|
||||
QRCodeGenerator qrGenerator = new QRCodeGenerator();
|
||||
QRCodeData qrCodeData = qrGenerator.CreateQrCode(Text.Value(this), 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;
|
||||
});
|
||||
});
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -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(),
|
||||
|
|
|
|||
|
|
@ -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" />
|
||||
|
|
|
|||
|
|
@ -3916,6 +3916,9 @@ Translated:px
|
|||
English:Pyramid
|
||||
Translated:Pyramid
|
||||
|
||||
English:QR Code
|
||||
Translated:QR Code
|
||||
|
||||
English:Quality
|
||||
Translated:Quality
|
||||
|
||||
|
|
|
|||
|
|
@ -1 +1 @@
|
|||
Subproject commit 7e79fdb5d6d0ff90eb5d24f84716c62e5fb048df
|
||||
Subproject commit fe32884d5958d2666f3912615f90234271b2471f
|
||||
|
|
@ -1 +1 @@
|
|||
Subproject commit 0d0d08f1cb4c56b977354b246fd002deb98ba8f7
|
||||
Subproject commit 5d6079f193aadd944321af96244700691d84e0f9
|
||||
|
|
@ -16,6 +16,34 @@ using TestInvoker;
|
|||
|
||||
namespace MatterHackers.MatterControl.Tests.Automation
|
||||
{
|
||||
[TestFixture]
|
||||
public class SheetDataTests
|
||||
{
|
||||
[Test]
|
||||
public void Calculations()
|
||||
{
|
||||
var sheetData = new SheetData(4, 4);
|
||||
|
||||
sheetData[0, 0].Expression = "=4*2";
|
||||
|
||||
Assert.AreEqual("8", sheetData.EvaluateExpression("A1"));
|
||||
Assert.AreEqual("8", sheetData.EvaluateExpression("a1"));
|
||||
|
||||
sheetData["a2"].Expression = "=max(4, 5)";
|
||||
sheetData.Recalculate();
|
||||
Assert.AreEqual("5", sheetData.EvaluateExpression("a2"));
|
||||
|
||||
sheetData["a3"].Expression = "=a1+a2";
|
||||
sheetData.Recalculate();
|
||||
Assert.AreEqual("13", sheetData.EvaluateExpression("a3"));
|
||||
|
||||
sheetData["a4"].Expression = "=((4+5)/3+7)/5";
|
||||
sheetData.Recalculate();
|
||||
Assert.AreEqual("2", sheetData.EvaluateExpression("a4"));
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
[TestFixture, Category("MatterControl.UI.Automation"), Parallelizable(ParallelScope.Children)]
|
||||
public class PrimitiveAndSheetsTests
|
||||
{
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue