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

Made image converter select good filter

Browse source 
Fixed bug with bed not showing top texture
This commit is contained in:
Lars Brubaker 2021-08-20 16:55:29 -07:00
parent c2a8ed5762
commit 8f8254e2ff
5 changed files with 96 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

72
MatterControlLib/DesignTools/Operations/Image/ImageToPathObject3D_2.cs
View file

@ -44,6 +44,7 @@ using MatterHackers.Localizations;
using MatterHackers.MarchingSquares;
using MatterHackers.MatterControl.DesignTools.Operations;
using MatterHackers.MatterControl.PartPreviewWindow;
using MatterHackers.VectorMath;
using Newtonsoft.Json;
using Polygon = System.Collections.Generic.List<ClipperLib.IntPoint>;
using Polygons = System.Collections.Generic.List<System.Collections.Generic.List<ClipperLib.IntPoint>>;
@ -185,7 +186,7 @@ namespace MatterHackers.MatterControl.DesignTools
this.FlattenToPathObject(undoBuffer);
}
public void GenerateMarchingSquaresAndLines(Action<double, string> progressReporter, ImageBuffer image, IThresholdFunction thresholdFunction, int minimumSurfaceArea)
public void GenerateMarchingSquaresAndLines(Action<double, string> progressReporter, ImageBuffer image, IThresholdFunction thresholdFunction)
{
if (image != null)
{
@ -204,9 +205,11 @@ namespace MatterHackers.MatterControl.DesignTools
int pixelsToIntPointsScale = 1000;
var lineLoops = marchingSquaresData.CreateLineLoops(pixelsToIntPointsScale);
if (minimumSurfaceArea > 0)
if (MinSurfaceArea > 0)
{
for(int i=lineLoops.Count - 1; i >=0; i--)
var minimumSurfaceArea = Math.Pow(MinSurfaceArea * 1000, 2);
for (int i=lineLoops.Count - 1; i >=0; i--)
{
var area = Math.Abs(Clipper.Area(lineLoops[i]));
if (area < minimumSurfaceArea)
@ -260,12 +263,67 @@ namespace MatterHackers.MatterControl.DesignTools
}
}
private bool ColorDetected(ImageBuffer sourceImage, out double hueDetected)
{
byte[] sourceBuffer = sourceImage.GetBuffer();
var min = new Vector3(double.MaxValue, double.MaxValue, double.MaxValue);
var max = new Vector3(double.MinValue, double.MinValue, double.MinValue);
for(int y = 0; y < sourceImage.Height; y++)
{
int imageOffset = sourceImage.GetBufferOffsetY(y);
for (int x = 0; x < sourceImage.Width; x++)
{
int offset = imageOffset + x * 4;
var b = sourceBuffer[offset + 0];
var g = sourceBuffer[offset + 1];
var r = sourceBuffer[offset + 2];
var color = new ColorF(r / 255.0, g / 255.0, b / 255.0);
color.GetHSL(out double hue, out double saturation, out double lightness);
min = Vector3.ComponentMin(min, new Vector3(hue, saturation, lightness));
max = Vector3.ComponentMax(max, new Vector3(hue, saturation, lightness));
if (saturation > .4 && lightness > .1 && lightness < .9)
{
hueDetected = hue;
return true;
}
}
}
hueDetected = 0;
return false;
}
public override async void OnInvalidate(InvalidateArgs invalidateArgs)
{
if (invalidateArgs.InvalidateType.HasFlag(InvalidateType.Image)
&& invalidateArgs.Source != this
&& !RebuildLocked)
{
// try to pick the best processing mode
if (SourceImage.HasTransparency)
{
AnalysisType = AnalysisTypes.Transparency;
Histogram.RangeStart = 0;
Histogram.RangeEnd = .9;
}
else if (ColorDetected(SourceImage, out double hue))
{
AnalysisType = AnalysisTypes.Colors;
Histogram.RangeStart = Math.Max(0, hue - .2);
Histogram.RangeEnd = Math.Min(1, hue + .2);
}
else
{
AnalysisType = AnalysisTypes.Intensity;
Histogram.RangeStart = 0;
Histogram.RangeEnd = .9;
}
if (AnalysisType != AnalysisTypes.Transparency)
{
Histogram.BuildHistogramFromImage(SourceImage, AnalysisType);
@ -277,6 +335,8 @@ namespace MatterHackers.MatterControl.DesignTools
Image?.CopyFrom(SourceImage);
}
await Rebuild();
this.ReloadEditorPannel();
}
else if ((invalidateArgs.InvalidateType.HasFlag(InvalidateType.Properties) && invalidateArgs.Source == this))
{
@ -313,8 +373,7 @@ namespace MatterHackers.MatterControl.DesignTools
reporter.Report(progressStatus);
},
SourceImage,
new AlphaFunction(),
(int)(MinSurfaceArea * 1000));
new AlphaFunction());
break;
case AnalysisTypes.Colors:
@ -327,8 +386,7 @@ namespace MatterHackers.MatterControl.DesignTools
reporter.Report(progressStatus);
},
alphaImage,
new AlphaFunction(),
(int)(Math.Pow(MinSurfaceArea * 1000, 2)));
new AlphaFunction());
break;
}

27
MatterControlLib/DesignTools/Operations/Object3DExtensions.cs
View file

@ -99,6 +99,33 @@ namespace MatterHackers.MatterControl.DesignTools.Operations
return null;
}
public static InteractiveScene ContainingScene(this IObject3D object3D)
{
foreach (var workspace in ApplicationController.Instance.Workspaces)
{
if (workspace.SceneContext.Scene.Descendants().Contains(object3D))
{
return workspace.SceneContext.Scene;
}
}
return null;
}
public static void ReloadEditorPannel(this IObject3D object3D)
{
// de-select and select this object
var scene = object3D.ContainingScene();
if (scene != null
&& (object3D.Parents().Contains(scene.SelectedItem)
|| object3D == scene.SelectedItem))
{
var selection = scene.SelectedItem;
scene.SelectedItem = null;
scene.SelectedItem = selection;
}
}
public static int EstimatedMemory(this IObject3D object3D)
{
return 0;

4
MatterControlLib/PartPreviewWindow/SceneViewer/FloorDrawable.cs
View file

@ -101,11 +101,11 @@ namespace MatterHackers.MatterControl.PartPreviewWindow
GLHelper.Render(
sceneContext.Mesh,
theme.UnderBedColor,
theme.UnderBedColor.WithAlpha(32),
RenderTypes.Shaded,
world.ModelviewMatrix,
blendTexture: !this.LookingDownOnBed,
forceCullBackFaces: true);
forceCullBackFaces: false);
if (sceneContext.PrinterShape != null)
{

2
Submodules/MatterSlice

@ -1 +1 @@
Subproject commit adb494612051827f20328a624bee101559d6ace5
Subproject commit 2ae23e64a38e0d13da4ba6c9e8803ee07d8daf05

2
Submodules/agg-sharp

@ -1 +1 @@
Subproject commit 0e6c407494ab8a587e950ed5e544c0404b1edd71
Subproject commit cb957e18fa363d13c6b36e02b603a5bf687bc2f5