nettika/mattercontrol
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

All icons working, improved context relevance

Browse source
This commit is contained in:
LarsBrubaker 2020-09-26 18:46:08 -07:00
parent 574f162903
commit 0b99980af7
8 changed files with 237 additions and 188 deletions
Download patch file Download diff file Expand all files Collapse all files

4
MatterControlLib/DesignTools/LithophaneObject3D.cs
View file

@ -51,7 +51,7 @@ namespace MatterHackers.MatterControl.Plugins.Lithophane
}
[JsonIgnore]
public ImageObject3D Image => this.Children.OfType<ImageObject3D>().FirstOrDefault();
public ImageObject3D ImageChild => this.Children.OfType<ImageObject3D>().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;
@ -90,7 +90,7 @@ namespace MatterHackers.MatterControl.Plugins.Lithophane
public override Task Rebuild()
{
this.DebugDepth("Rebuild");
var activeImage = AggContext.ImageIO.LoadImage(this.Image.AssetPath);
var activeImage = this.ImageChild.Image;
ApplicationController.Instance.Tasks.Execute("Generating Lithophane".Localize(), null, (reporter, cancellationToken) =>
{