elias/OSCADSharpDotnet7
1
0
Fork 0
mirror of https://github.com/eliasstepanik/OSCADSharpDotnet7.git synced 2026-01-23 11:18:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

Shifted image simplification code into ImageSimplifier.cs

Browse Source
This commit is contained in:
Michael Smith 2016-05-16 22:44:58 -07:00
parent 10185ea15e
commit 8247c5b807
3 changed files with 79 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
OSCADSharp/OSCADSharp/OSCADSharp.csproj
View File

@ -55,6 +55,7 @@
<Compile Include="Utility\Images\ImageImportMode.cs" /> <Compile Include="Utility\Images\ImageImportMode.cs" />
<Compile Include="Solids\Imported\ImportedImage.cs" /> <Compile Include="Solids\Imported\ImportedImage.cs" />
<Compile Include="Solids\Imported\ImportedModel.cs" /> <Compile Include="Solids\Imported\ImportedModel.cs" />
<Compile Include="Utility\Images\ImageSimplifier.cs" />
<Compile Include="Utility\Images\NeighboringPointFinder.cs" /> <Compile Include="Utility\Images\NeighboringPointFinder.cs" />
<Compile Include="Utility\Images\PolygonalImageProcessor.cs" /> <Compile Include="Utility\Images\PolygonalImageProcessor.cs" />
<Compile Include="Utility\Dependencies.cs" /> <Compile Include="Utility\Dependencies.cs" />

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

@ -49,7 +49,7 @@ namespace OSCADSharp.Utility.Images
{ {
Bitmap img = new Bitmap(Image.FromFile(this.imagePath)); Bitmap img = new Bitmap(Image.FromFile(this.imagePath));
this.setColorArray(img); this.setColorArray(img);
this.simlifyColors(img); this.simplifyColors(img);
this.setHeightMappings(img); this.setHeightMappings(img);
this.ImageBounds = new Bounds(new Vector3(), new Vector3(img.Width, img.Height, 1)); this.ImageBounds = new Bounds(new Vector3(), new Vector3(img.Width, img.Height, 1));
@ -85,54 +85,11 @@ namespace OSCADSharp.Utility.Images
return cubes; return cubes;
} }
private void simlifyColors(Bitmap img) private void simplifyColors(Bitmap img)
{ {
if (this.simplificationAmount == 0)
{
return;
}
// These calls color values from their originals to new ones based upon the color's proximity to the simpification amount var simplifier = new ImageSimplifier(img.Width, img.Height, pixels);
// the channelSelector and colorFactory functions allow us to use the same function for each. simplifier.GlobalReduction(this.simplificationAmount);
// TODO: Refactor into a class
mapColors(img, (c) => { return c.R; }, (orig, retained) => { return Color.FromArgb(orig.A, retained.R, orig.G, orig.B); });
mapColors(img, (c) => { return c.G; }, (orig, retained) => { return Color.FromArgb(orig.A, orig.R, retained.G, orig.B); });
mapColors(img, (c) => { return c.B; }, (orig, retained) => { return Color.FromArgb(orig.A, orig.R, orig.G, retained.B); });
}
private void mapColors(Bitmap img, Func<Color, byte> channelSelector, Func<Color, Color, Color> colorFactory)
{
Dictionary<byte, Color> colorsRetained = new Dictionary<byte, Color>();
for (int x = 0; x < img.Width; x++)
{
for (int y = 0; y < img.Height; y++)
{
Color curColor;
bool colorMatched = false;
curColor = this.pixels[x, y];
for (int simVal = 0; simVal < this.simplificationAmount; simVal++)
{
int upperLimit = channelSelector(curColor) + simVal;
int lowerLimit = channelSelector(curColor) - simVal;
if (upperLimit <= 255 && colorsRetained.ContainsKey((byte)upperLimit))
{
this.pixels[x, y] = colorFactory(curColor, colorsRetained[(byte)upperLimit]);
colorMatched = true;
}
else if (lowerLimit >= 0 && colorsRetained.ContainsKey((byte)lowerLimit))
{
this.pixels[x, y] = colorFactory(curColor, colorsRetained[(byte)lowerLimit]);
colorMatched = true;
}
}
if (!colorMatched)
{
colorsRetained[channelSelector(curColor)] = curColor;
}
}
}
} }
private void setColorArray(Bitmap img) private void setColorArray(Bitmap img)

73
OSCADSharp/OSCADSharp/Utility/Images/ImageSimplifier.cs Normal file
View File

@ -0,0 +1,73 @@
using System;
using System.Collections.Generic;
using System.Drawing;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace OSCADSharp.Utility.Images
{
internal class ImageSimplifier
{
private int height;
private Color[,] pixels;
private int width;
public ImageSimplifier(int width, int height, Color[,] pixels)
{
this.width = width;
this.height = height;
this.pixels = pixels;
}
internal void GlobalReduction(byte simplificationAmount)
{
if (simplificationAmount == 0)
{
return;
}
// These calls color values from their originals to new ones based upon the color's proximity to the simpification amount
// the channelSelector and colorFactory functions allow us to use the same function for each.
// TODO: Refactor into a class
mapColors(width, height, simplificationAmount, (c) => { return c.R; }, (orig, retained) => { return Color.FromArgb(orig.A, retained.R, orig.G, orig.B); });
mapColors(width, height, simplificationAmount, (c) => { return c.G; }, (orig, retained) => { return Color.FromArgb(orig.A, orig.R, retained.G, orig.B); });
mapColors(width, height, simplificationAmount, (c) => { return c.B; }, (orig, retained) => { return Color.FromArgb(orig.A, orig.R, orig.G, retained.B); });
}
private void mapColors(int width, int height, int simplificationAmount, Func<Color, byte> channelSelector, Func<Color, Color, Color> colorFactory)
{
Dictionary<byte, Color> colorsRetained = new Dictionary<byte, Color>();
for (int x = 0; x < width; x++)
{
for (int y = 0; y < height; y++)
{
Color curColor;
bool colorMatched = false;
curColor = this.pixels[x, y];
for (int simVal = 0; simVal < simplificationAmount; simVal++)
{
int upperLimit = channelSelector(curColor) + simVal;
int lowerLimit = channelSelector(curColor) - simVal;
if (upperLimit <= 255 && colorsRetained.ContainsKey((byte)upperLimit))
{
this.pixels[x, y] = colorFactory(curColor, colorsRetained[(byte)upperLimit]);
colorMatched = true;
}
else if (lowerLimit >= 0 && colorsRetained.ContainsKey((byte)lowerLimit))
{
this.pixels[x, y] = colorFactory(curColor, colorsRetained[(byte)lowerLimit]);
colorMatched = true;
}
}
if (!colorMatched)
{
colorsRetained[channelSelector(curColor)] = curColor;
}
}
}
}
}
}