elias/OSCADSharpDotnet7
1
0
Fork 0
mirror of https://github.com/eliasstepanik/OSCADSharpDotnet7.git synced 2026-01-25 03:58:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

Refactored recursive image processing code to be iterative.

Browse Source
This commit is contained in:
Michael L Smith 2016-10-30 15:44:29 -07:00
parent 3697647e4a
commit 57a653f326
1 changed files with 17 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

55
OSCADSharp/OSCADSharp/Utility/Images/CubistImageProcessor.cs
View File

@ -73,7 +73,7 @@ namespace OSCADSharp.Utility.Images
do do
{ {
System.Drawing.Color color = pixels[((Point)start).X, ((Point)start).Y]; System.Drawing.Color color = pixels[((Point)start).X, ((Point)start).Y];
var cube = this.traverseNext(img, (Point)start, ref visited, color); var cube = this.traverseIterative(img, (Point)start, ref visited, color);
if (cube != null) if (cube != null)
{ {
this.markVisited(ref visited, cube, (Point)start, img); this.markVisited(ref visited, cube, (Point)start, img);
@ -91,7 +91,6 @@ namespace OSCADSharp.Utility.Images
return cubes; return cubes;
} }
private void setColorArray(Bitmap img) private void setColorArray(Bitmap img)
{ {
this.pixels = new Color[img.Width, img.Height]; this.pixels = new Color[img.Width, img.Height];
@ -130,53 +129,33 @@ namespace OSCADSharp.Utility.Images
} }
} }
private Cube traverseNext(Bitmap img, Point start, ref bool[,] visited, System.Drawing.Color color, Cube cube = null) private Cube traverseIterative(Bitmap img, Point start, ref bool[,] visited, System.Drawing.Color color, Cube cube = null)
{ {
TraversalDirection direction = TraversalDirection.None; TraversalDirection direction = TraversalDirection.None;
if (cube != null) Cube current = cube ?? new Cube();
{ direction = canContinueTraversal(img, ref start, visited, color, current);
direction = canContinueTraversal(img, ref start, visited, color, cube);
}
if (direction != TraversalDirection.None || cube == null) while (direction != TraversalDirection.None)
{ {
if (cube == null)
if (direction == TraversalDirection.X_Only)
{ {
cube = new Cube(); current.Size.X += 1;
return traverseNext(img, start, ref visited, color, cube); }
else if (direction == TraversalDirection.Y_Only)
{
current.Size.Y += 1;
} }
else else
{ {
if (direction == TraversalDirection.X_Only) current.Size.X += 1;
{ current.Size.Y += 1;
cube.Size.X += 1;
return traverseNext(img, start, ref visited, color, cube);
}
else if (direction == TraversalDirection.Y_Only)
{
cube.Size.Y += 1;
return traverseNext(img, start, ref visited, color, cube);
}
else
{
cube.Size.X += 1;
cube.Size.Y += 1;
return traverseNext(img, start, ref visited, color, cube);
}
} }
}
else
{
if (cube == null) direction = canContinueTraversal(img, ref start, visited, color, current);
{
return new Cube();
}
else
{
return cube;
}
} }
return current;
} }
private TraversalDirection canContinueTraversal(Bitmap img, ref Point start, bool[,] visited, Color color, Cube cube) private TraversalDirection canContinueTraversal(Bitmap img, ref Point start, bool[,] visited, Color color, Cube cube)