From 5520b73a1daf27a837deb6569b2a8acb3ba526e0 Mon Sep 17 00:00:00 2001 From: Michael Smith Date: Sun, 15 May 2016 21:16:08 -0700 Subject: [PATCH] Shifted image processing helpers to Solids/Imported/Images --- OSCADSharp/OSCADSharp.ConsoleTests/Program.cs | 2 +- OSCADSharp/OSCADSharp/OSCADSharp.csproj | 12 ++++++------ .../Imported/{ => Images}/AdjacentPixelMatrix.cs | 2 +- .../Imported/{ => Images}/CubistImageProcessor.cs | 2 +- .../Solids/Imported/{ => Images}/IImageProcessor.cs | 2 +- .../Solids/Imported/{ => Images}/ImageImportMode.cs | 2 +- .../Imported/{ => Images}/NeighboringPointFinder.cs | 2 +- .../Imported/{ => Images}/PolygonalImageProcessor.cs | 2 +- .../OSCADSharp/Solids/Imported/ImportedImage.cs | 1 + 9 files changed, 14 insertions(+), 13 deletions(-) rename OSCADSharp/OSCADSharp/Solids/Imported/{ => Images}/AdjacentPixelMatrix.cs (98%) rename OSCADSharp/OSCADSharp/Solids/Imported/{ => Images}/CubistImageProcessor.cs (99%) rename OSCADSharp/OSCADSharp/Solids/Imported/{ => Images}/IImageProcessor.cs (86%) rename OSCADSharp/OSCADSharp/Solids/Imported/{ => Images}/ImageImportMode.cs (93%) rename OSCADSharp/OSCADSharp/Solids/Imported/{ => Images}/NeighboringPointFinder.cs (98%) rename OSCADSharp/OSCADSharp/Solids/Imported/{ => Images}/PolygonalImageProcessor.cs (99%) diff --git a/OSCADSharp/OSCADSharp.ConsoleTests/Program.cs b/OSCADSharp/OSCADSharp.ConsoleTests/Program.cs index 6ce6fb6..cf1a07f 100644 --- a/OSCADSharp/OSCADSharp.ConsoleTests/Program.cs +++ b/OSCADSharp/OSCADSharp.ConsoleTests/Program.cs @@ -57,7 +57,7 @@ namespace OSCADSharp.ConsoleTests static void Main(string[] args) { - var img = ImportedImage.FromFile("sample.png", ImageImportMode.Polygonal).Scale(1, 1, Inches.Quarter + Inches.Eigth); + var img = ImportedImage.FromFile("sample.png").Scale(1, 1, Inches.Quarter + Inches.Eigth); var imgPos = img.Position(); var _base = new Cylinder(img.Bounds().Width + Inches.Quarter, Inches.Quarter) { Resolution = 100 }; diff --git a/OSCADSharp/OSCADSharp/OSCADSharp.csproj b/OSCADSharp/OSCADSharp/OSCADSharp.csproj index 6508a65..d6d2fcd 100644 --- a/OSCADSharp/OSCADSharp/OSCADSharp.csproj +++ b/OSCADSharp/OSCADSharp/OSCADSharp.csproj @@ -48,14 +48,14 @@ - - - - + + + + - - + + diff --git a/OSCADSharp/OSCADSharp/Solids/Imported/AdjacentPixelMatrix.cs b/OSCADSharp/OSCADSharp/Solids/Imported/Images/AdjacentPixelMatrix.cs similarity index 98% rename from OSCADSharp/OSCADSharp/Solids/Imported/AdjacentPixelMatrix.cs rename to OSCADSharp/OSCADSharp/Solids/Imported/Images/AdjacentPixelMatrix.cs index 823ce72..74599a4 100644 --- a/OSCADSharp/OSCADSharp/Solids/Imported/AdjacentPixelMatrix.cs +++ b/OSCADSharp/OSCADSharp/Solids/Imported/Images/AdjacentPixelMatrix.cs @@ -5,7 +5,7 @@ using System.Linq; using System.Text; using System.Threading.Tasks; -namespace OSCADSharp.Solids.Imported +namespace OSCADSharp.Solids.Imported.Images { /// /// A matrix for finding neighbors in regions of pixels diff --git a/OSCADSharp/OSCADSharp/Solids/Imported/CubistImageProcessor.cs b/OSCADSharp/OSCADSharp/Solids/Imported/Images/CubistImageProcessor.cs similarity index 99% rename from OSCADSharp/OSCADSharp/Solids/Imported/CubistImageProcessor.cs rename to OSCADSharp/OSCADSharp/Solids/Imported/Images/CubistImageProcessor.cs index 3577400..183db49 100644 --- a/OSCADSharp/OSCADSharp/Solids/Imported/CubistImageProcessor.cs +++ b/OSCADSharp/OSCADSharp/Solids/Imported/Images/CubistImageProcessor.cs @@ -6,7 +6,7 @@ using System.Linq; using System.Text; using System.Threading.Tasks; -namespace OSCADSharp.Solids.Imported +namespace OSCADSharp.Solids.Imported.Images { /// /// Processes a bitmap image by treating contiguous same-color regions as cubes diff --git a/OSCADSharp/OSCADSharp/Solids/Imported/IImageProcessor.cs b/OSCADSharp/OSCADSharp/Solids/Imported/Images/IImageProcessor.cs similarity index 86% rename from OSCADSharp/OSCADSharp/Solids/Imported/IImageProcessor.cs rename to OSCADSharp/OSCADSharp/Solids/Imported/Images/IImageProcessor.cs index b725d6d..e08a94d 100644 --- a/OSCADSharp/OSCADSharp/Solids/Imported/IImageProcessor.cs +++ b/OSCADSharp/OSCADSharp/Solids/Imported/Images/IImageProcessor.cs @@ -5,7 +5,7 @@ using System.Linq; using System.Text; using System.Threading.Tasks; -namespace OSCADSharp.Solids.Imported +namespace OSCADSharp.Solids.Imported.Images { internal interface IImageProcessor { diff --git a/OSCADSharp/OSCADSharp/Solids/Imported/ImageImportMode.cs b/OSCADSharp/OSCADSharp/Solids/Imported/Images/ImageImportMode.cs similarity index 93% rename from OSCADSharp/OSCADSharp/Solids/Imported/ImageImportMode.cs rename to OSCADSharp/OSCADSharp/Solids/Imported/Images/ImageImportMode.cs index ac332cd..72f6b0c 100644 --- a/OSCADSharp/OSCADSharp/Solids/Imported/ImageImportMode.cs +++ b/OSCADSharp/OSCADSharp/Solids/Imported/Images/ImageImportMode.cs @@ -4,7 +4,7 @@ using System.Linq; using System.Text; using System.Threading.Tasks; -namespace OSCADSharp.Solids.Imported +namespace OSCADSharp.Solids.Imported.Images { /// /// Ways to process imported images into 3D models diff --git a/OSCADSharp/OSCADSharp/Solids/Imported/NeighboringPointFinder.cs b/OSCADSharp/OSCADSharp/Solids/Imported/Images/NeighboringPointFinder.cs similarity index 98% rename from OSCADSharp/OSCADSharp/Solids/Imported/NeighboringPointFinder.cs rename to OSCADSharp/OSCADSharp/Solids/Imported/Images/NeighboringPointFinder.cs index aee7f3c..52f5538 100644 --- a/OSCADSharp/OSCADSharp/Solids/Imported/NeighboringPointFinder.cs +++ b/OSCADSharp/OSCADSharp/Solids/Imported/Images/NeighboringPointFinder.cs @@ -5,7 +5,7 @@ using System.Linq; using System.Text; using System.Threading.Tasks; -namespace OSCADSharp.Solids.Imported +namespace OSCADSharp.Solids.Imported.Images { /// /// Helper class to reuse code in image processing for finding adjacent pixels diff --git a/OSCADSharp/OSCADSharp/Solids/Imported/PolygonalImageProcessor.cs b/OSCADSharp/OSCADSharp/Solids/Imported/Images/PolygonalImageProcessor.cs similarity index 99% rename from OSCADSharp/OSCADSharp/Solids/Imported/PolygonalImageProcessor.cs rename to OSCADSharp/OSCADSharp/Solids/Imported/Images/PolygonalImageProcessor.cs index 4430804..1199f11 100644 --- a/OSCADSharp/OSCADSharp/Solids/Imported/PolygonalImageProcessor.cs +++ b/OSCADSharp/OSCADSharp/Solids/Imported/Images/PolygonalImageProcessor.cs @@ -7,7 +7,7 @@ using System.Text; using System.Threading.Tasks; using OSCADSharp.DataBinding; -namespace OSCADSharp.Solids.Imported +namespace OSCADSharp.Solids.Imported.Images { diff --git a/OSCADSharp/OSCADSharp/Solids/Imported/ImportedImage.cs b/OSCADSharp/OSCADSharp/Solids/Imported/ImportedImage.cs index 5d46ee0..9089590 100644 --- a/OSCADSharp/OSCADSharp/Solids/Imported/ImportedImage.cs +++ b/OSCADSharp/OSCADSharp/Solids/Imported/ImportedImage.cs @@ -6,6 +6,7 @@ using System.Threading.Tasks; using OSCADSharp.DataBinding; using OSCADSharp.Spatial; using System.Drawing; +using OSCADSharp.Solids.Imported.Images; namespace OSCADSharp.Solids.Imported {