Fix for a compile error (oops), and added ImageImportOptions.cs

This commit is contained in:
Michael Smith 2016-05-15 21:27:37 -07:00
parent 59e250b28d
commit d308a517ee
4 changed files with 30 additions and 11 deletions

View File

@ -48,6 +48,7 @@
<Compile Include="OSCADObject.BaseTransform.cs" /> <Compile Include="OSCADObject.BaseTransform.cs" />
<Compile Include="OSCADObject.BasicTransforms.cs" /> <Compile Include="OSCADObject.BasicTransforms.cs" />
<Compile Include="OSCADObject.Booleans.cs" /> <Compile Include="OSCADObject.Booleans.cs" />
<Compile Include="Solids\Imported\ImageImportOptions.cs" />
<Compile Include="Utility\Images\AdjacentPixelMatrix.cs" /> <Compile Include="Utility\Images\AdjacentPixelMatrix.cs" />
<Compile Include="Utility\Images\CubistImageProcessor.cs" /> <Compile Include="Utility\Images\CubistImageProcessor.cs" />
<Compile Include="Utility\Images\IImageProcessor.cs" /> <Compile Include="Utility\Images\IImageProcessor.cs" />

View File

@ -0,0 +1,19 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace OSCADSharp.Solids.Imported
{
/// <summary>
/// Configuration options for processing imported images
/// </summary>
public class ImageImportOptions
{
/// <summary>
/// Indicates whether height-mapping should be used
/// </summary>
public bool HeightMapping { get; set; } = true;
}
}

View File

@ -25,19 +25,17 @@ namespace OSCADSharp.Solids.Imported
/// Creates an imported image from the specified file /// Creates an imported image from the specified file
/// </summary> /// </summary>
/// <param name="imagePath"></param> /// <param name="imagePath"></param>
/// <param name="options"></param>
/// <returns></returns> /// <returns></returns>
public static ImportedImage FromFile(string imagePath) public static ImportedImage FromFile(string imagePath, ImageImportOptions options = null)
{ {
IImageProcessor processor; IImageProcessor processor;
//if(mode == ImageImportMode.Cubist) if(options == null)
//{ {
processor = new CubistImageProcessor(imagePath); options = new ImageImportOptions();
//} }
//else
//{
// processor = new PolygonalImageProcessor(imagePath);
//}
processor = new CubistImageProcessor(imagePath, options.HeightMapping);
var obj = processor.ProcessImage(); var obj = processor.ProcessImage();
var img = new ImportedImage() var img = new ImportedImage()

View File

@ -1,4 +1,5 @@
using OSCADSharp.Spatial; using OSCADSharp.Solids;
using OSCADSharp.Spatial;
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Drawing; using System.Drawing;